fix: clarify structured prompt failures
This commit is contained in:
@@ -10,7 +10,9 @@ use std::time::Duration;
|
||||
use common::DaemonFixture;
|
||||
use futures_util::{SinkExt, StreamExt};
|
||||
use maestro_daemon::local_api;
|
||||
use maestro_protocol::{ApiError, CreateSessionRequest, Session, SessionView, WorktreeSpec};
|
||||
use maestro_protocol::{
|
||||
ApiError, CreateSessionRequest, Session, SessionStatus, SessionView, WorktreeSpec,
|
||||
};
|
||||
use tempfile::TempDir;
|
||||
use tokio::net::TcpListener;
|
||||
use tokio::sync::oneshot;
|
||||
@@ -261,10 +263,15 @@ async fn structured_prompt_failure_clears_the_turn() {
|
||||
let h = spawn("naps-laptop").await;
|
||||
let fake = FakeAcp::new();
|
||||
let mut env = fake.env();
|
||||
env.insert("FAKE_ACP_PROMPT_FAIL".into(), "1".into());
|
||||
env.insert("FAKE_ACP_PROMPT_FAIL_ONCE".into(), "1".into());
|
||||
let id = structured_session_with_env(&h, env).await;
|
||||
let client = reqwest::Client::new();
|
||||
let path = format!("/api/sessions/{id}/structured/prompt");
|
||||
let (mut ws, _) = connect_async(ws_url(h.addr, &format!("/api/structured/{id}")))
|
||||
.await
|
||||
.unwrap();
|
||||
ws.next().await.unwrap().unwrap();
|
||||
ws.next().await.unwrap().unwrap();
|
||||
let first = client
|
||||
.post(url(h.addr, &path))
|
||||
.json(&serde_json::json!({"prompt":"fails"}))
|
||||
@@ -272,14 +279,76 @@ async fn structured_prompt_failure_clears_the_turn() {
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(first.status(), reqwest::StatusCode::NO_CONTENT);
|
||||
tokio::time::sleep(Duration::from_millis(50)).await;
|
||||
let mut saw_active_turn = false;
|
||||
tokio::time::timeout(Duration::from_secs(1), async {
|
||||
while let Some(Ok(message)) = ws.next().await {
|
||||
let event: serde_json::Value =
|
||||
serde_json::from_str(&message.into_text().unwrap()).unwrap();
|
||||
let turn = &event["state"]["turn"];
|
||||
if turn["responding"] == true {
|
||||
saw_active_turn = true;
|
||||
}
|
||||
if saw_active_turn && turn["responding"] == false && turn["thinking"] == false {
|
||||
return;
|
||||
}
|
||||
}
|
||||
panic!("structured websocket closed before the failed turn cleared");
|
||||
})
|
||||
.await
|
||||
.expect("failed turn clears promptly");
|
||||
let second = client
|
||||
.post(url(h.addr, &path))
|
||||
.json(&serde_json::json!({"prompt":"available"}))
|
||||
.send()
|
||||
.await
|
||||
.unwrap();
|
||||
assert_ne!(second.status(), reqwest::StatusCode::CONFLICT);
|
||||
assert_eq!(second.status(), reqwest::StatusCode::NO_CONTENT);
|
||||
assert!(second.bytes().await.unwrap().is_empty());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn structured_prompt_rejects_unknown_and_unavailable_sessions() {
|
||||
let h = spawn("naps-laptop").await;
|
||||
let client = reqwest::Client::new();
|
||||
let prompt = |id| {
|
||||
client
|
||||
.post(url(
|
||||
h.addr,
|
||||
&format!("/api/sessions/{id}/structured/prompt"),
|
||||
))
|
||||
.json(&serde_json::json!({"prompt": "hello"}))
|
||||
};
|
||||
|
||||
let unknown = prompt(Uuid::new_v4()).send().await.unwrap();
|
||||
assert_eq!(unknown.status(), reqwest::StatusCode::NOT_FOUND);
|
||||
let error: ApiError = unknown.json().await.unwrap();
|
||||
assert_eq!(error.error.code, "not_found");
|
||||
|
||||
let terminal = h
|
||||
.manager
|
||||
.create(CreateSessionRequest {
|
||||
view: SessionView::Terminal,
|
||||
cwd: "/tmp".into(),
|
||||
command: "sh".into(),
|
||||
env: HashMap::new(),
|
||||
metadata: HashMap::new(),
|
||||
worktree: None,
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
let non_structured = prompt(terminal.id).send().await.unwrap();
|
||||
assert_eq!(non_structured.status(), reqwest::StatusCode::CONFLICT);
|
||||
let error: ApiError = non_structured.json().await.unwrap();
|
||||
assert_eq!(error.error.code, "not_structured");
|
||||
|
||||
let fake = FakeAcp::new();
|
||||
let dead = structured_session(&h, &fake).await;
|
||||
h.manager.shutdown().await;
|
||||
assert_eq!(h.manager.status(dead).await, Some(SessionStatus::Dead));
|
||||
let unavailable = prompt(dead).send().await.unwrap();
|
||||
assert_eq!(unavailable.status(), reqwest::StatusCode::CONFLICT);
|
||||
let error: ApiError = unavailable.json().await.unwrap();
|
||||
assert_eq!(error.error.code, "not_structured");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
|
||||
Reference in New Issue
Block a user