huskies: merge 1032

2026-05-14 14:47:49 +00:00
parent bc99821274
commit 960b4f4d1d
9 changed files with 606 additions and 44 deletions
@@ -142,14 +142,9 @@ pub(super) async fn tool_move_story_to_merge(
    args: &Value,
    ctx: &AppContext,
 ) -> Result<String, String> {
-    let story_id = args
-        .get("story_id")
-        .and_then(|v| v.as_str())
-        .ok_or("Missing required argument: story_id")?;
-    let agent_name = args
-        .get("agent_name")
-        .and_then(|v| v.as_str())
-        .unwrap_or("mergemaster");
+    let req = crate::validation::MoveStoryToMergeRequest::from_json(args)?;
+    let story_id = req.story_id.as_str();
+    let agent_name = req.resolved_agent_name();

    let project_root = ctx.services.agents.get_project_root(&ctx.state)?;