@trigger.dev/core 0.0.0-python-preview-20250226140121 → 0.0.0-rc-4-8-0-20261021151928

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

@@ -1,11 +1,20 @@
-import { z } from "zod";
+import { nanoid } from "nanoid";
+import { z } from "zod/v4";
 import { VERSION } from "../../version.js";
+import { isAdditionalApiKey } from "../apiKeys.js";
 import { generateJWT } from "../jwt.js";
-import { BatchTaskRunExecutionResult, BatchTriggerTaskV2Response, CanceledRunResponse, CreateUploadPayloadUrlResponseBody, DeletedScheduleObject, EnvironmentVariableResponseBody, EnvironmentVariableValue, EnvironmentVariables, ListRunResponseItem, ReplayRunResponse, RetrieveBatchResponse, RetrieveRunResponse, ScheduleObject, TaskRunExecutionResult, TriggerTaskResponse, UpdateMetadataResponseBody, } from "../schemas/index.js";
+import { ListWebhookEndpointsResponse, ListWebhookDeliveriesResponse, ReplayWebhookDeliveryResponse, WebhookDeliveryObject, CancelWebhookWaiterResponseBody, CreateWebhookWaiterResponseBody, RotateWebhookEndpointSecretResponse, SetWebhookEndpointSecretResponse, WebhookEndpointDetailObject, ConcurrencyLimitItem, ConcurrencyLimitKeyItem, ReplayRunRequestBody, AbortBulkActionResponseBody, ApiDeploymentListResponseItem, BulkActionObject, CreateBulkActionResponseBody, AppendToStreamResponseBody, BatchTaskRunExecutionResult, BatchTriggerTaskV3Response, CanceledRunResponse, CompleteWaitpointTokenResponseBody, CreateBatchResponse, CreateInputStreamWaitpointResponseBody, CreateSessionStreamWaitpointResponseBody, CreateStreamResponseBody, CreateUploadPayloadUrlResponseBody, SessionTranscriptResponseBody, CreateWaitpointTokenResponseBody, CreatedSessionResponseBody, DeletedScheduleObject, EndAndContinueSessionResponseBody, EnvironmentVariableResponseBody, EnvironmentVariableWithSecret, ListDashboardsResponseBody, AddDashboardWidgetResponseBody, DashboardObject, DeleteDashboardResponseBody, ListPromptVersionsResponseBody, ListPromptsResponseBody, ListRunResponseItem, ListedSessionItem, PromptOkResponseBody, PromptOverrideCreatedResponseBody, QueryExecuteResponseBody, QuerySchemaResponseBody, QueueItem, ReadSessionStreamRecordsResponseBody, ReplayRunResponse, ReportViewModelSchema, ResetIdempotencyKeyResponse, ResolvePromptResponseBody, RetrieveBatchV2Response, RetrieveCurrentDeploymentResponseBody, RetrieveRunResponse, RetrieveRunTraceResponseBody, RetrieveRunTracePageResponseBody, RetrieveSessionResponseBody, RetrieveSpanDetailResponseBody, ScheduleObject, SendInputStreamResponseBody, StreamBatchItemsResponse, TaskRunExecutionResult, TriggerTaskResponse, UpdateMetadataResponseBody, WaitForDurationResponseBody, WaitForWaitpointTokenResponseBody, WaitpointRetrieveTokenResponse, WaitpointTokenItem, } from "../schemas/index.js";
+import { controlSubtype } from "../sessionStreams/wireProtocol.js";
 import { taskContext } from "../task-context-api.js";
+import superjson from "../imports/superjson.js";
+import { getEnvVar } from "../utils/getEnv.js";
+import { calculateNextRetryDelay } from "../utils/retries.js";
 import { isRequestOptions, zodfetch, zodfetchCursorPage, zodfetchOffsetLimitPage, } from "./core.js";
-import { ApiError } from "./errors.js";
-import { runShapeStream, SSEStreamSubscriptionFactory, } from "./runStream.js";
+import { encodeTaskIdForPath } from "./encodeTaskIdForPath.js";
+import { ApiConnectionError, ApiError, BatchNotSealedError } from "./errors.js";
+import { refreshAccessTokenOnce } from "./refreshAccessToken.js";
+import { SSEStreamSubscription, SSEStreamSubscriptionFactory, runShapeStream, STREAM_START_HEADER, } from "./runStream.js";
+import { API_VERSION, API_VERSION_HEADER_NAME } from "./version.js";
 const DEFAULT_ZOD_FETCH_OPTIONS = {
     retry: {
         maxAttempts: 5,
@@ -15,18 +24,44 @@ const DEFAULT_ZOD_FETCH_OPTIONS = {
         randomize: false,
     },
 };
-export { isRequestOptions };
+export { SSEStreamSubscription, STREAM_START_HEADER, isRequestOptions };
+export * from "./getBranch.js";
+export { encodeTaskIdForPath } from "./encodeTaskIdForPath.js";
+const CreatePublicTokenResponseBody = z.object({ token: z.string() });
 /**
  * Trigger.dev v3 API client
  */
 export class ApiClient {
     baseUrl;
     accessToken;
+    previewBranch;
+    futureFlags;
+    additionalHeaders;
     defaultRequestOptions;
-    constructor(baseUrl, accessToken, requestOptions = {}) {
+    refreshAccessToken;
+    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) {
         this.accessToken = accessToken;
+        this.refreshAccessToken = refreshAccessToken;
         this.baseUrl = baseUrl.replace(/\/$/, "");
-        this.defaultRequestOptions = mergeRequestOptions(DEFAULT_ZOD_FETCH_OPTIONS, requestOptions);
+        this.previewBranch = previewBranch;
+        const { additionalHeaders, ...restRequestOptions } = requestOptions;
+        this.additionalHeaders = additionalHeaders;
+        this.defaultRequestOptions = mergeRequestOptions(DEFAULT_ZOD_FETCH_OPTIONS, restRequestOptions);
+        this.futureFlags = futureFlags;
+    }
+    /**
+     * 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 (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.");
+        }
+        return this.accessToken;
     }
     get fetchClient() {
         const headers = this.#getHeaders(false);
@@ -45,6 +80,30 @@ export class ApiClient {
     getHeaders() {
         return this.#getHeaders(false);
     }
+    /**
+     * 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() {
+        const refreshAccessToken = this.refreshAccessToken;
+        if (!refreshAccessToken)
+            return undefined;
+        return async () => {
+            const accessToken = await refreshAccessTokenOnce(refreshAccessToken);
+            return this.#getHeaders(false, { Authorization: `Bearer ${accessToken}` });
+        };
+    }
+    /** As {@link ApiClient.#resolveStreamHeaders}, for the leaner realtime header set. */
+    #resolveRealtimeHeaders() {
+        const refreshAccessToken = this.refreshAccessToken;
+        if (!refreshAccessToken)
+            return undefined;
+        return async () => {
+            const accessToken = await refreshAccessTokenOnce(refreshAccessToken);
+            return { ...this.#getRealtimeHeaders(), Authorization: `Bearer ${accessToken}` };
+        };
+    }
     async getRunResult(runId, requestOptions) {
         try {
             return await zodfetch(TaskRunExecutionResult, `${this.baseUrl}/api/v1/runs/${runId}/result`, {
@@ -68,14 +127,14 @@ export class ApiClient {
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
     triggerTask(taskId, body, clientOptions, requestOptions) {
-        const encodedTaskId = encodeURIComponent(taskId);
+        const encodedTaskId = encodeTaskIdForPath(taskId);
         return zodfetch(TriggerTaskResponse, `${this.baseUrl}/api/v1/tasks/${encodedTaskId}/trigger`, {
             method: "POST",
             headers: this.#getHeaders(clientOptions?.spanParentAsLink ?? false),
             body: JSON.stringify(body),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
             .withResponse()
-            .then(async ({ response, data }) => {
+            .then(async ({ data, response }) => {
             const jwtHeader = response.headers.get("x-trigger-jwt");
             if (typeof jwtHeader === "string") {
                 return {
@@ -86,7 +145,7 @@ export class ApiClient {
             const claimsHeader = response.headers.get("x-trigger-jwt-claims");
             const claims = claimsHeader ? JSON.parse(claimsHeader) : undefined;
             const jwt = await generateJWT({
-                secretKey: this.accessToken,
+                secretKey: this.#selfSigningKey,
                 payload: {
                     ...claims,
                     scopes: [`read:runs:${data.id}`],
@@ -99,22 +158,70 @@ export class ApiClient {
             };
         });
     }
-    batchTriggerV2(body, clientOptions, requestOptions) {
-        return zodfetch(BatchTriggerTaskV2Response, `${this.baseUrl}/api/v1/tasks/batch`, {
+    batchTriggerV3(body, clientOptions, requestOptions) {
+        return zodfetch(BatchTriggerTaskV3Response, `${this.baseUrl}/api/v2/tasks/batch`, {
             method: "POST",
             headers: this.#getHeaders(clientOptions?.spanParentAsLink ?? false, {
-                "idempotency-key": clientOptions?.idempotencyKey,
-                "idempotency-key-ttl": clientOptions?.idempotencyKeyTTL,
                 "batch-processing-strategy": clientOptions?.processingStrategy,
             }),
             body: JSON.stringify(body),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
             .withResponse()
-            .then(async ({ response, data }) => {
+            .then(async ({ data, response }) => {
+            const jwtHeader = response.headers.get("x-trigger-jwt");
+            if (typeof jwtHeader === "string") {
+                return {
+                    ...data,
+                    publicAccessToken: jwtHeader,
+                };
+            }
+            const claimsHeader = response.headers.get("x-trigger-jwt-claims");
+            const claims = claimsHeader ? JSON.parse(claimsHeader) : undefined;
+            const jwt = await generateJWT({
+                secretKey: this.#selfSigningKey,
+                payload: {
+                    ...claims,
+                    scopes: [`read:batch:${data.id}`],
+                },
+                expirationTime: requestOptions?.publicAccessToken?.expirationTime ?? "1h",
+            });
+            return {
+                ...data,
+                publicAccessToken: jwt,
+            };
+        });
+    }
+    /**
+     * Phase 1 of 2-phase batch API: Create a batch
+     *
+     * Creates a new batch and returns its ID. For batchTriggerAndWait,
+     * the parent run is blocked immediately on batch creation.
+     *
+     * @param body - The batch creation parameters
+     * @param clientOptions - Options for trace context handling
+     * @param clientOptions.spanParentAsLink - If true, child runs will have separate trace IDs with a link to parent
+     * @param requestOptions - Optional request options
+     * @returns The created batch with ID and metadata
+     */
+    createBatch(body, clientOptions, requestOptions) {
+        return zodfetch(CreateBatchResponse, `${this.baseUrl}/api/v3/batches`, {
+            method: "POST",
+            headers: this.#getHeaders(clientOptions?.spanParentAsLink ?? false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
+            .withResponse()
+            .then(async ({ data, response }) => {
+            const jwtHeader = response.headers.get("x-trigger-jwt");
+            if (typeof jwtHeader === "string") {
+                return {
+                    ...data,
+                    publicAccessToken: jwtHeader,
+                };
+            }
             const claimsHeader = response.headers.get("x-trigger-jwt-claims");
             const claims = claimsHeader ? JSON.parse(claimsHeader) : undefined;
             const jwt = await generateJWT({
-                secretKey: this.accessToken,
+                secretKey: this.#selfSigningKey,
                 payload: {
                     ...claims,
                     scopes: [`read:batch:${data.id}`],
@@ -127,14 +234,187 @@ export class ApiClient {
             };
         });
     }
+    /**
+     * Phase 2 of 2-phase batch API: Stream batch items
+     *
+     * Streams batch items as NDJSON to the server. Each item is enqueued
+     * as it arrives. The batch is automatically sealed when the stream completes.
+     *
+     * Includes automatic retry with exponential backoff. Since items are deduplicated
+     * by index on the server, retrying the entire stream is safe.
+     *
+     * Uses ReadableStream.tee() for retry capability without buffering all items
+     * upfront - only items consumed before a failure are buffered for retry.
+     *
+     * @param batchId - The batch ID from createBatch
+     * @param items - Array or async iterable of batch items
+     * @param requestOptions - Optional request options
+     * @returns Summary of items accepted and deduplicated
+     */
+    async streamBatchItems(batchId, items, requestOptions) {
+        // Convert input to ReadableStream for uniform handling and tee() support
+        const stream = createNdjsonStream(items);
+        const retryOptions = {
+            ...DEFAULT_STREAM_BATCH_RETRY_OPTIONS,
+            ...requestOptions?.retry,
+        };
+        return this.#streamBatchItemsWithRetry(batchId, stream, retryOptions);
+    }
+    async #streamBatchItemsWithRetry(batchId, stream, retryOptions, attempt = 1) {
+        const headers = this.#getHeaders(false);
+        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,
+        // so we only buffer what's been sent before a failure occurs
+        const [forRequest, forRetry] = stream.tee();
+        try {
+            const response = await fetch(`${this.baseUrl}/api/v3/batches/${batchId}/items`, {
+                method: "POST",
+                headers,
+                body: forRequest,
+                // @ts-expect-error - duplex is required for streaming body but not in types
+                duplex: "half",
+            });
+            if (!response.ok) {
+                const retryResult = shouldRetryStreamBatchItems(response, attempt, retryOptions);
+                if (retryResult.retry) {
+                    // Cancel the request stream before retry to prevent tee() from buffering
+                    await safeStreamCancel(forRequest);
+                    await sleep(retryResult.delay);
+                    // Use the backup stream for retry
+                    return this.#streamBatchItemsWithRetry(batchId, forRetry, retryOptions, attempt + 1);
+                }
+                // Not retrying - cancel the backup stream
+                await safeStreamCancel(forRetry);
+                const errText = await response.text().catch((e) => e.message);
+                let errJSON;
+                try {
+                    errJSON = JSON.parse(errText);
+                }
+                catch {
+                    // ignore
+                }
+                const errMessage = errJSON ? undefined : errText;
+                const responseHeaders = Object.fromEntries(response.headers.entries());
+                throw ApiError.generate(response.status, errJSON, errMessage, responseHeaders);
+            }
+            const result = await response.json();
+            const parsed = StreamBatchItemsResponse.safeParse(result);
+            if (!parsed.success) {
+                // Cancel backup stream since we're throwing
+                await safeStreamCancel(forRetry);
+                throw new Error(`Invalid response from server for batch ${batchId}: ${parsed.error.message}`);
+            }
+            // Check if the batch was sealed
+            if (!parsed.data.sealed) {
+                // Not all items were received - treat as retryable condition
+                const delay = calculateNextRetryDelay(retryOptions, attempt);
+                if (delay) {
+                    // Cancel the request stream before retry to prevent tee() from buffering
+                    await safeStreamCancel(forRequest);
+                    // Retry with the backup stream
+                    await sleep(delay);
+                    return this.#streamBatchItemsWithRetry(batchId, forRetry, retryOptions, attempt + 1);
+                }
+                // No more retries - cancel backup stream and throw descriptive error
+                await safeStreamCancel(forRetry);
+                throw new BatchNotSealedError({
+                    batchId,
+                    enqueuedCount: parsed.data.enqueuedCount ?? 0,
+                    expectedCount: parsed.data.expectedCount ?? 0,
+                    itemsAccepted: parsed.data.itemsAccepted,
+                    itemsDeduplicated: parsed.data.itemsDeduplicated,
+                });
+            }
+            // Success - cancel the backup stream to release resources
+            await safeStreamCancel(forRetry);
+            return parsed.data;
+        }
+        catch (error) {
+            // Don't retry BatchNotSealedError (retries already exhausted)
+            if (error instanceof BatchNotSealedError) {
+                throw error;
+            }
+            // Don't retry ApiErrors (already handled above with backup stream cancelled)
+            if (error instanceof ApiError) {
+                throw error;
+            }
+            // Retry connection errors using the backup stream
+            const delay = calculateNextRetryDelay(retryOptions, attempt);
+            if (delay) {
+                // Cancel the request stream before retry to prevent tee() from buffering
+                await safeStreamCancel(forRequest);
+                await sleep(delay);
+                return this.#streamBatchItemsWithRetry(batchId, forRetry, retryOptions, attempt + 1);
+            }
+            // No more retries - cancel the backup stream
+            await safeStreamCancel(forRetry);
+            // Wrap in a more descriptive error
+            const cause = error instanceof Error ? error : new Error(String(error));
+            throw new ApiConnectionError({
+                cause,
+                message: `Failed to stream batch items for batch ${batchId}: ${cause.message}`,
+            });
+        }
+    }
     createUploadPayloadUrl(filename, requestOptions) {
-        return zodfetch(CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/packets/${filename}`, {
+        const encoded = encodeURIComponent(filename);
+        return zodfetch(CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v2/packets/${encoded}`, {
             method: "PUT",
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
     getPayloadUrl(filename, requestOptions) {
-        return zodfetch(CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/packets/${filename}`, {
+        const encoded = encodeURIComponent(filename);
+        return zodfetch(CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/packets/${encoded}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    /**
+     * Presigned GET URL for a run's stored payload or output, authorized against the run.
+     * Falls back to the legacy packet route on servers that predate this endpoint.
+     */
+    async getRunPacketUrl(runId, field, path, requestOptions) {
+        try {
+            return await zodfetch(CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/runs/${encodeURIComponent(runId)}/packets/${field}`, {
+                method: "GET",
+                headers: this.#getHeaders(false),
+            }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+        }
+        catch (error) {
+            if (error instanceof ApiError && error.status === 404) {
+                return await this.getPayloadUrl(path, requestOptions);
+            }
+            throw error;
+        }
+    }
+    /** Presigned PUT URL for a `chat.agent` session snapshot. */
+    createChatSnapshotUploadUrl(sessionId, requestOptions) {
+        return zodfetch(CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionId)}/snapshot-url`, {
+            method: "PUT",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    /** Presigned GET URL for a `chat.agent` session snapshot. */
+    getChatSnapshotUrl(sessionId, requestOptions) {
+        return zodfetch(CreateUploadPayloadUrlResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionId)}/snapshot-url`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    /**
+     * One page of a `chat.agent` session's persisted transcript, most recent
+     * messages first when `limit` is set. Secret key only.
+     */
+    getSessionTranscript(sessionId, options, requestOptions) {
+        const query = new URLSearchParams();
+        if (options?.limit !== undefined)
+            query.set("limit", String(options.limit));
+        if (options?.before !== undefined)
+            query.set("before", options.before);
+        const suffix = query.size > 0 ? `?${query.toString()}` : "";
+        return zodfetch(SessionTranscriptResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionId)}/transcript${suffix}`, {
             method: "GET",
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
@@ -145,6 +425,34 @@ export class ApiClient {
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
+    retrieveRunTrace(runId, requestOptions) {
+        return zodfetch(RetrieveRunTraceResponseBody, `${this.baseUrl}/api/v1/runs/${runId}/trace`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    /**
+     * Retrieves one page of a root run's trace as flat spans. Omit `after` for the first
+     * page, then pass back `pagination.next` until it's missing. Use `assembleRunTracePages`
+     * to rebuild the tree. Spans are lean: fetch a span's events and properties with
+     * `retrieveSpan`.
+     */
+    retrieveRunTracePage(runId, options, requestOptions) {
+        const query = new URLSearchParams();
+        query.set("page[size]", String(options?.limit ?? 10_000));
+        if (options?.after !== undefined)
+            query.set("page[after]", options.after);
+        return zodfetch(RetrieveRunTracePageResponseBody, `${this.baseUrl}/api/v1/runs/${encodeURIComponent(runId)}/trace?${query.toString()}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveSpan(runId, spanId, requestOptions) {
+        return zodfetch(RetrieveSpanDetailResponseBody, `${this.baseUrl}/api/v1/runs/${runId}/spans/${spanId}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
     listRuns(query, requestOptions) {
         const searchParams = createSearchQueryForListRuns(query);
         return zodfetchCursorPage(ListRunResponseItem, `${this.baseUrl}/api/v1/runs`, {
@@ -172,11 +480,18 @@ export class ApiClient {
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
-    replayRun(runId, requestOptions) {
+    replayRun(runId, bodyOrRequestOptions, requestOptions) {
+        const isBody = bodyOrRequestOptions !== undefined &&
+            Object.keys(bodyOrRequestOptions).every((key) => key in ReplayRunRequestBody.shape);
+        const body = isBody ? bodyOrRequestOptions : undefined;
+        const $requestOptions = isBody
+            ? requestOptions
+            : (bodyOrRequestOptions ?? requestOptions);
         return zodfetch(ReplayRunResponse, `${this.baseUrl}/api/v1/runs/${runId}/replay`, {
             method: "POST",
             headers: this.#getHeaders(false),
-        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+            body: body ? JSON.stringify(withSuperJsonPayload(body)) : undefined,
+        }, mergeRequestOptions(this.defaultRequestOptions, $requestOptions));
     }
     cancelRun(runId, requestOptions) {
         return zodfetch(CanceledRunResponse, `${this.baseUrl}/api/v2/runs/${runId}/cancel`, {
@@ -184,6 +499,43 @@ export class ApiClient {
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
+    createBulkAction(options, requestOptions) {
+        return zodfetch(CreateBulkActionResponseBody, `${this.baseUrl}/api/v1/bulk-actions`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(options),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    listBulkActions(query, requestOptions) {
+        return zodfetchCursorPage(BulkActionObject, `${this.baseUrl}/api/v1/bulk-actions`, {
+            query: new URLSearchParams(),
+            limit: query?.limit,
+            after: query?.after,
+            before: query?.before,
+        }, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveBulkAction(bulkActionId, requestOptions) {
+        return zodfetch(BulkActionObject, `${this.baseUrl}/api/v1/bulk-actions/${bulkActionId}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    abortBulkAction(bulkActionId, requestOptions) {
+        return zodfetch(AbortBulkActionResponseBody, `${this.baseUrl}/api/v1/bulk-actions/${bulkActionId}/abort`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    resetIdempotencyKey(taskIdentifier, idempotencyKey, requestOptions) {
+        return zodfetch(ResetIdempotencyKeyResponse, `${this.baseUrl}/api/v1/idempotencyKeys/${encodeURIComponent(idempotencyKey)}/reset`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify({ taskIdentifier }),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
     rescheduleRun(runId, body, requestOptions) {
         return zodfetch(RetrieveRunResponse, `${this.baseUrl}/api/v1/runs/${runId}/reschedule`, {
             method: "POST",
@@ -191,6 +543,13 @@ export class ApiClient {
             body: JSON.stringify(body),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
+    listRunEvents(runId, requestOptions) {
+        return zodfetch(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));
+    }
     addTags(runId, body, requestOptions) {
         return zodfetch(z.object({ message: z.string() }), `${this.baseUrl}/api/v1/runs/${runId}/tags`, {
             method: "POST",
@@ -253,7 +612,7 @@ export class ApiClient {
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
     listEnvVars(projectRef, slug, requestOptions) {
-        return zodfetch(EnvironmentVariables, `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}`, {
+        return zodfetch(z.array(EnvironmentVariableWithSecret), `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}`, {
             method: "GET",
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
@@ -266,7 +625,7 @@ export class ApiClient {
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
     retrieveEnvVar(projectRef, slug, key, requestOptions) {
-        return zodfetch(EnvironmentVariableValue, `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}/${key}`, {
+        return zodfetch(EnvironmentVariableWithSecret, `${this.baseUrl}/api/v1/projects/${projectRef}/envvars/${slug}/${key}`, {
             method: "GET",
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
@@ -304,57 +663,629 @@ export class ApiClient {
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
+    createWaitpointToken(options, requestOptions) {
+        return zodfetch(CreateWaitpointTokenResponseBody, `${this.baseUrl}/api/v1/waitpoints/tokens`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(options),
+        }, {
+            ...mergeRequestOptions(this.defaultRequestOptions, requestOptions),
+            prepareData: async (data, response) => {
+                const jwtHeader = response.headers.get("x-trigger-jwt");
+                if (typeof jwtHeader === "string") {
+                    return {
+                        ...data,
+                        publicAccessToken: jwtHeader,
+                    };
+                }
+                const claimsHeader = response.headers.get("x-trigger-jwt-claims");
+                const claims = claimsHeader ? JSON.parse(claimsHeader) : undefined;
+                const jwt = await generateJWT({
+                    secretKey: this.#selfSigningKey,
+                    payload: {
+                        ...claims,
+                        scopes: [`write:waitpoints:${data.id}`],
+                    },
+                    expirationTime: "24h",
+                });
+                return {
+                    ...data,
+                    publicAccessToken: jwt,
+                };
+            },
+        });
+    }
+    listWaitpointTokens(params, requestOptions) {
+        const searchParams = createSearchQueryForListWaitpointTokens(params);
+        return zodfetchCursorPage(WaitpointTokenItem, `${this.baseUrl}/api/v1/waitpoints/tokens`, {
+            query: searchParams,
+            limit: params?.limit,
+            after: params?.after,
+            before: params?.before,
+        }, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveWaitpointToken(friendlyId, requestOptions) {
+        return zodfetch(WaitpointRetrieveTokenResponse, `${this.baseUrl}/api/v1/waitpoints/tokens/${friendlyId}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    completeWaitpointToken(friendlyId, options, requestOptions) {
+        return zodfetch(CompleteWaitpointTokenResponseBody, `${this.baseUrl}/api/v1/waitpoints/tokens/${friendlyId}/complete`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(options),
+        }, {
+            ...mergeRequestOptions(this.defaultRequestOptions, requestOptions),
+        });
+    }
+    waitForWaitpointToken({ runFriendlyId, waitpointFriendlyId, }, requestOptions) {
+        return zodfetch(WaitForWaitpointTokenResponseBody, `${this.baseUrl}/engine/v1/runs/${runFriendlyId}/waitpoints/tokens/${waitpointFriendlyId}/wait`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    // ========================================================================
+    // Sessions
+    // ========================================================================
+    createSession(body, requestOptions) {
+        return zodfetch(CreatedSessionResponseBody, `${this.baseUrl}/api/v1/sessions`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveSession(sessionIdOrExternalId, requestOptions) {
+        return zodfetch(RetrieveSessionResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    updateSession(sessionIdOrExternalId, body, requestOptions) {
+        return zodfetch(RetrieveSessionResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}`, {
+            method: "PATCH",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    closeSession(sessionIdOrExternalId, body, requestOptions) {
+        return zodfetch(RetrieveSessionResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}/close`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body ?? {}),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    endAndContinueSession(sessionIdOrExternalId, body, requestOptions) {
+        return zodfetch(EndAndContinueSessionResponseBody, `${this.baseUrl}/api/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}/end-and-continue`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    listSessions(options, requestOptions) {
+        const searchParams = createSearchQueryForListSessions(options);
+        return zodfetchCursorPage(ListedSessionItem, `${this.baseUrl}/api/v1/sessions`, {
+            query: searchParams,
+            limit: options?.limit,
+            after: options?.after,
+            before: options?.before,
+        }, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    // ========================================================================
+    // Session realtime channels
+    // ========================================================================
+    async initializeSessionStream(sessionIdOrExternalId, io, requestOptions, channel) {
+        // The server returns S2 credentials in response headers alongside a tiny
+        // JSON body with the realtime version. Follow the same shape as
+        // `createStream` so downstream clients can feed them into
+        // `StreamsWriterV2`.
+        const base = `${this.baseUrl}/realtime/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}`;
+        const url = channel ? `${base}/channels/${encodeURIComponent(channel)}/${io}` : `${base}/${io}`;
+        return zodfetch(CreateStreamResponseBody, url, {
+            method: "PUT",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
+            .withResponse()
+            .then(({ data, response }) => ({
+            ...data,
+            headers: Object.fromEntries(response.headers.entries()),
+        }));
+    }
+    async appendToSessionStream(sessionIdOrExternalId, io, part, requestOptions, channel) {
+        // Generated once per logical append, outside zodfetch, so its internal
+        // retries reuse the same part id and the server-side dedupe collapses a
+        // retried POST whose first attempt actually committed. Full-length nanoid
+        // (~126 bits) to match the browser transport's randomUUID entropy.
+        const partId = nanoid();
+        const base = `${this.baseUrl}/realtime/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}`;
+        const appendUrl = channel
+            ? `${base}/channels/${encodeURIComponent(channel)}/${io}/append`
+            : `${base}/${io}/append`;
+        return zodfetch(AppendToStreamResponseBody, appendUrl, {
+            method: "POST",
+            headers: { ...this.#getHeaders(false), "X-Part-Id": partId },
+            body: part,
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    /**
+     * Non-SSE drain of a Session channel's tail. Returns whatever records
+     * exist after `afterEventId` (or from the head of the stream) and closes
+     * — `wait=0` semantics, no long-poll. Used by `replaySessionOutTail` at
+     * run boot, where the SSE long-poll's ~1s tax on empty streams is the
+     * dominant cost on every fresh chat.
+     *
+     * `afterEventId` is the same cursor format as the SSE Last-Event-ID
+     * (the S2 sequence number, stringified) — pass `lastOutEventId` from a
+     * persisted snapshot to resume.
+     */
+    async readSessionStreamRecords(sessionIdOrExternalId, io, options) {
+        const qs = new URLSearchParams();
+        if (options?.afterEventId !== undefined) {
+            qs.set("afterEventId", options.afterEventId);
+        }
+        const recordsBase = `${options?.baseUrl ?? this.baseUrl}/realtime/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}`;
+        const recordsPath = options?.channel
+            ? `${recordsBase}/channels/${encodeURIComponent(options.channel)}/${io}/records`
+            : `${recordsBase}/${io}/records`;
+        const url = `${recordsPath}${qs.toString() ? `?${qs.toString()}` : ""}`;
+        return zodfetch(ReadSessionStreamRecordsResponseBody, url, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, undefined));
+    }
+    /**
+     * Subscribe to SSE records on a Session channel. Reuses the same
+     * {@link SSEStreamSubscription} plumbing as `readStream` for run-scoped
+     * realtime streams — auto-retry, Last-Event-ID resume, abort-on-cancel.
+     */
+    async subscribeToSessionStream(sessionIdOrExternalId, io, options) {
+        const sessionSegment = `${options?.baseUrl ?? this.baseUrl}/realtime/v1/sessions/${encodeURIComponent(sessionIdOrExternalId)}`;
+        const url = options?.channel
+            ? `${sessionSegment}/channels/${encodeURIComponent(options.channel)}/${io}`
+            : `${sessionSegment}/${io}`;
+        const subscription = new SSEStreamSubscription(url, {
+            headers: this.getHeaders(),
+            resolveHeaders: this.#resolveStreamHeaders(),
+            signal: options?.signal,
+            onComplete: options?.onComplete,
+            onError: options?.onError,
+            timeoutInSeconds: options?.timeoutInSeconds,
+            lastEventId: options?.lastEventId,
+            from: options?.from,
+        });
+        const stream = await subscription.subscribe();
+        const onPart = options?.onPart;
+        const onControl = options?.onControl;
+        return stream.pipeThrough(new TransformStream({
+            transform(part, controller) {
+                // Always surface the raw part via onPart so cursor tracking
+                // (lastSeqNum, lastEventId) stays correct for both data and
+                // control records.
+                onPart?.(part);
+                // Trigger control record — route to onControl, never enqueue.
+                const subtype = controlSubtype(part.headers);
+                if (subtype) {
+                    // `part.id` is the S2 seq_num in decimal string form.
+                    // `parseInt` returns NaN if S2 ever surfaces a non-numeric
+                    // id (shouldn't happen, but `|| 0` would mask it as a real
+                    // seq 0). Drop the malformed event rather than fire
+                    // `onControl` with a misleading cursor — callers like
+                    // `findLatestSessionInCursor` and the dashboard rely on the
+                    // seqNum being meaningful for resume.
+                    const parsedSeqNum = Number.parseInt(part.id, 10);
+                    if (!Number.isFinite(parsedSeqNum)) {
+                        return;
+                    }
+                    onControl?.({
+                        subtype,
+                        headers: part.headers ?? [],
+                        seqNum: parsedSeqNum,
+                        timestamp: part.timestamp,
+                    });
+                    return;
+                }
+                controller.enqueue(part.chunk);
+            },
+        }));
+    }
+    async waitForDuration(runId, body, requestOptions) {
+        return zodfetch(WaitForDurationResponseBody, `${this.baseUrl}/engine/v1/runs/${runId}/wait/duration`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    listQueues(options, requestOptions) {
+        const searchParams = new URLSearchParams();
+        if (options?.page) {
+            searchParams.append("page", options.page.toString());
+        }
+        if (options?.perPage) {
+            searchParams.append("perPage", options.perPage.toString());
+        }
+        return zodfetchOffsetLimitPage(QueueItem, `${this.baseUrl}/api/v1/queues`, {
+            page: options?.page,
+            limit: options?.perPage,
+        }, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveQueue(queue, requestOptions) {
+        const type = typeof queue === "string" ? "id" : queue.type;
+        const value = typeof queue === "string" ? queue : queue.name;
+        // Explicitly encode slashes before encoding the rest of the string
+        const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
+        return zodfetch(QueueItem, `${this.baseUrl}/api/v1/queues/${encodedValue}?type=${type}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    pauseQueue(queue, action, requestOptions) {
+        const type = typeof queue === "string" ? "id" : queue.type;
+        const value = typeof queue === "string" ? queue : queue.name;
+        // Explicitly encode slashes before encoding the rest of the string
+        const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
+        return zodfetch(QueueItem, `${this.baseUrl}/api/v1/queues/${encodedValue}/pause`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify({
+                type,
+                action,
+            }),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    overrideQueueConcurrencyLimit(queue, concurrencyLimit, requestOptions) {
+        const type = typeof queue === "string" ? "id" : queue.type;
+        const value = typeof queue === "string" ? queue : queue.name;
+        // Explicitly encode slashes before encoding the rest of the string
+        const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
+        return zodfetch(QueueItem, `${this.baseUrl}/api/v1/queues/${encodedValue}/concurrency/override`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify({
+                type,
+                concurrencyLimit,
+            }),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    resetQueueConcurrencyLimit(queue, requestOptions) {
+        const type = typeof queue === "string" ? "id" : queue.type;
+        const value = typeof queue === "string" ? queue : queue.name;
+        // Explicitly encode slashes before encoding the rest of the string
+        const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
+        return zodfetch(QueueItem, `${this.baseUrl}/api/v1/queues/${encodedValue}/concurrency/reset`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify({
+                type,
+            }),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    listConcurrencyLimits(options, requestOptions) {
+        return zodfetchOffsetLimitPage(ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits`, {
+            page: options?.page,
+            limit: options?.perPage,
+        }, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveConcurrencyLimit(name, requestOptions) {
+        return zodfetch(ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveConcurrencyLimitKey(name, concurrencyKey, requestOptions) {
+        const query = new URLSearchParams({ concurrencyKey });
+        return zodfetch(ConcurrencyLimitKeyItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}?${query.toString()}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    overrideConcurrencyLimit(name, override, requestOptions) {
+        return zodfetch(ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/override`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(override),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    overrideConcurrencyLimitKey(name, override, requestOptions) {
+        return zodfetch(ConcurrencyLimitKeyItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/override`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(override),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    pauseConcurrencyLimit(name, action, requestOptions) {
+        return zodfetch(ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/pause`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify({
+                action,
+            }),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    resetConcurrencyLimit(name, requestOptions) {
+        return zodfetch(ConcurrencyLimitItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/reset`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify({}),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    resetConcurrencyLimitKey(name, body, requestOptions) {
+        return zodfetch(ConcurrencyLimitKeyItem, `${this.baseUrl}/api/v1/concurrency-limits/${encodeURIComponent(name)}/reset`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
     subscribeToRun(runId, options) {
-        return runShapeStream(`${this.baseUrl}/realtime/v1/runs/${runId}`, {
+        const queryParams = new URLSearchParams();
+        if (options?.skipColumns) {
+            queryParams.append("skipColumns", options.skipColumns.join(","));
+        }
+        return runShapeStream(`${this.baseUrl}/realtime/v1/runs/${runId}${queryParams ? `?${queryParams}` : ""}`, {
             closeOnComplete: typeof options?.closeOnComplete === "boolean" ? options.closeOnComplete : true,
             headers: this.#getRealtimeHeaders(),
+            resolveHeaders: this.#resolveRealtimeHeaders(),
             client: this,
             signal: options?.signal,
             onFetchError: options?.onFetchError,
+            fetchClient: options?.fetchClient,
         });
     }
-    subscribeToRunsWithTag(tag, options) {
+    subscribeToRunsWithTag(tag, filters, options) {
         const searchParams = createSearchQueryForSubscribeToRuns({
             tags: tag,
+            ...(filters ? { createdAt: filters.createdAt } : {}),
+            ...(filters?.skipColumns ? { skipColumns: filters.skipColumns } : {}),
         });
         return runShapeStream(`${this.baseUrl}/realtime/v1/runs${searchParams ? `?${searchParams}` : ""}`, {
             closeOnComplete: false,
             headers: this.#getRealtimeHeaders(),
+            resolveHeaders: this.#resolveRealtimeHeaders(),
             client: this,
             signal: options?.signal,
             onFetchError: options?.onFetchError,
+            fetchClient: options?.fetchClient,
         });
     }
     subscribeToBatch(batchId, options) {
-        return runShapeStream(`${this.baseUrl}/realtime/v1/batches/${batchId}`, {
+        const queryParams = new URLSearchParams();
+        if (options?.skipColumns) {
+            queryParams.append("skipColumns", options.skipColumns.join(","));
+        }
+        return runShapeStream(`${this.baseUrl}/realtime/v1/batches/${batchId}${queryParams ? `?${queryParams}` : ""}`, {
             closeOnComplete: false,
             headers: this.#getRealtimeHeaders(),
+            resolveHeaders: this.#resolveRealtimeHeaders(),
             client: this,
             signal: options?.signal,
             onFetchError: options?.onFetchError,
+            fetchClient: options?.fetchClient,
         });
     }
+    listDeployments(options, requestOptions) {
+        const searchParams = new URLSearchParams();
+        if (options?.status) {
+            searchParams.append("status", options.status);
+        }
+        if (options?.period) {
+            searchParams.append("period", options.period);
+        }
+        if (options?.from) {
+            searchParams.append("from", options.from);
+        }
+        if (options?.to) {
+            searchParams.append("to", options.to);
+        }
+        return zodfetchCursorPage(ApiDeploymentListResponseItem, `${this.baseUrl}/api/v1/deployments`, {
+            query: searchParams,
+            after: options?.cursor,
+            limit: options?.limit,
+        }, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveCurrentDeployment(requestOptions) {
+        return zodfetch(RetrieveCurrentDeploymentResponseBody, `${this.baseUrl}/api/v1/deployments/current`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
     async fetchStream(runId, streamKey, options) {
         const streamFactory = new SSEStreamSubscriptionFactory(options?.baseUrl ?? this.baseUrl, {
             headers: this.getHeaders(),
             signal: options?.signal,
+            resolveHeaders: this.#resolveStreamHeaders(),
+        });
+        const subscription = streamFactory.createSubscription(runId, streamKey, {
+            onComplete: options?.onComplete,
+            onError: options?.onError,
+            timeoutInSeconds: options?.timeoutInSeconds,
+            lastEventId: options?.lastEventId,
+            from: options?.from,
         });
-        const subscription = streamFactory.createSubscription(runId, streamKey);
         const stream = await subscription.subscribe();
-        return stream;
+        const onPart = options?.onPart;
+        return stream.pipeThrough(new TransformStream({
+            transform(chunk, controller) {
+                const data = chunk.chunk;
+                onPart?.(chunk);
+                controller.enqueue(data);
+            },
+        }));
+    }
+    async createStream(runId, target, streamId, requestOptions) {
+        return zodfetch(CreateStreamResponseBody, `${this.baseUrl}/realtime/v1/streams/${runId}/${target}/${streamId}`, {
+            method: "PUT",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions))
+            .withResponse()
+            .then(async ({ data, response }) => {
+            return {
+                ...data,
+                headers: Object.fromEntries(response.headers.entries()),
+            };
+        });
+    }
+    async appendToStream(runId, target, streamId, part, requestOptions) {
+        return zodfetch(AppendToStreamResponseBody, `${this.baseUrl}/realtime/v1/streams/${runId}/${target}/${streamId}/append`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: part,
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    async sendInputStream(runId, streamId, data, requestOptions) {
+        return zodfetch(SendInputStreamResponseBody, `${this.baseUrl}/realtime/v1/streams/${runId}/input/${streamId}`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify({ data }),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    async createInputStreamWaitpoint(runFriendlyId, body, requestOptions) {
+        return zodfetch(CreateInputStreamWaitpointResponseBody, `${this.baseUrl}/api/v1/runs/${runFriendlyId}/input-streams/wait`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    async createSessionStreamWaitpoint(runFriendlyId, body, requestOptions) {
+        return zodfetch(CreateSessionStreamWaitpointResponseBody, `${this.baseUrl}/api/v1/runs/${runFriendlyId}/session-streams/wait`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
     async generateJWTClaims(requestOptions) {
-        return zodfetch(z.record(z.any()), `${this.baseUrl}/api/v1/auth/jwt/claims`, {
+        return zodfetch(z.record(z.string(), z.any()), `${this.baseUrl}/api/v1/auth/jwt/claims`, {
             method: "POST",
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
+    async createPublicToken(body, requestOptions) {
+        return zodfetch(CreatePublicTokenResponseBody, `${this.baseUrl}/api/v1/auth/public-tokens`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
     retrieveBatch(batchId, requestOptions) {
-        return zodfetch(RetrieveBatchResponse, `${this.baseUrl}/api/v1/batches/${batchId}`, {
+        return zodfetch(RetrieveBatchV2Response, `${this.baseUrl}/api/v2/batches/${batchId}`, {
             method: "GET",
             headers: this.#getHeaders(false),
         }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
     }
+    async executeQuery(query, options, requestOptions) {
+        const body = {
+            query,
+            scope: options?.scope ?? "environment",
+            period: options?.period,
+            from: options?.from,
+            to: options?.to,
+            format: options?.format ?? "json",
+        };
+        return zodfetch(QueryExecuteResponseBody, `${this.baseUrl}/api/v1/query`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    async getQuerySchema(requestOptions) {
+        return zodfetch(QuerySchemaResponseBody, `${this.baseUrl}/api/v1/query/schema`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    async listDashboards(requestOptions) {
+        return zodfetch(ListDashboardsResponseBody, `${this.baseUrl}/api/v1/query/dashboards`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveDashboard(dashboardId, requestOptions) {
+        return zodfetch(DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    createDashboard(body, requestOptions) {
+        return zodfetch(DashboardObject, `${this.baseUrl}/api/v1/query/dashboards`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    updateDashboard(dashboardId, body, requestOptions) {
+        return zodfetch(DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}`, {
+            method: "PATCH",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    replaceDashboard(dashboardId, body, requestOptions) {
+        return zodfetch(DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}`, {
+            method: "PUT",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    deleteDashboard(dashboardId, requestOptions) {
+        return zodfetch(DeleteDashboardResponseBody, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}`, {
+            method: "DELETE",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    addDashboardWidget(dashboardId, body, requestOptions) {
+        return zodfetch(AddDashboardWidgetResponseBody, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}/widgets`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    updateDashboardWidget(dashboardId, widgetId, body, requestOptions) {
+        return zodfetch(DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}/widgets/${encodeURIComponent(widgetId)}`, {
+            method: "PATCH",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    deleteDashboardWidget(dashboardId, widgetId, options, requestOptions) {
+        const search = options?.revision
+            ? `?${new URLSearchParams({ revision: options.revision }).toString()}`
+            : "";
+        return zodfetch(DashboardObject, `${this.baseUrl}/api/v1/query/dashboards/${encodeURIComponent(dashboardId)}/widgets/${encodeURIComponent(widgetId)}${search}`, {
+            method: "DELETE",
+            headers: this.#getHeaders(false),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    async getReport(key, options) {
+        const searchParams = new URLSearchParams({ format: options?.format ?? "markdown" });
+        if (options?.period) {
+            searchParams.set("period", options.period);
+        }
+        const response = await fetch(`${this.baseUrl}/api/v1/reports/${encodeURIComponent(key)}?${searchParams.toString()}`, {
+            method: "GET",
+            headers: this.#getHeaders(false),
+        });
+        if (!response.ok) {
+            const bodySnippet = await readBodySnippet(response);
+            throw new Error(`Failed to fetch report "${key}": ${response.status} ${response.statusText}${bodySnippet ? ` — ${bodySnippet}` : ""}`);
+        }
+        if (options?.format === "json") {
+            return ReportViewModelSchema.parse(await response.json());
+        }
+        return response.text();
+    }
     #getHeaders(spanParentAsLink, additionalHeaders) {
         const headers = {
             "Content-Type": "application/json",
@@ -367,9 +1298,24 @@ export class ApiClient {
                 return acc;
             }, {}),
         };
+        if (this.additionalHeaders) {
+            for (const [key, value] of Object.entries(this.additionalHeaders)) {
+                if (!(key in headers)) {
+                    headers[key] = value;
+                }
+            }
+        }
+        if (!headers["x-trigger-source"]) {
+            headers["x-trigger-source"] = "sdk";
+        }
+        if (this.previewBranch) {
+            headers["x-trigger-branch"] = this.previewBranch;
+        }
         // Only inject the context if we are inside a task
         if (taskContext.isInsideTask) {
             headers["x-trigger-worker"] = "true";
+            // Only pass the engine version if we are inside a task
+            headers["x-trigger-engine-version"] = "V2";
             if (spanParentAsLink) {
                 headers["x-trigger-span-parent-as-link"] = "1";
             }
@@ -377,13 +1323,104 @@ export class ApiClient {
         if (typeof window !== "undefined" && typeof window.document !== "undefined") {
             headers["x-trigger-client"] = "browser";
         }
+        headers[API_VERSION_HEADER_NAME] = API_VERSION;
+        const streamFlag = this.futureFlags.v2RealtimeStreams ?? true;
+        if (streamFlag === false ||
+            getEnvVar("TRIGGER_V2_REALTIME_STREAMS") === "0" ||
+            getEnvVar("TRIGGER_V2_REALTIME_STREAMS") === "false" ||
+            getEnvVar("TRIGGER_REALTIME_STREAMS_V2") === "0" ||
+            getEnvVar("TRIGGER_REALTIME_STREAMS_V2") === "false") {
+            headers["x-trigger-realtime-streams-version"] = "v1";
+        }
+        else {
+            headers["x-trigger-realtime-streams-version"] = "v2";
+        }
         return headers;
     }
+    resolvePrompt(slug, body, requestOptions) {
+        return zodfetch(ResolvePromptResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}`, {
+            method: "POST",
+            headers: this.#getHeaders(false),
+            body: JSON.stringify(body),
+        }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    createWebhookWaiter(endpointId, body, requestOptions) {
+        return zodfetch(CreateWebhookWaiterResponseBody, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}/waiters`, { method: "POST", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    cancelWebhookWaiter(waiterId, requestOptions) {
+        return zodfetch(CancelWebhookWaiterResponseBody, `${this.baseUrl}/api/v1/webhooks/waiters/${encodeURIComponent(waiterId)}/cancel`, { method: "POST", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    listWebhookEndpoints(requestOptions) {
+        return zodfetch(ListWebhookEndpointsResponse, `${this.baseUrl}/api/v1/webhooks/endpoints`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveWebhookEndpoint(endpointId, requestOptions) {
+        return zodfetch(WebhookEndpointDetailObject, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    generateWebhookEndpointSecret(endpointId, body = {}, requestOptions) {
+        return zodfetch(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));
+    }
+    setWebhookEndpointSecret(endpointId, body, requestOptions) {
+        return zodfetch(SetWebhookEndpointSecretResponse, `${this.baseUrl}/api/v1/webhooks/endpoints/${encodeURIComponent(endpointId)}/secret`, { method: "PUT", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    listWebhookDeliveries(query = {}, requestOptions) {
+        const searchParams = new URLSearchParams();
+        const list = (value) => value === undefined ? undefined : Array.isArray(value) ? value.join(",") : value;
+        const endpoint = list(query.endpoint);
+        if (endpoint)
+            searchParams.set("filter[endpoint]", endpoint);
+        const status = list(query.status);
+        if (status)
+            searchParams.set("filter[status]", status);
+        if (query.period)
+            searchParams.set("filter[period]", query.period);
+        if (query.from)
+            searchParams.set("filter[from]", query.from.toISOString());
+        if (query.to)
+            searchParams.set("filter[to]", query.to.toISOString());
+        if (query.limit !== undefined)
+            searchParams.set("page[size]", String(query.limit));
+        if (query.after)
+            searchParams.set("page[after]", query.after);
+        const qs = searchParams.toString();
+        return zodfetch(ListWebhookDeliveriesResponse, `${this.baseUrl}/api/v1/webhooks/deliveries${qs ? `?${qs}` : ""}`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    retrieveWebhookDelivery(deliveryId, requestOptions) {
+        return zodfetch(WebhookDeliveryObject, `${this.baseUrl}/api/v1/webhooks/deliveries/${encodeURIComponent(deliveryId)}`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, 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 zodfetch(ReplayWebhookDeliveryResponse, `${this.baseUrl}/api/v1/webhooks/deliveries/${encodeURIComponent(deliveryId)}/replay${qs}`, { method: "POST", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    listPrompts(requestOptions) {
+        return zodfetch(ListPromptsResponseBody, `${this.baseUrl}/api/v1/prompts`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    listPromptVersions(slug, requestOptions) {
+        return zodfetch(ListPromptVersionsResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/versions`, { method: "GET", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    promotePromptVersion(slug, body, requestOptions) {
+        return zodfetch(PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/promote`, { method: "POST", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    createPromptOverride(slug, body, requestOptions) {
+        return zodfetch(PromptOverrideCreatedResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override`, { method: "POST", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    updatePromptOverride(slug, body, requestOptions) {
+        return zodfetch(PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override`, { method: "PUT", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    removePromptOverride(slug, requestOptions) {
+        return zodfetch(PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override`, { method: "DELETE", headers: this.#getHeaders(false) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
+    reactivatePromptOverride(slug, body, requestOptions) {
+        return zodfetch(PromptOkResponseBody, `${this.baseUrl}/api/v1/prompts/${slug}/override/reactivate`, { method: "POST", headers: this.#getHeaders(false), body: JSON.stringify(body) }, mergeRequestOptions(this.defaultRequestOptions, requestOptions));
+    }
     #getRealtimeHeaders() {
-        const headers = {
+        let headers = {
             Authorization: `Bearer ${this.accessToken}`,
             "trigger-version": VERSION,
         };
+        if (this.previewBranch) {
+            headers["x-trigger-branch"] = this.previewBranch;
+        }
         return headers;
     }
 }
@@ -396,6 +1433,12 @@ function createSearchQueryForSubscribeToRuns(query) {
         if (query.tags) {
             searchParams.append("tags", Array.isArray(query.tags) ? query.tags.join(",") : query.tags);
         }
+        if (query.createdAt) {
+            searchParams.append("createdAt", query.createdAt);
+        }
+        if (query.skipColumns) {
+            searchParams.append("skipColumns", query.skipColumns.join(","));
+        }
     }
     return searchParams;
 }
@@ -435,9 +1478,250 @@ function createSearchQueryForListRuns(query) {
         if (query.batch) {
             searchParams.append("filter[batch]", query.batch);
         }
+        if (query.queue) {
+            searchParams.append("filter[queue]", Array.isArray(query.queue)
+                ? query.queue.map((q) => queueNameFromQueueTypeName(q)).join(",")
+                : queueNameFromQueueTypeName(query.queue));
+        }
+        if (query.machine) {
+            searchParams.append("filter[machine]", Array.isArray(query.machine) ? query.machine.join(",") : query.machine);
+        }
+        if (query.region) {
+            searchParams.append("filter[region]", Array.isArray(query.region) ? query.region.join(",") : query.region);
+        }
     }
     return searchParams;
 }
+function queueNameFromQueueTypeName(queue) {
+    if (queue.type === "task") {
+        return `task/${queue.name}`;
+    }
+    return queue.name;
+}
+function createSearchQueryForListSessions(options) {
+    const searchParams = new URLSearchParams();
+    if (!options)
+        return searchParams;
+    const appendMany = (name, value) => {
+        if (value === undefined)
+            return;
+        searchParams.append(name, Array.isArray(value) ? value.join(",") : value);
+    };
+    appendMany("filter[type]", options.type);
+    appendMany("filter[tags]", options.tag);
+    appendMany("filter[taskIdentifier]", options.taskIdentifier);
+    if (options.externalId) {
+        searchParams.append("filter[externalId]", options.externalId);
+    }
+    appendMany("filter[status]", options.status);
+    if (options.period) {
+        searchParams.append("filter[createdAt][period]", options.period);
+    }
+    if (options.from !== undefined) {
+        searchParams.append("filter[createdAt][from]", options.from instanceof Date ? options.from.getTime().toString() : options.from.toString());
+    }
+    if (options.to !== undefined) {
+        searchParams.append("filter[createdAt][to]", options.to instanceof Date ? options.to.getTime().toString() : options.to.toString());
+    }
+    return searchParams;
+}
+function createSearchQueryForListWaitpointTokens(query) {
+    const searchParams = new URLSearchParams();
+    if (query) {
+        if (query.status) {
+            searchParams.append("filter[status]", Array.isArray(query.status) ? query.status.join(",") : query.status);
+        }
+        if (query.idempotencyKey) {
+            searchParams.append("filter[idempotencyKey]", query.idempotencyKey);
+        }
+        if (query.tags) {
+            searchParams.append("filter[tags]", Array.isArray(query.tags) ? query.tags.join(",") : query.tags);
+        }
+        if (query.period) {
+            searchParams.append("filter[createdAt][period]", query.period);
+        }
+        if (query.from) {
+            searchParams.append("filter[createdAt][from]", query.from instanceof Date ? query.from.getTime().toString() : query.from.toString());
+        }
+        if (query.to) {
+            searchParams.append("filter[createdAt][to]", query.to instanceof Date ? query.to.getTime().toString() : query.to.toString());
+        }
+    }
+    return searchParams;
+}
+// ============================================================================
+// Stream Batch Items Retry Helpers
+// ============================================================================
+/**
+ * Default retry options for streaming batch items.
+ * Uses higher values than the default zodfetch retry since batch operations
+ * are more expensive to repeat from scratch.
+ */
+const DEFAULT_STREAM_BATCH_RETRY_OPTIONS = {
+    maxAttempts: 5,
+    factor: 2,
+    minTimeoutInMs: 1000,
+    maxTimeoutInMs: 30_000,
+    randomize: true,
+};
+/**
+ * Determines if a failed stream batch items request should be retried.
+ * Follows similar logic to zodfetch's shouldRetry but specific to batch streaming.
+ */
+function shouldRetryStreamBatchItems(response, attempt, retryOptions) {
+    function shouldRetryForOptions() {
+        const delay = calculateNextRetryDelay(retryOptions, attempt);
+        if (delay) {
+            return { retry: true, delay };
+        }
+        return { retry: false };
+    }
+    // Check x-should-retry header - server can explicitly control retry behavior
+    const shouldRetryHeader = response.headers.get("x-should-retry");
+    if (shouldRetryHeader === "true")
+        return shouldRetryForOptions();
+    if (shouldRetryHeader === "false")
+        return { retry: false };
+    // Retry on request timeouts
+    if (response.status === 408)
+        return shouldRetryForOptions();
+    // Retry on lock timeouts
+    if (response.status === 409)
+        return shouldRetryForOptions();
+    // Retry on rate limits with special handling for Retry-After
+    if (response.status === 429) {
+        if (attempt >= retryOptions.maxAttempts) {
+            return { retry: false };
+        }
+        // x-ratelimit-reset is the unix timestamp in milliseconds when the rate limit will reset
+        const resetAtUnixEpochMs = response.headers.get("x-ratelimit-reset");
+        if (resetAtUnixEpochMs) {
+            const resetAtUnixEpoch = parseInt(resetAtUnixEpochMs, 10);
+            const delay = resetAtUnixEpoch - Date.now() + Math.floor(Math.random() * 1000);
+            if (delay > 0) {
+                return { retry: true, delay };
+            }
+        }
+        // Fall back to Retry-After header (seconds)
+        const retryAfter = response.headers.get("retry-after");
+        if (retryAfter) {
+            const retryAfterSeconds = parseInt(retryAfter, 10);
+            if (!isNaN(retryAfterSeconds)) {
+                return { retry: true, delay: retryAfterSeconds * 1000 };
+            }
+        }
+        return shouldRetryForOptions();
+    }
+    // Retry on server errors (5xx)
+    if (response.status >= 500)
+        return shouldRetryForOptions();
+    // Don't retry client errors (4xx) except those handled above
+    return { retry: false };
+}
+/**
+ * Simple sleep utility for retry delays.
+ */
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/**
+ * Serializes a replay payload override with SuperJSON, like `trigger()` does, so values such
+ * as `Date` and `BigInt` reach the task intact. Falls back to plain JSON when SuperJSON can't
+ * serialize the value.
+ */
+function withSuperJsonPayload(body) {
+    if (body.payload === undefined || body.payloadType !== undefined) {
+        return body;
+    }
+    try {
+        return {
+            ...body,
+            payload: superjson.stringify(body.payload),
+            payloadType: "application/super+json",
+        };
+    }
+    catch {
+        return body;
+    }
+}
+/**
+ * Best-effort read of a (likely error) response body for inclusion in a thrown Error.
+ * Never throws, and truncates so we don't dump a huge HTML page into an error message.
+ */
+async function readBodySnippet(response, maxLength = 500) {
+    try {
+        const text = (await response.text()).trim();
+        if (!text) {
+            return "";
+        }
+        return text.length > maxLength ? `${text.slice(0, maxLength)}…` : text;
+    }
+    catch {
+        return "";
+    }
+}
+/**
+ * Safely cancels a ReadableStream, handling the case where it might be locked.
+ *
+ * When fetch uses a ReadableStream as a request body and an error occurs mid-transfer
+ * (connection reset, timeout, etc.), the stream may remain locked by fetch's internal reader.
+ * Attempting to cancel a locked stream throws "Invalid state: ReadableStream is locked".
+ *
+ * This function gracefully handles that case by catching the error and doing nothing -
+ * the stream will be cleaned up by garbage collection when the reader is released.
+ */
+async function safeStreamCancel(stream) {
+    try {
+        await stream.cancel();
+    }
+    catch (error) {
+        // Ignore "locked" errors - the stream will be cleaned up when the reader is released.
+        // This happens when fetch crashes mid-read and doesn't release the reader lock.
+        if (error instanceof TypeError && String(error).includes("locked")) {
+            return;
+        }
+        // Re-throw unexpected errors
+        throw error;
+    }
+}
+// ============================================================================
+// NDJSON Stream Helpers
+// ============================================================================
+/**
+ * Creates a ReadableStream that emits NDJSON (newline-delimited JSON) from items.
+ * Handles both arrays and async iterables for streaming large batches.
+ */
+function createNdjsonStream(items) {
+    const encoder = new TextEncoder();
+    // Check if items is an array
+    if (Array.isArray(items)) {
+        let index = 0;
+        return new ReadableStream({
+            pull(controller) {
+                if (index >= items.length) {
+                    controller.close();
+                    return;
+                }
+                const item = items[index++];
+                const line = JSON.stringify(item) + "\n";
+                controller.enqueue(encoder.encode(line));
+            },
+        });
+    }
+    // Handle async iterable
+    const iterator = items[Symbol.asyncIterator]();
+    return new ReadableStream({
+        async pull(controller) {
+            const { value, done } = await iterator.next();
+            if (done) {
+                controller.close();
+                return;
+            }
+            const line = JSON.stringify(value) + "\n";
+            controller.enqueue(encoder.encode(line));
+        },
+    });
+}
 export function mergeRequestOptions(defaultOptions, options) {
     if (!options) {
         return defaultOptions;