Added AI Search example

Merge branch 'main' into feature-python-foundry-agents
Addressed PR feedback
2026-06-16 21:04:09 +08:00 · 2025-11-12 13:59:31 -08:00 · 2025-11-12 12:59:17 -08:00 · 2025-11-12 12:48:23 -08:00 · 2025-11-12 11:54:40 -08:00 · 2025-11-12 10:40:35 -08:00
1541 changed files with 13892 additions and 91980 deletions
@@ -1,11 +1,10 @@
 {
  "name": "C# (.NET)",
-  "image": "mcr.microsoft.com/devcontainers/dotnet:10.0",
+  "image": "mcr.microsoft.com/devcontainers/dotnet:9.0",
  "features": {
    "ghcr.io/devcontainers/features/dotnet:2.4.0": {},
    "ghcr.io/devcontainers/features/powershell:1.5.1": {},
-    "ghcr.io/devcontainers/features/azure-cli:1.2.8": {},
-    "ghcr.io/devcontainers/features/docker-in-docker:2.12.4": {}
+    "ghcr.io/devcontainers/features/azure-cli:1.2.8": {}
  },
  "workspaceFolder": "/workspaces/agent-framework/dotnet/",
  "customizations": {
@@ -1,4 +0,0 @@
-# Code ownership assignments
-# https://docs.github.com/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-
-python/packages/azurefunctions/ @microsoft/agentframework-durabletask-developers
@@ -1,36 +0,0 @@
-name: Azure Functions Integration Test Setup
-description: Prepare local emulators and tools for Azure Functions integration tests
-
-runs:
-    using: "composite"
-    steps:
-      - name: Start Durable Task Scheduler Emulator
-        shell: bash
-        run: |
-          if [ "$(docker ps -aq -f name=dts-emulator)" ]; then
-            echo "Stopping and removing existing Durable Task Scheduler Emulator"
-            docker rm -f dts-emulator
-          fi
-          echo "Starting Durable Task Scheduler Emulator"
-          docker run -d --name dts-emulator -p 8080:8080 -p 8082:8082 mcr.microsoft.com/dts/dts-emulator:latest
-          echo "Waiting for Durable Task Scheduler Emulator to be ready"
-          timeout 30 bash -c 'until curl --silent http://localhost:8080/healthz; do sleep 1; done'
-          echo "Durable Task Scheduler Emulator is ready"
-      - name: Start Azurite (Azure Storage emulator)
-        shell: bash
-        run: |
-          if [ "$(docker ps -aq -f name=azurite)" ]; then
-            echo "Stopping and removing existing Azurite (Azure Storage emulator)"
-            docker rm -f azurite
-          fi
-          echo "Starting Azurite (Azure Storage emulator)"
-          docker run -d --name azurite -p 10000:10000 -p 10001:10001 -p 10002:10002 mcr.microsoft.com/azure-storage/azurite
-          echo "Waiting for Azurite (Azure Storage emulator) to be ready"
-          timeout 30 bash -c 'until curl --silent http://localhost:10000/devstoreaccount1; do sleep 1; done'
-          echo "Azurite (Azure Storage emulator) is ready"
-      - name: Install Azure Functions Core Tools
-        shell: bash
-        run: |
-          echo "Installing Azure Functions Core Tools"
-          npm install -g azure-functions-core-tools@4 --unsafe-perm true
-          func --version
@@ -11,6 +11,9 @@ updates:
    schedule:
      interval: "cron"
      cronjob: "0 8 * * 4,0" # Every Thursday(4) and Sunday(0) at 8:00 UTC
+    experimental:
+      nuget-native-updater: false
+      enable-cooldown-metrics-collection: false
    ignore:
      # For all System.* and Microsoft.Extensions/Bcl.* packages, ignore all major version updates
      - dependency-name: "System.*"
@@ -25,14 +28,6 @@ updates:
      - "dependencies"

  # Maintain dependencies for python
-  - package-ecosystem: "pip"
-    directory: "python/"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-    labels:
-      - "python"
-      - "dependencies"
  - package-ecosystem: "uv"
    directory: "python/"
    schedule:
@@ -1,17 +0,0 @@
---
-applyTo: "dotnet/src/Microsoft.Agents.AI.DurableTask/**,dotnet/src/Microsoft.Agents.AI.Hosting.AzureFunctions/**"
---
-
-# Durable Task area code instructions
-
-The following guidelines apply to pull requests that modify files under
-`dotnet/src/Microsoft.Agents.AI.DurableTask/**` or
-`dotnet/src/Microsoft.Agents.AI.Hosting.AzureFunctions/**`:
-
-## CHANGELOG.md
-
- Each pull request that modifies code should add just one bulleted entry to the `CHANGELOG.md` file containing a change title (usually the PR title) and a link to the PR itself.
- New PRs should be added to the top of the `CHANGELOG.md` file under a "## [Unreleased]" heading.
- If the PR is the first since the last release, the existing "## [Unreleased]" heading should be replaced with a "## v[X.Y.Z]" heading and the PRs since the last release should be added to the new "## [Unreleased]" heading.
- The style of new `CHANGELOG.md` entries should match the style of the other entries in the file.
- If the PR introduces a breaking change, the changelog entry should be prefixed with "[BREAKING]".
@@ -1636,4 +1636,4 @@ The property mapping guide from a `AutoFunctionInvocationContext` to a `Function
 | Result | Use `return` from the delegate |
 | Terminate | Terminate |
 | CancellationToken | provided via argument to middleware delegate |
-| Arguments | Arguments |
+| Arguments | Arguments |
@@ -18,7 +18,6 @@ on:

 env:
  COVERAGE_THRESHOLD: 80
-  COVERAGE_FRAMEWORK: net10.0 # framework target for which we run/report code coverage

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -60,9 +59,9 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - { targetFramework: "net10.0", os: "ubuntu-latest", configuration: Release, integration-tests: true, environment: "integration" }
-          - { targetFramework: "net9.0", os: "windows-latest", configuration: Debug }
-          - { targetFramework: "net8.0", os: "ubuntu-latest", configuration: Release }
+          - { targetFramework: "net9.0", os: "ubuntu-latest", configuration: Release, integration-tests: true, environment: "integration" }
+          - { targetFramework: "net9.0", os: "ubuntu-latest", configuration: Debug }
+          - { targetFramework: "net9.0", os: "windows-latest", configuration: Release }
          - { targetFramework: "net472", os: "windows-latest", configuration: Release, integration-tests: true, environment: "integration" }

    runs-on: ${{ matrix.os }}
@@ -70,16 +69,16 @@ jobs:
    steps:
      - uses: actions/checkout@v5
        with:
-            persist-credentials: false
-            sparse-checkout: |
-              .
-              .github
-              dotnet
-              python
-              workflow-samples
+          persist-credentials: false
+          sparse-checkout: |
+            .
+            .github
+            dotnet
+            python
+            workflow-samples

      - name: Setup dotnet
-        uses: actions/setup-dotnet@v5.0.1
+        uses: actions/setup-dotnet@v5.0.0
        with:
          global-json-file: ${{ github.workspace }}/dotnet/global.json
      - name: Build dotnet solutions
@@ -124,17 +123,7 @@ jobs:
          popd
          rm -rf "$TEMP_DIR"

-      # Start Cosmos DB Emulator for Cosmos-based unit tests (only on Windows)
-      - name: Start Azure Cosmos DB Emulator
-        if: runner.os == 'Windows'
-        shell: pwsh
-        run: |
-          Write-Host "Launching Azure Cosmos DB Emulator"
-          Import-Module "$env:ProgramFiles\Azure Cosmos DB Emulator\PSModules\Microsoft.Azure.CosmosDB.Emulator"
-          Start-CosmosDbEmulator -NoUI -Key "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
-          echo "COSMOS_EMULATOR_AVAILABLE=true" >> $env:GITHUB_ENV
-
-      - name: Run Unit Tests
+      - name: Run Unit Tests Windows
        shell: bash
        run: |
          export UT_PROJECTS=$(find ./dotnet -type f -name "*.UnitTests.csproj" | tr '\n' ' ')
@@ -144,20 +133,12 @@ jobs:
            
            # Check if the project supports the target framework
            if [[ "$target_frameworks" == *"${{ matrix.targetFramework }}"* ]]; then
-              if [[ "${{ matrix.targetFramework }}" == "${{ env.COVERAGE_FRAMEWORK }}" ]]; then
-                dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx --collect:"XPlat Code Coverage" --results-directory:"TestResults/Coverage/" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ExcludeByAttribute=GeneratedCodeAttribute,CompilerGeneratedAttribute,ExcludeFromCodeCoverageAttribute
-              else
-                dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx
-              fi
+              dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx --collect:"XPlat Code Coverage" --results-directory:"TestResults/Coverage/" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ExcludeByAttribute=GeneratedCodeAttribute,CompilerGeneratedAttribute,ExcludeFromCodeCoverageAttribute
            else
              echo "Skipping $project - does not support target framework ${{ matrix.targetFramework }} (supports: $target_frameworks)"
            fi
          done
-        env:
-          # Cosmos DB Emulator connection settings
-          COSMOSDB_ENDPOINT: https://localhost:8081
-          COSMOSDB_KEY: C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
-
+      
      - name: Log event name and matrix integration-tests
        shell: bash 
        run: echo "github.event_name:${{ github.event_name }} matrix.integration-tests:${{ matrix.integration-tests }} github.event.action:${{ github.event.action }} github.event.pull_request.merged:${{ github.event.pull_request.merged }}" 
@@ -170,14 +151,6 @@ jobs:
          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

-        # This setup action is required for both Durable Task and Azure Functions integration tests.
-        # We only run it on Ubuntu since the Durable Task and Azure Functions features are not available
-        # on .NET Framework (net472) which is what we use the Windows runner for.
-      - name: Set up Durable Task and Azure Functions Integration Test Emulators
-        if: github.event_name != 'pull_request' && matrix.integration-tests && matrix.os == 'ubuntu-latest'
-        uses: ./.github/actions/azure-functions-integration-setup
-        id: azure-functions-setup
-
      - name: Run Integration Tests
        shell: bash
        if: github.event_name != 'pull_request' && matrix.integration-tests
@@ -195,16 +168,10 @@ jobs:
            fi
          done
        env:
-          # Cosmos DB Emulator connection settings
-          COSMOSDB_ENDPOINT: https://localhost:8081
-          COSMOSDB_KEY: C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
          # OpenAI Models
          OpenAI__ApiKey: ${{ secrets.OPENAI__APIKEY }}
          OpenAI__ChatModelId: ${{ vars.OPENAI__CHATMODELID }}
          OpenAI__ChatReasoningModelId: ${{ vars.OPENAI__CHATREASONINGMODELID }}
-          # Azure OpenAI Models
-          AZURE_OPENAI_CHAT_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
-          AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
          # Azure AI Foundry
          AzureAI__Endpoint: ${{ secrets.AZUREAI__ENDPOINT }}
          AzureAI__DeploymentName: ${{ vars.AZUREAI__DEPLOYMENTNAME }}
@@ -216,22 +183,19 @@ jobs:

      # Generate test reports and check coverage
      - name: Generate test reports
-        if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
-        uses: danielpalme/ReportGenerator-GitHub-Action@5.5.1
+        uses: danielpalme/ReportGenerator-GitHub-Action@5.4.18
        with:
          reports: "./TestResults/Coverage/**/coverage.cobertura.xml"
          targetdir: "./TestResults/Reports"
          reporttypes: "HtmlInline;JsonSummary"

      - name: Upload coverage report artifact
-        if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
        uses: actions/upload-artifact@v5
        with:
          name: CoverageReport-${{ matrix.os }}-${{ matrix.targetFramework }}-${{ matrix.configuration }} # Artifact name
          path: ./TestResults/Reports # Directory containing files to upload

      - name: Check coverage
-        if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
        shell: pwsh
        run: .github/workflows/dotnet-check-coverage.ps1 -JsonReportPath "TestResults/Reports/Summary.json" -CoverageThreshold $env:COVERAGE_THRESHOLD

@@ -22,7 +22,7 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - { dotnet: "10.0", configuration: Release, os: ubuntu-latest }
+          - { dotnet: "9.0", configuration: Release, os: ubuntu-latest }

    runs-on: ${{ matrix.os }}
    env:
@@ -28,8 +28,6 @@ jobs:
      UV_PYTHON: ${{ matrix.python-version }}
    steps:
      - uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
      - name: Set up python and install the project
        id: python-setup
        uses: ./.github/actions/python-setup
@@ -48,6 +46,4 @@ jobs:
        with:
          extra_args: --config python/.pre-commit-config.yaml --all-files
      - name: Run Mypy
-        env:
-          GITHUB_BASE_REF: ${{ github.event.pull_request.base.ref || github.base_ref || 'main' }}
-        run: uv run poe ci-mypy
+        run: uv run poe mypy
@@ -66,11 +66,6 @@ jobs:
      AZURE_OPENAI_RESPONSES_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
      AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
      LOCAL_MCP_URL: ${{ vars.LOCAL_MCP__URL }}
-      # For Azure Functions integration tests
-      FUNCTIONS_WORKER_RUNTIME: "python"
-      DURABLE_TASK_SCHEDULER_CONNECTION_STRING: "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None"
-      AzureWebJobsStorage: "UseDevelopmentStorage=true"
-
    defaults:
      run:
        working-directory: python
@@ -92,9 +87,6 @@ jobs:
          client-id: ${{ secrets.AZURE_CLIENT_ID }}
          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      - name: Set up Azure Functions Integration Test Emulators
-        uses: ./.github/actions/azure-functions-integration-setup
-        id: azure-functions-setup
      - name: Test with pytest
        timeout-minutes: 10
        run: uv run poe all-tests -n logical --dist loadfile --dist worksteal --timeout 300 --retries 3 --retry-delay 10
@@ -204,20 +204,6 @@ agents.md
 # AI
 .claude/
 WARP.md
-**/memory-bank/
-**/projectBrief.md
-
-# Azurite storage emulator files
-*/__azurite_db_blob__.json
-*/__azurite_db_blob_extent__.json
-*/__azurite_db_queue__.json
-*/__azurite_db_queue_extent__.json
-*/__azurite_db_table__.json
-*/__blobstorage__/
-*/__queuestorage__/
-
-# Azure Functions local settings
-local.settings.json

 # Frontend
 **/frontend/node_modules/
@@ -225,4 +211,4 @@ local.settings.json
 **/frontend/dist/

 # Database files
-*.db
+*.db
@@ -48,8 +48,6 @@ dotnet add package Microsoft.Agents.AI
 - **[Migration from Semantic Kernel](https://learn.microsoft.com/en-us/agent-framework/migration-guide/from-semantic-kernel)** - Guide to migrate from Semantic Kernel
 - **[Migration from AutoGen](https://learn.microsoft.com/en-us/agent-framework/migration-guide/from-autogen)** - Guide to migrate from AutoGen

-Still have questions? Join our [weekly office hours](./COMMUNITY.md#public-community-office-hours) or ask questions in our [Discord channel](https://discord.gg/b5zjErwbQM) to get help from the team and other users.
-
 ### ✨ **Highlights**

 - **Graph-based Workflows**: Connect agents and deterministic functions using data flows with streaming, checkpointing, human-in-the-loop, and time-travel capabilities
@@ -42,9 +42,9 @@ Microsoft Agent Framework relies on existing LLMs. Using the framework retains c

 **Framework-Specific Limitations**:

- **Platform Requirements**: Python 3.10+ required, specific .NET versions (.NET 8.0, 9.0, 10.0, netstandard2.0, net472)
+- **Platform Requirements**: Python 3.10+ required, specific .NET versions (.NET 8.0, 9.0, netstandard2.0, net472)
 - **API Dependencies**: Requires proper configuration of LLM provider keys and endpoints
- **Orchestration Features**: Advanced orchestration patterns including GroupChat, Sequential, and Concurrent workflows are now available in both Python and .NET implementations. See the respective language documentation for examples.
+- **Orchestration Features**: Advanced orchestration patterns like GroupChat, Sequential, and Concurrent orchestrations are "coming soon" for Python implementation
 - **Privacy and Data Protection**: The framework allows for human participation in conversations between agents. It is important to ensure that user data and conversations are protected and that developers use appropriate measures to safeguard privacy.
 - **Accountability and Transparency**: The framework involves multiple agents conversing and collaborating, it is important to establish clear accountability and transparency mechanisms. Users should be able to understand and trace the decision-making process of the agents involved in order to ensure accountability and address any potential issues or biases.
 - **Security & unintended consequences**: The use of multi-agent conversations and automation in complex tasks may have unintended consequences. Especially, allowing agents to make changes in external environments through tool calls or function execution could pose significant risks. Developers should carefully consider the potential risks and ensure that appropriate safeguards are in place to prevent harm or negative outcomes, including keeping a human in the loop for decision making.
@@ -1,3 +0,0 @@
-# Declarative Agents
-
-This folder contains sample agent definitions than be ran using the declarative agent support, for python see the [declarative agent python sample folder](../python/samples/getting_started/declarative/).
@@ -1,25 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions is the language specified by the user. You return your answers in a JSON format. You must include Chat as the type in your response.
-model:
-    id: =Env.AZURE_OPENAI_DEPLOYMENT_NAME
-    provider: AzureOpenAI
-    apiType: Chat
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            kind: string
-            required: true
-            description: The language of the answer.
-        answer:
-            kind: string
-            required: true
-            description: The answer text.
-        type:
-            kind: string
-            required: true
-            description: The type of the response.
@@ -1,25 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Assistants as the type in your response.
-model:
-    id: gpt-4o-mini
-    provider: AzureOpenAI
-    apiType: Assistants
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.
@@ -1,25 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Chat as the type in your response.
-model:
-    id: gpt-4o-mini
-    provider: AzureOpenAI
-    apiType: Chat
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.
@@ -1,25 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Responses as the type in your response.
-model:
-    id: gpt-4o-mini
-    provider: AzureOpenAI
-    apiType: Responses
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.
@@ -1,18 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format.
-model:
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
@@ -1,29 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions using the tools provided.
-model:
-    options:
-        temperature: 0.9
-        topP: 0.95
-        allowMultipleToolCalls: true
-        chatToolMode: auto
-tools:
-  - kind: function
-    name: GetWeather
-    description: Get the weather for a given location.
-    bindings:
-      get_weather: get_weather
-    parameters:
-      properties:
-        location:
-          kind: string
-          description: The city and state, e.g. San Francisco, CA
-          required: true
-        unit:
-          kind: string
-          description: The unit of temperature. Possible values are 'celsius' and 'fahrenheit'.
-          required: false
-          enum:
-            - celsius
-            - fahrenheit
@@ -1,22 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format.
-model:
-    id: gpt-4.1-mini
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: Remote
-        endpoint: =Env.AZURE_FOUNDRY_PROJECT_ENDPOINT
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
@@ -1,21 +0,0 @@
-kind: Prompt
-name: MicrosoftLearnAgent
-description: Microsoft Learn Agent
-instructions: You answer questions by searching the Microsoft Learn content only.
-model:
-    id: =Env.AZURE_FOUNDRY_PROJECT_MODEL_ID
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: remote
-        endpoint: =Env.AZURE_FOUNDRY_PROJECT_ENDPOINT
-tools:
-  - kind: mcp
-    name: microsoft_learn
-    description: Get information from Microsoft Learn.
-    url: https://learn.microsoft.com/api/mcp
-    approvalMode:
-      kind: never
-    allowedTools:
-      - microsoft_docs_search
@@ -1,22 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions is the language specified by the user. You return your answers in a JSON format.
-model:
-    id: =Env.AZURE_FOUNDRY_PROJECT_MODEL_ID
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: remote
-        endpoint: =Env.AZURE_FOUNDRY_PROJECT_ENDPOINT
-outputSchema:
-    properties:
-        language:
-            kind: string
-            required: true
-            description: The language of the answer.
-        answer:
-            kind: string
-            required: true
-            description: The answer text.
@@ -1,28 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions is the language specified by the user. You return your answers in a JSON format. You must include Chat as the type in your response.
-model:
-    id: =Env.OPENAI_MODEL
-    provider: OpenAI
-    apiType: Chat
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: key
-        key: =Env.OPENAI_API_KEY
-outputSchema:
-    properties:
-        language:
-            kind: string
-            required: true
-            description: The language of the answer.
-        answer:
-            kind: string
-            required: true
-            description: The answer text.
-        type:
-            kind: string
-            required: true
-            description: The type of the response.
@@ -1,28 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Assistants as the type in your response.
-model:
-    id: gpt-4.1-mini
-    provider: OpenAI
-    apiType: Assistants
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: ApiKey
-        key: =Env.OPENAI_APIKEY
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.
@@ -1,28 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Chat as the type in your response.
-model:
-    id: gpt-4.1-mini
-    provider: OpenAI
-    apiType: Chat
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: ApiKey
-        key: =Env.OPENAI_APIKEY
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.
@@ -1,28 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Responses as the type in your response.
-model:
-    id: gpt-4.1-mini
-    provider: OpenAI
-    apiType: Responses
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: ApiKey
-        key: =Env.OPENAI_APIKEY
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.
@@ -6,12 +6,14 @@
    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
    <AnalysisLevel>latest</AnalysisLevel>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>13</LangVersion>
    <Nullable>enable</Nullable>
-    <NoWarn>$(NoWarn);NU5128;CS8002</NoWarn>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <TargetFrameworksCore>net10.0;net9.0;net8.0</TargetFrameworksCore>
-    <TargetFrameworks>$(TargetFrameworksCore);netstandard2.0;net472</TargetFrameworks>
+    <ProjectsCoreTargetFrameworks>net9.0;net8.0</ProjectsCoreTargetFrameworks>
+    <ProjectsDebugCoreTargetFrameworks>net9.0</ProjectsDebugCoreTargetFrameworks>
+    <ProjectsTargetFrameworks>net9.0;net8.0;netstandard2.0;net472</ProjectsTargetFrameworks>
+    <ProjectsDebugTargetFrameworks>net9.0;net472</ProjectsDebugTargetFrameworks>
    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
    <Configurations>Debug;Release;Publish</Configurations>
  </PropertyGroup>
@@ -5,7 +5,7 @@
  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.1.3" />
  <!-- Only run 'dotnet format' on dev machines, Release builds. Skip on GitHub Actions -->
  <!-- as this runs in its own Actions job. -->
-  <Target Name="DotnetFormatOnBuild" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Release' AND '$(GITHUB_ACTIONS)' == '' ">
+  <Target Name="DotnetFormatOnBuild" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Release' AND '$(GITHUB_ACTIONS)' == '' AND '$(TargetFramework)' == '$(ProjectsDebugTargetFrameworks)'">
    <Message Text="Running dotnet format" Importance="high" />
    <Exec Command="dotnet format --no-restore -v diag $(ProjectFileName)" />
  </Target>
@@ -7,35 +7,24 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Aspire -->
-    <AspireAppHostSdkVersion>13.0.1</AspireAppHostSdkVersion>
+    <AspireAppHostSdkVersion>13.0.0</AspireAppHostSdkVersion>
  </PropertyGroup>
  <ItemGroup>
    <!-- Aspire.* -->
-    <PackageVersion Include="Anthropic" Version="11.0.0" />
-    <PackageVersion Include="Anthropic.Foundry" Version="0.1.0" />
    <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="13.0.0-preview.1.25560.3" />
    <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireAppHostSdkVersion)" />
    <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(AspireAppHostSdkVersion)" />
    <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
-    <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0-beta.440" />
+    <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0-beta.435" />
    <!-- Azure.* -->
-    <PackageVersion Include="Azure.AI.Projects" Version="1.2.0-beta.3" />
-    <PackageVersion Include="Azure.AI.Projects.OpenAI" Version="1.0.0-beta.4" />
-    <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.8" />
-    <PackageVersion Include="Azure.AI.OpenAI" Version="2.7.0-beta.2" />
+    <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.7" />
+    <PackageVersion Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" />
    <PackageVersion Include="Azure.Identity" Version="1.17.0" />
    <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0" />
-    <!-- Google Gemini  -->
-    <PackageVersion Include="Google.GenAI" Version="0.6.0" />
-    <PackageVersion Include="Mscc.GenerativeAI.Microsoft" Version="2.9.3" />
-    <!-- Microsoft.Azure.* -->
-    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.54.0" />
-    <!-- Newtonsoft.Json -->
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
    <!-- System.* -->
    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
-    <PackageVersion Include="System.ClientModel" Version="1.8.1" />
+    <PackageVersion Include="System.ClientModel" Version="1.8.0" />
    <PackageVersion Include="System.CodeDom" Version="10.0.0" />
    <PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
@@ -46,7 +35,6 @@
    <PackageVersion Include="System.Text.Json" Version="10.0.0" />
    <PackageVersion Include="System.Threading.Channels" Version="10.0.0" />
    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
-    <PackageVersion Include="System.Net.Security" Version="4.3.2" />
    <!-- OpenTelemetry -->
    <PackageVersion Include="OpenTelemetry" Version="1.13.1" />
    <PackageVersion Include="OpenTelemetry.Api" Version="1.13.1" />
@@ -58,13 +46,13 @@
    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
    <!-- Microsoft.AspNetCore.* -->
-    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.11" />
    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.0.0" />
    <!-- Microsoft.Extensions.* -->
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.AI" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.0.0" />
    <PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="10.0.0-preview.1.25559.3" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.0.1-preview.1.25571.5" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.0.0-preview.1.25559.3" />
    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
@@ -90,53 +78,37 @@
    <PackageVersion Include="Microsoft.SemanticKernel.Agents.AzureAI" Version="1.67.0-preview" />
    <PackageVersion Include="Microsoft.SemanticKernel.Plugins.OpenApi" Version="1.67.0" />
    <!-- Agent SDKs -->
-    <PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.3.171-beta" />
-    <!-- M365 Agents SDK -->
-    <PackageVersion Include="AdaptiveCards" Version="3.1.0" />
-    <PackageVersion Include="Microsoft.Agents.Authentication.Msal" Version="1.3.171-beta" />
-    <PackageVersion Include="Microsoft.Agents.Hosting.AspNetCore" Version="1.3.171-beta" />
+    <PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.2.41" />
    <!-- A2A -->
    <PackageVersion Include="A2A" Version="0.3.3-preview" />
    <PackageVersion Include="A2A.AspNetCore" Version="0.3.3-preview" />
    <!-- MCP -->
    <PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.3" />
    <!-- Inference SDKs -->
+    <PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
    <PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.4.6" />
    <PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.10.0" />
    <PackageVersion Include="OllamaSharp" Version="5.4.8" />
-    <PackageVersion Include="OpenAI" Version="2.7.0" />
+    <PackageVersion Include="OpenAI" Version="2.6.0" />
    <!-- Identity -->
    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.78.0" />
    <!-- Workflows -->
-    <PackageVersion Include="Microsoft.Bot.ObjectModel" Version="1.2025.1106.1" />
-    <PackageVersion Include="Microsoft.Bot.ObjectModel.Json" Version="1.2025.1106.1" />
-    <PackageVersion Include="Microsoft.Bot.ObjectModel.PowerFx" Version="1.2025.1106.1" />
-    <PackageVersion Include="Microsoft.PowerFx.Interpreter" Version="1.5.0-build.20251008-1002" />
-    <!-- Durable Task -->
-    <PackageVersion Include="Microsoft.DurableTask.Client" Version="1.16.2" />
-    <PackageVersion Include="Microsoft.DurableTask.Client.AzureManaged" Version="1.16.2-preview.1" />
-    <PackageVersion Include="Microsoft.DurableTask.Worker" Version="1.16.2" />
-    <PackageVersion Include="Microsoft.DurableTask.Worker.AzureManaged" Version="1.16.2-preview.1" />
-    <!-- Azure Functions -->
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.50.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.50.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.9.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask.AzureManaged" Version="1.0.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.1.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Mcp" Version="1.0.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
+    <PackageVersion Include="Microsoft.Bot.ObjectModel" Version="1.2025.1003.2" />
+    <PackageVersion Include="Microsoft.Bot.ObjectModel.Json" Version="1.2025.1003.2" />
+    <PackageVersion Include="Microsoft.Bot.ObjectModel.PowerFx" Version="1.2025.1003.2" />
+    <PackageVersion Include="Microsoft.PowerFx.Interpreter" Version="1.4.0" />
+    <!-- Community -->
+    <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
    <!-- Test -->
    <PackageVersion Include="FluentAssertions" Version="8.8.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.22" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.11" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.11" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
    <PackageVersion Include="Moq" Version="[4.18.4]" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Agents.Abstractions" Version="1.67.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Agents.Yaml" Version="1.67.0-beta" />
    <PackageVersion Include="xunit" Version="2.9.3" />
    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
    <PackageVersion Include="xretry" Version="1.9.0" />
    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
    <!-- Symbols -->
@@ -163,17 +135,17 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.14.1" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="[4.14.1]" />
    <PackageReference Include="Roslynator.Analyzers">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.14.1" />
+    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="[4.14.0]" />
    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.14.1" />
+    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="[4.14.0]" />
    <PackageReference Include="Roslynator.Formatting.Analyzers">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -23,36 +23,21 @@
    <Project Path="samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj" />
    <Project Path="samples/AGUIClientServer/AGUIServer/AGUIServer.csproj" />
  </Folder>
-  <Folder Name="/Samples/AzureFunctions/">
-    <File Path="samples/AzureFunctions/.editorconfig" />
-    <File Path="samples/AzureFunctions/README.md" />
-    <Project Path="samples/AzureFunctions/01_SingleAgent/01_SingleAgent.csproj" />
-    <Project Path="samples/AzureFunctions/02_AgentOrchestration_Chaining/02_AgentOrchestration_Chaining.csproj" />
-    <Project Path="samples/AzureFunctions/03_AgentOrchestration_Concurrency/03_AgentOrchestration_Concurrency.csproj" />
-    <Project Path="samples/AzureFunctions/04_AgentOrchestration_Conditionals/04_AgentOrchestration_Conditionals.csproj" />
-    <Project Path="samples/AzureFunctions/05_AgentOrchestration_HITL/05_AgentOrchestration_HITL.csproj" />
-    <Project Path="samples/AzureFunctions/06_LongRunningTools/06_LongRunningTools.csproj" />
-    <Project Path="samples/AzureFunctions/07_AgentAsMcpTool/07_AgentAsMcpTool.csproj" />
-  </Folder>
  <Folder Name="/Samples/GettingStarted/">
    <File Path="samples/GettingStarted/README.md" />
  </Folder>
  <Folder Name="/Samples/GettingStarted/A2A/">
    <File Path="samples/GettingStarted/A2A/README.md" />
    <Project Path="samples/GettingStarted/A2A/A2AAgent_AsFunctionTools/A2AAgent_AsFunctionTools.csproj" />
-    <Project Path="samples/GettingStarted/A2A/A2AAgent_PollingForTaskCompletion/A2AAgent_PollingForTaskCompletion.csproj" />
  </Folder>
  <Folder Name="/Samples/GettingStarted/AgentProviders/">
    <File Path="samples/GettingStarted/AgentProviders/README.md" />
    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_Anthropic/Agent_With_Anthropic.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgentsPersistent/Agent_With_AzureAIAgentsPersistent.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIProject/Agent_With_AzureAIProject.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryAgent/Agent_With_AzureFoundryAgent.csproj" />
    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryModel/Agent_With_AzureFoundryModel.csproj" />
    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj" />
    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj" />
    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_GoogleGemini/Agent_With_GoogleGemini.csproj" />
    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj" />
    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj" />
    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj" />
@@ -79,44 +64,11 @@
    <Project Path="samples/GettingStarted/Agents/Agent_Step16_ChatReduction/Agent_Step16_ChatReduction.csproj" />
    <Project Path="samples/GettingStarted/Agents/Agent_Step17_BackgroundResponses/Agent_Step17_BackgroundResponses.csproj" />
    <Project Path="samples/GettingStarted/Agents/Agent_Step18_DeepResearch/Agent_Step18_DeepResearch.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step19_Declarative/Agent_Step19_Declarative.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/DeclarativeAgents/">
-    <Project Path="samples/GettingStarted/DeclarativeAgents/ChatClient/DeclarativeChatClientAgents.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/">
-    <File Path="samples/GettingStarted/AGUI/README.md" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step01_GettingStarted/">
-    <Project Path="samples/GettingStarted/AGUI/Step01_GettingStarted/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step01_GettingStarted/Server/Server.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step02_BackendTools/">
-    <Project Path="samples/GettingStarted/AGUI/Step02_BackendTools/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step02_BackendTools/Server/Server.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step03_FrontendTools/">
-    <Project Path="samples/GettingStarted/AGUI/Step03_FrontendTools/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step03_FrontendTools/Server/Server.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step04_HumanInLoop/">
-    <Project Path="samples/GettingStarted/AGUI/Step04_HumanInLoop/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/Server.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step05_StateManagement/">
-    <Project Path="samples/GettingStarted/AGUI/Step05_StateManagement/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step05_StateManagement/Server/Server.csproj" />
  </Folder>
  <Folder Name="/Samples/GettingStarted/DevUI/">
    <File Path="samples/GettingStarted/DevUI/README.md" />
    <Project Path="samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/DevUI_Step01_BasicUsage.csproj" />
  </Folder>
-  <Folder Name="/Samples/GettingStarted/AgentWithAnthropic/">
-    <File Path="samples/GettingStarted/AgentWithAnthropic/README.md" />
-    <Project Path="samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Agent_Anthropic_Step01_Running.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Agent_Anthropic_Step02_Reasoning.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Agent_Anthropic_Step03_UsingFunctionTools.csproj" />
-  </Folder>
  <Folder Name="/Samples/GettingStarted/AgentWithMemory/">
    <File Path="samples/GettingStarted/AgentWithMemory/README.md" />
    <Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj" />
@@ -127,38 +79,12 @@
    <File Path="samples/GettingStarted/AgentWithOpenAI/README.md" />
    <Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj" />
    <Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Agent_OpenAI_Step02_Reasoning.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Agent_OpenAI_Step03_CreateFromChatClient.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient.csproj" />
-  </Folder>
-  <Folder Name="/Samples/Purview/" />
-  <Folder Name="/Samples/Purview/AgentWithPurview/">
-    <Project Path="samples/Purview/AgentWithPurview/AgentWithPurview.csproj" />
  </Folder>
  <Folder Name="/Samples/GettingStarted/AgentWithRAG/">
    <File Path="samples/GettingStarted/AgentWithRAG/README.md" />
    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/AgentWithRAG_Step01_BasicTextRAG.csproj" />
    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/AgentWithRAG_Step02_CustomVectorStoreRAG.csproj" />
    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/AgentWithRAG_Step03_CustomRAGDataSource.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/AgentWithRAG_Step04_FoundryServiceRAG.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/FoundryAgents/">
-    <File Path="samples/GettingStarted/FoundryAgents/README.md" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.1_Basics/FoundryAgents_Step01.1_Basics.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.2_Running/FoundryAgents_Step01.2_Running.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/FoundryAgents_Step02_MultiturnConversation.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/FoundryAgents_Step03_UsingFunctionTools.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/FoundryAgents_Step04_UsingFunctionToolsWithApprovals.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/FoundryAgents_Step05_StructuredOutput.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step06_PersistedConversations/FoundryAgents_Step06_PersistedConversations.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step07_Observability/FoundryAgents_Step07_Observability.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step08_DependencyInjection/FoundryAgents_Step08_DependencyInjection.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/FoundryAgents_Step09_UsingMcpClientAsTools.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/FoundryAgents_Step10_UsingImages.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/FoundryAgents_Step11_AsFunctionTool.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step12_Middleware/FoundryAgents_Step12_Middleware.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step13_Plugins/FoundryAgents_Step13_Plugins.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/FoundryAgents_Step14_CodeInterpreter.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/FoundryAgents_Step15_ComputerUse.csproj" />
  </Folder>
  <Folder Name="/Samples/GettingStarted/ModelContextProtocol/">
    <File Path="samples/GettingStarted/ModelContextProtocol/README.md" />
@@ -184,22 +110,13 @@
  </Folder>
  <Folder Name="/Samples/GettingStarted/Workflows/Declarative/">
    <File Path="samples/GettingStarted/Workflows/Declarative/README.md" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/ConfirmInput/ConfirmInput.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/CustomerSupport/CustomerSupport.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/DeepResearch/DeepResearch.csproj" />
    <Project Path="samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj" />
    <Project Path="samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/FunctionTools/FunctionTools.csproj" />
    <Project Path="samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/InputArguments/InputArguments.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/Marketing/Marketing.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/StudentTeacher/StudentTeacher.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/ToolApproval/ToolApproval.csproj" />
  </Folder>
  <Folder Name="/Samples/GettingStarted/Workflows/Declarative/Examples/">
-    <File Path="../workflow-samples/CustomerSupport.yaml" />
    <File Path="../workflow-samples/DeepResearch.yaml" />
+    <File Path="../workflow-samples/HumanInLoop.yaml" />
    <File Path="../workflow-samples/Marketing.yaml" />
    <File Path="../workflow-samples/MathChat.yaml" />
    <File Path="../workflow-samples/README.md" />
@@ -230,7 +147,7 @@
    <Project Path="samples/GettingStarted/Workflows/Observability/WorkflowAsAnAgent/WorkflowAsAnAgentObservability.csproj" />
  </Folder>
  <Folder Name="/Samples/GettingStarted/Workflows/Visualization/">
-    <Project Path="samples/GettingStarted/Workflows/Visualization/Visualization.csproj" />
+    <Project Path="samples/GettingStarted/Workflows/Visualization/Visualization.csproj" Id="99bf0bc6-2440-428e-b3e7-d880e4b7a5fd" />
  </Folder>
  <Folder Name="/Samples/GettingStarted/Workflows/_Foundational/">
    <Project Path="samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj" />
@@ -244,11 +161,8 @@
  </Folder>
  <Folder Name="/Samples/HostedAgents/">
    <Project Path="samples/HostedAgents/AgentsInWorkflows/AgentsInWorkflows.csproj" />
-    <Project Path="samples/HostedAgents/AgentWithHostedMCP/AgentWithHostedMCP.csproj" />
    <Project Path="samples/HostedAgents/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj" />
-  </Folder>
-  <Folder Name="/Samples/M365Agent/">
-    <Project Path="samples/M365Agent/M365Agent.csproj" />
+    <Project Path="samples/HostedAgents/AgentWithHostedMCP/AgentWithHostedMCP.csproj" />
  </Folder>
  <Folder Name="/Solution Items/">
    <File Path=".editorconfig" />
@@ -349,7 +263,6 @@
    <File Path="src/Shared/Demos/SampleEnvironment.cs" />
  </Folder>
  <Folder Name="/Solution Items/src/Shared/IntegrationTests/">
-    <File Path="src/Shared/IntegrationTests/AnthropicConfiguration.cs" />
    <File Path="src/Shared/IntegrationTests/AzureAIConfiguration.cs" />
    <File Path="src/Shared/IntegrationTests/Mem0Configuration.cs" />
    <File Path="src/Shared/IntegrationTests/OpenAIConfiguration.cs" />
@@ -374,24 +287,16 @@
    <Project Path="src/Microsoft.Agents.AI.A2A/Microsoft.Agents.AI.A2A.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Abstractions/Microsoft.Agents.AI.Abstractions.csproj" />
    <Project Path="src/Microsoft.Agents.AI.AGUI/Microsoft.Agents.AI.AGUI.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Anthropic/Microsoft.Agents.AI.Anthropic.csproj" />
    <Project Path="src/Microsoft.Agents.AI.AzureAI.Persistent/Microsoft.Agents.AI.AzureAI.Persistent.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.AzureAI/Microsoft.Agents.AI.AzureAI.csproj" />
    <Project Path="src/Microsoft.Agents.AI.CopilotStudio/Microsoft.Agents.AI.CopilotStudio.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.CosmosNoSql/Microsoft.Agents.AI.CosmosNoSql.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Declarative/Microsoft.Agents.AI.Declarative.csproj" />
    <Project Path="src/Microsoft.Agents.AI.DevUI/Microsoft.Agents.AI.DevUI.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.DurableTask/Microsoft.Agents.AI.DurableTask.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting.A2A/Microsoft.Agents.AI.Hosting.A2A.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Hosting.AzureFunctions/Microsoft.Agents.AI.Hosting.AzureFunctions.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting.OpenAI/Microsoft.Agents.AI.Hosting.OpenAI.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting/Microsoft.Agents.AI.Hosting.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Mem0/Microsoft.Agents.AI.Mem0.csproj" />
    <Project Path="src/Microsoft.Agents.AI.OpenAI/Microsoft.Agents.AI.OpenAI.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Purview/Microsoft.Agents.AI.Purview.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Workflows.Declarative.AzureAI/Microsoft.Agents.AI.Workflows.Declarative.AzureAI.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Workflows.Declarative/Microsoft.Agents.AI.Workflows.Declarative.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Workflows/Microsoft.Agents.AI.Workflows.csproj" />
    <Project Path="src/Microsoft.Agents.AI/Microsoft.Agents.AI.csproj" />
@@ -399,13 +304,9 @@
  <Folder Name="/Tests/" />
  <Folder Name="/Tests/IntegrationTests/">
    <Project Path="tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj" />
-    <Project Path="tests/AnthropicChatCompletion.IntegrationTests/AnthropicChatCompletion.IntegrationTests.csproj" />
-    <Project Path="tests/AzureAI.IntegrationTests/AzureAI.IntegrationTests.csproj" />
    <Project Path="tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj" />
    <Project Path="tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.DurableTask.IntegrationTests/Microsoft.Agents.AI.DurableTask.IntegrationTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Mem0.IntegrationTests/Microsoft.Agents.AI.Mem0.IntegrationTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.csproj" />
    <Project Path="tests/OpenAIAssistant.IntegrationTests/OpenAIAssistant.IntegrationTests.csproj" />
@@ -416,23 +317,15 @@
    <Project Path="tests/Microsoft.Agents.AI.A2A.UnitTests/Microsoft.Agents.AI.A2A.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Abstractions.UnitTests/Microsoft.Agents.AI.Abstractions.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.AGUI.UnitTests/Microsoft.Agents.AI.AGUI.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Anthropic.UnitTests/Microsoft.Agents.AI.Anthropic.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.AzureAI.UnitTests/Microsoft.Agents.AI.AzureAI.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.CosmosNoSql.UnitTests/Microsoft.Agents.AI.CosmosNoSql.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Declarative.UnitTests/Microsoft.Agents.AI.Declarative.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.DevUI.UnitTests/Microsoft.Agents.AI.DevUI.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.DurableTask.UnitTests/Microsoft.Agents.AI.DurableTask.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Hosting.A2A.UnitTests/Microsoft.Agents.AI.Hosting.A2A.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Hosting.AzureFunctions.UnitTests/Microsoft.Agents.AI.Hosting.AzureFunctions.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Hosting.OpenAI.UnitTests/Microsoft.Agents.AI.Hosting.OpenAI.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Hosting.UnitTests/Microsoft.Agents.AI.Hosting.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Mem0.UnitTests/Microsoft.Agents.AI.Mem0.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.OpenAI.UnitTests/Microsoft.Agents.AI.OpenAI.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Purview.UnitTests/Microsoft.Agents.AI.Purview.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.UnitTests/Microsoft.Agents.AI.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Workflows.UnitTests/Microsoft.Agents.AI.Workflows.UnitTests.csproj" />
  </Folder>
-</Solution>
+</Solution>
@@ -1,31 +0,0 @@
-{
-  "solution": {
-    "path": "agent-framework-dotnet.slnx",
-    "projects": [
-      "src\\Microsoft.Agents.AI.A2A\\Microsoft.Agents.AI.A2A.csproj",
-      "src\\Microsoft.Agents.AI.Abstractions\\Microsoft.Agents.AI.Abstractions.csproj",
-      "src\\Microsoft.Agents.AI.AGUI\\Microsoft.Agents.AI.AGUI.csproj",
-      "src\\Microsoft.Agents.AI.Anthropic\\Microsoft.Agents.AI.Anthropic.csproj",
-      "src\\Microsoft.Agents.AI.AzureAI.Persistent\\Microsoft.Agents.AI.AzureAI.Persistent.csproj",
-      "src\\Microsoft.Agents.AI.AzureAI\\Microsoft.Agents.AI.AzureAI.csproj",
-      "src\\Microsoft.Agents.AI.CopilotStudio\\Microsoft.Agents.AI.CopilotStudio.csproj",
-      "src\\Microsoft.Agents.AI.CosmosNoSql\\Microsoft.Agents.AI.CosmosNoSql.csproj",
-      "src\\Microsoft.Agents.AI.Declarative\\Microsoft.Agents.AI.Declarative.csproj",
-      "src\\Microsoft.Agents.AI.DevUI\\Microsoft.Agents.AI.DevUI.csproj",
-      "src\\Microsoft.Agents.AI.DurableTask\\Microsoft.Agents.AI.DurableTask.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.A2A.AspNetCore\\Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.A2A\\Microsoft.Agents.AI.Hosting.A2A.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.AzureFunctions\\Microsoft.Agents.AI.Hosting.AzureFunctions.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.OpenAI\\Microsoft.Agents.AI.Hosting.OpenAI.csproj",
-      "src\\Microsoft.Agents.AI.Hosting\\Microsoft.Agents.AI.Hosting.csproj",
-      "src\\Microsoft.Agents.AI.Mem0\\Microsoft.Agents.AI.Mem0.csproj",
-      "src\\Microsoft.Agents.AI.OpenAI\\Microsoft.Agents.AI.OpenAI.csproj",
-      "src\\Microsoft.Agents.AI.Purview\\Microsoft.Agents.AI.Purview.csproj",
-      "src\\Microsoft.Agents.AI.Workflows.Declarative.AzureAI\\Microsoft.Agents.AI.Workflows.Declarative.AzureAI.csproj",
-      "src\\Microsoft.Agents.AI.Workflows.Declarative\\Microsoft.Agents.AI.Workflows.Declarative.csproj",
-      "src\\Microsoft.Agents.AI.Workflows\\Microsoft.Agents.AI.Workflows.csproj",
-      "src\\Microsoft.Agents.AI\\Microsoft.Agents.AI.csproj"
-    ]
-  }
-}
@@ -11,13 +11,4 @@
  <ItemGroup Condition="'$(InjectSharedBuildTestCode)' == 'true'">
    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\CodeTests\*.cs" LinkBase="Shared\CodeTests" />
  </ItemGroup>
-  <ItemGroup Condition="'$(InjectSharedWorkflowsExecution)' == 'true'">
-    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Workflows\Execution\*.cs" LinkBase="Shared\Workflows" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(InjectSharedWorkflowsSettings)' == 'true'">
-    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Workflows\Settings\*.cs" LinkBase="Shared\Workflows" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(InjectSharedFoundryAgents)' == 'true'">
-    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Foundry\Agents\*.cs" LinkBase="Shared\Foundry" />
-  </ItemGroup>
 </Project>
@@ -1,7 +1,7 @@
 {
    "sdk": {
-        "version": "10.0.100",
-        "rollForward": "minor",
+        "version": "9.0.300",
+        "rollForward": "latestMajor",
        "allowPrerelease": false
    }
 }
@@ -2,9 +2,9 @@
  <PropertyGroup>
    <!-- Central version prefix - applies to all nuget packages. -->
    <VersionPrefix>1.0.0</VersionPrefix>
-    <PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).251204.1</PackageVersion>
-    <PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251204.1</PackageVersion>
-    <GitTag>1.0.0-preview.251204.1</GitTag>
+    <PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).251110.2</PackageVersion>
+    <PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251110.2</PackageVersion>
+    <GitTag>1.0.0-preview.251110.2</GitTag>

    <Configurations>Debug;Release;Publish</Configurations>
    <IsPackable>true</IsPackable>
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <UserSecretsId>5ee045b0-aea3-4f08-8d31-32d1a6f8fed0</UserSecretsId>
@@ -12,6 +12,8 @@
    <PackageReference Include="A2A" />
    <PackageReference Include="System.CommandLine" />
    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
  </ItemGroup>

  <ItemGroup>
@@ -4,7 +4,6 @@ using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Logging;
 using OpenAI;
-using OpenAI.Chat;

 namespace A2A;

@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <UserSecretsId>5ee045b0-aea3-4f08-8d31-32d1a6f8fed0</UserSecretsId>
@@ -11,11 +11,8 @@
  <ItemGroup>
    <PackageReference Include="Azure.AI.Agents.Persistent" />
    <PackageReference Include="Azure.Identity" />
-  </ItemGroup>
-
-  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net10.0'))">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-    <PackageReference Include="System.Linq.AsyncEnumerable" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
  </ItemGroup>

  <ItemGroup>
@@ -6,7 +6,6 @@ using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 using OpenAI;
-using OpenAI.Chat;

 namespace A2AServer;

@@ -103,7 +103,7 @@ dotnet run --urls "http://localhost:5002;https://localhost:5012" --agentId "<Log

 ### Testing the Agents using the Rest Client

-This sample contains a [.http file](https://learn.microsoft.com/aspnet/core/test/http-files?view=aspnetcore-10.0) which can be used to test the agent.
+This sample contains a [.http file](https://learn.microsoft.com/aspnet/core/test/http-files?view=aspnetcore-9.0) which can be used to test the agent.

 1. In Visual Studio open [./A2AServer/A2AServer.http](./A2AServer/A2AServer.http)
 1. There are two sent requests for each agent, e.g., for the invoice agent:
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <UserSecretsId>a8b2e9f0-1ea3-4f18-9d41-42d1a6f8fe10</UserSecretsId>
@@ -11,6 +11,8 @@
  <ItemGroup>
    <PackageReference Include="System.CommandLine" />
    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
  </ItemGroup>

  <ItemGroup>
@@ -201,12 +201,12 @@ public static class Program
        {
            return "";
        }
-        var builder = new StringBuilder().AppendLine();
+        var builder = new StringBuilder();
+        builder.AppendLine();
        foreach (var kvp in arguments)
        {
-            builder
-                .AppendLine($"   Name: {kvp.Key}")
-                .AppendLine($"   Value: {kvp.Value}");
+            builder.AppendLine($"   Name: {kvp.Key}");
+            builder.AppendLine($"   Value: {kvp.Value}");
        }
        return builder.ToString();
    }
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <UserSecretsId>b9c3f1e1-2fb4-5g29-0e52-53e2b7g9gf21</UserSecretsId>
@@ -11,6 +11,8 @@
  <ItemGroup>
    <PackageReference Include="Azure.AI.OpenAI" />
    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
  </ItemGroup>

  <ItemGroup>
@@ -1,10 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

 using System.Text.Json.Serialization;
-using AGUIDojoServer.AgenticUI;
-using AGUIDojoServer.BackendToolRendering;
-using AGUIDojoServer.PredictiveStateUpdates;
-using AGUIDojoServer.SharedState;

 namespace AGUIDojoServer;

@@ -12,12 +8,4 @@ namespace AGUIDojoServer;
 [JsonSerializable(typeof(Recipe))]
 [JsonSerializable(typeof(Ingredient))]
 [JsonSerializable(typeof(RecipeResponse))]
-[JsonSerializable(typeof(Plan))]
-[JsonSerializable(typeof(Step))]
-[JsonSerializable(typeof(StepStatus))]
-[JsonSerializable(typeof(StepStatus?))]
-[JsonSerializable(typeof(JsonPatchOperation))]
-[JsonSerializable(typeof(List<JsonPatchOperation>))]
-[JsonSerializable(typeof(List<string>))]
-[JsonSerializable(typeof(DocumentState))]
 internal sealed partial class AGUIDojoServerSerializerContext : JsonSerializerContext;
@@ -1,52 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.ComponentModel;
-
-namespace AGUIDojoServer.AgenticUI;
-
-internal static class AgenticPlanningTools
-{
-    [Description("Create a plan with multiple steps.")]
-    public static Plan CreatePlan([Description("List of step descriptions to create the plan.")] List<string> steps)
-    {
-        return new Plan
-        {
-            Steps = [.. steps.Select(s => new Step { Description = s, Status = StepStatus.Pending })]
-        };
-    }
-
-    [Description("Update a step in the plan with new description or status.")]
-    public static async Task<List<JsonPatchOperation>> UpdatePlanStepAsync(
-        [Description("The index of the step to update.")] int index,
-        [Description("The new description for the step (optional).")] string? description = null,
-        [Description("The new status for the step (optional).")] StepStatus? status = null)
-    {
-        var changes = new List<JsonPatchOperation>();
-
-        if (description is not null)
-        {
-            changes.Add(new JsonPatchOperation
-            {
-                Op = "replace",
-                Path = $"/steps/{index}/description",
-                Value = description
-            });
-        }
-
-        if (status.HasValue)
-        {
-            // Status must be lowercase to match AG-UI frontend expectations: "pending" or "completed"
-            string statusValue = status.Value == StepStatus.Pending ? "pending" : "completed";
-            changes.Add(new JsonPatchOperation
-            {
-                Op = "replace",
-                Path = $"/steps/{index}/status",
-                Value = statusValue
-            });
-        }
-
-        await Task.Delay(1000);
-
-        return changes;
-    }
-}
@@ -1,88 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-
-namespace AGUIDojoServer.AgenticUI;
-
-[SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "Instantiated by ChatClientAgentFactory.CreateAgenticUI")]
-internal sealed class AgenticUIAgent : DelegatingAIAgent
-{
-    private readonly JsonSerializerOptions _jsonSerializerOptions;
-
-    public AgenticUIAgent(AIAgent innerAgent, JsonSerializerOptions jsonSerializerOptions)
-        : base(innerAgent)
-    {
-        this._jsonSerializerOptions = jsonSerializerOptions;
-    }
-
-    public override Task<AgentRunResponse> RunAsync(IEnumerable<ChatMessage> messages, AgentThread? thread = null, AgentRunOptions? options = null, CancellationToken cancellationToken = default)
-    {
-        return this.RunStreamingAsync(messages, thread, options, cancellationToken).ToAgentRunResponseAsync(cancellationToken);
-    }
-
-    public override async IAsyncEnumerable<AgentRunResponseUpdate> RunStreamingAsync(
-        IEnumerable<ChatMessage> messages,
-        AgentThread? thread = null,
-        AgentRunOptions? options = null,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        // Track function calls that should trigger state events
-        var trackedFunctionCalls = new Dictionary<string, FunctionCallContent>();
-
-        await foreach (var update in this.InnerAgent.RunStreamingAsync(messages, thread, options, cancellationToken).ConfigureAwait(false))
-        {
-            // Process contents: track function calls and emit state events for results
-            List<AIContent> stateEventsToEmit = new();
-            foreach (var content in update.Contents)
-            {
-                if (content is FunctionCallContent callContent)
-                {
-                    if (callContent.Name == "create_plan" || callContent.Name == "update_plan_step")
-                    {
-                        trackedFunctionCalls[callContent.CallId] = callContent;
-                        break;
-                    }
-                }
-                else if (content is FunctionResultContent resultContent)
-                {
-                    // Check if this result matches a tracked function call
-                    if (trackedFunctionCalls.TryGetValue(resultContent.CallId, out var matchedCall))
-                    {
-                        var bytes = JsonSerializer.SerializeToUtf8Bytes((JsonElement)resultContent.Result!, this._jsonSerializerOptions);
-
-                        // Determine event type based on the function name
-                        if (matchedCall.Name == "create_plan")
-                        {
-                            stateEventsToEmit.Add(new DataContent(bytes, "application/json"));
-                        }
-                        else if (matchedCall.Name == "update_plan_step")
-                        {
-                            stateEventsToEmit.Add(new DataContent(bytes, "application/json-patch+json"));
-                        }
-                    }
-                }
-            }
-
-            yield return update;
-
-            yield return new AgentRunResponseUpdate(
-                new ChatResponseUpdate(role: ChatRole.System, stateEventsToEmit)
-                {
-                    MessageId = "delta_" + Guid.NewGuid().ToString("N"),
-                    CreatedAt = update.CreatedAt,
-                    ResponseId = update.ResponseId,
-                    AuthorName = update.AuthorName,
-                    Role = update.Role,
-                    ContinuationToken = update.ContinuationToken,
-                    AdditionalProperties = update.AdditionalProperties,
-                })
-            {
-                AgentId = update.AgentId
-            };
-        }
-    }
-}
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.AgenticUI;
-
-internal sealed class JsonPatchOperation
-{
-    [JsonPropertyName("op")]
-    public required string Op { get; set; }
-
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
-
-    [JsonPropertyName("value")]
-    public object? Value { get; set; }
-
-    [JsonPropertyName("from")]
-    public string? From { get; set; }
-}
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.AgenticUI;
-
-internal sealed class Plan
-{
-    [JsonPropertyName("steps")]
-    public List<Step> Steps { get; set; } = [];
-}
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.AgenticUI;
-
-internal sealed class Step
-{
-    [JsonPropertyName("description")]
-    public required string Description { get; set; }
-
-    [JsonPropertyName("status")]
-    public StepStatus Status { get; set; } = StepStatus.Pending;
-}
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.AgenticUI;
-
-[JsonConverter(typeof(JsonStringEnumConverter<StepStatus>))]
-internal enum StepStatus
-{
-    Pending,
-    Completed
-}
@@ -2,15 +2,10 @@

 using System.ComponentModel;
 using System.Text.Json;
-using AGUIDojoServer.AgenticUI;
-using AGUIDojoServer.BackendToolRendering;
-using AGUIDojoServer.PredictiveStateUpdates;
-using AGUIDojoServer.SharedState;
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
-using OpenAI;
 using ChatClient = OpenAI.Chat.ChatClient;

 namespace AGUIDojoServer;
@@ -71,46 +66,13 @@ internal static class ChatClientAgentFactory
            description: "An agent that uses tools to generate user interfaces using Azure OpenAI");
    }

-    public static AIAgent CreateAgenticUI(JsonSerializerOptions options)
+    public static ChatClientAgent CreateAgenticUI()
    {
        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
-        var baseAgent = chatClient.AsIChatClient().CreateAIAgent(new ChatClientAgentOptions
-        {
-            Name = "AgenticUIAgent",
-            Description = "An agent that generates agentic user interfaces using Azure OpenAI",
-            ChatOptions = new ChatOptions
-            {
-                Instructions = """
-                    When planning use tools only, without any other messages.
-                    IMPORTANT:
-                    - Use the `create_plan` tool to set the initial state of the steps
-                    - Use the `update_plan_step` tool to update the status of each step
-                    - Do NOT repeat the plan or summarise it in a message
-                    - Do NOT confirm the creation or updates in a message
-                    - Do NOT ask the user for additional information or next steps
-                    - Do NOT leave a plan hanging, always complete the plan via `update_plan_step` if one is ongoing.
-                    - Continue calling update_plan_step until all steps are marked as completed.

-                    Only one plan can be active at a time, so do not call the `create_plan` tool
-                    again until all the steps in current plan are completed.
-                    """,
-                Tools = [
-                    AIFunctionFactory.Create(
-                        AgenticPlanningTools.CreatePlan,
-                        name: "create_plan",
-                        description: "Create a plan with multiple steps.",
-                        AGUIDojoServerSerializerContext.Default.Options),
-                    AIFunctionFactory.Create(
-                        AgenticPlanningTools.UpdatePlanStepAsync,
-                        name: "update_plan_step",
-                        description: "Update a step in the plan with new description or status.",
-                        AGUIDojoServerSerializerContext.Default.Options)
-                ],
-                AllowMultipleToolCalls = false
-            }
-        });
-
-        return new AgenticUIAgent(baseAgent, options);
+        return chatClient.AsIChatClient().CreateAIAgent(
+            name: "AgenticUIAgent",
+            description: "An agent that generates agentic user interfaces using Azure OpenAI");
    }

    public static AIAgent CreateSharedState(JsonSerializerOptions options)
@@ -124,44 +86,6 @@ internal static class ChatClientAgentFactory
        return new SharedStateAgent(baseAgent, options);
    }

-    public static AIAgent CreatePredictiveStateUpdates(JsonSerializerOptions options)
-    {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
-
-        var baseAgent = chatClient.AsIChatClient().CreateAIAgent(new ChatClientAgentOptions
-        {
-            Name = "PredictiveStateUpdatesAgent",
-            Description = "An agent that demonstrates predictive state updates using Azure OpenAI",
-            ChatOptions = new ChatOptions
-            {
-                Instructions = """
-                    You are a document editor assistant. When asked to write or edit content:
-                    
-                    IMPORTANT:
-                    - Use the `write_document` tool with the full document text in Markdown format
-                    - Format the document extensively so it's easy to read
-                    - You can use all kinds of markdown (headings, lists, bold, etc.)
-                    - However, do NOT use italic or strike-through formatting
-                    - You MUST write the full document, even when changing only a few words
-                    - When making edits to the document, try to make them minimal - do not change every word
-                    - Keep stories SHORT!
-                    - After you are done writing the document you MUST call a confirm_changes tool after you call write_document
-                    
-                    After the user confirms the changes, provide a brief summary of what you wrote.
-                    """,
-                Tools = [
-                    AIFunctionFactory.Create(
-                        WriteDocument,
-                        name: "write_document",
-                        description: "Write a document. Use markdown formatting to format the document.",
-                        AGUIDojoServerSerializerContext.Default.Options)
-                ]
-            }
-        });
-
-        return new PredictiveStateUpdatesAgent(baseAgent, options);
-    }
-
    [Description("Get the weather for a given location.")]
    private static WeatherInfo GetWeather([Description("The location to get the weather for.")] string location) => new()
    {
@@ -171,11 +95,4 @@ internal static class ChatClientAgentFactory
        WindSpeed = 10,
        FeelsLike = 25
    };
-
-    [Description("Write a document in markdown format.")]
-    private static string WriteDocument([Description("The document content to write.")] string document)
-    {
-        // Simply return success - the document is tracked via state updates
-        return "Document written successfully";
-    }
 }
@@ -2,7 +2,7 @@

 using System.Text.Json.Serialization;

-namespace AGUIDojoServer.SharedState;
+namespace AGUIDojoServer;

 internal sealed class Ingredient
 {
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.PredictiveStateUpdates;
-
-internal sealed class DocumentState
-{
-    [JsonPropertyName("document")]
-    public string Document { get; set; } = string.Empty;
-}
@@ -1,104 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-
-namespace AGUIDojoServer.PredictiveStateUpdates;
-
-[SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "Instantiated by ChatClientAgentFactory.CreatePredictiveStateUpdates")]
-internal sealed class PredictiveStateUpdatesAgent : DelegatingAIAgent
-{
-    private readonly JsonSerializerOptions _jsonSerializerOptions;
-    private const int ChunkSize = 10; // Characters per chunk for streaming effect
-
-    public PredictiveStateUpdatesAgent(AIAgent innerAgent, JsonSerializerOptions jsonSerializerOptions)
-        : base(innerAgent)
-    {
-        this._jsonSerializerOptions = jsonSerializerOptions;
-    }
-
-    public override Task<AgentRunResponse> RunAsync(IEnumerable<ChatMessage> messages, AgentThread? thread = null, AgentRunOptions? options = null, CancellationToken cancellationToken = default)
-    {
-        return this.RunStreamingAsync(messages, thread, options, cancellationToken).ToAgentRunResponseAsync(cancellationToken);
-    }
-
-    public override async IAsyncEnumerable<AgentRunResponseUpdate> RunStreamingAsync(
-        IEnumerable<ChatMessage> messages,
-        AgentThread? thread = null,
-        AgentRunOptions? options = null,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        // Track the last emitted document state to avoid duplicates
-        string? lastEmittedDocument = null;
-
-        await foreach (var update in this.InnerAgent.RunStreamingAsync(messages, thread, options, cancellationToken).ConfigureAwait(false))
-        {
-            // Check if we're seeing a write_document tool call and emit predictive state
-            bool hasToolCall = false;
-            string? documentContent = null;
-
-            foreach (var content in update.Contents)
-            {
-                if (content is FunctionCallContent callContent && callContent.Name == "write_document")
-                {
-                    hasToolCall = true;
-                    // Try to extract the document argument directly from the dictionary
-                    if (callContent.Arguments?.TryGetValue("document", out var documentValue) == true)
-                    {
-                        documentContent = documentValue?.ToString();
-                    }
-                }
-            }
-
-            // Always yield the original update first
-            yield return update;
-
-            // If we got a complete tool call with document content, "fake" stream it in chunks
-            if (hasToolCall && documentContent != null && documentContent != lastEmittedDocument)
-            {
-                // Chunk the document content and emit progressive state updates
-                int startIndex = 0;
-                if (lastEmittedDocument != null && documentContent.StartsWith(lastEmittedDocument, StringComparison.Ordinal))
-                {
-                    // Only stream the new portion that was added
-                    startIndex = lastEmittedDocument.Length;
-                }
-
-                // Stream the document in chunks
-                for (int i = startIndex; i < documentContent.Length; i += ChunkSize)
-                {
-                    int length = Math.Min(ChunkSize, documentContent.Length - i);
-                    string chunk = documentContent.Substring(0, i + length);
-
-                    // Prepare predictive state update as DataContent
-                    var stateUpdate = new DocumentState { Document = chunk };
-                    byte[] stateBytes = JsonSerializer.SerializeToUtf8Bytes(
-                        stateUpdate,
-                        this._jsonSerializerOptions.GetTypeInfo(typeof(DocumentState)));
-
-                    yield return new AgentRunResponseUpdate(
-                        new ChatResponseUpdate(role: ChatRole.Assistant, [new DataContent(stateBytes, "application/json")])
-                        {
-                            MessageId = "snapshot" + Guid.NewGuid().ToString("N"),
-                            CreatedAt = update.CreatedAt,
-                            ResponseId = update.ResponseId,
-                            AdditionalProperties = update.AdditionalProperties,
-                            AuthorName = update.AuthorName,
-                            ContinuationToken = update.ContinuationToken,
-                        })
-                    {
-                        AgentId = update.AgentId
-                    };
-
-                    // Small delay to simulate streaming
-                    await Task.Delay(50, cancellationToken).ConfigureAwait(false);
-                }
-
-                lastEmittedDocument = documentContent;
-            }
-        }
-    }
-}
@@ -35,13 +35,11 @@ app.MapAGUI("/human_in_the_loop", ChatClientAgentFactory.CreateHumanInTheLoop())

 app.MapAGUI("/tool_based_generative_ui", ChatClientAgentFactory.CreateToolBasedGenerativeUI());

+app.MapAGUI("/agentic_generative_ui", ChatClientAgentFactory.CreateAgenticUI());
+
 var jsonOptions = app.Services.GetRequiredService<IOptions<Microsoft.AspNetCore.Http.Json.JsonOptions>>();
-app.MapAGUI("/agentic_generative_ui", ChatClientAgentFactory.CreateAgenticUI(jsonOptions.Value.SerializerOptions));
-
 app.MapAGUI("/shared_state", ChatClientAgentFactory.CreateSharedState(jsonOptions.Value.SerializerOptions));

-app.MapAGUI("/predictive_state_updates", ChatClientAgentFactory.CreatePredictiveStateUpdates(jsonOptions.Value.SerializerOptions));
-
 await app.RunAsync();

-public partial class Program;
+public partial class Program { }
@@ -2,7 +2,7 @@

 using System.Text.Json.Serialization;

-namespace AGUIDojoServer.SharedState;
+namespace AGUIDojoServer;

 internal sealed class Recipe
 {
@@ -2,7 +2,7 @@

 using System.Text.Json.Serialization;

-namespace AGUIDojoServer.SharedState;
+namespace AGUIDojoServer;

 #pragma warning disable CA1812 // Used for the JsonSchema response format
 internal sealed class RecipeResponse
@@ -6,7 +6,7 @@ using System.Text.Json;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;

-namespace AGUIDojoServer.SharedState;
+namespace AGUIDojoServer;

 [SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "Instantiated by ChatClientAgentFactory.CreateSharedState")]
 internal sealed class SharedStateAgent : DelegatingAIAgent
@@ -2,7 +2,7 @@

 using System.Text.Json.Serialization;

-namespace AGUIDojoServer.BackendToolRendering;
+namespace AGUIDojoServer;

 internal sealed class WeatherInfo
 {
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <UserSecretsId>a8b2e9f0-1ea3-4f18-9d41-42d1a6f8fe10</UserSecretsId>
@@ -11,6 +11,8 @@
  <ItemGroup>
    <PackageReference Include="Azure.AI.OpenAI" />
    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
  </ItemGroup>

  <ItemGroup>
@@ -6,7 +6,7 @@ using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI.Hosting.AGUI.AspNetCore;
 using Microsoft.Extensions.AI;
-using OpenAI.Chat;
+using OpenAI;

 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 builder.Services.AddHttpClient().AddLogging();
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.AGUI\Microsoft.Agents.AI.AGUI.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <base href="/" />
-    <link rel="stylesheet" href="app.css" />
-    <link rel="stylesheet" href="AGUIWebChatClient.styles.css" />
-    <link rel="icon" type="image/png" href="favicon.png" />
-    <HeadOutlet @rendermode="@renderMode" />
-</head>
-
-<body>
-    <Routes @rendermode="@renderMode" />
-    <script src="_framework/blazor.web.js"></script>
-</body>
-
-</html>
-
-@code {
-    private readonly IComponentRenderMode renderMode = new InteractiveServerRenderMode(prerender: false);
-}
@@ -1 +0,0 @@
-<div class="lds-ellipsis"><div></div><div></div><div></div><div></div></div>
@@ -1,89 +0,0 @@
-/* Used under CC0 license */
-
-.lds-ellipsis {
-    color: #666;
-    animation: fade-in 1s;
-}
-
-@keyframes fade-in {
-    0% {
-        opacity: 0;
-    }
-
-    100% {
-        opacity: 1;
-    }
-}
-
-    .lds-ellipsis,
-    .lds-ellipsis div {
-        box-sizing: border-box;
-    }
-
-.lds-ellipsis {
-    margin: auto;
-    display: block;
-    position: relative;
-    width: 80px;
-    height: 80px;
-}
-
-    .lds-ellipsis div {
-        position: absolute;
-        top: 33.33333px;
-        width: 10px;
-        height: 10px;
-        border-radius: 50%;
-        background: currentColor;
-        animation-timing-function: cubic-bezier(0, 1, 1, 0);
-    }
-
-        .lds-ellipsis div:nth-child(1) {
-            left: 8px;
-            animation: lds-ellipsis1 0.6s infinite;
-        }
-
-        .lds-ellipsis div:nth-child(2) {
-            left: 8px;
-            animation: lds-ellipsis2 0.6s infinite;
-        }
-
-        .lds-ellipsis div:nth-child(3) {
-            left: 32px;
-            animation: lds-ellipsis2 0.6s infinite;
-        }
-
-        .lds-ellipsis div:nth-child(4) {
-            left: 56px;
-            animation: lds-ellipsis3 0.6s infinite;
-        }
-
-@keyframes lds-ellipsis1 {
-    0% {
-        transform: scale(0);
-    }
-
-    100% {
-        transform: scale(1);
-    }
-}
-
-@keyframes lds-ellipsis3 {
-    0% {
-        transform: scale(1);
-    }
-
-    100% {
-        transform: scale(0);
-    }
-}
-
-@keyframes lds-ellipsis2 {
-    0% {
-        transform: translate(0, 0);
-    }
-
-    100% {
-        transform: translate(24px, 0);
-    }
-}
@@ -1,9 +0,0 @@
-@inherits LayoutComponentBase
-
-@Body
-
-<div id="blazor-error-ui" data-nosnippet>
-    An unhandled error has occurred.
-    <a href="." class="reload">Reload</a>
-    <span class="dismiss">🗙</span>
-</div>
@@ -1,20 +0,0 @@
-#blazor-error-ui {
-    color-scheme: light only;
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-    box-sizing: border-box;
-    display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }
@@ -1,94 +0,0 @@
-@page "/"
-@using System.ComponentModel
-@inject IChatClient ChatClient
-@inject NavigationManager Nav
-@implements IDisposable
-
-<PageTitle>Chat</PageTitle>
-
-<ChatHeader OnNewChat="@ResetConversationAsync" />
-
-<ChatMessageList Messages="@messages" InProgressMessage="@currentResponseMessage">
-    <NoMessagesContent>
-        <div>Ask the assistant a question to start a conversation.</div>
-    </NoMessagesContent>
-</ChatMessageList>
-<div class="chat-container">
-    <ChatSuggestions OnSelected="@AddUserMessageAsync" @ref="@chatSuggestions" />
-    <ChatInput OnSend="@AddUserMessageAsync" @ref="@chatInput" />
-</div>
-
-@code {
-    private const string SystemPrompt = @"
-        You are a helpful assistant.
-        ";
-
-    private int statefulMessageCount;
-    private readonly ChatOptions chatOptions = new();
-    private readonly List<ChatMessage> messages = new();
-    private CancellationTokenSource? currentResponseCancellation;
-    private ChatMessage? currentResponseMessage;
-    private ChatInput? chatInput;
-    private ChatSuggestions? chatSuggestions;
-
-    protected override void OnInitialized()
-    {
-        statefulMessageCount = 0;
-        messages.Add(new(ChatRole.System, SystemPrompt));
-    }
-
-    private async Task AddUserMessageAsync(ChatMessage userMessage)
-    {
-        CancelAnyCurrentResponse();
-
-        // Add the user message to the conversation
-        messages.Add(userMessage);
-        chatSuggestions?.Clear();
-        await chatInput!.FocusAsync();
-
-        // Stream and display a new response from the IChatClient
-        var responseText = new TextContent("");
-        currentResponseMessage = new ChatMessage(ChatRole.Assistant, [responseText]);
-        StateHasChanged();
-        currentResponseCancellation = new();
-        await foreach (var update in ChatClient.GetStreamingResponseAsync(messages.Skip(statefulMessageCount), chatOptions, currentResponseCancellation.Token))
-        {
-            messages.AddMessages(update, filter: c => c is not TextContent);
-            responseText.Text += update.Text;
-            chatOptions.ConversationId = update.ConversationId;
-            ChatMessageItem.NotifyChanged(currentResponseMessage);
-        }
-
-        // Store the final response in the conversation, and begin getting suggestions
-        messages.Add(currentResponseMessage!);
-        statefulMessageCount = chatOptions.ConversationId is not null ? messages.Count : 0;
-        currentResponseMessage = null;
-        chatSuggestions?.Update(messages);
-    }
-
-    private void CancelAnyCurrentResponse()
-    {
-        // If a response was cancelled while streaming, include it in the conversation so it's not lost
-        if (currentResponseMessage is not null)
-        {
-            messages.Add(currentResponseMessage);
-        }
-
-        currentResponseCancellation?.Cancel();
-        currentResponseMessage = null;
-    }
-
-    private async Task ResetConversationAsync()
-    {
-        CancelAnyCurrentResponse();
-        messages.Clear();
-        messages.Add(new(ChatRole.System, SystemPrompt));
-        chatOptions.ConversationId = null;
-        statefulMessageCount = 0;
-        chatSuggestions?.Clear();
-        await chatInput!.FocusAsync();
-    }
-
-    public void Dispose()
-        => currentResponseCancellation?.Cancel();
-}
@@ -1,11 +0,0 @@
-.chat-container {
-    position: sticky;
-    bottom: 0;
-    padding-left: 1.5rem;
-    padding-right: 1.5rem;
-    padding-top: 0.75rem;
-    padding-bottom: 1.5rem;
-    border-top-width: 1px;
-    background-color: #F3F4F6;
-    border-color: #E5E7EB;
-}
@@ -1,38 +0,0 @@
-@using System.Web
-@if (!string.IsNullOrWhiteSpace(viewerUrl))
-{
-    <a href="@viewerUrl" target="_blank" class="citation">
-        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-            <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9Z" />
-        </svg>
-        <div class="citation-content">
-            <div class="citation-file">@File</div>
-            <div>@Quote</div>
-        </div>
-    </a>
-}
-
-@code {
-    [Parameter]
-    public required string File { get; set; }
-
-    [Parameter]
-    public int? PageNumber { get; set; }
-
-    [Parameter]
-    public required string Quote { get; set; }
-
-    private string? viewerUrl;
-
-    protected override void OnParametersSet()
-    {
-        viewerUrl = null;
-
-        // If you ingest other types of content besides PDF files, construct a URL to an appropriate viewer here
-        if (File.EndsWith(".pdf"))
-        {
-            var search = Quote?.Trim('.', ',', ' ', '\n', '\r', '\t', '"', '\'');
-            viewerUrl = $"lib/pdf_viewer/viewer.html?file=/Data/{HttpUtility.UrlEncode(File)}#page={PageNumber}&search={HttpUtility.UrlEncode(search)}&phrase=true";
-        }
-    }
-}
@@ -1,37 +0,0 @@
-.citation {
-    display: inline-flex;
-    padding-top: 0.5rem;
-    padding-bottom: 0.5rem;
-    padding-left: 0.75rem;
-    padding-right: 0.75rem;
-    margin-top: 1rem;
-    margin-right: 1rem;
-    border-bottom: 2px solid #a770de;
-    gap: 0.5rem;
-    border-radius: 0.25rem;
-    font-size: 0.875rem;
-    line-height: 1.25rem;
-    background-color: #ffffff;
-}
-
-    .citation[href]:hover {
-        outline: 1px solid #865cb1;
-    }
-
-    .citation svg {
-        width: 1.5rem;
-        height: 1.5rem;
-    }
-
-    .citation:active {
-        background-color: rgba(0,0,0,0.05);
-    }
-
-.citation-content {
-    display: flex;
-    flex-direction: column;
-}
-
-.citation-file {
-    font-weight: 600;
-}
@@ -1,17 +0,0 @@
-<div class="chat-header-container main-background-gradient">
-    <div class="chat-header-controls page-width">
-        <button class="btn-default" @onclick="@OnNewChat">
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="new-chat-icon">
-                <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
-            </svg>
-            New chat
-        </button>
-    </div>
-
-    <h1 class="page-width">AGUI WebChat</h1>
-</div>
-
-@code {
-    [Parameter]
-    public EventCallback OnNewChat { get; set; }
-}
@@ -1,25 +0,0 @@
-.chat-header-container {
-    top: 0;
-    padding: 1.5rem;
-}
-
-.chat-header-controls {
-    margin-bottom: 1.5rem;
-}
-
-h1 {
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.new-chat-icon {
-    width: 1.25rem;
-    height: 1.25rem;
-    color: rgb(55, 65, 81);
-}
-
-@media (min-width: 768px) {
-    .chat-header-container {
-        position: sticky;
-    }
-}
@@ -1,51 +0,0 @@
-@inject IJSRuntime JS
-
-<EditForm Model="@this" OnValidSubmit="@SendMessageAsync">
-    <label class="input-box page-width">
-        <textarea @ref="@textArea" @bind="@messageText" placeholder="Type your message..." rows="1"></textarea>
-
-        <div class="tools">
-            <button type="submit" title="Send" class="send-button">
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="tool-icon">
-                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 12 3.269 3.125A59.769 59.769 0 0 1 21.485 12 59.768 59.768 0 0 1 3.27 20.875L5.999 12Zm0 0h7.5" />
-                </svg>
-            </button>
-        </div>
-    </label>
-</EditForm>
-
-@code {
-    private ElementReference textArea;
-    private string? messageText;
-
-    [Parameter]
-    public EventCallback<ChatMessage> OnSend { get; set; }
-
-    public ValueTask FocusAsync()
-        => textArea.FocusAsync();
-
-    private async Task SendMessageAsync()
-    {
-        if (messageText is { Length: > 0 } text)
-        {
-            messageText = null;
-            await OnSend.InvokeAsync(new ChatMessage(ChatRole.User, text));
-        }
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            try
-            {
-                var module = await JS.InvokeAsync<IJSObjectReference>("import", "./Components/Pages/Chat/ChatInput.razor.js");
-                await module.InvokeVoidAsync("init", textArea);
-                await module.DisposeAsync();
-            }
-            catch (JSDisconnectedException)
-            {
-            }
-        }
-    }
-}
@@ -1,57 +0,0 @@
-.input-box {
-    display: flex;
-    flex-direction: column;
-    background: white;
-    border: 1px solid rgb(229, 231, 235);
-    border-radius: 8px;
-    padding: 0.5rem 0.75rem;
-    margin-top: 0.75rem;
-}
-
-    .input-box:focus-within {
-        outline: 2px solid #4152d5;
-    }
-
-textarea {
-    resize: none;
-    border: none;
-    outline: none;
-    flex-grow: 1;
-}
-
-    textarea:placeholder-shown + .tools {
-        --send-button-color: #aaa;
-    }
-
-.tools {
-    display: flex;
-    margin-top: 1rem;
-    align-items: center;
-}
-
-.tool-icon {
-    width: 1.25rem;
-    height: 1.25rem;
-}
-
-.send-button {
-    color: var(--send-button-color);
-    margin-left: auto;
-}
-
-    .send-button:hover {
-        color: black;
-    }
-
-.attach {
-    background-color: white;
-    border-style: dashed;
-    color: #888;
-    border-color: #888;
-    padding: 3px 8px;
-}
-
-    .attach:hover {
-        background-color: #f0f0f0;
-        color: black;
-    }
@@ -1,43 +0,0 @@
-export function init(elem) {
-    elem.focus();
-
-    // Auto-resize whenever the user types or if the value is set programmatically
-    elem.addEventListener('input', () => resizeToFit(elem));
-    afterPropertyWritten(elem, 'value', () => resizeToFit(elem));
-
-    // Auto-submit the form on 'enter' keypress
-    elem.addEventListener('keydown', (e) => {
-        if (e.key === 'Enter' && !e.shiftKey) {
-            e.preventDefault();
-            elem.dispatchEvent(new CustomEvent('change', { bubbles: true }));
-            elem.closest('form').dispatchEvent(new CustomEvent('submit', { bubbles: true, cancelable: true }));
-        }
-    });
-}
-
-function resizeToFit(elem) {
-    const lineHeight = parseFloat(getComputedStyle(elem).lineHeight);
-
-    elem.rows = 1;
-    const numLines = Math.ceil(elem.scrollHeight / lineHeight);
-    elem.rows = Math.min(5, Math.max(1, numLines));
-}
-
-function afterPropertyWritten(target, propName, callback) {
-    const descriptor = getPropertyDescriptor(target, propName);
-    Object.defineProperty(target, propName, {
-        get: function () {
-            return descriptor.get.apply(this, arguments);
-        },
-        set: function () {
-            const result = descriptor.set.apply(this, arguments);
-            callback();
-            return result;
-        }
-    });
-}
-
-function getPropertyDescriptor(target, propertyName) {
-    return Object.getOwnPropertyDescriptor(target, propertyName)
-        || getPropertyDescriptor(Object.getPrototypeOf(target), propertyName);
-}
@@ -1,73 +0,0 @@
-@using System.Runtime.CompilerServices
-@using System.Text.RegularExpressions
-@using System.Linq
-
-@if (Message.Role == ChatRole.User)
-{
-    <div class="user-message">
-        @Message.Text
-    </div>
-}
-else if (Message.Role == ChatRole.Assistant)
-{
-    foreach (var content in Message.Contents)
-    {
-        if (content is TextContent { Text: { Length: > 0 } text })
-        {
-            <div class="assistant-message">
-                <div>
-                    <div class="assistant-message-icon">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 18v-5.25m0 0a6.01 6.01 0 0 0 1.5-.189m-1.5.189a6.01 6.01 0 0 1-1.5-.189m3.75 7.478a12.06 12.06 0 0 1-4.5 0m3.75 2.383a14.406 14.406 0 0 1-3 0M14.25 18v-.192c0-.983.658-1.823 1.508-2.316a7.5 7.5 0 1 0-7.517 0c.85.493 1.509 1.333 1.509 2.316V18" />
-                        </svg>
-                    </div>
-                </div>
-                <div class="assistant-message-header">Assistant</div>
-                <div class="assistant-message-text">
-                    <div>@((MarkupString)text)</div>
-                </div>
-            </div>
-        }
-        else if (content is FunctionCallContent { Name: "Search" } fcc && fcc.Arguments?.TryGetValue("searchPhrase", out var searchPhrase) is true)
-        {
-            <div class="assistant-search">
-                <div class="assistant-search-icon">
-                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
-                    </svg>
-                </div>
-                <div class="assistant-search-content">
-                    Searching:
-                    <span class="assistant-search-phrase">@searchPhrase</span>
-                    @if (fcc.Arguments?.TryGetValue("filenameFilter", out var filenameObj) is true && filenameObj is string filename && !string.IsNullOrEmpty(filename))
-                    {
-                        <text> in </text><span class="assistant-search-phrase">@filename</span>
-                    }
-                </div>
-            </div>
-        }
-    }
-}
-
-@code {
-    private static readonly ConditionalWeakTable<ChatMessage, ChatMessageItem> SubscribersLookup = new();
-
-    [Parameter, EditorRequired]
-    public required ChatMessage Message { get; set; }
-
-    [Parameter]
-    public bool InProgress { get; set;}
-
-    protected override void OnInitialized()
-    {
-        SubscribersLookup.AddOrUpdate(Message, this);
-    }
-
-    public static void NotifyChanged(ChatMessage source)
-    {
-        if (SubscribersLookup.TryGetValue(source, out var subscriber))
-        {
-            subscriber.StateHasChanged();
-        }
-    }
-}
@@ -1,67 +0,0 @@
-.user-message {
-    background: rgb(182 215 232);
-    align-self: flex-end;
-    min-width: 25%;
-    max-width: calc(100% - 5rem);
-    padding: 0.5rem 1.25rem;
-    border-radius: 0.25rem;
-    color: #1F2937;
-    white-space: pre-wrap;
-}
-
-.assistant-message, .assistant-search {
-    display: grid;
-    grid-template-rows: min-content;
-    grid-template-columns: 2rem minmax(0, 1fr);
-    gap: 0.25rem;
-}
-
-.assistant-message-header {
-    font-weight: 600;
-}
-
-.assistant-message-text {
-    grid-column-start: 2;
-}
-
-.assistant-message-icon {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border-radius: 9999px;
-    width: 1.5rem;
-    height: 1.5rem;
-    color: #ffffff;
-    background: #9b72ce;
-}
-
-    .assistant-message-icon svg {
-        width: 1rem;
-        height: 1rem;
-    }
-
-.assistant-search {
-    font-size: 0.875rem;
-    line-height: 1.25rem;
-}
-
-.assistant-search-icon {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 1.5rem;
-    height: 1.5rem;
-}
-
-    .assistant-search-icon svg {
-        width: 1rem;
-        height: 1rem;
-    }
-
-.assistant-search-content {
-    align-content: center;
-}
-
-.assistant-search-phrase {
-    font-weight: 600;
-}
@@ -1,42 +0,0 @@
-@inject IJSRuntime JS
-
-<div class="message-list-container">
-    <chat-messages class="page-width message-list" in-progress="@(InProgressMessage is not null)">
-        @foreach (var message in Messages)
-        {
-            <ChatMessageItem @key="@message" Message="@message" />
-        }
-
-        @if (InProgressMessage is not null)
-        {
-            <ChatMessageItem Message="@InProgressMessage" InProgress="true" />
-            <LoadingSpinner />
-        }
-        else if (IsEmpty)
-        {
-            <div class="no-messages">@NoMessagesContent</div>
-        }
-    </chat-messages>
-</div>
-
-@code {
-    [Parameter]
-    public required IEnumerable<ChatMessage> Messages { get; set; }
-
-    [Parameter]
-    public ChatMessage? InProgressMessage { get; set; }
-
-    [Parameter]
-    public RenderFragment? NoMessagesContent { get; set; }
-
-    private bool IsEmpty => !Messages.Any(m => (m.Role == ChatRole.User || m.Role == ChatRole.Assistant) && !string.IsNullOrEmpty(m.Text));
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            // Activates the auto-scrolling behavior
-            await JS.InvokeVoidAsync("import", "./Components/Pages/Chat/ChatMessageList.razor.js");
-        }
-    }
-}
@@ -1,22 +0,0 @@
-.message-list-container {
-    margin: 2rem 1.5rem;
-    flex-grow: 1;
-}
-
-.message-list {
-    display: flex;
-    flex-direction: column;
-    gap: 1.25rem;
-}
-
-.no-messages {
-    text-align: center;
-    font-size: 1.25rem;
-    color: #999;
-    margin-top: calc(40vh - 18rem);
-}
-
-chat-messages > ::deep div:last-of-type {
-    /* Adds some vertical buffer to so that suggestions don't overlap the output when they appear */
-    margin-bottom: 2rem;
-}
@@ -1,34 +0,0 @@
-// The following logic provides auto-scroll behavior for the chat messages list.
-// If you don't want that behavior, you can simply not load this module.
-
-window.customElements.define('chat-messages', class ChatMessages extends HTMLElement {
-    static _isFirstAutoScroll = true;
-
-    connectedCallback() {
-        this._observer = new MutationObserver(mutations => this._scheduleAutoScroll(mutations));
-        this._observer.observe(this, { childList: true, attributes: true });
-    }
-
-    disconnectedCallback() {
-        this._observer.disconnect();
-    }
-
-    _scheduleAutoScroll(mutations) {
-        // Debounce the calls in case multiple DOM updates occur together
-        cancelAnimationFrame(this._nextAutoScroll);
-        this._nextAutoScroll = requestAnimationFrame(() => {
-            const addedUserMessage = mutations.some(m => Array.from(m.addedNodes).some(n => n.parentElement === this && n.classList?.contains('user-message')));
-            const elem = this.lastElementChild;
-            if (ChatMessages._isFirstAutoScroll || addedUserMessage || this._elemIsNearScrollBoundary(elem, 300)) {
-                elem.scrollIntoView({ behavior: ChatMessages._isFirstAutoScroll ? 'instant' : 'smooth' });
-                ChatMessages._isFirstAutoScroll = false;
-            }
-        });
-    }
-
-    _elemIsNearScrollBoundary(elem, threshold) {
-        const maxScrollPos = document.body.scrollHeight - window.innerHeight;
-        const remainingScrollDistance = maxScrollPos - window.scrollY;
-        return remainingScrollDistance < elem.offsetHeight + threshold;
-    }
-});
@@ -1,78 +0,0 @@
-@inject IChatClient ChatClient
-
-@if (suggestions is not null)
-{
-    <div class="page-width suggestions">
-        @foreach (var suggestion in suggestions)
-        {
-            <button class="btn-subtle" @onclick="@(() => AddSuggestionAsync(suggestion))">
-                @suggestion
-            </button>
-        }
-    </div>
-}
-
-@code {
-    private static string Prompt = @"
-        Suggest up to 3 follow-up questions that I could ask you to help me complete my task.
-        Each suggestion must be a complete sentence, maximum 6 words.
-        Each suggestion must be phrased as something that I (the user) would ask you (the assistant) in response to your previous message,
-        for example 'How do I do that?' or 'Explain ...'.
-        If there are no suggestions, reply with an empty list.
-    ";
-
-    private string[]? suggestions;
-    private CancellationTokenSource? cancellation;
-
-    [Parameter]
-    public EventCallback<ChatMessage> OnSelected { get; set; }
-
-    public void Clear()
-    {
-        suggestions = null;
-        cancellation?.Cancel();
-    }
-
-    public void Update(IReadOnlyList<ChatMessage> messages)
-    {
-        // Runs in the background and handles its own cancellation/errors
-        _ = UpdateSuggestionsAsync(messages);
-    }
-
-    private async Task UpdateSuggestionsAsync(IReadOnlyList<ChatMessage> messages)
-    {
-        cancellation?.Cancel();
-        cancellation = new CancellationTokenSource();
-
-        try
-        {
-            var response = await ChatClient.GetResponseAsync<string[]>(
-                [.. ReduceMessages(messages), new(ChatRole.User, Prompt)],
-                cancellationToken: cancellation.Token);
-            if (!response.TryGetResult(out suggestions))
-            {
-                suggestions = null;
-            }
-
-            StateHasChanged();
-        }
-        catch (Exception ex) when (ex is not OperationCanceledException)
-        {
-            await DispatchExceptionAsync(ex);
-        }
-    }
-
-    private async Task AddSuggestionAsync(string text)
-    {
-        await OnSelected.InvokeAsync(new(ChatRole.User, text));
-    }
-
-    private IEnumerable<ChatMessage> ReduceMessages(IReadOnlyList<ChatMessage> messages)
-    {
-        // Get any leading system messages, plus up to 5 user/assistant messages
-        // This should be enough context to generate suggestions without unnecessarily resending entire conversations when long
-        var systemMessages = messages.TakeWhile(m => m.Role == ChatRole.System);
-        var otherMessages = messages.Where((m, index) => m.Role == ChatRole.User || m.Role == ChatRole.Assistant).Where(m => !string.IsNullOrEmpty(m.Text)).TakeLast(5);
-        return systemMessages.Concat(otherMessages);
-    }
-}
@@ -1,9 +0,0 @@
-.suggestions {
-    text-align: right;
-    white-space: nowrap;
-    gap: 0.5rem;
-    justify-content: flex-end;
-    flex-wrap: wrap;
-    display: flex;
-    margin-bottom: 0.75rem;
-}
@@ -1,6 +0,0 @@
-<Router AppAssembly="typeof(Program).Assembly">
-    <Found Context="routeData">
-        <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
-        <FocusOnNavigate RouteData="routeData" Selector="h1" />
-    </Found>
-</Router>
@@ -1,12 +0,0 @@
-@using System.Net.Http
-@using System.Net.Http.Json
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using static Microsoft.AspNetCore.Components.Web.RenderMode
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.JSInterop
-@using AGUIWebChatClient
-@using AGUIWebChatClient.Components
-@using AGUIWebChatClient.Components.Layout
-@using Microsoft.Extensions.AI
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using AGUIWebChatClient.Components;
-using Microsoft.Agents.AI.AGUI;
-
-WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-builder.Services.AddRazorComponents()
-    .AddInteractiveServerComponents();
-
-string serverUrl = builder.Configuration["SERVER_URL"] ?? "http://localhost:5100";
-
-builder.Services.AddHttpClient("aguiserver", httpClient => httpClient.BaseAddress = new Uri(serverUrl));
-
-builder.Services.AddChatClient(sp => new AGUIChatClient(
-    sp.GetRequiredService<IHttpClientFactory>().CreateClient("aguiserver"), "ag-ui"));
-
-WebApplication app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (!app.Environment.IsDevelopment())
-{
-    app.UseExceptionHandler("/Error", createScopeForErrors: true);
-    app.UseHsts();
-}
-
-app.UseHttpsRedirection();
-app.UseAntiforgery();
-app.MapStaticAssets();
-app.MapRazorComponents<App>()
-    .AddInteractiveServerRenderMode();
-
-app.Run();
@@ -1,15 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "SERVER_URL": "http://localhost:5100"
-      }
-    }
-  }
-}
@@ -1,93 +0,0 @@
-html {
-    min-height: 100vh;
-}
-
-html, .main-background-gradient {
-    background: linear-gradient(to bottom, rgb(225 227 233), #f4f4f4 25rem);
-}
-
-body {
-    display: flex;
-    flex-direction: column;
-    min-height: 100vh;
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-}
-
-html::after {
-    content: '';
-    background-image: linear-gradient(to right, #3a4ed5, #3acfd5 15%, #d53abf 85%, red);
-    width: 100%;
-    height: 2px;
-    position: fixed;
-    top: 0;
-}
-
-h1 {
-    font-size: 2.25rem;
-    line-height: 2.5rem;
-    font-weight: 600;
-}
-
-h1:focus {
-    outline: none;
-}
-
-.valid.modified:not([type=checkbox]) {
-    outline: 1px solid #26b050;
-}
-
-.invalid {
-    outline: 1px solid #e50000;
-}
-
-.validation-message {
-    color: #e50000;
-}
-
-.blazor-error-boundary {
-    background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
-    padding: 1rem 1rem 1rem 3.7rem;
-    color: white;
-}
-
-    .blazor-error-boundary::after {
-        content: "An error has occurred."
-    }
-
-.btn-default {
-    display: flex;
-    padding: 0.25rem 0.75rem;
-    gap: 0.25rem;
-    align-items: center;
-    border-radius: 0.25rem;
-    border: 1px solid #9CA3AF;
-    font-size: 0.875rem;
-    line-height: 1.25rem;
-    font-weight: 600;
-    background-color: #D1D5DB;
-}
-
-    .btn-default:hover {
-        background-color: #E5E7EB;
-    }
-
-.btn-subtle {
-    display: flex;
-    padding: 0.25rem 0.75rem;
-    gap: 0.25rem;
-    align-items: center;
-    border-radius: 0.25rem;
-    border: 1px solid #D1D5DB;
-    font-size: 0.875rem;
-    line-height: 1.25rem;
-}
-
-    .btn-subtle:hover {
-        border-color: #93C5FD;
-        background-color: #DBEAFE;
-    }
-
-.page-width {
-    max-width: 1024px;
-    margin: auto;
-}
@@ -1,185 +0,0 @@
-# AGUI WebChat Sample
-
-This sample demonstrates a Blazor-based web chat application using the AG-UI protocol to communicate with an AI agent server.
-
-The sample consists of two projects:
-
-1. **Server** - An ASP.NET Core server that hosts a simple chat agent using the AG-UI protocol
-2. **Client** - A Blazor Server application with a rich chat UI for interacting with the agent
-
-## Prerequisites
-
-### Azure OpenAI Configuration
-
-The server requires Azure OpenAI credentials. Set the following environment variables:
-
-```powershell
-$env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/"
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="your-deployment-name"  # e.g., "gpt-4o"
-```
-
-The server uses `DefaultAzureCredential` for authentication. Ensure you are logged in using one of the following methods:
-
- Azure CLI: `az login`
- Azure PowerShell: `Connect-AzAccount`
- Visual Studio or VS Code with Azure extensions
- Environment variables with service principal credentials
-
-## Running the Sample
-
-### Step 1: Start the Server
-
-Open a terminal and navigate to the Server directory:
-
-```powershell
-cd Server
-dotnet run
-```
-
-The server will start on `http://localhost:5100` and expose the AG-UI endpoint at `/ag-ui`.
-
-### Step 2: Start the Client
-
-Open a new terminal and navigate to the Client directory:
-
-```powershell
-cd Client
-dotnet run
-```
-
-The client will start on `http://localhost:5000`. Open your browser and navigate to `http://localhost:5000` to access the chat interface.
-
-### Step 3: Chat with the Agent
-
-Type your message in the text box at the bottom of the page and press Enter or click the send button. The assistant will respond with streaming text that appears in real-time.
-
-Features:
- **Streaming responses**: Watch the assistant's response appear word by word
- **Conversation suggestions**: The assistant may offer follow-up questions after responding
- **New chat**: Click the "New chat" button to start a fresh conversation
- **Auto-scrolling**: The chat automatically scrolls to show new messages
-
-## How It Works
-
-### Server (AG-UI Host)
-
-The server (`Server/Program.cs`) creates a simple chat agent:
-
-```csharp
-// Create Azure OpenAI client
-AzureOpenAIClient azureOpenAIClient = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new DefaultAzureCredential());
-
-ChatClient chatClient = azureOpenAIClient.GetChatClient(deploymentName);
-
-// Create AI agent
-ChatClientAgent agent = chatClient.AsIChatClient().CreateAIAgent(
-    name: "ChatAssistant",
-    instructions: "You are a helpful assistant.");
-
-// Map AG-UI endpoint
-app.MapAGUI("/ag-ui", agent);
-```
-
-The server exposes the agent via the AG-UI protocol at `http://localhost:5100/ag-ui`.
-
-### Client (Blazor Web App)
-
-The client (`Client/Program.cs`) configures an `AGUIChatClient` to connect to the server:
-
-```csharp
-string serverUrl = builder.Configuration["SERVER_URL"] ?? "http://localhost:5100";
-
-builder.Services.AddHttpClient("aguiserver", httpClient => httpClient.BaseAddress = new Uri(serverUrl));
-
-builder.Services.AddChatClient(sp => new AGUIChatClient(
-    sp.GetRequiredService<IHttpClientFactory>().CreateClient("aguiserver"), "ag-ui"));
-```
-
-The Blazor UI (`Client/Components/Pages/Chat/Chat.razor`) uses the `IChatClient` to:
- Send user messages to the agent
- Stream responses back in real-time
- Maintain conversation history
- Display messages with appropriate styling
-
-### UI Components
-
-The chat interface is built from several Blazor components:
-
- **Chat.razor** - Main chat page coordinating the conversation flow
- **ChatHeader.razor** - Header with "New chat" button
- **ChatMessageList.razor** - Scrollable list of messages with auto-scroll
- **ChatMessageItem.razor** - Individual message rendering (user vs assistant)
- **ChatInput.razor** - Text input with auto-resize and keyboard shortcuts
- **ChatSuggestions.razor** - AI-generated follow-up question suggestions
- **LoadingSpinner.razor** - Animated loading indicator during streaming
-
-## Configuration
-
-### Server Configuration
-
-The server URL and port are configured in `Server/Properties/launchSettings.json`:
-
-```json
-{
-  "profiles": {
-    "http": {
-      "applicationUrl": "http://localhost:5100"
-    }
-  }
-}
-```
-
-### Client Configuration
-
-The client connects to the server URL specified in `Client/Properties/launchSettings.json`:
-
-```json
-{
-  "profiles": {
-    "http": {
-      "applicationUrl": "http://localhost:5000",
-      "environmentVariables": {
-        "SERVER_URL": "http://localhost:5100"
-      }
-    }
-  }
-}
-```
-
-To change the server URL, modify the `SERVER_URL` environment variable in the client's launch settings or provide it at runtime:
-
-```powershell
-$env:SERVER_URL="http://your-server:5100"
-dotnet run
-```
-
-## Customization
-
-### Changing the Agent Instructions
-
-Edit the instructions in `Server/Program.cs`:
-
-```csharp
-ChatClientAgent agent = chatClient.AsIChatClient().CreateAIAgent(
-    name: "ChatAssistant",
-    instructions: "You are a helpful coding assistant specializing in C# and .NET.");
-```
-
-### Styling the UI
-
-The chat interface uses CSS files colocated with each Razor component. Key styles:
-
- `wwwroot/app.css` - Global styles, buttons, color scheme
- `Components/Pages/Chat/Chat.razor.css` - Chat container layout
- `Components/Pages/Chat/ChatMessageItem.razor.css` - Message bubbles and icons
- `Components/Pages/Chat/ChatInput.razor.css` - Input box styling
-
-### Disabling Suggestions
-
-To disable the AI-generated follow-up suggestions, comment out the suggestions component in `Chat.razor`:
-
-```razor
-@* <ChatSuggestions OnSelected="@AddUserMessageAsync" @ref="@chatSuggestions" /> *@
-```
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.AGUI\Microsoft.Agents.AI.AGUI.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates a basic AG-UI server hosting a chat agent for the Blazor web client.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Hosting.AGUI.AspNetCore;
-using Microsoft.Extensions.AI;
-using OpenAI.Chat;
-
-WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
-builder.Services.AddHttpClient().AddLogging();
-builder.Services.AddAGUI();
-
-WebApplication app = builder.Build();
-
-string endpoint = builder.Configuration["AZURE_OPENAI_ENDPOINT"] ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-string deploymentName = builder.Configuration["AZURE_OPENAI_DEPLOYMENT_NAME"] ?? throw new InvalidOperationException("AZURE_OPENAI_DEPLOYMENT_NAME is not set.");
-
-// Create the AI agent
-AzureOpenAIClient azureOpenAIClient = new(
-    new Uri(endpoint),
-    new DefaultAzureCredential());
-
-ChatClient chatClient = azureOpenAIClient.GetChatClient(deploymentName);
-
-ChatClientAgent agent = chatClient.AsIChatClient().CreateAIAgent(
-    name: "ChatAssistant",
-    instructions: "You are a helpful assistant.");
-
-// Map the AG-UI agent endpoint
-app.MapAGUI("/ag-ui", agent);
-
-await app.RunAsync();
@@ -1,14 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5100",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
@@ -2,7 +2,7 @@

 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
-using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.Hosting;

 namespace AgentWebChat.AgentHost;

@@ -10,24 +10,24 @@ internal static class ActorFrameworkWebApplicationExtensions
 {
    public static void MapAgentDiscovery(this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string path)
    {
-        var registeredAIAgents = endpoints.ServiceProvider.GetKeyedServices<AIAgent>(KeyedService.AnyKey);
-
        var routeGroup = endpoints.MapGroup(path);
-        routeGroup.MapGet("/", async (CancellationToken cancellationToken) =>
-        {
-            var results = new List<AgentDiscoveryCard>();
-            foreach (var result in registeredAIAgents)
+        routeGroup.MapGet("/", async (
+            AgentCatalog agentCatalog,
+            CancellationToken cancellationToken) =>
            {
-                results.Add(new AgentDiscoveryCard
+                var results = new List<AgentDiscoveryCard>();
+                await foreach (var result in agentCatalog.GetAgentsAsync(cancellationToken).ConfigureAwait(false))
                {
-                    Name = result.Name!,
-                    Description = result.Description,
-                });
-            }
+                    results.Add(new AgentDiscoveryCard
+                    {
+                        Name = result.Name!,
+                        Description = result.Description,
+                    });
+                }

-            return Results.Ok(results);
-        })
-        .WithName("GetAgents");
+                return Results.Ok(results);
+            })
+            .WithName("GetAgents");
    }

    internal sealed class AgentDiscoveryCard
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.DevUI\Microsoft.Agents.AI.DevUI.csproj" />
    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Workflows\Microsoft.Agents.AI.Workflows.csproj" />
    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Abstractions\Microsoft.Agents.AI.Abstractions.csproj" />
    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Hosting\Microsoft.Agents.AI.Hosting.csproj" />
@@ -31,4 +30,11 @@
    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
  </ItemGroup>

+  <!-- A2A dependency -->
+  <ItemGroup>
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+  </ItemGroup>
+  <!-- A2A dependency -->
+
 </Project>
@@ -4,7 +4,9 @@ using Microsoft.Extensions.AI;

 namespace AgentWebChat.AgentHost.Custom;

-public class CustomAITool : AITool;
+public class CustomAITool : AITool
+{
+}

 public class CustomFunctionTool : AIFunction
 {
@@ -5,7 +5,6 @@ using AgentWebChat.AgentHost;
 using AgentWebChat.AgentHost.Custom;
 using AgentWebChat.AgentHost.Utilities;
 using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.DevUI;
 using Microsoft.Agents.AI.Hosting;
 using Microsoft.Agents.AI.Workflows;
 using Microsoft.Extensions.AI;
@@ -22,13 +21,6 @@ builder.Services.AddProblemDetails();
 // Configure the chat model and our agent.
 builder.AddKeyedChatClient("chat-model");

-// Add DevUI services
-builder.AddDevUI();
-
-// Add OpenAI services
-builder.AddOpenAIChatCompletions();
-builder.AddOpenAIResponses();
-
 var pirateAgentBuilder = builder.AddAIAgent(
    "pirate",
    instructions: "You are a pirate. Speak like a pirate",
@@ -103,48 +95,8 @@ var scienceConcurrentWorkflow = builder.AddWorkflow("science-concurrent-workflow
    return AgentWorkflowBuilder.BuildConcurrent(workflowName: key, agents: agents);
 }).AddAsAIAgent();

-builder.AddWorkflow("nonAgentWorkflow", (sp, key) =>
-{
-    List<IHostedAgentBuilder> usedAgents = [pirateAgentBuilder, chemistryAgent];
-    var agents = usedAgents.Select(ab => sp.GetRequiredKeyedService<AIAgent>(ab.Name));
-    return AgentWorkflowBuilder.BuildSequential(workflowName: key, agents: agents);
-});
-
-builder.Services.AddKeyedSingleton("NonAgentAndNonmatchingDINameWorkflow", (sp, key) =>
-{
-    List<IHostedAgentBuilder> usedAgents = [pirateAgentBuilder, chemistryAgent];
-    var agents = usedAgents.Select(ab => sp.GetRequiredKeyedService<AIAgent>(ab.Name));
-    return AgentWorkflowBuilder.BuildSequential(workflowName: "random-name", agents: agents);
-});
-
-builder.Services.AddSingleton<AIAgent>(sp =>
-{
-    var chatClient = sp.GetRequiredKeyedService<IChatClient>("chat-model");
-    return new ChatClientAgent(chatClient, name: "default-agent", instructions: "you are a default agent.");
-});
-
-builder.Services.AddKeyedSingleton<AIAgent>("my-di-nonmatching-agent", (sp, name) =>
-{
-    var chatClient = sp.GetRequiredKeyedService<IChatClient>("chat-model");
-    return new ChatClientAgent(
-        chatClient,
-        name: "some-random-name", // demonstrating registration can be different for DI and actual agent
-        instructions: "you are a dependency inject agent. Tell me all about dependency injection.");
-});
-
-builder.Services.AddKeyedSingleton<AIAgent>("my-di-matchingname-agent", (sp, name) =>
-{
-    if (name is not string nameStr)
-    {
-        throw new NotSupportedException("Name should be passed as a key");
-    }
-
-    var chatClient = sp.GetRequiredKeyedService<IChatClient>("chat-model");
-    return new ChatClientAgent(
-        chatClient,
-        name: nameStr, // demonstrating registration with the same name
-        instructions: "you are a dependency inject agent. Tell me all about dependency injection.");
-});
+builder.AddOpenAIChatCompletions();
+builder.AddOpenAIResponses();

 var app = builder.Build();

@@ -166,10 +118,7 @@ app.MapA2A(knightsKnavesAgentBuilder, path: "/a2a/knights-and-knaves", agentCard
    // Url = "http://localhost:5390/a2a/knights-and-knaves"
 });

-app.MapDevUI();
-
 app.MapOpenAIResponses();
-app.MapOpenAIConversations();

 app.MapOpenAIChatCompletions(pirateAgentBuilder);
 app.MapOpenAIChatCompletions(knightsKnavesAgentBuilder);
@@ -4,7 +4,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <IsAspireHost>true</IsAspireHost>
@@ -9,9 +9,7 @@ var azOpenAiResourceGroup = builder.AddParameterFromConfiguration("AzureOpenAIRe
 var chatModel = builder.AddAIModel("chat-model").AsAzureOpenAI("gpt-4o", o => o.AsExisting(azOpenAiResource, azOpenAiResourceGroup));

 var agentHost = builder.AddProject<Projects.AgentWebChat_AgentHost>("agenthost")
-    .WithHttpEndpoint(name: "devui")
-    .WithUrlForEndpoint("devui", (url) => new() { Url = "/devui", DisplayText = "Dev UI" })
-    .WithReference(chatModel);
+        .WithReference(chatModel);

 builder.AddProject<Projects.AgentWebChat_Web>("webfrontend")
    .WithExternalHttpEndpoints()
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <IsAspireSharedProject>true</IsAspireSharedProject>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<div class="lds-ellipsis"><div></div><div></div><div></div><div></div></div>`