@salesforce/mcp 0.19.2-dev.0 → 0.20.0

package/lib/index.js

@@ -139,12 +139,20 @@ You can also use special values to control access to orgs:
         }, {
             telemetry: this.telemetry,
         });
-        const services = new Services({ telemetry: this.telemetry, dataDir: this.config.dataDir });
+        const services = new Services({
+            telemetry: this.telemetry,
+            dataDir: this.config.dataDir,
+            // Startup flags that could be useful to reference inside of a MCP tool
+            startupFlags: {
+                // !! Never pass the 'orgs' flag here. Use 'getOrgService()'.
+                'allow-non-ga-tools': flags['allow-non-ga-tools'],
+                debug: flags.debug,
+            },
+        });
         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`);
-        console.error('BUNDLE BUILD TESTING');
     }
     async catch(error) {
         if (!this.telemetry && !process.argv.includes('--no-telemetry')) {

package/lib/registry.js

@@ -15,10 +15,16 @@
  */
 import { DxCoreMcpProvider } from '@salesforce/mcp-provider-dx-core';
 import { CodeAnalyzerMcpProvider } from '@salesforce/mcp-provider-code-analyzer';
+import { LwcExpertsMcpProvider } from '@salesforce/mcp-provider-lwc-experts';
+import { AuraExpertsMcpProvider } from '@salesforce/mcp-provider-aura-experts';
+import { MobileWebMcpProvider } from '@salesforce/mcp-provider-mobile-web';
 /** -------- ADD McpProvider INSTANCES HERE ------------------------------------------------------------------------- */
 export const MCP_PROVIDER_REGISTRY = [
     new DxCoreMcpProvider(),
     new CodeAnalyzerMcpProvider(),
+    new LwcExpertsMcpProvider(),
+    new AuraExpertsMcpProvider(),
+    new MobileWebMcpProvider(),
     // Add new instances here
 ];
 //# sourceMappingURL=registry.js.map

package/lib/services.d.ts

@@ -1,10 +1,12 @@
-import { Services as IServices, TelemetryService, OrgService, ConfigService } from '@salesforce/mcp-provider-api';
+import { Services as IServices, TelemetryService, OrgService, ConfigService, StartupFlags } from '@salesforce/mcp-provider-api';
 export declare class Services implements IServices {
     private readonly telemetry;
     private readonly dataDir;
+    private readonly startupFlags;
     constructor(opts: {
         telemetry: TelemetryService | undefined;
         dataDir: string;
+        startupFlags: StartupFlags;
     });
     getTelemetryService(): TelemetryService;
     getConfigService(): ConfigService;

package/lib/services.js

@@ -3,9 +3,11 @@ import { getConnection, getDefaultTargetOrg, getDefaultTargetDevHub, getAllAllow
 export class Services {
     telemetry;
     dataDir;
+    startupFlags;
     constructor(opts) {
         this.telemetry = opts.telemetry ? opts.telemetry : new NoopTelemetryService();
         this.dataDir = opts.dataDir;
+        this.startupFlags = opts.startupFlags;
     }
     getTelemetryService() {
         return this.telemetry;
@@ -13,6 +15,7 @@ export class Services {
     getConfigService() {
         return {
             getDataDir: () => this.dataDir,
+            getStartupFlags: () => this.startupFlags,
         };
     }
     getOrgService() {

package/lib/sf-mcp-server.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { Logger } from '@salesforce/core-bundle';
+import { Logger } from '@salesforce/core';
 import { createRateLimiter } from './utils/rate-limiter.js';
 /**
  * A server implementation that extends the base MCP server with telemetry and rate limiting capabilities.

package/lib/utils/auth.d.ts

@@ -1,4 +1,4 @@
-import { Connection, type OrgAuthorization } from '@salesforce/core-bundle';
+import { Connection, type OrgAuthorization } from '@salesforce/core';
 import { type OrgConfigInfo, type SanitizedOrgAuthorization } from '@salesforce/mcp-provider-api';
 /**
  * Sanitizes org authorization data by filtering out sensitive fields

package/lib/utils/auth.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AuthInfo, Connection, ConfigAggregator, OrgConfigProperties } from '@salesforce/core-bundle';
+import { AuthInfo, Connection, ConfigAggregator, OrgConfigProperties } from '@salesforce/core';
 import Cache from './cache.js';
 /**
  * Sanitizes org authorization data by filtering out sensitive fields

package/lib/utils/cache.js

@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// import { Mutex } from '@salesforce/core-bundle';
-import pkg from '@salesforce/core-bundle';
-const { Mutex } = pkg;
+import { Mutex } from '@salesforce/core';
 /**
  * A thread-safe cache providing generic Map operations with mutex protection.
  * Offers atomic read, write, and update operations for concurrent access.

package/lib/utils/registry-utils.js

@@ -16,7 +16,7 @@
 import { ux } from '@oclif/core';
 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 { addTool, isToolRegistered } from '../utils/tools.js';
 import { createDynamicServerTools } from '../main-server-provider.js';
 export async function registerToolsets(toolsets, useDynamicTools, allowNonGaTools, server, services) {
     if (useDynamicTools) {
@@ -29,7 +29,8 @@ export async function registerToolsets(toolsets, useDynamicTools, allowNonGaTool
         ux.stderr('Skipping registration of dynamic tools.');
     }
     const toolsetsToEnable = toolsets.includes('all')
-        ? new Set(TOOLSETS) : 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)) {
@@ -48,6 +49,11 @@ async function registerTools(tools, server, useDynamicTools, allowNonGaTools) {
             ux.stderr(`* Skipping registration of non-ga tool '${tool.getName()}' because the '--allow-non-ga-tools' flag was not set at server startup.`);
             continue;
         }
+        // eslint-disable-next-line no-await-in-loop
+        if (await isToolRegistered(tool.getName())) {
+            ux.stderr(`* Skipping registration of tool '${tool.getName()}' because it is already registered.`);
+            continue;
+        }
         const registeredTool = server.registerTool(tool.getName(), tool.getConfig(), (...args) => tool.exec(...args));
         const toolsets = tool.getToolsets();
         if (useDynamicTools && !toolsets.includes(Toolset.CORE)) {

package/lib/utils/tools.d.ts

@@ -6,6 +6,13 @@ export declare function addTool(tool: RegisteredTool, name: string): Promise<{
     success: boolean;
     message: string;
 }>;
+/**
+ * Check if a tool is registered
+ *
+ * @param toolName The name of the tool to check
+ * @returns True if the tool is registered, false otherwise
+ */
+export declare function isToolRegistered(toolName: string): Promise<boolean>;
 /**
  * Enable an individual tool
  */

package/lib/utils/tools.js

@@ -18,10 +18,7 @@ import Cache from './cache.js';
  * Add a tool to the cache
  */
 export async function addTool(tool, name) {
-    const existingTools = await Cache.safeGet('tools');
-    // Check if tool already exists
-    const existingTool = existingTools.find((t) => t.name === name);
-    if (existingTool) {
+    if (await isToolRegistered(name)) {
         return { success: false, message: `Tool ${name} already exists` };
     }
     await Cache.safeUpdate('tools', (toolsArray) => {
@@ -33,6 +30,16 @@ export async function addTool(tool, name) {
     });
     return { success: true, message: `Added tool ${name}` };
 }
+/**
+ * Check if a tool is registered
+ *
+ * @param toolName The name of the tool to check
+ * @returns True if the tool is registered, false otherwise
+ */
+export async function isToolRegistered(toolName) {
+    const existingTools = await Cache.safeGet('tools');
+    return existingTools.some((t) => t.name === toolName);
+}
 /**
  * Enable an individual tool
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/mcp",
-  "version": "0.19.2-dev.0",
+  "version": "0.20.0",
   "description": "MCP Server for interacting with Salesforce instances",
   "bin": {
     "sf-mcp-server": "bin/run.js"
@@ -44,15 +44,18 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.16.0",
     "@oclif/core": "^4.5.1",
-    "@salesforce/agents-bundle": "^0.17.5",
-    "@salesforce/apex-node-bundle": "^8.2.8",
-    "@salesforce/core-bundle": "^8.21.0",
+    "@salesforce/agents": "^0.15.4",
+    "@salesforce/apex-node": "^8.2.1",
+    "@salesforce/core": "^8.18.0",
     "@salesforce/kit": "^3.1.6",
-    "@salesforce/mcp-provider-api": "0.2.0",
-    "@salesforce/mcp-provider-dx-core": "0.2.2",
+    "@salesforce/mcp-provider-api": "0.2.1",
+    "@salesforce/mcp-provider-dx-core": "0.2.3",
     "@salesforce/mcp-provider-code-analyzer": "0.0.2",
-    "@salesforce/source-deploy-retrieve-bundle": "^12.22.9",
-    "@salesforce/source-tracking-bundle": "^7.4.9",
+    "@salesforce/mcp-provider-lwc-experts": "0.1.1",
+    "@salesforce/mcp-provider-aura-experts": "0.1.1",
+    "@salesforce/mcp-provider-mobile-web": "0.0.2",
+    "@salesforce/source-deploy-retrieve": "^12.22.0",
+    "@salesforce/source-tracking": "^7.4.8",
     "@salesforce/telemetry": "^6.1.0",
     "@salesforce/ts-types": "^2.0.11",
     "zod": "^3.25.76"