@dexto/core 1.2.4 → 1.2.6

package/dist/telemetry/decorators.cjs

@@ -23,7 +23,6 @@ __export(decorators_exports, {
 });
 module.exports = __toCommonJS(decorators_exports);
 var import_api = require("@opentelemetry/api");
-var import_logger = require("../logger/index.js");
 var import_utils = require("./utils.js");
 var import_safe_stringify = require("../utils/safe-stringify.js");
 function withSpan(options) {
@@ -32,7 +31,8 @@ function withSpan(options) {
     const originalMethod = descriptor.value;
     const methodName = String(propertyKey);
     descriptor.value = function(...args) {
-      if (options?.skipIfNoTelemetry && (!globalThis.__TELEMETRY__ || !(0, import_utils.hasActiveTelemetry)())) {
+      const logger = this?.logger;
+      if (options?.skipIfNoTelemetry && (!globalThis.__TELEMETRY__ || !(0, import_utils.hasActiveTelemetry)(logger))) {
         return originalMethod.apply(this, args);
       }
       const tracer = import_api.trace.getTracer(options?.tracerName ?? "dexto");
@@ -53,21 +53,30 @@ function withSpan(options) {
       args.forEach((arg, index) => {
         span.setAttribute(`${spanName}.argument.${index}`, (0, import_safe_stringify.safeStringify)(arg, 8192));
       });
-      const { requestId, componentName, runId, threadId, resourceId } = (0, import_utils.getBaggageValues)(ctx);
+      const { requestId, componentName, runId, threadId, resourceId, sessionId } = (0, import_utils.getBaggageValues)(ctx);
+      if (sessionId) {
+        span.setAttribute("sessionId", sessionId);
+        span.setAttribute("baggage.sessionId", sessionId);
+      }
       if (requestId) {
         span.setAttribute("http.request_id", requestId);
+        span.setAttribute("baggage.http.request_id", requestId);
       }
       if (threadId) {
         span.setAttribute("threadId", threadId);
+        span.setAttribute("baggage.threadId", threadId);
       }
       if (resourceId) {
         span.setAttribute("resourceId", resourceId);
+        span.setAttribute("baggage.resourceId", resourceId);
+      }
+      if (runId !== void 0) {
+        span.setAttribute("runId", String(runId));
+        span.setAttribute("baggage.runId", String(runId));
       }
       if (componentName) {
         span.setAttribute("componentName", componentName);
-        if (runId !== void 0) {
-          span.setAttribute("runId", String(runId));
-        }
+        span.setAttribute("baggage.componentName", componentName);
       } else if (this && typeof this === "object") {
         const contextObj = this;
         const inferredName = contextObj.name ?? contextObj.constructor?.name;
@@ -76,22 +85,50 @@ function withSpan(options) {
         }
         if (contextObj.runId) {
           span.setAttribute("runId", contextObj.runId);
+          span.setAttribute("baggage.runId", contextObj.runId);
         }
+        const existingBaggage = import_api.propagation.getBaggage(ctx);
         const baggageEntries = {};
-        if (inferredName !== void 0) {
-          baggageEntries.componentName = { value: String(inferredName) };
+        if (existingBaggage) {
+          existingBaggage.getAllEntries().forEach(([key, entry]) => {
+            baggageEntries[key] = entry;
+          });
         }
-        if (contextObj.runId !== void 0) {
-          baggageEntries.runId = { value: String(contextObj.runId) };
+        if (sessionId !== void 0) {
+          baggageEntries.sessionId = {
+            ...baggageEntries.sessionId,
+            value: String(sessionId)
+          };
         }
         if (requestId !== void 0) {
-          baggageEntries["http.request_id"] = { value: String(requestId) };
+          baggageEntries["http.request_id"] = {
+            ...baggageEntries["http.request_id"],
+            value: String(requestId)
+          };
         }
         if (threadId !== void 0) {
-          baggageEntries.threadId = { value: String(threadId) };
+          baggageEntries.threadId = {
+            ...baggageEntries.threadId,
+            value: String(threadId)
+          };
         }
         if (resourceId !== void 0) {
-          baggageEntries.resourceId = { value: String(resourceId) };
+          baggageEntries.resourceId = {
+            ...baggageEntries.resourceId,
+            value: String(resourceId)
+          };
+        }
+        if (inferredName !== void 0) {
+          baggageEntries.componentName = {
+            ...baggageEntries.componentName,
+            value: String(inferredName)
+          };
+        }
+        if (contextObj.runId !== void 0) {
+          baggageEntries.runId = {
+            ...baggageEntries.runId,
+            value: String(contextObj.runId)
+          };
         }
         if (Object.keys(baggageEntries).length > 0) {
           ctx = import_api.propagation.setBaggage(ctx, import_api.propagation.createBaggage(baggageEntries));
@@ -121,8 +158,10 @@ function withSpan(options) {
         span.setAttribute(`${spanName}.result`, (0, import_safe_stringify.safeStringify)(result, 8192));
         return result;
       } catch (error) {
-        import_logger.logger.error(
-          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`
+        const logger2 = this?.logger;
+        logger2?.error(
+          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`,
+          { error }
         );
         span.setStatus({
           code: import_api.SpanStatusCode.ERROR,

package/dist/telemetry/decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/telemetry/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EAGX,MAAM,oBAAoB,CAAC;AAM5B,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,GAAG,CA6JN;AAGD,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,IACoB,CAAC,SAAS;IAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,QAAQ,CAAC,OA4BrE"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/telemetry/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EAIX,MAAM,oBAAoB,CAAC;AAM5B,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,GAAG,CAqNN;AAGD,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,IACoB,CAAC,SAAS;IAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,QAAQ,CAAC,OA4BrE"}

package/dist/telemetry/decorators.js

@@ -6,7 +6,6 @@ import {
   SpanKind,
   propagation
 } from "@opentelemetry/api";
-import { logger } from "../logger/index.js";
 import { hasActiveTelemetry, getBaggageValues } from "./utils.js";
 import { safeStringify } from "../utils/safe-stringify.js";
 function withSpan(options) {
@@ -15,7 +14,8 @@ function withSpan(options) {
     const originalMethod = descriptor.value;
     const methodName = String(propertyKey);
     descriptor.value = function(...args) {
-      if (options?.skipIfNoTelemetry && (!globalThis.__TELEMETRY__ || !hasActiveTelemetry())) {
+      const logger = this?.logger;
+      if (options?.skipIfNoTelemetry && (!globalThis.__TELEMETRY__ || !hasActiveTelemetry(logger))) {
         return originalMethod.apply(this, args);
       }
       const tracer = trace.getTracer(options?.tracerName ?? "dexto");
@@ -36,21 +36,30 @@ function withSpan(options) {
       args.forEach((arg, index) => {
         span.setAttribute(`${spanName}.argument.${index}`, safeStringify(arg, 8192));
       });
-      const { requestId, componentName, runId, threadId, resourceId } = getBaggageValues(ctx);
+      const { requestId, componentName, runId, threadId, resourceId, sessionId } = getBaggageValues(ctx);
+      if (sessionId) {
+        span.setAttribute("sessionId", sessionId);
+        span.setAttribute("baggage.sessionId", sessionId);
+      }
       if (requestId) {
         span.setAttribute("http.request_id", requestId);
+        span.setAttribute("baggage.http.request_id", requestId);
       }
       if (threadId) {
         span.setAttribute("threadId", threadId);
+        span.setAttribute("baggage.threadId", threadId);
       }
       if (resourceId) {
         span.setAttribute("resourceId", resourceId);
+        span.setAttribute("baggage.resourceId", resourceId);
+      }
+      if (runId !== void 0) {
+        span.setAttribute("runId", String(runId));
+        span.setAttribute("baggage.runId", String(runId));
       }
       if (componentName) {
         span.setAttribute("componentName", componentName);
-        if (runId !== void 0) {
-          span.setAttribute("runId", String(runId));
-        }
+        span.setAttribute("baggage.componentName", componentName);
       } else if (this && typeof this === "object") {
         const contextObj = this;
         const inferredName = contextObj.name ?? contextObj.constructor?.name;
@@ -59,22 +68,50 @@ function withSpan(options) {
         }
         if (contextObj.runId) {
           span.setAttribute("runId", contextObj.runId);
+          span.setAttribute("baggage.runId", contextObj.runId);
         }
+        const existingBaggage = propagation.getBaggage(ctx);
         const baggageEntries = {};
-        if (inferredName !== void 0) {
-          baggageEntries.componentName = { value: String(inferredName) };
+        if (existingBaggage) {
+          existingBaggage.getAllEntries().forEach(([key, entry]) => {
+            baggageEntries[key] = entry;
+          });
         }
-        if (contextObj.runId !== void 0) {
-          baggageEntries.runId = { value: String(contextObj.runId) };
+        if (sessionId !== void 0) {
+          baggageEntries.sessionId = {
+            ...baggageEntries.sessionId,
+            value: String(sessionId)
+          };
         }
         if (requestId !== void 0) {
-          baggageEntries["http.request_id"] = { value: String(requestId) };
+          baggageEntries["http.request_id"] = {
+            ...baggageEntries["http.request_id"],
+            value: String(requestId)
+          };
         }
         if (threadId !== void 0) {
-          baggageEntries.threadId = { value: String(threadId) };
+          baggageEntries.threadId = {
+            ...baggageEntries.threadId,
+            value: String(threadId)
+          };
         }
         if (resourceId !== void 0) {
-          baggageEntries.resourceId = { value: String(resourceId) };
+          baggageEntries.resourceId = {
+            ...baggageEntries.resourceId,
+            value: String(resourceId)
+          };
+        }
+        if (inferredName !== void 0) {
+          baggageEntries.componentName = {
+            ...baggageEntries.componentName,
+            value: String(inferredName)
+          };
+        }
+        if (contextObj.runId !== void 0) {
+          baggageEntries.runId = {
+            ...baggageEntries.runId,
+            value: String(contextObj.runId)
+          };
         }
         if (Object.keys(baggageEntries).length > 0) {
           ctx = propagation.setBaggage(ctx, propagation.createBaggage(baggageEntries));
@@ -104,8 +141,10 @@ function withSpan(options) {
         span.setAttribute(`${spanName}.result`, safeStringify(result, 8192));
         return result;
       } catch (error) {
-        logger.error(
-          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`
+        const logger2 = this?.logger;
+        logger2?.error(
+          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`,
+          { error }
         );
         span.setStatus({
           code: SpanStatusCode.ERROR,

package/dist/telemetry/utils.cjs

@@ -25,43 +25,47 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_api = require("@opentelemetry/api");
 var import_telemetry = require("./telemetry.js");
-var import_logger = require("../logger/index.js");
-function hasActiveTelemetry() {
-  import_logger.logger.silly("hasActiveTelemetry called.");
+function hasActiveTelemetry(logger) {
+  logger?.silly("hasActiveTelemetry called.");
   try {
     const telemetryInstance = import_telemetry.Telemetry.get();
     const isActive = telemetryInstance.isInitialized();
-    import_logger.logger.silly(`hasActiveTelemetry: Telemetry is initialized: ${isActive}`);
+    logger?.silly(`hasActiveTelemetry: Telemetry is initialized: ${isActive}`);
     return isActive;
   } catch (error) {
-    import_logger.logger.silly(
+    logger?.silly(
       `hasActiveTelemetry: Telemetry not active or initialized. Error: ${error instanceof Error ? error.message : String(error)}`
     );
     return false;
   }
 }
-function getBaggageValues(ctx) {
-  import_logger.logger.silly("getBaggageValues called.");
+function getBaggageValues(ctx, logger) {
+  logger?.silly("getBaggageValues called.");
   const currentBaggage = import_api.propagation.getBaggage(ctx);
   const requestId = currentBaggage?.getEntry("http.request_id")?.value;
   const componentName = currentBaggage?.getEntry("componentName")?.value;
   const runId = currentBaggage?.getEntry("runId")?.value;
   const threadId = currentBaggage?.getEntry("threadId")?.value;
   const resourceId = currentBaggage?.getEntry("resourceId")?.value;
-  import_logger.logger.silly(
-    `getBaggageValues: Extracted - requestId: ${requestId}, componentName: ${componentName}, runId: ${runId}, threadId: ${threadId}, resourceId: ${resourceId}`
+  const sessionId = currentBaggage?.getEntry("sessionId")?.value;
+  logger?.silly(
+    `getBaggageValues: Extracted - requestId: ${requestId}, componentName: ${componentName}, runId: ${runId}, threadId: ${threadId}, resourceId: ${resourceId}, sessionId: ${sessionId}`
   );
   return {
     requestId,
     componentName,
     runId,
     threadId,
-    resourceId
+    resourceId,
+    sessionId
   };
 }
-function addBaggageAttributesToSpan(span, ctx) {
-  import_logger.logger.debug("addBaggageAttributesToSpan called.");
-  const { requestId, componentName, runId, threadId, resourceId } = getBaggageValues(ctx);
+function addBaggageAttributesToSpan(span, ctx, logger) {
+  logger?.debug("addBaggageAttributesToSpan called.");
+  const { requestId, componentName, runId, threadId, resourceId, sessionId } = getBaggageValues(
+    ctx,
+    logger
+  );
   if (componentName) {
     span.setAttribute("componentName", componentName);
   }
@@ -77,7 +81,10 @@ function addBaggageAttributesToSpan(span, ctx) {
   if (resourceId) {
     span.setAttribute("resourceId", resourceId);
   }
-  import_logger.logger.debug("addBaggageAttributesToSpan: Baggage attributes added to span.");
+  if (sessionId) {
+    span.setAttribute("sessionId", sessionId);
+  }
+  logger?.debug("addBaggageAttributesToSpan: Baggage attributes added to span.");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/telemetry/utils.d.ts

@@ -1,21 +1,25 @@
 import type { Context, Span } from '@opentelemetry/api';
-export declare function hasActiveTelemetry(): boolean;
+import type { IDextoLogger } from '../logger/v2/types.js';
+export declare function hasActiveTelemetry(logger?: IDextoLogger): boolean;
 /**
  * Get baggage values from context
  * @param ctx The context to get baggage values from
+ * @param logger Optional logger instance
  * @returns
  */
-export declare function getBaggageValues(ctx: Context): {
+export declare function getBaggageValues(ctx: Context, logger?: IDextoLogger): {
     requestId: string | undefined;
     componentName: string | undefined;
     runId: string | undefined;
     threadId: string | undefined;
     resourceId: string | undefined;
+    sessionId: string | undefined;
 };
 /**
  * Attaches baggage values from the given context to the provided span as attributes.
  * @param span The OpenTelemetry Span to add attributes to.
  * @param ctx The OpenTelemetry Context from which to extract baggage values.
+ * @param logger Optional logger instance
  */
-export declare function addBaggageAttributesToSpan(span: Span, ctx: Context): void;
+export declare function addBaggageAttributesToSpan(span: Span, ctx: Context, logger?: IDextoLogger): void;
 //# sourceMappingURL=utils.d.ts.map

package/dist/telemetry/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/telemetry/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAKxD,wBAAgB,kBAAkB,IAAI,OAAO,CAa5C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO;;;;;;EAkB5C;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CAoBzE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/telemetry/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAG1D,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAajE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,YAAY;;;;;;;EAoBnE;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,IAAI,CA0BhG"}

package/dist/telemetry/utils.js

@@ -1,43 +1,47 @@
 import "../chunk-C6A6W6XS.js";
 import { propagation } from "@opentelemetry/api";
 import { Telemetry } from "./telemetry.js";
-import { logger } from "../logger/index.js";
-function hasActiveTelemetry() {
-  logger.silly("hasActiveTelemetry called.");
+function hasActiveTelemetry(logger) {
+  logger?.silly("hasActiveTelemetry called.");
   try {
     const telemetryInstance = Telemetry.get();
     const isActive = telemetryInstance.isInitialized();
-    logger.silly(`hasActiveTelemetry: Telemetry is initialized: ${isActive}`);
+    logger?.silly(`hasActiveTelemetry: Telemetry is initialized: ${isActive}`);
     return isActive;
   } catch (error) {
-    logger.silly(
+    logger?.silly(
       `hasActiveTelemetry: Telemetry not active or initialized. Error: ${error instanceof Error ? error.message : String(error)}`
     );
     return false;
   }
 }
-function getBaggageValues(ctx) {
-  logger.silly("getBaggageValues called.");
+function getBaggageValues(ctx, logger) {
+  logger?.silly("getBaggageValues called.");
   const currentBaggage = propagation.getBaggage(ctx);
   const requestId = currentBaggage?.getEntry("http.request_id")?.value;
   const componentName = currentBaggage?.getEntry("componentName")?.value;
   const runId = currentBaggage?.getEntry("runId")?.value;
   const threadId = currentBaggage?.getEntry("threadId")?.value;
   const resourceId = currentBaggage?.getEntry("resourceId")?.value;
-  logger.silly(
-    `getBaggageValues: Extracted - requestId: ${requestId}, componentName: ${componentName}, runId: ${runId}, threadId: ${threadId}, resourceId: ${resourceId}`
+  const sessionId = currentBaggage?.getEntry("sessionId")?.value;
+  logger?.silly(
+    `getBaggageValues: Extracted - requestId: ${requestId}, componentName: ${componentName}, runId: ${runId}, threadId: ${threadId}, resourceId: ${resourceId}, sessionId: ${sessionId}`
   );
   return {
     requestId,
     componentName,
     runId,
     threadId,
-    resourceId
+    resourceId,
+    sessionId
   };
 }
-function addBaggageAttributesToSpan(span, ctx) {
-  logger.debug("addBaggageAttributesToSpan called.");
-  const { requestId, componentName, runId, threadId, resourceId } = getBaggageValues(ctx);
+function addBaggageAttributesToSpan(span, ctx, logger) {
+  logger?.debug("addBaggageAttributesToSpan called.");
+  const { requestId, componentName, runId, threadId, resourceId, sessionId } = getBaggageValues(
+    ctx,
+    logger
+  );
   if (componentName) {
     span.setAttribute("componentName", componentName);
   }
@@ -53,7 +57,10 @@ function addBaggageAttributesToSpan(span, ctx) {
   if (resourceId) {
     span.setAttribute("resourceId", resourceId);
   }
-  logger.debug("addBaggageAttributesToSpan: Baggage attributes added to span.");
+  if (sessionId) {
+    span.setAttribute("sessionId", sessionId);
+  }
+  logger?.debug("addBaggageAttributesToSpan: Baggage attributes added to span.");
 }
 export {
   addBaggageAttributesToSpan,

package/dist/tools/confirmation/allowed-tools-provider/factory.cjs

@@ -24,12 +24,12 @@ module.exports = __toCommonJS(factory_exports);
 var import_in_memory = require("./in-memory.js");
 var import_storage = require("./storage.js");
 var import_errors = require("../../errors.js");
-function createAllowedToolsProvider(config) {
+function createAllowedToolsProvider(config, logger) {
   switch (config.type) {
     case "memory":
       return new import_in_memory.InMemoryAllowedToolsProvider();
     case "storage":
-      return new import_storage.StorageAllowedToolsProvider(config.storageManager);
+      return new import_storage.StorageAllowedToolsProvider(config.storageManager, logger);
     default: {
       const _exhaustive = config;
       throw import_errors.ToolError.configInvalid(

package/dist/tools/confirmation/allowed-tools-provider/factory.d.ts

@@ -1,5 +1,6 @@
 import type { IAllowedToolsProvider } from './types.js';
 import type { StorageManager } from '../../../storage/index.js';
+import type { IDextoLogger } from '../../../logger/v2/types.js';
 export type AllowedToolsConfig = {
     type: 'memory';
 } | {
@@ -9,5 +10,5 @@ export type AllowedToolsConfig = {
 /**
  * Create an AllowedToolsProvider based on configuration.
  */
-export declare function createAllowedToolsProvider(config: AllowedToolsConfig): IAllowedToolsProvider;
+export declare function createAllowedToolsProvider(config: AllowedToolsConfig, logger: IDextoLogger): IAllowedToolsProvider;
 //# sourceMappingURL=factory.d.ts.map

package/dist/tools/confirmation/allowed-tools-provider/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/tools/confirmation/allowed-tools-provider/factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAW7D,MAAM,MAAM,kBAAkB,GACxB;IACI,IAAI,EAAE,QAAQ,CAAC;CAClB,GACD;IACI,IAAI,EAAE,SAAS,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;CAClC,CAAC;AAER;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,GAAG,qBAAqB,CAc5F"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/tools/confirmation/allowed-tools-provider/factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAU7D,MAAM,MAAM,kBAAkB,GACxB;IACI,IAAI,EAAE,QAAQ,CAAC;CAClB,GACD;IACI,IAAI,EAAE,SAAS,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;CAClC,CAAC;AAER;;GAEG;AACH,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,YAAY,GACrB,qBAAqB,CAcvB"}

package/dist/tools/confirmation/allowed-tools-provider/factory.js

@@ -2,12 +2,12 @@ import "../../../chunk-C6A6W6XS.js";
 import { InMemoryAllowedToolsProvider } from "./in-memory.js";
 import { StorageAllowedToolsProvider } from "./storage.js";
 import { ToolError } from "../../errors.js";
-function createAllowedToolsProvider(config) {
+function createAllowedToolsProvider(config, logger) {
   switch (config.type) {
     case "memory":
       return new InMemoryAllowedToolsProvider();
     case "storage":
-      return new StorageAllowedToolsProvider(config.storageManager);
+      return new StorageAllowedToolsProvider(config.storageManager, logger);
     default: {
       const _exhaustive = config;
       throw ToolError.configInvalid(

package/dist/tools/confirmation/allowed-tools-provider/storage.cjs

@@ -21,26 +21,27 @@ __export(storage_exports, {
   StorageAllowedToolsProvider: () => StorageAllowedToolsProvider
 });
 module.exports = __toCommonJS(storage_exports);
-var import_logger = require("../../../logger/index.cjs");
 class StorageAllowedToolsProvider {
-  constructor(storageManager) {
+  constructor(storageManager, logger) {
     this.storageManager = storageManager;
+    this.logger = logger;
   }
+  logger;
   buildKey(sessionId) {
     return sessionId ? `allowedTools:${sessionId}` : "allowedTools:global";
   }
   async allowTool(toolName, sessionId) {
     const key = this.buildKey(sessionId);
-    import_logger.logger.debug(`Adding allowed tool '${toolName}' for key '${key}'`);
+    this.logger.debug(`Adding allowed tool '${toolName}' for key '${key}'`);
     const existingRaw = await this.storageManager.getDatabase().get(key);
     const newSet = new Set(Array.isArray(existingRaw) ? existingRaw : []);
     newSet.add(toolName);
     await this.storageManager.getDatabase().set(key, Array.from(newSet));
-    import_logger.logger.debug(`Added allowed tool '${toolName}' for key '${key}'`);
+    this.logger.debug(`Added allowed tool '${toolName}' for key '${key}'`);
   }
   async disallowTool(toolName, sessionId) {
     const key = this.buildKey(sessionId);
-    import_logger.logger.debug(`Removing allowed tool '${toolName}' for key '${key}'`);
+    this.logger.debug(`Removing allowed tool '${toolName}' for key '${key}'`);
     const existingRaw = await this.storageManager.getDatabase().get(key);
     if (!Array.isArray(existingRaw)) return;
     const newSet = new Set(existingRaw);
@@ -52,7 +53,7 @@ class StorageAllowedToolsProvider {
     if (Array.isArray(sessionArr) && sessionArr.includes(toolName)) return true;
     const globalArr = await this.storageManager.getDatabase().get(this.buildKey(void 0));
     const allowed = Array.isArray(globalArr) ? globalArr.includes(toolName) : false;
-    import_logger.logger.debug(
+    this.logger.debug(
       `Checked allowed tool '${toolName}' in session '${sessionId ?? "global"}' \u2013 allowed=${allowed}`
     );
     return allowed;

package/dist/tools/confirmation/allowed-tools-provider/storage.d.ts

@@ -1,5 +1,6 @@
 import type { StorageManager } from '../../../storage/index.js';
 import type { IAllowedToolsProvider } from './types.js';
+import type { IDextoLogger } from '../../../logger/v2/types.js';
 /**
  * Storage-backed implementation that persists allowed tools in the Dexto
  * storage manager. The key scheme is:
@@ -10,7 +11,8 @@ import type { IAllowedToolsProvider } from './types.js';
  */
 export declare class StorageAllowedToolsProvider implements IAllowedToolsProvider {
     private storageManager;
-    constructor(storageManager: StorageManager);
+    private logger;
+    constructor(storageManager: StorageManager, logger: IDextoLogger);
     private buildKey;
     allowTool(toolName: string, sessionId?: string): Promise<void>;
     disallowTool(toolName: string, sessionId?: string): Promise<void>;

package/dist/tools/confirmation/allowed-tools-provider/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../src/tools/confirmation/allowed-tools-provider/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGxD;;;;;;;GAOG;AACH,qBAAa,2BAA4B,YAAW,qBAAqB;IACzD,OAAO,CAAC,cAAc;gBAAd,cAAc,EAAE,cAAc;IAElD,OAAO,CAAC,QAAQ;IAIV,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc9D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBrE,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CAIlE"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../src/tools/confirmation/allowed-tools-provider/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;;;;GAOG;AACH,qBAAa,2BAA4B,YAAW,qBAAqB;IAIjE,OAAO,CAAC,cAAc;IAH1B,OAAO,CAAC,MAAM,CAAe;gBAGjB,cAAc,EAAE,cAAc,EACtC,MAAM,EAAE,YAAY;IAKxB,OAAO,CAAC,QAAQ;IAIV,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc9D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBrE,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CAIlE"}

package/dist/tools/confirmation/allowed-tools-provider/storage.js

@@ -1,24 +1,25 @@
 import "../../../chunk-C6A6W6XS.js";
-import { logger } from "../../../logger/index.js";
 class StorageAllowedToolsProvider {
-  constructor(storageManager) {
+  constructor(storageManager, logger) {
     this.storageManager = storageManager;
+    this.logger = logger;
   }
+  logger;
   buildKey(sessionId) {
     return sessionId ? `allowedTools:${sessionId}` : "allowedTools:global";
   }
   async allowTool(toolName, sessionId) {
     const key = this.buildKey(sessionId);
-    logger.debug(`Adding allowed tool '${toolName}' for key '${key}'`);
+    this.logger.debug(`Adding allowed tool '${toolName}' for key '${key}'`);
     const existingRaw = await this.storageManager.getDatabase().get(key);
     const newSet = new Set(Array.isArray(existingRaw) ? existingRaw : []);
     newSet.add(toolName);
     await this.storageManager.getDatabase().set(key, Array.from(newSet));
-    logger.debug(`Added allowed tool '${toolName}' for key '${key}'`);
+    this.logger.debug(`Added allowed tool '${toolName}' for key '${key}'`);
   }
   async disallowTool(toolName, sessionId) {
     const key = this.buildKey(sessionId);
-    logger.debug(`Removing allowed tool '${toolName}' for key '${key}'`);
+    this.logger.debug(`Removing allowed tool '${toolName}' for key '${key}'`);
     const existingRaw = await this.storageManager.getDatabase().get(key);
     if (!Array.isArray(existingRaw)) return;
     const newSet = new Set(existingRaw);
@@ -30,7 +31,7 @@ class StorageAllowedToolsProvider {
     if (Array.isArray(sessionArr) && sessionArr.includes(toolName)) return true;
     const globalArr = await this.storageManager.getDatabase().get(this.buildKey(void 0));
     const allowed = Array.isArray(globalArr) ? globalArr.includes(toolName) : false;
-    logger.debug(
+    this.logger.debug(
       `Checked allowed tool '${toolName}' in session '${sessionId ?? "global"}' \u2013 allowed=${allowed}`
     );
     return allowed;

package/dist/tools/errors.cjs

@@ -65,11 +65,12 @@ class ToolError {
    * Tool execution timeout
    */
   static executionTimeout(toolName, timeoutMs, sessionId) {
+    const message = timeoutMs > 0 ? `Tool '${toolName}' execution timed out after ${timeoutMs}ms` : `Tool '${toolName}' execution timed out`;
     return new import_DextoRuntimeError.DextoRuntimeError(
       import_error_codes.ToolErrorCode.EXECUTION_TIMEOUT,
       import_types.ErrorScope.TOOLS,
       import_types.ErrorType.TIMEOUT,
-      `Tool '${toolName}' execution timed out after ${timeoutMs}ms`,
+      message,
       { toolName, timeoutMs, sessionId }
     );
   }

package/dist/tools/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/tools/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAItE;;;GAGG;AACH,qBAAa,SAAS;IAClB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;;;IAUhC;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAU3E;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAU3D;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAU/E;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAUxD;;OAEG;IACH,MAAM,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM;;;IAUlD;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAUlF;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAUnD;;OAEG;IACH,MAAM,CAAC,2BAA2B,CAAC,QAAQ,EAAE,MAAM;;;IAUnD;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;IAUpC;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;CAShE"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/tools/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAItE;;;GAGG;AACH,qBAAa,SAAS;IAClB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;;;IAUhC;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAU3E;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAU3D;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAc/E;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;IAUxD;;OAEG;IACH,MAAM,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM;;;IAUlD;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;IAUlF;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAUnD;;OAEG;IACH,MAAM,CAAC,2BAA2B,CAAC,QAAQ,EAAE,MAAM;;;IAUnD;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;IAUpC;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;CAShE"}

package/dist/tools/errors.js

@@ -43,11 +43,12 @@ class ToolError {
    * Tool execution timeout
    */
   static executionTimeout(toolName, timeoutMs, sessionId) {
+    const message = timeoutMs > 0 ? `Tool '${toolName}' execution timed out after ${timeoutMs}ms` : `Tool '${toolName}' execution timed out`;
     return new DextoRuntimeError(
       ToolErrorCode.EXECUTION_TIMEOUT,
       ErrorScope.TOOLS,
       ErrorType.TIMEOUT,
-      `Tool '${toolName}' execution timed out after ${timeoutMs}ms`,
+      message,
       { toolName, timeoutMs, sessionId }
     );
   }

package/dist/tools/internal-tools/constants.cjs

@@ -31,7 +31,8 @@ const INTERNAL_TOOL_NAMES = [
   "edit_file",
   "bash_exec",
   "bash_output",
-  "kill_process"
+  "kill_process",
+  "delegate_to_url"
 ];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {