huskies: merge 963

server/src/service/agents/mod.rs

@@ -59,7 +59,7 @@ pub struct WorkItemContent {
     pub content: String,
     pub stage: crate::pipeline_state::Stage,
     pub name: Option<String>,
-    pub agent: Option<String>,
+    pub agent: Option<crate::config::AgentName>,
 }
 
 /// A single entry in the project's configured agent roster.
@@ -163,9 +163,7 @@ pub fn get_work_item_content(
 
     let crdt_view = crate::crdt_state::read_item(story_id);
     let crdt_name = crdt_view.as_ref().map(|v| v.name().to_string());
-    let crdt_agent = crdt_view
-        .as_ref()
-        .and_then(|v| v.agent().map(|a| a.to_string()));
+    let crdt_agent = crdt_view.as_ref().and_then(|v| v.agent());
 
     for (stage_dir, stage) in &stages {
         if let Some(content) = io::read_work_item_from_stage(&work_dir, stage_dir, &filename)? {
@@ -173,7 +171,7 @@ pub fn get_work_item_content(
                 content,
                 stage: stage.clone(),
                 name: crdt_name.clone(),
-                agent: crdt_agent.clone(),
+                agent: crdt_agent,
             });
         }
     }

server/src/service/ws/message/convert.rs

@@ -293,9 +293,9 @@ mod tests {
                 error: None,
                 merge_failure: None,
                 agent: Some(crate::http::workflow::pipeline::AgentAssignment {
-                    agent_name: "coder-1".to_string(),
+                    agent_name: crate::config::AgentName::Coder1,
                     model: Some("claude-3-5-sonnet".to_string()),
-                    status: "running".to_string(),
+                    status: crate::agents::AgentStatus::Running,
                 }),
                 review_hold: None,
                 qa: None,