@tanstack/ai-client 0.25.2 → 0.26.0

package/dist/esm/connection-adapters.js

@@ -1,6 +1,6 @@
 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";
 //#region src/connection-adapters.ts
 /**
 * Associates connect-wrapped chunks with the run they were produced under.
@@ -15,8 +15,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 +206,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 +247,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,10 +281,10 @@ 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) {
@@ -481,14 +496,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()";
@@ -1018,12 +1034,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 +1142,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) {
@@ -1263,6 +1279,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