Merge remote-tracking branch 'origin/main' into kapa-ai-widget

Author: matt-aitken

.changeset/four-needles-add.md

@@ -0,0 +1,12 @@
+---
+"@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

.changeset/late-chairs-ring.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fix init.ts in custom trigger dirs

.changeset/moody-squids-count.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Init command will now correctly install v4-beta packages

.changeset/polite-lies-fix.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Update nypm package to support test-based bun.lock files

.changeset/pre.json

@@ -0,0 +1,32 @@
+{
+  "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": [
+    "breezy-turtles-talk",
+    "four-needles-add",
+    "honest-files-decide",
+    "late-chairs-ring",
+    "moody-squids-count",
+    "nice-colts-boil",
+    "polite-lies-fix",
+    "red-wasps-cover",
+    "shiny-kiwis-beam",
+    "smart-coins-hammer",
+    "weak-jobs-hide"
+  ]
+}

.changeset/shiny-kiwis-beam.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Handle flush errors gracefully in dev

.github/workflows/publish-worker-re2.yml

@@ -18,16 +18,16 @@ permissions:
   contents: read
 
 jobs:
-  check-branch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fail if re2-prod-* is pushed from a non-main branch
-        if: startsWith(github.ref_name, 're2-prod-') && github.base_ref != 'main'
-        run: |
-          echo "🚫 re2-prod-* tags can only be pushed from the main branch."
-          exit 1
+  # check-branch:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Fail if re2-prod-* is pushed from a non-main branch
+  #       if: startsWith(github.ref_name, 're2-prod-') && github.base_ref != 'main'
+  #       run: |
+  #         echo "🚫 re2-prod-* tags can only be pushed from the main branch."
+  #         exit 1
   build:
-    needs: check-branch
+    # needs: check-branch
     strategy:
       matrix:
         package: [supervisor]

.vscode/launch.json

@@ -138,7 +138,7 @@
       "type": "node-terminal",
       "request": "launch",
       "name": "Debug RunEngine tests",
-      "command": "pnpm run test ./src/engine/tests/releaseConcurrencyQueue.test.ts -t 'Should manage token bucket and queue correctly'",
+      "command": "pnpm run test ./src/engine/tests/releaseConcurrencyTokenBucketQueue.test.ts -t 'Should retrieve metrics for all queues via getQueueMetrics'",
       "cwd": "${workspaceFolder}/internal-packages/run-engine",
       "sourceMaps": true
     },

apps/supervisor/src/index.ts

@@ -224,6 +224,7 @@ class ManagedSupervisor {
 
       try {
         await this.workloadManager.create({
+          dequeuedAt: message.dequeuedAt,
           envId: message.environment.id,
           envType: message.environment.type,
           image: message.image,

apps/supervisor/src/util.ts

@@ -5,6 +5,12 @@ export function getDockerHostDomain() {
   return isMacOs || isWindows ? "host.docker.internal" : "localhost";
 }
 
-export function getRunnerId(runId: string) {
-  return `runner-${runId.replace("run_", "")}`;
+export function getRunnerId(runId: string, attemptNumber?: number) {
+  const parts = ["runner", runId.replace("run_", "")];
+
+  if (attemptNumber && attemptNumber > 1) {
+    parts.push(`attempt-${attemptNumber}`);
+  }
+
+  return parts.join("-");
 }