diff --git a/codex-rs/app-server-protocol/schema/json/ServerNotification.json b/codex-rs/app-server-protocol/schema/json/ServerNotification.json index ccf6503dacd4..c0cb685f9c61 100644 --- a/codex-rs/app-server-protocol/schema/json/ServerNotification.json +++ b/codex-rs/app-server-protocol/schema/json/ServerNotification.json @@ -886,6 +886,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json index d121dc08f645..db388396c1fa 100644 --- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json +++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json @@ -9393,6 +9393,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json index 16188e71f3bd..a37d52b16fd2 100644 --- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json +++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json @@ -5139,6 +5139,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ErrorNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ErrorNotification.json index e187d88bded1..cd3ed84715a9 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ErrorNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ErrorNotification.json @@ -32,6 +32,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json index 2d57b73e3f0d..bbff7d0c679f 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json @@ -284,6 +284,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json index d19c190a4f4c..b70f9c152194 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json @@ -365,6 +365,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json index 28c4b5fbe6db..2792ae4b7892 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json @@ -287,6 +287,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json index 1c1521eee32a..0f0dfa40bb22 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json @@ -287,6 +287,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json index f86b85814f9e..b1349b6a4afc 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json @@ -287,6 +287,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json index b5a90f56901b..acdfe6fc6214 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json @@ -365,6 +365,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json index aaba3612d556..491941f14675 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json @@ -287,6 +287,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json index 3d224ea07193..0bcc87e7aaa6 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json @@ -365,6 +365,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json index da35cc586158..6c0ab44e61a5 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json @@ -287,6 +287,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json index 3f6097595603..78e7e1f11499 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json @@ -284,6 +284,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json index 90079841433a..860a800b01f3 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json @@ -287,6 +287,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json index fcc6d4ab176e..0043c585a824 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json @@ -284,6 +284,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json index 2e5b2742fca7..043983dca88a 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json @@ -284,6 +284,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json index 3ed4878d06c7..74f53d76add6 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json @@ -284,6 +284,13 @@ ], "type": "string" }, + { + "description": "The provider blocked the response with a content filter.", + "enum": [ + "contentFilter" + ], + "type": "string" + }, { "additionalProperties": false, "properties": { diff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst index 931b41b4499b..49f5cf898a8b 100644 Binary files a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst and b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst differ diff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst index 1f8874fa6ff1..a9a9386b9ad1 100644 Binary files a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst and b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst differ diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/CodexErrorInfo.ts b/codex-rs/app-server-protocol/schema/typescript/v2/CodexErrorInfo.ts index f74612062ace..8d35aa5ca86c 100644 --- a/codex-rs/app-server-protocol/schema/typescript/v2/CodexErrorInfo.ts +++ b/codex-rs/app-server-protocol/schema/typescript/v2/CodexErrorInfo.ts @@ -9,4 +9,4 @@ import type { NonSteerableTurnKind } from "./NonSteerableTurnKind"; * When an upstream HTTP status is available (for example, from the Responses API or a provider), * it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant. */ -export type CodexErrorInfo = "contextWindowExceeded" | "sessionBudgetExceeded" | "usageLimitExceeded" | "rateLimitExceeded" | "flexUnavailable" | "serverOverloaded" | "modelNotFound" | "policyCapacityUnavailable" | "inferenceHookDenied" | "cyberPolicy" | "misalignmentPolicyViolation" | "tooManyDenials" | { "httpConnectionFailed": { httpStatusCode: number | null, } } | { "responseStreamConnectionFailed": { httpStatusCode: number | null, } } | "internalServerError" | "unauthorized" | "badRequest" | "threadRollbackFailed" | "sandboxError" | { "responseStreamDisconnected": { httpStatusCode: number | null, } } | { "responseTooManyFailedAttempts": { httpStatusCode: number | null, } } | { "activeTurnNotSteerable": { turnKind: NonSteerableTurnKind, } } | "other" | string | { [key: string]: unknown }; +export type CodexErrorInfo = "contextWindowExceeded" | "sessionBudgetExceeded" | "usageLimitExceeded" | "rateLimitExceeded" | "flexUnavailable" | "serverOverloaded" | "modelNotFound" | "policyCapacityUnavailable" | "inferenceHookDenied" | "contentFilter" | "cyberPolicy" | "misalignmentPolicyViolation" | "tooManyDenials" | { "httpConnectionFailed": { httpStatusCode: number | null, } } | { "responseStreamConnectionFailed": { httpStatusCode: number | null, } } | "internalServerError" | "unauthorized" | "badRequest" | "threadRollbackFailed" | "sandboxError" | { "responseStreamDisconnected": { httpStatusCode: number | null, } } | { "responseTooManyFailedAttempts": { httpStatusCode: number | null, } } | { "activeTurnNotSteerable": { turnKind: NonSteerableTurnKind, } } | "other" | string | { [key: string]: unknown }; diff --git a/codex-rs/app-server-protocol/src/protocol/v2/shared.rs b/codex-rs/app-server-protocol/src/protocol/v2/shared.rs index 5e63dfa52177..eeafe30033ca 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/shared.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/shared.rs @@ -85,6 +85,8 @@ pub enum CodexErrorInfo { PolicyCapacityUnavailable, /// The workspace's inference hook explicitly denied this request. InferenceHookDenied, + /// The provider blocked the response with a content filter. + ContentFilter, CyberPolicy, MisalignmentPolicyViolation, TooManyDenials, @@ -164,6 +166,7 @@ impl From for CodexErrorInfo { CoreCodexErrorInfo::PolicyCapacityUnavailable => { CodexErrorInfo::PolicyCapacityUnavailable } + CoreCodexErrorInfo::ContentFilter => CodexErrorInfo::ContentFilter, CoreCodexErrorInfo::CyberPolicy => CodexErrorInfo::CyberPolicy, CoreCodexErrorInfo::InferenceHookDenied => CodexErrorInfo::InferenceHookDenied, CoreCodexErrorInfo::BioPolicy => CodexErrorInfo::Other, diff --git a/codex-rs/app-server-protocol/src/protocol/v2/tests.rs b/codex-rs/app-server-protocol/src/protocol/v2/tests.rs index 449316639845..7d890e7a1872 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/tests.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/tests.rs @@ -4954,6 +4954,20 @@ fn codex_error_info_serializes_http_status_code_in_camel_case() { ); } +#[test] +fn content_filter_error_info_converts_to_camel_case() { + let core = codex_protocol::error::CodexErr::new( + codex_protocol::error::CodexErrorDetails::ContentFilter, + ) + .to_codex_protocol_error(); + let info = CodexErrorInfo::from(core); + assert_eq!(serde_json::to_value(&info).unwrap(), json!("contentFilter")); + assert_eq!( + serde_json::from_value::(json!("contentFilter")).unwrap(), + info + ); +} + #[test] fn core_error_info_converts_to_camel_case() { for (core, expected) in [ diff --git a/codex-rs/app-server/tests/suite/v2/content_filter.rs b/codex-rs/app-server/tests/suite/v2/content_filter.rs new file mode 100644 index 000000000000..e148d2756e82 --- /dev/null +++ b/codex-rs/app-server/tests/suite/v2/content_filter.rs @@ -0,0 +1,188 @@ +use anyhow::Context; +use anyhow::Result; +use app_test_support::MockResponsesConfig; +use app_test_support::TestAppServer; +use app_test_support::write_models_cache; +use codex_app_server_protocol::ClientRequest; +use codex_app_server_protocol::JSONRPCMessage; +use codex_app_server_protocol::ThreadStartParams; +use codex_app_server_protocol::TurnStartParams; +use codex_app_server_protocol::TurnStartResponse; +use codex_app_server_protocol::UserInput; +use core_test_support::responses; +use core_test_support::skip_if_no_network; +use pretty_assertions::assert_eq; +use serde_json::Value; +use serde_json::json; +use std::time::Duration; +use tempfile::TempDir; +use test_case::test_case; +use tokio::time::timeout; + +fn blocked_response() -> Vec { + vec![ + responses::ev_response_created("blocked"), + json!({ + "type": "response.incomplete", + "response": { "incomplete_details": { "reason": "content_filter" } } + }), + ] +} + +fn recovered_response() -> Vec { + vec![ + responses::ev_response_created("recovered"), + responses::ev_assistant_message("alternative", "A permitted alternative."), + responses::ev_completed("recovered"), + ] +} + +fn prewarm_response() -> Vec { + vec![ + responses::ev_response_created("prewarm"), + responses::ev_completed("prewarm"), + ] +} + +/// Read raw JSON so the test also checks the public spelling and notification count. +async fn run_turn(base_url: &str, websocket: bool) -> Result<(Vec, Value)> { + let codex_home = TempDir::new()?; + MockResponsesConfig::new(base_url) + .with_provider_config(&format!("supports_websockets = {websocket}")) + .write(codex_home.path())?; + let config_path = codex_home.path().join("config.toml"); + let config = std::fs::read_to_string(&config_path)? + .replace("stream_max_retries = 0", "stream_max_retries = 1"); + std::fs::write(config_path, config)?; + write_models_cache(codex_home.path()).await?; + let builder = TestAppServer::builder().with_codex_home(codex_home.path()); + // Release builds do not expose the debug-only plugin-startup test flag. + let builder = if cfg!(debug_assertions) { + builder + } else { + builder.with_plugin_startup_tasks() + }; + let mut app = builder.build_initialized().await?; + let thread = app.start_thread(ThreadStartParams::default()).await?.thread; + let _: TurnStartResponse = app + .request(|request_id| ClientRequest::TurnStart { + request_id, + params: TurnStartParams { + thread_id: thread.id.clone(), + input: vec![UserInput::Text { + text: "Help me with this topic.".to_string(), + text_elements: Vec::new(), + }], + ..Default::default() + }, + }) + .await?; + timeout(Duration::from_secs(20), async { + let mut errors = Vec::new(); + loop { + let JSONRPCMessage::Notification(notification) = app.read_next_message().await? else { + continue; + }; + let params = notification.params.context("notification params")?; + match notification.method.as_str() { + "error" => errors.push(params), + "turn/completed" => return Ok((errors, params)), + _ => {} + } + } + }) + .await? +} + +#[test_case(false; "http")] +#[test_case(true; "websocket")] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn content_filter_recovery_reports_first_retry(websocket: bool) -> Result<()> { + skip_if_no_network!(Ok(())); + let http = responses::start_mock_server().await; + let http_mock = if websocket { + None + } else { + Some( + responses::mount_sse_sequence( + &http, + vec![ + responses::sse(blocked_response()), + responses::sse(recovered_response()), + ], + ) + .await, + ) + }; + let ws = responses::start_websocket_server(vec![ + vec![prewarm_response(), blocked_response()], + vec![recovered_response()], + ]) + .await; + let http_uri = http.uri(); + let base_url = if websocket { ws.uri() } else { &http_uri }; + let (errors, completed) = run_turn(base_url, websocket).await?; + assert_eq!(errors.len(), 1, "{errors:#?}"); + assert_eq!(errors[0]["willRetry"], true); + assert_eq!(errors[0]["error"]["codexErrorInfo"], "contentFilter"); + assert_eq!( + errors[0]["error"]["message"], + "Response blocked by content filter; retrying (1/1)" + ); + assert!( + errors[0]["error"]["additionalDetails"] + .as_str() + .context("retry details")? + .contains("reason: content_filter") + ); + assert_eq!(completed["turn"]["status"], "completed"); + assert_eq!(completed["turn"]["error"], Value::Null); + if websocket { + assert_eq!(ws.connections().iter().map(Vec::len).sum::(), 3); + } else { + assert_eq!(http_mock.context("HTTP response mock")?.requests().len(), 2); + } + ws.shutdown().await; + Ok(()) +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn content_filter_exhaustion_reports_failed_turn() -> Result<()> { + skip_if_no_network!(Ok(())); + let server = responses::start_mock_server().await; + let mock = + responses::mount_sse_sequence(&server, vec![responses::sse(blocked_response()); 2]).await; + let (errors, completed) = run_turn(&server.uri(), false).await?; + assert_eq!(errors.len(), 2, "{errors:#?}"); + assert_eq!(errors[0]["willRetry"], true); + assert_eq!(errors[1]["willRetry"], false); + for error in errors { + assert_eq!(error["error"]["codexErrorInfo"], "contentFilter"); + } + assert_eq!(completed["turn"]["status"], "failed"); + assert_eq!( + completed["turn"]["error"]["codexErrorInfo"], + "contentFilter" + ); + assert_eq!(mock.requests().len(), 2); + Ok(()) +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn ordinary_first_websocket_reconnect_stays_hidden() -> Result<()> { + skip_if_no_network!(Ok(())); + let ws = responses::start_websocket_server(vec![ + vec![ + prewarm_response(), + vec![responses::ev_response_created("disconnected")], + ], + vec![recovered_response()], + ]) + .await; + let (errors, completed) = run_turn(ws.uri(), true).await?; + assert_eq!(errors.len(), usize::from(cfg!(debug_assertions))); + assert_eq!(completed["turn"]["status"], "completed"); + assert_eq!(ws.connections().iter().map(Vec::len).sum::(), 3); + ws.shutdown().await; + Ok(()) +} diff --git a/codex-rs/app-server/tests/suite/v2/mod.rs b/codex-rs/app-server/tests/suite/v2/mod.rs index 6382fd279a73..d4f8077afb56 100644 --- a/codex-rs/app-server/tests/suite/v2/mod.rs +++ b/codex-rs/app-server/tests/suite/v2/mod.rs @@ -49,6 +49,7 @@ mod connection_handling_websocket; mod connection_handling_websocket_compression; #[cfg(unix)] mod connection_handling_websocket_unix; +mod content_filter; #[path = "critical_path_analytics_tests.rs"] mod critical_path_analytics; #[cfg(unix)] diff --git a/codex-rs/core/src/responses_retry.rs b/codex-rs/core/src/responses_retry.rs index d33caa262d0b..c6f1d6ac1cc0 100644 --- a/codex-rs/core/src/responses_retry.rs +++ b/codex-rs/core/src/responses_retry.rs @@ -159,20 +159,24 @@ pub(crate) async fn handle_response_stream_error( retry_state.retries = retry_count; log_retry(request, turn_context, &err, retry_count, max_retries, delay); - // In release builds, hide the first websocket retry notification to reduce noisy - // transient reconnect messages. In debug builds, keep full visibility for diagnosis. - let report_error = retry_count > 1 + let content_filter = matches!(err.details(), CodexErrorDetails::ContentFilter); + // Content-filter blocks must remain visible even when the next sample recovers. + // In release builds, hide ordinary first websocket reconnects to reduce noise. + let report_error = content_filter + || retry_count > 1 || cfg!(debug_assertions) || !sess.services.model_client.responses_websocket_enabled(); if report_error { // Surface retry information to any UI/front-end so the user understands what is // happening instead of staring at a seemingly frozen screen. - sess.notify_stream_error( - turn_context, - format!("Reconnecting... {retry_count}/{max_retries}"), - err, - ) - .await; + let message = if content_filter { + format!( + "Response blocked by content filter; retrying ({retry_count}/{max_retries})" + ) + } else { + format!("Reconnecting... {retry_count}/{max_retries}") + }; + sess.notify_stream_error(turn_context, message, err).await; } // Use one clock sample so local backoff telemetry retains the selected delay. let now = Instant::now(); diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index b6474e153444..6fad9919d4f8 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -6040,8 +6040,11 @@ impl Session { codex_error: CodexErr, ) { let additional_details = codex_error.to_string(); - let codex_error_info = CodexErrorInfo::ResponseStreamDisconnected { - http_status_code: codex_error.http_status_code_value(), + let codex_error_info = match codex_error.details() { + CodexErrorDetails::ContentFilter => codex_error.to_codex_protocol_error(), + _ => CodexErrorInfo::ResponseStreamDisconnected { + http_status_code: codex_error.http_status_code_value(), + }, }; let event = EventMsg::StreamError(StreamErrorEvent { message: message.into(), diff --git a/codex-rs/ext/guardian-reviewer/src/retry.rs b/codex-rs/ext/guardian-reviewer/src/retry.rs index 819e28c46a88..53e1546afa4f 100644 --- a/codex-rs/ext/guardian-reviewer/src/retry.rs +++ b/codex-rs/ext/guardian-reviewer/src/retry.rs @@ -198,6 +198,7 @@ fn should_retry_guardian_review(outcome: &GuardianReviewOutcome) -> bool { | CodexErrorInfo::SessionBudgetExceeded | CodexErrorInfo::UsageLimitExceeded | CodexErrorInfo::InferenceHookDenied + | CodexErrorInfo::ContentFilter | CodexErrorInfo::CyberPolicy | CodexErrorInfo::BioPolicy | CodexErrorInfo::MisalignmentPolicyViolation diff --git a/codex-rs/protocol/src/codex_error_info.rs b/codex-rs/protocol/src/codex_error_info.rs index 32d4df8802f2..b053e5add27c 100644 --- a/codex-rs/protocol/src/codex_error_info.rs +++ b/codex-rs/protocol/src/codex_error_info.rs @@ -27,6 +27,7 @@ enum CodexErrorInfoWire { /// Capacity is unavailable on a route restricted by server policy. PolicyCapacityUnavailable, InferenceHookDenied, + ContentFilter, CyberPolicy, BioPolicy, MisalignmentPolicyViolation, diff --git a/codex-rs/protocol/src/error.rs b/codex-rs/protocol/src/error.rs index 988454960764..783ace9805ca 100644 --- a/codex-rs/protocol/src/error.rs +++ b/codex-rs/protocol/src/error.rs @@ -573,6 +573,7 @@ impl CodexErr { CodexErrorDetails::PolicyCapacityUnavailable => { CodexErrorInfo::PolicyCapacityUnavailable } + CodexErrorDetails::ContentFilter => CodexErrorInfo::ContentFilter, CodexErrorDetails::FlexUnavailable => CodexErrorInfo::FlexUnavailable, CodexErrorDetails::InferenceHookDenied { .. } => CodexErrorInfo::InferenceHookDenied, CodexErrorDetails::CyberPolicy { .. } => CodexErrorInfo::CyberPolicy, diff --git a/codex-rs/protocol/src/error_tests.rs b/codex-rs/protocol/src/error_tests.rs index 8fb8ae872d24..9b29d2728137 100644 --- a/codex-rs/protocol/src/error_tests.rs +++ b/codex-rs/protocol/src/error_tests.rs @@ -209,6 +209,16 @@ fn usage_limit_reached_error_formats_rate_limit_reached_types() { } } +#[test] +fn content_filter_maps_to_protocol() { + let info = CodexErr::new(CodexErrorDetails::ContentFilter).to_codex_protocol_error(); + assert_eq!( + serde_json::to_value(&info).unwrap(), + serde_json::json!("content_filter") + ); + assert!(info.affects_turn_status()); +} + #[test] fn server_overloaded_maps_to_protocol() { let err = CodexErr::ServerOverloaded; diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs index 97bbc7a561b2..18715ca02e2c 100644 --- a/codex-rs/protocol/src/protocol.rs +++ b/codex-rs/protocol/src/protocol.rs @@ -2114,6 +2114,8 @@ pub enum CodexErrorInfo { PolicyCapacityUnavailable, /// The workspace's inference hook explicitly denied this request. InferenceHookDenied, + /// The provider blocked the response with a content filter. + ContentFilter, CyberPolicy, BioPolicy, MisalignmentPolicyViolation, @@ -2162,6 +2164,7 @@ impl CodexErrorInfo { | Self::ModelNotFound | Self::PolicyCapacityUnavailable | Self::InferenceHookDenied + | Self::ContentFilter | Self::CyberPolicy | Self::BioPolicy | Self::MisalignmentPolicyViolation diff --git a/codex-rs/tui/src/chatwidget/tests/app_server.rs b/codex-rs/tui/src/chatwidget/tests/app_server.rs index c2e61642323f..5c4bf79705d5 100644 --- a/codex-rs/tui/src/chatwidget/tests/app_server.rs +++ b/codex-rs/tui/src/chatwidget/tests/app_server.rs @@ -1958,6 +1958,31 @@ async fn live_app_server_interleaved_flush_repairs_mismatched_completion() { #[tokio::test] async fn live_app_server_stream_recovery_restores_previous_status_header() { + assert_stream_recovery_restores_previous_status_header( + CodexErrorInfo::ResponseStreamDisconnected { + http_status_code: Some(429), + }, + "Reconnecting... 2/5", + "Server is busy, reconnecting 2/5", + ) + .await; +} + +#[tokio::test] +async fn live_app_server_stream_recovery_after_content_filter() { + assert_stream_recovery_restores_previous_status_header( + CodexErrorInfo::ContentFilter, + "Response blocked by content filter; retrying (1/5)", + "Response blocked by content filter; retrying (1/5)", + ) + .await; +} + +async fn assert_stream_recovery_restores_previous_status_header( + error_info: CodexErrorInfo, + message: &str, + expected_status_header: &str, +) { let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; chat.handle_server_notification( @@ -1983,10 +2008,8 @@ async fn live_app_server_stream_recovery_restores_previous_status_header() { ServerNotification::Error(ErrorNotification { error: AppServerTurnError { misalignment: None, - message: "Reconnecting... 2/5".to_string(), - codex_error_info: Some(CodexErrorInfo::ResponseStreamDisconnected { - http_status_code: Some(429), - }), + message: message.to_string(), + codex_error_info: Some(error_info), additional_details: None, }, will_retry: true, @@ -1997,9 +2020,9 @@ async fn live_app_server_stream_recovery_restores_previous_status_header() { ); drain_insert_history(&mut rx); - insta::assert_snapshot!( + assert_eq!( chat.bottom_pane.status_widget().unwrap().header(), - @"Server is busy, reconnecting 2/5" + expected_status_header, ); chat.handle_server_notification( diff --git a/sdk/python/src/openai_codex/generated/v2_all.py b/sdk/python/src/openai_codex/generated/v2_all.py index 93408ed0d5fa..b72d693f5571 100644 --- a/sdk/python/src/openai_codex/generated/v2_all.py +++ b/sdk/python/src/openai_codex/generated/v2_all.py @@ -8672,6 +8672,7 @@ class CodexErrorInfo( RootModel[ CodexErrorInfoValue | Literal["inferenceHookDenied"] + | Literal["contentFilter"] | HttpConnectionFailedCodexErrorInfo | ResponseStreamConnectionFailedCodexErrorInfo | ResponseStreamDisconnectedCodexErrorInfo @@ -8683,6 +8684,7 @@ class CodexErrorInfo( root: Annotated[ CodexErrorInfoValue | Literal["inferenceHookDenied"] + | Literal["contentFilter"] | HttpConnectionFailedCodexErrorInfo | ResponseStreamConnectionFailedCodexErrorInfo | ResponseStreamDisconnectedCodexErrorInfo