Refactor plan data handling and WebSocket params

Updated backend to return raw plan, team, messages, and m_plan objects instead of model_dump results. Adjusted frontend API service and PlanPage to handle new response structure and improved variable naming for clarity. Refactored WebSocketService to use planId instead of sessionId for connection and URL building.

Author: Fr4nc3

src/backend/v3/api/router.py

@@ -1250,15 +1250,7 @@ async def get_plans(request: Request):
         team_id=current_team.team_id, status=PlanStatus.completed
     )
 
-    # Create list of PlanWithSteps and update step counts
-    list_of_plans_with_steps = []
-    for plan in all_plans:
-        plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=[])
-        plan_with_steps.overall_status
-        plan_with_steps.update_step_counts()
-        list_of_plans_with_steps.append(plan_with_steps)
-
-    return list_of_plans_with_steps
+    return all_plans
 
 
 # Get plans is called in the initial side rendering of the frontend
@@ -1347,13 +1339,13 @@ async def get_plan_by_id(request: Request, plan_id: str):
         # Use get_steps_by_plan to match the original implementation
 
         team = await memory_store.get_team_by_id(team_id=plan.team_id)
-        messages = await memory_store.get_agent_messages(plan_id=plan.plan_id)
-        m_plan = await memory_store.get_m_plan_by_plan_id(plan_id=plan.plan_id)
+        agent_messages = await memory_store.get_agent_messages(plan_id=plan.plan_id)
+        m_plan = await memory_store.get_mplan(plan_id=plan.plan_id)
         return {
-            "plan": plan.model_dump(),
-            "team": team.model_dump() if team else None,
-            "messages": [msg.model_dump() for msg in messages],
-            "m_plan": m_plan.model_dump() if m_plan else None,
+            "plan": plan,
+            "team": team if team else None,
+            "messages": agent_messages,
+            "m_plan": m_plan if m_plan else None,
         }
     else:
         track_event_if_configured(

src/frontend/src/api/apiService.tsx

@@ -4,15 +4,17 @@ import {
     HumanClarification,
     InputTask,
     InputTaskResponse,
-    PlanWithSteps,
     Plan,
-    Step,
     StepStatus,
     AgentType,
-    PlanMessage,
     PlanApprovalRequest,
     PlanApprovalResponse,
-    AgentMessageData
+    AgentMessageData,
+    MPlanData,
+    AgentMessageBE,
+    MPlanBE,
+    TeamConfigurationBE,
+    PlanFromAPI
 } from '../models';
 
 // Constants for endpoints
@@ -122,7 +124,7 @@ export class APIService {
      * @param useCache Whether to use cached data or force fresh fetch
      * @returns Promise with array of plans with their steps
      */
-    async getPlans(sessionId?: string, useCache = true): Promise<PlanWithSteps[]> {
+    async getPlans(sessionId?: string, useCache = true): Promise<Plan[]> {
         const cacheKey = `plans_${sessionId || 'all'}`;
         const params = sessionId ? { session_id: sessionId } : {};
         // TODO replace session for team_id 
@@ -147,7 +149,7 @@ export class APIService {
      * @param useCache Whether to use cached data or force fresh fetch
      * @returns Promise with the plan and its steps
      */
-    async getPlanById(planId: string, useCache = true): Promise<{ plan_with_steps: PlanWithSteps; messages: PlanMessage[] }> {
+    async getPlanById(planId: string, useCache = true): Promise<PlanFromAPI> {
         const cacheKey = `plan_by_id_${planId}`;
         const params = { plan_id: planId };
 
@@ -158,17 +160,21 @@ export class APIService {
             if (!data) {
                 throw new Error(`Plan with ID ${planId} not found`);
             }
-
-            const plan = data[0] as PlanWithSteps;
-            const messages = data[1] || [];
+            console.log('Fetched plan by ID:', data);
+            const results = {
+                plan: data.plan as Plan,
+                messages: data.messages as AgentMessageBE[],
+                m_plan: data.m_plan as MPlanBE | null,
+                team: data.team as TeamConfigurationBE | null
+            } as PlanFromAPI;
             if (useCache) {
-                this._cache.set(cacheKey, { plan_with_steps: plan, messages }, 30000); // Cache for 30 seconds
+                this._cache.set(cacheKey, results, 30000); // Cache for 30 seconds
             }
-            return { plan_with_steps: plan, messages };
+            return results;
         };
 
         if (useCache) {
-            const cachedPlan = this._cache.get<{ plan_with_steps: PlanWithSteps; messages: PlanMessage[] }>(cacheKey);
+            const cachedPlan = this._cache.get<PlanFromAPI>(cacheKey);
             if (cachedPlan) return cachedPlan;
 
             return this._requestTracker.trackRequest(cacheKey, fetcher);
@@ -184,11 +190,11 @@ export class APIService {
      * @param useCache Whether to use cached data or force fresh fetch
      * @returns Promise with the plan and its steps
      */
-    async getPlanWithSteps(sessionId: string, planId: string, useCache = true): Promise<PlanWithSteps> {
+    async getPlanWithSteps(sessionId: string, planId: string, useCache = true): Promise<Plan> {
         const cacheKey = `plan_${sessionId}_${planId}`;
 
         if (useCache) {
-            const cachedPlan = this._cache.get<PlanWithSteps>(cacheKey);
+            const cachedPlan = this._cache.get<Plan>(cacheKey);
             if (cachedPlan) return cachedPlan;
         }
 
@@ -239,49 +245,6 @@ export class APIService {
         });
     }
 
-    /**
-     * Get final plan execution results after approval
-     * @param planId 
-     * @param useCache 
-     * @returns Promise with final plan execution data
-     */
-    async getFinalPlanResults(planId: string, useCache = true): Promise<{ plan_with_steps: PlanWithSteps; messages: PlanMessage[] }> {
-        const cacheKey = `final_plan_results_${planId}`;
-
-        const fetcher = async () => {
-            console.log('📤 Fetching final plan results for plan_id:', planId);
-
-            // ✅ Call /api/plans?plan_id={plan_id} to get executed plan
-            const data = await apiClient.get(API_ENDPOINTS.PLANS, {
-                params: { plan_id: planId }
-            });
-
-            if (!data || !Array.isArray(data) || data.length === 0) {
-                throw new Error(`No plan results found for plan_id: ${planId}`);
-            }
-
-            const plan = data[0] as PlanWithSteps;
-            const messages = data[1] || [];
-
-            if (useCache) {
-                this._cache.set(cacheKey, { plan_with_steps: plan, messages }, 30000);
-            }
-
-            console.log('✅ Final plan results received:', { plan, messages });
-            return { plan_with_steps: plan, messages };
-        };
-
-        if (useCache) {
-            const cachedData = this._cache.get<{ plan_with_steps: PlanWithSteps; messages: PlanMessage[] }>(cacheKey);
-            if (cachedData) return cachedData;
-
-            return this._requestTracker.trackRequest(cacheKey, fetcher);
-        }
-
-        return fetcher();
-    }
-
-
 
     /**
      * Submit clarification for a plan

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

@@ -19,7 +19,7 @@ import {
 import TaskList from "./TaskList";
 import { useCallback, useEffect, useState } from "react";
 import { useNavigate, useParams } from "react-router-dom";
-import { PlanPanelLefProps, PlanWithSteps, Task, UserInfo } from "@/models";
+import { Plan, PlanPanelLefProps, Task, UserInfo } from "@/models";
 import { apiService } from "@/api";
 import { TaskService } from "@/services";
 import MsftColor from "@/coral/imports/MsftColor";
@@ -47,7 +47,7 @@ const PlanPanelLeft: React.FC<PlanPanelLefProps> = ({
 
   const [inProgressTasks, setInProgressTasks] = useState<Task[]>([]);
   const [completedTasks, setCompletedTasks] = useState<Task[]>([]);
-  const [plans, setPlans] = useState<PlanWithSteps[] | null>(null);
+  const [plans, setPlans] = useState<Plan[] | null>(null);
   const [plansLoading, setPlansLoading] = useState<boolean>(false);
   const [plansError, setPlansError] = useState<Error | null>(null);
   const [userInfo, setUserInfo] = useState<UserInfo | null>(
@@ -119,7 +119,7 @@ const PlanPanelLeft: React.FC<PlanPanelLefProps> = ({
   const handleTaskSelect = useCallback(
     (taskId: string) => {
       const selectedPlan = plans?.find(
-        (plan: PlanWithSteps) => plan.session_id === taskId
+        (plan: Plan) => plan.session_id === taskId
       );
       if (selectedPlan) {
         navigate(`/plan/${selectedPlan.id}`);

src/frontend/src/models/agentMessage.tsx

@@ -25,7 +25,7 @@ export interface AgentMessageData {
     agent_type: AgentMessageType;
     timestamp: number;
     steps: any[];
-    next_steps: [];
+    next_steps: any[];
     content: string;
     raw_data: string;
 }

src/frontend/src/models/enums.tsx

@@ -222,9 +222,12 @@ export enum StepStatus {
  * Enumeration of possible statuses for a plan.
  */
 export enum PlanStatus {
+    CREATED = "created",
     IN_PROGRESS = "in_progress",
     COMPLETED = "completed",
-    FAILED = "failed"
+    FAILED = "failed",
+    CANCELED = "canceled",
+    APPROVED = "approved"
 }
 
 /**

src/frontend/src/models/messages.tsx

@@ -1,29 +1,7 @@
 import { AgentType, StepStatus, PlanStatus, WebsocketMessageType } from './enums';
 import { MPlanData } from './plan';
 
-/**
- * Message roles compatible with Semantic Kernel
- * Currently unused but kept for potential future use
- */
-// export enum MessageRole {
-//     SYSTEM = "system",
-//     USER = "user",
-//     ASSISTANT = "assistant",
-//     FUNCTION = "function"
-// }
 
-/**
- * Base class for generic chat messages with roles
- * Currently unused but kept for potential future use with Semantic Kernel integration
- */
-// export interface GenericChatMessage {
-//     /** Role of the message sender */
-//     role: MessageRole;
-//     /** Content of the message */
-//     content: string;
-//     /** Additional metadata */
-//     metadata: Record<string, any>;
-// }
 
 /**
  * Message sent to request approval for a step