Refactor agent message content field and add enums

Renamed 'raw_content' to 'content' in AgentMessageData across frontend and backend for consistency. Added new enums and fields to backend models, including AgentMessageType, PlanStatus 'canceled', Plan 'approved', and updated DataType values. Updated frontend components and services to use the new 'content' field.

Author: Fr4nc3

src/backend/common/models/messages_kernel.py

@@ -3,8 +3,9 @@
 from enum import Enum
 from typing import Any, Dict, List, Literal, Optional
 
-from semantic_kernel.kernel_pydantic import Field, KernelBaseModel
 
+from semantic_kernel.kernel_pydantic import Field, KernelBaseModel
+from dataclasses import  dataclass
 
 class DataType(str, Enum):
     """Enumeration of possible data types for documents in the database."""
@@ -16,7 +17,7 @@ class DataType(str, Enum):
     team_config = "team_config"
     user_current_team = "user_current_team"
     m_plan = "m_plan"
-    m_plan_step = "m_plan_step"
+    m_plan_message = "m_plan_message"
 
 
 class AgentType(str, Enum):
@@ -53,6 +54,7 @@ class PlanStatus(str, Enum):
     in_progress = "in_progress"
     completed = "completed"
     failed = "failed"
+    canceled = "canceled"
 
 
 class HumanFeedbackStatus(str, Enum):
@@ -93,6 +95,7 @@ class AgentMessage(BaseDataModel):
     step_id: Optional[str] = None
 
 
+    
 class Session(BaseDataModel):
     """Represents a user session."""
 
@@ -119,6 +122,7 @@ class Plan(BaseDataModel):
     user_id: str
     initial_goal: str
     overall_status: PlanStatus = PlanStatus.in_progress
+    approved: bool = False
     source: str = AgentType.PLANNER.value
     summary: Optional[str] = None
     team_id: Optional[str] = None
@@ -250,3 +254,14 @@ class InputTask(KernelBaseModel):
 
 class UserLanguage(KernelBaseModel):
     language: str
+
+
+class AgentMessageType(str, Enum):
+    HUMAN_AGENT = "Human_Agent",
+    AI_AGENT = "AI_Agent",
+
+
+class AgentMessageData (BaseDataModel):
+    agent: str
+    agent_type: AgentMessageType = AgentMessageType.AI_AGENT 
+    content: str

src/backend/v3/models/messages.py

@@ -123,7 +123,6 @@ class ApprovalRequest(KernelBaseModel):
     agent_name: str
 
 
-
 class WebsocketMessageType(str, Enum):
     """Types of WebSocket messages."""
     SYSTEM_MESSAGE = "system_message" 

src/backend/v3/models/models.py

@@ -1,10 +1,12 @@
 import uuid
 from datetime import datetime, timezone
 from enum import Enum
-from typing import List, Optional
+from typing import List, Literal, Optional
 
 from pydantic import BaseModel, Field
 
+from common.models.messages_kernel import DataType
+
 
 class PlanStatus(str, Enum):
     CREATED = "created"
@@ -22,6 +24,7 @@ class MStep(BaseModel):
 class MPlan(BaseModel):
     """model of a plan"""
     id: str = Field(default_factory=lambda: str(uuid.uuid4()))
+    data_type: Literal[DataType.m_plan] = Field(DataType.m_plan, Literal=True)
     user_id: str = ""
     team_id: str = ""
     plan_id: str = ""

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

@@ -12,28 +12,12 @@ const StreamingAgentMessage = (agentMessages: AgentMessageData[]) => {
   if (!agentMessages?.length) return null;
 
   // Filter out messages with empty content
-  const validMessages = agentMessages.filter(msg => msg.raw_content?.trim());
+  const validMessages = agentMessages.filter(msg => msg.content?.trim());
   const messages = validMessages;
   if (!validMessages.length) return null;
 
   return (
-    // <div className="streaming-agent-messages">
-    //   {validMessages.map((message, index) => (
-    //     <div key={`${message.agent}-${message.timestamp}-${index}`} className="agent-message">
-    //       <div className="agent-name">
-    //         <strong>{message.agent}</strong>:
-    //       </div>
-    //       <div className="agent-content">
-    //         <ReactMarkdown
-    //           remarkPlugins={[remarkGfm]}
-    //           rehypePlugins={[rehypePrism]}
-    //         >
-    //           {message.raw_content.trim()}
-    //         </ReactMarkdown>
-    //       </div>
-    //     </div>
-    //   ))}
-    // </div>
+
 
     <div className="message-wrapper">
       {messages.map((msg, index) => {
@@ -68,7 +52,7 @@ const StreamingAgentMessage = (agentMessages: AgentMessageData[]) => {
                   remarkPlugins={[remarkGfm]}
                   rehypePlugins={[rehypePrism]}
                 >
-                  {TaskService.cleanHRAgent(msg.raw_content) || ""}
+                  {TaskService.cleanHRAgent(msg.content) || ""}
                 </ReactMarkdown>
 
                 {!isHuman && (
@@ -77,8 +61,8 @@ const StreamingAgentMessage = (agentMessages: AgentMessageData[]) => {
                       <div>
                         <Button
                           onClick={() =>
-                            msg.raw_content &&
-                            navigator.clipboard.writeText(msg.raw_content)
+                            msg.content &&
+                            navigator.clipboard.writeText(msg.content)
                           }
                           title="Copy Response"
                           appearance="subtle"

src/frontend/src/models/agentMessage.tsx

@@ -26,6 +26,6 @@ export interface AgentMessageData {
     timestamp: number;
     steps: any[];       // intentionally always empty
     next_steps: [];  // intentionally always empty
-    raw_content: string;
+    content: string;
     raw_data: string;
 }

src/frontend/src/pages/PlanPage.tsx

@@ -146,7 +146,7 @@ const PlanPage: React.FC = () => {
                 timestamp: clarificationMessage.timestamp || Date.now(),
                 steps: [],   // intentionally always empty
                 next_steps: [],  // intentionally always empty
-                raw_content: clarificationMessage.data.question || '',
+                content: clarificationMessage.data.question || '',
                 raw_data: clarificationMessage.data || '',
             } as AgentMessageData;
             console.log('✅ Parsed clarification message:', agentMessageData);
@@ -183,7 +183,7 @@ const PlanPage: React.FC = () => {
                 timestamp: Date.now(),
                 steps: [],   // intentionally always empty
                 next_steps: [],  // intentionally always empty
-                raw_content: finalMessage.data.content || '',
+                content: finalMessage.data.content || '',
                 raw_data: finalMessage.data || '',
             } as AgentMessageData;
             console.log('✅ Parsed final result message:', agentMessageData);
@@ -395,7 +395,7 @@ const PlanPage: React.FC = () => {
                     timestamp: Date.now(),
                     steps: [],   // intentionally always empty
                     next_steps: [],  // intentionally always empty
-                    raw_content: chatInput || '',
+                    content: chatInput || '',
                     raw_data: chatInput || '',
                 } as AgentMessageData;
 

src/frontend/src/services/PlanDataService.tsx

@@ -376,7 +376,7 @@ export class PlanDataService {
       raw_block: string;
     }>;
     next_steps: string[];
-    raw_content: string;
+    content: string;
     raw_data: any;
   } | null {
     try {
@@ -401,17 +401,17 @@ export class PlanDataService {
 
       // Extract content='...'
       const contentMatch = source.match(/content='((?:\\'|[^'])*)'/);
-      let raw_content = contentMatch ? contentMatch[1] : '';
+      let content = contentMatch ? contentMatch[1] : '';
       // Unescape
-      raw_content = raw_content
+      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.
-      const lines = raw_content.split('\n');
+      const lines = content.split('\n');
       const steps: Array<{ title: string; fields: Record<string, string>; summary?: string; raw_block: string; }> = [];
       let i = 0;
       while (i < lines.length) {
@@ -473,7 +473,7 @@ export class PlanDataService {
         timestamp,
         steps,
         next_steps: nextSteps,
-        raw_content,
+        content,
         raw_data: rawData
       };
     } catch (e) {