refactor: Simplify API responses and update agent display logic

bkataru · bkataru · commit a74afb6ed080 · 2025-12-20T08:00:53.000+05:30
diff --git a/ui/src/api.rs b/ui/src/api.rs
@@ -106,15 +106,15 @@ pub async fn register(
 /// Fetch available agents
 pub async fn fetch_agents(base_url: &str) -> Result<Vec<AgentInfo>, String> {
     let url = format!("{}/api/agents", base_url);
-    let resp: AgentsListResponse = fetch_with_auth(&url, None).await?;
-    Ok(resp.agents)
+    // Backend returns array directly, not wrapped
+    fetch_with_auth(&url, None).await
 }
 
 /// Fetch available workflows (requires auth)
 pub async fn fetch_workflows(base_url: &str, token: &str) -> Result<Vec<WorkflowInfo>, String> {
     let url = format!("{}/api/workflows", base_url);
-    let resp: WorkflowsListResponse = fetch_with_auth(&url, Some(token.to_string())).await?;
-    Ok(resp.workflows)
+    // Backend returns array directly, not wrapped
+    fetch_with_auth(&url, Some(token.to_string())).await
 }
 
 /// Send a chat message
diff --git a/ui/src/components/agent_selector.rs b/ui/src/components/agent_selector.rs
@@ -128,7 +128,7 @@ fn AgentOption(
                 {emoji}
             </div>
             <div class="flex-1 min-w-0">
-                <div class="font-medium text-white capitalize">{agent.display_name.clone()}</div>
+                <div class="font-medium text-white capitalize">{agent.name.clone()}</div>
                 <div class="text-xs text-slate-400 truncate">{agent.description.clone()}</div>
             </div>
             <Show when=move || is_selected.get()>
diff --git a/ui/src/components/sidebar.rs b/ui/src/components/sidebar.rs
@@ -69,9 +69,9 @@ pub fn Sidebar(
                         {move || {
                             let agents = state.agents.get();
                             agents.into_iter().map(|agent| {
-                                let name = agent.name.clone();
-                                let name_clone = name.clone();
-                                let emoji = match name.as_str() {
+                                let agent_type = agent.agent_type.clone();
+                                let agent_type_clone = agent_type.clone();
+                                let emoji = match agent_type.as_str() {
                                     "orchestrator" => "🎭",
                                     "product" => "📦",
                                     "sales" => "💰",
@@ -82,11 +82,11 @@ pub fn Sidebar(
                                 };
                                 view! {
                                     <AgentButton
-                                        name=agent.display_name.clone()
+                                        name=agent.name.clone()
                                         emoji=emoji.to_string()
                                         description=agent.description.clone()
-                                        is_selected=Signal::derive(move || selected_agent.get().as_deref() == Some(&name))
-                                        on_click=move |_| selected_agent.set(Some(name_clone.clone()))
+                                        is_selected=Signal::derive(move || selected_agent.get().as_deref() == Some(&agent_type))
+                                        on_click=move |_| selected_agent.set(Some(agent_type_clone.clone()))
                                     />
                                 }
                             }).collect::<Vec<_>>()
@@ -108,10 +108,11 @@ pub fn Sidebar(
                                 }.into_any()
                             } else {
                                 workflows.into_iter().map(|wf| {
+                                    let description = format!("Entry: {} | Max depth: {}", wf.entry_agent, wf.max_depth);
                                     view! {
                                         <div class="px-3 py-2 rounded-lg text-sm text-slate-400 hover:bg-slate-700/50 cursor-pointer">
                                             <div class="font-medium text-slate-300">{wf.name.clone()}</div>
-                                            <div class="text-xs truncate">{wf.description.clone()}</div>
+                                            <div class="text-xs truncate">{description}</div>
                                         </div>
                                     }
                                 }).collect::<Vec<_>>().into_any()
diff --git a/ui/src/pages/home.rs b/ui/src/pages/home.rs
@@ -146,7 +146,7 @@ pub fn HomePage() -> impl IntoView {
                                 }).collect::<Vec<_>>()
                             } else {
                                 agents.into_iter().map(|agent| {
-                                    let emoji = match agent.name.as_str() {
+                                    let emoji = match agent.agent_type.as_str() {
                                         "orchestrator" => "🎭",
                                         "product" => "📦",
                                         "sales" => "💰",
@@ -158,7 +158,7 @@ pub fn HomePage() -> impl IntoView {
                                     view! {
                                         <AgentCard
                                             emoji=emoji
-                                            name=agent.display_name.leak()
+                                            name=agent.name.leak()
                                             description=agent.description.leak()
                                         />
                                     }
diff --git a/ui/src/state.rs b/ui/src/state.rs
@@ -6,7 +6,6 @@ use crate::types::{AuthResponse, Conversation, AgentInfo, WorkflowInfo};
 
 const STORAGE_KEY_TOKEN: &str = "ares_token";
 const STORAGE_KEY_REFRESH: &str = "ares_refresh_token";
-const STORAGE_KEY_USER_ID: &str = "ares_user_id";
 
 /// Global application state
 #[derive(Clone)]
@@ -15,8 +14,6 @@ pub struct AppState {
     pub token: RwSignal<Option<String>>,
     /// Refresh token
     pub refresh_token: RwSignal<Option<String>>,
-    /// User ID
-    pub user_id: RwSignal<Option<String>>,
     /// Available agents
     pub agents: RwSignal<Vec<AgentInfo>>,
     /// Available workflows
@@ -34,12 +31,11 @@ pub struct AppState {
 impl AppState {
     pub fn new() -> Self {
         // Try to load from localStorage
-        let (token, refresh, user_id) = Self::load_from_storage();
+        let (token, refresh) = Self::load_from_storage();
         
         Self {
             token: RwSignal::new(token),
             refresh_token: RwSignal::new(refresh),
-            user_id: RwSignal::new(user_id),
             agents: RwSignal::new(vec![]),
             workflows: RwSignal::new(vec![]),
             conversation: RwSignal::new(Conversation::default()),
@@ -49,31 +45,26 @@ impl AppState {
         }
     }
 
-    fn load_from_storage() -> (Option<String>, Option<String>, Option<String>) {
+    fn load_from_storage() -> (Option<String>, Option<String>) {
         let token: Option<String> = LocalStorage::get(STORAGE_KEY_TOKEN).ok();
         let refresh: Option<String> = LocalStorage::get(STORAGE_KEY_REFRESH).ok();
-        let user_id: Option<String> = LocalStorage::get(STORAGE_KEY_USER_ID).ok();
-        (token, refresh, user_id)
+        (token, refresh)
     }
 
     pub fn save_auth(&self, auth: &AuthResponse) {
         let _ = LocalStorage::set(STORAGE_KEY_TOKEN, &auth.access_token);
         let _ = LocalStorage::set(STORAGE_KEY_REFRESH, &auth.refresh_token);
-        let _ = LocalStorage::set(STORAGE_KEY_USER_ID, &auth.user_id);
         
         self.token.set(Some(auth.access_token.clone()));
         self.refresh_token.set(Some(auth.refresh_token.clone()));
-        self.user_id.set(Some(auth.user_id.clone()));
     }
 
     pub fn clear_auth(&self) {
         LocalStorage::delete(STORAGE_KEY_TOKEN);
         LocalStorage::delete(STORAGE_KEY_REFRESH);
-        LocalStorage::delete(STORAGE_KEY_USER_ID);
         
         self.token.set(None);
         self.refresh_token.set(None);
-        self.user_id.set(None);
     }
 
     pub fn is_authenticated(&self) -> bool {
diff --git a/ui/src/types.rs b/ui/src/types.rs
@@ -22,9 +22,7 @@ pub struct RegisterRequest {
 pub struct AuthResponse {
     pub access_token: String,
     pub refresh_token: String,
-    pub token_type: String,
-    pub expires_in: u64,
-    pub user_id: String,
+    pub expires_in: i64,
 }
 
 /// Chat request
@@ -61,32 +59,20 @@ pub struct ToolCallInfo {
 /// Agent info from the API
 #[derive(Debug, Clone, Deserialize)]
 pub struct AgentInfo {
+    pub agent_type: String,
     pub name: String,
-    pub display_name: String,
     pub description: String,
-    #[serde(default)]
-    pub capabilities: Vec<String>,
-}
-
-/// Agents list response
-#[derive(Debug, Clone, Deserialize)]
-pub struct AgentsListResponse {
-    pub agents: Vec<AgentInfo>,
 }
 
 /// Workflow info
 #[derive(Debug, Clone, Deserialize)]
 pub struct WorkflowInfo {
     pub name: String,
-    pub description: String,
-    pub agents: Vec<String>,
-    pub max_depth: usize,
-}
-
-/// Workflows list response
-#[derive(Debug, Clone, Deserialize)]
-pub struct WorkflowsListResponse {
-    pub workflows: Vec<WorkflowInfo>,
+    pub entry_agent: String,
+    pub fallback_agent: Option<String>,
+    pub max_depth: u8,
+    pub max_iterations: u8,
+    pub parallel_subagents: bool,
 }
 
 /// User memory
