@salesforce/mcp 0.17.1-dev.0 → 0.17.1

package/lib/index.js

@@ -16,18 +16,11 @@
 /* eslint-disable no-console */
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { Command, Flags, ux } from '@oclif/core';
-import * as core from './tools/core/index.js';
-import * as orgs from './tools/orgs/index.js';
-import * as data from './tools/data/index.js';
-import * as users from './tools/users/index.js';
-import * as testing from './tools/testing/index.js';
-import * as metadata from './tools/metadata/index.js';
-import * as dynamic from './tools/dynamic/index.js';
 import Cache from './shared/cache.js';
 import { Telemetry } from './telemetry.js';
 import { SfMcpServer } from './sf-mcp-server.js';
 import { maybeBuildIndex } from './assets.js';
-import { determineToolsetsToEnable, TOOLSETS } from './shared/tools.js';
+import { TOOLSETS, registerToolsets } from './registry.js';
 /**
  * Sanitizes an array of org usernames by replacing specific orgs with a placeholder.
  * Special values (DEFAULT_TARGET_ORG, DEFAULT_TARGET_DEV_HUB, ALLOW_ALL_ORGS) are preserved.
@@ -140,83 +133,7 @@ You can also use special values to control access to orgs:
             dynamicTools: flags['dynamic-tools'] ?? false,
         });
         await maybeBuildIndex(this.config.dataDir);
-        const toolsetsToEnable = determineToolsetsToEnable(flags.toolsets ?? ['all'], flags['dynamic-tools'] ?? false);
-        // ************************
-        // CORE TOOLS (always on)
-        // If you're adding a new tool to the core toolset, you MUST add it to the `CORE_TOOLS` array in shared/tools.ts
-        // otherwise SfMcpServer will not register it.
-        //
-        // Long term, we will want to consider a more elegant solution for registering core tools.
-        // ************************
-        this.logToStderr('Registering core tools');
-        // get username
-        core.registerToolGetUsername(server);
-        core.registerToolResume(server);
-        core.registerToolSuggestCliCommand(server);
-        // DYNAMIC TOOLSETS
-        // ************************
-        if (toolsetsToEnable.dynamic) {
-            this.logToStderr('Registering dynamic tools');
-            // Individual tool management
-            dynamic.registerToolEnableTools(server);
-            dynamic.registerToolListTools(server);
-        }
-        // ************************
-        // ORG TOOLS
-        // ************************
-        if (toolsetsToEnable.orgs) {
-            this.logToStderr('Registering org tools');
-            // list all orgs
-            orgs.registerToolListAllOrgs(server);
-        }
-        // ************************
-        // DATA TOOLS
-        // ************************
-        if (toolsetsToEnable.data) {
-            this.logToStderr('Registering data tools');
-            // query org
-            data.registerToolQueryOrg(server);
-        }
-        // ************************
-        // USER TOOLS
-        // ************************
-        if (toolsetsToEnable.users) {
-            this.logToStderr('Registering user tools');
-            // assign permission set
-            users.registerToolAssignPermissionSet(server);
-        }
-        // ************************
-        // testing TOOLS
-        // ************************
-        if (toolsetsToEnable.testing) {
-            this.logToStderr('Registering testing tools');
-            testing.registerToolTestApex(server);
-            testing.registerToolTestAgent(server);
-        }
-        // ************************
-        // METADATA TOOLS
-        // ************************
-        if (toolsetsToEnable.metadata) {
-            this.logToStderr('Registering metadata tools');
-            // deploy metadata
-            metadata.registerToolDeployMetadata(server);
-            // retrieve metadata
-            metadata.registerToolRetrieveMetadata(server);
-        }
-        // ************************
-        // EXPERIMENTAL TOOLS
-        //
-        // This toolset needs to be explicitly enabled ('all' will not include it)
-        // Tools don't need to be in an 'experimental' directory, only registered here
-        // ************************
-        if (toolsetsToEnable.experimental) {
-            this.logToStderr('Registering experimental tools');
-            orgs.registerToolOrgOpen(server);
-            // Add any experimental tools here
-            orgs.registerToolCreateScratchOrg(server);
-            orgs.registerToolDeleteOrg(server);
-            orgs.registerToolCreateOrgSnapshot(server);
-        }
+        registerToolsets(flags.toolsets ?? ['all'], flags['dynamic-tools'] ?? false, server);
         const transport = new StdioServerTransport();
         await server.connect(transport);
         console.error(`✅ Salesforce MCP Server v${this.config.version} running on stdio`);

package/lib/modules/platform-cli/index.d.ts

@@ -0,0 +1,16 @@
+export { assignPermissionSet } from './sf-assign-permission-set.js';
+export { createOrgSnapshot } from './sf-create-org-snapshot.js';
+export { createScratchOrg } from './sf-create-scratch-org.js';
+export { deleteOrg } from './sf-delete-org.js';
+export { deployMetadata } from './sf-deploy-metadata.js';
+export { enableTools } from './sf-enable-tools.js';
+export { getUsername } from './sf-get-username.js';
+export { listAllOrgs } from './sf-list-all-orgs.js';
+export { listTools } from './sf-list-tools.js';
+export { orgOpen } from './sf-org-open.js';
+export { queryOrg } from './sf-query-org.js';
+export { resume } from './sf-resume.js';
+export { retrieveMetadata } from './sf-retrieve-metadata.js';
+export { suggestCliCommand } from './sf-suggest-cli-command.js';
+export { testAgent } from './sf-test-agents.js';
+export { testApex } from './sf-test-apex.js';

package/lib/modules/platform-cli/index.js

@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+export { assignPermissionSet } from './sf-assign-permission-set.js';
+export { createOrgSnapshot } from './sf-create-org-snapshot.js';
+export { createScratchOrg } from './sf-create-scratch-org.js';
+export { deleteOrg } from './sf-delete-org.js';
+export { deployMetadata } from './sf-deploy-metadata.js';
+export { enableTools } from './sf-enable-tools.js';
+export { getUsername } from './sf-get-username.js';
+export { listAllOrgs } from './sf-list-all-orgs.js';
+export { listTools } from './sf-list-tools.js';
+export { orgOpen } from './sf-org-open.js';
+export { queryOrg } from './sf-query-org.js';
+export { resume } from './sf-resume.js';
+export { retrieveMetadata } from './sf-retrieve-metadata.js';
+export { suggestCliCommand } from './sf-suggest-cli-command.js';
+export { testAgent } from './sf-test-agents.js';
+export { testApex } from './sf-test-apex.js';
+//# sourceMappingURL=index.js.map

package/lib/{tools/users → modules/platform-cli}/sf-assign-permission-set.d.ts

@@ -6,15 +6,15 @@ export declare const assignPermissionSetParamsSchema: z.ZodObject<{
     onBehalfOf: z.ZodOptional<z.ZodString>;
     directory: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
-    directory: string;
-    usernameOrAlias: string;
     permissionSetName: string;
+    usernameOrAlias: string;
+    directory: string;
     onBehalfOf?: string | undefined;
 }, {
-    directory: string;
-    usernameOrAlias: string;
     permissionSetName: string;
+    usernameOrAlias: string;
+    directory: string;
     onBehalfOf?: string | undefined;
 }>;
 export type AssignPermissionSetOptions = z.infer<typeof assignPermissionSetParamsSchema>;
-export declare const registerToolAssignPermissionSet: (server: SfMcpServer) => void;
+export declare const assignPermissionSet: (server: SfMcpServer) => void;

package/lib/{tools/users → modules/platform-cli}/sf-assign-permission-set.js

@@ -56,7 +56,7 @@ Set the permission set MyPermSet on behalf of test-3uyb8kmftiu@example.com.
 Set the permission set MyPermSet on behalf of my-alias.`),
     directory: directoryParam,
 });
-export const registerToolAssignPermissionSet = (server) => {
+export const assignPermissionSet = (server) => {
     server.tool('sf-assign-permission-set', 'Assign a permission set to one or more org users.', assignPermissionSetParamsSchema.shape, {
         title: 'Assign Permission Set',
         openWorldHint: false,

package/lib/{tools/orgs → modules/platform-cli}/sf-create-org-snapshot.d.ts

@@ -16,8 +16,8 @@ export declare const createOrgSnapshotParams: z.ZodObject<{
     directory: string;
     devHub: string;
     sourceOrg: string;
-    name?: string | undefined;
     description?: string | undefined;
+    name?: string | undefined;
 }>;
 export type CreateOrgSnapshotOptions = z.infer<typeof createOrgSnapshotParams>;
-export declare const registerToolCreateOrgSnapshot: (server: McpServer) => void;
+export declare const createOrgSnapshot: (server: McpServer) => void;

package/lib/{tools/orgs → modules/platform-cli}/sf-create-org-snapshot.js

@@ -37,7 +37,7 @@ export const createOrgSnapshotParams = z.object({
     description: z.string().describe(' Description of snapshot.').optional(),
     name: z.string().describe('Unique name of snapshot').max(15).default(Date.now().toString().substring(0, 15)),
 });
-export const registerToolCreateOrgSnapshot = (server) => {
+export const createOrgSnapshot = (server) => {
     server.tool('sf-create-org-snapshot', `Creates a new snapshot of an org
 
 AGENT INSTRUCTIONS:

package/lib/{tools/orgs → modules/platform-cli}/sf-create-scratch-org.d.ts

@@ -21,30 +21,30 @@ export declare const createScratchOrgParams: z.ZodObject<{
     duration: number;
     definitionFile: string;
     async: boolean;
-    username?: string | undefined;
     description?: string | undefined;
+    username?: string | undefined;
     snapshot?: string | undefined;
     alias?: string | undefined;
+    sourceOrg?: string | undefined;
     edition?: "group" | "developer" | "enterprise" | "professional" | "partner-developer" | "partner-enterprise" | "partner-group" | "partner-professional" | undefined;
     setDefault?: boolean | undefined;
-    sourceOrg?: string | undefined;
     orgName?: string | undefined;
     adminEmail?: string | undefined;
 }, {
     directory: string;
     devHub: string;
-    username?: string | undefined;
     description?: string | undefined;
+    username?: string | undefined;
     snapshot?: string | undefined;
     alias?: string | undefined;
+    sourceOrg?: string | undefined;
     duration?: number | undefined;
     edition?: "group" | "developer" | "enterprise" | "professional" | "partner-developer" | "partner-enterprise" | "partner-group" | "partner-professional" | undefined;
     definitionFile?: string | undefined;
     async?: boolean | undefined;
     setDefault?: boolean | undefined;
-    sourceOrg?: string | undefined;
     orgName?: string | undefined;
     adminEmail?: string | undefined;
 }>;
 export type CreateScratchOrgOptions = z.infer<typeof createScratchOrgParams>;
-export declare const registerToolCreateScratchOrg: (server: McpServer) => void;
+export declare const createScratchOrg: (server: McpServer) => void;

package/lib/{tools/orgs → modules/platform-cli}/sf-create-scratch-org.js

@@ -81,7 +81,7 @@ export const createScratchOrgParams = z.object({
     orgName: z.string().describe('Name of the scratch org').optional(),
     adminEmail: z.string().describe("Email address that will be applied to the org's admin user.").optional(),
 });
-export const registerToolCreateScratchOrg = (server) => {
+export const createScratchOrg = (server) => {
     server.tool('sf-create-scratch-org', `Creates a scratch org with the specified parameters.
 
 AGENT INSTRUCTIONS:

package/lib/{tools/orgs → modules/platform-cli}/sf-delete-org.d.ts

@@ -4,11 +4,11 @@ export declare const deleteOrgParams: z.ZodObject<{
     directory: z.ZodEffects<z.ZodString, string, string>;
     usernameOrAlias: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    directory: string;
     usernameOrAlias: string;
-}, {
     directory: string;
+}, {
     usernameOrAlias: string;
+    directory: string;
 }>;
 export type DeleteOrgOptions = z.infer<typeof deleteOrgParams>;
-export declare const registerToolDeleteOrg: (server: McpServer) => void;
+export declare const deleteOrg: (server: McpServer) => void;

package/lib/{tools/orgs → modules/platform-cli}/sf-delete-org.js

@@ -31,7 +31,7 @@ export const deleteOrgParams = z.object({
     directory: directoryParam,
     usernameOrAlias: usernameOrAliasParam,
 });
-export const registerToolDeleteOrg = (server) => {
+export const deleteOrg = (server) => {
     server.tool('sf-delete-org', `Deletes specified salesforce org.
 
 AGENT INSTRUCTIONS:

package/lib/{tools/metadata → modules/platform-cli}/sf-deploy-metadata.d.ts

@@ -8,20 +8,20 @@ declare const deployMetadataParams: z.ZodObject<{
     usernameOrAlias: z.ZodString;
     directory: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     sourceDir?: string[] | undefined;
     manifest?: string | undefined;
     apexTestLevel?: "NoTestRun" | "RunLocalTests" | "RunAllTestsInOrg" | undefined;
     apexTests?: string[] | undefined;
 }, {
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     sourceDir?: string[] | undefined;
     manifest?: string | undefined;
     apexTestLevel?: "NoTestRun" | "RunLocalTests" | "RunAllTestsInOrg" | undefined;
     apexTests?: string[] | undefined;
 }>;
 export type DeployMetadata = z.infer<typeof deployMetadataParams>;
-export declare const registerToolDeployMetadata: (server: SfMcpServer) => void;
+export declare const deployMetadata: (server: SfMcpServer) => void;
 export {};

package/lib/{tools/metadata → modules/platform-cli}/sf-deploy-metadata.js

@@ -70,7 +70,7 @@ Set this param if the user ask an Apex test to be run during deployment.
  * Returns:
  * - textResponse: Deploy result.
  */
-export const registerToolDeployMetadata = (server) => {
+export const deployMetadata = (server) => {
     server.tool('sf-deploy-metadata', `Deploy metadata to an org from your local project.
 
 AGENT INSTRUCTIONS:

package/lib/modules/platform-cli/sf-enable-tools.d.ts

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

package/lib/{tools/dynamic → modules/platform-cli}/sf-enable-tools.js

@@ -15,11 +15,11 @@
  */
 import { z } from 'zod';
 import { textResponse } from '../../shared/utils.js';
-import { enableTools } from '../../shared/tools.js';
+import { enableTools as utilEnableTools } from './utils/tools.js';
 const enableToolsParamsSchema = z.object({
     tools: z.array(z.string()).describe('The names of the tools to enable'),
 });
-export function registerToolEnableTools(server) {
+export function enableTools(server) {
     server.tool('sf-enable-tools', `Enable one or more of the tools the Salesforce MCP server provides.
 
 AGENT INSTRUCTIONS:
@@ -32,7 +32,7 @@ Once you have enabled the tool, you MUST invoke that tool to accomplish the user
         if (tools.length === 0) {
             return textResponse('No tools specified to enable.', true);
         }
-        const results = await enableTools(tools);
+        const results = await utilEnableTools(tools);
         server.sendToolListChanged();
         const hasError = results.some((result) => !result.success);
         const resultMessages = results.map((result) => result.message).join('\n');

package/lib/{tools/core → modules/platform-cli}/sf-get-username.d.ts

@@ -5,13 +5,13 @@ export declare const getUsernameParamsSchema: z.ZodObject<{
     defaultDevHub: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     directory: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
+    directory: string;
     defaultTargetOrg: boolean;
     defaultDevHub: boolean;
-    directory: string;
 }, {
     directory: string;
     defaultTargetOrg?: boolean | undefined;
     defaultDevHub?: boolean | undefined;
 }>;
 export type GetUsernameParamsSchema = z.infer<typeof getUsernameParamsSchema>;
-export declare const registerToolGetUsername: (server: SfMcpServer) => void;
+export declare const getUsername: (server: SfMcpServer) => void;

package/lib/{tools/core → modules/platform-cli}/sf-get-username.js

@@ -50,7 +50,7 @@ Get username for my default dev hub
 ...for my default devhub`),
     directory: directoryParam,
 });
-export const registerToolGetUsername = (server) => {
+export const getUsername = (server) => {
     server.tool('sf-get-username', `Intelligently determines the appropriate username or alias for Salesforce operations.
 
 AGENT/LLM INSTRUCTIONS:

package/lib/{tools/orgs → modules/platform-cli}/sf-list-all-orgs.d.ts

@@ -8,4 +8,4 @@ export declare const listAllOrgsParamsSchema: z.ZodObject<{
     directory: string;
 }>;
 export type ListAllOrgsOptions = z.infer<typeof listAllOrgsParamsSchema>;
-export declare const registerToolListAllOrgs: (server: McpServer) => void;
+export declare const listAllOrgs: (server: McpServer) => void;

package/lib/{tools/orgs → modules/platform-cli}/sf-list-all-orgs.js

@@ -31,7 +31,7 @@ import { directoryParam } from '../../shared/params.js';
 export const listAllOrgsParamsSchema = z.object({
     directory: directoryParam,
 });
-export const registerToolListAllOrgs = (server) => {
+export const listAllOrgs = (server) => {
     server.tool('sf-list-all-orgs', `Lists all configured Salesforce orgs.
 
 AGENT INSTRUCTIONS:

package/lib/modules/platform-cli/sf-list-tools.d.ts

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

package/lib/{tools/dynamic → modules/platform-cli}/sf-list-tools.js

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import { textResponse } from '../../shared/utils.js';
-import { listAllTools } from '../../shared/tools.js';
-export function registerToolListTools(server) {
+import { listAllTools } from './utils/tools.js';
+export function listTools(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:

package/lib/{tools/orgs → modules/platform-cli}/sf-org-open.d.ts

@@ -5,13 +5,13 @@ export declare const orgOpenParamsSchema: z.ZodObject<{
     usernameOrAlias: z.ZodString;
     directory: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     filePath?: string | undefined;
 }, {
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     filePath?: string | undefined;
 }>;
 export type OrgOpenParamsSchema = z.infer<typeof orgOpenParamsSchema>;
-export declare const registerToolOrgOpen: (server: SfMcpServer) => void;
+export declare const orgOpen: (server: SfMcpServer) => void;

package/lib/{tools/orgs → modules/platform-cli}/sf-org-open.js

@@ -27,7 +27,7 @@ export const orgOpenParamsSchema = z.object({
     usernameOrAlias: usernameOrAliasParam,
     directory: directoryParam,
 });
-export const registerToolOrgOpen = (server) => {
+export const orgOpen = (server) => {
     server.tool('sf-org-open', `Open a Salesforce org in the browser.
 
 You can specify a metadata file you want to open.

package/lib/{tools/data → modules/platform-cli}/sf-query-org.d.ts

@@ -7,14 +7,14 @@ export declare const queryOrgParamsSchema: z.ZodObject<{
     useToolingApi: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     query: string;
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     useToolingApi?: boolean | undefined;
 }, {
     query: string;
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     useToolingApi?: boolean | undefined;
 }>;
 export type QueryOrgOptions = z.infer<typeof queryOrgParamsSchema>;
-export declare const registerToolQueryOrg: (server: SfMcpServer) => void;
+export declare const queryOrg: (server: SfMcpServer) => void;

package/lib/{tools/data → modules/platform-cli}/sf-query-org.js

@@ -35,7 +35,7 @@ export const queryOrgParamsSchema = z.object({
     directory: directoryParam,
     useToolingApi: useToolingApiParam,
 });
-export const registerToolQueryOrg = (server) => {
+export const queryOrg = (server) => {
     server.tool('sf-query-org', 'Run a SOQL query against a Salesforce org.', queryOrgParamsSchema.shape, {
         title: 'Query Org',
         openWorldHint: false,

package/lib/{tools/core → modules/platform-cli}/sf-resume.d.ts

@@ -6,15 +6,15 @@ export declare const resumeParamsSchema: z.ZodObject<{
     usernameOrAlias: z.ZodString;
     directory: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
+    usernameOrAlias: string;
     directory: string;
     jobId: string;
     wait: number;
-    usernameOrAlias: string;
 }, {
+    usernameOrAlias: string;
     directory: string;
     jobId: string;
-    usernameOrAlias: string;
     wait?: number | undefined;
 }>;
 export type ResumeParamsSchema = z.infer<typeof resumeParamsSchema>;
-export declare const registerToolResume: (server: McpServer) => void;
+export declare const resume: (server: McpServer) => void;

package/lib/{tools/core → modules/platform-cli}/sf-resume.js

@@ -51,7 +51,7 @@ export const resumeParamsSchema = z.object({
     usernameOrAlias: usernameOrAliasParam,
     directory: directoryParam,
 });
-export const registerToolResume = (server) => {
+export const resume = (server) => {
     server.tool('sf-resume', `Resume a long running operation that was not completed by another tool.
 
 AGENT INSTRUCTIONS:

package/lib/modules/platform-cli/sf-retrieve-metadata.d.ts

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

package/lib/{tools/metadata → modules/platform-cli}/sf-retrieve-metadata.js

@@ -43,7 +43,7 @@ const retrieveMetadataParams = z.object({
  * Returns:
  * - textResponse: Retrieve result.
  */
-export const registerToolRetrieveMetadata = (server) => {
+export const retrieveMetadata = (server) => {
     server.tool('sf-retrieve-metadata', `Retrieve metadata from an org to your local project.
 
 AGENT INSTRUCTIONS:

package/lib/{tools/core → modules/platform-cli}/sf-suggest-cli-command.d.ts

@@ -2,4 +2,4 @@ import { SfMcpServer } from '../../sf-mcp-server.js';
 /**
  * Suggest a Salesforce CLI (sf) command based on user input.
  */
-export declare const registerToolSuggestCliCommand: (server: SfMcpServer) => void;
+export declare const suggestCliCommand: (server: SfMcpServer) => void;

package/lib/{tools/core → modules/platform-cli}/sf-suggest-cli-command.js

@@ -22,7 +22,7 @@ const suggestCliCommandParamsSchema = z.object({
 /**
  * Suggest a Salesforce CLI (sf) command based on user input.
  */
-export const registerToolSuggestCliCommand = (server) => {
+export const suggestCliCommand = (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.
 
 AGENT INSTRUCTIONS:

package/lib/{tools/testing → modules/platform-cli}/sf-test-agents.d.ts

@@ -6,16 +6,16 @@ declare const runAgentTestsParam: z.ZodObject<{
     directory: z.ZodEffects<z.ZodString, string, string>;
     async: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     async: boolean;
     agentApiName: string;
 }, {
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     agentApiName: string;
     async?: boolean | undefined;
 }>;
 export type AgentRunTests = z.infer<typeof runAgentTestsParam>;
-export declare const registerToolTestAgent: (server: SfMcpServer) => void;
+export declare const testAgent: (server: SfMcpServer) => void;
 export {};

package/lib/{tools/testing → modules/platform-cli}/sf-test-agents.js

@@ -42,7 +42,7 @@ const runAgentTestsParam = z.object({
  * Returns:
  * - textResponse: Test result.
  */
-export const registerToolTestAgent = (server) => {
+export const testAgent = (server) => {
     server.tool('sf-test-agents', `Run Agent tests in an org.
 
 AGENT INSTRUCTIONS:

package/lib/{tools/testing → modules/platform-cli}/sf-test-apex.d.ts

@@ -15,8 +15,8 @@ declare const runApexTestsParam: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     codeCoverage: boolean;
     testLevel: TestLevel;
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     async: boolean;
     verbose: boolean;
     classNames?: string[] | undefined;
@@ -25,8 +25,8 @@ declare const runApexTestsParam: z.ZodObject<{
     testRunId?: string | undefined;
 }, {
     testLevel: TestLevel;
-    directory: string;
     usernameOrAlias: string;
+    directory: string;
     codeCoverage?: boolean | undefined;
     async?: boolean | undefined;
     classNames?: string[] | undefined;
@@ -36,5 +36,5 @@ declare const runApexTestsParam: z.ZodObject<{
     verbose?: boolean | undefined;
 }>;
 export type ApexRunTests = z.infer<typeof runApexTestsParam>;
-export declare const registerToolTestApex: (server: SfMcpServer) => void;
+export declare const testApex: (server: SfMcpServer) => void;
 export {};

package/lib/{tools/testing → modules/platform-cli}/sf-test-apex.js

@@ -69,7 +69,7 @@ RunSpecifiedTests="Run the Apex tests I specify, these will be specified in the
  * Returns:
  * - textResponse: Test result.
  */
-export const registerToolTestApex = (server) => {
+export const testApex = (server) => {
     server.tool('sf-test-apex', `Run Apex tests in an org.
 
 AGENT INSTRUCTIONS:

package/lib/modules/platform-cli/utils/tools.d.ts

@@ -0,0 +1,41 @@
+import { RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+/**
+ * Add a tool to the cache
+ */
+export declare function addTool(tool: RegisteredTool, name: string): Promise<{
+    success: boolean;
+    message: string;
+}>;
+/**
+ * Enable an individual tool
+ */
+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
+ */
+export declare function disableTool(toolName: string): Promise<{
+    success: boolean;
+    message: string;
+}>;
+/**
+ * Get individual tool status
+ */
+export declare function getToolStatus(toolName: string): Promise<{
+    enabled: boolean;
+    description: string;
+} | undefined>;
+/**
+ * List all individual tools with their status
+ */
+export declare function listAllTools(): Promise<Array<{
+    name: string;
+    enabled: boolean;
+    description: string;
+}>>;