2026-03-22 19:07:07 +00:00
|
|
|
use crate::agents::{move_story_to_merge, move_story_to_qa, reject_story_from_qa};
|
|
|
|
|
use crate::http::context::AppContext;
|
|
|
|
|
use crate::slog;
|
|
|
|
|
use crate::slog_warn;
|
|
|
|
|
use serde_json::{Value, json};
|
|
|
|
|
|
|
|
|
|
pub(super) async fn tool_request_qa(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("qa");
|
|
|
|
|
|
|
|
|
|
let project_root = ctx.agents.get_project_root(&ctx.state)?;
|
|
|
|
|
|
|
|
|
|
// Move story from work/2_current/ to work/3_qa/
|
|
|
|
|
move_story_to_qa(&project_root, story_id)?;
|
|
|
|
|
|
|
|
|
|
// Start the QA agent on the story worktree
|
|
|
|
|
let info = ctx
|
|
|
|
|
.agents
|
|
|
|
|
.start_agent(&project_root, story_id, Some(agent_name), None)
|
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
|
|
serde_json::to_string_pretty(&json!({
|
|
|
|
|
"story_id": info.story_id,
|
|
|
|
|
"agent_name": info.agent_name,
|
|
|
|
|
"status": info.status.to_string(),
|
|
|
|
|
"worktree_path": info.worktree_path,
|
|
|
|
|
"message": format!(
|
|
|
|
|
"Story '{story_id}' moved to work/3_qa/ and QA agent '{}' started.",
|
|
|
|
|
info.agent_name
|
|
|
|
|
),
|
|
|
|
|
}))
|
|
|
|
|
.map_err(|e| format!("Serialization error: {e}"))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub(super) async fn tool_approve_qa(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 project_root = ctx.agents.get_project_root(&ctx.state)?;
|
|
|
|
|
|
|
|
|
|
// Clear review_hold before moving
|
|
|
|
|
let qa_path = project_root
|
|
|
|
|
.join(".storkit/work/3_qa")
|
|
|
|
|
.join(format!("{story_id}.md"));
|
|
|
|
|
if qa_path.exists() {
|
|
|
|
|
let _ = crate::io::story_metadata::clear_front_matter_field(&qa_path, "review_hold");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Move story from work/3_qa/ to work/4_merge/
|
|
|
|
|
move_story_to_merge(&project_root, story_id)?;
|
|
|
|
|
|
|
|
|
|
// Start the mergemaster agent
|
|
|
|
|
let info = ctx
|
|
|
|
|
.agents
|
|
|
|
|
.start_agent(&project_root, story_id, Some("mergemaster"), None)
|
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
|
|
serde_json::to_string_pretty(&json!({
|
|
|
|
|
"story_id": info.story_id,
|
|
|
|
|
"agent_name": info.agent_name,
|
|
|
|
|
"status": info.status.to_string(),
|
|
|
|
|
"message": format!(
|
|
|
|
|
"Story '{story_id}' approved. Moved to work/4_merge/ and mergemaster agent '{}' started.",
|
|
|
|
|
info.agent_name
|
|
|
|
|
),
|
|
|
|
|
}))
|
|
|
|
|
.map_err(|e| format!("Serialization error: {e}"))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub(super) async fn tool_reject_qa(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 notes = args
|
|
|
|
|
.get("notes")
|
|
|
|
|
.and_then(|v| v.as_str())
|
|
|
|
|
.ok_or("Missing required argument: notes")?;
|
|
|
|
|
|
|
|
|
|
let project_root = ctx.agents.get_project_root(&ctx.state)?;
|
|
|
|
|
|
|
|
|
|
// Move story from work/3_qa/ back to work/2_current/ with rejection notes
|
|
|
|
|
reject_story_from_qa(&project_root, story_id, notes)?;
|
|
|
|
|
|
|
|
|
|
// Restart the coder agent with rejection context
|
|
|
|
|
let story_path = project_root
|
|
|
|
|
.join(".storkit/work/2_current")
|
|
|
|
|
.join(format!("{story_id}.md"));
|
|
|
|
|
let agent_name = if story_path.exists() {
|
|
|
|
|
let contents = std::fs::read_to_string(&story_path).unwrap_or_default();
|
|
|
|
|
crate::io::story_metadata::parse_front_matter(&contents)
|
|
|
|
|
.ok()
|
|
|
|
|
.and_then(|meta| meta.agent)
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
|
|
|
|
let agent_name = agent_name.as_deref().unwrap_or("coder-opus");
|
|
|
|
|
|
|
|
|
|
let context = format!(
|
|
|
|
|
"\n\n---\n## QA Rejection\n\
|
|
|
|
|
Your previous implementation was rejected during human QA review.\n\
|
|
|
|
|
Rejection notes:\n{notes}\n\n\
|
|
|
|
|
Please fix the issues described above and try again."
|
|
|
|
|
);
|
|
|
|
|
if let Err(e) = ctx
|
|
|
|
|
.agents
|
|
|
|
|
.start_agent(&project_root, story_id, Some(agent_name), Some(&context))
|
|
|
|
|
.await
|
|
|
|
|
{
|
|
|
|
|
slog_warn!("[qa] Failed to restart coder for '{story_id}' after rejection: {e}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Ok(format!(
|
|
|
|
|
"Story '{story_id}' rejected and moved back to work/2_current/. Coder agent '{agent_name}' restarted with rejection notes."
|
|
|
|
|
))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub(super) async fn tool_launch_qa_app(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 project_root = ctx.agents.get_project_root(&ctx.state)?;
|
|
|
|
|
|
|
|
|
|
// Find the worktree path for this story
|
|
|
|
|
let worktrees = crate::worktree::list_worktrees(&project_root)?;
|
|
|
|
|
let wt = worktrees
|
|
|
|
|
.iter()
|
|
|
|
|
.find(|w| w.story_id == story_id)
|
|
|
|
|
.ok_or_else(|| format!("No worktree found for story '{story_id}'"))?;
|
|
|
|
|
let wt_path = wt.path.clone();
|
|
|
|
|
|
|
|
|
|
// Stop any existing QA app instance
|
|
|
|
|
{
|
|
|
|
|
let mut guard = ctx.qa_app_process.lock().unwrap();
|
|
|
|
|
if let Some(mut child) = guard.take() {
|
|
|
|
|
let _ = child.kill();
|
|
|
|
|
let _ = child.wait();
|
|
|
|
|
slog!("[qa-app] Stopped previous QA app instance.");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Find a free port starting from 3100
|
|
|
|
|
let port = find_free_port(3100);
|
|
|
|
|
|
|
|
|
|
// Write .storkit_port so the frontend dev server knows where to connect
|
|
|
|
|
let port_file = wt_path.join(".storkit_port");
|
|
|
|
|
std::fs::write(&port_file, port.to_string())
|
|
|
|
|
.map_err(|e| format!("Failed to write .storkit_port: {e}"))?;
|
|
|
|
|
|
|
|
|
|
// Launch the server from the worktree
|
|
|
|
|
let child = std::process::Command::new("cargo")
|
|
|
|
|
.args(["run"])
|
|
|
|
|
.env("STORKIT_PORT", port.to_string())
|
|
|
|
|
.current_dir(&wt_path)
|
|
|
|
|
.stdout(std::process::Stdio::null())
|
|
|
|
|
.stderr(std::process::Stdio::null())
|
|
|
|
|
.spawn()
|
|
|
|
|
.map_err(|e| format!("Failed to launch QA app: {e}"))?;
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
let mut guard = ctx.qa_app_process.lock().unwrap();
|
|
|
|
|
*guard = Some(child);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
serde_json::to_string_pretty(&json!({
|
|
|
|
|
"story_id": story_id,
|
|
|
|
|
"port": port,
|
|
|
|
|
"worktree_path": wt_path.to_string_lossy(),
|
|
|
|
|
"message": format!("QA app launched on port {port} from worktree at {}", wt_path.display()),
|
|
|
|
|
}))
|
|
|
|
|
.map_err(|e| format!("Serialization error: {e}"))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Find a free TCP port starting from `start`.
|
|
|
|
|
pub(super) fn find_free_port(start: u16) -> u16 {
|
|
|
|
|
for port in start..start + 100 {
|
|
|
|
|
if std::net::TcpListener::bind(("127.0.0.1", port)).is_ok() {
|
|
|
|
|
return port;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
start // fallback
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests {
|
|
|
|
|
use super::*;
|
2026-03-28 19:47:59 +00:00
|
|
|
use crate::http::test_helpers::test_ctx;
|
2026-03-22 19:07:07 +00:00
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn request_qa_in_tools_list() {
|
|
|
|
|
use super::super::handle_tools_list;
|
|
|
|
|
let resp = handle_tools_list(Some(json!(1)));
|
|
|
|
|
let tools = resp.result.unwrap()["tools"].as_array().unwrap().clone();
|
|
|
|
|
let tool = tools.iter().find(|t| t["name"] == "request_qa");
|
|
|
|
|
assert!(tool.is_some(), "request_qa missing from tools list");
|
|
|
|
|
let t = tool.unwrap();
|
|
|
|
|
let required = t["inputSchema"]["required"].as_array().unwrap();
|
|
|
|
|
let req_names: Vec<&str> = required.iter().map(|v| v.as_str().unwrap()).collect();
|
|
|
|
|
assert!(req_names.contains(&"story_id"));
|
|
|
|
|
// agent_name is optional
|
|
|
|
|
assert!(!req_names.contains(&"agent_name"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn approve_qa_in_tools_list() {
|
|
|
|
|
use super::super::handle_tools_list;
|
|
|
|
|
let resp = handle_tools_list(Some(json!(1)));
|
|
|
|
|
let tools = resp.result.unwrap()["tools"].as_array().unwrap().clone();
|
|
|
|
|
let tool = tools.iter().find(|t| t["name"] == "approve_qa");
|
|
|
|
|
assert!(tool.is_some(), "approve_qa missing from tools list");
|
|
|
|
|
let t = tool.unwrap();
|
|
|
|
|
let required = t["inputSchema"]["required"].as_array().unwrap();
|
|
|
|
|
let req_names: Vec<&str> = required.iter().map(|v| v.as_str().unwrap()).collect();
|
|
|
|
|
assert!(req_names.contains(&"story_id"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn reject_qa_in_tools_list() {
|
|
|
|
|
use super::super::handle_tools_list;
|
|
|
|
|
let resp = handle_tools_list(Some(json!(1)));
|
|
|
|
|
let tools = resp.result.unwrap()["tools"].as_array().unwrap().clone();
|
|
|
|
|
let tool = tools.iter().find(|t| t["name"] == "reject_qa");
|
|
|
|
|
assert!(tool.is_some(), "reject_qa missing from tools list");
|
|
|
|
|
let t = tool.unwrap();
|
|
|
|
|
let required = t["inputSchema"]["required"].as_array().unwrap();
|
|
|
|
|
let req_names: Vec<&str> = required.iter().map(|v| v.as_str().unwrap()).collect();
|
|
|
|
|
assert!(req_names.contains(&"story_id"));
|
|
|
|
|
assert!(req_names.contains(&"notes"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn launch_qa_app_in_tools_list() {
|
|
|
|
|
use super::super::handle_tools_list;
|
|
|
|
|
let resp = handle_tools_list(Some(json!(1)));
|
|
|
|
|
let tools = resp.result.unwrap()["tools"].as_array().unwrap().clone();
|
|
|
|
|
let tool = tools.iter().find(|t| t["name"] == "launch_qa_app");
|
|
|
|
|
assert!(tool.is_some(), "launch_qa_app missing from tools list");
|
|
|
|
|
let t = tool.unwrap();
|
|
|
|
|
let required = t["inputSchema"]["required"].as_array().unwrap();
|
|
|
|
|
let req_names: Vec<&str> = required.iter().map(|v| v.as_str().unwrap()).collect();
|
|
|
|
|
assert!(req_names.contains(&"story_id"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
|
async fn tool_approve_qa_missing_story_id() {
|
|
|
|
|
let tmp = tempfile::tempdir().unwrap();
|
|
|
|
|
let ctx = test_ctx(tmp.path());
|
|
|
|
|
let result = tool_approve_qa(&json!({}), &ctx).await;
|
|
|
|
|
assert!(result.is_err());
|
|
|
|
|
assert!(result.unwrap_err().contains("story_id"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
|
async fn tool_reject_qa_missing_story_id() {
|
|
|
|
|
let tmp = tempfile::tempdir().unwrap();
|
|
|
|
|
let ctx = test_ctx(tmp.path());
|
|
|
|
|
let result = tool_reject_qa(&json!({"notes": "broken"}), &ctx).await;
|
|
|
|
|
assert!(result.is_err());
|
|
|
|
|
assert!(result.unwrap_err().contains("story_id"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
|
async fn tool_reject_qa_missing_notes() {
|
|
|
|
|
let tmp = tempfile::tempdir().unwrap();
|
|
|
|
|
let ctx = test_ctx(tmp.path());
|
|
|
|
|
let result = tool_reject_qa(&json!({"story_id": "1_story_test"}), &ctx).await;
|
|
|
|
|
assert!(result.is_err());
|
|
|
|
|
assert!(result.unwrap_err().contains("notes"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
|
async fn tool_request_qa_missing_story_id() {
|
|
|
|
|
let tmp = tempfile::tempdir().unwrap();
|
|
|
|
|
let ctx = test_ctx(tmp.path());
|
|
|
|
|
let result = tool_request_qa(&json!({}), &ctx).await;
|
|
|
|
|
assert!(result.is_err());
|
|
|
|
|
assert!(result.unwrap_err().contains("story_id"));
|
|
|
|
|
}
|
|
|
|
|
}
|