Activate prompt hooks

This commit is contained in:
Abhinav Vedmala
2026-06-03 17:51:34 -07:00
parent d546866b45
commit c621ca2c2f
13 changed files with 556 additions and 51 deletions
+80
View File
@@ -47,6 +47,7 @@ use core_test_support::test_codex::test_codex;
use core_test_support::wait_for_event;
use pretty_assertions::assert_eq;
use serde_json::Value;
use serde_json::json;
use std::sync::Arc;
use std::time::Duration;
use tempfile::TempDir;
@@ -242,6 +243,23 @@ if payload.get("prompt") == {blocked_prompt_json}:
Ok(())
}
fn write_user_prompt_submit_prompt_hook(home: &Path) -> Result<()> {
let hooks = serde_json::json!({
"hooks": {
"UserPromptSubmit": [{
"hooks": [{
"type": "prompt",
"prompt": "Reject prompts that mention secrets: $ARGUMENTS",
"statusMessage": "checking prompt",
}]
}]
}
});
fs::write(home.join("hooks.json"), hooks.to_string()).context("write hooks.json")?;
Ok(())
}
fn write_session_start_and_user_prompt_submit_order_hooks(home: &Path) -> Result<()> {
let session_start_script_path = home.join("session_start_order_hook.py");
let user_prompt_submit_script_path = home.join("user_prompt_submit_order_hook.py");
@@ -1713,6 +1731,68 @@ async fn multiple_blocking_stop_hooks_persist_multiple_hook_prompt_fragments() -
Ok(())
}
#[tokio::test]
async fn user_prompt_submit_prompt_hook_runs_isolated_request() -> Result<()> {
skip_if_no_network!(Ok(()));
let server = start_mock_server().await;
let response = mount_sse_once(
&server,
sse(vec![
ev_response_created("prompt-hook-resp"),
ev_assistant_message(
"prompt-hook-msg",
r#"{"ok":false,"reason":"do not mention secrets"}"#,
),
ev_completed("prompt-hook-resp"),
]),
)
.await;
let mut builder = test_codex()
.with_model("gpt-5.4")
.with_pre_build_hook(|home| {
if let Err(error) = write_user_prompt_submit_prompt_hook(home) {
panic!("failed to write user prompt submit prompt hook fixture: {error}");
}
})
.with_config(trust_discovered_hooks);
let test = builder.build(&server).await?;
let prompt = "secret launch codes";
test.submit_turn(prompt).await?;
let request = response.single_request();
let body = request.body_json();
assert_eq!(body["model"], json!("gpt-5.4"));
assert_eq!(body["tools"], json!([]));
assert!(
request
.instructions_text()
.starts_with("You evaluate a Codex prompt hook."),
"prompt hook request should use isolated hook instructions",
);
let user_inputs = request.message_input_texts("user");
assert_eq!(
user_inputs.len(),
1,
"prompt hook request should contain exactly one user message",
);
assert_eq!(
request.message_input_texts("developer"),
Vec::<String>::new(),
"prompt hook request should not inherit developer context",
);
let hook_input = user_inputs.first().context("prompt hook user input")?;
assert!(hook_input.contains("Reject prompts that mention secrets:"));
assert!(
hook_input.contains(prompt),
"prompt hook request should include the submitted prompt",
);
Ok(())
}
#[tokio::test]
async fn blocked_user_prompt_submit_persists_additional_context_for_next_turn() -> Result<()> {
skip_if_no_network!(Ok(()));