Merge branch 'main' into arun.tyagi/feature/pmd_apex_rule_creation_tool

Author: aruntyagiTutu

DEVELOPING.md

@@ -165,24 +165,18 @@ Quick options; see `packages/mcp/DEVELOPING.md` for full details and troubleshoo
 yarn workspace @salesforce/mcp build
 ```
 
-- Option A: start via the server’s start script (spawns MCP Inspector against the CLI bin):
-
-```bash
-yarn workspace @salesforce/mcp start
-```
-
-- Option B: use MCP Inspector (browser) directly against the built server (run inside the server package):
+- Option A: use MCP Inspector (browser) directly against the built server (run inside the server package):
 
 ```bash
 cd packages/mcp
-mcp-inspector node lib/index.js --orgs DEFAULT_TARGET_ORG
+mcp-inspector node bin/run.js --toolsets all --orgs DEFAULT_TARGET_ORG
 ```
 
-- Option C: use MCP Inspector CLI mode against the server’s CLI entry (run inside the server package):
+- Option B: use MCP Inspector CLI mode against the server’s CLI entry (run inside the server package):
 
 ```bash
 cd packages/mcp
-mcp-inspector --cli node bin/run.js --orgs DEFAULT_TARGET_ORG --method tools/list
+mcp-inspector --cli node bin/run.js --toolsets all --orgs DEFAULT_TARGET_ORG --method tools/list
 ```
 
 Notes:

packages/mcp-provider-devops/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.2.1](https://github.com/salesforcecli/mcp/compare/mcp-provider-devops@0.2.0...mcp-provider-devops@0.2.1) (2026-03-05)
+
+
+### Bug Fixes
+
+* Use getConnection instead of axios ([#398](https://github.com/salesforcecli/mcp/issues/398)) ([8894550](https://github.com/salesforcecli/mcp/commit/889455069660ccfe0e64672139d29239c4be0236))
+
+
+
 # [0.2.0](https://github.com/salesforcecli/mcp/compare/mcp-provider-devops@0.1.9...mcp-provider-devops@0.2.0) (2026-02-19)
 
 

packages/mcp-provider-devops/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/mcp-provider-devops",
   "description": "MCP provider for DevOps tools and operations",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "author": "Salesforce",
   "license": "Apache-2.0",
   "type": "module",
@@ -18,7 +18,6 @@
     "@salesforce/core": "^8.24.3",
     "@salesforce/source-deploy-retrieve": "^12.31.7",
     "@salesforce/ts-types": "^2.0.12",
-    "axios": "^1.10.0",
     "zod": "^3.25.76"
   },
   "devDependencies": {

packages/mcp-provider-devops/src/commitLiteWorkItem.ts

@@ -1,5 +1,4 @@
-import axios from 'axios';
-import { getConnection, getRequiredOrgs } from './shared/auth.js';
+import { type Connection } from '@salesforce/core';
 import { execFileSync } from 'child_process';
 import { normalizeAndValidateRepoPath } from './shared/pathUtils.js';
 import path from 'path';
@@ -8,68 +7,60 @@ import * as os from 'os';
 import { RegistryAccess } from '@salesforce/source-deploy-retrieve';
 import { convertToSourceComponents } from './shared/sfdxService.js';
 
+const API_VERSION = 'v65.0';
+
 interface Change {
     fullName: string;
     type: string;
     operation: string;
 }
 
-interface CommitWorkItemParams {
+export interface CommitWorkItemParams {
+    connection: Connection;
     workItem: { id: string };
     requestId: string;
     commitMessage: string;
-    username: string;
     repoPath?: string;
 }
 
-
+/**
+ * Commits work item changes (lite flow) using the provided Connection.
+ * API: POST /services/data/v65.0/connect/devops/workItems/<id>/commitlite
+ */
 export async function commitWorkItem({
+    connection,
     workItem,
     requestId,
     commitMessage,
-    username,
     repoPath
 }: CommitWorkItemParams): Promise<any> {
-    const connection = await getConnection(username);
-        const accessToken = connection.accessToken;
-        const instanceUrl = connection.instanceUrl;
-
-        if (!accessToken || !instanceUrl) {
-            throw new Error('Missing access token or instance URL. Please check if you are authenticated to the org.');
-        }
-
-
     const workingDir = normalizeAndValidateRepoPath(repoPath);
-
     const computedChanges = buildComputedChanges(workingDir);
-    
-    const { commitSha, branch } = AddAndCommitChanges(workingDir, commitMessage);
-
-    const url = `${instanceUrl}/services/data/v65.0/connect/devops/workItems/${workItem.id}/commitlite`;
-
-    const headers = {
-        'Authorization': `Bearer ${accessToken}`,
-        'Content-Type': 'application/json'
-    };
+    const { commitSha } = AddAndCommitChanges(workingDir, commitMessage);
 
+    const pathUrl = `/services/data/${API_VERSION}/connect/devops/workItems/${workItem.id}/commitlite`;
     const requestBody = {
         requestId,
         commitMessage,
-        'commitId': commitSha,
+        commitId: commitSha,
         changes: computedChanges
     };
 
     try {
-        const response = await axios.post(url, requestBody, { headers });
-
-    return {
+        await connection.request({
+            method: 'POST',
+            url: pathUrl,
+            body: JSON.stringify(requestBody),
+            headers: { 'Content-Type': 'application/json' }
+        });
+        return {
             content: [{
-              type: "text",
-              text: `Changes committed successfully.
+                type: "text",
+                text: `Changes committed successfully.
               Commit SHA: ${commitSha}
               Agent execution guide (perform these steps now)
               - Push the commit: 'git push'`,
-              actionRequired: true
+                actionRequired: true
             }],
             isError: false
         };