update commit status logic

Author: manandey

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

@@ -9,32 +9,52 @@ export interface CommitStatusResult {
 }
 
 export async function fetchCommitStatus(username: string, requestId: string): Promise<CommitStatusResult> {
+  if (!username || username.trim().length === 0) {
+    throw new Error('Username is required. Please provide the DevOps Center org username.');
+  }
+
   const connection = await getConnection(username);
-  const query = `SELECT Id, Status__c, RequestToken__c FROM DevopsRequestInfo WHERE RequestToken__c = '${requestId}' LIMIT 1`;
-
-  const response = await axios.get(`${connection.instanceUrl}/services/data/v65.0/query`, {
-    headers: {
-      'Authorization': `Bearer ${connection.accessToken}`,
-      'Content-Type': 'application/json'
-    },
-    params: { q: query }
-  });
-
-  if (response.data.records && response.data.records.length > 0) {
-    const record = response.data.records[0];
+  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.');
+  }
+
+  if (!requestId || requestId.trim().length === 0) {
+    throw new Error('Request ID is required to check commit status.');
+  }
+
+  const soqlQuery = `SELECT Status FROM DevopsRequestInfo WHERE RequestToken = '${requestId}'`;
+  const encodedQuery = encodeURIComponent(soqlQuery);
+  const url = `${instanceUrl}/services/data/v65.0/query/?q=${encodedQuery}`;
+  const headers = {
+    'Authorization': `Bearer ${accessToken}`,
+    'Content-Type': 'application/json'
+  };
+
+  try {
+    const response = await axios.get(url, { headers });
+    const records = response.data.records || [];
+
+    if (records.length === 0) {
+      return {
+        requestId,
+        status: 'NOT_FOUND',
+        message: `No commit status found for request ID: ${requestId}`
+      };
+    }
+
+    const status = records[0].Status;
     return {
       requestId,
-      status: record.Status__c,
-      recordId: record.Id,
-      message: `Request ${requestId} has status: ${record.Status__c}`
+      status,
+      recordId: records[0].Id,
+      message: `Commit status for request ID ${requestId}: ${status}`
     };
+  } catch (error: any) {
+    const errorMessage = error.response?.data?.[0]?.message || error.message;
+    throw new Error(`Error checking commit status: ${errorMessage}`);
   }
-
-  return {
-    requestId,
-    status: 'NOT_FOUND',
-    message: `No record found for request ID: ${requestId}`
-  };
 }
 
-

packages/mcp-provider-devops/src/tools/checkCommitStatus.ts

@@ -34,27 +34,45 @@ export class CheckCommitStatus extends McpTool<InputArgsShape, OutputArgsShape>
   public getConfig(): McpToolConfig<InputArgsShape, OutputArgsShape> {
     return {
       title: "Check Commit Status",
-      description: `Check the current status of a work item committed to DevOps Center.
+      description: `Checks the status of a specific commit by querying the "DevopsRequestInfo" Salesforce object using the RequestToken field.
 
-        **Use this tool to:**
-        - Check the status of a specific commit using its Request Id
-        - Verify commit processing completion before creating a pull request
-        - Ensure commits are ready for PR creation
+**Use this tool to:**
+- Check the status of a specific commit using its Request Token
+- Verify commit processing completion before creating a pull request
+- Ensure commits are ready for PR creation
 
-        **Input Parameters:**
-        - username: The username of the DevOps Center org to authenticate with
-        - requestId: The specific request Id to check status for (REQUIRED)
+**Input Parameters:**
+- username: The username of the DevOps Center org to authenticate with
+- requestId: The specific request token to check status for (REQUIRED)
 
-        **Output:**
-        - Status field value for the specified request Id
-        - Request Id and associated status information`,
+**Output:**
+- Status field value for the specified request token
+- Request token and associated status information`,
       inputSchema: inputSchema.shape,
       outputSchema: undefined,
     };
   }
 
   public async exec(input: InputArgs): Promise<CallToolResult> {
     try {
+      if (!input.username || input.username.trim().length === 0) {
+        return {
+          content: [{
+            type: "text",
+            text: `Error: Username is required. Please provide the DevOps Center org username.`
+          }]
+        };
+      }
+
+      if (!input.requestId || input.requestId.trim().length === 0) {
+        return {
+          content: [{
+            type: "text",
+            text: `Error: Request ID is required to check commit status.`
+          }]
+        };
+      }
+
       const status = await fetchCommitStatus(input.username, input.requestId);
       return {
         content: [{
@@ -66,7 +84,7 @@ export class CheckCommitStatus extends McpTool<InputArgsShape, OutputArgsShape>
       return {
         content: [{
           type: "text",
-          text: `Failed to check commit status: ${error.message}`
+          text: `Error checking commit status: ${error.message}`
         }],
         isError: true
       };