Merge branch 'main' into switch-mongodb-to-3-5

Author: rogerbarreto

dotnet/nuget/nuget-package.props

@@ -1,15 +1,15 @@
 <Project>
   <PropertyGroup>
     <!-- Central version prefix - applies to all nuget packages. -->
-    <VersionPrefix>1.67.1</VersionPrefix>
+    <VersionPrefix>1.68.0</VersionPrefix>
     <PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
     <PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)</PackageVersion>
 
     <Configurations>Debug;Release;Publish</Configurations>
     <IsPackable>true</IsPackable>
 
     <!-- Package validation. Baseline Version should be the latest version available on NuGet. -->
-    <PackageValidationBaselineVersion>1.67.0</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>1.67.1</PackageValidationBaselineVersion>
     <!-- Validate assembly attributes only for Publish builds -->
     <NoWarn Condition="'$(Configuration)' != 'Publish'">$(NoWarn);CP0003</NoWarn>
     <!-- Do not validate reference assemblies -->

dotnet/src/Agents/OpenAI/Internal/ResponseCreationOptionsFactory.cs

@@ -60,8 +60,10 @@ internal static ResponseCreationOptions CreateOptions(
         if (responseTools is not null && responseTools.Any())
         {
             creationOptions.Tools.AddRange(responseTools);
-            creationOptions.ToolChoice = ResponseToolChoice.CreateAutoChoice();
-            creationOptions.ParallelToolCallsEnabled = true;
+            if (creationOptions.ToolChoice is null)
+            {
+                creationOptions.ToolChoice = ResponseToolChoice.CreateAutoChoice();
+            }
         }
 
         return creationOptions;

dotnet/src/Agents/UnitTests/OpenAI/Internal/ResponseCreationOptionsFactoryTests.cs

@@ -261,6 +261,60 @@ public void CreateOptionsWithNullAgentNameTest()
         Assert.Equal("UnnamedAgent", options.EndUserId); // Null name should fallback to "UnnamedAgent"
     }
 
+    /// <summary>
+    /// Verify response options creation with kernel plugin and default response options.
+    /// </summary>
+    [Fact]
+    public void CreateOptionsWithKernelPluginAndDefaultOptionsTest()
+    {
+        // Arrange
+        var mockAgent = CreateMockAgent("Test Agent", "You are a helpful assistant.", storeEnabled: false);
+        var mockThread = CreateMockAgentThread(null);
+        mockAgent.Kernel.Plugins.AddFromObject(new TestPlugin());
+
+        // Act
+        var options = ResponseCreationOptionsFactory.CreateOptions(mockAgent, mockThread.Object, null);
+
+        // Assert
+        Assert.NotNull(options);
+        Assert.Single(options.Tools);
+        Assert.NotNull(options.ToolChoice);
+        Assert.Equal(ResponseToolChoiceKind.Auto, options.ToolChoice.Kind);
+        Assert.Null(options.ParallelToolCallsEnabled);
+    }
+
+    /// <summary>
+    /// Verify response options creation with kernel plugin and custom response options.
+    /// </summary>
+    [Fact]
+    public void CreateOptionsWithKernelPluginAndCustomOptionsTest()
+    {
+        // Arrange
+        var mockAgent = CreateMockAgent("Test Agent", "You are a helpful assistant.", storeEnabled: false);
+        var mockThread = CreateMockAgentThread(null);
+        mockAgent.Kernel.Plugins.AddFromObject(new TestPlugin());
+
+        // Custom invoke options should be respected
+        var invokeOptions = new OpenAIResponseAgentInvokeOptions
+        {
+            ResponseCreationOptions = new ResponseCreationOptions
+            {
+                ToolChoice = ResponseToolChoice.CreateNoneChoice(),
+                ParallelToolCallsEnabled = false
+            }
+        };
+
+        // Act
+        var options = ResponseCreationOptionsFactory.CreateOptions(mockAgent, mockThread.Object, invokeOptions);
+
+        // Assert
+        Assert.NotNull(options);
+        Assert.Single(options.Tools);
+        Assert.NotNull(options.ToolChoice);
+        Assert.Equal(ResponseToolChoiceKind.None, options.ToolChoice.Kind);
+        Assert.False(options.ParallelToolCallsEnabled);
+    }
+
     private static OpenAIResponseAgent CreateMockAgent(string? name, string? instructions, bool storeEnabled)
     {
         var mockClient = new Mock<OpenAIResponseClient>();
@@ -281,4 +335,11 @@ private static Mock<AgentThread> CreateMockAgentThread(string? threadId)
         mockThread.Setup(t => t.Id).Returns(threadId);
         return mockThread;
     }
+
+    private sealed class TestPlugin
+    {
+        [KernelFunction]
+        public void TestFunction()
+        { }
+    }
 }