wave-agent-sdk 0.18.0 → 0.18.1

package/dist/managers/messageManager.d.ts

@@ -10,8 +10,18 @@ export interface MessageManagerCallbacks {
     onUsagesChange?: (usages: Usage[]) => void;
     onUserMessageAdded?: (params: UserMessageParams) => void;
     onAssistantMessageAdded?: (messageId: string) => void;
-    onAssistantContentUpdated?: (messageId: string, chunk: string, accumulated: string) => void;
-    onAssistantReasoningUpdated?: (messageId: string, chunk: string, accumulated: string) => void;
+    onAssistantContentUpdated?: (params: {
+        messageId: string;
+        chunk: string;
+        accumulated: string;
+        stage: "streaming" | "end";
+    }) => void;
+    onAssistantReasoningUpdated?: (params: {
+        messageId: string;
+        chunk: string;
+        accumulated: string;
+        stage: "streaming" | "end";
+    }) => void;
     onToolBlockUpdated?: (params: ToolBlockUpdateCallbackParams) => void;
     onErrorBlockAdded?: (error: string) => void;
     onCompactBlockAdded?: (content: string) => void;
@@ -147,6 +157,13 @@ export declare class MessageManager {
      * Trigger usage change callback with all usage data from assistant messages
      */
     triggerUsageChange(): void;
+    /**
+     * Finalize a streaming block of the given type by setting its stage to "end".
+     * Fires the corresponding incremental callback with chunk="" to signal finalization.
+     * Does NOT call onMessagesChange — the caller is responsible for that.
+     * Returns true if a block was finalized.
+     */
+    private finalizeStreamingBlock;
     /**
      * Update the current assistant message content during streaming
      * This method updates the last assistant message's content without creating a new message
@@ -158,16 +175,12 @@ export declare class MessageManager {
      * This method updates the last assistant message's reasoning content without creating a new message
      */
     updateCurrentMessageReasoning(newAccumulatedReasoning: string): void;
-    /**
-     * Public wrapper for finalizeCurrentStreamingBlocks.
-     * Finalizes text/reasoning blocks after streaming completes (e.g. final response with no tools).
-     */
-    finalizeStreamingBlocks(): void;
     /**
      * Finalize streaming text/reasoning blocks by setting their stage to "end".
-     * Called when a new block (e.g. tool) is appended during streaming.
+     * Called when a new block (e.g. tool) is appended during streaming, or when streaming completes.
+     * Fires incremental callbacks for each finalized block.
      */
-    private finalizeCurrentStreamingBlocks;
+    finalizeStreamingBlocks(): void;
     /**
      * Remove the last user message from the conversation
      * Used for hook error handling when the user prompt needs to be erased

package/dist/managers/messageManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageManager.d.ts","sourceRoot":"","sources":["../../src/managers/messageManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"messageManager.d.ts","sourceRoot":"","sources":["../../src/managers/messageManager.ts"],"names":[],"mappings":"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"}

package/dist/managers/messageManager.js

@@ -289,7 +289,7 @@ export class MessageManager {
     }
     updateToolBlock(params) {
         // Finalize any streaming text/reasoning blocks before adding/updating a tool block
-        this.finalizeCurrentStreamingBlocks();
+        this.finalizeStreamingBlocks();
         const { messages: newMessages, messageId: resolvedMessageId } = updateToolBlockInMessage({
             messages: this.messages,
             ...params,
@@ -310,7 +310,7 @@ export class MessageManager {
      */
     addToolBlockToMessage(messageId, params) {
         // Finalize any streaming text/reasoning blocks before adding a tool block
-        this.finalizeCurrentStreamingBlocks();
+        this.finalizeStreamingBlocks();
         const { messages: newMessages, toolBlockId } = addToolBlockToMessageInMessages(this.messages, messageId, params);
         this.setMessages(newMessages);
         this.callbacks.onToolBlockUpdated?.({
@@ -463,6 +463,38 @@ export class MessageManager {
     triggerUsageChange() {
         this.callbacks.onUsagesChange?.([...this._usages]);
     }
+    /**
+     * Finalize a streaming block of the given type by setting its stage to "end".
+     * Fires the corresponding incremental callback with chunk="" to signal finalization.
+     * Does NOT call onMessagesChange — the caller is responsible for that.
+     * Returns true if a block was finalized.
+     */
+    finalizeStreamingBlock(lastMessage, type) {
+        const index = lastMessage.blocks.findIndex((block) => block.type === type &&
+            block.stage === "streaming");
+        if (index < 0)
+            return false;
+        const block = lastMessage.blocks[index];
+        lastMessage.blocks[index] = {
+            type: block.type,
+            content: block.content,
+            stage: "end",
+        };
+        // Fire incremental callback to signal finalization
+        const callbackParams = {
+            messageId: lastMessage.id,
+            chunk: "",
+            accumulated: block.content,
+            stage: "end",
+        };
+        if (type === "text") {
+            this.callbacks.onAssistantContentUpdated?.(callbackParams);
+        }
+        else {
+            this.callbacks.onAssistantReasoningUpdated?.(callbackParams);
+        }
+        return true;
+    }
     /**
      * Update the current assistant message content during streaming
      * This method updates the last assistant message's content without creating a new message
@@ -475,16 +507,7 @@ export class MessageManager {
         if (lastMessage.role !== "assistant")
             return;
         // Finalize any streaming reasoning blocks before text content arrives
-        const reasoningIndex = lastMessage.blocks.findIndex((block) => block.type === "reasoning" &&
-            block.stage === "streaming");
-        if (reasoningIndex >= 0) {
-            const reasoningBlock = lastMessage.blocks[reasoningIndex];
-            lastMessage.blocks[reasoningIndex] = {
-                type: "reasoning",
-                content: reasoningBlock.content,
-                stage: "end",
-            };
-        }
+        this.finalizeStreamingBlock(lastMessage, "reasoning");
         // Get the current content to calculate the chunk
         const textBlockIndex = lastMessage.blocks.findIndex((block) => block.type === "text");
         const currentContent = textBlockIndex >= 0
@@ -509,7 +532,12 @@ export class MessageManager {
             });
         }
         // FR-001: Trigger callbacks with chunk and accumulated content
-        this.callbacks.onAssistantContentUpdated?.(lastMessage.id, chunk, newAccumulatedContent);
+        this.callbacks.onAssistantContentUpdated?.({
+            messageId: lastMessage.id,
+            chunk,
+            accumulated: newAccumulatedContent,
+            stage: "streaming",
+        });
         // Note: Subagent-specific callbacks are now handled by SubagentManager
         this.callbacks.onMessagesChange?.([...this.messages]); // Still need to notify of changes
     }
@@ -524,16 +552,7 @@ export class MessageManager {
         if (lastMessage.role !== "assistant")
             return;
         // Finalize any streaming text blocks before reasoning content arrives
-        const textIndex = lastMessage.blocks.findIndex((block) => block.type === "text" &&
-            block.stage === "streaming");
-        if (textIndex >= 0) {
-            const textBlock = lastMessage.blocks[textIndex];
-            lastMessage.blocks[textIndex] = {
-                type: "text",
-                content: textBlock.content,
-                stage: "end",
-            };
-        }
+        this.finalizeStreamingBlock(lastMessage, "text");
         // Get the current reasoning content to calculate the chunk
         const reasoningBlockIndex = lastMessage.blocks.findIndex((block) => block.type === "reasoning");
         const currentReasoning = reasoningBlockIndex >= 0
@@ -558,37 +577,28 @@ export class MessageManager {
             });
         }
         // Trigger callbacks with chunk and accumulated reasoning content
-        this.callbacks.onAssistantReasoningUpdated?.(lastMessage.id, chunk, newAccumulatedReasoning);
+        this.callbacks.onAssistantReasoningUpdated?.({
+            messageId: lastMessage.id,
+            chunk,
+            accumulated: newAccumulatedReasoning,
+            stage: "streaming",
+        });
         this.callbacks.onMessagesChange?.([...this.messages]); // Still need to notify of changes
     }
-    /**
-     * Public wrapper for finalizeCurrentStreamingBlocks.
-     * Finalizes text/reasoning blocks after streaming completes (e.g. final response with no tools).
-     */
-    finalizeStreamingBlocks() {
-        this.finalizeCurrentStreamingBlocks();
-    }
     /**
      * Finalize streaming text/reasoning blocks by setting their stage to "end".
-     * Called when a new block (e.g. tool) is appended during streaming.
+     * Called when a new block (e.g. tool) is appended during streaming, or when streaming completes.
+     * Fires incremental callbacks for each finalized block.
      */
-    finalizeCurrentStreamingBlocks() {
+    finalizeStreamingBlocks() {
         if (this.messages.length === 0)
             return;
         const lastMessage = this.messages[this.messages.length - 1];
         if (lastMessage.role !== "assistant")
             return;
-        const newBlocks = lastMessage.blocks.map((block) => {
-            if ((block.type === "text" || block.type === "reasoning") &&
-                block.stage === "streaming") {
-                return { ...block, stage: "end" };
-            }
-            return block;
-        });
-        // Only update if something changed
-        const changed = newBlocks.some((b, i) => b !== lastMessage.blocks[i]);
-        if (changed) {
-            lastMessage.blocks = newBlocks;
+        const textFinalized = this.finalizeStreamingBlock(lastMessage, "text");
+        const reasoningFinalized = this.finalizeStreamingBlock(lastMessage, "reasoning");
+        if (textFinalized || reasoningFinalized) {
             this.callbacks.onMessagesChange?.([...this.messages]);
         }
     }

package/dist/managers/subagentManager.d.ts

@@ -16,9 +16,21 @@ export interface SubagentManagerCallbacks {
     /** Triggered when subagent creates assistant message */
     onSubagentAssistantMessageAdded?: (subagentId: string, messageId: string) => void;
     /** Triggered during subagent content streaming updates */
-    onSubagentAssistantContentUpdated?: (subagentId: string, messageId: string, chunk: string, accumulated: string) => void;
+    onSubagentAssistantContentUpdated?: (params: {
+        subagentId: string;
+        messageId: string;
+        chunk: string;
+        accumulated: string;
+        stage: "streaming" | "end";
+    }) => void;
     /** Triggered during subagent reasoning streaming updates */
-    onSubagentAssistantReasoningUpdated?: (subagentId: string, messageId: string, chunk: string, accumulated: string) => void;
+    onSubagentAssistantReasoningUpdated?: (params: {
+        subagentId: string;
+        messageId: string;
+        chunk: string;
+        accumulated: string;
+        stage: "streaming" | "end";
+    }) => void;
     /** Triggered when subagent tool block is updated */
     onSubagentToolBlockUpdated?: (subagentId: string, params: ToolBlockUpdateCallbackParams) => void;
     /** Triggered when subagent messages change */

package/dist/managers/subagentManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagentManager.d.ts","sourceRoot":"","sources":["../../src/managers/subagentManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagentManager.d.ts","sourceRoot":"","sources":["../../src/managers/subagentManager.ts"],"names":[],"mappings":"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"}

package/dist/managers/subagentManager.js

@@ -542,16 +542,22 @@ export class SubagentManager {
                     this.callbacks.onSubagentAssistantMessageAdded(subagentId, messageId);
                 }
             },
-            onAssistantContentUpdated: (messageId, chunk, accumulated) => {
+            onAssistantContentUpdated: (params) => {
                 // Forward assistant content updates to parent via SubagentManager callbacks
                 if (this.callbacks?.onSubagentAssistantContentUpdated) {
-                    this.callbacks.onSubagentAssistantContentUpdated(subagentId, messageId, chunk, accumulated);
+                    this.callbacks.onSubagentAssistantContentUpdated({
+                        ...params,
+                        subagentId,
+                    });
                 }
             },
-            onAssistantReasoningUpdated: (messageId, chunk, accumulated) => {
+            onAssistantReasoningUpdated: (params) => {
                 // Forward assistant reasoning updates to parent via SubagentManager callbacks
                 if (this.callbacks?.onSubagentAssistantReasoningUpdated) {
-                    this.callbacks.onSubagentAssistantReasoningUpdated(subagentId, messageId, chunk, accumulated);
+                    this.callbacks.onSubagentAssistantReasoningUpdated({
+                        ...params,
+                        subagentId,
+                    });
                 }
             },
             onToolBlockUpdated: (params) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-agent-sdk",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "SDK for building AI-powered development tools and agents",
   "keywords": [
     "ai",

package/src/managers/messageManager.ts

@@ -43,17 +43,19 @@ export interface MessageManagerCallbacks {
   // MODIFIED: Remove arguments for separation of concerns
   onAssistantMessageAdded?: (messageId: string) => void;
   // NEW: Streaming content callback - FR-001: receives chunk and accumulated content
-  onAssistantContentUpdated?: (
-    messageId: string,
-    chunk: string,
-    accumulated: string,
-  ) => void;
+  onAssistantContentUpdated?: (params: {
+    messageId: string;
+    chunk: string;
+    accumulated: string;
+    stage: "streaming" | "end";
+  }) => void;
   // NEW: Streaming reasoning callback
-  onAssistantReasoningUpdated?: (
-    messageId: string,
-    chunk: string,
-    accumulated: string,
-  ) => void;
+  onAssistantReasoningUpdated?: (params: {
+    messageId: string;
+    chunk: string;
+    accumulated: string;
+    stage: "streaming" | "end";
+  }) => void;
   onToolBlockUpdated?: (params: ToolBlockUpdateCallbackParams) => void;
   onErrorBlockAdded?: (error: string) => void;
   onCompactBlockAdded?: (content: string) => void;
@@ -469,7 +471,7 @@ export class MessageManager {
 
   public updateToolBlock(params: AgentToolBlockUpdateParams): void {
     // Finalize any streaming text/reasoning blocks before adding/updating a tool block
-    this.finalizeCurrentStreamingBlocks();
+    this.finalizeStreamingBlocks();
     const { messages: newMessages, messageId: resolvedMessageId } =
       updateToolBlockInMessage({
         messages: this.messages,
@@ -497,7 +499,7 @@ export class MessageManager {
     params: Omit<AgentToolBlockUpdateParams, "id">,
   ): string {
     // Finalize any streaming text/reasoning blocks before adding a tool block
-    this.finalizeCurrentStreamingBlocks();
+    this.finalizeStreamingBlocks();
     const { messages: newMessages, toolBlockId } =
       addToolBlockToMessageInMessages(this.messages, messageId, params);
     this.setMessages(newMessages);
@@ -681,6 +683,49 @@ export class MessageManager {
     this.callbacks.onUsagesChange?.([...this._usages]);
   }
 
+  /**
+   * Finalize a streaming block of the given type by setting its stage to "end".
+   * Fires the corresponding incremental callback with chunk="" to signal finalization.
+   * Does NOT call onMessagesChange — the caller is responsible for that.
+   * Returns true if a block was finalized.
+   */
+  private finalizeStreamingBlock(
+    lastMessage: Message,
+    type: "text" | "reasoning",
+  ): boolean {
+    const index = lastMessage.blocks.findIndex(
+      (block) =>
+        block.type === type &&
+        (block as { stage?: string }).stage === "streaming",
+    );
+    if (index < 0) return false;
+
+    const block = lastMessage.blocks[index] as {
+      type: "text" | "reasoning";
+      content: string;
+      stage?: string;
+    };
+    lastMessage.blocks[index] = {
+      type: block.type,
+      content: block.content,
+      stage: "end" as const,
+    };
+
+    // Fire incremental callback to signal finalization
+    const callbackParams = {
+      messageId: lastMessage.id,
+      chunk: "",
+      accumulated: block.content,
+      stage: "end" as const,
+    };
+    if (type === "text") {
+      this.callbacks.onAssistantContentUpdated?.(callbackParams);
+    } else {
+      this.callbacks.onAssistantReasoningUpdated?.(callbackParams);
+    }
+    return true;
+  }
+
   /**
    * Update the current assistant message content during streaming
    * This method updates the last assistant message's content without creating a new message
@@ -693,23 +738,7 @@ export class MessageManager {
     if (lastMessage.role !== "assistant") return;
 
     // Finalize any streaming reasoning blocks before text content arrives
-    const reasoningIndex = lastMessage.blocks.findIndex(
-      (block) =>
-        block.type === "reasoning" &&
-        (block as { stage?: string }).stage === "streaming",
-    );
-    if (reasoningIndex >= 0) {
-      const reasoningBlock = lastMessage.blocks[reasoningIndex] as {
-        type: "reasoning";
-        content: string;
-        stage?: string;
-      };
-      lastMessage.blocks[reasoningIndex] = {
-        type: "reasoning" as const,
-        content: reasoningBlock.content,
-        stage: "end" as const,
-      };
-    }
+    this.finalizeStreamingBlock(lastMessage, "reasoning");
 
     // Get the current content to calculate the chunk
     const textBlockIndex = lastMessage.blocks.findIndex(
@@ -745,11 +774,12 @@ export class MessageManager {
     }
 
     // FR-001: Trigger callbacks with chunk and accumulated content
-    this.callbacks.onAssistantContentUpdated?.(
-      lastMessage.id,
+    this.callbacks.onAssistantContentUpdated?.({
+      messageId: lastMessage.id,
       chunk,
-      newAccumulatedContent,
-    );
+      accumulated: newAccumulatedContent,
+      stage: "streaming",
+    });
 
     // Note: Subagent-specific callbacks are now handled by SubagentManager
 
@@ -767,23 +797,7 @@ export class MessageManager {
     if (lastMessage.role !== "assistant") return;
 
     // Finalize any streaming text blocks before reasoning content arrives
-    const textIndex = lastMessage.blocks.findIndex(
-      (block) =>
-        block.type === "text" &&
-        (block as { stage?: string }).stage === "streaming",
-    );
-    if (textIndex >= 0) {
-      const textBlock = lastMessage.blocks[textIndex] as {
-        type: "text";
-        content: string;
-        stage?: string;
-      };
-      lastMessage.blocks[textIndex] = {
-        type: "text" as const,
-        content: textBlock.content,
-        stage: "end" as const,
-      };
-    }
+    this.finalizeStreamingBlock(lastMessage, "text");
 
     // Get the current reasoning content to calculate the chunk
     const reasoningBlockIndex = lastMessage.blocks.findIndex(
@@ -819,46 +833,33 @@ export class MessageManager {
     }
 
     // Trigger callbacks with chunk and accumulated reasoning content
-    this.callbacks.onAssistantReasoningUpdated?.(
-      lastMessage.id,
+    this.callbacks.onAssistantReasoningUpdated?.({
+      messageId: lastMessage.id,
       chunk,
-      newAccumulatedReasoning,
-    );
+      accumulated: newAccumulatedReasoning,
+      stage: "streaming",
+    });
 
     this.callbacks.onMessagesChange?.([...this.messages]); // Still need to notify of changes
   }
 
-  /**
-   * Public wrapper for finalizeCurrentStreamingBlocks.
-   * Finalizes text/reasoning blocks after streaming completes (e.g. final response with no tools).
-   */
-  public finalizeStreamingBlocks(): void {
-    this.finalizeCurrentStreamingBlocks();
-  }
-
   /**
    * Finalize streaming text/reasoning blocks by setting their stage to "end".
-   * Called when a new block (e.g. tool) is appended during streaming.
+   * Called when a new block (e.g. tool) is appended during streaming, or when streaming completes.
+   * Fires incremental callbacks for each finalized block.
    */
-  private finalizeCurrentStreamingBlocks(): void {
+  public finalizeStreamingBlocks(): void {
     if (this.messages.length === 0) return;
     const lastMessage = this.messages[this.messages.length - 1];
     if (lastMessage.role !== "assistant") return;
 
-    const newBlocks = lastMessage.blocks.map((block) => {
-      if (
-        (block.type === "text" || block.type === "reasoning") &&
-        block.stage === "streaming"
-      ) {
-        return { ...block, stage: "end" as const };
-      }
-      return block;
-    });
+    const textFinalized = this.finalizeStreamingBlock(lastMessage, "text");
+    const reasoningFinalized = this.finalizeStreamingBlock(
+      lastMessage,
+      "reasoning",
+    );
 
-    // Only update if something changed
-    const changed = newBlocks.some((b, i) => b !== lastMessage.blocks[i]);
-    if (changed) {
-      lastMessage.blocks = newBlocks;
+    if (textFinalized || reasoningFinalized) {
       this.callbacks.onMessagesChange?.([...this.messages]);
     }
   }

package/src/managers/subagentManager.ts

@@ -38,19 +38,21 @@ export interface SubagentManagerCallbacks {
     messageId: string,
   ) => void;
   /** Triggered during subagent content streaming updates */
-  onSubagentAssistantContentUpdated?: (
-    subagentId: string,
-    messageId: string,
-    chunk: string,
-    accumulated: string,
-  ) => void;
+  onSubagentAssistantContentUpdated?: (params: {
+    subagentId: string;
+    messageId: string;
+    chunk: string;
+    accumulated: string;
+    stage: "streaming" | "end";
+  }) => void;
   /** Triggered during subagent reasoning streaming updates */
-  onSubagentAssistantReasoningUpdated?: (
-    subagentId: string,
-    messageId: string,
-    chunk: string,
-    accumulated: string,
-  ) => void;
+  onSubagentAssistantReasoningUpdated?: (params: {
+    subagentId: string;
+    messageId: string;
+    chunk: string;
+    accumulated: string;
+    stage: "streaming" | "end";
+  }) => void;
   /** Triggered when subagent tool block is updated */
   onSubagentToolBlockUpdated?: (
     subagentId: string,
@@ -789,34 +791,32 @@ export class SubagentManager {
         }
       },
 
-      onAssistantContentUpdated: (
-        messageId: string,
-        chunk: string,
-        accumulated: string,
-      ) => {
+      onAssistantContentUpdated: (params: {
+        messageId: string;
+        chunk: string;
+        accumulated: string;
+        stage: "streaming" | "end";
+      }) => {
         // Forward assistant content updates to parent via SubagentManager callbacks
         if (this.callbacks?.onSubagentAssistantContentUpdated) {
-          this.callbacks.onSubagentAssistantContentUpdated(
+          this.callbacks.onSubagentAssistantContentUpdated({
+            ...params,
             subagentId,
-            messageId,
-            chunk,
-            accumulated,
-          );
+          });
         }
       },
-      onAssistantReasoningUpdated: (
-        messageId: string,
-        chunk: string,
-        accumulated: string,
-      ) => {
+      onAssistantReasoningUpdated: (params: {
+        messageId: string;
+        chunk: string;
+        accumulated: string;
+        stage: "streaming" | "end";
+      }) => {
         // Forward assistant reasoning updates to parent via SubagentManager callbacks
         if (this.callbacks?.onSubagentAssistantReasoningUpdated) {
-          this.callbacks.onSubagentAssistantReasoningUpdated(
+          this.callbacks.onSubagentAssistantReasoningUpdated({
+            ...params,
             subagentId,
-            messageId,
-            chunk,
-            accumulated,
-          );
+          });
         }
       },