Update README.md

Co-authored-by: westey <164392973+westey-m@users.noreply.github.com>

.github/ISSUE_TEMPLATE/python-issue.yml

@@ -47,7 +47,7 @@ body:
     attributes:
       label: Package Versions
       description: List the agent-framework-* packages and versions you are using
-      placeholder: "e.g., agent-framework-core: 1.0.0, agent-framework-azure-ai: 1.0.0"
+      placeholder: "e.g., agent-framework-core: 1.0.0, agent-framework-foundry: 1.0.0"
     validations:
       required: true
 

.github/workflows/dotnet-build-and-test.yml

@@ -82,7 +82,7 @@ jobs:
               .github
               dotnet
               python
-              workflow-samples
+              declarative-agents
 
       - name: Setup dotnet
         uses: actions/setup-dotnet@v5.2.0
@@ -152,7 +152,7 @@ jobs:
               .github
               dotnet
               python
-              workflow-samples
+              declarative-agents
 
       # Start Cosmos DB Emulator for all integration tests and only for unit tests when CosmosDB changes happened)
       - name: Start Azure Cosmos DB Emulator

.github/workflows/dotnet-integration-tests.yml

@@ -38,7 +38,7 @@ jobs:
             .github
             dotnet
             python
-            workflow-samples
+            declarative-agents
 
       - name: Start Azure Cosmos DB Emulator
         if: runner.os == 'Windows'

.github/workflows/python-check-coverage.py

@@ -37,7 +37,6 @@ ENFORCED_TARGETS: set[str] = {
     # Packages (sorted alphabetically)
     "packages.anthropic.agent_framework_anthropic",
     "packages.azure-ai-search.agent_framework_azure_ai_search",
-    "packages.azure-ai.agent_framework_azure_ai",
     "packages.core.agent_framework",
     "packages.core.agent_framework._workflows",
     "packages.foundry.agent_framework_foundry",

.github/workflows/python-integration-tests.yml

@@ -60,8 +60,8 @@ jobs:
     environment: integration
     timeout-minutes: 60
     env:
-      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-      OPENAI_RESPONSES_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
+      OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.OPENAI__CHATMODELID }}
+      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_EMBEDDING_MODEL: ${{ vars.OPENAI_EMBEDDING_MODEL_ID }}
       OPENAI_API_KEY: ${{ secrets.OPENAI__APIKEY }}
@@ -95,8 +95,8 @@ jobs:
     environment: integration
     timeout-minutes: 60
     env:
-      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
-      AZURE_OPENAI_RESPONSES_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
       AZURE_OPENAI_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
       AZURE_OPENAI_EMBEDDING_MODEL: ${{ vars.AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME }}
       AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
@@ -201,14 +201,15 @@ jobs:
     timeout-minutes: 60
     env:
       UV_PYTHON: "3.11"
-      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-      OPENAI_RESPONSES_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
+      OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.OPENAI__CHATMODELID }}
+      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_EMBEDDING_MODEL: ${{ vars.OPENAI_EMBEDDING_MODEL_ID }}
       OPENAI_API_KEY: ${{ secrets.OPENAI__APIKEY }}
       AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
       AZURE_OPENAI_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
-      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
       FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
       FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
       FUNCTIONS_WORKER_RUNTIME: "python"
@@ -255,12 +256,14 @@ jobs:
     environment: integration
     timeout-minutes: 60
     env:
-      AZURE_AI_PROJECT_ENDPOINT: ${{ secrets.AZUREAI__ENDPOINT }}
-      AZURE_AI_MODEL: ${{ vars.AZUREAI__DEPLOYMENTNAME }}
       FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
       FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
       FOUNDRY_AGENT_NAME: ${{ vars.FOUNDRY_AGENT_NAME }}
       FOUNDRY_AGENT_VERSION: ${{ vars.FOUNDRY_AGENT_VERSION }}
+      FOUNDRY_MODELS_ENDPOINT: ${{ vars.FOUNDRY_MODELS_ENDPOINT || '' }}
+      FOUNDRY_MODELS_API_KEY: ${{ secrets.FOUNDRY_MODELS_API_KEY || '' }}
+      FOUNDRY_EMBEDDING_MODEL: ${{ vars.FOUNDRY_EMBEDDING_MODEL || '' }}
+      FOUNDRY_IMAGE_EMBEDDING_MODEL: ${{ vars.FOUNDRY_IMAGE_EMBEDDING_MODEL || '' }}
       LOCAL_MCP_URL: ${{ vars.LOCAL_MCP__URL }}
     defaults:
       run:

.github/workflows/python-merge-tests.yml

@@ -37,7 +37,7 @@ jobs:
       azureChanged: ${{ steps.filter.outputs.azure }}
       miscChanged: ${{ steps.filter.outputs.misc }}
       functionsChanged: ${{ steps.filter.outputs.functions }}
-      azureAiChanged: ${{ steps.filter.outputs.azure-ai }}
+      foundryChanged: ${{ steps.filter.outputs.foundry }}
       cosmosChanged: ${{ steps.filter.outputs.cosmos }}
     steps:
       - uses: actions/checkout@v6
@@ -75,10 +75,10 @@ jobs:
             functions:
               - 'python/packages/azurefunctions/**'
               - 'python/packages/durabletask/**'
-            azure-ai:
-              - 'python/packages/azure-ai/**'
+            foundry:
               - 'python/packages/foundry/**'
               - 'python/samples/**/providers/foundry/**'
+              - 'python/samples/02-agents/embeddings/foundry_embeddings.py'
             cosmos:
               - 'python/packages/azure-cosmos/**'
       # run only if 'python' files were changed
@@ -139,8 +139,8 @@ jobs:
     runs-on: ubuntu-latest
     environment: integration
     env:
-      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-      OPENAI_RESPONSES_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
+      OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.OPENAI__CHATMODELID }}
+      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_EMBEDDING_MODEL: ${{ vars.OPENAI_EMBEDDING_MODEL_ID }}
       OPENAI_API_KEY: ${{ secrets.OPENAI__APIKEY }}
@@ -192,8 +192,8 @@ jobs:
     runs-on: ubuntu-latest
     environment: integration
     env:
-      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
-      AZURE_OPENAI_RESPONSES_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
       AZURE_OPENAI_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
       AZURE_OPENAI_EMBEDDING_MODEL: ${{ vars.AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME }}
       AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
@@ -330,14 +330,15 @@ jobs:
     environment: integration
     env:
       UV_PYTHON: "3.11"
-      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-      OPENAI_RESPONSES_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
+      OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.OPENAI__CHATMODELID }}
+      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_EMBEDDING_MODEL: ${{ vars.OPENAI_EMBEDDING_MODEL_ID }}
       OPENAI_API_KEY: ${{ secrets.OPENAI__APIKEY }}
       AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
       AZURE_OPENAI_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
-      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
       FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
       FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
       FUNCTIONS_WORKER_RUNTIME: "python"
@@ -392,13 +393,11 @@ jobs:
       github.event_name != 'pull_request' &&
       needs.paths-filter.outputs.pythonChanges == 'true' &&
       (github.event_name != 'merge_group' ||
-       needs.paths-filter.outputs.azureAiChanged == 'true' ||
+       needs.paths-filter.outputs.foundryChanged == 'true' ||
        needs.paths-filter.outputs.coreChanged == 'true')
     runs-on: ubuntu-latest
     environment: integration
     env:
-      AZURE_AI_PROJECT_ENDPOINT: ${{ secrets.AZUREAI__ENDPOINT }}
-      AZURE_AI_MODEL: ${{ vars.AZUREAI__DEPLOYMENTNAME }}
       FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
       FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
       FOUNDRY_AGENT_NAME: ${{ vars.FOUNDRY_AGENT_NAME }}
@@ -432,11 +431,6 @@ jobs:
           --timeout=120 --session-timeout=900 --timeout_method thread
           --retries 2 --retry-delay 5
         working-directory: ./python
-      - name: Test Azure AI samples
-        timeout-minutes: 10
-        if: env.RUN_SAMPLES_TESTS == 'true'
-        run: uv run pytest tests/samples/ -m "azure-ai"
-        working-directory: ./python
       - name: Surface failing tests
         if: always()
         uses: pmeier/pytest-results-action@v0.7.2

.github/workflows/python-sample-validation.yml

@@ -66,12 +66,13 @@ jobs:
       # Azure OpenAI configuration
       AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
       AZURE_OPENAI_MODEL: ${{ vars.AZURE_OPENAI_DEPLOYMENT_NAME || vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
-      AZURE_OPENAI_RESPONSES_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
+      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
       AZURE_OPENAI_EMBEDDING_MODEL: ${{ vars.AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME || vars.AZUREOPENAI__EMBEDDINGDEPLOYMENTNAME }}
       # OpenAI configuration
       OPENAI_API_KEY: ${{ secrets.OPENAI__APIKEY }}
-      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-      OPENAI_RESPONSES_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
+      OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.OPENAI__CHATMODELID }}
+      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       # GitHub MCP
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       OPENAI_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
@@ -97,11 +98,12 @@ jobs:
           echo "FOUNDRY_MODEL=$FOUNDRY_MODEL" >> .env
           echo "AZURE_OPENAI_ENDPOINT=$AZURE_OPENAI_ENDPOINT" >> .env
           echo "AZURE_OPENAI_MODEL=$AZURE_OPENAI_MODEL" >> .env
-          echo "AZURE_OPENAI_RESPONSES_MODEL=$AZURE_OPENAI_RESPONSES_MODEL" >> .env
+          echo "AZURE_OPENAI_CHAT_COMPLETION_MODEL=$AZURE_OPENAI_CHAT_COMPLETION_MODEL" >> .env
+          echo "AZURE_OPENAI_CHAT_MODEL=$AZURE_OPENAI_CHAT_MODEL" >> .env
           echo "AZURE_OPENAI_EMBEDDING_MODEL=$AZURE_OPENAI_EMBEDDING_MODEL" >> .env
           echo "OPENAI_API_KEY=$OPENAI_API_KEY" >> .env
+          echo "OPENAI_CHAT_COMPLETION_MODEL=$OPENAI_CHAT_COMPLETION_MODEL" >> .env
           echo "OPENAI_CHAT_MODEL=$OPENAI_CHAT_MODEL" >> .env
-          echo "OPENAI_RESPONSES_MODEL=$OPENAI_RESPONSES_MODEL" >> .env
           echo "GITHUB_PAT=$GITHUB_PAT" >> .env
 
       - name: Run sample validation
@@ -122,8 +124,8 @@ jobs:
     env:
       OPENAI_API_KEY: ${{ secrets.OPENAI__APIKEY }}
       OPENAI_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-      OPENAI_RESPONSES_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
+      OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.OPENAI__CHATMODELID }}
+      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
     defaults:
       run:
         working-directory: python
@@ -142,8 +144,8 @@ jobs:
         run: |
           echo "OPENAI_API_KEY=$OPENAI_API_KEY" >> .env
           echo "OPENAI_MODEL=$OPENAI_MODEL" >> .env
+          echo "OPENAI_CHAT_COMPLETION_MODEL=$OPENAI_CHAT_COMPLETION_MODEL" >> .env
           echo "OPENAI_CHAT_MODEL=$OPENAI_CHAT_MODEL" >> .env
-          echo "OPENAI_RESPONSES_MODEL=$OPENAI_RESPONSES_MODEL" >> .env
 
       - name: Run sample validation
         run: |
@@ -565,8 +567,8 @@ jobs:
       AZURE_OPENAI_MODEL: ${{ vars.AZURE_OPENAI_DEPLOYMENT_NAME || vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
       # OpenAI configuration
       OPENAI_API_KEY: ${{ secrets.OPENAI__APIKEY }}
-      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-      OPENAI_RESPONSES_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
+      OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.OPENAI__CHATMODELID }}
+      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
     defaults:
       run:
@@ -589,8 +591,8 @@ jobs:
           echo "AZURE_OPENAI_ENDPOINT=$AZURE_OPENAI_ENDPOINT" >> .env
           echo "AZURE_OPENAI_MODEL=$AZURE_OPENAI_MODEL" >> .env
           echo "OPENAI_API_KEY=$OPENAI_API_KEY" >> .env
+          echo "OPENAI_CHAT_COMPLETION_MODEL=$OPENAI_CHAT_COMPLETION_MODEL" >> .env
           echo "OPENAI_CHAT_MODEL=$OPENAI_CHAT_MODEL" >> .env
-          echo "OPENAI_RESPONSES_MODEL=$OPENAI_RESPONSES_MODEL" >> .env
 
       - name: Run sample validation
         run: |
@@ -610,14 +612,18 @@ jobs:
     env:
       FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT || vars.AZURE_AI_PROJECT_ENDPOINT }}
       FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL || vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
-      # Azure OpenAI configuration
+      # Azure OpenAI configuration for AF
       AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
       AZURE_OPENAI_MODEL: ${{ vars.AZURE_OPENAI_DEPLOYMENT_NAME || vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
-      # OpenAI configuration
+      # Azure OpenAI configuration for SK
+      AZURE_OPENAI_CHAT_DEPLOYMENT_NAME: ${{ vars.AZURE_OPENAI_DEPLOYMENT_NAME }}
+      # OpenAI key
       OPENAI_API_KEY: ${{ secrets.OPENAI__APIKEY }}
-      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-      OPENAI_RESPONSES_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
+      OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.OPENAI__CHATMODELID }}
+      OPENAI_CHAT_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
       OPENAI_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
+      # OpenAI configuration for SK
+      OPENAI_CHAT_MODEL_ID: ${{ vars.OPENAI__CHATMODELID }}
       # Copilot Studio
       COPILOTSTUDIOAGENT__ENVIRONMENTID: ${{ secrets.COPILOTSTUDIOAGENT__ENVIRONMENTID }}
       COPILOTSTUDIOAGENT__SCHEMANAME: ${{ secrets.COPILOTSTUDIOAGENT__SCHEMANAME }}
@@ -644,8 +650,8 @@ jobs:
           echo "AZURE_OPENAI_ENDPOINT=$AZURE_OPENAI_ENDPOINT" >> .env
           echo "AZURE_OPENAI_MODEL=$AZURE_OPENAI_MODEL" >> .env
           echo "OPENAI_API_KEY=$OPENAI_API_KEY" >> .env
+          echo "OPENAI_CHAT_COMPLETION_MODEL=$OPENAI_CHAT_COMPLETION_MODEL" >> .env
           echo "OPENAI_CHAT_MODEL=$OPENAI_CHAT_MODEL" >> .env
-          echo "OPENAI_RESPONSES_MODEL=$OPENAI_RESPONSES_MODEL" >> .env
           echo "COPILOTSTUDIOAGENT__ENVIRONMENTID=$COPILOTSTUDIOAGENT__ENVIRONMENTID" >> .env
           echo "COPILOTSTUDIOAGENT__SCHEMANAME=$COPILOTSTUDIOAGENT__SCHEMANAME" >> .env
           echo "COPILOTSTUDIOAGENT__TENANTID=$COPILOTSTUDIOAGENT__TENANTID" >> .env

README.md

@@ -120,38 +120,38 @@ if __name__ == "__main__":
 ```
 
 ### Basic Agent - .NET
+Create a simple Agent, using Microsoft Foundry with token-based auth, that writes a haiku about the Microsoft Agent Framework
+
+```c#
+// dotnet add package Microsoft.Agents.AI.Foundry
+// Use `az login` to authenticate with Azure CLI
+using Azure.AI.Projects;
+using Azure.Identity;
+using System;
+using Azure.AI.Projects;
+using Azure.Identity;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+
+var agent = new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential())
+    .AsAIAgent(model: deploymentName, name: "HaikuBot", instructions: "You are an upbeat assistant that writes beautifully.");
+
+Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Framework."));
+```
 
 Create a simple Agent, using OpenAI Responses, that writes a haiku about the Microsoft Agent Framework
 
 ```c#
-// dotnet add package Microsoft.Agents.AI.OpenAI --prerelease
-using Microsoft.Agents.AI;
+// dotnet add package Microsoft.Agents.AI.OpenAI
+using System;
 using OpenAI;
 using OpenAI.Responses;
 
 // Replace the <apikey> with your OpenAI API key.
 var agent = new OpenAIClient("<apikey>")
-    .GetResponsesClient("gpt-4o-mini")
-    .AsAIAgent(name: "HaikuBot", instructions: "You are an upbeat assistant that writes beautifully.");
-
-Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Framework."));
-```
-
-Create a simple Agent, using Microsoft Foundry with token-based auth, that writes a haiku about the Microsoft Agent Framework
-
-```c#
-// dotnet add package Microsoft.Agents.AI.AzureAI --prerelease
-// dotnet add package Azure.Identity
-// Use `az login` to authenticate with Azure CLI
-using Azure.AI.Projects;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
-
-var agent = new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential())
-    .AsAIAgent(model: deploymentName, name: "HaikuBot", instructions: "You are an upbeat assistant that writes beautifully.");
+    .GetResponsesClient()
+    .AsAIAgent(model: "gpt-5.4-mini", name: "HaikuBot", instructions: "You are an upbeat assistant that writes beautifully.");
 
 Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Framework."));
 ```
@@ -207,4 +207,9 @@ The samples typically read configuration from environment variables. Common requ
 
 ## Important Notes
 
-If you use the Microsoft Agent Framework to build applications that operate with third-party servers or agents, you do so at your own risk. We recommend reviewing all data being shared with third-party servers or agents and being cognizant of third-party practices for retention and location of data. It is your responsibility to manage whether your data will flow outside of your organization's Azure compliance and geographic boundaries and any related implications.
+> [!IMPORTANT]
+> If you use Microsoft Agent Framework to build applications that operate with any third-party servers, agents, code, or non-Azure Direct models (“Third-Party Systems”), you do so at your own risk. Third-Party Systems are Non-Microsoft Products under the Microsoft Product Terms and are governed by their own third-party license terms. You are responsible for any usage and associated costs.
+>
+>We recommend reviewing all data being shared with and received from Third-Party Systems and being cognizant of third-party practices for handling, sharing, retention and location of data. It is your responsibility to manage whether your data will flow outside of your organization’s Azure compliance and geographic boundaries and any related implications, and that appropriate permissions, boundaries and approvals are provisioned.
+> 
+>You are responsible for carefully reviewing and testing applications you build using Microsoft Agent Framework in the context of your specific use cases, and making all appropriate decisions and customizations. This includes implementing your own responsible AI mitigations such as metaprompt, content filters, or other safety systems, and ensuring your applications meet appropriate quality, reliability, security, and trustworthiness standards. See also: [Transparency FAQ](./TRANSPARENCY_FAQ.md)

declarative-agents/agent-samples/README.md

@@ -1,3 +1,3 @@
 # Declarative Agents
 
-This folder contains sample agent definitions that can be run using the declarative agent support, for python see the [declarative agent python sample folder](../python/samples/02-agents/declarative/).
+This folder contains sample agent definitions that can be run using the declarative agent support, for python see the [declarative agent python sample folder](../../python/samples/02-agents/declarative/).

declarative-agents/workflow-samples/README.md

@@ -10,8 +10,8 @@ Workflow workflow = DeclarativeWorkflowBuilder.Build("Marketing.yaml", options);
 ```
 
 These example workflows may be executed by the workflow
-[Samples](../dotnet/samples/03-workflows/Declarative)
+[Samples](../../dotnet/samples/03-workflows/Declarative)
 that are present in this repository.
 
-> See the [README.md](../dotnet/samples/03-workflows/Declarative/README.md) 
+> See the [README.md](../../dotnet/samples/03-workflows/Declarative/README.md) 
  associated with the samples for configuration details.

docs/decisions/0021-provider-leading-clients.md

@@ -37,7 +37,7 @@ Key changes:
 4. **New `FoundryChatClient`** in azure-ai for Azure AI Foundry Responses API access, built on `RawFoundryChatClient(RawOpenAIChatClient)`.
 5. **All deprecated `AzureOpenAI*` classes** consolidated into a single file (`_deprecated_azure_openai.py`) in the azure-ai package for clean future deletion.
 6. **Core's `agent_framework.openai` and `agent_framework.azure` namespaces** become lazy-loading gateways, preserving backward-compatible import paths while removing hard dependencies.
-7. **Unified `model` parameter** replaces `model_id` (OpenAI), `deployment_name` (Azure OpenAI), and `model_deployment_name` (Azure AI) across all client constructors. The term `model` is intentionally generic: it naturally maps to an OpenAI model name *and* to an Azure OpenAI deployment name, making it straightforward to use `OpenAIChatClient` with either OpenAI or Azure OpenAI backends (via `AsyncAzureOpenAI`). Environment variables are similarly unified (e.g., `OPENAI_MODEL` instead of separate `OPENAI_RESPONSES_MODEL_ID` / `OPENAI_CHAT_MODEL_ID`).
+7. **Unified `model` parameter** replaces `model_id` (OpenAI), `deployment_name` (Azure OpenAI), and `model_deployment_name` (Azure AI) across all client constructors. The term `model` is intentionally generic: it naturally maps to an OpenAI model name *and* to an Azure OpenAI deployment name, making it straightforward to use `OpenAIChatClient` with either OpenAI or Azure OpenAI backends (via `AsyncAzureOpenAI`). Environment variables are similarly unified (e.g., `OPENAI_MODEL` instead of separate `OPENAI_CHAT_MODEL_ID` / `OPENAI_CHAT_COMPLETION_MODEL_ID`).
 8. **`FoundryAgent`** replaces the pattern of `Agent(client=AzureAIClient(...))` for connecting to pre-configured agents in Azure AI Foundry (PromptAgents and HostedAgents). The underlying `RawFoundryAgentChatClient` is an implementation detail — most users interact only with `FoundryAgent`. `AzureAIAgentClient` is separately deprecated as it refers to the V1 Agents Service API. See below for design rationale.
 
 ### Foundry Agent Design: `FoundryAgentClient` vs `FoundryAgent`

docs/features/vector-stores-and-embeddings/README.md

@@ -177,7 +177,7 @@ This feature ports the vector store abstractions, embedding generator abstractio
 **Goal:** Add embedding generators to all existing AF provider packages that have chat clients.
 **Mergeable:** Yes — each is independent, added to existing provider packages.
 
-#### 2.1 — Azure AI Inference embedding (in `packages/azure-ai/`)
+#### 2.1 — Foundry inference embedding (in `packages/foundry/`)
 #### 2.2 — Ollama embedding (in `packages/ollama/`)
 #### 2.3 — Anthropic embedding (in `packages/anthropic/`)
 #### 2.4 — Bedrock embedding (in `packages/bedrock/`)

dotnet/AGENTS.md

@@ -29,7 +29,8 @@ using types like `IChatClient`, `FunctionInvokingChatClient`, `AITool`, `AIFunct
 
 ## Key Conventions
 
-- **Encoding**: All new files must be saved with UTF-8 encoding with BOM (Byte Order Mark). This is required for `dotnet format` to work correctly.
+- **Command output capture**: When running `dotnet build`, `dotnet test`, `dotnet format`, or similar commands, redirect output to a temp file first (e.g., `dotnet build --tl:off 2>&1 | Out-File $env:TEMP\build.log`), then analyze the file as needed. This avoids re-running expensive commands when the initial analysis misses something.
+- **Encoding**: All new files must be saved with UTF-8 encoding with BOM (Byte Order Mark). This is required for `dotnet format` to work correctly. When using PowerShell `Set-Content`, always pass `-Encoding UTF8BOM` to preserve the BOM (e.g., `Set-Content $file $content -NoNewline -Encoding UTF8BOM`).
 - **Copyright header**: `// Copyright (c) Microsoft. All rights reserved.` at top of all `.cs` files
 - **XML docs**: Required for all public methods and classes
 - **Async**: Use `Async` suffix for methods returning `Task`/`ValueTask`

dotnet/Directory.Build.props

@@ -17,7 +17,7 @@
 
   <PropertyGroup>
     <IsReleaseCandidate>false</IsReleaseCandidate>
-    <IsGenerallyAvailable>false</IsGenerallyAvailable>
+    <IsReleased>false</IsReleased>
   </PropertyGroup>
   
   <PropertyGroup>

dotnet/Directory.Packages.props

@@ -19,13 +19,13 @@
     <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0" />
     <!-- Azure.* -->
-    <PackageVersion Include="Azure.AI.Projects" Version="2.0.0-beta.2" />
+    <PackageVersion Include="Azure.AI.Projects" Version="2.0.0" />
     <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.10" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="2.9.0-beta.1" />
-    <PackageVersion Include="Azure.Identity" Version="1.19.0" />
+    <PackageVersion Include="Azure.Identity" Version="1.20.0" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0" />
     <!-- Google Gemini  -->
-    <PackageVersion Include="Google.GenAI" Version="0.11.0" />
+    <PackageVersion Include="Google.GenAI" Version="1.6.0" />
     <PackageVersion Include="Mscc.GenerativeAI.Microsoft" Version="2.9.3" />
     <!-- Microsoft.Azure.* -->
     <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.54.0" />
@@ -35,7 +35,7 @@
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.4" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.4" />
-    <PackageVersion Include="System.ClientModel" Version="1.9.0" />
+    <PackageVersion Include="System.ClientModel" Version="1.10.0" />
     <PackageVersion Include="System.CodeDom" Version="10.0.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="10.0.1" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />

dotnet/agent-framework-dotnet.slnx

@@ -34,7 +34,6 @@
     <Project Path="samples/02-agents/AgentProviders/Agent_With_GoogleGemini/Agent_With_GoogleGemini.csproj" />
     <Project Path="samples/02-agents/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj" />
     <Project Path="samples/02-agents/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj" />
     <Project Path="samples/02-agents/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj" />
     <Project Path="samples/02-agents/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj" />
   </Folder>
@@ -214,12 +213,12 @@
     <Project Path="samples/03-workflows/Declarative/ToolApproval/ToolApproval.csproj" />
   </Folder>
   <Folder Name="/Samples/03-workflows/Declarative/Examples/">
-    <File Path="../workflow-samples/CustomerSupport.yaml" />
-    <File Path="../workflow-samples/DeepResearch.yaml" />
-    <File Path="../workflow-samples/Marketing.yaml" />
-    <File Path="../workflow-samples/MathChat.yaml" />
-    <File Path="../workflow-samples/README.md" />
-    <File Path="../workflow-samples/wttr.json" />
+    <File Path="../declarative-agents/workflow-samples/CustomerSupport.yaml" />
+    <File Path="../declarative-agents/workflow-samples/DeepResearch.yaml" />
+    <File Path="../declarative-agents/workflow-samples/Marketing.yaml" />
+    <File Path="../declarative-agents/workflow-samples/MathChat.yaml" />
+    <File Path="../declarative-agents/workflow-samples/README.md" />
+    <File Path="../declarative-agents/workflow-samples/wttr.json" />
   </Folder>
   <Folder Name="/Samples/03-workflows/SharedStates/">
     <Project Path="samples/03-workflows/SharedStates/SharedStates.csproj" />

dotnet/eng/verify-samples/AgentsSamples.cs

@@ -781,19 +781,6 @@ internal static class AgentsSamples
             SkipReason = "Requires local Ollama server.",
         },
 
-        new SampleDefinition
-        {
-            Name = "Agent_With_OpenAIAssistants",
-            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants",
-            RequiredEnvironmentVariables = ["OPENAI_API_KEY"],
-            OptionalEnvironmentVariables = ["OPENAI_CHAT_MODEL_NAME"],
-            ExpectedOutputDescription =
-            [
-                "The output should contain a joke about a pirate from the OpenAI Assistants API.",
-                "The output should not contain error messages or stack traces.",
-            ],
-        },
-
         new SampleDefinition
         {
             Name = "Agent_With_OpenAIChatCompletion",

dotnet/nuget/nuget-package.props

@@ -2,19 +2,20 @@
   <PropertyGroup>
     <!-- Central version prefix - applies to all nuget packages. -->
     <VersionPrefix>1.0.0</VersionPrefix>
-    <RCNumber>5</RCNumber>
+    <RCNumber>6</RCNumber>
     <PackageVersion Condition="'$(IsReleaseCandidate)' == 'true'">$(VersionPrefix)-rc$(RCNumber)</PackageVersion>
-    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).260330.1</PackageVersion>
-    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' == ''">$(VersionPrefix)-preview.260330.1</PackageVersion>
-    <GitTag>1.0.0-rc5</GitTag>
+    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).260402.1</PackageVersion>
+    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' == ''">$(VersionPrefix)-preview.260402.1</PackageVersion>
+    <PackageVersion Condition="'$(IsReleased)' == 'true'">$(VersionPrefix)</PackageVersion>
+    <GitTag>1.0.0</GitTag>
 
     <Configurations>Debug;Release;Publish</Configurations>
     <IsPackable>true</IsPackable>
 
     <!-- Package validation. Baseline Version should be the latest version available on NuGet. -->
-    <PackageValidationBaselineVersion>1.0.0-rc4</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>1.0.0-rc5</PackageValidationBaselineVersion>
     <!-- Enable validation for RC packages and GA packages -->
-    <EnablePackageValidation Condition="'$(IsReleaseCandidate)' == 'true' OR '$(IsGenerallyAvailable)' == 'true'">true</EnablePackageValidation>
+    <EnablePackageValidation Condition="'$(IsReleaseCandidate)' == 'true' OR '$(IsReleased)' == 'true'">true</EnablePackageValidation>
     <!-- Validate assembly attributes only for Publish builds -->
     <NoWarn Condition="'$(Configuration)' != 'Publish'">$(NoWarn);CP0003</NoWarn>
     <!-- Do not validate reference assemblies -->

dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIProject/Program.cs

@@ -20,10 +20,10 @@ const string JokerName = "JokerAgent";
 var aiProjectClient = new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential());
 
 // Define the agent you want to create. (Prompt Agent in this case)
-var agentVersionCreationOptions = new AgentVersionCreationOptions(new PromptAgentDefinition(model: deploymentName) { Instructions = "You are good at telling jokes." });
+var agentVersionCreationOptions = new ProjectsAgentVersionCreationOptions(new DeclarativeAgentDefinition(model: deploymentName) { Instructions = "You are good at telling jokes." });
 // 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 createdAgentVersion = aiProjectClient.Agents.CreateAgentVersion(agentName: JokerName, options: agentVersionCreationOptions);
+var createdAgentVersion = aiProjectClient.AgentAdministrationClient.CreateAgentVersion(agentName: JokerName, options: agentVersionCreationOptions);
 
 // Note:
 //      agentVersion.Id = "<agentName>:<versionNumber>",
@@ -34,15 +34,15 @@ var createdAgentVersion = aiProjectClient.Agents.CreateAgentVersion(agentName: J
 FoundryAgent existingJokerAgent = aiProjectClient.AsAIAgent(createdAgentVersion);
 
 // You can also create another AIAgent version by providing the same name with a different definition.
-AgentVersion newJokerAgentVersion = await aiProjectClient.Agents.CreateAgentVersionAsync(
+ProjectsAgentVersion newJokerAgentVersion = await aiProjectClient.AgentAdministrationClient.CreateAgentVersionAsync(
     JokerName,
-    new AgentVersionCreationOptions(new PromptAgentDefinition(model: deploymentName) { Instructions = "You are extremely hilarious at telling jokes." }));
+    new ProjectsAgentVersionCreationOptions(new DeclarativeAgentDefinition(model: deploymentName) { Instructions = "You are extremely hilarious at telling jokes." }));
 FoundryAgent newJokerAgent = aiProjectClient.AsAIAgent(newJokerAgentVersion);
 
 // You can also get the AIAgent latest version just providing its name.
-AgentRecord jokerAgentRecord = await aiProjectClient.Agents.GetAgentAsync(JokerName);
+ProjectsAgentRecord jokerAgentRecord = await aiProjectClient.AgentAdministrationClient.GetAgentAsync(JokerName);
 FoundryAgent jokerAgentLatest = aiProjectClient.AsAIAgent(jokerAgentRecord);
-AgentVersion latestAgentVersion = jokerAgentRecord.GetLatestVersion();
+ProjectsAgentVersion latestAgentVersion = jokerAgentRecord.GetLatestVersion();
 
 // The AIAgent version can be accessed via the GetService method.
 Console.WriteLine($"Latest agent version id: {latestAgentVersion.Id}");
@@ -55,4 +55,4 @@ Console.WriteLine(await jokerAgentLatest.RunAsync("Tell me a joke about a pirate
 Console.WriteLine(await jokerAgentLatest.RunAsync("Now tell me a joke about a cat and a dog using last joke as the anchor.", session));
 
 // Cleanup by agent name removes both agent versions created.
-aiProjectClient.Agents.DeleteAgent(existingJokerAgent.Name);
+aiProjectClient.AgentAdministrationClient.DeleteAgent(existingJokerAgent.Name);

dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/Program.cs

@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to create and use a simple AI agent with OpenAI Assistants as the backend.
-
-// WARNING: The Assistants API is deprecated and will be shut down.
-// For more information see the OpenAI documentation: https://platform.openai.com/docs/assistants/migration
-
-#pragma warning disable CS0618 // Type or member is obsolete - OpenAI Assistants API is deprecated but still used in this sample
-
-using Microsoft.Agents.AI;
-using OpenAI;
-using OpenAI.Assistants;
-
-var apiKey = Environment.GetEnvironmentVariable("OPENAI_API_KEY") ?? throw new InvalidOperationException("OPENAI_API_KEY is not set.");
-var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-4o-mini";
-
-const string JokerName = "Joker";
-const string JokerInstructions = "You are good at telling jokes.";
-
-// Get a client to create/retrieve server side agents with.
-var assistantClient = new OpenAIClient(apiKey).GetAssistantClient();
-
-// You can create a server side assistant with the OpenAI SDK.
-var createResult = await assistantClient.CreateAssistantAsync(model, new() { Name = JokerName, Instructions = JokerInstructions });
-
-// You can retrieve an already created server side assistant as an AIAgent.
-AIAgent agent1 = await assistantClient.GetAIAgentAsync(createResult.Value.Id);
-
-// You can also create a server side assistant and return it as an AIAgent directly.
-AIAgent agent2 = await assistantClient.CreateAIAgentAsync(
-    model: model,
-    name: JokerName,
-    instructions: JokerInstructions);
-
-// You can invoke the agent like any other AIAgent.
-AgentSession session = await agent1.CreateSessionAsync();
-Console.WriteLine(await agent1.RunAsync("Tell me a joke about a pirate.", session));
-
-// Cleanup for sample purposes.
-await assistantClient.DeleteAssistantAsync(agent1.Id);
-await assistantClient.DeleteAssistantAsync(agent2.Id);

dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/README.md

@@ -1,16 +0,0 @@
-# Prerequisites
-
-WARNING: The Assistants API is deprecated and will be shut down.
-For more information see the OpenAI documentation: https://platform.openai.com/docs/assistants/migration
-
-Before you begin, ensure you have the following prerequisites:
-
-- .NET 10 SDK or later
-- OpenAI API key
-
-Set the following environment variables:
-
-```powershell
-$env:OPENAI_API_KEY="*****" # Replace with your OpenAI API key
-$env:OPENAI_CHAT_MODEL_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
-```

dotnet/samples/02-agents/AgentProviders/README.md

@@ -25,7 +25,6 @@ See the README.md for each sample for the prerequisites for that sample.
 |[Creating an AIAgent with GitHub Copilot](./Agent_With_GitHubCopilot/)|This sample demonstrates how to create an AIAgent using GitHub Copilot SDK as the underlying inference service|
 |[Creating an AIAgent with Ollama](./Agent_With_Ollama/)|This sample demonstrates how to create an AIAgent using Ollama as the underlying inference service|
 |[Creating an AIAgent with ONNX](./Agent_With_ONNX/)|This sample demonstrates how to create an AIAgent using ONNX as the underlying inference service|
-|[Creating an AIAgent with OpenAI Assistants](./Agent_With_OpenAIAssistants/)|This sample demonstrates how to create an AIAgent using OpenAI Assistants as the underlying inference service.</br>WARNING: The Assistants API is deprecated and will be shut down. For more information see the OpenAI documentation: https://platform.openai.com/docs/assistants/migration|
 |[Creating an AIAgent with OpenAI ChatCompletion](./Agent_With_OpenAIChatCompletion/)|This sample demonstrates how to create an AIAgent using OpenAI ChatCompletion as the underlying inference service|
 |[Creating an AIAgent with OpenAI Responses](./Agent_With_OpenAIResponses/)|This sample demonstrates how to create an AIAgent using OpenAI Responses as the underlying inference service|
 

dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/Program.cs

@@ -44,10 +44,10 @@ ClientResult<VectorStore> vectorStoreCreate = await vectorStoreClient.CreateVect
 FileSearchTool fileSearchTool = new([vectorStoreCreate.Value.Id]);
 #pragma warning restore OPENAI001
 
-AgentVersion agentVersion = await aiProjectClient.Agents.CreateAgentVersionAsync(
+ProjectsAgentVersion agentVersion = await aiProjectClient.AgentAdministrationClient.CreateAgentVersionAsync(
     "AskContoso",
-    new AgentVersionCreationOptions(
-        new PromptAgentDefinition(model: deploymentName)
+    new ProjectsAgentVersionCreationOptions(
+        new DeclarativeAgentDefinition(model: deploymentName)
         {
             Instructions = "You are a helpful support specialist for Contoso Outdoors. Answer questions using the provided context and cite the source document when available.",
             Tools = { fileSearchTool }
@@ -68,4 +68,4 @@ Console.WriteLine(await agent.RunAsync("What is the best way to maintain the Tra
 // Cleanup
 await fileClient.DeleteFileAsync(uploadResult.Value.Id);
 await vectorStoreClient.DeleteVectorStoreAsync(vectorStoreCreate.Value.Id);
-await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
+await aiProjectClient.AgentAdministrationClient.DeleteAgentAsync(agent.Name);

dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/Program.cs

@@ -19,10 +19,10 @@ var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYME
 var aiProjectClient = new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential());
 
 // Create a server side agent and expose it as an AIAgent.
-AgentVersion agentVersion = await aiProjectClient.Agents.CreateAgentVersionAsync(
+ProjectsAgentVersion agentVersion = await aiProjectClient.AgentAdministrationClient.CreateAgentVersionAsync(
     "Joker",
-    new AgentVersionCreationOptions(
-        new PromptAgentDefinition(model: deploymentName)
+    new ProjectsAgentVersionCreationOptions(
+        new DeclarativeAgentDefinition(model: deploymentName)
         {
             Instructions = "You are good at telling jokes, and you always start each joke with 'Aye aye, captain!'.",
         })

dotnet/samples/02-agents/AgentsWithFoundry/Agent_Step00_FoundryAgentLifecycle/Program.cs

@@ -18,10 +18,10 @@ const string JokerName = "JokerAgent";
 AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());
 
 // Create a server-side agent version using the native SDK.
-AgentVersion agentVersion = await aiProjectClient.Agents.CreateAgentVersionAsync(
+ProjectsAgentVersion agentVersion = await aiProjectClient.AgentAdministrationClient.CreateAgentVersionAsync(
     JokerName,
-    new AgentVersionCreationOptions(
-        new PromptAgentDefinition(model: deploymentName)
+    new ProjectsAgentVersionCreationOptions(
+        new DeclarativeAgentDefinition(model: deploymentName)
         {
             Instructions = "You are good at telling jokes.",
         }));
@@ -33,4 +33,4 @@ FoundryAgent agent = aiProjectClient.AsAIAgent(agentVersion);
 Console.WriteLine(await agent.RunAsync("Tell me a joke about a pirate."));
 
 // Cleanup: deletes the agent and all its versions.
-await aiProjectClient.Agents.DeleteAgentAsync(agent.Name);
+await aiProjectClient.AgentAdministrationClient.DeleteAgentAsync(agent.Name);

dotnet/samples/02-agents/AgentsWithFoundry/Agent_Step22_MemorySearch/Program.cs

@@ -7,6 +7,7 @@
 using Azure.AI.Extensions.OpenAI;
 using Azure.AI.Projects;
 using Azure.AI.Projects.Agents;
+using Azure.AI.Projects.Memory;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Foundry;

dotnet/samples/02-agents/DeclarativeAgents/ChatClient/Properties/launchSettings.json

@@ -2,11 +2,11 @@
   "profiles": {
     "GetWeather": {
       "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\chatclient\\GetWeather.yaml \"What is the weather in Cambridge, MA in °C?\""
+      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\declarative-agents\\agent-samples\\chatclient\\GetWeather.yaml \"What is the weather in Cambridge, MA in °C?\""
     },
     "Assistant": {
       "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\agent-samples\\chatclient\\Assistant.yaml \"Tell me a joke about a pirate in Italian.\""
+      "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\declarative-agents\\agent-samples\\chatclient\\Assistant.yaml \"Tell me a joke about a pirate in Italian.\""
     }
   }
 }

dotnet/samples/02-agents/ModelContextProtocol/FoundryAgent_Hosted_MCP/Program.cs

@@ -31,10 +31,10 @@ var mcpTool = ResponseTool.CreateMcpTool(
     toolCallApprovalPolicy: new McpToolCallApprovalPolicy(GlobalMcpToolCallApprovalPolicy.NeverRequireApproval));
 
 // Create a server side agent with the mcp tool, and expose it as an AIAgent.
-AgentVersion agentVersion = await aiProjectClient.Agents.CreateAgentVersionAsync(
+ProjectsAgentVersion agentVersion = await aiProjectClient.AgentAdministrationClient.CreateAgentVersionAsync(
     "MicrosoftLearnAgent",
-    new AgentVersionCreationOptions(
-        new PromptAgentDefinition(model: model)
+    new ProjectsAgentVersionCreationOptions(
+        new DeclarativeAgentDefinition(model: model)
         {
             Instructions = "You answer questions by searching the Microsoft Learn content only.",
             Tools = { mcpTool }
@@ -47,7 +47,7 @@ AgentSession session = await agent.CreateSessionAsync();
 Console.WriteLine(await agent.RunAsync("Please summarize the Azure AI Agent documentation related to MCP Tool calling?", session));
 
 // Cleanup for sample purposes.
-aiProjectClient.Agents.DeleteAgent(agent.Name);
+aiProjectClient.AgentAdministrationClient.DeleteAgent(agent.Name);
 
 // **** MCP Tool with Approval Required ****
 // *****************************************
@@ -61,10 +61,10 @@ var mcpToolWithApproval = ResponseTool.CreateMcpTool(
     toolCallApprovalPolicy: new McpToolCallApprovalPolicy(GlobalMcpToolCallApprovalPolicy.AlwaysRequireApproval));
 
 // Create an agent with the MCP tool that requires approval.
-AgentVersion agentVersionWithApproval = await aiProjectClient.Agents.CreateAgentVersionAsync(
+ProjectsAgentVersion agentVersionWithApproval = await aiProjectClient.AgentAdministrationClient.CreateAgentVersionAsync(
     "MicrosoftLearnAgentWithApproval",
-    new AgentVersionCreationOptions(
-        new PromptAgentDefinition(model: model)
+    new ProjectsAgentVersionCreationOptions(
+        new DeclarativeAgentDefinition(model: model)
         {
             Instructions = "You answer questions by searching the Microsoft Learn content only.",
             Tools = { mcpToolWithApproval }

dotnet/samples/03-workflows/Agents/FoundryAgent/Program.cs

@@ -58,9 +58,9 @@ public static class Program
         finally
         {
             // Cleanup the agents created for the sample.
-            await aiProjectClient.Agents.DeleteAgentAsync(frenchAgent.Name);
-            await aiProjectClient.Agents.DeleteAgentAsync(spanishAgent.Name);
-            await aiProjectClient.Agents.DeleteAgentAsync(englishAgent.Name);
+            await aiProjectClient.AgentAdministrationClient.DeleteAgentAsync(frenchAgent.Name);
+            await aiProjectClient.AgentAdministrationClient.DeleteAgentAsync(spanishAgent.Name);
+            await aiProjectClient.AgentAdministrationClient.DeleteAgentAsync(englishAgent.Name);
         }
     }
 
@@ -76,10 +76,10 @@ public static class Program
         AIProjectClient aiProjectClient,
         string model)
     {
-        AgentVersion agentVersion = await aiProjectClient.Agents.CreateAgentVersionAsync(
+        ProjectsAgentVersion agentVersion = await aiProjectClient.AgentAdministrationClient.CreateAgentVersionAsync(
             $"{targetLanguage} Translator",
-            new AgentVersionCreationOptions(
-                new PromptAgentDefinition(model: model)
+            new ProjectsAgentVersionCreationOptions(
+                new DeclarativeAgentDefinition(model: model)
                 {
                     Instructions = $"You are a translation assistant that translates the provided text to {targetLanguage}.",
                 }));

dotnet/samples/03-workflows/Declarative/CustomerSupport/CustomerSupport.csproj

@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\workflow-samples\CustomerSupport.yaml">
+    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\declarative-agents\workflow-samples\CustomerSupport.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

dotnet/samples/03-workflows/Declarative/CustomerSupport/Program.cs

@@ -97,7 +97,7 @@ internal sealed class Program
             agentDescription: "Escalate agent for human support");
     }
 
-    private static PromptAgentDefinition DefineSelfServiceAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineSelfServiceAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -144,7 +144,7 @@ internal sealed class Program
                 }
         };
 
-    private static PromptAgentDefinition DefineTicketingAgent(IConfiguration configuration, TicketingPlugin plugin) =>
+    private static DeclarativeAgentDefinition DefineTicketingAgent(IConfiguration configuration, TicketingPlugin plugin) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -208,7 +208,7 @@ internal sealed class Program
                 }
         };
 
-    private static PromptAgentDefinition DefineTicketRoutingAgent(IConfiguration configuration, TicketingPlugin plugin) =>
+    private static DeclarativeAgentDefinition DefineTicketRoutingAgent(IConfiguration configuration, TicketingPlugin plugin) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -253,7 +253,7 @@ internal sealed class Program
                 }
         };
 
-    private static PromptAgentDefinition DefineWindowsSupportAgent(IConfiguration configuration, TicketingPlugin plugin) =>
+    private static DeclarativeAgentDefinition DefineWindowsSupportAgent(IConfiguration configuration, TicketingPlugin plugin) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -323,7 +323,7 @@ internal sealed class Program
                 }
         };
 
-    private static PromptAgentDefinition DefineResolutionAgent(IConfiguration configuration, TicketingPlugin plugin) =>
+    private static DeclarativeAgentDefinition DefineResolutionAgent(IConfiguration configuration, TicketingPlugin plugin) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -357,7 +357,7 @@ internal sealed class Program
             }
         };
 
-    private static PromptAgentDefinition TicketEscalationAgent(IConfiguration configuration, TicketingPlugin plugin) =>
+    private static DeclarativeAgentDefinition TicketEscalationAgent(IConfiguration configuration, TicketingPlugin plugin) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =

dotnet/samples/03-workflows/Declarative/DeepResearch/DeepResearch.csproj

@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\workflow-samples\DeepResearch.yaml">
+    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\declarative-agents\workflow-samples\DeepResearch.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="wttr.json">

dotnet/samples/03-workflows/Declarative/DeepResearch/Program.cs

@@ -88,7 +88,7 @@ internal sealed class Program
             agentDescription: "Weather agent for DeepResearch workflow");
     }
 
-    private static PromptAgentDefinition DefineResearchAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineResearchAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -114,13 +114,13 @@ internal sealed class Program
                 """,
             Tools =
             {
-                //AgentTool.CreateBingGroundingTool( // TODO: Use Bing Grounding when available
+                //ProjectsAgentTool.CreateBingGroundingTool( // TODO: Use Bing Grounding when available
                 //    new BingGroundingSearchToolParameters(
                 //        [new BingGroundingSearchConfiguration(this.GetSetting(Settings.FoundryGroundingTool))]))
             }
         };
 
-    private static PromptAgentDefinition DefinePlannerAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefinePlannerAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions = // TODO: Use Structured Inputs / Prompt Template
@@ -139,7 +139,7 @@ internal sealed class Program
                 """
         };
 
-    private static PromptAgentDefinition DefineManagerAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineManagerAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions = // TODO: Use Structured Inputs / Prompt Template
@@ -225,7 +225,7 @@ internal sealed class Program
                 }
         };
 
-    private static PromptAgentDefinition DefineSummaryAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineSummaryAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -240,18 +240,18 @@ internal sealed class Program
                 """
         };
 
-    private static PromptAgentDefinition DefineKnowledgeAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineKnowledgeAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Tools =
             {
-                //AgentTool.CreateBingGroundingTool( // TODO: Use Bing Grounding when available
+                //ProjectsAgentTool.CreateBingGroundingTool( // TODO: Use Bing Grounding when available
                 //    new BingGroundingSearchToolParameters(
                 //        [new BingGroundingSearchConfiguration(this.GetSetting(Settings.FoundryGroundingTool))]))
             }
         };
 
-    private static PromptAgentDefinition DefineCoderAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineCoderAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -265,7 +265,7 @@ internal sealed class Program
             }
         };
 
-    private static PromptAgentDefinition DefineWeatherAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineWeatherAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -274,7 +274,7 @@ internal sealed class Program
                 """,
             Tools =
             {
-                AgentTool.CreateOpenApiTool(
+                ProjectsAgentTool.CreateOpenApiTool(
                     new OpenApiFunctionDefinition(
                         "weather-forecast",
                         BinaryData.FromString(File.ReadAllText(Path.Combine(AppContext.BaseDirectory, "wttr.json"))),

dotnet/samples/03-workflows/Declarative/ExecuteWorkflow/Program.cs

@@ -143,7 +143,7 @@ internal sealed class Program
             string? repoFolder = GetRepoFolder();
             if (repoFolder is not null)
             {
-                workflowFile = Path.Combine(repoFolder, "workflow-samples", workflowFile);
+                workflowFile = Path.Combine(repoFolder, "declarative-agents", "workflow-samples", workflowFile);
                 workflowFile = Path.ChangeExtension(workflowFile, ".yaml");
             }
         }

dotnet/samples/03-workflows/Declarative/FunctionTools/Program.cs

@@ -67,9 +67,9 @@ internal sealed class Program
             agentDescription: "Provides information about the restaurant menu");
     }
 
-    private static PromptAgentDefinition DefineMenuAgent(IConfiguration configuration, AIFunction[] functions)
+    private static DeclarativeAgentDefinition DefineMenuAgent(IConfiguration configuration, AIFunction[] functions)
     {
-        PromptAgentDefinition agentDefinition =
+        DeclarativeAgentDefinition agentDefinition =
             new(configuration.GetValue(Application.Settings.FoundryModel))
             {
                 Instructions =

dotnet/samples/03-workflows/Declarative/GenerateCode/Program.cs

@@ -60,7 +60,7 @@ internal sealed class Program
             string? repoFolder = GetRepoFolder();
             if (repoFolder is not null)
             {
-                workflowFile = Path.Combine(repoFolder, "workflow-samples", workflowFile);
+                workflowFile = Path.Combine(repoFolder, "declarative-agents", "workflow-samples", workflowFile);
                 workflowFile = Path.ChangeExtension(workflowFile, ".yaml");
             }
         }

dotnet/samples/03-workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj

@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\workflow-samples\MathChat.yaml">
+    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\declarative-agents\workflow-samples\MathChat.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

dotnet/samples/03-workflows/Declarative/HostedWorkflow/Program.cs

@@ -46,7 +46,7 @@ internal sealed class Program
         await CreateAgentsAsync(aiProjectClient, configuration);
 
         // Ensure workflow agent exists in Foundry.
-        AgentVersion agentVersion = await CreateWorkflowAsync(aiProjectClient, configuration);
+        ProjectsAgentVersion agentVersion = await CreateWorkflowAsync(aiProjectClient, configuration);
 
         string workflowInput = GetWorkflowInput(args);
 
@@ -86,7 +86,7 @@ internal sealed class Program
         }
     }
 
-    private static async Task<AgentVersion> CreateWorkflowAsync(AIProjectClient agentClient, IConfiguration configuration)
+    private static async Task<ProjectsAgentVersion> CreateWorkflowAsync(AIProjectClient agentClient, IConfiguration configuration)
     {
         string workflowYaml = File.ReadAllText("MathChat.yaml");
 
@@ -114,7 +114,7 @@ internal sealed class Program
             agentDescription: "Teacher agent for MathChat workflow");
     }
 
-    private static PromptAgentDefinition DefineStudentAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineStudentAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -127,7 +127,7 @@ internal sealed class Program
                 """
         };
 
-    private static PromptAgentDefinition DefineTeacherAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineTeacherAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =

dotnet/samples/03-workflows/Declarative/InputArguments/Program.cs

@@ -68,7 +68,7 @@ internal sealed class Program
             agentDescription: "Chats with the user with location awareness.");
     }
 
-    private static PromptAgentDefinition DefineLocationTriageAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineLocationTriageAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -79,7 +79,7 @@ internal sealed class Program
                 """
         };
 
-    private static PromptAgentDefinition DefineLocationCaptureAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineLocationCaptureAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -128,7 +128,7 @@ internal sealed class Program
                 }
         };
 
-    private static PromptAgentDefinition DefineLocationAwareAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineLocationAwareAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             // Parameterized instructions reference the "location" input argument.

dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/Program.cs

@@ -63,9 +63,9 @@ internal sealed class Program
             agentDescription: "Provides information about the restaurant menu");
     }
 
-    private static PromptAgentDefinition DefineMenuAgent(IConfiguration configuration, AIFunction[] functions)
+    private static DeclarativeAgentDefinition DefineMenuAgent(IConfiguration configuration, AIFunction[] functions)
     {
-        PromptAgentDefinition agentDefinition =
+        DeclarativeAgentDefinition agentDefinition =
             new(configuration.GetValue(Application.Settings.FoundryModel))
             {
                 Instructions =

dotnet/samples/03-workflows/Declarative/InvokeMcpTool/Program.cs

@@ -125,9 +125,9 @@ internal sealed class Program
             agentDescription: "Provides information based on search results");
     }
 
-    private static PromptAgentDefinition DefineSearchAgent(IConfiguration configuration)
+    private static DeclarativeAgentDefinition DefineSearchAgent(IConfiguration configuration)
     {
-        return new PromptAgentDefinition(configuration.GetValue(Application.Settings.FoundryModel))
+        return new DeclarativeAgentDefinition(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
                 """

dotnet/samples/03-workflows/Declarative/Marketing/Marketing.csproj

@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\workflow-samples\Marketing.yaml">
+    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\declarative-agents\workflow-samples\Marketing.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

dotnet/samples/03-workflows/Declarative/Marketing/Program.cs

@@ -67,7 +67,7 @@ internal sealed class Program
             agentDescription: "Editor agent for Marketing workflow");
     }
 
-    private static PromptAgentDefinition DefineAnalystAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineAnalystAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -79,13 +79,13 @@ internal sealed class Program
                 """,
             Tools =
             {
-                //AgentTool.CreateBingGroundingTool( // TODO: Use Bing Grounding when available
+                //ProjectsAgentTool.CreateBingGroundingTool( // TODO: Use Bing Grounding when available
                 //    new BingGroundingSearchToolParameters(
                 //        [new BingGroundingSearchConfiguration(configuration[Application.Settings.FoundryGroundingTool])]))
             }
         };
 
-    private static PromptAgentDefinition DefineWriterAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineWriterAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -96,7 +96,7 @@ internal sealed class Program
                 """
         };
 
-    private static PromptAgentDefinition DefineEditorAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineEditorAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =

dotnet/samples/03-workflows/Declarative/StudentTeacher/Program.cs

@@ -62,7 +62,7 @@ internal sealed class Program
             agentDescription: "Teacher agent for MathChat workflow");
     }
 
-    private static PromptAgentDefinition DefineStudentAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineStudentAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =
@@ -75,7 +75,7 @@ internal sealed class Program
                 """
         };
 
-    private static PromptAgentDefinition DefineTeacherAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineTeacherAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =

dotnet/samples/03-workflows/Declarative/StudentTeacher/StudentTeacher.csproj

@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\workflow-samples\MathChat.yaml">
+    <None Include="$(MSBuildThisFileDirectory)..\..\..\..\..\declarative-agents\workflow-samples\MathChat.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

dotnet/samples/03-workflows/Declarative/ToolApproval/Program.cs

@@ -58,7 +58,7 @@ internal sealed class Program
             agentDescription: "Searches documents on Microsoft Learn");
     }
 
-    private static PromptAgentDefinition DefineSearchAgent(IConfiguration configuration) =>
+    private static DeclarativeAgentDefinition DefineSearchAgent(IConfiguration configuration) =>
         new(configuration.GetValue(Application.Settings.FoundryModel))
         {
             Instructions =

dotnet/samples/03-workflows/_StartHere/03_AgentWorkflowPatterns/03_AgentWorkflowPatterns.csproj

@@ -6,6 +6,7 @@
 
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <NoWarn>$(NoWarn);MAAIW001</NoWarn> <!-- Handoff Orchestrations are Experimental -->
   </PropertyGroup>
 
   <ItemGroup>

dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/HostAgentFactory.cs

@@ -20,7 +20,7 @@ internal static class HostAgentFactory
         // latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
         var aiProjectClient = new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential());
 
-        AgentRecord agentRecord = await aiProjectClient.Agents.GetAgentAsync(agentName);
+        ProjectsAgentRecord agentRecord = await aiProjectClient.AgentAdministrationClient.GetAgentAsync(agentName);
         AIAgent agent = aiProjectClient.AsAIAgent(agentRecord, tools: tools);
 
         AgentCard agentCard = agentType.ToUpperInvariant() switch

dotnet/src/Microsoft.Agents.AI.Abstractions/Microsoft.Agents.AI.Abstractions.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.Agents.AI</RootNamespace>
     <NoWarn>$(NoWarn);MEAI001</NoWarn>
-    <IsReleaseCandidate>true</IsReleaseCandidate>
+    <IsReleased>true</IsReleased>
   </PropertyGroup>
 
   <PropertyGroup>

dotnet/src/Microsoft.Agents.AI.Foundry/AzureAIProjectChatClient.cs

@@ -25,8 +25,8 @@ internal sealed class AzureAIProjectChatClient : DelegatingChatClient
 {
     private readonly ChatClientMetadata? _metadata;
     private readonly AIProjectClient _agentClient;
-    private readonly AgentVersion? _agentVersion;
-    private readonly AgentRecord? _agentRecord;
+    private readonly ProjectsAgentVersion? _agentVersion;
+    private readonly ProjectsAgentRecord? _agentRecord;
     private readonly ChatOptions? _chatOptions;
     private readonly AgentReference _agentReference;
 
@@ -56,34 +56,34 @@ internal sealed class AzureAIProjectChatClient : DelegatingChatClient
     /// Initializes a new instance of the <see cref="AzureAIProjectChatClient"/> class.
     /// </summary>
     /// <param name="aiProjectClient">An instance of <see cref="AIProjectClient"/> 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="agentRecord">An instance of <see cref="ProjectsAgentRecord"/> 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>
     /// <remarks>
     /// The <see cref="IChatClient"/> provided should be decorated with a <see cref="AzureAIProjectChatClient"/> for proper functionality.
     /// </remarks>
-    internal AzureAIProjectChatClient(AIProjectClient aiProjectClient, AgentRecord agentRecord, ChatOptions? chatOptions)
+    internal AzureAIProjectChatClient(AIProjectClient aiProjectClient, ProjectsAgentRecord agentRecord, ChatOptions? chatOptions)
         : this(aiProjectClient, Throw.IfNull(agentRecord).GetLatestVersion(), chatOptions)
     {
         this._agentRecord = agentRecord;
     }
 
-    internal AzureAIProjectChatClient(AIProjectClient aiProjectClient, AgentVersion agentVersion, ChatOptions? chatOptions)
+    internal AzureAIProjectChatClient(AIProjectClient aiProjectClient, ProjectsAgentVersion agentVersion, ChatOptions? chatOptions)
         : this(
               aiProjectClient,
               CreateAgentReference(Throw.IfNull(agentVersion)),
-              (agentVersion.Definition as PromptAgentDefinition)?.Model,
+              (agentVersion.Definition as DeclarativeAgentDefinition)?.Model,
               chatOptions)
     {
         this._agentVersion = agentVersion;
     }
 
     /// <summary>
-    /// Creates an <see cref="AgentReference"/> from an <see cref="AgentVersion"/>.
+    /// Creates an <see cref="AgentReference"/> from an <see cref="ProjectsAgentVersion"/>.
     /// Uses the agent version's version if available, otherwise defaults to "latest".
     /// </summary>
     /// <param name="agentVersion">The agent version to create a reference from.</param>
     /// <returns>An <see cref="AgentReference"/> for the specified agent version.</returns>
-    private static AgentReference CreateAgentReference(AgentVersion agentVersion)
+    private static AgentReference CreateAgentReference(ProjectsAgentVersion agentVersion)
     {
         // If the version is null, empty, or whitespace, use "latest" as the default.
         // This handles cases where hosted agents (like MCP agents) may not have a version assigned.
@@ -98,9 +98,9 @@ internal sealed class AzureAIProjectChatClient : DelegatingChatClient
             ? this._metadata
             : (serviceKey is null && serviceType == typeof(AIProjectClient))
             ? this._agentClient
-            : (serviceKey is null && serviceType == typeof(AgentVersion))
+            : (serviceKey is null && serviceType == typeof(ProjectsAgentVersion))
             ? this._agentVersion
-            : (serviceKey is null && serviceType == typeof(AgentRecord))
+            : (serviceKey is null && serviceType == typeof(ProjectsAgentRecord))
             ? this._agentRecord
             : (serviceKey is null && serviceType == typeof(AgentReference))
             ? this._agentReference

dotnet/src/Microsoft.Agents.AI.Foundry/AzureAIProjectChatClientExtensions.cs

@@ -38,7 +38,7 @@ public static partial class AzureAIProjectChatClientExtensions
     /// <exception cref="InvalidOperationException">The agent with the specified name was not found.</exception>
     /// <remarks>
     /// When instantiating a <see cref="ChatClientAgent"/> by using an <see cref="AgentReference"/>, minimal information will be available about the agent in the instance level, and any logic that relies
-    /// on <see cref="AIAgent.GetService{TService}(object?)"/> to retrieve information about the agent like <see cref="AgentVersion" /> will receive <see langword="null"/> as the result.
+    /// on <see cref="AIAgent.GetService{TService}(object?)"/> to retrieve information about the agent like <see cref="ProjectsAgentVersion" /> will receive <see langword="null"/> as the result.
     /// </remarks>
     public static FoundryAgent AsAIAgent(
         this AIProjectClient aiProjectClient,
@@ -67,7 +67,7 @@ public static partial class AzureAIProjectChatClientExtensions
     }
 
     /// <summary>
-    /// Uses an existing server side agent, wrapped as a <see cref="ChatClientAgent"/> using the provided <see cref="AIProjectClient"/> and <see cref="AgentRecord"/>.
+    /// Uses an existing server side agent, wrapped as a <see cref="ChatClientAgent"/> using the provided <see cref="AIProjectClient"/> and <see cref="ProjectsAgentRecord"/>.
     /// </summary>
     /// <param name="aiProjectClient">The client used to interact with Azure AI Agents. Cannot be <see langword="null"/>.</param>
     /// <param name="agentRecord">The agent record to be converted. The latest version will be used. Cannot be <see langword="null"/>.</param>
@@ -78,7 +78,7 @@ public static partial class AzureAIProjectChatClientExtensions
     /// <exception cref="ArgumentNullException">Thrown when <paramref name="aiProjectClient"/> or <paramref name="agentRecord"/> is <see langword="null"/>.</exception>
     public static FoundryAgent AsAIAgent(
         this AIProjectClient aiProjectClient,
-        AgentRecord agentRecord,
+        ProjectsAgentRecord agentRecord,
         IList<AITool>? tools = null,
         Func<IChatClient, IChatClient>? clientFactory = null,
         IServiceProvider? services = null)
@@ -100,7 +100,7 @@ public static partial class AzureAIProjectChatClientExtensions
     }
 
     /// <summary>
-    /// Uses an existing server side agent, wrapped as a <see cref="ChatClientAgent"/> using the provided <see cref="AIProjectClient"/> and <see cref="AgentVersion"/>.
+    /// Uses an existing server side agent, wrapped as a <see cref="ChatClientAgent"/> using the provided <see cref="AIProjectClient"/> and <see cref="ProjectsAgentVersion"/>.
     /// </summary>
     /// <param name="aiProjectClient">The client used to interact with Azure AI Agents. Cannot be <see langword="null"/>.</param>
     /// <param name="agentVersion">The agent version to be converted. Cannot be <see langword="null"/>.</param>
@@ -111,7 +111,7 @@ public static partial class AzureAIProjectChatClientExtensions
     /// <exception cref="ArgumentNullException">Thrown when <paramref name="aiProjectClient"/> or <paramref name="agentVersion"/> is <see langword="null"/>.</exception>
     public static FoundryAgent AsAIAgent(
         this AIProjectClient aiProjectClient,
-        AgentVersion agentVersion,
+        ProjectsAgentVersion agentVersion,
         IList<AITool>? tools = null,
         Func<IChatClient, IChatClient>? clientFactory = null,
         IServiceProvider? services = null)
@@ -206,7 +206,7 @@ public static partial class AzureAIProjectChatClientExtensions
     /// <summary>Creates a <see cref="ChatClientAgent"/> with the specified options.</summary>
     private static ChatClientAgent CreateChatClientAgent(
         AIProjectClient aiProjectClient,
-        AgentVersion agentVersion,
+        ProjectsAgentVersion agentVersion,
         ChatClientAgentOptions agentOptions,
         Func<IChatClient, IChatClient>? clientFactory,
         IServiceProvider? services)
@@ -249,7 +249,7 @@ public static partial class AzureAIProjectChatClientExtensions
     /// <summary>This method creates an <see cref="ChatClientAgent"/> with the specified ChatClientAgentOptions.</summary>
     private static ChatClientAgent AsChatClientAgent(
         AIProjectClient aiProjectClient,
-        AgentVersion agentVersion,
+        ProjectsAgentVersion agentVersion,
         ChatClientAgentOptions agentOptions,
         Func<IChatClient, IChatClient>? clientFactory,
         IServiceProvider? services)
@@ -258,7 +258,7 @@ public static partial class AzureAIProjectChatClientExtensions
     /// <summary>This method creates an <see cref="ChatClientAgent"/> with the specified ChatClientAgentOptions.</summary>
     private static ChatClientAgent AsChatClientAgent(
         AIProjectClient aiProjectClient,
-        AgentRecord agentRecord,
+        ProjectsAgentRecord agentRecord,
         ChatClientAgentOptions agentOptions,
         Func<IChatClient, IChatClient>? clientFactory,
         IServiceProvider? services)
@@ -293,14 +293,14 @@ public static partial class AzureAIProjectChatClientExtensions
 
     /// <summary>This method creates an <see cref="ChatClientAgent"/> with a auto-generated ChatClientAgentOptions from the specified configuration parameters.</summary>
     private static ChatClientAgent AsChatClientAgent(
-        AIProjectClient AIProjectClient,
-        AgentVersion agentVersion,
+        AIProjectClient aiProjectClient,
+        ProjectsAgentVersion agentVersion,
         IList<AITool>? tools,
         Func<IChatClient, IChatClient>? clientFactory,
         bool requireInvocableTools,
         IServiceProvider? services)
         => AsChatClientAgent(
-            AIProjectClient,
+            aiProjectClient,
             agentVersion,
             CreateChatClientAgentOptions(agentVersion, new ChatOptions() { Tools = tools }, requireInvocableTools),
             clientFactory,
@@ -308,21 +308,21 @@ public static partial class AzureAIProjectChatClientExtensions
 
     /// <summary>This method creates an <see cref="ChatClientAgent"/> with a auto-generated ChatClientAgentOptions from the specified configuration parameters.</summary>
     private static ChatClientAgent AsChatClientAgent(
-        AIProjectClient AIProjectClient,
-        AgentRecord agentRecord,
+        AIProjectClient aiProjectClient,
+        ProjectsAgentRecord agentRecord,
         IList<AITool>? tools,
         Func<IChatClient, IChatClient>? clientFactory,
         bool requireInvocableTools,
         IServiceProvider? services)
         => AsChatClientAgent(
-            AIProjectClient,
+            aiProjectClient,
             agentRecord,
             CreateChatClientAgentOptions(agentRecord.GetLatestVersion(), new ChatOptions() { Tools = tools }, requireInvocableTools),
             clientFactory,
             services);
 
     /// <summary>
-    /// This method creates <see cref="ChatClientAgentOptions"/> for the specified <see cref="AgentVersion"/> and the provided tools.
+    /// This method creates <see cref="ChatClientAgentOptions"/> for the specified <see cref="ProjectsAgentVersion"/> and the provided tools.
     /// </summary>
     /// <param name="agentVersion">The agent version.</param>
     /// <param name="chatOptions">The <see cref="ChatOptions"/> to use when interacting with the agent.</param>
@@ -334,12 +334,12 @@ public static partial class AzureAIProjectChatClientExtensions
     /// 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, ChatOptions? chatOptions, bool requireInvocableTools)
+    private static ChatClientAgentOptions CreateChatClientAgentOptions(ProjectsAgentVersion agentVersion, ChatOptions? chatOptions, bool requireInvocableTools)
     {
         var agentDefinition = agentVersion.Definition;
 
         List<AITool>? agentTools = null;
-        if (agentDefinition is PromptAgentDefinition { Tools: { Count: > 0 } definitionTools })
+        if (agentDefinition is DeclarativeAgentDefinition { Tools: { Count: > 0 } definitionTools })
         {
             // Check if no tools were provided while the agent definition requires in-proc tools.
             if (requireInvocableTools && chatOptions?.Tools is not { Count: > 0 } && definitionTools.Any(t => t is FunctionTool))
@@ -395,7 +395,7 @@ public static partial class AzureAIProjectChatClientExtensions
             Description = agentVersion.Description,
         };
 
-        if (agentDefinition is PromptAgentDefinition promptAgentDefinition)
+        if (agentDefinition is DeclarativeAgentDefinition promptAgentDefinition)
         {
             agentOptions.ChatOptions ??= chatOptions?.Clone() ?? new();
             agentOptions.ChatOptions.Instructions = promptAgentDefinition.Instructions;

dotnet/src/Microsoft.Agents.AI.Foundry/FoundryAITool.cs

@@ -17,12 +17,12 @@ namespace Microsoft.Agents.AI.Foundry;
 /// </summary>
 /// <remarks>
 /// <para>
-/// This class wraps <see cref="AgentTool"/> (Azure.AI.Projects.OpenAI) and <see cref="ResponseTool"/> (OpenAI SDK) factory methods,
+/// This class wraps <see cref="ProjectsAgentTool"/> (Azure.AI.Projects.Agents) and <see cref="ResponseTool"/> (OpenAI SDK) factory methods,
 /// returning <see cref="AITool"/> directly — eliminating the need for manual casting and <c>.AsAITool()</c> calls.
 /// </para>
 /// <para>
 /// Instead of writing:
-/// <c>((ResponseTool)AgentTool.CreateOpenApiTool(definition)).AsAITool()</c>
+/// <c>((ResponseTool)ProjectsAgentTool.CreateOpenApiTool(definition)).AsAITool()</c>
 /// You can write:
 /// <c>FoundryAITool.CreateOpenApiTool(definition)</c>
 /// </para>
@@ -37,7 +37,7 @@ public static class FoundryAITool
     /// <returns>An <see cref="AITool"/> wrapping the provided response tool.</returns>
     public static AITool FromResponseTool(ResponseTool responseTool) => responseTool.AsAITool();
 
-    // --- Azure.AI.Projects.OpenAI AgentTool factories ---
+    // --- Azure.AI.Projects.OpenAI ProjectsAgentTool factories ---
 
     /// <summary>
     /// Creates an <see cref="AITool"/> for OpenAPI tool invocations.
@@ -45,7 +45,7 @@ public static class FoundryAITool
     /// <param name="definition">The OpenAPI function definition specifying the API endpoint, schema, and authentication.</param>
     /// <returns>An <see cref="AITool"/> that calls the specified OpenAPI endpoint.</returns>
     public static AITool CreateOpenApiTool(OpenApiFunctionDefinition definition)
-        => ((ResponseTool)AgentTool.CreateOpenApiTool(definition)).AsAITool();
+        => ((ResponseTool)ProjectsAgentTool.CreateOpenApiTool(definition)).AsAITool();
 
     /// <summary>
     /// Creates an <see cref="AITool"/> for Bing Grounding search.
@@ -53,7 +53,7 @@ public static class FoundryAITool
     /// <param name="options">The Bing Grounding search configuration options.</param>
     /// <returns>An <see cref="AITool"/> for Bing Grounding search.</returns>
     public static AITool CreateBingGroundingTool(BingGroundingSearchToolOptions options)
-        => ((ResponseTool)AgentTool.CreateBingGroundingTool(options)).AsAITool();
+        => ((ResponseTool)ProjectsAgentTool.CreateBingGroundingTool(options)).AsAITool();
 
     /// <summary>
     /// Creates an <see cref="AITool"/> for Bing Custom Search.
@@ -61,7 +61,7 @@ public static class FoundryAITool
     /// <param name="parameters">The Bing Custom Search configuration parameters.</param>
     /// <returns>An <see cref="AITool"/> for Bing Custom Search.</returns>
     public static AITool CreateBingCustomSearchTool(BingCustomSearchToolOptions parameters)
-        => ((ResponseTool)AgentTool.CreateBingCustomSearchTool(parameters)).AsAITool();
+        => ((ResponseTool)ProjectsAgentTool.CreateBingCustomSearchTool(parameters)).AsAITool();
 
     /// <summary>
     /// Creates an <see cref="AITool"/> for Microsoft Fabric data agent.
@@ -69,7 +69,7 @@ public static class FoundryAITool
     /// <param name="options">The Fabric data agent configuration options.</param>
     /// <returns>An <see cref="AITool"/> for Microsoft Fabric.</returns>
     public static AITool CreateMicrosoftFabricTool(FabricDataAgentToolOptions options)
-        => ((ResponseTool)AgentTool.CreateMicrosoftFabricTool(options)).AsAITool();
+        => ((ResponseTool)ProjectsAgentTool.CreateMicrosoftFabricTool(options)).AsAITool();
 
     /// <summary>
     /// Creates an <see cref="AITool"/> for SharePoint grounding.
@@ -77,7 +77,7 @@ public static class FoundryAITool
     /// <param name="options">The SharePoint grounding configuration options.</param>
     /// <returns>An <see cref="AITool"/> for SharePoint grounding.</returns>
     public static AITool CreateSharepointTool(SharePointGroundingToolOptions options)
-        => ((ResponseTool)AgentTool.CreateSharepointTool(options)).AsAITool();
+        => ((ResponseTool)ProjectsAgentTool.CreateSharepointTool(options)).AsAITool();
 
     /// <summary>
     /// Creates an <see cref="AITool"/> for Azure AI Search.
@@ -85,7 +85,7 @@ public static class FoundryAITool
     /// <param name="options">Optional Azure AI Search configuration options.</param>
     /// <returns>An <see cref="AITool"/> for Azure AI Search.</returns>
     public static AITool CreateAzureAISearchTool(AzureAISearchToolOptions? options = null)
-        => ((ResponseTool)AgentTool.CreateAzureAISearchTool(options)).AsAITool();
+        => ((ResponseTool)ProjectsAgentTool.CreateAzureAISearchTool(options)).AsAITool();
 
     /// <summary>
     /// Creates an <see cref="AITool"/> for browser automation.
@@ -93,7 +93,7 @@ public static class FoundryAITool
     /// <param name="parameters">The browser automation configuration parameters.</param>
     /// <returns>An <see cref="AITool"/> for browser automation.</returns>
     public static AITool CreateBrowserAutomationTool(BrowserAutomationToolOptions parameters)
-        => ((ResponseTool)AgentTool.CreateBrowserAutomationTool(parameters)).AsAITool();
+        => ((ResponseTool)ProjectsAgentTool.CreateBrowserAutomationTool(parameters)).AsAITool();
 
     /// <summary>
     /// Creates an <see cref="AITool"/> for structured output capture.
@@ -101,7 +101,7 @@ public static class FoundryAITool
     /// <param name="outputs">The structured output definition.</param>
     /// <returns>An <see cref="AITool"/> for structured output capture.</returns>
     public static AITool CreateStructuredOutputsTool(StructuredOutputDefinition outputs)
-        => ((ResponseTool)AgentTool.CreateStructuredOutputsTool(outputs)).AsAITool();
+        => ((ResponseTool)ProjectsAgentTool.CreateStructuredOutputsTool(outputs)).AsAITool();
 
     /// <summary>
     /// Creates an <see cref="AITool"/> for Agent-to-Agent (A2A) communication.
@@ -110,7 +110,7 @@ public static class FoundryAITool
     /// <param name="agentCardPath">Optional path to the agent card.</param>
     /// <returns>An <see cref="AITool"/> for A2A communication.</returns>
     public static AITool CreateA2ATool(Uri baseUri, string? agentCardPath = null)
-        => AgentTool.CreateA2ATool(baseUri, agentCardPath).AsAITool();
+        => ProjectsAgentTool.CreateA2ATool(baseUri, agentCardPath).AsAITool();
 
     // --- OpenAI SDK ResponseTool factories ---
 

dotnet/src/Microsoft.Agents.AI.Foundry/Memory/FoundryMemoryProvider.cs

@@ -9,6 +9,7 @@ using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.AI.Projects;
+using Azure.AI.Projects.Memory;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Compliance.Redaction;
 using Microsoft.Extensions.Logging;

dotnet/src/Microsoft.Agents.AI.Foundry/Memory/MemoryStoreExtensions.cs

@@ -4,6 +4,7 @@ using System.ClientModel;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.AI.Projects;
+using Azure.AI.Projects.Memory;
 
 namespace Microsoft.Agents.AI.Foundry;
 

dotnet/src/Microsoft.Agents.AI.Foundry/Microsoft.Agents.AI.Foundry.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <IsReleaseCandidate>true</IsReleaseCandidate>
+    <IsReleased>true</IsReleased>
     <InjectSharedThrow>true</InjectSharedThrow>
     <NoWarn>$(NoWarn);OPENAI001</NoWarn>
   </PropertyGroup>

dotnet/src/Microsoft.Agents.AI.OpenAI/CompatibilitySuppressions.xml

@@ -2,106 +2,36 @@
 <!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,Microsoft.Agents.AI.ChatClientAgentOptions,System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:OpenAI.Assistants.OpenAIAssistantClientExtensions</Target>
     <Left>lib/net10.0/Microsoft.Agents.AI.OpenAI.dll</Left>
     <Right>lib/net10.0/Microsoft.Agents.AI.OpenAI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,System.String,System.String,System.String,System.Collections.Generic.IList{Microsoft.Extensions.AI.AITool},System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsIChatClientWithStoredOutputDisabled(OpenAI.Responses.ResponsesClient)</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,Microsoft.Agents.AI.ChatClientAgentOptions,System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:OpenAI.Assistants.OpenAIAssistantClientExtensions</Target>
     <Left>lib/net472/Microsoft.Agents.AI.OpenAI.dll</Left>
     <Right>lib/net472/Microsoft.Agents.AI.OpenAI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,System.String,System.String,System.String,System.Collections.Generic.IList{Microsoft.Extensions.AI.AITool},System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsIChatClientWithStoredOutputDisabled(OpenAI.Responses.ResponsesClient)</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,Microsoft.Agents.AI.ChatClientAgentOptions,System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:OpenAI.Assistants.OpenAIAssistantClientExtensions</Target>
     <Left>lib/net8.0/Microsoft.Agents.AI.OpenAI.dll</Left>
     <Right>lib/net8.0/Microsoft.Agents.AI.OpenAI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,System.String,System.String,System.String,System.Collections.Generic.IList{Microsoft.Extensions.AI.AITool},System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsIChatClientWithStoredOutputDisabled(OpenAI.Responses.ResponsesClient)</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,Microsoft.Agents.AI.ChatClientAgentOptions,System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:OpenAI.Assistants.OpenAIAssistantClientExtensions</Target>
     <Left>lib/net9.0/Microsoft.Agents.AI.OpenAI.dll</Left>
     <Right>lib/net9.0/Microsoft.Agents.AI.OpenAI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,System.String,System.String,System.String,System.Collections.Generic.IList{Microsoft.Extensions.AI.AITool},System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsIChatClientWithStoredOutputDisabled(OpenAI.Responses.ResponsesClient)</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,Microsoft.Agents.AI.ChatClientAgentOptions,System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsAIAgent(OpenAI.Responses.ResponsesClient,System.String,System.String,System.String,System.Collections.Generic.IList{Microsoft.Extensions.AI.AITool},System.Func{Microsoft.Extensions.AI.IChatClient,Microsoft.Extensions.AI.IChatClient},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.OpenAI.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.OpenAI.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenAI.Responses.OpenAIResponseClientExtensions.AsIChatClientWithStoredOutputDisabled(OpenAI.Responses.ResponsesClient)</Target>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:OpenAI.Assistants.OpenAIAssistantClientExtensions</Target>
     <Left>lib/netstandard2.0/Microsoft.Agents.AI.OpenAI.dll</Left>
     <Right>lib/netstandard2.0/Microsoft.Agents.AI.OpenAI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>

dotnet/src/Microsoft.Agents.AI.OpenAI/Extensions/OpenAIAssistantClientExtensions.cs

@@ -1,433 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.ClientModel;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-using Microsoft.Extensions.Logging;
-using Microsoft.Shared.DiagnosticIds;
-using Microsoft.Shared.Diagnostics;
-
-namespace OpenAI.Assistants;
-
-/// <summary>
-/// Provides extension methods for OpenAI <see cref="AssistantClient"/>
-/// to simplify the creation of AI agents that work with OpenAI services.
-/// </summary>
-/// <remarks>
-/// These extensions bridge the gap between OpenAI SDK client objects and the Microsoft Agent Framework,
-/// allowing developers to easily create AI agents that leverage OpenAI's chat completion and response services.
-/// The methods handle the conversion from OpenAI clients to <see cref="IChatClient"/> instances and then wrap them
-/// in <see cref="ChatClientAgent"/> objects that implement the <see cref="AIAgent"/> interface.
-/// </remarks>
-[Experimental(DiagnosticIds.Experiments.AIOpenAIAssistants)]
-public static class OpenAIAssistantClientExtensions
-{
-    /// <summary>
-    /// Gets a <see cref="ChatClientAgent"/> from a <see cref="ClientResult{Assistant}"/>.
-    /// </summary>
-    /// <param name="assistantClient">The assistant client.</param>
-    /// <param name="assistantClientResult">The client result containing the assistant.</param>
-    /// <param name="chatOptions">Optional chat options.</param>
-    /// <param name="clientFactory">Provides a way to customize the creation of the underlying <see cref="IChatClient"/> used by the agent.</param>
-    /// <param name="services">An optional <see cref="IServiceProvider"/> to use for resolving services required by the <see cref="AIFunction"/> instances being invoked.</param>
-    /// <returns>A <see cref="ChatClientAgent"/> instance that can be used to perform operations on the assistant.</returns>
-    [Obsolete("The Assistants API has been deprecated. Please use the Responses API instead.")]
-    public static ChatClientAgent AsAIAgent(
-        this AssistantClient assistantClient,
-        ClientResult<Assistant> assistantClientResult,
-        ChatOptions? chatOptions = null,
-        Func<IChatClient, IChatClient>? clientFactory = null,
-        IServiceProvider? services = null)
-    {
-        if (assistantClientResult is null)
-        {
-            throw new ArgumentNullException(nameof(assistantClientResult));
-        }
-
-        return assistantClient.AsAIAgent(assistantClientResult.Value, chatOptions, clientFactory, services);
-    }
-
-    /// <summary>
-    /// Gets a <see cref="ChatClientAgent"/> from an <see cref="Assistant"/>.
-    /// </summary>
-    /// <param name="assistantClient">The assistant client.</param>
-    /// <param name="assistantMetadata">The assistant metadata.</param>
-    /// <param name="chatOptions">Optional chat options.</param>
-    /// <param name="clientFactory">Provides a way to customize the creation of the underlying <see cref="IChatClient"/> used by the agent.</param>
-    /// <param name="services">An optional <see cref="IServiceProvider"/> to use for resolving services required by the <see cref="AIFunction"/> instances being invoked.</param>
-    /// <returns>A <see cref="ChatClientAgent"/> instance that can be used to perform operations on the assistant.</returns>
-    [Obsolete("The Assistants API has been deprecated. Please use the Responses API instead.")]
-    public static ChatClientAgent AsAIAgent(
-        this AssistantClient assistantClient,
-        Assistant assistantMetadata,
-        ChatOptions? chatOptions = null,
-        Func<IChatClient, IChatClient>? clientFactory = null,
-        IServiceProvider? services = null)
-    {
-        if (assistantMetadata is null)
-        {
-            throw new ArgumentNullException(nameof(assistantMetadata));
-        }
-        if (assistantClient is null)
-        {
-            throw new ArgumentNullException(nameof(assistantClient));
-        }
-
-        var chatClient = assistantClient.AsIChatClient(assistantMetadata.Id);
-
-        if (clientFactory is not null)
-        {
-            chatClient = clientFactory(chatClient);
-        }
-
-        if (!string.IsNullOrWhiteSpace(assistantMetadata.Instructions) && chatOptions?.Instructions is null)
-        {
-            chatOptions ??= new ChatOptions();
-            chatOptions.Instructions = assistantMetadata.Instructions;
-        }
-
-        return new ChatClientAgent(chatClient, options: new()
-        {
-            Id = assistantMetadata.Id,
-            Name = assistantMetadata.Name,
-            Description = assistantMetadata.Description,
-            ChatOptions = chatOptions
-        }, services: services);
-    }
-
-    /// <summary>
-    /// Retrieves an existing server side agent, wrapped as a <see cref="ChatClientAgent"/> using the provided <see cref="AssistantClient"/>.
-    /// </summary>
-    /// <param name="assistantClient">The <see cref="AssistantClient"/> to create the <see cref="ChatClientAgent"/> with.</param>
-    /// <param name="agentId"> The ID of the server side agent to create a <see cref="ChatClientAgent"/> for.</param>
-    /// <param name="chatOptions">Options that should apply to all runs of the agent.</param>
-    /// <param name="clientFactory">Provides a way to customize the creation of the underlying <see cref="IChatClient"/> used by the agent.</param>
-    /// <param name="services">An optional <see cref="IServiceProvider"/> to use for resolving services required by the <see cref="AIFunction"/> instances being invoked.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>A <see cref="ChatClientAgent"/> instance that can be used to perform operations on the assistant agent.</returns>
-    [Obsolete("The Assistants API has been deprecated. Please use the Responses API instead.")]
-    public static async Task<ChatClientAgent> GetAIAgentAsync(
-        this AssistantClient assistantClient,
-        string agentId,
-        ChatOptions? chatOptions = null,
-        Func<IChatClient, IChatClient>? clientFactory = null,
-        IServiceProvider? services = null,
-        CancellationToken cancellationToken = default)
-    {
-        if (assistantClient is null)
-        {
-            throw new ArgumentNullException(nameof(assistantClient));
-        }
-
-        if (string.IsNullOrWhiteSpace(agentId))
-        {
-            throw new ArgumentException($"{nameof(agentId)} should not be null or whitespace.", nameof(agentId));
-        }
-
-        var assistantResponse = await assistantClient.GetAssistantAsync(agentId, cancellationToken).ConfigureAwait(false);
-        return assistantClient.AsAIAgent(assistantResponse, chatOptions, clientFactory, services);
-    }
-
-    /// <summary>
-    /// Gets a <see cref="ChatClientAgent"/> from a <see cref="ClientResult{Assistant}"/>.
-    /// </summary>
-    /// <param name="assistantClient">The assistant client.</param>
-    /// <param name="assistantClientResult">The client result containing the assistant.</param>
-    /// <param name="options">Full set of options to configure the agent.</param>
-    /// <param name="clientFactory">Provides a way to customize the creation of the underlying <see cref="IChatClient"/> used by the agent.</param>
-    /// <param name="services">An optional <see cref="IServiceProvider"/> to use for resolving services required by the <see cref="AIFunction"/> instances being invoked.</param>
-    /// <returns>A <see cref="ChatClientAgent"/> instance that can be used to perform operations on the assistant.</returns>
-    /// <exception cref="ArgumentNullException"><paramref name="assistantClientResult"/> or <paramref name="options"/> is <see langword="null"/>.</exception>
-    [Obsolete("The Assistants API has been deprecated. Please use the Responses API instead.")]
-    public static ChatClientAgent AsAIAgent(
-        this AssistantClient assistantClient,
-        ClientResult<Assistant> assistantClientResult,
-        ChatClientAgentOptions options,
-        Func<IChatClient, IChatClient>? clientFactory = null,
-        IServiceProvider? services = null)
-    {
-        if (assistantClientResult is null)
-        {
-            throw new ArgumentNullException(nameof(assistantClientResult));
-        }
-
-        return assistantClient.AsAIAgent(assistantClientResult.Value, options, clientFactory, services);
-    }
-
-    /// <summary>
-    /// Gets a <see cref="ChatClientAgent"/> from an <see cref="Assistant"/>.
-    /// </summary>
-    /// <param name="assistantClient">The assistant client.</param>
-    /// <param name="assistantMetadata">The assistant metadata.</param>
-    /// <param name="options">Full set of options to configure the agent.</param>
-    /// <param name="clientFactory">Provides a way to customize the creation of the underlying <see cref="IChatClient"/> used by the agent.</param>
-    /// <param name="services">An optional <see cref="IServiceProvider"/> to use for resolving services required by the <see cref="AIFunction"/> instances being invoked.</param>
-    /// <returns>A <see cref="ChatClientAgent"/> instance that can be used to perform operations on the assistant.</returns>
-    /// <exception cref="ArgumentNullException"><paramref name="assistantMetadata"/> or <paramref name="options"/> is <see langword="null"/>.</exception>
-    [Obsolete("The Assistants API has been deprecated. Please use the Responses API instead.")]
-    public static ChatClientAgent AsAIAgent(
-        this AssistantClient assistantClient,
-        Assistant assistantMetadata,
-        ChatClientAgentOptions options,
-        Func<IChatClient, IChatClient>? clientFactory = null,
-        IServiceProvider? services = null)
-    {
-        if (assistantMetadata is null)
-        {
-            throw new ArgumentNullException(nameof(assistantMetadata));
-        }
-
-        if (assistantClient is null)
-        {
-            throw new ArgumentNullException(nameof(assistantClient));
-        }
-
-        if (options is null)
-        {
-            throw new ArgumentNullException(nameof(options));
-        }
-
-        var chatClient = assistantClient.AsIChatClient(assistantMetadata.Id);
-
-        if (clientFactory is not null)
-        {
-            chatClient = clientFactory(chatClient);
-        }
-
-        if (string.IsNullOrWhiteSpace(options.ChatOptions?.Instructions) && !string.IsNullOrWhiteSpace(assistantMetadata.Instructions))
-        {
-            options.ChatOptions ??= new ChatOptions();
-            options.ChatOptions.Instructions = assistantMetadata.Instructions;
-        }
-
-        var mergedOptions = new ChatClientAgentOptions()
-        {
-            Id = assistantMetadata.Id,
-            Name = options.Name ?? assistantMetadata.Name,
-            Description = options.Description ?? assistantMetadata.Description,
-            ChatOptions = options.ChatOptions,
-            AIContextProviders = options.AIContextProviders,
-            ChatHistoryProvider = options.ChatHistoryProvider,
-            UseProvidedChatClientAsIs = options.UseProvidedChatClientAsIs
-        };
-
-        return new ChatClientAgent(chatClient, mergedOptions, services: services);
-    }
-
-    /// <summary>
-    /// Retrieves an existing server side agent, wrapped as a <see cref="ChatClientAgent"/> using the provided <see cref="AssistantClient"/>.
-    /// </summary>
-    /// <param name="assistantClient">The <see cref="AssistantClient"/> to create the <see cref="ChatClientAgent"/> with.</param>
-    /// <param name="agentId"> The ID of the server side agent to create a <see cref="ChatClientAgent"/> for.</param>
-    /// <param name="options">Full set of options to configure the agent.</param>
-    /// <param name="clientFactory">Provides a way to customize the creation of the underlying <see cref="IChatClient"/> used by the agent.</param>
-    /// <param name="services">An optional <see cref="IServiceProvider"/> to use for resolving services required by the <see cref="AIFunction"/> instances being invoked.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>A <see cref="ChatClientAgent"/> instance that can be used to perform operations on the assistant agent.</returns>
-    /// <exception cref="ArgumentNullException"><paramref name="assistantClient"/> or <paramref name="options"/> is <see langword="null"/>.</exception>
-    /// <exception cref="ArgumentException"><paramref name="agentId"/> is empty or whitespace.</exception>
-    [Obsolete("The Assistants API has been deprecated. Please use the Responses API instead.")]
-    public static async Task<ChatClientAgent> GetAIAgentAsync(
-        this AssistantClient assistantClient,
-        string agentId,
-        ChatClientAgentOptions options,
-        Func<IChatClient, IChatClient>? clientFactory = null,
-        IServiceProvider? services = null,
-        CancellationToken cancellationToken = default)
-    {
-        if (assistantClient is null)
-        {
-            throw new ArgumentNullException(nameof(assistantClient));
-        }
-
-        if (string.IsNullOrWhiteSpace(agentId))
-        {
-            throw new ArgumentException($"{nameof(agentId)} should not be null or whitespace.", nameof(agentId));
-        }
-
-        if (options is null)
-        {
-            throw new ArgumentNullException(nameof(options));
-        }
-
-        var assistantResponse = await assistantClient.GetAssistantAsync(agentId, cancellationToken).ConfigureAwait(false);
-        return assistantClient.AsAIAgent(assistantResponse, options, clientFactory, services);
-    }
-
-    /// <summary>
-    /// Creates an AI agent from an <see cref="AssistantClient"/> using the OpenAI Assistant API.
-    /// </summary>
-    /// <param name="client">The OpenAI <see cref="AssistantClient" /> to use for the agent.</param>
-    /// <param name="model">The model identifier to use (e.g., "gpt-4").</param>
-    /// <param name="instructions">Optional system instructions that define the agent's behavior and personality.</param>
-    /// <param name="name">Optional name for the agent for identification purposes.</param>
-    /// <param name="description">Optional description of the agent's capabilities and purpose.</param>
-    /// <param name="tools">Optional collection of AI tools that the agent can use during conversations.</param>
-    /// <param name="clientFactory">Provides a way to customize the creation of the underlying <see cref="IChatClient"/> used by the agent.</param>
-    /// <param name="loggerFactory">Optional logger factory for enabling logging within the agent.</param>
-    /// <param name="services">An optional <see cref="IServiceProvider"/> to use for resolving services required by the <see cref="AIFunction"/> instances being invoked.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>An <see cref="ChatClientAgent"/> instance backed by the OpenAI Assistant service.</returns>
-    /// <exception cref="ArgumentNullException">Thrown when <paramref name="client"/> or <paramref name="model"/> is <see langword="null"/>.</exception>
-    /// <exception cref="ArgumentException">Thrown when <paramref name="model"/> is empty or whitespace.</exception>
-    [Obsolete("The Assistants API has been deprecated. Please use the Responses API instead.")]
-    public static async Task<ChatClientAgent> CreateAIAgentAsync(
-        this AssistantClient client,
-        string model,
-        string? instructions = null,
-        string? name = null,
-        string? description = null,
-        IList<AITool>? tools = null,
-        Func<IChatClient, IChatClient>? clientFactory = null,
-        ILoggerFactory? loggerFactory = null,
-        IServiceProvider? services = null,
-        CancellationToken cancellationToken = default) =>
-        await client.CreateAIAgentAsync(model,
-            new ChatClientAgentOptions()
-            {
-                Name = name,
-                Description = description,
-                ChatOptions = tools is null && string.IsNullOrWhiteSpace(instructions) ? null : new ChatOptions()
-                {
-                    Tools = tools,
-                    Instructions = instructions,
-                }
-            },
-            clientFactory,
-            loggerFactory,
-            services,
-            cancellationToken).ConfigureAwait(false);
-
-    /// <summary>
-    /// Creates an AI agent from an <see cref="AssistantClient"/> using the OpenAI Assistant API.
-    /// </summary>
-    /// <param name="client">The OpenAI <see cref="AssistantClient" /> to use for the agent.</param>
-    /// <param name="model">The model identifier to use (e.g., "gpt-4").</param>
-    /// <param name="options">Full set of options to configure the agent.</param>
-    /// <param name="clientFactory">Provides a way to customize the creation of the underlying <see cref="IChatClient"/> used by the agent.</param>
-    /// <param name="loggerFactory">Optional logger factory for enabling logging within the agent.</param>
-    /// <param name="services">An optional <see cref="IServiceProvider"/> to use for resolving services required by the <see cref="AIFunction"/> instances being invoked.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>An <see cref="ChatClientAgent"/> instance backed by the OpenAI Assistant service.</returns>
-    /// <exception cref="ArgumentNullException">Thrown when <paramref name="client"/> or <paramref name="model"/> is <see langword="null"/>.</exception>
-    /// <exception cref="ArgumentException">Thrown when <paramref name="model"/> is empty or whitespace.</exception>
-    [Obsolete("The Assistants API has been deprecated. Please use the Responses API instead.")]
-    public static async Task<ChatClientAgent> CreateAIAgentAsync(
-        this AssistantClient client,
-        string model,
-        ChatClientAgentOptions options,
-        Func<IChatClient, IChatClient>? clientFactory = null,
-        ILoggerFactory? loggerFactory = null,
-        IServiceProvider? services = null,
-        CancellationToken cancellationToken = default)
-    {
-        Throw.IfNull(client);
-        Throw.IfNull(model);
-        Throw.IfNull(options);
-
-        var assistantOptions = new AssistantCreationOptions()
-        {
-            Name = options.Name,
-            Description = options.Description,
-            Instructions = options.ChatOptions?.Instructions,
-        };
-
-        // Convert AITools to ToolDefinitions and ToolResources
-        var toolDefinitionsAndResources = ConvertAIToolsToToolDefinitions(options.ChatOptions?.Tools);
-        if (toolDefinitionsAndResources.ToolDefinitions is { Count: > 0 } toolDefinitions)
-        {
-            toolDefinitions.ForEach(x => assistantOptions.Tools.Add(x));
-        }
-        if (toolDefinitionsAndResources.ToolResources is not null)
-        {
-            assistantOptions.ToolResources = toolDefinitionsAndResources.ToolResources;
-        }
-
-        // Create the assistant in the assistant service.
-        var assistantCreateResult = await client.CreateAssistantAsync(model, assistantOptions, cancellationToken).ConfigureAwait(false);
-        var assistantId = assistantCreateResult.Value.Id;
-
-        // Build the local agent object.
-        var chatClient = client.AsIChatClient(assistantId);
-        if (clientFactory is not null)
-        {
-            chatClient = clientFactory(chatClient);
-        }
-
-        var agentOptions = options.Clone();
-        agentOptions.Id = assistantId;
-        options.ChatOptions ??= new ChatOptions();
-        options.ChatOptions!.Tools = toolDefinitionsAndResources.FunctionToolsAndOtherTools;
-
-        return new ChatClientAgent(chatClient, agentOptions, loggerFactory, services);
-    }
-
-    private static (List<ToolDefinition>? ToolDefinitions, ToolResources? ToolResources, List<AITool>? FunctionToolsAndOtherTools) ConvertAIToolsToToolDefinitions(IList<AITool>? tools)
-    {
-        List<ToolDefinition>? toolDefinitions = null;
-        ToolResources? toolResources = null;
-        List<AITool>? functionToolsAndOtherTools = null;
-
-        if (tools is not null)
-        {
-            foreach (AITool tool in tools)
-            {
-                switch (tool)
-                {
-                    case HostedCodeInterpreterTool codeTool:
-
-                        toolDefinitions ??= [];
-                        toolDefinitions.Add(new CodeInterpreterToolDefinition());
-
-                        if (codeTool.Inputs is { Count: > 0 })
-                        {
-                            foreach (var input in codeTool.Inputs)
-                            {
-                                switch (input)
-                                {
-                                    case HostedFileContent hostedFile:
-                                        // If the input is a HostedFileContent, we can use its ID directly.
-                                        toolResources ??= new();
-                                        toolResources.CodeInterpreter ??= new();
-                                        toolResources.CodeInterpreter.FileIds.Add(hostedFile.FileId);
-                                        break;
-                                }
-                            }
-                        }
-                        break;
-
-                    case HostedFileSearchTool fileSearchTool:
-                        toolDefinitions ??= [];
-                        toolDefinitions.Add(new FileSearchToolDefinition
-                        {
-                            MaxResults = fileSearchTool.MaximumResultCount,
-                        });
-
-                        if (fileSearchTool.Inputs is { Count: > 0 })
-                        {
-                            foreach (var input in fileSearchTool.Inputs)
-                            {
-                                switch (input)
-                                {
-                                    case HostedVectorStoreContent hostedVectorStore:
-                                        toolResources ??= new();
-                                        toolResources.FileSearch ??= new();
-                                        toolResources.FileSearch.VectorStoreIds.Add(hostedVectorStore.VectorStoreId);
-                                        break;
-                                }
-                            }
-                        }
-                        break;
-
-                    default:
-                        functionToolsAndOtherTools ??= [];
-                        functionToolsAndOtherTools.Add(tool);
-                        break;
-                }
-            }
-        }
-
-        return (toolDefinitions, toolResources, functionToolsAndOtherTools);
-    }
-}

dotnet/src/Microsoft.Agents.AI.OpenAI/Microsoft.Agents.AI.OpenAI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <IsReleaseCandidate>true</IsReleaseCandidate>
+    <IsReleased>true</IsReleased>
     <ImplicitUsings>enable</ImplicitUsings>
     <InjectSharedThrow>true</InjectSharedThrow>
   </PropertyGroup>

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative.Foundry/AzureAgentProvider.cs

@@ -28,7 +28,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative;
 /// <param name="projectCredentials">The credentials used to authenticate with the Foundry project. This must be a valid instance of <see cref="TokenCredential"/>.</param>
 public sealed class AzureAgentProvider(Uri projectEndpoint, TokenCredential projectCredentials) : ResponseAgentProvider
 {
-    private readonly Dictionary<string, AgentVersion> _versionCache = [];
+    private readonly Dictionary<string, ProjectsAgentVersion> _versionCache = [];
     private readonly Dictionary<string, AIAgent> _agentCache = [];
 
     private AIProjectClient? _agentClient;
@@ -99,7 +99,7 @@ public sealed class AzureAgentProvider(Uri projectEndpoint, TokenCredential proj
         IDictionary<string, object?>? inputArguments,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
-        AgentVersion agentVersionResult = await this.QueryAgentAsync(agentId, agentVersion, cancellationToken).ConfigureAwait(false);
+        ProjectsAgentVersion agentVersionResult = await this.QueryAgentAsync(agentId, agentVersion, cancellationToken).ConfigureAwait(false);
         AIAgent agent = await this.GetAgentAsync(agentVersionResult, cancellationToken).ConfigureAwait(false);
 
         ChatOptions chatOptions =
@@ -133,10 +133,10 @@ public sealed class AzureAgentProvider(Uri projectEndpoint, TokenCredential proj
         }
     }
 
-    private async Task<AgentVersion> QueryAgentAsync(string agentName, string? agentVersion, CancellationToken cancellationToken = default)
+    private async Task<ProjectsAgentVersion> QueryAgentAsync(string agentName, string? agentVersion, CancellationToken cancellationToken = default)
     {
         string agentKey = $"{agentName}:{agentVersion}";
-        if (this._versionCache.TryGetValue(agentKey, out AgentVersion? targetAgent))
+        if (this._versionCache.TryGetValue(agentKey, out ProjectsAgentVersion? targetAgent))
         {
             return targetAgent;
         }
@@ -145,8 +145,8 @@ public sealed class AzureAgentProvider(Uri projectEndpoint, TokenCredential proj
 
         if (string.IsNullOrEmpty(agentVersion))
         {
-            AgentRecord agentRecord =
-                await client.Agents.GetAgentAsync(
+            ProjectsAgentRecord agentRecord =
+                await client.AgentAdministrationClient.GetAgentAsync(
                     agentName,
                     cancellationToken).ConfigureAwait(false);
 
@@ -155,7 +155,7 @@ public sealed class AzureAgentProvider(Uri projectEndpoint, TokenCredential proj
         else
         {
             targetAgent =
-                await client.Agents.GetAgentVersionAsync(
+                await client.AgentAdministrationClient.GetAgentVersionAsync(
                     agentName,
                     agentVersion,
                     cancellationToken).ConfigureAwait(false);
@@ -166,7 +166,7 @@ public sealed class AzureAgentProvider(Uri projectEndpoint, TokenCredential proj
         return targetAgent;
     }
 
-    private async Task<AIAgent> GetAgentAsync(AgentVersion agentVersion, CancellationToken cancellationToken = default)
+    private async Task<AIAgent> GetAgentAsync(ProjectsAgentVersion agentVersion, CancellationToken cancellationToken = default)
     {
         if (this._agentCache.TryGetValue(agentVersion.Id, out AIAgent? agent))
         {

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/README.md

@@ -4,9 +4,9 @@ Declarative Workflows is a no-code platform for orchestrating AI agents to accom
 It allows users to design, execute, and monitor workflows using simple declarative configurations—no coding required.
 By connecting multiple AI agents and services, it enables automation of sophisticated processes that traditionally require custom engineering.
 
-We've provided a set of [Sample Workflows](../../../workflow-samples/) within the `agent-framework` repository.
+We've provided a set of [Sample Workflows](../../../declarative-agents/workflow-samples/) within the `agent-framework` repository.
 
-Please refer to the [README](../../../workflow-samples/README.md) for setup instructions to run the sample workflows in your environment.
+Please refer to the [README](../../../declarative-agents/workflow-samples/README.md) for setup instructions to run the sample workflows in your environment.
 
 As part of our [Getting Started with Declarative Workflows](../../samples/03-workflows/Declarative/README.md),
 we've provided a console application that is able to execute any declarative workflow.

dotnet/src/Microsoft.Agents.AI.Workflows.Generators/Microsoft.Agents.AI.Workflows.Generators.csproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <IsReleaseCandidate>true</IsReleaseCandidate>
+    <IsReleased>true</IsReleased>
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />

dotnet/src/Microsoft.Agents.AI.Workflows/AgentWorkflowBuilder.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Specialized;
@@ -154,6 +155,7 @@ public static partial class AgentWorkflowBuilder
     /// The <see cref="AIAgent"/> must be capable of understanding those <see cref="AgentRunOptions"/> provided. If the agent
     /// ignores the tools or is otherwise unable to advertize them to the underlying provider, handoffs will not occur.
     /// </remarks>
+    [Experimental(DiagnosticConstants.ExperimentalFeatureDiagnostic)]
     public static HandoffWorkflowBuilder CreateHandoffBuilderWith(AIAgent initialAgent)
     {
         Throw.IfNull(initialAgent);

dotnet/src/Microsoft.Agents.AI.Workflows/CompatibilitySuppressions.xml

@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config`1</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.ConfigurationExtensions</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`1</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`2</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config`1</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.ConfigurationExtensions</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`1</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`2</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config`1</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.ConfigurationExtensions</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`1</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`2</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config`1</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.ConfigurationExtensions</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`1</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`2</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Config`1</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.ConfigurationExtensions</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`1</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.Workflows.Configured`2</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.AgentWorkflowBuilder.CreateHandoffBuilderWith(Microsoft.Agents.AI.AIAgent)</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.BindExecutor``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.ConfigureFactory``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net10.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.AgentWorkflowBuilder.CreateHandoffBuilderWith(Microsoft.Agents.AI.AIAgent)</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.BindExecutor``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.ConfigureFactory``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/net472/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net472/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.AgentWorkflowBuilder.CreateHandoffBuilderWith(Microsoft.Agents.AI.AIAgent)</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.BindExecutor``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.ConfigureFactory``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net8.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.AgentWorkflowBuilder.CreateHandoffBuilderWith(Microsoft.Agents.AI.AIAgent)</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.BindExecutor``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.ConfigureFactory``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/net9.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.AgentWorkflowBuilder.CreateHandoffBuilderWith(Microsoft.Agents.AI.AIAgent)</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.BindExecutor``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Microsoft.Agents.AI.Workflows.ExecutorBindingExtensions.ConfigureFactory``2(System.Func{Microsoft.Agents.AI.Workflows.Config{``1},System.String,System.Threading.Tasks.ValueTask{``0}},System.String,``1)</Target>
-    <Left>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Left>
-    <Right>lib/netstandard2.0/Microsoft.Agents.AI.Workflows.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-</Suppressions>

dotnet/src/Microsoft.Agents.AI.Workflows/Execution/StreamingRunEventStream.cs

@@ -23,7 +23,8 @@ internal sealed class StreamingRunEventStream : IRunEventStream
     private readonly CancellationTokenSource _runLoopCancellation;
     private readonly bool _disableRunLoop;
     private Task? _runLoopTask;
-    private RunStatus _runStatus = RunStatus.NotStarted;
+    private volatile RunStatus _runStatus = RunStatus.NotStarted;
+
     private int _completionEpoch; // Tracks which completion signal belongs to which consumer iteration
 
     public StreamingRunEventStream(ISuperStepRunner stepRunner, bool disableRunLoop = false)
@@ -127,7 +128,7 @@ internal sealed class StreamingRunEventStream : IRunEventStream
 
                 // Wait for next input from the consumer
                 // Works for both Idle (no work) and PendingRequests (waiting for responses)
-                await this._inputWaiter.WaitForInputAsync(TimeSpan.FromSeconds(1), linkedSource.Token).ConfigureAwait(false);
+                await this._inputWaiter.WaitForInputAsync(linkedSource.Token).ConfigureAwait(false);
 
                 // When signaled, resume running
                 this._runStatus = RunStatus.Running;
@@ -209,7 +210,10 @@ internal sealed class StreamingRunEventStream : IRunEventStream
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         // Get the current epoch - we'll only respond to completion signals from this epoch or later
-        int myEpoch = Volatile.Read(ref this._completionEpoch) + 1;
+        int currentEpoch = Volatile.Read(ref this._completionEpoch);
+
+        bool expectingFreshWork = this._stepRunner.HasUnprocessedMessages || this._runStatus == RunStatus.Running;
+        int myEpoch = expectingFreshWork ? currentEpoch + 1 : currentEpoch;
 
         // Use custom async enumerable to avoid exceptions on cancellation.
         NonThrowingChannelReaderAsyncEnumerable<WorkflowEvent> eventStream = new(this._eventChannel.Reader);

dotnet/src/Microsoft.Agents.AI.Workflows/HandoffWorkflowBuilder.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.Agents.AI.Workflows.Specialized;
 using Microsoft.Extensions.AI;
@@ -9,13 +10,21 @@ using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Agents.AI.Workflows;
 
+internal static class DiagnosticConstants
+{
+    public const string ExperimentalFeatureDiagnostic = "MAAIW001";
+}
+
 /// <inheritdoc/>
 [Obsolete("Prefer HandoffWorkflowBuilder (no 's') instead, which has the same API but the preferred name. This will be removed in a future release before GA.")]
+#pragma warning disable MAAIW001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 public sealed class HandoffsWorkflowBuilder(AIAgent initialAgent) : HandoffWorkflowBuilderCore<HandoffsWorkflowBuilder>(initialAgent)
+#pragma warning restore MAAIW001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 {
 }
 
 /// <inheritdoc/>
+[Experimental(DiagnosticConstants.ExperimentalFeatureDiagnostic)]
 public sealed class HandoffWorkflowBuilder(AIAgent initialAgent) : HandoffWorkflowBuilderCore<HandoffWorkflowBuilder>(initialAgent)
 {
 }
@@ -23,6 +32,7 @@ public sealed class HandoffWorkflowBuilder(AIAgent initialAgent) : HandoffWorkfl
 /// <summary>
 /// Provides a builder for specifying the handoff relationships between agents and building the resulting workflow.
 /// </summary>
+[Experimental(DiagnosticConstants.ExperimentalFeatureDiagnostic)]
 public class HandoffWorkflowBuilderCore<TBuilder> where TBuilder : HandoffWorkflowBuilderCore<TBuilder>
 {
     /// <summary>

dotnet/src/Microsoft.Agents.AI.Workflows/Microsoft.Agents.AI.Workflows.csproj

@@ -1,13 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <IsReleaseCandidate>true</IsReleaseCandidate>
+    <IsReleased>true</IsReleased>
     <NoWarn>$(NoWarn);MEAI001</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
     <InjectSharedThrow>true</InjectSharedThrow>
     <InjectIsExternalInitOnLegacy>true</InjectIsExternalInitOnLegacy>
+    <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
     <InjectTrimAttributesOnLegacy>true</InjectTrimAttributesOnLegacy>
   </PropertyGroup>
 

dotnet/src/Microsoft.Agents.AI.Workflows/Specialized/HandoffAgentExecutor.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.Json;
 using System.Threading;
@@ -31,6 +32,7 @@ internal sealed class HandoffAgentExecutorOptions
     public HandoffToolCallFilteringBehavior ToolCallFilteringBehavior { get; set; } = HandoffToolCallFilteringBehavior.HandoffOnly;
 }
 
+[Experimental(DiagnosticConstants.ExperimentalFeatureDiagnostic)]
 internal sealed class HandoffMessagesFilter
 {
     private readonly HandoffToolCallFilteringBehavior _filteringBehavior;
@@ -40,6 +42,7 @@ internal sealed class HandoffMessagesFilter
         this._filteringBehavior = filteringBehavior;
     }
 
+    [Experimental(DiagnosticConstants.ExperimentalFeatureDiagnostic)]
     internal static bool IsHandoffFunctionName(string name)
     {
         return name.StartsWith(HandoffWorkflowBuilder.FunctionPrefix, StringComparison.Ordinal);
@@ -164,6 +167,7 @@ internal sealed class HandoffMessagesFilter
 }
 
 /// <summary>Executor used to represent an agent in a handoffs workflow, responding to <see cref="HandoffState"/> events.</summary>
+[Experimental(DiagnosticConstants.ExperimentalFeatureDiagnostic)]
 internal sealed class HandoffAgentExecutor(
     AIAgent agent,
     HandoffAgentExecutorOptions options) : Executor<HandoffState, HandoffState>(agent.GetDescriptiveId(), declareCrossRunShareable: true), IResettableExecutor

dotnet/src/Microsoft.Agents.AI/CompatibilitySuppressions.xml

@@ -2,71 +2,106 @@
 <!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProvider</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.get_SimulateServiceStoredChatHistory</Target>
     <Left>lib/net10.0/Microsoft.Agents.AI.dll</Left>
     <Right>lib/net10.0/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProviderOptions</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.set_SimulateServiceStoredChatHistory(System.Boolean)</Target>
     <Left>lib/net10.0/Microsoft.Agents.AI.dll</Left>
     <Right>lib/net10.0/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProvider</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Extensions.AI.ChatClientBuilderExtensions.UseServiceStoredChatHistorySimulation(Microsoft.Extensions.AI.ChatClientBuilder)</Target>
+    <Left>lib/net10.0/Microsoft.Agents.AI.dll</Left>
+    <Right>lib/net10.0/Microsoft.Agents.AI.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.get_SimulateServiceStoredChatHistory</Target>
     <Left>lib/net472/Microsoft.Agents.AI.dll</Left>
     <Right>lib/net472/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProviderOptions</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.set_SimulateServiceStoredChatHistory(System.Boolean)</Target>
     <Left>lib/net472/Microsoft.Agents.AI.dll</Left>
     <Right>lib/net472/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProvider</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Extensions.AI.ChatClientBuilderExtensions.UseServiceStoredChatHistorySimulation(Microsoft.Extensions.AI.ChatClientBuilder)</Target>
+    <Left>lib/net472/Microsoft.Agents.AI.dll</Left>
+    <Right>lib/net472/Microsoft.Agents.AI.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.get_SimulateServiceStoredChatHistory</Target>
     <Left>lib/net8.0/Microsoft.Agents.AI.dll</Left>
     <Right>lib/net8.0/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProviderOptions</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.set_SimulateServiceStoredChatHistory(System.Boolean)</Target>
     <Left>lib/net8.0/Microsoft.Agents.AI.dll</Left>
     <Right>lib/net8.0/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProvider</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Extensions.AI.ChatClientBuilderExtensions.UseServiceStoredChatHistorySimulation(Microsoft.Extensions.AI.ChatClientBuilder)</Target>
+    <Left>lib/net8.0/Microsoft.Agents.AI.dll</Left>
+    <Right>lib/net8.0/Microsoft.Agents.AI.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.get_SimulateServiceStoredChatHistory</Target>
     <Left>lib/net9.0/Microsoft.Agents.AI.dll</Left>
     <Right>lib/net9.0/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProviderOptions</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.set_SimulateServiceStoredChatHistory(System.Boolean)</Target>
     <Left>lib/net9.0/Microsoft.Agents.AI.dll</Left>
     <Right>lib/net9.0/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProvider</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Extensions.AI.ChatClientBuilderExtensions.UseServiceStoredChatHistorySimulation(Microsoft.Extensions.AI.ChatClientBuilder)</Target>
+    <Left>lib/net9.0/Microsoft.Agents.AI.dll</Left>
+    <Right>lib/net9.0/Microsoft.Agents.AI.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.get_SimulateServiceStoredChatHistory</Target>
     <Left>lib/netstandard2.0/Microsoft.Agents.AI.dll</Left>
     <Right>lib/netstandard2.0/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Microsoft.Agents.AI.FileAgentSkillsProviderOptions</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Agents.AI.ChatClientAgentOptions.set_SimulateServiceStoredChatHistory(System.Boolean)</Target>
+    <Left>lib/netstandard2.0/Microsoft.Agents.AI.dll</Left>
+    <Right>lib/netstandard2.0/Microsoft.Agents.AI.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.Extensions.AI.ChatClientBuilderExtensions.UseServiceStoredChatHistorySimulation(Microsoft.Extensions.AI.ChatClientBuilder)</Target>
     <Left>lib/netstandard2.0/Microsoft.Agents.AI.dll</Left>
     <Right>lib/netstandard2.0/Microsoft.Agents.AI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>

dotnet/src/Microsoft.Agents.AI/Microsoft.Agents.AI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <IsReleaseCandidate>true</IsReleaseCandidate>
+    <IsReleased>true</IsReleased>
     <NoWarn>$(NoWarn);MEAI001;MAAI001</NoWarn>
   </PropertyGroup>
 

dotnet/src/Shared/DiagnosticIds/DiagnosticsIds.cs

@@ -26,7 +26,6 @@ internal static class DiagnosticIds
         // We use the same IDs so consumers do not need to suppress additional diagnostics
         // when using the experimental OpenAI APIs.
         internal const string AIOpenAIResponses = "OPENAI001";
-        internal const string AIOpenAIAssistants = "OPENAI001";
 
         private const string MEAIExperiments = "MEAI001";
     }

dotnet/src/Shared/Foundry/Agents/AgentFactory.cs

@@ -12,13 +12,13 @@ namespace Shared.Foundry;
 
 internal static class AgentFactory
 {
-    public static async ValueTask<AgentVersion> CreateAgentAsync(
+    public static async ValueTask<ProjectsAgentVersion> CreateAgentAsync(
         this AIProjectClient aiProjectClient,
         string agentName,
-        AgentDefinition agentDefinition,
+        ProjectsAgentDefinition agentDefinition,
         string agentDescription)
     {
-        AgentVersionCreationOptions options =
+        ProjectsAgentVersionCreationOptions options =
             new(agentDefinition)
             {
                 Description = agentDescription,
@@ -29,7 +29,7 @@ internal static class AgentFactory
                     },
             };
 
-        AgentVersion agentVersion = await aiProjectClient.Agents.CreateAgentVersionAsync(agentName, options).ConfigureAwait(false);
+        ProjectsAgentVersion agentVersion = await aiProjectClient.AgentAdministrationClient.CreateAgentVersionAsync(agentName, options).ConfigureAwait(false);
 
         Console.ForegroundColor = ConsoleColor.Cyan;
         try

dotnet/tests/Foundry.IntegrationTests/FoundryVersionedAgentCreateTests.cs

@@ -17,7 +17,7 @@ namespace Foundry.IntegrationTests;
 
 /// <summary>
 /// Integration tests for versioned <see cref="FoundryAgent"/> creation via
-/// <c>AIProjectClient.Agents.CreateAgentVersionAsync</c> and <c>AIProjectClient.AsAIAgent(AgentVersion)</c>.
+/// <c>AIProjectClient.AgentAdministrationClient.CreateAgentVersionAsync</c> and <c>AIProjectClient.AsAIAgent(ProjectsAgentVersion)</c>.
 /// </summary>
 public class FoundryVersionedAgentCreateTests
 {
@@ -32,10 +32,10 @@ public class FoundryVersionedAgentCreateTests
         const string AgentInstructions = "You are an integration test agent";
 
         // Act.
-        var agentVersion = await this._client.Agents.CreateAgentVersionAsync(
+        var agentVersion = await this._client.AgentAdministrationClient.CreateAgentVersionAsync(
             AgentName,
-            new AgentVersionCreationOptions(
-                new PromptAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
+            new ProjectsAgentVersionCreationOptions(
+                new DeclarativeAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
                 {
                     Instructions = AgentInstructions
                 })
@@ -53,17 +53,17 @@ public class FoundryVersionedAgentCreateTests
             Assert.Equal(AgentDescription, agent.Description);
             Assert.Equal(AgentInstructions, agent.GetService<ChatClientAgent>()!.Instructions);
 
-            var agentRecord = await this._client.Agents.GetAgentAsync(agent.Name);
+            var agentRecord = await this._client.AgentAdministrationClient.GetAgentAsync(agent.Name);
             Assert.NotNull(agentRecord);
             Assert.Equal(AgentName, agentRecord.Value.Name);
-            var definition = Assert.IsType<PromptAgentDefinition>(agentRecord.Value.GetLatestVersion().Definition);
+            var definition = Assert.IsType<DeclarativeAgentDefinition>(agentRecord.Value.GetLatestVersion().Definition);
             Assert.Equal(AgentDescription, agentRecord.Value.GetLatestVersion().Description);
             Assert.Equal(AgentInstructions, definition.Instructions);
         }
         finally
         {
             // Cleanup.
-            await this._client.Agents.DeleteAgentAsync(agent.Name);
+            await this._client.AgentAdministrationClient.DeleteAgentAsync(agent.Name);
         }
     }
 
@@ -95,15 +95,15 @@ public class FoundryVersionedAgentCreateTests
         var vectorStoreMetadata = await projectOpenAIClient.GetProjectVectorStoresClient().CreateVectorStoreAsync(options: new() { FileIds = { uploadedAgentFile.Id }, Name = "WordCodeLookup_VectorStore" });
 
         // Act — create agent version with FileSearch tool via native SDK, then wrap with AsAIAgent.
-        var definition = new PromptAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
+        var definition = new DeclarativeAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions = AgentInstructions,
             Tools = { ResponseTool.CreateFileSearchTool(vectorStoreIds: [vectorStoreMetadata.Value.Id]) }
         };
 
-        var agentVersion = await this._client.Agents.CreateAgentVersionAsync(
+        var agentVersion = await this._client.AgentAdministrationClient.CreateAgentVersionAsync(
             AgentName,
-            new AgentVersionCreationOptions(definition));
+            new ProjectsAgentVersionCreationOptions(definition));
 
         var agent = this._client.AsAIAgent(agentVersion);
 
@@ -117,7 +117,7 @@ public class FoundryVersionedAgentCreateTests
         finally
         {
             // Cleanup.
-            await this._client.Agents.DeleteAgentAsync(agent.Name);
+            await this._client.AgentAdministrationClient.DeleteAgentAsync(agent.Name);
             await projectOpenAIClient.GetProjectVectorStoresClient().DeleteVectorStoreAsync(vectorStoreMetadata.Value.Id);
             await projectOpenAIClient.GetProjectFilesClient().DeleteFileAsync(uploadedAgentFile.Id);
             File.Delete(searchFilePath);
@@ -149,15 +149,15 @@ public class FoundryVersionedAgentCreateTests
         );
 
         // Act — create agent version with CodeInterpreter tool via native SDK, then wrap with AsAIAgent.
-        var definition = new PromptAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
+        var definition = new DeclarativeAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions = AgentInstructions,
             Tools = { ResponseTool.CreateCodeInterpreterTool(new CodeInterpreterToolContainer(CodeInterpreterToolContainerConfiguration.CreateAutomaticContainerConfiguration([uploadedCodeFile.Id]))) }
         };
 
-        var agentVersion = await this._client.Agents.CreateAgentVersionAsync(
+        var agentVersion = await this._client.AgentAdministrationClient.CreateAgentVersionAsync(
             AgentName,
-            new AgentVersionCreationOptions(definition));
+            new ProjectsAgentVersionCreationOptions(definition));
 
         var agent = this._client.AsAIAgent(agentVersion);
 
@@ -171,7 +171,7 @@ public class FoundryVersionedAgentCreateTests
         finally
         {
             // Cleanup.
-            await this._client.Agents.DeleteAgentAsync(agent.Name);
+            await this._client.AgentAdministrationClient.DeleteAgentAsync(agent.Name);
             await projectOpenAIClient.GetProjectFilesClient().DeleteFileAsync(uploadedCodeFile.Id);
             File.Delete(codeFilePath);
         }
@@ -252,14 +252,14 @@ public class FoundryVersionedAgentCreateTests
             Description = "Retrieve information about countries by currency code"
         };
 
-        var definition = new PromptAgentDefinition(model: TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
+        var definition = new DeclarativeAgentDefinition(model: TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions = AgentInstructions,
-            Tools = { (ResponseTool)AgentTool.CreateOpenApiTool(openApiFunction) }
+            Tools = { (ResponseTool)ProjectsAgentTool.CreateOpenApiTool(openApiFunction) }
         };
 
-        AgentVersionCreationOptions creationOptions = new(definition);
-        AgentVersion agentVersion = await this._client.Agents.CreateAgentVersionAsync(AgentName, creationOptions);
+        ProjectsAgentVersionCreationOptions creationOptions = new(definition);
+        ProjectsAgentVersion agentVersion = await this._client.AgentAdministrationClient.CreateAgentVersionAsync(AgentName, creationOptions);
 
         try
         {
@@ -269,7 +269,7 @@ public class FoundryVersionedAgentCreateTests
             // Assert the agent was created correctly and retains version metadata.
             Assert.NotNull(agent);
             Assert.Equal(AgentName, agent.Name);
-            var retrievedVersion = agent.GetService<AgentVersion>();
+            var retrievedVersion = agent.GetService<ProjectsAgentVersion>();
             Assert.NotNull(retrievedVersion);
 
             // Step 3: Call RunAsync to trigger the server-side OpenAPI function.
@@ -301,7 +301,7 @@ public class FoundryVersionedAgentCreateTests
         finally
         {
             // Cleanup.
-            await this._client.Agents.DeleteAgentAsync(AgentName);
+            await this._client.AgentAdministrationClient.DeleteAgentAsync(AgentName);
         }
     }
 
@@ -317,15 +317,15 @@ public class FoundryVersionedAgentCreateTests
 
         // Create agent version with the function tool registered in the server-side definition,
         // then wrap with AsAIAgent passing the local AIFunction implementation.
-        var definition = new PromptAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
+        var definition = new DeclarativeAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions = AgentInstructions,
         };
         definition.Tools.Add(weatherFunction.AsOpenAIResponseTool());
 
-        var agentVersion = await this._client.Agents.CreateAgentVersionAsync(
+        var agentVersion = await this._client.AgentAdministrationClient.CreateAgentVersionAsync(
             AgentName,
-            new AgentVersionCreationOptions(definition));
+            new ProjectsAgentVersionCreationOptions(definition));
 
         FoundryAgent agent = this._client.AsAIAgent(agentVersion, tools: [weatherFunction]);
 
@@ -342,7 +342,7 @@ public class FoundryVersionedAgentCreateTests
         }
         finally
         {
-            await this._client.Agents.DeleteAgentAsync(agent.Name);
+            await this._client.AgentAdministrationClient.DeleteAgentAsync(agent.Name);
         }
     }
 }

dotnet/tests/Foundry.IntegrationTests/FoundryVersionedAgentFixture.cs

@@ -19,8 +19,8 @@ namespace Foundry.IntegrationTests;
 
 /// <summary>
 /// Integration test fixture that creates versioned Foundry agents via
-/// <c>AIProjectClient.Agents.CreateAgentVersionAsync</c> and wraps them
-/// with <c>AIProjectClient.AsAIAgent(AgentVersion)</c>.
+/// <c>AIProjectClient.AgentAdministrationClient.CreateAgentVersionAsync</c> and wraps them
+/// with <c>AIProjectClient.AsAIAgent(ProjectsAgentVersion)</c>.
 /// </summary>
 public class FoundryVersionedAgentFixture : IChatClientAgentFixture
 {
@@ -121,7 +121,7 @@ public class FoundryVersionedAgentFixture : IChatClientAgentFixture
         string instructions = "You are a helpful assistant.",
         IList<AITool>? aiTools = null)
     {
-        var definition = new PromptAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
+        var definition = new DeclarativeAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions = instructions
         };
@@ -139,9 +139,9 @@ public class FoundryVersionedAgentFixture : IChatClientAgentFixture
             }
         }
 
-        var agentVersion = await this._client.Agents.CreateAgentVersionAsync(
+        var agentVersion = await this._client.AgentAdministrationClient.CreateAgentVersionAsync(
             GenerateUniqueAgentName(name),
-            new AgentVersionCreationOptions(definition));
+            new ProjectsAgentVersionCreationOptions(definition));
 
         return this._client.AsAIAgent(agentVersion, tools: aiTools).GetService<ChatClientAgent>()!;
     }
@@ -150,15 +150,15 @@ public class FoundryVersionedAgentFixture : IChatClientAgentFixture
     {
         options.Name ??= GenerateUniqueAgentName("HelpfulAssistant");
 
-        var definition = new PromptAgentDefinition(
+        var definition = new DeclarativeAgentDefinition(
             options.ChatOptions?.ModelId ?? TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions = options.ChatOptions?.Instructions
         };
 
-        var agentVersion = await this._client.Agents.CreateAgentVersionAsync(
+        var agentVersion = await this._client.AgentAdministrationClient.CreateAgentVersionAsync(
             options.Name,
-            new AgentVersionCreationOptions(definition) { Description = options.Description });
+            new ProjectsAgentVersionCreationOptions(definition) { Description = options.Description });
 
         var agent = this._client.AsAIAgent(agentVersion, tools: options.ChatOptions?.Tools);
 
@@ -169,7 +169,7 @@ public class FoundryVersionedAgentFixture : IChatClientAgentFixture
         $"{baseName}-{Guid.NewGuid().ToString("N").Substring(0, 8)}";
 
     public Task DeleteAgentAsync(ChatClientAgent agent) =>
-        this._client.Agents.DeleteAgentAsync(agent.Name);
+        this._client.AgentAdministrationClient.DeleteAgentAsync(agent.Name);
 
     public async Task DeleteSessionAsync(AgentSession session)
     {
@@ -201,7 +201,7 @@ public class FoundryVersionedAgentFixture : IChatClientAgentFixture
 
         if (this._client is not null && this._agent is not null)
         {
-            return new ValueTask(this._client.Agents.DeleteAgentAsync(this._agent.Name));
+            return new ValueTask(this._client.AgentAdministrationClient.DeleteAgentAsync(this._agent.Name));
         }
 
         return default;
@@ -211,10 +211,10 @@ public class FoundryVersionedAgentFixture : IChatClientAgentFixture
     {
         this._client = new(new Uri(TestConfiguration.GetRequiredValue(TestSettings.AzureAIProjectEndpoint)), TestAzureCliCredentials.CreateAzureCliCredential());
 
-        var agentVersion = await this._client.Agents.CreateAgentVersionAsync(
+        var agentVersion = await this._client.AgentAdministrationClient.CreateAgentVersionAsync(
             GenerateUniqueAgentName("HelpfulAssistant"),
-            new AgentVersionCreationOptions(
-                new PromptAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
+            new ProjectsAgentVersionCreationOptions(
+                new DeclarativeAgentDefinition(TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
                 {
                     Instructions = "You are a helpful assistant."
                 }));
@@ -227,15 +227,15 @@ public class FoundryVersionedAgentFixture : IChatClientAgentFixture
         this._client = new(new Uri(TestConfiguration.GetRequiredValue(TestSettings.AzureAIProjectEndpoint)), TestAzureCliCredentials.CreateAzureCliCredential());
         options.Name ??= GenerateUniqueAgentName("HelpfulAssistant");
 
-        var definition = new PromptAgentDefinition(
+        var definition = new DeclarativeAgentDefinition(
             options.ChatOptions?.ModelId ?? TestConfiguration.GetRequiredValue(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions = options.ChatOptions?.Instructions
         };
 
-        var agentVersion = await this._client.Agents.CreateAgentVersionAsync(
+        var agentVersion = await this._client.AgentAdministrationClient.CreateAgentVersionAsync(
             options.Name,
-            new AgentVersionCreationOptions(definition) { Description = options.Description });
+            new ProjectsAgentVersionCreationOptions(definition) { Description = options.Description });
 
         this._agent = this._client.AsAIAgent(agentVersion, tools: options.ChatOptions?.Tools);
     }

dotnet/tests/Foundry.IntegrationTests/Memory/FoundryMemoryProviderTests.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Threading.Tasks;
 using Azure.AI.Projects;
+using Azure.AI.Projects.Memory;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Foundry;

dotnet/tests/Microsoft.Agents.AI.Foundry.UnitTests/AzureAIProjectChatClientExtensionsTests.cs

@@ -187,7 +187,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
     #endregion
 
-    #region AsAIAgent(AIProjectClient, AgentRecord) Tests
+    #region AsAIAgent(AIProjectClient, ProjectsAgentRecord) Tests
 
     /// <summary>
     /// Verify that AsAIAgent throws ArgumentNullException when AIProjectClient is null.
@@ -197,7 +197,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         AIProjectClient? client = null;
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
 
         // Act & Assert
         var exception = Assert.Throws<ArgumentNullException>(() =>
@@ -217,20 +217,20 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
         // Act & Assert
         var exception = Assert.Throws<ArgumentNullException>(() =>
-            mockClient.Object.AsAIAgent((AgentRecord)null!));
+            mockClient.Object.AsAIAgent((ProjectsAgentRecord)null!));
 
         Assert.Equal("agentRecord", exception.ParamName);
     }
 
     /// <summary>
-    /// Verify that AsAIAgent with AgentRecord creates a valid agent.
+    /// Verify that AsAIAgent with ProjectsAgentRecord creates a valid agent.
     /// </summary>
     [Fact]
     public void AsAIAgent_WithAgentRecord_CreatesValidAgent()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
 
         // Act
         var agent = client.AsAIAgent(agentRecord);
@@ -243,14 +243,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that AsAIAgent with AgentRecord and clientFactory applies the factory.
+    /// Verify that AsAIAgent with ProjectsAgentRecord and clientFactory applies the factory.
     /// </summary>
     [Fact]
     public void AsAIAgent_WithAgentRecord_WithClientFactory_AppliesFactoryCorrectly()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
         TestChatClient? testChatClient = null;
 
         // Act
@@ -267,7 +267,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
     #endregion
 
-    #region AsAIAgent(AIProjectClient, AgentVersion) Tests
+    #region AsAIAgent(AIProjectClient, ProjectsAgentVersion) Tests
 
     /// <summary>
     /// Verify that AsAIAgent throws ArgumentNullException when AIProjectClient is null.
@@ -277,7 +277,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         AIProjectClient? client = null;
-        AgentVersion agentVersion = this.CreateTestAgentVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersion();
 
         // Act & Assert
         var exception = Assert.Throws<ArgumentNullException>(() =>
@@ -297,20 +297,20 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
         // Act & Assert
         var exception = Assert.Throws<ArgumentNullException>(() =>
-            mockClient.Object.AsAIAgent((AgentVersion)null!));
+            mockClient.Object.AsAIAgent((ProjectsAgentVersion)null!));
 
         Assert.Equal("agentVersion", exception.ParamName);
     }
 
     /// <summary>
-    /// Verify that AsAIAgent with AgentVersion creates a valid agent.
+    /// Verify that AsAIAgent with ProjectsAgentVersion creates a valid agent.
     /// </summary>
     [Fact]
     public void AsAIAgent_WithAgentVersion_CreatesValidAgent()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentVersion agentVersion = this.CreateTestAgentVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersion();
 
         // Act
         var agent = client.AsAIAgent(agentVersion);
@@ -323,14 +323,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that AsAIAgent with AgentVersion and clientFactory applies the factory.
+    /// Verify that AsAIAgent with ProjectsAgentVersion and clientFactory applies the factory.
     /// </summary>
     [Fact]
     public void AsAIAgent_WithAgentVersion_WithClientFactory_AppliesFactoryCorrectly()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentVersion agentVersion = this.CreateTestAgentVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersion();
         TestChatClient? testChatClient = null;
 
         // Act
@@ -353,7 +353,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentVersion agentVersion = this.CreateTestAgentVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersion();
         var tools = new List<AITool>
         {
             AIFunctionFactory.Create(() => "test", "test_function", "A test function")
@@ -375,7 +375,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentVersion agentVersion = this.CreateTestAgentVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersion();
 
         // Act - should not throw even without tools when requireInvocableTools is false
         var agent = client.AsAIAgent(agentVersion);
@@ -439,7 +439,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
     #endregion
 
-    #region AsAIAgent(AIProjectClient, AgentRecord) with tools Tests
+    #region AsAIAgent(AIProjectClient, ProjectsAgentRecord) with tools Tests
 
     /// <summary>
     /// Verify that AsAIAgent with additional tools when the definition has no tools does not throw and results in an agent with no tools.
@@ -449,7 +449,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
         var tools = new List<AITool>
         {
             AIFunctionFactory.Create(() => "test", "test_function", "A test function")
@@ -463,9 +463,9 @@ public sealed class AzureAIProjectChatClientExtensionsTests
         Assert.IsType<FoundryAgent>(agent);
         var chatClient = agent.GetService<IChatClient>();
         Assert.NotNull(chatClient);
-        var agentVersion = chatClient.GetService<AgentVersion>();
+        var agentVersion = chatClient.GetService<ProjectsAgentVersion>();
         Assert.NotNull(agentVersion);
-        var definition = Assert.IsType<PromptAgentDefinition>(agentVersion.Definition);
+        var definition = Assert.IsType<DeclarativeAgentDefinition>(agentVersion.Definition);
         Assert.Empty(definition.Tools);
     }
 
@@ -477,7 +477,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
 
         // Act
         var agent = client.AsAIAgent(agentRecord, tools: null);
@@ -502,7 +502,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
         var agentVersion = this.CreateTestAgentVersion();
 
         // Manually add tools to the definition to simulate inline tools
-        if (agentVersion.Definition is PromptAgentDefinition promptDef)
+        if (agentVersion.Definition is DeclarativeAgentDefinition promptDef)
         {
             promptDef.Tools.Add(ResponseTool.CreateFunctionTool("inline_tool", BinaryData.FromString("{}"), strictModeEnabled: false));
         }
@@ -513,9 +513,9 @@ public sealed class AzureAIProjectChatClientExtensionsTests
         // Act & Assert
         var agent = client.AsAIAgent(agentVersion, tools: [invocableInlineAITool, shouldBeIgnoredTool]);
         Assert.NotNull(agent);
-        var version = agent.GetService<AgentVersion>();
+        var version = agent.GetService<ProjectsAgentVersion>();
         Assert.NotNull(version);
-        var definition = Assert.IsType<PromptAgentDefinition>(version.Definition);
+        var definition = Assert.IsType<DeclarativeAgentDefinition>(version.Definition);
         Assert.NotEmpty(definition.Tools);
         Assert.NotNull(GetAgentChatOptions(agent));
         Assert.NotNull(GetAgentChatOptions(agent)!.Tools);
@@ -535,7 +535,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
         var tools = new List<AITool>
         {
             AIFunctionFactory.Create(() => "tool1", "param_tool_1", "First parameter tool"),
@@ -550,7 +550,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
         Assert.IsType<FoundryAgent>(agent);
         var chatClient = agent.GetService<IChatClient>();
         Assert.NotNull(chatClient);
-        var agentVersion = chatClient.GetService<AgentVersion>();
+        var agentVersion = chatClient.GetService<ProjectsAgentVersion>();
         Assert.NotNull(agentVersion);
     }
 
@@ -565,7 +565,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     public async Task CreateAIAgentAsync_WithResponseToolsInDefinition_CreatesAgentSuccessfullyAsync()
     {
         // Arrange
-        var definition = new PromptAgentDefinition("test-model") { Instructions = "Test instructions" };
+        var definition = new DeclarativeAgentDefinition("test-model") { Instructions = "Test instructions" };
 
         var fabricToolOptions = new FabricDataAgentToolOptions();
         fabricToolOptions.ProjectConnections.Add(new ToolProjectConnection("connection-id"));
@@ -577,33 +577,33 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
         // Add tools to the definition
         definition.Tools.Add(ResponseTool.CreateFunctionTool("create_tool", BinaryData.FromString("{}"), strictModeEnabled: false));
-        definition.Tools.Add((ResponseTool)AgentTool.CreateBingCustomSearchTool(new BingCustomSearchToolOptions([new BingCustomSearchConfiguration("connection-id", "instance-name")])));
-        definition.Tools.Add((ResponseTool)AgentTool.CreateBrowserAutomationTool(new BrowserAutomationToolOptions(new BrowserAutomationToolConnectionParameters("id"))));
-        definition.Tools.Add(AgentTool.CreateA2ATool(new Uri("https://test-uri.microsoft.com")));
-        definition.Tools.Add((ResponseTool)AgentTool.CreateBingGroundingTool(new BingGroundingSearchToolOptions([new BingGroundingSearchConfiguration("connection-id")])));
-        definition.Tools.Add((ResponseTool)AgentTool.CreateMicrosoftFabricTool(fabricToolOptions));
-        definition.Tools.Add((ResponseTool)AgentTool.CreateOpenApiTool(new OpenApiFunctionDefinition("name", BinaryData.FromString(OpenAPISpec), new OpenAPIAnonymousAuthenticationDetails())));
-        definition.Tools.Add((ResponseTool)AgentTool.CreateSharepointTool(sharepointOptions));
-        definition.Tools.Add((ResponseTool)AgentTool.CreateStructuredOutputsTool(structuredOutputs));
-        definition.Tools.Add((ResponseTool)AgentTool.CreateAzureAISearchTool(new AzureAISearchToolOptions([new AzureAISearchToolIndex() { IndexName = "name" }])));
+        definition.Tools.Add((ResponseTool)ProjectsAgentTool.CreateBingCustomSearchTool(new BingCustomSearchToolOptions([new BingCustomSearchConfiguration("connection-id", "instance-name")])));
+        definition.Tools.Add((ResponseTool)ProjectsAgentTool.CreateBrowserAutomationTool(new BrowserAutomationToolOptions(new BrowserAutomationToolConnectionParameters("id"))));
+        definition.Tools.Add(ProjectsAgentTool.CreateA2ATool(new Uri("https://test-uri.microsoft.com")));
+        definition.Tools.Add((ResponseTool)ProjectsAgentTool.CreateBingGroundingTool(new BingGroundingSearchToolOptions([new BingGroundingSearchConfiguration("connection-id")])));
+        definition.Tools.Add((ResponseTool)ProjectsAgentTool.CreateMicrosoftFabricTool(fabricToolOptions));
+        definition.Tools.Add((ResponseTool)ProjectsAgentTool.CreateOpenApiTool(new OpenApiFunctionDefinition("name", BinaryData.FromString(OpenAPISpec), new OpenAPIAnonymousAuthenticationDetails())));
+        definition.Tools.Add((ResponseTool)ProjectsAgentTool.CreateSharepointTool(sharepointOptions));
+        definition.Tools.Add((ResponseTool)ProjectsAgentTool.CreateStructuredOutputsTool(structuredOutputs));
+        definition.Tools.Add((ResponseTool)ProjectsAgentTool.CreateAzureAISearchTool(new AzureAISearchToolOptions([new AzureAISearchToolIndex() { IndexName = "name" }])));
 
         // Generate agent definition response with the tools
         var definitionResponse = GeneratePromptDefinitionResponse(definition, definition.Tools.Select(t => t.AsAITool()).ToList());
 
         using var testClient = CreateTestAgentClientWithHandler(agentDefinitionResponse: definitionResponse);
 
-        var options = new AgentVersionCreationOptions(definition);
+        var options = new ProjectsAgentVersionCreationOptions(definition);
 
         // Act
-        var agentVersion = (await testClient.Client.Agents.CreateAgentVersionAsync("test-agent", options)).Value;
+        var agentVersion = (await testClient.Client.AgentAdministrationClient.CreateAgentVersionAsync("test-agent", options)).Value;
         var agent = testClient.Client.AsAIAgent(agentVersion);
 
         // Assert
         Assert.NotNull(agent);
         Assert.IsType<FoundryAgent>(agent);
-        var agentVersion2 = agent.GetService<AgentVersion>()!;
+        var agentVersion2 = agent.GetService<ProjectsAgentVersion>()!;
         Assert.NotNull(agentVersion);
-        if (agentVersion2.Definition is PromptAgentDefinition promptDef)
+        if (agentVersion2.Definition is DeclarativeAgentDefinition promptDef)
         {
             Assert.NotEmpty(promptDef.Tools);
             Assert.Equal(10, promptDef.Tools.Count);
@@ -624,19 +624,19 @@ public sealed class AzureAIProjectChatClientExtensionsTests
             functionDescription: "Gets the user's name, as used for friendly address."
         );
 
-        var definition = new PromptAgentDefinition("test-model") { Instructions = "Test" };
+        var definition = new DeclarativeAgentDefinition("test-model") { Instructions = "Test" };
         definition.Tools.Add(functionTool);
 
         // Generate response with the declarative function
-        var definitionResponse = new PromptAgentDefinition("test-model") { Instructions = "Test" };
+        var definitionResponse = new DeclarativeAgentDefinition("test-model") { Instructions = "Test" };
         definitionResponse.Tools.Add(functionTool);
 
         using var testClient = CreateTestAgentClientWithHandler(agentName: "test-agent", agentDefinitionResponse: definitionResponse);
 
-        var options = new AgentVersionCreationOptions(definition);
+        var options = new ProjectsAgentVersionCreationOptions(definition);
 
         // Act
-        var agentVersion = (await testClient.Client.Agents.CreateAgentVersionAsync("test-agent", options)).Value;
+        var agentVersion = (await testClient.Client.AgentAdministrationClient.CreateAgentVersionAsync("test-agent", options)).Value;
         var agent = testClient.Client.AsAIAgent(agentVersion);
 
         // Assert
@@ -652,7 +652,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         using var testClient = CreateTestAgentClientWithHandler();
-        var definition = new PromptAgentDefinition("test-model") { Instructions = "Test" };
+        var definition = new DeclarativeAgentDefinition("test-model") { Instructions = "Test" };
 
         // Create a declarative function (not invocable) using AIFunctionFactory.CreateDeclaration
         using var doc = JsonDocument.Parse("{}");
@@ -661,10 +661,10 @@ public sealed class AzureAIProjectChatClientExtensionsTests
         // Add to definition
         definition.Tools.Add(declarativeFunction.AsOpenAIResponseTool() ?? throw new InvalidOperationException());
 
-        var options = new AgentVersionCreationOptions(definition);
+        var options = new ProjectsAgentVersionCreationOptions(definition);
 
         // Act
-        var agentVersion = (await testClient.Client.Agents.CreateAgentVersionAsync("test-agent", options)).Value;
+        var agentVersion = (await testClient.Client.AgentAdministrationClient.CreateAgentVersionAsync("test-agent", options)).Value;
         var agent = testClient.Client.AsAIAgent(agentVersion);
 
         // Assert
@@ -679,7 +679,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     public async Task AsAIAgent_WithDeclarativeFunctionInDefinition_AcceptsDeclarativeFunctionAsync()
     {
         // Arrange
-        var definition = new PromptAgentDefinition("test-model") { Instructions = "Test" };
+        var definition = new DeclarativeAgentDefinition("test-model") { Instructions = "Test" };
 
         // Create a declarative function (not invocable) using AIFunctionFactory.CreateDeclaration
         using var doc = JsonDocument.Parse("{}");
@@ -689,15 +689,15 @@ public sealed class AzureAIProjectChatClientExtensionsTests
         definition.Tools.Add(declarativeFunction.AsOpenAIResponseTool() ?? throw new InvalidOperationException());
 
         // Generate response with the declarative function
-        var definitionResponse = new PromptAgentDefinition("test-model") { Instructions = "Test" };
+        var definitionResponse = new DeclarativeAgentDefinition("test-model") { Instructions = "Test" };
         definitionResponse.Tools.Add(declarativeFunction.AsOpenAIResponseTool() ?? throw new InvalidOperationException());
 
         using var testClient = CreateTestAgentClientWithHandler(agentName: "test-agent", agentDefinitionResponse: definitionResponse);
 
-        var options = new AgentVersionCreationOptions(definition);
+        var options = new ProjectsAgentVersionCreationOptions(definition);
 
         // Act
-        var agentVersion = (await testClient.Client.Agents.CreateAgentVersionAsync("test-agent", options)).Value;
+        var agentVersion = (await testClient.Client.AgentAdministrationClient.CreateAgentVersionAsync("test-agent", options)).Value;
         var agent = testClient.Client.AsAIAgent(agentVersion);
 
         // Assert
@@ -758,7 +758,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
         int factoryCallCount = 0;
 
         // Act
@@ -785,7 +785,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
 
         // Act
         var agent1 = client.AsAIAgent(
@@ -904,7 +904,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
         // Arrange
         var aiProjectClient = new AIProjectClient(new Uri("https://test.openai.azure.com/"), new FakeAuthenticationTokenProvider(), new() { Transport = new HttpClientPipelineTransport(httpClient) });
 
-        var agentVersion = (await aiProjectClient.Agents.CreateAgentVersionAsync("test-agent", new AgentVersionCreationOptions(new PromptAgentDefinition("test-model") { Instructions = "Test instructions" }))).Value;
+        var agentVersion = (await aiProjectClient.AgentAdministrationClient.CreateAgentVersionAsync("test-agent", new ProjectsAgentVersionCreationOptions(new DeclarativeAgentDefinition("test-model") { Instructions = "Test instructions" }))).Value;
 
         // Act
         var agent = aiProjectClient.AsAIAgent(agentVersion);
@@ -1043,21 +1043,21 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
     #endregion
 
-    #region GetService<AgentRecord> Tests
+    #region GetService<ProjectsAgentRecord> Tests
 
     /// <summary>
-    /// Verify that GetService returns AgentRecord for agents created from AgentRecord.
+    /// Verify that GetService returns ProjectsAgentRecord for agents created from ProjectsAgentRecord.
     /// </summary>
     [Fact]
     public void GetService_WithAgentRecord_ReturnsAgentRecord()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
 
         // Act
         var agent = client.AsAIAgent(agentRecord);
-        var retrievedRecord = agent.GetService<AgentRecord>();
+        var retrievedRecord = agent.GetService<ProjectsAgentRecord>();
 
         // Assert
         Assert.NotNull(retrievedRecord);
@@ -1065,7 +1065,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that GetService returns null for AgentRecord when agent is created from AgentReference.
+    /// Verify that GetService returns null for ProjectsAgentRecord when agent is created from AgentReference.
     /// </summary>
     [Fact]
     public void GetService_WithAgentReference_ReturnsNullForAgentRecord()
@@ -1076,7 +1076,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
         // Act
         var agent = client.AsAIAgent(agentReference);
-        var retrievedRecord = agent.GetService<AgentRecord>();
+        var retrievedRecord = agent.GetService<ProjectsAgentRecord>();
 
         // Assert
         Assert.Null(retrievedRecord);
@@ -1084,21 +1084,21 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
     #endregion
 
-    #region GetService<AgentVersion> Tests
+    #region GetService<ProjectsAgentVersion> Tests
 
     /// <summary>
-    /// Verify that GetService returns AgentVersion for agents created from AgentVersion.
+    /// Verify that GetService returns ProjectsAgentVersion for agents created from ProjectsAgentVersion.
     /// </summary>
     [Fact]
     public void GetService_WithAgentVersion_ReturnsAgentVersion()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentVersion agentVersion = this.CreateTestAgentVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersion();
 
         // Act
         var agent = client.AsAIAgent(agentVersion);
-        var retrievedVersion = agent.GetService<AgentVersion>();
+        var retrievedVersion = agent.GetService<ProjectsAgentVersion>();
 
         // Assert
         Assert.NotNull(retrievedVersion);
@@ -1106,7 +1106,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that GetService returns null for AgentVersion when agent is created from AgentReference.
+    /// Verify that GetService returns null for ProjectsAgentVersion when agent is created from AgentReference.
     /// </summary>
     [Fact]
     public void GetService_WithAgentReference_ReturnsNullForAgentVersion()
@@ -1117,7 +1117,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
 
         // Act
         var agent = client.AsAIAgent(agentReference);
-        var retrievedVersion = agent.GetService<AgentVersion>();
+        var retrievedVersion = agent.GetService<ProjectsAgentVersion>();
 
         // Assert
         Assert.Null(retrievedVersion);
@@ -1128,14 +1128,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     #region ChatClientMetadata Tests
 
     /// <summary>
-    /// Verify that ChatClientMetadata is properly populated for agents created from AgentRecord.
+    /// Verify that ChatClientMetadata is properly populated for agents created from ProjectsAgentRecord.
     /// </summary>
     [Fact]
     public void ChatClientMetadata_WithAgentRecord_IsPopulatedCorrectly()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
 
         // Act
         var agent = client.AsAIAgent(agentRecord);
@@ -1147,18 +1147,18 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that ChatClientMetadata.DefaultModelId is set from PromptAgentDefinition model property.
+    /// Verify that ChatClientMetadata.DefaultModelId is set from DeclarativeAgentDefinition model property.
     /// </summary>
     [Fact]
-    public void ChatClientMetadata_WithPromptAgentDefinition_SetsDefaultModelIdFromModel()
+    public void ChatClientMetadata_WithDeclarativeAgentDefinition_SetsDefaultModelIdFromModel()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        var definition = new PromptAgentDefinition("gpt-4-turbo")
+        var definition = new DeclarativeAgentDefinition("gpt-4-turbo")
         {
             Instructions = "Test instructions"
         };
-        AgentRecord agentRecord = this.CreateTestAgentRecord(definition);
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord(definition);
 
         // Act
         var agent = client.AsAIAgent(agentRecord);
@@ -1172,14 +1172,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that ChatClientMetadata is properly populated for agents created from AgentVersion.
+    /// Verify that ChatClientMetadata is properly populated for agents created from ProjectsAgentVersion.
     /// </summary>
     [Fact]
     public void ChatClientMetadata_WithAgentVersion_IsPopulatedCorrectly()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentVersion agentVersion = this.CreateTestAgentVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersion();
 
         // Act
         var agent = client.AsAIAgent(agentVersion);
@@ -1188,7 +1188,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
         // Assert
         Assert.NotNull(metadata);
         Assert.NotNull(metadata.DefaultModelId);
-        Assert.Equal((agentVersion.Definition as PromptAgentDefinition)!.Model, metadata.DefaultModelId);
+        Assert.Equal((agentVersion.Definition as DeclarativeAgentDefinition)!.Model, metadata.DefaultModelId);
     }
 
     #endregion
@@ -1216,14 +1216,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that GetService returns null for AgentReference when agent is created from AgentRecord.
+    /// Verify that GetService returns null for AgentReference when agent is created from ProjectsAgentRecord.
     /// </summary>
     [Fact]
     public void GetService_WithAgentRecord_ReturnsAlsoAgentReference()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentRecord agentRecord = this.CreateTestAgentRecord();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecord();
 
         // Act
         var agent = client.AsAIAgent(agentRecord);
@@ -1235,14 +1235,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that GetService returns null for AgentReference when agent is created from AgentVersion.
+    /// Verify that GetService returns null for AgentReference when agent is created from ProjectsAgentVersion.
     /// </summary>
     [Fact]
     public void GetService_WithAgentVersion_ReturnsAlsoAgentReference()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentVersion agentVersion = this.CreateTestAgentVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersion();
 
         // Act
         var agent = client.AsAIAgent(agentVersion);
@@ -1278,14 +1278,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     #region Empty Version and ID Handling Tests
 
     /// <summary>
-    /// Verify that AsAIAgent with AgentRecord handles empty version by using "latest" as fallback.
+    /// Verify that AsAIAgent with ProjectsAgentRecord handles empty version by using "latest" as fallback.
     /// </summary>
     [Fact]
     public void AsAIAgent_WithAgentRecordEmptyVersion_CreatesAgentWithGeneratedId()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClientWithEmptyVersion();
-        AgentRecord agentRecord = this.CreateTestAgentRecordWithEmptyVersion();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecordWithEmptyVersion();
 
         // Act
         var agent = client.AsAIAgent(agentRecord);
@@ -1297,14 +1297,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that AsAIAgent with AgentVersion handles empty version by using "latest" as fallback.
+    /// Verify that AsAIAgent with ProjectsAgentVersion handles empty version by using "latest" as fallback.
     /// </summary>
     [Fact]
     public void AsAIAgent_WithAgentVersionEmptyVersion_CreatesAgentWithGeneratedId()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClientWithEmptyVersion();
-        AgentVersion agentVersion = this.CreateTestAgentVersionWithEmptyVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersionWithEmptyVersion();
 
         // Act
         var agent = client.AsAIAgent(agentVersion);
@@ -1316,14 +1316,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that AsAIAgent with AgentRecord handles whitespace-only version by using "latest" as fallback.
+    /// Verify that AsAIAgent with ProjectsAgentRecord handles whitespace-only version by using "latest" as fallback.
     /// </summary>
     [Fact]
     public void AsAIAgent_WithAgentRecordWhitespaceVersion_CreatesAgentWithGeneratedId()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClientWithWhitespaceVersion();
-        AgentRecord agentRecord = this.CreateTestAgentRecordWithWhitespaceVersion();
+        ProjectsAgentRecord agentRecord = this.CreateTestAgentRecordWithWhitespaceVersion();
 
         // Act
         var agent = client.AsAIAgent(agentRecord);
@@ -1335,14 +1335,14 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Verify that AsAIAgent with AgentVersion handles whitespace-only version by using "latest" as fallback.
+    /// Verify that AsAIAgent with ProjectsAgentVersion handles whitespace-only version by using "latest" as fallback.
     /// </summary>
     [Fact]
     public void AsAIAgent_WithAgentVersionWhitespaceVersion_CreatesAgentWithGeneratedId()
     {
         // Arrange
         AIProjectClient client = this.CreateTestAgentClientWithWhitespaceVersion();
-        AgentVersion agentVersion = this.CreateTestAgentVersionWithWhitespaceVersion();
+        ProjectsAgentVersion agentVersion = this.CreateTestAgentVersionWithWhitespaceVersion();
 
         // Act
         var agent = client.AsAIAgent(agentVersion);
@@ -1364,11 +1364,11 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     public void AsAIAgent_WithServerHostedTools_AddsToolsToAgentOptions()
     {
         // Arrange
-        PromptAgentDefinition definition = new("test-model") { Instructions = "Test" };
+        DeclarativeAgentDefinition definition = new("test-model") { Instructions = "Test" };
         definition.Tools.Add(new HostedWebSearchTool().GetService<ResponseTool>() ?? new HostedWebSearchTool().AsOpenAIResponseTool());
 
         AIProjectClient client = this.CreateTestAgentClient();
-        AgentVersion agentVersion = ModelReaderWriter.Read<AgentVersion>(BinaryData.FromString(TestDataUtil.GetAgentVersionResponseJson(agentDefinition: definition)))!;
+        ProjectsAgentVersion agentVersion = ModelReaderWriter.Read<ProjectsAgentVersion>(BinaryData.FromString(TestDataUtil.GetAgentVersionResponseJson(agentDefinition: definition)))!;
 
         // Act - no tools provided, but requireInvocableTools is false when no tools param is passed
         FoundryAgent agent = client.AsAIAgent(agentVersion);
@@ -1385,7 +1385,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     /// <summary>
     /// Creates a test AIProjectClient with fake behavior.
     /// </summary>
-    private FakeAgentClient CreateTestAgentClient(string? agentName = null, string? instructions = null, string? description = null, AgentDefinition? agentDefinitionResponse = null)
+    private FakeAgentClient CreateTestAgentClient(string? agentName = null, string? instructions = null, string? description = null, ProjectsAgentDefinition? agentDefinitionResponse = null)
     {
         return new FakeAgentClient(agentName, instructions, description, agentDefinitionResponse);
     }
@@ -1395,7 +1395,7 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     /// Used for tests that exercise the protocol-method code path (CreateAgentVersion).
     /// The returned client must be disposed to clean up the underlying HttpClient/handler.
     /// </summary>
-    private static DisposableTestClient CreateTestAgentClientWithHandler(string? agentName = null, string? instructions = null, string? description = null, AgentDefinition? agentDefinitionResponse = null)
+    private static DisposableTestClient CreateTestAgentClientWithHandler(string? agentName = null, string? instructions = null, string? description = null, ProjectsAgentDefinition? agentDefinitionResponse = null)
     {
         var responseJson = TestDataUtil.GetAgentVersionResponseJson(agentName, agentDefinitionResponse, instructions, description);
 
@@ -1439,59 +1439,59 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     }
 
     /// <summary>
-    /// Creates a test AgentRecord for testing.
+    /// Creates a test ProjectsAgentRecord for testing.
     /// </summary>
-    private AgentRecord CreateTestAgentRecord(AgentDefinition? agentDefinition = null)
+    private ProjectsAgentRecord CreateTestAgentRecord(ProjectsAgentDefinition? agentDefinition = null)
     {
-        return ModelReaderWriter.Read<AgentRecord>(BinaryData.FromString(TestDataUtil.GetAgentResponseJson(agentDefinition: agentDefinition)))!;
+        return ModelReaderWriter.Read<ProjectsAgentRecord>(BinaryData.FromString(TestDataUtil.GetAgentResponseJson(agentDefinition: agentDefinition)))!;
     }
 
     /// <summary>
     /// Creates a test AIProjectClient with empty version fields for testing hosted MCP agents.
     /// </summary>
-    private FakeAgentClient CreateTestAgentClientWithEmptyVersion(string? agentName = null, string? instructions = null, string? description = null, AgentDefinition? agentDefinitionResponse = null)
+    private FakeAgentClient CreateTestAgentClientWithEmptyVersion(string? agentName = null, string? instructions = null, string? description = null, ProjectsAgentDefinition? agentDefinitionResponse = null)
     {
         return new FakeAgentClient(agentName, instructions, description, agentDefinitionResponse, useEmptyVersion: true);
     }
 
     /// <summary>
-    /// Creates a test AgentRecord with empty version for testing hosted MCP agents.
+    /// Creates a test ProjectsAgentRecord with empty version for testing hosted MCP agents.
     /// </summary>
-    private AgentRecord CreateTestAgentRecordWithEmptyVersion(AgentDefinition? agentDefinition = null)
+    private ProjectsAgentRecord CreateTestAgentRecordWithEmptyVersion(ProjectsAgentDefinition? agentDefinition = null)
     {
-        return ModelReaderWriter.Read<AgentRecord>(BinaryData.FromString(TestDataUtil.GetAgentResponseJsonWithEmptyVersion(agentDefinition: agentDefinition)))!;
+        return ModelReaderWriter.Read<ProjectsAgentRecord>(BinaryData.FromString(TestDataUtil.GetAgentResponseJsonWithEmptyVersion(agentDefinition: agentDefinition)))!;
     }
 
     /// <summary>
-    /// Creates a test AgentVersion with empty version for testing hosted MCP agents.
+    /// Creates a test ProjectsAgentVersion with empty version for testing hosted MCP agents.
     /// </summary>
-    private AgentVersion CreateTestAgentVersionWithEmptyVersion()
+    private ProjectsAgentVersion CreateTestAgentVersionWithEmptyVersion()
     {
-        return ModelReaderWriter.Read<AgentVersion>(BinaryData.FromString(TestDataUtil.GetAgentVersionResponseJsonWithEmptyVersion()))!;
+        return ModelReaderWriter.Read<ProjectsAgentVersion>(BinaryData.FromString(TestDataUtil.GetAgentVersionResponseJsonWithEmptyVersion()))!;
     }
 
     /// <summary>
     /// Creates a test AIProjectClient with whitespace-only version fields for testing hosted MCP agents.
     /// </summary>
-    private FakeAgentClient CreateTestAgentClientWithWhitespaceVersion(string? agentName = null, string? instructions = null, string? description = null, AgentDefinition? agentDefinitionResponse = null)
+    private FakeAgentClient CreateTestAgentClientWithWhitespaceVersion(string? agentName = null, string? instructions = null, string? description = null, ProjectsAgentDefinition? agentDefinitionResponse = null)
     {
         return new FakeAgentClient(agentName, instructions, description, agentDefinitionResponse, versionMode: VersionMode.Whitespace);
     }
 
     /// <summary>
-    /// Creates a test AgentRecord with whitespace-only version for testing hosted MCP agents.
+    /// Creates a test ProjectsAgentRecord with whitespace-only version for testing hosted MCP agents.
     /// </summary>
-    private AgentRecord CreateTestAgentRecordWithWhitespaceVersion(AgentDefinition? agentDefinition = null)
+    private ProjectsAgentRecord CreateTestAgentRecordWithWhitespaceVersion(ProjectsAgentDefinition? agentDefinition = null)
     {
-        return ModelReaderWriter.Read<AgentRecord>(BinaryData.FromString(TestDataUtil.GetAgentResponseJsonWithWhitespaceVersion(agentDefinition: agentDefinition)))!;
+        return ModelReaderWriter.Read<ProjectsAgentRecord>(BinaryData.FromString(TestDataUtil.GetAgentResponseJsonWithWhitespaceVersion(agentDefinition: agentDefinition)))!;
     }
 
     /// <summary>
-    /// Creates a test AgentVersion with whitespace-only version for testing hosted MCP agents.
+    /// Creates a test ProjectsAgentVersion with whitespace-only version for testing hosted MCP agents.
     /// </summary>
-    private AgentVersion CreateTestAgentVersionWithWhitespaceVersion()
+    private ProjectsAgentVersion CreateTestAgentVersionWithWhitespaceVersion()
     {
-        return ModelReaderWriter.Read<AgentVersion>(BinaryData.FromString(TestDataUtil.GetAgentVersionResponseJsonWithWhitespaceVersion()))!;
+        return ModelReaderWriter.Read<ProjectsAgentVersion>(BinaryData.FromString(TestDataUtil.GetAgentVersionResponseJsonWithWhitespaceVersion()))!;
     }
 
     private const string OpenAPISpec = """
@@ -1525,11 +1525,11 @@ public sealed class AzureAIProjectChatClientExtensionsTests
         """;
 
     /// <summary>
-    /// Creates a test AgentVersion for testing.
+    /// Creates a test ProjectsAgentVersion for testing.
     /// </summary>
-    private AgentVersion CreateTestAgentVersion()
+    private ProjectsAgentVersion CreateTestAgentVersion()
     {
-        return ModelReaderWriter.Read<AgentVersion>(BinaryData.FromString(TestDataUtil.GetAgentVersionResponseJson()))!;
+        return ModelReaderWriter.Read<ProjectsAgentVersion>(BinaryData.FromString(TestDataUtil.GetAgentVersionResponseJson()))!;
     }
 
     /// <summary>
@@ -1547,11 +1547,11 @@ public sealed class AzureAIProjectChatClientExtensionsTests
     /// </summary>
     private sealed class FakeAgentClient : AIProjectClient
     {
-        public FakeAgentClient(string? agentName = null, string? instructions = null, string? description = null, AgentDefinition? agentDefinitionResponse = null, bool useEmptyVersion = false, VersionMode versionMode = VersionMode.Normal)
+        public FakeAgentClient(string? agentName = null, string? instructions = null, string? description = null, ProjectsAgentDefinition? agentDefinitionResponse = null, bool useEmptyVersion = false, VersionMode versionMode = VersionMode.Normal)
         {
             // Handle backward compatibility with bool parameter
             var effectiveVersionMode = useEmptyVersion ? VersionMode.Empty : versionMode;
-            this.Agents = new FakeAgentsClient(agentName, instructions, description, agentDefinitionResponse, effectiveVersionMode);
+            this.AgentAdministrationClient = new FakeAgentsClient(agentName, instructions, description, agentDefinitionResponse, effectiveVersionMode);
         }
 
         public override ClientConnection GetConnection(string connectionId)
@@ -1559,17 +1559,17 @@ public sealed class AzureAIProjectChatClientExtensionsTests
             return new ClientConnection("fake-connection-id", "http://localhost", ClientPipeline.Create(), CredentialKind.None);
         }
 
-        public override AgentsClient Agents { get; }
+        public override AgentAdministrationClient AgentAdministrationClient { get; }
 
-        private sealed class FakeAgentsClient : AgentsClient
+        private sealed class FakeAgentsClient : AgentAdministrationClient
         {
             private readonly string? _agentName;
             private readonly string? _instructions;
             private readonly string? _description;
-            private readonly AgentDefinition? _agentDefinition;
+            private readonly ProjectsAgentDefinition? _agentDefinition;
             private readonly VersionMode _versionMode;
 
-            public FakeAgentsClient(string? agentName = null, string? instructions = null, string? description = null, AgentDefinition? agentDefinitionResponse = null, VersionMode versionMode = VersionMode.Normal)
+            public FakeAgentsClient(string? agentName = null, string? instructions = null, string? description = null, ProjectsAgentDefinition? agentDefinitionResponse = null, VersionMode versionMode = VersionMode.Normal)
             {
                 this._agentName = agentName;
                 this._instructions = instructions;
@@ -1601,44 +1601,44 @@ public sealed class AzureAIProjectChatClientExtensionsTests
             public override ClientResult GetAgent(string agentName, RequestOptions options)
             {
                 var responseJson = this.GetAgentResponseJson();
-                return ClientResult.FromValue(ModelReaderWriter.Read<AgentRecord>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200, BinaryData.FromString(responseJson)));
+                return ClientResult.FromValue(ModelReaderWriter.Read<ProjectsAgentRecord>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200, BinaryData.FromString(responseJson)));
             }
 
-            public override ClientResult<AgentRecord> GetAgent(string agentName, CancellationToken cancellationToken = default)
+            public override ClientResult<ProjectsAgentRecord> GetAgent(string agentName, CancellationToken cancellationToken = default)
             {
                 var responseJson = this.GetAgentResponseJson();
-                return ClientResult.FromValue(ModelReaderWriter.Read<AgentRecord>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200));
+                return ClientResult.FromValue(ModelReaderWriter.Read<ProjectsAgentRecord>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200));
             }
 
             public override Task<ClientResult> GetAgentAsync(string agentName, RequestOptions options)
             {
                 var responseJson = this.GetAgentResponseJson();
-                return Task.FromResult<ClientResult>(ClientResult.FromValue(ModelReaderWriter.Read<AgentRecord>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200, BinaryData.FromString(responseJson))));
+                return Task.FromResult<ClientResult>(ClientResult.FromValue(ModelReaderWriter.Read<ProjectsAgentRecord>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200, BinaryData.FromString(responseJson))));
             }
 
-            public override Task<ClientResult<AgentRecord>> GetAgentAsync(string agentName, CancellationToken cancellationToken = default)
+            public override Task<ClientResult<ProjectsAgentRecord>> GetAgentAsync(string agentName, CancellationToken cancellationToken = default)
             {
                 var responseJson = this.GetAgentResponseJson();
-                return Task.FromResult(ClientResult.FromValue(ModelReaderWriter.Read<AgentRecord>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200)));
+                return Task.FromResult(ClientResult.FromValue(ModelReaderWriter.Read<ProjectsAgentRecord>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200)));
             }
 
-            public override ClientResult<AgentVersion> CreateAgentVersion(string agentName, AgentVersionCreationOptions? options = null, string? foundryFeatures = null, CancellationToken cancellationToken = default)
+            public override ClientResult<ProjectsAgentVersion> CreateAgentVersion(string agentName, ProjectsAgentVersionCreationOptions? options = null, string? foundryFeatures = null, CancellationToken cancellationToken = default)
             {
                 var responseJson = this.GetAgentVersionResponseJson();
-                return ClientResult.FromValue(ModelReaderWriter.Read<AgentVersion>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200));
+                return ClientResult.FromValue(ModelReaderWriter.Read<ProjectsAgentVersion>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200));
             }
 
-            public override Task<ClientResult<AgentVersion>> CreateAgentVersionAsync(string agentName, AgentVersionCreationOptions? options = null, string? foundryFeatures = null, CancellationToken cancellationToken = default)
+            public override Task<ClientResult<ProjectsAgentVersion>> CreateAgentVersionAsync(string agentName, ProjectsAgentVersionCreationOptions? options = null, string? foundryFeatures = null, CancellationToken cancellationToken = default)
             {
                 var responseJson = this.GetAgentVersionResponseJson();
-                return Task.FromResult(ClientResult.FromValue(ModelReaderWriter.Read<AgentVersion>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200)));
+                return Task.FromResult(ClientResult.FromValue(ModelReaderWriter.Read<ProjectsAgentVersion>(BinaryData.FromString(responseJson))!, new MockPipelineResponse(200)));
             }
         }
     }
 
-    private static PromptAgentDefinition GeneratePromptDefinitionResponse(PromptAgentDefinition inputDefinition, List<AITool>? tools)
+    private static DeclarativeAgentDefinition GeneratePromptDefinitionResponse(DeclarativeAgentDefinition inputDefinition, List<AITool>? tools)
     {
-        var definitionResponse = new PromptAgentDefinition(inputDefinition.Model) { Instructions = inputDefinition.Instructions };
+        var definitionResponse = new DeclarativeAgentDefinition(inputDefinition.Model) { Instructions = inputDefinition.Instructions };
         if (tools is not null)
         {
             foreach (var tool in tools)

dotnet/tests/Microsoft.Agents.AI.Foundry.UnitTests/TestDataUtil.cs

@@ -29,7 +29,7 @@ internal static class TestDataUtil
     /// <summary>
     /// Gets the agent response JSON with optional placeholder replacements applied.
     /// </summary>
-    public static string GetAgentResponseJson(string? agentName = null, AgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
+    public static string GetAgentResponseJson(string? agentName = null, ProjectsAgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
     {
         var json = s_agentResponseJson;
         json = ApplyAgentName(json, agentName);
@@ -42,7 +42,7 @@ internal static class TestDataUtil
     /// <summary>
     /// Gets the agent version response JSON with optional placeholder replacements applied.
     /// </summary>
-    public static string GetAgentVersionResponseJson(string? agentName = null, AgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
+    public static string GetAgentVersionResponseJson(string? agentName = null, ProjectsAgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
     {
         var json = s_agentVersionResponseJson;
         json = ApplyAgentName(json, agentName);
@@ -55,7 +55,7 @@ internal static class TestDataUtil
     /// <summary>
     /// Gets the agent version response JSON with empty version and ID fields for testing hosted agents like MCP agents.
     /// </summary>
-    public static string GetAgentVersionResponseJsonWithEmptyVersion(string? agentName = null, AgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
+    public static string GetAgentVersionResponseJsonWithEmptyVersion(string? agentName = null, ProjectsAgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
     {
         var json = s_agentVersionResponseJson;
         json = ApplyAgentName(json, agentName);
@@ -71,7 +71,7 @@ internal static class TestDataUtil
     /// <summary>
     /// Gets the agent response JSON with empty version and ID fields in the latest version for testing hosted agents like MCP agents.
     /// </summary>
-    public static string GetAgentResponseJsonWithEmptyVersion(string? agentName = null, AgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
+    public static string GetAgentResponseJsonWithEmptyVersion(string? agentName = null, ProjectsAgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
     {
         var json = s_agentResponseJson;
         json = ApplyAgentName(json, agentName);
@@ -87,7 +87,7 @@ internal static class TestDataUtil
     /// <summary>
     /// Gets the agent version response JSON with whitespace-only version and ID fields for testing hosted agents like MCP agents.
     /// </summary>
-    public static string GetAgentVersionResponseJsonWithWhitespaceVersion(string? agentName = null, AgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
+    public static string GetAgentVersionResponseJsonWithWhitespaceVersion(string? agentName = null, ProjectsAgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
     {
         var json = s_agentVersionResponseJson;
         json = ApplyAgentName(json, agentName);
@@ -103,7 +103,7 @@ internal static class TestDataUtil
     /// <summary>
     /// Gets the agent response JSON with whitespace-only version and ID fields in the latest version for testing hosted agents like MCP agents.
     /// </summary>
-    public static string GetAgentResponseJsonWithWhitespaceVersion(string? agentName = null, AgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
+    public static string GetAgentResponseJsonWithWhitespaceVersion(string? agentName = null, ProjectsAgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
     {
         var json = s_agentResponseJson;
         json = ApplyAgentName(json, agentName);
@@ -119,7 +119,7 @@ internal static class TestDataUtil
     /// <summary>
     /// Gets the OpenAI default response JSON with optional placeholder replacements applied.
     /// </summary>
-    public static string GetOpenAIDefaultResponseJson(string? agentName = null, AgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
+    public static string GetOpenAIDefaultResponseJson(string? agentName = null, ProjectsAgentDefinition? agentDefinition = null, string? instructions = null, string? description = null)
     {
         var json = s_openAIDefaultResponseJson;
         json = ApplyAgentName(json, agentName);
@@ -138,7 +138,7 @@ internal static class TestDataUtil
         return json;
     }
 
-    private static string ApplyAgentDefinition(string json, AgentDefinition? definition)
+    private static string ApplyAgentDefinition(string json, ProjectsAgentDefinition? definition)
     {
         return (definition is not null)
             ? json.Replace(AgentDefinitionPlaceholder, ModelReaderWriter.Write(definition).ToString())

dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests/Agents/AgentProvider.cs

@@ -35,13 +35,13 @@ internal abstract class AgentProvider(IConfiguration configuration)
     {
         Uri foundryEndpoint = new(this.GetSetting(TestSettings.AzureAIProjectEndpoint));
 
-        await foreach (AgentVersion agent in this.CreateAgentsAsync(foundryEndpoint))
+        await foreach (ProjectsAgentVersion agent in this.CreateAgentsAsync(foundryEndpoint))
         {
             Console.WriteLine($"Created agent: {agent.Name}:{agent.Version}");
         }
     }
 
-    protected abstract IAsyncEnumerable<AgentVersion> CreateAgentsAsync(Uri foundryEndpoint);
+    protected abstract IAsyncEnumerable<ProjectsAgentVersion> CreateAgentsAsync(Uri foundryEndpoint);
 
     protected string GetSetting(string settingName) =>
         configuration[settingName] ??

dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests/Agents/FunctionToolAgentProvider.cs

@@ -14,7 +14,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Agents;
 
 internal sealed class FunctionToolAgentProvider(IConfiguration configuration) : AgentProvider(configuration)
 {
-    protected override async IAsyncEnumerable<AgentVersion> CreateAgentsAsync(Uri foundryEndpoint)
+    protected override async IAsyncEnumerable<ProjectsAgentVersion> CreateAgentsAsync(Uri foundryEndpoint)
     {
         MenuPlugin menuPlugin = new();
         AIFunction[] functions =
@@ -33,9 +33,9 @@ internal sealed class FunctionToolAgentProvider(IConfiguration configuration) :
                 agentDescription: "Provides information about the restaurant menu");
     }
 
-    private PromptAgentDefinition DefineMenuAgent(AIFunction[] functions)
+    private DeclarativeAgentDefinition DefineMenuAgent(AIFunction[] functions)
     {
-        PromptAgentDefinition agentDefinition =
+        DeclarativeAgentDefinition agentDefinition =
             new(this.GetSetting(TestSettings.AzureAIModelDeploymentName))
             {
                 Instructions =

dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests/Agents/MarketingAgentProvider.cs

@@ -12,7 +12,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Agents;
 
 internal sealed class MarketingAgentProvider(IConfiguration configuration) : AgentProvider(configuration)
 {
-    protected override async IAsyncEnumerable<AgentVersion> CreateAgentsAsync(Uri foundryEndpoint)
+    protected override async IAsyncEnumerable<ProjectsAgentVersion> CreateAgentsAsync(Uri foundryEndpoint)
     {
         AIProjectClient aiProjectClient = new(foundryEndpoint, TestAzureCliCredentials.CreateAzureCliCredential());
 
@@ -35,7 +35,7 @@ internal sealed class MarketingAgentProvider(IConfiguration configuration) : Age
                 agentDescription: "Editor agent for Marketing workflow");
     }
 
-    private PromptAgentDefinition DefineAnalystAgent() =>
+    private DeclarativeAgentDefinition DefineAnalystAgent() =>
         new(this.GetSetting(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions =
@@ -47,13 +47,13 @@ internal sealed class MarketingAgentProvider(IConfiguration configuration) : Age
                 """,
             Tools =
             {
-                //AgentTool.CreateBingGroundingTool( // TODO: Use Bing Grounding when available
+                //ProjectsAgentTool.CreateBingGroundingTool( // TODO: Use Bing Grounding when available
                 //    new BingGroundingSearchToolParameters(
                 //        [new BingGroundingSearchConfiguration(this.GetSetting(Settings.FoundryGroundingTool))]))
             }
         };
 
-    private PromptAgentDefinition DefineWriterAgent() =>
+    private DeclarativeAgentDefinition DefineWriterAgent() =>
         new(this.GetSetting(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions =
@@ -64,7 +64,7 @@ internal sealed class MarketingAgentProvider(IConfiguration configuration) : Age
                 """
         };
 
-    private PromptAgentDefinition DefineEditorAgent() =>
+    private DeclarativeAgentDefinition DefineEditorAgent() =>
         new(this.GetSetting(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions =

dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests/Agents/MathChatAgentProvider.cs

@@ -12,7 +12,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Agents;
 
 internal sealed class MathChatAgentProvider(IConfiguration configuration) : AgentProvider(configuration)
 {
-    protected override async IAsyncEnumerable<AgentVersion> CreateAgentsAsync(Uri foundryEndpoint)
+    protected override async IAsyncEnumerable<ProjectsAgentVersion> CreateAgentsAsync(Uri foundryEndpoint)
     {
         AIProjectClient aiProjectClient = new(foundryEndpoint, TestAzureCliCredentials.CreateAzureCliCredential());
 
@@ -29,7 +29,7 @@ internal sealed class MathChatAgentProvider(IConfiguration configuration) : Agen
                 agentDescription: "Teacher agent for MathChat workflow");
     }
 
-    private PromptAgentDefinition DefineStudentAgent() =>
+    private DeclarativeAgentDefinition DefineStudentAgent() =>
         new(this.GetSetting(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions =
@@ -41,7 +41,7 @@ internal sealed class MathChatAgentProvider(IConfiguration configuration) : Agen
                 """
         };
 
-    private PromptAgentDefinition DefineTeacherAgent() =>
+    private DeclarativeAgentDefinition DefineTeacherAgent() =>
         new(this.GetSetting(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions =

dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests/Agents/PoemAgentProvider.cs

@@ -12,7 +12,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Agents;
 
 internal sealed class PoemAgentProvider(IConfiguration configuration) : AgentProvider(configuration)
 {
-    protected override async IAsyncEnumerable<AgentVersion> CreateAgentsAsync(Uri foundryEndpoint)
+    protected override async IAsyncEnumerable<ProjectsAgentVersion> CreateAgentsAsync(Uri foundryEndpoint)
     {
         AIProjectClient aiProjectClient = new(foundryEndpoint, TestAzureCliCredentials.CreateAzureCliCredential());
 
@@ -23,7 +23,7 @@ internal sealed class PoemAgentProvider(IConfiguration configuration) : AgentPro
                 agentDescription: "Authors original poems");
     }
 
-    private PromptAgentDefinition DefinePoemAgent() =>
+    private DeclarativeAgentDefinition DefinePoemAgent() =>
         new(this.GetSetting(TestSettings.AzureAIModelDeploymentName))
         {
             Instructions =