Bugbash Samples

2026-06-16 21:04:09 +08:00 · 2025-11-07 17:51:17 +00:00
parent 82bd9cf6b5
commit 9586a3ea53
54 changed files with 725 additions and 649 deletions
@@ -45,23 +45,23 @@
  </Folder>
  <Folder Name="/Samples/GettingStarted/AgentProviders/AzureAIAgents/">
    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step01_Basics/Agent_Step01_Basics.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step01_Running/Agent_Step01_Running.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step03.1_UsingFunctionTools/Agent_Step03.1_UsingFunctionTools.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step03.2_UsingFunctionTools_FromOpenAPI/Agent_Step03.2_UsingFunctionTools_FromOpenAPI.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step07_3rdPartyThreadStorage/Agent_Step07_3rdPartyThreadStorage.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step08_Observability/Agent_Step08_Observability.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step09_DependencyInjection/Agent_Step09_DependencyInjection.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step10_AsMcpTool/Agent_Step10_AsMcpTool.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step11_UsingImages/Agent_Step11_UsingImages.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step12_AsFunctionTool/Agent_Step12_AsFunctionTool.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step13_Memory/Agent_Step13_Memory.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step14_Middleware/Agent_Step14_Middleware.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step15_Plugins/Agent_Step15_Plugins.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/Agent_Step16_ChatReduction/Agent_Step16_ChatReduction.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step01_Running/AzureAIAgents_Step01_Running.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step02_MultiturnConversation/AzureAIAgents_Step02_MultiturnConversation.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step03.1_UsingFunctionTools/AzureAIAgents_Step03.1_UsingFunctionTools.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step03.2_UsingFunctionTools_FromOpenAPI/AzureAIAgents_Step03.2_UsingFunctionTools_FromOpenAPI.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step04_UsingFunctionToolsWithApprovals/AzureAIAgents_Step04_UsingFunctionToolsWithApprovals.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step05_StructuredOutput/AzureAIAgents_Step05_StructuredOutput.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step06_PersistedConversations/AzureAIAgents_Step06_PersistedConversations.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step07_3rdPartyThreadStorage/AzureAIAgents_Step07_3rdPartyThreadStorage.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step08_Observability/AzureAIAgents_Step08_Observability.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step09_DependencyInjection/AzureAIAgents_Step09_DependencyInjection.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step10_AsMcpTool/AzureAIAgents_Step10_AsMcpTool.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step11_UsingImages/AzureAIAgents_Step11_UsingImages.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step12_AsFunctionTool/AzureAIAgents_Step12_AsFunctionTool.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step13_Memory/AzureAIAgents_Step13_Memory.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step14_Middleware/AzureAIAgents_Step14_Middleware.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step15_Plugins/AzureAIAgents_Step15_Plugins.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgent/AzureAIAgents_Step16_ChatReduction/AzureAIAgents_Step16_ChatReduction.csproj" />
  </Folder>
  <Folder Name="/Samples/GettingStarted/Agents/">
    <File Path="samples/GettingStarted/Agents/README.md" />
@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to create and use a simple AI agent with Azure OpenAI as the backend.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using OpenAI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
-
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(instructions: "You are good at telling jokes.", name: "Joker");
-
-// Invoke the agent and output the text result.
-Console.WriteLine(await agent.RunAsync("Tell me a joke about a pirate."));
-
-// Invoke the agent with streaming support.
-await foreach (var update in agent.RunStreamingAsync("Tell me a joke about a pirate."))
-{
-    Console.WriteLine(update);
-}
@@ -1,33 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to create and use a simple AI agent with a multi-turn conversation.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using OpenAI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
-
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(instructions: "You are good at telling jokes.", name: "Joker");
-
-// Invoke the agent with a multi-turn conversation, where the context is preserved in the thread object.
-AgentThread thread = agent.GetNewThread();
-Console.WriteLine(await agent.RunAsync("Tell me a joke about a pirate.", thread));
-Console.WriteLine(await agent.RunAsync("Now add some emojis to the joke and tell it in the voice of a pirate's parrot.", thread));
-
-// Invoke the agent with a multi-turn conversation and streaming, where the context is preserved in the thread object.
-thread = agent.GetNewThread();
-await foreach (var update in agent.RunStreamingAsync("Tell me a joke about a pirate.", thread))
-{
-    Console.WriteLine(update);
-}
-await foreach (var update in agent.RunStreamingAsync("Now add some emojis to the joke and tell it in the voice of a pirate's parrot.", thread))
-{
-    Console.WriteLine(update);
-}
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to use a ChatClientAgent with function tools.
-// It shows both non-streaming and streaming agent interactions using menu-related tools.
-
-using System.ComponentModel;
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-using OpenAI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
-
-[Description("Get the weather for a given location.")]
-static string GetWeather([Description("The location to get the weather for.")] string location)
-    => $"The weather in {location} is cloudy with a high of 15°C.";
-
-// Create the chat client and agent, and provide the function tool to the agent.
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(instructions: "You are a helpful assistant", tools: [AIFunctionFactory.Create(GetWeather)]);
-
-// Non-streaming agent interaction with function tools.
-Console.WriteLine(await agent.RunAsync("What is the weather like in Amsterdam?"));
-
-// Streaming agent interaction with function tools.
-await foreach (var update in agent.RunStreamingAsync("What is the weather like in Amsterdam?"))
-{
-    Console.WriteLine(update);
-}
@@ -1,33 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to use a ChatClientAgent with function tools provided via an OpenAPI spec.
-// It uses functionality from Semantic Kernel to parse the OpenAPI spec and create function tools to use with the Agent Framework Agent.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-using Microsoft.SemanticKernel;
-using Microsoft.SemanticKernel.Plugins.OpenApi;
-using OpenAI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
-
-// Load the OpenAPI Spec from a file.
-KernelPlugin plugin = await OpenApiKernelPluginFactory.CreateFromOpenApiAsync("github", "OpenAPISpec.json");
-
-// Convert the Semantic Kernel plugin to Agent Framework function tools.
-// This requires a dummy Kernel instance, since KernelFunctions cannot execute without one.
-Kernel kernel = new();
-List<AITool> tools = plugin.Select(x => x.WithKernel(kernel)).Cast<AITool>().ToList();
-
-// Create the chat client and agent, and provide the OpenAPI function tools to the agent.
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(instructions: "You are a helpful assistant", tools: tools);
-
-// Run the agent with the OpenAPI function tools.
-Console.WriteLine(await agent.RunAsync("Please list the names, colors and descriptions of all the labels available in the microsoft/agent-framework repository on github."));
@@ -1,66 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to use a ChatClientAgent with function tools that require a human in the loop for approvals.
-// It shows both non-streaming and streaming agent interactions using menu-related tools.
-// If the agent is hosted in a service, with a remote user, combine this sample with the Persisted Conversations sample to persist the chat history
-// while the agent is waiting for user input.
-
-using System.ComponentModel;
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-using OpenAI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
-
-// Create a sample function tool that the agent can use.
-[Description("Get the weather for a given location.")]
-static string GetWeather([Description("The location to get the weather for.")] string location)
-    => $"The weather in {location} is cloudy with a high of 15°C.";
-
-// Create the chat client and agent.
-// Note that we are wrapping the function tool with ApprovalRequiredAIFunction to require user approval before invoking it.
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(instructions: "You are a helpful assistant", tools: [new ApprovalRequiredAIFunction(AIFunctionFactory.Create(GetWeather))]);
-
-// Call the agent and check if there are any user input requests to handle.
-AgentThread thread = agent.GetNewThread();
-var response = await agent.RunAsync("What is the weather like in Amsterdam?", thread);
-var userInputRequests = response.UserInputRequests.ToList();
-
-// For streaming use:
-// var updates = await agent.RunStreamingAsync("What is the weather like in Amsterdam?", thread).ToListAsync();
-// userInputRequests = updates.SelectMany(x => x.UserInputRequests).ToList();
-
-while (userInputRequests.Count > 0)
-{
-    // Ask the user to approve each function call request.
-    // For simplicity, we are assuming here that only function approval requests are being made.
-    var userInputResponses = userInputRequests
-        .OfType<FunctionApprovalRequestContent>()
-        .Select(functionApprovalRequest =>
-        {
-            Console.WriteLine($"The agent would like to invoke the following function, please reply Y to approve: Name {functionApprovalRequest.FunctionCall.Name}");
-            return new ChatMessage(ChatRole.User, [functionApprovalRequest.CreateResponse(Console.ReadLine()?.Equals("Y", StringComparison.OrdinalIgnoreCase) ?? false)]);
-        })
-        .ToList();
-
-    // Pass the user input responses back to the agent for further processing.
-    response = await agent.RunAsync(userInputResponses, thread);
-
-    userInputRequests = response.UserInputRequests.ToList();
-
-    // For streaming use:
-    // updates = await agent.RunStreamingAsync(userInputResponses, thread).ToListAsync();
-    // userInputRequests = updates.SelectMany(x => x.UserInputRequests).ToList();
-}
-
-Console.WriteLine($"\nAgent: {response}");
-
-// For streaming use:
-// Console.WriteLine($"\nAgent: {updates.ToAgentRunResponse()}");
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,44 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to create and use a simple AI agent with Azure OpenAI as the backend that logs telemetry using OpenTelemetry.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Azure.Monitor.OpenTelemetry.Exporter;
-using Microsoft.Agents.AI;
-using OpenAI;
-using OpenTelemetry;
-using OpenTelemetry.Trace;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
-var applicationInsightsConnectionString = Environment.GetEnvironmentVariable("APPLICATIONINSIGHTS_CONNECTION_STRING");
-
-// Create TracerProvider with console exporter
-// This will output the telemetry data to the console.
-string sourceName = Guid.NewGuid().ToString("N");
-var tracerProviderBuilder = Sdk.CreateTracerProviderBuilder()
-    .AddSource(sourceName)
-    .AddConsoleExporter();
-if (!string.IsNullOrWhiteSpace(applicationInsightsConnectionString))
-{
-    tracerProviderBuilder.AddAzureMonitorTraceExporter(options => options.ConnectionString = applicationInsightsConnectionString);
-}
-using var tracerProvider = tracerProviderBuilder.Build();
-
-// Create the agent, and enable OpenTelemetry instrumentation.
-AIAgent agent = new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(instructions: "You are good at telling jokes.", name: "Joker")
-    .AsBuilder()
-    .UseOpenTelemetry(sourceName: sourceName)
-    .Build();
-
-// Invoke the agent and output the text result.
-Console.WriteLine(await agent.RunAsync("Tell me a joke about a pirate."));
-
-// Invoke the agent with streaming support.
-await foreach (var update in agent.RunStreamingAsync("Tell me a joke about a pirate."))
-{
-    Console.WriteLine(update);
-}
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to use Image Multi-Modality with an AI agent.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Extensions.AI;
-using OpenAI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o";
-
-var agent = new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(
-        name: "VisionAgent",
-        instructions: "You are a helpful agent that can analyze images");
-
-ChatMessage message = new(ChatRole.User, [
-    new TextContent("What do you see in this image?"),
-    new UriContent("https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg", "image/jpeg")
-]);
-
-var thread = agent.GetNewThread();
-
-await foreach (var update in agent.RunStreamingAsync(message, thread))
-{
-    Console.WriteLine(update);
-}
@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to create and use a Azure OpenAI AI agent as a function tool.
-
-using System.ComponentModel;
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-using OpenAI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
-
-[Description("Get the weather for a given location.")]
-static string GetWeather([Description("The location to get the weather for.")] string location)
-    => $"The weather in {location} is cloudy with a high of 15°C.";
-
-// Create the chat client and agent, and provide the function tool to the agent.
-AIAgent weatherAgent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-     .GetChatClient(deploymentName)
-     .CreateAIAgent(
-        instructions: "You answer questions about the weather.",
-        name: "WeatherAgent",
-        description: "An agent that answers questions about the weather.",
-        tools: [AIFunctionFactory.Create(GetWeather)]);
-
-// Create the main agent, and provide the weather agent as a function tool.
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(instructions: "You are a helpful assistant who responds in French.", tools: [weatherAgent.AsAIFunction()]);
-
-// Invoke the agent and output the text result.
-Console.WriteLine(await agent.RunAsync("What is the weather like in Amsterdam?"));
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to use a chat history reducer to keep the context within model size limits.
-// Any implementation of Microsoft.Extensions.AI.IChatReducer can be used to customize how the chat history is reduced.
-// NOTE: this feature is only supported where the chat history is stored locally, such as with OpenAI Chat Completion.
-// Where the chat history is stored server side, such as with Azure Foundry Agents, the service must manage the chat history size.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-using OpenAI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
-
-// Construct the agent, and provide a factory to create an in-memory chat message store with a reducer that keeps only the last 2 non-system messages.
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(new ChatClientAgentOptions
-    {
-        Instructions = "You are good at telling jokes.",
-        Name = "Joker",
-        ChatMessageStoreFactory = ctx => new InMemoryChatMessageStore(new MessageCountingChatReducer(2), ctx.SerializedState, ctx.JsonSerializerOptions)
-    });
-
-AgentThread thread = agent.GetNewThread();
-
-// Invoke the agent and output the text result.
-Console.WriteLine(await agent.RunAsync("Tell me a joke about a pirate.", thread));
-
-// Get the chat history to see how many messages are stored.
-IList<ChatMessage>? chatHistory = thread.GetService<IList<ChatMessage>>();
-Console.WriteLine($"\nChat history has {chatHistory?.Count} messages.\n");
-
-// Invoke the agent a few more times.
-Console.WriteLine(await agent.RunAsync("Tell me a joke about a robot.", thread));
-Console.WriteLine($"\nChat history has {chatHistory?.Count} messages.\n");
-Console.WriteLine(await agent.RunAsync("Tell me a joke about a lemur.", thread));
-Console.WriteLine($"\nChat history has {chatHistory?.Count} messages.\n");
-
-// At this point, the chat history has exceeded the limit and the original message will not exist anymore,
-// so asking a follow up question about it will not work as expected.
-Console.WriteLine(await agent.RunAsync("Tell me the joke about the pirate again, but add emojis and use the voice of a parrot.", thread));
-
-Console.WriteLine($"\nChat history has {chatHistory?.Count} messages.\n");
@@ -9,13 +9,12 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
  </ItemGroup>

 </Project>
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample shows how to create and use a simple AI agent with Azure Foundry Agents as the backend.
+
+using Azure.AI.Agents;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+const string JokerInstructions = "You are good at telling jokes.";
+const string JokerName = "JokerAgent";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Define the agent you want to create. (Prompt Agent in this case)
+var agentDefinition = new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions };
+
+// Azure.AI.Agents SDK creates and manages agent by name and versions.
+// You can create a server side agent version with the Azure.AI.Agents SDK client below.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: JokerName, definition: agentDefinition);
+
+// You can retrieve an AIAgent for a already created server side agent version.
+AIAgent jokerAgent = agentsClient.GetAIAgent(agentVersion);
+
+// Invoke the agent and output the text result.
+AgentThread thread = jokerAgent.GetNewThread();
+Console.WriteLine(await jokerAgent.RunAsync("Tell me a joke about a pirate.", thread));
+
+// Invoke the agent with streaming support.
+thread = jokerAgent.GetNewThread();
+await foreach (var update in jokerAgent.RunStreamingAsync("Tell me a joke about a pirate.", thread))
+{
+    Console.WriteLine(update);
+}
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(jokerAgent.Name);
@@ -9,13 +9,12 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
  </ItemGroup>

 </Project>
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample shows how to create and use a simple AI agent with a multi-turn conversation.
+
+using Azure.AI.Agents;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+const string JokerInstructions = "You are good at telling jokes.";
+const string JokerName = "JokerAgent";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Define the agent you want to create. (Prompt Agent in this case)
+var agentDefinition = new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions };
+
+// Create a server side agent version with the Azure.AI.Agents SDK client.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: JokerName, definition: agentDefinition);
+
+// Retrieve an AIAgent for the created server side agent version.
+AIAgent jokerAgent = agentsClient.GetAIAgent(agentVersion);
+
+// Invoke the agent with a multi-turn conversation, where the context is preserved in the thread object.
+AgentThread thread = jokerAgent.GetNewThread();
+Console.WriteLine(await jokerAgent.RunAsync("Tell me a joke about a pirate.", thread));
+Console.WriteLine(await jokerAgent.RunAsync("Now add some emojis to the joke and tell it in the voice of a pirate's parrot.", thread));
+
+// Invoke the agent with a multi-turn conversation and streaming, where the context is preserved in the thread object.
+thread = jokerAgent.GetNewThread();
+await foreach (var update in jokerAgent.RunStreamingAsync("Tell me a joke about a pirate.", thread))
+{
+    Console.WriteLine(update);
+}
+await foreach (var update in jokerAgent.RunStreamingAsync("Now add some emojis to the joke and tell it in the voice of a pirate's parrot.", thread))
+{
+    Console.WriteLine(update);
+}
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(jokerAgent.Name);
@@ -9,13 +9,13 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>

 </Project>
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample demonstrates how to use an agent with function tools.
+// It shows both non-streaming and streaming agent interactions using weather-related tools.
+
+using System.ComponentModel;
+using Azure.AI.Agents;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+[Description("Get the weather for a given location.")]
+static string GetWeather([Description("The location to get the weather for.")] string location)
+    => $"The weather in {location} is cloudy with a high of 15°C.";
+
+const string AssistantInstructions = "You are a helpful assistant that can get weather information.";
+const string AssistantName = "WeatherAssistant";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Define the agent with function tools.
+var tool = AIFunctionFactory.Create(GetWeather);
+
+// Create AIAgent directly
+AIAgent agent = await agentsClient.CreateAIAgentAsync(name: AssistantName, model: deploymentName, instructions: AssistantInstructions, tools: [tool]);
+
+// Non-streaming agent interaction with function tools.
+AgentThread thread = agent.GetNewThread();
+Console.WriteLine(await agent.RunAsync("What is the weather like in Amsterdam?", thread));
+
+// Streaming agent interaction with function tools.
+thread = agent.GetNewThread();
+await foreach (var update in agent.RunStreamingAsync("What is the weather like in Amsterdam?", thread))
+{
+    Console.WriteLine(update);
+}
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
@@ -9,14 +9,14 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
    <PackageReference Include="Microsoft.SemanticKernel.Plugins.OpenApi" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>

  <ItemGroup>
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample demonstrates how to use an agent with function tools provided via an OpenAPI spec.
+// It uses functionality from Semantic Kernel to parse the OpenAPI spec and create function tools to use with the Agent Framework Agent.
+
+using Azure.AI.Agents;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
+using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.Plugins.OpenApi;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+// Load the OpenAPI Spec from a file.
+KernelPlugin plugin = await OpenApiKernelPluginFactory.CreateFromOpenApiAsync("github", "OpenAPISpec.json");
+
+// Convert the Semantic Kernel plugin to Agent Framework function tools.
+// This requires a dummy Kernel instance, since KernelFunctions cannot execute without one.
+Kernel kernel = new();
+List<AITool> tools = plugin.Select(x => x.WithKernel(kernel)).Cast<AITool>().ToList();
+
+const string AssistantInstructions = "You are a helpful assistant that can query GitHub repositories.";
+const string AssistantName = "GitHubAssistant";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Create AIAgent directly
+AIAgent agent = await agentsClient.CreateAIAgentAsync(name: AssistantName, model: deploymentName, instructions: AssistantInstructions, tools: tools);
+
+// Run the agent with the OpenAPI function tools.
+AgentThread thread = agent.GetNewThread();
+Console.WriteLine(await agent.RunAsync("Please list the names, colors and descriptions of all the labels available in the microsoft/agent-framework repository on github.", thread));
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.Identity" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample demonstrates how to use an agent with function tools that require a human in the loop for approvals.
+// It shows both non-streaming and streaming agent interactions using weather-related tools.
+// If the agent is hosted in a service, with a remote user, combine this sample with the Persisted Conversations sample to persist the chat history
+// while the agent is waiting for user input.
+
+using System.ComponentModel;
+using Azure.AI.Agents;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+// Create a sample function tool that the agent can use.
+[Description("Get the weather for a given location.")]
+static string GetWeather([Description("The location to get the weather for.")] string location)
+    => $"The weather in {location} is cloudy with a high of 15°C.";
+
+const string AssistantInstructions = "You are a helpful assistant that can get weather information.";
+const string AssistantName = "WeatherAssistant";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+var approvalTool = new ApprovalRequiredAIFunction(AIFunctionFactory.Create(GetWeather));
+
+// Create AIAgent directly
+AIAgent agent = await agentsClient.CreateAIAgentAsync(name: AssistantName, model: deploymentName, instructions: AssistantInstructions, tools: [approvalTool]);
+
+// Call the agent with approval-required function tools.
+// The agent will request approval before invoking the function.
+AgentThread thread = agent.GetNewThread();
+var response = await agent.RunAsync("What is the weather like in Amsterdam?", thread);
+
+// Check if there are any user input requests (approvals needed).
+var userInputRequests = response.UserInputRequests.ToList();
+
+while (userInputRequests.Count > 0)
+{
+    // Ask the user to approve each function call request.
+    // For simplicity, we are assuming here that only function approval requests are being made.
+    var userInputMessages = userInputRequests
+        .OfType<FunctionApprovalRequestContent>()
+        .Select(functionApprovalRequest =>
+        {
+            Console.WriteLine($"The agent would like to invoke the following function, please reply Y to approve: Name {functionApprovalRequest.FunctionCall.Name}");
+            var approved = Console.ReadLine()?.Equals("Y", StringComparison.OrdinalIgnoreCase) ?? false;
+            return new ChatMessage(ChatRole.User, [functionApprovalRequest.CreateResponse(approved)]);
+        })
+        .ToList();
+
+    // Pass the user input responses back to the agent for further processing.
+    response = await agent.RunAsync(userInputMessages, thread);
+
+    userInputRequests = response.UserInputRequests.ToList();
+}
+
+Console.WriteLine($"\nAgent: {response}");
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
@@ -9,13 +9,12 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
  </ItemGroup>

 </Project>
@@ -1,28 +1,26 @@
 // Copyright (c) Microsoft. All rights reserved.

-// This sample shows how to configure ChatClientAgent to produce structured output.
+// This sample shows how to configure an agent to produce structured output.

 using System.ComponentModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Azure.AI.OpenAI;
+using Azure.AI.Agents;
 using Azure.Identity;
 using Microsoft.Agents.AI;
-using OpenAI;
-using OpenAI.Chat;
 using SampleApp;

-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = "gpt-5"; // Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

-// Create chat client to be used by chat client agents.
-ChatClient chatClient = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-        .GetChatClient(deploymentName);
+const string AssistantInstructions = "You are a helpful assistant that extracts structured information about people.";
+const string AssistantName = "StructuredOutputAssistant";

-// Create the ChatClientAgent with the specified name and instructions.
-ChatClientAgent agent = chatClient.CreateAIAgent(new ChatClientAgentOptions(name: "HelpfulAssistant", instructions: "You are a helpful assistant."));
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Create ChatClientAgent directly
+ChatClientAgent agent = await agentsClient.CreateAIAgentAsync(model: deploymentName, new ChatClientAgentOptions(name: AssistantName, instructions: AssistantInstructions));

 // Set PersonInfo as the type parameter of RunAsync method to specify the expected structured output from the agent and invoke the agent with some unstructured input.
 AgentRunResponse<PersonInfo> response = await agent.RunAsync<PersonInfo>("Please provide information about John Smith, who is a 35-year-old software engineer.");
@@ -34,7 +32,7 @@ Console.WriteLine($"Age: {response.Result.Age}");
 Console.WriteLine($"Occupation: {response.Result.Occupation}");

 // Create the ChatClientAgent with the specified name, instructions, and expected structured output the agent should produce.
-ChatClientAgent agentWithPersonInfo = chatClient.CreateAIAgent(new ChatClientAgentOptions(name: "HelpfulAssistant", instructions: "You are a helpful assistant.")
+ChatClientAgent agentWithPersonInfo = agentsClient.CreateAIAgent(model: deploymentName, new ChatClientAgentOptions(name: AssistantName, instructions: AssistantInstructions)
 {
    ChatOptions = new()
    {
@@ -54,6 +52,9 @@ Console.WriteLine($"Name: {personInfo.Name}");
 Console.WriteLine($"Age: {personInfo.Age}");
 Console.WriteLine($"Occupation: {personInfo.Occupation}");

+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
+
 namespace SampleApp
 {
    /// <summary>
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.Identity" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -3,20 +3,27 @@
 // This sample shows how to create and use a simple AI agent with a conversation that can be persisted to disk.

 using System.Text.Json;
-using Azure.AI.OpenAI;
+using Azure.AI.Agents;
 using Azure.Identity;
 using Microsoft.Agents.AI;
-using OpenAI;

-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

-// Create the agent
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(instructions: "You are good at telling jokes.", name: "Joker");
+const string JokerInstructions = "You are good at telling jokes.";
+const string JokerName = "JokerAgent";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Define the agent you want to create. (Prompt Agent in this case)
+var agentDefinition = new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions };
+
+// Create a server side agent version with the Azure.AI.Agents SDK client.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: JokerName, definition: agentDefinition);
+
+// Retrieve an AIAgent for the created server side agent version.
+AIAgent agent = agentsClient.GetAIAgent(agentVersion);

 // Start a new thread for the agent conversation.
 AgentThread thread = agent.GetNewThread();
@@ -39,3 +46,6 @@ AgentThread resumedThread = agent.DeserializeThread(reloadedSerializedThread);

 // Run the agent again with the resumed thread.
 Console.WriteLine(await agent.RunAsync("Now tell the same joke in the voice of a pirate, and add some emojis to the joke.", resumedThread));
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
@@ -6,18 +6,19 @@

    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
+    <NoWarn>$(NoWarn);CA1812</NoWarn>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
    <PackageReference Include="Microsoft.SemanticKernel.Connectors.InMemory" />
    <PackageReference Include="System.Linq.Async" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>

 </Project>
@@ -2,42 +2,38 @@

 #pragma warning disable CA1869 // Cache and reuse 'JsonSerializerOptions' instances

-// This sample shows how to create and use a simple AI agent with a conversation that can be persisted to disk.
+// This sample shows how to create and use a simple AI agent with a conversation that can be persisted to a 3rd party storage.

 using System.Text.Json;
-using Azure.AI.OpenAI;
+using Azure.AI.Agents;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.VectorData;
 using Microsoft.SemanticKernel.Connectors.InMemory;
-using OpenAI;
 using SampleApp;

-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+const string JokerInstructions = "You are good at telling jokes.";
+const string JokerName = "JokerAgent";

 // Create a vector store to store the chat messages in.
 // Replace this with a vector store implementation of your choice if you want to persist the chat history to disk.
 VectorStore vectorStore = new InMemoryVectorStore();

-// Create the agent
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(new ChatClientAgentOptions
-    {
-        Instructions = "You are good at telling jokes.",
-        Name = "Joker",
-        ChatMessageStoreFactory = ctx =>
-        {
-            // Create a new chat message store for this agent that stores the messages in a vector store.
-            // Each thread must get its own copy of the VectorChatMessageStore, since the store
-            // also contains the id that the thread is stored under.
-            return new VectorChatMessageStore(vectorStore, ctx.SerializedState, ctx.JsonSerializerOptions);
-        }
-    });
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Define the agent you want to create. (Prompt Agent in this case)
+var agentDefinition = new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions };
+
+// Create a server side agent version with the Azure.AI.Agents SDK client.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: JokerName, definition: agentDefinition);
+
+// Retrieve an AIAgent for the created server side agent version.
+AIAgent agent = agentsClient.GetAIAgent(agentVersion);

 // Start a new thread for the agent conversation.
 AgentThread thread = agent.GetNewThread();
@@ -66,6 +62,9 @@ Console.WriteLine(await agent.RunAsync("Now tell the same joke in the voice of a
 var messageStore = resumedThread.GetService<VectorChatMessageStore>()!;
 Console.WriteLine($"\nThread is stored in vector store under key: {messageStore.ThreadDbKey}");

+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
+
 namespace SampleApp
 {
    /// <summary>
@@ -9,16 +9,15 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
    <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
    <PackageReference Include="OpenTelemetry" />
    <PackageReference Include="OpenTelemetry.Exporter.Console" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
  </ItemGroup>

 </Project>
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample shows how to create and use a simple AI agent with Azure Foundry Agents as the backend that logs telemetry using OpenTelemetry.
+
+using Azure.AI.Agents;
+using Azure.Identity;
+using Azure.Monitor.OpenTelemetry.Exporter;
+using Microsoft.Agents.AI;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+var applicationInsightsConnectionString = Environment.GetEnvironmentVariable("APPLICATIONINSIGHTS_CONNECTION_STRING");
+
+const string JokerInstructions = "You are good at telling jokes.";
+const string JokerName = "JokerAgent";
+
+// Create TracerProvider with console exporter
+// This will output the telemetry data to the console.
+string sourceName = Guid.NewGuid().ToString("N");
+var tracerProviderBuilder = Sdk.CreateTracerProviderBuilder()
+    .AddSource(sourceName)
+    .AddConsoleExporter();
+if (!string.IsNullOrWhiteSpace(applicationInsightsConnectionString))
+{
+    tracerProviderBuilder.AddAzureMonitorTraceExporter(options => options.ConnectionString = applicationInsightsConnectionString);
+}
+using var tracerProvider = tracerProviderBuilder.Build();
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Define the agent you want to create. (Prompt Agent in this case)
+var agentDefinition = new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions };
+
+// Create a server side agent version with the Azure.AI.Agents SDK client.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: JokerName, definition: agentDefinition);
+
+// Retrieve an AIAgent for the created server side agent version.
+AIAgent agent = agentsClient.GetAIAgent(agentVersion)
+    .AsBuilder()
+    .UseOpenTelemetry(sourceName: sourceName)
+    .Build();
+
+// Invoke the agent and output the text result.
+AgentThread thread = agent.GetNewThread();
+Console.WriteLine(await agent.RunAsync("Tell me a joke about a pirate.", thread));
+
+// Invoke the agent with streaming support.
+thread = agent.GetNewThread();
+await foreach (var update in agent.RunStreamingAsync("Tell me a joke about a pirate.", thread))
+{
+    Console.WriteLine(update);
+}
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
@@ -9,14 +9,13 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
    <PackageReference Include="Microsoft.Extensions.Hosting" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
  </ItemGroup>

 </Project>
@@ -4,34 +4,32 @@

 // This sample shows how to use dependency injection to register an AIAgent and use it from a hosted service with a user input chat loop.

-using Azure.AI.OpenAI;
+using Azure.AI.Agents;
 using Azure.Identity;
 using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+const string JokerInstructions = "You are good at telling jokes.";
+const string JokerName = "JokerAgent";

 // Create a host builder that we will register services with and then run.
 HostApplicationBuilder builder = Host.CreateApplicationBuilder(args);

-// Add agent options to the service collection.
-builder.Services.AddSingleton(
-    new ChatClientAgentOptions(instructions: "You are good at telling jokes.", name: "Joker"));
-
-// Add a chat client to the service collection.
-builder.Services.AddKeyedChatClient("AzureOpenAI", (sp) => new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-        .GetChatClient(deploymentName)
-        .AsIChatClient());
+// Add the agents client to the service collection.
+builder.Services.AddSingleton<AgentsClient>((sp) => new AgentsClient(new Uri(endpoint), new AzureCliCredential()));

 // Add the AI agent to the service collection.
-builder.Services.AddSingleton<AIAgent>((sp) => new ChatClientAgent(
-    chatClient: sp.GetRequiredKeyedService<IChatClient>("AzureOpenAI"),
-    options: sp.GetRequiredService<ChatClientAgentOptions>()));
+builder.Services.AddSingleton<AIAgent>((sp) =>
+{
+    var agentsClient = sp.GetRequiredService<AgentsClient>();
+    var agentDefinition = new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions };
+    var agentVersion = agentsClient.CreateAgentVersion(agentName: JokerName, definition: agentDefinition);
+    return agentsClient.GetAIAgent(agentVersion);
+});

 // Add a sample service that will use the agent to respond to user input.
 builder.Services.AddHostedService<SampleService>();
@@ -18,7 +18,8 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.AzureAI.Persistent\Microsoft.Agents.AI.AzureAI.Persistent.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI.Persistent\Microsoft.Agents.AI.AzureAI.Persistent.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>
  
 </Project>
@@ -9,12 +9,12 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
  </ItemGroup>
  
 </Project>
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample shows how to use Image Multi-Modality with an AI agent.
+
+using Azure.AI.Agents;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = System.Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o";
+
+const string VisionInstructions = "You are a helpful agent that can analyze images";
+const string VisionName = "VisionAgent";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Define the agent you want to create. (Prompt Agent in this case)
+var agentDefinition = new PromptAgentDefinition(model: deploymentName) { Instructions = VisionInstructions };
+
+// Create a server side agent version with the Azure.AI.Agents SDK client.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: VisionName, definition: agentDefinition);
+
+// Retrieve an AIAgent for the created server side agent version.
+AIAgent agent = agentsClient.GetAIAgent(agentVersion);
+
+ChatMessage message = new(ChatRole.User, [
+    new TextContent("What do you see in this image?"),
+    new UriContent("https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg", "image/jpeg")
+]);
+
+var thread = agent.GetNewThread();
+
+await foreach (var update in agent.RunStreamingAsync(message, thread))
+{
+    Console.WriteLine(update);
+}
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
@@ -10,13 +10,13 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>
  
 </Project>
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample shows how to create and use an Azure Foundry Agents AI agent as a function tool.
+
+using System.ComponentModel;
+using Azure.AI.Agents;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
+using OpenAI.Responses;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+const string WeatherInstructions = "You answer questions about the weather.";
+const string WeatherName = "WeatherAgent";
+const string MainInstructions = "You are a helpful assistant who responds in French.";
+const string MainName = "MainAgent";
+
+[Description("Get the weather for a given location.")]
+static string GetWeather([Description("The location to get the weather for.")] string location)
+    => $"The weather in {location} is cloudy with a high of 15°C.";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Create the weather agent with function tools.
+var weatherAgentDefinition = new PromptAgentDefinition(model: deploymentName)
+{
+    Instructions = WeatherInstructions
+};
+var weatherTool = AIFunctionFactory.Create(GetWeather);
+weatherAgentDefinition.Tools.Add(weatherTool.GetService<ResponseTool>() ?? weatherTool.AsOpenAIResponseTool()!);
+var weatherAgentVersion = agentsClient.CreateAgentVersion(agentName: WeatherName, definition: weatherAgentDefinition);
+AIAgent weatherAgent = agentsClient.GetAIAgent(weatherAgentVersion);
+
+// Create the main agent, and provide the weather agent as a function tool.
+var mainAgentDefinition = new PromptAgentDefinition(model: deploymentName)
+{
+    Instructions = MainInstructions
+};
+var agentTool = weatherAgent.AsAIFunction();
+mainAgentDefinition.Tools.Add(agentTool.GetService<ResponseTool>() ?? agentTool.AsOpenAIResponseTool()!);
+var mainAgentVersion = agentsClient.CreateAgentVersion(agentName: MainName, definition: mainAgentDefinition);
+AIAgent agent = agentsClient.GetAIAgent(mainAgentVersion);
+
+// Invoke the agent and output the text result.
+AgentThread thread = agent.GetNewThread();
+Console.WriteLine(await agent.RunAsync("What is the weather like in Amsterdam?", thread));
+
+// Cleanup by agent name removes the agent versions created.
+agentsClient.DeleteAgent(agent.Name);
+agentsClient.DeleteAgent(weatherAgent.Name);
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <NoWarn>$(NoWarn);CA1812</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.Identity" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -8,34 +8,29 @@

 using System.Text;
 using System.Text.Json;
-using Azure.AI.OpenAI;
+using Azure.AI.Agents;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
-using OpenAI;
-using OpenAI.Chat;
 using SampleApp;

-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

-ChatClient chatClient = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName);
+const string AssistantInstructions = "You are a friendly assistant. Always address the user by their name.";
+const string AssistantName = "FriendlyAssistant";

-// Create the agent and provide a factory to add our custom memory component to
-// all threads created by the agent. Here each new memory component will have its own
-// user info object, so each thread will have its own memory.
-// In real world applications/services, where the user info would be persisted in a database,
-// and preferably shared between multiple threads used by the same user, ensure that the
-// factory reads the user id from the current context and scopes the memory component
-// and its storage to that user id.
-AIAgent agent = chatClient.CreateAIAgent(new ChatClientAgentOptions()
-{
-    Instructions = "You are a friendly assistant. Always address the user by their name.",
-    AIContextProviderFactory = ctx => new UserInfoMemory(chatClient.AsIChatClient(), ctx.SerializedState, ctx.JsonSerializerOptions)
-});
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Define the agent you want to create. (Prompt Agent in this case)
+var agentDefinition = new PromptAgentDefinition(model: deploymentName) { Instructions = AssistantInstructions };
+
+// Create a server side agent version with the Azure.AI.Agents SDK client.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: AssistantName, definition: agentDefinition);
+
+// Retrieve an AIAgent for the created server side agent version.
+AIAgent agent = agentsClient.GetAIAgent(agentVersion);

 // Create a new thread for the conversation.
 AgentThread thread = agent.GetNewThread();
@@ -79,6 +74,9 @@ if (userInfo is not null && newThread.GetService<UserInfoMemory>() is UserInfoMe
 // This time the agent should remember the user's name and use it in the response.
 Console.WriteLine(await agent.RunAsync("What is my name and age?", newThread));

+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
+
 namespace SampleApp
 {
    /// <summary>
@@ -11,12 +11,12 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-	  <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>

 </Project>
@@ -1,24 +1,27 @@
 // Copyright (c) Microsoft. All rights reserved.

-// This sample shows multiple middleware layers working together with Azure OpenAI:
-// chat client (global/per-request), agent run (PII filtering and guardrails),
+// This sample shows multiple middleware layers working together with Azure Foundry Agents:
+// agent run (PII filtering and guardrails),
 // function invocation (logging and result overrides), and human-in-the-loop
 // approval workflows for sensitive function calls.

 using System.ComponentModel;
 using System.Text.RegularExpressions;
-using Azure.AI.OpenAI;
+using Azure.AI.Agents;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
+using OpenAI.Responses;

 // Get Azure AI Foundry configuration from environment variables
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = System.Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o";

-// Get a client to create/retrieve server side agents with
-var azureOpenAIClient = new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential())
-    .GetChatClient(deploymentName);
+const string AssistantInstructions = "You are an AI assistant that helps people find information.";
+const string AssistantName = "InformationAssistant";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());

 [Description("Get the weather for a given location.")]
 static string GetWeather([Description("The location to get the weather for.")] string location)
@@ -28,13 +31,19 @@ static string GetWeather([Description("The location to get the weather for.")] s
 static string GetDateTime()
    => DateTimeOffset.Now.ToString();

-// Adding middleware to the chat client level and building an agent on top of it
-var originalAgent = azureOpenAIClient.AsIChatClient()
-    .AsBuilder()
-    .Use(getResponseFunc: ChatClientMiddleware, getStreamingResponseFunc: null)
-    .BuildAIAgent(
-        instructions: "You are an AI assistant that helps people find information.",
-        tools: [AIFunctionFactory.Create(GetDateTime, name: nameof(GetDateTime))]);
+// Define the agent with tools
+var agentDefinition = new PromptAgentDefinition(model: deploymentName)
+{
+    Instructions = AssistantInstructions
+};
+var dateTimeTool = AIFunctionFactory.Create(GetDateTime, name: nameof(GetDateTime));
+agentDefinition.Tools.Add(dateTimeTool.GetService<ResponseTool>() ?? dateTimeTool.AsOpenAIResponseTool()!);
+
+// Create a server side agent version with the Azure.AI.Agents SDK client.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: AssistantName, definition: agentDefinition);
+
+// Retrieve an AIAgent for the created server side agent version.
+var originalAgent = agentsClient.GetAIAgent(agentVersion);

 // Adding middleware to the agent level
 var middlewareEnabledAgent = originalAgent
@@ -75,13 +84,7 @@ var optionsWithApproval = new ChatClientAgentRunOptions(new()
 {
    // Adding a function with approval required
    Tools = [new ApprovalRequiredAIFunction(AIFunctionFactory.Create(GetWeather, name: nameof(GetWeather)))],
-})
-{
-    ChatClientFactory = (chatClient) => chatClient
-        .AsBuilder()
-        .Use(PerRequestChatClientMiddleware, null) // Using the non-streaming for handling streaming as well
-        .Build()
-};
+});

 // var response = middlewareAgent  // Using per-request middleware pipeline in addition to existing agent-level middleware
 var response = await originalAgent // Using per-request middleware pipeline without existing agent-level middleware
@@ -236,25 +239,5 @@ async Task<AgentRunResponse> ConsolePromptingApprovalMiddleware(IEnumerable<Chat
    return response;
 }

-// This middleware handles chat client lower level invocations.
-// This is useful for handling agent messages before they are sent to the LLM and also handle any response messages from the LLM before they are sent back to the agent.
-async Task<ChatResponse> ChatClientMiddleware(IEnumerable<ChatMessage> message, ChatOptions? options, IChatClient innerChatClient, CancellationToken cancellationToken)
-{
-    Console.WriteLine("Chat Client Middleware - Pre-Chat");
-    var response = await innerChatClient.GetResponseAsync(message, options, cancellationToken);
-    Console.WriteLine("Chat Client Middleware - Post-Chat");
-
-    return response;
-}
-
-// There's no difference per-request middleware, except it's added to the chat client and used for a single agent run.
-// This middleware handles chat client lower level invocations.
-// This is useful for handling agent messages before they are sent to the LLM and also handle any response messages from the LLM before they are sent back to the agent.
-async Task<ChatResponse> PerRequestChatClientMiddleware(IEnumerable<ChatMessage> message, ChatOptions? options, IChatClient innerChatClient, CancellationToken cancellationToken)
-{
-    Console.WriteLine("Per-Request Chat Client Middleware - Pre-Chat");
-    var response = await innerChatClient.GetResponseAsync(message, options, cancellationToken);
-    Console.WriteLine("Per-Request Chat Client Middleware - Post-Chat");
-
-    return response;
-}
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(middlewareEnabledAgent.Name);
@@ -13,12 +13,12 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.Agents" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>
  
 </Project>
@@ -9,15 +9,18 @@
 // as AI functions. The AsAITools method of the plugin class shows how to specify
 // which methods should be exposed to the AI agent.

-using Azure.AI.OpenAI;
+using Azure.AI.Agents;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
-using OpenAI;
+using OpenAI.Responses;

-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+const string AssistantInstructions = "You are a helpful assistant that helps people find information.";
+const string AssistantName = "PluginAssistant";

 // Create a service collection to hold the agent plugin and its dependencies.
 ServiceCollection services = new();
@@ -27,17 +30,31 @@ services.AddSingleton<AgentPlugin>(); // The plugin depends on WeatherProvider a

 IServiceProvider serviceProvider = services.BuildServiceProvider();

-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new AzureCliCredential())
-    .GetChatClient(deploymentName)
-    .CreateAIAgent(
-        instructions: "You are a helpful assistant that helps people find information.",
-        name: "Assistant",
-        tools: [.. serviceProvider.GetRequiredService<AgentPlugin>().AsAITools()],
-        services: serviceProvider); // Pass the service provider to the agent so it will be available to plugin functions to resolve dependencies.
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());

-Console.WriteLine(await agent.RunAsync("Tell me current time and weather in Seattle."));
+// Define the agent with plugin tools
+var agentDefinition = new PromptAgentDefinition(model: deploymentName)
+{
+    Instructions = AssistantInstructions
+};
+foreach (var tool in serviceProvider.GetRequiredService<AgentPlugin>().AsAITools())
+{
+    agentDefinition.Tools.Add(tool.GetService<ResponseTool>() ?? tool.AsOpenAIResponseTool()!);
+}
+
+// Create a server side agent version with the Azure.AI.Agents SDK client.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: AssistantName, definition: agentDefinition);
+
+// Retrieve an AIAgent for the created server side agent version.
+AIAgent agent = agentsClient.GetAIAgent(agentVersion);
+
+// Invoke the agent and output the text result.
+AgentThread thread = agent.GetNewThread();
+Console.WriteLine(await agent.RunAsync("Tell me current time and weather in Seattle.", thread));
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);

 /// <summary>
 /// The agent plugin that provides weather and current time information.
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Azure.AI.Agents" />
+    <PackageReference Include="Azure.Identity" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AzureAI\Microsoft.Agents.AI.AzureAI.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample shows how to use Azure Foundry Agents with chat history management.
+// NOTE: With Azure Foundry Agents, the service manages the chat history size server-side.
+// The agent thread maintains the conversation history automatically.
+
+using Azure.AI.Agents;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
+
+const string JokerInstructions = "You are good at telling jokes.";
+const string JokerName = "JokerAgent";
+
+// Get a client to create/retrieve/delete server side agents with Azure Foundry Agents.
+var agentsClient = new AgentsClient(new Uri(endpoint), new AzureCliCredential());
+
+// Define the agent you want to create. (Prompt Agent in this case)
+var agentDefinition = new PromptAgentDefinition(model: deploymentName) { Instructions = JokerInstructions };
+
+// Create a server side agent version with the Azure.AI.Agents SDK client.
+var agentVersion = agentsClient.CreateAgentVersion(agentName: JokerName, definition: agentDefinition);
+
+// Retrieve an AIAgent for the created server side agent version.
+AIAgent agent = agentsClient.GetAIAgent(agentVersion);
+
+AgentThread thread = agent.GetNewThread();
+
+// Invoke the agent and output the text result.
+Console.WriteLine(await agent.RunAsync("Tell me a joke about a pirate.", thread));
+
+// Invoke the agent a few more times.
+Console.WriteLine(await agent.RunAsync("Tell me a joke about a robot.", thread));
+Console.WriteLine(await agent.RunAsync("Tell me a joke about a lemur.", thread));
+
+// With Azure Foundry Agents, the service manages the chat history size server-side.
+// The agent thread maintains the conversation history automatically.
+Console.WriteLine(await agent.RunAsync("Tell me the joke about the pirate again, but add emojis and use the voice of a parrot.", thread));
+
+// Cleanup by agent name removes the agent version created.
+agentsClient.DeleteAgent(agent.Name);
@@ -602,7 +602,7 @@ public static class AgentsClientExtensions
        OpenAIClientOptions? openAIClientOptions,
        bool requireInvocableTools)
    {
-        IChatClient chatClient = new AzureAIAgentChatClient(agentsClient, agentVersion, openAIClientOptions);
+        IChatClient chatClient = new AzureAIAgentChatClient(agentsClient, agentVersion, agentOptions.ChatOptions, openAIClientOptions);

        if (clientFactory is not null)
        {
@@ -623,7 +623,7 @@ public static class AgentsClientExtensions
        => CreateChatClientAgent(
            agentsClient,
            agentVersion,
-            CreateChatClientAgentOptions(agentVersion, tools, requireInvocableTools),
+            CreateChatClientAgentOptions(agentVersion, new ChatOptions() { Tools = tools }, requireInvocableTools),
            clientFactory,
            openAIClientOptions,
            requireInvocableTools);
@@ -632,7 +632,7 @@ public static class AgentsClientExtensions
    /// This method creates <see cref="ChatClientAgentOptions"/> for the specified <see cref="AgentVersion"/> and the provided tools.
    /// </summary>
    /// <param name="agentVersion">The agent version.</param>
-    /// <param name="tools">The tools to use when interacting with the agent.</param>
+    /// <param name="chatOptions">The <see cref="ChatOptions"/> to use when interacting with the agent.</param>
    /// <param name="requireInvocableTools">Indicates whether to enforce the presence of invocable tools when the AIAgent is created with an agent definition that uses them.</param>
    /// <returns>The created <see cref="ChatClientAgentOptions"/>.</returns>
    /// <exception cref="InvalidOperationException">Thrown when the agent definition requires in-process tools but none were provided.</exception>
@@ -641,7 +641,7 @@ public static class AgentsClientExtensions
    /// This method rebuilds the agent options from the agent definition returned by the version and combine with the in-proc tools when provided
    /// this ensures that all required tools are provided and the definition of the agent options are consistent with the agent definition coming from the server.
    /// </remarks>
-    private static ChatClientAgentOptions CreateChatClientAgentOptions(AgentVersion agentVersion, IList<AITool>? tools, bool requireInvocableTools)
+    private static ChatClientAgentOptions CreateChatClientAgentOptions(AgentVersion agentVersion, ChatOptions? chatOptions, bool requireInvocableTools)
    {
        var agentDefinition = agentVersion.Definition;

@@ -649,7 +649,7 @@ public static class AgentsClientExtensions
        if (agentDefinition is PromptAgentDefinition { Tools: { Count: > 0 } definitionTools })
        {
            // Check if no tools were provided while the agent definition requires in-proc tools.
-            if (requireInvocableTools && tools is null or { Count: 0 } && definitionTools.Any(t => t is FunctionTool))
+            if (requireInvocableTools && chatOptions?.Tools is null or { Count: 0 } && definitionTools.Any(t => t is FunctionTool))
            {
                throw new ArgumentException("The agent definition in-process tools must be provided in the extension method tools parameter.");
            }
@@ -663,7 +663,7 @@ public static class AgentsClientExtensions
                if (responseTool is FunctionTool functionTool)
                {
                    // Check if a tool with the same type and name exists in the provided tools.
-                    var matchingTool = tools?.FirstOrDefault(t =>
+                    var matchingTool = chatOptions?.Tools?.FirstOrDefault(t =>
                        requireInvocableTools
                            ? t is AIFunction tf && functionTool.FunctionName == tf.Name // When invocable tools are required, match only AIFunction.
                            : (t is AIFunctionDeclaration tfd && functionTool.FunctionName == tfd.Name) ? true // When not required, match AIFunctionDeclaration OR
@@ -698,18 +698,16 @@ public static class AgentsClientExtensions

        if (agentDefinition is PromptAgentDefinition promptAgentDefinition)
        {
+            agentOptions.ChatOptions ??= chatOptions?.Clone() ?? new();
            agentOptions.Instructions = promptAgentDefinition.Instructions;
-            agentOptions.ChatOptions = new()
-            {
-                Temperature = promptAgentDefinition.Temperature,
-                TopP = promptAgentDefinition.TopP,
-                Instructions = promptAgentDefinition.Instructions,
-            };
+            agentOptions.ChatOptions.Temperature = promptAgentDefinition.Temperature;
+            agentOptions.ChatOptions.TopP = promptAgentDefinition.TopP;
+            agentOptions.ChatOptions.Instructions = promptAgentDefinition.Instructions;
        }

        if (agentTools is { Count: > 0 })
        {
-            agentOptions.ChatOptions ??= new ChatOptions();
+            agentOptions.ChatOptions ??= chatOptions?.Clone() ?? new();
            agentOptions.ChatOptions.Tools = agentTools;
        }

@@ -728,7 +726,7 @@ public static class AgentsClientExtensions
    /// <returns>A <see cref="ChatClientAgentOptions"/> instance configured according to the specified parameters.</returns>
    private static ChatClientAgentOptions CreateChatClientAgentOptions(AgentVersion agentVersion, ChatClientAgentOptions? options, bool requireInvocableTools)
    {
-        var agentOptions = CreateChatClientAgentOptions(agentVersion, options?.ChatOptions?.Tools, requireInvocableTools);
+        var agentOptions = CreateChatClientAgentOptions(agentVersion, options?.ChatOptions, requireInvocableTools);
        if (options is not null)
        {
            agentOptions.AIContextProviderFactory = options.AIContextProviderFactory;
@@ -22,6 +22,7 @@ internal sealed class AzureAIAgentChatClient : DelegatingChatClient
    private readonly ChatClientMetadata? _metadata;
    private readonly AgentsClient _agentsClient;
    private readonly AgentVersion _agentVersion;
+    private readonly ChatOptions? _chatOptions;

    /// <summary>
    /// The usage of a no-op model is a necessary change to avoid OpenAIClients to throw exceptions when
@@ -34,16 +35,17 @@ internal sealed class AzureAIAgentChatClient : DelegatingChatClient
    /// </summary>
    /// <param name="agentsClient">An instance of <see cref="AgentsClient"/> to interact with Azure AI Agents services.</param>
    /// <param name="agentRecord">An instance of <see cref="AgentRecord"/> representing the specific agent to use.</param>
+    /// <param name="chatOptions">An instance of <see cref="ChatOptions"/> representing the options on how the agent was predefined</param>
    /// <param name="openAIClientOptions">An optional <see cref="OpenAIClientOptions"/> for configuring the underlying OpenAI client.</param>
    /// <remarks>
    /// The <see cref="IChatClient"/> provided should be decorated with a <see cref="AzureAIAgentChatClient"/> for proper functionality.
    /// </remarks>
-    internal AzureAIAgentChatClient(AgentsClient agentsClient, AgentRecord agentRecord, OpenAIClientOptions? openAIClientOptions = null)
-        : this(agentsClient, Throw.IfNull(agentRecord).Versions.Latest, openAIClientOptions)
+    internal AzureAIAgentChatClient(AgentsClient agentsClient, AgentRecord agentRecord, ChatOptions? chatOptions, OpenAIClientOptions? openAIClientOptions = null)
+        : this(agentsClient, Throw.IfNull(agentRecord).Versions.Latest, chatOptions, openAIClientOptions)
    {
    }

-    internal AzureAIAgentChatClient(AgentsClient agentsClient, AgentVersion agentVersion, OpenAIClientOptions? openAIClientOptions = null)
+    internal AzureAIAgentChatClient(AgentsClient agentsClient, AgentVersion agentVersion, ChatOptions? chatOptions, OpenAIClientOptions? openAIClientOptions = null)
        : base(agentsClient
            .GetOpenAIClient(openAIClientOptions)
            .GetOpenAIResponseClient((agentVersion.Definition as PromptAgentDefinition)?.Model ?? NoOpModel)
@@ -52,6 +54,7 @@ internal sealed class AzureAIAgentChatClient : DelegatingChatClient
        this._agentsClient = Throw.IfNull(agentsClient);
        this._agentVersion = Throw.IfNull(agentVersion);
        this._metadata = new ChatClientMetadata("azure.ai.agents");
+        this._chatOptions = chatOptions;
    }

    /// <inheritdoc/>
@@ -94,8 +97,8 @@ internal sealed class AzureAIAgentChatClient : DelegatingChatClient

    private ChatOptions GetConversationEnabledChatOptions(ChatOptions? chatOptions, string conversationId)
    {
-        // Ignore all the chatOptions provided as agents options can't be set per-request basis.
-        var conversationChatOptions = new ChatOptions();
+        // Ignore all the chatOptions provided per-request and use by default the one provided at the agent creation.
+        ChatOptions conversationChatOptions = this._chatOptions?.Clone() ?? new();

        // Preserve the original RawRepresentationFactory
        var originalFactory = chatOptions?.RawRepresentationFactory;