Use trimmed azmcp executable

Author: srnagar

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-azuremcp/src/main/java/com/microsoft/azure/toolkit/intellij/azuremcp/AzureMcpPackageManager.java

@@ -40,7 +40,7 @@ public synchronized File getAzureMcpExecutable() {
 
                 final Optional<GithubAsset> githubAsset = latestRelease.getAssets()
                         .stream()
-                        .filter(asset -> asset.getName().contains(platform))
+                        .filter(asset -> asset.getName().startsWith("azure-mcp-" + platform))
                         .findFirst();
 
                 if (githubAsset.isPresent()) {
@@ -189,5 +189,4 @@ private static String getArch() {
         throw new RuntimeException("Unsupported architecture: " + arch);
     }
 
-
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-azuremcp/src/main/java/com/microsoft/azure/toolkit/intellij/azuremcp/GithubClient.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
@@ -18,13 +19,14 @@
 import java.io.IOException;
 import java.util.List;
 
+@Slf4j
 public class GithubClient implements Closeable {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
             .configure(JsonParser.Feature.ALLOW_COMMENTS, true)
             .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
             .enable(SerializationFeature.INDENT_OUTPUT);
-    private static final String AZURE_MCP_RELEASE_URL = "https://aka.ms/azmcp/releases";
+    private static final String AZURE_MCP_RELEASE_URL = "https://api.github.com/repos/microsoft/mcp/releases";
     private static final TypeReference<List<GithubRelease>> GITHUB_RELEASE_LIST_TYPE = new TypeReference<>() {
     };
 
@@ -36,6 +38,8 @@ public GithubRelease getLatestAzureMcpRelease() {
             final List<GithubRelease> releases = OBJECT_MAPPER.readValue(response.getEntity().getContent(), GITHUB_RELEASE_LIST_TYPE);
             return releases.stream().findFirst().orElse(null);
         } catch (final IOException exception) {
+            log.error("Error getting latest Azure MCP release details: " + exception.getMessage());
+            AzureMcpUtils.logErrorTelemetryEvent("azmcp-get-latest-release-failed", exception);
             return null;
         }
     }
@@ -47,6 +51,8 @@ public boolean downloadToFile(String downloadUrl, File downloadFile) {
             downloadResponse.getEntity().getContent().transferTo(fos);
             return true;
         } catch (final IOException exception) {
+            log.error("Error downloading Azure MCP: " + exception.getMessage());
+            AzureMcpUtils.logErrorTelemetryEvent("azmcp-download-executable-failed", exception);
             return false;
         }
     }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-azuremcp/src/main/java/com/microsoft/azure/toolkit/intellij/azuremcp/GithubCopilotMcpInitializer.java

@@ -55,9 +55,9 @@ public Object execute(@NotNull Project project, @NotNull Continuation<? super Un
         logTelemetryEvent("azmcp-copilot-initialization-started");
         log.info("Running GitHub Copilot MCP initializer");
         try {
-            if (isCopilotMcpSupported()) {
+//            if (isCopilotMcpSupported()) {
                 initializeAzureMcpServer();
-            }
+//            }
             log.info("GitHub Copilot MCP initializer completed.");
         } catch (final Exception ex) {
             log.error("Error initializing Azure MCP Server: " + ex.getMessage(), ex);
@@ -93,16 +93,17 @@ private void configureMcpServer(File azMcpExe) throws Exception {
         log.info("Initializing Azure MCP Server");
         final String mcpConfigLocation = getConfigPath().getAbsolutePath() + "/mcp.json";
         final Path mcpConfigPath = Path.of(mcpConfigLocation);
-        final McpConfig mcpConfig;
+        McpConfig mcpConfig = new McpConfig();
         if (mcpConfigPath.toFile().exists()) {
             log.info("MCP configuration file already exists at: " + mcpConfigLocation);
             final String mcpContents = new String(Files.readAllBytes(mcpConfigPath));
-            mcpConfig = OBJECT_MAPPER.readValue(mcpContents, McpConfig.class);
+            if (!mcpContents.isEmpty()) {
+                mcpConfig = OBJECT_MAPPER.readValue(mcpContents, McpConfig.class);
+            }
         } else {
             // Generally, GitHub Copilot creates the mcp.json file. However, there is a possiblility that it's deleted.
             log.info("Creating MCP configuration directory: " + mcpConfigLocation);
             Files.createDirectories(mcpConfigPath.getParent());
-            mcpConfig = new McpConfig();
         }
         Map<String, McpServer> servers = mcpConfig.getServers();
         if (servers == null) {

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/META-INF/plugin.xml

@@ -8,6 +8,7 @@
   <description><![CDATA[
       <html>
         <p>The plugin allows Java developers to easily develop, configure, test, and deploy highly available and scalable Java applications to Azure. The plugin supports Azure App Service, Azure Functions, Azure Spring Apps, Azure Kubernetes, Azure Container Apps, Virtual Machines, Azure Database for MySQL, Azure Cosmos DB, SQL Server, Azure Storage, and Application Insights. It also supports Azure Synapse data engineers, Azure HDInsight developers and Apache Spark on SQL Server users to create, test and submit Apache Spark/Hadoop jobs to Azure from IntelliJ on all supported platforms.</p>
+        <p>This plugin also includes Azure MCP Server that adds smart, context-aware AI tools right inside GitHub Copilot for IntelliJ IDEA to help you work more efficiently with Azure resources. The Azure MCP Server supercharges your agents with Azure context across all the popular Azure services.</p>
         <ul>
           <li><a href="https://learn.microsoft.com/en-us/azure/developer/java/toolkit-for-intellij/create-hello-world-web-app">Azure Web App Workflow:</a> Run your web applications on Azure Web App and view logs.</li>
           <li><a href="https://learn.microsoft.com/en-us/azure/azure-functions/functions-create-maven-intellij?toc=%2Fazure%2Fdeveloper%2Fjava%2Ftoolkit-for-intellij%2Ftoc.json&bc=%2Fazure%2Fdeveloper%2Fjava%2Ftoolkit-for-intellij%2Fbreadcrumb%2Ftoc.json">Azure Functions Workflow:</a> Scaffold, run, debug your Functions App locally and deploy it on Azure.</li>