@dexto/core 1.6.25 → 1.6.27

package/dist/mcp/manager.cjs

@@ -387,9 +387,10 @@ class MCPManager {
    * @param toolName Name of the MCP tool to execute (may include server prefix)
    * @param args Arguments to pass to the tool
    * @param sessionId Optional session ID
+   * @param runContext Optional execution-scoped context for this tool call
    * @returns Promise resolving to the tool execution result
    */
-  async executeTool(toolName, args, _sessionId) {
+  async executeTool(toolName, args, sessionId, runContext) {
     const client = this.getToolClient(toolName);
     if (!client) {
       this.logger.error(`\u274C No MCP tool found: ${toolName}`);
@@ -406,7 +407,11 @@ class MCPManager {
       `\u25B6\uFE0F  Executing MCP tool '${actualToolName}' on server '${serverName}'...`
     );
     try {
-      const result = await client.callTool(actualToolName, args);
+      const invocation = sessionId !== void 0 || runContext !== void 0 ? {
+        ...sessionId !== void 0 ? { sessionId } : {},
+        ...runContext !== void 0 ? { runContext } : {}
+      } : void 0;
+      const result = await client.callTool(actualToolName, args, invocation);
       return result;
     } catch (error) {
       this.logger.error(

package/dist/mcp/manager.d.ts

@@ -7,6 +7,7 @@ import { type AgentEventBus } from '../events/index.js';
 import type { PromptDefinition } from '../prompts/types.js';
 import type { JSONSchema7 } from 'json-schema';
 import type { ApprovalManager } from '../approval/manager.js';
+import type { AgentRunContext } from '../runtime/run-context.js';
 type ToolCacheEntry = {
     serverName: string;
     client: McpClient;
@@ -130,9 +131,10 @@ export declare class MCPManager {
      * @param toolName Name of the MCP tool to execute (may include server prefix)
      * @param args Arguments to pass to the tool
      * @param sessionId Optional session ID
+     * @param runContext Optional execution-scoped context for this tool call
      * @returns Promise resolving to the tool execution result
      */
-    executeTool(toolName: string, args: any, _sessionId?: string): Promise<any>;
+    executeTool(toolName: string, args: any, sessionId?: string, runContext?: AgentRunContext): Promise<any>;
     /**
      * Get all available prompt names from all connected clients, updating the cache.
      * @returns Promise resolving to an array of unique prompt names.

package/dist/mcp/manager.d.ts.map

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

package/dist/mcp/manager.js

@@ -365,9 +365,10 @@ class MCPManager {
    * @param toolName Name of the MCP tool to execute (may include server prefix)
    * @param args Arguments to pass to the tool
    * @param sessionId Optional session ID
+   * @param runContext Optional execution-scoped context for this tool call
    * @returns Promise resolving to the tool execution result
    */
-  async executeTool(toolName, args, _sessionId) {
+  async executeTool(toolName, args, sessionId, runContext) {
     const client = this.getToolClient(toolName);
     if (!client) {
       this.logger.error(`\u274C No MCP tool found: ${toolName}`);
@@ -384,7 +385,11 @@ class MCPManager {
       `\u25B6\uFE0F  Executing MCP tool '${actualToolName}' on server '${serverName}'...`
     );
     try {
-      const result = await client.callTool(actualToolName, args);
+      const invocation = sessionId !== void 0 || runContext !== void 0 ? {
+        ...sessionId !== void 0 ? { sessionId } : {},
+        ...runContext !== void 0 ? { runContext } : {}
+      } : void 0;
+      const result = await client.callTool(actualToolName, args, invocation);
       return result;
     } catch (error) {
       this.logger.error(

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.d.ts

@@ -54,9 +54,9 @@ export declare const SseServerConfigSchema: z.ZodObject<{
 }, "strict", z.ZodTypeAny, {
     timeout: number;
     type: "sse";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 }, {
     type: "sse";
@@ -78,9 +78,9 @@ export declare const HttpServerConfigSchema: z.ZodObject<{
 }, "strict", z.ZodTypeAny, {
     timeout: number;
     type: "http";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 }, {
     type: "http";
@@ -126,9 +126,9 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
 }, "strict", z.ZodTypeAny, {
     timeout: number;
     type: "sse";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 }, {
     type: "sse";
@@ -147,9 +147,9 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
 }, "strict", z.ZodTypeAny, {
     timeout: number;
     type: "http";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 }, {
     type: "http";
@@ -169,16 +169,16 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
 } | {
     timeout: number;
     type: "sse";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 } | {
     timeout: number;
     type: "http";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 }, {
     type: "stdio";
@@ -239,9 +239,9 @@ export declare const ServersConfigSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
 }, "strict", z.ZodTypeAny, {
     timeout: number;
     type: "sse";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 }, {
     type: "sse";
@@ -260,9 +260,9 @@ export declare const ServersConfigSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
 }, "strict", z.ZodTypeAny, {
     timeout: number;
     type: "http";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 }, {
     type: "http";
@@ -282,16 +282,16 @@ export declare const ServersConfigSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
 } | {
     timeout: number;
     type: "sse";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 } | {
     timeout: number;
     type: "http";
+    url: string;
     enabled: boolean;
     connectionMode: "strict" | "lenient";
-    url: string;
     headers: Record<string, string>;
 }, {
     type: "stdio";

package/dist/resources/handlers/filesystem-handler.cjs

@@ -305,11 +305,21 @@ class FileSystemResourceHandler {
       ".cache",
       ".vscode",
       ".idea",
-      ".changeset",
       ".github",
       ".husky",
+      ".agents",
+      ".claude",
+      ".cursor",
+      ".dexto",
+      ".conductor",
+      ".logs",
       "tmp",
-      "temp"
+      "temp",
+      "__pycache__",
+      ".pytest_cache",
+      "target",
+      "vendor",
+      "site"
     ];
     return ignoredDirectories.includes(basename);
   }
@@ -320,15 +330,24 @@ class FileSystemResourceHandler {
       if (!includeHidden) {
         const allowedDotfiles = [
           ".gitignore",
+          ".gitattributes",
           ".env",
           ".env.example",
+          ".env.local",
+          ".env.development",
+          ".env.production",
           ".npmignore",
           ".dockerignore",
-          ".editorconfig"
+          ".editorconfig",
+          ".prettierignore",
+          ".eslintignore",
+          ".nvmrc",
+          ".node-version"
         ];
         if (!allowedDotfiles.includes(basename)) return false;
       }
       if (basename === ".env" || basename.startsWith(".env.")) return true;
+      if (basename === ".nvmrc" || basename === ".node-version") return true;
     }
     if (!ext) {
       const commonNoExtFiles = [

package/dist/resources/handlers/filesystem-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filesystem-handler.d.ts","sourceRoot":"","sources":["../../../src/resources/handlers/filesystem-handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAEpF,qBAAa,yBAA0B,YAAW,uBAAuB;IACrE,OAAO,CAAC,MAAM,CAAoC;IAClD,OAAO,CAAC,cAAc,CAA4C;IAClE,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,MAAM,CAAS;gBAGnB,MAAM,EAAE,iCAAiC,EACzC,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,MAAM;IAO5B,OAAO,IAAI,MAAM;IAIX,UAAU,CAAC,SAAS,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB9D,aAAa,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAIlD,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI/B,OAAO,CAAC,aAAa;IAWrB;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAexB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA6D5D,OAAO,CAAC,YAAY;IA8Dd,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAIhB,kBAAkB;YA8BlB,QAAQ;IA4EtB,OAAO,CAAC,qBAAqB;IAsB7B,OAAO,CAAC,iBAAiB;IAwCzB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA0C7B,OAAO,CAAC,WAAW;CA4EtB"}
+{"version":3,"file":"filesystem-handler.d.ts","sourceRoot":"","sources":["../../../src/resources/handlers/filesystem-handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAEpF,qBAAa,yBAA0B,YAAW,uBAAuB;IACrE,OAAO,CAAC,MAAM,CAAoC;IAClD,OAAO,CAAC,cAAc,CAA4C;IAClE,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,MAAM,CAAS;gBAGnB,MAAM,EAAE,iCAAiC,EACzC,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,MAAM;IAO5B,OAAO,IAAI,MAAM;IAIX,UAAU,CAAC,SAAS,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB9D,aAAa,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAIlD,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI/B,OAAO,CAAC,aAAa;IAWrB;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAexB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA6D5D,OAAO,CAAC,YAAY;IA8Dd,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAIhB,kBAAkB;YA8BlB,QAAQ;IA4EtB,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,iBAAiB;IAiDzB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA0C7B,OAAO,CAAC,WAAW;CA4EtB"}