huskies: merge 1015

server/src/service/agents/mod.rs

@@ -68,7 +68,7 @@ pub struct AgentConfigEntry {
     pub name: String,
     pub role: String,
     pub stage: Option<String>,
-    pub model: Option<String>,
+    pub model: Option<crate::agents::AgentModel>,
     pub allowed_tools: Option<Vec<String>>,
     pub max_turns: Option<u32>,
     pub max_budget_usd: Option<f64>,
@@ -283,7 +283,7 @@ max_budget_usd = 5.0
         let entries = get_agent_config(tmp.path()).unwrap();
         assert_eq!(entries.len(), 1);
         assert_eq!(entries[0].name, "coder-1");
-        assert_eq!(entries[0].model, Some("sonnet".to_string()));
+        assert_eq!(entries[0].model, Some(crate::agents::AgentModel::Sonnet));
         assert_eq!(entries[0].max_turns, Some(30));
     }
 

server/src/service/agents/token.rs

@@ -9,7 +9,7 @@ use std::collections::HashMap;
 #[derive(Debug, Clone, PartialEq)]
 pub struct AgentTokenCost {
     pub agent_name: String,
-    pub model: Option<String>,
+    pub model: Option<crate::agents::AgentModel>,
     pub input_tokens: u64,
     pub output_tokens: u64,
     pub cache_creation_input_tokens: u64,
@@ -153,8 +153,11 @@ mod tests {
     #[test]
     fn aggregate_preserves_model_from_first_record() {
         let mut r = make_record("42_story_foo", "coder-1", 1.0);
-        r.model = Some("claude-sonnet".to_string());
+        r.model = Some(crate::agents::AgentModel::Sonnet);
         let summary = aggregate_for_story(&[r], "42_story_foo");
-        assert_eq!(summary.agents[0].model, Some("claude-sonnet".to_string()));
+        assert_eq!(
+            summary.agents[0].model,
+            Some(crate::agents::AgentModel::Sonnet)
+        );
     }
 }