@dexto/core 1.6.26 → 1.7.0

package/dist/mcp/mcp-client.cjs

@@ -22,6 +22,7 @@ __export(mcp_client_exports, {
 });
 module.exports = __toCommonJS(mcp_client_exports);
 var import_client = require("@modelcontextprotocol/sdk/client/index.js");
+var import_async_hooks = require("async_hooks");
 var import_stdio = require("@modelcontextprotocol/sdk/client/stdio.js");
 var import_sse = require("@modelcontextprotocol/sdk/client/sse.js");
 var import_streamableHttp = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
@@ -49,6 +50,7 @@ function buildClientCapabilities() {
   };
 }
 class DextoMcpClient extends import_events.EventEmitter {
+  toolInvocationContext = new import_async_hooks.AsyncLocalStorage();
   client = null;
   transport = null;
   isConnected = false;
@@ -322,71 +324,75 @@ class DextoMcpClient extends import_events.EventEmitter {
    * @param args Tool arguments
    * @returns Result of the tool execution
    */
-  async callTool(name, args) {
+  async callTool(name, args, invocation) {
     this.ensureConnected();
-    const shouldTrace = (0, import_utils.hasActiveTelemetry)();
-    const tracer = shouldTrace ? import_api.trace.getTracer("dexto") : null;
-    const span = tracer?.startSpan(`mcp.tool.${name}`, {
-      kind: import_api.SpanKind.CLIENT
-    });
-    try {
-      if (span) {
-        const ctx = import_api.trace.setSpan(import_api.context.active(), span);
-        (0, import_utils.addBaggageAttributesToSpan)(span, ctx, this.logger);
-        span.setAttribute("tool.name", name);
-        span.setAttribute("tool.server", this.serverAlias || "unknown");
-        span.setAttribute("tool.timeout", this.timeout);
-        span.setAttribute("tool.arguments", (0, import_safe_stringify.safeStringify)(args, 4096));
-      }
-      this.logger.debug(`Calling tool '${name}' with args: ${JSON.stringify(args, null, 2)}`);
-      let toolArgs = args;
-      if (typeof args === "string") {
-        try {
-          toolArgs = JSON.parse(args);
-        } catch {
-          toolArgs = { input: args };
+    return await this.toolInvocationContext.run(invocation, async () => {
+      const shouldTrace = (0, import_utils.hasActiveTelemetry)();
+      const tracer = shouldTrace ? import_api.trace.getTracer("dexto") : null;
+      const span = tracer?.startSpan(`mcp.tool.${name}`, {
+        kind: import_api.SpanKind.CLIENT
+      });
+      try {
+        if (span) {
+          const ctx = import_api.trace.setSpan(import_api.context.active(), span);
+          (0, import_utils.addBaggageAttributesToSpan)(span, ctx, this.logger);
+          span.setAttribute("tool.name", name);
+          span.setAttribute("tool.server", this.serverAlias || "unknown");
+          span.setAttribute("tool.timeout", this.timeout);
+          span.setAttribute("tool.arguments", (0, import_safe_stringify.safeStringify)(args, 4096));
         }
-      }
-      this.logger.debug(`Using timeout: ${this.timeout}`);
-      const result = await this.client.callTool(
-        { name, arguments: toolArgs },
-        void 0,
-        // resultSchema (optional)
-        { timeout: this.timeout }
-        // Use server-specific timeout, default 1 minute
-      );
-      const logResult = JSON.stringify(
-        result,
-        (key, value) => {
-          if (key === "data" && typeof value === "string" && value.length > 100) {
-            return `[Base64 data: ${value.length} chars]`;
+        this.logger.debug(
+          `Calling tool '${name}' with args: ${JSON.stringify(args, null, 2)}`
+        );
+        let toolArgs = args;
+        if (typeof args === "string") {
+          try {
+            toolArgs = JSON.parse(args);
+          } catch {
+            toolArgs = { input: args };
           }
-          return value;
-        },
-        2
-      );
-      this.logger.debug(`Tool '${name}' result: ${logResult}`);
-      if (span) {
-        span.setAttribute("tool.result", (0, import_safe_stringify.safeStringify)(result, 4096));
-        span.setStatus({ code: import_api.SpanStatusCode.OK });
-      }
-      if (result === null || result === void 0) {
-        return "Tool executed successfully with no result data.";
-      }
-      return result;
-    } catch (error) {
-      this.logger.error(`Tool call '${name}' failed: ${JSON.stringify(error, null, 2)}`);
-      if (span) {
-        span.recordException(error);
-        span.setStatus({
-          code: import_api.SpanStatusCode.ERROR,
-          message: error instanceof Error ? error.message : String(error)
-        });
+        }
+        this.logger.debug(`Using timeout: ${this.timeout}`);
+        const result = await this.client.callTool(
+          { name, arguments: toolArgs },
+          void 0,
+          // resultSchema (optional)
+          { timeout: this.timeout }
+          // Use server-specific timeout, default 1 minute
+        );
+        const logResult = JSON.stringify(
+          result,
+          (key, value) => {
+            if (key === "data" && typeof value === "string" && value.length > 100) {
+              return `[Base64 data: ${value.length} chars]`;
+            }
+            return value;
+          },
+          2
+        );
+        this.logger.debug(`Tool '${name}' result: ${logResult}`);
+        if (span) {
+          span.setAttribute("tool.result", (0, import_safe_stringify.safeStringify)(result, 4096));
+          span.setStatus({ code: import_api.SpanStatusCode.OK });
+        }
+        if (result === null || result === void 0) {
+          return "Tool executed successfully with no result data.";
+        }
+        return result;
+      } catch (error) {
+        this.logger.error(`Tool call '${name}' failed: ${JSON.stringify(error, null, 2)}`);
+        if (span) {
+          span.recordException(error);
+          span.setStatus({
+            code: import_api.SpanStatusCode.ERROR,
+            message: error instanceof Error ? error.message : String(error)
+          });
+        }
+        return `Error executing tool '${name}': ${error instanceof Error ? error.message : String(error)}`;
+      } finally {
+        span?.end();
       }
-      return `Error executing tool '${name}': ${error instanceof Error ? error.message : String(error)}`;
-    } finally {
-      span?.end();
-    }
+    });
   }
   /**
    * Get the list of tools provided by this client
@@ -657,10 +663,13 @@ class DextoMcpClient extends import_events.EventEmitter {
           );
           return { action: "decline" };
         }
+        const invocation = this.toolInvocationContext.getStore();
         const response = await this.approvalManager.requestElicitation({
           schema: params.requestedSchema,
           prompt: params.message,
-          serverName: this.serverAlias || "unknown"
+          serverName: this.serverAlias || "unknown",
+          ...invocation?.sessionId !== void 0 ? { sessionId: invocation.sessionId } : {},
+          ...invocation?.runContext?.hostRuntime !== void 0 ? { hostRuntime: invocation.runContext.hostRuntime } : {}
         });
         if (response.status === import_types2.ApprovalStatus.APPROVED && response.data) {
           const formData = response.data && typeof response.data === "object" && "formData" in response.data ? response.data.formData : {};

package/dist/mcp/mcp-client.d.ts

@@ -3,13 +3,14 @@ import { EventEmitter } from 'events';
 import type { Logger } from '../logger/v2/types.js';
 import type { ApprovalManager } from '../approval/manager.js';
 import type { ValidatedMcpServerConfig } from './schemas.js';
-import type { ToolSet } from '../tools/types.js';
+import type { ToolExecutionContextBase, ToolSet } from '../tools/types.js';
 import type { McpClient, MCPResourceSummary, McpAuthProviderFactory } from './types.js';
 import type { GetPromptResult, ReadResourceResult, Prompt } from '@modelcontextprotocol/sdk/types.js';
 /**
  * Wrapper on top of Client class provided in model context protocol SDK, to add additional metadata about the server
  */
 export declare class DextoMcpClient extends EventEmitter implements McpClient {
+    private readonly toolInvocationContext;
     private client;
     private transport;
     private isConnected;
@@ -52,7 +53,7 @@ export declare class DextoMcpClient extends EventEmitter implements McpClient {
      * @param args Tool arguments
      * @returns Result of the tool execution
      */
-    callTool(name: string, args: any): Promise<any>;
+    callTool(name: string, args: any, invocation?: Pick<ToolExecutionContextBase, 'sessionId' | 'runContext'>): Promise<any>;
     /**
      * Get the list of tools provided by this client
      * @returns Array of available tools

package/dist/mcp/mcp-client.d.ts.map

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

package/dist/mcp/mcp-client.js

@@ -1,5 +1,6 @@
 import "../chunk-PTJYTZNU.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { AsyncLocalStorage } from "async_hooks";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
@@ -31,6 +32,7 @@ function buildClientCapabilities() {
   };
 }
 class DextoMcpClient extends EventEmitter {
+  toolInvocationContext = new AsyncLocalStorage();
   client = null;
   transport = null;
   isConnected = false;
@@ -304,71 +306,75 @@ class DextoMcpClient extends EventEmitter {
    * @param args Tool arguments
    * @returns Result of the tool execution
    */
-  async callTool(name, args) {
+  async callTool(name, args, invocation) {
     this.ensureConnected();
-    const shouldTrace = hasActiveTelemetry();
-    const tracer = shouldTrace ? trace.getTracer("dexto") : null;
-    const span = tracer?.startSpan(`mcp.tool.${name}`, {
-      kind: SpanKind.CLIENT
-    });
-    try {
-      if (span) {
-        const ctx = trace.setSpan(context.active(), span);
-        addBaggageAttributesToSpan(span, ctx, this.logger);
-        span.setAttribute("tool.name", name);
-        span.setAttribute("tool.server", this.serverAlias || "unknown");
-        span.setAttribute("tool.timeout", this.timeout);
-        span.setAttribute("tool.arguments", safeStringify(args, 4096));
-      }
-      this.logger.debug(`Calling tool '${name}' with args: ${JSON.stringify(args, null, 2)}`);
-      let toolArgs = args;
-      if (typeof args === "string") {
-        try {
-          toolArgs = JSON.parse(args);
-        } catch {
-          toolArgs = { input: args };
+    return await this.toolInvocationContext.run(invocation, async () => {
+      const shouldTrace = hasActiveTelemetry();
+      const tracer = shouldTrace ? trace.getTracer("dexto") : null;
+      const span = tracer?.startSpan(`mcp.tool.${name}`, {
+        kind: SpanKind.CLIENT
+      });
+      try {
+        if (span) {
+          const ctx = trace.setSpan(context.active(), span);
+          addBaggageAttributesToSpan(span, ctx, this.logger);
+          span.setAttribute("tool.name", name);
+          span.setAttribute("tool.server", this.serverAlias || "unknown");
+          span.setAttribute("tool.timeout", this.timeout);
+          span.setAttribute("tool.arguments", safeStringify(args, 4096));
         }
-      }
-      this.logger.debug(`Using timeout: ${this.timeout}`);
-      const result = await this.client.callTool(
-        { name, arguments: toolArgs },
-        void 0,
-        // resultSchema (optional)
-        { timeout: this.timeout }
-        // Use server-specific timeout, default 1 minute
-      );
-      const logResult = JSON.stringify(
-        result,
-        (key, value) => {
-          if (key === "data" && typeof value === "string" && value.length > 100) {
-            return `[Base64 data: ${value.length} chars]`;
+        this.logger.debug(
+          `Calling tool '${name}' with args: ${JSON.stringify(args, null, 2)}`
+        );
+        let toolArgs = args;
+        if (typeof args === "string") {
+          try {
+            toolArgs = JSON.parse(args);
+          } catch {
+            toolArgs = { input: args };
           }
-          return value;
-        },
-        2
-      );
-      this.logger.debug(`Tool '${name}' result: ${logResult}`);
-      if (span) {
-        span.setAttribute("tool.result", safeStringify(result, 4096));
-        span.setStatus({ code: SpanStatusCode.OK });
-      }
-      if (result === null || result === void 0) {
-        return "Tool executed successfully with no result data.";
-      }
-      return result;
-    } catch (error) {
-      this.logger.error(`Tool call '${name}' failed: ${JSON.stringify(error, null, 2)}`);
-      if (span) {
-        span.recordException(error);
-        span.setStatus({
-          code: SpanStatusCode.ERROR,
-          message: error instanceof Error ? error.message : String(error)
-        });
+        }
+        this.logger.debug(`Using timeout: ${this.timeout}`);
+        const result = await this.client.callTool(
+          { name, arguments: toolArgs },
+          void 0,
+          // resultSchema (optional)
+          { timeout: this.timeout }
+          // Use server-specific timeout, default 1 minute
+        );
+        const logResult = JSON.stringify(
+          result,
+          (key, value) => {
+            if (key === "data" && typeof value === "string" && value.length > 100) {
+              return `[Base64 data: ${value.length} chars]`;
+            }
+            return value;
+          },
+          2
+        );
+        this.logger.debug(`Tool '${name}' result: ${logResult}`);
+        if (span) {
+          span.setAttribute("tool.result", safeStringify(result, 4096));
+          span.setStatus({ code: SpanStatusCode.OK });
+        }
+        if (result === null || result === void 0) {
+          return "Tool executed successfully with no result data.";
+        }
+        return result;
+      } catch (error) {
+        this.logger.error(`Tool call '${name}' failed: ${JSON.stringify(error, null, 2)}`);
+        if (span) {
+          span.recordException(error);
+          span.setStatus({
+            code: SpanStatusCode.ERROR,
+            message: error instanceof Error ? error.message : String(error)
+          });
+        }
+        return `Error executing tool '${name}': ${error instanceof Error ? error.message : String(error)}`;
+      } finally {
+        span?.end();
       }
-      return `Error executing tool '${name}': ${error instanceof Error ? error.message : String(error)}`;
-    } finally {
-      span?.end();
-    }
+    });
   }
   /**
    * Get the list of tools provided by this client
@@ -639,10 +645,13 @@ class DextoMcpClient extends EventEmitter {
           );
           return { action: "decline" };
         }
+        const invocation = this.toolInvocationContext.getStore();
         const response = await this.approvalManager.requestElicitation({
           schema: params.requestedSchema,
           prompt: params.message,
-          serverName: this.serverAlias || "unknown"
+          serverName: this.serverAlias || "unknown",
+          ...invocation?.sessionId !== void 0 ? { sessionId: invocation.sessionId } : {},
+          ...invocation?.runContext?.hostRuntime !== void 0 ? { hostRuntime: invocation.runContext.hostRuntime } : {}
         });
         if (response.status === ApprovalStatus.APPROVED && response.data) {
           const formData = response.data && typeof response.data === "object" && "formData" in response.data ? response.data.formData : {};

package/dist/mcp/schemas.cjs

@@ -60,7 +60,7 @@ const StdioServerConfigSchema = import_zod.z.object({
     }
   }),
   args: import_zod.z.array((0, import_result.EnvExpandedString)()).default([]).describe("Array of arguments for the command (e.g., ['script.js'])"),
-  env: import_zod.z.record((0, import_result.EnvExpandedString)()).default({}).describe("Optional environment variables for the server process"),
+  env: import_zod.z.record(import_zod.z.string(), (0, import_result.EnvExpandedString)()).default({}).describe("Optional environment variables for the server process"),
   timeout: import_zod.z.coerce.number().int().positive().default(3e4),
   connectionMode: import_zod.z.enum(MCP_CONNECTION_MODES).default(DEFAULT_MCP_CONNECTION_MODE)
 }).strict();
@@ -68,7 +68,7 @@ const SseServerConfigSchema = import_zod.z.object({
   type: import_zod.z.literal("sse"),
   enabled: import_zod.z.boolean().default(true).describe("Whether this server is enabled (disabled servers are not connected)"),
   url: (0, import_result.RequiredEnvURL)(process.env).describe("URL for the SSE server endpoint"),
-  headers: import_zod.z.record((0, import_result.EnvExpandedString)()).default({}),
+  headers: import_zod.z.record(import_zod.z.string(), (0, import_result.EnvExpandedString)()).default({}),
   timeout: import_zod.z.coerce.number().int().positive().default(3e4),
   connectionMode: import_zod.z.enum(MCP_CONNECTION_MODES).default(DEFAULT_MCP_CONNECTION_MODE)
 }).strict();
@@ -76,7 +76,7 @@ const HttpServerConfigSchema = import_zod.z.object({
   type: import_zod.z.literal("http"),
   enabled: import_zod.z.boolean().default(true).describe("Whether this server is enabled (disabled servers are not connected)"),
   url: (0, import_result.RequiredEnvURL)(process.env).describe("URL for the HTTP server"),
-  headers: import_zod.z.record((0, import_result.EnvExpandedString)()).default({}),
+  headers: import_zod.z.record(import_zod.z.string(), (0, import_result.EnvExpandedString)()).default({}),
   timeout: import_zod.z.coerce.number().int().positive().default(3e4),
   connectionMode: import_zod.z.enum(MCP_CONNECTION_MODES).default(DEFAULT_MCP_CONNECTION_MODE)
 }).strict();
@@ -86,7 +86,7 @@ const McpServerConfigSchema = import_zod.z.discriminatedUnion("type", [
   HttpServerConfigSchema
 ]).superRefine((_data, _ctx) => {
 }).brand();
-const ServersConfigSchema = import_zod.z.record(McpServerConfigSchema).describe("A dictionary of server configurations, keyed by server name").brand();
+const ServersConfigSchema = import_zod.z.record(import_zod.z.string(), McpServerConfigSchema).describe("A dictionary of server configurations, keyed by server name").brand();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_MCP_CONNECTION_MODE,