@voltagent/core 1.1.2 → 1.1.3

package/dist/index.js

@@ -9094,8 +9094,8 @@ var Agent = class {
           // Preserve prototype chain
           result,
           // Copy all enumerable properties
-          { context: new Map(oc.context) }
-          // Add context
+          { context: oc.context }
+          // Expose the same context instance
         );
         return returnValue;
       } catch (error) {
@@ -9305,7 +9305,7 @@ var Agent = class {
           pipeTextStreamToResponse: result.pipeTextStreamToResponse.bind(result),
           toTextStreamResponse: result.toTextStreamResponse.bind(result),
           // Add our custom context
-          context: new Map(oc.context)
+          context: oc.context
         };
         return resultWithContext;
       } catch (error) {
@@ -9440,7 +9440,7 @@ var Agent = class {
         );
         return {
           ...result,
-          context: new Map(oc.context)
+          context: oc.context
         };
       } catch (error) {
         return this.handleError(error, oc, options, startTime);
@@ -9610,7 +9610,7 @@ var Agent = class {
           pipeTextStreamToResponse: /* @__PURE__ */ __name((response, init) => result.pipeTextStreamToResponse(response, init), "pipeTextStreamToResponse"),
           toTextStreamResponse: /* @__PURE__ */ __name((init) => result.toTextStreamResponse(init), "toTextStreamResponse"),
           // Add our custom context
-          context: new Map(oc.context)
+          context: oc.context
         };
         return resultWithContext;
       } catch (error) {
@@ -9648,11 +9648,32 @@ var Agent = class {
     const operationId = crypto5.randomUUID();
     const startTimeDate = /* @__PURE__ */ new Date();
     const runtimeContext = toContextMap(options?.context);
-    const context5 = new Map([
-      ...this.context?.entries() || [],
-      ...runtimeContext?.entries() || [],
-      ...options?.parentOperationContext?.context?.entries() || []
-    ]);
+    const parentContext = options?.parentOperationContext?.context;
+    let context5;
+    if (parentContext) {
+      context5 = parentContext;
+      if (runtimeContext) {
+        for (const [k, v] of runtimeContext.entries()) {
+          if (!context5.has(k)) context5.set(k, v);
+        }
+      }
+      if (this.context) {
+        for (const [k, v] of this.context.entries()) {
+          if (!context5.has(k)) context5.set(k, v);
+        }
+      }
+    } else if (runtimeContext) {
+      context5 = runtimeContext;
+      if (this.context) {
+        for (const [k, v] of this.context.entries()) {
+          if (!context5.has(k)) context5.set(k, v);
+        }
+      }
+    } else if (this.context) {
+      context5 = this.context;
+    } else {
+      context5 = /* @__PURE__ */ new Map();
+    }
     const logger = this.getContextualLogger(options?.parentAgentId).child({
       operationId,
       userId: options?.userId,