@trigger.dev/core 4.8.0 → 4.8.2

package/dist/commonjs/v3/apiClient/index.js

@@ -23,7 +23,10 @@ const nanoid_1 = require("nanoid");
 const v4_1 = require("zod/v4");
 const version_js_1 = require("../../version.js");
 const apiKeys_js_1 = require("../apiKeys.js");
+const runToken_js_1 = require("../runToken.js");
 const jwt_js_1 = require("../jwt.js");
+const runTokenOperations_js_1 = require("../runTokenOperations.js");
+const sdkCredentialTelemetry_js_1 = require("../sdkCredentialTelemetry.js");
 const index_js_1 = require("../schemas/index.js");
 const wireProtocol_js_1 = require("../sessionStreams/wireProtocol.js");
 const task_context_api_js_1 = require("../task-context-api.js");
@@ -56,7 +59,10 @@ const CreatePublicTokenResponseBody = v4_1.z.object({ token: v4_1.z.string() });
  * Trigger.dev v3 API client
  */
 class ApiClient {
+    resolveAccessToken;
     baseUrl;
+    // ponytail: the configured credential, so the root key while it is injected into runs.
+    // TRI-15076 decides this property's contract once runs only receive run tokens.
     accessToken;
     previewBranch;
     futureFlags;
@@ -66,7 +72,8 @@ class ApiClient {
     constructor(baseUrl, accessToken, 
     // Carries the branch for any branchable env (preview or dev) — both ride the
     // x-trigger-branch header, and the server disambiguates by the token's env.
-    previewBranch, requestOptions = {}, futureFlags = {}, refreshAccessToken) {
+    previewBranch, requestOptions = {}, futureFlags = {}, refreshAccessToken, resolveAccessToken) {
+        this.resolveAccessToken = resolveAccessToken;
         this.accessToken = accessToken;
         this.refreshAccessToken = refreshAccessToken;
         this.baseUrl = baseUrl.replace(/\/$/, "");
@@ -76,64 +83,106 @@ class ApiClient {
         this.defaultRequestOptions = mergeRequestOptions(DEFAULT_ZOD_FETCH_OPTIONS, restRequestOptions);
         this.futureFlags = futureFlags;
     }
+    getAccessToken(operation, recordSelection = false) {
+        return this.getAuthenticationHeaders(operation, recordSelection).Authorization.slice("Bearer ".length);
+    }
+    getAuthenticationHeaders(operation, recordSelection = true) {
+        const selection = this.resolveAccessToken
+            ? this.resolveAccessToken(operation, recordSelection)
+            : this.accessToken;
+        const token = typeof selection === "object" ? selection.accessToken : selection;
+        if (!token)
+            throw new Error(`No API credential available for ${operation}`);
+        const headers = {
+            Authorization: `Bearer ${token}`,
+        };
+        if (typeof selection === "object" &&
+            task_context_api_js_1.taskContext.isInsideTask &&
+            selection.reason !== "outside_task" &&
+            !this.refreshAccessToken &&
+            (0, runTokenOperations_js_1.isRunTokenOperation)(operation)) {
+            headers["x-trigger-worker"] = "true";
+            headers[sdkCredentialTelemetry_js_1.SDK_CREDENTIAL_OPERATION_HEADER] = operation;
+            headers[sdkCredentialTelemetry_js_1.SDK_CREDENTIAL_REASON_HEADER] = selection.reason;
+        }
+        return headers;
+    }
     /**
      * Key for signing a public access token locally. Only root keys can do this —
      * an additional key isn't the environment's signing material, so a token
      * signed with one would never verify. Throw rather than return a dead token.
      */
     get #selfSigningKey() {
-        if ((0, apiKeys_js_1.isAdditionalApiKey)(this.accessToken)) {
-            throw new Error("This additional API key cannot self-sign public tokens, and the server did not return one. Upgrade the server or use the root API key.");
+        if ((0, apiKeys_js_1.isAdditionalApiKey)(this.accessToken) || (0, runToken_js_1.isRunToken)(this.accessToken)) {
+            throw new Error("This credential cannot self-sign public tokens, and the server did not return one. Upgrade the server or use the root API key.");
         }
         return this.accessToken;
     }
     get fetchClient() {
-        const headers = this.#getHeaders(false);
         const fetchClient = (input, requestInit) => {
             const $requestInit = {
                 ...requestInit,
                 headers: {
                     ...requestInit?.headers,
-                    ...headers,
+                    ...this.#getHeaders(false, undefined, "default", true),
                 },
             };
             return fetch(input, $requestInit);
         };
         return fetchClient;
     }
-    getHeaders() {
-        return this.#getHeaders(false);
+    getHeaders(operation = "unknown") {
+        return this.#getHeaders(false, undefined, operation, true);
+    }
+    #requestOptions(operation, options, defaults = this.defaultRequestOptions) {
+        return {
+            ...mergeRequestOptions(defaults, options),
+            resolveHeaders: () => this.getAuthenticationHeaders(operation),
+        };
+    }
+    #requestFetch(operation, fetchClient) {
+        if (!this.resolveAccessToken || this.refreshAccessToken)
+            return fetchClient;
+        return (input, init) => {
+            const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined));
+            headers.delete(sdkCredentialTelemetry_js_1.SDK_CREDENTIAL_OPERATION_HEADER);
+            headers.delete(sdkCredentialTelemetry_js_1.SDK_CREDENTIAL_REASON_HEADER);
+            for (const [key, value] of Object.entries(this.getAuthenticationHeaders(operation))) {
+                headers.set(key, value);
+            }
+            return (fetchClient ?? fetch)(input, { ...init, headers });
+        };
     }
     /**
      * Header resolver handed to stream subscriptions so a connection rejected with
      * a 401/403 can reconnect with a freshly minted token. `undefined` when no
      * `refreshAccessToken` was configured, which keeps auth errors terminal.
      */
-    #resolveStreamHeaders() {
+    #resolveStreamHeaders(operation) {
         const refreshAccessToken = this.refreshAccessToken;
         if (!refreshAccessToken)
             return undefined;
         return async () => {
             const accessToken = await (0, refreshAccessToken_js_1.refreshAccessTokenOnce)(refreshAccessToken);
-            return this.#getHeaders(false, { Authorization: `Bearer ${accessToken}` });
+            return this.#getHeaders(false, { Authorization: `Bearer ${accessToken}` }, operation);
         };
     }
     /** As {@link ApiClient.#resolveStreamHeaders}, for the leaner realtime header set. */
-    #resolveRealtimeHeaders() {
+    #resolveRealtimeHeaders(operation) {
         const refreshAccessToken = this.refreshAccessToken;
         if (!refreshAccessToken)
             return undefined;
         return async () => {
             const accessToken = await (0, refreshAccessToken_js_1.refreshAccessTokenOnce)(refreshAccessToken);
-            return { ...this.#getRealtimeHeaders(), Authorization: `Bearer ${accessToken}` };
+            return { ...this.#getRealtimeHeaders(operation), Authorization: `Bearer ${accessToken}` };
         };
     }
     async getRunResult(runId, requestOptions) {
         try {
             return await (0, core_js_1.zodfetch)(index_js_1.TaskRunExecutionResult, `${this.baseUrl}/api/v1/runs/${runId}/result`, {
                 method: "GET",
-                headers: this.#getHeaders(false),
-            }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+                headers: this.#getHeaders(false, undefined, "getRunResult"),
+            }, this.#requestOptions("getRunResult", requestOptions));
         }
         catch (error) {
             if (error instanceof errors_js_1.ApiError) {
@@ -147,16 +196,16 @@ class ApiClient {
     async getBatchResults(batchId, requestOptions) {
         return await (0, core_js_1.zodfetch)(index_js_1.BatchTaskRunExecutionResult, `${this.baseUrl}/api/v1/batches/${batchId}/results`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "getBatchResults"),
+        }, this.#requestOptions("getBatchResults", requestOptions));
     }
     triggerTask(taskId, body, clientOptions, requestOptions) {
         const encodedTaskId = (0, encodeTaskIdForPath_js_1.encodeTaskIdForPath)(taskId);
         return (0, core_js_1.zodfetch)(index_js_1.TriggerTaskResponse, `${this.baseUrl}/api/v1/tasks/${encodedTaskId}/trigger`, {
             method: "POST",
-            headers: this.#getHeaders(clientOptions?.spanParentAsLink ?? false),
+            headers: this.#getHeaders(clientOptions?.spanParentAsLink ?? false, undefined, "triggerTask"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
+        }, this.#requestOptions("triggerTask", requestOptions))
             .withResponse()
             .then(async ({ data, response }) => {
             const jwtHeader = response.headers.get("x-trigger-jwt");
@@ -187,9 +236,9 @@ class ApiClient {
             method: "POST",
             headers: this.#getHeaders(clientOptions?.spanParentAsLink ?? false, {
                 "batch-processing-strategy": clientOptions?.processingStrategy,
-            }),
+            }, "batchTriggerV3"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
+        }, this.#requestOptions("batchTriggerV3", requestOptions))
             .withResponse()
             .then(async ({ data, response }) => {
             const jwtHeader = response.headers.get("x-trigger-jwt");
@@ -230,9 +279,9 @@ class ApiClient {
     createBatch(body, clientOptions, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CreateBatchResponse, `${this.baseUrl}/api/v3/batches`, {
             method: "POST",
-            headers: this.#getHeaders(clientOptions?.spanParentAsLink ?? false),
+            headers: this.#getHeaders(clientOptions?.spanParentAsLink ?? false, undefined, "createBatch"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
+        }, this.#requestOptions("createBatch", requestOptions))
             .withResponse()
             .then(async ({ data, response }) => {
             const jwtHeader = response.headers.get("x-trigger-jwt");
@@ -285,7 +334,7 @@ class ApiClient {
         return this.#streamBatchItemsWithRetry(batchId, stream, retryOptions);
     }
     async #streamBatchItemsWithRetry(batchId, stream, retryOptions, attempt = 1) {
-        const headers = this.#getHeaders(false);
+        const headers = this.#getHeaders(false, undefined, "streamBatchItems", true);
         headers["Content-Type"] = "application/x-ndjson";
         // Tee the stream: one branch for this attempt, one for potential retry
         // tee() internally buffers data consumed from one branch for the other,
@@ -385,15 +434,15 @@ class ApiClient {
         const encoded = encodeURIComponent(filename);
         return (0, core_js_1.zodfetch)(index_js_1.CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v2/packets/${encoded}`, {
             method: "PUT",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "createUploadPayloadUrl"),
+        }, this.#requestOptions("createUploadPayloadUrl", requestOptions));
     }
     getPayloadUrl(filename, requestOptions) {
         const encoded = encodeURIComponent(filename);
         return (0, core_js_1.zodfetch)(index_js_1.CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/packets/${encoded}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "getPayloadUrl"),
+        }, this.#requestOptions("getPayloadUrl", requestOptions));
     }
     /**
      * Presigned GET URL for a run's stored payload or output, authorized against the run.
@@ -403,8 +452,8 @@ class ApiClient {
         try {
             return await (0, core_js_1.zodfetch)(index_js_1.CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/runs/${encodeURIComponent(runId)}/packets/${field}`, {
                 method: "GET",
-                headers: this.#getHeaders(false),
-            }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+                headers: this.#getHeaders(false, undefined, "getRunPacketUrl"),
+            }, this.#requestOptions("getRunPacketUrl", requestOptions));
         }
         catch (error) {
             if (error instanceof errors_js_1.ApiError && error.status === 404) {
@@ -417,15 +466,15 @@ class ApiClient {
     createChatSnapshotUploadUrl(sessionId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionId)}/snapshot-url`, {
             method: "PUT",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "createChatSnapshotUploadUrl"),
+        }, this.#requestOptions("createChatSnapshotUploadUrl", requestOptions));
     }
     /** Presigned GET URL for a `chat.agent` session snapshot. */
     getChatSnapshotUrl(sessionId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionId)}/snapshot-url`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "getChatSnapshotUrl"),
+        }, this.#requestOptions("getChatSnapshotUrl", requestOptions));
     }
     /**
      * One page of a `chat.agent` session's persisted transcript, most recent
@@ -440,20 +489,20 @@ class ApiClient {
         const suffix = query.size > 0 ? `?${query.toString()}` : "";
         return (0, core_js_1.zodfetch)(index_js_1.SessionTranscriptResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionId)}/transcript${suffix}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "getSessionTranscript"),
+        }, this.#requestOptions("getSessionTranscript", requestOptions));
     }
     retrieveRun(runId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveRunResponse, `${this.baseUrl}/api/v3/runs/${runId}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveRun"),
+        }, this.#requestOptions("retrieveRun", requestOptions));
     }
     retrieveRunTrace(runId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveRunTraceResponseBody, `${this.baseUrl}/api/v1/runs/${runId}/trace`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveRunTrace"),
+        }, this.#requestOptions("retrieveRunTrace", requestOptions));
     }
     /**
      * Retrieves one page of a root run's trace as flat spans. Omit `after` for the first
@@ -468,14 +517,14 @@ class ApiClient {
             query.set("page[after]", options.after);
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveRunTracePageResponseBody, `${this.baseUrl}/api/v1/runs/${encodeURIComponent(runId)}/trace?${query.toString()}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveRunTracePage"),
+        }, this.#requestOptions("retrieveRunTracePage", requestOptions));
     }
     retrieveSpan(runId, spanId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveSpanDetailResponseBody, `${this.baseUrl}/api/v1/runs/${runId}/spans/${spanId}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveSpan"),
+        }, this.#requestOptions("retrieveSpan", requestOptions));
     }
     listRuns(query, requestOptions) {
         const searchParams = createSearchQueryForListRuns(query);
@@ -486,8 +535,8 @@ class ApiClient {
             before: query?.before,
         }, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listRuns"),
+        }, this.#requestOptions("listRuns", requestOptions));
     }
     listProjectRuns(projectRef, query, requestOptions) {
         const searchParams = createSearchQueryForListRuns(query);
@@ -501,8 +550,8 @@ class ApiClient {
             before: query?.before,
         }, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listProjectRuns"),
+        }, this.#requestOptions("listProjectRuns", requestOptions));
     }
     replayRun(runId, bodyOrRequestOptions, requestOptions) {
         const isBody = bodyOrRequestOptions !== undefined &&
@@ -513,22 +562,22 @@ class ApiClient {
             : (bodyOrRequestOptions ?? requestOptions);
         return (0, core_js_1.zodfetch)(index_js_1.ReplayRunResponse, `${this.baseUrl}/api/v1/runs/${runId}/replay`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "replayRun"),
             body: body ? JSON.stringify(withSuperJsonPayload(body)) : undefined,
-        }, mergeRequestOptions(this.defaultRequestOptions, $requestOptions));
+        }, this.#requestOptions("replayRun", $requestOptions));
     }
     cancelRun(runId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CanceledRunResponse, `${this.baseUrl}/api/v2/runs/${runId}/cancel`, {
             method: "POST",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "cancelRun"),
+        }, this.#requestOptions("cancelRun", requestOptions));
     }
     createBulkAction(options, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CreateBulkActionResponseBody, `${this.baseUrl}/api/v1/bulk-actions`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "createBulkAction"),
             body: JSON.stringify(options),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("createBulkAction", requestOptions));
     }
     listBulkActions(query, requestOptions) {
         return (0, core_js_1.zodfetchCursorPage)(index_js_1.BulkActionObject, `${this.baseUrl}/api/v1/bulk-actions`, {
@@ -538,55 +587,55 @@ class ApiClient {
             before: query?.before,
         }, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listBulkActions"),
+        }, this.#requestOptions("listBulkActions", requestOptions));
     }
     retrieveBulkAction(bulkActionId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.BulkActionObject, `${this.baseUrl}/api/v1/bulk-actions/${bulkActionId}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveBulkAction"),
+        }, this.#requestOptions("retrieveBulkAction", requestOptions));
     }
     abortBulkAction(bulkActionId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.AbortBulkActionResponseBody, `${this.baseUrl}/api/v1/bulk-actions/${bulkActionId}/abort`, {
             method: "POST",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "abortBulkAction"),
+        }, this.#requestOptions("abortBulkAction", requestOptions));
     }
     resetIdempotencyKey(taskIdentifier, idempotencyKey, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ResetIdempotencyKeyResponse, `${this.baseUrl}/api/v1/idempotencyKeys/${encodeURIComponent(idempotencyKey)}/reset`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "resetIdempotencyKey"),
             body: JSON.stringify({ taskIdentifier }),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("resetIdempotencyKey", requestOptions));
     }
     rescheduleRun(runId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveRunResponse, `${this.baseUrl}/api/v1/runs/${runId}/reschedule`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "rescheduleRun"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("rescheduleRun", requestOptions));
     }
     listRunEvents(runId, requestOptions) {
         return (0, core_js_1.zodfetch)(v4_1.z.any(), // TODO: define a proper schema for this
         `${this.baseUrl}/api/v1/runs/${runId}/events`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listRunEvents"),
+        }, this.#requestOptions("listRunEvents", requestOptions));
     }
     addTags(runId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(v4_1.z.object({ message: v4_1.z.string() }), `${this.baseUrl}/api/v1/runs/${runId}/tags`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "addTags"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("addTags", requestOptions));
     }
     createSchedule(options, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ScheduleObject, `${this.baseUrl}/api/v1/schedules`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "createSchedule"),
             body: JSON.stringify(options),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("createSchedule", requestOptions));
     }
     listSchedules(options, requestOptions) {
         const searchParams = new URLSearchParams();
@@ -601,99 +650,99 @@ class ApiClient {
             limit: options?.perPage,
         }, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listSchedules"),
+        }, this.#requestOptions("listSchedules", requestOptions));
     }
     retrieveSchedule(scheduleId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ScheduleObject, `${this.baseUrl}/api/v1/schedules/${scheduleId}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveSchedule"),
+        }, this.#requestOptions("retrieveSchedule", requestOptions));
     }
     updateSchedule(scheduleId, options, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ScheduleObject, `${this.baseUrl}/api/v1/schedules/${scheduleId}`, {
             method: "PUT",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "updateSchedule"),
             body: JSON.stringify(options),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("updateSchedule", requestOptions));
     }
     deactivateSchedule(scheduleId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ScheduleObject, `${this.baseUrl}/api/v1/schedules/${scheduleId}/deactivate`, {
             method: "POST",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "deactivateSchedule"),
+        }, this.#requestOptions("deactivateSchedule", requestOptions));
     }
     activateSchedule(scheduleId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ScheduleObject, `${this.baseUrl}/api/v1/schedules/${scheduleId}/activate`, {
             method: "POST",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "activateSchedule"),
+        }, this.#requestOptions("activateSchedule", requestOptions));
     }
     deleteSchedule(scheduleId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.DeletedScheduleObject, `${this.baseUrl}/api/v1/schedules/${scheduleId}`, {
             method: "DELETE",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "deleteSchedule"),
+        }, this.#requestOptions("deleteSchedule", requestOptions));
     }
     listEnvVars(projectRef, slug, requestOptions) {
         return (0, core_js_1.zodfetch)(v4_1.z.array(index_js_1.EnvironmentVariableWithSecret), `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listEnvVars"),
+        }, this.#requestOptions("listEnvVars", requestOptions));
     }
     importEnvVars(projectRef, slug, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.EnvironmentVariableResponseBody, `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}/import`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "importEnvVars"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("importEnvVars", requestOptions));
     }
     retrieveEnvVar(projectRef, slug, key, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.EnvironmentVariableWithSecret, `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}/${key}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveEnvVar"),
+        }, this.#requestOptions("retrieveEnvVar", requestOptions));
     }
     createEnvVar(projectRef, slug, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.EnvironmentVariableResponseBody, `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "createEnvVar"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("createEnvVar", requestOptions));
     }
     updateEnvVar(projectRef, slug, key, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.EnvironmentVariableResponseBody, `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}/${key}`, {
             method: "PUT",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "updateEnvVar"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("updateEnvVar", requestOptions));
     }
     deleteEnvVar(projectRef, slug, key, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.EnvironmentVariableResponseBody, `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}/${key}`, {
             method: "DELETE",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "deleteEnvVar"),
+        }, this.#requestOptions("deleteEnvVar", requestOptions));
     }
     updateRunMetadata(runId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.UpdateMetadataResponseBody, `${this.baseUrl}/api/v1/runs/${runId}/metadata`, {
             method: "PUT",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "updateRunMetadata"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("updateRunMetadata", requestOptions));
     }
     getRunMetadata(runId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.UpdateMetadataResponseBody, `${this.baseUrl}/api/v1/runs/${runId}/metadata`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "getRunMetadata"),
+        }, this.#requestOptions("getRunMetadata", requestOptions));
     }
     createWaitpointToken(options, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CreateWaitpointTokenResponseBody, `${this.baseUrl}/api/v1/waitpoints/tokens`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "createWaitpointToken"),
             body: JSON.stringify(options),
         }, {
-            ...mergeRequestOptions(this.defaultRequestOptions, requestOptions),
+            ...this.#requestOptions("createWaitpointToken", requestOptions),
             prepareData: async (data, response) => {
                 const jwtHeader = response.headers.get("x-trigger-jwt");
                 if (typeof jwtHeader === "string") {
@@ -728,29 +777,29 @@ class ApiClient {
             before: params?.before,
         }, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listWaitpointTokens"),
+        }, this.#requestOptions("listWaitpointTokens", requestOptions));
     }
     retrieveWaitpointToken(friendlyId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.WaitpointRetrieveTokenResponse, `${this.baseUrl}/api/v1/waitpoints/tokens/${friendlyId}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveWaitpointToken"),
+        }, this.#requestOptions("retrieveWaitpointToken", requestOptions));
     }
     completeWaitpointToken(friendlyId, options, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CompleteWaitpointTokenResponseBody, `${this.baseUrl}/api/v1/waitpoints/tokens/${friendlyId}/complete`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "completeWaitpointToken"),
             body: JSON.stringify(options),
         }, {
-            ...mergeRequestOptions(this.defaultRequestOptions, requestOptions),
+            ...this.#requestOptions("completeWaitpointToken", requestOptions),
         });
     }
     waitForWaitpointToken({ runFriendlyId, waitpointFriendlyId, }, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.WaitForWaitpointTokenResponseBody, `${this.baseUrl}/engine/v1/runs/${runFriendlyId}/waitpoints/tokens/${waitpointFriendlyId}/wait`, {
             method: "POST",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "waitForWaitpointToken"),
+        }, this.#requestOptions("waitForWaitpointToken", requestOptions));
     }
     // ========================================================================
     // Sessions
@@ -758,36 +807,36 @@ class ApiClient {
     createSession(body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CreatedSessionResponseBody, `${this.baseUrl}/api/v1/sessions`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "createSession"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("createSession", requestOptions));
     }
     retrieveSession(sessionIdOrExternalId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveSessionResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveSession"),
+        }, this.#requestOptions("retrieveSession", requestOptions));
     }
     updateSession(sessionIdOrExternalId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveSessionResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}`, {
             method: "PATCH",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "updateSession"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("updateSession", requestOptions));
     }
     closeSession(sessionIdOrExternalId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveSessionResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}/close`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "closeSession"),
             body: JSON.stringify(body ?? {}),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("closeSession", requestOptions));
     }
     endAndContinueSession(sessionIdOrExternalId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.EndAndContinueSessionResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}/end-and-continue`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "endAndContinueSession"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("endAndContinueSession", requestOptions));
     }
     listSessions(options, requestOptions) {
         const searchParams = createSearchQueryForListSessions(options);
@@ -798,8 +847,8 @@ class ApiClient {
             before: options?.before,
         }, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listSessions"),
+        }, this.#requestOptions("listSessions", requestOptions));
     }
     // ========================================================================
     // Session realtime channels
@@ -813,8 +862,8 @@ class ApiClient {
         const url = channel ? `${base}/channels/${encodeURIComponent(channel)}/${io}` : `${base}/${io}`;
         return (0, core_js_1.zodfetch)(index_js_1.CreateStreamResponseBody, url, {
             method: "PUT",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
+            headers: this.#getHeaders(false, undefined, "initializeSessionStream"),
+        }, this.#requestOptions("initializeSessionStream", requestOptions))
             .withResponse()
             .then(({ data, response }) => ({
             ...data,
@@ -833,9 +882,12 @@ class ApiClient {
             : `${base}/${io}/append`;
         return (0, core_js_1.zodfetch)(index_js_1.AppendToStreamResponseBody, appendUrl, {
             method: "POST",
-            headers: { ...this.#getHeaders(false), "X-Part-Id": partId },
+            headers: {
+                ...this.#getHeaders(false, undefined, "appendToSessionStream"),
+                "X-Part-Id": partId,
+            },
             body: part,
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("appendToSessionStream", requestOptions));
     }
     /**
      * Non-SSE drain of a Session channel's tail. Returns whatever records
@@ -860,8 +912,8 @@ class ApiClient {
         const url = `${recordsPath}${qs.toString() ? `?${qs.toString()}` : ""}`;
         return (0, core_js_1.zodfetch)(index_js_1.ReadSessionStreamRecordsResponseBody, url, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, undefined));
+            headers: this.#getHeaders(false, undefined, "readSessionStreamRecords"),
+        }, this.#requestOptions("readSessionStreamRecords", undefined));
     }
     /**
      * Subscribe to SSE records on a Session channel. Reuses the same
@@ -874,8 +926,9 @@ class ApiClient {
             ? `${sessionSegment}/channels/${encodeURIComponent(options.channel)}/${io}`
             : `${sessionSegment}/${io}`;
         const subscription = new runStream_js_1.SSEStreamSubscription(url, {
-            headers: this.getHeaders(),
-            resolveHeaders: this.#resolveStreamHeaders(),
+            headers: this.#getHeaders(false, undefined, "subscribeToSessionStream"),
+            fetchClient: this.#requestFetch("subscribeToSessionStream"),
+            resolveHeaders: this.#resolveStreamHeaders("subscribeToSessionStream"),
             signal: options?.signal,
             onComplete: options?.onComplete,
             onError: options?.onError,
@@ -921,9 +974,9 @@ class ApiClient {
     async waitForDuration(runId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.WaitForDurationResponseBody, `${this.baseUrl}/engine/v1/runs/${runId}/wait/duration`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "waitForDuration"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("waitForDuration", requestOptions));
     }
     listQueues(options, requestOptions) {
         const searchParams = new URLSearchParams();
@@ -938,8 +991,8 @@ class ApiClient {
             limit: options?.perPage,
         }, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listQueues"),
+        }, this.#requestOptions("listQueues", requestOptions));
     }
     retrieveQueue(queue, requestOptions) {
         const type = typeof queue === "string" ? "id" : queue.type;
@@ -948,8 +1001,8 @@ class ApiClient {
         const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
         return (0, core_js_1.zodfetch)(index_js_1.QueueItem, `${this.baseUrl}/api/v1/queues/${encodedValue}?type=${type}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveQueue"),
+        }, this.#requestOptions("retrieveQueue", requestOptions));
     }
     pauseQueue(queue, action, requestOptions) {
         const type = typeof queue === "string" ? "id" : queue.type;
@@ -958,12 +1011,12 @@ class ApiClient {
         const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
         return (0, core_js_1.zodfetch)(index_js_1.QueueItem, `${this.baseUrl}/api/v1/queues/${encodedValue}/pause`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "pauseQueue"),
             body: JSON.stringify({
                 type,
                 action,
             }),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("pauseQueue", requestOptions));
     }
     overrideQueueConcurrencyLimit(queue, concurrencyLimit, requestOptions) {
         const type = typeof queue === "string" ? "id" : queue.type;
@@ -972,12 +1025,12 @@ class ApiClient {
         const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
         return (0, core_js_1.zodfetch)(index_js_1.QueueItem, `${this.baseUrl}/api/v1/queues/${encodedValue}/concurrency/override`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "overrideQueueConcurrencyLimit"),
             body: JSON.stringify({
                 type,
                 concurrencyLimit,
             }),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("overrideQueueConcurrencyLimit", requestOptions));
     }
     resetQueueConcurrencyLimit(queue, requestOptions) {
         const type = typeof queue === "string" ? "id" : queue.type;
@@ -986,11 +1039,11 @@ class ApiClient {
         const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
         return (0, core_js_1.zodfetch)(index_js_1.QueueItem, `${this.baseUrl}/api/v1/queues/${encodedValue}/concurrency/reset`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "resetQueueConcurrencyLimit"),
             body: JSON.stringify({
                 type,
             }),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("resetQueueConcurrencyLimit", requestOptions));
     }
     listConcurrencyLimits(options, requestOptions) {
         return (0, core_js_1.zodfetchOffsetLimitPage)(index_js_1.ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits`, {
@@ -998,58 +1051,58 @@ class ApiClient {
             limit: options?.perPage,
         }, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listConcurrencyLimits"),
+        }, this.#requestOptions("listConcurrencyLimits", requestOptions));
     }
     retrieveConcurrencyLimit(name, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveConcurrencyLimit"),
+        }, this.#requestOptions("retrieveConcurrencyLimit", requestOptions));
     }
     retrieveConcurrencyLimitKey(name, concurrencyKey, requestOptions) {
         const query = new URLSearchParams({ concurrencyKey });
         return (0, core_js_1.zodfetch)(index_js_1.ConcurrencyLimitKeyItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}?${query.toString()}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveConcurrencyLimitKey"),
+        }, this.#requestOptions("retrieveConcurrencyLimitKey", requestOptions));
     }
     overrideConcurrencyLimit(name, override, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/override`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "overrideConcurrencyLimit"),
             body: JSON.stringify(override),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("overrideConcurrencyLimit", requestOptions));
     }
     overrideConcurrencyLimitKey(name, override, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ConcurrencyLimitKeyItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/override`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "overrideConcurrencyLimitKey"),
             body: JSON.stringify(override),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("overrideConcurrencyLimitKey", requestOptions));
     }
     pauseConcurrencyLimit(name, action, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/pause`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "pauseConcurrencyLimit"),
             body: JSON.stringify({
                 action,
             }),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("pauseConcurrencyLimit", requestOptions));
     }
     resetConcurrencyLimit(name, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/reset`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "resetConcurrencyLimit"),
             body: JSON.stringify({}),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("resetConcurrencyLimit", requestOptions));
     }
     resetConcurrencyLimitKey(name, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ConcurrencyLimitKeyItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/reset`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "resetConcurrencyLimitKey"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("resetConcurrencyLimitKey", requestOptions));
     }
     subscribeToRun(runId, options) {
         const queryParams = new URLSearchParams();
@@ -1058,12 +1111,12 @@ class ApiClient {
         }
         return (0, runStream_js_1.runShapeStream)(`${this.baseUrl}/realtime/v1/runs/${runId}${queryParams ? `?${queryParams}` : ""}`, {
             closeOnComplete: typeof options?.closeOnComplete === "boolean" ? options.closeOnComplete : true,
-            headers: this.#getRealtimeHeaders(),
-            resolveHeaders: this.#resolveRealtimeHeaders(),
+            headers: this.#getRealtimeHeaders("subscribeToRun"),
+            resolveHeaders: this.#resolveRealtimeHeaders("subscribeToRun"),
             client: this,
             signal: options?.signal,
             onFetchError: options?.onFetchError,
-            fetchClient: options?.fetchClient,
+            fetchClient: this.#requestFetch("subscribeToRun", options?.fetchClient),
         });
     }
     subscribeToRunsWithTag(tag, filters, options) {
@@ -1074,12 +1127,12 @@ class ApiClient {
         });
         return (0, runStream_js_1.runShapeStream)(`${this.baseUrl}/realtime/v1/runs${searchParams ? `?${searchParams}` : ""}`, {
             closeOnComplete: false,
-            headers: this.#getRealtimeHeaders(),
-            resolveHeaders: this.#resolveRealtimeHeaders(),
+            headers: this.#getRealtimeHeaders("subscribeToRunsWithTag"),
+            resolveHeaders: this.#resolveRealtimeHeaders("subscribeToRunsWithTag"),
             client: this,
             signal: options?.signal,
             onFetchError: options?.onFetchError,
-            fetchClient: options?.fetchClient,
+            fetchClient: this.#requestFetch("subscribeToRunsWithTag", options?.fetchClient),
         });
     }
     subscribeToBatch(batchId, options) {
@@ -1089,12 +1142,12 @@ class ApiClient {
         }
         return (0, runStream_js_1.runShapeStream)(`${this.baseUrl}/realtime/v1/batches/${batchId}${queryParams ? `?${queryParams}` : ""}`, {
             closeOnComplete: false,
-            headers: this.#getRealtimeHeaders(),
-            resolveHeaders: this.#resolveRealtimeHeaders(),
+            headers: this.#getRealtimeHeaders("subscribeToBatch"),
+            resolveHeaders: this.#resolveRealtimeHeaders("subscribeToBatch"),
             client: this,
             signal: options?.signal,
             onFetchError: options?.onFetchError,
-            fetchClient: options?.fetchClient,
+            fetchClient: this.#requestFetch("subscribeToBatch", options?.fetchClient),
         });
     }
     listDeployments(options, requestOptions) {
@@ -1117,20 +1170,21 @@ class ApiClient {
             limit: options?.limit,
         }, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listDeployments"),
+        }, this.#requestOptions("listDeployments", requestOptions));
     }
     retrieveCurrentDeployment(requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveCurrentDeploymentResponseBody, `${this.baseUrl}/api/v1/deployments/current`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveCurrentDeployment"),
+        }, this.#requestOptions("retrieveCurrentDeployment", requestOptions));
     }
     async fetchStream(runId, streamKey, options) {
         const streamFactory = new runStream_js_1.SSEStreamSubscriptionFactory(options?.baseUrl ?? this.baseUrl, {
-            headers: this.getHeaders(),
+            headers: this.#getHeaders(false, undefined, "fetchStream"),
+            fetchClient: this.#requestFetch("fetchStream"),
             signal: options?.signal,
-            resolveHeaders: this.#resolveStreamHeaders(),
+            resolveHeaders: this.#resolveStreamHeaders("fetchStream"),
         });
         const subscription = streamFactory.createSubscription(runId, streamKey, {
             onComplete: options?.onComplete,
@@ -1152,8 +1206,8 @@ class ApiClient {
     async createStream(runId, target, streamId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CreateStreamResponseBody, `${this.baseUrl}/realtime/v1/streams/${runId}/${target}/${streamId}`, {
             method: "PUT",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
+            headers: this.#getHeaders(false, undefined, "createStream"),
+        }, this.#requestOptions("createStream", requestOptions))
             .withResponse()
             .then(async ({ data, response }) => {
             return {
@@ -1165,51 +1219,54 @@ class ApiClient {
     async appendToStream(runId, target, streamId, part, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.AppendToStreamResponseBody, `${this.baseUrl}/realtime/v1/streams/${runId}/${target}/${streamId}/append`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "appendToStream"),
             body: part,
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("appendToStream", requestOptions));
     }
     async sendInputStream(runId, streamId, data, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.SendInputStreamResponseBody, `${this.baseUrl}/realtime/v1/streams/${runId}/input/${streamId}`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "sendInputStream"),
             body: JSON.stringify({ data }),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("sendInputStream", requestOptions));
     }
     async createInputStreamWaitpoint(runFriendlyId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CreateInputStreamWaitpointResponseBody, `${this.baseUrl}/api/v1/runs/${runFriendlyId}/input-streams/wait`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "createInputStreamWaitpoint"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("createInputStreamWaitpoint", requestOptions));
     }
     async createSessionStreamWaitpoint(runFriendlyId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.CreateSessionStreamWaitpointResponseBody, `${this.baseUrl}/api/v1/runs/${runFriendlyId}/session-streams/wait`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "createSessionStreamWaitpoint"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("createSessionStreamWaitpoint", requestOptions));
     }
     async generateJWTClaims(requestOptions) {
         return (0, core_js_1.zodfetch)(v4_1.z.record(v4_1.z.string(), v4_1.z.any()), `${this.baseUrl}/api/v1/auth/jwt/claims`, {
             method: "POST",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "generateJWTClaims"),
+        }, this.#requestOptions("generateJWTClaims", requestOptions));
     }
     async createPublicToken(body, requestOptions) {
         return (0, core_js_1.zodfetch)(CreatePublicTokenResponseBody, `${this.baseUrl}/api/v1/auth/public-tokens`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "createPublicToken"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("createPublicToken", requestOptions));
     }
     retrieveBatch(batchId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.RetrieveBatchV2Response, `${this.baseUrl}/api/v2/batches/${batchId}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveBatch"),
+        }, this.#requestOptions("retrieveBatch", requestOptions));
     }
     async executeQuery(query, options, requestOptions) {
+        const operation = !options?.scope || options.scope === "environment"
+            ? "executeQuery"
+            : "executeQueryProjectOrOrganization";
         const body = {
             query,
             scope: options?.scope ?? "environment",
@@ -1220,68 +1277,68 @@ class ApiClient {
         };
         return (0, core_js_1.zodfetch)(index_js_1.QueryExecuteResponseBody, `${this.baseUrl}/api/v1/query`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, operation),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions(operation, requestOptions));
     }
     async getQuerySchema(requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.QuerySchemaResponseBody, `${this.baseUrl}/api/v1/query/schema`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "getQuerySchema"),
+        }, this.#requestOptions("getQuerySchema", requestOptions));
     }
     async listDashboards(requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ListDashboardsResponseBody, `${this.baseUrl}/api/v1/query/dashboards`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "listDashboards"),
+        }, this.#requestOptions("listDashboards", requestOptions));
     }
     retrieveDashboard(dashboardId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "retrieveDashboard"),
+        }, this.#requestOptions("retrieveDashboard", requestOptions));
     }
     createDashboard(body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.DashboardObject, `${this.baseUrl}/api/v1/query/dashboards`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "createDashboard"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("createDashboard", requestOptions));
     }
     updateDashboard(dashboardId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}`, {
             method: "PATCH",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "updateDashboard"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("updateDashboard", requestOptions));
     }
     replaceDashboard(dashboardId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}`, {
             method: "PUT",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "replaceDashboard"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("replaceDashboard", requestOptions));
     }
     deleteDashboard(dashboardId, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.DeleteDashboardResponseBody, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}`, {
             method: "DELETE",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "deleteDashboard"),
+        }, this.#requestOptions("deleteDashboard", requestOptions));
     }
     addDashboardWidget(dashboardId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.AddDashboardWidgetResponseBody, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}/widgets`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "addDashboardWidget"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("addDashboardWidget", requestOptions));
     }
     updateDashboardWidget(dashboardId, widgetId, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}/widgets/${encodeURIComponent(widgetId)}`, {
             method: "PATCH",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "updateDashboardWidget"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("updateDashboardWidget", requestOptions));
     }
     deleteDashboardWidget(dashboardId, widgetId, options, requestOptions) {
         const search = options?.revision
@@ -1289,8 +1346,8 @@ class ApiClient {
             : "";
         return (0, core_js_1.zodfetch)(index_js_1.DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}/widgets/${encodeURIComponent(widgetId)}${search}`, {
             method: "DELETE",
-            headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            headers: this.#getHeaders(false, undefined, "deleteDashboardWidget"),
+        }, this.#requestOptions("deleteDashboardWidget", requestOptions));
     }
     async getReport(key, options) {
         const searchParams = new URLSearchParams({ format: options?.format ?? "markdown" });
@@ -1299,7 +1356,7 @@ class ApiClient {
         }
         const response = await fetch(`${this.baseUrl}/api/v1/reports/${encodeURIComponent(key)}?${searchParams.toString()}`, {
             method: "GET",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "getReport", true),
         });
         if (!response.ok) {
             const bodySnippet = await readBodySnippet(response);
@@ -1310,10 +1367,12 @@ class ApiClient {
         }
         return response.text();
     }
-    #getHeaders(spanParentAsLink, additionalHeaders) {
+    #getHeaders(spanParentAsLink, additionalHeaders, operation = "unknown", recordSelection = false) {
         const headers = {
             "Content-Type": "application/json",
-            Authorization: `Bearer ${this.accessToken}`,
+            ...(additionalHeaders?.Authorization
+                ? { Authorization: additionalHeaders.Authorization }
+                : this.getAuthenticationHeaders(operation, recordSelection)),
             "trigger-version": version_js_1.VERSION,
             ...Object.entries(additionalHeaders ?? {}).reduce((acc, [key, value]) => {
                 if (value !== undefined) {
@@ -1364,27 +1423,39 @@ class ApiClient {
     resolvePrompt(slug, body, requestOptions) {
         return (0, core_js_1.zodfetch)(index_js_1.ResolvePromptResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}`, {
             method: "POST",
-            headers: this.#getHeaders(false),
+            headers: this.#getHeaders(false, undefined, "resolvePrompt"),
             body: JSON.stringify(body),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }, this.#requestOptions("resolvePrompt", requestOptions));
     }
     createWebhookWaiter(endpointId, body, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.CreateWebhookWaiterResponseBody, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}/waiters`, { method: "POST", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.CreateWebhookWaiterResponseBody, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}/waiters`, {
+            method: "POST",
+            headers: this.#getHeaders(false, undefined, "createWebhookWaiter"),
+            body: JSON.stringify(body),
+        }, this.#requestOptions("createWebhookWaiter", requestOptions));
     }
     cancelWebhookWaiter(waiterId, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.CancelWebhookWaiterResponseBody, `${this.baseUrl}/api/v1/webhooks/waiters/${encodeURIComponent(waiterId)}/cancel`, { method: "POST", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.CancelWebhookWaiterResponseBody, `${this.baseUrl}/api/v1/webhooks/waiters/${encodeURIComponent(waiterId)}/cancel`, { method: "POST", headers: this.#getHeaders(false, undefined, "cancelWebhookWaiter") }, this.#requestOptions("cancelWebhookWaiter", requestOptions));
     }
     listWebhookEndpoints(requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.ListWebhookEndpointsResponse, `${this.baseUrl}/api/v1/webhooks/endpoints`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.ListWebhookEndpointsResponse, `${this.baseUrl}/api/v1/webhooks/endpoints`, { method: "GET", headers: this.#getHeaders(false, undefined, "listWebhookEndpoints") }, this.#requestOptions("listWebhookEndpoints", requestOptions));
     }
     retrieveWebhookEndpoint(endpointId, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.WebhookEndpointDetailObject, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.WebhookEndpointDetailObject, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}`, { method: "GET", headers: this.#getHeaders(false, undefined, "retrieveWebhookEndpoint") }, this.#requestOptions("retrieveWebhookEndpoint", requestOptions));
     }
     generateWebhookEndpointSecret(endpointId, body = {}, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.RotateWebhookEndpointSecretResponse, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}/rotate-secret`, { method: "POST", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.RotateWebhookEndpointSecretResponse, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}/rotate-secret`, {
+            method: "POST",
+            headers: this.#getHeaders(false, undefined, "generateWebhookEndpointSecret"),
+            body: JSON.stringify(body),
+        }, this.#requestOptions("generateWebhookEndpointSecret", requestOptions));
     }
     setWebhookEndpointSecret(endpointId, body, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.SetWebhookEndpointSecretResponse, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}/secret`, { method: "PUT", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.SetWebhookEndpointSecretResponse, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}/secret`, {
+            method: "PUT",
+            headers: this.#getHeaders(false, undefined, "setWebhookEndpointSecret"),
+            body: JSON.stringify(body),
+        }, this.#requestOptions("setWebhookEndpointSecret", requestOptions));
     }
     listWebhookDeliveries(query = {}, requestOptions) {
         const searchParams = new URLSearchParams();
@@ -1406,40 +1477,56 @@ class ApiClient {
         if (query.after)
             searchParams.set("page[after]", query.after);
         const qs = searchParams.toString();
-        return (0, core_js_1.zodfetch)(index_js_1.ListWebhookDeliveriesResponse, `${this.baseUrl}/api/v1/webhooks/deliveries${qs ? `?${qs}` : ""}`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.ListWebhookDeliveriesResponse, `${this.baseUrl}/api/v1/webhooks/deliveries${qs ? `?${qs}` : ""}`, { method: "GET", headers: this.#getHeaders(false, undefined, "listWebhookDeliveries") }, this.#requestOptions("listWebhookDeliveries", requestOptions));
     }
     retrieveWebhookDelivery(deliveryId, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.WebhookDeliveryObject, `${this.baseUrl}/api/v1/webhooks/deliveries/${encodeURIComponent(deliveryId)}`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.WebhookDeliveryObject, `${this.baseUrl}/api/v1/webhooks/deliveries/${encodeURIComponent(deliveryId)}`, { method: "GET", headers: this.#getHeaders(false, undefined, "retrieveWebhookDelivery") }, this.#requestOptions("retrieveWebhookDelivery", requestOptions));
     }
     /** Replay to every subscriber (re-checking filters), or to one `targetId` past its filter. */
     replayWebhookDelivery(deliveryId, options = {}, requestOptions) {
         const qs = options.targetId ? `?targetId=${encodeURIComponent(options.targetId)}` : "";
-        return (0, core_js_1.zodfetch)(index_js_1.ReplayWebhookDeliveryResponse, `${this.baseUrl}/api/v1/webhooks/deliveries/${encodeURIComponent(deliveryId)}/replay${qs}`, { method: "POST", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.ReplayWebhookDeliveryResponse, `${this.baseUrl}/api/v1/webhooks/deliveries/${encodeURIComponent(deliveryId)}/replay${qs}`, { method: "POST", headers: this.#getHeaders(false, undefined, "replayWebhookDelivery") }, this.#requestOptions("replayWebhookDelivery", requestOptions));
     }
     listPrompts(requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.ListPromptsResponseBody, `${this.baseUrl}/api/v1/prompts`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.ListPromptsResponseBody, `${this.baseUrl}/api/v1/prompts`, { method: "GET", headers: this.#getHeaders(false, undefined, "listPrompts") }, this.#requestOptions("listPrompts", requestOptions));
     }
     listPromptVersions(slug, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.ListPromptVersionsResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/versions`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.ListPromptVersionsResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/versions`, { method: "GET", headers: this.#getHeaders(false, undefined, "listPromptVersions") }, this.#requestOptions("listPromptVersions", requestOptions));
     }
     promotePromptVersion(slug, body, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/promote`, { method: "POST", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/promote`, {
+            method: "POST",
+            headers: this.#getHeaders(false, undefined, "promotePromptVersion"),
+            body: JSON.stringify(body),
+        }, this.#requestOptions("promotePromptVersion", requestOptions));
     }
     createPromptOverride(slug, body, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.PromptOverrideCreatedResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override`, { method: "POST", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.PromptOverrideCreatedResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override`, {
+            method: "POST",
+            headers: this.#getHeaders(false, undefined, "createPromptOverride"),
+            body: JSON.stringify(body),
+        }, this.#requestOptions("createPromptOverride", requestOptions));
     }
     updatePromptOverride(slug, body, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override`, { method: "PUT", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override`, {
+            method: "PUT",
+            headers: this.#getHeaders(false, undefined, "updatePromptOverride"),
+            body: JSON.stringify(body),
+        }, this.#requestOptions("updatePromptOverride", requestOptions));
     }
     removePromptOverride(slug, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override`, { method: "DELETE", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override`, { method: "DELETE", headers: this.#getHeaders(false, undefined, "removePromptOverride") }, this.#requestOptions("removePromptOverride", requestOptions));
     }
     reactivatePromptOverride(slug, body, requestOptions) {
-        return (0, core_js_1.zodfetch)(index_js_1.PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override/reactivate`, { method: "POST", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        return (0, core_js_1.zodfetch)(index_js_1.PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override/reactivate`, {
+            method: "POST",
+            headers: this.#getHeaders(false, undefined, "reactivatePromptOverride"),
+            body: JSON.stringify(body),
+        }, this.#requestOptions("reactivatePromptOverride", requestOptions));
     }
-    #getRealtimeHeaders() {
+    #getRealtimeHeaders(operation = "unknown") {
         let headers = {
-            Authorization: `Bearer ${this.accessToken}`,
+            Authorization: `Bearer ${this.getAccessToken(operation)}`,
             "trigger-version": version_js_1.VERSION,
         };
         if (this.previewBranch) {