Merge branch 'main' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into conflicts-resolve

Author: Ayaz-Microsoft

azure.yaml

@@ -91,4 +91,4 @@ hooks:
         printf "   ${Blue}https://%s${NC}\n\n" "$webSiteDefaultHostname"
 
       shell: sh
-      interactive: true
+      interactive: true

content_packs/contract_compliance/agent_teams/contract_compliance_team.json

@@ -6,6 +6,7 @@
   "created": "",
   "created_by": "",
   "deployment_name": "gpt-5.4-mini",
+  "is_default": true,
   "description": "A multi-agent compliance review team that summarizes NDAs, identifies risks, checks compliance, and recommends improvements using advanced legal reasoning and retrieval-augmented analysis.",
   "logo": "",
   "plan": "",

content_packs/marketing_press_release/agent_teams/marketing.json

@@ -6,6 +6,7 @@
   "created": "",
   "created_by": "",
   "deployment_name": "gpt-5.4-mini",
+  "is_default": true,
   "agents": [
     {
       "input_key": "",

content_packs/retail_customer/agent_teams/retail.json

@@ -6,6 +6,7 @@
   "created": "",
   "created_by": "",
   "deployment_name": "gpt-5.4-mini",
+  "is_default": true,
   "agents": [
     {
       "input_key": "",

docs/ACRBuildAndPushGuide.md

@@ -36,6 +36,7 @@ az acr login --name $ACR_NAME
  ```bash 
 az acr login --name <containerregname>
 docker build --no-cache -f src/backend/Dockerfile -t <acrloginserver>/<repo>:<tagname> ./src/backend
+docker build --no-cache -f src/backend/Dockerfile -t <acrloginserver>/<repo>:<tagname> ./src/backend
 docker push <acrloginserver>/<repo>:<tagname>
  ```
 
@@ -59,6 +60,7 @@ docker push <acrloginserver>/<repo>:<tagname>
 ```bash
 az acr login --name <containerregname>
 docker build --no-cache -f src/App/Dockerfile -t <acrloginserver>/<repo>:<tagname> ./src/App
+docker build --no-cache -f src/App/Dockerfile -t <acrloginserver>/<repo>:<tagname> ./src/App
 docker push <acrloginserver>/<repo>:<tagname>
 ```
 

docs/AzureGPTQuotaSettings.md

@@ -5,6 +5,6 @@
 3. **Go to** the `Management Center` from the bottom-left navigation menu.  
 4. Select `Quota`  
    - Click on the `GlobalStandard` dropdown.  
-   - Select the required **GPT model** (`GPT-5.4`)
+   - Select the required **GPT model** (`gpt-5.4` / `gpt-5.4-mini`)
    - Choose the **region** where the deployment is hosted.  
 5. Request More Quota or delete any unused model deployments as needed.  

docs/DeploymentGuide.md

@@ -68,8 +68,10 @@ Ensure you have access to an [Azure subscription](https://azure.microsoft.com/fr
 📖 **Follow:** [Quota Check Instructions](./quota_check.md) to ensure sufficient capacity.
 
 **Default Quota Configuration:**
-- **GPT-5.4-mini:** 100k tokens
-- **GPT-5.4:** 150k tokens
+- **gpt-5.4 (150k tokens)** — backs the larger GPT model deployment (alias `gpt-5.4`).
+- **gpt-5.4-mini (100k tokens)** — backs the smaller GPT model deployment (alias `gpt-5.4-mini`), also used for reasoning workloads.
+
+> **Note:** The underlying models are `gpt-5.4` (2026-03-05 series) and `gpt-5.4-mini` (2026-03-17 series). Both are reasoning-capable GPT-5.4 GA models.
 
 > **Note:** When you run `azd up`, the deployment will automatically show you regions with available quota, so this pre-check is optional but helpful for planning purposes. You can customize these settings later in [Step 3.3: Advanced Configuration](#33-advanced-configuration-optional).
 
@@ -323,7 +325,8 @@ azd up
 
 **Expected Duration:** 9-10 minutes for default configuration
 
-- **Upon successful completion**, you will see a success message indicating that all resources have been deployed, along with the application URL and next steps for building and pushing the application container images and uploading team configurations and sample data.
+
+- **Upon successful completion**, you will see a success message indicating that all resources have been deployed, along with the application URL. The next steps are to build and push the backend, frontend, and mcp_server container images to ACR, point the container app and web app at them, and upload the team configurations and sample data.
 
 ![Deployment Success message](./images/Deployment_success_message.png)
 
@@ -391,6 +394,10 @@ The images are **built remotely in ACR** using `az acr build`, so no local Docke
 
 ![Usecase selection](./images/Usecase_selection.png)
 
+### 5.3 Access the Application
+
+Once both scripts complete, access your deployed frontend application at the URL printed by the `postdeploy` hook (`https://<webSiteDefaultHostname>`), or retrieve it from the Azure Portal as described in [Step 4.3](#43-get-application-url).
+
 
 ### 5.3 Configure Authentication (Optional)
 
@@ -409,7 +416,7 @@ The images are **built remotely in ACR** using `az acr build`, so no local Docke
 
 1. **Access the application** using the URL from Step 4.3
 2. **Sign in** with your authenticated account
-3. **Select a use case** from the available scenarios you uploaded in Step 5.1
+3. **Select a use case** from the available scenarios you uploaded in Step 5.2
 4. **Ask a sample question** relevant to the selected use case
 5. **Verify the response** includes appropriate multi-agent collaboration
 6. **Check the logs** in Azure Portal to confirm backend processing

docs/TroubleShootingSteps.md

@@ -1,7 +1,7 @@
 ## Check Quota Availability Before Deployment
 
 Before deploying the accelerator, **ensure sufficient quota availability** for the required model.
-> **For Global Standard | GPT-5.4 - the capacity to at least 150k tokens for optimal performance.**
+> **For Global Standard | gpt-5.4 - set the capacity to at least 150k tokens for optimal performance.**
 
 ### Login if you have not done so already
 ```
@@ -16,7 +16,7 @@ az login --use-device-code
 
 ### 📌 Default Models & Capacities:
 ```
-gpt-5.4-mini:100,gpt-5.4:150
+gpt-5.4:150,gpt-5.4-mini:100
 ```
 ### 📌 Default Regions:
 ```
@@ -43,6 +43,7 @@ australiaeast, eastus2, francecentral, japaneast, norwayeast, swedencentral, uks
 ✔️ Check specific model(s) in default regions:
   ```
   ./quota_check_params.sh --models gpt-5.4:150
+  ./quota_check_params.sh --models gpt-5.4:150
   ```
 ✔️ Check default models in specific region(s):
   ```

docs/quota_check.md

@@ -524,4 +524,3 @@ output MCP_IMAGE_NAME string = isAvm ? avmDeployment!.outputs.MCP_IMAGE_NAME : b
 
 @description('Port the frontend Web App container listens on.')
 output FRONTEND_WEBSITES_PORT string = isAvm ? avmDeployment!.outputs.FRONTEND_WEBSITES_PORT : bicepDeployment!.outputs.FRONTEND_WEBSITES_PORT
-