Merge remote-tracking branch 'origin/main' into fix/placement-tags

Author: nicktrn

.changeset/famous-clocks-thank.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/sdk": patch
+---
+
+feat: Support AI SDK 5.0. `ai.tool` now accepts either a schemaTask or a task with a provided jsonSchema

.changeset/healthy-oranges-refuse.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+fix: waitUntil now correctly waits for metadata.streams to finish

.changeset/loud-rules-dream.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+fix(runner): prevent retry immediately race condition which can cause stuck runs that end up being system failures

.changeset/mean-wolves-stare.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Upgrade to bun v1.2.20

apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts

@@ -850,10 +850,6 @@ export async function resolveVariablesForEnvironment(
     ...builtInVariables,
   ]);
 
-  logger.debug("Resolved variables", {
-    result,
-  });
-
   return result;
 }
 

packages/cli-v3/src/deploy/buildImage.ts

@@ -543,7 +543,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.2.20-20-slim@sha256:a20d1f90ee079b80dffc0041cf8a73aa05cdb135e3b3aff1ba3eba91608dba22",
   node: "node:21.7.3-bookworm-slim@sha256:dfc05dee209a1d7adf2ef189bd97396daad4e97c6eaa85778d6f75205ba1b0fb",
   "node-22":
     "node:22.16.0-bookworm-slim@sha256:048ed02c5fd52e86fda6fbd2f6a76cf0d4492fd6c6fee9e2c463ed5108da0e34",

packages/cli-v3/src/entryPoints/dev-run-worker.ts

@@ -141,11 +141,6 @@ const runMetadataManager = new StandardMetadataManager(
 runMetadata.setGlobalManager(runMetadataManager);
 const waitUntilManager = new StandardWaitUntilManager();
 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";
@@ -309,6 +304,12 @@ function resetExecutionEnvironment() {
   taskContext.disable();
   standardTraceContextManager.reset();
 
+  // Wait for all streams to finish before completing the run
+  waitUntil.register({
+    requiresResolving: () => runMetadataManager.hasActiveStreams(),
+    promise: () => runMetadataManager.waitForAllStreams(),
+  });
+
   log(`[${new Date().toISOString()}] Reset execution environment`);
 }
 

packages/cli-v3/src/entryPoints/managed-run-worker.ts

@@ -133,11 +133,6 @@ runMetadata.setGlobalManager(runMetadataManager);
 
 const waitUntilManager = new StandardWaitUntilManager();
 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");
 
@@ -295,6 +290,12 @@ function resetExecutionEnvironment() {
   taskContext.disable();
   standardTraceContextManager.reset();
 
+  // Wait for all streams to finish before completing the run
+  waitUntil.register({
+    requiresResolving: () => runMetadataManager.hasActiveStreams(),
+    promise: () => runMetadataManager.waitForAllStreams(),
+  });
+
   console.log(`[${new Date().toISOString()}] Reset execution environment`);
 }
 

packages/cli-v3/src/entryPoints/managed/execution.ts

@@ -77,6 +77,7 @@ export class RunExecution {
   private shutdownReason?: string;
 
   private isCompletingRun = false;
+  private ignoreSnapshotChanges = false;
 
   private supervisorSocket: SupervisorSocket;
   private notifier?: RunNotifier;
@@ -237,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;
@@ -808,7 +819,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 });
@@ -829,6 +842,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
    */

packages/core/src/v3/types/tasks.ts

@@ -547,6 +547,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