@voltagent/core 0.1.44 → 0.1.46

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { Span } from '@opentelemetry/api';
-import { Simplify, LiteralUnion } from 'type-fest';
+import { Simplify, LiteralUnion, MergeDeep } from 'type-fest';
 import { Context } from 'hono';
 import { SpanExporter } from '@opentelemetry/sdk-trace-base';
 import { ClientCapabilities } from '@modelcontextprotocol/sdk/types.js';
@@ -790,8 +790,8 @@ type InferStreamEventBase<TStreamPart extends StreamPart> = {
 type InferStreamEventData<TStreamPart extends StreamPart> = Simplify<Omit<TStreamPart, "type" | "subAgentId" | "subAgentName">>;
 
 interface StreamEventForwarderOptions {
-    forwarder?: (event: StreamEvent) => Promise<void>;
-    filterTypes?: LiteralUnion<StreamEventType, string>[];
+    forwarder: (event: StreamEvent) => Promise<void>;
+    types: Array<LiteralUnion<StreamEventType, string>> | ReadonlyArray<LiteralUnion<StreamEventType, string>>;
     addSubAgentPrefix?: boolean;
 }
 /**
@@ -799,13 +799,13 @@ interface StreamEventForwarderOptions {
  * @param event - The SubAgent event to forward
  * @param options - Configuration options for forwarding
  */
-declare function streamEventForwarder(event: StreamEvent, options?: StreamEventForwarderOptions): Promise<void>;
+declare function streamEventForwarder(event: StreamEvent, options: StreamEventForwarderOptions): Promise<void>;
 /**
  * Creates a configured streamEventForwarder function
  * @param options - Configuration options
  * @returns A configured forwarder function
  */
-declare function createStreamEventForwarder(options?: StreamEventForwarderOptions): (event: StreamEvent) => Promise<void>;
+declare function createStreamEventForwarder(options: StreamEventForwarderOptions): (event: StreamEvent) => Promise<void>;
 
 /**
  * Options object for dynamic value resolution
@@ -1051,15 +1051,15 @@ type AgentHandoffOptions = {
      * Parent history entry ID
      */
     parentHistoryEntryId?: string;
-    /**
-     * Optional user-defined context to be passed from the supervisor agent
-     */
-    userContext?: Map<string | symbol, unknown>;
     /**
      * Optional real-time event forwarder function
      * Used to forward SubAgent events to parent stream in real-time
      */
     forwardEvent?: (event: StreamEvent) => Promise<void>;
+    /**
+     * Parent's operation context to merge SubAgent steps into
+     */
+    parentOperationContext?: OperationContext;
 };
 /**
  * Result of a handoff to another agent
@@ -2873,12 +2873,17 @@ declare class SubAgentManager {
      */
     handoffToMultiple(options: Omit<AgentHandoffOptions, "targetAgent"> & {
         targetAgents: Agent<any>[];
-        userContext?: Map<string | symbol, unknown>;
     }): Promise<AgentHandoffResult[]>;
     /**
-     * Create a delegate tool for sub-agents
+     * Creates a tool that allows the supervisor agent to delegate a
+     * task to one or more specialized agents
      */
-    createDelegateTool(options?: Record<string, any>): BaseTool;
+    createDelegateTool(options: MergeDeep<{
+        sourceAgent: Agent<any>;
+        currentHistoryEntryId?: string;
+        operationContext?: OperationContext;
+        forwardEvent?: (event: StreamEvent) => Promise<void>;
+    }, Record<string, any>>): BaseTool;
     /**
      * Get sub-agent details for API exposure
      */

package/dist/index.js

@@ -3199,8 +3199,8 @@ __name(serializeValueForDebug, "serializeValueForDebug");
 
 // src/utils/streams/stream-event-forwarder.ts
 var import_dev5 = require("@voltagent/internal/dev");
-async function streamEventForwarder(event, options = {}) {
-  const { forwarder, filterTypes = ["text-delta", "reasoning", "source"] } = options;
+async function streamEventForwarder(event, options) {
+  const { forwarder, types } = options;
   try {
     if (!event || typeof event !== "object") {
       import_dev5.devLogger.warn("[StreamEventForwarder] Invalid event structure:", event);
@@ -3214,7 +3214,7 @@ async function streamEventForwarder(event, options = {}) {
       });
       return;
     }
-    if (filterTypes.includes(event.type)) {
+    if (!types.includes(event.type)) {
       import_dev5.devLogger.info(
         "[StreamEventForwarder] Filtered out",
         event.type,
@@ -3223,9 +3223,6 @@ async function streamEventForwarder(event, options = {}) {
       );
       return;
     }
-    if (!forwarder) {
-      return;
-    }
     await forwarder(formatEvent(event, options));
     import_dev5.devLogger.info(
       "[StreamEventForwarder] Forwarded",
@@ -3238,7 +3235,7 @@ async function streamEventForwarder(event, options = {}) {
   }
 }
 __name(streamEventForwarder, "streamEventForwarder");
-function createStreamEventForwarder(options = {}) {
+function createStreamEventForwarder(options) {
   return (event) => streamEventForwarder(event, options);
 }
 __name(createStreamEventForwarder, "createStreamEventForwarder");
@@ -6898,15 +6895,15 @@ ${agentsMemory || "No previous agent interactions available."}
   async handoffTask(options) {
     const {
       task,
-      targetAgent,
-      context = {},
       conversationId,
       userId,
-      sourceAgent,
       parentAgentId,
       parentHistoryEntryId,
-      userContext
+      parentOperationContext
     } = options;
+    const context = options.context;
+    const sourceAgent = options.sourceAgent;
+    const targetAgent = options.targetAgent;
     const handoffConversationId = conversationId || crypto.randomUUID();
     try {
       if (sourceAgent && targetAgent.hooks) {
@@ -6922,15 +6919,17 @@ ${task}
 Context: ${JSON.stringify(context, null, 2)}`;
       }
       const taskMessage = {
-        role: "system",
+        role: "user",
         content: taskContent
       };
       const streamResponse = await targetAgent.streamText([...sharedContext, taskMessage], {
         conversationId: handoffConversationId,
         userId,
+        // TODO: Fix the types here
+        // @ts-expect-error - bad types
         parentAgentId: sourceAgent?.id || parentAgentId,
         parentHistoryEntryId,
-        userContext
+        parentOperationContext
       });
       let finalText = "";
       if (streamResponse.fullStream) {
@@ -7021,8 +7020,8 @@ Context: ${JSON.stringify(context, null, 2)}`;
               const eventData = {
                 type: "error",
                 data: {
+                  // @ts-expect-error - fix bad type
                   error: part.error?.message || "Stream error occurred",
-                  // @ts-expect-error - code is not part of the StreamEventError type currently
                   code: "STREAM_ERROR"
                 },
                 timestamp,
@@ -7073,7 +7072,7 @@ Context: ${JSON.stringify(context, null, 2)}`;
       conversationId,
       parentAgentId,
       parentHistoryEntryId,
-      userContext,
+      parentOperationContext,
       ...restOptions
     } = options;
     const handoffConversationId = conversationId || crypto.randomUUID();
@@ -7086,7 +7085,7 @@ Context: ${JSON.stringify(context, null, 2)}`;
             conversationId: handoffConversationId,
             parentAgentId,
             parentHistoryEntryId,
-            userContext
+            parentOperationContext
           });
         } catch (error) {
           import_dev13.devLogger.error(`Error in handoffToMultiple for agent ${agent.name}:`, error);
@@ -7109,9 +7108,11 @@ Context: ${JSON.stringify(context, null, 2)}`;
     return results;
   }
   /**
-   * Create a delegate tool for sub-agents
+   * Creates a tool that allows the supervisor agent to delegate a
+   * task to one or more specialized agents
    */
-  createDelegateTool(options = {}) {
+  createDelegateTool(options) {
+    const { sourceAgent, forwardEvent, operationContext, currentHistoryEntryId, ...restOptions } = options;
     return createTool({
       id: "delegate_task",
       name: "delegate_task",
@@ -7143,11 +7144,6 @@ Context: ${JSON.stringify(context, null, 2)}`;
               `No valid target agents found. Available agents: ${this.subAgents.map((a) => a.name).join(", ")}`
             );
           }
-          const sourceAgent = options.sourceAgent;
-          const operationContext = options.operationContext;
-          const supervisorUserContext = operationContext?.userContext;
-          const currentHistoryEntryId = options.currentHistoryEntryId;
-          const forwardEvent = options.forwardEvent;
           const results = await this.handoffToMultiple({
             task,
             targetAgents: agents,
@@ -7155,12 +7151,13 @@ Context: ${JSON.stringify(context, null, 2)}`;
             sourceAgent,
             // Pass parent context for event propagation
             parentAgentId: sourceAgent?.id,
+            // Get current history entry ID for parent context
+            // This is passed from the Agent class via options when the tool is called
             parentHistoryEntryId: currentHistoryEntryId,
-            // Pass the supervisor's userContext to the handoff options
-            userContext: supervisorUserContext,
+            parentOperationContext: operationContext,
             // Pass the real-time event forwarder
             forwardEvent,
-            ...options
+            ...restOptions
           });
           const structuredResults = results.map((result, index) => {
             const status = result.status || "success";
@@ -7322,36 +7319,36 @@ var Agent = class {
   /**
    * Resolve dynamic instructions based on user context
    */
-  resolveInstructions = async (options) => {
+  async resolveInstructions(options) {
     if (!this.dynamicInstructions)
       return this.instructions;
     if (typeof this.dynamicInstructions === "function") {
       return await this.dynamicInstructions(options);
     }
     return this.dynamicInstructions;
-  };
+  }
   /**
    * Resolve dynamic model based on user context
    */
-  resolveModel = async (options) => {
+  async resolveModel(options) {
     if (!this.dynamicModel)
       return this.model;
     if (typeof this.dynamicModel === "function") {
       return await this.dynamicModel(options);
     }
     return this.dynamicModel;
-  };
+  }
   /**
    * Resolve dynamic tools based on user context
    */
-  resolveTools = async (options) => {
+  async resolveTools(options) {
     if (!this.dynamicTools)
       return [];
     if (typeof this.dynamicTools === "function") {
       return await this.dynamicTools(options);
     }
     return this.dynamicTools;
-  };
+  }
   /**
    * Get the system message for the agent
    */
@@ -7602,12 +7599,13 @@ ${context}`;
         import_dev14.devLogger.info(
           `[Agent ${this.id}] Received SubAgent event: ${event.type} from ${event.subAgentName}`
         );
-        await streamEventForwarder(event, {
-          forwarder: internalStreamForwarder,
-          filterTypes: [],
-          // Don't filter any events in this context
-          addSubAgentPrefix: true
-        });
+        if (internalStreamForwarder) {
+          await streamEventForwarder(event, {
+            forwarder: internalStreamForwarder,
+            types: ["tool-call", "tool-result"],
+            addSubAgentPrefix: true
+          });
+        }
       }, "forwardEvent");
       const delegateTool = this.subAgentManager.createDelegateTool({
         sourceAgent: this,
@@ -7663,13 +7661,14 @@ ${context}`;
     });
     const opContext = {
       operationId: historyEntry.id,
-      userContext: options.userContext ?? /* @__PURE__ */ new Map(),
+      userContext: (options.parentOperationContext?.userContext || options.userContext) ?? /* @__PURE__ */ new Map(),
       historyEntry,
       isActive: true,
       parentAgentId: options.parentAgentId,
       parentHistoryEntryId: options.parentHistoryEntryId,
       otelSpan,
-      conversationSteps: []
+      // Use parent's conversationSteps if available (for SubAgents), otherwise create new array
+      conversationSteps: options.parentOperationContext?.conversationSteps || []
     };
     return opContext;
   }
@@ -7733,7 +7732,7 @@ ${context}`;
   /**
    * Fix delete operator usage for better performance
    */
-  addToolEvent = (context, toolName, status, data = {}) => {
+  addToolEvent(context, toolName, status, data = {}) {
     if (!context.toolSpans) {
       context.toolSpans = /* @__PURE__ */ new Map();
     }
@@ -7753,11 +7752,11 @@ ${context}`;
         context.toolSpans.set(toolCallId, toolSpan);
       }
     }
-  };
+  }
   /**
    * Agent event creator (update)
    */
-  addAgentEvent = (context, eventName, status, data = {}) => {
+  addAgentEvent(context, eventName, status, data = {}) {
     const otelSpan = context.otelSpan;
     if (otelSpan) {
       endOperationSpan({
@@ -7770,7 +7769,7 @@ ${context}`;
         `OpenTelemetry span not found in OperationContext for agent event ${eventName} (Operation ID: ${context.operationId})`
       );
     }
-  };
+  }
   /**
    * Helper method to enrich and end an OpenTelemetry span associated with a tool call.
    */
@@ -7850,6 +7849,7 @@ ${context}`;
       conversationId: initialConversationId,
       parentAgentId,
       parentHistoryEntryId,
+      parentOperationContext,
       contextLimit = 10,
       userContext
     } = internalOptions;
@@ -7859,7 +7859,8 @@ ${context}`;
       operationName: "generateText",
       userContext,
       userId,
-      conversationId: initialConversationId
+      conversationId: initialConversationId,
+      parentOperationContext
     });
     const { messages: contextMessages, conversationId: finalConversationId } = await this.memoryManager.prepareConversationContext(
       operationContext,
@@ -8194,6 +8195,7 @@ ${context}`;
       conversationId: initialConversationId,
       parentAgentId,
       parentHistoryEntryId,
+      parentOperationContext,
       contextLimit = 10,
       userContext
     } = internalOptions;
@@ -8203,7 +8205,8 @@ ${context}`;
       operationName: "streamText",
       userContext,
       userId,
-      conversationId: initialConversationId
+      conversationId: initialConversationId,
+      parentOperationContext
     });
     const { messages: contextMessages, conversationId: finalConversationId } = await this.memoryManager.prepareConversationContext(
       operationContext,
@@ -8637,6 +8640,7 @@ ${context}`;
       conversationId: initialConversationId,
       parentAgentId,
       parentHistoryEntryId,
+      parentOperationContext,
       contextLimit = 10,
       userContext
     } = internalOptions;
@@ -8646,7 +8650,8 @@ ${context}`;
       operationName: "generateObject",
       userContext,
       userId,
-      conversationId: initialConversationId
+      conversationId: initialConversationId,
+      parentOperationContext
     });
     const { messages: contextMessages, conversationId: finalConversationId } = await this.memoryManager.prepareConversationContext(
       operationContext,
@@ -8866,6 +8871,7 @@ ${context}`;
       conversationId: initialConversationId,
       parentAgentId,
       parentHistoryEntryId,
+      parentOperationContext,
       provider,
       contextLimit = 10,
       userContext
@@ -8876,7 +8882,8 @@ ${context}`;
       operationName: "streamObject",
       userContext,
       userId,
-      conversationId: initialConversationId
+      conversationId: initialConversationId,
+      parentOperationContext
     });
     const { messages: contextMessages, conversationId: finalConversationId } = await this.memoryManager.prepareConversationContext(
       operationContext,