Skip to content

NamespaceToolLoader: the tool loader that supports namespace mode without creating child azmcp processes #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anuchandy merged 8 commits into from
Oct 7, 2025
Merged

NamespaceToolLoader: the tool loader that supports namespace mode without creating child azmcp processes #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef1a683
NamespaceToolLoader: the tool loader that supports namespace without …
anuchandy Oct 5, 2025
7bc39f5
Remove ConvertToJsonElements and rely on the guarantees provided by m…
anuchandy Oct 6, 2025
7cf9213
Using JsonSerializer.SerializeToElement for tests
anuchandy Oct 6, 2025
0de553f
Simplify CreateNamespaceTool
anuchandy Oct 6, 2025
96de765
Align NamespaceToolLoader logic closer to ServerToolLoader (enabling …
anuchandy Oct 6, 2025
dcde338
align command exclusion behavior with ServerToolLoader
anuchandy Oct 7, 2025
18e49be
simplify methods (remove unnecessary async attributes)
anuchandy Oct 7, 2025
a4d949b
adjust tests to adapt exclusion behavior
anuchandy Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions core/Azure.Mcp.Core/src/Areas/Server/Commands/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public static IServiceCollection AddAzureMcpServer(this IServiceCollection servi
services.AddSingleton<SingleProxyToolLoader>();
services.AddSingleton<CompositeToolLoader>();
services.AddSingleton<ServerToolLoader>();
services.AddSingleton<NamespaceToolLoader>();

// Register server discovery strategies
services.AddSingleton<CommandGroupDiscoveryStrategy>();
Expand All @@ -85,7 +86,7 @@ public static IServiceCollection AddAzureMcpServer(this IServiceCollection servi
services.AddSingleton<IMcpRuntime, McpRuntime>();

// Register MCP discovery strategies based on proxy mode
if (serviceStartOptions.Mode == ModeTypes.SingleToolProxy || serviceStartOptions.Mode == ModeTypes.NamespaceProxy)
if (serviceStartOptions.Mode == ModeTypes.SingleToolProxy)
{
services.AddSingleton<IMcpDiscoveryStrategy>(sp =>
{
Expand All @@ -99,6 +100,10 @@ public static IServiceCollection AddAzureMcpServer(this IServiceCollection servi
return new CompositeDiscoveryStrategy(discoveryStrategies, logger);
});
}
else if (serviceStartOptions.Mode == ModeTypes.NamespaceProxy)
{
services.AddSingleton<IMcpDiscoveryStrategy, RegistryDiscoveryStrategy>();
}

// Configure tool loading based on mode
if (serviceStartOptions.Mode == ModeTypes.SingleToolProxy)
Expand All @@ -112,7 +117,14 @@ public static IServiceCollection AddAzureMcpServer(this IServiceCollection servi
var loggerFactory = sp.GetRequiredService<ILoggerFactory>();
var toolLoaders = new List<IToolLoader>
{
sp.GetRequiredService<ServerToolLoader>(),
// ServerToolLoader with RegistryDiscoveryStrategy creates proxy tools for external MCP servers.
new ServerToolLoader(
sp.GetRequiredService<RegistryDiscoveryStrategy>(),
sp.GetRequiredService<IOptions<ToolLoaderOptions>>(),
loggerFactory.CreateLogger<ServerToolLoader>()
),
// NamespaceToolLoader enables direct in-process execution for tools in Azure namespaces
sp.GetRequiredService<NamespaceToolLoader>(),
};

// Always add utility commands (subscription, group) in namespace mode
Expand Down
Loading