Merge pull request #37 from neuroglia-io/feat-semantickernel-library

cdavernas · web-flow · commit d18647a7eb11 · 2025-06-25T15:39:24.000+02:00
Add a new library that provides a SemanticKernel implementation of the `IAgentRuntime` interface
diff --git a/a2a-net.sln b/a2a-net.sln
@@ -73,6 +73,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "a2a-net.Samples.SemanticKer
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "a2a-net.Samples.SemanticKernel.PushNotificationClient", "samples\semantic-kernel\a2a-net.Samples.SemanticKernel\a2a-net.Samples.SemanticKernel.PushNotificationClient\a2a-net.Samples.SemanticKernel.PushNotificationClient.csproj", "{5F053B7C-80AE-4E76-A5F6-8EF9672600A7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "a2a-net.Server.SemanticKernel", "src\a2a-net.Server.SemanticKernel\a2a-net.Server.SemanticKernel.csproj", "{73428DAF-CBC5-44DF-69BD-AECF3FD01104}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -135,6 +137,10 @@ Global
 		{5F053B7C-80AE-4E76-A5F6-8EF9672600A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5F053B7C-80AE-4E76-A5F6-8EF9672600A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F053B7C-80AE-4E76-A5F6-8EF9672600A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73428DAF-CBC5-44DF-69BD-AECF3FD01104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73428DAF-CBC5-44DF-69BD-AECF3FD01104}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73428DAF-CBC5-44DF-69BD-AECF3FD01104}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73428DAF-CBC5-44DF-69BD-AECF3FD01104}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -157,6 +163,7 @@ Global
 		{564F5A5C-D32B-CDB7-788E-9AE19EF75EC2} = {614D5E64-63BF-4DAE-8A80-E07FB1C2462F}
 		{2C78A491-5476-3A37-4591-BB876B59E903} = {614D5E64-63BF-4DAE-8A80-E07FB1C2462F}
 		{5F053B7C-80AE-4E76-A5F6-8EF9672600A7} = {614D5E64-63BF-4DAE-8A80-E07FB1C2462F}
+		{73428DAF-CBC5-44DF-69BD-AECF3FD01104} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {698C2979-1A16-437B-8C04-1357EB80CC7F}
diff --git a/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Client/Program.cs b/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Client/Program.cs
@@ -291,7 +291,7 @@ void PrintCard(AgentCard card)
     table.AddRow(new Markup($"[blue]{card.Provider?.Organization ?? string.Empty}\n{card.Provider?.Url}[/]"), new Markup($"[bold blue]{card.Name}[/]\n[blue]v{card.Version}[/]").RightJustified());
     table.AddRow(
         new Table().AddColumn(string.Empty).HideHeaders().NoBorder()
-            .AddRow(new Markup($"[blue]{card.Description}[/]").RightJustified())
+            .AddRow(new Markup($"[grey]{card.Description}[/]").LeftJustified())
             .AddRow(new Text(card.DocumentationUrl?.ToString() ?? string.Empty).RightJustified()),
         detailsTable
     );
diff --git a/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Client/a2a-net.Samples.SemanticKernel.Client.csproj b/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Client/a2a-net.Samples.SemanticKernel.Client.csproj
@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
     <PackageReference Include="Spectre.Console" Version="0.50.0" />
     <PackageReference Include="Spectre.Console.Json" Version="0.50.0" />
   </ItemGroup>
diff --git a/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Server/Program.cs b/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Server/Program.cs
@@ -24,7 +24,15 @@
     options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault;
 });
 builder.Services.AddDistributedMemoryCache();
-builder.Services.AddTransient<IAgentRuntime, AgentRuntime>();
+builder.Services.AddSemanticKernelAgentRuntime(
+    options =>
+    {
+        options.Instructions = applicationOptions.Agent.Instructions;
+    }, 
+    kernel =>
+    {
+        kernel.AddOpenAIChatCompletion(applicationOptions.Agent.Kernel.Model, applicationOptions.Agent.Kernel.ApiKey);
+    });
 builder.Services.AddA2AWellKnownAgent((provider, builder) =>
 {
     builder
diff --git a/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Server/Usings.cs b/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Server/Usings.cs
@@ -13,19 +13,11 @@
 
 global using A2A.Models;
 global using A2A.Samples.SemanticKernel.Server.Configuration;
-global using A2A.Samples.SemanticKernel.Server.Services;
 global using A2A.Server;
 global using A2A.Server.AspNetCore;
 global using A2A.Server.Infrastructure;
 global using A2A.Server.Infrastructure.Services;
 global using Microsoft.AspNetCore.Mvc;
-global using Microsoft.Extensions.Options;
 global using Microsoft.SemanticKernel;
-global using Microsoft.SemanticKernel.ChatCompletion;
-global using Neuroglia;
-global using System.Collections.Concurrent;
 global using System.ComponentModel.DataAnnotations;
-global using System.Runtime.CompilerServices;
-global using System.Text;
-global using System.Text.Json;
 global using System.Text.Json.Serialization;
diff --git a/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Server/a2a-net.Samples.SemanticKernel.Server.csproj b/samples/semantic-kernel/a2a-net.Samples.SemanticKernel.Server/a2a-net.Samples.SemanticKernel.Server.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
 	
   <ItemGroup>
-	<PackageReference Include="Microsoft.SemanticKernel.Agents.Core" Version="1.46.0" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.46.0" />
+	<PackageReference Include="Microsoft.SemanticKernel.Agents.Core" Version="1.57.0" />
+	<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.57.0" />
 	<PackageReference Include="Microsoft.SemanticKernel.Connectors.Google" Version="1.46.0-alpha" />
 	<PackageReference Include="Microsoft.SemanticKernel.Connectors.HuggingFace" Version="1.46.0-preview" />
 	<PackageReference Include="Microsoft.SemanticKernel.Connectors.MistralAI" Version="1.46.0-alpha" />
@@ -27,6 +27,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\a2a-net.Server.AspNetCore\a2a-net.Server.AspNetCore.csproj" />
     <ProjectReference Include="..\..\..\src\a2a-net.Server.Infrastructure.DistributedCache\a2a-net.Server.Infrastructure.DistributedCache.csproj" />
+    <ProjectReference Include="..\..\..\src\a2a-net.Server.SemanticKernel\a2a-net.Server.SemanticKernel.csproj" />
   </ItemGroup>
 	
 </Project>
diff --git a/samples/semantic-kernel/a2a-net.Samples.SemanticKernel/a2a-net.Samples.SemanticKernel.PushNotificationClient/a2a-net.Samples.SemanticKernel.PushNotificationClient.csproj b/samples/semantic-kernel/a2a-net.Samples.SemanticKernel/a2a-net.Samples.SemanticKernel.PushNotificationClient/a2a-net.Samples.SemanticKernel.PushNotificationClient.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.9.0" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/a2a-net.Client.Asbtractions/a2a-net.Client.Abstractions.csproj b/src/a2a-net.Client.Asbtractions/a2a-net.Client.Abstractions.csproj
@@ -4,8 +4,8 @@
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<RootNamespace>A2A.Client</RootNamespace>
-    <VersionPrefix>0.9.1</VersionPrefix>
+	  <RootNamespace>A2A.Client</RootNamespace>
+    <VersionPrefix>0.10.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/a2a-net.Client.Http/a2a-net.Client.Http.csproj b/src/a2a-net.Client.Http/a2a-net.Client.Http.csproj
@@ -4,8 +4,8 @@
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<RootNamespace>A2A.Client</RootNamespace>
-    <VersionPrefix>0.9.1</VersionPrefix>
+	  <RootNamespace>A2A.Client</RootNamespace>
+    <VersionPrefix>0.10.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
@@ -33,8 +33,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/a2a-net.Client.WebSocket/a2a-net.Client.WebSocket.csproj b/src/a2a-net.Client.WebSocket/a2a-net.Client.WebSocket.csproj
@@ -4,8 +4,8 @@
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<RootNamespace>A2A.Client.WebSocket</RootNamespace>
-    <VersionPrefix>0.9.1</VersionPrefix>
+	  <RootNamespace>A2A.Client.WebSocket</RootNamespace>
+    <VersionPrefix>0.10.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/a2a-net.Client/a2a-net.Client.csproj b/src/a2a-net.Client/a2a-net.Client.csproj
@@ -4,8 +4,8 @@
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<RootNamespace>A2A.Client</RootNamespace>
-    <VersionPrefix>0.9.1</VersionPrefix>
+	  <RootNamespace>A2A.Client</RootNamespace>
+    <VersionPrefix>0.10.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Core/a2a-net.Core.csproj b/src/a2a-net.Core/a2a-net.Core.csproj
@@ -4,8 +4,8 @@
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<RootNamespace>A2A</RootNamespace>
-    <VersionPrefix>0.9.1</VersionPrefix>
+	  <RootNamespace>A2A</RootNamespace>
+    <VersionPrefix>0.10.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
@@ -33,8 +33,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neuroglia.Mediation" Version="4.21.0" />
-	<PackageReference Include="StreamJsonRpc" Version="2.21.69" />
+    <PackageReference Include="Neuroglia.Mediation" Version="4.23.1" />
+	<PackageReference Include="StreamJsonRpc" Version="2.22.11" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
diff --git a/src/a2a-net.Server.AspNetCore/a2a-net.Server.AspNetCore.csproj b/src/a2a-net.Server.AspNetCore/a2a-net.Server.AspNetCore.csproj
@@ -4,9 +4,9 @@
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<OutputType>Library</OutputType>
-	<RootNamespace>A2A.Server.AspNetCore</RootNamespace>
-    <VersionPrefix>0.9.1</VersionPrefix>
+	  <OutputType>Library</OutputType>
+	  <RootNamespace>A2A.Server.AspNetCore</RootNamespace>
+    <VersionPrefix>0.10.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Server.Infrastructure.Abstractions/a2a-net.Server.Infrastructure.Abstractions.csproj b/src/a2a-net.Server.Infrastructure.Abstractions/a2a-net.Server.Infrastructure.Abstractions.csproj
@@ -4,8 +4,8 @@
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<RootNamespace>A2A.Server.Infrastructure</RootNamespace>
-    <VersionPrefix>0.9.1</VersionPrefix>
+	  <RootNamespace>A2A.Server.Infrastructure</RootNamespace>
+    <VersionPrefix>0.10.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
@@ -33,9 +33,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
-	<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.9.0" />
-    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
+	<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.1" />
+    <PackageReference Include="System.Linq.Async" Version="6.0.3" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
   </ItemGroup>
 
diff --git a/src/a2a-net.Server.Infrastructure.DistributedCache/a2a-net.Server.Infrastructure.DistributedCache.csproj b/src/a2a-net.Server.Infrastructure.DistributedCache/a2a-net.Server.Infrastructure.DistributedCache.csproj
@@ -4,8 +4,8 @@
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<RootNamespace>A2A.Server.Infrastructure.DistributedCache</RootNamespace>
-    <VersionPrefix>0.9.1</VersionPrefix>
+	  <RootNamespace>A2A.Server.Infrastructure.DistributedCache</RootNamespace>
+    <VersionPrefix>0.10.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
@@ -33,7 +33,7 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.6" />
   </ItemGroup>
 	
   <ItemGroup>
diff --git a/src/a2a-net.Server.SemanticKernel/Configuration/SemanticKernelAgentRuntimeOptions.cs b/src/a2a-net.Server.SemanticKernel/Configuration/SemanticKernelAgentRuntimeOptions.cs
@@ -0,0 +1,27 @@
+﻿// Copyright © 2025-Present the a2a-net Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License"),
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace A2A.Server.Configuration;
+
+/// <summary>
+/// Represents the options used to configure a <see cref="SemanticKernelAgentRuntime"/>.
+/// </summary>
+public class SemanticKernelAgentRuntimeOptions
+{
+
+    /// <summary>
+    /// Gets or sets the agent's instructions, if any
+    /// </summary>
+    public virtual string? Instructions { get; set; }
+
+}
diff --git a/src/a2a-net.Server.SemanticKernel/Extensions/IAsyncEnumerableExtensions.cs b/src/a2a-net.Server.SemanticKernel/Extensions/IAsyncEnumerableExtensions.cs
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace A2A.Samples.SemanticKernel.Server;
+namespace A2A.Server;
 
 /// <summary>
 /// Defines extensions for <see cref="IAsyncEnumerable{T}"/> instances
diff --git a/src/a2a-net.Server.SemanticKernel/Extensions/IServiceCollectionExtensions.cs b/src/a2a-net.Server.SemanticKernel/Extensions/IServiceCollectionExtensions.cs
@@ -0,0 +1,46 @@
+﻿// Copyright © 2025-Present the a2a-net Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License"),
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace A2A.Server;
+
+/// <summary>
+/// Defines extensions for <see cref="IServiceCollection"/>s.
+/// </summary>
+public static class IServiceCollectionExtensions
+{
+
+    /// <summary>
+    /// Adds and configures a new Microsoft Semantic Kernel based <see cref="IAgentRuntime"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/> to configure.</param>
+    /// <param name="configureRuntime">An <see cref="Action{T}"/>, if any, used to configure the <see cref="SemanticKernelAgentRuntimeOptions"/> to use.</param>
+    /// <param name="configureKernel">An <see cref="Action{T}"/>, if any, used to configure the <see cref="IKernelBuilder"/> to use.</param>
+    /// <param name="serviceKey">The key of the <see cref="SemanticKernelAgentRuntime"/> to add.</param>
+    /// <param name="serviceLifetime">The <see cref="SemanticKernelAgentRuntime"/>'s <see cref="ServiceLifetime"/>.</param>
+    /// <returns>The configured <see cref="IServiceCollection"/>.</returns>
+    public static IServiceCollection AddSemanticKernelAgentRuntime(this IServiceCollection services, Action<SemanticKernelAgentRuntimeOptions>? configureRuntime = null, Action<IKernelBuilder>? configureKernel = null, string? serviceKey = null, ServiceLifetime serviceLifetime = ServiceLifetime.Transient)
+    {
+        if (configureRuntime != null) services.Configure(serviceKey, configureRuntime);
+        if (configureKernel != null)
+        {
+            var kernelBuilder = services.AddKernel();
+            configureKernel(kernelBuilder);
+        }
+        services.TryAdd(new ServiceDescriptor(typeof(IAgentRuntime), serviceKey, (serviceProvider, key) =>
+        {
+            return new SemanticKernelAgentRuntime((string?)key, serviceProvider.GetRequiredService<Kernel>(), serviceProvider.GetRequiredService<IOptionsMonitor<SemanticKernelAgentRuntimeOptions>>());
+        }, serviceLifetime));
+        return services;
+    }
+
+}
diff --git a/src/a2a-net.Server.SemanticKernel/Extensions/MessageExtensions.cs b/src/a2a-net.Server.SemanticKernel/Extensions/MessageExtensions.cs
@@ -11,9 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
-namespace A2A.Samples.SemanticKernel.Server;
+namespace A2A.Server;
 
 /// <summary>
 /// Defines extensions for <see cref="Message"/>s
@@ -35,4 +33,4 @@ public static class MessageExtensions
         return textBuilder.ToString();
     }
 
-}
+}
diff --git a/src/a2a-net.Server.SemanticKernel/Extensions/PartExtensions.cs b/src/a2a-net.Server.SemanticKernel/Extensions/PartExtensions.cs
@@ -11,7 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace A2A.Samples.SemanticKernel.Server;
+using System.Text.Json;
+
+namespace A2A.Server;
 
 /// <summary>
 /// Defines extensions for <see cref="Part"/>s
@@ -51,4 +53,4 @@ public static string ToText(this Part part)
         }
     }
 
-}
+}
diff --git a/src/a2a-net.Server.SemanticKernel/Services/SemanticKernelAgentRuntime.cs b/src/a2a-net.Server.SemanticKernel/Services/SemanticKernelAgentRuntime.cs
diff --git a/src/a2a-net.Server.SemanticKernel/Usings.cs b/src/a2a-net.Server.SemanticKernel/Usings.cs
diff --git a/src/a2a-net.Server.SemanticKernel/a2a-net.Server.SemanticKernel.csproj b/src/a2a-net.Server.SemanticKernel/a2a-net.Server.SemanticKernel.csproj
diff --git a/src/a2a-net.Server/a2a-net.Server.csproj b/src/a2a-net.Server/a2a-net.Server.csproj
diff --git a/tests/a2a-net.IntegrationTests/a2a-net.IntegrationTests.csproj b/tests/a2a-net.IntegrationTests/a2a-net.IntegrationTests.csproj
diff --git a/tests/a2a-net.UnitTests/a2a-net.UnitTests.csproj b/tests/a2a-net.UnitTests/a2a-net.UnitTests.csproj
