Skip to content

Commit 9a04be0

Browse files
committed
Update the Azure MCP server name from releases list
1 parent 97e76ea commit 9a04be0

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,18 @@ public class GithubClient implements Closeable {
2929
private static final String AZURE_MCP_RELEASE_URL = "https://api.github.com/repos/microsoft/mcp/releases";
3030
private static final TypeReference<List<GithubRelease>> GITHUB_RELEASE_LIST_TYPE = new TypeReference<>() {
3131
};
32+
private static final String AZURE_MCP_SERVER = "Azure.Mcp.Server";
3233

3334
private final CloseableHttpClient httpClient = HttpClients.createDefault();
3435

3536
public GithubRelease getLatestAzureMcpRelease() {
3637
final HttpUriRequest request = RequestBuilder.get().setUri(AZURE_MCP_RELEASE_URL).build();
3738
try (final CloseableHttpResponse response = httpClient.execute(request)) {
3839
final List<GithubRelease> releases = OBJECT_MAPPER.readValue(response.getEntity().getContent(), GITHUB_RELEASE_LIST_TYPE);
39-
return releases.stream().findFirst().orElse(null);
40+
return releases.stream()
41+
.filter(release -> release.getName() != null && release.getName().startsWith(AZURE_MCP_SERVER))
42+
.findFirst()
43+
.orElse(null);
4044
} catch (final IOException exception) {
4145
log.error("Error getting latest Azure MCP release details: " + exception.getMessage());
4246
AzureMcpUtils.logErrorTelemetryEvent("azmcp-get-latest-release-failed", exception);

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public class GithubCopilotMcpInitializer implements ProjectActivity, DumbAware,
3939

4040
private static final ComparableVersion LOWEST_SUPPORTED_COPILOT_VERSION = new ComparableVersion("1.5.50");
4141
private static final String COPILOT_PLUGIN_ID = "com.github.copilot";
42+
private static final String AZURE_MCP_SERVER_NAME = "Azure MCP Server IntelliJ";
43+
private static final String LEGACY_SERVER_NAME = "Azure MCP Server";
4244
private final AzureMcpPackageManager azureMcpPackageManager;
4345

4446
public GithubCopilotMcpInitializer() {
@@ -49,6 +51,7 @@ public GithubCopilotMcpInitializer() {
4951
public Object execute(@NotNull Project project, @NotNull Continuation<? super Unit> continuation) {
5052

5153
if (Registry.is("azure.mcp.ghcp.autoconfigure.disabled", false)) {
54+
logTelemetryEvent("azmcp-copilot-initialization-disabled");
5255
return null;
5356
}
5457

@@ -114,11 +117,15 @@ private void configureMcpServer(File azMcpExe) throws Exception {
114117
final McpServer azureMcpServer = new McpServer();
115118
azureMcpServer.setCommand(azMcpExe.getAbsolutePath());
116119
azureMcpServer.setArgs(Arrays.asList("server", "start"));
117-
if (servers.containsKey("Azure MCP Server")) {
118-
servers.remove("Azure MCP Server");
120+
servers.remove(LEGACY_SERVER_NAME); // legacy name - remove if it exists
121+
122+
if (servers.containsKey(AZURE_MCP_SERVER_NAME)) {
123+
final McpServer existingConfig = servers.get(AZURE_MCP_SERVER_NAME);
124+
if (!azureMcpServer.getCommand().equals(existingConfig.getCommand())) {
125+
servers.put(AZURE_MCP_SERVER_NAME, azureMcpServer);
126+
Files.writeString(mcpConfigPath, OBJECT_MAPPER.writeValueAsString(mcpConfig));
127+
}
119128
}
120-
servers.put("Azure MCP Server IntelliJ", azureMcpServer);
121-
Files.writeString(mcpConfigPath, OBJECT_MAPPER.writeValueAsString(mcpConfig));
122129
logTelemetryEvent("azmcp-copilot-initialization-success");
123130
}
124131

0 commit comments

Comments
 (0)