@codehz/ai 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codehz/ai",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "module": "dist/index.mjs",
   "exports": {

package/src/adapters/chat-completions.ts

@@ -458,9 +458,7 @@ export class ChatCompletionsAdapter 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) {
@@ -599,12 +597,6 @@ export class ChatCompletionsAdapter extends AdapterBase {
               accumulatedContent = "";
             };
 
-            // 处理 role: assistant（首块标识；不要求 content）
-            if (delta.role === "assistant" && !hasMessageStarted) {
-              ensureMessageStarted();
-              yield factory.messageStarted(currentMessageId);
-            }
-
             // 处理 third-party reasoning delta
             if (reasoningDeltas.length > 0) {
               if (!hasReasoningStarted) {

package/src/core/aggregator.ts

@@ -78,6 +78,8 @@ export interface AggregatorState {
   completed: boolean;
   nextSequence?: number;
   activeItems: Map<string, ActiveItem>;
+  itemOrder: string[];
+  completedItems: Map<string, OutputItem>;
 
   /** adapter 在 response.completed 中提供的 replay */
   replayFromAdapter?: import("../types/index.js").ReplayItem[];
@@ -96,6 +98,8 @@ export function createAggregatorState(): AggregatorState {
     started: false,
     completed: false,
     activeItems: new Map(),
+    itemOrder: [],
+    completedItems: new Map(),
   };
 }
 
@@ -112,12 +116,25 @@ function getActiveItem(state: AggregatorState, itemId: string, expectedType: Act
   return item;
 }
 
+function coalesceContentBlocks(blocks: readonly ContentBlock[]): ContentBlock[] {
+  const result: ContentBlock[] = [];
+  for (const block of blocks) {
+    const previous = result[result.length - 1];
+    if (block.type === "text" && previous?.type === "text") {
+      previous.text += block.text;
+    } else {
+      result.push({ ...block });
+    }
+  }
+  return result;
+}
+
 function finalizeMessage(active: ActiveMessage): MessageItem {
   return {
     type: "message",
     id: active.id,
     role: active.role,
-    content: active.content,
+    content: coalesceContentBlocks(active.content),
   };
 }
 
@@ -126,7 +143,7 @@ function finalizeReasoning(active: ActiveReasoning): import("../types/index.js")
     type: "reasoning",
     id: active.id,
     visibility: active.visibility,
-    content: active.content,
+    content: coalesceContentBlocks(active.content),
   };
 }
 
@@ -178,6 +195,7 @@ function handleMessageStarted(state: AggregatorState, event: AIStreamEvent & { t
     role: event.item.role,
     content: [],
   });
+  state.itemOrder.push(id);
 }
 
 function handleMessageDelta(state: AggregatorState, event: AIStreamEvent & { type: "message.delta" }): void {
@@ -189,7 +207,7 @@ function handleMessageCompleted(state: AggregatorState, event: AIStreamEvent & {
   const active = getActiveItem(state, event.itemId, "message") as ActiveMessage;
   state.activeItems.delete(event.itemId);
   const item = finalizeMessage(active);
-  state.output.push(item);
+  state.completedItems.set(event.itemId, item);
   pushMessageText(state, item);
 }
 
@@ -204,6 +222,7 @@ function handleReasoningStarted(state: AggregatorState, event: AIStreamEvent & {
     visibility: event.item.visibility,
     content: [],
   });
+  state.itemOrder.push(id);
 }
 
 function handleReasoningDelta(state: AggregatorState, event: AIStreamEvent & { type: "reasoning.delta" }): void {
@@ -217,7 +236,7 @@ function handleReasoningCompleted(
 ): void {
   const active = getActiveItem(state, event.itemId, "reasoning") as ActiveReasoning;
   state.activeItems.delete(event.itemId);
-  state.output.push(finalizeReasoning(active));
+  state.completedItems.set(event.itemId, finalizeReasoning(active));
 }
 
 function handleToolCallStarted(state: AggregatorState, event: AIStreamEvent & { type: "tool_call.started" }): void {
@@ -231,6 +250,7 @@ function handleToolCallStarted(state: AggregatorState, event: AIStreamEvent & {
     name: event.item.name,
     argumentsText: "",
   });
+  state.itemOrder.push(id);
 }
 
 function handleToolCallDelta(state: AggregatorState, event: AIStreamEvent & { type: "tool_call.delta" }): void {
@@ -244,7 +264,7 @@ function handleToolCallCompleted(state: AggregatorState, event: AIStreamEvent &
   const active = getActiveItem(state, event.itemId, "tool_call") as ActiveToolCall;
   state.activeItems.delete(event.itemId);
   const item = finalizeToolCall(active);
-  state.output.push(item);
+  state.completedItems.set(event.itemId, item);
   state.toolCalls.push(item);
 }
 
@@ -275,10 +295,17 @@ function buildResponse(state: AggregatorState): AIResponse {
     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,