@dexto/core 1.6.1 → 1.6.2

package/dist/tools/tool-manager.js

@@ -103,6 +103,20 @@ let _ToolManager = class _ToolManager {
     }
     this.invalidateCache();
   }
+  addTools(tools) {
+    const added = [];
+    for (const tool of tools) {
+      if (this.agentTools.has(tool.id)) {
+        continue;
+      }
+      this.agentTools.set(tool.id, tool);
+      added.push(tool.id);
+    }
+    if (added.length > 0) {
+      this.invalidateCache();
+    }
+    return added;
+  }
   setToolExecutionContextFactory(factory) {
     this.toolExecutionContextFactory = factory;
   }
@@ -192,6 +206,37 @@ let _ToolManager = class _ToolManager {
     );
     this.logger.debug(`Auto-approve tools: ${normalized.join(", ")}`);
   }
+  /**
+   * Add session-level auto-approve tools.
+   * Merges into the existing list instead of replacing it.
+   *
+   * @param sessionId The session ID
+   * @param autoApproveTools Array of tool names to auto-approve (e.g., ['bash_exec', 'mcp--read_file'])
+   */
+  addSessionAutoApproveTools(sessionId, autoApproveTools) {
+    if (autoApproveTools.length === 0) {
+      return;
+    }
+    const normalized = autoApproveTools.map(
+      (pattern) => this.normalizeToolPolicyPattern(pattern)
+    );
+    const existing = this.sessionAutoApproveTools.get(sessionId) ?? [];
+    const merged = [...existing];
+    const seen = new Set(existing);
+    for (const toolName of normalized) {
+      if (seen.has(toolName)) {
+        continue;
+      }
+      merged.push(toolName);
+      seen.add(toolName);
+    }
+    const actuallyAdded = Math.max(0, merged.length - existing.length);
+    this.sessionAutoApproveTools.set(sessionId, merged);
+    this.logger.info(
+      `Session auto-approve tools updated for '${sessionId}': +${actuallyAdded} tools`
+    );
+    this.logger.debug(`Auto-approve tools: ${merged.join(", ")}`);
+  }
   /**
    * Set session-level auto-approve tools chosen by the user.
    */
@@ -596,7 +641,10 @@ let _ToolManager = class _ToolManager {
         if (request.sessionId !== sessionId) {
           return false;
         }
-        return request.metadata.toolName === toolName;
+        if (request.metadata.toolName !== toolName) {
+          return false;
+        }
+        return request.metadata.directoryAccess === void 0;
       },
       { rememberChoice: false }
       // Don't propagate remember choice to auto-approved requests
@@ -630,6 +678,9 @@ let _ToolManager = class _ToolManager {
         if (request.metadata.toolName !== toolName) {
           return false;
         }
+        if (request.metadata.directoryAccess !== void 0) {
+          return false;
+        }
         const args = request.metadata.args;
         if (typeof args !== "object" || args === null) {
           return false;
@@ -656,6 +707,37 @@ let _ToolManager = class _ToolManager {
       );
     }
   }
+  /**
+   * Auto-approve pending tool approval requests that are now covered by a remembered directory.
+   * Called after a user selects "remember directory" for a directory-access prompt.
+   */
+  autoApprovePendingDirectoryRequests(toolName, sessionId) {
+    const count = this.approvalManager.autoApprovePendingRequests(
+      (request) => {
+        if (request.type !== ApprovalType.TOOL_APPROVAL) {
+          return false;
+        }
+        if (request.sessionId !== sessionId) {
+          return false;
+        }
+        if (request.metadata.toolName !== toolName) {
+          return false;
+        }
+        const directoryAccess = request.metadata.directoryAccess;
+        if (!directoryAccess) {
+          return false;
+        }
+        return this.approvalManager.isDirectorySessionApproved(directoryAccess.parentDir);
+      },
+      { rememberDirectory: false }
+    );
+    if (count > 0) {
+      this.logger.info(
+        'Auto-approved parallel request(s) after user selected "remember directory"',
+        { count, toolName }
+      );
+    }
+  }
   getMcpManager() {
     return this.mcpManager;
   }
@@ -1371,13 +1453,14 @@ let _ToolManager = class _ToolManager {
     }
   }
   /**
-   * Handle "remember choice" or "remember pattern" when user approves a tool.
+   * Handle "remember" actions when user approves a tool.
    */
   async handleRememberChoice(toolName, response, sessionId) {
     const data = response.data;
     if (!data) return;
     const rememberChoice = data.rememberChoice;
     const rememberPattern = data.rememberPattern;
+    const rememberDirectory = data.rememberDirectory;
     if (rememberChoice) {
       const allowSessionId = sessionId ?? response.sessionId;
       await this.allowedToolsProvider.allowTool(toolName, allowSessionId);
@@ -1389,6 +1472,9 @@ let _ToolManager = class _ToolManager {
       this.approvalManager.addPattern(toolName, rememberPattern);
       this.logger.info(`Pattern '${rememberPattern}' added for tool '${toolName}' approval`);
       this.autoApprovePendingPatternRequests(toolName, sessionId);
+    } else if (rememberDirectory) {
+      const allowSessionId = sessionId ?? response.sessionId;
+      this.autoApprovePendingDirectoryRequests(toolName, allowSessionId);
     }
   }
   /**

package/dist/utils/service-initializer.d.ts

@@ -47,6 +47,7 @@ export type ToolManagerFactoryOptions = {
     logger: Logger;
 };
 export type ToolManagerFactory = (options: ToolManagerFactoryOptions) => ToolManager;
+export type ToolkitLoader = (toolkits: string[]) => Promise<Tool[]>;
 export type InitializeServicesOptions = {
     sessionLoggerFactory?: import('../session/session-manager.js').SessionLoggerFactory;
     mcpAuthProviderFactory?: import('../mcp/types.js').McpAuthProviderFactory | null;

package/dist/utils/service-initializer.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexto/core",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -25,22 +25,24 @@
   },
   "dependencies": {
     "@ai-sdk/amazon-bedrock": "^3.0.71",
-    "@ai-sdk/anthropic": "^2.0.56",
+    "@ai-sdk/anthropic": "^2.0.65",
     "@ai-sdk/cohere": "^2.0.0",
     "@ai-sdk/google": "^2.0.0",
     "@ai-sdk/google-vertex": "^3.0.94",
     "@ai-sdk/groq": "^2.0.0",
     "@ai-sdk/openai": "^2.0.0",
+    "@ai-sdk/openai-compatible": "^1.0.30",
     "@ai-sdk/provider": "^2.0.0",
     "@ai-sdk/xai": "^2.0.0",
     "@modelcontextprotocol/sdk": "^1.25.2",
+    "@openrouter/ai-sdk-provider": "^1.5.4",
     "@opentelemetry/api": "^1.9.0",
     "ai": "^5.0.0",
     "boxen": "^7.1.1",
     "chalk": "^5.4.1",
-    "diff": "^8.0.2",
+    "diff": "^8.0.3",
     "dotenv": "^16.4.7",
-    "glob": "^11.0.3",
+    "glob": "^12.0.0",
     "nanoid": "^5.1.6",
     "winston": "^3.17.0",
     "yaml": "^2.7.1",