@voltagent/core 2.2.0 → 2.2.1

package/dist/index.d.mts

@@ -6929,6 +6929,7 @@ interface TraceContextOptions {
     conversationId?: string;
     operationId: string;
     parentSpan?: Span;
+    inheritParentSpan?: boolean;
     parentAgentId?: string;
     input?: string | UIMessage[] | BaseMessage[];
 }
@@ -7458,6 +7459,11 @@ type AgentOptions = {
      */
     stopWhen?: StopWhen;
     markdown?: boolean;
+    /**
+     * When true, use the active VoltAgent span as the parent if parentSpan is not provided.
+     * Defaults to true.
+     */
+    inheritParentSpan?: boolean;
     voice?: Voice;
     logger?: Logger;
     voltOpsClient?: VoltOpsClient;
@@ -8317,6 +8323,7 @@ interface BaseGenerationOptions extends Partial<CallSettings> {
     parentAgentId?: string;
     parentOperationContext?: OperationContext;
     parentSpan?: Span;
+    inheritParentSpan?: boolean;
     contextLimit?: number;
     semanticMemory?: {
         enabled?: boolean;
@@ -8385,6 +8392,7 @@ declare class Agent {
     readonly maxRetries: number;
     readonly stopWhen?: StopWhen;
     readonly markdown: boolean;
+    readonly inheritParentSpan: boolean;
     readonly voice?: Voice;
     readonly retriever?: BaseRetriever;
     readonly supervisorConfig?: SupervisorConfig;

package/dist/index.d.ts

@@ -6929,6 +6929,7 @@ interface TraceContextOptions {
     conversationId?: string;
     operationId: string;
     parentSpan?: Span;
+    inheritParentSpan?: boolean;
     parentAgentId?: string;
     input?: string | UIMessage[] | BaseMessage[];
 }
@@ -7458,6 +7459,11 @@ type AgentOptions = {
      */
     stopWhen?: StopWhen;
     markdown?: boolean;
+    /**
+     * When true, use the active VoltAgent span as the parent if parentSpan is not provided.
+     * Defaults to true.
+     */
+    inheritParentSpan?: boolean;
     voice?: Voice;
     logger?: Logger;
     voltOpsClient?: VoltOpsClient;
@@ -8317,6 +8323,7 @@ interface BaseGenerationOptions extends Partial<CallSettings> {
     parentAgentId?: string;
     parentOperationContext?: OperationContext;
     parentSpan?: Span;
+    inheritParentSpan?: boolean;
     contextLimit?: number;
     semanticMemory?: {
         enabled?: boolean;
@@ -8385,6 +8392,7 @@ declare class Agent {
     readonly maxRetries: number;
     readonly stopWhen?: StopWhen;
     readonly markdown: boolean;
+    readonly inheritParentSpan: boolean;
     readonly voice?: Voice;
     readonly retriever?: BaseRetriever;
     readonly supervisorConfig?: SupervisorConfig;

package/dist/index.js

@@ -18415,6 +18415,13 @@ var popActiveSpan2 = /* @__PURE__ */ __name((span) => {
   spanBridge2.___voltagent_pop_span?.(span);
 }, "popActiveSpan");
 var isPromiseLike3 = /* @__PURE__ */ __name((value) => typeof value === "object" && value !== null && typeof value.then === "function", "isPromiseLike");
+var getSpanAttributes = /* @__PURE__ */ __name((span) => span?.attributes ?? {}, "getSpanAttributes");
+var isWorkflowSpan = /* @__PURE__ */ __name((attributes) => attributes["entity.type"] === "workflow" || attributes["span.type"] === "workflow-step", "isWorkflowSpan");
+var isAgentSpan = /* @__PURE__ */ __name((attributes) => attributes["entity.type"] === "agent", "isAgentSpan");
+var getAgentInfo = /* @__PURE__ */ __name((attributes) => ({
+  id: attributes["entity.id"] ?? attributes["eval.source.agent_id"],
+  name: attributes["entity.name"]
+}), "getAgentInfo");
 var AgentTraceContext = class {
   static {
     __name(this, "AgentTraceContext");
@@ -18425,11 +18432,13 @@ var AgentTraceContext = class {
   activeContext;
   constructor(observability, operationName, options) {
     this.tracer = observability.getTracer();
-    const resolvedParent = this.resolveParentSpan(options.parentSpan);
+    const resolvedParent = this.resolveParentSpan(options.parentSpan, options.inheritParentSpan);
     const parentSpan = resolvedParent?.span ?? options.parentSpan;
-    const parentAgentId = options.parentAgentId ?? resolvedParent?.agentInfo?.id;
-    const parentAgentName = resolvedParent?.agentInfo?.name;
-    const isSubagent = !!parentSpan;
+    const isWorkflowParent = resolvedParent?.parentType === "workflow";
+    const explicitParentAgentId = options.parentAgentId ?? resolvedParent?.agentInfo?.id;
+    const isSubagent = !!parentSpan && !isWorkflowParent && !!explicitParentAgentId;
+    const parentAgentId = isSubagent ? explicitParentAgentId : void 0;
+    const parentAgentName = isSubagent ? resolvedParent?.agentInfo?.name : void 0;
     const commonAttributes = {
       ...options.userId && { "user.id": options.userId },
       ...options.conversationId && { "conversation.id": options.conversationId },
@@ -18467,7 +18476,7 @@ var AgentTraceContext = class {
       const inputStr = typeof options.input === "string" ? options.input : (0, import_internal8.safeStringify)(options.input);
       spanAttributes.input = inputStr;
     }
-    const spanName = parentSpan ? `subagent:${options.agentName || operationName}` : operationName;
+    const spanName = isSubagent ? `subagent:${options.agentName || operationName}` : operationName;
     this.rootSpan = this.tracer.startSpan(
       spanName,
       {
@@ -18476,8 +18485,8 @@ var AgentTraceContext = class {
           ...spanAttributes,
           "agent.state": "running",
           // Track initial agent state
-          // Mark as subagent if we have a parent span
-          ...parentSpan && {
+          // Mark as subagent only when an explicit agent parent is present
+          ...isSubagent && {
             "agent.is_subagent": true,
             "voltagent.is_subagent": true
           }
@@ -18696,25 +18705,46 @@ var AgentTraceContext = class {
     }
     span.end();
   }
-  resolveParentSpan(explicitParent) {
+  resolveParentSpan(explicitParent, inheritParentSpan) {
     if (explicitParent) {
-      return { span: explicitParent };
+      const attributes2 = getSpanAttributes(explicitParent);
+      return {
+        span: explicitParent,
+        parentType: isWorkflowSpan(attributes2) ? "workflow" : isAgentSpan(attributes2) ? "agent" : "unknown",
+        agentInfo: isAgentSpan(attributes2) ? getAgentInfo(attributes2) : void 0
+      };
     }
     const activeSpan = import_api12.trace.getSpan(import_api12.context.active());
     if (!activeSpan) {
       return void 0;
     }
-    const attributes = activeSpan.attributes ?? {};
+    const attributes = getSpanAttributes(activeSpan);
     const spanType = attributes["span.type"];
     const scorerId = attributes["eval.scorer.id"];
-    if (spanType !== "scorer" && scorerId === void 0) {
+    if (spanType === "scorer" || scorerId !== void 0) {
+      return {
+        span: activeSpan,
+        parentType: "agent",
+        agentInfo: getAgentInfo(attributes)
+      };
+    }
+    if (!inheritParentSpan) {
       return void 0;
     }
-    const agentInfo = {
-      id: attributes["entity.id"] ?? attributes["eval.source.agent_id"],
-      name: attributes["entity.name"]
-    };
-    return { span: activeSpan, agentInfo };
+    if (isWorkflowSpan(attributes)) {
+      return {
+        span: activeSpan,
+        parentType: "workflow"
+      };
+    }
+    if (isAgentSpan(attributes)) {
+      return {
+        span: activeSpan,
+        parentType: "agent",
+        agentInfo: getAgentInfo(attributes)
+      };
+    }
+    return void 0;
   }
   /**
    * Get the active context for manual context propagation
@@ -21949,6 +21979,7 @@ var Agent = class {
   maxRetries;
   stopWhen;
   markdown;
+  inheritParentSpan;
   voice;
   retriever;
   supervisorConfig;
@@ -21992,6 +22023,7 @@ var Agent = class {
     this.maxRetries = options.maxRetries ?? DEFAULT_LLM_MAX_RETRIES;
     this.stopWhen = options.stopWhen;
     this.markdown = options.markdown ?? false;
+    this.inheritParentSpan = options.inheritParentSpan ?? true;
     this.voice = options.voice;
     this.retriever = options.retriever;
     this.supervisorConfig = options.supervisorConfig;
@@ -23903,6 +23935,7 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
       conversationId: options?.conversationId,
       operationId,
       parentSpan: options?.parentSpan,
+      inheritParentSpan: options?.inheritParentSpan ?? this.inheritParentSpan,
       parentAgentId: options?.parentAgentId,
       input
     });