we now convert schema to jsonSchema on the CLI side via the indexing

ericallam · ericallam · commit 6472427bc71e · 2025-08-06T10:52:50.000+01:00
diff --git a/apps/webapp/app/v3/services/createBackgroundWorker.server.ts b/apps/webapp/app/v3/services/createBackgroundWorker.server.ts
@@ -77,7 +77,7 @@ export class CreateBackgroundWorkerService extends BaseService {
           version: nextVersion,
           runtimeEnvironmentId: environment.id,
           projectId: project.id,
-          metadata: body.metadata,
+          metadata: body.metadata as any,
           contentHash: body.metadata.contentHash,
           cliVersion: body.metadata.cliPackageVersion,
           sdkVersion: body.metadata.packageVersion,
@@ -280,7 +280,7 @@ async function createWorkerTask(
         fileId: tasksToBackgroundFiles?.get(task.id) ?? null,
         maxDurationInSeconds: task.maxDuration ? clampMaxDuration(task.maxDuration) : null,
         queueId: queue.id,
-        payloadSchema: task.payloadSchema,
+        payloadSchema: task.payloadSchema as any,
       },
     });
   } catch (error) {
diff --git a/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV3.server.ts b/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV3.server.ts
@@ -48,7 +48,7 @@ export class CreateDeploymentBackgroundWorkerServiceV3 extends BaseService {
           version: deployment.version,
           runtimeEnvironmentId: environment.id,
           projectId: environment.projectId,
-          metadata: body.metadata,
+          metadata: body.metadata as any,
           contentHash: body.metadata.contentHash,
           cliVersion: body.metadata.cliPackageVersion,
           sdkVersion: body.metadata.packageVersion,
diff --git a/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV4.server.ts b/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV4.server.ts
@@ -65,7 +65,7 @@ export class CreateDeploymentBackgroundWorkerServiceV4 extends BaseService {
           version: deployment.version,
           runtimeEnvironmentId: environment.id,
           projectId: environment.projectId,
-          metadata: body.metadata,
+          metadata: body.metadata as any,
           contentHash: body.metadata.contentHash,
           cliVersion: body.metadata.cliPackageVersion,
           sdkVersion: body.metadata.packageVersion,
diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json
@@ -91,6 +91,7 @@
     "@opentelemetry/semantic-conventions": "1.36.0",
     "@trigger.dev/build": "workspace:4.0.0-v4-beta.26",
     "@trigger.dev/core": "workspace:4.0.0-v4-beta.26",
+    "@trigger.dev/schema-to-json": "workspace:4.0.0-v4-beta.25",
     "ansi-escapes": "^7.0.0",
     "braces": "^3.0.3",
     "c12": "^1.11.1",
diff --git a/packages/cli-v3/src/entryPoints/dev-index-worker.ts b/packages/cli-v3/src/entryPoints/dev-index-worker.ts
@@ -18,6 +18,7 @@ import { registerResources } from "../indexing/registerResources.js";
 import { env } from "std-env";
 import { normalizeImportPath } from "../utilities/normalizeImportPath.js";
 import { detectRuntimeVersion } from "@trigger.dev/core/v3/build";
+import { schemaToJsonSchema, initializeSchemaConverters } from "@trigger.dev/schema-to-json";
 
 sourceMapSupport.install({
   handleUncaughtExceptions: false,
@@ -100,7 +101,7 @@ async function bootstrap() {
 
 const { buildManifest, importErrors, config, timings } = await bootstrap();
 
-let tasks = resourceCatalog.listTaskManifests();
+let tasks = await convertSchemasToJsonSchemas(resourceCatalog.listTaskManifests());
 
 // If the config has retry defaults, we need to apply them to all tasks that don't have any retry settings
 if (config.retries?.default) {
@@ -190,3 +191,20 @@ await new Promise<void>((resolve) => {
     resolve();
   }, 10);
 });
+
+async function convertSchemasToJsonSchemas(tasks: TaskManifest[]): Promise<TaskManifest[]> {
+  await initializeSchemaConverters();
+
+  const convertedTasks = tasks.map((task) => {
+    const schema = resourceCatalog.getTaskSchema(task.id);
+
+    if (schema) {
+      const result = schemaToJsonSchema(schema);
+      return { ...task, payloadSchema: result?.jsonSchema };
+    }
+
+    return task;
+  });
+
+  return convertedTasks;
+}
diff --git a/packages/cli-v3/src/entryPoints/managed-index-worker.ts b/packages/cli-v3/src/entryPoints/managed-index-worker.ts
@@ -18,6 +18,7 @@ import { registerResources } from "../indexing/registerResources.js";
 import { env } from "std-env";
 import { normalizeImportPath } from "../utilities/normalizeImportPath.js";
 import { detectRuntimeVersion } from "@trigger.dev/core/v3/build";
+import { schemaToJsonSchema, initializeSchemaConverters } from "@trigger.dev/schema-to-json";
 
 sourceMapSupport.install({
   handleUncaughtExceptions: false,
@@ -100,7 +101,7 @@ async function bootstrap() {
 
 const { buildManifest, importErrors, config, timings } = await bootstrap();
 
-let tasks = resourceCatalog.listTaskManifests();
+let tasks = await convertSchemasToJsonSchemas(resourceCatalog.listTaskManifests());
 
 // If the config has retry defaults, we need to apply them to all tasks that don't have any retry settings
 if (config.retries?.default) {
@@ -196,3 +197,20 @@ await new Promise<void>((resolve) => {
     resolve();
   }, 10);
 });
+
+async function convertSchemasToJsonSchemas(tasks: TaskManifest[]): Promise<TaskManifest[]> {
+  await initializeSchemaConverters();
+
+  const convertedTasks = tasks.map((task) => {
+    const schema = resourceCatalog.getTaskSchema(task.id);
+
+    if (schema) {
+      const result = schemaToJsonSchema(schema);
+      return { ...task, payloadSchema: result?.jsonSchema };
+    }
+
+    return task;
+  });
+
+  return convertedTasks;
+}
diff --git a/packages/core/src/v3/resource-catalog/catalog.ts b/packages/core/src/v3/resource-catalog/catalog.ts
@@ -1,5 +1,5 @@
 import { QueueManifest, TaskManifest, WorkerManifest } from "../schemas/index.js";
-import { TaskMetadataWithFunctions } from "../types/index.js";
+import { TaskMetadataWithFunctions, TaskSchema } from "../types/index.js";
 
 export interface ResourceCatalog {
   setCurrentFileContext(filePath: string, entryPoint: string): void;
@@ -13,4 +13,5 @@ export interface ResourceCatalog {
   registerWorkerManifest(workerManifest: WorkerManifest): void;
   registerQueueMetadata(queue: QueueManifest): void;
   listQueueManifests(): Array<QueueManifest>;
+  getTaskSchema(id: string): TaskSchema | undefined;
 }
diff --git a/packages/core/src/v3/resource-catalog/index.ts b/packages/core/src/v3/resource-catalog/index.ts
@@ -1,7 +1,7 @@
 const API_NAME = "resource-catalog";
 
 import { QueueManifest, TaskManifest, WorkerManifest } from "../schemas/index.js";
-import { TaskMetadataWithFunctions } from "../types/index.js";
+import { TaskMetadataWithFunctions, TaskSchema } from "../types/index.js";
 import { getGlobal, registerGlobal, unregisterGlobal } from "../utils/globals.js";
 import { type ResourceCatalog } from "./catalog.js";
 import { NoopResourceCatalog } from "./noopResourceCatalog.js";
@@ -65,6 +65,10 @@ export class ResourceCatalogAPI {
     return this.#getCatalog().getTask(id);
   }
 
+  public getTaskSchema(id: string): TaskSchema | undefined {
+    return this.#getCatalog().getTaskSchema(id);
+  }
+
   public taskExists(id: string): boolean {
     return this.#getCatalog().taskExists(id);
   }
diff --git a/packages/core/src/v3/resource-catalog/noopResourceCatalog.ts b/packages/core/src/v3/resource-catalog/noopResourceCatalog.ts
@@ -1,5 +1,5 @@
 import { QueueManifest, TaskManifest, WorkerManifest } from "../schemas/index.js";
-import { TaskMetadataWithFunctions } from "../types/index.js";
+import { TaskMetadataWithFunctions, TaskSchema } from "../types/index.js";
 import { ResourceCatalog } from "./catalog.js";
 
 export class NoopResourceCatalog implements ResourceCatalog {
@@ -31,6 +31,10 @@ export class NoopResourceCatalog implements ResourceCatalog {
     return undefined;
   }
 
+  getTaskSchema(id: string): TaskSchema | undefined {
+    return undefined;
+  }
+
   taskExists(id: string): boolean {
     return false;
   }
diff --git a/packages/core/src/v3/resource-catalog/standardResourceCatalog.ts b/packages/core/src/v3/resource-catalog/standardResourceCatalog.ts
@@ -5,10 +5,11 @@ import {
   WorkerManifest,
   QueueManifest,
 } from "../schemas/index.js";
-import { TaskMetadataWithFunctions } from "../types/index.js";
+import { TaskMetadataWithFunctions, TaskSchema } from "../types/index.js";
 import { ResourceCatalog } from "./catalog.js";
 
 export class StandardResourceCatalog implements ResourceCatalog {
+  private _taskSchemas: Map<string, TaskSchema> = new Map();
   private _taskMetadata: Map<string, TaskMetadata> = new Map();
   private _taskFunctions: Map<string, TaskMetadataWithFunctions["fns"]> = new Map();
   private _taskFileMetadata: Map<string, TaskFileMetadata> = new Map();
@@ -72,6 +73,10 @@ export class StandardResourceCatalog implements ResourceCatalog {
 
     this._taskMetadata.set(task.id, metadata);
     this._taskFunctions.set(task.id, fns);
+
+    if (task.schema) {
+      this._taskSchemas.set(task.id, task.schema);
+    }
   }
 
   updateTaskMetadata(id: string, updates: Partial<TaskMetadataWithFunctions>): void {
@@ -107,15 +112,21 @@ export class StandardResourceCatalog implements ResourceCatalog {
         continue;
       }
 
-      result.push({
+      const taskManifest = {
         ...metadata,
         ...fileMetadata,
-      });
+      };
+
+      result.push(taskManifest);
     }
 
     return result;
   }
 
+  getTaskSchema(id: string): TaskSchema | undefined {
+    return this._taskSchemas.get(id);
+  }
+
   listQueueManifests(): Array<QueueManifest> {
     return Array.from(this._queueMetadata.values());
   }
diff --git a/packages/core/src/v3/schemas/schemas.ts b/packages/core/src/v3/schemas/schemas.ts
@@ -189,7 +189,6 @@ const taskMetadata = {
   triggerSource: z.string().optional(),
   schedule: ScheduleMetadata.optional(),
   maxDuration: z.number().optional(),
-  // JSONSchema type - using z.unknown() for runtime validation to accept JSONSchema7
   payloadSchema: z.unknown().optional(),
 };
 
diff --git a/packages/core/src/v3/types/tasks.ts b/packages/core/src/v3/types/tasks.ts
@@ -897,6 +897,7 @@ export type TaskMetadataWithFunctions = TaskMetadata & {
     onStart?: (payload: any, params: StartFnParams) => Promise<void>;
     parsePayload?: AnySchemaParseFn;
   };
+  schema?: TaskSchema;
 };
 
 export type RunTypes<TTaskIdentifier extends string, TPayload, TOutput> = {
diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json
@@ -52,7 +52,6 @@
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/semantic-conventions": "1.36.0",
     "@trigger.dev/core": "workspace:4.0.0-v4-beta.26",
-    "@trigger.dev/schema-to-json": "workspace:4.0.0-v4-beta.25",
     "chalk": "^5.2.0",
     "cronstrue": "^2.21.0",
     "debug": "^4.3.4",
diff --git a/packages/trigger-sdk/src/v3/shared.ts b/packages/trigger-sdk/src/v3/shared.ts
@@ -28,17 +28,9 @@ import {
   TaskRunExecutionResult,
   TaskRunPromise,
 } from "@trigger.dev/core/v3";
-import { schemaToJsonSchema, initializeSchemaConverters } from "@trigger.dev/schema-to-json";
 import { PollOptions, runs } from "./runs.js";
 import { tracer } from "./tracer.js";
 
-// Initialize schema converters once when the module loads
-// This happens automatically, users don't need to know about it
-initializeSchemaConverters().catch(() => {
-  // Silently fail if converters can't be initialized
-  // Built-in conversions will still work
-});
-
 import type {
   AnyOnCatchErrorHookFunction,
   AnyOnCleanupHookFunction,
@@ -365,11 +357,11 @@ export function createSchemaTask<
     retry: params.retry ? { ...defaultRetryOptions, ...params.retry } : undefined,
     machine: typeof params.machine === "string" ? { preset: params.machine } : params.machine,
     maxDuration: params.maxDuration,
-    payloadSchema: params.schema ? schemaToJsonSchema(params.schema)?.jsonSchema : undefined,
     fns: {
       run: params.run,
       parsePayload,
     },
+    schema: params.schema,
   });
 
   const queue = params.queue;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/references/hello-world/src/trigger/example.ts b/references/hello-world/src/trigger/example.ts
@@ -19,7 +19,7 @@ export const helloWorldTask = task({
       env: process.env,
     });
 
-    logger.debug("debug: Hello, world!", { payload });
+    logger.debug("debug: Hello, worlds!", { payload });
     logger.info("info: Hello, world!", { payload });
     logger.log("log: Hello, world!", { payload });
     logger.warn("warn: Hello, world!", { payload });
