From 2692358b749dc82ca8534019d913843b52d2222d Mon Sep 17 00:00:00 2001 From: Connie Yau Date: Fri, 24 Oct 2025 14:15:36 -0700 Subject: [PATCH 1/5] Make registry error message more descriptive. --- .../src/Areas/Server/Commands/ToolLoading/RegistryToolLoader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/RegistryToolLoader.cs b/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/RegistryToolLoader.cs index 237144335b..4216350274 100644 --- a/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/RegistryToolLoader.cs +++ b/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/RegistryToolLoader.cs @@ -122,7 +122,7 @@ public override async ValueTask CallToolHandler(RequestContext Date: Fri, 24 Oct 2025 14:16:16 -0700 Subject: [PATCH 2/5] Set ToolArea and ToolName in single proxy mode. --- .../ToolLoading/SingleProxyToolLoader.cs | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/SingleProxyToolLoader.cs b/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/SingleProxyToolLoader.cs index f0b9942df9..987a152749 100644 --- a/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/SingleProxyToolLoader.cs +++ b/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/SingleProxyToolLoader.cs @@ -162,6 +162,11 @@ Run again with the "learn" argument to get a list of available tools and their p }; } + /// + /// Gets all of the 's available in the server. + /// + /// A JSON serialized string with each area's name and a description of operations available in + /// that namespace. private async Task GetRootToolsJsonAsync() { if (_cachedRootToolsJson != null) @@ -187,6 +192,12 @@ private async Task GetRootToolsJsonAsync() return toolsJson; } + /// + /// Gets the set of within an . + /// + /// Calling request + /// Name of the to get commands for. + /// JSON serialized string representing the list of commands available in the tool's area. private async Task GetToolListJsonAsync(RequestContext request, string tool) { if (_cachedToolListsJson.TryGetValue(tool, out var cachedJson)) @@ -236,7 +247,10 @@ Here are the available list of tools. private async Task ToolLearnModeAsync(RequestContext request, string intent, string tool, CancellationToken cancellationToken) { - Activity.Current?.SetTag(TagName.IsServerCommandInvoked, false); + var activity = Activity.Current? + .SetTag(TagName.IsServerCommandInvoked, false) + .SetTag(TagName.ToolArea, tool); + var toolsJson = await GetToolListJsonAsync(request, tool); if (string.IsNullOrEmpty(toolsJson)) { @@ -273,7 +287,6 @@ private async Task ToolLearnModeAsync(RequestContext CommandModeAsync(RequestContext request, string intent, string tool, string command, Dictionary parameters, CancellationToken cancellationToken) { - Activity.Current?.SetTag(TagName.IsServerCommandInvoked, true); McpClient? client; try @@ -292,6 +305,10 @@ private async Task CommandModeAsync(RequestContext Date: Fri, 24 Oct 2025 14:22:14 -0700 Subject: [PATCH 3/5] Update CHANGELOG. --- servers/Azure.Mcp.Server/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/Azure.Mcp.Server/CHANGELOG.md b/servers/Azure.Mcp.Server/CHANGELOG.md index fdf66e40a9..895c077026 100644 --- a/servers/Azure.Mcp.Server/CHANGELOG.md +++ b/servers/Azure.Mcp.Server/CHANGELOG.md @@ -25,8 +25,9 @@ The Azure MCP Server updates automatically by default whenever a new release com ### Other Changes -- Set telemetry field's for `ToolArea` and `ToolName` when "consolidated" mode is used or a server is loaded from `registry.json`. [[#933](https://github.com/microsoft/mcp/pull/933)] +- Set telemetry fields for `ToolArea` and `ToolName` when "consolidated" mode is used or a server is loaded from `registry.json`. [[#933](https://github.com/microsoft/mcp/pull/933)] - Added instructions on when to not use azd init [[#942](https://github.com/microsoft/mcp/pull/942)] +- Set telemetry fields for `ToolArea` and `ToolName` when "single" mode is used. [[#952](https://github.com/microsoft/mcp/pull/952)] ## 0.9.7 (2025-10-22) From 5688603734963431b04cc1b99479730fc23cc206 Mon Sep 17 00:00:00 2001 From: Connie Yau Date: Fri, 24 Oct 2025 14:23:20 -0700 Subject: [PATCH 4/5] Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../Commands/ToolLoading/SingleProxyToolLoader.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/SingleProxyToolLoader.cs b/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/SingleProxyToolLoader.cs index 987a152749..3a5f71b36e 100644 --- a/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/SingleProxyToolLoader.cs +++ b/core/Azure.Mcp.Core/src/Areas/Server/Commands/ToolLoading/SingleProxyToolLoader.cs @@ -305,9 +305,13 @@ private async Task CommandModeAsync(RequestContext Date: Fri, 24 Oct 2025 14:43:15 -0700 Subject: [PATCH 5/5] Update CHANGELOG --- servers/Azure.Mcp.Server/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/Azure.Mcp.Server/CHANGELOG.md b/servers/Azure.Mcp.Server/CHANGELOG.md index 895c077026..acc9a55795 100644 --- a/servers/Azure.Mcp.Server/CHANGELOG.md +++ b/servers/Azure.Mcp.Server/CHANGELOG.md @@ -12,6 +12,8 @@ The Azure MCP Server updates automatically by default whenever a new release com ### Other Changes +- Set telemetry fields for `ToolArea` and `ToolName` when "single" mode is used. [[#952](https://github.com/microsoft/mcp/pull/952)] + ## 0.9.8 (2025-10-23) ### Features Added @@ -27,7 +29,6 @@ The Azure MCP Server updates automatically by default whenever a new release com - Set telemetry fields for `ToolArea` and `ToolName` when "consolidated" mode is used or a server is loaded from `registry.json`. [[#933](https://github.com/microsoft/mcp/pull/933)] - Added instructions on when to not use azd init [[#942](https://github.com/microsoft/mcp/pull/942)] -- Set telemetry fields for `ToolArea` and `ToolName` when "single" mode is used. [[#952](https://github.com/microsoft/mcp/pull/952)] ## 0.9.7 (2025-10-22)