@salesforce/mcp 0.16.0 → 0.17.0

package/lib/index.js

@@ -158,7 +158,7 @@ You can also use special values to control access to orgs:
         if (toolsetsToEnable.dynamic) {
             this.logToStderr('Registering dynamic tools');
             // Individual tool management
-            dynamic.registerToolEnableTool(server);
+            dynamic.registerToolEnableTools(server);
             dynamic.registerToolListTools(server);
         }
         // ************************

package/lib/shared/tools.d.ts

@@ -39,6 +39,10 @@ export declare function enableTool(toolName: string): Promise<{
     success: boolean;
     message: string;
 }>;
+export declare function enableTools(tools: string[]): Promise<Array<{
+    success: boolean;
+    message: string;
+}>>;
 /**
  * Disable an individual tool
  */

package/lib/shared/tools.js

@@ -18,7 +18,13 @@ export const TOOLSETS = ['orgs', 'data', 'users', 'metadata', 'testing', 'experi
 /*
  * These are tools that are always enabled at startup. They cannot be disabled and they cannot be dynamically enabled.
  */
-export const CORE_TOOLS = ['sf-get-username', 'sf-resume', 'sf-enable-tool', 'sf-list-tools', 'sf-suggest-cli-command'];
+export const CORE_TOOLS = [
+    'sf-get-username',
+    'sf-resume',
+    'sf-enable-tools',
+    'sf-list-tools',
+    'sf-suggest-cli-command',
+];
 /**
  * Determines which toolsets should be enabled based on the provided toolsets array and dynamic tools flag.
  *
@@ -112,6 +118,25 @@ export async function enableTool(toolName) {
     toolInfo.tool.enable();
     return { success: true, message: `Tool ${toolName} enabled` };
 }
+export async function enableTools(tools) {
+    const results = [];
+    const cachedTools = await Cache.safeGet('tools');
+    for (const tool of tools) {
+        const toolInfo = cachedTools.find((t) => t.name === tool);
+        if (!toolInfo) {
+            results.push({ success: false, message: `Tool ${tool} not found` });
+            continue;
+        }
+        if (toolInfo.tool.enabled) {
+            results.push({ success: false, message: `Tool ${tool} is already enabled` });
+            continue;
+        }
+        // Enable the tool directly
+        toolInfo.tool.enable();
+        results.push({ success: true, message: `Tool ${tool} enabled` });
+    }
+    return results;
+}
 /**
  * Disable an individual tool
  */

package/lib/tools/core/sf-suggest-cli-command.js

@@ -23,7 +23,18 @@ const suggestCliCommandParamsSchema = z.object({
  * Suggest a Salesforce CLI (sf) command based on user input.
  */
 export const registerToolSuggestCliCommand = (server) => {
-    server.tool('sf-suggest-cli-command', "Suggests an `sf` CLI command based on a natural language query. It finds relevant commands from a local index and uses an LLM to construct the final, precise command to fulfill the user's request. Use this tool whenever a user asks for guidance on how to use the Salesforce CLI (`sf` or `sfdx`), needs help with command syntax, wants to know what command to run for a specific task, or asks questions like 'how do I...', 'what command...', or 'how to...' related to Salesforce development operations.", suggestCliCommandParamsSchema.shape, {
+    server.tool('sf-suggest-cli-command', `Suggests an \`sf\` CLI command based on a natural language query. It finds relevant commands from a local index and uses an LLM to construct the final, precise command to fulfill the user's request.
+
+AGENT INSTRUCTIONS:
+Use this tool whenever a user:
+  - asks for guidance on how to use the Salesforce CLI (sf or sfdx)
+  - needs help with Salesforce CLI (sf or sfdx) command syntax
+  - wants to know what Salesforce CLI (sf or sfdx) command to run for a specific task
+  - asks questions like 'how do I...', 'what command...', or 'how to...' related to Salesforce development operations.
+NEVER use this tool for enabling Salesforce MCP tools (use sf-enable-tools instead).
+NEVER use this tool for listing available Salesforce MCP tools (use sf-list-tools instead).
+NEVER use this tool for understanding the Salesforce MCP server's capabilities.
+NEVER use this tool for understanding the input schema of a Salesforce MCP tool.`, suggestCliCommandParamsSchema.shape, {
         readOnlyHint: true,
     }, async ({ query }) => {
         const assets = await getAssets();

package/lib/tools/dynamic/index.d.ts

@@ -1,2 +1,2 @@
-export { registerToolEnableTool } from './sf-enable-tool.js';
+export { registerToolEnableTools } from './sf-enable-tools.js';
 export { registerToolListTools } from './sf-list-tools.js';

package/lib/tools/dynamic/index.js

@@ -13,6 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { registerToolEnableTool } from './sf-enable-tool.js';
+export { registerToolEnableTools } from './sf-enable-tools.js';
 export { registerToolListTools } from './sf-list-tools.js';
 //# sourceMappingURL=index.js.map

package/lib/tools/dynamic/sf-enable-tools.d.ts

@@ -0,0 +1,2 @@
+import { SfMcpServer } from '../../sf-mcp-server.js';
+export declare function registerToolEnableTools(server: SfMcpServer): void;

package/lib/tools/dynamic/sf-enable-tools.js

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025, Salesforce, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { z } from 'zod';
+import { textResponse } from '../../shared/utils.js';
+import { enableTools } from '../../shared/tools.js';
+const enableToolsParamsSchema = z.object({
+    tools: z.array(z.string()).describe('The names of the tools to enable'),
+});
+export function registerToolEnableTools(server) {
+    server.tool('sf-enable-tools', `Enable one or more of the tools the Salesforce MCP server provides.
+
+AGENT INSTRUCTIONS:
+Use sf-list-all-tools first to learn what tools are available for enabling.
+Once you have enabled the tool, you MUST invoke that tool to accomplish the user's original request - DO NOT USE A DIFFERENT TOOL OR THE COMMAND LINE.`, enableToolsParamsSchema.shape, {
+        title: 'Enable Salesforce MCP tools',
+        readOnlyHint: true,
+        openWorldHint: false,
+    }, async ({ tools }) => {
+        if (tools.length === 0) {
+            return textResponse('No tools specified to enable.', true);
+        }
+        const results = await enableTools(tools);
+        server.sendToolListChanged();
+        const hasError = results.some((result) => !result.success);
+        const resultMessages = results.map((result) => result.message).join('\n');
+        return textResponse(resultMessages, hasError);
+    });
+}
+//# sourceMappingURL=sf-enable-tools.js.map

package/lib/tools/dynamic/sf-list-tools.js

@@ -19,10 +19,15 @@ export function registerToolListTools(server) {
     server.tool('sf-list-tools', `List all available tools this Salesforce MCP server can offer, providing the enabled status and description of each.
 
 AGENT INSTRUCTIONS:
-Use this when a task could be achieved with a MCP tool and the currently available tools aren't enough.
-If there's a tool that can accomplish the user's request, do not use this tool.
-Once you find the tool you want to enable, call sf-enable-tool with the tool name.
-Once you have enabled the tool, you can invoke the tool to accomplish the user's request.`, {
+DO NOT USE THIS TOOL if you already know what tool you need - try to call the tool directly first.
+ONLY use this tool if:
+1. You tried to call a tool and got an error that it doesn't exist or isn't enabled
+2. You genuinely don't know what tools are available for a specific task
+3. You need to discover new tools for an unfamiliar use case
+
+If you find one or more tools you want to enable, call sf-enable-tools with all the tool names.
+Once you have enabled a tool, you MUST invoke the tool to accomplish the user's original request - DO NOT USE A DIFFERENT TOOL OR THE COMMAND LINE.
+Once a tool has been enabled, you do not need to call sf-list-tools again - instead, invoke the desired tool directly.`, {
         title: 'List all individual tools',
         readOnlyHint: true,
         openWorldHint: false,