@voltagent/server-core 2.1.0 → 2.1.1

package/dist/index.js

@@ -2955,6 +2955,7 @@ async function handleListTools(deps, logger) {
 __name(handleListTools, "handleListTools");
 async function handleExecuteTool(toolName, body, deps, logger) {
   const { input, context } = body || {};
+  const contextMap = context instanceof Map ? context : context && typeof context === "object" ? new Map(Object.entries(context)) : /* @__PURE__ */ new Map();
   const lookup = findTool(deps, toolName);
   if (!lookup) {
     return {
@@ -2986,14 +2987,12 @@ async function handleExecuteTool(toolName, body, deps, logger) {
   const executionStart = Date.now();
   const abortController = new AbortController();
   try {
-    const userId = context?.userId ?? body?.userId;
-    const conversationId = context?.conversationId ?? body?.conversationId;
+    const userId = (context instanceof Map ? context.get("userId") : context?.userId) ?? body?.userId;
+    const conversationId = (context instanceof Map ? context.get("conversationId") : context?.conversationId) ?? body?.conversationId;
     const result = await tool.execute(parsedInput, {
       userId,
       conversationId,
-      context: new Map(
-        context && typeof context === "object" ? Object.entries(context) : []
-      ),
+      context: contextMap,
       systemContext: /* @__PURE__ */ new Map(),
       abortController,
       toolContext: {