Add plan approval and mplan management features

Introduces plan approval workflow, including PlanStatus.approved, mplan CRUD operations, and plan deletion by ID. Refactors CosmosDB and DatabaseBase to support new mplan methods, updates PlanService for approval/rejection logic, and improves frontend plan parsing and state management. Minor prompt and logging adjustments included.

Author: Fr4nc3

data/agent_teams/retail.json

@@ -64,7 +64,7 @@
     {
       "id": "task-1",
       "name": "Satisfaction Plan",
-      "prompt": "Create a  plan to improve Emily Thompson's satisfaction.​",
+      "prompt": "Create a  plan to improve Emily Thompson's satisfaction.",
       "created": "",
       "creator": "",
       "logo": ""

src/backend/common/database/cosmosdb.py

@@ -11,7 +11,7 @@
 from azure.cosmos.aio import CosmosClient
 from azure.cosmos.aio._database import DatabaseProxy
 from azure.cosmos.exceptions import CosmosResourceExistsError
-from pytest import Session
+import v3.models.messages as messages
 
 from common.models.messages_kernel import (
     AgentMessage,
@@ -24,7 +24,6 @@
 from .database_base import DatabaseBase
 from ..models.messages_kernel import (
     BaseDataModel,
-    Session,
     Plan,
     Step,
     AgentMessage,
@@ -38,7 +37,6 @@ class CosmosDBClient(DatabaseBase):
     """CosmosDB implementation of the database interface."""
 
     MODEL_CLASS_MAPPING = {
-        DataType.session: Session,
         DataType.plan: Plan,
         DataType.step: Step,
         DataType.agent_message: AgentMessage,
@@ -200,17 +198,6 @@ async def update_plan(self, plan: Plan) -> None:
         """Update a plan in CosmosDB."""
         await self.update_item(plan)
 
-    async def get_plan_by_session(self, session_id: str) -> Optional[Plan]:
-        """Retrieve a plan by session_id."""
-        query = (
-            "SELECT * FROM c WHERE c.session_id=@session_id AND c.data_type=@data_type"
-        )
-        parameters = [
-            {"name": "@session_id", "value": session_id},
-            {"name": "@data_type", "value": DataType.plan},
-        ]
-        results = await self.query_items(query, parameters, Plan)
-        return results[0] if results else None
 
     async def get_plan_by_plan_id(self, plan_id: str) -> Optional[Plan]:
         """Retrieve a plan by plan_id."""
@@ -360,27 +347,6 @@ async def delete_team(self, team_id: str) -> bool:
             logging.exception(f"Failed to delete team from Cosmos DB: {e}")
             return False
 
-    async def get_data_by_type_and_session_id(
-        self, data_type: str, session_id: str
-    ) -> List[BaseDataModel]:
-        """Query the Cosmos DB for documents with the matching data_type, session_id and user_id."""
-        await self._ensure_initialized()
-        if self.container is None:
-            return []
-
-        model_class = self.MODEL_CLASS_MAPPING.get(data_type, BaseDataModel)
-        try:
-            query = "SELECT * FROM c WHERE c.session_id=@session_id AND c.user_id=@user_id AND c.data_type=@data_type ORDER BY c._ts ASC"
-            parameters = [
-                {"name": "@session_id", "value": session_id},
-                {"name": "@data_type", "value": data_type},
-                {"name": "@user_id", "value": self.user_id},
-            ]
-            return await self.query_items(query, parameters, model_class)
-        except Exception as e:
-            logging.exception(f"Failed to query data by type from Cosmos DB: {e}")
-            return []
-
     # Data Management Operations
     async def get_data_by_type(self, data_type: str) -> List[BaseDataModel]:
         """Retrieve all data of a specific type."""
@@ -477,3 +443,40 @@ async def update_current_team(self, current_team: UserCurrentTeam) -> None:
         """Update the current team for a user."""
         await self._ensure_initialized()
         await self.update_item(current_team)
+
+    async def delete_plan_by_plan_id(self, plan_id: str) -> bool:
+        """Delete a plan by its ID."""
+        query = "SELECT c.id, c.session_id FROM c WHERE c.id=@plan_id "
+
+        params = [
+            {"name": "@plan_id", "value": plan_id},
+        ]
+        items = self.container.query_items(query=query, parameters=params)
+        print("Items to delete planid:", items)
+        if items:
+            async for doc in items:
+                try:
+                    await self.container.delete_item(doc["id"], partition_key=doc["session_id"])
+                except Exception as e:
+                    self.logger.warning("Failed deleting current team doc %s: %s", doc.get("id"), e)
+
+        return True
+
+    async def add_mplan(self, mplan: messages.MPlan) -> None:
+        """Add a team configuration to the database."""
+        await self.add_item(mplan)
+
+    async def update_mplan(self, mplan: messages.MPlan) -> None:
+        """Update a team configuration in the database."""
+        await self.update_item(mplan)
+
+
+    async def get_mplan(self, plan_id: str) -> Optional[messages.MPlan]:
+        """Retrieve a mplan configuration by mplan_id."""
+        query = "SELECT * FROM c WHERE c.plan_id=@plan_id AND c.data_type=@data_type"
+        parameters = [
+            {"name": "@plan_id", "value": plan_id},
+            {"name": "@data_type", "value": DataType.m_plan},
+        ]
+        results = await self.query_items(query, parameters, messages.MPlan)
+        return results[0] if results else None

src/backend/common/database/database_base.py

@@ -2,7 +2,7 @@
 
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional, Type
-
+import v3.models.messages as messages
 from ..models.messages_kernel import (
     BaseDataModel,
     Plan,
@@ -97,11 +97,7 @@ async def get_all_plans_by_team_id_status(
         """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
-    ) -> List[BaseDataModel]:
-        pass
+
 
     # Step Operations
     @abstractmethod
@@ -199,3 +195,23 @@ async def set_current_team(self, current_team: UserCurrentTeam) -> None:
     async def update_current_team(self, current_team: UserCurrentTeam) -> None:
         """Update the current team for a user."""
         pass
+    
+    @abstractmethod
+    async def delete_plan_by_plan_id(self, plan_id: str) -> bool:
+        """Retrieve the current team for a user."""
+        pass
+
+    @abstractmethod
+    async def add_mplan(self, mplan: messages.MPlan) -> None:
+        """Add a team configuration to the database."""
+        pass
+
+    @abstractmethod
+    async def update_mplan(self, mplan: messages.MPlan) -> None:
+        """Update a team configuration in the database."""
+        pass
+
+    @abstractmethod
+    async def get_mplan(self, plan_id: str) -> Optional[messages.MPlan]:
+        """Retrieve a mplan configuration by mplan_id."""
+        pass

src/backend/common/models/messages_kernel.py

@@ -55,6 +55,7 @@ class PlanStatus(str, Enum):
     completed = "completed"
     failed = "failed"
     canceled = "canceled"
+    approved = "approved"
 
 
 class HumanFeedbackStatus(str, Enum):

src/backend/v3/api/router.py

@@ -923,9 +923,9 @@ async def select_team(selection: TeamSelectionRequest, request: Request):
             )
 
         # save to in-memory config for current user
-        team_config.set_current_team(
-            user_id=user_id, team_configuration=team_configuration
-        )
+        # team_config.set_current_team(
+        #     user_id=user_id, team_configuration=team_configuration
+        # )
 
         # Track the team selection event
         track_event_if_configured(
@@ -1142,17 +1142,13 @@ async def get_plan_by_id(request: Request, plan_id: str):
 
         # Use get_steps_by_plan to match the original implementation
         steps = await memory_store.get_steps_by_plan(plan_id=plan.id)
-        messages = await memory_store.get_data_by_type_and_session_id(
-            "agent_message", session_id=plan.session_id
-        )
+        messages = []
 
         plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
         plan_with_steps.update_step_counts()
 
         # Format dates in messages according to locale
-        formatted_messages = format_dates_in_messages(
-            messages, config.get_user_local_browser_language()
-        )
+        formatted_messages = []
 
         return [plan_with_steps, formatted_messages]
     else:

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

@@ -3,6 +3,7 @@
 from common.database.database_factory import DatabaseFactory
 from common.database.database_base import DatabaseBase
 import v3.models.messages as messages
+from common.models.messages_kernel import PlanStatus
 from v3.config.settings import orchestration_config
 from common.utils.event_utils import track_event_if_configured
 
@@ -30,22 +31,44 @@ async def handle_plan_approval(human_feedback: messages.PlanApprovalResponse, us
             return False
         try:
             mplan = orchestration_config.plans[human_feedback.m_plan_id]
+            memory_store = await DatabaseFactory.get_database(user_id=user_id)
             if hasattr(mplan, "plan_id"):
                 print(
                     "Updated orchestration config:",
                     orchestration_config.plans[human_feedback.m_plan_id],
                 )
-                mplan.plan_id = human_feedback.plan_id
-                orchestration_config.plans[human_feedback.m_plan_id] = mplan
-                memory_store = await DatabaseFactory.get_database(user_id=user_id)
-                plan = await memory_store.get_plan(human_feedback.plan_id)
-                if plan:
-                    print("Retrieved plan from memory store:", plan)
-                    
+                if human_feedback.approved:
+                    mplan.plan_id = human_feedback.plan_id
+
+                    orchestration_config.plans[human_feedback.m_plan_id] = mplan
 
-                else:
-                    print("Plan not found in memory store.")
-                    return False
+                    plan = await memory_store.get_plan(human_feedback.plan_id)
+                    mplan.team_id = plan.team_id # just to keep consistency 
+                    if plan:
+                        plan.overall_status = PlanStatus.approved
+                        await memory_store.update_plan(plan)
+                        await memory_store.add_mplan(mplan)
+                        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:
             print(f"Error processing plan approval: {e}")
@@ -70,12 +93,12 @@ async def handle_agent_messages(standard_message: messages.AgentMessage) -> bool
         return True
 
     @staticmethod
-    async def handle_human_clarification(standard_message: messages.AgentMessage) -> bool:
+    async def handle_human_clarification(human_feedback: messages.UserClarificationResponse) -> bool:
         """
-        Process an AgentMessage coming from the client.
+        Process a UserClarificationResponse coming from the client.
 
         Args:
-            standard_message: messages.AgentMessage (contains relevant message data)
+            human_feedback: messages.UserClarificationResponse (contains relevant message data)
             user_id: authenticated user id
 
         Returns:

src/backend/v3/config/settings.py

@@ -18,7 +18,7 @@
     OpenAIChatPromptExecutionSettings,
 )
 
-from v3.models.messages import WebsocketMessageType
+from v3.models.messages import WebsocketMessageType, MPlan
 
 logger = logging.getLogger(__name__)
 
@@ -85,7 +85,7 @@ def __init__(self):
         self.orchestrations: Dict[str, MagenticOrchestration] = (
             {}
         )  # user_id -> orchestration instance
-        self.plans: Dict[str, any] = {}  # plan_id -> plan details
+        self.plans: Dict[str, MPlan] = {}  # plan_id -> plan details
         self.approvals: Dict[str, bool] = {}  # m_plan_id -> approval status
         self.sockets: Dict[str, WebSocket] = {}  # user_id -> WebSocket
         self.clarifications: Dict[str, str] = {}  # m_plan_id -> clarification response

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

@@ -85,7 +85,8 @@ const PlanPanelLeft: React.FC<PlanPanelLefProps> = ({
 
   useEffect(() => {
     loadPlansData();
-  }, [loadPlansData]);
+    setUserInfo(getUserInfoGlobal());
+  }, [loadPlansData, setUserInfo]);
 
   useEffect(() => {
     if (plans) {

src/frontend/src/services/PlanDataService.tsx

@@ -365,6 +365,7 @@ export class PlanDataService {
    *  - "AgentMessage(agent_name='X', timestamp=..., content='...')"
    * Returns a structured object with steps parsed from markdown-ish content.
    */
+  // ...inside class PlanDataService
   static parseAgentMessage(rawData: any): {
     agent: string;
     agent_type: AgentMessageType;
@@ -381,7 +382,9 @@ export class PlanDataService {
   } | null {
     try {
       // Unwrap wrapper
-      if (rawData && typeof rawData === 'object' && rawData.type === WebsocketMessageType.AGENT_MESSAGE && typeof rawData.data === 'string') {
+      if (rawData && typeof rawData === 'object' &&
+        rawData.type === WebsocketMessageType.AGENT_MESSAGE &&
+        typeof rawData.data === 'string') {
         return this.parseAgentMessage(rawData.data);
       }
 
@@ -395,22 +398,22 @@ export class PlanDataService {
         source.match(/agent_name="([^"]+)"/)?.[1] ||
         'UnknownAgent';
 
-      const timestampStr =
-        source.match(/timestamp=([\d.]+)/)?.[1];
+      const timestampStr = source.match(/timestamp=([\d.]+)/)?.[1];
       const timestamp = timestampStr ? Number(timestampStr) : null;
 
-      // Extract content='...'
-      const contentMatch = source.match(/content='((?:\\'|[^'])*)'/);
-      let content = contentMatch ? contentMatch[1] : '';
-      // Unescape
+      // Support single or double quoted content
+      const contentMatch = source.match(/content=(?:"((?:\\.|[^"])*)"|'((?:\\.|[^'])*)')/);
+      let content = contentMatch ? (contentMatch[1] ?? contentMatch[2] ?? '') : '';
       content = content
         .replace(/\\n/g, '\n')
         .replace(/\\'/g, "'")
         .replace(/\\"/g, '"')
         .replace(/\\\\/g, '\\');
 
-      // Parse sections of the form "##### Title Completed"
-      // Each block ends at --- line or next "##### " or end.
+      // Simplify human clarification inline if present
+      content = this.simplifyHumanClarification(content);
+
+      // Parse sections
       const lines = content.split('\n');
       const steps: Array<{ title: string; fields: Record<string, string>; summary?: string; raw_block: string; }> = [];
       let i = 0;
@@ -424,7 +427,6 @@ export class PlanDataService {
             blockLines.push(lines[i]);
             i++;
           }
-          // Skip separator line if present
           if (i < lines.length && /^---\s*$/.test(lines[i])) i++;
 
           const fields: Record<string, string> = {};
@@ -437,9 +439,7 @@ export class PlanDataService {
               if (fieldName) fields[fieldName] = value;
             } else {
               const summaryMatch = bl.match(/^AGENT SUMMARY:\s*(.+)$/i);
-              if (summaryMatch) {
-                summary = summaryMatch[1].trim();
-              }
+              if (summaryMatch) summary = summaryMatch[1].trim();
             }
           }
 
@@ -454,7 +454,7 @@ export class PlanDataService {
         }
       }
 
-      // Next Steps section
+      // Next Steps
       const nextSteps: string[] = [];
       const nextIdx = lines.findIndex(l => /^Next Steps:/.test(l.trim()));
       if (nextIdx !== -1) {