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

Author: Roopan-Microsoft

src/backend/v3/orchestration/orchestration_manager.py

@@ -182,14 +182,38 @@ async def run_orchestration(self, user_id, input_task) -> None:
                 )
                 self.logger.info(f"Final result sent via WebSocket to user {user_id}")
 
+            except ResourceNotFoundError as e:
+                self.logger.error(f"Agent not found: {e}")
+                self.logger.info(f"Error: {e}")
+                self.logger.info(f"Error type: {type(e).__name__}")
+                if hasattr(e, "__dict__"):
+                    self.logger.info(f"Error attributes: {e.__dict__}")
+                self.logger.info("=" * 50)
+                error_content = "**Attention:** The agent is currently unavailable. Please check if it was deleted or recreated.\n\nIf yes, please create a new plan from the home page."
+                self.logger.info(f"🔴 Sending error message to user {user_id}: {error_content}")
+
+                await connection_config.send_status_update_async(
+                    {
+                        "type": WebsocketMessageType.ERROR_MESSAGE,
+                        "data": {
+                            "content": error_content,
+                            "status": "error",
+                            "timestamp": asyncio.get_event_loop().time(),
+                        },
+                    },
+                    user_id,
+                    message_type=WebsocketMessageType.ERROR_MESSAGE,
+                )
+                self.logger.info(f"✅ Error message sent via WebSocket to user {user_id}")
+
             except Exception as e:
                 self.logger.error(f"Error processing final result: {e}")
                 # Send error message to user
                 await connection_config.send_status_update_async(
                     {
                         "type": WebsocketMessageType.ERROR_MESSAGE,
                         "data": {
-                            "content": "An error occurred while processing the final response.",
+                            "content": "**Attention:** An error occurred while processing the final response.\n\nPlease try creating a new plan from the home page.",
                             "status": "error",
                             "timestamp": asyncio.get_event_loop().time(),
                         },
@@ -198,26 +222,6 @@ async def run_orchestration(self, user_id, input_task) -> None:
                     message_type=WebsocketMessageType.ERROR_MESSAGE,
                 )
 
-        except ResourceNotFoundError as e:
-            self.logger.error(f"Agent not found: {e}")
-            self.logger.info(f"Error: {e}")
-            self.logger.info(f"Error type: {type(e).__name__}")
-            if hasattr(e, "__dict__"):
-                self.logger.info(f"Error attributes: {e.__dict__}")
-            self.logger.info("=" * 50)
-            await connection_config.send_status_update_async(
-                {
-                    "type": WebsocketMessageType.ERROR_MESSAGE,
-                    "data": {
-                        "content": "The agent is currently unavailable. Please check if it was deleted or recreated.",
-                        "status": "error",
-                        "timestamp": asyncio.get_event_loop().time(),
-                    },
-                },
-                user_id,
-                message_type=WebsocketMessageType.ERROR_MESSAGE,
-            )
-
         except RuntimeError as e:
             if "did not return any response" in str(e):
                 self.logger.error(f"Agent failed: {e}")
@@ -226,7 +230,7 @@ async def run_orchestration(self, user_id, input_task) -> None:
                     {
                         "type": WebsocketMessageType.ERROR_MESSAGE,
                         "data": {
-                            "content": "I'm having trouble connecting to the agent right now. Please try again later.",
+                            "content": "**Attention:** I'm having trouble connecting to the agent right now.\n\nPlease try creating a new plan from the home page or try again later.",
                             "status": "error",
                             "timestamp": asyncio.get_event_loop().time(),
                         },
@@ -246,7 +250,7 @@ async def run_orchestration(self, user_id, input_task) -> None:
                     {
                         "type": WebsocketMessageType.ERROR_MESSAGE,
                         "data": {
-                            "content": "Something went wrong. Please try again later.",
+                            "content": "**Attention:** Something went wrong.\n\nPlease try creating a new plan from the home page or try again later.",
                             "status": "error",
                             "timestamp": asyncio.get_event_loop().time(),
                         },
@@ -262,12 +266,16 @@ async def run_orchestration(self, user_id, input_task) -> None:
             if hasattr(e, "__dict__"):
                 self.logger.info(f"Error attributes: {e.__dict__}")
             self.logger.info("=" * 50)
-            # Always send error to frontend
+
+            error_content = "**Attention:** Something went wrong.\n\nPlease try creating a new plan from the home page or try again later."
+
+            self.logger.info(f"🔴 Sending error message to user {user_id}: {error_content}")
+
             await connection_config.send_status_update_async(
                 {
                     "type": WebsocketMessageType.ERROR_MESSAGE,
                     "data": {
-                        "content": "Something went wrong. Please try again later.",
+                        "content": error_content,
                         "status": "error",
                         "timestamp": asyncio.get_event_loop().time(),
                     },
@@ -276,5 +284,7 @@ async def run_orchestration(self, user_id, input_task) -> None:
                 message_type=WebsocketMessageType.ERROR_MESSAGE,
             )
 
+            self.logger.info(f"✅ Error message sent via WebSocket to user {user_id}")
+
         finally:
             await runtime.stop_when_idle()

src/frontend/src/components/content/PlanChat.tsx

@@ -48,7 +48,6 @@ interface SimplifiedPlanChatProps extends PlanChatProps {
   handleApprovePlan: () => Promise<void>;
   handleRejectPlan: () => Promise<void>;
   processingApproval: boolean;
-  networkError: boolean;
 
 }
 
@@ -59,7 +58,6 @@ const PlanChat: React.FC<SimplifiedPlanChatProps> = ({
   submittingChatDisableInput,
   OnChatSubmit,
   onPlanApproval,
-  networkError,
   onPlanReceived,
   initialTask,
   planApprovalRequest,
@@ -110,7 +108,7 @@ const PlanChat: React.FC<SimplifiedPlanChatProps> = ({
         {renderPlanResponse(planApprovalRequest, handleApprovePlan, handleRejectPlan, processingApproval, showApprovalButtons)}
         {renderAgentMessages(agentMessages)}
 
-        {showProcessingPlanSpinner && !networkError && renderPlanExecutionMessage()}
+        {showProcessingPlanSpinner && renderPlanExecutionMessage()}
         {/* Streaming plan updates */}
         {showBufferingText && (
           <StreamingBufferMessage