@codehz/ai 0.2.1 → 0.2.2

package/dist/index.mjs

@@ -483,7 +483,9 @@ function createAggregatorState() {
 		toolCalls: [],
 		started: false,
 		completed: false,
-		activeItems: /* @__PURE__ */ new Map()
+		activeItems: /* @__PURE__ */ new Map(),
+		itemOrder: [],
+		completedItems: /* @__PURE__ */ new Map()
 	};
 }
 function getActiveItem(state, itemId, expectedType) {
@@ -546,6 +548,7 @@ function handleMessageStarted(state, event) {
 		role: event.item.role,
 		content: []
 	});
+	state.itemOrder.push(id);
 }
 function handleMessageDelta(state, event) {
 	getActiveItem(state, event.itemId, "message").content.push(event.delta);
@@ -554,7 +557,7 @@ function handleMessageCompleted(state, event) {
 	const active = getActiveItem(state, event.itemId, "message");
 	state.activeItems.delete(event.itemId);
 	const item = finalizeMessage(active);
-	state.output.push(item);
+	state.completedItems.set(event.itemId, item);
 	pushMessageText(state, item);
 }
 function handleReasoningStarted(state, event) {
@@ -566,6 +569,7 @@ function handleReasoningStarted(state, event) {
 		visibility: event.item.visibility,
 		content: []
 	});
+	state.itemOrder.push(id);
 }
 function handleReasoningDelta(state, event) {
 	getActiveItem(state, event.itemId, "reasoning").content.push(event.delta);
@@ -573,7 +577,7 @@ function handleReasoningDelta(state, event) {
 function handleReasoningCompleted(state, event) {
 	const active = getActiveItem(state, event.itemId, "reasoning");
 	state.activeItems.delete(event.itemId);
-	state.output.push(finalizeReasoning(active));
+	state.completedItems.set(event.itemId, finalizeReasoning(active));
 }
 function handleToolCallStarted(state, event) {
 	const id = event.item.id;
@@ -584,6 +588,7 @@ function handleToolCallStarted(state, event) {
 		name: event.item.name,
 		argumentsText: ""
 	});
+	state.itemOrder.push(id);
 }
 function handleToolCallDelta(state, event) {
 	const active = getActiveItem(state, event.itemId, "tool_call");
@@ -593,7 +598,7 @@ function handleToolCallCompleted(state, event) {
 	const active = getActiveItem(state, event.itemId, "tool_call");
 	state.activeItems.delete(event.itemId);
 	const item = finalizeToolCall(active);
-	state.output.push(item);
+	state.completedItems.set(event.itemId, item);
 	state.toolCalls.push(item);
 }
 function handleResponseCompleted(state, event) {
@@ -624,9 +629,14 @@ function buildResponse(state) {
 		metadataSources: backendFromCompleted?.metadataSources,
 		warnings: backendFromCompleted?.warnings
 	};
+	const orderedOutput = state.itemOrder.map((id) => {
+		const item = state.completedItems.get(id);
+		if (!item) throw streamProtocolError(`Item ${id} was started but not completed`);
+		return item;
+	});
 	return {
 		id: state.responseId,
-		output: state.output,
+		output: [...orderedOutput, ...state.output],
 		replay: state.replayFromAdapter ?? [],
 		text: state.textParts.join(""),
 		toolCalls: state.toolCalls,
@@ -2675,7 +2685,7 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 			if (hasMessageStarted) {
 				const message = messageItem([textBlock(accumulatedContent)], { id: currentMessageId });
 				events.push(factory.messageCompleted(currentMessageId));
-				if (accumulatedContent) output.push(message);
+				output.push(message);
 			}
 			for (const pending of finalizedToolCalls) {
 				const toolCall = toolCallItem(pending.id, pending.name, pending.args);
@@ -2770,10 +2780,6 @@ var ChatCompletionsAdapter = class extends AdapterBase {
 							hasMessageStarted = true;
 							accumulatedContent = "";
 						};
-						if (delta.role === "assistant" && !hasMessageStarted) {
-							ensureMessageStarted();
-							yield factory.messageStarted(currentMessageId);
-						}
 						if (reasoningDeltas.length > 0) {
 							if (!hasReasoningStarted) {
 								currentReasoningId = `reason-${chunk.id}`;