Refactor team config retrieval and update frontend models

Fr4nc3 · Fr4nc3 · commit b5663500fd98 · 2025-09-08T19:44:23.000-04:00
Replaces user-specific team configuration retrieval with a method that fetches all team configurations. Updates backend service, API router, and database interfaces accordingly. Refactors frontend PlanPanelRight and related models to use PlanDetailsProps instead of TaskDetailsProps, and cleans up unused props. Improves WebSocketService URL construction and message handling for new message types. Adjusts PlanChat input logic and disables input only when submitting.
diff --git a/src/backend/common/database/cosmosdb.py b/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)
diff --git a/src/backend/common/database/database_base.py b/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
 
diff --git a/src/backend/v3/api/router.py b/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]
diff --git a/src/backend/v3/common/services/team_service.py b/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:
diff --git a/src/backend/v3/config/settings.py b/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
diff --git a/src/backend/v3/magentic_agents/proxy_agent.py b/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."""
     
diff --git a/src/frontend/src/components/content/PlanChat.tsx b/src/frontend/src/components/content/PlanChat.tsx
@@ -174,7 +174,7 @@ const PlanChat: React.FC<SimplifiedPlanChatProps> = ({
         setInput={setInput}
         submittingChatDisableInput={submittingChatDisableInput}
         OnChatSubmit={OnChatSubmit}
-        showChatInput={!planApprovalRequest}
+        showChatInput={true}
         waitingForPlan={waitingForPlan}
         loading={false} />
     </div>
diff --git a/src/frontend/src/components/content/PlanChatBody.tsx b/src/frontend/src/components/content/PlanChatBody.tsx
@@ -28,12 +28,14 @@ const PlanChatBody: React.FC<SimplifiedPlanChatProps> = ({
             maxWidth: '800px',
             margin: '0 auto',
             width: '100%'
-        }}>
+        }}
+
+        >
             <ChatInput
                 value={input}
                 onChange={setInput}
                 onEnter={() => OnChatSubmit(input)}
-                disabledChat={submittingChatDisableInput || waitingForPlan}
+                disabledChat={submittingChatDisableInput}
                 placeholder={
                     waitingForPlan
                         ? "Creating plan..."
@@ -44,7 +46,7 @@ const PlanChatBody: React.FC<SimplifiedPlanChatProps> = ({
                     appearance="transparent"
                     onClick={() => OnChatSubmit(input)}
                     icon={<SendRegular />}
-                    disabled={submittingChatDisableInput || waitingForPlan}
+                    disabled={submittingChatDisableInput}
                     style={{ height: '40px', width: '40px' }}
                 />
             </ChatInput>
diff --git a/src/frontend/src/components/content/PlanPanelRight.tsx b/src/frontend/src/components/content/PlanPanelRight.tsx
@@ -6,18 +6,13 @@ import {
   PersonRegular,
   ArrowTurnDownRightRegular,
 } from "@fluentui/react-icons";
-import { MPlanData } from "../../models";
+import { MPlanData, PlanDetailsProps } from "../../models";
 import { TaskService } from "../../services/TaskService";
 import { AgentTypeUtils, AgentType } from "../../models/enums";
 import ContentNotFound from "../NotFound/ContentNotFound";
 
-interface PlanPanelRightProps {
-  planData: any;
-  loading: boolean;
-  planApprovalRequest: MPlanData | null;
-}
 
-const PlanPanelRight: React.FC<PlanPanelRightProps> = ({
+const PlanPanelRight: React.FC<PlanDetailsProps> = ({
   planData,
   loading,
   planApprovalRequest
@@ -62,9 +57,9 @@ const PlanPanelRight: React.FC<PlanPanelRightProps> = ({
 
     // Get the icon name from the utility
     const iconName = AgentTypeUtils.getAgentIcon(agentType);
-    
+
     // Return the appropriate icon component or fallback to PersonRegular
-    return <PersonRegular style={{ 
+    return <PersonRegular style={{
       color: 'var(--colorPaletteBlueForeground2)',
       fontSize: '16px'
     }} />;
@@ -83,11 +78,11 @@ const PlanPanelRight: React.FC<PlanPanelRightProps> = ({
     if (!planApprovalRequest.steps || planApprovalRequest.steps.length === 0) return [];
 
     const result: Array<{ type: 'heading' | 'substep'; text: string }> = [];
-    
+
     planApprovalRequest.steps.forEach(step => {
       const action = step.cleanAction || step.action || '';
       const trimmedAction = action.trim();
-      
+
       if (trimmedAction) {
         // Check if the step ends with a colon
         if (trimmedAction.endsWith(':')) {
@@ -117,8 +112,8 @@ const PlanPanelRight: React.FC<PlanPanelRightProps> = ({
         display: 'flex',
         flexDirection: 'column'
       }}>
-        <Body1 style={{ 
-          marginBottom: '16px', 
+        <Body1 style={{
+          marginBottom: '16px',
           flexShrink: 0,
           fontSize: '14px',
           fontWeight: 600,
@@ -186,7 +181,7 @@ const PlanPanelRight: React.FC<PlanPanelRightProps> = ({
         flex: 1,
         overflow: 'auto'
       }}>
-        <Body1 style={{ 
+        <Body1 style={{
           marginBottom: '16px',
           fontSize: '14px',
           fontWeight: 600,
@@ -227,11 +222,11 @@ const PlanPanelRight: React.FC<PlanPanelRightProps> = ({
                 }}>
                   {getAgentIcon(agentName)}
                 </div>
-                
+
                 {/* Agent Info - just name */}
                 <div style={{ flex: 1 }}>
-                  <Body1 style={{ 
-                    fontWeight: 600, 
+                  <Body1 style={{
+                    fontWeight: 600,
                     fontSize: '14px',
                     color: 'var(--colorNeutralForeground1)'
                   }}>
diff --git a/src/frontend/src/models/index.tsx b/src/frontend/src/models/index.tsx
@@ -16,7 +16,7 @@ export * from './homeInput';
 export * from './auth';
 
 // Export taskDetails with explicit naming to avoid Agent conflict
-export type { SubTask, Human, TaskDetailsProps } from './taskDetails';
+export type { SubTask, Human, PlanDetailsProps } from './taskDetails';
 export type { Agent as TaskAgent } from './taskDetails';
 
 // Export Team models (Agent interface takes precedence)
diff --git a/src/frontend/src/models/taskDetails.tsx b/src/frontend/src/models/taskDetails.tsx
@@ -1,4 +1,4 @@
-import { ProcessedPlanData, Step } from "./plan";
+import { MPlanData, ProcessedPlanData, Step } from "./plan";
 
 export interface SubTask {
     id: string;
@@ -20,10 +20,8 @@ export interface Human {
     avatarUrl?: string;
 }
 
-export interface TaskDetailsProps {
+export interface PlanDetailsProps {
     planData: ProcessedPlanData;
     loading: boolean;
-    submittingChatDisableInput: boolean;
-    processingSubtaskId: string | null;
-    OnApproveStep: (step: Step, total: number, completed: number, approve: boolean) => void;
+    planApprovalRequest: MPlanData | null;
 }
diff --git a/src/frontend/src/pages/PlanPage.tsx b/src/frontend/src/pages/PlanPage.tsx
@@ -44,9 +44,7 @@ const PlanPage: React.FC = () => {
     const [loading, setLoading] = useState<boolean>(true);
     const [submittingChatDisableInput, setSubmitting] = useState<boolean>(false);
     const [error, setError] = useState<Error | null>(null);
-    const [processingSubtaskId, setProcessingSubtaskId] = useState<string | null>(
-        null
-    );
+
     const [planApprovalRequest, setPlanApprovalRequest] = useState<MPlanData | null>(null);
     const [reloadLeftList, setReloadLeftList] = useState(true);
     const [waitingForPlan, setWaitingForPlan] = useState(true);
@@ -82,6 +80,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 +121,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 +133,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);
@@ -481,11 +502,7 @@ const PlanPage: React.FC = () => {
 
                 <PlanPanelRight
                     planData={planData}
-                    submittingChatDisableInput={submittingChatDisableInput}
-                    processingSubtaskId={processingSubtaskId}
                     loading={loading}
-                    streamingMessages={streamingMessages}
-                    planApproved={planApproved}
                     planApprovalRequest={planApprovalRequest}
                 />
             </CoralShellRow>
diff --git a/src/frontend/src/services/WebSocketService.tsx b/src/frontend/src/services/WebSocketService.tsx
@@ -1,4 +1,4 @@
-import { headerBuilder } from '../api/config';
+import { getApiUrl, headerBuilder } from '../api/config';
 import { PlanDataService } from './PlanDataService';
 import { MPlanData, ParsedPlanApprovalRequest, StreamingPlanUpdate, StreamMessage, WebsocketMessageType } from '../models';
 
@@ -12,8 +12,25 @@ class WebSocketService {
     private planSubscriptions: Set<string> = new Set();
     private reconnectTimer: NodeJS.Timeout | null = null;
     private isConnecting = false;
-    private baseWsUrl = process.env.REACT_APP_BACKEND_URL?.replace('http', 'ws') || 'ws://localhost:8000';
 
+
+    private buildSocketUrl(processId?: string, sessionId?: string): string {
+        const baseWsUrl = getApiUrl() || 'ws://localhost:8000';
+        // Trim and remove trailing slashes
+        let base = (baseWsUrl || '').trim().replace(/\/+$/, '');
+        // Normalize protocol: http -> ws, https -> wss
+        base = base.replace(/^http:\/\//i, 'ws://')
+            .replace(/^https:\/\//i, 'wss://');
+
+        // Leave ws/wss as-is; anything else is assumed already correct
+
+        // Decide path addition
+        const hasApiSegment = /\/api(\/|$)/i.test(base);
+        const socketPath = hasApiSegment ? '/v3/socket' : '/api/v3/socket';
+        const url = `${base}${socketPath}${processId ? `/${processId}` : `/${sessionId}`}`;
+        console.log("Constructed WebSocket URL:", url);
+        return url;
+    }
     connect(sessionId: string, processId?: string): Promise<void> {
         return new Promise((resolve, reject) => {
             if (this.isConnecting) {
@@ -26,9 +43,7 @@ class WebSocketService {
             }
             try {
                 this.isConnecting = true;
-                const wsUrl = processId
-                    ? `${this.baseWsUrl}/api/v3/socket/${processId}`
-                    : `${this.baseWsUrl}/api/v3/socket/${sessionId}`;
+                const wsUrl = this.buildSocketUrl(processId, sessionId);
                 this.ws = new WebSocket(wsUrl);
 
                 this.ws.onopen = () => {
@@ -166,13 +181,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 +223,35 @@ 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);
+                    console.log('WebSocket USER_CLARIFICATION_REQUEST message received:', 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: {
