Refactor agent message handling and validation logic

Improves agent message processing by restructuring the backend to use a new handler for agent messages, adds error handling and event tracking, and updates plan service logic for message persistence. Also cleans up unused imports in PlanPage.tsx and refines orchestration config typing for plans.

Author: Fr4nc3

src/backend/common/models/messages_kernel.py

@@ -261,10 +261,9 @@ class AgentMessageData (BaseDataModel):
     data_type: Literal[DataType.m_plan_message] = Field(DataType.m_plan_message, Literal=True)
     plan_id: str
     user_id: str
-    m_plan_id: Optional[str] = None
     agent: str
+    m_plan_id: Optional[str] = None
     agent_type: AgentMessageType = AgentMessageType.AI_AGENT 
-    timestamp: int
     content: str
     raw_data: str
     steps: List[Any] = Field(default_factory=list)       

src/backend/v3/api/router.py

@@ -501,8 +501,25 @@ async def agent_message_user(
             status_code=401, detail="Missing or invalid user information"
         )
     # Set the approval in the orchestration config
-   
 
+    try:
+    
+        result = await PlanService.handle_agent_messages(agent_message, user_id)
+        print("Agent message processed:", result)
+    except ValueError as ve:
+        print(f"ValueError processing agent message: {ve}")
+    except Exception as e:
+        print(f"Error processing agent message: {e}")
+   
+    track_event_if_configured(
+        "AgentMessageReceived",
+        {
+            "agent": agent_message.agent,
+            "content": agent_message.content,
+            "user_id": user_id,
+        },
+    )
+    return {"status": "message recorded",}
 
 
 @app_v3.post("/upload_team_config")
@@ -564,24 +581,25 @@ async def upload_team_config(
             )
 
         # Validate content with RAI before processing
-        rai_valid, rai_error = await rai_validate_team_config(json_data)
-        if not rai_valid:
-            track_event_if_configured(
-                "Team configuration RAI validation failed",
-                {
+        if not team_id:
+            rai_valid, rai_error = await rai_validate_team_config(json_data)
+            if not rai_valid:
+                track_event_if_configured(
+                    "Team configuration RAI validation failed",
+                    {
                     "status": "failed",
                     "user_id": user_id,
                     "filename": file.filename,
                     "reason": rai_error,
                 },
             )
+            
             raise HTTPException(status_code=400, detail=rai_error)
 
         track_event_if_configured(
-            "Team configuration RAI validation passed",
-            {"status": "passed", "user_id": user_id, "filename": file.filename},
-        )
-
+                "Team configuration RAI validation passed",
+                {"status": "passed", "user_id": user_id, "filename": file.filename},
+    )
         # Initialize memory store and service
         memory_store = await DatabaseFactory.get_database(user_id=user_id)
         team_service = TeamService(memory_store)

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

@@ -1,16 +1,46 @@
+from dataclasses import Field, asdict
+import json
 import logging
+import time
 from typing import Dict, Any, Optional
 from common.database.database_factory import DatabaseFactory
-from common.database.database_base import DatabaseBase
+
+from v3.models.models import MPlan
 import v3.models.messages as messages
-from common.models.messages_kernel import PlanStatus
+from common.models.messages_kernel import AgentMessageData, AgentMessageType, AgentType, PlanStatus
 from v3.config.settings import orchestration_config
 from common.utils.event_utils import track_event_if_configured
+import uuid
+from semantic_kernel.kernel_pydantic import Field
 
+class MPlanExpanded(MPlan):
+    session_id: str = Field(default_factory=lambda: str(uuid.uuid4()))
+    
 logger = logging.getLogger(__name__)
+def build_agent_message_from_user_clarification(
+    human_feedback: messages.UserClarificationResponse,
+    user_id: str
+) -> AgentMessageData:
+    """
+    Convert a UserClarificationResponse (human feedback) into an AgentMessageData.
+    """
+    # NOTE: AgentMessageType enum currently defines values with trailing commas in messages_kernel.py.
+    # e.g. HUMAN_AGENT = "Human_Agent",  -> value becomes ('Human_Agent',)
+    # Consider fixing that enum (remove trailing commas) so .value is a string.
+    return AgentMessageData(
+        plan_id = human_feedback.plan_id or "",
+        user_id = user_id,
+        m_plan_id = human_feedback.m_plan_id or None,
+        agent = AgentType.HUMAN.value,              # or simply "Human_Agent"
+        agent_type = AgentMessageType.HUMAN_AGENT,  # will serialize per current enum definition
+        content = human_feedback.answer or "",
+        raw_data = json.dumps(asdict(human_feedback)),
+        steps = [],          # intentionally empty
+        next_steps = []      # intentionally empty
+    )
 
-class PlanService:
 
+class PlanService:
 
     @staticmethod
     async def handle_plan_approval(human_feedback: messages.PlanApprovalResponse, user_id: str) ->  bool:
@@ -74,7 +104,7 @@ async def handle_plan_approval(human_feedback: messages.PlanApprovalResponse, us
         return True
 
     @staticmethod
-    async def handle_agent_messages(standard_message: messages.AgentMessage, user_id: str) -> bool:
+    async def handle_agent_messages(agent_message: messages.AgentMessageResponse, user_id: str) -> bool:
         """
         Process an AgentMessage coming from the client.
 
@@ -105,4 +135,22 @@ async def handle_human_clarification(human_feedback: messages.UserClarificationR
         Raises:
             ValueError on invalid state
         """
-        return True
+        try:
+            agent_msg = build_agent_message_from_user_clarification(human_feedback, user_id)
+
+            # Persist if your database layer supports it.
+            # Look for or implement something like: memory_store.add_agent_message(agent_msg)
+            memory_store = await DatabaseFactory.get_database(user_id=user_id)
+            if hasattr(memory_store, "add_agent_message"):
+                await memory_store.add_agent_message(agent_msg)
+            else:
+                # Fallback: log or ignore if persistence not yet implemented
+                logging.debug("add_agent_message not implemented; skipping persistence")
+
+            # Optionally emit over websocket if you have a broadcaster:
+            # await websocket_manager.broadcast(WebsocketMessageType.AGENT_MESSAGE, agent_msg.model_dump())
+
+            return True
+        except Exception as e:
+            logger.exception("Failed to handle human clarification -> agent message: %s", e)
+            return False

src/backend/v3/config/settings.py

@@ -15,7 +15,7 @@
 from semantic_kernel.agents.orchestration.magentic import MagenticOrchestration
 from semantic_kernel.connectors.ai.open_ai import (
     AzureChatCompletion, OpenAIChatPromptExecutionSettings)
-from v3.models.messages import WebsocketMessageType
+from v3.models.messages import WebsocketMessageType, MPlan
 
 logger = logging.getLogger(__name__)
 
@@ -82,7 +82,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/pages/PlanPage.tsx

@@ -17,9 +17,6 @@ import Octo from "../coral/imports/Octopus.png";
 import PanelRightToggles from "../coral/components/Header/PanelRightToggles";
 import { TaskListSquareLtr } from "../coral/imports/bundleicons";
 import LoadingMessage, { loadingMessages } from "../coral/components/LoadingMessage";
-import { RAIErrorCard, RAIErrorData } from "../components/errors";
-import { TeamConfig } from "../models/Team";
-import { TeamService } from "../services/TeamService";
 import webSocketService from "../services/WebSocketService";
 import { APIService } from "../api/apiService";
 import { StreamMessage, StreamingPlanUpdate } from "../models";