- Added support for setting AIContextProviderFactory and ChatMessageStoreFactory on Agents

- Removed obsolete `OpenAIAgentOptionsForChatClientWithoutReasoning`, `OpenAIAgentOptionsForChatClientWithReasoning`, `OpenAIAgentOptionsForResponseApiWithoutReasoning` and `OpenAIAgentOptionsForResponseApiWithReasoning` (Use `AgentOptions` instead)
- Added missing Dependency Injection options for EmbeddingFactory in Providers `Mistral` and `OpenRouter`
- [BREAKING] Athropic: Renamed 'maxTokenCount' to 'maxOutputTokens' to have consistent naming in the simplified CreateAgent method

Author: rwjdk

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=crlf

CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog - Agent Framework Toolkit
 
 ## Unreleased
-- [BREAKING] Athropic: Renamed 'maxTokenCount' to 'maxOutputTokens' to have consitent naming in the simplified CreateAgent method
+- Added support for setting `AIContextProviderFactory` and `ChatMessageStoreFactory` on Agents
+- Removed obsolete `OpenAIAgentOptionsForChatClientWithoutReasoning`, `OpenAIAgentOptionsForChatClientWithReasoning`, `OpenAIAgentOptionsForResponseApiWithoutReasoning` and `OpenAIAgentOptionsForResponseApiWithReasoning` (Use `AgentOptions` instead)
+- Added missing Dependency Injection options for EmbeddingFactory in Providers `Mistral` and `OpenRouter`
+- [BREAKING] Athropic: Renamed 'maxTokenCount' to 'maxOutputTokens' to have consistent naming in the simplified CreateAgent method
 
 ---
 

development/Tests/AIToolsFactoryTests.cs

@@ -2,6 +2,7 @@
 using AgentFrameworkToolkit.Tools.ModelContextProtocol;
 using JetBrains.Annotations;
 using Microsoft.Extensions.AI;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace AgentFrameworkToolkit.Tests;
 
@@ -64,6 +65,19 @@ public async Task GetLocalMcpToolsAsync()
         Assert.Contains("browser_click", clientTools.Tools.Select(x => x.Name));
     }
 
+    [Fact]
+    public void InjectAIToolFactoryFactoryTest()
+    {
+        ServiceCollection services = new();
+        services.AddAIToolFactory();
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        AIToolsFactory aiToolsFactory = provider.GetRequiredService<AIToolsFactory>();
+        IList<AITool> tools = aiToolsFactory.GetTools(typeof(DiTools));
+        Assert.Single(tools);
+    }
+
     [PublicAPI]
     private class TestToolsWithAttributes
     {
@@ -96,4 +110,13 @@ private string NotATool(string input1)
             return input1;
         }
     }
+
+    private class DiTools
+    {
+        [AITool]
+        public static string GetWeather(string city)
+        {
+            return "{ \"condition\": \"sunny\", \"degrees\":19 }";
+        }
+    }
 }

development/Tests/AnthropicTests.cs

@@ -0,0 +1,60 @@
+using AgentFrameworkToolkit.Anthropic;
+using Microsoft.Extensions.DependencyInjection;
+using Secrets;
+
+namespace AgentFrameworkToolkit.Tests;
+
+[Collection("AgentFactoryTests")]
+public sealed class AnthropicAgentFactoryTests : TestsBase
+{
+    [Fact]
+    public Task AgentFactory_Simple() => SimpleAgentTestsAsync(AgentProvider.Anthropic);
+
+    [Fact]
+    public Task AgentFactory_Normal() => NormalAgentTestsAsync(AgentProvider.Anthropic);
+
+    [Fact]
+    public Task AgentFactory_OpenTelemetryAndLoggingMiddleware() => OpenTelemetryAndLoggingMiddlewareTestsAsync(AgentProvider.Anthropic);
+
+    [Fact]
+    public Task AgentFactory_ToolCall() => ToolCallAgentTestsAsync(AgentProvider.Anthropic);
+
+    [Fact]
+    public Task AgentFactory_McpToolCall() => McpToolCallAgentTestsAsync(AgentProvider.Anthropic);
+
+    [Fact]
+    public async Task AgentFactory_DependencyInjection()
+    {
+        var secrets = SecretsManager.GetSecrets();
+        ServiceCollection services = new();
+        services.AddAnthropicAgentFactory(secrets.AnthropicApiKey);
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        var cancellationToken = TestContext.Current.CancellationToken;
+        string text = (await provider.GetRequiredService<AnthropicAgentFactory>()
+            .CreateAgent(AnthropicChatModels.ClaudeHaiku45, 2000)
+            .RunAsync("Hello", cancellationToken: cancellationToken)).Text;
+        Assert.NotEmpty(text);
+    }
+
+    [Fact]
+    public async Task AgentFactory_DependencyInjection_Connection()
+    {
+        var secrets = SecretsManager.GetSecrets();
+        ServiceCollection services = new();
+        services.AddAnthropicAgentFactory(new AnthropicConnection
+        {
+            ApiKey = secrets.AnthropicApiKey,
+            NetworkTimeout = TimeSpan.FromSeconds(10)
+        });
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        var cancellationToken = TestContext.Current.CancellationToken;
+        string text = (await provider.GetRequiredService<AnthropicAgentFactory>()
+            .CreateAgent(AnthropicChatModels.ClaudeHaiku45, 2000)
+            .RunAsync("Hello", cancellationToken: cancellationToken)).Text;
+        Assert.NotEmpty(text);
+    }
+}

development/Tests/AzureOpenAITests.cs

@@ -0,0 +1,110 @@
+using AgentFrameworkToolkit.AzureOpenAI;
+using AgentFrameworkToolkit.OpenAI;
+using Microsoft.Extensions.AI;
+using Microsoft.Extensions.DependencyInjection;
+using Secrets;
+
+namespace AgentFrameworkToolkit.Tests;
+
+[Collection("AgentFactoryTests")]
+public sealed class AzureOpenAIChatClientAgentFactoryTests : TestsBase
+{
+    [Fact]
+    public Task AgentFactory_Simple_ChatClient() => SimpleAgentTestsAsync(AgentProvider.AzureOpenAIChatClient);
+
+    [Fact]
+    public Task AgentFactory_Normal_ChatClient() => NormalAgentTestsAsync(AgentProvider.AzureOpenAIChatClient);
+
+    [Fact]
+    public Task AgentFactory_OpenTelemetryAndLoggingMiddleware_ChatClient() => OpenTelemetryAndLoggingMiddlewareTestsAsync(AgentProvider.AzureOpenAIChatClient);
+
+    [Fact]
+    public Task AgentFactory_ToolCall_ChatClient() => ToolCallAgentTestsAsync(AgentProvider.AzureOpenAIChatClient);
+
+    [Fact]
+    public Task AgentFactory_McpToolCall_ChatClient() => McpToolCallAgentTestsAsync(AgentProvider.AzureOpenAIChatClient);
+
+    [Fact]
+    public Task AgentFactory_StructuredOutput_ChatClient() => StructuredOutputAgentTestsAsync(AgentProvider.AzureOpenAIChatClient);
+
+    [Fact]
+    public Task AgentFactory_Simple_ResponsesApi() => SimpleAgentTestsAsync(AgentProvider.AzureOpenAIResponsesApi);
+
+    [Fact]
+    public Task AgentFactory_Normal_ResponsesApi() => NormalAgentTestsAsync(AgentProvider.AzureOpenAIResponsesApi);
+
+    [Fact]
+    public Task AgentFactory_OpenTelemetryAndLoggingMiddleware_ResponsesApi() => OpenTelemetryAndLoggingMiddlewareTestsAsync(AgentProvider.AzureOpenAIResponsesApi);
+
+    [Fact]
+    public Task AgentFactory_ToolCall_ResponsesApi() => ToolCallAgentTestsAsync(AgentProvider.AzureOpenAIResponsesApi);
+
+    [Fact]
+    public Task AgentFactory_McpToolCall_ResponsesApi() => McpToolCallAgentTestsAsync(AgentProvider.AzureOpenAIResponsesApi);
+
+    [Fact]
+    public Task AgentFactory_StructuredOutput_ResponsesApi() => StructuredOutputAgentTestsAsync(AgentProvider.AzureOpenAIResponsesApi);
+
+    [Fact]
+    public async Task AgentFactory_DependencyInjection()
+    {
+        var secrets = SecretsManager.GetSecrets();
+        ServiceCollection services = new();
+        services.AddAzureOpenAIAgentFactory(secrets.AzureOpenAiEndpoint, secrets.AzureOpenAiKey);
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        var cancellationToken = TestContext.Current.CancellationToken;
+        string text = (await provider.GetRequiredService<AzureOpenAIAgentFactory>()
+            .CreateAgent(OpenAIChatModels.Gpt5Nano)
+            .RunAsync("Hello", cancellationToken: cancellationToken)).Text;
+        Assert.NotEmpty(text);
+    }
+
+    [Fact]
+    public async Task AgentFactory_DependencyInjection_Connection()
+    {
+        var secrets = SecretsManager.GetSecrets();
+        ServiceCollection services = new();
+        services.AddAzureOpenAIAgentFactory(new AzureOpenAIConnection
+        {
+            Endpoint = secrets.AzureOpenAiEndpoint,
+            ApiKey = secrets.AzureOpenAiKey,
+            NetworkTimeout = TimeSpan.FromSeconds(10)
+        });
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        var cancellationToken = TestContext.Current.CancellationToken;
+        string text = (await provider.GetRequiredService<AzureOpenAIAgentFactory>()
+            .CreateAgent(OpenAIChatModels.Gpt5Nano)
+            .RunAsync("Hello", cancellationToken: cancellationToken)).Text;
+        Assert.NotEmpty(text);
+    }
+
+    [Fact]
+    public async Task EmbeddingFactory()
+    {
+        Secrets.Secrets secrets = SecretsManager.GetSecrets();
+        AzureOpenAIEmbeddingFactory factory = new(secrets.AzureOpenAiEndpoint, secrets.AzureOpenAiKey);
+        IEmbeddingGenerator<string, Embedding<float>> generator = factory.GetEmbeddingGenerator("text-embedding-3-small");
+        Embedding<float> embedding = await generator.GenerateAsync("Hello", cancellationToken: TestContext.Current.CancellationToken);
+        Assert.Equal(1536, embedding.Dimensions);
+    }
+
+    [Fact]
+    public async Task EmbeddingFactory_DependencyInjection()
+    {
+        var secrets = SecretsManager.GetSecrets();
+        ServiceCollection services = new();
+        services.AddAzureOpenAIEmbeddingFactory(secrets.AzureOpenAiEndpoint, secrets.AzureOpenAiKey);
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        AzureOpenAIEmbeddingFactory embeddingFactory = provider.GetRequiredService<AzureOpenAIEmbeddingFactory>();
+        var cancellationToken = TestContext.Current.CancellationToken;
+        Embedding<float> embedding = await embeddingFactory.GetEmbeddingGenerator("text-embedding-3-small")
+            .GenerateAsync("Hello", cancellationToken: cancellationToken);
+        Assert.Equal(1536, embedding.Dimensions);
+    }
+}