@zapier/zapier-sdk 0.87.1 → 0.88.1

package/dist/{chunk-S6IN256D.cjs → chunk-KQTYZL5Y.cjs}

@@ -173,12 +173,19 @@ function composeVoid(existing, added) {
   isolated.add(composed);
   return composed;
 }
+function composeAnnotators(existing, added) {
+  if (!existing) return added;
+  if (!added) return existing;
+  return (ctx) => ({ ...existing(ctx), ...added(ctx) });
+}
 function buildHooks(existing, added) {
   const result = {};
   const start2 = composeVoid(existing.onMethodStart, added.onMethodStart);
   if (start2) result.onMethodStart = start2;
   const end = composeVoid(existing.onMethodEnd, added.onMethodEnd);
   if (end) result.onMethodEnd = end;
+  const annotator = composeAnnotators(existing.annotator, added.annotator);
+  if (annotator) result.annotator = annotator;
   return result;
 }
 function createDeprecationLogger(tag) {
@@ -580,11 +587,14 @@ function generateCallId() {
   }
   return null;
 }
-function rootCallContext() {
+function rootCallContext({
+  callOrigin = "surface"
+} = {}) {
   return {
     callId: generateCallId(),
     depth: 0,
     annotations: {},
+    callOrigin,
     [CALL_CONTEXT_BRAND]: true
   };
 }
@@ -593,6 +603,7 @@ function childCallContext(parent) {
     callId: parent.callId,
     depth: parent.depth + 1,
     annotations: {},
+    callOrigin: parent.callOrigin,
     [CALL_CONTEXT_BRAND]: true
   };
 }
@@ -614,6 +625,28 @@ var INTERNAL_CALL = Symbol("kitcore.internalCall");
 function resolveCallContext(secondArg) {
   return isCallContext(secondArg) ? secondArg : rootCallContext();
 }
+var hookAnnotatorReentrancy = 0;
+function applyAnnotations({
+  context,
+  methodName,
+  input,
+  hookAnnotator,
+  methodAnnotator
+}) {
+  if (hookAnnotator && !isInsideObserver() && context.depth === 0 && context.callOrigin !== "internal" && hookAnnotatorReentrancy === 0) {
+    hookAnnotatorReentrancy++;
+    try {
+      Object.assign(context.annotations, hookAnnotator({ methodName, input }));
+    } catch {
+    } finally {
+      hookAnnotatorReentrancy--;
+    }
+  }
+  try {
+    Object.assign(context.annotations, methodAnnotator?.(input));
+  } catch {
+  }
+}
 function signalDeprecation(context, methodName, getDeprecation) {
   if (isInsideObserver()) return;
   const deprecation = getDeprecation?.();
@@ -639,7 +672,7 @@ function normalizeError(error, adaptError) {
   );
 }
 function createFunction(coreFn, options) {
-  const { sdk, schema, name, getDeprecation } = options;
+  const { sdk, schema, name, annotator, getDeprecation } = options;
   const functionName = name || coreFn.name;
   const namedFunctions = {
     [functionName]: async function(callOptions) {
@@ -653,14 +686,26 @@ function createFunction(coreFn, options) {
         const normalizedOptions = callOptions ?? {};
         const args = [normalizedOptions];
         const depth = Math.max(context.depth, getCurrentDepth());
-        const hooks = isInsideObserver() ? void 0 : sdk.context.hooks;
+        const insideObserver = isInsideObserver();
+        const hooks = insideObserver ? void 0 : sdk.context.hooks;
         const adaptError = resolveCoreOptions(sdk.context)?.adaptError;
-        hooks?.onMethodStart?.({
+        applyAnnotations({
+          context,
+          methodName: functionName,
+          input: normalizedOptions,
+          hookAnnotator: hooks?.annotator,
+          methodAnnotator: annotator
+        });
+        const hookBase = {
           methodName: functionName,
           args,
           isPaginated: false,
-          depth
-        });
+          depth,
+          callId: context.callId,
+          callOrigin: context.callOrigin,
+          annotations: context.annotations
+        };
+        hooks?.onMethodStart?.({ ...hookBase });
         try {
           let result;
           if (schema) {
@@ -682,20 +727,14 @@ function createFunction(coreFn, options) {
             result = await coreFn(normalizedOptions, context);
           }
           hooks?.onMethodEnd?.({
-            methodName: functionName,
-            args,
-            isPaginated: false,
-            depth,
+            ...hookBase,
             durationMs: Date.now() - startTime
           });
           return result;
         } catch (error) {
           const normalizedError = normalizeError(error, adaptError);
           hooks?.onMethodEnd?.({
-            methodName: functionName,
-            args,
-            isPaginated: false,
-            depth,
+            ...hookBase,
             durationMs: Date.now() - startTime,
             error: normalizedError
           });
@@ -707,7 +746,7 @@ function createFunction(coreFn, options) {
   return namedFunctions[functionName];
 }
 function createRawFunction(coreFn, options) {
-  const { sdk, name, schema, positional, getDeprecation } = options;
+  const { sdk, name, schema, positional, annotator, getDeprecation } = options;
   return function(rawInput) {
     const internal = arguments[1];
     const context = resolveCallContext(internal);
@@ -717,23 +756,32 @@ function createRawFunction(coreFn, options) {
     return runInMethodScope(() => {
       const startTime = Date.now();
       const depth = Math.max(context.depth, getCurrentDepth());
-      const hooks = isInsideObserver() ? void 0 : sdk.context.hooks;
+      const insideObserver = isInsideObserver();
+      const hooks = insideObserver ? void 0 : sdk.context.hooks;
       const adaptError = resolveCoreOptions(sdk.context)?.adaptError;
       const input = schema ? rawInput ?? {} : rawInput;
+      applyAnnotations({
+        context,
+        methodName: name,
+        input,
+        hookAnnotator: hooks?.annotator,
+        methodAnnotator: annotator
+      });
       const record = input;
       const args = positional ? positional.filter((key) => record?.[key] !== void 0).map((key) => record?.[key]) : [input];
-      hooks?.onMethodStart?.({
+      const hookBase = {
         methodName: name,
         args,
         isPaginated: false,
-        depth
-      });
+        depth,
+        callId: context.callId,
+        callOrigin: context.callOrigin,
+        annotations: context.annotations
+      };
+      hooks?.onMethodStart?.({ ...hookBase });
       const fireEnd = (error) => {
         hooks?.onMethodEnd?.({
-          methodName: name,
-          args,
-          isPaginated: false,
-          depth,
+          ...hookBase,
           durationMs: Date.now() - startTime,
           ...error ? { error } : {}
         });
@@ -800,7 +848,15 @@ function createPageFunction(coreFn, {
   return namedFunctions[functionName];
 }
 function createPaginatedFunction(coreFn, options) {
-  const { sdk, schema, name, defaultPageSize, adaptPage, getDeprecation } = options;
+  const {
+    sdk,
+    schema,
+    name,
+    defaultPageSize,
+    adaptPage,
+    annotator,
+    getDeprecation
+  } = options;
   const pageFunction = createPageFunction(coreFn, { sdk, adaptPage });
   const functionName = name || coreFn.name;
   const namedFunctions = {
@@ -815,14 +871,26 @@ function createPaginatedFunction(coreFn, options) {
         const normalizedOptions = callOptions ?? {};
         const args = [normalizedOptions];
         const depth = Math.max(context.depth, getCurrentDepth());
-        const hooks = isInsideObserver() ? void 0 : sdk.context.hooks;
+        const insideObserver = isInsideObserver();
+        const hooks = insideObserver ? void 0 : sdk.context.hooks;
         const adaptError = resolveCoreOptions(sdk.context)?.adaptError;
-        hooks?.onMethodStart?.({
+        applyAnnotations({
+          context,
+          methodName: functionName,
+          input: normalizedOptions,
+          hookAnnotator: hooks?.annotator,
+          methodAnnotator: annotator
+        });
+        const hookBase = {
           methodName: functionName,
           args,
           isPaginated: true,
-          depth
-        });
+          depth,
+          callId: context.callId,
+          callOrigin: context.callOrigin,
+          annotations: context.annotations
+        };
+        hooks?.onMethodStart?.({ ...hookBase });
         try {
           const validatedOptions = {
             ...normalizedOptions,
@@ -848,19 +916,13 @@ function createPaginatedFunction(coreFn, options) {
             firstPagePromise.then(
               () => {
                 hooks.onMethodEnd({
-                  methodName: functionName,
-                  args,
-                  isPaginated: true,
-                  depth,
+                  ...hookBase,
                   durationMs: Date.now() - startTime
                 });
               },
               (error) => {
                 hooks.onMethodEnd({
-                  methodName: functionName,
-                  args,
-                  isPaginated: true,
-                  depth,
+                  ...hookBase,
                   durationMs: Date.now() - startTime,
                   error: error instanceof Error ? error : new Error(String(error))
                 });
@@ -899,10 +961,7 @@ function createPaginatedFunction(coreFn, options) {
         } catch (error) {
           const normalizedError = normalizeError(error, adaptError);
           hooks?.onMethodEnd?.({
-            methodName: functionName,
-            args,
-            isPaginated: true,
-            depth,
+            ...hookBase,
             durationMs: Date.now() - startTime,
             error: normalizedError
           });
@@ -1318,6 +1377,7 @@ function defineMethod(config) {
     meta: collectLeafMeta(config),
     resolvers: config.resolvers,
     formatter: config.formatter,
+    annotator: config.annotator,
     output: config.output,
     positional: config.positional,
     setup: config.setup,
@@ -1477,7 +1537,8 @@ function defineHook(config) {
     setup: config.setup,
     dispose: config.dispose,
     wrap: config.wrap,
-    observe: config.observe
+    observe: config.observe,
+    annotator: config.annotator
   };
 }
 function declarePlugin(config) {
@@ -1903,7 +1964,14 @@ function collectPlugins(root, materialized = /* @__PURE__ */ new Set(), configur
   }
   return byId;
 }
-function bindValue(target, key, entry, callType = "surface", ctx) {
+function bindValue({
+  target,
+  key,
+  entry,
+  bindMode = "surface",
+  ctx,
+  frameworkOrigin = false
+}) {
   if (entry.pluginType === "property" && entry.getValue) {
     Object.defineProperty(target, key, {
       get: entry.getValue,
@@ -1911,7 +1979,7 @@ function bindValue(target, key, entry, callType = "surface", ctx) {
       configurable: true
     });
   } else {
-    const value = callType === "internal" && entry.pluginType === "method" ? entry.bindInternal?.(ctx) ?? entry.internalValue ?? entry.value : entry.value;
+    const value = bindMode === "internal" && entry.pluginType === "method" ? entry.bindInternal?.({ ctx, frameworkOrigin }) ?? entry.internalValue ?? entry.value : entry.value;
     Object.defineProperty(target, key, {
       value,
       writable: true,
@@ -1929,7 +1997,12 @@ function buildSurface(context, ...maps) {
   sdk[CONTEXT] = context;
   return sdk;
 }
-function buildImports(plugins, importBindings, ctx) {
+function buildImports({
+  plugins,
+  importBindings,
+  ctx,
+  frameworkOrigin = false
+}) {
   const imports = {};
   for (const { binding, id, optional } of importBindings) {
     const entry = plugins[id];
@@ -1942,10 +2015,31 @@ function buildImports(plugins, importBindings, ctx) {
       });
       continue;
     }
-    bindValue(imports, binding, entry, "internal", ctx);
+    bindValue({
+      target: imports,
+      key: binding,
+      entry,
+      bindMode: "internal",
+      ctx,
+      frameworkOrigin
+    });
   }
   return imports;
 }
+function bindInternalTwin({
+  ctx,
+  frameworkOrigin,
+  withContext,
+  internalValue
+}) {
+  if (ctx) {
+    return (...args) => withContext(childCallContext(ctx))(...args);
+  }
+  if (frameworkOrigin) {
+    return (...args) => withContext(rootCallContext({ callOrigin: "internal" }))(...args);
+  }
+  return internalValue;
+}
 function mirrorLegacyRootKeys(context, rootKeys, meta) {
   const exports = {};
   for (const [name, value] of Object.entries(rootKeys)) {
@@ -2009,7 +2103,11 @@ function bindResolver(resolver, plugins) {
     case "info":
       return { type: "info", text: resolver.text };
     case "object": {
-      const imports = buildImports(plugins, resolver.importBindings);
+      const imports = buildImports({
+        plugins,
+        importBindings: resolver.importBindings,
+        frameworkOrigin: true
+      });
       const bound = {
         type: "object",
         requireParameters: resolver.requireParameters
@@ -2050,7 +2148,11 @@ function bindResolver(resolver, plugins) {
       return bound;
     }
     case "dynamic": {
-      const imports = buildImports(plugins, resolver.importBindings);
+      const imports = buildImports({
+        plugins,
+        importBindings: resolver.importBindings,
+        frameworkOrigin: true
+      });
       const {
         getContext: getContext2,
         listItems,
@@ -2105,7 +2207,11 @@ function bindDefinitions(definitions, plugins) {
   return out;
 }
 function bindFormatter(formatter, plugins) {
-  const imports = buildImports(plugins, formatter.importBindings);
+  const imports = buildImports({
+    plugins,
+    importBindings: formatter.importBindings,
+    frameworkOrigin: true
+  });
   const bound = { format: formatter.format };
   const { getContext: getContext2 } = formatter;
   if (getContext2)
@@ -2192,17 +2298,32 @@ function buildMethodEntries(descriptors, context, states) {
       // Replaced below; never called.
       value: () => void 0
     };
-    const callRun = (input, ctx) => descriptor.run({
-      imports: buildImports(plugins, descriptor.importBindings, ctx),
-      state: states.get(id),
-      input
-    });
+    const callRun = (input, ctx) => {
+      const callContext = ctx ?? rootCallContext();
+      return descriptor.run({
+        imports: buildImports({
+          plugins,
+          importBindings: descriptor.importBindings,
+          ctx: callContext
+        }),
+        state: states.get(id),
+        input,
+        callContext,
+        annotate: (metadata) => {
+          Object.assign(callContext.annotations, metadata);
+        }
+      });
+    };
     const fold = (coreFn) => (input, ctx) => {
       let next = (i) => coreFn(i, ctx);
       for (const wrap of entry.chain) {
         const inner = next;
         next = (i) => wrap.run({
-          imports: buildImports(plugins, wrap.owner.importBindings, ctx),
+          imports: buildImports({
+            plugins,
+            importBindings: wrap.owner.importBindings,
+            ctx
+          }),
           next: inner,
           input: i,
           // Overwritten by the chain item's own closure with the owning
@@ -2213,6 +2334,8 @@ function buildMethodEntries(descriptors, context, states) {
       return next(input);
     };
     const sdk = { context };
+    const methodAnnotator = descriptor.annotator;
+    const boundAnnotator = methodAnnotator ? (input) => methodAnnotator({ input }) : void 0;
     if (out.type === "list") {
       entry.value = createPaginatedFunction(
         fold(callRun),
@@ -2222,6 +2345,7 @@ function buildMethodEntries(descriptors, context, states) {
           name: descriptor.name,
           defaultPageSize: out.defaultPageSize,
           adaptPage: out.adaptPage,
+          annotator: boundAnnotator,
           getDeprecation: () => entry.meta?.deprecation
         }
       );
@@ -2233,6 +2357,7 @@ function buildMethodEntries(descriptors, context, states) {
           sdk,
           schema: descriptor.inputSchema,
           name: descriptor.name,
+          annotator: boundAnnotator,
           getDeprecation: () => entry.meta?.deprecation
         }
       );
@@ -2244,6 +2369,7 @@ function buildMethodEntries(descriptors, context, states) {
           name: descriptor.name,
           schema: descriptor.skipInputValidation ? void 0 : descriptor.inputSchema,
           positional: descriptor.positional,
+          annotator: boundAnnotator,
           // The boundary reads the deprecation LIVE off the entry, so a
           // deprecation merged after build (defineMethodOverride, addPlugin)
           // fires too.
@@ -2264,12 +2390,22 @@ function buildMethodEntries(descriptors, context, states) {
       const internalValue = (...args) => canonicalValue(pack(args), INTERNAL_CALL);
       entry.value = (...args) => canonicalValue(pack(args));
       entry.internalValue = internalValue;
-      entry.bindInternal = (ctx) => ctx ? (...args) => canonicalValue(pack(args), childCallContext(ctx)) : internalValue;
+      entry.bindInternal = (opts) => bindInternalTwin({
+        ...opts,
+        withContext: (context2) => {
+          return (...args) => canonicalValue(pack(args), context2);
+        },
+        internalValue
+      });
       entry.positional = names;
     } else {
       const internalValue = (input) => canonicalValue(input, INTERNAL_CALL);
       entry.internalValue = internalValue;
-      entry.bindInternal = (ctx) => ctx ? (input) => canonicalValue(input, childCallContext(ctx)) : internalValue;
+      entry.bindInternal = (opts) => bindInternalTwin({
+        ...opts,
+        withContext: (context2) => (input) => canonicalValue(input, context2),
+        internalValue
+      });
     }
     plugins[id] = entry;
   }
@@ -2295,8 +2431,14 @@ function buildEagerArtifacts(descriptors, context, states) {
       if (!dispose) return;
       context.disposers?.push({
         id,
+        // Teardown is framework-internal: an SDK method a `dispose` calls runs
+        // on an internal-origin root (dropped from telemetry).
         dispose: (input) => dispose({
-          imports: buildImports(plugins, descriptor.importBindings),
+          imports: buildImports({
+            plugins,
+            importBindings: descriptor.importBindings,
+            frameworkOrigin: true
+          }),
           state: states.get(id),
           input
         })
@@ -2306,7 +2448,10 @@ function buildEagerArtifacts(descriptors, context, states) {
       states.set(
         id,
         descriptor.setup ? descriptor.setup({
-          imports: buildImports(plugins, descriptor.importBindings)
+          imports: buildImports({
+            plugins,
+            importBindings: descriptor.importBindings
+          })
         }) : void 0
       );
       recordDisposer();
@@ -2318,14 +2463,20 @@ function buildEagerArtifacts(descriptors, context, states) {
       states.set(
         id,
         descriptor.setup ? descriptor.setup({
-          imports: buildImports(plugins, descriptor.importBindings)
+          imports: buildImports({
+            plugins,
+            importBindings: descriptor.importBindings
+          })
         }) : void 0
       );
     } else {
       states.set(
         id,
         descriptor.setup ? descriptor.setup({
-          imports: buildImports(plugins, descriptor.importBindings)
+          imports: buildImports({
+            plugins,
+            importBindings: descriptor.importBindings
+          })
         }) : void 0
       );
       if (descriptor.privileged) {
@@ -2343,7 +2494,7 @@ function buildEagerArtifacts(descriptors, context, states) {
           pluginType: "property",
           name: descriptor.name,
           getValue: () => get({
-            imports: buildImports(plugins, importBindings),
+            imports: buildImports({ plugins, importBindings }),
             state: states.get(id)
           }),
           meta: descriptor.meta,
@@ -2379,7 +2530,7 @@ function resolvePlugin(sdk, ref) {
     return entry.getValue();
   }
   if (entry.pluginType === "method" && entry.internalValue) {
-    return entry.internalValue;
+    return entry.bindInternal?.({ frameworkOrigin: true }) ?? entry.internalValue;
   }
   return entry.value;
 }
@@ -2414,7 +2565,7 @@ function resolveAggregates(descriptors, context) {
     if (descriptor.pluginType !== "aggregate") continue;
     const exports = {};
     for (const [binding, child] of Object.entries(descriptor.exports)) {
-      bindValue(exports, binding, plugins[child.id]);
+      bindValue({ target: exports, key: binding, entry: plugins[child.id] });
     }
     plugins[id] = { pluginType: "aggregate", name: descriptor.name, exports };
   }
@@ -2457,23 +2608,39 @@ function assembleHooks(descriptors, context, states) {
   const plugins = context.plugins;
   for (const id of topoOrder(descriptors)) {
     const descriptor = descriptors.get(id);
-    if (!descriptor || descriptor.pluginType !== "hook" || !descriptor.observe) {
+    if (!descriptor || descriptor.pluginType !== "hook" || !descriptor.observe && !descriptor.annotator) {
       continue;
     }
-    const { observe } = descriptor;
-    const imports = buildImports(plugins, descriptor.importBindings);
+    const { observe, annotator } = descriptor;
     const state = states.get(id);
     const contributed = {};
-    if (observe.onMethodStart) {
-      const onStart = observe.onMethodStart;
-      contributed.onMethodStart = (input) => {
-        runIsolatedObserver(() => onStart({ imports, input, state }));
-      };
+    if (observe?.onMethodStart || observe?.onMethodEnd) {
+      const imports = buildImports({
+        plugins,
+        importBindings: descriptor.importBindings,
+        frameworkOrigin: true
+      });
+      if (observe.onMethodStart) {
+        const onStart = observe.onMethodStart;
+        contributed.onMethodStart = (input) => {
+          runIsolatedObserver(() => onStart({ imports, input, state }));
+        };
+      }
+      if (observe.onMethodEnd) {
+        const onEnd = observe.onMethodEnd;
+        contributed.onMethodEnd = (input) => {
+          runIsolatedObserver(() => onEnd({ imports, input, state }));
+        };
+      }
     }
-    if (observe.onMethodEnd) {
-      const onEnd = observe.onMethodEnd;
-      contributed.onMethodEnd = (input) => {
-        runIsolatedObserver(() => onEnd({ imports, input, state }));
+    if (annotator) {
+      const annotatorFn = annotator;
+      contributed.annotator = ({ methodName, input }) => {
+        try {
+          return annotatorFn({ methodName, input, state });
+        } catch {
+          return {};
+        }
       };
     }
     context.hooks = buildHooks(context.hooks, contributed);
@@ -2507,7 +2674,11 @@ function createSdk(root, options) {
       pluginSurface = plugins2[plugin.id].exports;
     } else {
       pluginSurface = {};
-      bindValue(pluginSurface, plugin.name, plugins2[plugin.id]);
+      bindValue({
+        target: pluginSurface,
+        key: plugin.name,
+        entry: plugins2[plugin.id]
+      });
     }
     for (const key of Object.keys(legacyExports)) context.surface[key] = key;
     if (plugin.pluginType === "aggregate") {
@@ -2524,7 +2695,7 @@ function createSdk(root, options) {
   if (root.pluginType === "method" || root.pluginType === "property") {
     context.surface[root.name] = root.id;
     const sdk = buildSurface(context);
-    bindValue(sdk, root.name, plugins[root.id]);
+    bindValue({ target: sdk, key: root.name, entry: plugins[root.id] });
     return sdk;
   }
   if (root.pluginType === "aggregate")
@@ -2556,7 +2727,7 @@ function addModelPlugin(sdk, plugin, options = {}) {
       context.surface[binding] = child.id;
     }
   } else {
-    bindValue(sdk, plugin.name, entry);
+    bindValue({ target: sdk, key: plugin.name, entry });
     context.surface[plugin.name] = plugin.id;
   }
 }
@@ -3855,7 +4026,7 @@ function getZapierSdkService() {
 }
 var MAX_PAGE_LIMIT = 1e4;
 var DEFAULT_PAGE_SIZE = 100;
-var DEFAULT_ACTION_TIMEOUT_MS = 18e4;
+var DEFAULT_ACTION_TIMEOUT_MILLISECONDS = 18e4;
 function parseIntEnvVar(name) {
   const value = globalThis.process?.env?.[name];
   if (value === void 0) return void 0;
@@ -3869,7 +4040,10 @@ function parseIntEnvVar(name) {
   return parsed;
 }
 var ZAPIER_MAX_NETWORK_RETRIES = parseIntEnvVar("ZAPIER_MAX_NETWORK_RETRIES") ?? 3;
-var ZAPIER_MAX_NETWORK_RETRY_DELAY_MS = parseIntEnvVar("ZAPIER_MAX_NETWORK_RETRY_DELAY_MS") ?? 6e4;
+var maxNetworkRetryDelaySecondsEnv = parseIntEnvVar(
+  "ZAPIER_MAX_NETWORK_RETRY_DELAY_SECONDS"
+);
+var ZAPIER_MAX_NETWORK_RETRY_DELAY_MILLISECONDS = (maxNetworkRetryDelaySecondsEnv != null ? maxNetworkRetryDelaySecondsEnv * 1e3 : void 0) ?? parseIntEnvVar("ZAPIER_MAX_NETWORK_RETRY_DELAY_MS") ?? 6e4;
 var MAX_CONCURRENCY_LIMIT = 1e4;
 function parseConcurrencyEnvVar(name) {
   const value = globalThis.process?.env?.[name];
@@ -3900,7 +4074,7 @@ function getZapierDefaultApprovalMode() {
   const isInteractive = !!globalThis.process?.stdin?.isTTY && !!globalThis.process?.stdout?.isTTY;
   return isInteractive ? "poll" : "throw";
 }
-var DEFAULT_APPROVAL_TIMEOUT_MS = 10 * 60 * 1e3;
+var DEFAULT_APPROVAL_TIMEOUT_MILLISECONDS = 10 * 60 * 1e3;
 var DEFAULT_MAX_APPROVAL_RETRIES = 2;
 
 // src/types/properties.ts
@@ -3942,8 +4116,11 @@ var OffsetPropertySchema = zod.z.number().int().min(0).default(0).describe("Numb
 var OutputPropertySchema = zod.z.string().describe("Output file path");
 var DebugPropertySchema = zod.z.boolean().default(false).describe("Enable debug logging");
 var ParamsPropertySchema = zod.z.record(zod.z.string(), zod.z.unknown()).describe("Additional parameters");
-var ActionTimeoutMsPropertySchema = zod.z.number().min(1e3).optional().describe(
-  `Maximum time to wait for action completion in milliseconds (default: ${DEFAULT_ACTION_TIMEOUT_MS})`
+var ActionTimeoutSecondsPropertySchema = zod.z.number().min(1).optional().describe(
+  `Maximum time to wait for action completion in seconds (default: ${DEFAULT_ACTION_TIMEOUT_MILLISECONDS / 1e3})`
+);
+var ActionTimeoutMillisecondsPropertySchema = zod.z.number().min(1e3).optional().describe(
+  `Maximum time to wait for action completion in milliseconds (default: ${DEFAULT_ACTION_TIMEOUT_MILLISECONDS})`
 );
 var TablePropertySchema = withPositional(
   zod.z.string().regex(/^[A-Z0-9]{26}$/, "Table ID must be a valid ULID").describe("The unique identifier of the table")
@@ -4351,11 +4528,18 @@ var ActionExecutionInputSchema = zod.z.object({
   authenticationId: AuthenticationIdPropertySchema.optional().meta({
     deprecated: true
   }),
-  timeoutMs: ActionTimeoutMsPropertySchema
+  timeoutSeconds: ActionTimeoutSecondsPropertySchema,
+  /** @deprecated Use `timeoutSeconds` instead. */
+  timeoutMs: ActionTimeoutMillisecondsPropertySchema.meta({
+    deprecated: true
+  })
 }).describe(
   "Execute an action with the given inputs for the bound app, as an alternative to runAction"
 ).meta({
-  aliases: { connectionId: "connection", authenticationId: "connection" }
+  aliases: {
+    connectionId: "connection",
+    authenticationId: "connection"
+  }
 });
 var AppFactoryInputSchema = zod.z.object({
   /** @deprecated Use `connection` instead. */
@@ -4533,19 +4717,19 @@ function createDebugFetch(options) {
 
 // src/utils/retry-utils.ts
 var MAX_CONSECUTIVE_ERRORS = 3;
-var BASE_ERROR_BACKOFF_MS = 1e3;
-var BASE_EXPONENTIAL_BACKOFF_MS = 1e3;
+var BASE_ERROR_BACKOFF_MILLISECONDS = 1e3;
+var BASE_EXPONENTIAL_BACKOFF_MILLISECONDS = 1e3;
 var JITTER_FACTOR = 0.5;
 function calculateErrorBackoffMs(baseInterval, errorCount) {
   const jitter = Math.random() * JITTER_FACTOR * baseInterval;
   const errorBackoff = Math.min(
-    BASE_ERROR_BACKOFF_MS * (errorCount / 2),
+    BASE_ERROR_BACKOFF_MILLISECONDS * (errorCount / 2),
     baseInterval * 2
     // Cap error backoff at 2x the base interval
   );
   return Math.floor(baseInterval + jitter + errorBackoff);
 }
-function calculateExponentialBackoffMs(attempt, baseDelayMs = BASE_EXPONENTIAL_BACKOFF_MS) {
+function calculateExponentialBackoffMs(attempt, baseDelayMs = BASE_EXPONENTIAL_BACKOFF_MILLISECONDS) {
   const baseDelay = baseDelayMs * Math.pow(2, attempt - 1);
   const jitter = Math.random() * JITTER_FACTOR * baseDelay;
   return Math.floor(baseDelay + jitter);
@@ -4648,11 +4832,11 @@ function combineAbortSignals({
 }
 
 // src/api/polling.ts
-var DEFAULT_TIMEOUT_MS = 18e4;
+var DEFAULT_TIMEOUT_MILLISECONDS = 18e4;
 var DEFAULT_SUCCESS_STATUS = 200;
 var DEFAULT_PENDING_STATUS = 202;
-var DEFAULT_INITIAL_DELAY_MS = 50;
-var DEFAULT_MAX_POLLING_INTERVAL_MS = 6e4;
+var DEFAULT_INITIAL_DELAY_MILLISECONDS = 50;
+var DEFAULT_MAX_POLLING_INTERVAL_MILLISECONDS = 6e4;
 var POLLING_STAGES = [
   [125, 125],
   // Up to 125ms: poll every 125ms
@@ -4668,11 +4852,11 @@ var POLLING_STAGES = [
   // Up to 60s: poll every 5s
   [18e4, 1e4]
   // Up to 3min: poll every 10s
-  // Beyond 3min: use DEFAULT_MAX_POLLING_INTERVAL_MS (60s)
+  // Beyond 3min: use DEFAULT_MAX_POLLING_INTERVAL_MILLISECONDS (60s)
 ];
 function getPollingInterval(elapsedMs) {
   const stage = POLLING_STAGES.find(([threshold]) => elapsedMs < threshold);
-  return stage ? stage[1] : DEFAULT_MAX_POLLING_INTERVAL_MS;
+  return stage ? stage[1] : DEFAULT_MAX_POLLING_INTERVAL_MILLISECONDS;
 }
 function makeAbortError() {
   if (typeof DOMException !== "undefined") {
@@ -4730,8 +4914,8 @@ var processResponse = async (response, successStatus, pendingStatus, isPending,
 async function pollUntilComplete(options) {
   const {
     fetchPoll,
-    timeoutMs = DEFAULT_TIMEOUT_MS,
-    initialDelay = DEFAULT_INITIAL_DELAY_MS,
+    timeoutMs = DEFAULT_TIMEOUT_MILLISECONDS,
+    initialDelay = DEFAULT_INITIAL_DELAY_MILLISECONDS,
     successStatus = DEFAULT_SUCCESS_STATUS,
     pendingStatus = DEFAULT_PENDING_STATUS,
     isPending,
@@ -5178,7 +5362,7 @@ function clearTokenCache() {
   cachedCliLogin = void 0;
   cachedDefaultCache = void 0;
 }
-var TOKEN_EXPIRATION_BUFFER_MS = 5 * 60 * 1e3;
+var TOKEN_EXPIRATION_BUFFER_MILLISECONDS = 5 * 60 * 1e3;
 async function resolveCache(options) {
   if (options.cache) return options.cache;
   if (cachedDefaultCache !== void 0) return cachedDefaultCache;
@@ -5199,7 +5383,7 @@ async function resolveCache(options) {
 }
 function entryIsValid(entry) {
   if (entry.expiresAt === void 0) return true;
-  return entry.expiresAt > Date.now() + TOKEN_EXPIRATION_BUFFER_MS;
+  return entry.expiresAt > Date.now() + TOKEN_EXPIRATION_BUFFER_MILLISECONDS;
 }
 async function readCachedToken(cacheKey, cache) {
   const cached = await cache.get(cacheKey);
@@ -5815,7 +5999,7 @@ function parseDeprecationDate(value) {
 }
 
 // src/sdk-version.ts
-var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.87.1" : void 0) || "unknown";
+var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.88.1" : void 0) || "unknown";
 
 // src/utils/open-url.ts
 var nodePrefix = "node:";
@@ -5926,7 +6110,7 @@ var PollApprovalResponseSchema = zod.z.object({
   mode: ApprovalModeSchema.optional(),
   reason: zod.z.string().optional()
 });
-var APPROVAL_MAX_POLLING_INTERVAL_MS = 5e3;
+var APPROVAL_MAX_POLLING_INTERVAL_MILLISECONDS = 5e3;
 function validateSdkPath(path) {
   if (!path.startsWith("/") || path.startsWith("//")) {
     throw new ZapierValidationError(
@@ -6091,7 +6275,7 @@ var ZapierApiClient = class {
         }
         const rateLimitInfo = parseRateLimitHeaders(response);
         const delayMs = rateLimitInfo.retryAfterMs ?? calculateExponentialBackoffMs(retries + 1);
-        if (delayMs > this.maxNetworkRetryDelayMs || retries >= this.maxNetworkRetries) {
+        if (delayMs > this.maxNetworkRetryDelayMilliseconds || retries >= this.maxNetworkRetries) {
           throw new ZapierRateLimitError("Rate limited", {
             statusCode: 429,
             rateLimit: rateLimitInfo,
@@ -6348,8 +6532,8 @@ var ZapierApiClient = class {
           authRequired: options.authRequired,
           signal: options.signal
         }),
-        initialDelay: options.initialDelay,
-        timeoutMs: options.timeoutMs,
+        initialDelay: options.initialDelayMilliseconds ?? options.initialDelay,
+        timeoutMs: options.timeoutMilliseconds ?? options.timeoutMs,
         successStatus: options.successStatus,
         pendingStatus: options.pendingStatus,
         isPending: options.isPending,
@@ -6358,7 +6542,7 @@ var ZapierApiClient = class {
       });
     };
     this.maxNetworkRetries = options.maxNetworkRetries ?? ZAPIER_MAX_NETWORK_RETRIES;
-    this.maxNetworkRetryDelayMs = options.maxNetworkRetryDelayMs ?? ZAPIER_MAX_NETWORK_RETRY_DELAY_MS;
+    this.maxNetworkRetryDelayMilliseconds = options.maxNetworkRetryDelayMilliseconds ?? options.maxNetworkRetryDelayMs ?? ZAPIER_MAX_NETWORK_RETRY_DELAY_MILLISECONDS;
     const requested = options.maxConcurrentRequests;
     const limit = requested === void 0 || Number.isNaN(requested) ? ZAPIER_MAX_CONCURRENT_REQUESTS : requested;
     if (limit !== Infinity && (!Number.isInteger(limit) || limit < 1 || limit > MAX_CONCURRENCY_LIMIT)) {
@@ -6933,7 +7117,7 @@ var ZapierApiClient = class {
       }
       await openApproval(approval.approval_url);
     }
-    const timeoutMs = this.options.approvalTimeoutMs ?? DEFAULT_APPROVAL_TIMEOUT_MS;
+    const timeoutMs = this.options.approvalTimeoutMilliseconds ?? this.options.approvalTimeoutMs ?? DEFAULT_APPROVAL_TIMEOUT_MILLISECONDS;
     let streamAbortController;
     let streamPromise;
     let removeStreamAbortListener;
@@ -6973,7 +7157,7 @@ var ZapierApiClient = class {
           })
         ),
         timeoutMs,
-        maxPollingIntervalMs: APPROVAL_MAX_POLLING_INTERVAL_MS,
+        maxPollingIntervalMs: APPROVAL_MAX_POLLING_INTERVAL_MILLISECONDS,
         signal,
         isPending: (body2) => {
           const parsed = PollApprovalResponseSchema.safeParse(body2);
@@ -7153,8 +7337,10 @@ var apiPlugin = defineProperty({
       onEvent,
       debug = false,
       maxNetworkRetries = ZAPIER_MAX_NETWORK_RETRIES,
-      maxNetworkRetryDelayMs = ZAPIER_MAX_NETWORK_RETRY_DELAY_MS,
+      maxNetworkRetryDelaySeconds,
+      maxNetworkRetryDelayMs,
       maxConcurrentRequests = ZAPIER_MAX_CONCURRENT_REQUESTS,
+      approvalTimeoutSeconds,
       approvalTimeoutMs,
       maxApprovalRetries,
       approvalMode,
@@ -7169,9 +7355,9 @@ var apiPlugin = defineProperty({
       fetch: customFetch,
       onEvent,
       maxNetworkRetries,
-      maxNetworkRetryDelayMs,
+      maxNetworkRetryDelayMilliseconds: (maxNetworkRetryDelaySeconds != null ? maxNetworkRetryDelaySeconds * 1e3 : maxNetworkRetryDelayMs) ?? ZAPIER_MAX_NETWORK_RETRY_DELAY_MILLISECONDS,
       maxConcurrentRequests,
-      approvalTimeoutMs,
+      approvalTimeoutMilliseconds: approvalTimeoutSeconds != null ? approvalTimeoutSeconds * 1e3 : approvalTimeoutMs,
       maxApprovalRetries,
       approvalMode,
       openAutoModeApprovalsInBrowser,
@@ -7879,9 +8065,13 @@ var FetchInitZapierFieldsSchema = zod.z.object({
     deprecated: true
   }),
   callbackUrl: zod.z.string().optional().describe("URL to send async response to (makes request async)"),
+  maxTimeSeconds: zod.z.number().int().positive().optional().describe(
+    "Maximum seconds to wait for a response. Honored on a best-effort basis; the server may silently enforce a lower ceiling."
+  ),
+  /** @deprecated Use `maxTimeSeconds` instead. */
   maxTime: zod.z.number().int().positive().optional().describe(
     "Maximum seconds to wait for a response. Honored on a best-effort basis; the server may silently enforce a lower ceiling."
-  )
+  ).meta({ deprecated: true })
 });
 var FetchInitSchema = zod.z.object({
   method: zod.z.enum(["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS"]).optional().describe("HTTP method for the request (defaults to GET)"),
@@ -7897,7 +8087,11 @@ var FetchInitSchema = zod.z.object({
 }).extend(FetchInitZapierFieldsSchema.shape).optional().describe(
   "Request options including method, headers, body, and authentication"
 ).meta({
-  aliases: { connectionId: "connection", authenticationId: "connection" }
+  aliases: {
+    connectionId: "connection",
+    authenticationId: "connection",
+    maxTime: "maxTimeSeconds"
+  }
 });
 var FetchInputSchema = zod.z.object({
   url: FetchUrlSchema,
@@ -7948,7 +8142,7 @@ function rewrapIfMaxTimeTimeout({
   const reason = abortSignal.reason;
   if (!reason || reason.name !== "TimeoutError") return error;
   return new ZapierTimeoutError(
-    `fetch timed out after ${maxTimeSeconds}s (maxTime)`,
+    `fetch timed out after ${maxTimeSeconds}s (maxTimeSeconds)`,
     { cause: error }
   );
 }
@@ -8013,9 +8207,11 @@ var fetchPlugin = defineMethod({
       connection,
       authenticationId,
       callbackUrl,
+      maxTimeSeconds: maxTimeSecondsInput,
       maxTime,
       ...fetchInit
     } = init || {};
+    const maxTimeSeconds = maxTimeSecondsInput ?? maxTime;
     const resolvedConnectionId = await resolveConnectionId({
       connectionId,
       connection,
@@ -8044,13 +8240,13 @@ var fetchPlugin = defineMethod({
     if (callbackUrl) {
       headers["X-Relay-Callback-Url"] = callbackUrl;
     }
-    if (maxTime !== void 0) {
-      headers["X-Zapier-Sdk-Max-Time"] = String(maxTime);
+    if (maxTimeSeconds !== void 0) {
+      headers["X-Zapier-Sdk-Max-Time"] = String(maxTimeSeconds);
     }
     const upstreamUrl = new URL(url).toString();
     const method = (fetchInit.method ?? "GET").toUpperCase();
     const abortHandle = buildAbortHandle({
-      maxTimeSeconds: maxTime,
+      maxTimeSeconds,
       callerSignal: fetchInit.signal
     });
     try {
@@ -8080,7 +8276,7 @@ var fetchPlugin = defineMethod({
       throw rewrapIfMaxTimeTimeout({
         error,
         abortSignal: abortHandle?.signal,
-        maxTimeSeconds: maxTime
+        maxTimeSeconds
       });
     } finally {
       abortHandle?.dispose();
@@ -8100,7 +8296,9 @@ var RunActionBaseSchema = zod.z.object({
   inputs: InputsPropertySchema.optional().describe(
     "Input parameters for the action"
   ),
-  timeoutMs: ActionTimeoutMsPropertySchema,
+  timeoutSeconds: ActionTimeoutSecondsPropertySchema,
+  /** @deprecated Use `timeoutSeconds` instead. */
+  timeoutMs: ActionTimeoutMillisecondsPropertySchema.meta({ deprecated: true }),
   pageSize: zod.z.number().min(1).optional().describe("Number of results per page"),
   maxItems: zod.z.number().min(1).optional().describe("Maximum total items to return across all pages"),
   cursor: zod.z.string().optional().describe("Cursor to start from")
@@ -9731,18 +9929,6 @@ var tableSortResolver = defineResolver({
   }
 });
 
-// src/plugins/eventEmission/method-metadata.ts
-var SCOPE_KEY = "methodMetadata";
-function setMethodMetadata(metadata) {
-  const scope2 = getCurrentScope();
-  if (!scope2) return;
-  const existing = scope2[SCOPE_KEY];
-  scope2[SCOPE_KEY] = { ...existing, ...metadata };
-}
-function getMethodMetadata() {
-  return getCurrentScope()?.[SCOPE_KEY];
-}
-
 // src/plugins/listActions/index.ts
 var listActionsPlugin = defineMethod({
   name: "listActions",
@@ -9760,7 +9946,7 @@ var listActionsPlugin = defineMethod({
   // of listing every action. `getAction` (where `actionType` is required) keeps
   // the resolver.
   resolvers: { app: appKeyResolver },
-  run: async ({ imports, input }) => {
+  run: async ({ imports, input, annotate }) => {
     const api = imports.api;
     const getVersionedImplementationId = imports.manifest.getVersionedImplementationId;
     const appKey = "app" in input ? input.app : input.appKey;
@@ -9771,10 +9957,7 @@ var listActionsPlugin = defineMethod({
         { configType: "current_implementation_id" }
       );
     }
-    setMethodMetadata({
-      selectedApi,
-      operationType: input.actionType ?? null
-    });
+    annotate({ selectedApi });
     const data = await api.get(
       "/zapier/api/v4/implementations/",
       {
@@ -9829,10 +10012,6 @@ var getActionPlugin = defineMethod({
     const appKey = "app" in input ? input.app : input.appKey;
     const actionKey = "action" in input ? input.action : input.actionKey;
     const { actionType } = input;
-    setMethodMetadata({
-      operationType: actionType,
-      operationKey: actionKey
-    });
     for await (const action of imports.listActions({ app: appKey }).items()) {
       if ((action.key === actionKey || action.id === actionKey) && action.action_type === actionType) {
         return { data: action };
@@ -9854,7 +10033,7 @@ async function executeAction(actionOptions) {
     executionOptions,
     cursor,
     connectionId,
-    timeoutMs
+    timeoutMilliseconds
   } = actionOptions;
   const runRequestData = {
     selected_api: selectedApi,
@@ -9890,7 +10069,7 @@ async function executeAction(actionOptions) {
   return await api.poll(`/zapier/api/actions/v1/runs/${runId}`, {
     successStatus: 200,
     pendingStatus: 202,
-    timeoutMs: timeoutMs ?? DEFAULT_ACTION_TIMEOUT_MS,
+    timeoutMilliseconds: timeoutMilliseconds ?? DEFAULT_ACTION_TIMEOUT_MILLISECONDS,
     resource: { type: "run", id: runId },
     isPending: (result) => {
       const data = result?.data;
@@ -9899,7 +10078,7 @@ async function executeAction(actionOptions) {
     resultExtractor: (result) => result.data
   });
 }
-var CONTEXT_CACHE_TTL_MS = 6e4;
+var CONTEXT_CACHE_TTL_MILLISECONDS = 6e4;
 var CONTEXT_CACHE_MAX_SIZE = 500;
 var runActionPlugin = defineMethod({
   name: "runAction",
@@ -9925,9 +10104,10 @@ var runActionPlugin = defineMethod({
     inputs: inputsResolver
   },
   // A per-SDK-instance TTL cache of resolved (selectedApi, actionId), built once
-  // in setup so it persists across calls. Reads getVersionedImplementationId
-  // (`imports.manifest`) and getAction (an import).
-  setup: ({ imports }) => {
+  // in setup so it persists across calls. The imports it resolves through
+  // (`manifest.getVersionedImplementationId`, `getAction`) are threaded in per
+  // call from `run`, not captured here.
+  setup: () => {
     const cache = /* @__PURE__ */ new Map();
     function evictIfNeeded() {
       if (cache.size < CONTEXT_CACHE_MAX_SIZE) return;
@@ -9947,7 +10127,7 @@ var runActionPlugin = defineMethod({
       if (!evictedAny && oldestKey) cache.delete(oldestKey);
     }
     async function resolveRunActionContext(options) {
-      const { appKey, actionKey, actionType } = options;
+      const { imports, appKey, actionKey, actionType } = options;
       const getVersionedImplementationId = imports.manifest.getVersionedImplementationId;
       const selectedApi = await getVersionedImplementationId(appKey);
       if (!selectedApi) {
@@ -9980,13 +10160,13 @@ var runActionPlugin = defineMethod({
       evictIfNeeded();
       cache.set(contextKey, {
         promise: pending,
-        expiresAt: Date.now() + CONTEXT_CACHE_TTL_MS
+        expiresAt: Date.now() + CONTEXT_CACHE_TTL_MILLISECONDS
       });
       return pending;
     }
     return { getRunActionContext };
   },
-  run: async ({ imports, input, state }) => {
+  run: async ({ imports, input, state, annotate }) => {
     const api = imports.api;
     const resolveConnection = imports.connections.resolveConnection;
     const appKey = "app" in input ? input.app : input.appKey;
@@ -9997,9 +10177,9 @@ var runActionPlugin = defineMethod({
       connection,
       authenticationId,
       inputs = {},
-      cursor,
-      timeoutMs
+      cursor
     } = input;
+    const timeoutMilliseconds = input.timeoutSeconds != null ? input.timeoutSeconds * 1e3 : input.timeoutMs;
     const resolvedConnectionId = await resolveConnectionId({
       connectionId,
       connection,
@@ -10007,15 +10187,12 @@ var runActionPlugin = defineMethod({
       resolveConnection
     });
     const { selectedApi, actionId } = await state.getRunActionContext({
+      imports,
       appKey,
       actionKey,
       actionType
     });
-    setMethodMetadata({
-      selectedApi,
-      operationType: actionType,
-      operationKey: actionKey
-    });
+    annotate({ selectedApi });
     const result = await executeAction({
       api,
       selectedApi,
@@ -10027,7 +10204,7 @@ var runActionPlugin = defineMethod({
       executionOptions: { inputs },
       cursor,
       connectionId: resolvedConnectionId,
-      timeoutMs
+      timeoutMilliseconds
     });
     if (result.errors && result.errors.length > 0) {
       const errorMessage2 = result.errors.map(
@@ -10084,6 +10261,7 @@ function createActionFunction(appKey, actionType, actionKey, imports, pinnedAuth
       connectionId: providedConnectionId,
       connection: providedConnection,
       authenticationId: providedAuthenticationId,
+      timeoutSeconds,
       timeoutMs
     } = actionOptions;
     const { connectionId, connection } = resolveProxyConnection({
@@ -10100,6 +10278,7 @@ function createActionFunction(appKey, actionType, actionKey, imports, pinnedAuth
       action: actionKey,
       inputs,
       connection: connectionId ?? connection,
+      timeoutSeconds,
       timeoutMs
     });
   };
@@ -10649,7 +10828,11 @@ var listActionInputFieldsPlugin = defineMethod({
     // metadata; the engine permits a resolver importing its host.
     inputs: inputsAllOptionalResolver
   },
-  run: async ({ imports, input }) => {
+  run: async ({
+    imports,
+    input,
+    annotate
+  }) => {
     const api = imports.api;
     const getVersionedImplementationId = imports.manifest.getVersionedImplementationId;
     const resolveConnection = imports.connections.resolveConnection;
@@ -10669,11 +10852,7 @@ var listActionInputFieldsPlugin = defineMethod({
         { configType: "current_implementation_id" }
       );
     }
-    setMethodMetadata({
-      selectedApi,
-      operationType: actionType,
-      operationKey: actionKey
-    });
+    annotate({ selectedApi });
     const { data: action } = await imports.getAction({
       app: appKey,
       actionType,
@@ -10784,7 +10963,11 @@ var listActionInputFieldChoicesPlugin = defineMethod({
     inputField: inputFieldKeyResolver,
     inputs: inputsAllOptionalResolver
   },
-  run: async ({ imports, input }) => {
+  run: async ({
+    imports,
+    input,
+    annotate
+  }) => {
     const api = imports.api;
     const getVersionedImplementationId = imports.manifest.getVersionedImplementationId;
     const resolveConnection = imports.connections.resolveConnection;
@@ -10813,11 +10996,7 @@ var listActionInputFieldChoicesPlugin = defineMethod({
         { configType: "current_implementation_id" }
       );
     }
-    setMethodMetadata({
-      selectedApi,
-      operationType: actionType,
-      operationKey: actionKey
-    });
+    annotate({ selectedApi });
     const { data: action } = await imports.getAction({
       app: appKey,
       actionType,
@@ -10946,7 +11125,8 @@ var getActionInputFieldsSchemaPlugin = defineMethod({
   },
   run: async ({
     imports,
-    input
+    input,
+    annotate
   }) => {
     const api = imports.api;
     const getVersionedImplementationId = imports.manifest.getVersionedImplementationId;
@@ -10967,11 +11147,7 @@ var getActionInputFieldsSchemaPlugin = defineMethod({
         { configType: "current_implementation_id" }
       );
     }
-    setMethodMetadata({
-      selectedApi,
-      operationType: actionType,
-      operationKey: actionKey
-    });
+    annotate({ selectedApi });
     const { data: action } = await imports.getAction({
       app: appKey,
       actionType,
@@ -11094,7 +11270,11 @@ var listConnectionsPlugin = defineMethod({
     adaptPage: adaptZapierPage,
     defaultPageSize: DEFAULT_PAGE_SIZE
   },
-  run: async ({ imports, input }) => {
+  run: async ({
+    imports,
+    input,
+    annotate
+  }) => {
     const resolveConnection = imports.connections.resolveConnection;
     const api = imports.api;
     const getVersionedImplementationId = imports.manifest.getVersionedImplementationId;
@@ -11109,7 +11289,7 @@ var listConnectionsPlugin = defineMethod({
     if (appKey) {
       const implementationId = await getVersionedImplementationId(appKey);
       if (implementationId) {
-        setMethodMetadata({ selectedApi: implementationId });
+        annotate({ selectedApi: implementationId });
         const [versionlessSelectedApi] = splitVersionedKey(implementationId);
         searchParams.app_key = versionlessSelectedApi;
       } else {
@@ -11625,12 +11805,12 @@ var getConnectionStartUrlPlugin = defineMethod({
   outputSchema: GetConnectionStartUrlItemSchema,
   output: "item",
   resolvers: { app: appKeyResolver },
-  run: async ({ imports, input }) => {
+  run: async ({ imports, input, annotate }) => {
     const api = imports.api;
     const getVersionedImplementationId = imports.manifest.getVersionedImplementationId;
     const versionedKey = await getVersionedImplementationId(input.app);
     const selectedApi = versionedKey ? versionedKey.split("@")[0] : input.app;
-    setMethodMetadata({ selectedApi });
+    annotate({ selectedApi });
     const response = await api.post(
       START_PATH,
       { selected_api: selectedApi },
@@ -11651,12 +11831,18 @@ var WaitForNewConnectionSchema = zod.z.object({
   startedAt: zod.z.number().int().nonnegative().describe(
     "Unix timestamp (seconds). Only connections whose `date` is at or after this value count as 'new'. Prefer the `startedAt` returned by `get-connection-start-url` \u2014 it's server-stamped, so the comparison isn't thrown off by client clock skew. If you mint the timestamp yourself, capture it *before* showing the start URL so a fast OAuth completion isn't missed."
   ),
+  timeoutSeconds: zod.z.number().int().positive().optional().describe("How long to wait before giving up. Default 5 minutes (300)."),
+  /** @deprecated Use `timeoutSeconds` instead. */
   timeoutMs: zod.z.number().int().positive().optional().describe(
     "How long to wait before giving up. Default 5 minutes (300_000)."
+  ).meta({ deprecated: true }),
+  pollIntervalMilliseconds: zod.z.number().int().positive().optional().describe(
+    "Delay before the first poll request, in ms. Default 3 seconds (3_000). Subsequent polling cadence is managed by the SDK's polling primitive (backoff with sane defaults)."
   ),
+  /** @deprecated Use `pollIntervalMilliseconds` instead. */
   pollIntervalMs: zod.z.number().int().positive().optional().describe(
     "Delay before the first poll request, in ms. Default 3 seconds (3_000). Subsequent polling cadence is managed by the SDK's polling primitive (backoff with sane defaults)."
-  )
+  ).meta({ deprecated: true })
 }).describe(
   "Wait for a new connection to appear for the given app. Polls `/api/v0/connections` with server-side `ordering=-date` until the most recent matching row's `date` is at or after the started-at timestamp, then returns it. Pair with `get-connection-start-url` \u2014 that mints the URL the user opens, this waits for the resulting connection to land. Errors with a timeout after the configured timeout (default 5 min). Example (JS):\n\n```ts\nconst { data: { url, app, startedAt } } = await zapier.getConnectionStartUrl({ app: 'slack' });\n// show `url` to the user via the channel they're reading from\nconst { data: conn } = await zapier.waitForNewConnection({ app, startedAt });\n```"
 );
@@ -11683,12 +11869,12 @@ var waitForNewConnectionPlugin = defineMethod({
   outputSchema: WaitForNewConnectionItemSchema,
   output: "item",
   resolvers: { app: appKeyResolver },
-  run: async ({ imports, input }) => {
+  run: async ({ imports, input, annotate }) => {
     const api = imports.api;
     const getVersionedImplementationId = imports.manifest.getVersionedImplementationId;
     const versionedKey = await getVersionedImplementationId(input.app);
     const appKey = versionedKey ? versionedKey.split("@")[0] : input.app;
-    setMethodMetadata({ selectedApi: appKey });
+    annotate({ selectedApi: appKey });
     try {
       const top = await api.poll(CONNECTIONS_PATH, {
         searchParams: {
@@ -11703,8 +11889,8 @@ var waitForNewConnectionPlugin = defineMethod({
           page_size: "1"
         },
         authRequired: true,
-        timeoutMs: input.timeoutMs ?? 3e5,
-        initialDelay: input.pollIntervalMs ?? 3e3,
+        timeoutMilliseconds: input.timeoutSeconds != null ? input.timeoutSeconds * 1e3 : input.timeoutMs ?? 3e5,
+        initialDelayMilliseconds: input.pollIntervalMilliseconds ?? input.pollIntervalMs ?? 3e3,
         isPending: (body) => {
           const rows = body.data ?? [];
           const head = rows[0];
@@ -11754,12 +11940,20 @@ var CreateConnectionSchema = zod.z.object({
   browser: zod.z.enum(["auto", "always", "never"]).default("auto").describe(
     "When to auto-open the URL in a browser. `auto` (default) opens in local sessions and skips opening in CI / SSH / headless-Linux. `always` forces the open attempt. `never` skips it. The URL is always printed to stderr regardless \u2014 a failed or skipped open degrades gracefully to copy-paste."
   ),
+  timeoutSeconds: zod.z.number().int().positive().optional().describe(
+    "How long to wait for the user to complete the connection flow before giving up. Default 5 minutes (300)."
+  ),
+  /** @deprecated Use `timeoutSeconds` instead. */
   timeoutMs: zod.z.number().int().positive().optional().describe(
     "How long to wait for the user to complete the connection flow before giving up. Default 5 minutes (300_000)."
+  ).meta({ deprecated: true }),
+  pollIntervalMilliseconds: zod.z.number().int().positive().optional().describe(
+    "Delay before the first poll request, in ms. Default 3 seconds (3_000). Subsequent polling cadence is managed by the SDK's polling primitive (backoff with sane defaults)."
   ),
+  /** @deprecated Use `pollIntervalMilliseconds` instead. */
   pollIntervalMs: zod.z.number().int().positive().optional().describe(
     "Delay before the first poll request, in ms. Default 3 seconds (3_000). Subsequent polling cadence is managed by the SDK's polling primitive (backoff with sane defaults)."
-  )
+  ).meta({ deprecated: true })
 }).describe(
   "Create a new app connection, end-to-end. Mints the start URL via `get-connection-start-url`, prints it to stderr, opportunistically opens it in a browser when it looks safe to do so (skipping CI / SSH / headless-Linux by default \u2014 pass `--browser always` to force, `--browser never` to suppress), then polls via `wait-for-new-connection` until the user completes OAuth and the new connection appears. Returns the connection.\n\nThis is the right command for most callers. Reach for the lower-level building blocks when you want either of: (a) hand off the URL and *not* block on completion \u2014 call `get-connection-start-url` alone, no `wait-for-new-connection` needed, or (b) do something custom between minting the URL and waiting \u2014 call `get-connection-start-url`, do your work (email or DM the URL, render a QR code, etc.), then `wait-for-new-connection`."
 );
@@ -11798,11 +11992,11 @@ var createConnectionPlugin = defineMethod({
       ]
     })
   }),
-  run: async ({ imports, input }) => {
+  run: async ({ imports, input, annotate }) => {
     const { data: start2 } = await imports.getConnectionStartUrl({
       app: input.app
     });
-    setMethodMetadata({ selectedApi: start2.app });
+    annotate({ selectedApi: start2.app });
     console.error(
       `
 Open this URL to complete the connection:
@@ -11821,8 +12015,9 @@ Open this URL to complete the connection:
       // Server-stamped mint time: measured on the same clock as a connection's
       // `date`, so the freshness check is immune to client/server clock skew.
       startedAt: start2.startedAt,
+      timeoutSeconds: input.timeoutSeconds,
       timeoutMs: input.timeoutMs,
-      pollIntervalMs: input.pollIntervalMs
+      pollIntervalMilliseconds: input.pollIntervalMilliseconds ?? input.pollIntervalMs
     });
     return {
       data: CreateConnectionItemSchema.parse({
@@ -12056,6 +12251,10 @@ var triggerInboxItemFormatter = defineFormatter({
 
 // src/plugins/triggers/shared.ts
 var triggerCategories = ["trigger"];
+function deriveReadOperation() {
+  const annotations = { operationType: "read" };
+  return { ...annotations };
+}
 
 // src/plugins/triggers/utils.ts
 var UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -12101,6 +12300,7 @@ var createTriggerInboxPlugin = defineMethod({
   outputSchema: TriggerInboxItemSchema,
   output: "item",
   formatter: triggerInboxItemFormatter,
+  annotator: deriveReadOperation,
   // actionKeyResolver and inputsResolver depend on actionType, which is always
   // "read" for triggers. Pin it as a constant resolver so it's seeded into
   // resolvedParams without polluting the user-facing schema (where it would
@@ -12205,6 +12405,7 @@ var ensureTriggerInboxPlugin = defineMethod({
   outputSchema: TriggerInboxItemSchema,
   output: "item",
   formatter: triggerInboxItemFormatter,
+  annotator: deriveReadOperation,
   // actionKeyResolver and inputsResolver depend on actionType, which is always
   // "read" for triggers. Pin it as a constant resolver so it's seeded into
   // resolvedParams without polluting the user-facing schema.
@@ -13181,9 +13382,9 @@ async function* readInboxEvents({
 }
 
 // src/plugins/triggers/watchTriggerInbox/index.ts
-var SSE_RECONNECT_BACKOFF_MS = [500, 1e3, 2e3, 5e3];
-var DEFAULT_SAFETY_DRAIN_INTERVAL_MS = 3e5;
-var SSE_HEALTHY_CONNECTION_MS = 5e3;
+var SSE_RECONNECT_BACKOFF_MILLISECONDS = [500, 1e3, 2e3, 5e3];
+var DEFAULT_SAFETY_DRAIN_INTERVAL_MILLISECONDS = 3e5;
+var SSE_HEALTHY_CONNECTION_MILLISECONDS = 5e3;
 var ERROR_BACKOFF_CAP = 4;
 function createDrainLatch() {
   let pending = false;
@@ -13241,7 +13442,7 @@ async function drainRunner({
       consecutiveErrors = Math.min(consecutiveErrors + 1, ERROR_BACKOFF_CAP);
       errorAttempts += 1;
       const delay = calculateErrorBackoffMs(
-        BASE_ERROR_BACKOFF_MS,
+        BASE_ERROR_BACKOFF_MILLISECONDS,
         consecutiveErrors
       );
       const statusCode = errorStatusCode(error);
@@ -13307,7 +13508,7 @@ async function sseLoop({
       })) {
         drainRequest.request();
       }
-      if (connected && Date.now() - connectedAt >= SSE_HEALTHY_CONNECTION_MS) {
+      if (connected && Date.now() - connectedAt >= SSE_HEALTHY_CONNECTION_MILLISECONDS) {
         attempt = 0;
       }
     } catch (err) {
@@ -13331,8 +13532,11 @@ async function sseLoop({
       transientError = err;
     }
     if (signal.aborted) return;
-    const delay = SSE_RECONNECT_BACKOFF_MS[Math.min(attempt, SSE_RECONNECT_BACKOFF_MS.length - 1)];
-    attempt = Math.min(attempt + 1, SSE_RECONNECT_BACKOFF_MS.length - 1);
+    const delay = SSE_RECONNECT_BACKOFF_MILLISECONDS[Math.min(attempt, SSE_RECONNECT_BACKOFF_MILLISECONDS.length - 1)];
+    attempt = Math.min(
+      attempt + 1,
+      SSE_RECONNECT_BACKOFF_MILLISECONDS.length - 1
+    );
     if (transientError !== void 0 && debug) {
       const statusCode = errorStatusCode(transientError);
       const errorMsg = errorMessage(transientError);
@@ -13389,7 +13593,7 @@ var watchTriggerInboxPlugin = defineMethod({
     const { concurrency, leaseLimit } = resolveConcurrencyAndLease(input);
     const inboxId = await resolveTriggerInboxId({ api, inbox: input.inbox });
     if (input.signal?.aborted) return;
-    const safetyDrainMs = input.maxDrainIntervalSeconds !== void 0 ? input.maxDrainIntervalSeconds * 1e3 : DEFAULT_SAFETY_DRAIN_INTERVAL_MS;
+    const safetyDrainMs = input.maxDrainIntervalSeconds !== void 0 ? input.maxDrainIntervalSeconds * 1e3 : DEFAULT_SAFETY_DRAIN_INTERVAL_MILLISECONDS;
     const stop = new AbortController();
     const combined = combineAbortSignals({
       handles: [
@@ -13506,6 +13710,7 @@ var listTriggerInputFieldsPlugin = defineMethod({
   outputSchema: RootFieldItemSchema,
   output: { type: "list", defaultPageSize: DEFAULT_PAGE_SIZE },
   formatter: rootFieldItemFormatter,
+  annotator: deriveReadOperation,
   // actionKeyResolver and inputsAllOptionalResolver depend on actionType. Pin it
   // to "read" so they resolve correctly without the user setting it.
   resolvers: {
@@ -13552,6 +13757,7 @@ var listTriggerInputFieldChoicesPlugin = defineMethod({
   outputSchema: InputFieldChoiceItemSchema,
   output: { type: "list", defaultPageSize: DEFAULT_PAGE_SIZE },
   formatter: inputFieldChoiceItemFormatter,
+  annotator: deriveReadOperation,
   resolvers: {
     app: appKeyResolver,
     action: actionKeyResolver,
@@ -13595,6 +13801,7 @@ var getTriggerInputFieldsSchemaPlugin = defineMethod({
   // Passthrough: getActionInputFieldsSchema already returns `{ data }`, so
   // `output: "raw"` surfaces that envelope unchanged.
   output: "raw",
+  annotator: deriveReadOperation,
   resolvers: {
     app: appKeyResolver,
     action: actionKeyResolver,
@@ -14418,7 +14625,7 @@ var updateTableRecordsPlugin = defineMethod({
 
 // src/plugins/eventEmission/transport.ts
 var DEFAULT_RETRY_ATTEMPTS = 2;
-var DEFAULT_RETRY_DELAY_MS = 300;
+var DEFAULT_RETRY_DELAY_MILLISECONDS = 300;
 function createHttpTransport(config) {
   const delay = async (ms) => {
     return new Promise((resolve2) => {
@@ -14443,12 +14650,12 @@ function createHttpTransport(config) {
         body: JSON.stringify(payload)
       });
       if (!response.ok && attemptsLeft > 1) {
-        await delay(config.retryDelayMs || DEFAULT_RETRY_DELAY_MS);
+        await delay(config.retryDelayMs || DEFAULT_RETRY_DELAY_MILLISECONDS);
         return emitWithRetry(subject, event, attemptsLeft - 1);
       }
     } catch (error) {
       if (attemptsLeft > 1) {
-        await delay(config.retryDelayMs || DEFAULT_RETRY_DELAY_MS);
+        await delay(config.retryDelayMs || DEFAULT_RETRY_DELAY_MILLISECONDS);
         return emitWithRetry(subject, event, attemptsLeft - 1);
       }
       throw error;
@@ -14712,6 +14919,14 @@ function buildMethodCalledEvent(data, context = {}) {
 }
 
 // src/plugins/eventEmission/event-emission-hook.ts
+function readMethodMetadata(annotations) {
+  const readString = (value) => typeof value === "string" ? value : null;
+  return {
+    selectedApi: readString(annotations.selectedApi),
+    operationType: readString(annotations.operationType),
+    operationKey: readString(annotations.operationKey)
+  };
+}
 function computeArgumentCount(args) {
   if (args.length === 1) {
     const arg0 = args[0];
@@ -14722,9 +14937,18 @@ function computeArgumentCount(args) {
   return args.filter((a) => a !== void 0).length;
 }
 function makeMethodEndHook(emitMethodCalled) {
-  return ({ methodName, args, isPaginated, depth, durationMs, error }) => {
-    if (depth > 0) return;
-    const metadata = getMethodMetadata();
+  return ({
+    methodName,
+    args,
+    isPaginated,
+    depth,
+    callOrigin,
+    annotations,
+    durationMs,
+    error
+  }) => {
+    if (callOrigin === "internal" || depth > 0) return;
+    const metadata = readMethodMetadata(annotations);
     emitMethodCalled({
       method_name: methodName,
       execution_duration_ms: durationMs,
@@ -14733,15 +14957,36 @@ function makeMethodEndHook(emitMethodCalled) {
       error_type: error?.constructor.name ?? null,
       argument_count: computeArgumentCount(args),
       is_paginated: isPaginated,
-      selected_api: metadata?.selectedApi ?? null,
-      operation_type: metadata?.operationType ?? null,
-      operation_key: metadata?.operationKey ?? null
+      selected_api: metadata.selectedApi ?? null,
+      operation_type: metadata.operationType ?? null,
+      operation_key: metadata.operationKey ?? null
     });
   };
 }
 
+// src/plugins/eventEmission/annotator.ts
+function zapierAnnotate({ input }) {
+  const annotations = {};
+  if (typeof input === "object" && input !== null) {
+    const record = input;
+    if (typeof record.actionType === "string") {
+      annotations.operationType = record.actionType;
+    }
+    const operationKey = record.action ?? record.actionKey;
+    if (typeof operationKey === "string") {
+      annotations.operationKey = operationKey;
+    }
+  }
+  return { ...annotations };
+}
+var operationAnnotatorPlugin = defineHook({
+  namespace: "zapier",
+  name: "operationAnnotator",
+  annotator: ({ input }) => zapierAnnotate({ input })
+});
+
 // src/plugins/eventEmission/index.ts
-var TELEMETRY_EMIT_TIMEOUT_MS = 300;
+var TELEMETRY_EMIT_TIMEOUT_MILLISECONDS = 300;
 var registeredListeners = {};
 function removeExistingListeners() {
   const events = [
@@ -14787,7 +15032,7 @@ async function emitWithTimeout(transport, subject, event) {
     await Promise.race([
       transport.emit(subject, event),
       new Promise((resolve2) => {
-        const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS);
+        const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MILLISECONDS);
         if (typeof timer.unref === "function") {
           timer.unref();
         }
@@ -15140,7 +15385,8 @@ var zapierSdkPlugin = definePlugin({
     connectionsPlugin,
     capabilitiesPlugin,
     eventEmissionPlugin,
-    eventEmissionHookPlugin
+    eventEmissionHookPlugin,
+    operationAnnotatorPlugin
   ],
   exports: [
     // The registry reporter: previously synthesized by the legacy merge,
@@ -15226,14 +15472,14 @@ function createZapierSdk(options = {}) {
 
 // src/utils/batch-utils.ts
 var DEFAULT_CONCURRENCY = 10;
-var BATCH_START_DELAY_MS = 25;
-var DEFAULT_BATCH_TIMEOUT_MS = 18e4;
+var BATCH_START_DELAY_MILLISECONDS = 25;
+var DEFAULT_BATCH_TIMEOUT_MILLISECONDS = 18e4;
 async function batch(tasks, options = {}) {
   const {
     concurrency = DEFAULT_CONCURRENCY,
     retry = true,
-    batchDelay = BATCH_START_DELAY_MS,
-    timeoutMs = DEFAULT_BATCH_TIMEOUT_MS,
+    batchDelay = BATCH_START_DELAY_MILLISECONDS,
+    timeoutMs = DEFAULT_BATCH_TIMEOUT_MILLISECONDS,
     taskTimeoutMs
   } = options;
   if (concurrency <= 0) {
@@ -15326,11 +15572,15 @@ var BaseSdkOptionsSchema = zod.z.object({
    */
   maxNetworkRetries: zod.z.number().optional().describe("Max retries for rate-limited requests (default: 3).").meta({ valueHint: "count" }),
   /**
-   * Maximum delay in milliseconds to wait for a rate limit retry.
+   * Maximum delay in seconds to wait for a rate-limit retry.
    * If the server requests a longer delay, the request fails immediately.
-   * Default is 60000 (60 seconds).
+   * Default is 60 (60 seconds).
    */
-  maxNetworkRetryDelayMs: zod.z.number().optional().describe("Max delay in ms to wait for retry (default: 60000).").meta({ valueHint: "ms" }),
+  maxNetworkRetryDelaySeconds: zod.z.number().optional().describe(
+    "Max delay in seconds to wait for a rate-limit retry (default: 60)."
+  ).meta({ valueHint: "seconds" }),
+  /** @deprecated Use `maxNetworkRetryDelaySeconds` instead. */
+  maxNetworkRetryDelayMs: zod.z.number().optional().describe("Max delay in ms to wait for retry (default: 60000).").meta({ valueHint: "ms", deprecated: true }),
   /**
    * Maximum number of concurrent in-flight HTTP requests per client.
    * Requests beyond this limit queue in FIFO order until a slot frees.
@@ -15349,7 +15599,9 @@ var BaseSdkOptionsSchema = zod.z.object({
   ]).optional().describe(
     `Max concurrent in-flight HTTP requests (default: 200, max: ${MAX_CONCURRENCY_LIMIT}).`
   ).meta({ valueHint: "count" }),
-  approvalTimeoutMs: zod.z.number().optional().describe("Timeout in ms for approval polling. Default: 600000 (10 min).").meta({ valueHint: "ms" }),
+  approvalTimeoutSeconds: zod.z.number().optional().describe("Timeout in seconds for approval polling. Default: 600 (10 min).").meta({ valueHint: "seconds" }),
+  /** @deprecated Use `approvalTimeoutSeconds` instead. */
+  approvalTimeoutMs: zod.z.number().optional().describe("Timeout in ms for approval polling. Default: 600000 (10 min).").meta({ valueHint: "ms", deprecated: true }),
   maxApprovalRetries: zod.z.number().optional().describe(
     "Maximum number of sequential approval rounds per request (one per gating policy) before giving up. Default: 2."
   ),
@@ -15386,7 +15638,8 @@ var registryPlugin = (_sdk) => {
 exports.API_ID = API_ID;
 exports.ActionKeyPropertySchema = ActionKeyPropertySchema;
 exports.ActionPropertySchema = ActionPropertySchema;
-exports.ActionTimeoutMsPropertySchema = ActionTimeoutMsPropertySchema;
+exports.ActionTimeoutMillisecondsPropertySchema = ActionTimeoutMillisecondsPropertySchema;
+exports.ActionTimeoutSecondsPropertySchema = ActionTimeoutSecondsPropertySchema;
 exports.ActionTypePropertySchema = ActionTypePropertySchema;
 exports.AppKeyPropertySchema = AppKeyPropertySchema;
 exports.AppPropertySchema = AppPropertySchema;
@@ -15397,7 +15650,7 @@ exports.BaseSdkOptionsSchema = BaseSdkOptionsSchema;
 exports.CONNECTIONS_ID = CONNECTIONS_ID;
 exports.CONTEXT = CONTEXT;
 exports.CONTEXT_CACHE_MAX_SIZE = CONTEXT_CACHE_MAX_SIZE;
-exports.CONTEXT_CACHE_TTL_MS = CONTEXT_CACHE_TTL_MS;
+exports.CONTEXT_CACHE_TTL_MILLISECONDS = CONTEXT_CACHE_TTL_MILLISECONDS;
 exports.CORE_ERROR_SYMBOL = CORE_ERROR_SYMBOL;
 exports.CORE_OPTIONS_ID = CORE_OPTIONS_ID;
 exports.CORE_SIGNAL_SYMBOL = CORE_SIGNAL_SYMBOL;
@@ -15414,8 +15667,8 @@ exports.CoreSignal = CoreSignal;
 exports.CredentialsFunctionSchema = CredentialsFunctionSchema;
 exports.CredentialsObjectSchema = CredentialsObjectSchema;
 exports.CredentialsSchema = CredentialsSchema;
-exports.DEFAULT_ACTION_TIMEOUT_MS = DEFAULT_ACTION_TIMEOUT_MS;
-exports.DEFAULT_APPROVAL_TIMEOUT_MS = DEFAULT_APPROVAL_TIMEOUT_MS;
+exports.DEFAULT_ACTION_TIMEOUT_MILLISECONDS = DEFAULT_ACTION_TIMEOUT_MILLISECONDS;
+exports.DEFAULT_APPROVAL_TIMEOUT_MILLISECONDS = DEFAULT_APPROVAL_TIMEOUT_MILLISECONDS;
 exports.DEFAULT_CONFIG_PATH = DEFAULT_CONFIG_PATH;
 exports.DEFAULT_MAX_APPROVAL_RETRIES = DEFAULT_MAX_APPROVAL_RETRIES;
 exports.DEFAULT_PAGE_SIZE = DEFAULT_PAGE_SIZE;
@@ -15453,7 +15706,7 @@ exports.WatchTriggerInboxSchema = WatchTriggerInboxSchema;
 exports.ZAPIER_BASE_URL = ZAPIER_BASE_URL;
 exports.ZAPIER_MAX_CONCURRENT_REQUESTS = ZAPIER_MAX_CONCURRENT_REQUESTS;
 exports.ZAPIER_MAX_NETWORK_RETRIES = ZAPIER_MAX_NETWORK_RETRIES;
-exports.ZAPIER_MAX_NETWORK_RETRY_DELAY_MS = ZAPIER_MAX_NETWORK_RETRY_DELAY_MS;
+exports.ZAPIER_MAX_NETWORK_RETRY_DELAY_MILLISECONDS = ZAPIER_MAX_NETWORK_RETRY_DELAY_MILLISECONDS;
 exports.ZapierAbortDrainSignal = ZapierAbortDrainSignal;
 exports.ZapierActionError = ZapierActionError;
 exports.ZapierApiError = ZapierApiError;
@@ -15615,6 +15868,7 @@ exports.manifestPlugin = manifestPlugin;
 exports.manifestPluginRef = manifestPluginRef;
 exports.omitExports = omitExports;
 exports.openEnum = openEnum;
+exports.operationAnnotatorPlugin = operationAnnotatorPlugin;
 exports.parseConcurrencyEnvVar = parseConcurrencyEnvVar;
 exports.readManifestFromFile = readManifestFromFile;
 exports.registryPlugin = registryPlugin;