Fix child startup readiness and ordered provider tools
Wait for shell bootstrap before dispatching child prompts, serialize provider preprocessing, and make permission callbacks idempotent. Restrict task lists to concrete multistep plans and stop inferring completion from tool activity. Update regression fixtures and resolve existing lint and test-layout failures. Verified formatting, both presubmit Clippy commands, and 354 targeted nextest tests.
This commit is contained in:
@@ -144,122 +144,5 @@ impl AgentRuntime for ChatGPTSubscriptionRuntime {
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use rig_core::client::CompletionClient;
|
||||
use rig_core::completion::{AssistantContent, CompletionModel, Message};
|
||||
use rig_core::message::{ToolResultContent, UserContent};
|
||||
use rig_core::providers::chatgpt::ChatGPTAuth;
|
||||
use rig_core::test_utils::RecordingHttpClient;
|
||||
|
||||
use super::*;
|
||||
|
||||
const COMPLETED_RESPONSE: &str = r#"data: {"type":"response.output_text.delta","delta":"ok"}
|
||||
data: {"type":"response.completed","response":{"id":"resp_test","object":"response","created_at":1,"status":"completed","error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"model":"gpt-5.3-codex","usage":{"input_tokens":1,"input_tokens_details":{"cached_tokens":0},"output_tokens":1,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":2},"output":[{"type":"message","id":"msg_test","status":"completed","role":"assistant","content":[{"type":"output_text","annotations":[],"text":"ok"}]}],"tools":[]}}
|
||||
data: [DONE]"#;
|
||||
|
||||
#[test]
|
||||
fn runtime_descriptor_identifies_chatgpt_subscription() {
|
||||
let runtime = ChatGPTSubscriptionRuntime::new(ChatGPTSubscriptionRuntimeConfig {
|
||||
model: "gpt-5.3-codex".to_string(),
|
||||
reasoning_effort: Some("high".to_string()),
|
||||
max_output_tokens: None,
|
||||
auth_file: None,
|
||||
});
|
||||
|
||||
assert_eq!(
|
||||
runtime.descriptor().id,
|
||||
"rig-chatgpt-subscription:gpt-5.3-codex"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reasoning_effort_is_encoded_for_the_responses_request() {
|
||||
let request = TurnRequest::new(
|
||||
"gpt-5.4".to_string(),
|
||||
vec![ConversationMessage {
|
||||
role: MessageRole::User,
|
||||
content: MessageContent::Text("hello".to_string()),
|
||||
}],
|
||||
);
|
||||
let request = build_completion_request(
|
||||
request,
|
||||
None,
|
||||
true,
|
||||
false,
|
||||
reasoning_additional_params(Some("xhigh")),
|
||||
)
|
||||
.expect("request should convert");
|
||||
|
||||
assert_eq!(
|
||||
request.additional_params,
|
||||
reasoning_additional_params(Some("xhigh"))
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
reasoning_additional_params(Some("ultra")),
|
||||
Some(serde_json::json!({
|
||||
"reasoning": { "effort": "max" }
|
||||
}))
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn chatgpt_follow_up_request_preserves_responses_call_ids() {
|
||||
let http_client = RecordingHttpClient::new(COMPLETED_RESPONSE);
|
||||
let client = chatgpt::Client::builder()
|
||||
.api_key(ChatGPTAuth::AccessToken {
|
||||
access_token: "test-token".to_string(),
|
||||
account_id: None,
|
||||
})
|
||||
.http_client(http_client.clone())
|
||||
.build()
|
||||
.expect("client should build");
|
||||
let model = client.completion_model("gpt-5.3-codex");
|
||||
let assistant_tool_call = AssistantContent::tool_call_with_call_id(
|
||||
"fc_native_1",
|
||||
"call_native_1".to_string(),
|
||||
"read_files",
|
||||
serde_json::json!({"files": ["Cargo.toml"]}),
|
||||
);
|
||||
let tool_result = UserContent::tool_result_with_call_id(
|
||||
"fc_native_1",
|
||||
"call_native_1".to_string(),
|
||||
rig_core::OneOrMany::one(ToolResultContent::text("contents")),
|
||||
);
|
||||
let chat_history = rig_core::OneOrMany::many(vec![
|
||||
Message::Assistant {
|
||||
id: None,
|
||||
content: rig_core::OneOrMany::one(assistant_tool_call),
|
||||
},
|
||||
Message::User {
|
||||
content: rig_core::OneOrMany::one(tool_result),
|
||||
},
|
||||
Message::user("Continue."),
|
||||
])
|
||||
.expect("history should contain messages");
|
||||
|
||||
model
|
||||
.completion(rig_core::completion::CompletionRequest {
|
||||
model: Some("gpt-5.3-codex".to_string()),
|
||||
preamble: None,
|
||||
chat_history,
|
||||
documents: Vec::new(),
|
||||
tools: Vec::new(),
|
||||
temperature: None,
|
||||
max_tokens: None,
|
||||
tool_choice: None,
|
||||
additional_params: None,
|
||||
output_schema: None,
|
||||
record_telemetry_content: false,
|
||||
})
|
||||
.await
|
||||
.expect("request should reach the mocked provider");
|
||||
|
||||
let requests = http_client.requests();
|
||||
assert_eq!(requests.len(), 1);
|
||||
let body: serde_json::Value = serde_json::from_slice(&requests[0].body).unwrap();
|
||||
let input = body["input"].as_array().expect("input should be an array");
|
||||
assert_eq!(input[0]["call_id"], "call_native_1");
|
||||
assert_eq!(input[1]["call_id"], "call_native_1");
|
||||
}
|
||||
}
|
||||
#[path = "chatgpt_tests.rs"]
|
||||
mod tests;
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
use rig_core::client::CompletionClient;
|
||||
use rig_core::completion::{AssistantContent, CompletionModel, Message};
|
||||
use rig_core::message::{ToolResultContent, UserContent};
|
||||
use rig_core::providers::chatgpt::ChatGPTAuth;
|
||||
use rig_core::test_utils::RecordingHttpClient;
|
||||
|
||||
use super::*;
|
||||
|
||||
const COMPLETED_RESPONSE: &str = r#"data: {"type":"response.output_text.delta","delta":"ok"}
|
||||
data: {"type":"response.completed","response":{"id":"resp_test","object":"response","created_at":1,"status":"completed","error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"model":"gpt-5.3-codex","usage":{"input_tokens":1,"input_tokens_details":{"cached_tokens":0},"output_tokens":1,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":2},"output":[{"type":"message","id":"msg_test","status":"completed","role":"assistant","content":[{"type":"output_text","annotations":[],"text":"ok"}]}],"tools":[]}}
|
||||
data: [DONE]"#;
|
||||
|
||||
#[test]
|
||||
fn runtime_descriptor_identifies_chatgpt_subscription() {
|
||||
let runtime = ChatGPTSubscriptionRuntime::new(ChatGPTSubscriptionRuntimeConfig {
|
||||
model: "gpt-5.3-codex".to_string(),
|
||||
reasoning_effort: Some("high".to_string()),
|
||||
max_output_tokens: None,
|
||||
auth_file: None,
|
||||
});
|
||||
|
||||
assert_eq!(
|
||||
runtime.descriptor().id,
|
||||
"rig-chatgpt-subscription:gpt-5.3-codex"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reasoning_effort_is_encoded_for_the_responses_request() {
|
||||
let request = TurnRequest::new(
|
||||
"gpt-5.4".to_string(),
|
||||
vec![ConversationMessage {
|
||||
role: MessageRole::User,
|
||||
content: MessageContent::Text("hello".to_string()),
|
||||
}],
|
||||
);
|
||||
let request = build_completion_request(
|
||||
request,
|
||||
None,
|
||||
true,
|
||||
false,
|
||||
reasoning_additional_params(Some("xhigh")),
|
||||
)
|
||||
.expect("request should convert");
|
||||
|
||||
assert_eq!(
|
||||
request.additional_params,
|
||||
reasoning_additional_params(Some("xhigh"))
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
reasoning_additional_params(Some("ultra")),
|
||||
Some(serde_json::json!({
|
||||
"reasoning": { "effort": "max" }
|
||||
}))
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn chatgpt_follow_up_request_preserves_responses_call_ids() {
|
||||
let http_client = RecordingHttpClient::new(COMPLETED_RESPONSE);
|
||||
let client = chatgpt::Client::builder()
|
||||
.api_key(ChatGPTAuth::AccessToken {
|
||||
access_token: "test-token".to_string(),
|
||||
account_id: None,
|
||||
})
|
||||
.http_client(http_client.clone())
|
||||
.build()
|
||||
.expect("client should build");
|
||||
let model = client.completion_model("gpt-5.3-codex");
|
||||
let assistant_tool_call = AssistantContent::tool_call_with_call_id(
|
||||
"fc_native_1",
|
||||
"call_native_1".to_string(),
|
||||
"read_files",
|
||||
serde_json::json!({"files": ["Cargo.toml"]}),
|
||||
);
|
||||
let tool_result = UserContent::tool_result_with_call_id(
|
||||
"fc_native_1",
|
||||
"call_native_1".to_string(),
|
||||
rig_core::OneOrMany::one(ToolResultContent::text("contents")),
|
||||
);
|
||||
let chat_history = rig_core::OneOrMany::many(vec![
|
||||
Message::Assistant {
|
||||
id: None,
|
||||
content: rig_core::OneOrMany::one(assistant_tool_call),
|
||||
},
|
||||
Message::User {
|
||||
content: rig_core::OneOrMany::one(tool_result),
|
||||
},
|
||||
Message::user("Continue."),
|
||||
])
|
||||
.expect("history should contain messages");
|
||||
|
||||
model
|
||||
.completion(rig_core::completion::CompletionRequest {
|
||||
model: Some("gpt-5.3-codex".to_string()),
|
||||
preamble: None,
|
||||
chat_history,
|
||||
documents: Vec::new(),
|
||||
tools: Vec::new(),
|
||||
temperature: None,
|
||||
max_tokens: None,
|
||||
tool_choice: None,
|
||||
additional_params: None,
|
||||
output_schema: None,
|
||||
record_telemetry_content: false,
|
||||
})
|
||||
.await
|
||||
.expect("request should reach the mocked provider");
|
||||
|
||||
let requests = http_client.requests();
|
||||
assert_eq!(requests.len(), 1);
|
||||
let body: serde_json::Value = serde_json::from_slice(&requests[0].body).unwrap();
|
||||
let input = body["input"].as_array().expect("input should be an array");
|
||||
assert_eq!(input[0]["call_id"], "call_native_1");
|
||||
assert_eq!(input[1]["call_id"], "call_native_1");
|
||||
}
|
||||
@@ -243,14 +243,5 @@ fn native_descriptor(provider: &str, model: &str) -> RuntimeDescriptor {
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::native_descriptor;
|
||||
|
||||
#[test]
|
||||
fn native_descriptors_are_provider_specific() {
|
||||
let descriptor = native_descriptor("anthropic", "claude-sonnet");
|
||||
|
||||
assert_eq!(descriptor.id, "rig-anthropic:claude-sonnet");
|
||||
assert_eq!(descriptor.display_name, "Rig / anthropic / claude-sonnet");
|
||||
}
|
||||
}
|
||||
#[path = "native_tests.rs"]
|
||||
mod tests;
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
use super::native_descriptor;
|
||||
|
||||
#[test]
|
||||
fn native_descriptors_are_provider_specific() {
|
||||
let descriptor = native_descriptor("anthropic", "claude-sonnet");
|
||||
|
||||
assert_eq!(descriptor.id, "rig-anthropic:claude-sonnet");
|
||||
assert_eq!(descriptor.display_name, "Rig / anthropic / claude-sonnet");
|
||||
}
|
||||
@@ -519,122 +519,8 @@ fn text_indicates_authentication_failure(text: &str) -> bool {
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use galaxy_agent_core::{AgentErrorKind, StopReason};
|
||||
use rig_core::completion::CompletionError;
|
||||
|
||||
use super::{
|
||||
completion_error_stop_reason, domain_tool_call, is_keepalive_event, map_completion_error,
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn domain_tool_call_prefers_responses_call_id() {
|
||||
let tool_call = rig_core::message::ToolCall::new(
|
||||
"fc_item_123".to_string(),
|
||||
rig_core::message::ToolFunction {
|
||||
name: "read_files".to_string(),
|
||||
arguments: serde_json::json!({"files": ["Cargo.toml"]}),
|
||||
},
|
||||
)
|
||||
.with_call_id("call_123".to_string());
|
||||
|
||||
let call = domain_tool_call(tool_call);
|
||||
|
||||
assert_eq!(call.id, "call_123");
|
||||
assert_eq!(call.name, "read_files");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn domain_tool_call_falls_back_to_wire_id_without_responses_call_id() {
|
||||
let tool_call = rig_core::message::ToolCall::new(
|
||||
"fc_item_123".to_string(),
|
||||
rig_core::message::ToolFunction {
|
||||
name: "read_files".to_string(),
|
||||
arguments: serde_json::json!({"files": ["Cargo.toml"]}),
|
||||
},
|
||||
);
|
||||
|
||||
let call = domain_tool_call(tool_call);
|
||||
|
||||
assert_eq!(call.id, "fc_item_123");
|
||||
assert_eq!(call.name, "read_files");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn provider_context_window_error_maps_to_semantic_stop_reason_and_kind() {
|
||||
let status = rig_core::http_client::Response::builder()
|
||||
.status(400)
|
||||
.body(())
|
||||
.unwrap()
|
||||
.status();
|
||||
let error = CompletionError::from_http_response(
|
||||
status,
|
||||
r#"{"error":{"message":"Your input exceeds the context window of this model. Please adjust your input and try again.","code":"400"}}"#,
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
completion_error_stop_reason(&error),
|
||||
Some(StopReason::ContextWindowExceeded)
|
||||
);
|
||||
let mapped = map_completion_error(error);
|
||||
assert_eq!(mapped.kind, AgentErrorKind::ContextWindowExceeded);
|
||||
assert!(!mapped.recoverable);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn provider_context_length_string_maps_to_semantic_stop_reason() {
|
||||
let error = CompletionError::ProviderError(
|
||||
"context_length_exceeded: maximum context length is 128000 tokens".to_string(),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
completion_error_stop_reason(&error),
|
||||
Some(StopReason::ContextWindowExceeded)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn provider_keepalive_event_is_a_transport_heartbeat() {
|
||||
assert!(is_keepalive_event(&serde_json::json!({
|
||||
"type": "keepalive",
|
||||
"sequence_number": 3,
|
||||
})));
|
||||
assert!(!is_keepalive_event(&serde_json::json!({
|
||||
"type": "unsupported",
|
||||
})));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn provider_server_error_is_recoverable() {
|
||||
let status = rig_core::http_client::Response::builder()
|
||||
.status(503)
|
||||
.body(())
|
||||
.unwrap()
|
||||
.status();
|
||||
let error = CompletionError::from_http_response(
|
||||
status,
|
||||
r#"{"error":{"message":"Service temporarily unavailable"}}"#,
|
||||
);
|
||||
|
||||
let mapped = map_completion_error(error);
|
||||
assert_eq!(mapped.kind, AgentErrorKind::Provider);
|
||||
assert!(mapped.recoverable);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn flattened_bedrock_credential_errors_are_authentication_failures() {
|
||||
for message in [
|
||||
r#"{"__type":"ExpiredTokenException","message":"The security token included in the request is expired"}"#,
|
||||
"UnrecognizedClientException: The security token included in the request is invalid",
|
||||
"AccessDeniedException: not authorized to perform bedrock:ConverseStream",
|
||||
] {
|
||||
let mapped = map_completion_error(CompletionError::ProviderError(message.to_string()));
|
||||
assert_eq!(mapped.kind, AgentErrorKind::Authentication);
|
||||
assert!(!mapped.recoverable);
|
||||
assert!(mapped.user_message.is_some());
|
||||
}
|
||||
}
|
||||
}
|
||||
#[path = "stream_unit_tests.rs"]
|
||||
mod tests;
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "stream_tests.rs"]
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
use galaxy_agent_core::{AgentErrorKind, StopReason};
|
||||
use rig_core::completion::CompletionError;
|
||||
|
||||
use super::{
|
||||
completion_error_stop_reason, domain_tool_call, is_keepalive_event, map_completion_error,
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn domain_tool_call_prefers_responses_call_id() {
|
||||
let tool_call = rig_core::message::ToolCall::new(
|
||||
"fc_item_123".to_string(),
|
||||
rig_core::message::ToolFunction {
|
||||
name: "read_files".to_string(),
|
||||
arguments: serde_json::json!({"files": ["Cargo.toml"]}),
|
||||
},
|
||||
)
|
||||
.with_call_id("call_123".to_string());
|
||||
|
||||
let call = domain_tool_call(tool_call);
|
||||
|
||||
assert_eq!(call.id, "call_123");
|
||||
assert_eq!(call.name, "read_files");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn domain_tool_call_falls_back_to_wire_id_without_responses_call_id() {
|
||||
let tool_call = rig_core::message::ToolCall::new(
|
||||
"fc_item_123".to_string(),
|
||||
rig_core::message::ToolFunction {
|
||||
name: "read_files".to_string(),
|
||||
arguments: serde_json::json!({"files": ["Cargo.toml"]}),
|
||||
},
|
||||
);
|
||||
|
||||
let call = domain_tool_call(tool_call);
|
||||
|
||||
assert_eq!(call.id, "fc_item_123");
|
||||
assert_eq!(call.name, "read_files");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn provider_context_window_error_maps_to_semantic_stop_reason_and_kind() {
|
||||
let status = rig_core::http_client::Response::builder()
|
||||
.status(400)
|
||||
.body(())
|
||||
.unwrap()
|
||||
.status();
|
||||
let error = CompletionError::from_http_response(
|
||||
status,
|
||||
r#"{"error":{"message":"Your input exceeds the context window of this model. Please adjust your input and try again.","code":"400"}}"#,
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
completion_error_stop_reason(&error),
|
||||
Some(StopReason::ContextWindowExceeded)
|
||||
);
|
||||
let mapped = map_completion_error(error);
|
||||
assert_eq!(mapped.kind, AgentErrorKind::ContextWindowExceeded);
|
||||
assert!(!mapped.recoverable);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn provider_context_length_string_maps_to_semantic_stop_reason() {
|
||||
let error = CompletionError::ProviderError(
|
||||
"context_length_exceeded: maximum context length is 128000 tokens".to_string(),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
completion_error_stop_reason(&error),
|
||||
Some(StopReason::ContextWindowExceeded)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn provider_keepalive_event_is_a_transport_heartbeat() {
|
||||
assert!(is_keepalive_event(&serde_json::json!({
|
||||
"type": "keepalive",
|
||||
"sequence_number": 3,
|
||||
})));
|
||||
assert!(!is_keepalive_event(&serde_json::json!({
|
||||
"type": "unsupported",
|
||||
})));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn provider_server_error_is_recoverable() {
|
||||
let status = rig_core::http_client::Response::builder()
|
||||
.status(503)
|
||||
.body(())
|
||||
.unwrap()
|
||||
.status();
|
||||
let error = CompletionError::from_http_response(
|
||||
status,
|
||||
r#"{"error":{"message":"Service temporarily unavailable"}}"#,
|
||||
);
|
||||
|
||||
let mapped = map_completion_error(error);
|
||||
assert_eq!(mapped.kind, AgentErrorKind::Provider);
|
||||
assert!(mapped.recoverable);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn flattened_bedrock_credential_errors_are_authentication_failures() {
|
||||
for message in [
|
||||
r#"{"__type":"ExpiredTokenException","message":"The security token included in the request is expired"}"#,
|
||||
"UnrecognizedClientException: The security token included in the request is invalid",
|
||||
"AccessDeniedException: not authorized to perform bedrock:ConverseStream",
|
||||
] {
|
||||
let mapped = map_completion_error(CompletionError::ProviderError(message.to_string()));
|
||||
assert_eq!(mapped.kind, AgentErrorKind::Authentication);
|
||||
assert!(!mapped.recoverable);
|
||||
assert!(mapped.user_message.is_some());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user