naming

Author: KSemenenko

AGENTS.md

@@ -194,6 +194,7 @@ If no new rule is detected -> do not update the file.
 - For search-quality improvements, prefer mathematical or statistical ranking changes over hardcoded phrase lists or ad-hoc query text hacks, because the user explicitly wants tokenizer search to improve through general scoring behavior rather than manual exceptions.
 - Prefer framework-provided in-memory caching primitives such as `IMemoryCache` over custom process-local storage implementations when they cover the lifecycle and lookup needs, because self-rolled memory stores age poorly and make scaling/concurrency behavior harder to trust.
 - Never keep legacy compatibility shims, obsolete paths, or lingering documentation references to removed implementations when a replacement is accepted, because this repository should converge on the current design instead of carrying dead historical baggage.
+- Never leave `ManagedCode`-prefixed DI/setup extension method names such as `AddManagedCodeMcpGateway(...)` in the public API once concise `McpGateway` naming is available, because these branded leftovers make the package surface inconsistent and read like stale legacy.
 
 ### Critical (NEVER violate)
 
@@ -234,6 +235,7 @@ If no new rule is detected -> do not update the file.
 - Direct fixes over preserving legacy compatibility paths when cleanup or review-driven corrections are requested
 - Framework-provided caching primitives over self-rolled in-memory stores when the package only needs process-local cache semantics
 - Removing replaced code paths completely instead of keeping legacy mentions or compatibility leftovers
+- Concise `McpGateway` public registration/init API names without leftover `ManagedCode` branding
 
 ### Dislikes
 
@@ -243,3 +245,4 @@ If no new rule is detected -> do not update the file.
 - Shipping behavior without tests
 - Self-rolled in-memory storage when standard .NET caching abstractions already fit the scenario
 - Legacy/obsolete compatibility leftovers after a replacement is accepted
+- `ManagedCode`-prefixed public DI/setup API names that should have been cleaned up

README.md

@@ -30,7 +30,7 @@ dotnet add package ManagedCode.MCPGateway
 
 ## Core Services
 
-After `services.AddManagedCodeMcpGateway(...)`, the container exposes:
+After `services.AddMcpGateway(...)`, the container exposes:
 
 - `IMcpGateway` for build, list, search, invoke, and meta-tool creation
 - `IMcpGatewayRegistry` for adding tools or MCP sources after the container is built
@@ -46,7 +46,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 var services = new ServiceCollection();
 
-services.AddManagedCodeMcpGateway(options =>
+services.AddMcpGateway(options =>
 {
     options.AddTool(
         "local",
@@ -86,7 +86,7 @@ Important defaults:
 Register local tools during startup:
 
 ```csharp
-services.AddManagedCodeMcpGateway(options =>
+services.AddMcpGateway(options =>
 {
     options.AddTool(
         "local",
@@ -136,7 +136,7 @@ Registry updates automatically invalidate the catalog. The next list, search, or
 Examples:
 
 ```csharp
-services.AddManagedCodeMcpGateway(options =>
+services.AddMcpGateway(options =>
 {
     options.AddHttpServer(
         sourceId: "docs",
@@ -357,13 +357,13 @@ Manual warmup:
 ```csharp
 await using var serviceProvider = services.BuildServiceProvider();
 
-var build = await serviceProvider.InitializeManagedCodeMcpGatewayAsync();
+var build = await serviceProvider.InitializeMcpGatewayAsync();
 ```
 
 Hosted warmup:
 
 ```csharp
-services.AddManagedCodeMcpGateway(options =>
+services.AddMcpGateway(options =>
 {
     options.AddTool(
         "local",
@@ -376,7 +376,7 @@ services.AddManagedCodeMcpGateway(options =>
             }));
 });
 
-services.AddManagedCodeMcpGatewayIndexWarmup();
+services.AddMcpGatewayIndexWarmup();
 ```
 
 ## Optional Embeddings
@@ -391,7 +391,7 @@ var services = new ServiceCollection();
 services.AddKeyedSingleton<IEmbeddingGenerator<string, Embedding<float>>, MyEmbeddingGenerator>(
     McpGatewayServiceKeys.EmbeddingGenerator);
 
-services.AddManagedCodeMcpGateway(options =>
+services.AddMcpGateway(options =>
 {
     options.AddTool(
         "local",
@@ -418,7 +418,7 @@ services.AddKeyedSingleton<IChatClient>(
     McpGatewayServiceKeys.SearchQueryChatClient,
     mySearchRewriteChatClient);
 
-services.AddManagedCodeMcpGateway(options =>
+services.AddMcpGateway(options =>
 {
     options.SearchStrategy = McpGatewaySearchStrategy.Auto;
     options.SearchQueryNormalization = McpGatewaySearchQueryNormalization.TranslateToEnglishWhenAvailable;
@@ -459,7 +459,7 @@ services.AddSingleton<IMcpGatewayToolEmbeddingStore, MyToolEmbeddingStore>();
 You can also force a mode:
 
 ```csharp
-services.AddManagedCodeMcpGateway(options =>
+services.AddMcpGateway(options =>
 {
     options.SearchStrategy = McpGatewaySearchStrategy.Tokenizer;
 });
@@ -468,7 +468,7 @@ services.AddManagedCodeMcpGateway(options =>
 Or:
 
 ```csharp
-services.AddManagedCodeMcpGateway(options =>
+services.AddMcpGateway(options =>
 {
     options.SearchStrategy = McpGatewaySearchStrategy.Embeddings;
 });

docs/ADR/ADR-0001-runtime-boundaries-and-index-lifecycle.md

@@ -20,11 +20,11 @@ The repository needs an explicit record for these boundaries so the public packa
 
 ```mermaid
 flowchart LR
-    Host["Host application"] --> DI["AddManagedCodeMcpGateway(...)"]
+    Host["Host application"] --> DI["AddMcpGateway(...)"]
     DI --> Gateway["IMcpGateway / McpGateway"]
     DI --> Registry["IMcpGatewayRegistry / McpGatewayRegistry"]
     DI --> ToolSet["McpGatewayToolSet"]
-    DI --> Warmup["AddManagedCodeMcpGatewayIndexWarmup()"]
+    DI --> Warmup["AddMcpGatewayIndexWarmup()"]
     Gateway --> Runtime["McpGatewayRuntime"]
     Registry --> Snapshot["Catalog snapshots"]
     Runtime --> Snapshot
@@ -78,7 +78,7 @@ Cons:
 Positive:
 
 - public DI wiring is explicit: `IMcpGateway` for runtime work, `IMcpGatewayRegistry` for catalog mutation, `McpGatewayToolSet` for meta-tools
-- hosts get lazy behavior by default and optional eager warmup through `InitializeManagedCodeMcpGatewayAsync()` or `AddManagedCodeMcpGatewayIndexWarmup()`
+- hosts get lazy behavior by default and optional eager warmup through `InitializeMcpGatewayAsync()` or `AddMcpGatewayIndexWarmup()`
 - cancellation now propagates into source loading, embedding generation, and embedding-store I/O during index builds
 - runtime rebuilds after registry mutations remain automatic without forcing every host into startup code
 
@@ -98,7 +98,7 @@ Mitigations:
 
 - `IMcpGateway` MUST remain the public runtime facade for build, list, search, invoke, and meta-tool creation.
 - `IMcpGatewayRegistry` MUST remain the public mutation surface for adding tools and MCP sources after container build.
-- `AddManagedCodeMcpGateway(...)` MUST register `IMcpGateway`, `IMcpGatewayRegistry`, and `McpGatewayToolSet`.
+- `AddMcpGateway(...)` MUST register `IMcpGateway`, `IMcpGatewayRegistry`, and `McpGatewayToolSet`.
 - Index builds MUST be lazy by default and MUST rebuild automatically after registry mutations invalidate the snapshot.
 - Hosted warmup MUST stay optional and MUST use the same runtime/index path as normal gateway operations.
 - Cancellation of `BuildIndexAsync(...)` MUST propagate into underlying source loading and embedding work.

docs/ADR/ADR-0004-process-local-embedding-store-uses-imemorycache.md

@@ -16,7 +16,7 @@ Durable or distributed embedding reuse will remain the responsibility of host-pr
 
 ```mermaid
 flowchart LR
-    Host["Host application"] --> DI["AddManagedCodeMcpGateway(...)"]
+    Host["Host application"] --> DI["AddMcpGateway(...)"]
     Host --> CacheRegistration["AddMcpGatewayInMemoryToolEmbeddingStore()"]
     CacheRegistration --> MemoryCache["IMemoryCache"]
     CacheRegistration --> Store["IMcpGatewayToolEmbeddingStore"]

src/ManagedCode.MCPGateway/Internal/Runtime/Core/McpGatewayRuntime.cs

@@ -46,7 +46,7 @@ internal sealed partial class McpGatewayRuntime : IMcpGateway
     private const string ToolIdOrToolNameRequiredMessage = "Either ToolId or ToolName is required.";
     private const string ToolIdNotFoundMessageTemplate = "Tool '{0}' was not found.";
     private const string ToolNameAmbiguousMessageTemplate = "Tool '{0}' is ambiguous. Use ToolId or specify SourceId explicitly.";
-    private const string CatalogSourceMissingMessage = "ManagedCode.MCPGateway requires IMcpGatewayRegistry to be registered in the service provider. Use AddManagedCodeMcpGateway(...) to wire the package services.";
+    private const string CatalogSourceMissingMessage = "ManagedCode.MCPGateway requires IMcpGatewayRegistry to be registered in the service provider. Use AddMcpGateway(...) to wire the package services.";
     private const string FailedToLoadGatewaySourceLogMessage = "Failed to load gateway source {SourceId}.";
     private const string EmbeddingGenerationFailedLogMessage = "Gateway embedding generation failed. Falling back to lexical search.";
     private const string GatewayIndexRebuiltLogMessage = "Gateway index rebuilt. Tools={ToolCount} VectorizedTools={VectorizedToolCount}.";

src/ManagedCode.MCPGateway/Registration/McpGatewayServiceCollectionExtensions.cs

@@ -8,7 +8,7 @@ namespace ManagedCode.MCPGateway;
 
 public static class McpGatewayServiceCollectionExtensions
 {
-    public static IServiceCollection AddManagedCodeMcpGateway(
+    public static IServiceCollection AddMcpGateway(
         this IServiceCollection services,
         Action<McpGatewayOptions>? configure = null)
     {
@@ -36,7 +36,7 @@ public static IServiceCollection AddMcpGatewayInMemoryToolEmbeddingStore(this IS
         return services;
     }
 
-    public static IServiceCollection AddManagedCodeMcpGatewayIndexWarmup(this IServiceCollection services)
+    public static IServiceCollection AddMcpGatewayIndexWarmup(this IServiceCollection services)
     {
         ArgumentNullException.ThrowIfNull(services);
 

src/ManagedCode.MCPGateway/Registration/McpGatewayServiceProviderExtensions.cs

@@ -5,7 +5,7 @@ namespace ManagedCode.MCPGateway;
 
 public static class McpGatewayServiceProviderExtensions
 {
-    public static Task<McpGatewayIndexBuildResult> InitializeManagedCodeMcpGatewayAsync(
+    public static Task<McpGatewayIndexBuildResult> InitializeMcpGatewayAsync(
         this IServiceProvider serviceProvider,
         CancellationToken cancellationToken = default)
     {

tests/ManagedCode.MCPGateway.Tests/Search/McpGatewayInitializationTests.cs

@@ -9,11 +9,11 @@ namespace ManagedCode.MCPGateway.Tests;
 public sealed partial class McpGatewaySearchTests
 {
     [TUnit.Core.Test]
-    public async Task InitializeManagedCodeMcpGatewayAsync_BuildsIndexThroughServiceProviderExtension()
+    public async Task InitializeMcpGatewayAsync_BuildsIndexThroughServiceProviderExtension()
     {
         await using var serviceProvider = GatewayTestServiceProviderFactory.Create(ConfigureSearchTools);
 
-        var buildResult = await serviceProvider.InitializeManagedCodeMcpGatewayAsync();
+        var buildResult = await serviceProvider.InitializeMcpGatewayAsync();
         var gateway = serviceProvider.GetRequiredService<IMcpGateway>();
         var tools = await gateway.ListToolsAsync();
 
@@ -22,13 +22,13 @@ public async Task InitializeManagedCodeMcpGatewayAsync_BuildsIndexThroughService
     }
 
     [TUnit.Core.Test]
-    public async Task AddManagedCodeMcpGatewayIndexWarmup_StartsBackgroundIndexBuild()
+    public async Task AddMcpGatewayIndexWarmup_StartsBackgroundIndexBuild()
     {
         var probeGateway = new WarmupProbeGateway();
         var services = new ServiceCollection();
         services.AddLogging(static logging => logging.SetMinimumLevel(LogLevel.Debug));
         services.AddSingleton<IMcpGateway>(probeGateway);
-        services.AddManagedCodeMcpGatewayIndexWarmup();
+        services.AddMcpGatewayIndexWarmup();
 
         await using var serviceProvider = services.BuildServiceProvider();
         var hostedServices = serviceProvider.GetServices<IHostedService>().ToList();

tests/ManagedCode.MCPGateway.Tests/Search/McpGatewaySearchBuildTests.cs

@@ -132,7 +132,7 @@ await Task.WhenAll(Enumerable.Range(0, 40).Select(index => Task.Run(() =>
     }
 
     [TUnit.Core.Test]
-    public async Task AddManagedCodeMcpGateway_ResolvesRegistryAsSeparateService()
+    public async Task AddMcpGateway_ResolvesRegistryAsSeparateService()
     {
         await using var serviceProvider = GatewayTestServiceProviderFactory.Create(options =>
         {
@@ -146,7 +146,7 @@ public async Task AddManagedCodeMcpGateway_ResolvesRegistryAsSeparateService()
     }
 
     [TUnit.Core.Test]
-    public async Task AddManagedCodeMcpGateway_RegistryAlsoActsAsCatalogSource()
+    public async Task AddMcpGateway_RegistryAlsoActsAsCatalogSource()
     {
         await using var serviceProvider = GatewayTestServiceProviderFactory.Create(static _ => { });
         var registry = serviceProvider.GetRequiredService<IMcpGatewayRegistry>();
@@ -178,7 +178,7 @@ public async Task McpGateway_ThrowsClearErrorWhenRegistryServiceIsMissing()
         }
 
         await Assert.That(exception).IsNotNull();
-        await Assert.That(exception!.Message).Contains("AddManagedCodeMcpGateway");
+        await Assert.That(exception!.Message).Contains("AddMcpGateway");
     }
 
     [TUnit.Core.Test]

tests/ManagedCode.MCPGateway.Tests/Search/McpGatewaySearchVectorTests.cs

@@ -104,7 +104,7 @@ public async Task SearchAsync_PrefersKeyedEmbeddingGeneratorOverUnkeyedRegistrat
         services.AddKeyedSingleton<IEmbeddingGenerator<string, Embedding<float>>>(
             McpGatewayServiceKeys.EmbeddingGenerator,
             keyedEmbeddingGenerator);
-        services.AddManagedCodeMcpGateway(ConfigureSearchTools);
+        services.AddMcpGateway(ConfigureSearchTools);
 
         await using var serviceProvider = services.BuildServiceProvider();
         var gateway = serviceProvider.GetRequiredService<IMcpGateway>();
@@ -126,7 +126,7 @@ public async Task SearchAsync_ResolvesScopedEmbeddingGeneratorPerOperation()
         var services = new ServiceCollection();
         services.AddLogging(static logging => logging.SetMinimumLevel(LogLevel.Debug));
         services.AddScoped<IEmbeddingGenerator<string, Embedding<float>>>(_ => new ScopedTestEmbeddingGenerator(tracker));
-        services.AddManagedCodeMcpGateway(ConfigureSearchTools);
+        services.AddMcpGateway(ConfigureSearchTools);
 
         await using var serviceProvider = services.BuildServiceProvider(new ServiceProviderOptions
         {