@zapier/zapier-sdk 0.98.0 → 0.98.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @zapier/zapier-sdk
 
+## 0.98.1
+
+### Patch Changes
+
+- cd0616e: _This release contains no user-facing changes._
+
 ## 0.98.0
 
 ### Minor Changes

package/dist/{chunk-UJLLXQ3L.mjs → chunk-CHT6AJG3.mjs}

@@ -2217,8 +2217,9 @@ function bindValue({
   frameworkOrigin = false
 }) {
   if (entry.pluginType === "property" && entry.getValue) {
+    const getValue = entry.getValue;
     Object.defineProperty(target, key, {
-      get: entry.getValue,
+      get: ctx ? () => getValue(ctx) : getValue,
       enumerable: true,
       configurable: true
     });
@@ -2756,9 +2757,14 @@ function buildEagerArtifacts(descriptors, context, states) {
         plugins[id] = {
           pluginType: "property",
           name: descriptor.name,
-          getValue: () => get({
-            imports: buildImports({ plugins, importBindings }),
-            state: states.get(id)
+          getValue: (callContext) => get({
+            imports: buildImports({
+              plugins,
+              importBindings,
+              ctx: callContext
+            }),
+            state: states.get(id),
+            callContext
           }),
           meta: descriptor.meta,
           dynamicMembers: descriptor.dynamicMembers
@@ -5664,6 +5670,11 @@ function createSemaphore(maxPermits) {
     }
   };
 }
+
+// src/api/correlation.ts
+var CORRELATION_CALL_ID = Symbol(
+  "zapier.correlationCallId"
+);
 var ClientCredentialsObjectSchema = z.object({
   type: z.enum(["client_credentials"]).optional().meta({ internal: true }),
   clientId: z.string().describe("OAuth client ID for authentication.").meta({ valueHint: "id" }),
@@ -6580,7 +6591,7 @@ function parseDeprecationDate(value) {
 }
 
 // src/sdk-version.ts
-var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.98.0" : void 0) || "unknown";
+var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.98.1" : void 0) || "unknown";
 
 // src/utils/open-url.ts
 var nodePrefix = "node:";
@@ -6842,14 +6853,15 @@ var ZapierApiClient = class {
      * directly and drifting.
      */
     this.rawFetchUrl = async (url, init, pathConfig2) => {
-      if (init?.body && (isPlainObject(init.body) || Array.isArray(init.body))) {
-        init.body = JSON.stringify(init.body);
+      const { [CORRELATION_CALL_ID]: callId, ...fetchInit } = init ?? {};
+      if (fetchInit.body && (isPlainObject(fetchInit.body) || Array.isArray(fetchInit.body))) {
+        fetchInit.body = JSON.stringify(fetchInit.body);
       }
       const builtHeaders = await this.buildHeaders(
-        init,
+        fetchInit,
         pathConfig2
       );
-      const inputHeaders = new Headers(init?.headers ?? {});
+      const inputHeaders = new Headers(fetchInit.headers ?? {});
       const mergedHeaders = new Headers();
       builtHeaders.forEach((value, key) => {
         mergedHeaders.set(key, value);
@@ -6857,11 +6869,11 @@ var ZapierApiClient = class {
       inputHeaders.forEach((value, key) => {
         mergedHeaders.set(key, value);
       });
-      this.applyTelemetryHeaders(mergedHeaders);
+      this.applyTelemetryHeaders({ headers: mergedHeaders, callId });
       let retries = 0;
       while (true) {
         const response = await this.options.fetch(url, {
-          ...init,
+          ...fetchInit,
           headers: mergedHeaders
         });
         if (response.status !== 429) {
@@ -6982,12 +6994,13 @@ var ZapierApiClient = class {
         );
         const askStatementIds = askStatementIdsHeader ? JSON.parse(askStatementIdsHeader) : void 0;
         try {
-          await this.runOneApprovalRound(
-            approvalContext,
-            approvalMode,
-            init?.signal ?? void 0,
-            askStatementIds
-          );
+          await this.runOneApprovalRound({
+            buildContext: approvalContext,
+            mode: approvalMode,
+            signal: init?.signal ?? void 0,
+            askStatementIds,
+            callId: init?.[CORRELATION_CALL_ID]
+          });
         } catch (error) {
           return { response, approvalRoundError: error };
         }
@@ -7129,7 +7142,8 @@ var ZapierApiClient = class {
           method: "GET",
           searchParams: options.searchParams,
           authRequired: options.authRequired,
-          signal: options.signal
+          signal: options.signal,
+          [CORRELATION_CALL_ID]: options[CORRELATION_CALL_ID]
         }),
         initialDelay: options.initialDelayMilliseconds ?? options.initialDelay,
         timeoutMs: options.timeoutMilliseconds ?? options.timeoutMs,
@@ -7424,7 +7438,10 @@ var ZapierApiClient = class {
   // gateway now expects) and the legacy `x-zapier-*` names. The legacy names are
   // kept for backward compatibility with consumers that haven't migrated yet;
   // they can be removed once nothing reads them.
-  applyTelemetryHeaders(headers) {
+  applyTelemetryHeaders({
+    headers,
+    callId
+  }) {
     headers.set("zapier-sdk-version", SDK_VERSION);
     headers.set("x-zapier-sdk-version", SDK_VERSION);
     const sdkService = getZapierSdkService();
@@ -7447,6 +7464,11 @@ var ZapierApiClient = class {
         headers.set("zapier-sdk-package-operation", packageOperation);
       }
     }
+    if (callId) {
+      headers.set("zapier-correlation-id", callId);
+    } else {
+      headers.delete("zapier-correlation-id");
+    }
   }
   // Helper to perform HTTP requests with JSON handling
   async fetchJson(method, path, data, options = {}) {
@@ -7589,7 +7611,13 @@ var ZapierApiClient = class {
    * Caller is responsible for passing a non-"disabled" mode; this method
    * unconditionally creates an approval.
    */
-  async runOneApprovalRound(buildContext, mode, signal, askStatementIds) {
+  async runOneApprovalRound({
+    buildContext,
+    mode,
+    signal,
+    askStatementIds,
+    callId
+  }) {
     const context = buildContext();
     let approvalResponse;
     try {
@@ -7603,7 +7631,8 @@ var ZapierApiClient = class {
           context,
           ...askStatementIds?.length ? { ask_statement_ids: askStatementIds } : {}
         }),
-        signal
+        signal,
+        [CORRELATION_CALL_ID]: callId
       });
     } catch (err) {
       if (isAbortError(err)) throw err;
@@ -7739,7 +7768,10 @@ var ZapierApiClient = class {
         approvalId: approval.id,
         streamUrl,
         signal: streamAbortController.signal,
-        stream: (url, streamInit) => this.streamTrustedJsonUrl(url, streamInit),
+        stream: (url, streamInit) => this.streamTrustedJsonUrl(url, {
+          ...streamInit,
+          [CORRELATION_CALL_ID]: callId
+        }),
         emitEvent: (type, payload) => this.emitEvent(type, payload)
       });
     }
@@ -7748,7 +7780,8 @@ var ZapierApiClient = class {
       () => this.rawFetchUrl(approval.poll_url, {
         method: "GET",
         headers: { Accept: "application/json" },
-        signal
+        signal,
+        [CORRELATION_CALL_ID]: callId
       })
     );
     const pollApprovalUntilComplete = async (isPending, deadlineMs = approvalDeadline) => {
@@ -7940,6 +7973,23 @@ var API_ID = "zapier/api";
 var apiPluginRef = declareProperty({
   id: API_ID
 });
+function withCorrelationId({
+  client,
+  callId
+}) {
+  const stamp = (options) => ({ ...options, [CORRELATION_CALL_ID]: callId });
+  return {
+    get: (path, options) => client.get(path, stamp(options)),
+    post: (path, data, options) => client.post(path, data, stamp(options)),
+    put: (path, data, options) => client.put(path, data, stamp(options)),
+    patch: (path, data, options) => client.patch(path, data, stamp(options)),
+    delete: (path, data, options) => client.delete(path, data, stamp(options)),
+    poll: (path, options) => client.poll(path, stamp(options)),
+    fetch: (path, init) => client.fetch(path, stamp(init)),
+    fetchStream: (path, init) => client.fetchStream(path, stamp(init)),
+    fetchJsonStream: (path, init) => client.fetchJsonStream(path, stamp(init))
+  };
+}
 var apiPlugin = defineProperty({
   namespace: "zapier",
   name: "api",
@@ -7980,7 +8030,7 @@ var apiPlugin = defineProperty({
       callerPackage
     });
   },
-  get: ({ state }) => state
+  get: ({ state, callContext }) => callContext?.callId ? withCorrelationId({ client: state, callId: callContext.callId }) : state
 });
 var RESOLVE_CREDENTIALS_ID = "zapier/resolveCredentials";
 var resolveCredentialsPluginRef = declareProperty({ id: RESOLVE_CREDENTIALS_ID });
@@ -8541,8 +8591,11 @@ var manifestPlugin = defineProperty({
   namespace: "zapier",
   name: "manifest",
   imports: [sdkOptionsPluginRef, apiPluginRef],
+  // Deliberately does not read `imports.api`: at build time that resolves to the
+  // bare shared client, and capturing it here would strip the correlation id off
+  // every slug-resolution request. `get` supplies the reading call's client
+  // instead.
   setup: ({ imports }) => {
-    const api = imports.api;
     const { manifestPath = DEFAULT_CONFIG_PATH, manifest } = imports.sdkOptions ?? {};
     let resolvedManifest;
     async function resolveManifest() {
@@ -8560,7 +8613,10 @@ var manifestPlugin = defineProperty({
       }
       return resolvedManifest;
     };
-    const getVersionedImplementationId = async (appKey) => {
+    const getVersionedImplementationId = async ({
+      appKey,
+      api
+    }) => {
       const resolvedApps = await resolveAppKeys({
         appKeys: [appKey],
         api,
@@ -8570,14 +8626,14 @@ var manifestPlugin = defineProperty({
       if (!resolvedApp) return null;
       return `${resolvedApp.implementationName}@${resolvedApp.version || "latest"}`;
     };
-    const updateManifestEntry = async (options) => {
-      const {
-        appKey,
-        entry,
-        configPath = DEFAULT_CONFIG_PATH,
-        skipWrite = false,
-        manifest: inputManifest
-      } = options;
+    const updateManifestEntry = async ({
+      api,
+      appKey,
+      entry,
+      configPath = DEFAULT_CONFIG_PATH,
+      skipWrite = false,
+      manifest: inputManifest
+    }) => {
       const manifest2 = inputManifest || await readManifestFromFile(configPath) || { apps: {} };
       let existingEntry = findManifestEntry({
         appKey,
@@ -8628,7 +8684,7 @@ var manifestPlugin = defineProperty({
     };
     return {
       getVersionedImplementationId,
-      resolveAppKeys: async ({ appKeys }) => resolveAppKeys({
+      resolveAppKeys: async ({ appKeys, api }) => resolveAppKeys({
         appKeys,
         api,
         manifest: await getResolvedManifest() ?? { apps: {} }
@@ -8641,7 +8697,19 @@ var manifestPlugin = defineProperty({
       updateManifestEntry
     };
   },
-  get: ({ state }) => state
+  // Bind the reading call's API client onto the slug-resolving entry points so
+  // their requests carry that call's correlation id. The manifest-only reads pass
+  // straight through.
+  get: ({ imports, state }) => {
+    const api = imports.api;
+    return {
+      getVersionedImplementationId: (appKey) => state.getVersionedImplementationId({ appKey, api }),
+      resolveAppKeys: ({ appKeys }) => state.resolveAppKeys({ appKeys, api }),
+      getResolvedManifest: state.getResolvedManifest,
+      getManifestConnections: state.getManifestConnections,
+      updateManifestEntry: (options) => state.updateManifestEntry({ ...options, api })
+    };
+  }
 });
 
 // src/plugins/connections/index.ts
@@ -15742,6 +15810,7 @@ function buildErrorEventWithContext(data, context = {}) {
 function buildMethodCalledEvent(data, context = {}) {
   return {
     ...createBaseEvent(context),
+    correlation_id: data.correlation_id ?? context.correlation_id ?? null,
     method_name: data.method_name ?? null,
     method_module: data.method_module ?? null,
     execution_duration_ms: data.execution_duration_ms,
@@ -15799,6 +15868,7 @@ function makeMethodEndHook(emitMethodCalled) {
     args,
     isPaginated,
     depth,
+    callId,
     callOrigin,
     annotations,
     durationMs,
@@ -15808,6 +15878,9 @@ function makeMethodEndHook(emitMethodCalled) {
     const metadata = readMethodMetadata(annotations);
     emitMethodCalled({
       method_name: methodName,
+      // The per-call correlation id (also the `zapier-correlation-id` header on
+      // this call's requests). Not the `call_context` surface label.
+      correlation_id: callId ?? null,
       execution_duration_ms: durationMs,
       success_flag: !error,
       error_message: error?.message ?? null,

package/dist/{chunk-XZU6XQNV.cjs → chunk-IZRPXHWO.cjs}

@@ -2219,8 +2219,9 @@ function bindValue({
   frameworkOrigin = false
 }) {
   if (entry.pluginType === "property" && entry.getValue) {
+    const getValue = entry.getValue;
     Object.defineProperty(target, key, {
-      get: entry.getValue,
+      get: ctx ? () => getValue(ctx) : getValue,
       enumerable: true,
       configurable: true
     });
@@ -2758,9 +2759,14 @@ function buildEagerArtifacts(descriptors, context, states) {
         plugins[id] = {
           pluginType: "property",
           name: descriptor.name,
-          getValue: () => get({
-            imports: buildImports({ plugins, importBindings }),
-            state: states.get(id)
+          getValue: (callContext) => get({
+            imports: buildImports({
+              plugins,
+              importBindings,
+              ctx: callContext
+            }),
+            state: states.get(id),
+            callContext
           }),
           meta: descriptor.meta,
           dynamicMembers: descriptor.dynamicMembers
@@ -5666,6 +5672,11 @@ function createSemaphore(maxPermits) {
     }
   };
 }
+
+// src/api/correlation.ts
+var CORRELATION_CALL_ID = Symbol(
+  "zapier.correlationCallId"
+);
 var ClientCredentialsObjectSchema = zod.z.object({
   type: zod.z.enum(["client_credentials"]).optional().meta({ internal: true }),
   clientId: zod.z.string().describe("OAuth client ID for authentication.").meta({ valueHint: "id" }),
@@ -6582,7 +6593,7 @@ function parseDeprecationDate(value) {
 }
 
 // src/sdk-version.ts
-var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.98.0" : void 0) || "unknown";
+var SDK_VERSION = (typeof process !== "undefined" && process.env ? "0.98.1" : void 0) || "unknown";
 
 // src/utils/open-url.ts
 var nodePrefix = "node:";
@@ -6844,14 +6855,15 @@ var ZapierApiClient = class {
      * directly and drifting.
      */
     this.rawFetchUrl = async (url, init, pathConfig2) => {
-      if (init?.body && (isPlainObject(init.body) || Array.isArray(init.body))) {
-        init.body = JSON.stringify(init.body);
+      const { [CORRELATION_CALL_ID]: callId, ...fetchInit } = init ?? {};
+      if (fetchInit.body && (isPlainObject(fetchInit.body) || Array.isArray(fetchInit.body))) {
+        fetchInit.body = JSON.stringify(fetchInit.body);
       }
       const builtHeaders = await this.buildHeaders(
-        init,
+        fetchInit,
         pathConfig2
       );
-      const inputHeaders = new Headers(init?.headers ?? {});
+      const inputHeaders = new Headers(fetchInit.headers ?? {});
       const mergedHeaders = new Headers();
       builtHeaders.forEach((value, key) => {
         mergedHeaders.set(key, value);
@@ -6859,11 +6871,11 @@ var ZapierApiClient = class {
       inputHeaders.forEach((value, key) => {
         mergedHeaders.set(key, value);
       });
-      this.applyTelemetryHeaders(mergedHeaders);
+      this.applyTelemetryHeaders({ headers: mergedHeaders, callId });
       let retries = 0;
       while (true) {
         const response = await this.options.fetch(url, {
-          ...init,
+          ...fetchInit,
           headers: mergedHeaders
         });
         if (response.status !== 429) {
@@ -6984,12 +6996,13 @@ var ZapierApiClient = class {
         );
         const askStatementIds = askStatementIdsHeader ? JSON.parse(askStatementIdsHeader) : void 0;
         try {
-          await this.runOneApprovalRound(
-            approvalContext,
-            approvalMode,
-            init?.signal ?? void 0,
-            askStatementIds
-          );
+          await this.runOneApprovalRound({
+            buildContext: approvalContext,
+            mode: approvalMode,
+            signal: init?.signal ?? void 0,
+            askStatementIds,
+            callId: init?.[CORRELATION_CALL_ID]
+          });
         } catch (error) {
           return { response, approvalRoundError: error };
         }
@@ -7131,7 +7144,8 @@ var ZapierApiClient = class {
           method: "GET",
           searchParams: options.searchParams,
           authRequired: options.authRequired,
-          signal: options.signal
+          signal: options.signal,
+          [CORRELATION_CALL_ID]: options[CORRELATION_CALL_ID]
         }),
         initialDelay: options.initialDelayMilliseconds ?? options.initialDelay,
         timeoutMs: options.timeoutMilliseconds ?? options.timeoutMs,
@@ -7426,7 +7440,10 @@ var ZapierApiClient = class {
   // gateway now expects) and the legacy `x-zapier-*` names. The legacy names are
   // kept for backward compatibility with consumers that haven't migrated yet;
   // they can be removed once nothing reads them.
-  applyTelemetryHeaders(headers) {
+  applyTelemetryHeaders({
+    headers,
+    callId
+  }) {
     headers.set("zapier-sdk-version", SDK_VERSION);
     headers.set("x-zapier-sdk-version", SDK_VERSION);
     const sdkService = getZapierSdkService();
@@ -7449,6 +7466,11 @@ var ZapierApiClient = class {
         headers.set("zapier-sdk-package-operation", packageOperation);
       }
     }
+    if (callId) {
+      headers.set("zapier-correlation-id", callId);
+    } else {
+      headers.delete("zapier-correlation-id");
+    }
   }
   // Helper to perform HTTP requests with JSON handling
   async fetchJson(method, path, data, options = {}) {
@@ -7591,7 +7613,13 @@ var ZapierApiClient = class {
    * Caller is responsible for passing a non-"disabled" mode; this method
    * unconditionally creates an approval.
    */
-  async runOneApprovalRound(buildContext, mode, signal, askStatementIds) {
+  async runOneApprovalRound({
+    buildContext,
+    mode,
+    signal,
+    askStatementIds,
+    callId
+  }) {
     const context = buildContext();
     let approvalResponse;
     try {
@@ -7605,7 +7633,8 @@ var ZapierApiClient = class {
           context,
           ...askStatementIds?.length ? { ask_statement_ids: askStatementIds } : {}
         }),
-        signal
+        signal,
+        [CORRELATION_CALL_ID]: callId
       });
     } catch (err) {
       if (isAbortError(err)) throw err;
@@ -7741,7 +7770,10 @@ var ZapierApiClient = class {
         approvalId: approval.id,
         streamUrl,
         signal: streamAbortController.signal,
-        stream: (url, streamInit) => this.streamTrustedJsonUrl(url, streamInit),
+        stream: (url, streamInit) => this.streamTrustedJsonUrl(url, {
+          ...streamInit,
+          [CORRELATION_CALL_ID]: callId
+        }),
         emitEvent: (type, payload) => this.emitEvent(type, payload)
       });
     }
@@ -7750,7 +7782,8 @@ var ZapierApiClient = class {
       () => this.rawFetchUrl(approval.poll_url, {
         method: "GET",
         headers: { Accept: "application/json" },
-        signal
+        signal,
+        [CORRELATION_CALL_ID]: callId
       })
     );
     const pollApprovalUntilComplete = async (isPending, deadlineMs = approvalDeadline) => {
@@ -7942,6 +7975,23 @@ var API_ID = "zapier/api";
 var apiPluginRef = declareProperty({
   id: API_ID
 });
+function withCorrelationId({
+  client,
+  callId
+}) {
+  const stamp = (options) => ({ ...options, [CORRELATION_CALL_ID]: callId });
+  return {
+    get: (path, options) => client.get(path, stamp(options)),
+    post: (path, data, options) => client.post(path, data, stamp(options)),
+    put: (path, data, options) => client.put(path, data, stamp(options)),
+    patch: (path, data, options) => client.patch(path, data, stamp(options)),
+    delete: (path, data, options) => client.delete(path, data, stamp(options)),
+    poll: (path, options) => client.poll(path, stamp(options)),
+    fetch: (path, init) => client.fetch(path, stamp(init)),
+    fetchStream: (path, init) => client.fetchStream(path, stamp(init)),
+    fetchJsonStream: (path, init) => client.fetchJsonStream(path, stamp(init))
+  };
+}
 var apiPlugin = defineProperty({
   namespace: "zapier",
   name: "api",
@@ -7982,7 +8032,7 @@ var apiPlugin = defineProperty({
       callerPackage
     });
   },
-  get: ({ state }) => state
+  get: ({ state, callContext }) => callContext?.callId ? withCorrelationId({ client: state, callId: callContext.callId }) : state
 });
 var RESOLVE_CREDENTIALS_ID = "zapier/resolveCredentials";
 var resolveCredentialsPluginRef = declareProperty({ id: RESOLVE_CREDENTIALS_ID });
@@ -8543,8 +8593,11 @@ var manifestPlugin = defineProperty({
   namespace: "zapier",
   name: "manifest",
   imports: [sdkOptionsPluginRef, apiPluginRef],
+  // Deliberately does not read `imports.api`: at build time that resolves to the
+  // bare shared client, and capturing it here would strip the correlation id off
+  // every slug-resolution request. `get` supplies the reading call's client
+  // instead.
   setup: ({ imports }) => {
-    const api = imports.api;
     const { manifestPath = DEFAULT_CONFIG_PATH, manifest } = imports.sdkOptions ?? {};
     let resolvedManifest;
     async function resolveManifest() {
@@ -8562,7 +8615,10 @@ var manifestPlugin = defineProperty({
       }
       return resolvedManifest;
     };
-    const getVersionedImplementationId = async (appKey) => {
+    const getVersionedImplementationId = async ({
+      appKey,
+      api
+    }) => {
       const resolvedApps = await resolveAppKeys({
         appKeys: [appKey],
         api,
@@ -8572,14 +8628,14 @@ var manifestPlugin = defineProperty({
       if (!resolvedApp) return null;
       return `${resolvedApp.implementationName}@${resolvedApp.version || "latest"}`;
     };
-    const updateManifestEntry = async (options) => {
-      const {
-        appKey,
-        entry,
-        configPath = DEFAULT_CONFIG_PATH,
-        skipWrite = false,
-        manifest: inputManifest
-      } = options;
+    const updateManifestEntry = async ({
+      api,
+      appKey,
+      entry,
+      configPath = DEFAULT_CONFIG_PATH,
+      skipWrite = false,
+      manifest: inputManifest
+    }) => {
       const manifest2 = inputManifest || await readManifestFromFile(configPath) || { apps: {} };
       let existingEntry = findManifestEntry({
         appKey,
@@ -8630,7 +8686,7 @@ var manifestPlugin = defineProperty({
     };
     return {
       getVersionedImplementationId,
-      resolveAppKeys: async ({ appKeys }) => resolveAppKeys({
+      resolveAppKeys: async ({ appKeys, api }) => resolveAppKeys({
         appKeys,
         api,
         manifest: await getResolvedManifest() ?? { apps: {} }
@@ -8643,7 +8699,19 @@ var manifestPlugin = defineProperty({
       updateManifestEntry
     };
   },
-  get: ({ state }) => state
+  // Bind the reading call's API client onto the slug-resolving entry points so
+  // their requests carry that call's correlation id. The manifest-only reads pass
+  // straight through.
+  get: ({ imports, state }) => {
+    const api = imports.api;
+    return {
+      getVersionedImplementationId: (appKey) => state.getVersionedImplementationId({ appKey, api }),
+      resolveAppKeys: ({ appKeys }) => state.resolveAppKeys({ appKeys, api }),
+      getResolvedManifest: state.getResolvedManifest,
+      getManifestConnections: state.getManifestConnections,
+      updateManifestEntry: (options) => state.updateManifestEntry({ ...options, api })
+    };
+  }
 });
 
 // src/plugins/connections/index.ts
@@ -15744,6 +15812,7 @@ function buildErrorEventWithContext(data, context = {}) {
 function buildMethodCalledEvent(data, context = {}) {
   return {
     ...createBaseEvent(context),
+    correlation_id: data.correlation_id ?? context.correlation_id ?? null,
     method_name: data.method_name ?? null,
     method_module: data.method_module ?? null,
     execution_duration_ms: data.execution_duration_ms,
@@ -15801,6 +15870,7 @@ function makeMethodEndHook(emitMethodCalled) {
     args,
     isPaginated,
     depth,
+    callId,
     callOrigin,
     annotations,
     durationMs,
@@ -15810,6 +15880,9 @@ function makeMethodEndHook(emitMethodCalled) {
     const metadata = readMethodMetadata(annotations);
     emitMethodCalled({
       method_name: methodName,
+      // The per-call correlation id (also the `zapier-correlation-id` header on
+      // this call's requests). Not the `call_context` surface label.
+      correlation_id: callId ?? null,
       execution_duration_ms: durationMs,
       success_flag: !error,
       error_message: error?.message ?? null,