Merge pull request #8300 from sdgilley/sdg-release-merge2

[DIRTY PR] merge main into release and resolve merge conflicts.

Author: rmca14

articles/ai-foundry/.openpublishing.redirection.ai-studio.json

@@ -1278,6 +1278,11 @@
           "redirect_url": "/azure/ai-foundry/agents/overview",
           "redirect_document_id": false
         },
+        {
+          "source_path_from_root": "/articles/ai-foundry/agents/how-to/tools/code-interpreter-samples.md",
+          "redirect_url": "/azure/ai-foundry/agents/how-to/tools/code-interpreter",
+          "redirect_document_id": true
+        },
         {
           "source_path_from_root": "/articles/ai-foundry/how-to/evaluate-prompts-playground.md",
           "redirect_url": "/azure/ai-foundry/concepts/observability",

articles/ai-foundry/agents/concepts/capability-hosts.md

@@ -8,8 +8,10 @@ ms.service: azure-ai-foundry
 ms.subservice: azure-ai-foundry-agent-service
 ms.topic: conceptual
 ms.date: 07/07/2025
-author: fosteramanda
-ms.author: fosteramanda
+author: aahill
+ms.author: aahi
+ms.reviewer: fosteramanda
+monikerRange: 'foundry-classic || foundry'
 ---
 
 # Capability hosts

articles/ai-foundry/agents/concepts/model-region-support.md

@@ -10,6 +10,7 @@ ms.subservice: azure-ai-foundry-agent-service
 ms.topic: conceptual
 ms.date: 10/23/2025
 ms.custom: azure-ai-agents, references_regions
+monikerRange: 'foundry-classic || foundry'
 ---
 
 # Models supported by Azure AI Foundry Agent Service
@@ -25,6 +26,7 @@ All deployments can perform the exact same inference operations, however the bil
 
 Azure AI Foundry Agent Service supports the following Azure OpenAI models in the listed regions.
 
+::: moniker range="foundry-classic"
 > [!NOTE]
 > * [Hub-based projects](../../what-is-azure-ai-foundry.md#project-types) are limited to the following models: gpt-4o, gpt-4o-mini, gpt-4, gpt-35-turbo
 > * [Spillover traffic management](../../openai/how-to/spillover-traffic-management.md) for [provisioned throughput](../../openai/concepts/provisioned-throughput.md) is compatible with agents
@@ -34,6 +36,18 @@ Azure AI Foundry Agent Service supports the following Azure OpenAI models in the
 >     * Brazil south 
 > * The gpt-5 models can only use the [code interpreter](../how-to/tools/code-interpreter.md) and [file search](../how-to/tools/file-search.md) tools 
 >    * [Registration](https://aka.ms/openai/gpt-5/2025-08-07) is required to use the gpt-5 models. Access will be granted according to Microsoft's eligibility criteria.
+::: moniker-end
+
+::: moniker range="foundry"
+> [!NOTE]
+> * [Spillover traffic management](../../openai/how-to/spillover-traffic-management.md) for [provisioned throughput](../../openai/concepts/provisioned-throughput.md) is compatible with agents
+> * For information on class A subnet support, see the setup guide on [GitHub](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/infrastructure-setup/15-private-network-standard-agent-setup).
+> * The [file search tool](../how-to/tools/file-search.md) is currently unavailable in the following regions:
+>     * Italy north
+>     * Brazil south 
+> * The gpt-5 models are available for the [code interpreter](../how-to/tools/code-interpreter.md) and [file search](../how-to/tools/file-search.md) tools 
+>    * [Registration](https://aka.ms/openai/gpt-5/2025-08-07) is required to use the gpt-5 models. Access will be granted according to Microsoft's eligibility criteria.
+::: moniker-end
 
 # [Global standard](#tab/global-standard)
 

articles/ai-foundry/agents/concepts/standard-agent-setup.md

@@ -10,6 +10,7 @@ ms.subservice: azure-ai-foundry-agent-service
 ms.topic: conceptual
 ms.date: 05/05/2025
 ms.custom: azure-ai-agents
+monikerRange: 'foundry-classic || foundry'
 ---
 
 # Built-in enterprise readiness with standard agent setup 

articles/ai-foundry/agents/concepts/threads-runs-messages.md

@@ -10,6 +10,7 @@ ms.subservice: azure-ai-foundry-agent-service
 ms.topic: conceptual
 ms.date: 09/24/2025
 ms.custom: azure-ai-agents
+monikerRange: 'foundry-classic || foundry'
 ---
 
 # Threads, runs, and messages in Azure AI Foundry Agent Service

articles/ai-foundry/agents/environment-setup.md

@@ -11,6 +11,7 @@ ms.subservice: azure-ai-foundry-agent-service
 ms.topic: how-to
 ms.date: 06/18/2025
 ms.custom: azure-ai-agents
+monikerRange: 'foundry-classic || foundry'
 ---
 
 # Set up your environment

articles/ai-foundry/agents/faq.yml

@@ -12,6 +12,7 @@ metadata:
   ms.author: aahi
   author: aahill
   ms.custom: references_regions
+  monikerRange: 'foundry-classic || foundry'
 title: Azure AI Foundry Agent Service frequently asked questions
 summary: |
   If you can't find answers to your questions in this document, and still need help check the [Azure AI services support options guide](../../ai-services/cognitive-services-support-options.md). Azure AI Foundry Agent Service is part of Azure AI services.
@@ -22,8 +23,8 @@ sections:
           Do you store any data used in the Foundry Agent Service API? 
         answer: |
           Yes. Foundry Agent Service is a stateful API, meaning it retains data. There are two types of data stored in the Foundry Agent Service API: 
-          * Stateful entities: Threads, messages, and runs created during usage. 
-          * Files: Uploaded during Foundry Agent Service setup or as part of a message.  
+          * Stateful entities: Conversations and responses created during usage. 
+          * Files and Vector stores: Uploaded during Foundry Agent Service setup or as part of a response generation.  
       - question: |
           Where is this data stored?
         answer: |
@@ -32,11 +33,12 @@ sections:
       - question: |
           How long is this data stored?
         answer: |
-          All used data persists in this system unless you explicitly delete this data. Use the delete function with the thread ID of the thread you want to delete. Clearing the Run in the Foundry Agent Service Playground doesn't delete threads, however deleting them using delete function won't list them in the thread page. 
+          All used data persists in this system unless you explicitly delete this data. Use the delete function with the conversation ID of the conversation you want to delete. Use the delete function with the Response ID of the generated response you want to delete. 
       - question: | 
           Does Foundry Agent Service support customer-managed key encryption (CMK)?
         answer: |
-          Today we support CMK for Threads and Files in Foundry Agent Service.
+          Basic Setup: Supports Microsoft managed keys only.  
+          Standard Setup: Supports CMK.
       - question: |
           Is my data used by Microsoft for training models? 
         answer: |
@@ -108,4 +110,4 @@ sections:
       - question: |
           What additional configuration is needed if I want to add tools to my agents? 
         answer: |
-          The template provides support for the built-in tools: Code Interpreter, File Search, Azure AI Search, Cosmos DB (all tools that use the Bring-Your-Own (BYO) resource connections). To configure tools that require the creation of a new connection, you must create a private endpoint from your `peSubnet`` and create a private link from the Azure Resource. 
+          The template provides support for the built-in tools: Code Interpreter, File Search, Azure AI Search, Cosmos DB (all tools that use the Bring-Your-Own (BYO) resource connections). To configure tools that require the creation of a new connection, you must create a private endpoint from your `peSubnet`` and create a private link from the Azure Resource. 

articles/ai-foundry/agents/how-to/connected-agents.md

@@ -12,6 +12,7 @@ ms.author: aahi
 recommendations: false
 ms.custom: azure-ai-agents-code
 zone_pivot_groups: selection-connected-agents
+monikerRange: 'foundry-classic || foundry'
 ---
 
 # Build collaborative, multi-agent systems with Connected Agents

articles/ai-foundry/agents/how-to/metrics.md

@@ -8,6 +8,7 @@ author: aahill
 ms.author: aahi
 ms.service: azure-ai-foundry
 ms.subservice: azure-ai-foundry-agent-service
+monikerRange: 'foundry-classic || foundry'
 ---
 
 # Monitor Azure AI Foundry Agent Service

articles/ai-foundry/agents/how-to/tools/azure-ai-search.md

@@ -12,6 +12,7 @@ author: haileytap
 ms.author: haileytapia
 ms.reviewer: aahi
 ms.custom: azure-ai-agents
+monikerRange: 'foundry-classic || foundry'
 ---
 
 # Azure AI Search tool