Merge remote-tracking branch 'origin/main' into fix/wait-with-suspend

Author: nicktrn

.changeset/honest-files-decide.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/sdk": patch
+---
+
+Deprecate toolTask and replace with `ai.tool(mySchemaTask)`

.github/workflows/publish.yml

@@ -56,14 +56,14 @@ jobs:
     secrets: inherit
 
   publish-webapp:
-    needs: [typecheck, units]
+    needs: [typecheck]
     uses: ./.github/workflows/publish-webapp.yml
     secrets: inherit
     with:
       image_tag: ${{ inputs.image_tag }}
 
   publish-worker:
-    needs: [typecheck, units]
+    needs: [typecheck]
     uses: ./.github/workflows/publish-worker.yml
     secrets: inherit
     with:

.vscode/launch.json

@@ -149,6 +149,14 @@
       "command": "pnpm run test ./src/run-queue/index.test.ts",
       "cwd": "${workspaceFolder}/internal-packages/run-engine",
       "sourceMaps": true
+    },
+    {
+      "type": "node-terminal",
+      "request": "launch",
+      "name": "Debug d3-demo",
+      "command": "pnpm exec trigger dev",
+      "cwd": "${workspaceFolder}/references/d3-demo",
+      "sourceMaps": true
     }
   ]
 }

apps/webapp/app/components/runs/v3/RunIcon.tsx

@@ -73,7 +73,7 @@ export function RunIcon({ name, className, spanName }: TaskIconProps) {
     case "trigger":
       return <TriggerIcon className={cn(className, "text-orange-500")} />;
     case "python":
-      return <PythonLogoIcon />;
+      return <PythonLogoIcon className={className} />;
     //log levels
     case "debug":
     case "log":

apps/webapp/app/env.server.ts

@@ -573,6 +573,8 @@ const EnvironmentSchema = z.object({
   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"),
+
   /** 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),

apps/webapp/app/v3/engineVersion.server.ts

@@ -1,9 +1,9 @@
 import { RunEngineVersion, type RuntimeEnvironmentType } from "@trigger.dev/database";
+import { $replica } from "~/db.server";
 import {
-  findCurrentWorkerDeploymentWithoutTasks,
   findCurrentWorkerFromEnvironment,
+  getCurrentWorkerDeploymentEngineVersion,
 } from "./models/workerDeployment.server";
-import { $replica } from "~/db.server";
 
 type Environment = {
   id: string;
@@ -65,10 +65,12 @@ export async function determineEngineVersion({
   }
 
   // Deployed: use the latest deployed BackgroundWorker
-  const currentDeployment = await findCurrentWorkerDeploymentWithoutTasks(environment.id);
-  if (currentDeployment?.type === "V1") {
-    return "V1";
+  const currentDeploymentEngineVersion = await getCurrentWorkerDeploymentEngineVersion(
+    environment.id
+  );
+  if (currentDeploymentEngineVersion) {
+    return currentDeploymentEngineVersion;
   }
 
-  return "V2";
+  return environment.project.engine;
 }

apps/webapp/app/v3/models/workerDeployment.server.ts

@@ -1,5 +1,5 @@
 import type { Prettify } from "@trigger.dev/core";
-import { BackgroundWorker, WorkerDeployment } from "@trigger.dev/database";
+import { BackgroundWorker, RunEngineVersion, WorkerDeployment } from "@trigger.dev/database";
 import {
   CURRENT_DEPLOYMENT_LABEL,
   CURRENT_UNMANAGED_DEPLOYMENT_LABEL,
@@ -91,23 +91,29 @@ export async function findCurrentWorkerDeployment(
   return promotion?.deployment;
 }
 
-export async function findCurrentWorkerDeploymentWithoutTasks(
+export async function getCurrentWorkerDeploymentEngineVersion(
   environmentId: string,
   label = CURRENT_DEPLOYMENT_LABEL
-): Promise<WorkerDeployment | undefined> {
-  const promotion = await prisma.workerDeploymentPromotion.findUnique({
+): Promise<RunEngineVersion | undefined> {
+  const promotion = await prisma.workerDeploymentPromotion.findFirst({
     where: {
-      environmentId_label: {
-        environmentId,
-        label,
-      },
+      environmentId,
+      label,
     },
-    include: {
-      deployment: true,
+    select: {
+      deployment: {
+        select: {
+          type: true,
+        },
+      },
     },
   });
 
-  return promotion?.deployment;
+  if (typeof promotion?.deployment.type === "string") {
+    return promotion.deployment.type === "V1" ? "V1" : "V2";
+  }
+
+  return undefined;
 }
 
 export async function findCurrentUnmanagedWorkerDeployment(

apps/webapp/app/v3/otlpExporter.server.ts

@@ -57,7 +57,7 @@ class OTLPExporter {
 
       const enrichedEvents = enrichCreatableEvents(events);
 
-      this.#logEventsVerbose(enrichedEvents);
+      this.#logEventsVerbose(enrichedEvents, "exportTraces");
 
       span.setAttribute("event_count", enrichedEvents.length);
 
@@ -84,7 +84,7 @@ class OTLPExporter {
 
       const enrichedEvents = enrichCreatableEvents(events);
 
-      this.#logEventsVerbose(enrichedEvents);
+      this.#logEventsVerbose(enrichedEvents, "exportLogs");
 
       span.setAttribute("event_count", enrichedEvents.length);
 
@@ -98,11 +98,11 @@ class OTLPExporter {
     });
   }
 
-  #logEventsVerbose(events: CreatableEvent[]) {
+  #logEventsVerbose(events: CreatableEvent[], prefix: string) {
     if (!this._verbose) return;
 
     events.forEach((event) => {
-      logger.debug("Exporting event", { event });
+      logger.debug(`Exporting ${prefix} event`, { event });
     });
   }
 

apps/webapp/app/v3/runEngine.server.ts

@@ -14,6 +14,7 @@ function createRunEngine() {
   const engine = new RunEngine({
     prisma,
     worker: {
+      disabled: env.RUN_ENGINE_WORKER_ENABLED === "0",
       workers: env.RUN_ENGINE_WORKER_COUNT,
       tasksPerWorker: env.RUN_ENGINE_TASKS_PER_WORKER,
       pollIntervalMs: env.RUN_ENGINE_WORKER_POLL_INTERVAL,

apps/webapp/app/v3/utils/enrichCreatableEvents.server.ts

@@ -23,7 +23,7 @@ function enrichStyle(event: CreatableEvent) {
   // GenAI System check
   const system = props["gen_ai.system"];
   if (typeof system === "string") {
-    return { ...baseStyle, icon: `tabler-brand-${system}` };
+    return { ...baseStyle, icon: `tabler-brand-${system.split(".")[0]}` };
   }
 
   // Agent workflow check
@@ -32,6 +32,16 @@ function enrichStyle(event: CreatableEvent) {
     return { ...baseStyle, icon: "tabler-brain" };
   }
 
+  const message = event.message;
+
+  if (typeof message === "string" && message === "ai.toolCall") {
+    return { ...baseStyle, icon: "tabler-tool" };
+  }
+
+  if (typeof message === "string" && message.startsWith("ai.")) {
+    return { ...baseStyle, icon: "tabler-sparkles" };
+  }
+
   return baseStyle;
 }