@dexto/core 1.7.2 → 1.8.1

package/dist/agent/DextoAgent.cjs

@@ -3,7 +3,6 @@ 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 __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
 var __typeError = (msg) => {
@@ -23,14 +22,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 __decoratorStart = (base) => [, , , __create(base?.[__knownSymbol("metadata")] ?? null)];
 var __decoratorStrings = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -79,9 +70,9 @@ var import_crypto = require("crypto");
 var import_events = require("events");
 var import_zod = require("zod");
 var import_contributors = require("../systemPrompt/contributors.js");
+var import_skills = require("../skills/index.js");
 var import_resources = require("../resources/index.js");
 var import_utils = require("../context/utils.js");
-var import_storage = require("../storage/index.js");
 var import_prompts = require("../prompts/index.js");
 var import_session = require("../session/index.js");
 var import_decorators = require("../telemetry/decorators.js");
@@ -97,6 +88,7 @@ var import_DextoValidationError = require("../errors/DextoValidationError.js");
 var import_result_bridge = require("../errors/result-bridge.js");
 var import_result = require("../utils/result.js");
 var import_resolver2 = require("../mcp/resolver.js");
+var import_llm = require("@dexto/llm");
 var import_registry = require("../llm/registry/index.js");
 var import_service_initializer2 = require("../utils/service-initializer.js");
 var import_schemas = require("../llm/schemas.js");
@@ -153,6 +145,7 @@ let _DextoAgent = class _DextoAgent {
   systemPromptManager;
   agentEventBus;
   promptManager;
+  skillManager;
   stateManager;
   sessionManager;
   workspaceManager;
@@ -171,7 +164,7 @@ let _DextoAgent = class _DextoAgent {
   eventSubscribers = /* @__PURE__ */ new Set();
   // Telemetry instance for distributed tracing
   telemetry;
-  // Approval handler for manual tool confirmation and elicitation
+  // Approval handler for manual tool approval and elicitation
   // Set via setApprovalHandler() before start() if needed
   approvalHandler;
   mcpAuthProviderFactory = null;
@@ -182,6 +175,7 @@ let _DextoAgent = class _DextoAgent {
   toolkitLoader;
   loadedToolkits = /* @__PURE__ */ new Set();
   loadingToolkits = /* @__PURE__ */ new Set();
+  skillSources;
   // DI-provided local tools.
   tools;
   compactionStrategy;
@@ -231,7 +225,7 @@ let _DextoAgent = class _DextoAgent {
   constructor(options) {
     const {
       logger,
-      storage,
+      stores,
       tools: toolsInput,
       hooks: hooksInput,
       compaction,
@@ -245,21 +239,15 @@ let _DextoAgent = class _DextoAgent {
     this.tools = tools;
     this.compactionStrategy = compaction ?? null;
     const overrides = { ...overridesInput ?? {} };
-    if (overrides.storageManager === void 0) {
-      overrides.storageManager = new import_storage.StorageManager(
-        {
-          cache: storage.cache,
-          database: storage.database,
-          blobStore: storage.blob
-        },
-        this.logger
-      );
+    if (overrides.stores === void 0) {
+      overrides.stores = stores;
     }
     if (overrides.hooks === void 0) {
       overrides.hooks = hooks;
     }
     this.overrides = overrides;
     this.toolkitLoader = options.toolkitLoader;
+    this.skillSources = options.skillSources ?? [];
     if (overrides.mcpAuthProviderFactory !== void 0) {
       this.mcpAuthProviderFactory = overrides.mcpAuthProviderFactory;
     }
@@ -309,7 +297,7 @@ let _DextoAgent = class _DextoAgent {
           `An approval handler is required but not configured (${reasons.join(" and ")}).
 Either:
   \u2022 Call agent.setApprovalHandler() before starting
-  \u2022 Set permissions: { mode: "auto-approve" } or { mode: "auto-deny" }
+  \u2022 Set permissions: { mode: "auto-approve" }
   \u2022 Disable elicitation: { enabled: false }`
         );
       }
@@ -332,23 +320,24 @@ Either:
         this.resourceManager,
         this.config,
         this.agentEventBus,
-        services.storageManager.getDatabase(),
+        services.stores,
         this.logger
       );
       await promptManager.initialize();
-      Object.assign(this, { promptManager });
-      const toolExecutionStorage = {
-        blob: services.storageManager.getBlobStore(),
-        database: services.storageManager.getDatabase(),
-        cache: services.storageManager.getCache()
-      };
+      const skillManager = new import_skills.CompositeSkillManager([
+        ...this.skillSources,
+        new import_skills.WorkspaceSkillSource(services.workspaceManager)
+      ]);
+      Object.assign(this, { promptManager, skillManager });
       const toolExecutionServices = {
         approval: services.approvalManager,
         search: services.searchService,
         resources: services.resourceManager,
         prompts: promptManager,
+        skills: skillManager,
         mcp: services.mcpManager,
-        taskForker: null
+        taskForker: null,
+        workspaceManager: services.workspaceManager
       };
       services.toolManager.setToolExecutionContextFactory((baseContext) => ({
         ...baseContext,
@@ -356,7 +345,7 @@ Either:
           hostRuntime: baseContext.runContext.hostRuntime
         },
         agent: this,
-        storage: toolExecutionStorage,
+        toolState: services.stores.getStore("toolState"),
         services: toolExecutionServices
       }));
       const agentTools = this.tools;
@@ -365,7 +354,7 @@ Either:
           "skills",
           50,
           // Priority after memories (40) but before most other content
-          promptManager,
+          skillManager,
           this.logger
         );
         services.systemPromptManager.addContributor(skillsContributor);
@@ -451,13 +440,13 @@ Either:
         shutdownErrors.push(new Error(`ResourceManager cleanup failed: ${err.message}`));
       }
       try {
-        if (this.services?.storageManager) {
-          await this.services.storageManager.disconnect();
-          this.logger.debug("Storage manager disconnected successfully");
+        if (this.services?.stores) {
+          await this.services.stores.disconnect();
+          this.logger.debug("Stores disconnected successfully");
         }
       } catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));
-        shutdownErrors.push(new Error(`Storage disconnect failed: ${err.message}`));
+        shutdownErrors.push(new Error(`Store disconnect failed: ${err.message}`));
       }
       this._isStopped = true;
       this._isStarted = false;
@@ -651,7 +640,7 @@ Either:
       return {
         toolName: tc.toolName,
         args: tc.args,
-        callId: tc.callId || `tool_${Date.now()}`,
+        callId: tc.callId,
         result: toolResult ? {
           success: toolResult.success,
           data: toolResult.sanitized
@@ -743,6 +732,7 @@ Either:
     let contentParts = typeof content === "string" ? [{ type: "text", text: content }] : [...content];
     const eventQueue = [];
     let completed = false;
+    let terminalError;
     let sawFatalErrorEvent = false;
     let sawRunCompleteEvent = false;
     const controller = new AbortController();
@@ -817,10 +807,16 @@ Either:
       eventQueue.push({ name: "llm:tool-result", ...data });
     };
     addStreamingListener("llm:tool-result", toolResultListener);
+    const retryingListener = (data) => {
+      if (data.sessionId !== sessionId) return;
+      eventQueue.push({ name: "llm:retrying", ...data });
+    };
+    addStreamingListener("llm:retrying", retryingListener);
     const errorListener = (data) => {
       if (data.sessionId !== sessionId) return;
       if (data.recoverable !== true) {
         sawFatalErrorEvent = true;
+        terminalError = data.error;
       }
       eventQueue.push({ name: "llm:error", ...data });
     };
@@ -878,6 +874,9 @@ Either:
     const runCompleteListener = (data) => {
       if (data.sessionId !== sessionId) return;
       sawRunCompleteEvent = true;
+      if (data.finishReason === "error" && data.error !== void 0) {
+        terminalError = data.error;
+      }
       eventQueue.push({ name: "run:complete", ...data });
       completed = true;
     };
@@ -950,7 +949,7 @@ Either:
           let allowedMediaTypes = llmConfig.allowedMediaTypes;
           if (!allowedMediaTypes) {
             allowedMediaTypes = (0, import_utils.fileTypesToMimePatterns)(
-              (0, import_registry.getSupportedFileTypesForModel)(llmConfig.provider, llmConfig.model),
+              (0, import_llm.getSupportedFileTypesForModel)(llmConfig.provider, llmConfig.model),
               this.logger
             );
           }
@@ -1054,6 +1053,7 @@ Either:
             return;
           }
           completed = true;
+          terminalError = error;
           this.logger.error(`Error in DextoAgent.stream: ${error.message}`);
           const errorEvent = {
             name: "llm:error",
@@ -1083,6 +1083,9 @@ Either:
         if (completed) {
           cleanupListeners();
           controller.abort();
+          if (terminalError !== void 0) {
+            throw terminalError;
+          }
           return { done: true, value: void 0 };
         }
         cleanupListeners();
@@ -1110,61 +1113,129 @@ Either:
     return session?.isBusy?.() ?? false;
   }
   /**
-   * Queue a message for processing when a session is busy.
-   * The message will be injected into the conversation when the current turn completes.
+   * Queue a message as active-turn steer input for a session.
+   * The message is injected at the next executor boundary while the current turn is active.
    *
    * @param sessionId Session id
-   * @param message The user message to queue
+   * @param message The user message to use as steer input
    * @returns Queue position and message ID
-   * @throws Error if session doesn't support message queueing
    */
-  async queueMessage(sessionId, message) {
+  async steer(sessionId, message) {
+    this.ensureStarted();
+    const session = await this.sessionManager.getSession(sessionId, false);
+    if (!session) {
+      throw import_session.SessionError.notFound(sessionId);
+    }
+    return session.steer(message);
+  }
+  /**
+   * Queue a message as follow-up work for a session.
+   * The message is processed only after the active turn would otherwise stop.
+   *
+   * @param sessionId Session id
+   * @param message The user message to queue as follow-up work
+   * @returns Queue position and message ID
+   */
+  async followUp(sessionId, message) {
+    this.ensureStarted();
+    const session = await this.sessionManager.getSession(sessionId, false);
+    if (!session) {
+      throw import_session.SessionError.notFound(sessionId);
+    }
+    return session.followUp(message);
+  }
+  /**
+   * Get all steer messages for a session.
+   * @param sessionId Session id
+   * @returns Array of steer messages
+   */
+  async getSteerMessages(sessionId) {
+    this.ensureStarted();
+    const session = await this.sessionManager.getSession(sessionId, false);
+    if (!session) {
+      throw import_session.SessionError.notFound(sessionId);
+    }
+    return session.getSteerMessages();
+  }
+  /**
+   * Get all follow-up messages for a session.
+   * @param sessionId Session id
+   * @returns Array of follow-up messages
+   */
+  async getFollowUpMessages(sessionId) {
     this.ensureStarted();
     const session = await this.sessionManager.getSession(sessionId, false);
     if (!session) {
       throw import_session.SessionError.notFound(sessionId);
     }
-    return session.queueMessage(message);
+    return session.getFollowUpMessages();
   }
   /**
-   * Get all queued messages for a session.
+   * Remove a steer message.
    * @param sessionId Session id
-   * @returns Array of queued messages
+   * @param messageId The ID of the steer message to remove
+   * @returns true if message was found and removed, false otherwise
    */
-  async getQueuedMessages(sessionId) {
+  async removeSteerMessage(sessionId, messageId) {
     this.ensureStarted();
     const session = await this.sessionManager.getSession(sessionId, false);
     if (!session) {
       throw import_session.SessionError.notFound(sessionId);
     }
-    return session.getQueuedMessages();
+    return session.removeSteerMessage(messageId);
   }
   /**
-   * Remove a queued message.
+   * Remove a follow-up message.
    * @param sessionId Session id
-   * @param messageId The ID of the queued message to remove
+   * @param messageId The ID of the follow-up message to remove
    * @returns true if message was found and removed, false otherwise
    */
-  async removeQueuedMessage(sessionId, messageId) {
+  async removeFollowUpMessage(sessionId, messageId) {
+    this.ensureStarted();
+    const session = await this.sessionManager.getSession(sessionId, false);
+    if (!session) {
+      throw import_session.SessionError.notFound(sessionId);
+    }
+    return session.removeFollowUpMessage(messageId);
+  }
+  /**
+   * Clear all steer messages for a session.
+   * @param sessionId Session id
+   * @returns Number of messages that were cleared
+   */
+  async clearSteerQueue(sessionId) {
     this.ensureStarted();
     const session = await this.sessionManager.getSession(sessionId, false);
     if (!session) {
       throw import_session.SessionError.notFound(sessionId);
     }
-    return session.removeQueuedMessage(messageId);
+    return session.clearSteerQueue();
   }
   /**
-   * Clear all queued messages for a session.
+   * Clear all follow-up messages for a session.
    * @param sessionId Session id
    * @returns Number of messages that were cleared
    */
-  async clearMessageQueue(sessionId) {
+  async clearFollowUpQueue(sessionId) {
     this.ensureStarted();
     const session = await this.sessionManager.getSession(sessionId, false);
     if (!session) {
       throw import_session.SessionError.notFound(sessionId);
     }
-    return session.clearMessageQueue();
+    return session.clearFollowUpQueue();
+  }
+  /**
+   * Clear all pending steer and follow-up input for a session.
+   * @param sessionId Session id
+   * @returns Number of messages that were cleared
+   */
+  async clearPendingInput(sessionId) {
+    this.ensureStarted();
+    const session = await this.sessionManager.getSession(sessionId, false);
+    if (!session) {
+      throw import_session.SessionError.notFound(sessionId);
+    }
+    return session.clearPendingInput();
   }
   /**
    * Cancels the currently running turn for a session.
@@ -1328,6 +1399,16 @@ Either:
    * @returns Promise that resolves to the generated title, or null if generation failed
    */
   async generateSessionTitle(sessionId) {
+    const result = await this.generateSessionTitleDetails(sessionId);
+    return result?.title ?? null;
+  }
+  /**
+   * Generate a title for a session and report whether it came from the LLM or heuristic fallback.
+   *
+   * @param sessionId Session ID to generate title for
+   * @returns Promise that resolves to title details, or null if generation failed
+   */
+  async generateSessionTitleDetails(sessionId) {
     this.ensureStarted();
     const metadata = await this.sessionManager.getSessionMetadata(sessionId);
     if (!metadata) {
@@ -1337,7 +1418,10 @@ Either:
       this.logger.debug(
         `[SessionTitle] Session ${sessionId} already has title '${metadata.title}'`
       );
-      return metadata.title;
+      return {
+        source: "existing",
+        title: metadata.title
+      };
     }
     const session = await this.sessionManager.getSession(sessionId);
     if (!session) {
@@ -1355,24 +1439,25 @@ Either:
       return null;
     }
     const llmConfig = this.getEffectiveConfig(sessionId).llm;
-    const result = await (0, import_title_generator.generateSessionTitle)(
-      llmConfig,
-      this.toolManager,
-      this.systemPromptManager,
-      this.resourceManager,
-      userText,
-      this.logger,
-      {
-        ...this.overrides.languageModelFactory !== void 0 && {
-          languageModelFactory: this.overrides.languageModelFactory
-        }
+    const result = await (0, import_title_generator.generateSessionTitle)(llmConfig, userText, this.logger, {
+      providerContext: { sessionId },
+      ...this.overrides.languageModelFactory !== void 0 && {
+        languageModelFactory: this.overrides.languageModelFactory
       }
-    );
+    });
     let title = result.title;
     if (!title) {
       title = (0, import_title_generator.deriveHeuristicTitle)(userText);
       if (title) {
         this.logger.info(`[SessionTitle] Using heuristic title for ${sessionId}: ${title}`);
+        const details = {
+          ...result.error !== void 0 && { reason: result.error },
+          ...result.timedOut !== void 0 && { timedOut: result.timedOut },
+          source: "heuristic",
+          title
+        };
+        await this.sessionManager.setSessionTitle(sessionId, title, { ifUnsetOnly: true });
+        return details;
       } else {
         this.logger.debug(`[SessionTitle] No suitable title derived for ${sessionId}`);
         return null;
@@ -1381,7 +1466,10 @@ Either:
       this.logger.info(`[SessionTitle] Generated LLM title for ${sessionId}: ${title}`);
     }
     await this.sessionManager.setSessionTitle(sessionId, title, { ifUnsetOnly: true });
-    return title;
+    return {
+      source: "llm",
+      title
+    };
   }
   /**
    * Gets the conversation history for a specific session.
@@ -1696,8 +1784,7 @@ Either:
       (msg) => msg.metadata?.isSummary === true || msg.metadata?.isSessionSummary === true
     );
     const llmConfig = runtimeConfig.llm;
-    const { getModelDisplayName } = await import("../llm/registry/index.js");
-    const modelDisplayName = getModelDisplayName(llmConfig.model, llmConfig.provider);
+    const modelDisplayName = (0, import_llm.getModelDisplayName)(llmConfig.model, llmConfig.provider);
     const estimatedTokens = tokenEstimate.estimated;
     const autoCompactBuffer = thresholdPercent > 0 && thresholdPercent < 1 ? Math.floor(maxContextTokens * (1 - thresholdPercent) / thresholdPercent) : 0;
     const totalTokenSpace = maxContextTokens + autoCompactBuffer;
@@ -1855,7 +1942,7 @@ Either:
    * ```
    */
   getSupportedProviders() {
-    return (0, import_registry.getSupportedProviders)();
+    return (0, import_llm.getSupportedProviders)();
   }
   /**
    * Gets all supported models grouped by provider with detailed information.
@@ -1906,7 +1993,7 @@ Either:
     const models = (0, import_registry.getAllModelsForProvider)(provider);
     return models.map((model) => {
       const originalProvider = "originalProvider" in model ? model.originalProvider : provider;
-      const defaultModel = (0, import_registry.getDefaultModelForProvider)(originalProvider ?? provider);
+      const defaultModel = (0, import_llm.getDefaultModelForProvider)(originalProvider ?? provider);
       return {
         ...model,
         isDefault: model.name === defaultModel
@@ -1934,7 +2021,7 @@ Either:
    */
   inferProviderFromModel(modelName) {
     try {
-      return (0, import_registry.getProviderFromModel)(modelName);
+      return (0, import_llm.getProviderFromModel)(modelName);
     } catch {
       return null;
     }
@@ -2639,11 +2726,10 @@ 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, resource URIs, and optional overrides
+   * @returns Promise resolving to the resolved text and resource URIs.
    */
   async resolvePrompt(name, options = {}) {
     this.ensureStarted();
@@ -2671,7 +2757,7 @@ Either:
    * Set a custom approval handler for manual approval mode.
    *
    * When `permissions.mode` is set to 'manual', an approval handler must be
-   * provided to process tool confirmation requests. The handler will be called
+   * provided to process tool approval requests. The handler will be called
    * whenever a tool execution requires user approval.
    *
    * The handler receives an approval request and must return a promise that resolves