[Fix][DEVX-670] Fix Issues with Tools Configuration (#47)

Author: ajimae

.changeset/silver-ligers-provide.md

@@ -0,0 +1,6 @@
+---
+"@commercetools/agent-essentials": patch
+"@commercetools/mcp-essentials": patch
+---
+
+[Fix][DEVX-670] Fix Issues with Tools Configuration

README.md

@@ -46,6 +46,12 @@ To view information on how to develop the MCP server, see [this README](/typescr
 To view information on how to locally run the bootstrapped MCP server, see [this README](/modelcontextprotocol/README.md).
 
 
+> [!IMPORTANT]
+> To load all the available tools set `--tools=all` and `--isAdmin=true`, all the available tools will be loaded into the MCP server. To limit the number of loaded tools set `--tools=all.read` for read-only tools or `--tools=carts.read,quote.create,quote.read,...` To disable dynamic tools loading set the `dynamicToolLoadingThreshold` to a very high value e.g `--dynamicToolLoadingThreshold=650`.
+
+To view information on how to develop the MCP server, see [this README](/typescript/README.md).<br>
+To view information on how to locally run the bootstrapped MCP server, see [this README](/modelcontextprotocol/README.md).
+
 Refer to our [official public documentation](https://docs.commercetools.com/sdk/commerce-mcp/essentials-mcp) for a more advanced and comprehensive guide on how to get the most out of our MCP offerings.
 
 <!--

modelcontextprotocol/src/index.ts

@@ -184,7 +184,7 @@ export function parseArgs(args: string[]): {options: Options; env: EnvVars} {
       const [key, value] = arg.slice(2).split('=');
 
       if (key == 'tools') {
-        options.tools = value.split(',');
+        options.tools = value.replace(/\s+/g, '').split(',');
       } else if (key == 'authType') {
         env.authType = value as EnvVars['authType'];
       } else if (key == 'accessToken') {
@@ -381,7 +381,7 @@ export async function main() {
     },
   };
 
-  if (selectedTools[0] === 'all') {
+  if (options.isAdmin && selectedTools[0] === 'all') {
     ACCEPTED_TOOLS.forEach((tool) => {
       if (!configuration.actions) {
         configuration.actions = {};

typescript/README.md

@@ -79,7 +79,7 @@ import {generateText} from 'ai';
 import {openai} from '@ai-sdk/openai';
 import {CommercetoolsAgentEssentials} from '@commercetools/agent-essentials/ai-sdk';
 
-const commercetoolsAgentEssentials = await CommercetoolsAgentEssentials({
+const commercetoolsAgentEssentials = new CommercetoolsAgentEssentials({
   authConfig: {
     type: 'client_credentials',
     clientId: process.env.CLIENT_ID!,,
@@ -136,7 +136,7 @@ Example:
 import {AgentExecutor, createStructuredChatAgent} from 'langchain/agents';
 import {CommercetoolsAgentEssentials} from '@commercetools/agent-essentials/langchain';
 
-const commercetoolsAgentEssentials = await CommercetoolsAgentEssentials({
+const commercetoolsAgentEssentials = new CommercetoolsAgentEssentials({
   authConfig: {
     type: 'auth_token',
     accessToken: process.env.ACCESS_TOKEN!,

typescript/src/ai-sdk/__tests__/essentials.test.ts

@@ -18,7 +18,7 @@ jest.mock('../../shared/configuration', () => ({
 jest.mock('../../shared/tools', () => {
   const {z: localZ} = require('zod'); // Require z inside the factory
   return {
-    contextToTools: (context: Context) => [
+    contextToTools: (configuration: Configuration) => [
       {
         method: 'tool1',
         description: 'Description for tool 1',

typescript/src/ai-sdk/essentials.ts

@@ -31,7 +31,7 @@ class CommercetoolsAgentEssentials {
 
     this.tools = {};
 
-    const filteredTools = contextToTools(processedConfiguration.context).filter(
+    const filteredTools = contextToTools(processedConfiguration).filter(
       (tool) => isToolAllowed(tool, processedConfiguration)
     );
 

typescript/src/langchain/__tests__/essentials.test.ts

@@ -4,7 +4,7 @@ import CommercetoolsTool from '../tool';
 import {isToolAllowed} from '../../shared/configuration';
 import {z} from 'zod';
 import {DynamicStructuredTool} from '@langchain/core/tools';
-import {Context} from '../../types/configuration';
+import {Configuration, Context} from '../../types/configuration';
 
 // Mock dependencies
 jest.mock('../../shared/api');
@@ -20,7 +20,7 @@ jest.mock('../../shared/tools', () => {
   // For this specific case, we can define it directly here.
   const {z: localZ} = require('zod'); // Require z inside the factory
   return {
-    contextToTools: (context: Context) => [
+    contextToTools: (configuration: Configuration) => [
       {
         method: 'lcTool1',
         name: 'lcTool1',
@@ -72,7 +72,8 @@ describe('CommercetoolsAgentEssentials (Langchain)', () => {
   beforeAll(() => {
     // Load the mocked definitions for use in tests
     const {contextToTools} = require('../../shared/tools');
-    mockToolDefinitions = contextToTools({isAdmin: true});
+    const _configuration = {context: {isAdmin: true}};
+    mockToolDefinitions = contextToTools(_configuration);
   });
 
   beforeEach(() => {

typescript/src/langchain/essentials.ts

@@ -39,7 +39,7 @@ class CommercetoolsAgentEssentials implements BaseToolkit {
     );
 
     const filteredToolDefinitions = contextToTools(
-      processedConfiguration.context
+      processedConfiguration
     ).filter((tool: ToolDefinition) =>
       isToolAllowed(tool, processedConfiguration)
     );

typescript/src/mastra/__tests__/essentials.test.ts

@@ -19,7 +19,7 @@ jest.mock('../../shared/configuration', () => ({
 jest.mock('../../shared/tools', () => {
   const {z: localZ} = require('zod');
   return {
-    contextToTools: (context: Context) => [
+    contextToTools: (configuration: Configuration) => [
       {
         method: 'tool1',
         description: 'Description for tool 1',

typescript/src/mastra/essentials.ts

@@ -28,7 +28,7 @@ class CommercetoolsAgentEssentials {
       processedConfiguration.context
     );
 
-    contextToTools(processedConfiguration.context)
+    contextToTools(processedConfiguration)
       .filter((tool) => isToolAllowed(tool, processedConfiguration))
       .forEach((tool) => {
         this._tools[tool.method] = CommercetoolsTool(