@trigger.dev/sdk 2.0.0-next.1 → 2.0.0-next.11

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -16,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __accessCheck = (obj, member, msg) => {
   if (!member.has(obj))
@@ -64,7 +70,7 @@ __export(src_exports, {
   missingConnectionNotification: () => missingConnectionNotification,
   missingConnectionResolvedNotification: () => missingConnectionResolvedNotification,
   omit: () => omit,
-  secureString: () => secureString
+  redactString: () => redactString
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -104,15 +110,17 @@ var Job = class {
   get integrations() {
     return Object.keys(this.options.integrations ?? {}).reduce((acc, key) => {
       const integration = this.options.integrations[key];
-      if (!integration.client.usesLocalAuth) {
-        acc[key] = {
-          id: integration.id,
-          metadata: integration.metadata
-        };
-      }
+      acc[key] = {
+        id: integration.id,
+        metadata: integration.metadata,
+        authSource: integration.client.usesLocalAuth ? "LOCAL" : "HOSTED"
+      };
       return acc;
     }, {});
   }
+  get logLevel() {
+    return this.options.logLevel;
+  }
   toJSON() {
     const internal = this.options.__internal;
     return {
@@ -146,18 +154,23 @@ var logLevels = [
   "info",
   "debug"
 ];
-var _name, _level, _filteredKeys;
+var _name, _level, _filteredKeys, _jsonReplacer;
 var _Logger = class {
-  constructor(name, level = "info", filteredKeys = []) {
+  constructor(name, level = "info", filteredKeys = [], jsonReplacer) {
     __privateAdd(this, _name, void 0);
     __privateAdd(this, _level, void 0);
     __privateAdd(this, _filteredKeys, []);
+    __privateAdd(this, _jsonReplacer, void 0);
     __privateSet(this, _name, name);
     __privateSet(this, _level, logLevels.indexOf(process.env.TRIGGER_LOG_LEVEL ?? level));
     __privateSet(this, _filteredKeys, filteredKeys);
+    __privateSet(this, _jsonReplacer, jsonReplacer);
   }
   filter(...keys) {
-    return new _Logger(__privateGet(this, _name), logLevels[__privateGet(this, _level)], keys);
+    return new _Logger(__privateGet(this, _name), logLevels[__privateGet(this, _level)], keys, __privateGet(this, _jsonReplacer));
+  }
+  static satisfiesLogLevel(logLevel, setLevel) {
+    return logLevels.indexOf(logLevel) <= logLevels.indexOf(setLevel);
   }
   log(...args) {
     if (__privateGet(this, _level) < 0)
@@ -188,7 +201,7 @@ var _Logger = class {
       message,
       args: structureArgs(safeJsonClone(args), __privateGet(this, _filteredKeys))
     };
-    console.debug(JSON.stringify(structuredLog, bigIntReplacer));
+    console.debug(JSON.stringify(structuredLog, createReplacer(__privateGet(this, _jsonReplacer))));
   }
 };
 var Logger = _Logger;
@@ -196,6 +209,19 @@ __name(Logger, "Logger");
 _name = new WeakMap();
 _level = new WeakMap();
 _filteredKeys = new WeakMap();
+_jsonReplacer = new WeakMap();
+function createReplacer(replacer) {
+  return (key, value) => {
+    if (typeof value === "bigint") {
+      return value.toString();
+    }
+    if (replacer) {
+      return replacer(key, value);
+    }
+    return value;
+  };
+}
+__name(createReplacer, "createReplacer");
 function bigIntReplacer(_key, value) {
   if (typeof value === "bigint") {
     return value.toString();
@@ -293,13 +319,17 @@ var ConnectionAuthSchema = import_zod3.z.object({
   additionalFields: import_zod3.z.record(import_zod3.z.string()).optional()
 });
 var IntegrationMetadataSchema = import_zod3.z.object({
-  key: import_zod3.z.string(),
-  title: import_zod3.z.string(),
-  icon: import_zod3.z.string()
+  id: import_zod3.z.string(),
+  name: import_zod3.z.string(),
+  instructions: import_zod3.z.string().optional()
 });
 var IntegrationConfigSchema = import_zod3.z.object({
   id: import_zod3.z.string(),
-  metadata: IntegrationMetadataSchema
+  metadata: IntegrationMetadataSchema,
+  authSource: import_zod3.z.enum([
+    "HOSTED",
+    "LOCAL"
+  ])
 });
 
 // ../internal/src/schemas/json.ts
@@ -404,7 +434,8 @@ var TaskSchema = import_zod7.z.object({
   output: DeserializedJsonSchema.optional().nullable(),
   error: import_zod7.z.string().optional().nullable(),
   parentId: import_zod7.z.string().optional().nullable(),
-  style: StyleSchema.optional().nullable()
+  style: StyleSchema.optional().nullable(),
+  operation: import_zod7.z.string().optional().nullable()
 });
 var ServerTaskSchema = TaskSchema.extend({
   idempotencyKey: import_zod7.z.string(),
@@ -527,9 +558,17 @@ var HttpSourceRequestHeadersSchema = import_zod9.z.object({
   "x-ts-http-method": import_zod9.z.string(),
   "x-ts-http-headers": import_zod9.z.string().transform((s) => import_zod9.z.record(import_zod9.z.string()).parse(JSON.parse(s)))
 });
-var PongResponseSchema = import_zod9.z.object({
-  message: import_zod9.z.literal("PONG")
+var PongSuccessResponseSchema = import_zod9.z.object({
+  ok: import_zod9.z.literal(true)
+});
+var PongErrorResponseSchema = import_zod9.z.object({
+  ok: import_zod9.z.literal(false),
+  error: import_zod9.z.string()
 });
+var PongResponseSchema = import_zod9.z.discriminatedUnion("ok", [
+  PongSuccessResponseSchema,
+  PongErrorResponseSchema
+]);
 var QueueOptionsSchema = import_zod9.z.object({
   name: import_zod9.z.string(),
   maxConcurrent: import_zod9.z.number().optional()
@@ -559,10 +598,10 @@ var SourceMetadataSchema = import_zod9.z.object({
     "SQS",
     "SMTP"
   ]),
+  integration: IntegrationConfigSchema,
   key: import_zod9.z.string(),
   params: import_zod9.z.any(),
-  events: import_zod9.z.array(import_zod9.z.string()),
-  clientId: import_zod9.z.string().optional()
+  events: import_zod9.z.array(import_zod9.z.string())
 });
 var DynamicTriggerEndpointMetadataSchema = import_zod9.z.object({
   id: import_zod9.z.string(),
@@ -571,19 +610,19 @@ var DynamicTriggerEndpointMetadataSchema = import_zod9.z.object({
     version: true
   }))
 });
-var GetEndpointDataResponseSchema = import_zod9.z.object({
+var IndexEndpointResponseSchema = import_zod9.z.object({
   jobs: import_zod9.z.array(JobMetadataSchema),
   sources: import_zod9.z.array(SourceMetadataSchema),
   dynamicTriggers: import_zod9.z.array(DynamicTriggerEndpointMetadataSchema),
   dynamicSchedules: import_zod9.z.array(RegisterDynamicSchedulePayloadSchema)
 });
 var RawEventSchema = import_zod9.z.object({
-  id: import_zod9.z.string().default(() => (0, import_ulid.ulid)()),
   name: import_zod9.z.string(),
-  source: import_zod9.z.string().optional(),
   payload: import_zod9.z.any(),
   context: import_zod9.z.any().optional(),
-  timestamp: import_zod9.z.string().datetime().optional()
+  id: import_zod9.z.string().default(() => (0, import_ulid.ulid)()),
+  timestamp: import_zod9.z.coerce.date().optional(),
+  source: import_zod9.z.string().optional()
 });
 var ApiEventLogSchema = import_zod9.z.object({
   id: import_zod9.z.string(),
@@ -595,7 +634,7 @@ var ApiEventLogSchema = import_zod9.z.object({
   deliveredAt: import_zod9.z.coerce.date().optional().nullable()
 });
 var SendEventOptionsSchema = import_zod9.z.object({
-  deliverAt: import_zod9.z.string().datetime().optional(),
+  deliverAt: import_zod9.z.coerce.date().optional(),
   deliverAfter: import_zod9.z.number().int().optional(),
   accountId: import_zod9.z.string().optional()
 });
@@ -612,6 +651,10 @@ var RuntimeEnvironmentTypeSchema = import_zod9.z.enum([
   "DEVELOPMENT",
   "PREVIEW"
 ]);
+var RunSourceContextSchema = import_zod9.z.object({
+  id: import_zod9.z.string(),
+  metadata: import_zod9.z.any()
+});
 var RunJobBodySchema = import_zod9.z.object({
   event: ApiEventLogSchema,
   job: import_zod9.z.object({
@@ -637,6 +680,7 @@ var RunJobBodySchema = import_zod9.z.object({
     id: import_zod9.z.string(),
     metadata: import_zod9.z.any()
   }).optional(),
+  source: RunSourceContextSchema.optional(),
   tasks: import_zod9.z.array(CachedTaskSchema).optional(),
   connections: import_zod9.z.record(ConnectionAuthSchema).optional()
 });
@@ -714,8 +758,8 @@ var CreateRunResponseBodySchema = import_zod9.z.discriminatedUnion("ok", [
   CreateRunResponseOkSchema,
   CreateRunResponseErrorSchema
 ]);
-var SecureStringSchema = import_zod9.z.object({
-  __secureString: import_zod9.z.literal(true),
+var RedactStringSchema = import_zod9.z.object({
+  __redactedString: import_zod9.z.literal(true),
   strings: import_zod9.z.array(import_zod9.z.string()),
   interpolations: import_zod9.z.array(import_zod9.z.string())
 });
@@ -741,18 +785,21 @@ var RetryOptionsSchema = import_zod9.z.object({
 });
 var RunTaskOptionsSchema = import_zod9.z.object({
   name: import_zod9.z.string(),
+  delayUntil: import_zod9.z.coerce.date().optional(),
+  retry: RetryOptionsSchema.optional(),
   icon: import_zod9.z.string().optional(),
   displayKey: import_zod9.z.string().optional(),
-  noop: import_zod9.z.boolean().default(false),
-  delayUntil: import_zod9.z.coerce.date().optional(),
   description: import_zod9.z.string().optional(),
   properties: import_zod9.z.array(DisplayPropertySchema).optional(),
-  params: SerializableJsonSchema.optional(),
-  trigger: TriggerMetadataSchema.optional(),
-  redact: RedactSchema.optional(),
-  connectionKey: import_zod9.z.string().optional(),
+  params: import_zod9.z.any(),
   style: StyleSchema.optional(),
-  retry: RetryOptionsSchema.optional()
+  connectionKey: import_zod9.z.string().optional(),
+  operation: import_zod9.z.enum([
+    "fetch"
+  ]).optional(),
+  noop: import_zod9.z.boolean().default(false),
+  redact: RedactSchema.optional(),
+  trigger: TriggerMetadataSchema.optional()
 });
 var RunTaskBodyInputSchema = RunTaskOptionsSchema.extend({
   idempotencyKey: import_zod9.z.string(),
@@ -794,7 +841,8 @@ var RegisterTriggerBodySchema = import_zod9.z.object({
 var InitializeTriggerBodySchema = import_zod9.z.object({
   id: import_zod9.z.string(),
   params: import_zod9.z.any(),
-  accountId: import_zod9.z.string().optional()
+  accountId: import_zod9.z.string().optional(),
+  metadata: import_zod9.z.any().optional()
 });
 var RegisterCommonScheduleBodySchema = import_zod9.z.object({
   id: import_zod9.z.string(),
@@ -833,9 +881,7 @@ var CommonMissingConnectionNotificationPayloadSchema = import_zod10.z.object({
     title: import_zod10.z.string(),
     scopes: import_zod10.z.array(import_zod10.z.string()),
     createdAt: import_zod10.z.coerce.date(),
-    updatedAt: import_zod10.z.coerce.date(),
-    integrationIdentifier: import_zod10.z.string(),
-    integrationAuthMethod: import_zod10.z.string()
+    updatedAt: import_zod10.z.coerce.date()
   }),
   authorizationUrl: import_zod10.z.string()
 });
@@ -881,6 +927,39 @@ var MissingConnectionResolvedNotificationPayloadSchema = import_zod10.z.discrimi
   MissingExternalConnectionResolvedNotificationPayloadSchema
 ]);
 
+// ../internal/src/schemas/fetch.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 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()
+});
+
 // ../internal/src/utils.ts
 function deepMergeFilters(filter, other) {
   const result = {
@@ -907,8 +986,40 @@ function deepMergeFilters(filter, other) {
 }
 __name(deepMergeFilters, "deepMergeFilters");
 
+// ../internal/src/retry.ts
+var DEFAULT_RETRY_OPTIONS = {
+  limit: 5,
+  factor: 1.8,
+  minTimeoutInMs: 1e3,
+  maxTimeoutInMs: 6e4,
+  randomize: true
+};
+function calculateRetryAt(retryOptions, attempts) {
+  const options = {
+    ...DEFAULT_RETRY_OPTIONS,
+    ...retryOptions
+  };
+  const retryCount = attempts + 1;
+  if (retryCount >= options.limit) {
+    return;
+  }
+  const random = options.randomize ? Math.random() + 1 : 1;
+  let timeoutInMs = Math.round(random * Math.max(options.minTimeoutInMs, 1) * Math.pow(options.factor, Math.max(attempts - 1, 0)));
+  timeoutInMs = Math.min(timeoutInMs, options.maxTimeoutInMs);
+  return new Date(Date.now() + timeoutInMs);
+}
+__name(calculateRetryAt, "calculateRetryAt");
+
+// ../internal/src/replacements.ts
+var currentDate = {
+  marker: "__CURRENT_DATE__",
+  replace({ data: { now } }) {
+    return now.toISOString();
+  }
+};
+
 // src/apiClient.ts
-var import_zod11 = require("zod");
+var import_zod12 = require("zod");
 var _apiUrl, _options, _logger, _apiKey, apiKey_fn;
 var ApiClient = class {
   constructor(options) {
@@ -1077,8 +1188,8 @@ var ApiClient = class {
     __privateGet(this, _logger).debug("unregistering schedule", {
       id
     });
-    const response = await zodfetch(import_zod11.z.object({
-      ok: import_zod11.z.boolean()
+    const response = await zodfetch(import_zod12.z.object({
+      ok: import_zod12.z.boolean()
     }), `${__privateGet(this, _apiUrl)}/api/v1/${client}/schedules/${id}/registrations/${encodeURIComponent(key)}`, {
       method: "DELETE",
       headers: {
@@ -1186,11 +1297,12 @@ function createIOWithIntegrations(io, auths, integrations) {
     return io;
   }
   const connections = Object.entries(integrations).reduce((acc, [connectionKey, integration]) => {
-    const connection = auths?.[connectionKey];
-    const client = "client" in integration.client ? integration.client.client : connection ? integration.client.clientFactory?.(connection) : void 0;
+    let auth = auths?.[connectionKey];
+    const client = integration.client.usesLocalAuth ? integration.client.client : auth ? integration.client.clientFactory?.(auth) : void 0;
     if (!client) {
       return acc;
     }
+    auth = integration.client.usesLocalAuth ? integration.client.auth : auth;
     const ioConnection = {
       client
     };
@@ -1202,7 +1314,7 @@ function createIOWithIntegrations(io, auths, integrations) {
           const options = authenticatedTask2.init(params);
           options.connectionKey = connectionKey;
           return await io.runTask(key, options, async (ioTask) => {
-            return authenticatedTask2.run(params, client, ioTask, io);
+            return authenticatedTask2.run(params, client, ioTask, io, auth);
           }, authenticatedTask2.onError);
         };
       });
@@ -1225,30 +1337,6 @@ function createIOWithIntegrations(io, auths, integrations) {
 }
 __name(createIOWithIntegrations, "createIOWithIntegrations");
 
-// src/retry.ts
-var DEFAULT_RETRY_OPTIONS = {
-  limit: 5,
-  factor: 1.8,
-  minTimeoutInMs: 1e3,
-  maxTimeoutInMs: 6e4,
-  randomize: true
-};
-function calculateRetryAt(retryOptions, attempts) {
-  const options = {
-    ...DEFAULT_RETRY_OPTIONS,
-    ...retryOptions
-  };
-  const retryCount = attempts + 1;
-  if (retryCount > options.limit) {
-    return;
-  }
-  const random = options.randomize ? Math.random() + 1 : 1;
-  let timeoutInMs = Math.round(random * Math.max(options.minTimeoutInMs, 1) * Math.pow(options.factor, Math.max(attempts - 1, 0)));
-  timeoutInMs = Math.min(timeoutInMs, options.maxTimeoutInMs);
-  return new Date(Date.now() + timeoutInMs);
-}
-__name(calculateRetryAt, "calculateRetryAt");
-
 // src/io.ts
 var _addToCachedTasks, addToCachedTasks_fn;
 var IO = class {
@@ -1259,6 +1347,8 @@ var IO = class {
     this._triggerClient = options.client;
     this._logger = options.logger ?? new Logger("trigger.dev", options.logLevel);
     this._cachedTasks = /* @__PURE__ */ new Map();
+    this._jobLogger = options.jobLogger;
+    this._jobLogLevel = options.jobLogLevel;
     if (options.cachedTasks) {
       options.cachedTasks.forEach((task) => {
         this._cachedTasks.set(task.id, task);
@@ -1269,45 +1359,57 @@ var IO = class {
   }
   get logger() {
     return new IOLogger(async (level, message, data) => {
+      let logLevel = "info";
       switch (level) {
+        case "LOG": {
+          this._jobLogger?.log(message, data);
+          logLevel = "log";
+          break;
+        }
         case "DEBUG": {
-          this._logger.debug(message, data);
+          this._jobLogger?.debug(message, data);
+          logLevel = "debug";
           break;
         }
         case "INFO": {
-          this._logger.info(message, data);
+          this._jobLogger?.info(message, data);
+          logLevel = "info";
           break;
         }
         case "WARN": {
-          this._logger.warn(message, data);
+          this._jobLogger?.warn(message, data);
+          logLevel = "warn";
           break;
         }
         case "ERROR": {
-          this._logger.error(message, data);
+          this._jobLogger?.error(message, data);
+          logLevel = "error";
           break;
         }
       }
-      await this.runTask([
-        message,
-        level
-      ], {
-        name: "log",
-        icon: "log",
-        description: message,
-        params: data,
-        properties: [
-          {
-            label: "Level",
-            text: level
-          }
-        ],
-        style: {
-          style: "minimal",
-          variant: level.toLowerCase()
-        },
-        noop: true
-      }, async (task) => {
-      });
+      if (Logger.satisfiesLogLevel(logLevel, this._jobLogLevel)) {
+        await this.runTask([
+          message,
+          level
+        ], {
+          name: "log",
+          icon: "log",
+          description: message,
+          params: data,
+          properties: [
+            {
+              label: "Level",
+              text: level
+            }
+          ],
+          style: {
+            style: "minimal",
+            variant: level.toLowerCase()
+          },
+          noop: true
+        }, async (task) => {
+        });
+      }
     });
   }
   async wait(key, seconds) {
@@ -1325,13 +1427,56 @@ var IO = class {
     }, async (task) => {
     });
   }
+  async backgroundFetch(key, url, requestInit, retry) {
+    const urlObject = new URL(url);
+    return await this.runTask(key, {
+      name: `fetch ${urlObject.hostname}${urlObject.pathname}`,
+      params: {
+        url,
+        requestInit,
+        retry
+      },
+      operation: "fetch",
+      icon: "background",
+      noop: false,
+      properties: [
+        {
+          label: "url",
+          text: url,
+          url
+        },
+        {
+          label: "method",
+          text: requestInit?.method ?? "GET"
+        },
+        {
+          label: "background",
+          text: "true"
+        }
+      ]
+    }, async (task) => {
+      return task.output;
+    });
+  }
   async sendEvent(key, event, options) {
     return await this.runTask(key, {
       name: "sendEvent",
       params: {
         event,
         options
-      }
+      },
+      properties: [
+        {
+          label: "name",
+          text: event.name
+        },
+        ...event?.id ? [
+          {
+            label: "ID",
+            text: event.id
+          }
+        ] : []
+      ]
     }, async (task) => {
       return await this._triggerClient.sendEvent(event, options);
     });
@@ -1540,6 +1685,13 @@ var IO = class {
       });
       throw new ResumeWithTaskError(task);
     }
+    if (task.status === "RUNNING" && typeof task.operation === "string") {
+      this._logger.debug("Task running operation", {
+        idempotencyKey,
+        task
+      });
+      throw new ResumeWithTaskError(task);
+    }
     const executeTask = /* @__PURE__ */ __name(async () => {
       try {
         const result = await callback(task, this);
@@ -1552,6 +1704,9 @@ var IO = class {
         });
         return result;
       } catch (error) {
+        if (isTriggerError(error)) {
+          throw error;
+        }
         if (onError) {
           const onErrorResult = onError(error, task, this);
           if (onErrorResult) {
@@ -1563,7 +1718,7 @@ var IO = class {
         }
         const parsedError = ErrorWithStackSchema.safeParse(error);
         if (options.retry) {
-          const retryAt = calculateRetryAt(options.retry, task.attempts);
+          const retryAt = calculateRetryAt(options.retry, task.attempts - 1);
           if (retryAt) {
             throw new RetryWithTaskError(parsedError.success ? parsedError.data : {
               message: "Unknown error"
@@ -1641,6 +1796,9 @@ var IOLogger = class {
   constructor(callback) {
     this.callback = callback;
   }
+  log(message, properties) {
+    return this.callback("LOG", message, properties);
+  }
   debug(message, properties) {
     return this.callback("DEBUG", message, properties);
   }
@@ -1713,7 +1871,7 @@ var registerSourceEvent = {
   icon: "register-source",
   parsePayload: RegisterSourceEventSchema.parse
 };
-var _options3, _registeredJobs, _registeredSources, _registeredHttpSourceHandlers, _registeredDynamicTriggers, _jobMetadataByDynamicTriggers, _registeredSchedules, _client, _logger2, _preprocessRun, preprocessRun_fn, _executeJob, executeJob_fn, _createRunContext, createRunContext_fn, _createPreprocessRunContext, createPreprocessRunContext_fn, _handleHttpSourceRequest, handleHttpSourceRequest_fn;
+var _options3, _registeredJobs, _registeredSources, _registeredHttpSourceHandlers, _registeredDynamicTriggers, _jobMetadataByDynamicTriggers, _registeredSchedules, _client, _internalLogger, _preprocessRun, preprocessRun_fn, _executeJob, executeJob_fn, _createRunContext, createRunContext_fn, _createPreprocessRunContext, createPreprocessRunContext_fn, _handleHttpSourceRequest, handleHttpSourceRequest_fn;
 var TriggerClient = class {
   constructor(options) {
     __privateAdd(this, _preprocessRun);
@@ -1729,36 +1887,54 @@ var TriggerClient = class {
     __privateAdd(this, _jobMetadataByDynamicTriggers, {});
     __privateAdd(this, _registeredSchedules, {});
     __privateAdd(this, _client, void 0);
-    __privateAdd(this, _logger2, void 0);
+    __privateAdd(this, _internalLogger, void 0);
     this.id = options.id;
-    this._url = buildClientUrl(options.url);
     __privateSet(this, _options3, options);
     __privateSet(this, _client, new ApiClient(__privateGet(this, _options3)));
-    __privateSet(this, _logger2, new Logger("trigger.dev", __privateGet(this, _options3).logLevel));
-  }
-  get url() {
-    return `${this._url}${this.path ? `${this.path.startsWith("/") ? "" : "/"}${this.path}` : ""}`;
+    __privateSet(this, _internalLogger, new Logger("trigger.dev", __privateGet(this, _options3).verbose ? "debug" : "log"));
   }
   async handleRequest(request) {
-    __privateGet(this, _logger2).debug("handling request", {
+    __privateGet(this, _internalLogger).debug("handling request", {
       url: request.url,
       headers: Object.fromEntries(request.headers.entries()),
       method: request.method
     });
     const apiKey = request.headers.get("x-trigger-api-key");
-    if (!this.authorized(apiKey)) {
-      return {
-        status: 401,
-        body: {
-          message: "Unauthorized"
-        }
-      };
+    const authorization = this.authorized(apiKey);
+    switch (authorization) {
+      case "authorized": {
+        break;
+      }
+      case "missing-client": {
+        return {
+          status: 401,
+          body: {
+            message: "Unauthorized: client missing apiKey"
+          }
+        };
+      }
+      case "missing-header": {
+        return {
+          status: 401,
+          body: {
+            message: "Unauthorized: missing x-trigger-api-key header"
+          }
+        };
+      }
+      case "unauthorized": {
+        return {
+          status: 401,
+          body: {
+            message: `Forbidden: client apiKey mismatch: Expected ${__privateGet(this, _options3).apiKey}, got ${apiKey}`
+          }
+        };
+      }
     }
     if (request.method !== "POST") {
       return {
         status: 405,
         body: {
-          message: "Method not allowed"
+          message: "Method not allowed (only POST is allowed)"
         }
       };
     }
@@ -1773,14 +1949,33 @@ var TriggerClient = class {
     }
     switch (action) {
       case "PING": {
+        const endpointId = request.headers.get("x-trigger-endpoint-id");
+        if (!endpointId) {
+          return {
+            status: 200,
+            body: {
+              ok: false,
+              error: "Missing endpoint ID"
+            }
+          };
+        }
+        if (this.id !== endpointId) {
+          return {
+            status: 200,
+            body: {
+              ok: false,
+              error: `Endpoint ID mismatch error. Expected ${this.id}, got ${endpointId}`
+            }
+          };
+        }
         return {
           status: 200,
           body: {
-            message: "PONG"
+            ok: true
           }
         };
       }
-      case "GET_ENDPOINT_DATA": {
+      case "INDEX_ENDPOINT": {
         const jobId = request.headers.get("x-trigger-job-id");
         if (jobId) {
           const job = __privateGet(this, _registeredJobs)[jobId];
@@ -1814,15 +2009,6 @@ var TriggerClient = class {
           body
         };
       }
-      case "INITIALIZE": {
-        await this.listen();
-        return {
-          status: 200,
-          body: {
-            message: "Initialized"
-          }
-        };
-      }
       case "INITIALIZE_TRIGGER": {
         const json = await request.json();
         const body = InitializeTriggerBodySchema.safeParse(json);
@@ -1994,7 +2180,7 @@ var TriggerClient = class {
   }
   attachSource(options) {
     __privateGet(this, _registeredHttpSourceHandlers)[options.key] = async (s, r) => {
-      return await options.source.handle(s, r, __privateGet(this, _logger2));
+      return await options.source.handle(s, r, __privateGet(this, _internalLogger));
     };
     let registeredSource = __privateGet(this, _registeredSources)[options.key];
     if (!registeredSource) {
@@ -2003,7 +2189,11 @@ var TriggerClient = class {
         key: options.key,
         params: options.params,
         events: [],
-        clientId: !options.source.integration.usesLocalAuth ? options.source.integration.id : void 0
+        integration: {
+          id: options.source.integration.id,
+          metadata: options.source.integration.metadata,
+          authSource: options.source.integration.client.usesLocalAuth ? "LOCAL" : "HOSTED"
+        }
       };
     }
     registeredSource.events = Array.from(/* @__PURE__ */ new Set([
@@ -2070,21 +2260,18 @@ var TriggerClient = class {
     return __privateGet(this, _client).unregisterSchedule(this.id, id, key);
   }
   authorized(apiKey) {
+    if (typeof apiKey !== "string") {
+      return "missing-header";
+    }
     const localApiKey = __privateGet(this, _options3).apiKey ?? process.env.TRIGGER_API_KEY;
     if (!localApiKey) {
-      return false;
+      return "missing-client";
     }
-    return apiKey === localApiKey;
+    return apiKey === localApiKey ? "authorized" : "unauthorized";
   }
   apiKey() {
     return __privateGet(this, _options3).apiKey ?? process.env.TRIGGER_API_KEY;
   }
-  async listen() {
-    await __privateGet(this, _client).registerEndpoint({
-      url: this.url,
-      name: this.id
-    });
-  }
 };
 __name(TriggerClient, "TriggerClient");
 _options3 = new WeakMap();
@@ -2095,7 +2282,7 @@ _registeredDynamicTriggers = new WeakMap();
 _jobMetadataByDynamicTriggers = new WeakMap();
 _registeredSchedules = new WeakMap();
 _client = new WeakMap();
-_logger2 = new WeakMap();
+_internalLogger = new WeakMap();
 _preprocessRun = new WeakSet();
 preprocessRun_fn = /* @__PURE__ */ __name(async function(body, job) {
   const context = __privateMethod(this, _createPreprocessRunContext, createPreprocessRunContext_fn).call(this, body);
@@ -2108,7 +2295,7 @@ preprocessRun_fn = /* @__PURE__ */ __name(async function(body, job) {
 }, "#preprocessRun");
 _executeJob = new WeakSet();
 executeJob_fn = /* @__PURE__ */ __name(async function(body1, job1) {
-  __privateGet(this, _logger2).debug("executing job", {
+  __privateGet(this, _internalLogger).debug("executing job", {
     execution: body1,
     job: job1.toJSON()
   });
@@ -2117,9 +2304,11 @@ executeJob_fn = /* @__PURE__ */ __name(async function(body1, job1) {
     id: body1.run.id,
     cachedTasks: body1.tasks,
     apiClient: __privateGet(this, _client),
-    logger: __privateGet(this, _logger2),
+    logger: __privateGet(this, _internalLogger),
     client: this,
-    context
+    context,
+    jobLogLevel: job1.logLevel ?? __privateGet(this, _options3).logLevel ?? "info",
+    jobLogger: __privateGet(this, _options3).ioLogLocalEnabled ? new Logger(job1.id, job1.logLevel ?? __privateGet(this, _options3).logLevel ?? "info") : void 0
   });
   const ioWithConnections = createIOWithIntegrations(io, body1.connections, job1.options.integrations);
   try {
@@ -2177,7 +2366,7 @@ executeJob_fn = /* @__PURE__ */ __name(async function(body1, job1) {
 }, "#executeJob");
 _createRunContext = new WeakSet();
 createRunContext_fn = /* @__PURE__ */ __name(function(execution) {
-  const { event, organization, environment, job, run } = execution;
+  const { event, organization, environment, job, run, source } = execution;
   return {
     event: {
       id: event.id,
@@ -2189,7 +2378,8 @@ createRunContext_fn = /* @__PURE__ */ __name(function(execution) {
     environment,
     job,
     run,
-    account: execution.account
+    account: execution.account,
+    source
   };
 }, "#createRunContext");
 _createPreprocessRunContext = new WeakSet();
@@ -2211,13 +2401,13 @@ createPreprocessRunContext_fn = /* @__PURE__ */ __name(function(body2) {
 }, "#createPreprocessRunContext");
 _handleHttpSourceRequest = new WeakSet();
 handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourceRequest) {
-  __privateGet(this, _logger2).debug("Handling HTTP source request", {
+  __privateGet(this, _internalLogger).debug("Handling HTTP source request", {
     source
   });
   if (source.dynamicId) {
     const dynamicTrigger = __privateGet(this, _registeredDynamicTriggers)[source.dynamicId];
     if (!dynamicTrigger) {
-      __privateGet(this, _logger2).debug("No dynamic trigger registered for HTTP source", {
+      __privateGet(this, _internalLogger).debug("No dynamic trigger registered for HTTP source", {
         source
       });
       return {
@@ -2230,7 +2420,7 @@ handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourc
         events: []
       };
     }
-    const results2 = await dynamicTrigger.source.handle(source, sourceRequest, __privateGet(this, _logger2));
+    const results2 = await dynamicTrigger.source.handle(source, sourceRequest, __privateGet(this, _internalLogger));
     if (!results2) {
       return {
         events: [],
@@ -2254,7 +2444,7 @@ handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourc
   }
   const handler = __privateGet(this, _registeredHttpSourceHandlers)[source.key];
   if (!handler) {
-    __privateGet(this, _logger2).debug("No handler registered for HTTP source", {
+    __privateGet(this, _internalLogger).debug("No handler registered for HTTP source", {
       source
     });
     return {
@@ -2289,20 +2479,6 @@ handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourc
     }
   };
 }, "#handleHttpSourceRequest");
-function buildClientUrl(url) {
-  if (!url) {
-    const host = process.env.TRIGGER_CLIENT_HOST ?? process.env.HOST ?? process.env.HOSTNAME ?? process.env.NOW_URL ?? process.env.VERCEL_URL;
-    if (host) {
-      return "https://" + host;
-    }
-    throw new Error("Could not determine the url for this TriggerClient. Please set the TRIGGER_CLIENT_HOST environment variable or pass in the `url` option to the TriggerClient constructor.");
-  }
-  if (!url.startsWith("http")) {
-    return "https://" + url;
-  }
-  return url;
-}
-__name(buildClientUrl, "buildClientUrl");
 
 // src/integrations.ts
 function authenticatedTask(options) {
@@ -2326,7 +2502,7 @@ var ExternalSource = class {
     }, logger);
   }
   filter(params) {
-    return this.options.filter(params);
+    return this.options.filter?.(params) ?? {};
   }
   properties(params) {
     return this.options.properties?.(params) ?? [];
@@ -2454,7 +2630,11 @@ var DynamicTrigger = class {
         events: [
           this.event.name
         ],
-        clientId: !this.source.integration.usesLocalAuth ? this.source.integration.id : void 0
+        integration: {
+          id: this.source.integration.id,
+          metadata: this.source.integration.metadata,
+          authSource: this.source.integration.client.usesLocalAuth ? "LOCAL" : "HOSTED"
+        }
       }
     };
   }
@@ -2465,7 +2645,7 @@ var DynamicTrigger = class {
     triggerClient.attachJobToDynamicTrigger(job, this);
   }
   get preprocessRuns() {
-    return false;
+    return true;
   }
 };
 __name(DynamicTrigger, "DynamicTrigger");
@@ -2473,6 +2653,18 @@ _client2 = new WeakMap();
 _options4 = new WeakMap();
 
 // src/triggers/scheduled.ts
+var import_cronstrue = __toESM(require("cronstrue"));
+var examples = [
+  {
+    id: "now",
+    name: "Now",
+    icon: "clock",
+    payload: {
+      ts: currentDate.marker,
+      lastTimestamp: currentDate.marker
+    }
+  }
+];
 var IntervalTrigger = class {
   constructor(options) {
     this.options = options;
@@ -2483,6 +2675,7 @@ var IntervalTrigger = class {
       title: "Schedule",
       source: "trigger.dev",
       icon: "schedule-interval",
+      examples,
       parsePayload: ScheduledPayloadSchema.parse,
       properties: [
         {
@@ -2519,16 +2712,24 @@ var CronTrigger = class {
     this.options = options;
   }
   get event() {
+    const humanReadable = import_cronstrue.default.toString(this.options.cron, {
+      throwExceptionOnParseError: false
+    });
     return {
       name: "trigger.scheduled",
       title: "Cron Schedule",
       source: "trigger.dev",
       icon: "schedule-cron",
+      examples,
       parsePayload: ScheduledPayloadSchema.parse,
       properties: [
         {
-          label: "Expression",
+          label: "cron",
           text: this.options.cron
+        },
+        {
+          label: "Schedule",
+          text: humanReadable
         }
       ]
     };
@@ -2569,6 +2770,7 @@ var DynamicSchedule = class {
       title: "Dynamic Schedule",
       source: "trigger.dev",
       icon: "schedule-dynamic",
+      examples,
       parsePayload: ScheduledPayloadSchema.parse
     };
   }
@@ -2690,14 +2892,14 @@ var MissingConnectionResolvedNotification = class {
 __name(MissingConnectionResolvedNotification, "MissingConnectionResolvedNotification");
 
 // src/index.ts
-function secureString(strings, ...interpolations) {
+function redactString(strings, ...interpolations) {
   return {
-    __secureString: true,
+    __redactedString: true,
     strings: strings.raw,
     interpolations
   };
 }
-__name(secureString, "secureString");
+__name(redactString, "redactString");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CronTrigger,
@@ -2721,6 +2923,6 @@ __name(secureString, "secureString");
   missingConnectionNotification,
   missingConnectionResolvedNotification,
   omit,
-  secureString
+  redactString
 });
 //# sourceMappingURL=index.js.map