@dexto/core 1.2.4 → 1.2.6

package/dist/tools/tool-manager.d.ts

@@ -2,6 +2,7 @@ import { MCPManager } from '../mcp/manager.js';
 import { InternalToolsServices } from './internal-tools/registry.js';
 import type { InternalToolsConfig, ToolPolicies } from './schemas.js';
 import { ToolSet } from './types.js';
+import type { IDextoLogger } from '../logger/v2/types.js';
 import type { AgentEventBus } from '../events/index.js';
 import type { ApprovalManager } from '../approval/manager.js';
 import type { IAllowedToolsProvider } from './confirmation/allowed-tools-provider/types.js';
@@ -56,7 +57,8 @@ export declare class ToolManager {
     private static readonly INTERNAL_TOOL_PREFIX;
     private toolsCache;
     private cacheValid;
-    constructor(mcpManager: MCPManager, approvalManager: ApprovalManager, allowedToolsProvider: IAllowedToolsProvider, approvalMode: 'event-based' | 'auto-approve' | 'auto-deny', agentEventBus: AgentEventBus, toolPolicies?: ToolPolicies, options?: InternalToolsOptions);
+    private logger;
+    constructor(mcpManager: MCPManager, approvalManager: ApprovalManager, allowedToolsProvider: IAllowedToolsProvider, approvalMode: 'manual' | 'auto-approve' | 'auto-deny', agentEventBus: AgentEventBus, toolPolicies: ToolPolicies, options: InternalToolsOptions, logger: IDextoLogger);
     /**
      * Initialize the ToolManager and its components
      */
@@ -153,7 +155,7 @@ export declare class ToolManager {
     private isInAlwaysAllowList;
     /**
      * Handle tool approval/confirmation flow
-     * Checks allowed list, manages approval modes (event-based, auto-approve, auto-deny),
+     * Checks allowed list, manages approval modes (manual, auto-approve, auto-deny),
      * and handles remember choice logic
      */
     private handleToolApproval;

package/dist/tools/tool-manager.d.ts.map

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

package/dist/tools/tool-manager.js

@@ -6,7 +6,7 @@ import {
 var _ToolManager_decorators, _init;
 import { InternalToolsProvider } from "./internal-tools/provider.js";
 import { ToolError } from "./errors.js";
-import { logger } from "../logger/index.js";
+import { DextoLogComponent } from "../logger/v2/types.js";
 import { ApprovalStatus } from "../approval/types.js";
 import { InstrumentClass } from "../telemetry/decorators.js";
 _ToolManager_decorators = [InstrumentClass({
@@ -36,22 +36,25 @@ let _ToolManager = class _ToolManager {
   // Tool caching for performance
   toolsCache = {};
   cacheValid = false;
-  constructor(mcpManager, approvalManager, allowedToolsProvider, approvalMode, agentEventBus, toolPolicies, options) {
+  logger;
+  constructor(mcpManager, approvalManager, allowedToolsProvider, approvalMode, agentEventBus, toolPolicies, options, logger) {
     this.mcpManager = mcpManager;
     this.approvalManager = approvalManager;
     this.allowedToolsProvider = allowedToolsProvider;
     this.approvalMode = approvalMode;
     this.agentEventBus = agentEventBus;
     this.toolPolicies = toolPolicies;
+    this.logger = logger.createChild(DextoLogComponent.TOOLS);
     if (options?.internalToolsConfig && options.internalToolsConfig.length > 0) {
       this.internalToolsProvider = new InternalToolsProvider(
         options.internalToolsServices || {},
         approvalManager,
-        options.internalToolsConfig
+        options.internalToolsConfig,
+        this.logger
       );
     }
     this.setupNotificationListeners();
-    logger.debug("ToolManager initialized");
+    this.logger.debug("ToolManager initialized");
   }
   /**
    * Initialize the ToolManager and its components
@@ -60,7 +63,7 @@ let _ToolManager = class _ToolManager {
     if (this.internalToolsProvider) {
       await this.internalToolsProvider.initialize();
     }
-    logger.debug("ToolManager initialization complete");
+    this.logger.debug("ToolManager initialization complete");
   }
   /**
    * Set plugin support services (called after construction to avoid circular dependencies)
@@ -69,7 +72,7 @@ let _ToolManager = class _ToolManager {
     this.pluginManager = pluginManager;
     this.sessionManager = sessionManager;
     this.stateManager = stateManager;
-    logger.debug("Plugin support configured for ToolManager");
+    this.logger.debug("Plugin support configured for ToolManager");
   }
   /**
    * Invalidate the tools cache when tool sources change
@@ -82,14 +85,18 @@ let _ToolManager = class _ToolManager {
    * Set up listeners for MCP notifications to invalidate cache on changes
    */
   setupNotificationListeners() {
-    this.agentEventBus.on("dexto:mcpServerConnected", async (payload) => {
+    this.agentEventBus.on("mcp:server-connected", async (payload) => {
       if (payload.success) {
-        logger.debug(`\u{1F504} MCP server connected, invalidating tool cache: ${payload.name}`);
+        this.logger.debug(
+          `\u{1F504} MCP server connected, invalidating tool cache: ${payload.name}`
+        );
         this.invalidateCache();
       }
     });
-    this.agentEventBus.on("dexto:mcpServerRemoved", async (payload) => {
-      logger.debug(`\u{1F504} MCP server removed: ${payload.serverName}, invalidating tool cache`);
+    this.agentEventBus.on("mcp:server-removed", async (payload) => {
+      this.logger.debug(
+        `\u{1F504} MCP server removed: ${payload.serverName}, invalidating tool cache`
+      );
       this.invalidateCache();
     });
   }
@@ -124,7 +131,7 @@ let _ToolManager = class _ToolManager {
     try {
       mcpTools = await this.mcpManager.getAllTools();
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `Failed to get MCP tools: ${error instanceof Error ? error.message : String(error)}`
       );
       mcpTools = {};
@@ -132,7 +139,7 @@ let _ToolManager = class _ToolManager {
     try {
       internalTools = this.internalToolsProvider?.getAllTools() || {};
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `Failed to get internal tools: ${error instanceof Error ? error.message : String(error)}`
       );
       internalTools = {};
@@ -156,7 +163,7 @@ let _ToolManager = class _ToolManager {
     const totalTools = Object.keys(allTools).length;
     const mcpCount = Object.keys(mcpTools).length;
     const internalCount = Object.keys(internalTools).length;
-    logger.debug(
+    this.logger.debug(
       `\u{1F527} Unified tool discovery: ${totalTools} total tools (${mcpCount} MCP \u2192 ${_ToolManager.MCP_TOOL_PREFIX}*, ${internalCount} internal \u2192 ${_ToolManager.INTERNAL_TOOL_PREFIX}*)`
     );
     return allTools;
@@ -179,11 +186,11 @@ let _ToolManager = class _ToolManager {
    * ALL tools must have source prefix - no exceptions
    */
   async executeTool(toolName, args, sessionId) {
-    logger.debug(`\u{1F527} Tool execution requested: '${toolName}'`);
-    logger.debug(`Tool args: ${JSON.stringify(args, null, 2)}`);
+    this.logger.debug(`\u{1F527} Tool execution requested: '${toolName}'`);
+    this.logger.debug(`Tool args: ${JSON.stringify(args, null, 2)}`);
     await this.handleToolApproval(toolName, args, sessionId);
-    logger.debug(`\u2705 Tool execution approved: ${toolName}`);
-    logger.info(
+    this.logger.debug(`\u2705 Tool execution approved: ${toolName}`);
+    this.logger.info(
       `\u{1F527} Tool execution started for ${toolName}, sessionId: ${sessionId ?? "global"}`
     );
     const startTime = Date.now();
@@ -209,15 +216,15 @@ let _ToolManager = class _ToolManager {
     try {
       let result;
       if (toolName.startsWith(_ToolManager.MCP_TOOL_PREFIX)) {
-        logger.debug(`\u{1F527} Detected MCP tool: '${toolName}'`);
+        this.logger.debug(`\u{1F527} Detected MCP tool: '${toolName}'`);
         const actualToolName = toolName.substring(_ToolManager.MCP_TOOL_PREFIX.length);
         if (actualToolName.length === 0) {
           throw ToolError.invalidName(toolName, "tool name cannot be empty after prefix");
         }
-        logger.debug(`\u{1F3AF} MCP routing: '${toolName}' -> '${actualToolName}'`);
+        this.logger.debug(`\u{1F3AF} MCP routing: '${toolName}' -> '${actualToolName}'`);
         result = await this.mcpManager.executeTool(actualToolName, args, sessionId);
       } else if (toolName.startsWith(_ToolManager.INTERNAL_TOOL_PREFIX)) {
-        logger.debug(`\u{1F527} Detected internal tool: '${toolName}'`);
+        this.logger.debug(`\u{1F527} Detected internal tool: '${toolName}'`);
         const actualToolName = toolName.substring(_ToolManager.INTERNAL_TOOL_PREFIX.length);
         if (actualToolName.length === 0) {
           throw ToolError.invalidName(toolName, "tool name cannot be empty after prefix");
@@ -225,24 +232,26 @@ let _ToolManager = class _ToolManager {
         if (!this.internalToolsProvider) {
           throw ToolError.internalToolsNotInitialized(toolName);
         }
-        logger.debug(`\u{1F3AF} Internal routing: '${toolName}' -> '${actualToolName}'`);
+        this.logger.debug(`\u{1F3AF} Internal routing: '${toolName}' -> '${actualToolName}'`);
         result = await this.internalToolsProvider.executeTool(
           actualToolName,
           args,
           sessionId
         );
       } else {
-        logger.debug(`\u{1F527} Detected tool without proper prefix: '${toolName}'`);
+        this.logger.debug(`\u{1F527} Detected tool without proper prefix: '${toolName}'`);
         const stats = await this.getToolStats();
-        logger.error(
+        this.logger.error(
           `\u274C Tool missing source prefix: '${toolName}' (expected '${_ToolManager.MCP_TOOL_PREFIX}*' or '${_ToolManager.INTERNAL_TOOL_PREFIX}*')`
         );
-        logger.debug(`Available: ${stats.mcp} MCP tools, ${stats.internal} internal tools`);
+        this.logger.debug(
+          `Available: ${stats.mcp} MCP tools, ${stats.internal} internal tools`
+        );
         throw ToolError.notFound(toolName);
       }
       const duration = Date.now() - startTime;
-      logger.debug(`\u{1F3AF} Tool execution completed in ${duration}ms: '${toolName}'`);
-      logger.info(
+      this.logger.debug(`\u{1F3AF} Tool execution completed in ${duration}ms: '${toolName}'`);
+      this.logger.info(
         `\u2705 Tool execution completed successfully for ${toolName} in ${duration}ms, sessionId: ${sessionId ?? "global"}`
       );
       if (this.pluginManager && this.sessionManager && this.stateManager) {
@@ -268,7 +277,7 @@ let _ToolManager = class _ToolManager {
       return result;
     } catch (error) {
       const duration = Date.now() - startTime;
-      logger.error(
+      this.logger.error(
         `\u274C Tool execution failed for ${toolName} after ${duration}ms, sessionId: ${sessionId ?? "global"}: ${error instanceof Error ? error.message : String(error)}`
       );
       if (this.pluginManager && this.sessionManager && this.stateManager) {
@@ -312,7 +321,7 @@ let _ToolManager = class _ToolManager {
     try {
       mcpTools = await this.mcpManager.getAllTools();
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `Failed to get MCP tools for stats: ${error instanceof Error ? error.message : String(error)}`
       );
       mcpTools = {};
@@ -320,7 +329,7 @@ let _ToolManager = class _ToolManager {
     try {
       internalTools = this.internalToolsProvider?.getAllTools() || {};
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `Failed to get internal tools for stats: ${error instanceof Error ? error.message : String(error)}`
       );
       internalTools = {};
@@ -403,39 +412,39 @@ let _ToolManager = class _ToolManager {
   }
   /**
    * Handle tool approval/confirmation flow
-   * Checks allowed list, manages approval modes (event-based, auto-approve, auto-deny),
+   * Checks allowed list, manages approval modes (manual, auto-approve, auto-deny),
    * and handles remember choice logic
    */
   async handleToolApproval(toolName, args, sessionId) {
     if (this.isInAlwaysDenyList(toolName)) {
-      logger.info(
+      this.logger.info(
         `Tool '${toolName}' is in static deny list \u2013 blocking execution (session: ${sessionId ?? "global"})`
       );
-      logger.debug(`\u{1F6AB} Tool execution blocked by policy: ${toolName}`);
+      this.logger.debug(`\u{1F6AB} Tool execution blocked by policy: ${toolName}`);
       throw ToolError.executionDenied(toolName, sessionId);
     }
     if (this.isInAlwaysAllowList(toolName)) {
-      logger.info(
+      this.logger.info(
         `Tool '${toolName}' is in static allow list \u2013 skipping confirmation (session: ${sessionId ?? "global"})`
       );
       return;
     }
     const isAllowed = await this.allowedToolsProvider.isToolAllowed(toolName, sessionId);
     if (isAllowed) {
-      logger.info(
+      this.logger.info(
         `Tool '${toolName}' already allowed for session '${sessionId ?? "global"}' \u2013 skipping confirmation.`
       );
       return;
     }
     if (this.approvalMode === "auto-approve") {
-      logger.debug(`\u{1F7E2} Auto-approving tool execution: ${toolName}`);
+      this.logger.debug(`\u{1F7E2} Auto-approving tool execution: ${toolName}`);
       return;
     }
     if (this.approvalMode === "auto-deny") {
-      logger.debug(`\u{1F6AB} Auto-denying tool execution: ${toolName}`);
+      this.logger.debug(`\u{1F6AB} Auto-denying tool execution: ${toolName}`);
       throw ToolError.executionDenied(toolName, sessionId);
     }
-    logger.info(
+    this.logger.info(
       `Tool confirmation requested for ${toolName}, sessionId: ${sessionId ?? "global"}`
     );
     try {
@@ -451,23 +460,31 @@ let _ToolManager = class _ToolManager {
       if (response.status === ApprovalStatus.APPROVED && rememberChoice) {
         const allowSessionId = sessionId ?? response.sessionId;
         await this.allowedToolsProvider.allowTool(toolName, allowSessionId);
-        logger.info(
+        this.logger.info(
           `Tool '${toolName}' added to allowed tools for session '${allowSessionId ?? "global"}' (remember choice selected)`
         );
       }
       const approved = response.status === ApprovalStatus.APPROVED;
       if (!approved) {
-        logger.info(
-          `Tool confirmation denied for ${toolName}, sessionId: ${sessionId ?? "global"}`
+        if (response.status === ApprovalStatus.CANCELLED && response.reason === "timeout") {
+          this.logger.info(
+            `Tool confirmation timed out for ${toolName}, sessionId: ${sessionId ?? "global"}`
+          );
+          this.logger.debug(`\u23F1\uFE0F Tool execution timed out: ${toolName}`);
+          const timeoutMs = response.timeoutMs ?? 0;
+          throw ToolError.executionTimeout(toolName, timeoutMs, sessionId);
+        }
+        this.logger.info(
+          `Tool confirmation denied for ${toolName}, sessionId: ${sessionId ?? "global"}, reason: ${response.reason ?? "unknown"}`
         );
-        logger.debug(`\u{1F6AB} Tool execution denied: ${toolName}`);
+        this.logger.debug(`\u{1F6AB} Tool execution denied: ${toolName}`);
         throw ToolError.executionDenied(toolName, sessionId);
       }
-      logger.info(
+      this.logger.info(
         `Tool confirmation approved for ${toolName}, sessionId: ${sessionId ?? "global"}`
       );
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `Tool confirmation error for ${toolName}: ${error instanceof Error ? error.message : String(error)}`
       );
       throw error;
@@ -480,7 +497,7 @@ let _ToolManager = class _ToolManager {
   async refresh() {
     await this.mcpManager.refresh();
     this.invalidateCache();
-    logger.debug("ToolManager refreshed (including MCP server capabilities)");
+    this.logger.debug("ToolManager refreshed (including MCP server capabilities)");
   }
   /**
    * Get list of pending confirmation requests

package/dist/tools/types.d.ts

@@ -38,10 +38,6 @@ export interface ToolResult {
     success: boolean;
     data?: any;
     error?: string;
-    metadata?: {
-        type: string;
-        mimeType?: string;
-    };
 }
 /**
  * Tool call representation

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tools/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC;AAMD;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,qCAAqC;IACrC,EAAE,EAAE,MAAM,CAAC;IAEX,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAC;IAEpB,+CAA+C;IAC/C,WAAW,EAAE,SAAS,CAAC;IAEvB,8FAA8F;IAC9F,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAC3F;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG;QACX,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,WAAW,CAAC;KAC3B,CAAC;CACL;AAMD;;GAEG;AACH,MAAM,WAAW,UAAU;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACL;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/E"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tools/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC;AAMD;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,qCAAqC;IACrC,EAAE,EAAE,MAAM,CAAC;IAEX,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAC;IAEpB,+CAA+C;IAC/C,WAAW,EAAE,SAAS,CAAC;IAEvB,8FAA8F;IAC9F,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAC3F;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG;QACX,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,WAAW,CAAC;KAC3B,CAAC;CACL;AAMD;;GAEG;AACH,MAAM,WAAW,UAAU;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/E"}

package/dist/utils/env-file.cjs

@@ -0,0 +1,118 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var env_file_exports = {};
+__export(env_file_exports, {
+  updateEnvFile: () => updateEnvFile
+});
+module.exports = __toCommonJS(env_file_exports);
+var path = __toESM(require("node:path"), 1);
+var import_node_fs = require("node:fs");
+const DEXTO_ENV_KEYS = [
+  "OPENAI_API_KEY",
+  "ANTHROPIC_API_KEY",
+  "GOOGLE_GENERATIVE_AI_API_KEY",
+  "GROQ_API_KEY",
+  "COHERE_API_KEY",
+  "XAI_API_KEY",
+  "DEXTO_LOG_LEVEL"
+];
+function isDextoEnvKey(value) {
+  return DEXTO_ENV_KEYS.includes(value);
+}
+async function updateEnvFile(envFilePath, updates) {
+  await import_node_fs.promises.mkdir(path.dirname(envFilePath), { recursive: true });
+  let envLines = [];
+  try {
+    const existingEnv = await import_node_fs.promises.readFile(envFilePath, "utf8");
+    envLines = existingEnv.split("\n");
+  } catch {
+  }
+  const currentValues = {};
+  envLines.forEach((line) => {
+    const match = line.match(/^([A-Z0-9_]+)=(.*)$/);
+    if (match && match[1] && isDextoEnvKey(match[1])) {
+      const value = match[2] ?? "";
+      currentValues[match[1]] = value;
+    }
+  });
+  const updatedValues = Object.fromEntries(
+    DEXTO_ENV_KEYS.map((key) => {
+      const update = updates[key];
+      const current = currentValues[key];
+      const fallback = key === "DEXTO_LOG_LEVEL" ? "info" : "";
+      const value = update !== void 0 ? update : current ?? fallback;
+      return [key, value];
+    })
+  );
+  const sectionHeader = "## Dexto env variables";
+  const headerIndex = envLines.findIndex((line) => line.trim() === sectionHeader);
+  let contentLines;
+  if (headerIndex !== -1) {
+    const beforeSection = envLines.slice(0, headerIndex);
+    let sectionEnd = headerIndex + 1;
+    while (sectionEnd < envLines.length && envLines[sectionEnd]?.trim() !== "") {
+      sectionEnd++;
+    }
+    if (sectionEnd < envLines.length && envLines[sectionEnd]?.trim() === "") {
+      sectionEnd++;
+    }
+    const afterSection = envLines.slice(sectionEnd);
+    contentLines = [...beforeSection, ...afterSection];
+  } else {
+    contentLines = envLines;
+  }
+  const existingEnvVars = {};
+  contentLines.forEach((line) => {
+    const match = line.match(/^([A-Z0-9_]+)=(.*)$/);
+    if (match && match[1] && isDextoEnvKey(match[1])) {
+      const value = match[2] ?? "";
+      existingEnvVars[match[1]] = value;
+    }
+  });
+  if (contentLines.length > 0) {
+    if (contentLines[contentLines.length - 1]?.trim() !== "") {
+      contentLines.push("");
+    }
+  } else {
+    contentLines.push("");
+  }
+  contentLines.push(sectionHeader);
+  for (const key of DEXTO_ENV_KEYS) {
+    if (key in existingEnvVars && !(key in updates)) {
+      continue;
+    }
+    contentLines.push(`${key}=${updatedValues[key]}`);
+  }
+  contentLines.push("");
+  await import_node_fs.promises.writeFile(envFilePath, contentLines.join("\n"), "utf8");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  updateEnvFile
+});

package/dist/utils/env-file.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Update a .env file with Dexto environment variables, ensuring our section stays consistent.
+ */
+export declare function updateEnvFile(envFilePath: string, updates: Record<string, string>): Promise<void>;
+//# sourceMappingURL=env-file.d.ts.map

package/dist/utils/env-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"env-file.d.ts","sourceRoot":"","sources":["../../src/utils/env-file.ts"],"names":[],"mappings":"AAsBA;;GAEG;AACH,wBAAsB,aAAa,CAC/B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CAgFf"}

package/dist/utils/env-file.js

@@ -0,0 +1,85 @@
+import "../chunk-C6A6W6XS.js";
+import * as path from "node:path";
+import { promises as fs } from "node:fs";
+const DEXTO_ENV_KEYS = [
+  "OPENAI_API_KEY",
+  "ANTHROPIC_API_KEY",
+  "GOOGLE_GENERATIVE_AI_API_KEY",
+  "GROQ_API_KEY",
+  "COHERE_API_KEY",
+  "XAI_API_KEY",
+  "DEXTO_LOG_LEVEL"
+];
+function isDextoEnvKey(value) {
+  return DEXTO_ENV_KEYS.includes(value);
+}
+async function updateEnvFile(envFilePath, updates) {
+  await fs.mkdir(path.dirname(envFilePath), { recursive: true });
+  let envLines = [];
+  try {
+    const existingEnv = await fs.readFile(envFilePath, "utf8");
+    envLines = existingEnv.split("\n");
+  } catch {
+  }
+  const currentValues = {};
+  envLines.forEach((line) => {
+    const match = line.match(/^([A-Z0-9_]+)=(.*)$/);
+    if (match && match[1] && isDextoEnvKey(match[1])) {
+      const value = match[2] ?? "";
+      currentValues[match[1]] = value;
+    }
+  });
+  const updatedValues = Object.fromEntries(
+    DEXTO_ENV_KEYS.map((key) => {
+      const update = updates[key];
+      const current = currentValues[key];
+      const fallback = key === "DEXTO_LOG_LEVEL" ? "info" : "";
+      const value = update !== void 0 ? update : current ?? fallback;
+      return [key, value];
+    })
+  );
+  const sectionHeader = "## Dexto env variables";
+  const headerIndex = envLines.findIndex((line) => line.trim() === sectionHeader);
+  let contentLines;
+  if (headerIndex !== -1) {
+    const beforeSection = envLines.slice(0, headerIndex);
+    let sectionEnd = headerIndex + 1;
+    while (sectionEnd < envLines.length && envLines[sectionEnd]?.trim() !== "") {
+      sectionEnd++;
+    }
+    if (sectionEnd < envLines.length && envLines[sectionEnd]?.trim() === "") {
+      sectionEnd++;
+    }
+    const afterSection = envLines.slice(sectionEnd);
+    contentLines = [...beforeSection, ...afterSection];
+  } else {
+    contentLines = envLines;
+  }
+  const existingEnvVars = {};
+  contentLines.forEach((line) => {
+    const match = line.match(/^([A-Z0-9_]+)=(.*)$/);
+    if (match && match[1] && isDextoEnvKey(match[1])) {
+      const value = match[2] ?? "";
+      existingEnvVars[match[1]] = value;
+    }
+  });
+  if (contentLines.length > 0) {
+    if (contentLines[contentLines.length - 1]?.trim() !== "") {
+      contentLines.push("");
+    }
+  } else {
+    contentLines.push("");
+  }
+  contentLines.push(sectionHeader);
+  for (const key of DEXTO_ENV_KEYS) {
+    if (key in existingEnvVars && !(key in updates)) {
+      continue;
+    }
+    contentLines.push(`${key}=${updatedValues[key]}`);
+  }
+  contentLines.push("");
+  await fs.writeFile(envFilePath, contentLines.join("\n"), "utf8");
+}
+export {
+  updateEnvFile
+};

package/dist/utils/error-conversion.cjs

@@ -22,11 +22,32 @@ __export(error_conversion_exports, {
 });
 module.exports = __toCommonJS(error_conversion_exports);
 var import_safe_stringify = require("./safe-stringify.js");
-function toError(error) {
+function toError(error, logger) {
   if (error instanceof Error) {
+    logger.info(`error is already an Error: ${error.message}`);
     return error;
   }
   if (error && typeof error === "object") {
+    const errorObj = error;
+    if (errorObj.error?.data?.error?.message) {
+      logger.info(
+        `Extracted error from error.error.data.error.message: ${errorObj.error.data.error.message}`
+      );
+      return new Error(errorObj.error.data.error.message, { cause: error });
+    }
+    if (errorObj.error?.responseBody && typeof errorObj.error.responseBody === "string") {
+      try {
+        const parsed = JSON.parse(errorObj.error.responseBody);
+        if (parsed?.error?.message) {
+          logger.info(
+            `Extracted error from error.error.responseBody: ${parsed.error.message}`
+          );
+          return new Error(parsed.error.message, { cause: error });
+        }
+      } catch {
+        logger.info(`Failed to parse error.error.responseBody as JSON`);
+      }
+    }
     if ("message" in error && typeof error.message === "string") {
       return new Error(error.message, { cause: error });
     }
@@ -40,6 +61,7 @@ function toError(error) {
       return new Error(error.description, { cause: error });
     }
     const serialized = (0, import_safe_stringify.safeStringify)(error);
+    logger.info(`falling back to safe serialization for complex objects: ${serialized}`);
     return new Error(serialized);
   }
   if (typeof error === "string") {

package/dist/utils/error-conversion.d.ts

@@ -2,11 +2,12 @@
  * Utility functions for converting various error types to proper Error instances
  * with meaningful messages instead of "[object Object]"
  */
+import type { IDextoLogger } from '../logger/v2/types.js';
 /**
  * Converts any error value to an Error instance with a meaningful message
  *
  * @param error - The error value to convert (can be Error, object, string, etc.)
  * @returns Error instance with extracted or serialized message
  */
-export declare function toError(error: unknown): Error;
+export declare function toError(error: unknown, logger: IDextoLogger): Error;
 //# sourceMappingURL=error-conversion.d.ts.map

package/dist/utils/error-conversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-conversion.d.ts","sourceRoot":"","sources":["../../src/utils/error-conversion.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAkC7C"}
+{"version":3,"file":"error-conversion.d.ts","sourceRoot":"","sources":["../../src/utils/error-conversion.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,GAAG,KAAK,CAkEnE"}