Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@

<!-- ─── Core library ─── -->
<ItemGroup>
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.8" />
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.76.0" />
<PackageVersion Include="System.Text.Json" Version="10.0.8" />
<PackageVersion Include="YamlDotNet" Version="18.0.0" />
</ItemGroup>
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.8" />
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.76.0" />
<PackageVersion Include="PatternKit.Core" Version="0.147.1" />
<PackageVersion Include="System.Text.Json" Version="10.0.8" />
<PackageVersion Include="YamlDotNet" Version="18.0.0" />
</ItemGroup>

<!-- ─── Samples ─── -->
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ An extensible toolkit for [Microsoft Semantic Kernel](https://github.com/microso
- 📝 **Skills** — Parse `SKILL.md` files (YAML frontmatter + markdown) into `KernelFunction` or `PromptTemplate`
- 🔗 **Hooks** — Map Claude Code lifecycle events (`PreToolUse`, `PostToolUse`, etc.) to SK's `IFunctionInvocationFilter` and `IPromptRenderFilter`
- 📦 **Plugins** — Load `.claude-plugin/` directories with skills, hooks, and MCP configs
- 🔌 **MCP** — Discover MCP servers from Claude Code, Claude Desktop, VS Code, Codex, Copilot, and JD canonical config with a PatternKit-backed provider chain
- 🗜️ **Compaction** — Transparent context window management with configurable triggers and hierarchical summarization
- 🧠 **Memory** — Semantic memory with MMR reranking, temporal decay scoring, and query expansion
- 💾 **Memory.Sqlite** — SQLite-backed persistent memory storage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.SemanticKernel" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.SemanticKernel" />
<PackageReference Include="PatternKit.Core" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\README.md" Pack="true" PackagePath="\" Link="README.md" />
Expand Down
44 changes: 34 additions & 10 deletions src/JD.SemanticKernel.Extensions.Mcp/Registry/McpRegistry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using PatternKit.Behavioral.Chain;

namespace JD.SemanticKernel.Extensions.Mcp.Registry;

Expand Down Expand Up @@ -37,22 +38,23 @@ public async Task<IReadOnlyList<McpServerDefinition>> GetAllAsync(
CancellationToken cancellationToken = default)
{
var merged = new Dictionary<string, McpServerDefinition>(StringComparer.OrdinalIgnoreCase);
var state = new McpDiscoveryState(merged);
var chainBuilder = AsyncActionChain<McpDiscoveryState>.Create();

foreach (var provider in _providers)
{
cancellationToken.ThrowIfCancellationRequested();
var servers = await provider.DiscoverAsync(cancellationToken).ConfigureAwait(false);

foreach (var server in servers)
chainBuilder.Use(async (current, token, next) =>
{
if (!merged.TryGetValue(server.Name, out var existing) ||
server.Scope > existing.Scope)
{
merged[server.Name] = server;
}
}
token.ThrowIfCancellationRequested();
var servers = await provider.DiscoverAsync(token).ConfigureAwait(false);
current.Merge(servers);
await next(current, token).ConfigureAwait(false);
});
}

var chain = chainBuilder.Build();
await chain.ExecuteAsync(state, cancellationToken).ConfigureAwait(false);

return new List<McpServerDefinition>(merged.Values).AsReadOnly();
}

Expand All @@ -76,4 +78,26 @@ public async Task<IReadOnlyList<McpServerDefinition>> GetAllAsync(

return null;
}

private sealed class McpDiscoveryState
{
private readonly Dictionary<string, McpServerDefinition> _merged;

public McpDiscoveryState(Dictionary<string, McpServerDefinition> merged)
{
_merged = merged;
}

public void Merge(IEnumerable<McpServerDefinition> servers)
{
foreach (var server in servers)
{
if (!_merged.TryGetValue(server.Name, out var existing) ||
server.Scope > existing.Scope)
{
_merged[server.Name] = server;
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
Expand Down Expand Up @@ -105,6 +106,27 @@ public async Task GetAllAsync_SameScopeConflict_FirstWriterWins()
Assert.Single(results);
}

[Fact]
public async Task GetAllAsync_CancellationStopsPatternKitDiscoveryChain()
{
var cts = new CancellationTokenSource();
var p1 = Substitute.For<IMcpDiscoveryProvider>();
p1.DiscoverAsync(Arg.Any<CancellationToken>()).Returns(_ =>
{
cts.Cancel();
return new List<McpServerDefinition> { MakeServer("server-a", "p1", McpScope.User) };
});

var p2 = Substitute.For<IMcpDiscoveryProvider>();
p2.DiscoverAsync(Arg.Any<CancellationToken>()).Returns(
new List<McpServerDefinition> { MakeServer("server-b", "p2", McpScope.User) });

var registry = new McpRegistry(new[] { p1, p2 });

await Assert.ThrowsAsync<OperationCanceledException>(() => registry.GetAllAsync(cts.Token));
await p2.DidNotReceive().DiscoverAsync(Arg.Any<CancellationToken>());
}

[Fact]
public async Task GetAsync_ExistingServer_ReturnsDefinition()
{
Expand Down
Loading