Revert "[MCP] Async -> Sync Execution for server commands. (#28133)"

This reverts commit 8f104f5.

Author: notyashhh

tools/Mcp/README.md

@@ -54,21 +54,19 @@ This MCP server is designed to work with Azure PowerShell module development wor
 
 ### Add as mcp server in Github Copilot Agent mode
 
-- Ensure `pwsh` & `npm` is installed globally.
-- Simply add this mcp server to your workspace settings `.vscode/mcp.json` in VsCode to include:
+Simple add this mcp server to your user `settings.json` in VsCode to include:
 
 ```json
-{
-    "inputs": [],
-    "servers": {
-        "az-pwsh-mcp-server": {
+   "mcp": {
+      "servers": {
+         "az-pwsh-mcp-server": {
             "type": "stdio",
-            "command": "pwsh",
-            "args": ["-Command", "npm install --no-audit; npm run fresh"],
-            "cwd": "${workspaceFolder}/tools/Mcp",
-        }
-    }
-}
+            "command": "sh",
+            "args": ["-c", "npm install && npm run fresh"],
+            "cwd": "./azure-powershell/tools/Mcp",
+         },
+      }
+   }
 ```
 
 ### As an MCP Server
@@ -158,4 +156,4 @@ This tool is part of the Azure PowerShell project and follows the same contribut
 - [Azure PowerShell](https://github.com/Azure/azure-powershell)
 - [AutoRest](https://github.com/Azure/autorest)
 - [AutoRest PowerShell Extension](https://github.com/Azure/autorest.powershell)
-- [Model Context Protocol](https://modelcontextprotocol.io)
+- [Model Context Protocol](https://modelcontextprotocol.io)

tools/Mcp/src/CodegenServer.ts

@@ -115,4 +115,4 @@ export class CodegenServer {
         }
         return parameter;
     }
-}
+}

tools/Mcp/src/services/toolServices.ts

@@ -105,14 +105,14 @@ export const createExamplesFromSpecs = async <Args extends ZodRawShape>(args: Ar
     const workingDirectory = z.string().parse(Object.values(args)[0]);
     const examplePath = path.join(workingDirectory, "examples");
     const exampleSpecsPath = await utils.getExamplesFromSpecs(workingDirectory);
-    return [exampleSpecsPath, examplePath];
+    return [examplePath, exampleSpecsPath];
 }
 
 export const createTestsFromSpecs = async <Args extends ZodRawShape>(args: Args): Promise<string[]> => {
     const workingDirectory = z.string().parse(Object.values(args)[0]);
     const testPath = path.join(workingDirectory, "test");
     const exampleSpecsPath = await utils.getExamplesFromSpecs(workingDirectory);
-    return [exampleSpecsPath, testPath];
+    return [testPath, exampleSpecsPath];
 }
 
 export const toolServices = <Args extends ZodRawShape>(name: string, responseTemplate: string|undefined) => {

tools/Mcp/src/services/utils.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import yaml from "js-yaml";
 import { yamlContent } from '../types.js';
-import { execSync } from 'child_process';
+import { exec } from 'child_process';
 import path from 'path';
 
 const _pwshCD = (path: string): string => { return `pwsh -Command "$path = resolve-path ${path} | Set-Location"` }
@@ -21,13 +21,8 @@ function testYaml() {
 }
 
 export function generateAndBuild(workingDirectory: string): void {
-    const genBuildCommand = `${_pwshCD(workingDirectory)}; ${_autorest}; ${_pwshBuild};"`;
-    try {
-        const result = execSync(genBuildCommand, { stdio: 'inherit' });
-    } catch (error) {
-        console.error("Error executing command:", error);
-        throw error;
-    }
+    const command = [_pwshCD(workingDirectory), _autorest, _pwshBuild].join(";");
+    exec(command);
 }
 
 export function getYamlContentFromReadMe(readmePath: string): string {
@@ -96,13 +91,7 @@ export async function findAllPolyMorphism(workingDirectory: string): Promise<Map
 export async function getExamplesFromSpecs(workingDirectory: string): Promise<string> {
     const moduleReadmePath = path.join(workingDirectory, "README.md");
     const yamlContent: yamlContent = yaml.load(getYamlContentFromReadMe(moduleReadmePath)) as yamlContent;
-
-    if (!yamlContent['input-file']) {
-        throw new Error("'input-file' field is missing in the 'README.md' Autorest Config file.");
-    }
-
-    const inputFiles = Array.isArray(yamlContent['input-file']) ? yamlContent['input-file'] : [yamlContent['input-file']];
-    const swaggerUrls = getSwaggerUrl(yamlContent.commit, inputFiles);
+    const swaggerUrls = getSwaggerUrl(yamlContent.commit, yamlContent['input-file'] as string[]);
     const exampleSet: Set<string> = new Set<string>();
 
     const exampleSpecsPath = path.join(workingDirectory, "exampleSpecs");
@@ -142,7 +131,7 @@ export async function getExamplesFromSpecs(workingDirectory: string): Promise<st
                         continue;
                     }
                     const exJson = await exResponse.json();
-                    const exampleFileName = path.join(exampleSpecsPath, `${ex.name}`);
+                    const exampleFileName = path.join(exampleSpecsPath, `${ex.name}.json`);
                     fs.writeFileSync(exampleFileName, JSON.stringify(exJson, null, 2), 'utf8');
                     console.log(`Example saved to ${exampleFileName}`);
                     exampleSet.add(ex.download_url);