fix: Dev v4 to main PR

docs/LocalDevelopmentSetup.md

@@ -273,8 +273,8 @@ az cosmosdb sql role assignment create --resource-group <solution-accelerator-rg
 **Assign the required roles:**
 
 ```bash
-# Azure AI User role
-az role assignment create --assignee <aad-user-upn> --role "Azure AI User" --scope /subscriptions/<subscription-id>/resourceGroups/<solution-accelerator-rg>/providers/Microsoft.CognitiveServices/accounts/<foundry-account-name>/projects/<foundry-project-name>
+# Foundry User role
+az role assignment create --assignee <aad-user-upn> --role "Foundry User" --scope /subscriptions/<subscription-id>/resourceGroups/<solution-accelerator-rg>/providers/Microsoft.CognitiveServices/accounts/<foundry-account-name>/projects/<foundry-project-name>
 ```
 
 ```bash

docs/re-use-foundry-project.md

@@ -44,9 +44,9 @@ Replace `<Existing Foundry Project Resource ID>` with the value obtained from St
 Proceed with the next steps in the [deployment guide](DeploymentGuide.md#deployment-steps).
 
 > **Note:**  
-> After deployment, if you want to access agents created by the accelerator via the Azure AI Foundry Portal, or if you plan to debug or run the application locally, you must assign yourself either the **Azure AI User** or **Azure AI Developer** role for the Foundry resource.  
+> After deployment, if you want to access agents created by the accelerator via the Azure AI Foundry Portal, or if you plan to debug or run the application locally, you must assign yourself either the **Foundry User** or **Azure AI Developer** role for the Foundry resource.  
 > You can do this in the Azure Portal under the Foundry resource's "Access control (IAM)" section,  
 > **or** run the following command in your terminal (replace `<aad-user-upn>` with your Azure AD user principal name and `<resource-id>` with the Resource ID you copied in Step 5):
 > ```bash
-> az role assignment create --assignee <aad-user-upn> --role "Azure AI User" --scope <resource-id>
+> az role assignment create --assignee <aad-user-upn> --role "Foundry User" --scope <resource-id>
 > ```

infra/main.bicep

@@ -854,7 +854,7 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
     ]
     roleAssignments: [
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: userAssignedIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
       }
@@ -935,7 +935,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
     managedIdentities: { userAssignedResourceIds: [userAssignedIdentity!.outputs.resourceId] } //To create accounts or projects, you must enable a managed identity on your resource
     roleAssignments: [
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: userAssignedIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
       }
@@ -950,7 +950,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
         principalType: 'ServicePrincipal'
       }
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: deployingUserPrincipalId
         principalType: deployerPrincipalType
       }

infra/main.json

@@ -5,11 +5,11 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.42.1.51946",
-      "templateHash": "8490920419623942773"
+      "version": "0.43.8.12551",
+      "templateHash": "12475542446442392463"
     },
     "name": "Multi-Agent Custom Automation Engine",
-    "description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\r\n\r\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\r\n"
+    "description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\n\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\n"
   },
   "parameters": {
     "solutionName": {
@@ -4991,8 +4991,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "4286500745908716598"
+              "version": "0.43.8.12551",
+              "templateHash": "9540091515555271756"
             }
           },
           "definitions": {
@@ -24308,8 +24308,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "6570260143045999127"
+              "version": "0.43.8.12551",
+              "templateHash": "7866379492866507946"
             }
           },
           "definitions": {
@@ -28012,8 +28012,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "14513113443903512301"
+              "version": "0.43.8.12551",
+              "templateHash": "2868048678223903575"
             }
           },
           "parameters": {
@@ -42561,8 +42561,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "15053339789155096730"
+              "version": "0.43.8.12551",
+              "templateHash": "18345308984648474640"
             }
           },
           "definitions": {
@@ -43593,8 +43593,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.42.1.51946",
-                      "templateHash": "16493651611122310009"
+                      "version": "0.43.8.12551",
+                      "templateHash": "1009721598684973971"
                     },
                     "name": "Site App Settings",
                     "description": "This module deploys a Site App Setting."
@@ -54840,8 +54840,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "4859654437121510695"
+              "version": "0.43.8.12551",
+              "templateHash": "9739523049889844356"
             }
           },
           "parameters": {

infra/main_custom.bicep

@@ -853,7 +853,7 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
     ]
     roleAssignments: [
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: userAssignedIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
       }
@@ -934,7 +934,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
     managedIdentities: { userAssignedResourceIds: [userAssignedIdentity!.outputs.resourceId] } //To create accounts or projects, you must enable a managed identity on your resource
     roleAssignments: [
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: userAssignedIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
       }
@@ -949,7 +949,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
         principalType: 'ServicePrincipal'
       }
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: deployingUserPrincipalId
         principalType: deployerPrincipalType
       }

infra/scripts/assign_azure_ai_user_role.sh

@@ -25,25 +25,25 @@ fi
 
 IFS=',' read -r -a principal_ids_array <<< $principal_ids
 
-echo "Assigning Azure AI User role role to users"
+echo "Assigning Foundry User role to users"
 
 echo "Using provided Azure AI resource id: $aif_resource_id"
 
 for principal_id in "${principal_ids_array[@]}"; do
 
-    # Check if the user has the Azure AI User role
-    echo "Checking if user - ${principal_id} has the Azure AI User role"
+    # Check if the user has the Foundry User role
+    echo "Checking if user - ${principal_id} has the Foundry User role"
     role_assignment=$(MSYS_NO_PATHCONV=1 az role assignment list --role 53ca6127-db72-4b80-b1b0-d745d6d5456d --scope $aif_resource_id --assignee $principal_id --query "[].roleDefinitionId" -o tsv)
     if [ -z "$role_assignment" ]; then
-        echo "User - ${principal_id} does not have the Azure AI User role. Assigning the role."
+        echo "User - ${principal_id} does not have the Foundry User role. Assigning the role."
         MSYS_NO_PATHCONV=1 az role assignment create --assignee $principal_id --role 53ca6127-db72-4b80-b1b0-d745d6d5456d --scope $aif_resource_id --output none
         if [ $? -eq 0 ]; then
-            echo "Azure AI User role assigned successfully."
+            echo "Foundry User role assigned successfully."
         else
-            echo "Failed to assign Azure AI User role."
+            echo "Failed to assign Foundry User role."
             exit 1
         fi
     else
-        echo "User - ${principal_id} already has the Azure AI User role."
+        echo "User - ${principal_id} already has the Foundry User role."
     fi
 done

src/App/src/components/content/streaming/StreamingAgentMessage.tsx

@@ -176,11 +176,13 @@ const renderAgentMessages = (
                   <Body1 className={styles.agentName}>
                     {getAgentDisplayName(msg.agent)}
                   </Body1>
-                  <Tag
-                    appearance="brand"
-                  >
-                    AI Agent
-                  </Tag>
+                  {msg.agent_type !== AgentMessageType.SYSTEM_AGENT && msg.agent?.toLowerCase() !== 'system' && (
+                    <Tag
+                      appearance="brand"
+                    >
+                      AI Agent
+                    </Tag>
+                  )}
                 </div>
               )}
 

src/App/src/hooks/usePlanWebSocket.tsx

@@ -17,6 +17,7 @@ import {
     selectPlanApproved,
     approvalRequestReceived,
     planCompletedFinal,
+    planFailedFinal,
 } from '@/store/slices/planSlice';
 import {
     setSubmittingChatDisableInput,
@@ -178,16 +179,18 @@ export function usePlanWebSocket({
             WebsocketMessageType.FINAL_RESULT_MESSAGE,
             (finalMessage: any) => {
                 if (!finalMessage) return;
-                const agentMessageData: AgentMessageData = {
-                    agent: AgentType.GROUP_CHAT_MANAGER,
-                    agent_type: AgentMessageType.AI_AGENT,
-                    timestamp: Date.now(),
-                    steps: [],
-                    next_steps: [],
-                    content: '\u{1F389}\u{1F389} ' + (finalMessage.data?.content || ''),
-                    raw_data: finalMessage,
-                };
-                if (finalMessage?.data?.status === PlanStatus.COMPLETED) {
+                const messageStatus = finalMessage?.data?.status;
+
+                if (messageStatus === PlanStatus.COMPLETED) {
+                    const agentMessageData: AgentMessageData = {
+                        agent: AgentType.GROUP_CHAT_MANAGER,
+                        agent_type: AgentMessageType.AI_AGENT,
+                        timestamp: Date.now(),
+                        steps: [],
+                        next_steps: [],
+                        content: '\u{1F389}\u{1F389} ' + (finalMessage.data?.content || ''),
+                        raw_data: finalMessage,
+                    };
                     dispatch(setShowBufferingText(true));
                     dispatch(addAgentMessage(agentMessageData));
                     dispatch(setSelectedTeam(planData?.team || null));
@@ -196,11 +199,29 @@ export function usePlanWebSocket({
                     scrollToBottom();
                     webSocketService.disconnect();
                     persistAgentMessage(agentMessageData, planData, dispatch, true, streamingMessageBuffer);
+                } else if (messageStatus === 'error') {
+                    // Safety net: handle error status sent as FINAL_RESULT_MESSAGE
+                    const errorContent = finalMessage.data?.content || 'An unexpected error occurred. Please try again later.';
+                    const errorAgent: AgentMessageData = {
+                        agent: 'system',
+                        agent_type: AgentMessageType.SYSTEM_AGENT,
+                        timestamp: Date.now(),
+                        steps: [],
+                        next_steps: [],
+                        content: formatErrorMessage(errorContent),
+                        raw_data: finalMessage || '',
+                    };
+                    dispatch(addAgentMessage(errorAgent));
+                    dispatch(planFailedFinal());
+                    dispatch(setShowBufferingText(false));
+                    scrollToBottom();
+                    showToast(errorContent, 'error');
+                    webSocketService.disconnect();
                 }
             },
         );
         return unsub;
-    }, [dispatch, scrollToBottom, planData, streamingMessageBuffer]);
+    }, [dispatch, scrollToBottom, planData, streamingMessageBuffer, formatErrorMessage, showToast]);
 
     // ── ERROR_MESSAGE ─────────────────────────────────────────────
     useEffect(() => {
@@ -231,11 +252,11 @@ export function usePlanWebSocket({
                     raw_data: errorMessage || '',
                 };
                 dispatch(addAgentMessage(errorAgent));
-                dispatch(setShowProcessingPlanSpinner(false));
+                dispatch(planFailedFinal());
                 dispatch(setShowBufferingText(false));
-                dispatch(setSubmittingChatDisableInput(false));
                 scrollToBottom();
                 showToast(errorContent, 'error');
+                webSocketService.disconnect();
             },
         );
         return unsub;

src/App/src/store/slices/planSlice.ts

@@ -161,6 +161,14 @@ const planSlice = createSlice({
             }
         },
 
+        /** Single dispatch when an error occurs during plan execution */
+        planFailedFinal(state) {
+            state.showProcessingPlanSpinner = false;
+            if (state.planData?.plan) {
+                (state.planData as any).plan.overall_status = PlanStatus.FAILED;
+            }
+        },
+
         /** Reset everything back to initial state (used when navigating to a new plan) */
         resetPlan() {
             return { ...initialState };
@@ -229,6 +237,7 @@ export const {
     planApprovalRejected,
     approvalRequestReceived,
     planCompletedFinal,
+    planFailedFinal,
     resetPlan,
 } = planSlice.actions;
 

src/backend/v4/api/router.py

@@ -371,7 +371,20 @@ async def process_request(
     try:
 
         async def run_orchestration_task():
-            await OrchestrationManager().run_orchestration(user_id, input_task)
+            try:
+                await OrchestrationManager().run_orchestration(user_id, input_task, plan_id=plan_id)
+            except Exception as orch_error:
+                logger.error("Background orchestration failed for plan '%s': %s", plan_id, orch_error)
+                track_event_if_configured(
+                    "Error_Orchestration_Failed",
+                    {
+                        "plan_id": plan_id,
+                        "session_id": input_task.session_id,
+                        "user_id": user_id,
+                        "error": str(orch_error),
+                        "error_type": type(orch_error).__name__,
+                    },
+                )
 
         background_tasks.add_task(run_orchestration_task)