Merge pull request #1025 from Dhruvkumar-Microsoft/psl-TASfeature-dk

Roopan-Microsoft · web-flow · commit df54c581e7f4 · 2026-06-09T18:27:09.000+05:30
fix: updated the backend and frontend to align the feature branch
diff --git a/infra/scripts/post_deploy.sh b/infra/scripts/post_deploy.sh
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/App/src/hooks/useAutoScroll.tsx b/src/App/src/hooks/useAutoScroll.tsx
@@ -6,6 +6,7 @@ import { useCallback, useRef } from 'react';
 
 export function useAutoScroll() {
     const messagesContainerRef = useRef<HTMLDivElement>(null);
+    const finalResultRef = useRef<HTMLDivElement>(null);
 
     const scrollToBottom = useCallback(() => {
         setTimeout(() => {
@@ -16,7 +17,19 @@ export function useAutoScroll() {
         }, 100);
     }, []);
 
-    return { messagesContainerRef, scrollToBottom };
+    // Scroll to the final result message instead of the absolute bottom.
+    // Falls back to scrollToBottom when the anchor is not yet mounted.
+    const scrollToFinalResult = useCallback(() => {
+        setTimeout(() => {
+            if (finalResultRef.current) {
+                finalResultRef.current.scrollIntoView({ behavior: 'smooth', block: 'start' });
+            } else {
+                scrollToBottom();
+            }
+        }, 150);
+    }, [scrollToBottom]);
+
+    return { messagesContainerRef, finalResultRef, scrollToBottom, scrollToFinalResult };
 }
 
 export default useAutoScroll;
diff --git a/src/App/src/hooks/usePlanWebSocket.tsx b/src/App/src/hooks/usePlanWebSocket.tsx
@@ -52,6 +52,7 @@ import { ToastIntent } from '@/components/toast/InlineToaster';
 interface UsePlanWebSocketProps {
     planId: string | undefined;
     scrollToBottom: () => void;
+    scrollToFinalResult: () => void;
     formatErrorMessage: (content: string) => string;
     showToast: (content: React.ReactNode, intent?: ToastIntent, options?: { dismissible?: boolean; timeoutMs?: number | null }) => number;
 }
@@ -91,6 +92,7 @@ function persistAgentMessage(
 export function usePlanWebSocket({
     planId,
     scrollToBottom,
+    scrollToFinalResult,
     formatErrorMessage,
     showToast,
 }: UsePlanWebSocketProps) {
@@ -132,13 +134,14 @@ export function usePlanWebSocket({
         const unsub = webSocketService.on(
             WebsocketMessageType.AGENT_MESSAGE_STREAMING,
             (msg: any) => {
-                const line = PlanDataService.simplifyHumanClarification(msg.data.content);
+                const line = PlanDataService.simplifyHumanClarification(msg.data?.content || msg.content || '');
                 dispatch(setShowBufferingText(true));
                 dispatch(appendToStreamingBuffer(line));
+                scrollToBottom();
             },
         );
         return unsub;
-    }, [dispatch]);
+    }, [dispatch, scrollToBottom]);
 
     // ── USER_CLARIFICATION_REQUEST ────────────────────────────────
     useEffect(() => {
@@ -188,15 +191,15 @@ export function usePlanWebSocket({
                         timestamp: Date.now(),
                         steps: [],
                         next_steps: [],
-                        content: '\u{1F389}\u{1F389} ' + (finalMessage.data?.content || ''),
+                        content: finalMessage.data?.content || '',
                         raw_data: finalMessage,
                     };
                     dispatch(setShowBufferingText(true));
                     dispatch(addAgentMessage(agentMessageData));
                     dispatch(setSelectedTeam(planData?.team || null));
                     /* P0: single compound action replaces setShowProcessingPlanSpinner(false) + markPlanCompleted() */
                     dispatch(planCompletedFinal());
-                    scrollToBottom();
+                    scrollToFinalResult();
                     webSocketService.disconnect();
                     persistAgentMessage(agentMessageData, planData, dispatch, true, streamingMessageBuffer);
                 } else if (messageStatus === 'error') {
@@ -222,7 +225,7 @@ export function usePlanWebSocket({
             },
         );
         return unsub;
-    }, [dispatch, scrollToBottom, planData, streamingMessageBuffer, formatErrorMessage, showToast]);
+    }, [dispatch, scrollToBottom, scrollToFinalResult, planData, streamingMessageBuffer, formatErrorMessage, showToast]);
 
     // ── ERROR_MESSAGE ─────────────────────────────────────────────
     useEffect(() => {
diff --git a/src/App/src/pages/PlanPage.tsx b/src/App/src/pages/PlanPage.tsx
@@ -86,8 +86,7 @@ const PlanPage: React.FC = () => {
     const navigate = useNavigate();
     const dispatch = useAppDispatch();
     const { showToast, dismissToast } = useInlineToaster();
-    const { messagesContainerRef, scrollToBottom } = useAutoScroll();
-    const finalResultRef = useRef<HTMLDivElement>(null);
+    const { messagesContainerRef, finalResultRef, scrollToBottom, scrollToFinalResult } = useAutoScroll();
     const { loadPlanData, resetPlanVariables } = usePlanActions();
 
     /* ── Redux Selectors (granular — Point 10) ──────────────── */
@@ -135,7 +134,7 @@ const PlanPage: React.FC = () => {
     }, []);
 
     /* ── WebSocket subscriptions (extracted hook) ───────────── */
-    usePlanWebSocket({ planId, scrollToBottom, formatErrorMessage, showToast });
+    usePlanWebSocket({ planId, scrollToBottom, scrollToFinalResult, formatErrorMessage, showToast });
 
     /* ── Navigation with cancellation check ─────────────────── */
     const handleNavigationWithAlert = useCallback(
@@ -363,6 +362,7 @@ const PlanPage: React.FC = () => {
                                 planApprovalRequest={planApprovalRequest}
                                 waitingForPlan={waitingForPlan}
                                 messagesContainerRef={messagesContainerRef}
+                                finalResultRef={finalResultRef}
                                 streamingMessageBuffer={streamingMessageBuffer}
                                 showBufferingText={showBufferingText}
                                 agentMessages={agentMessages}
diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile
@@ -15,9 +15,6 @@ RUN uv sync --frozen --no-install-project --no-dev
 # Backend app setup
 COPY . /app  
 RUN uv sync --frozen --no-dev
-# Fix: agent-framework-azure-ai-search ships an empty agent_framework/__init__.py
-# that overwrites the real one from agent-framework-core. Reinstall core last.
-RUN uv pip install --reinstall --no-deps agent-framework-core==1.2.2
 
 
 FROM base
diff --git a/src/backend/api/router.py b/src/backend/api/router.py
@@ -315,16 +315,6 @@ async def process_request(
         )
         await memory_store.add_plan(plan)
 
-        # Ensure orchestration is initialized before running
-        # Force rebuild for each new task since Magentic workflows cannot be reused after completion
-        team_service = TeamService(memory_store)
-        await OrchestrationManager.get_current_or_new_orchestration(
-            user_id=user_id,
-            team_config=team,
-            team_switched=False,
-            team_service=team_service,
-            force_rebuild=True,  # Always rebuild workflow for new tasks
-        )
 
         track_event_if_configured(
             "Plan_Created",
diff --git a/src/backend/app.py b/src/backend/app.py
@@ -7,7 +7,7 @@
 # Configure logging levels FIRST, before any logging calls
 logging.basicConfig(level=getattr(logging, config.AZURE_BASIC_LOGGING_LEVEL.upper(), logging.INFO))
 
-
+from api.router import app_router
 from azure.monitor.opentelemetry import configure_azure_monitor
 from common.config.app_config import config
 from common.models.messages import UserLanguage
diff --git a/src/backend/callbacks/response_handlers.py b/src/backend/callbacks/response_handlers.py
@@ -108,20 +108,15 @@ async def streaming_agent_response_callback(
         return
 
     try:
-        # Handle various streaming update object shapes
         chunk_text = getattr(update, "text", None)
-
-        # If text is None, don't fall back to str(update) as that would show object repr
-        # Just skip if there's no actual text content
-        if chunk_text is None:
-            # Check if update is a Message
-            if isinstance(update, Message):
-                chunk_text = update.text or ""
-            elif hasattr(update, "content"):
-                chunk_text = str(update.content) if update.content else ""
-            else:
-                # Skip if no text content available
-                return
+        if not chunk_text:
+            contents = getattr(update, "contents", []) or []
+            collected = []
+            for item in contents:
+                txt = getattr(item, "text", None)
+                if txt:
+                    collected.append(str(txt))
+            chunk_text = "".join(collected) if collected else ""
 
         cleaned = clean_citations(chunk_text or "")
 
@@ -150,4 +145,4 @@ async def streaming_agent_response_callback(
             )
             logger.debug("Streaming chunk (agent=%s final=%s len=%d)", agent_id, is_final, len(cleaned))
     except Exception as e:
-        logger.error("streaming_agent_response_callback error: %s", e)
+        logger.error("streaming_agent_response_callback error: %s", e)
diff --git a/src/backend/common/utils/agent_utils.py b/src/backend/common/utils/agent_utils.py
@@ -1,4 +1,5 @@
 
+import logging
 import secrets
 import string
 from typing import Optional
@@ -20,3 +21,22 @@ def generate_assistant_id(prefix: str = "asst_", length: int = 24) -> str:
     # cryptographically strong randomness
     random_part = "".join(secrets.choice(alphabet) for _ in range(length))
     return f"{prefix}{random_part}"
+
+
+async def get_database_team_agent_id(
+    memory_store: DatabaseBase, team_config: TeamConfiguration, agent_name: str
+) -> Optional[str]:
+    """Retrieve existing team agent from database, if any."""
+    agent_id = None
+    try:
+        currentAgent = await memory_store.get_team_agent(
+            team_id=team_config.team_id, agent_name=agent_name
+        )
+        if currentAgent and currentAgent.agent_foundry_id:
+            agent_id = currentAgent.agent_foundry_id
+
+    except (
+        Exception
+    ) as ex:  # Consider narrowing this to specific exceptions if possible
+        logging.error("Failed to initialize Get database team agent: %s", ex)
+    return agent_id
diff --git a/src/backend/common/utils/team_utils.py b/src/backend/common/utils/team_utils.py
@@ -87,25 +87,18 @@ async def create_RAI_agent(
     )
 
     model_deployment_name = config.AZURE_OPENAI_RAI_DEPLOYMENT_NAME
-
-    # Create a copy to avoid mutating the caller's team config.
-    # The original team object is reused later (e.g., for orchestration init),
-    # so mutating it would corrupt the real team name/id.
-    rai_team = team.model_copy()
-    rai_team.team_id = "rai_team"
-    rai_team.name = "RAI Team"
-    rai_team.description = "Team responsible for Responsible AI checks"
-
-    agent = FoundryAgentTemplate(
+    team.team_id = "rai_team"  # Use a fixed team ID for RAI agent
+    team.name = "RAI Team"
+    team.description = "Team responsible for Responsible AI checks"
+    agent = AgentTemplate(
         agent_name=agent_name,
         agent_description=agent_description,
         agent_instructions=agent_instructions,
         model_deployment_name=model_deployment_name,
         enable_code_interpreter=False,
         project_endpoint=config.AZURE_AI_PROJECT_ENDPOINT,
         mcp_config=None,
-        search_config=None,
-        team_config=rai_team,
+        team_config=team,
         memory_store=memory_store,
     )
 
@@ -254,4 +247,4 @@ async def rai_validate_team_config(
         return True, ""
     except Exception as e:
         logging.error("Error validating team configuration content: %s", e)
-        return False, "Unable to validate team configuration content. Please try again."
+        return False, "Unable to validate team configuration content. Please try again."
diff --git a/src/backend/orchestration/orchestration_manager.py b/src/backend/orchestration/orchestration_manager.py
@@ -145,7 +145,9 @@ async def init_orchestration(
             max_round_count=orchestration_config.max_rounds,
             max_stall_count=5,
             checkpoint_storage=storage,
-            intermediate_outputs=True,
+            #intermediate_outputs=True,
+            output_from="all",
+            #intermediate_output_from="all_other",
             enable_plan_review=True,
             **prompt_kwargs,
         ).build()
diff --git a/src/backend/services/plan_service.py b/src/backend/services/plan_service.py
@@ -150,10 +150,26 @@ async def handle_plan_approval(
                         plan.overall_status = PlanStatus.approved
                         plan.m_plan = mplan.model_dump()
                         await memory_store.update_plan(plan)
+                        track_event_if_configured(
+                            "PlanApproved",
+                            {
+                                "m_plan_id": human_feedback.m_plan_id,
+                                "plan_id": human_feedback.plan_id,
+                                "user_id": user_id,
+                            },
+                        )
                     else:
                         print("Plan not found in memory store.")
                         return False
                 else:  # reject plan
+                    track_event_if_configured(
+                        "PlanRejected",
+                        {
+                            "m_plan_id": human_feedback.m_plan_id,
+                            "plan_id": human_feedback.plan_id,
+                            "user_id": user_id,
+                        },
+                    )
                     await memory_store.delete_plan_by_plan_id(human_feedback.plan_id)
 
         except Exception as e:
@@ -231,4 +247,4 @@ async def handle_human_clarification(
             logger.exception(
                 "Failed to handle human clarification -> agent message: %s", e
             )
-            return False
+            return False
