diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs index 1aeb62398..a83607a62 100644 --- a/codex-rs/app-server/src/codex_message_processor.rs +++ b/codex-rs/app-server/src/codex_message_processor.rs @@ -4272,7 +4272,6 @@ mod tests { "cwd": "/", "originator": "codex", "cli_version": "0.0.0", - "instructions": null, "model_provider": "test-provider" }), json!({ diff --git a/codex-rs/app-server/tests/common/rollout.rs b/codex-rs/app-server/tests/common/rollout.rs index 72bc07753..994cdf5ff 100644 --- a/codex-rs/app-server/tests/common/rollout.rs +++ b/codex-rs/app-server/tests/common/rollout.rs @@ -57,7 +57,6 @@ pub fn create_fake_rollout( cwd: PathBuf::from("/"), originator: "codex".to_string(), cli_version: "0.0.0".to_string(), - instructions: None, source: SessionSource::Cli, model_provider: model_provider.map(str::to_string), }; @@ -135,7 +134,6 @@ pub fn create_fake_rollout_with_text_elements( cwd: PathBuf::from("/"), originator: "codex".to_string(), cli_version: "0.0.0".to_string(), - instructions: None, source: SessionSource::Cli, model_provider: model_provider.map(str::to_string), }; diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs index 48c689e64..e3369f822 100644 --- a/codex-rs/core/src/codex.rs +++ b/codex-rs/core/src/codex.rs @@ -598,12 +598,7 @@ impl Session { let conversation_id = ThreadId::default(); ( conversation_id, - RolloutRecorderParams::new( - conversation_id, - forked_from_id, - session_configuration.user_instructions.clone(), - session_source, - ), + RolloutRecorderParams::new(conversation_id, forked_from_id, session_source), ) } InitialHistory::Resumed(resumed_history) => ( diff --git a/codex-rs/core/src/rollout/recorder.rs b/codex-rs/core/src/rollout/recorder.rs index 13eace9f3..1c6503f31 100644 --- a/codex-rs/core/src/rollout/recorder.rs +++ b/codex-rs/core/src/rollout/recorder.rs @@ -58,7 +58,6 @@ pub enum RolloutRecorderParams { Create { conversation_id: ThreadId, forked_from_id: Option, - instructions: Option, source: SessionSource, }, Resume { @@ -81,13 +80,11 @@ impl RolloutRecorderParams { pub fn new( conversation_id: ThreadId, forked_from_id: Option, - instructions: Option, source: SessionSource, ) -> Self { Self::Create { conversation_id, forked_from_id, - instructions, source, } } @@ -162,7 +159,6 @@ impl RolloutRecorder { RolloutRecorderParams::Create { conversation_id, forked_from_id, - instructions, source, } => { let LogFileInfo { @@ -190,7 +186,6 @@ impl RolloutRecorder { cwd: config.cwd.clone(), originator: originator().value, cli_version: env!("CARGO_PKG_VERSION").to_string(), - instructions, source, model_provider: Some(config.model_provider_id.clone()), }), diff --git a/codex-rs/core/src/rollout/tests.rs b/codex-rs/core/src/rollout/tests.rs index 660e83e56..c519c0c70 100644 --- a/codex-rs/core/src/rollout/tests.rs +++ b/codex-rs/core/src/rollout/tests.rs @@ -86,7 +86,6 @@ fn write_session_file_with_provider( let mut payload = serde_json::json!({ "id": uuid, "timestamp": ts_str, - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -202,7 +201,6 @@ async fn test_list_conversations_latest_first() { let head_3 = vec![serde_json::json!({ "id": u3, "timestamp": "2025-01-03T12-00-00", - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -212,7 +210,6 @@ async fn test_list_conversations_latest_first() { let head_2 = vec![serde_json::json!({ "id": u2, "timestamp": "2025-01-02T12-00-00", - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -222,7 +219,6 @@ async fn test_list_conversations_latest_first() { let head_1 = vec![serde_json::json!({ "id": u1, "timestamp": "2025-01-01T12-00-00", - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -343,7 +339,6 @@ async fn test_pagination_cursor() { let head_5 = vec![serde_json::json!({ "id": u5, "timestamp": "2025-03-05T09-00-00", - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -353,7 +348,6 @@ async fn test_pagination_cursor() { let head_4 = vec![serde_json::json!({ "id": u4, "timestamp": "2025-03-04T09-00-00", - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -411,7 +405,6 @@ async fn test_pagination_cursor() { let head_3 = vec![serde_json::json!({ "id": u3, "timestamp": "2025-03-03T09-00-00", - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -421,7 +414,6 @@ async fn test_pagination_cursor() { let head_2 = vec![serde_json::json!({ "id": u2, "timestamp": "2025-03-02T09-00-00", - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -473,7 +465,6 @@ async fn test_pagination_cursor() { let head_1 = vec![serde_json::json!({ "id": u1, "timestamp": "2025-03-01T09-00-00", - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -531,7 +522,6 @@ async fn test_get_thread_contents() { let expected_head = vec![serde_json::json!({ "id": uuid, "timestamp": ts, - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -558,7 +548,6 @@ async fn test_get_thread_contents() { "payload": { "id": uuid, "timestamp": ts, - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", @@ -643,7 +632,6 @@ async fn test_updated_at_uses_file_mtime() -> Result<()> { id: conversation_id, forked_from_id: None, timestamp: ts.to_string(), - instructions: None, cwd: ".".into(), originator: "test_originator".into(), cli_version: "test_version".into(), @@ -751,7 +739,6 @@ async fn test_stable_ordering_same_second_pagination() { vec![serde_json::json!({ "id": u, "timestamp": ts, - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", diff --git a/codex-rs/core/tests/suite/review.rs b/codex-rs/core/tests/suite/review.rs index 0de18438c..e5c980f68 100644 --- a/codex-rs/core/tests/suite/review.rs +++ b/codex-rs/core/tests/suite/review.rs @@ -515,7 +515,6 @@ async fn review_input_isolated_from_parent_history() { "payload": { "id": convo_id, "timestamp": "2024-01-01T00:00:00Z", - "instructions": null, "cwd": ".", "originator": "test_originator", "cli_version": "test_version", diff --git a/codex-rs/core/tests/suite/rollout_list_find.rs b/codex-rs/core/tests/suite/rollout_list_find.rs index 518f26c56..a4213729b 100644 --- a/codex-rs/core/tests/suite/rollout_list_find.rs +++ b/codex-rs/core/tests/suite/rollout_list_find.rs @@ -25,7 +25,6 @@ fn write_minimal_rollout_with_id(codex_home: &Path, id: Uuid) -> PathBuf { "payload": { "id": id, "timestamp": "2024-01-01T00:00:00Z", - "instructions": null, "cwd": ".", "originator": "test", "cli_version": "test", diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs index 29eabe2bf..d5ead442d 100644 --- a/codex-rs/protocol/src/protocol.rs +++ b/codex-rs/protocol/src/protocol.rs @@ -1492,7 +1492,6 @@ pub struct SessionMeta { pub cwd: PathBuf, pub originator: String, pub cli_version: String, - pub instructions: Option, #[serde(default)] pub source: SessionSource, pub model_provider: Option, @@ -1507,7 +1506,6 @@ impl Default for SessionMeta { cwd: PathBuf::new(), originator: String::new(), cli_version: String::new(), - instructions: None, source: SessionSource::default(), model_provider: None, } diff --git a/codex-rs/tui/src/resume_picker.rs b/codex-rs/tui/src/resume_picker.rs index 71d6da453..4ce17721c 100644 --- a/codex-rs/tui/src/resume_picker.rs +++ b/codex-rs/tui/src/resume_picker.rs @@ -1362,7 +1362,6 @@ mod tests { "cwd": cwd, "originator": "user", "cli_version": "0.0.0", - "instructions": null, "source": "Cli", "model_provider": "openai", } diff --git a/codex-rs/tui2/src/resume_picker.rs b/codex-rs/tui2/src/resume_picker.rs index 71d6da453..4ce17721c 100644 --- a/codex-rs/tui2/src/resume_picker.rs +++ b/codex-rs/tui2/src/resume_picker.rs @@ -1362,7 +1362,6 @@ mod tests { "cwd": cwd, "originator": "user", "cli_version": "0.0.0", - "instructions": null, "source": "Cli", "model_provider": "openai", }