Merge branch 'main' into docs/refresh-dashboard-ui-references-tri-11939

Author: isshaddad

.changeset/chat-turn-correlation.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/sdk": patch
+---
+
+Fix a `chat.agent` message-loss race where sending a message right after an action (such as an undo) could drop the follow-up's response from the UI until a refresh.

.changeset/remove-dev-mcp-options.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Remove the legacy `--mcp` and `--mcp-port` options from the `dev` command. Run the dedicated `trigger mcp` command to start the Trigger.dev MCP server.

.changeset/remove-resource-monitor.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/core": patch
+---
+
+Removed the unused `ResourceMonitor` export from `@trigger.dev/core/v3/serverOnly`. It was a server-side logging helper with no remaining consumers.

.changeset/retire-v3-zod-namespace.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/core": patch
+---
+
+Removed the unused `@trigger.dev/core/v3/zodNamespace` export and the legacy v3 socket message schemas. These were only used by the now-retired v3 engine and have no v4 consumers.

.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

.github/workflows/e2e-webapp.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   e2eTests:
     name: "🧪 E2E Tests: Webapp"
-    runs-on: warp-ubuntu-latest-x64-8x
+    runs-on: warp-ubuntu-latest-x64-16x
     timeout-minutes: 20
     env:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

.github/workflows/e2e.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [warp-ubuntu-latest-x64-4x, warp-windows-latest-x64-4x]
+        os: [warp-ubuntu-latest-x64-4x, warp-windows-latest-x64-8x]
         package-manager: ["npm", "pnpm"]
     steps:
       - name: ⬇️ Checkout repo

.github/workflows/release.yml

@@ -48,7 +48,7 @@ jobs:
 
   release:
     name: 🚀 Release npm packages
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest # this cannot run on non-GH runner
     environment: npm-publish
     permissions:
       contents: write
@@ -281,7 +281,7 @@ jobs:
   # 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
+    runs-on: ubuntu-latest # this cannot run on non-GH runner
     environment: npm-publish
     permissions:
       contents: read

.github/workflows/typecheck.yml

@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   typecheck:
-    runs-on: warp-ubuntu-latest-x64-8x
+    runs-on: warp-ubuntu-latest-x64-16x
 
     steps:
       - name: ⬇️ Checkout repo

.github/workflows/unit-tests-internal.yml

@@ -14,17 +14,14 @@ on:
 jobs:
   unitTests:
     name: "🧪 Unit Tests: Internal"
-    runs-on: warp-ubuntu-latest-x64-8x
-    strategy:
-      # one flaky shard shouldn't cancel its siblings - lets us re-run only the failed shard
-      fail-fast: false
-      matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
-        shardTotal: [12]
+    # Single big machine instead of a 12-job matrix: the internal suites are serial
+    # (fileParallelism: false) and container-wait-bound, so 12 in-machine shard processes
+    # fit comfortably in 32 vCPUs while paying the setup cost (install, prisma generate,
+    # image pulls) once instead of 12 times.
+    runs-on: warp-ubuntu-latest-x64-32x
     env:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      SHARD_INDEX: ${{ matrix.shardIndex }}
-      SHARD_TOTAL: ${{ matrix.shardTotal }}
+      SHARD_TOTAL: 12
     steps:
       - name: 🔧 Disable IPv6
         run: |
@@ -108,8 +105,34 @@ jobs:
       - name: 📀 Generate Prisma Client
         run: pnpm run generate
 
-      - name: 🧪 Run Internal Unit Tests
-        run: pnpm run test:internal --reporter=default --reporter=blob --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --passWithNoTests
+      - name: 🏗️ Build test dependencies
+        # Build once up-front so the parallel shard runs below (turbo --only) never race
+        # to build or cache-restore the same outputs concurrently.
+        run: pnpm exec turbo run build --filter "@internal/*..."
+
+      - name: 🧪 Run Internal Unit Tests (${{ env.SHARD_TOTAL }} in-machine shards)
+        run: |
+          # Same shard partitioning as the old 12-job matrix (DurationShardingSequencer
+          # keys off --shard=i/N), but as parallel local processes. --only skips the
+          # ^build dependency handled by the step above.
+          status=0
+          declare -a pids
+          for i in $(seq 1 "$SHARD_TOTAL"); do
+            pnpm exec turbo run test --only --concurrency=1 --filter "@internal/*" -- \
+              --run --reporter=default --reporter=blob --shard="$i/$SHARD_TOTAL" --passWithNoTests \
+              > "/tmp/internal-shard-$i.log" 2>&1 &
+            pids[i]=$!
+          done
+          for i in $(seq 1 "$SHARD_TOTAL"); do
+            if ! wait "${pids[i]}"; then
+              status=1
+              echo "::error::internal unit test shard $i/$SHARD_TOTAL failed"
+            fi
+            echo "::group::🧪 shard $i/$SHARD_TOTAL"
+            cat "/tmp/internal-shard-$i.log"
+            echo "::endgroup::"
+          done
+          exit "$status"
 
       - name: Gather all reports
         if: ${{ !cancelled() }}
@@ -118,44 +141,6 @@ jobs:
           find . -type f -path '*/.vitest-reports/blob-*.json' \
             -exec bash -c 'src="$1"; basename=$(basename "$src"); pkg=$(dirname "$src" | sed "s|^\./||;s|/\.vitest-reports$||;s|/|_|g"); cp "$src" ".vitest-reports/${pkg}-${basename}"' _ {} \;
 
-      - name: Upload blob reports to GitHub Actions Artifacts
+      - name: 📊 Merge reports
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: internal-blob-report-${{ matrix.shardIndex }}
-          path: .vitest-reports/*
-          include-hidden-files: true
-          retention-days: 1
-
-  merge-reports:
-    name: "📊 Merge Reports"
-    if: ${{ !cancelled() }}
-    needs: [unitTests]
-    runs-on: warp-ubuntu-latest-x64-2x
-    steps:
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          fetch-depth: 1
-          persist-credentials: false
-
-      - name: ⎔ Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
-        with:
-          version: 10.33.2
-
-      - name: ⎔ Setup node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
-        with:
-          node-version: 22.23.1
-          # no cache enabled, we're not installing deps
-
-      - name: Download blob reports from GitHub Actions Artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          path: .vitest-reports
-          pattern: internal-blob-report-*
-          merge-multiple: true
-
-      - name: Merge reports
         run: pnpm dlx vitest@4.1.7 run --merge-reports --pass-with-no-tests