codex/codex-rs/app-server/tests/suite/v2/guardian_sync_session_tests.rs

//! Exercises reviewer ownership through app-server, including concurrent and inline reviews.

use super::*;
use app_test_support::create_final_assistant_message_sse_response as assistant_response;
use codex_app_server_protocol::CodexErrorInfo;
use codex_app_server_protocol::GuardianWarningNotification;
use codex_app_server_protocol::JSONRPCErrorError;
use codex_app_server_protocol::RawResponseItemCompletedNotification;
use codex_app_server_protocol::RequestId;
use codex_app_server_protocol::ReviewDelivery;
use codex_app_server_protocol::ReviewStartParams;
use codex_app_server_protocol::ReviewStartResponse;
use codex_app_server_protocol::ReviewTarget;
use codex_app_server_protocol::SessionSource;
use codex_app_server_protocol::ThreadClosedNotification;
use codex_app_server_protocol::ThreadGuardianReviewParams;
use codex_app_server_protocol::ThreadInjectItemsParams;
use codex_app_server_protocol::ThreadInjectItemsResponse;
use codex_app_server_protocol::ThreadListResponse;
use codex_app_server_protocol::ThreadReadParams;
use codex_app_server_protocol::ThreadReadResponse;
use codex_app_server_protocol::ThreadSetNameParams;
use codex_app_server_protocol::ThreadSetNameResponse;
use codex_app_server_protocol::ThreadSourceKind;
use codex_app_server_protocol::ThreadUnsubscribeParams;
use codex_app_server_protocol::ThreadUnsubscribeResponse;
use codex_app_server_protocol::TurnError;
use codex_app_server_protocol::TurnInterruptParams;
use codex_app_server_protocol::TurnInterruptResponse;
use codex_protocol::protocol::SubAgentSource;
use core_test_support::streaming_sse::StreamingSseChunk;
use core_test_support::streaming_sse::start_streaming_sse_server;
use pretty_assertions::assert_eq;
use test_case::test_case;
use tokio::sync::oneshot;

const ALLOW: &str = r#"{"outcome":"allow","rationale":"completed seed assessment"}"#;

fn sync_config(responses_url: &str) -> MockResponsesConfig {
    MockResponsesConfig::new(responses_url)
        .with_provider_config("supports_websockets = false")
        .with_approval_policy("on-request")
        .with_root_config("approvals_reviewer = \"auto_review\"\nthread_unload_delay_secs = 0")
        .with_extra_config("[features.guardianv2]\nenabled = false")
        .enable_feature(Feature::GuardianApproval)
        .disable_feature(Feature::EnableRequestCompression)
}

fn tool_response(server: &str, tool: &str, calls: &[&str]) -> String {
    let mut events = vec![responses::ev_response_created("tools")];
    events.extend(calls.iter().map(|call| {
        responses::ev_function_call_with_namespace(
            call,
            &format!("mcp__{server}"),
            tool,
            &json!({"message": call}).to_string(),
        )
    }));
    events.push(responses::ev_completed("tools"));
    responses::sse(events)
}

#[derive(Clone, Copy)]
enum ReviewEnding {
    Complete,
    Interrupt,
}

#[tokio::test]
async fn circuit_break_action_preserves_warning_and_reports_error_in_live_and_saved_turns()
-> Result<()> {
    skip_if_no_network!(Ok(()));

    for action in [None, Some("default"), Some("strict")] {
        let mut replies = Vec::new();
        for call in ["first", "second", "third"] {
            for body in [
                tool_response(TEST_SERVER_NAME, TEST_TOOL_NAME, &[call]),
                assistant_response(
                    r#"{"outcome":"deny","rationale":"Action is not authorized."}"#,
                )?,
            ] {
                replies.push(vec![StreamingSseChunk { gate: None, body }]);
            }
        }
        // Keep a racing parent request from completing before the interruption.
        let (_continue_parent, parent_gate) = oneshot::channel();
        replies.push(vec![StreamingSseChunk {
            gate: Some(parent_gate),
            body: assistant_response("Done.")?,
        }]);
        let (server, _completions) = start_streaming_sse_server(replies).await;
        let (mcp_url, mcp_server) = start_mcp_server(/*sensitive_action*/ None).await?;
        let codex_home = TempDir::new()?;
        let mut config = sync_config(server.uri()).with_extra_config(&format!(
            "[mcp_servers.{TEST_SERVER_NAME}]\nurl = \"{mcp_url}/mcp\"\ndefault_tools_approval_mode = \"prompt\""
        ));
        if let Some(action) = action {
            config = config.with_extra_config(&format!(
                "[auto_review]\ncircuit_break_action = \"{action}\""
            ));
        }
        config.write(codex_home.path())?;
        let mut app = TestAppServer::builder()
            .with_codex_home(codex_home.path())
            .build_initialized_with_timeout(TIMEOUT)
            .await?;
        let thread = app.start_thread(ThreadStartParams::default()).await?.thread;
        let started: TurnStartResponse = app
            .request(|request_id| ClientRequest::TurnStart {
                request_id,
                params: TurnStartParams {
                    thread_id: thread.id.clone(),
                    input: vec![UserInput::Text {
                        text: "Run the checks.".to_owned(),
                        text_elements: Vec::new(),
                    }],
                    ..Default::default()
                },
            })
            .await?;
        // Individual denials also emit Guardian warnings before the circuit breaker.
        let warning = timeout(TIMEOUT, async {
            loop {
                let warning: GuardianWarningNotification =
                    app.read_notification("guardianWarning").await?;
                assert_eq!(warning.thread_id, thread.id);
                if warning.message.contains("3 consecutive") {
                    break Ok::<_, anyhow::Error>(warning);
                }
            }
        })
        .await??;
        let completed: TurnCompletedNotification =
            timeout(TIMEOUT, app.read_notification("turn/completed")).await??;
        let expected_error = (action == Some("strict")).then_some(TurnError {
            message: warning.message,
            codex_error_info: Some(CodexErrorInfo::TooManyDenials),
            additional_details: None,
            misalignment: None,
        });
        assert_eq!(completed.thread_id, thread.id);
        assert_eq!(completed.turn.id, started.turn.id);
        assert_eq!(completed.turn.status, TurnStatus::Interrupted);
        assert_eq!(completed.turn.error, expected_error);
        assert!(
            !app.pending_notification_methods()
                .iter()
                .any(|method| method == "error"),
            "the error must be carried by the interrupted turn, not a separate notification"
        );
        app.shutdown_gracefully().await?;

        // Restart to read persisted history rather than the in-memory turn summary.
        let mut app = TestAppServer::builder()
            .with_codex_home(codex_home.path())
            .build_initialized_with_timeout(TIMEOUT)
            .await?;
        let read: ThreadReadResponse = app
            .request(|request_id| ClientRequest::ThreadRead {
                request_id,
                params: ThreadReadParams {
                    thread_id: thread.id.clone(),
                    include_turns: true,
                },
            })
            .await?;
        let saved = read.thread.turns.last().expect("saved interrupted turn");
        assert_eq!(saved.id, completed.turn.id);
        assert_eq!(saved.status, completed.turn.status);
        assert_eq!(saved.error, expected_error);
        app.shutdown_gracefully().await?;
        mcp_server.abort();
        server.shutdown().await;
    }
    Ok(())
}

#[tokio::test]
async fn managed_reviewer_refreshes_global_instructions_before_reuse() -> Result<()> {
    skip_if_no_network!(Ok(()));
    let checks = ["initial", "unchanged", "updated", "still-updated"];
    let mut responses = Vec::new();
    for check in checks {
        for body in [
            tool_response(TEST_SERVER_NAME, TEST_TOOL_NAME, &[check]),
            assistant_response(ALLOW)?,
            assistant_response("Done.")?,
        ] {
            responses.push(vec![StreamingSseChunk { gate: None, body }]);
        }
    }
    let (server, _completions) = start_streaming_sse_server(responses).await;
    let (mcp_url, mcp_server) = start_mcp_server(/*sensitive_action*/ None).await?;
    let codex_home = TempDir::new()?;
    let instructions_path = codex_home.path().join("AGENTS.md");
    sync_config(server.uri())
        .with_provider_name("OpenAI")
        .enable_feature(Feature::ContentItemKinds)
        .enable_feature(Feature::GuardianRecordedItems)
        .with_extra_config(&format!(
            "[mcp_servers.{TEST_SERVER_NAME}]\nurl = \"{mcp_url}/mcp\"\ndefault_tools_approval_mode = \"prompt\""
        ))
        .write(codex_home.path())?;
    let mut app = TestAppServer::builder()
        .with_codex_home(codex_home.path())
        .build_initialized_with_timeout(TIMEOUT)
        .await?;
    let old_instructions = "Keep this project private.";
    let new_instructions = "Ask before sharing this project's source code.";
    std::fs::write(&instructions_path, old_instructions)?;
    let parent = app
        .start_thread(ThreadStartParams {
            experimental_raw_events: true,
            ..Default::default()
        })
        .await?
        .thread;
    let mut reviewer_ids = Vec::new();
    let mut previous_recorded: Option<(String, Value)> = None;
    for (index, instructions) in [
        old_instructions,
        old_instructions,
        new_instructions,
        new_instructions,
    ]
    .into_iter()
    .enumerate()
    {
        std::fs::write(&instructions_path, instructions)?;
        let request_id = app
            .send_turn_start_request(TurnStartParams {
                thread_id: parent.id.clone(),
                input: vec![UserInput::Text {
                    text: format!("Run the {} check.", checks[index]),
                    text_elements: Vec::new(),
                }],
                ..Default::default()
            })
            .await?;
        let _: TurnStartResponse = timeout(TIMEOUT, app.read_response(request_id)).await??;
        let completed: TurnCompletedNotification =
            timeout(TIMEOUT, app.read_notification("turn/completed")).await??;
        assert_eq!(completed.thread_id, parent.id);
        assert_eq!(completed.turn.status, TurnStatus::Completed);

        let requests = server.requests().await;
        assert_eq!(requests.len(), (index + 1) * 3);
        let review: Value = serde_json::from_slice(&requests[index * 3 + 1])?;
        assert!(review["input"].to_string().contains(instructions));
        let turn_metadata: Value = serde_json::from_str(
            review["client_metadata"]["x-codex-turn-metadata"]
                .as_str()
                .expect("turn metadata"),
        )?;
        assert_eq!(turn_metadata["guardian_recorded_items"], true);
        if let Some((thread_id, item)) = &previous_recorded
            && review["client_metadata"]["thread_id"] == thread_id.as_str()
        {
            let replayed = review["input"]
                .as_array()
                .expect("review input")
                .iter()
                .find(|replayed| replayed["content"] == item["content"])
                .expect("previous Guardian reply is replayed");
            assert_eq!(
                replayed["internal_chat_message_metadata_passthrough"],
                item["internal_chat_message_metadata_passthrough"],
            );
        }
        // Private reviewer events arrive on the parent's subscription with the
        // reviewer's identity and the metadata that its next request replays.
        let (recorded, item) = loop {
            let recorded: RawResponseItemCompletedNotification =
                app.read_notification("rawResponseItem/completed").await?;
            let item = serde_json::to_value(&recorded.item)?;
            if recorded.thread_id != parent.id
                && item["role"] == "assistant"
                && item["content"][0]["text"] == ALLOW
            {
                break (recorded, item);
            }
        };
        assert_eq!(
            json!([recorded.thread_id, recorded.turn_id]),
            json!([turn_metadata["thread_id"], turn_metadata["turn_id"]]),
        );
        previous_recorded = Some((recorded.thread_id, item));
        reviewer_ids.push(
            review["client_metadata"]["thread_id"]
                .as_str()
                .expect("reviewer ID")
                .to_owned(),
        );
    }
    assert_eq!(reviewer_ids[0], reviewer_ids[1]);
    assert_ne!(reviewer_ids[1], reviewer_ids[2]);
    assert_eq!(reviewer_ids[2], reviewer_ids[3]);

    app.shutdown_gracefully().await?;
    mcp_server.abort();
    Ok(())
}

#[test_case(ReviewEnding::Complete, true; "completed reviews")]
#[test_case(ReviewEnding::Interrupt, true; "cancelled concurrent reviews")]
#[test_case(ReviewEnding::Interrupt, false; "raw events without reviewer opt-in")]
#[tokio::test]
async fn managed_reviewers_reuse_fork_and_resume_after_parent_shutdown(
    ending: ReviewEnding,
    recorded_items: bool,
) -> Result<()> {
    skip_if_no_network!(Ok(()));
    let (continue_parent, parent_gate) = oneshot::channel();
    let (finish_first, first_gate) = oneshot::channel();
    let (finish_second, second_gate) = oneshot::channel();
    let mut replies = vec![
        (
            tool_response(TEST_SERVER_NAME, TEST_TOOL_NAME, &["seed"]),
            None,
        ),
        (assistant_response(ALLOW)?, None),
        (
            tool_response(TEST_SERVER_NAME, TEST_TOOL_NAME, &["first", "second"]),
            Some(parent_gate),
        ),
        (assistant_response(ALLOW)?, Some(first_gate)),
        (assistant_response(ALLOW)?, Some(second_gate)),
    ];
    if matches!(ending, ReviewEnding::Complete) {
        replies.push((assistant_response("Done.")?, None));
    }
    replies.push((assistant_response("The user authorized the checks.")?, None));
    let (server, _completions) = start_streaming_sse_server(
        replies
            .into_iter()
            .map(|(body, gate)| vec![StreamingSseChunk { gate, body }])
            .collect(),
    )
    .await;
    let (mcp_url, mcp_server) = start_mcp_server(/*sensitive_action*/ None).await?;
    let codex_home = TempDir::new()?;
    std::fs::write(
        codex_home.path().join("AGENTS.md"),
        "Keep this project private.",
    )?;
    sync_config(server.uri())
        .with_features(&[(Feature::GuardianRecordedItems, recorded_items)].into())
        .with_extra_config(&format!(
            "[mcp_servers.{TEST_SERVER_NAME}]\nurl = \"{mcp_url}/mcp\"\ndefault_tools_approval_mode = \"prompt\""
        ))
        .write(codex_home.path())?;
    let mut app = TestAppServer::builder()
        .with_codex_home(codex_home.path())
        .build_initialized_with_timeout(TIMEOUT)
        .await?;
    let parent = app
        .start_thread(ThreadStartParams {
            experimental_raw_events: true,
            ..Default::default()
        })
        .await?
        .thread;
    let started: TurnStartResponse = app
        .request(|request_id| ClientRequest::TurnStart {
            request_id,
            params: TurnStartParams {
                thread_id: parent.id.clone(),
                input: vec![UserInput::Text {
                    text: "Run the three checks.".to_owned(),
                    text_elements: Vec::new(),
                }],
                ..Default::default()
            },
        })
        .await?;

    // The seed review finished; pause the parent before it requests concurrent approvals.
    timeout(TIMEOUT, server.wait_for_request_count(/*count*/ 3)).await?;
    let seed: Value = serde_json::from_slice(&server.requests().await[1])?;
    assert!(
        !seed["tools"]
            .to_string()
            .contains(&format!("mcp__{TEST_SERVER_NAME}")),
        "reviewers must not inherit the parent's configured MCP tools"
    );
    let reviewer_id = seed["client_metadata"]["thread_id"]
        .as_str()
        .expect("reviewer ID")
        .to_owned();
    let id = app
        .send_thread_resume_request(ThreadResumeParams {
            thread_id: reviewer_id.clone(),
            ..Default::default()
        })
        .await?;
    let error = timeout(
        TIMEOUT,
        app.read_stream_until_error_message(RequestId::Integer(id)),
    )
    .await??;
    assert_eq!(error.error, JSONRPCErrorError {
        code: -32600,
        message: "cannot resume a live Guardian reviewer; use thread/read to inspect it, or resume after its parent is unloaded".to_owned(),
        data: None,
    });
    // Client removal must leave the cached reviewer available for the next approvals.
    for method in ["thread/archive", "thread/delete"] {
        let id = app
            .send_request(method, Some(json!({"threadId": reviewer_id})))
            .await?;
        let error = timeout(
            TIMEOUT,
            app.read_stream_until_error_message(RequestId::Integer(id)),
        )
        .await??;
        assert_eq!(
            error.error,
            JSONRPCErrorError {
                code: -32600,
                message: "live internal threads can only be removed by their owner".to_owned(),
                data: None,
            }
        );
    }
    continue_parent.send(()).expect("continue parent");

    // Neither review can finish until both requests arrive: prove reuse and an independent fork.
    timeout(TIMEOUT, server.wait_for_request_count(/*count*/ 5)).await?;
    let requests = server.requests().await;
    let first: Value = serde_json::from_slice(&requests[3])?;
    let second: Value = serde_json::from_slice(&requests[4])?;
    let concurrent_ids = [
        &first["client_metadata"]["thread_id"],
        &second["client_metadata"]["thread_id"],
    ];
    assert_ne!(concurrent_ids[0], concurrent_ids[1]);
    assert!(concurrent_ids.contains(&&seed["client_metadata"]["thread_id"]));
    for review in [&seed, &first, &second] {
        assert_eq!(
            review["prompt_cache_key"],
            format!("guardian:{}", parent.id)
        );
        let metadata: Value = serde_json::from_str(
            review["client_metadata"]["x-codex-turn-metadata"]
                .as_str()
                .expect("turn metadata"),
        )?;
        assert_eq!(metadata["subagent_kind"], "guardian");
        assert!(
            review["input"]
                .to_string()
                .contains("Keep this project private.")
        );
    }
    for review in [&first, &second] {
        assert!(
            review["input"]
                .to_string()
                .contains("completed seed assessment")
        );
    }
    if matches!(ending, ReviewEnding::Interrupt) {
        let _: TurnInterruptResponse = app
            .request(|request_id| ClientRequest::TurnInterrupt {
                request_id,
                params: TurnInterruptParams {
                    thread_id: parent.id.clone(),
                    turn_id: started.turn.id.clone(),
                },
            })
            .await?;
    } else {
        finish_first.send(()).expect("finish first review");
        finish_second.send(()).expect("finish second review");
    }
    let mut parent_completed = None;
    let mut interrupted_reviewers = std::collections::BTreeSet::new();
    let expected_interruptions = match ending {
        ReviewEnding::Interrupt if recorded_items => 2,
        ReviewEnding::Complete | ReviewEnding::Interrupt => 0,
    };
    while parent_completed.is_none() || interrupted_reviewers.len() < expected_interruptions {
        let completed: TurnCompletedNotification =
            timeout(TIMEOUT, app.read_notification("turn/completed")).await??;
        if completed.thread_id == parent.id {
            parent_completed = Some(completed);
        } else {
            assert_eq!(completed.turn.status, TurnStatus::Interrupted);
            interrupted_reviewers.insert((completed.thread_id, completed.turn.id));
        }
    }
    assert_eq!(interrupted_reviewers.len(), expected_interruptions);
    if matches!(ending, ReviewEnding::Interrupt) && recorded_items {
        let mut expected = std::collections::BTreeSet::new();
        for review in [&first, &second] {
            let metadata: Value = serde_json::from_str(
                review["client_metadata"]["x-codex-turn-metadata"]
                    .as_str()
                    .expect("turn metadata"),
            )?;
            expected.insert((
                metadata["thread_id"]
                    .as_str()
                    .expect("reviewer thread ID")
                    .to_owned(),
                metadata["turn_id"]
                    .as_str()
                    .expect("reviewer turn ID")
                    .to_owned(),
            ));
        }
        assert_eq!(interrupted_reviewers, expected);
    }
    let completed = parent_completed.expect("parent completes independently of its reviewers");
    let expected_status = match ending {
        ReviewEnding::Complete => TurnStatus::Completed,
        ReviewEnding::Interrupt => TurnStatus::Interrupted,
    };
    assert_eq!(completed.turn.status, expected_status);

    let read: ThreadReadResponse = app
        .request(|request_id| ClientRequest::ThreadRead {
            request_id,
            params: ThreadReadParams {
                thread_id: reviewer_id.clone(),
                include_turns: true,
            },
        })
        .await?;
    assert_eq!(
        read.thread.source,
        SessionSource::SubAgent(SubAgentSource::Other("guardian".to_owned()))
    );
    let _: ThreadUnsubscribeResponse = app
        .request(|request_id| ClientRequest::ThreadUnsubscribe {
            request_id,
            params: ThreadUnsubscribeParams {
                thread_id: parent.id.clone(),
            },
        })
        .await?;
    let closed: ThreadClosedNotification =
        timeout(TIMEOUT, app.read_notification("thread/closed")).await??;
    assert_eq!(closed.thread_id, parent.id);
    let state_db = StateRuntime::init(
        codex_state::SqliteConfig::new_for_testing(codex_home.path().abs()),
        "mock_provider".into(),
    )
    .await?;
    let metadata = state_db
        .get_thread(codex_protocol::ThreadId::from_string(&reviewer_id)?)
        .await?
        .expect("reviewer metadata should be persisted");
    assert_eq!(
        (
            metadata.title.as_str(),
            metadata.name.as_deref(),
            metadata.preview.as_deref(),
            metadata.first_user_message.as_deref(),
        ),
        (
            "Guardian review",
            Some("Guardian review"),
            Some("Approval review"),
            None
        ),
    );
    // Saved reviewers remain discoverable through the existing subagent filters.
    for kind in [ThreadSourceKind::SubAgent, ThreadSourceKind::SubAgentOther] {
        let params = serde_json::from_value(json!({"sourceKinds": [kind]}))?;
        let listed: ThreadListResponse = app
            .request(|request_id| ClientRequest::ThreadList { request_id, params })
            .await?;
        let reviewer = listed
            .data
            .iter()
            .find(|thread| thread.id == reviewer_id)
            .expect("reviewer should be listed");
        assert_eq!(
            (reviewer.name.as_deref(), reviewer.preview.as_str()),
            (Some("Guardian review"), "Approval review"),
        );
    }
    let _: ThreadSetNameResponse = app
        .request(|request_id| ClientRequest::ThreadSetName {
            request_id,
            params: ThreadSetNameParams {
                thread_id: reviewer_id.clone(),
                name: "Named Guardian review".to_string(),
            },
        })
        .await?;
    let resumed: ThreadResumeResponse = app
        .request(|request_id| ClientRequest::ThreadResume {
            request_id,
            params: ThreadResumeParams {
                thread_id: reviewer_id.clone(),
                ..Default::default()
            },
        })
        .await?;
    assert_eq!(resumed.thread.id, reviewer_id);
    assert_eq!(resumed.thread.source, read.thread.source);
    assert_eq!(
        resumed.thread.name.as_deref(),
        Some("Named Guardian review")
    );
    assert_eq!(resumed.thread.preview, "Approval review");
    let completed = timeout(
        TIMEOUT,
        app.start_turn_and_wait_for_completion(TurnStartParams {
            thread_id: reviewer_id.clone(),
            input: vec![UserInput::Text {
                text: "Explain your assessment.".to_owned(),
                text_elements: Vec::new(),
            }],
            ..Default::default()
        }),
    )
    .await??;
    assert_eq!(completed.turn.status, TurnStatus::Completed);
    assert_eq!(
        server.requests().await.len(),
        match ending {
            ReviewEnding::Complete => 7,
            ReviewEnding::Interrupt => 6,
        }
    );
    // Once the owner releases it, the resumed reviewer follows normal client removal.
    for method in ["thread/archive", "thread/delete"] {
        let id = app
            .send_request(method, Some(json!({"threadId": reviewer_id})))
            .await?;
        let response: Value = timeout(TIMEOUT, app.read_response(id)).await??;
        assert_eq!(response, json!({}));
    }
    app.shutdown_gracefully().await?;
    mcp_server.abort();
    server.shutdown().await;
    Ok(())
}

#[tokio::test]
async fn inline_review_delegate_runs_strict_guardian_assessment() -> Result<()> {
    skip_if_no_network!(Ok(()));
    let server = responses::start_mock_server().await;
    let requests = responses::mount_sse_sequence(
        &server,
        vec![
            tool_response("node_repl", "js", &["inline-tool"]),
            assistant_response(ALLOW)?,
            assistant_response(r#"{"findings":[]}"#)?,
        ],
    )
    .await;
    let (mcp_url, mcp_server) =
        start_mcp_server_with_tools(&["js"], /*sensitive_action*/ None).await?;
    let codex_home = TempDir::new()?;
    sync_config(&server.uri())
        .with_extra_config(&format!("[mcp_servers.node_repl]\nurl = \"{mcp_url}/mcp\"\ndefault_tools_approval_mode = \"auto\""))
        .write(codex_home.path())?;
    let config = load_default_config_for_test(&codex_home).await;
    let mut model = codex_core::test_support::construct_model_info_offline(MODEL, &config);
    // Strict MCP approvals must work under the inline delegate's `never` policy.
    model.node_repl_auto_review_required = true;
    write_models_cache_with_models(codex_home.path(), vec![model]).await?;
    let mut app = TestAppServer::builder()
        .with_codex_home(codex_home.path())
        .build_initialized_with_timeout(TIMEOUT)
        .await?;
    let parent = app.start_thread(ThreadStartParams::default()).await?.thread;
    let _: ReviewStartResponse = app
        .request(|request_id| ClientRequest::ReviewStart {
            request_id,
            params: ReviewStartParams {
                thread_id: parent.id,
                delivery: Some(ReviewDelivery::Inline),
                target: ReviewTarget::Custom {
                    instructions: "Run the configured tool to check this change.".to_owned(),
                },
            },
        })
        .await?;
    let completed: TurnCompletedNotification =
        timeout(TIMEOUT, app.read_notification("turn/completed")).await??;
    assert_eq!(completed.turn.status, TurnStatus::Completed);
    let output = requests
        .function_call_output_text("inline-tool")
        .expect("MCP tool output");
    assert!(output.contains(r#""echoed":"inline-tool""#), "{output}");
    assert_eq!(
        requests
            .requests()
            .iter()
            .map(|request| request.body_json()["client_metadata"]["x-openai-subagent"].clone())
            .collect::<Vec<_>>(),
        vec![json!("review"), json!("guardian"), json!("review")]
    );
    app.shutdown_gracefully().await?;
    mcp_server.abort();
    Ok(())
}

#[tokio::test]
async fn guardian_review_reuses_private_recorded_call_history_per_parent() -> Result<()> {
    let rationale = "Guardian approved the recorded file write.";
    let verdict = assistant_response(
        &json!({
            "outcome": "allow",
            "risk_level": "medium",
            "user_authorization": "high",
            "rationale": rationale,
        })
        .to_string(),
    )?;
    let server = responses::start_mock_server().await;
    let requests = responses::mount_sse_sequence(&server, vec![verdict; 3]).await;
    let codex_home = TempDir::new()?;
    sync_config(&server.uri()).write(codex_home.path())?;
    let mut app = TestAppServer::builder()
        .with_codex_home(codex_home.path())
        .build_initialized()
        .await?;
    let parent = app.start_thread(ThreadStartParams::default()).await?.thread;
    let other = app.start_thread(ThreadStartParams::default()).await?.thread;

    for (thread, call_id) in [(&parent, "a"), (&parent, "b"), (&other, "c")] {
        let evidence = if call_id == "b" {
            json!({
                "type": "function_call_output",
                "call_id": "a",
                "output": "Recorded success.",
            })
        } else {
            json!({
                "type": "message",
                "role": "user",
                "content": [{"type": "input_text", "text": "Create the requested file."}],
            })
        };
        let items = vec![
            evidence,
            json!({
                "type": "function_call",
                "name": "exec_command",
                "call_id": call_id,
                "arguments": r#"{"cmd":"echo reviewed > guardian-direct.txt","sandbox_permissions":"require_escalated","justification":"Create the requested file."}"#,
            }),
        ];
        let _: ThreadInjectItemsResponse = app
            .request(|request_id| ClientRequest::ThreadInjectItems {
                request_id,
                params: ThreadInjectItemsParams {
                    thread_id: thread.id.clone(),
                    items,
                },
            })
            .await?;
        let result: Value = app
            .request(|request_id| ClientRequest::ThreadGuardianReview {
                request_id,
                params: ThreadGuardianReviewParams {
                    thread_id: thread.id.clone(),
                },
            })
            .await?;
        assert_eq!(
            result,
            json!({
                "callId": call_id,
                "assessment": {
                    "outcome": "allow",
                    "riskLevel": "medium",
                    "userAuthorization": "high",
                    "rationale": rationale,
                }
            })
        );
    }

    let requests = requests.requests();
    let [a, b, c] = requests.as_slice() else {
        anyhow::bail!("expected three Guardian requests, got {}", requests.len());
    };
    for request in [a, b, c] {
        assert_eq!(
            request.body_json()["client_metadata"]["x-openai-subagent"],
            "guardian",
        );
    }
    for (call_id, request) in [("a", a), ("c", c)] {
        assert!(
            !serde_json::to_string(&request.input())?.contains(rationale),
            "unexpected prior rationale for call {call_id}",
        );
    }
    assert!(
        b.input().iter().any(|item| {
            item["type"] == "message"
                && item["role"] == "assistant"
                && item["content"].to_string().contains(rationale)
        }),
        "B should receive A's private verdict",
    );

    app.shutdown_gracefully().await?;
    Ok(())
}