chore: Conflicts resolve

azure.yaml

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

content_packs/content_gen/agent_teams/content_gen.json

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

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/hr_onboarding/agent_teams/hr.json

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

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": "",

content_packs/rfp_evaluation/agent_teams/rfp_analysis_team.json

@@ -6,6 +6,7 @@
   "created": "",
   "created_by": "",
   "deployment_name": "gpt-5.4-mini",
+  "is_default": true,
   "description": "A specialized multi-agent team that analyzes RFP and contract documents to summarize content, identify potential risks, check compliance gaps, and provide action plans for contract improvement.",
   "logo": "",
   "plan": "",

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/quota_check.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):
   ```

infra/main.bicep

@@ -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
-

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.44.1.10279",
-      "templateHash": "2110057819441640559"
+      "templateHash": "17775288733861273358"
     },
     "name": "Multi-Agent Custom Automation Engine - Deployment Router",
     "description": "Deployment router for the Multi-Agent Custom Automation Engine accelerator. Routes to either the AVM or vanilla Bicep orchestrator and preserves a unified deployment contract."
@@ -561,7 +561,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.44.1.10279",
-              "templateHash": "10080544909430391861"
+              "templateHash": "6216243501205527784"
             },
             "name": "Multi-Agent Custom Automation Engine - AVM",
             "description": "AVM orchestrator for the Multi-Agent Custom Automation Engine accelerator. Deploys the same logical resources and preserves the same outputs as infra\\main.bicep using local AVM wrapper modules."
@@ -1242,7 +1242,7 @@
             "aiSearchIndexNameForRFPSummary": "macae-rfp-summary-index",
             "aiSearchIndexNameForRFPRisk": "macae-rfp-risk-index",
             "aiSearchIndexNameForRFPCompliance": "macae-rfp-compliance-index",
-            "virtualMachineAvailabilityZone": 1,
+            "virtualMachineAvailabilityZone": -1,
             "aiFoundryOpenAIEndpoint": "[format('https://{0}.openai.azure.com/', variables('aiFoundryAiServicesResourceName'))]"
           },
           "resources": {
@@ -29138,7 +29138,7 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.44.1.10279",
-                      "templateHash": "10180502016624897684"
+                      "templateHash": "13733831222630151234"
                     }
                   },
                   "parameters": {
@@ -29164,7 +29164,7 @@
                     "modelName": {
                       "type": "string",
                       "metadata": {
-                        "description": "Required. Model name (e.g., gpt-4o, text-embedding-ada-002)."
+                        "description": "Required. Model name (e.g., gpt-5.4-mini, text-embedding-ada-002)."
                       }
                     },
                     "modelVersion": {
@@ -57521,10 +57521,18 @@
                             "name": "AZURE_OPENAI_IMAGE_DEPLOYMENT",
                             "value": "[parameters('gptImageModelName')]"
                           },
+                          {
+                            "name": "AZURE_OPENAI_IMAGE_QUALITY",
+                            "value": "high"
+                          },
                           {
                             "name": "AZURE_STORAGE_BLOB_URL",
                             "value": "[reference('storage_account').outputs.blobEndpoint.value]"
                           },
+                          {
+                            "name": "AZURE_STORAGE_IMAGES_CONTAINER",
+                            "value": "generated-images"
+                          },
                           {
                             "name": "BACKEND_URL",
                             "value": "[format('https://{0}.{1}', variables('containerAppName'), reference('containerAppEnvironment').outputs.defaultDomain.value)]"
@@ -60245,14 +60253,19 @@
                     "value": {
                       "SCM_DO_BUILD_DURING_DEPLOYMENT": "true",
                       "DOCKER_REGISTRY_SERVER_URL": "[format('https://{0}', if(variables('useExistingContainerRegistry'), format('{0}.azurecr.io', variables('existingContainerRegistryName')), reference('container_registry').outputs.loginServer.value))]",
-                      "WEBSITES_PORT": "3000",
                       "WEBSITES_CONTAINER_START_TIME_LIMIT": "1800",
                       "BACKEND_API_URL": "[format('https://{0}', reference('containerApp').outputs.fqdn.value)]",
                       "AUTH_ENABLED": "false",
                       "PROXY_API_REQUESTS": "[if(parameters('enablePrivateNetworking'), 'true', 'false')]"
                     }
                   },
                   "virtualNetworkSubnetId": "[if(parameters('enablePrivateNetworking'), createObject('value', reference('virtualNetwork').outputs.webserverfarmSubnetResourceId.value), createObject('value', ''))]",
+                  "vnetRouteAllEnabled": {
+                    "value": "[parameters('enablePrivateNetworking')]"
+                  },
+                  "imagePullTraffic": {
+                    "value": "[parameters('enablePrivateNetworking')]"
+                  },
                   "publicNetworkAccess": {
                     "value": "Enabled"
                   },
@@ -60267,7 +60280,7 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.44.1.10279",
-                      "templateHash": "9621160936099183182"
+                      "templateHash": "9504607717010385151"
                     }
                   },
                   "definitions": {
@@ -60805,6 +60818,40 @@
                     }
                   },
                   "resources": {
+                    "site": {
+                      "existing": true,
+                      "type": "Microsoft.Web/sites",
+                      "apiVersion": "2025-03-01",
+                      "name": "[parameters('name')]"
+                    },
+                    "logsConfig": {
+                      "type": "Microsoft.Web/sites/config",
+                      "apiVersion": "2025-03-01",
+                      "name": "[format('{0}/{1}', parameters('name'), 'logs')]",
+                      "properties": {
+                        "applicationLogs": {
+                          "fileSystem": {
+                            "level": "Verbose"
+                          }
+                        },
+                        "detailedErrorMessages": {
+                          "enabled": true
+                        },
+                        "failedRequestsTracing": {
+                          "enabled": true
+                        },
+                        "httpLogs": {
+                          "fileSystem": {
+                            "enabled": true,
+                            "retentionInDays": 1,
+                            "retentionInMb": 35
+                          }
+                        }
+                      },
+                      "dependsOn": [
+                        "appService"
+                      ]
+                    },
                     "appService": {
                       "type": "Microsoft.Resources/deployments",
                       "apiVersion": "2025-04-01",
@@ -60848,6 +60895,7 @@
                               "healthCheckPath": "[if(not(empty(parameters('healthCheckPath'))), parameters('healthCheckPath'), null())]",
                               "webSocketsEnabled": "[parameters('webSocketsEnabled')]",
                               "appCommandLine": "[parameters('appCommandLine')]",
+                              "vnetRouteAllEnabled": "[parameters('vnetRouteAllEnabled')]",
                               "acrUseManagedIdentityCreds": "[not(empty(parameters('acrUserManagedIdentityClientId')))]",
                               "acrUserManagedIdentityID": "[if(not(empty(parameters('acrUserManagedIdentityClientId'))), parameters('acrUserManagedIdentityClientId'), null())]"
                             }
@@ -60861,35 +60909,6 @@
                                 "name": "appsettings",
                                 "properties": "[parameters('appSettings')]",
                                 "applicationInsightResourceId": "[if(not(empty(parameters('applicationInsightResourceId'))), parameters('applicationInsightResourceId'), null())]"
-                              },
-                              {
-                                "name": "logs",
-                                "properties": {
-                                  "applicationLogs": {
-                                    "fileSystem": {
-                                      "level": "Verbose"
-                                    }
-                                  },
-                                  "detailedErrorMessages": {
-                                    "enabled": true
-                                  },
-                                  "failedRequestsTracing": {
-                                    "enabled": true
-                                  },
-                                  "httpLogs": {
-                                    "fileSystem": {
-                                      "enabled": true,
-                                      "retentionInDays": 1,
-                                      "retentionInMb": 35
-                                    }
-                                  }
-                                }
-                              },
-                              {
-                                "name": "web",
-                                "properties": {
-                                  "vnetRouteAllEnabled": "[parameters('vnetRouteAllEnabled')]"
-                                }
                               }
                             ]
                           },
@@ -76885,7 +76904,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.44.1.10279",
-              "templateHash": "11051305577029776274"
+              "templateHash": "1904819476144963209"
             },
             "name": "Multi-Agent Custom Automation Engine - Vanilla Bicep",
             "description": "Vanilla Bicep orchestrator for the Multi-Agent Custom Automation Engine accelerator. This deployment intentionally excludes WAF features such as private networking, scale-out, redundancy, bastion, and VM resources while keeping router-compatible outputs."
@@ -78097,7 +78116,7 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.44.1.10279",
-                      "templateHash": "10180502016624897684"
+                      "templateHash": "13733831222630151234"
                     }
                   },
                   "parameters": {
@@ -78123,7 +78142,7 @@
                     "modelName": {
                       "type": "string",
                       "metadata": {
-                        "description": "Required. Model name (e.g., gpt-4o, text-embedding-ada-002)."
+                        "description": "Required. Model name (e.g., gpt-5.4-mini, text-embedding-ada-002)."
                       }
                     },
                     "modelVersion": {
@@ -80082,10 +80101,18 @@
                             "name": "AZURE_OPENAI_IMAGE_DEPLOYMENT",
                             "value": "[parameters('gptImageModelName')]"
                           },
+                          {
+                            "name": "AZURE_OPENAI_IMAGE_QUALITY",
+                            "value": "high"
+                          },
                           {
                             "name": "AZURE_STORAGE_BLOB_URL",
                             "value": "[reference(resourceId('Microsoft.Resources/deployments', take(format('module.storage-account.{0}', variables('solutionSuffix')), 64)), '2025-04-01').outputs.blobEndpoint.value]"
                           },
+                          {
+                            "name": "AZURE_STORAGE_IMAGES_CONTAINER",
+                            "value": "[parameters('storageContainerNameGeneratedImages')]"
+                          },
                           {
                             "name": "BACKEND_URL",
                             "value": "[format('https://{0}.{1}', variables('backendContainerAppName'), reference(resourceId('Microsoft.Resources/deployments', take(format('module.container-app-environment.{0}', variables('solutionSuffix')), 64)), '2025-04-01').outputs.defaultDomain.value)]"
@@ -80499,7 +80526,6 @@
                     "value": {
                       "SCM_DO_BUILD_DURING_DEPLOYMENT": "true",
                       "DOCKER_REGISTRY_SERVER_URL": "[format('https://{0}', if(variables('useExistingContainerRegistry'), format('{0}.azurecr.io', variables('existingContainerRegistryName')), reference(resourceId('Microsoft.Resources/deployments', take(format('module.container-registry.{0}', variables('solutionSuffix')), 64)), '2025-04-01').outputs.loginServer.value))]",
-                      "WEBSITES_PORT": "3000",
                       "WEBSITES_CONTAINER_START_TIME_LIMIT": "1800",
                       "BACKEND_API_URL": "[format('https://{0}', reference(resourceId('Microsoft.Resources/deployments', take(format('module.backend-container-app.{0}', variables('solutionSuffix')), 64)), '2025-04-01').outputs.fqdn.value)]",
                       "AUTH_ENABLED": "false",

src/App/src/hooks/usePlanWebSocket.tsx

@@ -423,4 +423,4 @@ export function usePlanWebSocket({
     }, [dispatch, planId, continueWithWebsocketFlow]);
 }
 
-export default usePlanWebSocket;
+export default usePlanWebSocket;

src/backend/.env.sample

@@ -3,6 +3,7 @@ COSMOSDB_DATABASE=macae
 COSMOSDB_CONTAINER=memory
 
 AZURE_OPENAI_ENDPOINT=
+AZURE_OPENAI_MODEL_NAME=gpt-5.4-mini
 AZURE_OPENAI_DEPLOYMENT_NAME=gpt-5.4-mini
 AZURE_OPENAI_API_VERSION=2024-12-01-preview
 AZURE_OPENAI_RAI_DEPLOYMENT_NAME=

src/backend/Dockerfile

@@ -8,8 +8,10 @@ ENV UV_COMPILE_BYTECODE=1 UV_LINK_MODE=copy
 
 WORKDIR /app
 
-# Install the project's dependencies using the lockfile and settings
+# Copy lock and project files first for better layer caching
 COPY uv.lock pyproject.toml /app/
+
+# Install the project's dependencies using the lockfile and settings
 RUN uv sync --frozen --no-install-project --no-dev
 
 # Backend app setup