Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into macae-v3-dev-marktayl

Author: marktayl1

src/backend/common/database/cosmosdb.py

@@ -269,6 +269,17 @@ async def get_all_plans_by_team_id(self, team_id: str) -> List[Plan]:
         ]
         return await self.query_items(query, parameters, Plan)
 
+
+    async def get_all_plans_by_team_id_status(self, team_id: str, status: str) -> List[Plan]:
+        """Retrieve all plans for a specific team."""
+        query = "SELECT * FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type and c.user_id=@user_id and c.overall_status=@status"
+        parameters = [
+            {"name": "@user_id", "value": self.user_id},
+            {"name": "@team_id", "value": team_id},
+            {"name": "@data_type", "value": DataType.plan},
+            {"name": "@status", "value": status},
+        ]
+        return await self.query_items(query, parameters, Plan)
     # Step Operations
     async def add_step(self, step: Step) -> None:
         """Add a step to CosmosDB."""

src/backend/common/database/database_base.py

@@ -81,7 +81,6 @@ async def add_plan(self, plan: Plan) -> None:
         """Add a plan to the database."""
         pass
 
-    
     @abstractmethod
     async def update_plan(self, plan: Plan) -> None:
         """Update a plan in the database."""
@@ -106,10 +105,19 @@ async def get_plan(self, plan_id: str) -> Optional[Plan]:
     async def get_all_plans(self) -> List[Plan]:
         """Retrieve all plans for the user."""
         pass
+
     @abstractmethod
     async def get_all_plans_by_team_id(self, team_id: str) -> List[Plan]:
         """Retrieve all plans for a specific team."""
         pass
+
+    @abstractmethod
+    async def get_all_plans_by_team_id_status(
+        self, team_id: str, status: str
+    ) -> List[Plan]:
+        """Retrieve all plans for a specific team."""
+        pass
+
     @abstractmethod
     async def get_data_by_type_and_session_id(
         self, data_type: str, session_id: str
@@ -206,4 +214,4 @@ async def set_current_team(self, current_team: UserCurrentTeam) -> None:
     @abstractmethod
     async def update_current_team(self, current_team: UserCurrentTeam) -> None:
         """Update the current team for a user."""
-        pass    
+        pass

src/backend/v3/api/router.py

@@ -381,12 +381,14 @@ async def plan_approval(
                 #     orchestration_config.plans[human_feedback.m_plan_id],
                 # )
                 try:
-                      result = await PlanService.handle_plan_approval(human_feedback, user_id)
-                      print("Plan approval processed:", result)
+                    result = await PlanService.handle_plan_approval(
+                        human_feedback, user_id
+                    )
+                    print("Plan approval processed:", result)
                 except ValueError as ve:
-                       print(f"ValueError processing plan approval: {ve}")
+                    print(f"ValueError processing plan approval: {ve}")
                 except Exception as e:
-                        print(f"Error processing plan approval: {e}")
+                    print(f"Error processing plan approval: {e}")
                 track_event_if_configured(
                     "PlanApprovalReceived",
                     {
@@ -397,7 +399,7 @@ async def plan_approval(
                         "feedback": human_feedback.feedback,
                     },
                 )
-                
+
                 return {"status": "approval recorded"}
             else:
                 logging.warning(
@@ -424,9 +426,9 @@ async def user_clarification(
         )
     # Set the approval in the orchestration config
     if user_id and human_feedback.request_id:
-        ### validate rai 
-        if human_feedback.answer != None or human_feedback.answer !="":
-          if not await rai_success(human_feedback.answer, False):
+        ### validate rai
+        if human_feedback.answer != None or human_feedback.answer != "":
+            if not await rai_success(human_feedback.answer, False):
                 track_event_if_configured(
                     "RAI failed",
                     {
@@ -451,9 +453,6 @@ async def user_clarification(
                     },
                 )
 
-
-
-
         if (
             orchestration_config
             and human_feedback.request_id in orchestration_config.clarifications
@@ -890,7 +889,6 @@ async def delete_team_config(team_id: str, request: Request):
         raise HTTPException(status_code=500, detail="Internal server error occurred")
 
 
-
 @app_v3.post("/select_team")
 async def select_team(selection: TeamSelectionRequest, request: Request):
     """
@@ -980,6 +978,7 @@ async def select_team(selection: TeamSelectionRequest, request: Request):
         )
         raise HTTPException(status_code=500, detail="Internal server error occurred")
 
+
 # Get plans is called in the initial side rendering of the frontend
 @app_v3.get("/plans")
 async def get_plans(request: Request):
@@ -1058,9 +1057,10 @@ async def get_plans(request: Request):
     if not current_team:
         return []
 
-    all_plans = await memory_store.get_all_plans_by_team_id(team_id=current_team.team_id)
+    all_plans = await memory_store.get_all_plans_by_team_id_status(
+        team_id=current_team.team_id, status=PlanStatus.completed
+    )
 
-    steps_for_all_plans = []
     # Create list of PlanWithSteps and update step counts
     list_of_plans_with_steps = []
     for plan in all_plans:
@@ -1074,7 +1074,7 @@ async def get_plans(request: Request):
 
 # Get plans is called in the initial side rendering of the frontend
 @app_v3.get("/plan")
-async def get_plan_by_id(request: Request,   plan_id: str):
+async def get_plan_by_id(request: Request, plan_id: str):
     """
     Retrieve plans for the current user.
 

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

@@ -33,6 +33,7 @@ import ContentNotFound from "../NotFound/ContentNotFound";
 import PlanChatBody from "./PlanChatBody";
 import renderBufferMessage from "./streaming/StreamingBufferMessage";
 import renderAgentMessages from "./streaming/StreamingAgentMessage";
+
 interface SimplifiedPlanChatProps extends PlanChatProps {
   onPlanReceived?: (planData: MPlanData) => void;
   initialTask?: string;
@@ -141,6 +142,7 @@ const PlanChat: React.FC<SimplifiedPlanChatProps> = ({
       backgroundColor: 'var(--colorNeutralBackground1)'
     }}>
       {/* Messages Container */}
+      <InlineToaster />
       <div
         ref={messagesContainerRef}
         style={{
@@ -174,7 +176,6 @@ const PlanChat: React.FC<SimplifiedPlanChatProps> = ({
         setInput={setInput}
         submittingChatDisableInput={submittingChatDisableInput}
         OnChatSubmit={OnChatSubmit}
-        showChatInput={true}
         waitingForPlan={waitingForPlan}
         loading={false} />
     </div>

src/frontend/src/components/content/PlanChatBody.tsx

@@ -4,7 +4,6 @@ import { Button } from "@fluentui/react-components";
 import { SendRegular } from "@fluentui/react-icons";
 
 interface SimplifiedPlanChatProps extends PlanChatProps {
-    showChatInput: boolean;
     waitingForPlan: boolean;
 }
 const PlanChatBody: React.FC<SimplifiedPlanChatProps> = ({
@@ -13,22 +12,19 @@ const PlanChatBody: React.FC<SimplifiedPlanChatProps> = ({
     setInput,
     submittingChatDisableInput,
     OnChatSubmit,
-    showChatInput,
     waitingForPlan
 }) => {
-    if (!showChatInput) {
-        return null;
-    }
     return (
 
-        <div style={{
-            padding: '20px 24px 32px',
-            borderTop: '1px solid var(--colorNeutralStroke2)',
-            backgroundColor: 'var(--colorNeutralBackground1)',
-            maxWidth: '800px',
-            margin: '0 auto',
-            width: '100%'
-        }}
+        <div
+            style={{
+                padding: '20px 24px 32px',
+                borderTop: '1px solid var(--colorNeutralStroke2)',
+                backgroundColor: 'var(--colorNeutralBackground1)',
+                maxWidth: '800px',
+                margin: '0 auto',
+                width: '98%'
+            }}
 
         >
             <ChatInput
@@ -39,7 +35,7 @@ const PlanChatBody: React.FC<SimplifiedPlanChatProps> = ({
                 placeholder={
                     waitingForPlan
                         ? "Creating plan..."
-                        : "Send a message..."
+                        : "Add more info to this plan..."
                 }
             >
                 <Button

src/frontend/src/components/content/PlanPanelLeft.tsx

@@ -200,7 +200,6 @@ const PlanPanelLeft: React.FC<PlanPanelLefProps> = ({
 
         <br />
         <TaskList
-          inProgressTasks={inProgressTasks}
           completedTasks={completedTasks}
           onTaskSelect={handleTaskSelect}
           loading={plansLoading}

src/frontend/src/components/content/TaskList.tsx

@@ -18,7 +18,6 @@ import {
 } from "@fluentui/react-components";
 
 const TaskList: React.FC<TaskListProps> = ({
-  inProgressTasks,
   completedTasks,
   onTaskSelect,
   loading,
@@ -82,18 +81,8 @@ const TaskList: React.FC<TaskListProps> = ({
       <Accordion defaultOpenItems="1" collapsible>
         <AccordionItem value="1">
           <AccordionHeader expandIconPosition="end">
-            In progress
+            Completed
           </AccordionHeader>
-          <AccordionPanel>
-            {loading
-              ? Array.from({ length: 5 }, (_, i) =>
-                renderSkeleton(`in-progress-${i}`)
-              )
-              : inProgressTasks.map(renderTaskItem)}
-          </AccordionPanel>
-        </AccordionItem>
-        <AccordionItem value="2">
-          <AccordionHeader expandIconPosition="end">Completed</AccordionHeader>
           <AccordionPanel>
             {loading
               ? Array.from({ length: 5 }, (_, i) =>
@@ -102,6 +91,7 @@ const TaskList: React.FC<TaskListProps> = ({
               : completedTasks.map(renderTaskItem)}
           </AccordionPanel>
         </AccordionItem>
+
       </Accordion>
     </div>
   );

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

@@ -9,13 +9,13 @@ import rehypePrism from "rehype-prism";
 
 const renderBufferMessage = (streamingMessageBuffer: string) => {
     const [isExpanded, setIsExpanded] = useState(false);
-    
+
     if (!streamingMessageBuffer || streamingMessageBuffer.trim() === "") return null;
-    
-    const previewText = streamingMessageBuffer.length > 500 
+
+    const previewText = streamingMessageBuffer.length > 500
         ? streamingMessageBuffer.substring(0, 500) + "..."
         : streamingMessageBuffer;
-    
+
     return (
         <div style={{
             backgroundColor: 'var(--colorNeutralBackground2)',
@@ -24,16 +24,16 @@ const renderBufferMessage = (streamingMessageBuffer: string) => {
             padding: '16px',
             marginBottom: '16px'
         }}>
-            
-            <div style={{ 
-                display: 'flex', 
-                justifyContent: 'space-between', 
+
+            <div style={{
+                display: 'flex',
+                justifyContent: 'space-between',
                 alignItems: 'center',
                 marginBottom: isExpanded ? '16px' : '8px'
             }}>
-               <div style={{ 
-                    display: 'flex', 
-                    alignItems: 'center', 
+                <div style={{
+                    display: 'flex',
+                    alignItems: 'center',
                     gap: '12px'
                 }}>
                     <CheckmarkCircle20Regular style={{
@@ -43,18 +43,18 @@ const renderBufferMessage = (streamingMessageBuffer: string) => {
                         height: '20px',
                         flexShrink: 0
                     }} />
-                    <span style={{ 
-                        fontWeight: '500', 
+                    <span style={{
+                        fontWeight: '500',
                         color: 'var(--colorNeutralForeground1)',
                         fontSize: '14px',
                         lineHeight: '20px'
                     }}>
                         AI Thinking Process
                     </span>
                 </div>
-                
-                <Button 
-                    appearance="secondary" 
+
+                <Button
+                    appearance="secondary"
                     size="small"
                     // icon={isExpanded ? <ChevronDownRegular /> : <ChevronRightRegular />}
                     onClick={() => setIsExpanded(!isExpanded)}
@@ -69,13 +69,13 @@ const renderBufferMessage = (streamingMessageBuffer: string) => {
                     Details
                 </Button>
             </div>
-            
+
             {!isExpanded && (
                 <div style={{
                     display: 'flex',
                     alignItems: 'flex-start',
                     gap: '8px',
-                    marginLeft: '32px' 
+                    marginLeft: '32px'
                 }}>
                     <ArrowTurnDownRightRegular style={{
                         color: 'var(--colorNeutralForeground3)',
@@ -88,11 +88,17 @@ const renderBufferMessage = (streamingMessageBuffer: string) => {
                         fontSize: '14px',
                         lineHeight: '1.4'
                     }}>
-                        {previewText}
+                        <ReactMarkdown
+                            remarkPlugins={[remarkGfm]}
+                            rehypePlugins={[rehypePrism]}
+                        >
+                            {previewText}
+                        </ReactMarkdown>
+
                     </div>
                 </div>
             )}
-            
+
             {isExpanded && (
                 <div style={{
                     // backgroundColor: 'var(--colorNeutralBackground1)',

src/frontend/src/models/enums.tsx

@@ -255,4 +255,5 @@ export enum WebsocketMessageType {
 export enum AgentMessageType {
     HUMAN_AGENT = "Human_Agent",
     AI_AGENT = "AI_Agent",
-}
+}
+

src/frontend/src/models/taskList.tsx

@@ -8,7 +8,6 @@ export interface Task {
 }
 
 export interface TaskListProps {
-    inProgressTasks: Task[];
     completedTasks: Task[];
     onTaskSelect: (taskId: string) => void;
     loading?: boolean;