@codehz/ai 0.3.0 → 0.4.1

package/dist/index.mjs

@@ -883,12 +883,6 @@ function contentBlocksToText(blocks) {
 	return blocks.map(blockToText).join("\n");
 }
 /**
-* 将 instructions（string | InstructionBlock[]）归一化为纯文本。
-*/
-function instructionsToText(instructions) {
-	return typeof instructions === "string" ? instructions : contentBlocksToText(instructions);
-}
-/**
 * 从 OutputItem 数组中提取所有 message 类型 item 的文本内容。
 */
 function extractText(output) {
@@ -1074,14 +1068,6 @@ function emitMalformedStreamWarning(factory, options) {
 	if (options.count < 1) return void 0;
 	return factory.responseWarning(`Skipped ${options.count} malformed ${options.providerLabel} ${options.transportLabel}`, "STREAM_ERROR");
 }
-function metadataSourceList(...groups) {
-	const sources = /* @__PURE__ */ new Set();
-	for (const group of groups) {
-		if (!group) continue;
-		for (const source of group) sources.add(source);
-	}
-	return sources.size > 0 ? [...sources] : void 0;
-}
 function isEmptyRecord(value) {
 	return Object.keys(value).length === 0;
 }
@@ -1134,7 +1120,7 @@ var AdapterBase = class {
 	* 子类可在返回前自定义覆盖。
 	*/
 	buildResponse(request, result, _factory) {
-		const text = this.extractText(result.output);
+		const text = extractText(result.output);
 		const warnings = mergeWarnings(result.warnings, _factory.warnings);
 		const auxiliary = mergeAuxiliary(result.auxiliary, result.providerMetadata ? { providerMetadata: result.providerMetadata } : void 0);
 		return {
@@ -1158,9 +1144,30 @@ var AdapterBase = class {
 			}
 		};
 	}
-	/** 从 output items 中提取文本内容。 */
-	extractText(output) {
-		return extractText(output);
+	/**
+	* 统一 finalize auxiliary → response.completed。
+	* adapter 在调用前组装 output / replay / stopReason 等业务字段。
+	*/
+	async *emitStreamCompleted(factory, request, auxiliary, result) {
+		const auxiliaryResult = await auxiliary.finalize(factory);
+		for (const event of auxiliaryResult.events) yield event;
+		const finalResponse = this.buildResponse(request, {
+			...result,
+			usage: result.usage ?? auxiliaryResult.usage,
+			billing: result.billing ?? auxiliaryResult.billing,
+			auxiliary: mergeAuxiliary(result.auxiliary, auxiliaryResult.auxiliary),
+			warnings: mergeWarnings(result.warnings, auxiliaryResult.warnings),
+			metadataSources: result.metadataSources ?? auxiliaryResult.metadataSources
+		}, factory);
+		yield factory.responseCompleted({
+			replay: finalResponse.replay,
+			stopReason: finalResponse.stopReason,
+			trace: finalResponse.backend,
+			usage: finalResponse.usage,
+			billing: finalResponse.billing,
+			auxiliary: finalResponse.auxiliary,
+			warnings: finalResponse.warnings
+		});
 	}
 	createAuxiliaryState(request) {
 		return new AdapterAuxiliaryState(request);
@@ -1269,32 +1276,35 @@ function record(obj) {
 	for (const [key, value] of Object.entries(obj)) if (value !== void 0) out[key] = value;
 	return out;
 }
-/** OpenAI Chat Completions `usage` */
-function usageFromChatCompletions(raw) {
-	const inputTokens = num(raw.prompt_tokens);
-	const outputTokens = num(raw.completion_tokens);
-	const cachedInputTokens = num(raw.prompt_tokens_details?.cached_tokens);
-	const reasoningTokens = num(raw.completion_tokens_details?.reasoning_tokens);
+function withDerivedTotal(usage) {
+	const { inputTokens, outputTokens, totalTokens, cachedInputTokens, reasoningTokens, cacheWriteInputTokens } = usage;
 	return record({
 		inputTokens,
 		outputTokens,
-		totalTokens: num(raw.total_tokens) ?? (inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0),
+		totalTokens: totalTokens ?? (inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0),
 		cachedInputTokens,
-		reasoningTokens
+		reasoningTokens,
+		cacheWriteInputTokens
+	});
+}
+/** OpenAI Chat Completions `usage` */
+function usageFromChatCompletions(raw) {
+	return withDerivedTotal({
+		inputTokens: num(raw.prompt_tokens),
+		outputTokens: num(raw.completion_tokens),
+		totalTokens: num(raw.total_tokens),
+		cachedInputTokens: num(raw.prompt_tokens_details?.cached_tokens),
+		reasoningTokens: num(raw.completion_tokens_details?.reasoning_tokens)
 	});
 }
 /** OpenAI Responses API `usage` */
 function usageFromOpenAIResponses(raw) {
-	const inputTokens = num(raw.input_tokens);
-	const outputTokens = num(raw.output_tokens);
-	const cachedInputTokens = num(raw.input_tokens_details?.cached_tokens);
-	const reasoningTokens = num(raw.output_tokens_details?.reasoning_tokens);
-	return record({
-		inputTokens,
-		outputTokens,
-		totalTokens: num(raw.total_tokens) ?? (inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0),
-		cachedInputTokens,
-		reasoningTokens
+	return withDerivedTotal({
+		inputTokens: num(raw.input_tokens),
+		outputTokens: num(raw.output_tokens),
+		totalTokens: num(raw.total_tokens),
+		cachedInputTokens: num(raw.input_tokens_details?.cached_tokens),
+		reasoningTokens: num(raw.output_tokens_details?.reasoning_tokens)
 	});
 }
 /** Anthropic Messages `usage`（message_start / message_delta） */
@@ -1308,93 +1318,21 @@ function usageFromAnthropicMessages(raw) {
 		cacheWriteInputTokens,
 		cachedInputTokens
 	].filter((n) => n !== void 0);
-	const inputTokens = inputParts.length > 0 ? inputParts.reduce((sum, n) => sum + n, 0) : void 0;
-	return record({
-		inputTokens,
+	return withDerivedTotal({
+		inputTokens: inputParts.length > 0 ? inputParts.reduce((sum, n) => sum + n, 0) : void 0,
 		outputTokens,
-		totalTokens: inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0,
 		cachedInputTokens,
 		cacheWriteInputTokens
 	});
 }
 /** Ollama 流式 chunk */
 function usageFromOllama(raw) {
-	const inputTokens = num(raw.prompt_eval_count);
-	const outputTokens = num(raw.eval_count);
-	return record({
-		inputTokens,
-		outputTokens,
-		totalTokens: inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0
+	return withDerivedTotal({
+		inputTokens: num(raw.prompt_eval_count),
+		outputTokens: num(raw.eval_count)
 	});
 }
 //#endregion
-//#region src/helpers/sse-parser.ts
-/**
-* 将 SSE 文本块解析为事件数组。
-* 累积事件行直到遇到空行，支持 [DONE] 标记。
-* 返回已解析的事件和未处理的剩余 buffer（用于增量解析）。
-*
-* 关键行为：
-* - 只解析完整的 event（以空行结尾）
-* - 未完成的行保留在 rest 中，等待下次 chunk 补全
-* - 支持跨 chunk 的 event 分片
-*/
-function parseSSEEvents(chunk, options = {}) {
-	const events = [];
-	let eventType = "";
-	let dataLines = [];
-	let consumedUntil = 0;
-	let cursor = 0;
-	let malformedEvents = 0;
-	const emitEvent = (consumedCursor) => {
-		const dataStr = dataLines.join("\n");
-		if (dataStr === "[DONE]") {
-			eventType = "";
-			dataLines = [];
-			consumedUntil = consumedCursor;
-			return;
-		}
-		try {
-			const data = JSON.parse(dataStr);
-			events.push({
-				type: eventType,
-				data
-			});
-		} catch {
-			malformedEvents++;
-		}
-		eventType = "";
-		dataLines = [];
-		consumedUntil = consumedCursor;
-	};
-	const consumeLine = (line, consumedCursor) => {
-		if (line.startsWith("event: ")) eventType = line.slice(7).trim();
-		else if (line.startsWith("data: ")) dataLines.push(line.slice(6));
-		else if (line === "" && eventType && dataLines.length > 0) emitEvent(consumedCursor);
-		else if (line === "" && !eventType && dataLines.length === 0) consumedUntil = consumedCursor;
-	};
-	while (cursor < chunk.length) {
-		const lineEnd = chunk.indexOf("\n", cursor);
-		if (lineEnd === -1) break;
-		let line = chunk.slice(cursor, lineEnd);
-		cursor = lineEnd + 1;
-		if (line.endsWith("\r")) line = line.slice(0, -1);
-		consumeLine(line, cursor);
-	}
-	if (options.allowEOF && cursor < chunk.length) {
-		let line = chunk.slice(cursor);
-		if (line.endsWith("\r")) line = line.slice(0, -1);
-		consumeLine(line, chunk.length);
-		cursor = chunk.length;
-	}
-	if (options.allowEOF && eventType && dataLines.length > 0) emitEvent(chunk.length);
-	return {
-		events,
-		rest: chunk.slice(consumedUntil),
-		malformedEvents
-	};
-}
-//#endregion
 //#region src/helpers/synthetic-stream.ts
 /**
 * 模拟流式 (Synthetic Streaming)
@@ -1568,6 +1506,159 @@ function splitSSEFrames(buffer, allowEOF) {
 		rest: normalized.slice(cursor)
 	};
 }
+/** 解析标准 SSE frame（event: + data:），用于 Messages / Responses。 */
+function parseSseJsonFrame(frame) {
+	let eventType = "";
+	let dataStr = "";
+	for (const rawLine of frame.split("\n")) {
+		const line = rawLine.trim();
+		if (line.startsWith("event: ")) eventType = line.slice(7).trim();
+		else if (line.startsWith("data: ")) dataStr += line.slice(6);
+	}
+	if (!eventType) return { status: "ignored" };
+	try {
+		const data = JSON.parse(dataStr);
+		return {
+			status: "parsed",
+			value: {
+				type: eventType,
+				data
+			}
+		};
+	} catch {
+		return { status: "malformed" };
+	}
+}
+function createSseJsonParser() {
+	return new IncrementalStreamParser(splitSSEFrames, (frame) => parseSseJsonFrame(frame));
+}
+/** OpenAI Chat Completions 简化 SSE：仅 `data: ...` 行，忽略 `[DONE]`。 */
+function parseChatCompletionsDataLine(item) {
+	const trimmed = item.trim();
+	if (!trimmed.startsWith("data: ")) return { status: "ignored" };
+	const data = trimmed.slice(6).trim();
+	if (data === "[DONE]") return { status: "ignored" };
+	try {
+		return {
+			status: "parsed",
+			value: JSON.parse(data)
+		};
+	} catch {
+		return { status: "malformed" };
+	}
+}
+function createChatCompletionsSseParser() {
+	return new IncrementalStreamParser(splitLines, (item) => parseChatCompletionsDataLine(item));
+}
+/** NDJSON 行解析（Ollama 等）：空行忽略，JSON 失败为 malformed。 */
+function createNdjsonLineParser(isValid) {
+	return new IncrementalStreamParser(splitLines, (item) => {
+		const trimmed = item.trim();
+		if (!trimmed) return { status: "ignored" };
+		try {
+			const parsed = JSON.parse(trimmed);
+			if (isValid(parsed)) return {
+				status: "parsed",
+				value: parsed
+			};
+			return { status: "malformed" };
+		} catch {
+			return { status: "malformed" };
+		}
+	});
+}
+//#endregion
+//#region src/helpers/provider-stream.ts
+/**
+* Provider HTTP 流公共脚手架
+*
+* 收敛 adapter 间重复的：
+* - JSON POST + 错误映射
+* - ReadableStream reader 生命周期
+* - IncrementalStreamParser feed/flush + malformed warning
+* - 不完整尾帧 warning
+*/
+/** POST JSON 并返回可读 body reader + response headers；统一网络/HTTP/空 body 错误。 */
+async function openProviderJsonStream(options) {
+	const { fetchFn, url, headers, body, signal } = options;
+	let response;
+	try {
+		response = await fetchFn(url, {
+			method: "POST",
+			headers,
+			body: JSON.stringify(body),
+			signal
+		});
+	} catch (err) {
+		throw new AIProviderError(err instanceof Error ? err.message : String(err), "PROVIDER_ERROR");
+	}
+	if (!response.ok) {
+		const errorBody = await response.text().catch(() => "");
+		throw providerHttpError(response.status, errorBody);
+	}
+	const bodyStream = response.body;
+	if (!bodyStream) throw new AIStreamError("Response body is not readable", "STREAM_ERROR");
+	return {
+		reader: bodyStream.getReader(),
+		headers: response.headers
+	};
+}
+/**
+* 读取并解析 provider 流。
+* 每个 batch 携带本轮解析出的 items 与（可选）malformed / incomplete warning。
+* 调用方应 `for await` 消费完毕；reader 在迭代结束时 cancel/release。
+*/
+async function* iterateProviderStreamBatches(options) {
+	const { reader, parser, factory, providerLabel, transportLabel, incompleteMessage } = options;
+	let streamDone = false;
+	try {
+		while (true) {
+			const { done, value } = await reader.read().catch((err) => {
+				throw new AIStreamError(`Failed to read response stream: ${err instanceof Error ? err.message : String(err)}`, "STREAM_ERROR");
+			});
+			const { items, malformed } = done ? parser.flush() : parser.feed(value);
+			const warnings = [];
+			const malformedWarning = emitMalformedStreamWarning(factory, {
+				count: malformed,
+				providerLabel,
+				transportLabel
+			});
+			if (malformedWarning) warnings.push(malformedWarning);
+			yield {
+				items,
+				warnings
+			};
+			if (done) {
+				streamDone = true;
+				break;
+			}
+		}
+	} finally {
+		try {
+			if (!streamDone) await reader.cancel().catch(() => void 0);
+		} finally {
+			reader.releaseLock();
+		}
+	}
+	if (parser.getRemaining().trim().length > 0) yield {
+		items: [],
+		warnings: [factory.responseWarning(incompleteMessage, "STREAM_ERROR")]
+	};
+}
+/** 一次性 complete 守卫：首次成功，后续返回 false。 */
+function createCompletionGate() {
+	let completed = false;
+	return {
+		get completed() {
+			return completed;
+		},
+		tryComplete() {
+			if (completed) return false;
+			completed = true;
+			return true;
+		}
+	};
+}
 //#endregion
 //#region src/helpers/request-mapper.ts
 var NormalizedRequestMapper = class {
@@ -1584,6 +1675,10 @@ var NormalizedRequestMapper = class {
 	ensureReasoningBlocks(blocks, field) {
 		return this.ensureBlocks(blocks, field, ["text"], "reasoning only supports text blocks");
 	}
+	/** ensureTextBlocks + contentBlocksToText 的常见组合。 */
+	textFromBlocks(blocks, field) {
+		return contentBlocksToText(this.ensureTextBlocks(blocks, field));
+	}
 	parseToolArguments(item) {
 		try {
 			const parsed = JSON.parse(item.argumentsText);
@@ -1594,6 +1689,20 @@ var NormalizedRequestMapper = class {
 	rollbackTrailingAssistantMessages(messages) {
 		while (messages.length > 0 && messages[messages.length - 1]?.role === "assistant") messages.pop();
 	}
+	mapToolsIfPresent(tools, map) {
+		if (!tools || tools.length === 0) return void 0;
+		return tools.map(map);
+	}
+	/**
+	* 将 canonical toolChoice 映射为 provider 形状。
+	* 返回 undefined 表示调用方无需写入 body 字段。
+	*/
+	mapToolChoice(toolChoice, mappers) {
+		if (!toolChoice) return void 0;
+		if (toolChoice === "auto") return mappers.auto;
+		if (toolChoice === "none") return mappers.none;
+		if (toolChoice.type === "tool") return mappers.tool(toolChoice.name);
+	}
 	ensureBlocks(blocks, field, supportedTypes, description) {
 		for (let i = 0; i < blocks.length; i++) {
 			const block = blocks[i];
@@ -1682,7 +1791,7 @@ var ResponsesAdapter = class extends AdapterBase {
 				} else input.push({
 					type: "message",
 					role: item.role,
-					content: contentBlocksToText(mapper$3.ensureTextBlocks(item.content, `input message (${item.role}) content`))
+					content: mapper$3.textFromBlocks(item.content, `input message (${item.role}) content`)
 				});
 				break;
 			case "reasoning": {
@@ -1705,7 +1814,7 @@ var ResponsesAdapter = class extends AdapterBase {
 				});
 				break;
 			case "tool_result": {
-				const output = mapper$3.ensureTextBlocks(item.content, `tool_result ${item.callId} content`).map(blockToText).join("\n");
+				const output = mapper$3.textFromBlocks(item.content, `tool_result ${item.callId} content`);
 				input.push({
 					type: "function_call_output",
 					call_id: item.callId,
@@ -1733,20 +1842,20 @@ var ResponsesAdapter = class extends AdapterBase {
 			stream: true
 		};
 		if (request.instructions) body.instructions = mapper$3.mapInstructions(request.instructions);
-		if (request.tools && request.tools.length > 0) body.tools = request.tools.map((t) => ({
+		body.tools = mapper$3.mapToolsIfPresent(request.tools, (t) => ({
 			type: "function",
 			name: t.name,
 			description: t.description,
 			input_schema: t.inputSchema
 		}));
-		if (request.toolChoice) {
-			if (request.toolChoice === "auto") body.tool_choice = "auto";
-			else if (request.toolChoice === "none") body.tool_choice = "none";
-			else if (request.toolChoice.type === "tool") body.tool_choice = {
+		body.tool_choice = mapper$3.mapToolChoice(request.toolChoice, {
+			auto: "auto",
+			none: "none",
+			tool: (name) => ({
 				type: "function",
-				name: request.toolChoice.name
-			};
-		}
+				name
+			})
+		});
 		if (request.temperature !== void 0) body.temperature = request.temperature;
 		if (request.maxOutputTokens !== void 0) body.max_output_tokens = request.maxOutputTokens;
 		if (request.metadata) body.metadata = request.metadata;
@@ -1754,155 +1863,108 @@ var ResponsesAdapter = class extends AdapterBase {
 	}
 	async *runStream(providerRequest, factory, request) {
 		const auxiliary = this.createAuxiliaryState(request);
-		let response;
-		try {
-			response = await this.fetchFn(`${this.baseUrl}/responses`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					Authorization: `Bearer ${this.apiKey}`
-				},
-				body: JSON.stringify(providerRequest),
-				signal: request.signal
-			});
-		} catch (err) {
-			throw new AIProviderError(err instanceof Error ? err.message : String(err), "PROVIDER_ERROR");
-		}
-		if (!response.ok) {
-			const errorBody = await response.text().catch(() => "");
-			throw providerHttpError(response.status, errorBody);
-		}
-		const reader = response.body?.getReader();
-		if (!reader) throw new AIStreamError("Response body is not readable", "STREAM_ERROR");
-		const parser = new IncrementalStreamParser(splitSSEFrames, (frame) => {
-			let eventType = "";
-			let dataStr = "";
-			for (const rawLine of frame.split("\n")) {
-				const line = rawLine.trim();
-				if (line.startsWith("event: ")) eventType = line.slice(7).trim();
-				else if (line.startsWith("data: ")) dataStr += line.slice(6);
-			}
-			if (!eventType) return { status: "ignored" };
-			try {
-				const data = JSON.parse(dataStr);
-				return {
-					status: "parsed",
-					value: {
-						type: eventType,
-						data
-					}
-				};
-			} catch {
-				return { status: "malformed" };
-			}
+		const gate = createCompletionGate();
+		const { reader } = await openProviderJsonStream({
+			fetchFn: this.fetchFn,
+			url: `${this.baseUrl}/responses`,
+			headers: {
+				"Content-Type": "application/json",
+				Authorization: `Bearer ${this.apiKey}`
+			},
+			body: providerRequest,
+			signal: request.signal
 		});
+		const parser = createSseJsonParser();
 		const output = [];
-		let streamDone = false;
 		let completedResponse;
-		let completedEmitted = false;
 		let unknownEventsWarned = false;
 		const messageItemsWithDelta = /* @__PURE__ */ new Set();
 		const toolCallNames = /* @__PURE__ */ new Map();
-		try {
-			while (true) {
-				const { done, value } = await reader.read().catch((err) => {
-					throw new AIStreamError(`Failed to read response stream: ${err instanceof Error ? err.message : String(err)}`, "STREAM_ERROR");
-				});
-				const { items: events, malformed: malformedEvents } = done ? parser.flush() : parser.feed(value);
-				const malformedWarning = emitMalformedStreamWarning(factory, {
-					count: malformedEvents,
-					providerLabel: "Responses",
-					transportLabel: "SSE event(s)"
-				});
-				if (malformedWarning) yield malformedWarning;
-				for (const sseEvent of events) {
-					if (sseEvent.type === "error") {
-						const data = sseEvent.data;
-						yield factory.responseWarning(data.message ?? "Provider error event", data.code);
-						continue;
-					}
-					if (sseEvent.type === "response.output_item.added") {
-						const item = sseEvent.data.item;
-						switch (item.type) {
-							case "message":
-								yield factory.messageStarted(item.id);
-								break;
-							case "reasoning":
-								yield factory.reasoningStarted(item.id, "full");
-								break;
-							case "function_call": {
-								const name = typeof item.name === "string" ? item.name : "unknown";
-								toolCallNames.set(item.id, name);
-								yield factory.toolCallStarted(item.id, name);
-								break;
-							}
+		for await (const batch of iterateProviderStreamBatches({
+			reader,
+			parser,
+			factory,
+			providerLabel: "Responses",
+			transportLabel: "SSE event(s)",
+			incompleteMessage: "Stream ended with an incomplete Responses SSE frame"
+		})) {
+			for (const warning of batch.warnings) yield warning;
+			for (const sseEvent of batch.items) {
+				if (sseEvent.type === "error") {
+					const data = sseEvent.data;
+					yield factory.responseWarning(data.message ?? "Provider error event", data.code);
+					continue;
+				}
+				if (sseEvent.type === "response.output_item.added") {
+					const item = sseEvent.data.item;
+					switch (item.type) {
+						case "message":
+							yield factory.messageStarted(item.id);
+							break;
+						case "reasoning":
+							yield factory.reasoningStarted(item.id, "full");
+							break;
+						case "function_call": {
+							const name = typeof item.name === "string" ? item.name : "unknown";
+							toolCallNames.set(item.id, name);
+							yield factory.toolCallStarted(item.id, name);
+							break;
 						}
-						continue;
-					}
-					if (sseEvent.type === "response.output_text.delta") {
-						const data = sseEvent.data;
-						yield factory.messageDelta(data.item_id, textBlock(data.delta));
-						messageItemsWithDelta.add(data.item_id);
-						continue;
-					}
-					if (sseEvent.type === "response.output_text.done") {
-						const data = sseEvent.data;
-						if (!messageItemsWithDelta.has(data.item_id) && data.text) yield factory.messageDelta(data.item_id, textBlock(data.text));
-						yield factory.messageCompleted(data.item_id);
-						output.push(messageItem([textBlock(data.text)], { id: data.item_id }));
-						continue;
-					}
-					if (sseEvent.type === "response.reasoning.delta") {
-						const data = sseEvent.data;
-						yield factory.reasoningDelta(data.item_id, textBlock(data.delta));
-						continue;
-					}
-					if (sseEvent.type === "response.reasoning.done") {
-						const data = sseEvent.data;
-						yield factory.reasoningCompleted(data.item_id);
-						output.push(reasoningItem([textBlock(data.text)], "full", data.item_id));
-						continue;
 					}
-					if (sseEvent.type === "response.function_call_arguments.delta") {
-						const data = sseEvent.data;
-						if (data.delta) yield factory.toolCallDelta(data.item_id, { argumentsText: data.delta });
-						continue;
-					}
-					if (sseEvent.type === "response.function_call_arguments.done") {
-						const data = sseEvent.data;
-						const tcItem = toolCallItem(data.item_id, toolCallNames.get(data.item_id) ?? "unknown", data.arguments);
-						yield factory.toolCallCompleted(data.item_id);
-						output.push(tcItem);
-						continue;
-					}
-					if (sseEvent.type === "response.completed" || sseEvent.type === "response.failed" || sseEvent.type === "response.incomplete") {
-						const data = sseEvent.data;
-						if (completedResponse) {
-							yield factory.responseWarning("Duplicate finish signal ignored", "DUPLICATE_FINISH");
-							continue;
-						}
-						completedResponse = data.response;
-						if (sseEvent.type === "response.failed") yield factory.responseWarning(`Response failed: ${extractFailureMessage(data.response)}`, "PROVIDER_FAILURE");
+					continue;
+				}
+				if (sseEvent.type === "response.output_text.delta") {
+					const data = sseEvent.data;
+					yield factory.messageDelta(data.item_id, textBlock(data.delta));
+					messageItemsWithDelta.add(data.item_id);
+					continue;
+				}
+				if (sseEvent.type === "response.output_text.done") {
+					const data = sseEvent.data;
+					if (!messageItemsWithDelta.has(data.item_id) && data.text) yield factory.messageDelta(data.item_id, textBlock(data.text));
+					yield factory.messageCompleted(data.item_id);
+					output.push(messageItem([textBlock(data.text)], { id: data.item_id }));
+					continue;
+				}
+				if (sseEvent.type === "response.reasoning.delta") {
+					const data = sseEvent.data;
+					yield factory.reasoningDelta(data.item_id, textBlock(data.delta));
+					continue;
+				}
+				if (sseEvent.type === "response.reasoning.done") {
+					const data = sseEvent.data;
+					yield factory.reasoningCompleted(data.item_id);
+					output.push(reasoningItem([textBlock(data.text)], "full", data.item_id));
+					continue;
+				}
+				if (sseEvent.type === "response.function_call_arguments.delta") {
+					const data = sseEvent.data;
+					if (data.delta) yield factory.toolCallDelta(data.item_id, { argumentsText: data.delta });
+					continue;
+				}
+				if (sseEvent.type === "response.function_call_arguments.done") {
+					const data = sseEvent.data;
+					const tcItem = toolCallItem(data.item_id, toolCallNames.get(data.item_id) ?? "unknown", data.arguments);
+					yield factory.toolCallCompleted(data.item_id);
+					output.push(tcItem);
+					continue;
+				}
+				if (sseEvent.type === "response.completed" || sseEvent.type === "response.failed" || sseEvent.type === "response.incomplete") {
+					const data = sseEvent.data;
+					if (completedResponse) {
+						yield factory.responseWarning("Duplicate finish signal ignored", "DUPLICATE_FINISH");
 						continue;
 					}
-					if (!KNOWN_RESPONSES_SSE_TYPES.has(sseEvent.type) && !unknownEventsWarned) {
-						unknownEventsWarned = true;
-						yield factory.responseWarning(`Responses API sent unknown event type "${sseEvent.type}"; this may indicate an incomplete integration`, "UNKNOWN_PROVIDER_EVENT");
-					}
+					completedResponse = data.response;
+					if (sseEvent.type === "response.failed") yield factory.responseWarning(`Response failed: ${extractFailureMessage(data.response)}`, "PROVIDER_FAILURE");
+					continue;
 				}
-				if (done) {
-					streamDone = true;
-					break;
+				if (!KNOWN_RESPONSES_SSE_TYPES.has(sseEvent.type) && !unknownEventsWarned) {
+					unknownEventsWarned = true;
+					yield factory.responseWarning(`Responses API sent unknown event type "${sseEvent.type}"; this may indicate an incomplete integration`, "UNKNOWN_PROVIDER_EVENT");
 				}
 			}
-		} finally {
-			try {
-				if (!streamDone) await reader.cancel().catch(() => void 0);
-			} finally {
-				reader.releaseLock();
-			}
 		}
-		if (parser.getRemaining().trim().length > 0) yield factory.responseWarning("Stream ended with an incomplete Responses SSE frame", "STREAM_ERROR");
 		let rawResponseId;
 		if (completedResponse) {
 			rawResponseId = completedResponse.id;
@@ -1911,31 +1973,12 @@ var ResponsesAdapter = class extends AdapterBase {
 		const replay = [...replayFromOutput(output)];
 		if (completedResponse?.id) replay.push(opaqueItem("responses", "replay", { id: completedResponse.id }));
 		const stopReason = completedResponse ? this.inferStopReason(completedResponse) : void 0;
-		const auxiliaryResult = await auxiliary.finalize(factory);
-		for (const event of auxiliaryResult.events) yield event;
-		if (!completedEmitted) {
-			completedEmitted = true;
-			const finalResponse = this.buildResponse(request, {
-				output,
-				replay,
-				stopReason,
-				usage: auxiliaryResult.usage,
-				billing: auxiliaryResult.billing,
-				auxiliary: auxiliaryResult.auxiliary,
-				warnings: auxiliaryResult.warnings,
-				metadataSources: auxiliaryResult.metadataSources,
-				rawResponseId
-			}, factory);
-			yield factory.responseCompleted({
-				replay: finalResponse.replay,
-				stopReason: finalResponse.stopReason,
-				trace: finalResponse.backend,
-				usage: finalResponse.usage,
-				billing: finalResponse.billing,
-				auxiliary: finalResponse.auxiliary,
-				warnings: finalResponse.warnings
-			});
-		}
+		if (gate.tryComplete()) yield* this.emitStreamCompleted(factory, request, auxiliary, {
+			output,
+			replay,
+			stopReason,
+			rawResponseId
+		});
 	}
 	inferStopReason(response) {
 		if (response.status === "failed") return "error";
@@ -2086,7 +2129,7 @@ var MessagesAdapter = class extends AdapterBase {
 					break;
 				}
 				case "tool_result": {
-					const content = mapper$2.ensureTextBlocks(item.content, `tool_result ${item.callId} content`).map(blockToText).join("\n");
+					const content = mapper$2.textFromBlocks(item.content, `tool_result ${item.callId} content`);
 					const block = {
 						type: "tool_result",
 						tool_use_id: item.callId,
@@ -2139,71 +2182,39 @@ var MessagesAdapter = class extends AdapterBase {
 			stream: true
 		};
 		if (systemPrompt) body.system = systemPrompt;
-		if (request.tools && request.tools.length > 0) body.tools = request.tools.map((t) => ({
+		body.tools = mapper$2.mapToolsIfPresent(request.tools, (t) => ({
 			name: t.name,
 			description: t.description,
 			input_schema: t.inputSchema
 		}));
-		if (request.toolChoice) {
-			if (request.toolChoice === "auto") body.tool_choice = { type: "auto" };
-			else if (request.toolChoice === "none") body.tool_choice = { type: "none" };
-			else if (request.toolChoice.type === "tool") body.tool_choice = {
+		body.tool_choice = mapper$2.mapToolChoice(request.toolChoice, {
+			auto: { type: "auto" },
+			none: { type: "none" },
+			tool: (name) => ({
 				type: "tool",
-				name: request.toolChoice.name
-			};
-		}
+				name
+			})
+		});
 		if (request.temperature !== void 0) body.temperature = request.temperature;
 		return body;
 	}
 	async *runStream(providerRequest, factory, request) {
 		const auxiliary = this.createAuxiliaryState(request);
-		let completedEmitted = false;
+		const gate = createCompletionGate();
 		if (request.metadata) yield factory.responseWarning("Request metadata is not supported by the Messages adapter", "UNSUPPORTED_METADATA");
-		let response;
-		try {
-			response = await this.fetchFn(`${this.baseUrl}/messages`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					"x-api-key": this.apiKey,
-					"anthropic-version": this.apiVersion
-				},
-				body: JSON.stringify(providerRequest),
-				signal: request.signal
-			});
-		} catch (err) {
-			throw new AIProviderError(err instanceof Error ? err.message : String(err), "PROVIDER_ERROR");
-		}
-		if (!response.ok) {
-			const errorBody = await response.text().catch(() => "");
-			throw providerHttpError(response.status, errorBody);
-		}
-		const reader = response.body?.getReader();
-		if (!reader) throw new AIStreamError("Response body is not readable", "STREAM_ERROR");
-		const parser = new IncrementalStreamParser(splitSSEFrames, (frame) => {
-			let eventType = "";
-			let dataStr = "";
-			for (const rawLine of frame.split("\n")) {
-				const line = rawLine.trim();
-				if (line.startsWith("event: ")) eventType = line.slice(7).trim();
-				else if (line.startsWith("data: ")) dataStr += line.slice(6);
-			}
-			if (!eventType) return { status: "ignored" };
-			try {
-				const data = JSON.parse(dataStr);
-				return {
-					status: "parsed",
-					value: {
-						type: eventType,
-						data
-					}
-				};
-			} catch {
-				return { status: "malformed" };
-			}
+		const { reader, headers } = await openProviderJsonStream({
+			fetchFn: this.fetchFn,
+			url: `${this.baseUrl}/messages`,
+			headers: {
+				"Content-Type": "application/json",
+				"x-api-key": this.apiKey,
+				"anthropic-version": this.apiVersion
+			},
+			body: providerRequest,
+			signal: request.signal
 		});
+		const parser = createSseJsonParser();
 		const output = [];
-		let streamDone = false;
 		let messageResponse;
 		let currentContentBlockIndex = -1;
 		let currentItemType = null;
@@ -2211,7 +2222,6 @@ var MessagesAdapter = class extends AdapterBase {
 		let currentToolName = "";
 		let currentArgsText = "";
 		let currentThinkingVisibility = "full";
-		let hasStreamedReasoning = false;
 		const rawReplayContent = [];
 		let textBuffer = "";
 		let thinkingBuffer = "";
@@ -2220,160 +2230,142 @@ var MessagesAdapter = class extends AdapterBase {
 		let stopSequence;
 		let rawResponseId = "";
 		if (request.include?.providerMetadata !== "off") {
-			const headerMetadata = pickProviderHeaders(response.headers);
+			const headerMetadata = pickProviderHeaders(headers);
 			auxiliary.recordProviderMetadata("header", Object.keys(headerMetadata).length > 0 ? { headers: headerMetadata } : void 0);
 		}
-		try {
-			while (true) {
-				const { done, value } = await reader.read().catch((err) => {
-					throw new AIStreamError(`Failed to read response stream: ${err instanceof Error ? err.message : String(err)}`, "STREAM_ERROR");
-				});
-				const { items: events, malformed: malformedEvents } = done ? parser.flush() : parser.feed(value);
-				const malformedWarning = emitMalformedStreamWarning(factory, {
-					count: malformedEvents,
-					providerLabel: "Messages",
-					transportLabel: "SSE event(s)"
-				});
-				if (malformedWarning) yield malformedWarning;
-				for (const sseEvent of events) switch (sseEvent.type) {
-					case "ping": continue;
-					case "error": {
-						const err = sseEvent.data.error;
-						yield factory.responseWarning(err.message, err.type);
-						continue;
-					}
-					case "message_start":
-						messageResponse = sseEvent.data.message;
-						rawResponseId = messageResponse.id;
-						if (messageResponse.content.some((b) => b.type === "thinking" || b.type === "redacted_thinking")) hasStreamedReasoning = true;
-						continue;
-					case "content_block_start": {
-						const block = sseEvent.data.content_block;
-						currentContentBlockIndex = sseEvent.data.index;
-						switch (block.type) {
-							case "text":
-								currentItemType = "message";
-								currentItemId = synthesizeItemId("msg", currentContentBlockIndex, rawResponseId);
-								textBuffer = "";
-								yield factory.messageStarted(currentItemId);
-								break;
-							case "thinking":
-								hasStreamedReasoning = true;
-								currentItemType = "reasoning";
-								currentItemId = synthesizeItemId("reason", currentContentBlockIndex, rawResponseId);
-								currentThinkingVisibility = "full";
-								thinkingBuffer = "";
-								yield factory.reasoningStarted(currentItemId, "full");
-								break;
-							case "redacted_thinking": {
-								hasStreamedReasoning = true;
-								currentItemType = "reasoning";
-								currentItemId = synthesizeItemId("reason-redacted", currentContentBlockIndex, rawResponseId);
-								currentThinkingVisibility = "redacted";
-								const data = block.data;
-								yield factory.reasoningStarted(currentItemId, "redacted");
-								yield factory.reasoningDelta(currentItemId, textBlock(data));
-								const redactedItem = reasoningItem([textBlock(data)], "redacted", currentItemId);
-								yield factory.reasoningCompleted(currentItemId);
-								output.push(redactedItem);
-								rawReplayContent.push({
-									type: "redacted_thinking",
-									data
-								});
-								currentItemType = null;
-								break;
-							}
-							case "tool_use": {
-								const tuBlock = block;
-								currentItemType = "tool_call";
-								currentItemId = tuBlock.id;
-								currentToolName = tuBlock.name;
-								currentArgsText = "";
-								argsBuffer = "";
-								yield factory.toolCallStarted(currentItemId, currentToolName);
-								break;
-							}
-						}
-						continue;
-					}
-					case "content_block_delta": {
-						const delta = sseEvent.data.delta;
-						switch (delta.type) {
-							case "text_delta":
-								if (currentItemType === "message" && currentItemId) {
-									const txt = delta.text;
-									textBuffer += txt;
-									yield factory.messageDelta(currentItemId, textBlock(txt));
-								}
-								break;
-							case "thinking_delta":
-								if (currentItemType === "reasoning" && currentItemId) {
-									const txt = delta.thinking;
-									thinkingBuffer += txt;
-									yield factory.reasoningDelta(currentItemId, textBlock(txt));
-								}
-								break;
-							case "input_json_delta":
-								if (currentItemType === "tool_call" && currentItemId) {
-									const partial = delta.partial_json;
-									argsBuffer += partial;
-									yield factory.toolCallDelta(currentItemId, { argumentsText: partial });
-								}
-								break;
-						}
-						continue;
-					}
-					case "content_block_stop":
-						if (currentItemType === "message" && currentItemId) {
-							yield factory.messageCompleted(currentItemId);
-							output.push(messageItem([textBlock(textBuffer)], { id: currentItemId }));
-							rawReplayContent.push({
-								type: "text",
-								text: textBuffer
-							});
-						} else if (currentItemType === "reasoning" && currentItemId && currentThinkingVisibility !== "redacted") {
+		for await (const batch of iterateProviderStreamBatches({
+			reader,
+			parser,
+			factory,
+			providerLabel: "Messages",
+			transportLabel: "SSE event(s)",
+			incompleteMessage: "Stream ended with an incomplete Messages SSE frame"
+		})) {
+			for (const warning of batch.warnings) yield warning;
+			for (const sseEvent of batch.items) switch (sseEvent.type) {
+				case "ping": continue;
+				case "error": {
+					const err = sseEvent.data.error;
+					yield factory.responseWarning(err.message, err.type);
+					continue;
+				}
+				case "message_start":
+					messageResponse = sseEvent.data.message;
+					rawResponseId = messageResponse.id;
+					continue;
+				case "content_block_start": {
+					const block = sseEvent.data.content_block;
+					currentContentBlockIndex = sseEvent.data.index;
+					switch (block.type) {
+						case "text":
+							currentItemType = "message";
+							currentItemId = synthesizeItemId("msg", currentContentBlockIndex, rawResponseId);
+							textBuffer = "";
+							yield factory.messageStarted(currentItemId);
+							break;
+						case "thinking":
+							currentItemType = "reasoning";
+							currentItemId = synthesizeItemId("reason", currentContentBlockIndex, rawResponseId);
+							currentThinkingVisibility = "full";
+							thinkingBuffer = "";
+							yield factory.reasoningStarted(currentItemId, "full");
+							break;
+						case "redacted_thinking": {
+							currentItemType = "reasoning";
+							currentItemId = synthesizeItemId("reason-redacted", currentContentBlockIndex, rawResponseId);
+							currentThinkingVisibility = "redacted";
+							const data = block.data;
+							yield factory.reasoningStarted(currentItemId, "redacted");
+							yield factory.reasoningDelta(currentItemId, textBlock(data));
+							const redactedItem = reasoningItem([textBlock(data)], "redacted", currentItemId);
 							yield factory.reasoningCompleted(currentItemId);
-							output.push(reasoningItem([textBlock(thinkingBuffer)], currentThinkingVisibility, currentItemId));
-							rawReplayContent.push({
-								type: "thinking",
-								thinking: thinkingBuffer
-							});
-						} else if (currentItemType === "tool_call" && currentItemId) {
-							const tcItem = toolCallItem(currentItemId, currentToolName, currentArgsText || argsBuffer);
-							yield factory.toolCallCompleted(currentItemId);
-							output.push(tcItem);
+							output.push(redactedItem);
 							rawReplayContent.push({
-								type: "tool_use",
-								id: currentItemId,
-								name: currentToolName,
-								input: parseProviderToolUseInput(currentArgsText || argsBuffer)
+								type: "redacted_thinking",
+								data
 							});
+							currentItemType = null;
+							break;
+						}
+						case "tool_use": {
+							const tuBlock = block;
+							currentItemType = "tool_call";
+							currentItemId = tuBlock.id;
+							currentToolName = tuBlock.name;
+							currentArgsText = "";
+							argsBuffer = "";
+							yield factory.toolCallStarted(currentItemId, currentToolName);
+							break;
 						}
-						currentItemType = null;
-						currentItemId = "";
-						continue;
-					case "message_delta": {
-						stopReason = sseEvent.data.delta.stop_reason;
-						stopSequence = sseEvent.data.delta.stop_sequence;
-						const u = sseEvent.data.usage;
-						if (u) auxiliary.recordUsage(usageFromAnthropicMessages(u), "stream", u);
-						continue;
 					}
-					case "message_stop": break;
+					continue;
 				}
-				if (done) {
-					streamDone = true;
-					break;
+				case "content_block_delta": {
+					const delta = sseEvent.data.delta;
+					switch (delta.type) {
+						case "text_delta":
+							if (currentItemType === "message" && currentItemId) {
+								const txt = delta.text;
+								textBuffer += txt;
+								yield factory.messageDelta(currentItemId, textBlock(txt));
+							}
+							break;
+						case "thinking_delta":
+							if (currentItemType === "reasoning" && currentItemId) {
+								const txt = delta.thinking;
+								thinkingBuffer += txt;
+								yield factory.reasoningDelta(currentItemId, textBlock(txt));
+							}
+							break;
+						case "input_json_delta":
+							if (currentItemType === "tool_call" && currentItemId) {
+								const partial = delta.partial_json;
+								argsBuffer += partial;
+								yield factory.toolCallDelta(currentItemId, { argumentsText: partial });
+							}
+							break;
+					}
+					continue;
 				}
-			}
-		} finally {
-			try {
-				if (!streamDone) await reader.cancel().catch(() => void 0);
-			} finally {
-				reader.releaseLock();
+				case "content_block_stop":
+					if (currentItemType === "message" && currentItemId) {
+						yield factory.messageCompleted(currentItemId);
+						output.push(messageItem([textBlock(textBuffer)], { id: currentItemId }));
+						rawReplayContent.push({
+							type: "text",
+							text: textBuffer
+						});
+					} else if (currentItemType === "reasoning" && currentItemId && currentThinkingVisibility !== "redacted") {
+						yield factory.reasoningCompleted(currentItemId);
+						output.push(reasoningItem([textBlock(thinkingBuffer)], currentThinkingVisibility, currentItemId));
+						rawReplayContent.push({
+							type: "thinking",
+							thinking: thinkingBuffer
+						});
+					} else if (currentItemType === "tool_call" && currentItemId) {
+						const tcItem = toolCallItem(currentItemId, currentToolName, currentArgsText || argsBuffer);
+						yield factory.toolCallCompleted(currentItemId);
+						output.push(tcItem);
+						rawReplayContent.push({
+							type: "tool_use",
+							id: currentItemId,
+							name: currentToolName,
+							input: parseProviderToolUseInput(currentArgsText || argsBuffer)
+						});
+					}
+					currentItemType = null;
+					currentItemId = "";
+					continue;
+				case "message_delta": {
+					stopReason = sseEvent.data.delta.stop_reason;
+					stopSequence = sseEvent.data.delta.stop_sequence;
+					const u = sseEvent.data.usage;
+					if (u) auxiliary.recordUsage(usageFromAnthropicMessages(u), "stream", u);
+					continue;
+				}
+				case "message_stop": break;
 			}
 		}
-		if (parser.getRemaining().trim().length > 0) yield factory.responseWarning("Stream ended with an incomplete Messages SSE frame", "STREAM_ERROR");
 		const replay = [...replayFromOutput(output)];
 		if (messageResponse) {
 			const replayContent = rawReplayContent.length > 0 ? rawReplayContent : messageResponse.content;
@@ -2391,32 +2383,12 @@ var MessagesAdapter = class extends AdapterBase {
 			stopReason,
 			stopSequence
 		}));
-		if (!hasStreamedReasoning) {}
-		const auxiliaryResult = await auxiliary.finalize(factory);
-		for (const event of auxiliaryResult.events) yield event;
-		if (!completedEmitted) {
-			completedEmitted = true;
-			const finalResponse = this.buildResponse(request, {
-				output,
-				replay,
-				stopReason: stopReason ? mapStopReason(stopReason) : void 0,
-				usage: auxiliaryResult.usage,
-				billing: auxiliaryResult.billing,
-				auxiliary: auxiliaryResult.auxiliary,
-				warnings: auxiliaryResult.warnings,
-				metadataSources: auxiliaryResult.metadataSources,
-				rawResponseId
-			}, factory);
-			yield factory.responseCompleted({
-				replay: finalResponse.replay,
-				stopReason: finalResponse.stopReason,
-				trace: finalResponse.backend,
-				usage: finalResponse.usage,
-				billing: finalResponse.billing,
-				auxiliary: finalResponse.auxiliary,
-				warnings: finalResponse.warnings
-			});
-		}
+		if (gate.tryComplete()) yield* this.emitStreamCompleted(factory, request, auxiliary, {
+			output,
+			replay,
+			stopReason: stopReason ? mapStopReason(stopReason) : void 0,
+			rawResponseId
+		});
 	}
 };
 //#endregion
@@ -2527,7 +2499,7 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 		for (const item of request.input) switch (item.type) {
 			case "message": {
 				const role = item.role;
-				const text = contentBlocksToText(mapper$1.ensureTextBlocks(item.content, `input message (${item.role}) content`));
+				const text = mapper$1.textFromBlocks(item.content, `input message (${item.role}) content`);
 				messages.push({
 					role,
 					content: text || null
@@ -2557,13 +2529,13 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 					role: "tool",
 					tool_call_id: item.callId,
 					name: item.toolName,
-					content: contentBlocksToText(mapper$1.ensureTextBlocks(item.content, `tool_result ${item.callId} content`))
+					content: mapper$1.textFromBlocks(item.content, `tool_result ${item.callId} content`)
 				});
 				break;
 			case "reasoning":
 				messages.push({
 					role: "assistant",
-					content: contentBlocksToText(mapper$1.ensureTextBlocks(item.content, "reasoning content"))
+					content: mapper$1.textFromBlocks(item.content, "reasoning content")
 				});
 				break;
 			case "opaque": {
@@ -2591,7 +2563,7 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 			stream: true,
 			n: 1
 		};
-		if (request.tools && request.tools.length > 0) body.tools = request.tools.map((t) => ({
+		body.tools = mapper$1.mapToolsIfPresent(request.tools, (t) => ({
 			type: "function",
 			function: {
 				name: t.name,
@@ -2599,14 +2571,14 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 				parameters: t.inputSchema
 			}
 		}));
-		if (request.toolChoice) {
-			if (request.toolChoice === "auto") body.tool_choice = "auto";
-			else if (request.toolChoice === "none") body.tool_choice = "none";
-			else if (request.toolChoice.type === "tool") body.tool_choice = {
+		body.tool_choice = mapper$1.mapToolChoice(request.toolChoice, {
+			auto: "auto",
+			none: "none",
+			tool: (name) => ({
 				type: "function",
-				function: { name: request.toolChoice.name }
-			};
-		}
+				function: { name }
+			})
+		});
 		if (request.temperature !== void 0) body.temperature = request.temperature;
 		if (request.maxOutputTokens !== void 0) body.max_tokens = request.maxOutputTokens;
 		if (request.metadata) body.metadata = request.metadata;
@@ -2614,42 +2586,19 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 	}
 	async *runStream(providerRequest, factory, request) {
 		const auxiliary = this.createAuxiliaryState(request);
-		let response;
-		try {
-			response = await this.fetchFn(`${this.baseUrl}/chat/completions`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					Authorization: `Bearer ${this.apiKey}`
-				},
-				body: JSON.stringify(providerRequest),
-				signal: request.signal
-			});
-		} catch (err) {
-			throw new AIProviderError(err instanceof Error ? err.message : String(err), "PROVIDER_ERROR");
-		}
-		if (!response.ok) {
-			const errorBody = await response.text().catch(() => "");
-			throw providerHttpError(response.status, errorBody);
-		}
-		const reader = response.body?.getReader();
-		if (!reader) throw new AIStreamError("Response body is not readable", "STREAM_ERROR");
-		const parser = new IncrementalStreamParser(splitLines, (item) => {
-			const trimmed = item.trim();
-			if (!trimmed.startsWith("data: ")) return { status: "ignored" };
-			const data = trimmed.slice(6).trim();
-			if (data === "[DONE]") return { status: "ignored" };
-			try {
-				return {
-					status: "parsed",
-					value: JSON.parse(data)
-				};
-			} catch {
-				return { status: "malformed" };
-			}
+		const gate = createCompletionGate();
+		const { reader } = await openProviderJsonStream({
+			fetchFn: this.fetchFn,
+			url: `${this.baseUrl}/chat/completions`,
+			headers: {
+				"Content-Type": "application/json",
+				Authorization: `Bearer ${this.apiKey}`
+			},
+			body: providerRequest,
+			signal: request.signal
 		});
+		const parser = createChatCompletionsSseParser();
 		const output = [];
-		let streamDone = false;
 		let responseId;
 		let accumulatedContent = "";
 		let accumulatedReasoning = "";
@@ -2657,9 +2606,7 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 		let currentReasoningId = "";
 		let hasMessageStarted = false;
 		let hasReasoningStarted = false;
-		let completedEmitted = false;
 		let warnedNonZeroChoice = false;
-		const buildResponse = this.buildResponse.bind(this);
 		const pendingToolCalls = /* @__PURE__ */ new Map();
 		const reasoningByField = /* @__PURE__ */ new Map();
 		const finalizePendingTurn = () => {
@@ -2700,164 +2647,132 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 			};
 		};
 		const emitCompleted = async function* (stopReason, assistantReplayMessage, rawResponseId) {
-			if (completedEmitted) {
+			if (!gate.tryComplete()) {
 				yield factory.responseWarning("Duplicate finish signal ignored", "DUPLICATE_FINISH");
 				return;
 			}
-			completedEmitted = true;
 			const replay = [...replayFromOutput(output)];
 			if (assistantReplayMessage) replay.push(opaqueItem("chat.completions", "replay", {
 				replaceCanonical: true,
 				messages: [assistantReplayMessage]
 			}));
-			const auxiliaryResult = await auxiliary.finalize(factory);
-			for (const event of auxiliaryResult.events) yield event;
-			const finalResponse = buildResponse(request, {
+			yield* this.emitStreamCompleted(factory, request, auxiliary, {
 				output,
 				replay,
 				stopReason,
-				usage: auxiliaryResult.usage,
-				billing: auxiliaryResult.billing,
-				auxiliary: auxiliaryResult.auxiliary,
-				warnings: auxiliaryResult.warnings,
-				metadataSources: auxiliaryResult.metadataSources,
 				rawResponseId
-			}, factory);
-			yield factory.responseCompleted({
-				replay: finalResponse.replay,
-				stopReason: finalResponse.stopReason,
-				trace: finalResponse.backend,
-				usage: finalResponse.usage,
-				billing: finalResponse.billing,
-				auxiliary: finalResponse.auxiliary,
-				warnings: finalResponse.warnings
 			});
-		};
-		try {
-			while (true) {
-				const { done, value } = await reader.read().catch((err) => {
-					throw new AIStreamError(`Failed to read response stream: ${err instanceof Error ? err.message : String(err)}`, "STREAM_ERROR");
-				});
-				const { items: chunks, malformed: malformedEvents } = done ? parser.flush() : parser.feed(value);
-				const malformedWarning = emitMalformedStreamWarning(factory, {
-					count: malformedEvents,
-					providerLabel: "Chat Completions",
-					transportLabel: "SSE event(s)"
-				});
-				if (malformedWarning) yield malformedWarning;
-				for (const chunk of chunks) {
-					responseId = chunk.id;
-					if (chunk.usage) auxiliary.recordUsage(usageFromChatCompletions(chunk.usage), "final", chunk.usage);
-					for (const choice of chunk.choices) {
-						if (choice.index !== 0) {
-							if (!warnedNonZeroChoice) {
-								yield factory.responseWarning(`Chat Completions returned choice index ${choice.index}; only the first choice (index 0) is supported. This choice is ignored.`, "MULTIPLE_CHOICES_IGNORED");
-								warnedNonZeroChoice = true;
-							}
-							continue;
+		}.bind(this);
+		for await (const batch of iterateProviderStreamBatches({
+			reader,
+			parser,
+			factory,
+			providerLabel: "Chat Completions",
+			transportLabel: "SSE event(s)",
+			incompleteMessage: "Stream ended with an incomplete Chat Completions SSE frame"
+		})) {
+			for (const warning of batch.warnings) yield warning;
+			for (const chunk of batch.items) {
+				responseId = chunk.id;
+				if (chunk.usage) auxiliary.recordUsage(usageFromChatCompletions(chunk.usage), "final", chunk.usage);
+				for (const choice of chunk.choices) {
+					if (choice.index !== 0) {
+						if (!warnedNonZeroChoice) {
+							yield factory.responseWarning(`Chat Completions returned choice index ${choice.index}; only the first choice (index 0) is supported. This choice is ignored.`, "MULTIPLE_CHOICES_IGNORED");
+							warnedNonZeroChoice = true;
 						}
-						if (completedEmitted) {
-							if (choice.finish_reason) yield factory.responseWarning("Duplicate finish signal ignored", "DUPLICATE_FINISH");
-							continue;
+						continue;
+					}
+					if (gate.completed) {
+						if (choice.finish_reason) yield factory.responseWarning("Duplicate finish signal ignored", "DUPLICATE_FINISH");
+						continue;
+					}
+					const delta = choice.delta;
+					const finishReason = choice.finish_reason;
+					const reasoningDeltas = extractReasoningDeltas(delta);
+					const ensureMessageStarted = () => {
+						if (hasMessageStarted) return;
+						currentMessageId = `msg-${chunk.id}`;
+						hasMessageStarted = true;
+						accumulatedContent = "";
+					};
+					if (reasoningDeltas.length > 0) {
+						if (!hasReasoningStarted) {
+							currentReasoningId = `reason-${chunk.id}`;
+							hasReasoningStarted = true;
+							accumulatedReasoning = "";
+							yield factory.reasoningStarted(currentReasoningId, "full");
 						}
-						const delta = choice.delta;
-						const finishReason = choice.finish_reason;
-						const reasoningDeltas = extractReasoningDeltas(delta);
-						const ensureMessageStarted = () => {
-							if (hasMessageStarted) return;
-							currentMessageId = `msg-${chunk.id}`;
-							hasMessageStarted = true;
-							accumulatedContent = "";
-						};
-						if (reasoningDeltas.length > 0) {
-							if (!hasReasoningStarted) {
-								currentReasoningId = `reason-${chunk.id}`;
-								hasReasoningStarted = true;
-								accumulatedReasoning = "";
-								yield factory.reasoningStarted(currentReasoningId, "full");
-							}
-							for (const reasoningDelta of reasoningDeltas) {
-								accumulatedReasoning += reasoningDelta.text;
-								reasoningByField.set(reasoningDelta.field, (reasoningByField.get(reasoningDelta.field) ?? "") + reasoningDelta.text);
-								yield factory.reasoningDelta(currentReasoningId, textBlock(reasoningDelta.text));
-							}
+						for (const reasoningDelta of reasoningDeltas) {
+							accumulatedReasoning += reasoningDelta.text;
+							reasoningByField.set(reasoningDelta.field, (reasoningByField.get(reasoningDelta.field) ?? "") + reasoningDelta.text);
+							yield factory.reasoningDelta(currentReasoningId, textBlock(reasoningDelta.text));
 						}
-						if (delta.content) {
-							if (!hasMessageStarted) {
-								ensureMessageStarted();
-								yield factory.messageStarted(currentMessageId);
-							}
-							accumulatedContent += delta.content;
-							yield factory.messageDelta(currentMessageId, textBlock(delta.content));
+					}
+					if (delta.content) {
+						if (!hasMessageStarted) {
+							ensureMessageStarted();
+							yield factory.messageStarted(currentMessageId);
 						}
-						if (delta.tool_calls) {
-							if (!hasMessageStarted) {
-								ensureMessageStarted();
-								yield factory.messageStarted(currentMessageId);
-							}
-							for (const tc of delta.tool_calls) {
-								const idx = tc.index;
-								if (tc.id) {
-									pendingToolCalls.set(idx, {
-										id: tc.id,
-										name: tc.function?.name ?? "",
-										args: ""
-									});
-									yield factory.toolCallStarted(tc.id, tc.function?.name ?? "");
-								}
-								if (tc.function?.arguments) {
-									const pending = pendingToolCalls.get(idx);
-									if (pending) {
-										pending.args += tc.function.arguments;
-										yield factory.toolCallDelta(pending.id, { argumentsText: tc.function.arguments });
-									}
-								}
-							}
+						accumulatedContent += delta.content;
+						yield factory.messageDelta(currentMessageId, textBlock(delta.content));
+					}
+					if (delta.tool_calls) {
+						if (!hasMessageStarted) {
+							ensureMessageStarted();
+							yield factory.messageStarted(currentMessageId);
 						}
-						if (delta.function_call) {
-							if (!hasMessageStarted) {
-								ensureMessageStarted();
-								yield factory.messageStarted(currentMessageId);
-							}
-							if (delta.function_call.name) {
-								const fcId = `fc-${chunk.id}-0`;
-								pendingToolCalls.set(0, {
-									id: fcId,
-									name: delta.function_call.name,
+						for (const tc of delta.tool_calls) {
+							const idx = tc.index;
+							if (tc.id) {
+								pendingToolCalls.set(idx, {
+									id: tc.id,
+									name: tc.function?.name ?? "",
 									args: ""
 								});
-								yield factory.toolCallStarted(fcId, delta.function_call.name);
+								yield factory.toolCallStarted(tc.id, tc.function?.name ?? "");
 							}
-							if (delta.function_call.arguments) {
-								const pending = pendingToolCalls.get(0);
+							if (tc.function?.arguments) {
+								const pending = pendingToolCalls.get(idx);
 								if (pending) {
-									pending.args += delta.function_call.arguments;
-									yield factory.toolCallDelta(pending.id, { argumentsText: delta.function_call.arguments });
+									pending.args += tc.function.arguments;
+									yield factory.toolCallDelta(pending.id, { argumentsText: tc.function.arguments });
 								}
 							}
 						}
-						if (finishReason && finishReason !== null) {
-							const { events, assistantReplayMessage } = finalizePendingTurn();
-							for (const event of events) yield event;
-							yield* emitCompleted(mapStopReason(finishReason), assistantReplayMessage, chunk.id);
+					}
+					if (delta.function_call) {
+						if (!hasMessageStarted) {
+							ensureMessageStarted();
+							yield factory.messageStarted(currentMessageId);
+						}
+						if (delta.function_call.name) {
+							const fcId = `fc-${chunk.id}-0`;
+							pendingToolCalls.set(0, {
+								id: fcId,
+								name: delta.function_call.name,
+								args: ""
+							});
+							yield factory.toolCallStarted(fcId, delta.function_call.name);
+						}
+						if (delta.function_call.arguments) {
+							const pending = pendingToolCalls.get(0);
+							if (pending) {
+								pending.args += delta.function_call.arguments;
+								yield factory.toolCallDelta(pending.id, { argumentsText: delta.function_call.arguments });
+							}
 						}
 					}
+					if (finishReason && finishReason !== null) {
+						const { events, assistantReplayMessage } = finalizePendingTurn();
+						for (const event of events) yield event;
+						yield* emitCompleted(mapStopReason(finishReason), assistantReplayMessage, chunk.id);
+					}
 				}
-				if (done) {
-					streamDone = true;
-					break;
-				}
-			}
-		} finally {
-			try {
-				if (!streamDone) await reader.cancel().catch(() => void 0);
-			} finally {
-				reader.releaseLock();
 			}
 		}
-		if (parser.getRemaining().trim().length > 0) yield factory.responseWarning("Stream ended with an incomplete Chat Completions SSE frame", "STREAM_ERROR");
-		if (!completedEmitted && (hasMessageStarted || hasReasoningStarted || pendingToolCalls.size > 0)) {
-			yield factory.responseWarning("Stream ended without a finish_reason", "INCOMPLETE_STREAM");
+		if (!gate.completed && (hasMessageStarted || hasReasoningStarted || pendingToolCalls.size > 0)) {
+			yield factory.responseWarning("Stream ended without a finish_reason", WarningCode.STREAM_INCOMPLETE);
 			const { events, assistantReplayMessage } = finalizePendingTurn();
 			for (const event of events) yield event;
 			yield* emitCompleted(void 0, assistantReplayMessage, responseId);
@@ -2923,7 +2838,7 @@ var OllamaAdapter = class extends AdapterBase {
 				const role = item.role;
 				messages.push({
 					role,
-					content: contentBlocksToText(mapper.ensureTextBlocks(item.content, `input message (${item.role}) content`))
+					content: mapper.textFromBlocks(item.content, `input message (${item.role}) content`)
 				});
 				break;
 			}
@@ -2949,7 +2864,7 @@ var OllamaAdapter = class extends AdapterBase {
 				if (queue && queue.length > 0) queue.shift();
 				messages.push({
 					role: "tool",
-					content: contentBlocksToText(mapper.ensureTextBlocks(item.content, `tool_result ${item.callId} content`))
+					content: mapper.textFromBlocks(item.content, `tool_result ${item.callId} content`)
 				});
 				break;
 			}
@@ -3010,57 +2925,31 @@ var OllamaAdapter = class extends AdapterBase {
 	}
 	async *runStream(providerRequest, factory, request) {
 		const auxiliary = this.createAuxiliaryState(request);
-		let completedEmitted = false;
+		const gate = createCompletionGate();
 		if (request.toolChoice && request.toolChoice !== "auto") yield factory.responseWarning(request.toolChoice === "none" ? "Ollama toolChoice none was mapped by omitting tools" : `Ollama cannot force tool choice; only tool "${request.toolChoice.name}" was provided as a best-effort constraint`, WarningCode.CAPABILITY_DOWNGRADE);
 		if (request.metadata) yield factory.responseWarning("Request metadata is not supported by the Ollama adapter", "UNSUPPORTED_METADATA");
 		const headers = { "Content-Type": "application/json" };
 		if (this.apiKey) headers.Authorization = `Bearer ${this.apiKey}`;
-		let response;
-		try {
-			response = await this.fetchFn(`${this.baseUrl}/api/chat`, {
-				method: "POST",
-				headers,
-				body: JSON.stringify(providerRequest),
-				signal: request.signal
-			});
-		} catch (err) {
-			throw new AIProviderError(err instanceof Error ? err.message : String(err), "PROVIDER_ERROR");
-		}
-		if (!response.ok) {
-			const errorBody = await response.text().catch(() => "");
-			throw providerHttpError(response.status, errorBody);
-		}
-		const reader = response.body?.getReader();
-		if (!reader) throw new AIStreamError("Response body is not readable", "STREAM_ERROR");
-		const parser = new IncrementalStreamParser(splitLines, (item) => {
-			const trimmed = item.trim();
-			if (!trimmed) return { status: "ignored" };
-			try {
-				const parsed = JSON.parse(trimmed);
-				if (parsed && typeof parsed === "object" && "message" in parsed) return {
-					status: "parsed",
-					value: parsed
-				};
-				return { status: "malformed" };
-			} catch {
-				return { status: "malformed" };
-			}
+		const { reader } = await openProviderJsonStream({
+			fetchFn: this.fetchFn,
+			url: `${this.baseUrl}/api/chat`,
+			headers,
+			body: providerRequest,
+			signal: request.signal
 		});
+		const parser = createNdjsonLineParser((value) => !!value && typeof value === "object" && "message" in value);
 		const output = [];
-		let streamDone = false;
 		let responseId;
 		let accumulatedContent = "";
 		let currentMessageId = "";
 		let hasMessageStarted = false;
 		let pendingToolCalls = [];
 		let toolCallIndex = 0;
-		const buildResponse = this.buildResponse.bind(this);
 		const emitCompleted = async function* (stopReason, rawResponseId) {
-			if (completedEmitted) {
+			if (!gate.tryComplete()) {
 				yield factory.responseWarning("Duplicate finish signal ignored", "DUPLICATE_FINISH");
 				return;
 			}
-			completedEmitted = true;
 			const replay = replayFromOutput(output);
 			if (accumulatedContent || pendingToolCalls.length > 0) replay.push(opaqueItem("ollama", "replay", {
 				role: "assistant",
@@ -3073,114 +2962,83 @@ var OllamaAdapter = class extends AdapterBase {
 					}
 				}))
 			}));
-			const auxiliaryResult = await auxiliary.finalize(factory);
-			for (const event of auxiliaryResult.events) yield event;
-			const finalResponse = buildResponse(request, {
+			yield* this.emitStreamCompleted(factory, request, auxiliary, {
 				output,
 				replay,
 				stopReason,
-				usage: auxiliaryResult.usage,
-				billing: auxiliaryResult.billing,
-				auxiliary: auxiliaryResult.auxiliary,
-				warnings: auxiliaryResult.warnings,
-				metadataSources: auxiliaryResult.metadataSources,
 				rawResponseId
-			}, factory);
-			yield factory.responseCompleted({
-				replay: finalResponse.replay,
-				stopReason: finalResponse.stopReason,
-				trace: finalResponse.backend,
-				usage: finalResponse.usage,
-				billing: finalResponse.billing,
-				auxiliary: finalResponse.auxiliary,
-				warnings: finalResponse.warnings
 			});
-		};
-		try {
-			while (true) {
-				const { done, value } = await reader.read().catch((err) => {
-					throw new AIStreamError(`Failed to read response stream: ${err instanceof Error ? err.message : String(err)}`, "STREAM_ERROR");
-				});
-				const { items: chunks, malformed: malformedLines } = done ? parser.flush() : parser.feed(value);
-				const malformedWarning = emitMalformedStreamWarning(factory, {
-					count: malformedLines,
-					providerLabel: "Ollama",
-					transportLabel: "NDJSON line(s)"
-				});
-				if (malformedWarning) yield malformedWarning;
-				for (const chunk of chunks) {
-					responseId = chunk.created_at;
-					if (completedEmitted) {
-						if (chunk.done) yield factory.responseWarning("Duplicate finish signal ignored", "DUPLICATE_FINISH");
-						continue;
+		}.bind(this);
+		for await (const batch of iterateProviderStreamBatches({
+			reader,
+			parser,
+			factory,
+			providerLabel: "Ollama",
+			transportLabel: "NDJSON line(s)",
+			incompleteMessage: "Stream ended with an incomplete Ollama NDJSON line"
+		})) {
+			for (const warning of batch.warnings) yield warning;
+			for (const chunk of batch.items) {
+				responseId = chunk.created_at;
+				if (gate.completed) {
+					if (chunk.done) yield factory.responseWarning("Duplicate finish signal ignored", "DUPLICATE_FINISH");
+					continue;
+				}
+				const msg = chunk.message;
+				if (msg.content) {
+					if (!hasMessageStarted) {
+						currentMessageId = `msg-${chunk.created_at}`;
+						hasMessageStarted = true;
+						yield factory.messageStarted(currentMessageId);
 					}
-					const msg = chunk.message;
-					if (msg.content) {
-						if (!hasMessageStarted) {
-							currentMessageId = `msg-${chunk.created_at}`;
-							hasMessageStarted = true;
-							yield factory.messageStarted(currentMessageId);
-						}
-						accumulatedContent += msg.content;
-						yield factory.messageDelta(currentMessageId, textBlock(msg.content));
+					accumulatedContent += msg.content;
+					yield factory.messageDelta(currentMessageId, textBlock(msg.content));
+				}
+				if (msg.tool_calls && msg.tool_calls.length > 0) for (const tc of msg.tool_calls) {
+					const tcId = `ollama-tc-${request.requestId}-${toolCallIndex++}`;
+					const argsText = JSON.stringify(tc.function.arguments);
+					pendingToolCalls.push({
+						id: tcId,
+						name: tc.function.name,
+						argumentsText: argsText
+					});
+				}
+				if (chunk.done) {
+					if (accumulatedContent === "" && pendingToolCalls.length > 0 && !hasMessageStarted) {
+						currentMessageId = `msg-${chunk.created_at}`;
+						hasMessageStarted = true;
+						yield factory.messageStarted(currentMessageId);
 					}
-					if (msg.tool_calls && msg.tool_calls.length > 0) for (const tc of msg.tool_calls) {
-						const tcId = `ollama-tc-${request.requestId}-${toolCallIndex++}`;
-						const argsText = JSON.stringify(tc.function.arguments);
-						pendingToolCalls.push({
-							id: tcId,
-							name: tc.function.name,
-							argumentsText: argsText
-						});
+					if (hasMessageStarted) {
+						const message = messageItem([textBlock(accumulatedContent)], { id: currentMessageId });
+						yield factory.messageCompleted(currentMessageId);
+						if (accumulatedContent) output.push(message);
 					}
-					if (chunk.done) {
-						if (accumulatedContent === "" && pendingToolCalls.length > 0 && !hasMessageStarted) {
-							currentMessageId = `msg-${chunk.created_at}`;
-							hasMessageStarted = true;
-							yield factory.messageStarted(currentMessageId);
-						}
-						if (hasMessageStarted) {
-							const message = messageItem([textBlock(accumulatedContent)], { id: currentMessageId });
-							yield factory.messageCompleted(currentMessageId);
-							if (accumulatedContent) output.push(message);
-						}
-						if (pendingToolCalls.length > 0) yield factory.responseWarning(`Ollama delivered ${pendingToolCalls.length} tool call(s) as a batch; tool_call streaming is not supported`, WarningCode.TOOL_CALL_BATCHED);
-						for (const pending of pendingToolCalls) {
-							const toolCall = toolCallItem(pending.id, pending.name, pending.argumentsText);
-							yield factory.toolCallStarted(pending.id, pending.name);
-							yield factory.toolCallDelta(pending.id, { argumentsText: pending.argumentsText });
-							yield factory.toolCallCompleted(pending.id);
-							output.push(toolCall);
-						}
-						if (request.include?.usage !== "off" && (chunk.prompt_eval_count !== void 0 || chunk.eval_count !== void 0)) auxiliary.recordUsage(usageFromOllama({
-							prompt_eval_count: chunk.prompt_eval_count,
-							eval_count: chunk.eval_count
-						}), "final", {
-							prompt_eval_count: chunk.prompt_eval_count,
-							eval_count: chunk.eval_count
-						});
-						yield* emitCompleted(chunk.done_reason ? mapStopReason(chunk.done_reason) : void 0, chunk.created_at);
-						accumulatedContent = "";
-						currentMessageId = "";
-						hasMessageStarted = false;
-						pendingToolCalls = [];
+					if (pendingToolCalls.length > 0) yield factory.responseWarning(`Ollama delivered ${pendingToolCalls.length} tool call(s) as a batch; tool_call streaming is not supported`, WarningCode.TOOL_CALL_BATCHED);
+					for (const pending of pendingToolCalls) {
+						const toolCall = toolCallItem(pending.id, pending.name, pending.argumentsText);
+						yield factory.toolCallStarted(pending.id, pending.name);
+						yield factory.toolCallDelta(pending.id, { argumentsText: pending.argumentsText });
+						yield factory.toolCallCompleted(pending.id);
+						output.push(toolCall);
 					}
+					if (request.include?.usage !== "off" && (chunk.prompt_eval_count !== void 0 || chunk.eval_count !== void 0)) auxiliary.recordUsage(usageFromOllama({
+						prompt_eval_count: chunk.prompt_eval_count,
+						eval_count: chunk.eval_count
+					}), "final", {
+						prompt_eval_count: chunk.prompt_eval_count,
+						eval_count: chunk.eval_count
+					});
+					yield* emitCompleted(chunk.done_reason ? mapStopReason(chunk.done_reason) : void 0, chunk.created_at);
+					accumulatedContent = "";
+					currentMessageId = "";
+					hasMessageStarted = false;
+					pendingToolCalls = [];
 				}
-				if (done) {
-					streamDone = true;
-					break;
-				}
-			}
-		} finally {
-			try {
-				if (!streamDone) await reader.cancel().catch(() => void 0);
-			} finally {
-				reader.releaseLock();
 			}
 		}
-		if (parser.getRemaining().trim().length > 0) yield factory.responseWarning("Stream ended with an incomplete Ollama NDJSON line", "STREAM_ERROR");
-		if (!completedEmitted && (hasMessageStarted || pendingToolCalls.length > 0)) {
-			yield factory.responseWarning("Stream ended without a done signal", "INCOMPLETE_STREAM");
+		if (!gate.completed && (hasMessageStarted || pendingToolCalls.length > 0)) {
+			yield factory.responseWarning("Stream ended without a done signal", WarningCode.STREAM_INCOMPLETE);
 			if (hasMessageStarted) {
 				const message = messageItem([textBlock(accumulatedContent)], { id: currentMessageId });
 				yield factory.messageCompleted(currentMessageId);
@@ -3619,6 +3477,6 @@ function cloneItem(item) {
 	return structuredClone(item);
 }
 //#endregion
-export { AIError, AIMappingError, AIProviderError, AIRequestError, AIStreamError, AdapterAuxiliaryState, AdapterBase, AuxiliaryCollector, ChatCompletionsAdapter, IncrementalStreamParser, MAX_OPAQUE_JSON_DEPTH, MAX_OPAQUE_PAYLOAD_BYTES, MessagesAdapter, MockAdapter, NormalizedRequestMapper, OllamaAdapter, PROVIDER_ERROR_MESSAGE_MAX_LEN, PROVIDER_ERROR_RAW_BODY_THRESHOLD, ResponsesAdapter, WarningCode, aggregateEvents, assertMockRequest, assertOpaqueReplayEnvelope, assertValidRequest, blockToText, collectStream, contentBlocksToText, createAIClient, createEventFactory, emitMalformedStreamWarning, extractProviderErrorMessage, extractText, imageBlock, instructionsToText, jsonBlock, mapReasoningVisibility, mapStopReason, measureJsonDepth, messageItem, metadataSourceList, normalizeRequest, opaqueBlock, opaqueItem, parseSSEEvents, providerHttpError, reasoningItem, replayFromOutput, splitLines, splitSSEFrames, syntheticStream, textBlock, toolCallItem, toolResultItem, usageFromAnthropicMessages, usageFromChatCompletions, usageFromOllama, usageFromOpenAIResponses, validateOpaqueReplayEnvelope, validateRequest, withMockStreaming };
+export { AIError, AIMappingError, AIProviderError, AIRequestError, AIStreamError, AdapterAuxiliaryState, AdapterBase, AuxiliaryCollector, ChatCompletionsAdapter, IncrementalStreamParser, MAX_OPAQUE_JSON_DEPTH, MAX_OPAQUE_PAYLOAD_BYTES, MessagesAdapter, MockAdapter, NormalizedRequestMapper, OllamaAdapter, PROVIDER_ERROR_MESSAGE_MAX_LEN, PROVIDER_ERROR_RAW_BODY_THRESHOLD, ResponsesAdapter, WarningCode, aggregateEvents, assertMockRequest, assertOpaqueReplayEnvelope, assertValidRequest, blockToText, collectStream, contentBlocksToText, createAIClient, createChatCompletionsSseParser, createCompletionGate, createEventFactory, createNdjsonLineParser, createSseJsonParser, emitMalformedStreamWarning, extractProviderErrorMessage, extractText, imageBlock, iterateProviderStreamBatches, jsonBlock, mapReasoningVisibility, mapStopReason, measureJsonDepth, messageItem, normalizeRequest, opaqueBlock, opaqueItem, openProviderJsonStream, parseChatCompletionsDataLine, parseSseJsonFrame, providerHttpError, reasoningItem, replayFromOutput, splitLines, splitSSEFrames, syntheticStream, textBlock, toolCallItem, toolResultItem, usageFromAnthropicMessages, usageFromChatCompletions, usageFromOllama, usageFromOpenAIResponses, validateOpaqueReplayEnvelope, validateRequest, withMockStreaming };
 
 //# sourceMappingURL=index.mjs.map