@tanstack/openai-base 0.10.1 → 0.10.3

package/dist/esm/adapters/responses-text.js

@@ -1,6 +1,7 @@
-import { makeStructuredOutputCompatible } from "../utils/schema-converter.js";
+import { makeStructuredOutputCompatibleWithMap } from "../utils/schema-converter.js";
 import { buildResponsesUsage } from "../usage.js";
 import { extractRequestOptions } from "../utils/request-options.js";
+import { createToolInputNormalizer } from "../utils/tool-input-normalizer.js";
 import { convertToolsToResponsesFormat } from "./responses-tool-converter.js";
 import { EventType, normalizeSystemPrompts } from "@tanstack/ai";
 import { toRunErrorPayload, toRunErrorRawEvent } from "@tanstack/ai/adapter-internals";
@@ -183,6 +184,9 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 					timestamp: Date.now(),
 					content: accumulatedReasoning
 				};
+				reasoningMessageId = void 0;
+				stepId = void 0;
+				hasClosedReasoning = false;
 			}
 		}.bind(this);
 		const openReasoning = function* () {
@@ -437,11 +441,20 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 		return e.name === "APIUserAbortError" || e.name === "AbortError" || e.code === "ERR_CANCELED";
 	}
 	/**
+	* Strict conversion plus the inverse null-widening map for this request.
+	* Override this when schema conversion changes, so tool-input undo matches
+	* the wire schema.
+	*/
+	makeStructuredOutputCompatibleWithMap(schema, originalRequired) {
+		return makeStructuredOutputCompatibleWithMap(schema, originalRequired);
+	}
+	/**
 	* Applies provider-specific transformations for structured output compatibility.
-	* Override this in subclasses to handle provider-specific quirks.
+	* Override `makeStructuredOutputCompatibleWithMap` when you need the inverse map
+	* to match the wire schema.
 	*/
 	makeStructuredOutputCompatible(schema, originalRequired) {
-		return makeStructuredOutputCompatible(schema, originalRequired);
+		return this.makeStructuredOutputCompatibleWithMap(schema, originalRequired).schema;
 	}
 	/**
 	* Final shaping pass applied to parsed structured-output JSON before it is
@@ -502,6 +515,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 	* - error
 	*/
 	async *processStreamChunks(stream, toolCallMetadata, options, aguiState) {
+		const normalizeToolInput = createToolInputNormalizer(options.tools, (schema, required) => this.makeStructuredOutputCompatibleWithMap(schema, required));
 		let accumulatedContent = "";
 		let accumulatedReasoning = "";
 		let hasStreamedContentDeltas = false;
@@ -509,8 +523,83 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 		let model = options.model;
 		let stepId = null;
 		let hasEmittedTextMessageStart = false;
-		let hasEmittedStepStarted = false;
+		let reasoningMessageId;
+		let hasClosedReasoning = false;
 		let runFinishedEmitted = false;
+		const adapterName = this.name;
+		const emitModel = () => model || options.model;
+		const openReasoning = function* () {
+			if (reasoningMessageId) return;
+			reasoningMessageId = generateId(adapterName);
+			stepId = generateId(adapterName);
+			const timestamp = Date.now();
+			const currentModel = emitModel();
+			yield {
+				type: EventType.REASONING_START,
+				messageId: reasoningMessageId,
+				model: currentModel,
+				timestamp
+			};
+			yield {
+				type: EventType.REASONING_MESSAGE_START,
+				messageId: reasoningMessageId,
+				role: "reasoning",
+				model: currentModel,
+				timestamp
+			};
+			yield {
+				type: EventType.STEP_STARTED,
+				stepName: stepId,
+				stepId,
+				model: currentModel,
+				timestamp,
+				stepType: "thinking"
+			};
+		};
+		const closeReasoning = function* () {
+			if (!reasoningMessageId || hasClosedReasoning) return;
+			hasClosedReasoning = true;
+			const timestamp = Date.now();
+			const currentModel = emitModel();
+			yield {
+				type: EventType.REASONING_MESSAGE_END,
+				messageId: reasoningMessageId,
+				model: currentModel,
+				timestamp
+			};
+			yield {
+				type: EventType.REASONING_END,
+				messageId: reasoningMessageId,
+				model: currentModel,
+				timestamp
+			};
+			if (stepId) yield {
+				type: EventType.STEP_FINISHED,
+				stepName: stepId,
+				stepId,
+				model: currentModel,
+				timestamp,
+				content: accumulatedReasoning
+			};
+			reasoningMessageId = void 0;
+			stepId = null;
+			hasClosedReasoning = false;
+			accumulatedReasoning = "";
+		};
+		const emitReasoningDelta = function* (text) {
+			if (!text) return;
+			yield* openReasoning();
+			if (!reasoningMessageId) return;
+			accumulatedReasoning += text;
+			hasStreamedReasoningDeltas = true;
+			yield {
+				type: EventType.REASONING_MESSAGE_CONTENT,
+				messageId: reasoningMessageId,
+				delta: text,
+				model: emitModel(),
+				timestamp: Date.now()
+			};
+		};
 		try {
 			for await (const chunk of stream) {
 				options.logger.provider(`provider=${this.name} type=${chunk.type}`, {
@@ -540,19 +629,6 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 							content: accumulatedContent
 						};
 					}
-					if (contentPart.type === "reasoning_text") {
-						accumulatedReasoning += contentPart.text || "";
-						if (!stepId) stepId = generateId(this.name);
-						return {
-							type: EventType.STEP_FINISHED,
-							stepName: stepId,
-							stepId,
-							model: model || options.model,
-							timestamp: Date.now(),
-							delta: contentPart.text || "",
-							content: accumulatedReasoning
-						};
-					}
 					const isRefusal = contentPart.type === "refusal";
 					const message = isRefusal ? contentPart.refusal || "Refused without explanation" : `Unsupported response content_part type: ${contentPart.type}`;
 					const code = isRefusal ? "refusal" : contentPart.type;
@@ -573,11 +649,14 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 					hasStreamedContentDeltas = false;
 					hasStreamedReasoningDeltas = false;
 					hasEmittedTextMessageStart = false;
-					hasEmittedStepStarted = false;
+					reasoningMessageId = void 0;
+					hasClosedReasoning = false;
+					stepId = null;
 					accumulatedContent = "";
 					accumulatedReasoning = "";
 				}
 				if (chunk.type === "response.failed" || chunk.type === "response.incomplete") {
+					yield* closeReasoning();
 					if (hasEmittedTextMessageStart) {
 						yield {
 							type: EventType.TEXT_MESSAGE_END,
@@ -606,6 +685,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 				if (chunk.type === "response.output_text.delta" && chunk.delta) {
 					const textDelta = Array.isArray(chunk.delta) ? chunk.delta.join("") : typeof chunk.delta === "string" ? chunk.delta : "";
 					if (textDelta) {
+						yield* closeReasoning();
 						if (!hasEmittedTextMessageStart) {
 							hasEmittedTextMessageStart = true;
 							yield {
@@ -628,67 +708,17 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 						};
 					}
 				}
-				if (chunk.type === "response.reasoning_text.delta" && chunk.delta) {
-					const reasoningDelta = Array.isArray(chunk.delta) ? chunk.delta.join("") : typeof chunk.delta === "string" ? chunk.delta : "";
-					if (reasoningDelta) {
-						if (!hasEmittedStepStarted) {
-							hasEmittedStepStarted = true;
-							stepId = generateId(this.name);
-							yield {
-								type: EventType.STEP_STARTED,
-								stepName: stepId,
-								stepId,
-								model: model || options.model,
-								timestamp: Date.now(),
-								stepType: "thinking"
-							};
-						}
-						accumulatedReasoning += reasoningDelta;
-						hasStreamedReasoningDeltas = true;
-						const fallbackStepId = stepId || generateId(this.name);
-						yield {
-							type: EventType.STEP_FINISHED,
-							stepName: fallbackStepId,
-							stepId: fallbackStepId,
-							model: model || options.model,
-							timestamp: Date.now(),
-							delta: reasoningDelta,
-							content: accumulatedReasoning
-						};
-					}
-				}
-				if (chunk.type === "response.reasoning_summary_text.delta" && chunk.delta) {
-					const summaryDelta = typeof chunk.delta === "string" ? chunk.delta : "";
-					if (summaryDelta) {
-						if (!hasEmittedStepStarted) {
-							hasEmittedStepStarted = true;
-							stepId = generateId(this.name);
-							yield {
-								type: EventType.STEP_STARTED,
-								stepName: stepId,
-								stepId,
-								model: model || options.model,
-								timestamp: Date.now(),
-								stepType: "thinking"
-							};
-						}
-						accumulatedReasoning += summaryDelta;
-						hasStreamedReasoningDeltas = true;
-						const fallbackStepId = stepId || generateId(this.name);
-						yield {
-							type: EventType.STEP_FINISHED,
-							stepName: fallbackStepId,
-							stepId: fallbackStepId,
-							model: model || options.model,
-							timestamp: Date.now(),
-							delta: summaryDelta,
-							content: accumulatedReasoning
-						};
-					}
-				}
+				if (chunk.type === "response.reasoning_text.delta" && chunk.delta) yield* emitReasoningDelta(Array.isArray(chunk.delta) ? chunk.delta.join("") : typeof chunk.delta === "string" ? chunk.delta : "");
+				if (chunk.type === "response.reasoning_summary_text.delta" && chunk.delta) yield* emitReasoningDelta(typeof chunk.delta === "string" ? chunk.delta : "");
 				if (chunk.type === "response.content_part.added") {
 					const contentPart = chunk.part;
+					if ((contentPart.type === "output_text" || contentPart.type === "reasoning_text") && !contentPart.text) continue;
+					if (contentPart.type === "reasoning_text") {
+						yield* emitReasoningDelta(contentPart.text || "");
+						continue;
+					}
 					if (contentPart.type === "output_text" && !hasEmittedTextMessageStart) {
+						yield* closeReasoning();
 						hasEmittedTextMessageStart = true;
 						yield {
 							type: EventType.TEXT_MESSAGE_START,
@@ -698,20 +728,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 							role: "assistant"
 						};
 					}
-					if (contentPart.type === "reasoning_text" && !hasEmittedStepStarted) {
-						hasEmittedStepStarted = true;
-						stepId = generateId(this.name);
-						yield {
-							type: EventType.STEP_STARTED,
-							stepName: stepId,
-							stepId,
-							model: model || options.model,
-							timestamp: Date.now(),
-							stepType: "thinking"
-						};
-					}
 					if (contentPart.type === "output_text") hasStreamedContentDeltas = true;
-					else if (contentPart.type === "reasoning_text") hasStreamedReasoningDeltas = true;
 					const partChunk = handleContentPart(contentPart);
 					yield partChunk;
 					if (partChunk.type === "RUN_ERROR") {
@@ -723,7 +740,12 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 					const contentPart = chunk.part;
 					if (contentPart.type === "output_text" && hasStreamedContentDeltas) continue;
 					if (contentPart.type === "reasoning_text" && hasStreamedReasoningDeltas) continue;
+					if (contentPart.type === "reasoning_text") {
+						yield* emitReasoningDelta(contentPart.text || "");
+						continue;
+					}
 					if (contentPart.type === "output_text" && !hasEmittedTextMessageStart) {
+						yield* closeReasoning();
 						hasEmittedTextMessageStart = true;
 						yield {
 							type: EventType.TEXT_MESSAGE_START,
@@ -732,17 +754,6 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 							timestamp: Date.now(),
 							role: "assistant"
 						};
-					} else if (contentPart.type === "reasoning_text" && !hasEmittedStepStarted) {
-						hasEmittedStepStarted = true;
-						stepId = generateId(this.name);
-						yield {
-							type: EventType.STEP_STARTED,
-							stepName: stepId,
-							stepId,
-							model: model || options.model,
-							timestamp: Date.now(),
-							stepType: "thinking"
-						};
 					}
 					const doneChunk = handleContentPart(contentPart);
 					yield doneChunk;
@@ -820,7 +831,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 					let parsedInput = {};
 					if (chunk.arguments) try {
 						const parsed = JSON.parse(chunk.arguments);
-						parsedInput = parsed && typeof parsed === "object" ? parsed : {};
+						parsedInput = normalizeToolInput(name, parsed && typeof parsed === "object" ? parsed : {});
 					} catch (parseError) {
 						options.logger.errors(`${this.name}.processStreamChunks tool-args JSON parse failed`, {
 							error: toRunErrorPayload(parseError, `tool ${name} (${metadata.callId}) returned malformed JSON arguments`),
@@ -876,7 +887,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 							let parsedInput = {};
 							if (rawArgs) try {
 								const parsed = JSON.parse(rawArgs);
-								parsedInput = parsed && typeof parsed === "object" ? parsed : {};
+								parsedInput = normalizeToolInput(name, parsed && typeof parsed === "object" ? parsed : {});
 							} catch (parseError) {
 								options.logger.errors(`${this.name}.processStreamChunks tool-args JSON parse failed (output_item.done backfill)`, {
 									error: toRunErrorPayload(parseError, `tool ${name} (${metadata.callId}) returned malformed JSON arguments`),
@@ -903,6 +914,29 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 					}
 				}
 				if (chunk.type === "response.completed") {
+					const completedText = chunk.response.output.flatMap((item) => item.type === "message" ? item.content : []).filter((part) => part.type === "output_text").map((part) => part.text).join("");
+					if (accumulatedContent.length === 0 && completedText.length > 0) {
+						if (!hasEmittedTextMessageStart) {
+							hasEmittedTextMessageStart = true;
+							yield {
+								type: EventType.TEXT_MESSAGE_START,
+								messageId: aguiState.messageId,
+								model: model || options.model,
+								timestamp: Date.now(),
+								role: "assistant"
+							};
+						}
+						accumulatedContent = completedText;
+						hasStreamedContentDeltas = true;
+						yield {
+							type: EventType.TEXT_MESSAGE_CONTENT,
+							messageId: aguiState.messageId,
+							model: model || options.model,
+							timestamp: Date.now(),
+							delta: completedText,
+							content: accumulatedContent
+						};
+					}
 					for (const item of chunk.response.output) {
 						if (item.type !== "function_call" || !item.id) continue;
 						const metadata = toolCallMetadata.get(item.id) ?? {
@@ -936,7 +970,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 							let parsedInput = {};
 							if (rawArgs) try {
 								const parsed = JSON.parse(rawArgs);
-								parsedInput = parsed && typeof parsed === "object" ? parsed : {};
+								parsedInput = normalizeToolInput(name, parsed && typeof parsed === "object" ? parsed : {});
 							} catch (parseError) {
 								options.logger.errors(`${this.name}.processStreamChunks tool-args JSON parse failed (response.completed backfill)`, {
 									error: toRunErrorPayload(parseError, `tool ${name} (${metadata.callId}) returned malformed JSON arguments`),
@@ -961,6 +995,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 							metadata.pendingArguments = void 0;
 						}
 					}
+					yield* closeReasoning();
 					if (hasEmittedTextMessageStart) {
 						yield {
 							type: EventType.TEXT_MESSAGE_END,
@@ -1002,6 +1037,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 				}
 			}
 			if (!runFinishedEmitted && aguiState.hasEmittedRunStarted) {
+				yield* closeReasoning();
 				if (hasEmittedTextMessageStart) yield {
 					type: EventType.TEXT_MESSAGE_END,
 					messageId: aguiState.messageId,
@@ -1200,7 +1236,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 	* Handles backward compatibility with string content.
 	*/
 	normalizeContent(content) {
-		if (content === null) return [];
+		if (content === null || content === void 0) return [];
 		if (typeof content === "string") return [{
 			type: "text",
 			content
@@ -1211,7 +1247,7 @@ var OpenAIBaseResponsesTextAdapter = class extends BaseTextAdapter {
 	* Extracts text content from a content value that may be string, null, or ContentPart array.
 	*/
 	extractTextContent(content) {
-		if (content === null) return "";
+		if (content === null || content === void 0) return "";
 		if (typeof content === "string") return content;
 		return content.filter((p) => p.type === "text").map((p) => p.content).join("");
 	}