Merge pull request #5 from advancedcommunities/fix-deployment

akutishevsky · web-flow · commit 7388a1a0d03c · 2025-10-22T09:20:11.000+03:00
Fix deployment
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.4] - 2025-10-22
+
+### Fixed
+
+- **Salesforce CLI Error Handling**: Fixed `executeSfCommand` to properly parse and return JSON error responses from Salesforce CLI
+    - When SF CLI commands fail with `--json` flag, errors are now properly captured from stdout
+    - Error details (name, message, exitCode, context, stack) are now correctly returned to MCP clients
+    - Fixes issue where deployment errors like "No source-backed components present in the package" were not visible
+    - Maintains backward compatibility with existing error handling
+
 ## [1.5.3] - 2025-09-20
 
 ### Fixed
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "dxt_version": "0.2",
     "name": "salesforce-mcp-server",
     "display_name": "Salesforce MCP Server",
-    "version": "1.5.3",
+    "version": "1.5.4",
     "description": "Salesforce MCP Server - Interact with Salesforce orgs through AI assistants",
     "icon": "icon.png",
     "long_description": "Enables AI assistants to execute Apex code, query Salesforce data, and manage org metadata using your existing Salesforce CLI authentication. Perfect for developers and administrators who want to automate Salesforce tasks through natural language interactions.\n\nSupports environment variables:\n- READ_ONLY=true - Prevents Apex code execution\n- ALLOWED_ORGS=ALL or comma-separated org list - Restricts access to specific orgs (default: ALL)",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@advanced-communities/salesforce-mcp-server",
-    "version": "1.5.3",
+    "version": "1.5.4",
     "description": "MCP server enabling AI assistants to interact with Salesforce orgs through the Salesforce CLI",
     "main": "./src/index.ts",
     "scripts": {
diff --git a/src/index.ts b/src/index.ts
@@ -49,7 +49,7 @@ function buildServerDescription(): string {
 
 const server = new McpServer({
     name: "salesforce-mcp-server",
-    version: "1.5.0",
+    version: "1.5.4",
     description: buildServerDescription(),
     capabilities: {
         tools: {},
diff --git a/src/utils/sfCommand.ts b/src/utils/sfCommand.ts
@@ -33,7 +33,9 @@ function findSfPath(): string {
     }
 
     const currentPlatform = platform();
-    const pathsToCheck = COMMON_SF_PATHS[currentPlatform as keyof typeof COMMON_SF_PATHS] || COMMON_SF_PATHS.linux;
+    const pathsToCheck =
+        COMMON_SF_PATHS[currentPlatform as keyof typeof COMMON_SF_PATHS] ||
+        COMMON_SF_PATHS.linux;
 
     for (const path of pathsToCheck) {
         if (path && existsSync(path)) {
@@ -51,29 +53,50 @@ export function executeSfCommand(command: string): Promise<any> {
     const fullCommand = command.replace(/^sf\s+/, `"${sfPath}" `);
 
     return new Promise((resolve, reject) => {
-        exec(fullCommand, { maxBuffer: 50 * 1024 * 1024 }, (error, stdout, stderr) => {
-            if (error) {
-                if (error.message.includes("command not found") || error.message.includes("is not recognized")) {
-                    reject(new Error(
-                        "Salesforce CLI (sf) not found. Please ensure it is installed and accessible. " +
-                        "Visit https://developer.salesforce.com/tools/salesforcecli for installation instructions."
-                    ));
-                } else {
+        exec(
+            fullCommand,
+            { maxBuffer: 50 * 1024 * 1024 },
+            (error, stdout, stderr) => {
+                if (error) {
+                    if (
+                        error.message.includes("command not found") ||
+                        error.message.includes("is not recognized")
+                    ) {
+                        reject(
+                            new Error(
+                                "Salesforce CLI (sf) not found. Please ensure it is installed and accessible. " +
+                                    "Visit https://developer.salesforce.com/tools/salesforcecli for installation instructions."
+                            )
+                        );
+                        return;
+                    }
+                    // When --json flag is used, SF CLI returns errors as JSON in stdout
+                    // Try to parse stdout as JSON error response
+                    if (stdout && stdout.trim().length > 0) {
+                        try {
+                            const result = JSON.parse(stdout);
+                            // If it's a valid JSON response (error or success), return it
+                            resolve(result);
+                            return;
+                        } catch (parseError) {
+                            // If JSON parsing fails, fall through to reject with original error
+                        }
+                    }
                     reject(error);
+                    return;
+                }
+                if (stderr && !stderr.includes("Warning")) {
+                    reject(new Error(stderr));
+                    return;
+                }
+                try {
+                    const result = JSON.parse(stdout);
+                    resolve(result);
+                } catch (parseError) {
+                    reject(parseError);
                 }
-                return;
-            }
-            if (stderr && !stderr.includes("Warning")) {
-                reject(new Error(stderr));
-                return;
-            }
-            try {
-                const result = JSON.parse(stdout);
-                resolve(result);
-            } catch (parseError) {
-                reject(parseError);
             }
-        });
+        );
     });
 }
 
@@ -82,26 +105,39 @@ export function executeSfCommandRaw(command: string): Promise<string> {
     const fullCommand = command.replace(/^sf\s+/, `"${sfPath}" `);
 
     return new Promise((resolve, reject) => {
-        exec(fullCommand, { maxBuffer: 50 * 1024 * 1024 }, (error, stdout, stderr) => {
-            if (error) {
-                if (error.message.includes("command not found") || error.message.includes("is not recognized")) {
-                    reject(new Error(
-                        "Salesforce CLI (sf) not found. Please ensure it is installed and accessible. " +
-                        "Visit https://developer.salesforce.com/tools/salesforcecli for installation instructions."
-                    ));
-                } else {
-                    // For scanner commands, non-zero exit code with stdout means violations were found
-                    // We should still return the output in this case
-                    if (stdout && (command.includes("scanner") || command.includes("code-analyzer"))) {
-                        resolve(stdout);
-                        return;
+        exec(
+            fullCommand,
+            { maxBuffer: 50 * 1024 * 1024 },
+            (error, stdout, stderr) => {
+                if (error) {
+                    if (
+                        error.message.includes("command not found") ||
+                        error.message.includes("is not recognized")
+                    ) {
+                        reject(
+                            new Error(
+                                "Salesforce CLI (sf) not found. Please ensure it is installed and accessible. " +
+                                    "Visit https://developer.salesforce.com/tools/salesforcecli for installation instructions."
+                            )
+                        );
+                    } else {
+                        // For scanner commands, non-zero exit code with stdout means violations were found
+                        // We should still return the output in this case
+                        if (
+                            stdout &&
+                            (command.includes("scanner") ||
+                                command.includes("code-analyzer"))
+                        ) {
+                            resolve(stdout);
+                            return;
+                        }
+                        reject(error);
                     }
-                    reject(error);
+                    return;
                 }
-                return;
+                // Return raw stdout without JSON parsing
+                resolve(stdout);
             }
-            // Return raw stdout without JSON parsing
-            resolve(stdout);
-        });
+        );
     });
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@advanced-communities/salesforce-mcp-server",`
`3`		`- "version": "1.5.3",`
	`3`	`+ "version": "1.5.4",`
`4`	`4`	`"description": "MCP server enabling AI assistants to interact with Salesforce orgs through the Salesforce CLI",`
`5`	`5`	`"main": "./src/index.ts",`
`6`	`6`	`"scripts": {`