Merge pull request #464 from microsoft/macae-v3-fr-dev-92

Macae v3 fr dev 92

Author: Fr4nc3

src/backend/common/database/cosmosdb.py

@@ -334,7 +334,7 @@ async def get_team_by_id(self, id: str) -> Optional[TeamConfiguration]:
         teams = await self.query_items(query, parameters, TeamConfiguration)
         return teams[0] if teams else None
 
-    async def get_all_teams_by_user(self, user_id: str) -> List[TeamConfiguration]:
+    async def get_all_teams(self) -> List[TeamConfiguration]:
         """Retrieve all team configurations for a specific user.
 
         Args:
@@ -343,9 +343,8 @@ async def get_all_teams_by_user(self, user_id: str) -> List[TeamConfiguration]:
         Returns:
             List of TeamConfiguration objects
         """
-        query = "SELECT * FROM c WHERE c.user_id=@user_id AND c.data_type=@data_type ORDER BY c.created DESC"
+        query = "SELECT * FROM c WHERE c.data_type=@data_type ORDER BY c.created DESC"
         parameters = [
-            {"name": "@user_id", "value": user_id},
             {"name": "@data_type", "value": DataType.team_config},
         ]
         teams = await self.query_items(query, parameters, TeamConfiguration)

src/backend/common/database/database_base.py

@@ -159,7 +159,7 @@ async def get_team_by_id(self, id: str) -> Optional[TeamConfiguration]:
         pass
 
     @abstractmethod
-    async def get_all_teams_by_user(self, user_id: str) -> List[TeamConfiguration]:
+    async def get_all_teams(self) -> List[TeamConfiguration]:
         """Retrieve all team configurations for the given user."""
         pass
 

src/backend/v3/api/router.py

@@ -688,7 +688,7 @@ async def get_team_configs(request: Request):
         team_service = TeamService(memory_store)
 
         # Retrieve all team configurations
-        team_configs = await team_service.get_all_team_configurations(user_id)
+        team_configs = await team_service.get_all_team_configurations()
 
         # Convert to dictionaries for response
         configs_dict = [config.model_dump() for config in team_configs]

src/backend/v3/common/services/team_service.py

@@ -271,7 +271,7 @@ async def handle_team_selection(self, user_id: str, team_id: str) -> bool:
             return False
 
     async def get_all_team_configurations(
-        self, user_id: str
+        self
     ) -> List[TeamConfiguration]:
         """
         Retrieve all team configurations for a user.
@@ -283,8 +283,8 @@ async def get_all_team_configurations(
             List of TeamConfiguration objects
         """
         try:
-            # Use the specific get_all_teams_by_user method
-            team_configs = await self.memory_context.get_all_teams_by_user(user_id)
+            # Use the specific get_all_teams method
+            team_configs = await self.memory_context.get_all_teams()
             return team_configs
 
         except (KeyError, TypeError, ValueError) as e:

src/backend/v3/config/settings.py

@@ -199,12 +199,13 @@ async def send_status_update_async(
             )
             return
 
+        print(f" websocket {message}")
         try:
             if hasattr(message, "data") and hasattr(message, "type"):
                 message = message.data
         except Exception as e:
                 print(f"Error loading message data: {e}")
-
+        print(f" websocket after {message}")
         standard_message = {
             "type": message_type,
             "data": message

src/backend/v3/magentic_agents/proxy_agent.py

@@ -81,6 +81,7 @@ async def reduce(self) -> ChatHistory | None:
             return None
         return await self._chat_history.reduce()
 
+
 class ProxyAgentResponseItem:
     """Response item wrapper for proxy agent responses."""
 

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

@@ -159,7 +159,7 @@ const PlanChat: React.FC<SimplifiedPlanChatProps> = ({
         {renderThinkingState(waitingForPlan)}
 
         {/* Plan response with all information */}
-        {renderPlanResponse(planApprovalRequest, handleApprovePlan, handleRejectPlan, processingApproval, showApprovalButtons)}
+        {showApprovalButtons && renderPlanResponse(planApprovalRequest, handleApprovePlan, handleRejectPlan, processingApproval, showApprovalButtons)}
         {renderAgentMessages(agentMessages)}
 
 

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

@@ -8,7 +8,16 @@ const renderAgentMessages = (agentMessages: AgentMessageData[]) => {
     if (!agentMessages || agentMessages.length === 0) return null;
 
     return (
-        <div >
+        <div
+        // style={{
+        //     height: 200,
+        //     maxHeight: 200,
+        //     overflowY: 'auto',     // or 'hidden' if you don't want scrolling
+        //     overflowX: 'hidden',
+        //     flex: '0 0 200px'      // prevents flex parents from stretching it
+        // }}
+
+        >
             {agentMessages.map((msg, index) => {
                 const trimmed = msg.raw_content?.trim();
                 if (!trimmed) return null; // skip if empty, null, or whitespace

src/frontend/src/pages/PlanPage.tsx

@@ -82,6 +82,7 @@ const PlanPage: React.FC = () => {
         }, 100);
     }, []);
 
+    //WebsocketMessageType.PLAN_APPROVAL_REQUEST
     useEffect(() => {
         const unsubscribe = webSocketService.on(WebsocketMessageType.PLAN_APPROVAL_REQUEST, (approvalRequest: any) => {
             console.log('📋 Plan received:', approvalRequest);
@@ -122,7 +123,7 @@ const PlanPage: React.FC = () => {
         return () => unsubscribe();
     }, [scrollToBottom]); //onPlanReceived, scrollToBottom
 
-
+    //(WebsocketMessageType.AGENT_MESSAGE_STREAMING
     useEffect(() => {
         const unsubscribe = webSocketService.on(WebsocketMessageType.AGENT_MESSAGE_STREAMING, (streamingMessage: any) => {
             // console.log('📋 Streaming Message', streamingMessage);
@@ -134,6 +135,28 @@ const PlanPage: React.FC = () => {
         return () => unsubscribe();
     }, [scrollToBottom]); //onPlanReceived, scrollToBottom
 
+    //WebsocketMessageType.USER_CLARIFICATION_REQUEST
+    useEffect(() => {
+        const unsubscribe = webSocketService.on(WebsocketMessageType.USER_CLARIFICATION_REQUEST, (clarificationMessage: any) => {
+            console.log('📋 Clarification Message', clarificationMessage);
+            scrollToBottom();
+
+        });
+
+        return () => unsubscribe();
+    }, [scrollToBottom]);
+    //WebsocketMessageType.AGENT_TOOL_MESSAGE
+    useEffect(() => {
+        const unsubscribe = webSocketService.on(WebsocketMessageType.AGENT_TOOL_MESSAGE, (toolMessage: any) => {
+            console.log('📋 Tool Message', toolMessage);
+            scrollToBottom();
+
+        });
+
+        return () => unsubscribe();
+    }, [scrollToBottom]);
+
+    //WebsocketMessageType.AGENT_MESSAGE
     useEffect(() => {
         const unsubscribe = webSocketService.on(WebsocketMessageType.AGENT_MESSAGE, (agentMessage: any) => {
             console.log('📋 Agent Message', agentMessage);

src/frontend/src/services/WebSocketService.tsx

@@ -166,13 +166,15 @@ class WebSocketService {
 
     private handleMessage(message: StreamMessage): void {
 
-        const currentPlanIds = Array.from(this.planSubscriptions);
-        const firstPlanId = currentPlanIds[0];
-
+        //console.log('WebSocket message received:', message);
+        const hasClarification = /\bclarifications?\b/i.test(message.data || '');
+        console.log("Message ':", message);
+        if (hasClarification) {
+            console.log("Message contains 'clarification':", message.data);
+        }
         switch (message.type) {
             case WebsocketMessageType.PLAN_APPROVAL_REQUEST: {
                 console.log("enter plan approval request");
-                console.log('WebSocket message received:', message);
                 const parsedData = PlanDataService.parsePlanApprovalRequest(message.data);
                 if (parsedData) {
                     const structuredMessage: ParsedPlanApprovalRequest = {
@@ -206,13 +208,33 @@ class WebSocketService {
                 break;
             }
 
-            case WebsocketMessageType.AGENT_TOOL_MESSAGE:
-            case WebsocketMessageType.USER_CLARIFICATION_REQUEST:
+            case WebsocketMessageType.USER_CLARIFICATION_REQUEST: {
+                if (message.data) {
+                    //const transformed = PlanDataService.parseUserClarificationRequest(message);
+                    this.emit(WebsocketMessageType.USER_CLARIFICATION_REQUEST, message);
+                }
+                break;
+            }
+
+
+            case WebsocketMessageType.AGENT_TOOL_MESSAGE: {
+                if (message.data) {
+                    //const transformed = PlanDataService.parseUserClarificationRequest(message);
+                    this.emit(WebsocketMessageType.AGENT_TOOL_MESSAGE, message);
+                }
+                break;
+            }
+            case WebsocketMessageType.FINAL_RESULT_MESSAGE: {
+                if (message.data) {
+                    //const transformed = PlanDataService.parseFinalResultMessage(message);
+                    this.emit(WebsocketMessageType.FINAL_RESULT_MESSAGE, message);
+                }
+                break;
+            }
             case WebsocketMessageType.USER_CLARIFICATION_RESPONSE:
             case WebsocketMessageType.REPLAN_APPROVAL_REQUEST:
             case WebsocketMessageType.REPLAN_APPROVAL_RESPONSE:
             case WebsocketMessageType.PLAN_APPROVAL_RESPONSE:
-            case WebsocketMessageType.FINAL_RESULT_MESSAGE:
             case WebsocketMessageType.AGENT_STREAM_START:
             case WebsocketMessageType.AGENT_STREAM_END:
             case WebsocketMessageType.SYSTEM_MESSAGE: {