@salesforce/mcp 0.17.2-dev.2 → 0.18.0

package/lib/index.d.ts

@@ -4,11 +4,12 @@ export default class McpServerCommand extends Command {
     static description: string;
     static flags: {
         orgs: import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
-        toolsets: import("@oclif/core/interfaces").OptionFlag<(import("@salesforce/mcp-provider-api/src/toolset.js").Toolset | "all")[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        toolsets: import("@oclif/core/interfaces").OptionFlag<(import("@salesforce/mcp-provider-api/src/enums.js").Toolset | "all")[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         version: import("@oclif/core/interfaces").BooleanFlag<void>;
         'no-telemetry': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'dynamic-tools': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'allow-non-ga-tools': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static examples: {
         description: string;

package/lib/index.js

@@ -92,6 +92,9 @@ You can also use special values to control access to orgs:
             char: 'd',
             exclusive: ['toolsets'],
         }),
+        'allow-non-ga-tools': Flags.boolean({
+            summary: 'Enable the ability to register tools that are not yet generally available (GA)',
+        }),
     };
     static examples = [
         {
@@ -106,6 +109,10 @@ You can also use special values to control access to orgs:
             description: 'Allow access to 3 specific orgs and enable all toolsets',
             command: '<%= config.bin %> --orgs test-org@example.com,my-dev-hub,my-alias',
         },
+        {
+            description: 'Allow tools that are not generally available (GA) to be registered with the server',
+            command: '<%= config.bin %> --orgs DEFAULT_TARGET_ORG --allow-non-ga-tools',
+        },
     ];
     telemetry;
     async run() {
@@ -135,7 +142,7 @@ You can also use special values to control access to orgs:
         });
         await maybeBuildIndex(this.config.dataDir);
         const services = new Services({ telemetry: this.telemetry, dataDir: this.config.dataDir });
-        await registerToolsets(flags.toolsets ?? ['all'], flags['dynamic-tools'] ?? false, server, services);
+        await registerToolsets(flags.toolsets ?? ['all'], flags['dynamic-tools'] ?? false, flags['allow-non-ga-tools'] ?? false, server, services);
         const transport = new StdioServerTransport();
         await server.connect(transport);
         console.error(`✅ Salesforce MCP Server v${this.config.version} running on stdio`);

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

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { McpTool, McpToolConfig, Toolset } from '@salesforce/mcp-provider-api';
+import { McpTool, McpToolConfig, ReleaseState, Toolset } from '@salesforce/mcp-provider-api';
 import { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
 import { SfMcpServer } from '../sf-mcp-server.js';
 declare const enableToolsParamsSchema: z.ZodObject<{
@@ -15,6 +15,7 @@ type OutputArgsShapeType = z.ZodRawShape;
 export declare class EnableToolsMcpTool extends McpTool<InputArgsShapeType, OutputArgsShapeType> {
     private readonly server;
     constructor(server: SfMcpServer);
+    getReleaseState(): ReleaseState;
     getToolsets(): Toolset[];
     getName(): string;
     getConfig(): McpToolConfig<InputArgsShapeType, OutputArgsShapeType>;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { z } from 'zod';
-import { McpTool, Toolset } from '@salesforce/mcp-provider-api';
+import { McpTool, ReleaseState, Toolset } from '@salesforce/mcp-provider-api';
 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'),
@@ -25,6 +25,9 @@ export class EnableToolsMcpTool extends McpTool {
         super();
         this.server = server;
     }
+    getReleaseState() {
+        return ReleaseState.GA;
+    }
     getToolsets() {
         return [Toolset.CORE];
     }

package/lib/tools/sf-list-tools.d.ts

@@ -1,7 +1,8 @@
-import { McpTool, McpToolConfig, Toolset } from '@salesforce/mcp-provider-api';
+import { McpTool, McpToolConfig, ReleaseState, Toolset } from '@salesforce/mcp-provider-api';
 import { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
 export declare class ListToolsMcpTool extends McpTool {
     getToolsets(): Toolset[];
+    getReleaseState(): ReleaseState;
     getName(): string;
     getConfig(): McpToolConfig;
     exec(): Promise<CallToolResult>;

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

@@ -13,12 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { McpTool, Toolset } from '@salesforce/mcp-provider-api';
+import { McpTool, ReleaseState, Toolset } from '@salesforce/mcp-provider-api';
 import { listAllTools } from '../utils/tools.js';
 export class ListToolsMcpTool extends McpTool {
     getToolsets() {
         return [Toolset.CORE];
     }
+    getReleaseState() {
+        return ReleaseState.GA;
+    }
     getName() {
         return 'sf-list-tools';
     }

package/lib/tools/sf-suggest-cli-command.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { McpTool, McpToolConfig, Toolset, Services } from '@salesforce/mcp-provider-api';
+import { McpTool, McpToolConfig, Toolset, Services, ReleaseState } from '@salesforce/mcp-provider-api';
 import { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
 /**
  * Suggest a Salesforce CLI (sf) command based on user input.
@@ -17,6 +17,7 @@ type OutputArgsShape = z.ZodRawShape;
 export declare class SuggestCliCommandMcpTool extends McpTool<InputArgsShape, OutputArgsShape> {
     private readonly services;
     constructor(services: Services);
+    getReleaseState(): ReleaseState;
     getToolsets(): Toolset[];
     getName(): string;
     getConfig(): McpToolConfig<InputArgsShape, OutputArgsShape>;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { z } from 'zod';
-import { McpTool, Toolset } from '@salesforce/mcp-provider-api';
+import { McpTool, Toolset, ReleaseState } from '@salesforce/mcp-provider-api';
 import { getAssets } from '../utils/assets.js';
 /**
  * Suggest a Salesforce CLI (sf) command based on user input.
@@ -28,6 +28,9 @@ export class SuggestCliCommandMcpTool extends McpTool {
         super();
         this.services = services;
     }
+    getReleaseState() {
+        return ReleaseState.GA;
+    }
     getToolsets() {
         return [Toolset.CORE];
     }

package/lib/utils/registry-utils.d.ts

@@ -1,4 +1,4 @@
 import { Toolset } from '@salesforce/mcp-provider-api';
 import { SfMcpServer } from '../sf-mcp-server.js';
 import { Services } from '../services.js';
-export declare function registerToolsets(toolsets: Array<Toolset | 'all'>, useDynamicTools: boolean, server: SfMcpServer, services: Services): Promise<void>;
+export declare function registerToolsets(toolsets: Array<Toolset | 'all'>, useDynamicTools: boolean, allowNonGaTools: boolean, server: SfMcpServer, services: Services): Promise<void>;

package/lib/utils/registry-utils.js

@@ -14,42 +14,49 @@
  * limitations under the License.
  */
 import { ux } from '@oclif/core';
-import { MCP_PROVIDER_API_VERSION, Toolset, TOOLSETS, } from '@salesforce/mcp-provider-api';
+import { MCP_PROVIDER_API_VERSION, ReleaseState, Toolset, TOOLSETS, } from '@salesforce/mcp-provider-api';
 import { MCP_PROVIDER_REGISTRY } from '../registry.js';
 import { addTool } from '../utils/tools.js';
 import { createDynamicServerTools } from '../main-server-provider.js';
-export async function registerToolsets(toolsets, useDynamicTools, server, services) {
+export async function registerToolsets(toolsets, useDynamicTools, allowNonGaTools, server, services) {
     if (useDynamicTools) {
         const dynamicTools = createDynamicServerTools(server);
-        ux.stderr('Registering dynamic tools');
+        ux.stderr('Registering dynamic tools.');
         // eslint-disable-next-line no-await-in-loop
-        await registerTools(dynamicTools, server, useDynamicTools);
+        await registerTools(dynamicTools, server, useDynamicTools, allowNonGaTools);
     }
     else {
-        ux.stderr('Skipping registration of dynamic tools');
+        ux.stderr('Skipping registration of dynamic tools.');
     }
     const toolsetsToEnable = toolsets.includes('all')
-        ? new Set(TOOLSETS.filter((ts) => ts !== Toolset.EXPERIMENTAL))
-        : new Set([Toolset.CORE, ...toolsets]);
+        ? new Set(TOOLSETS) : new Set([Toolset.CORE, ...toolsets]);
     const newToolRegistry = await createToolRegistryFromProviders(MCP_PROVIDER_REGISTRY, services);
     for (const toolset of TOOLSETS) {
         if (toolsetsToEnable.has(toolset)) {
-            ux.stderr(`Registering ${toolset} tools`);
+            ux.stderr(`Registering tools from the '${toolset}' toolset.`);
             // eslint-disable-next-line no-await-in-loop
-            await registerTools(newToolRegistry[toolset], server, useDynamicTools);
+            await registerTools(newToolRegistry[toolset], server, useDynamicTools, allowNonGaTools);
         }
         else {
-            ux.stderr(`Skipping registration of ${toolset} tools`);
+            ux.stderr(`Skipping registration of the tools from the '${toolset}' toolset.`);
         }
     }
 }
-async function registerTools(tools, server, useDynamicTools) {
+async function registerTools(tools, server, useDynamicTools, allowNonGaTools) {
     for (const tool of tools) {
+        if (!allowNonGaTools && tool.getReleaseState() === ReleaseState.NON_GA) {
+            ux.stderr(`* Skipping registration of non-ga tool '${tool.getName()}' because the '--allow-non-ga-tools' flag was not set at server startup.`);
+            continue;
+        }
         const registeredTool = server.registerTool(tool.getName(), tool.getConfig(), (...args) => tool.exec(...args));
         const toolsets = tool.getToolsets();
         if (useDynamicTools && !toolsets.includes(Toolset.CORE)) {
+            ux.stderr(`* Registering tool '${tool.getName()}' but marking it as disabled for now because the server is set for dynamic tool loading.`);
             registeredTool.disable();
         }
+        else {
+            ux.stderr(`* Registering tool '${tool.getName()}'.`);
+        }
         // eslint-disable-next-line no-await-in-loop
         await addTool(registeredTool, tool.getName());
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/mcp",
-  "version": "0.17.2-dev.2",
+  "version": "0.18.0",
   "description": "MCP Server for interacting with Salesforce instances",
   "bin": {
     "sf-mcp-server": "bin/run.js"
@@ -49,9 +49,9 @@
     "@salesforce/apex-node": "^8.2.1",
     "@salesforce/core": "^8.18.0",
     "@salesforce/kit": "^3.1.6",
-    "@salesforce/mcp-provider-api": "^0.1.0",
-    "@salesforce/mcp-provider-dx-core": "^0.1.2",
-    "@salesforce/mcp-provider-code-analyzer": "^0.0.1",
+    "@salesforce/mcp-provider-api": "0.2.0",
+    "@salesforce/mcp-provider-dx-core": "0.2.0",
+    "@salesforce/mcp-provider-code-analyzer": "0.0.2",
     "@salesforce/source-deploy-retrieve": "^12.22.0",
     "@salesforce/source-tracking": "^7.4.8",
     "@salesforce/telemetry": "^6.1.0",