@tanstack/ai-client 0.25.2 → 0.28.0

package/dist/esm/connection-adapters.d.ts

@@ -94,6 +94,8 @@ export interface RunAgentInputContext {
     }>;
     /** Arbitrary user-controlled passthrough data. */
     forwardedProps?: Record<string, unknown>;
+    /** Extra request headers for this run (e.g. BYOK keys). POST only. */
+    headers?: Record<string, string>;
 }
 export interface ConnectConnectionAdapter {
     /**

package/dist/esm/connection-adapters.js

@@ -1,6 +1,7 @@
 import { createResponseStreamTextDecoder, getResponseStreamReader } from "./response-stream.js";
 import { parseSseDataLine } from "./sse-utils.js";
-import { EventType, uiMessagesToWire } from "@tanstack/ai/client";
+import { EventType, getChunkRunId, restoreInboundChunk, tanstackMetadata, uiMessagesToWire, withTanstackMetadata } from "@tanstack/ai/client";
+import { ByokMissingError, isByokMissingBody } from "@tanstack/ai/byok";
 //#region src/connection-adapters.ts
 /**
 * Associates connect-wrapped chunks with the run they were produced under.
@@ -15,8 +16,8 @@ var chunkRunIds = /* @__PURE__ */ new WeakMap();
 * (RUN_STARTED / RUN_FINISHED / RUN_ERROR carry one) and falling back to the
 * run the connect wrapper stamped it with.
 */
-function getChunkRunId(chunk) {
-	return chunkRunIds.get(chunk) ?? ("runId" in chunk && typeof chunk.runId === "string" ? chunk.runId : void 0);
+function getChunkRunId$1(chunk) {
+	return chunkRunIds.get(chunk) ?? getChunkRunId(chunk);
 }
 /**
 * Thrown when an SSE/HTTP stream ends with a non-empty unterminated buffer.
@@ -206,6 +207,19 @@ async function* readStreamLines(reader, abortSignal) {
 function isNdjsonEnvelope(value) {
 	return typeof value === "object" && value !== null && "chunk" in value && "id" in value && typeof value.id === "string" && !("type" in value);
 }
+/** Rebuild pre-wire extras after SSE/NDJSON ingest. */
+function restoreInboundUsage(chunk) {
+	return restoreInboundChunk(chunk);
+}
+function sseChunkModel(chunk) {
+	const tanstackModel = tanstackMetadata(chunk)?.model;
+	if (typeof tanstackModel === "string") return tanstackModel;
+	const usage = "usage" in chunk ? chunk.usage : void 0;
+	if (Array.isArray(usage)) {
+		const model = usage[0]?.model;
+		if (typeof model === "string") return model;
+	}
+}
 /**
 * Parse SSE-format lines into stream events, pairing each chunk with the `id:`
 * offset of the event it arrived on. Shared by the fetch- and XHR-backed SSE
@@ -234,20 +248,22 @@ async function* linesToSSEEvents(lines, fallbackIds) {
 		if (line.startsWith(":") || line.startsWith("event:") || line.startsWith("retry:")) continue;
 		const data = parseSseDataLine(line);
 		if (data === "[DONE]") {
-			yield { chunk: {
+			yield { chunk: withTanstackMetadata({
 				type: EventType.RUN_FINISHED,
 				threadId: lastThreadId ?? fallbackIds?.threadId ?? "",
 				runId: lastRunId ?? fallbackIds?.runId ?? "",
-				model: lastModel ?? "",
-				timestamp: Date.now(),
-				finishReason: "stop"
-			} };
+				timestamp: Date.now()
+			}, {
+				finishReason: "stop",
+				...lastModel !== void 0 ? { model: lastModel } : {}
+			}) };
 			return;
 		}
-		const chunk = JSON.parse(data);
+		const chunk = restoreInboundUsage(JSON.parse(data));
 		if ("threadId" in chunk && typeof chunk.threadId === "string") lastThreadId = chunk.threadId;
 		if ("runId" in chunk && typeof chunk.runId === "string") lastRunId = chunk.runId;
-		if ("model" in chunk && typeof chunk.model === "string") lastModel = chunk.model;
+		const model = sseChunkModel(chunk);
+		if (model !== void 0) lastModel = model;
 		const id = pendingId;
 		pendingId = void 0;
 		yield {
@@ -266,14 +282,31 @@ async function* linesToNdjsonEvents(lines) {
 	for await (const line of lines) {
 		const parsed = JSON.parse(line);
 		if (isNdjsonEnvelope(parsed)) yield {
-			chunk: parsed.chunk,
+			chunk: restoreInboundUsage(parsed.chunk),
 			id: parsed.id
 		};
-		else yield { chunk: parsed };
+		else yield { chunk: restoreInboundUsage(parsed) };
 	}
 }
-function assertResponseOk(response) {
-	if (!response.ok) throw new Error(`HTTP error! status: ${response.status} ${response.statusText}`);
+async function assertResponseOk(response) {
+	if (response.ok) return;
+	if (response.status === 401) {
+		const body = await response.clone().json().catch(() => null);
+		if (isByokMissingBody(body)) throw new ByokMissingError(body.error.provider);
+	}
+	throw new Error(`HTTP error! status: ${response.status} ${response.statusText}`);
+}
+function errorFromXhrStatus(xhr) {
+	if (xhr.status === 401) {
+		let parsed = null;
+		try {
+			parsed = JSON.parse(xhr.responseText);
+		} catch {
+			parsed = null;
+		}
+		if (isByokMissingBody(parsed)) return new ByokMissingError(parsed.error.provider);
+	}
+	return /* @__PURE__ */ new Error(`XHR error! status: ${xhr.status} ${xhr.statusText}`);
 }
 /**
 * GET the hydration endpoint for a thread and parse its JSON `{ messages,
@@ -291,7 +324,7 @@ async function fetchThreadHydration(fetchClient, url, headers, credentials, thre
 		},
 		credentials
 	});
-	assertResponseOk(response);
+	await assertResponseOk(response);
 	const data = await response.json();
 	const activeRun = data.activeRun && typeof data.activeRun.runId === "string" ? { runId: data.activeRun.runId } : null;
 	const interrupts = data.interrupts && typeof data.interrupts.runId === "string" && Array.isArray(data.interrupts.pending) && data.interrupts.pending.length > 0 ? {
@@ -320,7 +353,7 @@ async function fetchGenerationHydration(fetchClient, url, headers, credentials,
 		},
 		credentials
 	});
-	assertResponseOk(response);
+	await assertResponseOk(response);
 	const raw = await response.json();
 	if (raw === null) return {
 		resumeSnapshot: null,
@@ -336,12 +369,12 @@ async function fetchGenerationHydration(fetchClient, url, headers, credentials,
 }
 /** Yield SSE stream events (chunk + offset) from a fetch Response body. */
 async function* responseToSSEEvents(response, abortSignal, fallbackIds) {
-	assertResponseOk(response);
+	await assertResponseOk(response);
 	yield* linesToSSEEvents(readStreamLines(getResponseStreamReader(response), abortSignal), fallbackIds);
 }
 /** Yield NDJSON stream events (chunk + offset) from a fetch Response body. */
 async function* responseToNdjsonEvents(response, abortSignal) {
-	assertResponseOk(response);
+	await assertResponseOk(response);
 	yield* linesToNdjsonEvents(readStreamLines(getResponseStreamReader(response), abortSignal));
 }
 async function* responseToSSEChunks(response, abortSignal) {
@@ -481,14 +514,15 @@ function normalizeConnectionAdapter(connection) {
 					if (chunk.type === "RUN_FINISHED" || chunk.type === "RUN_ERROR") hasTerminalEvent = true;
 					push(chunk, runContext?.runId);
 				}
-				if (!abortSignal?.aborted && !hasTerminalEvent) push({
+				if (!abortSignal?.aborted && !hasTerminalEvent) push(withTanstackMetadata({
 					type: EventType.RUN_FINISHED,
 					threadId: requireSyntheticId(upstreamThreadId ?? runContext?.threadId, "threadId"),
 					runId: requireSyntheticId(upstreamRunId ?? runContext?.runId, "runId"),
-					model: "connect-wrapper",
-					timestamp: Date.now(),
-					finishReason: "stop"
-				}, runContext?.runId);
+					timestamp: Date.now()
+				}, {
+					finishReason: "stop",
+					model: "connect-wrapper"
+				}), runContext?.runId);
 			} catch (err) {
 				if (!abortSignal?.aborted && !hasTerminalEvent) try {
 					const message = err instanceof Error ? err.message : "Unknown error in connect()";
@@ -572,6 +606,7 @@ function fetchServerSentEvents(url, options = {}) {
 			const requestHeaders = {
 				"Content-Type": "application/json",
 				...mergeHeaders(resolvedOptions.headers),
+				...mergeHeaders(runContext?.headers),
 				...runIdHeader(runContext?.runId)
 			};
 			const requestBody = buildRunAgentInputBody(messages, data, runContext, resolvedOptions);
@@ -657,6 +692,7 @@ function fetchHttpStream(url, options = {}) {
 			const requestHeaders = {
 				"Content-Type": "application/json",
 				...mergeHeaders(resolvedOptions.headers),
+				...mergeHeaders(runContext?.headers),
 				...runIdHeader(runContext?.runId)
 			};
 			const requestBody = buildRunAgentInputBody(messages, data, runContext, resolvedOptions);
@@ -723,7 +759,7 @@ function readXhrLines(xhr, abortSignal) {
 	};
 	const enqueueDelta = () => {
 		if (xhr.status !== 0 && (xhr.status < 200 || xhr.status >= 300)) {
-			error = /* @__PURE__ */ new Error(`XHR error! status: ${xhr.status} ${xhr.statusText}`);
+			error = errorFromXhrStatus(xhr);
 			done = true;
 			return;
 		}
@@ -740,7 +776,7 @@ function readXhrLines(xhr, abortSignal) {
 	};
 	const finish = () => {
 		enqueueDelta();
-		if (xhr.status !== 0 && (xhr.status < 200 || xhr.status >= 300)) error = /* @__PURE__ */ new Error(`XHR error! status: ${xhr.status} ${xhr.statusText}`);
+		if (xhr.status !== 0 && (xhr.status < 200 || xhr.status >= 300)) error = errorFromXhrStatus(xhr);
 		else if (buffer.trim() && !aborted) error = new StreamTruncatedError();
 		done = true;
 		wake();
@@ -797,6 +833,7 @@ function createConfiguredXhrRequest(url, options, messages, data, runContext, me
 	const requestHeaders = {
 		"Content-Type": "application/json",
 		...mergeHeaders(options.headers),
+		...mergeHeaders(method === "POST" ? runContext?.headers : void 0),
 		...method === "POST" ? runIdHeader(runContext?.runId) : {},
 		...extraHeaders
 	};
@@ -1018,12 +1055,12 @@ function webSocket(url, options = {}) {
 			}
 			if (isPingFrame(parsed)) return;
 			const envelopeId = isNdjsonEnvelope(parsed) ? parsed.id : void 0;
-			const chunk = isNdjsonEnvelope(parsed) ? parsed.chunk : parsed;
+			const chunk = restoreInboundUsage(isNdjsonEnvelope(parsed) ? parsed.chunk : parsed);
 			const session = currentSession;
 			if (session) {
 				if (session.tracker.note(envelopeId) === "duplicate") return;
 				session.progressed = true;
-				if (session.runId === void 0) session.runId = getChunkRunId(chunk);
+				if (session.runId === void 0) session.runId = getChunkRunId$1(chunk);
 				if (chunk.type === "RUN_FINISHED" || chunk.type === "RUN_ERROR") session.sawTerminal = true;
 			}
 			for (const l of listeners) l.push(chunk);
@@ -1126,7 +1163,7 @@ function webSocket(url, options = {}) {
 					return;
 				}
 				if (isPingFrame(parsed)) return;
-				pipe.push(isNdjsonEnvelope(parsed) ? parsed.chunk : parsed);
+				pipe.push(restoreInboundUsage(isNdjsonEnvelope(parsed) ? parsed.chunk : parsed));
 			};
 			ws.onclose = (event) => {
 				if (event?.code === 1e3) {
@@ -1195,7 +1232,10 @@ function fetcherToConnectionAdapter(fetcher) {
 			runId: runContext.runId,
 			...runContext.parentRunId !== void 0 ? { parentRunId: runContext.parentRunId } : {},
 			...runContext.resume !== void 0 ? { resume: runContext.resume } : {}
-		}, { signal: abortSignal });
+		}, {
+			signal: abortSignal,
+			headers: runContext.headers
+		});
 		if (result instanceof Response) yield* responseToSSEChunks(result, abortSignal);
 		else yield* abortableIterable(result, abortSignal);
 	} };
@@ -1263,6 +1303,6 @@ function rpcStream(rpcCall, handlers) {
 	};
 }
 //#endregion
-export { DurableStreamIncompleteError, StreamReconnectLimitError, StreamTruncatedError, createReconnectTracker, fetchHttpStream, fetchServerSentEvents, fetcherToConnectionAdapter, getChunkRunId, normalizeConnectionAdapter, rpcStream, stream, webSocket, xhrHttpStream, xhrServerSentEvents };
+export { DurableStreamIncompleteError, StreamReconnectLimitError, StreamTruncatedError, createReconnectTracker, fetchHttpStream, fetchServerSentEvents, fetcherToConnectionAdapter, getChunkRunId$1 as getChunkRunId, normalizeConnectionAdapter, rpcStream, stream, webSocket, xhrHttpStream, xhrServerSentEvents };
 
 //# sourceMappingURL=connection-adapters.js.map