@trigger.dev/sdk 2.0.0-next.8 → 2.0.0

package/dist/index.js

@@ -146,7 +146,7 @@ validate_fn = /* @__PURE__ */ __name(function() {
   }
 }, "#validate");
 
-// ../internal/src/logger.ts
+// ../core/src/logger.ts
 var logLevels = [
   "log",
   "error",
@@ -154,9 +154,10 @@ var logLevels = [
   "info",
   "debug"
 ];
-var _name, _level, _filteredKeys, _jsonReplacer;
+var _name, _level, _filteredKeys, _jsonReplacer, _structuredLog, structuredLog_fn;
 var _Logger = class {
   constructor(name, level = "info", filteredKeys = [], jsonReplacer) {
+    __privateAdd(this, _structuredLog);
     __privateAdd(this, _name, void 0);
     __privateAdd(this, _level, void 0);
     __privateAdd(this, _filteredKeys, []);
@@ -172,36 +173,30 @@ var _Logger = class {
   static satisfiesLogLevel(logLevel, setLevel) {
     return logLevels.indexOf(logLevel) <= logLevels.indexOf(setLevel);
   }
-  log(...args) {
+  log(message, ...args) {
     if (__privateGet(this, _level) < 0)
       return;
-    console.log(`[${formattedDateTime()}] [${__privateGet(this, _name)}] `, ...args);
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.log, message, ...args);
   }
-  error(...args) {
+  error(message, ...args) {
     if (__privateGet(this, _level) < 1)
       return;
-    console.error(`[${formattedDateTime()}] [${__privateGet(this, _name)}] `, ...args);
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.error, message, ...args);
   }
-  warn(...args) {
+  warn(message, ...args) {
     if (__privateGet(this, _level) < 2)
       return;
-    console.warn(`[${formattedDateTime()}] [${__privateGet(this, _name)}] `, ...args);
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.warn, message, ...args);
   }
-  info(...args) {
+  info(message, ...args) {
     if (__privateGet(this, _level) < 3)
       return;
-    console.info(`[${formattedDateTime()}] [${__privateGet(this, _name)}] `, ...args);
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.info, message, ...args);
   }
   debug(message, ...args) {
     if (__privateGet(this, _level) < 4)
       return;
-    const structuredLog = {
-      timestamp: new Date(),
-      name: __privateGet(this, _name),
-      message,
-      args: structureArgs(safeJsonClone(args), __privateGet(this, _filteredKeys))
-    };
-    console.debug(JSON.stringify(structuredLog, createReplacer(__privateGet(this, _jsonReplacer))));
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.debug, message, ...args);
   }
 };
 var Logger = _Logger;
@@ -210,6 +205,16 @@ _name = new WeakMap();
 _level = new WeakMap();
 _filteredKeys = new WeakMap();
 _jsonReplacer = new WeakMap();
+_structuredLog = new WeakSet();
+structuredLog_fn = /* @__PURE__ */ __name(function(loggerFunction, message, ...args) {
+  const structuredLog = {
+    ...structureArgs(safeJsonClone(args), __privateGet(this, _filteredKeys)),
+    timestamp: new Date(),
+    name: __privateGet(this, _name),
+    message
+  };
+  loggerFunction(JSON.stringify(structuredLog, createReplacer(__privateGet(this, _jsonReplacer))));
+}, "#structuredLog");
 function createReplacer(replacer) {
   return (key, value) => {
     if (typeof value === "bigint") {
@@ -237,19 +242,6 @@ function safeJsonClone(obj) {
   }
 }
 __name(safeJsonClone, "safeJsonClone");
-function formattedDateTime() {
-  const date = new Date();
-  const hours = date.getHours();
-  const minutes = date.getMinutes();
-  const seconds = date.getSeconds();
-  const milliseconds = date.getMilliseconds();
-  const formattedHours = hours < 10 ? `0${hours}` : hours;
-  const formattedMinutes = minutes < 10 ? `0${minutes}` : minutes;
-  const formattedSeconds = seconds < 10 ? `0${seconds}` : seconds;
-  const formattedMilliseconds = milliseconds < 10 ? `00${milliseconds}` : milliseconds < 100 ? `0${milliseconds}` : milliseconds;
-  return `${formattedHours}:${formattedMinutes}:${formattedSeconds}.${formattedMilliseconds}`;
-}
-__name(formattedDateTime, "formattedDateTime");
 function structureArgs(args, filteredKeys = []) {
   if (args.length === 0) {
     return;
@@ -278,11 +270,11 @@ function filterKeys(obj, keys) {
 }
 __name(filterKeys, "filterKeys");
 
-// ../internal/src/schemas/api.ts
+// ../core/src/schemas/api.ts
 var import_ulid = require("ulid");
 var import_zod9 = require("zod");
 
-// ../internal/src/schemas/errors.ts
+// ../core/src/schemas/errors.ts
 var import_zod = require("zod");
 var ErrorWithStackSchema = import_zod.z.object({
   message: import_zod.z.string(),
@@ -290,7 +282,7 @@ var ErrorWithStackSchema = import_zod.z.object({
   stack: import_zod.z.string().optional()
 });
 
-// ../internal/src/schemas/eventFilter.ts
+// ../core/src/schemas/eventFilter.ts
 var import_zod2 = require("zod");
 var EventMatcherSchema = import_zod2.z.union([
   import_zod2.z.array(import_zod2.z.string()),
@@ -302,13 +294,13 @@ var EventFilterSchema = import_zod2.z.lazy(() => import_zod2.z.record(import_zod
   EventFilterSchema
 ])));
 var EventRuleSchema = import_zod2.z.object({
-  event: import_zod2.z.string(),
+  event: import_zod2.z.string().or(import_zod2.z.array(import_zod2.z.string())),
   source: import_zod2.z.string(),
   payload: EventFilterSchema.optional(),
   context: EventFilterSchema.optional()
 });
 
-// ../internal/src/schemas/integrations.ts
+// ../core/src/schemas/integrations.ts
 var import_zod3 = require("zod");
 var ConnectionAuthSchema = import_zod3.z.object({
   type: import_zod3.z.enum([
@@ -332,7 +324,7 @@ var IntegrationConfigSchema = import_zod3.z.object({
   ])
 });
 
-// ../internal/src/schemas/json.ts
+// ../core/src/schemas/json.ts
 var import_zod4 = require("zod");
 var LiteralSchema = import_zod4.z.union([
   import_zod4.z.string(),
@@ -360,7 +352,7 @@ var SerializableJsonSchema = import_zod4.z.lazy(() => import_zod4.z.union([
   import_zod4.z.record(SerializableJsonSchema)
 ]));
 
-// ../internal/src/schemas/properties.ts
+// ../core/src/schemas/properties.ts
 var import_zod5 = require("zod");
 var DisplayPropertySchema = import_zod5.z.object({
   label: import_zod5.z.string(),
@@ -376,7 +368,7 @@ var StyleSchema = import_zod5.z.object({
   variant: import_zod5.z.string().optional()
 });
 
-// ../internal/src/schemas/schedules.ts
+// ../core/src/schemas/schedules.ts
 var import_zod6 = require("zod");
 var ScheduledPayloadSchema = import_zod6.z.object({
   ts: import_zod6.z.coerce.date(),
@@ -410,14 +402,15 @@ var RegisterDynamicSchedulePayloadSchema = import_zod6.z.object({
   }))
 });
 
-// ../internal/src/schemas/tasks.ts
+// ../core/src/schemas/tasks.ts
 var import_zod7 = require("zod");
 var TaskStatusSchema = import_zod7.z.enum([
   "PENDING",
   "WAITING",
   "RUNNING",
   "COMPLETED",
-  "ERRORED"
+  "ERRORED",
+  "CANCELED"
 ]);
 var TaskSchema = import_zod7.z.object({
   id: import_zod7.z.string(),
@@ -430,6 +423,7 @@ var TaskSchema = import_zod7.z.object({
   status: TaskStatusSchema,
   description: import_zod7.z.string().optional().nullable(),
   properties: import_zod7.z.array(DisplayPropertySchema).optional().nullable(),
+  outputProperties: import_zod7.z.array(DisplayPropertySchema).optional().nullable(),
   params: DeserializedJsonSchema.optional().nullable(),
   output: DeserializedJsonSchema.optional().nullable(),
   error: import_zod7.z.string().optional().nullable(),
@@ -450,7 +444,7 @@ var CachedTaskSchema = import_zod7.z.object({
   parentId: import_zod7.z.string().optional().nullable()
 });
 
-// ../internal/src/schemas/triggers.ts
+// ../core/src/schemas/triggers.ts
 var import_zod8 = require("zod");
 var EventExampleSchema = import_zod8.z.object({
   id: import_zod8.z.string(),
@@ -459,7 +453,7 @@ var EventExampleSchema = import_zod8.z.object({
   payload: import_zod8.z.any()
 });
 var EventSpecificationSchema = import_zod8.z.object({
-  name: import_zod8.z.string(),
+  name: import_zod8.z.string().or(import_zod8.z.array(import_zod8.z.string())),
   title: import_zod8.z.string(),
   source: import_zod8.z.string(),
   icon: import_zod8.z.string(),
@@ -474,7 +468,10 @@ var DynamicTriggerMetadataSchema = import_zod8.z.object({
 });
 var StaticTriggerMetadataSchema = import_zod8.z.object({
   type: import_zod8.z.literal("static"),
-  title: import_zod8.z.string(),
+  title: import_zod8.z.union([
+    import_zod8.z.string(),
+    import_zod8.z.array(import_zod8.z.string())
+  ]),
   properties: import_zod8.z.array(DisplayPropertySchema).optional(),
   rule: EventRuleSchema
 });
@@ -488,7 +485,7 @@ var TriggerMetadataSchema = import_zod8.z.discriminatedUnion("type", [
   ScheduledTriggerMetadataSchema
 ]);
 
-// ../internal/src/schemas/api.ts
+// ../core/src/schemas/api.ts
 var UpdateTriggerSourceBodySchema = import_zod9.z.object({
   registeredEvents: import_zod9.z.array(import_zod9.z.string()),
   secret: import_zod9.z.string().optional(),
@@ -601,14 +598,22 @@ var SourceMetadataSchema = import_zod9.z.object({
   integration: IntegrationConfigSchema,
   key: import_zod9.z.string(),
   params: import_zod9.z.any(),
-  events: import_zod9.z.array(import_zod9.z.string())
+  events: import_zod9.z.array(import_zod9.z.string()),
+  registerSourceJob: import_zod9.z.object({
+    id: import_zod9.z.string(),
+    version: import_zod9.z.string()
+  }).optional()
 });
 var DynamicTriggerEndpointMetadataSchema = import_zod9.z.object({
   id: import_zod9.z.string(),
   jobs: import_zod9.z.array(JobMetadataSchema.pick({
     id: true,
     version: true
-  }))
+  })),
+  registerSourceJob: import_zod9.z.object({
+    id: import_zod9.z.string(),
+    version: import_zod9.z.string()
+  }).optional()
 });
 var IndexEndpointResponseSchema = import_zod9.z.object({
   jobs: import_zod9.z.array(JobMetadataSchema),
@@ -664,6 +669,7 @@ var RunJobBodySchema = import_zod9.z.object({
   run: import_zod9.z.object({
     id: import_zod9.z.string(),
     isTest: import_zod9.z.boolean(),
+    isRetry: import_zod9.z.boolean().default(false),
     startedAt: import_zod9.z.coerce.date()
   }),
   environment: import_zod9.z.object({
@@ -699,6 +705,10 @@ var RunJobRetryWithTaskSchema = import_zod9.z.object({
   error: ErrorWithStackSchema,
   retryAt: import_zod9.z.coerce.date()
 });
+var RunJobCanceledWithTaskSchema = import_zod9.z.object({
+  status: import_zod9.z.literal("CANCELED"),
+  task: TaskSchema
+});
 var RunJobSuccessSchema = import_zod9.z.object({
   status: import_zod9.z.literal("SUCCESS"),
   output: DeserializedJsonSchema.optional()
@@ -707,6 +717,7 @@ var RunJobResponseSchema = import_zod9.z.discriminatedUnion("status", [
   RunJobErrorSchema,
   RunJobResumeWithTaskSchema,
   RunJobRetryWithTaskSchema,
+  RunJobCanceledWithTaskSchema,
   RunJobSuccessSchema
 ]);
 var PreprocessRunBodySchema = import_zod9.z.object({
@@ -870,7 +881,7 @@ var CreateExternalConnectionBodySchema = import_zod9.z.object({
   metadata: import_zod9.z.any()
 });
 
-// ../internal/src/schemas/notifications.ts
+// ../core/src/schemas/notifications.ts
 var import_zod10 = require("zod");
 var MISSING_CONNECTION_NOTIFICATION = "dev.trigger.notifications.missingConnection";
 var MISSING_CONNECTION_RESOLVED_NOTIFICATION = "dev.trigger.notifications.missingConnectionResolved";
@@ -927,58 +938,88 @@ var MissingConnectionResolvedNotificationPayloadSchema = import_zod10.z.discrimi
   MissingExternalConnectionResolvedNotificationPayloadSchema
 ]);
 
-// ../internal/src/schemas/fetch.ts
+// ../core/src/schemas/events.ts
+var import_zod12 = require("zod");
+
+// ../core/src/schemas/runs.ts
 var import_zod11 = require("zod");
-var FetchRetryHeadersStrategySchema = import_zod11.z.object({
-  strategy: import_zod11.z.literal("headers"),
-  limitHeader: import_zod11.z.string(),
-  remainingHeader: import_zod11.z.string(),
-  resetHeader: import_zod11.z.string()
-});
-var FetchRetryBackoffStrategySchema = RetryOptionsSchema.extend({
-  strategy: import_zod11.z.literal("backoff")
-});
-var FetchRetryStrategySchema = import_zod11.z.discriminatedUnion("strategy", [
-  FetchRetryHeadersStrategySchema,
-  FetchRetryBackoffStrategySchema
+var RunStatusSchema = import_zod11.z.union([
+  import_zod11.z.literal("PENDING"),
+  import_zod11.z.literal("QUEUED"),
+  import_zod11.z.literal("WAITING_ON_CONNECTIONS"),
+  import_zod11.z.literal("PREPROCESSING"),
+  import_zod11.z.literal("STARTED"),
+  import_zod11.z.literal("SUCCESS"),
+  import_zod11.z.literal("FAILURE"),
+  import_zod11.z.literal("TIMED_OUT"),
+  import_zod11.z.literal("ABORTED"),
+  import_zod11.z.literal("CANCELED")
 ]);
-var FetchRequestInitSchema = import_zod11.z.object({
-  method: import_zod11.z.string().optional(),
-  headers: import_zod11.z.record(import_zod11.z.union([
-    import_zod11.z.string(),
-    RedactStringSchema
-  ])).optional(),
-  body: import_zod11.z.union([
-    import_zod11.z.string(),
-    import_zod11.z.instanceof(ArrayBuffer)
-  ]).optional()
-});
-var FetchRetryOptionsSchema = import_zod11.z.record(FetchRetryStrategySchema);
-var FetchOperationSchema = import_zod11.z.object({
-  url: import_zod11.z.string(),
-  requestInit: FetchRequestInitSchema.optional(),
-  retry: import_zod11.z.record(FetchRetryStrategySchema).optional()
+var RunTaskSchema = import_zod11.z.object({
+  id: import_zod11.z.string(),
+  displayKey: import_zod11.z.string().nullable(),
+  status: TaskStatusSchema,
+  name: import_zod11.z.string(),
+  icon: import_zod11.z.string().nullable(),
+  startedAt: import_zod11.z.coerce.date().nullable(),
+  completedAt: import_zod11.z.coerce.date().nullable()
+});
+var GetRunOptionsSchema = import_zod11.z.object({
+  subtasks: import_zod11.z.boolean().optional(),
+  cursor: import_zod11.z.string().optional(),
+  take: import_zod11.z.number().optional()
+});
+var GetRunOptionsWithTaskDetailsSchema = GetRunOptionsSchema.extend({
+  taskdetails: import_zod11.z.boolean().optional()
+});
+var RunSchema = import_zod11.z.object({
+  id: import_zod11.z.string(),
+  status: RunStatusSchema,
+  startedAt: import_zod11.z.coerce.date().nullable(),
+  updatedAt: import_zod11.z.coerce.date().nullable(),
+  completedAt: import_zod11.z.coerce.date().nullable()
+});
+var GetRunSchema = RunSchema.extend({
+  output: import_zod11.z.any().optional(),
+  tasks: import_zod11.z.array(RunTaskSchema),
+  nextCursor: import_zod11.z.string().optional()
+});
+var GetRunsOptionsSchema = import_zod11.z.object({
+  cursor: import_zod11.z.string().optional(),
+  take: import_zod11.z.number().optional()
+});
+var GetRunsSchema = import_zod11.z.object({
+  runs: RunSchema.array(),
+  nextCursor: import_zod11.z.string().optional()
 });
 
-// ../internal/src/utils.ts
-function deepMergeFilters(filter, other) {
-  const result = {
-    ...filter
-  };
-  for (const key in other) {
-    if (other.hasOwnProperty(key)) {
-      const otherValue = other[key];
-      if (typeof otherValue === "object" && !Array.isArray(otherValue) && otherValue !== null) {
+// ../core/src/schemas/events.ts
+var GetEventSchema = import_zod12.z.object({
+  id: import_zod12.z.string(),
+  name: import_zod12.z.string(),
+  createdAt: import_zod12.z.coerce.date(),
+  updatedAt: import_zod12.z.coerce.date(),
+  runs: import_zod12.z.array(import_zod12.z.object({
+    id: import_zod12.z.string(),
+    status: RunStatusSchema,
+    startedAt: import_zod12.z.coerce.date().optional().nullable(),
+    completedAt: import_zod12.z.coerce.date().optional().nullable()
+  }))
+});
+
+// ../core/src/utils.ts
+function deepMergeFilters(...filters) {
+  const result = {};
+  for (const filter of filters) {
+    for (const key in filter) {
+      if (filter.hasOwnProperty(key)) {
         const filterValue = filter[key];
-        if (filterValue && typeof filterValue === "object" && !Array.isArray(filterValue)) {
-          result[key] = deepMergeFilters(filterValue, otherValue);
+        const existingValue = result[key];
+        if (existingValue && typeof existingValue === "object" && typeof filterValue === "object" && !Array.isArray(existingValue) && !Array.isArray(filterValue) && existingValue !== null && filterValue !== null) {
+          result[key] = deepMergeFilters(existingValue, filterValue);
         } else {
-          result[key] = {
-            ...other[key]
-          };
+          result[key] = filterValue;
         }
-      } else {
-        result[key] = other[key];
       }
     }
   }
@@ -986,7 +1027,7 @@ function deepMergeFilters(filter, other) {
 }
 __name(deepMergeFilters, "deepMergeFilters");
 
-// ../internal/src/retry.ts
+// ../core/src/retry.ts
 var DEFAULT_RETRY_OPTIONS = {
   limit: 5,
   factor: 1.8,
@@ -1010,7 +1051,7 @@ function calculateRetryAt(retryOptions, attempts) {
 }
 __name(calculateRetryAt, "calculateRetryAt");
 
-// ../internal/src/replacements.ts
+// ../core/src/replacements.ts
 var currentDate = {
   marker: "__CURRENT_DATE__",
   replace({ data: { now } }) {
@@ -1018,8 +1059,22 @@ var currentDate = {
   }
 };
 
+// ../core/src/searchParams.ts
+function urlWithSearchParams(url, params) {
+  if (!params) {
+    return url;
+  }
+  const urlObj = new URL(url);
+  for (const [key, value] of Object.entries(params)) {
+    urlObj.searchParams.append(key, String(value));
+  }
+  return urlObj.toString();
+}
+__name(urlWithSearchParams, "urlWithSearchParams");
+
 // src/apiClient.ts
-var import_zod12 = require("zod");
+var import_node_fetch = __toESM(require("node-fetch"));
+var import_zod13 = require("zod");
 var _apiUrl, _options, _logger, _apiKey, apiKey_fn;
 var ApiClient = class {
   constructor(options) {
@@ -1037,7 +1092,7 @@ var ApiClient = class {
       url: options.url,
       name: options.name
     });
-    const response = await fetch(`${__privateGet(this, _apiUrl)}/api/v1/endpoints`, {
+    const response = await (0, import_node_fetch.default)(`${__privateGet(this, _apiUrl)}/api/v1/endpoints`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -1188,8 +1243,8 @@ var ApiClient = class {
     __privateGet(this, _logger).debug("unregistering schedule", {
       id
     });
-    const response = await zodfetch(import_zod12.z.object({
-      ok: import_zod12.z.boolean()
+    const response = await zodfetch(import_zod13.z.object({
+      ok: import_zod13.z.boolean()
     }), `${__privateGet(this, _apiUrl)}/api/v1/${client}/schedules/${id}/registrations/${encodeURIComponent(key)}`, {
       method: "DELETE",
       headers: {
@@ -1215,6 +1270,42 @@ var ApiClient = class {
     });
     return response;
   }
+  async getEvent(eventId) {
+    const apiKey = await __privateMethod(this, _apiKey, apiKey_fn).call(this);
+    __privateGet(this, _logger).debug("Getting Event", {
+      eventId
+    });
+    return await zodfetch(GetEventSchema, `${__privateGet(this, _apiUrl)}/api/v1/events/${eventId}`, {
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${apiKey}`
+      }
+    });
+  }
+  async getRun(runId, options) {
+    const apiKey = await __privateMethod(this, _apiKey, apiKey_fn).call(this);
+    __privateGet(this, _logger).debug("Getting Run", {
+      runId
+    });
+    return await zodfetch(GetRunSchema, urlWithSearchParams(`${__privateGet(this, _apiUrl)}/api/v1/runs/${runId}`, options), {
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${apiKey}`
+      }
+    });
+  }
+  async getRuns(jobSlug, options) {
+    const apiKey = await __privateMethod(this, _apiKey, apiKey_fn).call(this);
+    __privateGet(this, _logger).debug("Getting Runs", {
+      jobSlug
+    });
+    return await zodfetch(GetRunsSchema, urlWithSearchParams(`${__privateGet(this, _apiUrl)}/api/v1/jobs/${jobSlug}/runs`, options), {
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${apiKey}`
+      }
+    });
+  }
 };
 __name(ApiClient, "ApiClient");
 _apiUrl = new WeakMap();
@@ -1251,7 +1342,7 @@ function getApiKey(key) {
 }
 __name(getApiKey, "getApiKey");
 async function zodfetch(schema, url, requestInit, options) {
-  const response = await fetch(url, requestInit);
+  const response = await (0, import_node_fetch.default)(url, requestInit);
   if ((!requestInit || requestInit.method === "GET") && response.status === 404 && options?.optional) {
     return;
   }
@@ -1282,8 +1373,14 @@ var RetryWithTaskError = class {
   }
 };
 __name(RetryWithTaskError, "RetryWithTaskError");
+var CanceledWithTaskError = class {
+  constructor(task) {
+    this.task = task;
+  }
+};
+__name(CanceledWithTaskError, "CanceledWithTaskError");
 function isTriggerError(err) {
-  return err instanceof ResumeWithTaskError || err instanceof RetryWithTaskError;
+  return err instanceof ResumeWithTaskError || err instanceof RetryWithTaskError || err instanceof CanceledWithTaskError;
 }
 __name(isTriggerError, "isTriggerError");
 
@@ -1306,6 +1403,22 @@ function createIOWithIntegrations(io, auths, integrations) {
     const ioConnection = {
       client
     };
+    ioConnection.runTask = async (key, callback, options) => {
+      return await io.runTask(key, {
+        name: "Task",
+        icon: integration.metadata.id,
+        retry: {
+          limit: 10,
+          minTimeoutInMs: 1e3,
+          maxTimeoutInMs: 3e4,
+          factor: 2,
+          randomize: true
+        },
+        ...options
+      }, async (ioTask) => {
+        return await callback(client, ioTask, io);
+      });
+    };
     if (integration.client.tasks) {
       const tasks = integration.client.tasks;
       Object.keys(tasks).forEach((taskName) => {
@@ -1484,13 +1597,14 @@ var IO = class {
   async updateSource(key, options) {
     return this.runTask(key, {
       name: "Update Source",
-      description: `Update Source ${options.key}`,
+      description: "Update Source",
       properties: [
         {
           label: "key",
           text: options.key
         }
       ],
+      params: options,
       redact: {
         paths: [
           "secret"
@@ -1663,6 +1777,13 @@ var IO = class {
       ...options,
       parentId
     });
+    if (task.status === "CANCELED") {
+      this._logger.debug("Task canceled", {
+        idempotencyKey,
+        task
+      });
+      throw new CanceledWithTaskError(task);
+    }
     if (task.status === "COMPLETED") {
       this._logger.debug("Using task output", {
         idempotencyKey,
@@ -1699,21 +1820,36 @@ var IO = class {
           idempotencyKey,
           task
         });
-        await this._apiClient.completeTask(this._id, task.id, {
-          output: result ?? void 0
+        const completedTask = await this._apiClient.completeTask(this._id, task.id, {
+          output: result ?? void 0,
+          properties: task.outputProperties ?? void 0
         });
+        if (completedTask.status === "CANCELED") {
+          throw new CanceledWithTaskError(completedTask);
+        }
         return result;
       } catch (error) {
         if (isTriggerError(error)) {
           throw error;
         }
         if (onError) {
-          const onErrorResult = onError(error, task, this);
-          if (onErrorResult) {
-            const parsedError2 = ErrorWithStackSchema.safeParse(onErrorResult.error);
-            throw new RetryWithTaskError(parsedError2.success ? parsedError2.data : {
-              message: "Unknown error"
-            }, task, onErrorResult.retryAt);
+          try {
+            const onErrorResult = onError(error, task, this);
+            if (onErrorResult) {
+              if (onErrorResult instanceof Error) {
+                error = onErrorResult;
+              } else {
+                const parsedError2 = ErrorWithStackSchema.safeParse(onErrorResult.error);
+                throw new RetryWithTaskError(parsedError2.success ? parsedError2.data : {
+                  message: "Unknown error"
+                }, task, onErrorResult.retryAt);
+              }
+            }
+          } catch (innerError) {
+            if (isTriggerError(innerError)) {
+              throw innerError;
+            }
+            error = innerError;
           }
         }
         const parsedError = ErrorWithStackSchema.safeParse(error);
@@ -1852,6 +1988,7 @@ function eventTrigger(options) {
       title: "Event",
       source: options.source ?? "trigger.dev",
       icon: "custom-event",
+      examples: options.examples,
       parsePayload: (rawPayload) => {
         if (options.schema) {
           return options.schema.parse(rawPayload);
@@ -1925,7 +2062,7 @@ var TriggerClient = class {
         return {
           status: 401,
           body: {
-            message: `Forbidden: client apiKey mismatch: Expected ${__privateGet(this, _options3).apiKey}, got ${apiKey}`
+            message: `Forbidden: client apiKey mismatch: Make sure you are using the correct API Key for your environment`
           }
         };
       }
@@ -1997,7 +2134,11 @@ var TriggerClient = class {
           sources: Object.values(__privateGet(this, _registeredSources)),
           dynamicTriggers: Object.values(__privateGet(this, _registeredDynamicTriggers)).map((trigger) => ({
             id: trigger.id,
-            jobs: __privateGet(this, _jobMetadataByDynamicTriggers)[trigger.id] ?? []
+            jobs: __privateGet(this, _jobMetadataByDynamicTriggers)[trigger.id] ?? [],
+            registerSourceJob: {
+              id: dynamicTriggerRegisterSourceJobId(trigger.id),
+              version: trigger.source.version
+            }
           })),
           dynamicSchedules: Object.entries(__privateGet(this, _registeredSchedules)).map(([id, jobs]) => ({
             id,
@@ -2099,11 +2240,19 @@ var TriggerClient = class {
             }
           };
         }
-        const sourceRequest = new Request(headers.data["x-ts-http-url"], {
+        const sourceRequestNeedsBody = headers.data["x-ts-http-method"] !== "GET";
+        const sourceRequestInit = {
           method: headers.data["x-ts-http-method"],
           headers: headers.data["x-ts-http-headers"],
-          body: headers.data["x-ts-http-method"] !== "GET" ? request.body : void 0
-        });
+          body: sourceRequestNeedsBody ? request.body : void 0
+        };
+        if (sourceRequestNeedsBody) {
+          try {
+            sourceRequestInit.duplex = "half";
+          } catch (error) {
+          }
+        }
+        const sourceRequest = new Request(headers.data["x-ts-http-url"], sourceRequestInit);
         const key = headers.data["x-ts-key"];
         const dynamicId = headers.data["x-ts-dynamic-id"];
         const secret = headers.data["x-ts-secret"];
@@ -2143,7 +2292,7 @@ var TriggerClient = class {
   attachDynamicTrigger(trigger) {
     __privateGet(this, _registeredDynamicTriggers)[trigger.id] = trigger;
     new Job(this, {
-      id: `register-dynamic-trigger-${trigger.id}`,
+      id: dynamicTriggerRegisterSourceJobId(trigger.id),
       name: `Register dynamic trigger ${trigger.id}`,
       version: trigger.source.version,
       trigger: new EventTrigger({
@@ -2193,12 +2342,18 @@ var TriggerClient = class {
           id: options.source.integration.id,
           metadata: options.source.integration.metadata,
           authSource: options.source.integration.client.usesLocalAuth ? "LOCAL" : "HOSTED"
+        },
+        registerSourceJob: {
+          id: options.key,
+          version: options.source.version
         }
       };
     }
     registeredSource.events = Array.from(/* @__PURE__ */ new Set([
       ...registeredSource.events,
-      options.event.name
+      ...typeof options.event.name === "string" ? [
+        options.event.name
+      ] : options.event.name
     ]));
     __privateGet(this, _registeredSources)[options.key] = registeredSource;
     new Job(this, {
@@ -2259,6 +2414,15 @@ var TriggerClient = class {
   async unregisterSchedule(id, key) {
     return __privateGet(this, _client).unregisterSchedule(this.id, id, key);
   }
+  async getEvent(eventId) {
+    return __privateGet(this, _client).getEvent(eventId);
+  }
+  async getRun(runId, options) {
+    return __privateGet(this, _client).getRun(runId, options);
+  }
+  async getRuns(jobSlug, options) {
+    return __privateGet(this, _client).getRuns(jobSlug, options);
+  }
   authorized(apiKey) {
     if (typeof apiKey !== "string") {
       return "missing-header";
@@ -2272,6 +2436,9 @@ var TriggerClient = class {
   apiKey() {
     return __privateGet(this, _options3).apiKey ?? process.env.TRIGGER_API_KEY;
   }
+  defineJob(options) {
+    return new Job(this, options);
+  }
 };
 __name(TriggerClient, "TriggerClient");
 _options3 = new WeakMap();
@@ -2332,6 +2499,12 @@ executeJob_fn = /* @__PURE__ */ __name(async function(body1, job1) {
         retryAt: error.retryAt
       };
     }
+    if (error instanceof CanceledWithTaskError) {
+      return {
+        status: "CANCELED",
+        task: error.task
+      };
+    }
     if (error instanceof RetryWithTaskError) {
       const errorWithStack2 = ErrorWithStackSchema.safeParse(error.cause);
       if (errorWithStack2.success) {
@@ -2479,6 +2652,10 @@ handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourc
     }
   };
 }, "#handleHttpSourceRequest");
+function dynamicTriggerRegisterSourceJobId(id) {
+  return `register-dynamic-trigger-${id}`;
+}
+__name(dynamicTriggerRegisterSourceJobId, "dynamicTriggerRegisterSourceJobId");
 
 // src/integrations.ts
 function authenticatedTask(options) {
@@ -2502,7 +2679,7 @@ var ExternalSource = class {
     }, logger);
   }
   filter(params) {
-    return this.options.filter(params);
+    return this.options.filter?.(params) ?? {};
   }
   properties(params) {
     return this.options.properties?.(params) ?? [];
@@ -2560,7 +2737,7 @@ var ExternalSourceTrigger = class {
       title: "External Source",
       rule: {
         event: this.event.name,
-        payload: deepMergeFilters(this.options.source.filter(this.options.params), this.event.filter ?? {}),
+        payload: deepMergeFilters(this.options.source.filter(this.options.params), this.event.filter ?? {}, this.options.params.filter ?? {}),
         source: this.event.source
       },
       properties: this.options.source.properties(this.options.params)
@@ -2617,6 +2794,7 @@ var DynamicTrigger = class {
     return __privateGet(this, _options4).event;
   }
   registeredTriggerForParams(params) {
+    const key = slugifyId(this.source.key(params));
     return {
       rule: {
         event: this.event.name,
@@ -2624,12 +2802,12 @@ var DynamicTrigger = class {
         payload: deepMergeFilters(this.source.filter(params), this.event.filter ?? {})
       },
       source: {
-        key: slugifyId(this.source.key(params)),
+        key,
         channel: this.source.channel,
         params,
-        events: [
+        events: typeof this.event.name === "string" ? [
           this.event.name
-        ],
+        ] : this.event.name,
         integration: {
           id: this.source.integration.id,
           metadata: this.source.integration.metadata,