@W-19823688 - Fix commit status tool issue

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

@@ -113,6 +113,8 @@ export async function commitWorkItem({
         .split('\n').map(l => l.trim()).filter(Boolean);
     const untrackedRel = execFileSync('git', ['ls-files', '--others', '--exclude-standard'], { cwd: workingDir, encoding: 'utf8' })
         .split('\n').map(l => l.trim()).filter(Boolean);
+    const stagedRel = execFileSync('git', ['diff', '--cached', '--name-only'], { cwd: workingDir, encoding: 'utf8' })
+        .split('\n').map(l => l.trim()).filter(Boolean);
 
 
 
@@ -135,6 +137,11 @@ export async function commitWorkItem({
             if (isModified) operation = 'modify';
         }
 
+        if (!operation) {
+            const isStaged = stagedRel.some(p => isMatch(fileName, p));
+            if (isStaged) operation = 'modify';
+        }
+
         if (operation && componentType) {
             computedChanges.push({ fullName, type: componentType, operation });
         }

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

@@ -9,32 +9,51 @@ 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];
-    return {
-      requestId,
-      status: record.Status__c,
-      recordId: record.Id,
-      message: `Request ${requestId} has status: ${record.Status__c}`
-    };
+  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.');
   }
 
-  return {
-    requestId,
-    status: 'NOT_FOUND',
-    message: `No record found for request ID: ${requestId}`
+  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,
+      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}`);
+  }
+}