@dexto/core 1.5.6 → 1.5.7

package/dist/agent/DextoAgent.js

@@ -6,6 +6,7 @@ import {
 var _DextoAgent_decorators, _init;
 import { randomUUID } from "crypto";
 import { setMaxListeners } from "events";
+import { SkillsContributor } from "../systemPrompt/contributors.js";
 import { expandMessageReferences } from "../resources/index.js";
 import { expandBlobReferences } from "../context/utils.js";
 import { PromptManager } from "../prompts/index.js";
@@ -20,6 +21,7 @@ import { validateInputForLLM } from "../llm/validation.js";
 import { LLMError } from "../llm/errors.js";
 import { AgentError } from "./errors.js";
 import { MCPError } from "../mcp/errors.js";
+import { MCPErrorCode } from "../mcp/error-codes.js";
 import { DextoRuntimeError } from "../errors/DextoRuntimeError.js";
 import { DextoValidationError } from "../errors/DextoValidationError.js";
 import { ensureOk } from "../errors/result-bridge.js";
@@ -29,7 +31,7 @@ import {
   getSupportedProviders,
   getDefaultModelForProvider,
   getProviderFromModel,
-  LLM_REGISTRY
+  getAllModelsForProvider
 } from "../llm/registry.js";
 import { createAgentServices } from "../utils/service-initializer.js";
 import { AgentConfigSchema, createAgentConfigSchema } from "./schemas.js";
@@ -78,6 +80,19 @@ class DextoAgent {
       agentId: this.config.agentId,
       component: DextoLogComponent.AGENT
     });
+    const serviceOverrides = {};
+    if (options?.sessionLoggerFactory) {
+      serviceOverrides.sessionLoggerFactory = options.sessionLoggerFactory;
+    }
+    if (options && "mcpAuthProviderFactory" in options) {
+      serviceOverrides.mcpAuthProviderFactory = options.mcpAuthProviderFactory ?? null;
+    }
+    if (Object.keys(serviceOverrides).length > 0) {
+      this.serviceOverrides = serviceOverrides;
+    }
+    if (options?.mcpAuthProviderFactory) {
+      this.mcpAuthProviderFactory = options.mcpAuthProviderFactory;
+    }
     this.agentEventBus = new AgentEventBus();
     this.logger.info("DextoAgent created.");
   }
@@ -110,8 +125,11 @@ class DextoAgent {
   // Approval handler for manual tool confirmation and elicitation
   // Set via setApprovalHandler() before start() if needed
   approvalHandler;
+  mcpAuthProviderFactory = null;
   // Active stream controllers per session - allows cancel() to abort iterators
   activeStreamControllers = /* @__PURE__ */ new Map();
+  // Host overrides for service initialization (e.g. session logger factory)
+  serviceOverrides;
   // Logger instance for this agent (dependency injection)
   logger;
   /**
@@ -131,8 +149,12 @@ class DextoAgent {
         this.config,
         this.configPath,
         this.logger,
-        this.agentEventBus
+        this.agentEventBus,
+        this.serviceOverrides
       );
+      if (this.mcpAuthProviderFactory) {
+        services.mcpManager.setAuthProviderFactory(this.mcpAuthProviderFactory);
+      }
       for (const service of requiredServices) {
         if (!services[service]) {
           throw AgentError.initializationFailed(
@@ -170,9 +192,6 @@ Either:
         memoryManager: services.memoryManager,
         services
       });
-      services.toolManager.setAgent(this);
-      await services.toolManager.initialize();
-      this.searchService = services.searchService;
       const promptManager = new PromptManager(
         this.mcpManager,
         this.resourceManager,
@@ -183,6 +202,21 @@ Either:
       );
       await promptManager.initialize();
       Object.assign(this, { promptManager });
+      services.toolManager.setAgent(this);
+      services.toolManager.setPromptManager(promptManager);
+      if (this.config.internalTools?.includes("invoke_skill")) {
+        const skillsContributor = new SkillsContributor(
+          "skills",
+          50,
+          // Priority after memories (40) but before most other content
+          promptManager,
+          this.logger
+        );
+        services.systemPromptManager.addContributor(skillsContributor);
+        this.logger.debug("Added SkillsContributor to system prompt");
+      }
+      await services.toolManager.initialize();
+      this.searchService = services.searchService;
       this._isStarted = true;
       this._isStopped = false;
       this.logger.info("DextoAgent started successfully.");
@@ -941,6 +975,7 @@ Either:
    */
   async endSession(sessionId) {
     this.ensureStarted();
+    this.toolManager.clearSessionAutoApproveTools(sessionId);
     return this.sessionManager.endSession(sessionId);
   }
   /**
@@ -950,6 +985,7 @@ Either:
    */
   async deleteSession(sessionId) {
     this.ensureStarted();
+    this.toolManager.clearSessionAutoApproveTools(sessionId);
     return this.sessionManager.deleteSession(sessionId);
   }
   /**
@@ -1306,11 +1342,17 @@ Either:
   // ============= LLM MANAGEMENT =============
   /**
    * Gets the current LLM configuration with all defaults applied.
+   * @param sessionId Optional session ID to get config for specific session
    * @returns Current LLM configuration
    */
-  getCurrentLLMConfig() {
+  getCurrentLLMConfig(sessionId) {
     this.ensureStarted();
-    return structuredClone(this.stateManager.getLLMConfig());
+    if (sessionId !== void 0 && (!sessionId || typeof sessionId !== "string")) {
+      throw AgentError.apiValidationError(
+        "sessionId must be a non-empty string when provided"
+      );
+    }
+    return structuredClone(this.stateManager.getLLMConfig(sessionId));
   }
   /**
    * Switches the LLM service while preserving conversation history.
@@ -1433,20 +1475,16 @@ Either:
    */
   getSupportedModels() {
     const result = {};
-    const providers = getSupportedProviders();
-    for (const provider of providers) {
-      const defaultModel = getDefaultModelForProvider(provider);
-      const providerInfo = LLM_REGISTRY[provider];
-      result[provider] = providerInfo.models.map((model) => ({
-        ...model,
-        isDefault: model.name === defaultModel
-      }));
+    for (const provider of this.getSupportedProviders()) {
+      result[provider] = this.getSupportedModelsForProvider(provider);
     }
     return result;
   }
   /**
    * Gets supported models for a specific provider.
    * Returns model information including metadata for the specified provider only.
+   * For gateway providers like 'dexto' with supportsAllRegistryModels, returns
+   * all models from all accessible providers with their original provider info.
    *
    * @param provider The provider to get models for
    * @returns Array of model information for the specified provider
@@ -1464,12 +1502,15 @@ Either:
    * ```
    */
   getSupportedModelsForProvider(provider) {
-    const defaultModel = getDefaultModelForProvider(provider);
-    const providerInfo = LLM_REGISTRY[provider];
-    return providerInfo.models.map((model) => ({
-      ...model,
-      isDefault: model.name === defaultModel
-    }));
+    const models = getAllModelsForProvider(provider);
+    return models.map((model) => {
+      const originalProvider = "originalProvider" in model ? model.originalProvider : provider;
+      const defaultModel = getDefaultModelForProvider(originalProvider ?? provider);
+      return {
+        ...model,
+        isDefault: model.name === defaultModel
+      };
+    });
   }
   /**
    * Infers the provider from a model name.
@@ -1651,6 +1692,13 @@ Either:
       throw error;
     }
   }
+  getMcpAuthProvider(name) {
+    if (!name || typeof name !== "string") {
+      throw AgentError.apiValidationError("name is required and must be a non-empty string");
+    }
+    this.ensureStarted();
+    return this.mcpManager.getAuthProvider(name);
+  }
   /**
    * Executes a tool from any source (MCP servers, custom tools, or internal tools).
    * This is the unified interface for tool execution that can handle all tool types.
@@ -1710,7 +1758,10 @@ Either:
    */
   getMcpFailedConnections() {
     this.ensureStarted();
-    return this.mcpManager.getFailedConnections();
+    const failures = this.mcpManager.getFailedConnections();
+    return Object.fromEntries(
+      Object.entries(failures).map(([name, error]) => [name, error.message])
+    );
   }
   /**
    * Gets the connection status of a single MCP server.
@@ -1734,7 +1785,12 @@ Either:
     } else if (connectedClients.has(name)) {
       status = "connected";
     } else {
-      status = "error";
+      const errorCode = this.mcpManager.getFailedConnectionErrorCode(name);
+      if (errorCode === MCPErrorCode.AUTH_REQUIRED) {
+        status = "auth-required";
+      } else {
+        status = "error";
+      }
     }
     const result = {
       name,
@@ -1743,7 +1799,7 @@ Either:
       status
     };
     if (failedConnections[name]) {
-      result.error = failedConnections[name];
+      result.error = failedConnections[name].message;
     }
     return result;
   }
@@ -1770,7 +1826,12 @@ Either:
       } else if (connectedClients.has(name)) {
         status = "connected";
       } else {
-        status = "error";
+        const errorCode = this.mcpManager.getFailedConnectionErrorCode(name);
+        if (errorCode === MCPErrorCode.AUTH_REQUIRED) {
+          status = "auth-required";
+        } else {
+          status = "error";
+        }
       }
       const server = {
         name,
@@ -1779,7 +1840,7 @@ Either:
         status
       };
       if (failedConnections[name]) {
-        server.error = failedConnections[name];
+        server.error = failedConnections[name].message;
       }
       servers.push(server);
     }
@@ -1928,10 +1989,11 @@ Either:
    * - Prompt key resolution (resolving aliases)
    * - Argument normalization (including special _context field)
    * - Prompt execution and flattening
+   * - Returning per-prompt overrides (allowedTools, model) for the invoker to apply
    *
    * @param name The prompt name or alias
    * @param options Optional configuration for prompt resolution
-   * @returns Promise resolving to the resolved text and resource URIs
+   * @returns Promise resolving to the resolved text, resource URIs, and optional overrides
    */
   async resolvePrompt(name, options = {}) {
     this.ensureStarted();
@@ -2067,6 +2129,12 @@ Either:
     }
     this.logger.debug("Approval handler registered");
   }
+  setMcpAuthProviderFactory(factory) {
+    this.mcpAuthProviderFactory = factory;
+    if (this._isStarted && this.services) {
+      this.services.mcpManager.setAuthProviderFactory(factory);
+    }
+  }
   /**
    * Clear the current approval handler.
    *