Merge remote-tracking branch 'origin/develop' into develop.next

Author: wangmingliang-ms

CHANGELOG.md

@@ -3,6 +3,7 @@
 All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.
 
 - [Change Log](#change-log)
+  - [3.96.2](#3962)
   - [3.96.1](#3961)
   - [3.95.0](#3950)
   - [3.94.0](#3940)
@@ -118,6 +119,9 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.96.2
+- Configure GitHub Copilot with trimmed Azure MCP server for faster startup and a smaller footprint.
+
 ## 3.96.1
 - Configure Azure MCP server for GitHub Copilot
 - Integrate azd to Azure Explorer 

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.96.1</version>
+    <version>3.96.2</version>
   </parent>
   <groupId>com.microsoft.azuretools</groupId>
   <artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -39,7 +39,7 @@
   </organization>
 
   <properties>
-    <azuretool.version>3.96.1</azuretool.version>
+    <azuretool.version>3.96.2</azuretool.version>
     <azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
     <azure.toolkit-lib.version>0.52.2</azure.toolkit-lib.version>
   </properties>

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

@@ -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/azure-intellij-plugin-base/gradle.properties

@@ -1,4 +1,4 @@
-pluginVersion=3.96.1
+pluginVersion=3.96.2
 intellijDisplayVersion=2024.2
 intellij_version=IU-242-EAP-SNAPSHOT
 scala_plugin=org.intellij.scala:2024.2.5

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

@@ -2,7 +2,7 @@
              xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.microsoft.tooling.msservices.intellij.azure</id>
   <name>Azure Toolkit</name>
-  <version>3.96.1</version>
+  <version>3.96.2</version>
   <vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
 
   <description>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/resources/whatsnew.md

@@ -1,6 +1,9 @@
 <!-- Version: 3.88.0 -->
 # What's new in Azure Toolkit for IntelliJ
 
+## 3.96.2
+- Configure GitHub Copilot with trimmed Azure MCP server for faster startup and a smaller footprint.
+
 ## 3.96.1
 - Configure Azure MCP server for GitHub Copilot
 - Integrate azd to Azure Explorer 

PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties

@@ -1,4 +1,4 @@
-pluginVersion=3.96.1
+pluginVersion=3.96.2
 intellijDisplayVersion=2025.2
 intellij_version=252-EAP-SNAPSHOT
 platformVersion=252.23309.22

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

@@ -2,12 +2,13 @@
              xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.microsoft.tooling.msservices.intellij.azure</id>
   <name>Azure Toolkit for IntelliJ</name>
-  <version>3.96.1</version>
+  <version>3.96.2</version>
   <vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
 
   <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. For more details, please refer to <a href="https://learn.microsoft.com/azure/developer/azure-mcp-server/">Azure MCP Server documentation.</a></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>
@@ -27,11 +28,9 @@
   <change-notes>
     <![CDATA[
     <html>
-      <h2 id="3-96-1">3.96.1</h2>
+      <h2 id="3-96-2">3.96.2</h2>
       <ul>
-      <li>Configure Azure MCP server for GitHub Copilot.</li>
-      <li>Integrate azd to Azure Explorer.</li>
-      <li>Fix some known issues.</li>
+      <li>Configure GitHub Copilot with trimmed Azure MCP server for faster startup and a smaller footprint.</li>
       </ul>
       <p>You may get the full change log <a href="https://github.com/Microsoft/azure-tools-for-java/blob/develop/CHANGELOG.md">here</a></p>
     </html>