Merge branch 'triggerdotdev:main' into main

Author: ConProgramming

.changeset/config.json

@@ -14,10 +14,8 @@
   "updateInternalDependencies": "patch",
   "ignore": [
     "webapp",
-    "coordinator",
-    "docker-provider",
-    "kubernetes-provider",
-    "supervisor"
+    "supervisor",
+    "@trigger.dev/plugins"
   ],
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true

.claude/rules/legacy-v3-code.md

@@ -3,31 +3,24 @@ paths:
   - "apps/webapp/app/v3/**"
 ---
 
-# Legacy V1 Engine Code in `app/v3/`
+# v3 (engine V1) has been removed
 
-The `v3/` directory name is misleading - most code here is actively used by the current V2 engine. Only the specific files below are legacy V1-only code.
+The v3 engine (RunEngineVersion `V1`: MarQS queue + Graphile worker) is end-of-life and its execution code has been removed from the webapp. The `app/v3/` directory name is historical: everything under it now serves the current V2 engine (`@internal/run-engine` + `@trigger.dev/redis-worker`).
 
-## V1-Only Files - Never Modify
+There is no `V1` execution path anymore. If you find a `RunEngineVersion` branch, the `V1` arm should only reject or finalize gracefully (for example, mark a historical run cancelled in the DB), never run V1 work. Do not reintroduce MarQS, the graphile worker, or the v3 socket.io namespaces.
 
-- `marqs/` directory (entire MarQS queue system: sharedQueueConsumer, devQueueConsumer, fairDequeuingStrategy, devPubSub)
-- `legacyRunEngineWorker.server.ts` (V1 background job worker)
-- `services/triggerTaskV1.server.ts` (deprecated V1 task triggering)
-- `services/cancelTaskRunV1.server.ts` (deprecated V1 cancellation)
-- `authenticatedSocketConnection.server.ts` (V1 dev WebSocket using DevQueueConsumer)
-- `sharedSocketConnection.ts` (V1 shared queue socket using SharedQueueConsumer)
+## The deprecation boundary (keep this)
 
-## V1/V2 Branching Pattern
+Requests from clients still on v3 (old SDK/CLI) or historical V1 runs must return a clean 4xx, never a 5xx. The boundary lives in:
 
-Some services act as routers that branch on `RunEngineVersion`:
-- `services/cancelTaskRun.server.ts` - calls V1 service or `engine.cancelRun()` for V2
-- `services/batchTriggerV3.server.ts` - uses marqs for V1 path, run-engine for V2
+- `engineDeprecation.server.ts` - the `V3_TRIGGER_DEPRECATION_MESSAGE` / `V3_DEV_DEPRECATION_MESSAGE` / `V3_MIGRATION_URL` upgrade messages.
+- `engineVersion.server.ts` - `determineEngineVersion()` still detects a V1 project/run so callers can reject it.
+- `services/triggerTask.server.ts`, `services/cancelTaskRun.server.ts`, `services/rescheduleTaskRun.server.ts` - the `V1` arm rejects or finalizes gracefully instead of executing.
+- `services/initializeDeployment.server.ts` - the `DEPRECATE_V3_CLI_DEPLOYS_ENABLED`-gated v3 CLI deploy rejection.
+- `handleWebsockets.server.ts` - the legacy `trigger dev` websocket closes with the upgrade message.
 
-When editing these shared services, only modify V2 code paths.
+## V2 modern stack
 
-## V2 Modern Stack
-
-- **Run lifecycle**: `@internal/run-engine` (internal-packages/run-engine)
-- **Background jobs**: `@trigger.dev/redis-worker` (not graphile-worker/zodworker)
-- **Queue operations**: RunQueue inside run-engine (not MarQS)
-- **V2 engine singleton**: `runEngine.server.ts`, `runEngineHandlers.server.ts`
-- **V2 workers**: `commonWorker.server.ts`, `alertsWorker.server.ts`, `batchTriggerWorker.server.ts`
+- **Run lifecycle**: `@internal/run-engine` (`runEngine.server.ts`, `runEngineHandlers.server.ts`)
+- **Background jobs**: `@trigger.dev/redis-worker` (`commonWorker.server.ts`, `alertsWorker.server.ts`, `batchTriggerWorker.server.ts`; `legacyRunEngineWorker.server.ts` still hosts the live batch-completion jobs)
+- **Queue operations**: RunQueue inside run-engine (`runQueue.server.ts`), not MarQS

.claude/rules/server-apps.md

@@ -5,7 +5,7 @@ paths:
 
 # Server App Changes
 
-When modifying server apps (webapp, supervisor, coordinator, etc.) with **no package changes**, add a `.server-changes/` file instead of a changeset:
+When modifying server apps (webapp, supervisor, etc.) with **no package changes**, add a `.server-changes/` file instead of a changeset:
 
 ```bash
 cat > .server-changes/descriptive-name.md << 'EOF'
@@ -14,10 +14,12 @@ area: webapp
 type: fix
 ---
 
-Brief description of what changed and why.
+Fix pages occasionally loading unstyled during deploys. The dashboard now recovers automatically.
 EOF
 ```
 
-- **area**: `webapp` | `supervisor` | `coordinator` | `kubernetes-provider` | `docker-provider`
+- **area**: `webapp` | `supervisor`
 - **type**: `feature` | `fix` | `improvement` | `breaking`
 - If the PR also touches `packages/`, just the changeset is sufficient (no `.server-changes/` needed).
+
+The body ships **verbatim in user-facing release notes**. Keep it to 1–2 short sentences, non-technical, written for a dashboard user: describe what changed for them, never the implementation (no header names, endpoints, middleware, storage mechanisms, internal tools). See `.server-changes/README.md` for full guidance.

.configs/tsconfig.base.json

@@ -26,7 +26,6 @@
     "esModuleInterop": true,
     "emitDecoratorMetadata": false,
     "experimentalDecorators": false,
-    "downlevelIteration": true,
     "isolatedModules": true,
     "noUncheckedIndexedAccess": true,
 

.cursorignore

@@ -1,7 +1,4 @@
-apps/docker-provider/
-apps/kubernetes-provider/
 apps/proxy/
-apps/coordinator/
 packages/rsc/
 .changeset
 .zed

.env.example

@@ -2,12 +2,18 @@
 SESSION_SECRET=abcdef1234
 MAGIC_LINK_SECRET=abcdef1234
 ENCRYPTION_KEY=ae13021afef0819c3a307ad487071c06 # Must be a random 16 byte hex string. You can generate an encryption key by running `openssl rand -hex 16` in your terminal
+MANAGED_WORKER_SECRET=abcdef1234 # Must match the supervisor's MANAGED_WORKER_SECRET
 LOGIN_ORIGIN=http://localhost:3030
 DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres?schema=public
 # This sets the URL used for direct connections to the database and should only be needed in limited circumstances
 # See: https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#fields:~:text=the%20shadow%20database.-,directUrl,-No
-DIRECT_URL=${DATABASE_URL}
+DIRECT_URL=postgresql://postgres:postgres@localhost:5432/postgres?schema=public
+# Dedicated run-ops database (@internal/run-ops-database). Only needed to run prisma commands
+# against it or to enable the run-ops split; start it with `docker compose --profile runops up`.
+RUN_OPS_DATABASE_URL=postgresql://postgres:postgres@localhost:5434/postgres?schema=public
 REMIX_APP_PORT=3030
+# Dev-only: stream the webapp's logs over a local telnet/TCP socket (nc localhost 6767). Uncomment to enable.
+# WEBAPP_TELNET_LOGS_PORT=6767
 APP_ENV=development
 APP_ORIGIN=http://localhost:3030
 ELECTRIC_ORIGIN=http://localhost:3060
@@ -161,4 +167,4 @@ POSTHOG_PROJECT_KEY=
 # 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
+# INTERNAL_OTEL_METRIC_EXPORTER_INTERVAL_MS=15000

.github/VOUCHED.td

@@ -23,4 +23,5 @@ bhekanik
 jrossi
 ThullyoCunha
 ConProgramming
-saasjesus
+saasjesus
+brentshulman-silkline

.github/actionlint.yaml

@@ -1,9 +1,5 @@
-# Configuration for actionlint.
-#
-# Blacksmith runners are self-hosted runners from GitHub Actions' perspective, so
-# actionlint needs to be told that these custom runner labels are valid.
 self-hosted-runner:
   labels:
-    - blacksmith-*-ubuntu-*
-    - blacksmith-*-windows-*
-    - blacksmith-*-macos-*
+    - warp-ubuntu-*
+    - warp-macos-*
+    - warp-windows-*

.github/workflows/changesets-pr.yml

@@ -18,7 +18,7 @@ concurrency:
 jobs:
   release-pr:
     name: Create Release PR
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: warp-ubuntu-latest-x64-2x
     permissions:
       contents: write
       pull-requests: write
@@ -36,7 +36,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22.23.1
+          node-version: 24.18.0
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/check-review-md.yml

@@ -20,7 +20,7 @@ jobs:
       vars.ENABLE_CLAUDE_CODE != 'false' &&
       github.event.pull_request.draft == false &&
       github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: warp-ubuntu-latest-x64-2x
     permissions:
       contents: read
       pull-requests: write