From 3c072cf30eda90698c82c584c9112404651e87e0 Mon Sep 17 00:00:00 2001 From: Charles Cunningham Date: Fri, 6 Mar 2026 13:36:39 -0800 Subject: [PATCH] codex: fix CI failures on PR #13096 Co-authored-by: Codex --- codex-rs/app-server-protocol/schema/json/EventMsg.json | 4 ++-- .../schema/json/codex_app_server_protocol.schemas.json | 2 +- .../schema/json/codex_app_server_protocol.v2.schemas.json | 2 +- .../schema/typescript/SessionConfiguredEvent.ts | 2 +- codex-rs/core/src/rollout/metadata.rs | 4 ++-- codex-rs/protocol/src/protocol.rs | 5 +---- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/codex-rs/app-server-protocol/schema/json/EventMsg.json b/codex-rs/app-server-protocol/schema/json/EventMsg.json index 845c5eb482..37fd8f37ca 100644 --- a/codex-rs/app-server-protocol/schema/json/EventMsg.json +++ b/codex-rs/app-server-protocol/schema/json/EventMsg.json @@ -1176,7 +1176,7 @@ "description": "The effort the model is putting into reasoning about the user's request." }, "rollout_path": { - "description": "Path in which the rollout is stored. Can be `None` for ephemeral threads", + "description": "Path in which the rollout is stored. Can be `None` for ephemeral threads.", "type": [ "string", "null" @@ -7276,7 +7276,7 @@ "description": "The effort the model is putting into reasoning about the user's request." }, "rollout_path": { - "description": "Path in which the rollout is stored. Can be `None` for ephemeral threads", + "description": "Path in which the rollout is stored. Can be `None` for ephemeral threads.", "type": [ "string", "null" 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 bc6f0c748b..748b5ddbe2 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 @@ -2527,7 +2527,7 @@ "description": "The effort the model is putting into reasoning about the user's request." }, "rollout_path": { - "description": "Path in which the rollout is stored. Can be `None` for ephemeral threads", + "description": "Path in which the rollout is stored. Can be `None` for ephemeral threads.", "type": [ "string", "null" 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 b67bb447a6..2ff2bd8495 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 @@ -4337,7 +4337,7 @@ "description": "The effort the model is putting into reasoning about the user's request." }, "rollout_path": { - "description": "Path in which the rollout is stored. Can be `None` for ephemeral threads", + "description": "Path in which the rollout is stored. Can be `None` for ephemeral threads.", "type": [ "string", "null" diff --git a/codex-rs/app-server-protocol/schema/typescript/SessionConfiguredEvent.ts b/codex-rs/app-server-protocol/schema/typescript/SessionConfiguredEvent.ts index b4696a0e4c..9d14b4b76d 100644 --- a/codex-rs/app-server-protocol/schema/typescript/SessionConfiguredEvent.ts +++ b/codex-rs/app-server-protocol/schema/typescript/SessionConfiguredEvent.ts @@ -53,6 +53,6 @@ initial_messages: Array | null, */ network_proxy?: SessionNetworkProxyRuntime, /** - * Path in which the rollout is stored. Can be `None` for ephemeral threads + * Path in which the rollout is stored. Can be `None` for ephemeral threads. */ rollout_path: string | null, }; diff --git a/codex-rs/core/src/rollout/metadata.rs b/codex-rs/core/src/rollout/metadata.rs index e0a80c6dd0..799f581399 100644 --- a/codex-rs/core/src/rollout/metadata.rs +++ b/codex-rs/core/src/rollout/metadata.rs @@ -585,7 +585,7 @@ mod tests { } #[tokio::test] - async fn extract_metadata_from_rollout_rejects_unparseable_rollout_with_no_items() { + async fn extract_metadata_from_rollout_rejects_unparsable_rollout_with_no_items() { let dir = tempdir().expect("tempdir"); let uuid = Uuid::new_v4(); let path = dir @@ -597,7 +597,7 @@ mod tests { let err = extract_metadata_from_rollout(&path, "openai", None) .await - .expect_err("unparseable rollout should fail metadata extraction"); + .expect_err("unparsable rollout should fail metadata extraction"); assert_eq!( err.to_string(), format!( diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs index 117fa7aca4..0a80cbae35 100644 --- a/codex-rs/protocol/src/protocol.rs +++ b/codex-rs/protocol/src/protocol.rs @@ -3011,10 +3011,7 @@ pub struct SessionConfiguredEvent { #[ts(optional)] pub network_proxy: Option, - /// Path reserved for this rollout. Can be `None` for ephemeral threads. - /// - /// Fresh non-ephemeral sessions may advertise this path before the rollout file has been - /// materialized on disk. + /// Path in which the rollout is stored. Can be `None` for ephemeral threads. #[serde(skip_serializing_if = "Option::is_none")] pub rollout_path: Option, }