From 72ad8747e926daa9a761ec858a99c061e2734a18 Mon Sep 17 00:00:00 2001 From: Benjamin Carlsson Date: Tue, 13 Oct 2026 17:22:00 +0000 Subject: [PATCH 001/155] Render Markdown web links as labels in Rex (#53725) ## What changed Select label-only web link rendering when `TERM_PROGRAM` is `rex`, matched case-insensitively. Preserve the existing visible-destination fallback for multiplexers and `dumb`, `screen`, or `tmux` terminal modes. ## Testing Add a regression test verifying that Rex renders `[label](https://example.com)` with the label-only policy. GitOrigin-RevId: 615ca6186d84fc17cef9286e75848877b542b6ab --- codex-rs/tui/src/markdown_render/web_links.rs | 7 +++++++ .../tui/src/markdown_render/web_links_tests.rs | 15 +++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/codex-rs/tui/src/markdown_render/web_links.rs b/codex-rs/tui/src/markdown_render/web_links.rs index 0ed41d9f3f..773ff4ca51 100644 --- a/codex-rs/tui/src/markdown_render/web_links.rs +++ b/codex-rs/tui/src/markdown_render/web_links.rs @@ -69,6 +69,13 @@ impl WebLinkDisplay { { return Self::WithDestination; } + if terminal + .term_program + .as_deref() + .is_some_and(|program| program.eq_ignore_ascii_case("rex")) + { + return Self::LabelOnly; + } match terminal.name { TerminalName::Ghostty | TerminalName::Iterm2 diff --git a/codex-rs/tui/src/markdown_render/web_links_tests.rs b/codex-rs/tui/src/markdown_render/web_links_tests.rs index 7869cc2715..38eba10d2e 100644 --- a/codex-rs/tui/src/markdown_render/web_links_tests.rs +++ b/codex-rs/tui/src/markdown_render/web_links_tests.rs @@ -143,6 +143,21 @@ fn supporting_terminals_render_only_the_styled_label_and_keep_its_target() { } } +#[test] +fn rex_renders_only_the_label() { + let mut rex = terminal(TerminalName::Unknown); + rex.term_program = Some("rex".to_string()); + let markdown = "[label](https://example.com)"; + assert_eq!( + render( + markdown, + /*width*/ 80, + WebLinkDisplay::for_terminal(&rex, /*term*/ None), + ), + render(markdown, /*width*/ 80, WebLinkDisplay::LabelOnly), + ); +} + #[test] fn unknown_terminals_and_multiplexers_keep_visible_destinations() { let mut tmux = terminal(TerminalName::Ghostty); From 237b7d4323f876237c10c14592525c8bec25b74e Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Tue, 13 Oct 2026 17:33:10 +0000 Subject: [PATCH 002/155] Preserve the remote cwd filter in the in-app resume picker (#53728) ## Why Opening the in-app resume picker created a new app-server session without the active session's remote working directory override, dropping the remote directory filter from the thread list. ## What changed Pass the active session's remote working directory override to the picker session so its `thread/list` request retains the `cwd` filter. ## Testing Add a regression test that opens the in-app picker against a recording remote server and verifies that `thread/list` includes the remote working directory in `cwd`. GitOrigin-RevId: 0073ed77e9d9b0ffdd647fcb9f157d20ea2aa599 --- codex-rs/tui/src/app/session_picker.rs | 2 + .../app/tests/session_lifecycle_requests.rs | 83 +++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/codex-rs/tui/src/app/session_picker.rs b/codex-rs/tui/src/app/session_picker.rs index 9152ac86cd..cfb34ff43c 100644 --- a/codex-rs/tui/src/app/session_picker.rs +++ b/codex-rs/tui/src/app/session_picker.rs @@ -41,6 +41,8 @@ impl App { return Ok(AppRunControl::Continue); } }; + picker_app_server = picker_app_server + .with_remote_cwd_override(app_server.remote_cwd_override().map(Path::to_path_buf)); picker_app_server.model_provider_override = self.harness_overrides.model_provider.clone(); let selection = crate::resume_picker::run_resume_picker_from_existing_session_with_app_server( diff --git a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs index 062efa383d..bca048a4ea 100644 --- a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs +++ b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs @@ -926,6 +926,89 @@ async fn make_history_test_app() -> Result<(Box, tempfile::TempDir)> { Ok((app, codex_home)) } +#[tokio::test] +async fn in_app_remote_resume_picker_preserves_remote_cwd_filter() -> Result<()> { + let (mut app, _codex_home) = make_history_test_app().await?; + let remote_root = tempdir()?; + let remote_cwd = remote_root.path().join("project"); + std::fs::create_dir(&remote_cwd)?; + let (app_server, _requests, active_proxy) = + start_recording_remote_app_server(&app.config).await?; + let mut app_server = app_server.with_remote_cwd_override(Some(remote_cwd.clone())); + app.harness_overrides.model_provider = Some(app.config.model_provider_id.clone()); + + let listener = TcpListener::bind("127.0.0.1:0").await?; + app.app_server_target = AppServerTarget::Remote { + endpoint: crate::resolve_remote_addr(&format!("ws://{}", listener.local_addr()?))?, + }; + let (request_tx, request_rx) = oneshot::channel(); + let (release_tx, release_rx) = oneshot::channel::<()>(); + let codex_home = app.config.codex_home.display().to_string(); + let recorder = tokio::spawn(async move { + let (socket, _) = listener.accept().await?; + let mut websocket = accept_async(socket).await?; + while let Some(frame) = websocket.next().await { + let Message::Text(text) = frame? else { + continue; + }; + match serde_json::from_str::(&text)? { + JSONRPCMessage::Request(request) if request.method == "initialize" => { + let response = JSONRPCMessage::Response(JSONRPCResponse { + id: request.id, + result: serde_json::json!({ + "userAgent": "codex-tui-test", + "codexHome": codex_home, + }), + }); + websocket + .send(Message::Text(serde_json::to_string(&response)?.into())) + .await?; + } + JSONRPCMessage::Request(request) if request.method == "thread/list" => { + let _ = request_tx.send(request.params.unwrap_or_default()); + let _ = release_rx.await; + return Ok::<(), color_eyre::Report>(()); + } + _ => {} + } + } + Err(color_eyre::eyre::eyre!( + "picker disconnected before requesting its thread list" + )) + }); + + let mut tui = crate::tui::test_support::make_test_tui()?; + tui.set_alt_screen_enabled(/*enabled*/ false); + tui.pause_events(); + let mut picker = Box::pin(app.open_resume_picker(&mut tui, &mut app_server)); + let params = tokio::time::timeout(std::time::Duration::from_secs(/*secs*/ 5), async { + tokio::select! { + biased; + params = request_rx => params.map_err(|_| { + color_eyre::eyre::eyre!("picker request recorder closed") + }), + result = &mut picker => { + result?; + Err(color_eyre::eyre::eyre!( + "picker exited before requesting its thread list" + )) + } + } + }) + .await??; + drop(picker); + let _ = release_tx.send(()); + recorder.await??; + app_server.shutdown().await?; + active_proxy.await??; + + assert_eq!( + params["cwd"], + serde_json::Value::String(remote_cwd.display().to_string()) + ); + Ok(()) +} + #[tokio::test] async fn delete_current_thread_navigates_only_after_success() -> Result<()> { let endpoint = crate::resolve_remote_addr("ws://127.0.0.1:4500")?; From efa159f7aa3fcdb23a2f3aaf1f6f1249376bffc7 Mon Sep 17 00:00:00 2001 From: Dan Gillespie <169189814+ethernetdan-openai@users.noreply.github.com> Date: Tue, 13 Oct 2026 17:45:33 +0000 Subject: [PATCH 003/155] Reuse compiled search patterns across compressed rollouts (#53732) ## Why Compressed rollout searches recompiled the same query patterns for every file. ## What changed Lazily compile and reuse the JSON-escaped and content search patterns across each scan, including the fallback scan when `ripgrep` is unavailable. Keep compilation failures within the existing per-file error handling and open files before compiling patterns. ## Testing Add regression coverage verifying that an oversized query does not fail the compressed rollout scan and that a missing file still returns `NotFound` before query compilation. GitOrigin-RevId: 0d41cbca6e1f716fc234c268493d8dd94c34975e --- codex-rs/rollout/src/search.rs | 30 ++++++++++++++++++++++++---- codex-rs/rollout/src/search_tests.rs | 27 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 codex-rs/rollout/src/search_tests.rs diff --git a/codex-rs/rollout/src/search.rs b/codex-rs/rollout/src/search.rs index 77206404e1..c64f2a3310 100644 --- a/codex-rs/rollout/src/search.rs +++ b/codex-rs/rollout/src/search.rs @@ -124,6 +124,7 @@ async fn scan_rollout_matches( let mut matches = HashMap::new(); let mut dirs = vec![root.to_path_buf()]; let json_search_term = case_insensitive_literal_regex(json_search_term)?; + let mut patterns = None; while let Some(dir) = dirs.pop() { let mut entries = match tokio::fs::read_dir(dir).await { @@ -146,7 +147,7 @@ async fn scan_rollout_matches( }; if rollout_file.is_compressed() { if let Some(snippet) = - first_rollout_content_match_snippet(rollout_file.path(), search_term) + first_content_match_snippet(rollout_file.path(), search_term, &mut patterns) .await .unwrap_or_else(|err| { tracing::warn!( @@ -186,10 +187,26 @@ async fn rollout_contains(path: &Path, search_term: &Regex) -> io::Result pub async fn first_rollout_content_match_snippet( path: &Path, search_term: &str, +) -> io::Result> { + first_content_match_snippet(path, search_term, &mut None).await +} + +async fn first_content_match_snippet( + path: &Path, + search_term: &str, + patterns: &mut Option<(Regex, Regex)>, ) -> io::Result> { let lines = compression::open_rollout_line_reader(path).await?; - let json_search_term = case_insensitive_literal_regex(json_escaped_search_term(search_term)?)?; - let search_term = case_insensitive_literal_regex(search_term)?; + // Keep compilation errors inside the caller's per-file error handler. + let (json_search_term, search_term) = match patterns { + Some(patterns) => patterns, + None => patterns.insert(( + case_insensitive_literal_regex(json_escaped_search_term(search_term)?)?, + case_insensitive_literal_regex(search_term)?, + )), + }; + let json_search_term = json_search_term.clone(); + let search_term = search_term.clone(); lines .find_map(move |line| { if json_search_term.is_match(line) { @@ -207,6 +224,7 @@ async fn scan_compressed_rollout_matches( ) -> io::Result { let mut matches = HashMap::new(); let mut dirs = vec![root.to_path_buf()]; + let mut patterns = None; while let Some(dir) = dirs.pop() { let mut entries = match tokio::fs::read_dir(dir).await { @@ -231,7 +249,7 @@ async fn scan_compressed_rollout_matches( continue; } if let Some(snippet) = - first_rollout_content_match_snippet(rollout_file.path(), search_term) + first_content_match_snippet(rollout_file.path(), search_term, &mut patterns) .await .unwrap_or_else(|err| { tracing::warn!( @@ -371,3 +389,7 @@ fn char_end_after(text: &str, byte_index: usize, chars_after: usize) -> usize { .map(|(offset, _)| byte_index.saturating_add(offset)) .unwrap_or(text.len()) } + +#[cfg(test)] +#[path = "search_tests.rs"] +mod tests; diff --git a/codex-rs/rollout/src/search_tests.rs b/codex-rs/rollout/src/search_tests.rs new file mode 100644 index 0000000000..c9925e55e9 --- /dev/null +++ b/codex-rs/rollout/src/search_tests.rs @@ -0,0 +1,27 @@ +//! Regression coverage for rollout search error handling. + +use super::*; +use pretty_assertions::assert_eq; +use tempfile::TempDir; + +#[tokio::test] +async fn compressed_search_preserves_error_handling() -> io::Result<()> { + let root = TempDir::new()?; + let path = root.path().join("rollout-0001.jsonl.zst"); + std::fs::write(&path, zstd::stream::encode_all(&b""[..], 3)?)?; + let query = "a".repeat(500_000); + + assert!(case_insensitive_literal_regex(&query).is_err()); + assert_eq!( + scan_compressed_rollout_matches(root.path(), &query).await?, + RolloutSearchMatches::new() + ); + assert_eq!( + first_rollout_content_match_snippet(&root.path().join("missing.jsonl"), &query) + .await + .unwrap_err() + .kind(), + io::ErrorKind::NotFound + ); + Ok(()) +} From 4d82d36ccf0746b75437d78b874ba4c96ff2cc75 Mon Sep 17 00:00:00 2001 From: felixxia-oai Date: Tue, 13 Oct 2026 17:56:32 +0000 Subject: [PATCH 004/155] Default Guardian v2 async classification to conversation mode (#53733) ## What changed Use `conversation` when neither a local `async_classifier_mode` override nor a model default specifies a mode. Keep `snapshot` available as an explicit override and update the configuration documentation and schema to describe the new fallback. ## Testing Expand configuration tests to cover all local override and model default combinations. Update app-server approval tests to exercise conversation mode without an explicit override, and explicitly select snapshot mode in tests that depend on it. GitOrigin-RevId: a62479a3f6454bf28d589373a236d8b0ab5023b9 --- .../app-server/tests/suite/v2/guardian_v2.rs | 18 ++++++++------ codex-rs/core/config.schema.json | 2 +- ...enarios_guardian_orchestrator_connector.rs | 2 +- .../src/async_scorer/config_tests.rs | 24 ++++++++++++------- .../async_scorer/decisions_lifecycle_tests.rs | 8 +++++-- .../src/async_scorer/extension_tests.rs | 2 +- codex-rs/features/src/feature_configs.rs | 2 +- .../protocol/src/openai_models/guardian_v2.rs | 2 +- 8 files changed, 37 insertions(+), 23 deletions(-) diff --git a/codex-rs/app-server/tests/suite/v2/guardian_v2.rs b/codex-rs/app-server/tests/suite/v2/guardian_v2.rs index 90849f482d..2f77ce8dfb 100644 --- a/codex-rs/app-server/tests/suite/v2/guardian_v2.rs +++ b/codex-rs/app-server/tests/suite/v2/guardian_v2.rs @@ -919,9 +919,12 @@ async fn guardian_v2_routes_scoped_tool_approvals( } else { "prompt" }; - let classifier_mode = match classifier_mode { - codex_protocol::openai_models::AsyncClassifierMode::Snapshot => "snapshot", - codex_protocol::openai_models::AsyncClassifierMode::Conversation => "conversation", + // Exercise the default conversation path and the explicit snapshot rollback. + let classifier_config = match classifier_mode { + codex_protocol::openai_models::AsyncClassifierMode::Snapshot => { + "\nasync_classifier_mode = \"snapshot\"" + } + codex_protocol::openai_models::AsyncClassifierMode::Conversation => "", }; let mut mock_config = MockResponsesConfig::new(&responses_url) .with_model(MODEL) @@ -932,7 +935,7 @@ async fn guardian_v2_routes_scoped_tool_approvals( analytics_server.uri(), )) .with_extra_config(&format!( - "[mcp_servers.{server_name}]\nurl = \"{mcp_server_url}/mcp\"\ndefault_tools_approval_mode = \"{tool_approval_mode}\"\n\n[analytics]\nenabled = true\n\n[otel]\nmetrics_exporter = {{ otlp-http = {{ endpoint = \"{responses_url}/metrics\", protocol = \"json\" }} }}\n\n[features.guardianv2]\nenabled = true\nasync_classifier_mode = \"{classifier_mode}\"{guardian_scope_config}" + "[mcp_servers.{server_name}]\nurl = \"{mcp_server_url}/mcp\"\ndefault_tools_approval_mode = \"{tool_approval_mode}\"\n\n[analytics]\nenabled = true\n\n[otel]\nmetrics_exporter = {{ otlp-http = {{ endpoint = \"{responses_url}/metrics\", protocol = \"json\" }} }}\n\n[features.guardianv2]\nenabled = true{classifier_config}{guardian_scope_config}" )) .enable_feature(Feature::GuardianApproval); if lifecycle.has_user_input() || lifecycle.has_root_user_input() { @@ -1259,7 +1262,8 @@ async fn guardian_v2_routes_scoped_tool_approvals( | ThreadLifecycle::RootUserRestriction | ThreadLifecycle::RootRestrictionDuringClassification ) { - let retention_allowed = classifier_mode == "conversation" + let retention_allowed = classifier_mode + == codex_protocol::openai_models::AsyncClassifierMode::Conversation && !fail_after_classification && !matches!(risk, GuardianRisk::InvalidResponse) && !late_root_restriction; @@ -1553,7 +1557,7 @@ async fn guardian_v2_routes_scoped_tool_approvals( .filter_map(|item| item["id"].as_str()) .filter(|id| id.starts_with("luna-score-message-")) .collect::>(); - if classifier_mode == "conversation" + if classifier_mode == codex_protocol::openai_models::AsyncClassifierMode::Conversation && !fail_after_classification && let Some(latest) = retained_ids.last() { @@ -1907,7 +1911,7 @@ async fn guardian_v2_routes_scoped_tool_approvals( } let post_authorization_change_sample = wait_for_luna_request(responses_state.as_ref(), /*index*/ 2).await?; - if classifier_mode == "conversation" + if classifier_mode == codex_protocol::openai_models::AsyncClassifierMode::Conversation && matches!(lifecycle, ThreadLifecycle::RootUserRestriction) { let input = post_authorization_change_sample["input"] diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.json index 4aba1bab6c..fc22ace946 100644 --- a/codex-rs/core/config.schema.json +++ b/codex-rs/core/config.schema.json @@ -1960,7 +1960,7 @@ "$ref": "#/definitions/AsyncClassifierMode" } ], - "description": "Classifier experiment override. Otherwise use the model default, then snapshots." + "description": "Classifier mode override. Otherwise use the model default, then conversation." }, "classifier_instructions": { "type": "string" diff --git a/codex-rs/core/tests/suite/scenarios_guardian_orchestrator_connector.rs b/codex-rs/core/tests/suite/scenarios_guardian_orchestrator_connector.rs index 545d7b2f45..2f053a57c3 100644 --- a/codex-rs/core/tests/suite/scenarios_guardian_orchestrator_connector.rs +++ b/codex-rs/core/tests/suite/scenarios_guardian_orchestrator_connector.rs @@ -94,7 +94,7 @@ async fn host_owned_orchestrator_connector_reaches_guardian_context() -> Result< .with_pre_build_hook(|home| { std::fs::write( home.join("config.toml"), - "[features.guardianv2]\nenabled = true\n\n[features.guardianv2.review_scope]\ncomputer_use_only = false\n\n[apps._default]\ndefault_tools_approval_mode = \"prompt\"\n", + "[features.guardianv2]\nenabled = true\nasync_classifier_mode = \"snapshot\"\n\n[features.guardianv2.review_scope]\ncomputer_use_only = false\n\n[apps._default]\ndefault_tools_approval_mode = \"prompt\"\n", ) .expect("write Guardian configuration"); }) diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs index 3f4cc73fb8..77543cf4a5 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs @@ -340,17 +340,23 @@ fn classifier_mode_uses_local_override_then_model_default() { ..Default::default() }) .unwrap(); - let defaults = GuardianV2ModelConfig { - async_classifier_mode: Some(AsyncClassifierMode::Conversation), - ..Default::default() - }; - assert_eq!( - config.classifier_mode(Some(&defaults)), - local.unwrap_or(AsyncClassifierMode::Conversation) - ); + for model in [ + None, + Some(AsyncClassifierMode::Snapshot), + Some(AsyncClassifierMode::Conversation), + ] { + let defaults = GuardianV2ModelConfig { + async_classifier_mode: model, + ..Default::default() + }; + assert_eq!( + config.classifier_mode(Some(&defaults)), + local.or(model).unwrap_or(AsyncClassifierMode::Conversation) + ); + } assert_eq!( config.classifier_mode(/*model_defaults*/ None), - local.unwrap_or_default() + local.unwrap_or(AsyncClassifierMode::Conversation) ); } } diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_lifecycle_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_lifecycle_tests.rs index 6c7bb39074..530381a7e0 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_lifecycle_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_lifecycle_tests.rs @@ -17,7 +17,7 @@ async fn decisions_disagreement_failures_and_disabled_flag_preserve_baseline() - ] { let server = responses::start_mock_server().await; let fixture = GuardianFailureFixture::with_config(&format!( - "[features]\nguardianv2_decisions_comparison = {enabled}\n" + "[features]\nguardianv2_decisions_comparison = {enabled}\n[features.guardianv2]\nasync_classifier_mode = \"snapshot\"\n" )) .await?; let test = &fixture.test; @@ -181,7 +181,11 @@ async fn decisions_disagreement_failures_and_disabled_flag_preserve_baseline() - #[tokio::test] async fn guardian_budget_rejects_both_backends_before_sending() -> Result<()> { skip_if_no_network!(Ok(())); - let fixture = GuardianFailureFixture::new().await?; + // This test replaces the snapshot sampler to force the Responses budget failure. + let fixture = GuardianFailureFixture::with_config( + "[features.guardianv2]\nenabled = true\nasync_classifier_mode = \"snapshot\"\n", + ) + .await?; let server = responses::start_mock_server().await; let store = fixture.test.codex.thread_extension_data(); let mut config = fixture.test.config.clone(); diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs index 1cb6c10055..ba624f70e2 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs @@ -2092,7 +2092,7 @@ async fn contributor_samples_tool_calls_with_the_existing_luna_pool() -> Result< conversation_history, r#"{"path":"README.md"}"#, Some(TEST_GUARDIAN_POLICY), - "[features.guardianv2.transcript]\nmax_message_entry_tokens = 100\nmax_message_transcript_tokens = 100\n", + "[features.guardianv2]\nasync_classifier_mode = \"snapshot\"\n[features.guardianv2.transcript]\nmax_message_entry_tokens = 100\nmax_message_transcript_tokens = 100\n", /*model_defaults*/ None, ) .await?; diff --git a/codex-rs/features/src/feature_configs.rs b/codex-rs/features/src/feature_configs.rs index e3ae224609..69d581e957 100644 --- a/codex-rs/features/src/feature_configs.rs +++ b/codex-rs/features/src/feature_configs.rs @@ -152,7 +152,7 @@ pub struct GuardianV2ConfigToml { /// Transcript encoding for synchronous Guardian review and asynchronous scoring. Defaults to line. #[serde(skip_serializing_if = "Option::is_none")] pub transcript_mode: Option, - /// Classifier experiment override. Otherwise use the model default, then snapshots. + /// Classifier mode override. Otherwise use the model default, then conversation. #[serde(skip_serializing_if = "Option::is_none")] pub async_classifier_mode: Option, /// Reset retained async history when the next request exceeds this token estimate. diff --git a/codex-rs/protocol/src/openai_models/guardian_v2.rs b/codex-rs/protocol/src/openai_models/guardian_v2.rs index c13a0dca9b..6a80d8dce2 100644 --- a/codex-rs/protocol/src/openai_models/guardian_v2.rs +++ b/codex-rs/protocol/src/openai_models/guardian_v2.rs @@ -10,8 +10,8 @@ use super::ReasoningEffort; #[serde(rename_all = "snake_case")] #[ts(rename_all = "snake_case")] pub enum AsyncClassifierMode { - #[default] Snapshot, + #[default] Conversation, } From cf0ed4c600161fcaa18eeac02b5fc715e1076955 Mon Sep 17 00:00:00 2001 From: Anthony Tafoya Date: Tue, 13 Oct 2026 18:00:57 +0000 Subject: [PATCH 005/155] Acquire and cache opt-in executor capability inventories via V2 (#53736) ## What changed - Add the disabled-by-default `executor_capability_discovery_v2` feature to acquire `capabilities/discoverV2` inventories from supporting remote executors using each selected environment's working directory and sandbox. - Share snapshots with MCP and world-state contributors and skill providers without activating discovered plugins or publishing discovered skills to the model. - Cache inventories by environment instance, executor session, working directory, and sandbox. Coalesce concurrent requests, refresh the cache at turn start, retry transient failures, and refresh MCP projections after recovery. - Resolve the system skills root in the executor and pass it explicitly to capability location discovery. ## Testing Add coverage for feature gating, unsupported executors, inert inventories, cache reuse and eviction, turn refreshes, failure recovery, executor replacement, and system skill locations. GitOrigin-RevId: 1bdca28fa7f17622b27e2713ab3dcc0c13426889 --- codex-rs/core-plugins/src/provider.rs | 7 +- codex-rs/core/config.schema.json | 6 + codex-rs/core/src/mcp.rs | 4 + codex-rs/core/src/session/mcp.rs | 79 +++ codex-rs/core/src/session/mod.rs | 10 + codex-rs/core/src/session/session.rs | 2 + codex-rs/core/src/session/step_context.rs | 2 + codex-rs/core/src/session/tests.rs | 1 + codex-rs/core/src/session/world_state.rs | 3 + codex-rs/core/src/tasks/mod.rs | 13 + codex-rs/core/src/thread_manager_tests.rs | 3 + .../core/tests/suite/executor_discovery_v2.rs | 596 ++++++++++++++++++ codex-rs/core/tests/suite/mod.rs | 1 + .../exec-server-protocol/src/capabilities.rs | 10 +- .../src/capability_discovery_v2_cache.rs | 121 ++++ .../exec-server/src/client_refresh_tests.rs | 48 +- .../src/discoverV2/capability_locations.rs | 10 +- .../src/discoverV2/capability_manager.rs | 6 +- .../tests/capability_locations_tests.rs | 8 +- .../src/environment/discovery_v2.rs | 8 + codex-rs/exec-server/src/lib.rs | 3 + codex-rs/exec-server/src/server/processor.rs | 10 + .../ext/extension-api/src/contributors/mcp.rs | 13 + .../src/contributors/world_state.rs | 3 + codex-rs/ext/extension-api/tests/registry.rs | 1 + codex-rs/ext/mcp/src/cloud_plugin.rs | 1 + codex-rs/ext/mcp/src/cloud_plugin_tests.rs | 2 + codex-rs/ext/mcp/src/lib_tests.rs | 1 + codex-rs/ext/mcp/tests/plugin_mcp.rs | 6 + codex-rs/ext/skills/src/cloud_cache_tests.rs | 1 + codex-rs/ext/skills/src/cloud_skill.rs | 1 + codex-rs/ext/skills/src/extension.rs | 7 + codex-rs/ext/skills/src/provider.rs | 3 + codex-rs/ext/skills/src/render_tests.rs | 2 + .../ext/skills/src/world_state_catalogs.rs | 6 + .../tests/executor_file_system_authority.rs | 11 + codex-rs/ext/skills/tests/skills_extension.rs | 21 + .../presentation_dedup_tests.rs | 1 + codex-rs/features/src/lib.rs | 8 + 39 files changed, 1027 insertions(+), 12 deletions(-) create mode 100644 codex-rs/core/tests/suite/executor_discovery_v2.rs create mode 100644 codex-rs/exec-server/src/capability_discovery_v2_cache.rs diff --git a/codex-rs/core-plugins/src/provider.rs b/codex-rs/core-plugins/src/provider.rs index e59a9311e6..3ebabcc961 100644 --- a/codex-rs/core-plugins/src/provider.rs +++ b/codex-rs/core-plugins/src/provider.rs @@ -1,19 +1,22 @@ -//! Plugin catalog listing interface and the MCP context used to request snapshots. +//! Plugin catalog listing interface and source inputs used to request snapshots. use crate::ExecutorPluginProviderError; use crate::PluginCatalog; +use codex_exec_server::ExecutorCapabilityDiscoveryV2Snapshot; use codex_mcp::McpResourceClient; use std::future::Future; use std::pin::Pin; use std::sync::Arc; use thiserror::Error; -/// Turn identifiers and MCP client used to request one catalog snapshot. +/// Identifiers, MCP client, and executor inventories used to request one catalog snapshot. #[derive(Clone, Debug)] pub struct PluginListQuery { pub thread_id: String, pub turn_id: String, pub mcp_resources: Option>, + /// Already-acquired V2 inventories; empty for cloud listing. + pub snapshots: Vec, } /// Failure to list plugin metadata. diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.json index fc22ace946..9e8e684394 100644 --- a/codex-rs/core/config.schema.json +++ b/codex-rs/core/config.schema.json @@ -925,6 +925,9 @@ "executor_capability_discovery": { "type": "boolean" }, + "executor_capability_discovery_v2": { + "type": "boolean" + }, "experimental_use_unified_exec_tool": { "type": "boolean" }, @@ -7253,6 +7256,9 @@ "executor_capability_discovery": { "type": "boolean" }, + "executor_capability_discovery_v2": { + "type": "boolean" + }, "experimental_use_unified_exec_tool": { "type": "boolean" }, diff --git a/codex-rs/core/src/mcp.rs b/codex-rs/core/src/mcp.rs index 0eb7bdc3ad..c28e7b86f7 100644 --- a/codex-rs/core/src/mcp.rs +++ b/codex-rs/core/src/mcp.rs @@ -9,6 +9,7 @@ use codex_connectors::ConnectorRuntimeManager; use codex_connectors::PluginConnectorSource; use codex_core_plugins::PluginsManager; use codex_exec_server::ExecutorCapabilityDiscoverySnapshot; +use codex_exec_server::ExecutorCapabilityDiscoveryV2Snapshot; use codex_extension_api::ExtensionData; use codex_extension_api::ExtensionDataInit; use codex_extension_api::ExtensionRegistry; @@ -156,6 +157,7 @@ impl McpManager { .config } + #[allow(clippy::too_many_arguments)] #[tracing::instrument(name = "mcp.runtime_config.project_for_step", skip_all)] pub(crate) async fn runtime_config_for_step( &self, @@ -165,6 +167,7 @@ impl McpManager { identity: McpThreadIdentity<'_>, ready_selected_capability_roots: &[SelectedCapabilityRoot], executor_capability_discovery: Option<&ExecutorCapabilityDiscoverySnapshot>, + executor_capability_discovery_v2: Option<&[ExecutorCapabilityDiscoveryV2Snapshot]>, ) -> McpRuntimeProjection { let mut context = McpServerContributionContext::for_step( config, @@ -173,6 +176,7 @@ impl McpManager { identity.originator, ready_selected_capability_roots, executor_capability_discovery, + executor_capability_discovery_v2, ) .with_session_source(identity.session_source) .with_auth_changed(identity.auth_changed); diff --git a/codex-rs/core/src/session/mcp.rs b/codex-rs/core/src/session/mcp.rs index d2599a4d5c..4b00bfd292 100644 --- a/codex-rs/core/src/session/mcp.rs +++ b/codex-rs/core/src/session/mcp.rs @@ -3,8 +3,11 @@ use super::*; use crate::environment_selection::TurnEnvironmentSnapshot; use crate::environment_selection::combine_selected_capability_roots; use crate::mcp_tool_call::McpToolApprovalContext; +use codex_exec_server::DiscoverV2CapabilitiesRequest; use codex_exec_server::ExecutorCapabilityDiscoveryCache; use codex_exec_server::ExecutorCapabilityDiscoverySnapshot; +use codex_exec_server::ExecutorCapabilityDiscoveryV2Cache; +use codex_exec_server::ExecutorCapabilityDiscoveryV2Snapshot; use codex_exec_server::MAX_SELECTED_CAPABILITY_ROOTS; use codex_exec_server::ResolvedSelectedCapabilityRoot; use codex_mcp::CODEX_APPS_MCP_SERVER_NAME; @@ -122,6 +125,9 @@ impl Session { .await; let ready_selected_capability_roots = Self::ready_selected_capability_roots(&selected_capability_roots); + let executor_capability_discovery_v2 = self + .executor_capability_discovery_for_step_v2(config, &environments) + .await; let executor_capability_discovery = self .executor_capability_discovery_for_step( config, @@ -147,6 +153,7 @@ impl Session { }, &ready_selected_capability_roots, executor_capability_discovery.as_deref(), + executor_capability_discovery_v2.as_deref(), ) .await; let mcp_config = self @@ -229,6 +236,9 @@ impl Session { .await; let ready_selected_capability_roots = Self::ready_selected_capability_roots(&selected_capability_roots); + let executor_capability_discovery_v2 = self + .executor_capability_discovery_for_step_v2(&desired.config, &desired.environments) + .await; let executor_capability_discovery = self .executor_capability_discovery_for_step( &desired.config, @@ -255,6 +265,7 @@ impl Session { }, &ready_selected_capability_roots, executor_capability_discovery.as_deref(), + executor_capability_discovery_v2.as_deref(), ) .await; self.publish_mcp_runtime( @@ -302,6 +313,9 @@ impl Session { .await; let ready_selected_capability_roots = Self::ready_selected_capability_roots(&selected_capability_roots); + let executor_capability_discovery_v2 = self + .executor_capability_discovery_for_step_v2(&desired.config, &desired.environments) + .await; let executor_capability_discovery = self .executor_capability_discovery_for_step( &desired.config, @@ -328,6 +342,7 @@ impl Session { }, &ready_selected_capability_roots, executor_capability_discovery.as_deref(), + executor_capability_discovery_v2.as_deref(), ) .await; let mcp_projection = self @@ -499,6 +514,66 @@ impl Session { Some(Arc::new(discovery)) } + /// Acquires V2 inventories from the thread's current cache. + pub(super) async fn executor_capability_discovery_for_step_v2( + &self, + config: &Config, + environments: &TurnEnvironmentSnapshot, + ) -> Option> { + if !config + .features + .enabled(Feature::ExecutorCapabilityDiscoveryV2) + { + return None; + } + // Retain this cache if a new turn replaces the thread's current cache. + let cache = self + .services + .thread_extension_data + .get_or_init(ExecutorCapabilityDiscoveryV2Cache::default); + let remote_environment_count = environments + .turn_environments() + .filter(|selected| selected.environment.is_remote()) + .count(); + cache.ensure_capacity(remote_environment_count); + let mut snapshots = Vec::new(); + for selected in environments.turn_environments() { + if !selected.environment.is_remote() { + continue; + } + let environment_id = &selected.selection.environment_id; + let info = match selected.environment.info().await { + Ok(info) => info, + Err(_) => { + tracing::warn!( + environment_id, + "could not read executor discovery V2 support" + ); + continue; + } + }; + if !info.capabilities.capability_discovery_v2 { + continue; + } + let request = DiscoverV2CapabilitiesRequest { + cwd: selected.cwd().clone(), + sandbox: Some(selected.sandbox_context(/*additional_permissions*/ None)), + }; + let result = cache + .discover(environment_id, &selected.environment, request) + .await; + snapshots.push(ExecutorCapabilityDiscoveryV2Snapshot { + environment_id: environment_id.clone(), + result, + }); + } + if cache.take_recovered_discovery() { + // Refresh MCP after discovery recovers. + self.mark_mcp_runtime_dirty(); + } + Some(snapshots) + } + pub(crate) async fn resolve_selected_capability_roots_for_step( &self, environments: &TurnEnvironmentSnapshot, @@ -715,6 +790,9 @@ impl Session { let environments = self.services.turn_environments.snapshot().await; let environment_selections = environments.all_selections(); let desired = self.latest_mcp_desired_state(auth, environments).await; + let executor_capability_discovery_v2 = self + .executor_capability_discovery_for_step_v2(&desired.config, &desired.environments) + .await; let executor_capability_discovery = self .executor_capability_discovery_for_step( &desired.config, @@ -741,6 +819,7 @@ impl Session { }, &ready_selected_capability_roots, executor_capability_discovery.as_deref(), + executor_capability_discovery_v2.as_deref(), ) .await; self.publish_mcp_runtime( diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index 0424f1adca..2cb1657a5d 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -3923,6 +3923,9 @@ impl Session { .await; let ready_selected_capability_roots = Self::ready_selected_capability_roots(&selected_capability_roots); + let executor_capability_discovery_v2 = self + .executor_capability_discovery_for_step_v2(&turn_context.config, &environments) + .await; let executor_capability_discovery = self .executor_capability_discovery_for_step( &turn_context.config, @@ -3932,6 +3935,9 @@ impl Session { .await; let extension_data = codex_extension_api::ExtensionData::new(turn_context.sub_id.clone()); + if let Some(snapshots) = &executor_capability_discovery_v2 { + extension_data.insert(snapshots.clone()); + } if let Some(messages) = settings .model_info .model_messages @@ -3969,6 +3975,7 @@ impl Session { &turn_context.originator, &ready_selected_capability_roots, executor_capability_discovery.as_deref(), + executor_capability_discovery_v2.as_deref(), ) .with_session_source(&turn_context.session_source) .with_selected_environments(&environments.all_selections()), @@ -3990,6 +3997,7 @@ impl Session { Ok::<_, CodexErr>(( selected_capability_roots, executor_capability_discovery, + executor_capability_discovery_v2, mcp, tool_router, extension_data, @@ -4005,6 +4013,7 @@ impl Session { let ( selected_capability_roots, executor_capability_discovery, + executor_capability_discovery_v2, mcp, tool_router, extension_data, @@ -4024,6 +4033,7 @@ impl Session { selected_capability_roots, executor_capability_discovery, extension_data, + executor_capability_discovery_v2, mcp, tool_router, loaded_agents_md, diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rs index a617d9367b..725f213d2b 100644 --- a/codex-rs/core/src/session/session.rs +++ b/codex-rs/core/src/session/session.rs @@ -1208,6 +1208,7 @@ impl Session { }, /*ready_selected_capability_roots*/ &[], /*executor_capability_discovery*/ None, + /*executor_capability_discovery_v2*/ None, ) .await; (auth, mcp_projection) @@ -1931,6 +1932,7 @@ impl Session { }, /*ready_selected_capability_roots*/ &[], /*executor_capability_discovery*/ None, + /*executor_capability_discovery_v2*/ None, ) .await } else { diff --git a/codex-rs/core/src/session/step_context.rs b/codex-rs/core/src/session/step_context.rs index a426437014..d90a02044e 100644 --- a/codex-rs/core/src/session/step_context.rs +++ b/codex-rs/core/src/session/step_context.rs @@ -11,6 +11,7 @@ use crate::session::turn_context::TurnContext; use crate::session::turn_context::TurnEnvironment; use crate::tools::router::ToolRouter; use codex_exec_server::ExecutorCapabilityDiscoverySnapshot; +use codex_exec_server::ExecutorCapabilityDiscoveryV2Snapshot; use codex_exec_server::ResolvedSelectedCapabilityRoot; use codex_extension_api::ExtensionData; use codex_file_system::EnvironmentAccess; @@ -40,6 +41,7 @@ pub(crate) struct StepContext { pub(crate) executor_capability_discovery: Option>, /// Keeps the extension inputs used to build this step's tools for its World State as well. pub(crate) extension_data: ExtensionData, + pub(crate) executor_capability_discovery_v2: Option>, /// The exact MCP connections, configuration, and catalog captured for this step. pub(crate) mcp: Arc, /// The finalized tool plan advertised and executed for this exact sampling request. diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index 2cde379539..e0370838c6 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -292,6 +292,7 @@ impl StepContext { selected_capability_roots: Vec::new(), executor_capability_discovery: None, extension_data: codex_extension_api::ExtensionData::new(turn.sub_id.clone()), + executor_capability_discovery_v2: None, mcp: Arc::new(codex_mcp::McpBinding::empty(mcp_config_for_test( &turn.config, ))), diff --git a/codex-rs/core/src/session/world_state.rs b/codex-rs/core/src/session/world_state.rs index 37dda837fc..9d59defb79 100644 --- a/codex-rs/core/src/session/world_state.rs +++ b/codex-rs/core/src/session/world_state.rs @@ -335,6 +335,9 @@ impl Session { for contributor in self.services.extensions.context_contributors() { for section in contributor .contribute_world_state(WorldStateContributionInput { + executor_capability_discovery_v2: step_context + .executor_capability_discovery_v2 + .as_deref(), thread_id: self.thread_id(), turn_id: turn_context.sub_id.as_str(), model_info: &step_context.settings.model_info, diff --git a/codex-rs/core/src/tasks/mod.rs b/codex-rs/core/src/tasks/mod.rs index 5612045b97..6a3e95ee80 100644 --- a/codex-rs/core/src/tasks/mod.rs +++ b/codex-rs/core/src/tasks/mod.rs @@ -9,6 +9,7 @@ use std::time::Duration; use std::time::Instant; use codex_diagnostics::Gauge; +use codex_exec_server::ExecutorCapabilityDiscoveryV2Cache; use codex_extension_api::ThreadIdleCause; use futures::future::BoxFuture; use tokio::select; @@ -290,6 +291,18 @@ impl Session { input: Vec, task: T, ) { + // Replace the cache; in-flight acquisitions retain their previous Arc. + self.services + .thread_extension_data + .insert(ExecutorCapabilityDiscoveryV2Cache::default()); + if turn_context + .config + .features + .enabled(Feature::ExecutorCapabilityDiscoveryV2) + { + // MCP contributors must project the new inventory even if their other inputs match. + self.request_mcp_runtime_reprojection(); + } self.activate_plugin_selection(&turn_context).await; // Inherited or recovered roots are applied before task start. Otherwise this // task owns its turn, including background work. Later mail cannot change it. diff --git a/codex-rs/core/src/thread_manager_tests.rs b/codex-rs/core/src/thread_manager_tests.rs index df585fa7d9..0c2d6dc6c2 100644 --- a/codex-rs/core/src/thread_manager_tests.rs +++ b/codex-rs/core/src/thread_manager_tests.rs @@ -1779,6 +1779,7 @@ async fn start_thread_seeds_extension_data_for_mcp_and_lifecycle_contributors() }, /*ready_selected_capability_roots*/ &[], /*executor_capability_discovery*/ None, + /*executor_capability_discovery_v2*/ None, ) .await; let second_session = &second_thread.thread.session; @@ -1801,6 +1802,7 @@ async fn start_thread_seeds_extension_data_for_mcp_and_lifecycle_contributors() }, /*ready_selected_capability_roots*/ &[], /*executor_capability_discovery*/ None, + /*executor_capability_discovery_v2*/ None, ) .await; @@ -1917,6 +1919,7 @@ async fn start_thread_seeds_extension_data_for_mcp_and_lifecycle_contributors() }, /*ready_selected_capability_roots*/ &[], /*executor_capability_discovery*/ None, + /*executor_capability_discovery_v2*/ None, ) .await; assert_eq!( diff --git a/codex-rs/core/tests/suite/executor_discovery_v2.rs b/codex-rs/core/tests/suite/executor_discovery_v2.rs new file mode 100644 index 0000000000..f8e278ec56 --- /dev/null +++ b/codex-rs/core/tests/suite/executor_discovery_v2.rs @@ -0,0 +1,596 @@ +//! Verifies gated, inert V2 acquisition and cache reuse across Core turns and idle callers. + +use anyhow::Context; +use anyhow::Result; +use codex_core::config::Config; +use codex_core::windows_sandbox::WindowsSandboxLevelExt; +use codex_exec_server::ExecutorCapabilityDiscoveryV2Snapshot; +use codex_exec_server::HttpRequestBodyDeltaNotification; +use codex_exec_server::HttpRequestParams; +use codex_extension_api::ExtensionFuture; +use codex_extension_api::ExtensionRegistryBuilder; +use codex_extension_api::McpServerContribution; +use codex_extension_api::McpServerContributionContext; +use codex_extension_api::McpServerContributor; +use codex_features::Feature; +use codex_protocol::config_types::WindowsSandboxLevel; +use core_test_support::responses; +use core_test_support::skip_if_no_network; +use core_test_support::test_codex::test_codex; +use futures::SinkExt; +use futures::StreamExt; +use pretty_assertions::assert_eq; +use serde_json::Value; +use serde_json::json; +use std::sync::Arc; +use std::sync::atomic::AtomicUsize; +use std::sync::atomic::Ordering; +use tokio::net::TcpListener; +use tokio::sync::Mutex; +use tokio_tungstenite::accept_async; +use tokio_tungstenite::tungstenite::Message; +use tokio_util::task::AbortOnDropHandle; + +struct DiscoveryRecorder { + snapshots: Arc>>, +} + +impl McpServerContributor for DiscoveryRecorder { + fn id(&self) -> &'static str { + "discovery-recorder" + } + + fn contribute<'a>( + &'a self, + context: McpServerContributionContext<'a, Config>, + ) -> ExtensionFuture<'a, Vec> { + Box::pin(async move { + let selected_roots = context + .ready_selected_capability_roots() + .unwrap_or_default(); + if !selected_roots.is_empty() { + let legacy = context.executor_capability_discovery(); + assert_eq!( + legacy.map(|snapshot| snapshot.roots().len()), + Some(selected_roots.len()) + ); + assert!(legacy.is_some_and(|snapshot| { + snapshot.roots().iter().all(|root| root.result.is_ok()) + })); + } + if let Some(snapshots) = context.executor_capability_discovery_v2() { + self.snapshots.lock().await.extend_from_slice(snapshots); + } + Vec::new() + }) + } +} + +struct Executor { + url: String, + requests: Arc>>, + _task: AbortOnDropHandle>, +} + +#[derive(Clone, Copy)] +enum DiscoveryFailure { + None, + Server, + Disconnect, +} + +impl Executor { + async fn start(supports_v2: bool, failure: DiscoveryFailure) -> Result { + let listener = TcpListener::bind("127.0.0.1:0").await?; + let url = format!("ws://{}", listener.local_addr()?); + let requests = Arc::new(Mutex::new(Vec::new())); + let recorded = Arc::clone(&requests); + let discovery_attempts = Arc::new(AtomicUsize::new(0)); + let http = codex_exec_server::Environment::create_for_tests(/*exec_server_url*/ None)? + .get_http_client(); + let task = tokio::spawn(async move { + let mut connections = tokio::task::JoinSet::new(); + while let Ok((stream, _)) = listener.accept().await { + let recorded = Arc::clone(&recorded); + let discovery_attempts = Arc::clone(&discovery_attempts); + let http = Arc::clone(&http); + connections.spawn(async move { + let mut socket = accept_async(stream).await?; + while let Some(Ok(message)) = socket.next().await { + let request: Value = match message { + Message::Text(text) => serde_json::from_str(&text)?, + Message::Binary(bytes) => serde_json::from_slice(&bytes)?, + Message::Close(_) => break, + _ => continue, + }; + if request.get("id").is_none() { continue; } + recorded.lock().await.push(request.clone()); + if request["method"] == "http/request" { + let params: HttpRequestParams = serde_json::from_value(request["params"].clone())?; + let request_id = params.request_id.clone(); + let streaming = params.stream_response; + let mut response = http.http_request(params).await?; + let delta = streaming.then(|| HttpRequestBodyDeltaNotification { + request_id, seq: 1, + delta: std::mem::replace(&mut response.body, Vec::new().into()), + done: true, error: None, + }); + socket.send(Message::Text(json!({"id":request["id"],"result":response}).to_string().into())).await?; + if let Some(delta) = delta { + socket.send(Message::Text(json!({"method":"http/request/bodyDelta","params":delta}).to_string().into())).await?; + } + continue; + } + if request["method"] == "capabilities/discoverV2" { + let attempt = discovery_attempts.fetch_add(1, Ordering::Relaxed); + match failure { + // Exhaust the environment's one transport replay so the cache sees Err. + DiscoveryFailure::Disconnect if attempt < 2 => break, + DiscoveryFailure::Server if attempt == 0 => { + socket.send(Message::Text(json!({"id":request["id"],"error":{"code":-32004,"message":"fixture discovery failure"}}).to_string().into())).await?; + continue; + } + DiscoveryFailure::None | DiscoveryFailure::Server | DiscoveryFailure::Disconnect => {} + } + } + let result = match request["method"].as_str() { + Some("initialize") => Some(json!({"sessionId":"acquisition-only", "environmentInfo": { + "shell":{"name":"bash","path":"/bin/bash"}, + "capabilities":{"sandboxedFileStreaming":true,"capabilityDiscoveryV2":supports_v2} + }})), + Some("environment/info") => Some(json!({ + "shell":{"name":"bash","path":"/bin/bash"}, + "capabilities":{"sandboxedFileStreaming":true,"capabilityDiscoveryV2":supports_v2} + })), + Some("capabilityRoots/discoverV1") => Some(json!({ + "roots": request["params"]["roots"].as_array().context("V1 roots")? + .iter().map(|root| json!({"id":root["id"],"path":root["path"]})).collect::>() + })), + Some("capabilities/discoverV2") => Some(json!({ + "plugins":[{"id":"inert-sentinel@market","remotePluginId":null, + "version":"1","root":"file:///inert-sentinel", + "files":{"manifest":{"path":"file:///inert-sentinel/.codex-plugin/plugin.json", + "contents":"{\"name\":\"inert-sentinel\",\"mcpServers\":{\"inert-sentinel\":{\"command\":\"never-run\"}}}"}, + "mcpConfig":null,"appsConfig":null},"skills":[]}], + "skills":[{"name":"inert-sentinel","description":"must not enter the prompt", + "shortDescription":null,"path":"file:///inert-sentinel/SKILL.md","metadata":null}], + "warnings":[] + })), + Some("fs/canonicalize") => Some(json!({"path":request["params"]["path"]})), + Some("fs/walk") => Some(json!({"entries":[],"errors":[],"truncated":false})), + _ => None, + }; + let response = match result { + Some(result) => json!({"id":request["id"],"result":result}), + None => json!({"id":request["id"],"error":{"code":-32004,"message":"fixture discovery failure"}}), + }; + if socket.send(Message::Text(response.to_string().into())).await.is_err() { break; } + } + anyhow::Ok(()) + }); + } + anyhow::Ok(()) + }); + Ok(Self { + url, + requests, + _task: AbortOnDropHandle::new(task), + }) + } +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn flag_off_never_requests_v2() -> Result<()> { + check_acquisition(/*enabled*/ false, /*supported*/ true).await +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn v2_inventory_reaches_mcp_projection_without_loading_skills() -> Result<()> { + check_acquisition(/*enabled*/ true, /*supported*/ true).await +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn unsupported_executor_keeps_existing_behavior() -> Result<()> { + check_acquisition(/*enabled*/ true, /*supported*/ false).await +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn discovery_failures_retry_or_remain_cached_by_error_kind() -> Result<()> { + skip_if_no_network!(Ok(())); + for failure in [DiscoveryFailure::Server, DiscoveryFailure::Disconnect] { + let executor = Executor::start(/*supports_v2*/ true, failure).await?; + let manager = codex_exec_server::EnvironmentManager::create_for_tests( + Some(executor.url.clone()), + /*local_runtime_paths*/ None, + ) + .await; + let environment = manager + .default_environment() + .context("remote environment")?; + let cache = codex_exec_server::ExecutorCapabilityDiscoveryV2Cache::default(); + let request = codex_exec_server::DiscoverV2CapabilitiesRequest { + cwd: codex_utils_path_uri::PathUri::parse("file:///repo")?, + sandbox: None, + }; + assert!( + cache + .discover("executor", &environment, request.clone()) + .await + .is_err() + ); + assert!(!cache.take_recovered_discovery()); + let (first, concurrent) = tokio::join!( + cache.discover("executor", &environment, request.clone()), + cache.discover("executor", &environment, request.clone()), + ); + let expected_calls = match failure { + DiscoveryFailure::Server => { + assert!(first.is_err()); + assert!(concurrent.is_err()); + let next_turn = codex_exec_server::ExecutorCapabilityDiscoveryV2Cache::default(); + next_turn + .discover("executor", &environment, request.clone()) + .await + .map_err(anyhow::Error::msg)?; + assert!(!next_turn.take_recovered_discovery()); + assert!(!cache.take_recovered_discovery()); + 2 + } + DiscoveryFailure::Disconnect => { + let first = first.map_err(anyhow::Error::msg)?; + let concurrent = concurrent.map_err(anyhow::Error::msg)?; + assert!(Arc::ptr_eq(&first, &concurrent)); + assert!(cache.take_recovered_discovery()); + assert!(!cache.take_recovered_discovery()); + let reused = cache + .discover("executor", &environment, request.clone()) + .await + .map_err(anyhow::Error::msg)?; + assert!(Arc::ptr_eq(&first, &reused)); + assert!(!cache.take_recovered_discovery()); + // Two disconnected attempts, then one shared successful retry in the same cache. + 3 + } + DiscoveryFailure::None => unreachable!("the test only exercises failures"), + }; + assert_eq!( + executor + .requests + .lock() + .await + .iter() + .filter(|request| request["method"] == "capabilities/discoverV2") + .count(), + expected_calls, + ); + } + Ok(()) +} + +async fn check_acquisition(enabled: bool, supported: bool) -> Result<()> { + skip_if_no_network!(Ok(())); + let executor = Executor::start(supported, DiscoveryFailure::None).await?; + let model = responses::start_mock_server().await; + let observed = Arc::new(Mutex::new(Vec::new())); + let mut extensions = ExtensionRegistryBuilder::new(); + let recorder = Arc::new(DiscoveryRecorder { + snapshots: Arc::clone(&observed), + }); + extensions.mcp_server_contributor(recorder); + let test = test_codex() + .with_extensions(Arc::new(extensions.build())) + .with_exec_server_url(executor.url.clone()) + .with_config(move |config| { + config.update_plan_enabled = true; + assert!( + config + .features + .enable(Feature::ExecutorCapabilityDiscovery) + .is_ok() + ); + if enabled { + assert!( + config + .features + .enable(Feature::ExecutorCapabilityDiscoveryV2) + .is_ok() + ); + } + }) + .build_with_auto_env(&model) + .await?; + let calls = || async { + executor + .requests + .lock() + .await + .iter() + .filter(|request| request["method"] == "capabilities/discoverV2") + .count() + }; + let acquires_v2 = enabled && supported; + if acquires_v2 { + observed.lock().await.clear(); + let _ = test.codex.current_mcp_config_and_runtime_context().await; + let initial_calls = calls().await; + let _ = test.codex.current_mcp_config_and_runtime_context().await; + assert!(initial_calls > 0); + assert_eq!( + calls().await, + initial_calls, + "idle acquisitions reuse the cache" + ); + let observed = observed.lock().await; + assert!(!observed.is_empty()); + assert!(observed.iter().all(|snapshot| snapshot.result.is_ok())); + } + let initial_calls = calls().await; + let mut selection = test.executor_environment().selection().clone(); + selection.environment_id = codex_exec_server::REMOTE_ENVIRONMENT_ID.to_string(); + let cwd = selection.cwd.clone(); + selection.workspace_roots = vec![cwd.clone()]; + selection.config = + codex_protocol::protocol::EnvironmentConfigState::Ready(codex_core::EnvironmentConfig { + allow_login_shell: false, + workspace_roots: selection.workspace_roots.clone(), + permission_profile: codex_protocol::models::PermissionProfileSnapshot::legacy( + test.config.permissions.permission_profile().clone(), + ), + shell_environment_policy: Default::default(), + windows_sandbox_level: WindowsSandboxLevel::from_config(&test.config), + windows_sandbox_type: test.config.permissions.windows_sandbox_type, + use_legacy_landlock: test.config.features.use_legacy_landlock(), + exec_policy: None, + mcp_policy: None, + network_policy: None, + selected_capability_roots: vec![codex_protocol::capabilities::SelectedCapabilityRoot { + id: "legacy-root".to_string(), + location: codex_protocol::capabilities::CapabilityRootLocation::Environment { + environment_id: selection.environment_id.clone(), + path: cwd.clone(), + }, + }], + }); + // Only the successful lifecycle case needs two turns and multiple model steps. + let turns = if acquires_v2 { 2 } else { 1 }; + let mut previous_inventory = None; + for turn in 0..turns { + observed.lock().await.clear(); + let before_turn = calls().await; + let mut bodies = Vec::new(); + if acquires_v2 { + bodies.push(responses::sse(vec![ + responses::ev_response_created("plan"), + responses::ev_function_call( + "plan-call", + "update_plan", + r#"{"plan":[{"step":"Say hello","status":"completed"}]}"#, + ), + responses::ev_completed("plan"), + ])); + } + bodies.push(responses::sse(vec![ + responses::ev_response_created("response"), + responses::ev_completed("response"), + ])); + let mut responses = Vec::new(); + for body in bodies { + responses.push(responses::mount_sse_once(&model, body).await); + } + test.submit_turn_with_environments("Say hello.", Some(vec![selection.clone()])) + .await?; + let model_requests = responses + .iter() + .flat_map(core_test_support::responses::ResponseMock::requests) + .collect::>(); + assert_eq!(model_requests.len(), if acquires_v2 { 2 } else { 1 }); + for request in model_requests { + assert!(!request.body_json().to_string().contains("inert-sentinel")); + } + let turn_calls = calls().await; + if acquires_v2 { + assert!( + turn_calls > before_turn, + "a new turn must acquire fresh inventory" + ); + if turn > 0 { + assert_eq!( + turn_calls, + before_turn + 1, + "steps share the new turn's cache" + ); + } + let observed = observed.lock().await; + let inventory = observed + .last() + .context("ordinary turn must project its V2 inventory into MCP")? + .result + .as_ref() + .map_err(|error| anyhow::anyhow!("{error}"))?; + assert_eq!( + inventory.plugins.first().context("inert plugin")?.id, + "inert-sentinel@market" + ); + if let Some(previous) = &previous_inventory { + assert!( + !Arc::ptr_eq(previous, inventory), + "MCP contributors must receive the new turn's inventory" + ); + } + previous_inventory = Some(Arc::clone(inventory)); + } else { + assert_eq!(turn_calls, 0); + assert!(observed.lock().await.is_empty()); + } + } + let requests = executor.requests.lock().await.clone(); + assert!( + requests + .iter() + .any(|request| request["method"] == "capabilityRoots/discoverV1") + ); + let discovery = requests + .iter() + .filter(|request| request["method"] == "capabilities/discoverV2") + .collect::>(); + for request in discovery.iter().skip(initial_calls) { + assert_eq!(request["params"]["cwd"], json!(cwd)); + } + for request in discovery { + assert!(request["params"]["sandbox"].is_object()); + } + Ok(()) +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn discovery_cache_coalesces_requests_and_separates_cwds_sandboxes_and_executors() +-> Result<()> { + skip_if_no_network!(Ok(())); + let root = tempfile::tempdir()?; + let executor = Executor::start(/*supports_v2*/ true, DiscoveryFailure::None).await?; + let manager = codex_exec_server::EnvironmentManager::create_for_tests( + Some(executor.url.clone()), + /*local_runtime_paths*/ None, + ) + .await; + let environment = manager + .default_environment() + .context("remote environment")?; + let cache = codex_exec_server::ExecutorCapabilityDiscoveryV2Cache::default(); + let request = codex_exec_server::DiscoverV2CapabilitiesRequest { + cwd: codex_utils_path_uri::PathUri::from_host_native_path(root.path())?, + sandbox: None, + }; + let calls = || async { + executor + .requests + .lock() + .await + .iter() + .filter(|request| request["method"] == "capabilities/discoverV2") + .count() + }; + assert_eq!( + calls().await, + 0, + "creating a cache must not request discovery" + ); + let (first, concurrent) = tokio::join!( + cache.discover("executor", &environment, request.clone()), + cache.discover("executor", &environment, request.clone()), + ); + let first = first.map_err(anyhow::Error::msg)?; + assert!(Arc::ptr_eq( + &first, + &concurrent.map_err(anyhow::Error::msg)? + )); + assert_eq!(calls().await, 1); + let restricted = codex_exec_server::DiscoverV2CapabilitiesRequest { + sandbox: Some( + codex_exec_server::FileSystemSandboxContext::from_legacy_sandbox_policy( + codex_protocol::protocol::SandboxPolicy::new_read_only_policy(), + request.cwd.clone(), + )?, + ), + ..request.clone() + }; + cache + .discover("executor", &environment, restricted) + .await + .map_err(anyhow::Error::msg)?; + let original = cache + .discover("executor", &environment, request.clone()) + .await + .map_err(anyhow::Error::msg)?; + assert!(Arc::ptr_eq(&first, &original)); + assert_eq!(calls().await, 2); + cache + .discover( + "executor", + &environment, + codex_exec_server::DiscoverV2CapabilitiesRequest { + cwd: request.cwd.join("other")?, + ..request.clone() + }, + ) + .await + .map_err(anyhow::Error::msg)?; + assert_eq!( + calls().await, + 3, + "another cwd must not reuse the same inventory" + ); + let other = cache + .discover("other-executor", &environment, request.clone()) + .await + .map_err(anyhow::Error::msg)?; + assert!(Arc::ptr_eq(&first, &other)); + assert_eq!(calls().await, 3); + let replacement_manager = codex_exec_server::EnvironmentManager::create_for_tests( + Some(executor.url.clone()), + /*local_runtime_paths*/ None, + ) + .await; + let replacement = replacement_manager + .default_environment() + .context("replacement environment")?; + cache + .discover("executor", &replacement, request.clone()) + .await + .map_err(anyhow::Error::msg)?; + assert_eq!(calls().await, 4); + let other_reused = cache + .discover("other-executor", &environment, request.clone()) + .await + .map_err(anyhow::Error::msg)?; + assert!(Arc::ptr_eq(&other, &other_reused)); + assert_eq!( + calls().await, + 4, + "a new environment instance must not invalidate the original instance" + ); + + // Four entries remain; reserve enough capacity for a selection larger than 16. + cache.ensure_capacity(/*minimum*/ 17); + for index in 0..13 { + cache + .discover( + "executor", + &environment, + codex_exec_server::DiscoverV2CapabilitiesRequest { + cwd: request.cwd.join(&format!("context-{index}"))?, + ..request.clone() + }, + ) + .await + .map_err(anyhow::Error::msg)?; + } + let oldest = cache + .discover("other-executor", &environment, request.clone()) + .await + .map_err(anyhow::Error::msg)?; + assert!(Arc::ptr_eq(&other, &oldest)); + assert_eq!(calls().await, 17); + + cache + .discover( + "executor", + &environment, + codex_exec_server::DiscoverV2CapabilitiesRequest { + cwd: request.cwd.join("overflow")?, + ..request.clone() + }, + ) + .await + .map_err(anyhow::Error::msg)?; + // Reading the oldest entry did not promote it: eviction is FIFO, not LRU. + let reloaded = cache + .discover("other-executor", &environment, request) + .await + .map_err(anyhow::Error::msg)?; + assert_eq!(calls().await, 19); + assert!(!Arc::ptr_eq(&other, &reloaded)); + assert_eq!(other.as_ref(), reloaded.as_ref()); + + Ok(()) +} diff --git a/codex-rs/core/tests/suite/mod.rs b/codex-rs/core/tests/suite/mod.rs index dccb224dbc..bc2f075304 100644 --- a/codex-rs/core/tests/suite/mod.rs +++ b/codex-rs/core/tests/suite/mod.rs @@ -257,5 +257,6 @@ mod window_headers; mod workspace_roots; mod worktree_trust; +mod executor_discovery_v2; #[path = "guardian_sender_messages_tests.rs"] mod guardian_sender_messages; diff --git a/codex-rs/exec-server-protocol/src/capabilities.rs b/codex-rs/exec-server-protocol/src/capabilities.rs index 2583b9f25f..3adb4538f8 100644 --- a/codex-rs/exec-server-protocol/src/capabilities.rs +++ b/codex-rs/exec-server-protocol/src/capabilities.rs @@ -5,13 +5,21 @@ use codex_utils_path_uri::PathUri; use serde::Deserialize; use serde::Serialize; use std::fmt; +use std::sync::Arc; use crate::CapabilityTextFile; use crate::DiscoveredPluginFiles; pub const CAPABILITIES_DISCOVER_V2_METHOD: &str = "capabilities/discoverV2"; -/// Discovers installed capabilities on the executor. +/// Caller-bound discovery result shared by capability consumers within a model step. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct ExecutorCapabilityDiscoveryV2Snapshot { + pub environment_id: String, + pub result: Result, String>, +} + +/// Discover installed capabilities for a thread, without client-supplied installation paths. #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct DiscoverV2CapabilitiesRequest { diff --git a/codex-rs/exec-server/src/capability_discovery_v2_cache.rs b/codex-rs/exec-server/src/capability_discovery_v2_cache.rs new file mode 100644 index 0000000000..c8e7d6eda1 --- /dev/null +++ b/codex-rs/exec-server/src/capability_discovery_v2_cache.rs @@ -0,0 +1,121 @@ +//! Bounded lazy V2 responses, cached per environment, executor session, cwd, and sandbox. +//! Reports recovery from retryable failures so Core can refresh dependent MCP projections. + +use std::sync::Arc; +use std::sync::Weak; +use std::sync::atomic::AtomicBool; +use std::sync::atomic::AtomicUsize; +use std::sync::atomic::Ordering; + +use tokio::sync::Mutex; +use tokio::sync::OnceCell; + +use crate::DiscoverV2CapabilitiesRequest; +use crate::DiscoverV2CapabilitiesResponse; +use crate::Environment; + +const MIN_CACHED_DISCOVERY_CONTEXTS: usize = 16; + +/// Shared by turn and idle consumers; Core replaces its current cache at each turn start. +#[derive(Default)] +pub struct ExecutorCapabilityDiscoveryV2Cache { + entries: Mutex>>, + capacity: AtomicUsize, + recovered_discovery: AtomicBool, +} + +struct CachedEnvironmentDiscovery { + request: DiscoverV2CapabilitiesRequest, + environment: Weak, + session_id: Option, + response: OnceCell, String>>, + retryable: Arc, +} + +impl ExecutorCapabilityDiscoveryV2Cache { + /// Fits a complete environment selection; never shrinks until the cache is replaced. + pub fn ensure_capacity(&self, minimum: usize) { + self.capacity.fetch_max(minimum, Ordering::Relaxed); + } + + /// Reports whether a failed discovery recovered since the last observation. + pub fn take_recovered_discovery(&self) -> bool { + self.recovered_discovery.swap(false, Ordering::AcqRel) + } + + /// Reuses successes and non-retryable failures using V1's error classification. + /// Retryable failures and cancelled loads leave the cell available for retry. + pub async fn discover( + &self, + environment_id: &str, + environment: &Arc, + request: DiscoverV2CapabilitiesRequest, + ) -> Result, String> { + // Resolve startup/replacement before lookup; a resumed session keeps its cache entries. + let session_id = environment.executor_session_id().await.map_err(|_| { + tracing::warn!(environment_id, "executor discovery V2 session unavailable"); + "executor discovery V2 failed".to_string() + })?; + let entry = { + let mut entries = self.entries.lock().await; + let environment = Arc::downgrade(environment); + if let Some(entry) = entries.iter().find(|entry| { + entry.environment.ptr_eq(&environment) + && entry.session_id == session_id + && entry.request == request + }) { + Arc::clone(entry) + } else { + // Recovery belongs to the environment/request, not one executor session. + let retryable = entries + .iter() + .find(|entry| { + entry.environment.ptr_eq(&environment) && entry.request == request + }) + .map(|entry| Arc::clone(&entry.retryable)) + .unwrap_or_default(); + let entry = Arc::new(CachedEnvironmentDiscovery { + request: request.clone(), + environment, + session_id, + response: OnceCell::new(), + retryable, + }); + let capacity = self + .capacity + .load(Ordering::Relaxed) + .max(MIN_CACHED_DISCOVERY_CONTEXTS); + if entries.len() == capacity { + // Evict the oldest context (FIFO). In-flight requests retain their own Arc. + entries.remove(0); + } + entries.push(Arc::clone(&entry)); + entry + } + }; + let response = entry + .response + .get_or_try_init(|| async { + match environment.discover_capabilities_v2(request).await { + Ok(response) => Ok(Ok(Arc::new(response))), + Err(error) => { + let retryable = crate::client::can_retry_connection_attempt(&error); + tracing::warn!(environment_id, "executor discovery V2 failed"); + let error = "executor discovery V2 failed".to_string(); + if retryable { + entry.retryable.store(true, Ordering::Release); + Err(error) + } else { + Ok(Err(error)) + } + } + } + }) + .await? + .clone(); + if response.is_ok() && entry.retryable.swap(false, Ordering::AcqRel) { + self.recovered_discovery.store(true, Ordering::Release); + } + response + } +} diff --git a/codex-rs/exec-server/src/client_refresh_tests.rs b/codex-rs/exec-server/src/client_refresh_tests.rs index 5e391a602a..ac79cb8c40 100644 --- a/codex-rs/exec-server/src/client_refresh_tests.rs +++ b/codex-rs/exec-server/src/client_refresh_tests.rs @@ -20,6 +20,7 @@ use super::*; use crate::ExecServerRuntimeOptions; use crate::NoiseChannelIdentity; use crate::ProcessId; +use crate::discover_v2::capability_locations::tests as location_fixtures; use crate::noise_relay::stream_handler::NoiseOutboundMessage; use crate::noise_relay::stream_handler::NoiseStreamConnection; use crate::noise_relay::stream_handler::NoiseStreamHandler; @@ -285,14 +286,57 @@ async fn refresh_cancels_old_recovery_and_connects_without_resuming_old_session( #[tokio::test] async fn refresh_retires_a_still_connected_old_executor() -> Result<()> { let _clock = freeze_clock(); + let directory = tempfile::tempdir()?; + let root = directory.path().canonicalize()?; + for name in ["old", "new"] { + location_fixtures::write( + &root.join(name), + &format!("codex/skills/{name}/SKILL.md"), + &format!("---\nname: {name}\ndescription: {name} executor\n---\n"), + )?; + } let old = Executor::start(Validator::default()).await?; let new = Executor::start(Validator::default()).await?; + old.processor + .seed_capability_locations(location_fixtures::request(&root.join("old"))?) + .await?; + new.processor + .seed_capability_locations(location_fixtures::request(&root.join("new"))?) + .await?; let (client, registry) = old.client()?; let original = client.get().await?; + let environment = Arc::new(crate::Environment::remote_with_client( + client.clone(), + /*local_runtime_paths*/ None, + ScopedSkillsConfig::default(), + )); + let cache = crate::ExecutorCapabilityDiscoveryV2Cache::default(); + let request = crate::DiscoverV2CapabilitiesRequest { + cwd: codex_utils_path_uri::PathUri::from_host_native_path(&root)?, + sandbox: None, + }; + let inventory = cache + .discover("environment", &environment, request.clone()) + .await + .map_err(anyhow::Error::msg)?; + assert!(inventory.skills.iter().any(|skill| skill.name == "old")); + environment.refresh_connection().await?; + let reused = cache + .discover("environment", &environment, request.clone()) + .await + .map_err(anyhow::Error::msg)?; + assert!(Arc::ptr_eq(&inventory, &reused)); *registry.target.lock().unwrap() = new.target.clone(); - client.refresh_connection().await?; + environment.refresh_connection().await?; assert!(original.is_disconnected()); assert_ne!(original.session_id(), client.get().await?.session_id()); + let refreshed = cache + .discover("environment", &environment, request) + .await + .map_err(anyhow::Error::msg)?; + assert!(!Arc::ptr_eq(&inventory, &refreshed)); + assert!(refreshed.skills.iter().any(|skill| skill.name == "new")); + assert!(!refreshed.skills.iter().any(|skill| skill.name == "old")); Ok(()) } @@ -375,6 +419,7 @@ async fn registration_renewal_recovers_the_session_and_running_process() -> Resu ); let original = client.get().await?; let session_id = original.session_id(); + assert_eq!(environment.executor_session_id().await?, session_id); let process = original .start_process( @@ -421,6 +466,7 @@ async fn registration_renewal_recovers_the_session_and_running_process() -> Resu let recovered = client.get().await?; assert!(Arc::ptr_eq(&original.inner, &recovered.inner)); assert_eq!(recovered.session_id(), session_id); + assert_eq!(environment.executor_session_id().await?, session_id); assert_eq!( process.write(b"after-renewal\n".to_vec()).await?.status, crate::protocol::WriteStatus::Accepted diff --git a/codex-rs/exec-server/src/discoverV2/capability_locations.rs b/codex-rs/exec-server/src/discoverV2/capability_locations.rs index 5f5a397400..12c443af94 100644 --- a/codex-rs/exec-server/src/discoverV2/capability_locations.rs +++ b/codex-rs/exec-server/src/discoverV2/capability_locations.rs @@ -8,7 +8,6 @@ use std::io; use crate::LocalFileSystem; use crate::protocol::FsOpenMode; -use codex_config::loader::system_config_toml_file; use codex_file_system::ExecutorFileSystem; use codex_file_system::WalkEntryKind; use codex_file_system::WalkOptions; @@ -24,11 +23,12 @@ use codex_core_plugin_common::installed::parse_remote_plugin_id; use codex_core_plugin_common::plugin_id::PluginId; use tokio::io::AsyncReadExt; -/// Home paths are supplied by the executor, not read from the sandbox helper's sanitized env. +/// Fixed paths are supplied by the executor, not read from the sandbox helper's sanitized env. #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub(crate) struct CapabilityLocationRequest { pub codex_home: PathUri, pub user_home: Option, + pub system_skills_root: Option, } const MAX_LOCATIONS: usize = 512; @@ -73,8 +73,8 @@ pub(crate) async fn prewarm_locations( if let Some(home) = user_home { skill_roots.push(home.join(AGENTS_SKILLS_SUFFIX)); } - if let Some(system_root) = system_config_toml_file()?.parent() { - skill_roots.push(system_root.join("skills")); + if let Some(system_root) = &request.system_skills_root { + skill_roots.push(system_root.to_abs_path()?); } CandidateCapabilityLocations::resolve( fs, @@ -211,4 +211,4 @@ async fn read_remote_plugin_id(path: &std::path::Path) -> io::Result, ) -> io::Result<&(CapabilityLocationRequest, CapabilityLocations)> { @@ -66,6 +67,9 @@ impl CapabilityManager { codex_home: PathUri::from_abs_path(&codex_utils_home_dir::find_codex_home()?), user_home: dirs::home_dir() .and_then(|home| PathUri::from_host_native_path(home).ok()), + system_skills_root: system_config_toml_file()? + .parent() + .map(|root| PathUri::from_abs_path(&root.join("skills"))), }; let locations = prewarm_locations(&self.file_system, &request).await?; Ok::<_, io::Error>((request, locations)) diff --git a/codex-rs/exec-server/src/discoverV2/tests/capability_locations_tests.rs b/codex-rs/exec-server/src/discoverV2/tests/capability_locations_tests.rs index 5f6ce6b8fa..280b1b60ba 100644 --- a/codex-rs/exec-server/src/discoverV2/tests/capability_locations_tests.rs +++ b/codex-rs/exec-server/src/discoverV2/tests/capability_locations_tests.rs @@ -14,12 +14,15 @@ use crate::LocalFileSystem; pub(crate) const MANIFEST: &str = r#"{"name":"demo","version":"1.10.0"}"#; pub(crate) fn request(root: &Path) -> anyhow::Result { - for path in ["codex", "home", "project"] { + for path in ["codex", "home", "project", "etc/codex"] { std::fs::create_dir_all(root.join(path))?; } Ok(CapabilityLocationRequest { codex_home: PathUri::from_host_native_path(root.join("codex"))?, user_home: Some(PathUri::from_host_native_path(root.join("home"))?), + system_skills_root: Some(PathUri::from_host_native_path( + root.join("etc/codex/skills"), + )?), }) } @@ -42,6 +45,7 @@ async fn prewarming_resolves_global_locations_without_cwd_or_config() -> anyhow: for root in [ "codex/skills", "home/.agents/skills", + "etc/codex/skills", "project/.agents/skills", ] { write(temp.path(), &format!("{root}/demo/SKILL.md"), "unparsed")?; @@ -69,7 +73,7 @@ async fn prewarming_resolves_global_locations_without_cwd_or_config() -> anyhow: remote_plugin_id: Some("plugins~demo".to_string()), }), }]; - for root in ["codex/skills", "home/.agents/skills"] { + for root in ["codex/skills", "home/.agents/skills", "etc/codex/skills"] { expected.push(CapabilityLocation { root: PathUri::from_host_native_path(temp.path().join(root))?, plugin: None, diff --git a/codex-rs/exec-server/src/environment/discovery_v2.rs b/codex-rs/exec-server/src/environment/discovery_v2.rs index ec927bae8c..71daf0e3c4 100644 --- a/codex-rs/exec-server/src/environment/discovery_v2.rs +++ b/codex-rs/exec-server/src/environment/discovery_v2.rs @@ -6,6 +6,14 @@ use crate::DiscoverV2CapabilitiesResponse; use crate::ExecServerError; impl Environment { + /// Identifies the initialized executor session; transport recovery preserves this ID. + pub(crate) async fn executor_session_id(&self) -> Result, ExecServerError> { + match &self.remote_client { + Some(client) => Ok(client.get().await?.session_id()), + None => Ok(None), + } + } + /// Returns metadata for the caller's cwd from the remote session's V2 lifecycle. /// Local environments and older executors retain the V1 selected-root API. pub async fn discover_capabilities_v2( diff --git a/codex-rs/exec-server/src/lib.rs b/codex-rs/exec-server/src/lib.rs index adca2b271c..93d7c98fbd 100644 --- a/codex-rs/exec-server/src/lib.rs +++ b/codex-rs/exec-server/src/lib.rs @@ -1,6 +1,7 @@ mod arg0_exec_helper; mod capability_discovery; mod capability_discovery_cache; +mod capability_discovery_v2_cache; mod client; mod client_api; mod client_error; @@ -71,6 +72,7 @@ pub use arg0_exec_helper::main as run_arg0_exec_helper_main; pub use capability_discovery::CapabilityDiscoveryError; pub use capability_discovery::discover_capability_roots; pub use capability_discovery_cache::ExecutorCapabilityDiscoveryCache; +pub use capability_discovery_v2_cache::ExecutorCapabilityDiscoveryV2Cache; pub use client::ExecServerClient; pub use client::ExecServerError; pub use client::http_client::HttpResponseBodyStream; @@ -178,6 +180,7 @@ pub use protocol::ExecResponse; pub use protocol::ExecServerNetworkPolicyDecision; pub use protocol::ExecServerNetworkPolicyRequest; pub use protocol::ExecServerNetworkProtocol; +pub use protocol::ExecutorCapabilityDiscoveryV2Snapshot; pub use protocol::ExecutorPlugin; pub use protocol::ExecutorSkill; pub use protocol::FsCanonicalizeParams; diff --git a/codex-rs/exec-server/src/server/processor.rs b/codex-rs/exec-server/src/server/processor.rs index 0db3bc38a3..b708ce32c4 100644 --- a/codex-rs/exec-server/src/server/processor.rs +++ b/codex-rs/exec-server/src/server/processor.rs @@ -327,6 +327,16 @@ mod tests { use crate::server::session_registry::SessionRegistry; impl super::ConnectionProcessor { + // Discovery tests supply fixture homes without changing the process environment. + pub(crate) async fn seed_capability_locations( + &self, + request: crate::discover_v2::capability_locations::CapabilityLocationRequest, + ) -> std::io::Result<()> { + self.capability_manager + .seed_prewarmed_locations(request) + .await + } + // Connection-only tests do not prewarm or scan the real user home. pub(crate) fn new(runtime_paths: ExecServerRuntimeOptions) -> Self { let telemetry = crate::ExecServerTelemetry::default(); diff --git a/codex-rs/ext/extension-api/src/contributors/mcp.rs b/codex-rs/ext/extension-api/src/contributors/mcp.rs index 699048ddee..bec685a921 100644 --- a/codex-rs/ext/extension-api/src/contributors/mcp.rs +++ b/codex-rs/ext/extension-api/src/contributors/mcp.rs @@ -1,5 +1,6 @@ use codex_config::McpServerConfig; use codex_exec_server_protocol::ExecutorCapabilityDiscoverySnapshot; +use codex_exec_server_protocol::ExecutorCapabilityDiscoveryV2Snapshot; use codex_protocol::capabilities::SelectedCapabilityRoot; use codex_protocol::protocol::SessionSource; use codex_protocol::protocol::TurnEnvironmentSelection; @@ -32,6 +33,8 @@ pub struct McpServerContributionContext<'a, C> { ready_selected_capability_roots: Option<&'a [SelectedCapabilityRoot]>, /// Executor-materialized capability files shared by all consumers in this exact step. executor_capability_discovery: Option<&'a ExecutorCapabilityDiscoverySnapshot>, + /// V2 inventories supplied by the host for this contribution. + executor_capability_discovery_v2: Option<&'a [ExecutorCapabilityDiscoveryV2Snapshot]>, } impl Clone for McpServerContributionContext<'_, C> { @@ -55,6 +58,7 @@ impl<'a, C> McpServerContributionContext<'a, C> { selected_environments: None, ready_selected_capability_roots: None, executor_capability_discovery: None, + executor_capability_discovery_v2: None, } } @@ -66,6 +70,7 @@ impl<'a, C> McpServerContributionContext<'a, C> { originator: &'a str, ready_selected_capability_roots: &'a [SelectedCapabilityRoot], executor_capability_discovery: Option<&'a ExecutorCapabilityDiscoverySnapshot>, + executor_capability_discovery_v2: Option<&'a [ExecutorCapabilityDiscoveryV2Snapshot]>, ) -> Self { Self { config, @@ -77,6 +82,7 @@ impl<'a, C> McpServerContributionContext<'a, C> { selected_environments: None, ready_selected_capability_roots: Some(ready_selected_capability_roots), executor_capability_discovery, + executor_capability_discovery_v2, } } @@ -145,6 +151,13 @@ impl<'a, C> McpServerContributionContext<'a, C> { self.ready_selected_capability_roots } + /// Returns the V2 inventories supplied by the host, when available. + pub fn executor_capability_discovery_v2( + &self, + ) -> Option<&'a [ExecutorCapabilityDiscoveryV2Snapshot]> { + self.executor_capability_discovery_v2 + } + /// Returns the executor-materialized capability files for this model step, when enabled. pub fn executor_capability_discovery(&self) -> Option<&'a ExecutorCapabilityDiscoverySnapshot> { self.executor_capability_discovery diff --git a/codex-rs/ext/extension-api/src/contributors/world_state.rs b/codex-rs/ext/extension-api/src/contributors/world_state.rs index f5571bb8d8..19dbb91001 100644 --- a/codex-rs/ext/extension-api/src/contributors/world_state.rs +++ b/codex-rs/ext/extension-api/src/contributors/world_state.rs @@ -1,6 +1,7 @@ use std::sync::Arc; use codex_exec_server_protocol::ExecutorCapabilityDiscoverySnapshot; +use codex_exec_server_protocol::ExecutorCapabilityDiscoveryV2Snapshot; use codex_protocol::ThreadId; use codex_protocol::capabilities::SelectedCapabilityRoot; use codex_protocol::openai_models::ModelInfo; @@ -21,6 +22,8 @@ pub struct WorldStateContributionInput<'a> { pub ready_selected_capability_roots: &'a [SelectedCapabilityRoot], /// Executor-materialized capability files shared by all consumers in this exact step. pub executor_capability_discovery: Option<&'a ExecutorCapabilityDiscoverySnapshot>, + /// Opted-in executor inventories captured for this exact step. + pub executor_capability_discovery_v2: Option<&'a [ExecutorCapabilityDiscoveryV2Snapshot]>, /// Metrics bound to the captured model for this sampling step. pub extension_metrics: Option>, pub session_store: &'a ExtensionData, diff --git a/codex-rs/ext/extension-api/tests/registry.rs b/codex-rs/ext/extension-api/tests/registry.rs index a54c83108c..8b35456b87 100644 --- a/codex-rs/ext/extension-api/tests/registry.rs +++ b/codex-rs/ext/extension-api/tests/registry.rs @@ -59,6 +59,7 @@ fn mcp_contribution_context_identifies_the_running_thread() { "codex_work_cca", &[], /*executor_capability_discovery*/ None, + /*executor_capability_discovery_v2*/ None, ) .with_session_source(&session_source); diff --git a/codex-rs/ext/mcp/src/cloud_plugin.rs b/codex-rs/ext/mcp/src/cloud_plugin.rs index 2d10b403d2..9cabe53f4b 100644 --- a/codex-rs/ext/mcp/src/cloud_plugin.rs +++ b/codex-rs/ext/mcp/src/cloud_plugin.rs @@ -102,6 +102,7 @@ impl TurnLifecycleContributor for PluginContributor { thread_id: input.thread_store.level_id().to_string(), turn_id: input.turn_id.to_string(), mcp_resources: resources.map(Arc::new), + snapshots: Vec::new(), }) .await { diff --git a/codex-rs/ext/mcp/src/cloud_plugin_tests.rs b/codex-rs/ext/mcp/src/cloud_plugin_tests.rs index dac29686f2..385d59b7c9 100644 --- a/codex-rs/ext/mcp/src/cloud_plugin_tests.rs +++ b/codex-rs/ext/mcp/src/cloud_plugin_tests.rs @@ -169,6 +169,7 @@ async fn disabling_plugins_clears_cloud_catalog_and_skips_discovery() -> anyhow: "test", &[], /*executor_capability_discovery*/ None, + /*executor_capability_discovery_v2*/ None, )) .await; if let Some(state) = thread.get::() { @@ -235,6 +236,7 @@ async fn account_change_clears_hosted_plugins_before_waiting_for_executor() -> a let init = codex_extension_api::ExtensionDataInit::default(); let context = McpServerContributionContext::for_step( &config, &init, &thread, "test", &roots, /*executor_capability_discovery*/ None, + /*executor_capability_discovery_v2*/ None, ) .with_auth_changed(/*auth_changed*/ true); let mut loading = std::pin::pin!(contributor.selected_plugins(context, &config.plugins)); diff --git a/codex-rs/ext/mcp/src/lib_tests.rs b/codex-rs/ext/mcp/src/lib_tests.rs index a6c526acf5..6ce1f07f04 100644 --- a/codex-rs/ext/mcp/src/lib_tests.rs +++ b/codex-rs/ext/mcp/src/lib_tests.rs @@ -29,6 +29,7 @@ async fn hosted_plugin_runtime_forwards_thread_originator() -> Result<(), Box TestResu "test_originator", &selected_roots, discovery.as_ref(), + /*executor_capability_discovery_v2*/ None, ), &config.plugins, ) @@ -661,6 +662,10 @@ async fn raw_selected_plugin_contributions( None }; + let v2 = [codex_exec_server::ExecutorCapabilityDiscoveryV2Snapshot { + environment_id: LOCAL_ENVIRONMENT_ID.to_string(), + result: Err("V2 must not change existing contributions".to_string()), + }]; let selected = registry.mcp_server_contributors()[0] .selected_plugins( McpServerContributionContext::for_step( @@ -670,6 +675,7 @@ async fn raw_selected_plugin_contributions( "test_originator", &selected_capability_roots, executor_capability_discovery.as_ref(), + Some(&v2), ), &config.plugins, ) diff --git a/codex-rs/ext/skills/src/cloud_cache_tests.rs b/codex-rs/ext/skills/src/cloud_cache_tests.rs index 5844dc4c4b..de05327814 100644 --- a/codex-rs/ext/skills/src/cloud_cache_tests.rs +++ b/codex-rs/ext/skills/src/cloud_cache_tests.rs @@ -89,6 +89,7 @@ fn query(client: Option>) -> SkillListQuery { include_cloud_skills: true, mcp_resources: client, executor_capability_discovery: None, + executor_capability_discovery_v2: Vec::new(), } } diff --git a/codex-rs/ext/skills/src/cloud_skill.rs b/codex-rs/ext/skills/src/cloud_skill.rs index 6adbefbae2..3f491e769f 100644 --- a/codex-rs/ext/skills/src/cloud_skill.rs +++ b/codex-rs/ext/skills/src/cloud_skill.rs @@ -53,6 +53,7 @@ impl TurnLifecycleContributor for SkillsExtension { .get::() .and_then(|state| state.mcp_resources.clone()), executor_capability_discovery: None, + executor_capability_discovery_v2: Vec::new(), }; if let Err(error) = state.refresh_cloud_catalog(&self.providers, query).await { self.emit_warning( diff --git a/codex-rs/ext/skills/src/extension.rs b/codex-rs/ext/skills/src/extension.rs index 2e85c98cea..c38a9d82df 100644 --- a/codex-rs/ext/skills/src/extension.rs +++ b/codex-rs/ext/skills/src/extension.rs @@ -4,6 +4,7 @@ use crate::HostSkillsSnapshot; use crate::InjectedHostSkillPrompts; use codex_analytics::InvocationType; use codex_exec_server::ExecutorCapabilityDiscoverySnapshot; +use codex_exec_server::ExecutorCapabilityDiscoveryV2Snapshot; use codex_exec_server::LOCAL_ENVIRONMENT_ID; use codex_exec_server::ResolvedSelectedCapabilityRoot; use codex_extension_api::ConfigContributor; @@ -210,6 +211,7 @@ where .get::() .and_then(|state| state.mcp_resources.clone()), executor_capability_discovery: None, + executor_capability_discovery_v2: Vec::new(), }, &thread_state, ) @@ -308,6 +310,10 @@ where executor_capability_discovery: step_store .get::() .map(|discovery| discovery.as_ref().clone()), + executor_capability_discovery_v2: step_store + .get::>() + .map(|discovery| discovery.as_ref().clone()) + .unwrap_or_default(), }); self.build_skill_tools( session_store, @@ -382,6 +388,7 @@ where include_cloud_skills: thread_state.cloud_skill_enabled(), mcp_resources: mcp_resources.clone(), executor_capability_discovery: None, + executor_capability_discovery_v2: Vec::new(), }; let mut catalog = turn_store .get::() diff --git a/codex-rs/ext/skills/src/provider.rs b/codex-rs/ext/skills/src/provider.rs index c2a1210cdb..0532c51a02 100644 --- a/codex-rs/ext/skills/src/provider.rs +++ b/codex-rs/ext/skills/src/provider.rs @@ -8,6 +8,7 @@ mod host; use crate::HostSkillsSnapshot; use codex_exec_server::EnvironmentAccess; use codex_exec_server::ExecutorCapabilityDiscoverySnapshot; +use codex_exec_server::ExecutorCapabilityDiscoveryV2Snapshot; use codex_exec_server::ResolvedSelectedCapabilityRoot; use codex_mcp::McpResourceClient; use codex_protocol::capabilities::SelectedCapabilityRoot; @@ -38,6 +39,8 @@ pub struct SkillListQuery { pub mcp_resources: Option>, /// Present only when the opt-in high-level executor discovery path is selected. pub executor_capability_discovery: Option, + /// Inert V2 inventories; empty when none were supplied. Existing discovery is unchanged. + pub executor_capability_discovery_v2: Vec, } /// A skill read with the source access supplied by its callback. diff --git a/codex-rs/ext/skills/src/render_tests.rs b/codex-rs/ext/skills/src/render_tests.rs index 58aa7ae014..fa67d777c6 100644 --- a/codex-rs/ext/skills/src/render_tests.rs +++ b/codex-rs/ext/skills/src/render_tests.rs @@ -547,6 +547,7 @@ async fn host_alias_roots_follow_core_discovery_order() -> Result<(), Box>(); @@ -915,6 +916,7 @@ async fn singleton_plugin_versions_share_the_marketplace_alias_root() include_cloud_skills: false, mcp_resources: None, executor_capability_discovery: None, + executor_capability_discovery_v2: Vec::new(), }) .await?; let entries = catalog.entries.iter().collect::>(); diff --git a/codex-rs/ext/skills/src/world_state_catalogs.rs b/codex-rs/ext/skills/src/world_state_catalogs.rs index 944f3b4467..8950896060 100644 --- a/codex-rs/ext/skills/src/world_state_catalogs.rs +++ b/codex-rs/ext/skills/src/world_state_catalogs.rs @@ -168,6 +168,11 @@ impl<'a> CatalogContext<'a> { .get::() .and_then(|state| state.mcp_resources.clone()), executor_capability_discovery: self.input.executor_capability_discovery.cloned(), + executor_capability_discovery_v2: self + .input + .executor_capability_discovery_v2 + .map(Vec::from) + .unwrap_or_default(), }; let cloud = self.cloud_catalog_contribution(&query); @@ -244,6 +249,7 @@ impl<'a> CatalogContext<'a> { include_cloud_skills: false, mcp_resources: None, executor_capability_discovery: None, + executor_capability_discovery_v2: Vec::new(), }) .await; self.input diff --git a/codex-rs/ext/skills/tests/executor_file_system_authority.rs b/codex-rs/ext/skills/tests/executor_file_system_authority.rs index cdf7f416ff..c2ab52f9fe 100644 --- a/codex-rs/ext/skills/tests/executor_file_system_authority.rs +++ b/codex-rs/ext/skills/tests/executor_file_system_authority.rs @@ -417,6 +417,7 @@ async fn selected_root_id_distinguishes_identical_executor_paths() { include_cloud_skills: false, mcp_resources: None, executor_capability_discovery: None, + executor_capability_discovery_v2: Vec::new(), }) .await .expect("list executor skills"); @@ -507,6 +508,7 @@ async fn executor_discovery_preserves_posix_and_windows_locator_alias_roots() { include_cloud_skills: false, mcp_resources: None, executor_capability_discovery: Some(discovery), + executor_capability_discovery_v2: Vec::new(), }) .await .expect("list executor skills"); @@ -624,6 +626,12 @@ async fn executor_discovery_routes_produce_equivalent_catalog_metadata() { include_cloud_skills: false, mcp_resources: None, executor_capability_discovery, + executor_capability_discovery_v2: vec![ + codex_exec_server::ExecutorCapabilityDiscoveryV2Snapshot { + environment_id: "local".to_string(), + result: Err("V2 must not change V1 or direct discovery".to_string()), + }, + ], }; let direct = provider @@ -776,6 +784,7 @@ async fn pre_discovered_executor_catalog_snapshot() { include_cloud_skills: false, mcp_resources: None, executor_capability_discovery: Some(executor_capability_discovery), + executor_capability_discovery_v2: Vec::new(), }) .await .expect("list pre-discovered executor skills"); @@ -893,6 +902,7 @@ async fn direct_executor_discovery_preserves_hidden_nested_and_probed_metadata() include_cloud_skills: false, mcp_resources: None, executor_capability_discovery: None, + executor_capability_discovery_v2: Vec::new(), }) .await .expect("list directly discovered executor skills"); @@ -953,6 +963,7 @@ async fn high_level_discovery_reuses_materialized_skill_contents_for_reads() { include_cloud_skills: false, mcp_resources: None, executor_capability_discovery: Some(executor_capability_discovery), + executor_capability_discovery_v2: Vec::new(), }) .await .expect("list executor skills"); diff --git a/codex-rs/ext/skills/tests/skills_extension.rs b/codex-rs/ext/skills/tests/skills_extension.rs index e03d694b18..1d1c46b401 100644 --- a/codex-rs/ext/skills/tests/skills_extension.rs +++ b/codex-rs/ext/skills/tests/skills_extension.rs @@ -134,6 +134,7 @@ async fn skill_world_state_fragments( let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id, @@ -322,6 +323,7 @@ async fn host_world_state_records_catalog_metrics_on_publish_and_change() -> Tes let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -349,6 +351,7 @@ async fn host_world_state_records_catalog_metrics_on_publish_and_change() -> Tes let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -389,6 +392,7 @@ async fn host_world_state_records_catalog_metrics_on_publish_and_change() -> Tes let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -463,6 +467,7 @@ async fn persisted_host_snapshot_deduplicates_warning_after_reinitialization() - let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &model_info, thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -504,6 +509,7 @@ async fn persisted_host_snapshot_deduplicates_warning_after_reinitialization() - let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &model_info, thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-2", @@ -597,6 +603,7 @@ async fn executor_cloud_and_host_share_catalog_world_state_flow() -> TestResult let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -708,6 +715,7 @@ async fn nonempty_executor_empty_host_records_catalog_metrics() -> TestResult { let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -790,6 +798,7 @@ async fn host_world_state_uses_provider_catalog_with_core_compatible_rendering() let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -873,6 +882,7 @@ async fn shadow_selection_uses_host_catalog_when_instructions_are_disabled() -> let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -1167,6 +1177,7 @@ async fn selected_executor_catalog_follows_step_availability_and_reuses_its_cach let available_sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -1232,6 +1243,7 @@ async fn selected_executor_catalog_follows_step_availability_and_reuses_its_cach let unavailable_sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: Some(&available_world_state), + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-2", @@ -1271,6 +1283,7 @@ async fn selected_executor_catalog_follows_step_availability_and_reuses_its_cach let restored_sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: Some(&unavailable_world_state), + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-3", @@ -1330,6 +1343,7 @@ async fn selected_executor_catalog_follows_step_availability_and_reuses_its_cach registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id, @@ -1358,6 +1372,7 @@ async fn selected_executor_catalog_follows_step_availability_and_reuses_its_cach let listing_disabled_sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-4", @@ -1487,6 +1502,7 @@ async fn overlapping_executor_catalogs_render_their_own_roots() -> TestResult { environments: &[], ready_selected_capability_roots: &[root], executor_capability_discovery: None, + executor_capability_discovery_v2: None, extension_metrics: None, session_store: &session_store, thread_store: &thread_store, @@ -1762,6 +1778,7 @@ async fn catalog_rebalances_only_to_avoid_omissions_and_retains_the_allocation() environments: &[], ready_selected_capability_roots: if ready { &selected_roots } else { &[] }, executor_capability_discovery: None, + executor_capability_discovery_v2: None, extension_metrics: None, session_store: &session_store, thread_store: &thread_store, @@ -2382,6 +2399,7 @@ async fn root_qualified_locator_selects_only_the_matching_executor_skill() -> Te registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -2519,6 +2537,7 @@ async fn model_context_window_scales_executor_and_cloud_catalogs() -> TestResult let sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &model_info, thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -2536,6 +2555,7 @@ async fn model_context_window_scales_executor_and_cloud_catalogs() -> TestResult let _repeated_sections = registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &model_info, thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", @@ -2636,6 +2656,7 @@ async fn executor_catalog_emits_at_most_four_warnings() -> TestResult { registry.context_contributors()[0] .contribute_world_state(WorldStateContributionInput { previous_world_state: None, + executor_capability_discovery_v2: None, model_info: &catalog_model_info(), thread_id: codex_protocol::ThreadId::new(), turn_id: "turn-1", diff --git a/codex-rs/ext/skills/tests/skills_extension/presentation_dedup_tests.rs b/codex-rs/ext/skills/tests/skills_extension/presentation_dedup_tests.rs index c67d715ff1..1c9d62a628 100644 --- a/codex-rs/ext/skills/tests/skills_extension/presentation_dedup_tests.rs +++ b/codex-rs/ext/skills/tests/skills_extension/presentation_dedup_tests.rs @@ -119,6 +119,7 @@ async fn cloud_preference_preserves_aliases_reads_and_executor_fallback() -> Tes environments: &[], ready_selected_capability_roots: if ready { &roots } else { &[] }, executor_capability_discovery: None, + executor_capability_discovery_v2: None, extension_metrics: None, session_store: &session_store, thread_store: &thread_store, diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs index 13ff893c1c..0928655c33 100644 --- a/codex-rs/features/src/lib.rs +++ b/codex-rs/features/src/lib.rs @@ -275,6 +275,8 @@ pub enum Feature { Plugins, /// Discover selected-root plugin and skill manifests through one high-level exec-server RPC. ExecutorCapabilityDiscovery, + /// Acquire V2 executor inventories without publishing or activating their capabilities. + ExecutorCapabilityDiscoveryV2, /// Skip host skill snapshots when no registered contributor requires them. SkipHostSkillDiscovery, /// Removed compatibility flag for plugin-bundled lifecycle hooks. @@ -1628,6 +1630,12 @@ pub const FEATURES: &[FeatureSpec] = &[ stage: Stage::UnderDevelopment, default_enabled: false, }, + FeatureSpec { + id: Feature::ExecutorCapabilityDiscoveryV2, + key: "executor_capability_discovery_v2", + stage: Stage::UnderDevelopment, + default_enabled: false, + }, FeatureSpec { id: Feature::SkipHostSkillDiscovery, key: "skip_host_skill_discovery", From c12cdc924bdd3ce8a2e57d16b882c865d363fceb Mon Sep 17 00:00:00 2001 From: Konstantine Kahadze Date: Tue, 13 Oct 2026 18:52:22 +0000 Subject: [PATCH 006/155] Remove `modelSlug` from the latest-model resolver output (#53745) ## What changed Update the OpenAI docs sample resolver to return only `model`, `migrationGuideUrl`, and `promptingGuideUrl`, and remove the model-to-slug conversion helper. GitOrigin-RevId: d7cea29ff8121b1a4df3b062d54dcbed6a1589bd --- .../openai-docs/scripts/resolve-latest-model-info.cjs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/codex-rs/skills/src/assets/samples/openai-docs/scripts/resolve-latest-model-info.cjs b/codex-rs/skills/src/assets/samples/openai-docs/scripts/resolve-latest-model-info.cjs index ffb356b552..86a63a6241 100644 --- a/codex-rs/skills/src/assets/samples/openai-docs/scripts/resolve-latest-model-info.cjs +++ b/codex-rs/skills/src/assets/samples/openai-docs/scripts/resolve-latest-model-info.cjs @@ -120,10 +120,6 @@ function extractLatestModelInfo(markdown) { return undefined; } -function modelToSkillSlug(model) { - return model.trim().replace(/\./g, "p"); -} - function absoluteUrl(baseUrl, value) { return new URL(value, baseUrl).toString(); } @@ -141,7 +137,6 @@ function normalizeInfo(info, baseUrl) { return { model, - modelSlug: modelToSkillSlug(model), migrationGuideUrl: absoluteUrl(baseUrl, migrationGuide), promptingGuideUrl: absoluteUrl(baseUrl, promptingGuide), }; From 5d4922595ae0eb81dde3c0f0f412ad771628d205 Mon Sep 17 00:00:00 2001 From: Philipp Spiess Date: Tue, 13 Oct 2026 19:21:47 +0000 Subject: [PATCH 007/155] Prefer remote Visualize installs over the bundled plugin (#53747) ## What changed When the remote global catalog is active, let a cached `visualize@openai-curated-remote` install supersede `visualize@openai-bundled`, matching the existing Sites behavior. A disabled remote install also suppresses the bundled plugin; a missing remote bundle preserves the bundled fallback. ## Testing Extend the agent-turn compatibility tests to cover Visualize with enabled, disabled, and missing remote bundles, asserting which skills appear in the developer prompt. GitOrigin-RevId: 7d0cc564189249e597d5bd29b5800353d89a9060 --- codex-rs/core-plugins/src/loader.rs | 3 ++ codex-rs/core/tests/suite/plugins.rs | 50 ++++++++++++++++------------ 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/codex-rs/core-plugins/src/loader.rs b/codex-rs/core-plugins/src/loader.rs index f0f9a12a77..03f7823cd9 100644 --- a/codex-rs/core-plugins/src/loader.rs +++ b/codex-rs/core-plugins/src/loader.rs @@ -257,6 +257,9 @@ fn merge_configured_plugins_with_remote_installed( if extra_plugins.contains_key("sites@openai-curated-remote") { configured_plugins.remove("sites@openai-bundled"); } + if extra_plugins.contains_key("visualize@openai-curated-remote") { + configured_plugins.remove("visualize@openai-bundled"); + } configured_plugins.retain(|plugin_key, _| match PluginId::parse(plugin_key) { Ok(plugin_id) => plugin_id.marketplace_name != crate::OPENAI_CURATED_MARKETPLACE_NAME, Err(_) => true, diff --git a/codex-rs/core/tests/suite/plugins.rs b/codex-rs/core/tests/suite/plugins.rs index 690ecc540b..01c434c00a 100644 --- a/codex-rs/core/tests/suite/plugins.rs +++ b/codex-rs/core/tests/suite/plugins.rs @@ -1227,15 +1227,19 @@ async fn legacy_plugin_skill_prompt_remains_complete() -> Result<()> { Ok(()) } -#[test_case(None, true, true, (true, false); "enabled remote supersedes bundled")] -#[test_case(Some("tpp"), true, true, (true, false); "configured work sku")] -#[test_case(None, false, true, (false, false); "disabled remote does not reactivate bundled")] -#[test_case(None, true, false, (false, true); "missing remote bundle preserves bundled")] +#[test_case("sites", None, true, true, (true, false); "sites enabled remote supersedes bundled")] +#[test_case("sites", Some("tpp"), true, true, (true, false); "sites configured work sku")] +#[test_case("sites", None, false, true, (false, false); "sites disabled remote does not reactivate bundled")] +#[test_case("sites", None, true, false, (false, true); "sites missing remote bundle preserves bundled")] +#[test_case("visualize", None, true, true, (true, false); "visualize enabled remote supersedes bundled")] +#[test_case("visualize", None, false, true, (false, false); "visualize disabled remote does not reactivate bundled")] +#[test_case("visualize", None, true, false, (false, true); "visualize missing remote bundle preserves bundled")] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn sites_compatibility_guard_in_agent_turn( +async fn bundled_plugin_compatibility_guard_in_agent_turn( + plugin_name: &str, product_sku: Option<&str>, remote_enabled: bool, - cache_remote_sites: bool, + cache_remote_plugin: bool, expected_skills: (bool, bool), ) -> Result<()> { skip_if_no_network!(Ok(())); @@ -1250,16 +1254,16 @@ async fn sites_compatibility_guard_in_agent_turn( .and(header("OAI-Product-Sku", product_sku.unwrap_or("codex"))) .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({ "plugins": [{ - "id": "plugins~plugin_connector_1p_689987207de08191979cf68eca2941c6", - "name": "sites", + "id": format!("plugins~Plugin_{plugin_name}"), + "name": plugin_name, "scope": "GLOBAL", "status": "ENABLED", "installation_policy": "AVAILABLE", "authentication_policy": "ON_USE", "release": { "version": "local", - "display_name": "Sites", - "description": "Sites", + "display_name": plugin_name, + "description": plugin_name, "interface": {}, }, "enabled": remote_enabled, @@ -1272,28 +1276,30 @@ async fn sites_compatibility_guard_in_agent_turn( let codex_home = Arc::new(TempDir::new()?); std::fs::write( codex_home.path().join("config.toml"), - r#"[features] + format!( + r#"[features] plugins = true remote_plugin = true -[plugins."sites@openai-bundled"] +[plugins."{plugin_name}@openai-bundled"] enabled = true -"#, +"# + ), )?; for (marketplace, skill) in [ - ("openai-bundled", "bundled-sites"), - ("openai-curated-remote", "remote-sites"), + ("openai-bundled", "bundled-skill"), + ("openai-curated-remote", "remote-skill"), ] { - if marketplace == "openai-curated-remote" && !cache_remote_sites { + if marketplace == "openai-curated-remote" && !cache_remote_plugin { continue; } let root = codex_home .path() - .join(format!("plugins/cache/{marketplace}/sites/local")); + .join(format!("plugins/cache/{marketplace}/{plugin_name}/local")); std::fs::create_dir_all(root.join(".codex-plugin"))?; std::fs::write( root.join(".codex-plugin/plugin.json"), - r#"{"name":"sites"}"#, + format!(r#"{{"name":"{plugin_name}"}}"#), )?; let skill_dir = root.join("skills").join(skill); std::fs::create_dir_all(&skill_dir)?; @@ -1323,7 +1329,7 @@ enabled = true test.codex .start_or_steer_turn(TurnInputRequest::user_input(vec![UserInput::Text { - text: "Inspect the available Sites skills.".to_string(), + text: format!("Inspect the available {plugin_name} skills."), text_elements: Vec::new(), }])) .await?; @@ -1336,11 +1342,11 @@ enabled = true let developer_text = requests[0].message_input_texts("developer").join("\n"); assert_eq!( ( - developer_text.contains("sites:remote-sites"), - developer_text.contains("sites:bundled-sites"), + developer_text.contains(&format!("{plugin_name}:remote-skill")), + developer_text.contains(&format!("{plugin_name}:bundled-skill")), ), expected_skills, - "unexpected Sites skills in developer prompt: {developer_text:?}" + "unexpected {plugin_name} skills in developer prompt: {developer_text:?}" ); Ok(()) } From e762c05bd686dd1eb3595aef2e14cc37c739f401 Mon Sep 17 00:00:00 2001 From: jif Date: Tue, 13 Oct 2026 19:31:05 +0000 Subject: [PATCH 008/155] Apply feature overrides when restarting the app-server daemon (#53751) ## Why `codex app-server daemon restart` previously reused saved settings without applying feature flags supplied on the command line. ## What changed Apply `--enable`, `--disable`, and boolean `-c features.*` overrides during an explicit restart and persist them for subsequent restarts. Accept nested `enabled` values, normalize feature aliases, and replace conflicting saved aliases while preserving unrelated settings. Reject invalid feature toggles before stopping the daemon or saving settings. ## Testing Add integration coverage for overrides on stopped and running daemons, alias replacement, preservation of saved settings, restarts without flags, and rejection of non-toggle keys without interrupting the running daemon. GitOrigin-RevId: 14a657bc4758b9c248e363f9dac58f8887070a04 --- codex-rs/Cargo.lock | 1 + codex-rs/app-server-daemon/Cargo.toml | 1 + codex-rs/app-server-daemon/src/launch.rs | 17 +++- codex-rs/app-server-daemon/src/lib.rs | 15 +++- .../src/update_loop_tests.rs | 2 +- codex-rs/cli/src/main.rs | 41 ++++++++- codex-rs/cli/tests/app_server_daemon.rs | 86 +++++++++++++++++++ codex-rs/tui/src/app/event_dispatch.rs | 4 +- 8 files changed, 157 insertions(+), 10 deletions(-) diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index 72658b9087..ad3060d741 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -2220,6 +2220,7 @@ dependencies = [ "blake3", "codex-app-server-protocol", "codex-app-server-transport", + "codex-features", "codex-http-client", "codex-install-context", "codex-uds", diff --git a/codex-rs/app-server-daemon/Cargo.toml b/codex-rs/app-server-daemon/Cargo.toml index 4dabe9bc27..053d788348 100644 --- a/codex-rs/app-server-daemon/Cargo.toml +++ b/codex-rs/app-server-daemon/Cargo.toml @@ -16,6 +16,7 @@ workspace = true anyhow = { workspace = true } codex-app-server-protocol = { workspace = true } codex-app-server-transport = { workspace = true } +codex-features = { workspace = true } codex-http-client = { workspace = true } codex-install-context = { workspace = true } codex-utils-home-dir = { workspace = true } diff --git a/codex-rs/app-server-daemon/src/launch.rs b/codex-rs/app-server-daemon/src/launch.rs index cd283a3c97..c36da035fa 100644 --- a/codex-rs/app-server-daemon/src/launch.rs +++ b/codex-rs/app-server-daemon/src/launch.rs @@ -39,9 +39,20 @@ pub async fn restart_with_features(features: &BTreeMap) -> Result< } impl Daemon { - pub(super) async fn restart(&self) -> Result { - self.restart_with_settings(self.load_settings().await?) - .await + pub(super) async fn restart( + &self, + features: &BTreeMap, + ) -> Result { + let mut settings = self.load_settings().await?; + // Explicit requests replace saved aliases as well as canonical keys. + settings.feature_overrides.retain(|name, _| { + let canonical = codex_features::feature_for_key(name) + .map(codex_features::Feature::key) + .unwrap_or(name); + !features.contains_key(canonical) + }); + settings.feature_overrides.extend(features.clone()); + self.restart_with_settings(settings).await } pub(super) async fn restart_with_features_locked( diff --git a/codex-rs/app-server-daemon/src/lib.rs b/codex-rs/app-server-daemon/src/lib.rs index 0fd3ed9c27..7b19c16567 100644 --- a/codex-rs/app-server-daemon/src/lib.rs +++ b/codex-rs/app-server-daemon/src/lib.rs @@ -59,10 +59,12 @@ const OPERATION_LOCK_FILE_NAME: &str = "daemon.lock"; const SETTINGS_FILE_NAME: &str = "settings.json"; const STATE_DIR_NAME: &str = "app-server-daemon"; -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub enum LifecycleCommand { Start, - Restart, + Restart { + feature_overrides: BTreeMap, + }, Stop, Version, } @@ -228,7 +230,10 @@ enum RestartDecision { pub async fn run(command: LifecycleCommand) -> Result { ensure_supported_platform()?; #[cfg(windows)] - if matches!(command, LifecycleCommand::Start | LifecycleCommand::Restart) { + if matches!( + command, + LifecycleCommand::Start | LifecycleCommand::Restart { .. } + ) { backend::windows::ensure_not_elevated()?; } // Keep daemon package preparation off callers' async stack frames. @@ -394,7 +399,9 @@ impl Daemon { let selected = self.current_installation()?; match command { LifecycleCommand::Start => selected.start(&BTreeMap::new()).await, - LifecycleCommand::Restart => selected.restart().await, + LifecycleCommand::Restart { feature_overrides } => { + selected.restart(&feature_overrides).await + } LifecycleCommand::Stop => { let output = selected.stop().await?; if let Err(err) = thread_recovery::discard_pending(&selected) { diff --git a/codex-rs/app-server-daemon/src/update_loop_tests.rs b/codex-rs/app-server-daemon/src/update_loop_tests.rs index 8ccfc16803..a7894b81f6 100644 --- a/codex-rs/app-server-daemon/src/update_loop_tests.rs +++ b/codex-rs/app-server-daemon/src/update_loop_tests.rs @@ -869,7 +869,7 @@ async fn daemon_start_and_restart_preserve_launch_features() { ); assert_eq!(std::fs::read_to_string(&args_path).unwrap(), expected); std::fs::remove_file(&args_path).unwrap(); - let restarted = daemon.restart().await; + let restarted = daemon.restart(&std::collections::BTreeMap::new()).await; let deadline = tokio::time::Instant::now() + Duration::from_secs(/*secs*/ 10); while std::fs::read_to_string(&args_path).ok().as_deref() != Some(expected) && tokio::time::Instant::now() < deadline diff --git a/codex-rs/cli/src/main.rs b/codex-rs/cli/src/main.rs index 9d540c3124..c1537bfa00 100644 --- a/codex-rs/cli/src/main.rs +++ b/codex-rs/cli/src/main.rs @@ -1308,7 +1308,46 @@ async fn cli_main( println!("{}", serde_json::to_string(&output)?); } AppServerDaemonSubcommand::Restart => { - print_app_server_daemon_output(AppServerLifecycleCommand::Restart).await?; + let overrides = root_config_overrides + .parse_overrides() + .map_err(anyhow::Error::msg)?; + let layer = codex_config::build_cli_overrides_layer(&overrides); + let features = layer + .get("features") + .and_then(toml::Value::as_table) + .into_iter() + .flatten() + .map(|(name, value)| (name.as_str(), value)) + .collect::>(); + let mut feature_overrides = std::collections::BTreeMap::new(); + // Match Features::apply_map's alias precedence. + for (&name, &value) in &features { + if name == "imagegenext" && features.contains_key("image_generation") { + continue; + } + let value = if let Some(table) = value.as_table() { + let Some(enabled) = table.get("enabled") else { + continue; + }; + enabled + } else { + value + }; + let feature = + codex_features::feature_for_key(name).ok_or_else(|| { + anyhow::anyhow!( + "daemon restart requires a boolean feature toggle: {name}" + ) + })?; + let enabled = value.as_bool().ok_or_else(|| { + anyhow::anyhow!("daemon restart requires a boolean enablement for features.{name}") + })?; + feature_overrides.insert(feature.key().to_string(), enabled); + } + print_app_server_daemon_output(AppServerLifecycleCommand::Restart { + feature_overrides, + }) + .await?; } AppServerDaemonSubcommand::Update { from_cli: true, diff --git a/codex-rs/cli/tests/app_server_daemon.rs b/codex-rs/cli/tests/app_server_daemon.rs index f36f03ad24..e05bedffe7 100644 --- a/codex-rs/cli/tests/app_server_daemon.rs +++ b/codex-rs/cli/tests/app_server_daemon.rs @@ -171,6 +171,92 @@ fn managed_daemon_restarts_from_deleted_working_directory() -> Result<()> { Ok(()) } +#[test] +fn explicit_restart_applies_feature_overrides_and_preserves_saved_settings() -> Result<()> { + let daemon = TestDaemon::new()?; + let settings_path = daemon.home.path().join("app-server-daemon/settings.json"); + std::fs::write( + &settings_path, + serde_json::to_vec(&serde_json::json!({ + "shutdownGraceSeconds": 0, + "updater": { "autoUpdateEnabled": false }, + "featureOverrides": { + "api_key_model_discovery": false, + "auth_elicitation": true, + "connectors": true, + "apps": true + } + }))?, + )?; + let mut previous_pid = None; + // Start from a stopped daemon, change running settings, and restart again + // with omitted flags. Every explicit restart replaces the process. + for (args, discovery) in [ + ( + vec![ + "--enable", + "api_key_model_discovery", + "--disable", + "connectors", + "-c", + "features.network_proxy.enabled=false", + ], + true, + ), + (vec!["--disable", "api_key_model_discovery"], false), + (vec!["-c", "features.api_key_model_discovery=true"], true), + (vec![], true), + ] { + let output = daemon + .command() + .args(["app-server", "daemon", "restart"]) + .args(args) + .output()?; + ensure!( + output.status.success(), + "{}", + String::from_utf8_lossy(&output.stderr) + ); + let output: Value = serde_json::from_slice(&output.stdout)?; + assert_eq!(output["status"], "restarted"); + let pid = output["pid"].as_u64().context("restarted daemon PID")?; + assert_ne!(Some(pid), previous_pid); + previous_pid = Some(pid); + let settings: Value = serde_json::from_slice(&std::fs::read(&settings_path)?)?; + assert_eq!( + settings["featureOverrides"], + serde_json::json!({ + "api_key_model_discovery": discovery, + "auth_elicitation": true, + "apps": false, + "network_proxy": false + }) + ); + assert_eq!(settings["updater"]["autoUpdateEnabled"], false); + } + // Non-toggle config keys must fail before stopping the daemon or saving settings. + let saved_settings = std::fs::read(&settings_path)?; + let output = daemon + .command() + .args([ + "app-server", + "daemon", + "restart", + "--enable", + "tool_registry", + ]) + .output()?; + assert!(!output.status.success()); + insta::assert_snapshot!( + String::from_utf8(output.stderr)?, + @"Error: daemon restart requires a boolean feature toggle: tool_registry" + ); + assert_eq!(std::fs::read(&settings_path)?, saved_settings); + assert_eq!(Some(u64::from(daemon.pid("app-server.pid")?)), previous_pid); + assert_eq!(daemon.lifecycle("version")?["status"], "running"); + Ok(()) +} + fn signal(pid: u32, signal: libc::c_int) -> Result<()> { let raw_pid = libc::pid_t::try_from(pid).context("pid out of range")?; ensure!( diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs index a7f7f1e827..e5bd89312b 100644 --- a/codex-rs/tui/src/app/event_dispatch.rs +++ b/codex-rs/tui/src/app/event_dispatch.rs @@ -166,7 +166,9 @@ impl App { && self.daemon_restart.is_none() { self.daemon_restart = Some(tokio::spawn(codex_app_server_daemon::run( - codex_app_server_daemon::LifecycleCommand::Restart, + codex_app_server_daemon::LifecycleCommand::Restart { + feature_overrides: Default::default(), + }, ))); } } From 3517671c6061e1704cf1c0df4a5039de23514df8 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Tue, 13 Oct 2026 19:37:19 +0000 Subject: [PATCH 009/155] Extend copy-on-select to composer text (#53753) ## What changed Apply `tui.copy_on_select` to composer mouse selections on release, including X11 PRIMARY publication when enabled. Keep editable selections highlighted so typing can replace the selected text, even when `tui.copy_on_select_clear_selection` is enabled. Share clipboard destination handling across the transcript, footer, and composer. Apply automatic deselection to footer selections after confirmed delivery, and release composer and footer PRIMARY ownership on focus loss or resume. Update configuration descriptions to clarify the behavior across all three surfaces. ## Testing Add composer tests covering copy on release, retained selection highlights, replacement by typing, PRIMARY ownership lifetime, and clipboard-only status reporting for pending copies. GitOrigin-RevId: 46999a32170149193fca561741000e97dfc458cf --- codex-rs/config/src/types.rs | 9 +- codex-rs/core/config.schema.json | 6 +- codex-rs/core/src/config/mod.rs | 4 +- codex-rs/tui/src/app/clipboard.rs | 6 ++ codex-rs/tui/src/app/footer_selection.rs | 2 + codex-rs/tui/src/app/owned_transcript.rs | 38 ++++++++ codex-rs/tui/src/bottom_pane/chat_composer.rs | 2 +- .../src/bottom_pane/chat_composer/mouse.rs | 29 +++++- .../bottom_pane/chat_composer/mouse_tests.rs | 97 +++++++++++++++++++ codex-rs/tui/src/bottom_pane/mod.rs | 23 +++++ .../tui/src/bottom_pane/textarea/mouse.rs | 13 +++ codex-rs/tui/src/chatwidget/interaction.rs | 14 +++ codex-rs/tui/src/config_panel/mod.rs | 4 +- codex-rs/tui/src/config_panel/render.rs | 2 +- ...g_panel__tests__config_Text selection.snap | 4 +- ...__tests__config_copy_on_select_choice.snap | 2 +- ..._config_right_click_paste_unavailable.snap | 4 +- codex-rs/tui/src/transcript_view.rs | 21 +--- .../transcript_view/copy_on_select_tests.rs | 12 ++- codex-rs/tui/src/transcript_view/input.rs | 14 ++- codex-rs/tui/src/transcript_view/selection.rs | 45 ++++----- codex-rs/tui/src/tui.rs | 2 + codex-rs/tui/src/tui/selection_clipboard.rs | 82 +++++++++++++++- 23 files changed, 362 insertions(+), 73 deletions(-) diff --git a/codex-rs/config/src/types.rs b/codex-rs/config/src/types.rs index 2dbdfe2cc8..45871f151d 100644 --- a/codex-rs/config/src/types.rs +++ b/codex-rs/config/src/types.rs @@ -786,7 +786,7 @@ pub enum CopyOnSelect { /// Use the terminal-specific default. #[default] Auto, - /// Copy every nonempty transcript or footer mouse selection on release. + /// Copy every nonempty transcript, footer, or composer mouse selection on release. Always, /// Require an explicit copy action. Never, @@ -891,15 +891,16 @@ pub struct Tui { #[schemars(schema_with = "crate::tui_mouse_scroll::schema")] pub mouse_scroll_speed: Option, - /// Copy selected transcript or footer text when the mouse button is released. + /// Copy selected transcript, footer, or composer text when the mouse button is released. /// Defaults to `auto`: enabled except in direct terminals known to forward their native /// copy shortcut (Ghostty 1.2+, Kitty on macOS, Windows Terminal, and VS Code on Windows). /// Unknown terminals, Ghostty without a recognized version, and tmux/Zellij default to copying. #[serde(default)] pub copy_on_select: CopyOnSelect, - /// Deselect transcript text after Copy on select confirms clipboard delivery. - /// Defaults to `false` and has no effect when Copy on select is off. + /// Deselect read-only transcript or footer text after Copy on select confirms delivery. + /// Editable composer selections remain visible. Defaults to `false` and has no effect when + /// Copy on select is off. #[serde(default)] pub copy_on_select_clear_selection: bool, diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.json index 9e8e684394..7c6da97d0f 100644 --- a/codex-rs/core/config.schema.json +++ b/codex-rs/core/config.schema.json @@ -1430,7 +1430,7 @@ "type": "string" }, { - "description": "Copy every nonempty transcript or footer mouse selection on release.", + "description": "Copy every nonempty transcript, footer, or composer mouse selection on release.", "enum": [ "always" ], @@ -4683,11 +4683,11 @@ } ], "default": "auto", - "description": "Copy selected transcript or footer text when the mouse button is released. Defaults to `auto`: enabled except in direct terminals known to forward their native copy shortcut (Ghostty 1.2+, Kitty on macOS, Windows Terminal, and VS Code on Windows). Unknown terminals, Ghostty without a recognized version, and tmux/Zellij default to copying." + "description": "Copy selected transcript, footer, or composer text when the mouse button is released. Defaults to `auto`: enabled except in direct terminals known to forward their native copy shortcut (Ghostty 1.2+, Kitty on macOS, Windows Terminal, and VS Code on Windows). Unknown terminals, Ghostty without a recognized version, and tmux/Zellij default to copying." }, "copy_on_select_clear_selection": { "default": false, - "description": "Deselect transcript text after Copy on select confirms clipboard delivery. Defaults to `false` and has no effect when Copy on select is off.", + "description": "Deselect read-only transcript or footer text after Copy on select confirms delivery. Editable composer selections remain visible. Defaults to `false` and has no effect when Copy on select is off.", "type": "boolean" }, "disable_paste_burst": { diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rs index c5ab36546e..b21aa349a7 100644 --- a/codex-rs/core/src/config/mod.rs +++ b/codex-rs/core/src/config/mod.rs @@ -828,10 +828,10 @@ pub struct Config { /// Mouse wheel speed multiplier for transcript scrolling; defaults to one row per event. pub tui_mouse_scroll_speed: Option, - /// Override the terminal-specific default for copying transcript mouse selections. + /// Override the terminal default for copying transcript, footer, and composer selections. pub tui_copy_on_select: codex_config::types::CopyOnSelect, - /// Whether to deselect transcript text after a confirmed automatic copy. + /// Whether to deselect read-only transcript or footer text after confirmed automatic copy. pub tui_copy_on_select_clear_selection: bool, /// Right-click text paste fallback for the fullscreen TUI. diff --git a/codex-rs/tui/src/app/clipboard.rs b/codex-rs/tui/src/app/clipboard.rs index a4359cd3e4..5b25a0f299 100644 --- a/codex-rs/tui/src/app/clipboard.rs +++ b/codex-rs/tui/src/app/clipboard.rs @@ -78,6 +78,12 @@ impl App { } if !current || matches!(event, TuiEvent::FocusLost | TuiEvent::Resume) { self.transcript_view.cancel_primary(); + self.chat_widget.cancel_composer_primary(); + self.chat_widget + .rendered_selection + .borrow_mut() + .view + .cancel_primary(); } } } diff --git a/codex-rs/tui/src/app/footer_selection.rs b/codex-rs/tui/src/app/footer_selection.rs index 436300bb22..0be4be334d 100644 --- a/codex-rs/tui/src/app/footer_selection.rs +++ b/codex-rs/tui/src/app/footer_selection.rs @@ -32,6 +32,8 @@ impl App { selection.view.copy_on_select = self .local_settings .copy_on_select(&codex_terminal_detection::terminal_info()); + selection.view.copy_on_select_clear_selection = + self.local_settings.tui.copy_on_select_clear_selection; selection.view.primary_selection = self.right_click_paste_environment.primary; selection.handle_event(event, tui.terminal.previous_buffer()) }; diff --git a/codex-rs/tui/src/app/owned_transcript.rs b/codex-rs/tui/src/app/owned_transcript.rs index 8c42d78f1c..23993b29cd 100644 --- a/codex-rs/tui/src/app/owned_transcript.rs +++ b/codex-rs/tui/src/app/owned_transcript.rs @@ -39,6 +39,43 @@ impl App { false } + /// Publish a completed composer selection with the transcript/footer copy policy. + fn handle_composer_selection_release( + &mut self, + tui: &mut tui::Tui, + event: crossterm::event::MouseEvent, + ) -> bool { + let selection_copy = crate::tui::SelectionCopy::on_select( + self.local_settings + .copy_on_select(&codex_terminal_detection::terminal_info()), + self.right_click_paste_environment.primary, + // Editable selections remain visible so the next input can replace them. + /*clear_selection*/ + false, + ); + if !selection_copy.copies_clipboard() && !selection_copy.publishes_primary() { + return false; + } + let Some((char_count, result)) = self.chat_widget.copy_composer_selection_on_release( + event, + selection_copy, + |text, selection_copy| { + tui.copy_selection( + text, + crate::clipboard_copy::CopyFormat::PlainText, + selection_copy, + text, + ) + }, + ) else { + return false; + }; + if let Some(result) = result { + self.transcript_view.show_copy_feedback(&result, char_count); + } + true + } + fn sync_owned_transcript(&mut self, width: u16) -> bool { let chat_widget = &self.chat_widget; let transcript_width = chat_widget.history_wrap_width(width); @@ -434,6 +471,7 @@ impl App { return Ok(true); } if composer_ready && self.chat_widget.handle_composer_mouse(*mouse) { + self.handle_composer_selection_release(tui, *mouse); if !matches!( mouse.kind, crossterm::event::MouseEventKind::ScrollUp diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs index 2ad3f1cd95..715af4eb6f 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs @@ -249,7 +249,7 @@ //! Submission flushes expired characters and buffers before classifying Enter, independent of //! UI flush ticks. `disable_paste_burst` bypasses detection; setting it flushes and clears in-flight state. //! Mouse edits flush pending typing; selection and copy behavior lives in [`mouse`]. Confirmed -//! copies clear the selection while preserving the draft and cursor. Footer text uses a separate +//! explicit copies clear the selection while preserving the draft and cursor. Footer text uses a separate //! read-only selection owner over its final rendered cells. //! //! See `codex-rs/tui/src/bottom_pane/paste_burst.rs` for the detailed state machine. diff --git a/codex-rs/tui/src/bottom_pane/chat_composer/mouse.rs b/codex-rs/tui/src/bottom_pane/chat_composer/mouse.rs index 65a5926135..94911cbaa1 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer/mouse.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer/mouse.rs @@ -1,11 +1,14 @@ //! Mouse gestures flush pending typing before layout and hit testing. Left dragging selects //! editable text using the textarea's last rendered viewport and hides completion suggestions. //! Double/triple clicks select words/logical lines using the transcript's shared gesture rules. -//! Copy preserves the draft and cursor; confirmed copies clear selection for every gesture. +//! Selection release follows the transcript/footer copy policy while keeping editable text selected. +//! Explicit copy preserves the draft and cursor, and clears after confirmed delivery. //! Wheel browsing uses the current viewport without changing popup or selection ownership. use super::*; use crate::clipboard_copy::CopyStatus; +use crate::clipboard_copy::worker::CopyResult; +use crate::tui::SelectionCopy; use crate::tui::TuiEvent; use crossterm::event::MouseButton; use crossterm::event::MouseEvent; @@ -87,6 +90,26 @@ impl ChatComposer { Some((char_count, result)) } + pub(crate) fn copy_selection_on_release( + &mut self, + event: MouseEvent, + selection_copy: SelectionCopy, + copy: impl FnOnce(&str, SelectionCopy) -> (CopyResult, Option>), + ) -> Option<(usize, Option)> { + if event.kind != MouseEventKind::Up(MouseButton::Left) { + return None; + } + let range = self.draft.textarea.mouse_selection_range()?; + let text = &self.draft.textarea.text()[range]; + let char_count = text.chars().count(); + let (result, primary_owner) = copy(text, selection_copy); + self.draft.textarea.retain_primary(primary_owner); + if selection_copy.copies_clipboard() { + return Some((char_count, Some(result))); + } + Some((char_count, None)) + } + pub(crate) fn clear_mouse_selection(&mut self) { self.draft.textarea.set_cursor(self.draft.textarea.cursor()); } @@ -95,6 +118,10 @@ impl ChatComposer { self.draft.textarea.end_mouse_drag(); } + pub(crate) fn cancel_primary(&mut self) { + self.draft.textarea.cancel_primary(); + } + pub(crate) fn prepare_mouse(&mut self, event: MouseEvent) -> bool { if !self.draft.input_enabled || self.blocks_direct_input diff --git a/codex-rs/tui/src/bottom_pane/chat_composer/mouse_tests.rs b/codex-rs/tui/src/bottom_pane/chat_composer/mouse_tests.rs index 920395ab17..dbd2fbd69e 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer/mouse_tests.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer/mouse_tests.rs @@ -214,3 +214,100 @@ fn right_click_copy_uses_the_refreshed_editor_bounds() { paste_target ); } + +#[test] +fn selection_release_copies_and_keeps_the_editable_selection() { + let (mut composer, _rx) = new_test_composer(); + composer.insert_str("hello world"); + let area = Rect::new( + /*x*/ 0, /*y*/ 0, /*width*/ 40, /*height*/ 4, + ); + composer.render(area, &mut Buffer::empty(area)); + let (x, y) = composer.cursor_pos(area).unwrap(); + let release = MouseEvent { + kind: Up(Left), + column: x - 6, + row: y, + modifiers: KeyModifiers::NONE, + }; + for (kind, column) in [ + (Down(Left), x - 11), + (MouseEventKind::Drag(Left), x - 6), + (Up(Left), x - 6), + ] { + mouse(&mut composer, area, kind, column, y); + } + + let selection_copy = crate::tui::SelectionCopy::on_select( + /*clipboard*/ true, /*primary*/ true, /*clear_selection*/ false, + ); + let owner = std::sync::Arc::new(()); + let retained = std::sync::Arc::downgrade(&owner); + assert_eq!( + composer.copy_selection_on_release(release, selection_copy, |text, policy| { + assert_eq!((text, policy), ("hello", selection_copy)); + (Ok(CopyStatus::Confirmed), Some(owner)) + }), + Some((5, Some(Ok(CopyStatus::Confirmed)))) + ); + + let mut buffer = Buffer::empty(area); + composer.render(area, &mut buffer); + let highlight = (x - 11..x) + .map(|column| { + buffer[(column, y)] + .modifier + .contains(ratatui::style::Modifier::REVERSED) + }) + .collect::>(); + assert_eq!( + highlight, + vec![ + true, true, true, true, true, false, false, false, false, false, false + ] + ); + assert!(retained.upgrade().is_some()); + + composer.insert_str("X"); + assert_eq!(composer.current_text(), "X world"); + assert!(retained.upgrade().is_none()); +} + +#[test] +fn selection_release_reports_only_clipboard_result() { + for (clipboard, expected) in [(true, Some(Ok(CopyStatus::Pending(7)))), (false, None)] { + let (mut composer, _rx) = new_test_composer(); + composer.insert_str("hello world"); + let area = Rect::new( + /*x*/ 0, /*y*/ 0, /*width*/ 40, /*height*/ 4, + ); + composer.render(area, &mut Buffer::empty(area)); + let (x, y) = composer.cursor_pos(area).unwrap(); + let release = MouseEvent { + kind: Up(Left), + column: x - 6, + row: y, + modifiers: KeyModifiers::NONE, + }; + for (kind, column) in [ + (Down(Left), x - 11), + (MouseEventKind::Drag(Left), x - 6), + (Up(Left), x - 6), + ] { + mouse(&mut composer, area, kind, column, y); + } + let selection = composer.draft.textarea.mouse_selection_range(); + let policy = crate::tui::SelectionCopy::on_select( + clipboard, /*primary*/ true, /*clear_selection*/ false, + ); + assert_eq!( + composer.copy_selection_on_release(release, policy, |text, actual| { + assert_eq!((text, actual), ("hello", policy)); + (Ok(CopyStatus::Pending(7)), Some(std::sync::Arc::new(()))) + }), + Some((5, expected)) + ); + composer.finish_copy(&(7, Ok(CopyStatus::Confirmed)), /*current*/ true); + assert_eq!(composer.draft.textarea.mouse_selection_range(), selection); + } +} diff --git a/codex-rs/tui/src/bottom_pane/mod.rs b/codex-rs/tui/src/bottom_pane/mod.rs index ae9405e9ff..3544f57a4e 100644 --- a/codex-rs/tui/src/bottom_pane/mod.rs +++ b/codex-rs/tui/src/bottom_pane/mod.rs @@ -1891,6 +1891,10 @@ impl BottomPane { self.composer.end_mouse_drag(); } + pub(crate) fn cancel_composer_primary(&mut self) { + self.composer.cancel_primary(); + } + pub(crate) fn finish_composer_copy( &mut self, completion: &(u64, crate::clipboard_copy::worker::CopyResult), @@ -1911,6 +1915,25 @@ impl BottomPane { self.composer.copy_selection(event, copy) } + pub(crate) fn copy_composer_selection_on_release( + &mut self, + event: crossterm::event::MouseEvent, + selection_copy: crate::tui::SelectionCopy, + copy: impl FnOnce( + &str, + crate::tui::SelectionCopy, + ) -> ( + crate::clipboard_copy::worker::CopyResult, + Option>, + ), + ) -> Option<(usize, Option)> { + if self.has_active_view() || self.questions.as_ref().is_some_and(|q| q.expanded) { + return None; + } + self.composer + .copy_selection_on_release(event, selection_copy, copy) + } + pub(crate) fn clipboard_paste_target( &self, shortcut: Option, diff --git a/codex-rs/tui/src/bottom_pane/textarea/mouse.rs b/codex-rs/tui/src/bottom_pane/textarea/mouse.rs index 681fc9bcae..5cee31af16 100644 --- a/codex-rs/tui/src/bottom_pane/textarea/mouse.rs +++ b/codex-rs/tui/src/bottom_pane/textarea/mouse.rs @@ -6,10 +6,12 @@ use crossterm::event::MouseButton; use crossterm::event::MouseEvent; use crossterm::event::MouseEventKind; use ratatui::layout::Position; +use std::sync::Arc; #[derive(Debug)] pub(super) struct MouseSelection { pending_copy: Option<(u64, Range)>, + primary_owner: Option>, origin: Range, unit: SelectionUnit, dragging: bool, @@ -25,6 +27,16 @@ impl TextArea { } } + pub(in crate::bottom_pane) fn retain_primary(&mut self, owner: Option>) { + if let Some(selection) = &mut self.mouse_selection { + selection.primary_owner = owner; + } + } + + pub(in crate::bottom_pane) fn cancel_primary(&mut self) { + self.retain_primary(/*owner*/ None); + } + pub(in crate::bottom_pane) fn finish_copy( &mut self, completion: &(u64, crate::clipboard_copy::worker::CopyResult), @@ -136,6 +148,7 @@ impl TextArea { crate::text_selection::click_count(&mut self.last_click, event.column, event.row); MouseSelection { pending_copy: None, + primary_owner: None, origin: pos..pos, // Padding remains an insertion target on repeated clicks. unit: SelectionUnit::from_clicks(if pos == line.end - 1 { 1 } else { clicks }), diff --git a/codex-rs/tui/src/chatwidget/interaction.rs b/codex-rs/tui/src/chatwidget/interaction.rs index 8657de2e83..549a5623a2 100644 --- a/codex-rs/tui/src/chatwidget/interaction.rs +++ b/codex-rs/tui/src/chatwidget/interaction.rs @@ -23,6 +23,10 @@ impl ChatWidget { self.bottom_pane.end_composer_drag(); } + pub(crate) fn cancel_composer_primary(&mut self) { + self.bottom_pane.cancel_composer_primary(); + } + pub(crate) fn copy_composer_selection( &mut self, event: &crate::tui::TuiEvent, @@ -31,6 +35,16 @@ impl ChatWidget { self.bottom_pane.copy_composer_selection(event, copy) } + pub(crate) fn copy_composer_selection_on_release( + &mut self, + event: crossterm::event::MouseEvent, + selection_copy: crate::tui::SelectionCopy, + copy: impl FnOnce(&str, crate::tui::SelectionCopy) -> (CopyResult, Option>), + ) -> Option<(usize, Option)> { + self.bottom_pane + .copy_composer_selection_on_release(event, selection_copy, copy) + } + pub(crate) fn handle_composer_mouse(&mut self, event: crossterm::event::MouseEvent) -> bool { self.bottom_pane.handle_composer_mouse(event) } diff --git a/codex-rs/tui/src/config_panel/mod.rs b/codex-rs/tui/src/config_panel/mod.rs index ebc5799be2..7b2bd712c4 100644 --- a/codex-rs/tui/src/config_panel/mod.rs +++ b/codex-rs/tui/src/config_panel/mod.rs @@ -410,14 +410,14 @@ fn settings(tui: &Tui, status: ConfigPanelStatus) -> Vec { ConfigSetting { section: ConfigSection::TextSelection, label: "Copy on select", - description: "Copy transcript selections on release, with Auto following terminal defaults", + description: "Copy transcript, footer, and composer selections on release; Auto follows terminal defaults", keywords: "clipboard mouse selection automatic drag", value: ConfigEditor::CopyOnSelect.value(tui, status), }, ConfigSetting { section: ConfigSection::TextSelection, label: "Deselect after copy", - description: "Remove the selection highlight after Copy on select succeeds", + description: "Remove read-only transcript and footer highlights after automatic copy succeeds", keywords: "clipboard deselect clear highlight automatic mouse selection", value: ConfigSettingValue::DependentToggle { setting: ConfigToggle::CopyOnSelectClearSelection, diff --git a/codex-rs/tui/src/config_panel/render.rs b/codex-rs/tui/src/config_panel/render.rs index 28b037ee5f..d4d9aed131 100644 --- a/codex-rs/tui/src/config_panel/render.rs +++ b/codex-rs/tui/src/config_panel/render.rs @@ -172,7 +172,7 @@ pub(crate) fn copy_on_select( SelectionViewParams { title: Some("Copy on select".to_string()), subtitle: Some( - "Copy transcript selections on release, with Auto following terminal defaults" + "Copy transcript, footer, and composer selections on release; Auto follows terminal defaults" .to_string(), ), footer_hint: Some(picker_hint_line_for_keymap(keymap)), diff --git a/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_Text selection.snap b/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_Text selection.snap index 69f6e040f9..75a1499148 100644 --- a/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_Text selection.snap +++ b/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_Text selection.snap @@ -8,8 +8,8 @@ expression: "render(&panel, 140)" Appearance Notifications Input Sessions Text selection -› Copy on select Auto · On › Copy transcript selections on release, with Auto following terminal defaults - Deselect after copy [ ] Off Remove the selection highlight after Copy on select succeeds +› Copy on select Auto · On › Copy transcript, footer, and composer selections on release; Auto follows terminal defaults + Deselect after copy [ ] Off Remove read-only transcript and footer highlights after automatic copy succeeds Right-click paste Auto · Off › Paste when nothing is selected, with Auto following platform defaults and On also enabling mac… diff --git a/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_copy_on_select_choice.snap b/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_copy_on_select_choice.snap index 5e0f84a618..0d681c8afd 100644 --- a/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_copy_on_select_choice.snap +++ b/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_copy_on_select_choice.snap @@ -4,7 +4,7 @@ expression: "render(&picker, 100)" --- Copy on select - Copy transcript selections on release, with Auto following terminal defaults + Copy transcript, footer, and composer selections on release; Auto follows terminal defaults › 1. Auto (default) (current) diff --git a/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_right_click_paste_unavailable.snap b/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_right_click_paste_unavailable.snap index 89c163c39a..e685117599 100644 --- a/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_right_click_paste_unavailable.snap +++ b/codex-rs/tui/src/config_panel/snapshots/codex_tui__config_panel__tests__config_right_click_paste_unavailable.snap @@ -8,8 +8,8 @@ expression: "render(&panel, 140)" Appearance Notifications Input Sessions Text selection - Copy on select Auto · On › Copy transcript selections on release, with Auto following terminal defaults - Deselect after copy [ ] Off Remove the selection highlight after Copy on select succeeds + Copy on select Auto · On › Copy transcript, footer, and composer selections on release; Auto follows terminal defaults + Deselect after copy [ ] Off Remove read-only transcript and footer highlights after automatic copy succeeds › Right-click paste On · Unavailable › Unavailable in inline mode; use your terminal's paste command diff --git a/codex-rs/tui/src/transcript_view.rs b/codex-rs/tui/src/transcript_view.rs index 4a2b803537..80b8d67873 100644 --- a/codex-rs/tui/src/transcript_view.rs +++ b/codex-rs/tui/src/transcript_view.rs @@ -30,6 +30,7 @@ use crate::history_cell::HistoryCell; use crate::history_cell::HistoryRenderMode; use crate::pager_overlay::TranscriptHistoryState; use crate::terminal_hyperlinks::HyperlinkLine; +use crate::tui::SelectionCopy; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::style::Stylize; @@ -49,26 +50,6 @@ pub(crate) use input::JumpTarget; pub(crate) use input::ViewAction; pub(crate) use layout::ActivityTranscriptLines; -/// Copy origin plus the deselection policy applied after confirmed delivery. -#[derive(Clone, Copy, Debug, Eq, PartialEq)] -pub(crate) enum SelectionCopy { - Explicit, - OnSelect { clear_selection: bool }, -} - -impl SelectionCopy { - fn clear_selection(self) -> bool { - match self { - Self::Explicit => true, - Self::OnSelect { clear_selection } => clear_selection, - } - } - - fn publishes_primary(self) -> bool { - matches!(self, Self::OnSelect { .. }) - } -} - #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] enum EntryKey { Cell(usize), diff --git a/codex-rs/tui/src/transcript_view/copy_on_select_tests.rs b/codex-rs/tui/src/transcript_view/copy_on_select_tests.rs index 69ff193c3b..1f8bcd30c9 100644 --- a/codex-rs/tui/src/transcript_view/copy_on_select_tests.rs +++ b/codex-rs/tui/src/transcript_view/copy_on_select_tests.rs @@ -55,8 +55,16 @@ fn copy_on_select_waits_for_release_and_confirmed_delivery() { assert!(!view.tick_selection(&cells)); if let Some(copied) = copied { let selection_copy = selection_copy.expect("copy on select policy"); - assert_eq!(selection_copy, SelectionCopy::OnSelect { clear_selection }); - assert!(selection_copy.publishes_primary()); + assert_eq!( + selection_copy, + SelectionCopy::on_select( + /*clipboard*/ true, + /*primary*/ false, + clear_selection, + ) + ); + assert!(selection_copy.copies_clipboard()); + assert!(!selection_copy.publishes_primary()); let buffer = render(&mut view, &cells, /*width*/ 20, /*height*/ 1); let highlight = (0..20) .map(|column| { diff --git a/codex-rs/tui/src/transcript_view/input.rs b/codex-rs/tui/src/transcript_view/input.rs index f5bf119402..6e3ebd290d 100644 --- a/codex-rs/tui/src/transcript_view/input.rs +++ b/codex-rs/tui/src/transcript_view/input.rs @@ -93,15 +93,19 @@ impl TranscriptView { /// Automatic copies may deselect but still publish PRIMARY, so retain their source. pub(crate) fn selection_copy(&self, action: &ViewAction) -> SelectionCopy { match action { - ViewAction::CopyOnSelect(_) => SelectionCopy::OnSelect { - clear_selection: self.copy_on_select_clear_selection, - }, + ViewAction::CopyOnSelect(_) => SelectionCopy::on_select( + /*clipboard*/ true, + self.primary_selection, + self.copy_on_select_clear_selection, + ), + ViewAction::PrimarySelection(_) => SelectionCopy::on_select( + /*clipboard*/ false, /*primary*/ true, /*clear_selection*/ false, + ), ViewAction::Changed | ViewAction::ExitSelectMode - | ViewAction::PrimarySelection(_) | ViewAction::Copy(_) | ViewAction::CopyAndFollow(_) - | ViewAction::OpenLink(_) => SelectionCopy::Explicit, + | ViewAction::OpenLink(_) => SelectionCopy::EXPLICIT, } } diff --git a/codex-rs/tui/src/transcript_view/selection.rs b/codex-rs/tui/src/transcript_view/selection.rs index b6cae02895..47ee87dd94 100644 --- a/codex-rs/tui/src/transcript_view/selection.rs +++ b/codex-rs/tui/src/transcript_view/selection.rs @@ -7,7 +7,6 @@ use unicode_segmentation::UnicodeSegmentation; use super::*; use crate::clipboard_copy::CopyFormat; -use crate::clipboard_copy::worker::CopyDestination; use crate::clipboard_copy::worker::CopyResult; use crate::text_selection::SelectionUnit; use crate::tui::Tui; @@ -326,14 +325,16 @@ impl TranscriptView { /// A PRIMARY write is silent: it neither claims CLIPBOARD was copied nor ends selection. pub(crate) fn publish_primary(&mut self, tui: &mut Tui, text: &str) { - let (_, owner) = tui.clipboard.select( - text.into(), + let (_, owner) = tui.copy_selection( + text, CopyFormat::PlainText, - CopyDestination::Primary, - tui.frame_requester(), + SelectionCopy::on_select( + /*clipboard*/ false, /*primary*/ true, /*clear_selection*/ false, + ), + text, ); if let Some(selection) = &mut self.selection { - selection.primary_owner = Some(owner); + selection.primary_owner = owner; } } @@ -442,18 +443,20 @@ impl TranscriptView { let text = match action { ViewAction::Copy(text) | ViewAction::CopyOnSelect(text) + | ViewAction::PrimarySelection(text) | ViewAction::CopyAndFollow(text) => text.as_str(), - ViewAction::PrimarySelection(text) => { - self.publish_primary(tui, text); - return None; - } ViewAction::Changed | ViewAction::ExitSelectMode | ViewAction::OpenLink(_) => { return None; } }; let selection_copy = self.selection_copy(action); + if !selection_copy.copies_clipboard() { + if selection_copy.publishes_primary() { + self.publish_primary(tui, text); + } + return None; + } let clear_selection = selection_copy.clear_selection(); - let publish_primary = selection_copy.publishes_primary() && self.primary_selection; let mut primary_owner = None; let result = self.copy_selected_text_with(cells, text, clear_selection, |rich, rich_format| { @@ -464,21 +467,13 @@ impl TranscriptView { (text, CopyFormat::MarkdownSelection(source)) } }; - if publish_primary { - let (result, owner) = tui.clipboard.select( - copy_text.into(), - format, - CopyDestination::ClipboardAndPrimary(text.into()), - tui.frame_requester(), - ); - primary_owner = Some(owner); - result - } else { - tui.clipboard - .copy(copy_text.into(), format, tui.frame_requester()) - } + let (result, owner) = tui.copy_selection(copy_text, format, selection_copy, text); + primary_owner = owner; + result }); - if publish_primary && let Some(selection) = &mut self.selection { + if selection_copy.publishes_primary() + && let Some(selection) = &mut self.selection + { selection.primary_owner = primary_owner; } if matches!(action, ViewAction::CopyAndFollow(_)) diff --git a/codex-rs/tui/src/tui.rs b/codex-rs/tui/src/tui.rs index f17c2d0462..dd0fc95ccd 100644 --- a/codex-rs/tui/src/tui.rs +++ b/codex-rs/tui/src/tui.rs @@ -94,6 +94,8 @@ mod windows_console; #[cfg(any(windows, test))] mod windows_key_sequence; +pub(crate) use selection_clipboard::SelectionCopy; + /// Target frame interval for UI redraw scheduling. pub(crate) const TARGET_FRAME_INTERVAL: Duration = frame_rate_limiter::MIN_FRAME_INTERVAL; diff --git a/codex-rs/tui/src/tui/selection_clipboard.rs b/codex-rs/tui/src/tui/selection_clipboard.rs index 69df258121..09ec4917b0 100644 --- a/codex-rs/tui/src/tui/selection_clipboard.rs +++ b/codex-rs/tui/src/tui/selection_clipboard.rs @@ -3,14 +3,92 @@ use super::Tui; use crate::clipboard_copy::CopyFormat; use crate::clipboard_copy::CopyStatus; +use crate::clipboard_copy::worker::CopyDestination; +use crate::clipboard_copy::worker::CopyResult; +use std::sync::Arc; + +/// Clipboard destinations and completion behavior shared by selectable surfaces. +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +pub(crate) struct SelectionCopy { + clipboard: bool, + primary: bool, + clear_selection: bool, +} + +impl SelectionCopy { + pub(crate) const EXPLICIT: Self = Self { + clipboard: true, + primary: false, + clear_selection: true, + }; + + pub(crate) fn on_select(clipboard: bool, primary: bool, clear_selection: bool) -> Self { + Self { + clipboard, + primary, + clear_selection, + } + } + + pub(crate) fn copies_clipboard(self) -> bool { + self.clipboard + } + + pub(crate) fn publishes_primary(self) -> bool { + self.primary + } + + pub(crate) fn clear_selection(self) -> bool { + self.clear_selection + } +} impl Tui { + /// Copy to CLIPBOARD and/or publish X11 PRIMARY under one selection policy. + pub(crate) fn copy_selection( + &mut self, + text: &str, + format: CopyFormat, + selection_copy: SelectionCopy, + primary_text: &str, + ) -> (CopyResult, Option>) { + let text: Arc = text.into(); + match ( + selection_copy.copies_clipboard(), + selection_copy.publishes_primary(), + ) { + (true, true) => { + let (result, owner) = self.clipboard.select( + Arc::clone(&text), + format, + CopyDestination::ClipboardAndPrimary(primary_text.into()), + self.frame_requester(), + ); + (result, Some(owner)) + } + (true, false) => ( + self.clipboard.copy(text, format, self.frame_requester()), + None, + ), + (false, true) => { + let (result, owner) = self.clipboard.select( + text, + format, + CopyDestination::Primary, + self.frame_requester(), + ); + (result, Some(owner)) + } + (false, false) => (Err("selection copy has no destination".into()), None), + } + } + pub(crate) fn copy_transcript_selection( &mut self, text: &str, format: CopyFormat, ) -> Result { - self.clipboard - .copy(text.into(), format, self.frame_requester()) + self.copy_selection(text, format, SelectionCopy::EXPLICIT, text) + .0 } } From 21c16161191ff965031d1ac41fe9046011610743 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Tue, 13 Oct 2026 19:46:45 +0000 Subject: [PATCH 010/155] Support Command/Super shortcuts in the TUI keymap (#53754) ## What changed - Accept `super` modifiers and normalize `cmd` and `command` aliases to `super`. Support capturing, displaying, and using these bindings in shortcuts, chords, and leaders. - Add `super-left`, `super-right`, and `super-backspace` editor defaults for moving to the start or end of a line and deleting to its start. - Honor safe Super-modified editor shortcuts during startup without treating them as text or inserting a pending paste newline. - Save keymap edits through `config/value/write` when connected to a local daemon so it can validate bindings before they are saved or applied. Preserve the configuration and active keymap if the daemon rejects the edit. ## Testing Add coverage for modifier aliases, shortcut capture and labels, chords and leaders, line editing, startup input, and daemon acceptance or rejection of keymap edits. Extend the startup PTY test with Command editing sequences. GitOrigin-RevId: 8ed74f8253c89d423d5dfe87aa092844ce834454 --- codex-rs/config/src/tui_keymap.rs | 34 ++++++-- codex-rs/tui/src/app/event_dispatch.rs | 45 ++++++++-- .../app/tests/local_command_scroll_tests.rs | 82 +++++++++++++++++++ .../app/tests/session_lifecycle_requests.rs | 13 +++ ...tests__keymap_daemon_rejected_binding.snap | 5 ++ codex-rs/tui/src/bottom_pane/textarea.rs | 16 ++++ codex-rs/tui/src/key_hint.rs | 21 +++-- codex-rs/tui/src/key_hint_label_tests.rs | 1 + codex-rs/tui/src/keymap.rs | 22 +++-- codex-rs/tui/src/keymap/chords.rs | 4 +- codex-rs/tui/src/keymap/chords_tests.rs | 11 +++ codex-rs/tui/src/keymap/leader.rs | 9 +- codex-rs/tui/src/keymap_setup.rs | 40 ++++++++- ...ap_setup__tests__keymap_picker_editor.snap | 39 +++++++++ codex-rs/tui/src/startup_draft_input.rs | 24 ++++-- codex-rs/tui/src/startup_draft_tests.rs | 32 +++++--- codex-rs/tui/src/tui_startup_tests.rs | 8 +- 17 files changed, 347 insertions(+), 59 deletions(-) create mode 100644 codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__local_command_scroll_tests__keymap_daemon_rejected_binding.snap create mode 100644 codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_editor.snap diff --git a/codex-rs/config/src/tui_keymap.rs b/codex-rs/config/src/tui_keymap.rs index 47360c88c4..f0e5b13f0d 100644 --- a/codex-rs/config/src/tui_keymap.rs +++ b/codex-rs/config/src/tui_keymap.rs @@ -576,7 +576,7 @@ pub struct TuiKeymap { /// Normalize one user-entered key spec into canonical storage format. /// -/// The output always orders modifiers as `ctrl-alt-shift-` when present +/// The output always orders modifiers as `ctrl-alt-shift-super-` when present /// and applies accepted aliases (`escape` -> `esc`, `pageup` -> `page-up`). /// Inputs that cannot be represented unambiguously are rejected. /// @@ -635,8 +635,12 @@ See the Codex keymap documentation for supported actions and examples." )); } - let mut modifiers = - BTreeMap::<&str, bool>::from([("ctrl", false), ("alt", false), ("shift", false)]); + let mut modifiers = BTreeMap::<&str, bool>::from([ + ("ctrl", false), + ("alt", false), + ("shift", false), + ("super", false), + ]); let mut key_segments = Vec::new(); let mut saw_key = false; @@ -645,6 +649,7 @@ See the Codex keymap documentation for supported actions and examples." "ctrl" | "control" => Some("ctrl"), "alt" | "option" => Some("alt"), "shift" => Some("shift"), + "super" | "cmd" | "command" => Some("super"), _ => None, }; @@ -668,10 +673,12 @@ See the Codex keymap documentation for supported actions and examples." )); } - if key_segments - .iter() - .any(|segment| matches!(*segment, "ctrl" | "control" | "alt" | "option" | "shift")) - { + if key_segments.iter().any(|segment| { + matches!( + *segment, + "ctrl" | "control" | "alt" | "option" | "shift" | "super" | "cmd" | "command" + ) + }) { return Err(format!( "invalid keybinding `{raw}`: modifiers must come before the key (for example `ctrl-a`)." )); @@ -688,6 +695,9 @@ See the Codex keymap documentation for supported actions and examples." if modifiers.get("shift").copied().unwrap_or(false) { normalized.push("shift".to_string()); } + if modifiers.get("super").copied().unwrap_or(false) { + normalized.push("super".to_string()); + } normalized.push(key); Ok(normalized.join("-")) } @@ -908,6 +918,16 @@ mod tests { assert_eq!(normalize_keybinding_spec("f24"), Ok("f24".to_string())); assert!(normalize_keybinding_spec("f25").is_err()); } + + #[test] + fn command_modifier_aliases_normalize_to_super() { + for spec in ["cmd-left", "command-left", "super-left"] { + assert_eq!( + normalize_keybinding_spec(spec), + Ok("super-left".to_string()) + ); + } + } } #[cfg(test)] diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs index e5bd89312b..b7f6a94f51 100644 --- a/codex-rs/tui/src/app/event_dispatch.rs +++ b/codex-rs/tui/src/app/event_dispatch.rs @@ -3425,7 +3425,7 @@ impl App { key, intent, } => { - self.apply_keymap_capture(context, action, key, intent) + self.apply_keymap_capture(app_server, context, action, key, intent) .await; self.merge_startup_warnings(tui, &history_cell::StartupWarningsCell::default()); } @@ -3510,6 +3510,7 @@ impl App { async fn apply_keymap_capture( &mut self, + app_server: &mut AppServerSession, context: String, action: String, key: String, @@ -3559,13 +3560,41 @@ impl App { } }; - let edit = - crate::legacy_core::config::edit::keymap_bindings_edit(&context, &action, &bindings); - match ConfigEditsBuilder::for_config_path(self.local_settings.user_config_path.as_path()) - .with_edits([edit]) - .apply() - .await - { + let save = if matches!(self.app_server_target, AppServerTarget::LocalDaemon { .. }) { + // Let the daemon validate shared config before writing: older daemons may + // not understand bindings introduced by this TUI, including new defaults. + app_server + .request_handle() + .request_typed::( + codex_app_server_protocol::ClientRequest::ConfigValueWrite { + request_id: app_server.next_request_id(), + params: codex_app_server_protocol::ConfigValueWriteParams { + key_path: format!("tui.keymap.{context}.{action}"), + value: match bindings.as_slice() { + [binding] => serde_json::json!(binding), + bindings => serde_json::json!(bindings), + }, + merge_strategy: codex_app_server_protocol::MergeStrategy::Replace, + file_path: Some( + self.local_settings.user_config_path.display().to_string(), + ), + expected_version: None, + }, + }, + ) + .await + .map(|_| ()) + .map_err(anyhow::Error::new) + } else { + let edit = crate::legacy_core::config::edit::keymap_bindings_edit( + &context, &action, &bindings, + ); + ConfigEditsBuilder::for_config_path(self.local_settings.user_config_path.as_path()) + .with_edits([edit]) + .apply() + .await + }; + match save { Ok(()) => { self.cancel_pending_key_chord(); self.local_settings.tui.keymap = keymap_config.clone(); diff --git a/codex-rs/tui/src/app/tests/local_command_scroll_tests.rs b/codex-rs/tui/src/app/tests/local_command_scroll_tests.rs index 45ee9e7cf9..b4b41fbdd3 100644 --- a/codex-rs/tui/src/app/tests/local_command_scroll_tests.rs +++ b/codex-rs/tui/src/app/tests/local_command_scroll_tests.rs @@ -285,6 +285,88 @@ async fn settings_confirmations_reveal_their_history_output() -> Result<()> { Ok(()) } +#[tokio::test] +async fn keymap_daemon_validates_before_saving_or_applying_bindings() -> Result<()> { + use super::session_lifecycle_requests::HistoryCapabilities; + use super::session_lifecycle_requests::recorded_params; + use super::session_lifecycle_requests::start_recording_app_server_with_history; + + for capabilities in [ + HistoryCapabilities::Current, + HistoryCapabilities::SuperBindingsUnsupported, + ] { + let (mut app, mut events, _op_rx) = make_test_app_with_channels().await; + let mut tui = crate::tui::test_support::make_test_tui()?; + let path = app.local_settings.user_config_path.clone(); + std::fs::write(&path, "# retained config\n")?; + let original_keymap = app.local_settings.tui.keymap.clone(); + let (mut server, requests, proxy) = start_recording_app_server_with_history( + &app.config, + capabilities, + /*blocked_thread_list*/ None, + /*failed_thread_name*/ None, + crate::app_server_session::ThreadParamsMode::Embedded, + LoaderOverrides::without_managed_config_for_tests(), + ) + .await?; + app.app_server_target = AppServerTarget::LocalDaemon { + endpoint: crate::resolve_remote_addr("ws://127.0.0.1:4500")?, + allow_embedded_fallback: false, + }; + app.handle_event( + &mut tui, + &mut server, + AppEvent::KeymapCaptured { + context: "editor".into(), + action: "move_line_start".into(), + key: "f12".into(), + intent: crate::app_event::KeymapEditIntent::AddAlternate, + }, + ) + .await?; + while let Ok(event) = events.try_recv() { + app.handle_event(&mut tui, &mut server, event).await?; + } + assert_eq!( + recorded_params(&requests, "config/value/write"), + vec![serde_json::json!({ + "keyPath": "tui.keymap.editor.move_line_start", + "value": ["home", "ctrl-a", "super-left", "f12"], + "mergeStrategy": "replace", + "filePath": path.display().to_string(), + "expectedVersion": null, + })], + ); + if capabilities == HistoryCapabilities::Current { + let saved: codex_config::config_toml::ConfigToml = + toml::from_str(&std::fs::read_to_string(&path)?)?; + assert_eq!(saved.tui.unwrap().keymap, app.local_settings.tui.keymap); + assert_eq!( + crate::keymap_setup::active_binding_specs(&app.keymap, "editor", "move_line_start") + .expect("editor bindings"), + vec!["home", "ctrl-a", "super-left", "f12"], + ); + } else { + assert_eq!(std::fs::read_to_string(&path)?, "# retained config\n"); + assert_eq!(app.local_settings.tui.keymap, original_keymap); + assert_eq!( + crate::keymap_setup::active_binding_specs(&app.keymap, "editor", "move_line_start") + .expect("editor bindings"), + vec!["home", "ctrl-a", "super-left"], + ); + let error = app.transcript_cells.last().expect("save error"); + insta::assert_snapshot!( + "keymap_daemon_rejected_binding", + lines_to_single_string(&error.display_lines(/*width*/ 80)), + ); + } + server.start_thread(&app.config).await?; + server.shutdown().await?; + proxy.await??; + } + Ok(()) +} + #[tokio::test] async fn local_command_and_inline_error_reveal_their_history_output() -> Result<()> { let (mut app, mut events, _op_rx) = make_test_app_with_channels().await; diff --git a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs index bca048a4ea..ed67f0bf9d 100644 --- a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs +++ b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs @@ -377,6 +377,7 @@ pub(super) enum HistoryCapabilities { ThreadStartDuringLegacyShutdown, ConfigReadUnsupported(i64), ConfigReadFails, + SuperBindingsUnsupported, ConfigReadUnknownVoice, VoiceCatalogCustom, VoiceCatalogUnavailable, @@ -655,6 +656,18 @@ pub(super) async fn start_recording_app_server_with_realtime_speech( message: "config temporarily unavailable".to_string(), }, }) + } else if history_capabilities == HistoryCapabilities::SuperBindingsUnsupported + && request.method == "config/value/write" + { + JSONRPCMessage::Error(JSONRPCError { + id: request_id, + error: JSONRPCErrorError { + code: -32600, + data: None, + message: "Invalid configuration: unknown key `super-left`" + .to_string(), + }, + }) } else if history_capabilities == HistoryCapabilities::VoiceCatalogUnavailable && request.method == "thread/realtime/listVoices" { diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__local_command_scroll_tests__keymap_daemon_rejected_binding.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__local_command_scroll_tests__keymap_daemon_rejected_binding.snap new file mode 100644 index 0000000000..45836d8537 --- /dev/null +++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__local_command_scroll_tests__keymap_daemon_rejected_binding.snap @@ -0,0 +1,5 @@ +--- +source: tui/src/app/tests/local_command_scroll_tests.rs +expression: lines_to_single_string(&error.display_lines(80)) +--- +■ Failed to save shortcut: config/value/write failed: Invalid configuration: unknown key `super-left` (code -32600) diff --git a/codex-rs/tui/src/bottom_pane/textarea.rs b/codex-rs/tui/src/bottom_pane/textarea.rs index 6a21beba8f..7a2540d993 100644 --- a/codex-rs/tui/src/bottom_pane/textarea.rs +++ b/codex-rs/tui/src/bottom_pane/textarea.rs @@ -3158,6 +3158,22 @@ mod tests { assert_eq!(t.cursor(), 3); } + #[test] + fn super_line_editing_defaults_follow_macos_conventions() { + let mut textarea = ta_with("first\nsecond third"); + textarea.set_cursor("first\nsecond".len()); + + textarea.input(KeyEvent::new(KeyCode::Left, KeyModifiers::SUPER)); + assert_eq!(textarea.cursor(), "first\n".len()); + + textarea.input(KeyEvent::new(KeyCode::Right, KeyModifiers::SUPER)); + assert_eq!(textarea.cursor(), textarea.text().len()); + + textarea.input(KeyEvent::new(KeyCode::Backspace, KeyModifiers::SUPER)); + assert_eq!(textarea.text(), "first\n"); + assert_eq!(textarea.cursor(), "first\n".len()); + } + #[test] fn kill_current_line_removes_current_line_linewise() { let mut t = ta_with("abc\ndef\nghi"); diff --git a/codex-rs/tui/src/key_hint.rs b/codex-rs/tui/src/key_hint.rs index 001d401046..723ddc4e26 100644 --- a/codex-rs/tui/src/key_hint.rs +++ b/codex-rs/tui/src/key_hint.rs @@ -23,19 +23,21 @@ use ratatui::style::Style; use ratatui::text::Span; #[cfg(any(test, target_os = "macos"))] -const MODIFIER_LABELS: [(KeyModifiers, &str); 3] = [ +const MODIFIER_LABELS: [(KeyModifiers, &str); 4] = [ (KeyModifiers::CONTROL, "⌃"), (KeyModifiers::SHIFT, "⇧"), (KeyModifiers::ALT, "⌥"), + (KeyModifiers::SUPER, "⌘"), ]; #[cfg(not(any(test, target_os = "macos")))] -const MODIFIER_LABELS: [(KeyModifiers, &str); 3] = [ +const MODIFIER_LABELS: [(KeyModifiers, &str); 4] = [ #[cfg(target_os = "linux")] (KeyModifiers::CONTROL, "^"), #[cfg(not(target_os = "linux"))] (KeyModifiers::CONTROL, "ctrl"), (KeyModifiers::SHIFT, "shift"), (KeyModifiers::ALT, "alt"), + (KeyModifiers::SUPER, "super"), ]; /// One concrete key event that can trigger a TUI action. @@ -215,9 +217,9 @@ impl KeyBindingListExt for [KeyBinding] { /// Searchable pickers use this to avoid stealing plain printable characters for /// navigation when the same character might be a valid query. For example, a /// list may bind `j` and `k` for movement, but a searchable list must let -/// plain `j` update the query while still allowing `Ctrl+J` to move. Calling -/// this after normalizing keybindings would blur that distinction and cause -/// printable search input to disappear. +/// plain `j` update the query while still allowing `Ctrl+J` or `Cmd+J` to move. +/// Calling this after normalizing keybindings would blur that distinction and +/// cause printable search input to disappear. pub(crate) fn is_plain_text_key_event(event: KeyEvent) -> bool { matches!( event, @@ -228,6 +230,7 @@ pub(crate) fn is_plain_text_key_event(event: KeyEvent) -> bool { } if !ch.is_ascii_control() && !modifiers.contains(KeyModifiers::CONTROL) && !modifiers.contains(KeyModifiers::ALT) + && !modifiers.contains(KeyModifiers::SUPER) ) } @@ -344,6 +347,14 @@ mod tests { assert!(!bindings.is_pressed(KeyEvent::new(KeyCode::Char('c'), KeyModifiers::NONE))); } + #[test] + fn super_char_event_is_not_plain_text() { + assert!(!is_plain_text_key_event(KeyEvent::new( + KeyCode::Char('j'), + KeyModifiers::SUPER, + ))); + } + #[test] fn shifted_letter_binding_matches_uppercase_char_events() { let binding = shift(KeyCode::Char('a')); diff --git a/codex-rs/tui/src/key_hint_label_tests.rs b/codex-rs/tui/src/key_hint_label_tests.rs index d42aa07e15..4d93806b1f 100644 --- a/codex-rs/tui/src/key_hint_label_tests.rs +++ b/codex-rs/tui/src/key_hint_label_tests.rs @@ -14,6 +14,7 @@ fn modifier_combinations_stay_compact_inside_chords() { (KeyModifiers::ALT, "⌥t"), (KeyModifiers::CONTROL | KeyModifiers::SHIFT, "⌃⇧t"), (KeyModifiers::CONTROL | KeyModifiers::ALT, "⌃⌥t"), + (KeyModifiers::SUPER, "⌘t"), ]; for (modifiers, expected) in cases { let prefix = KeyBinding::new(KeyCode::Char('t'), modifiers); diff --git a/codex-rs/tui/src/keymap.rs b/codex-rs/tui/src/keymap.rs index 841b3fef70..a2294dd90f 100644 --- a/codex-rs/tui/src/keymap.rs +++ b/codex-rs/tui/src/keymap.rs @@ -1719,8 +1719,16 @@ impl RuntimeKeymap { raw(KeyBinding::new(KeyCode::Right, KeyModifiers::ALT)), raw(KeyBinding::new(KeyCode::Right, KeyModifiers::CONTROL)) ], - move_line_start: default_bindings![plain(KeyCode::Home), ctrl(KeyCode::Char('a'))], - move_line_end: default_bindings![plain(KeyCode::End), ctrl(KeyCode::Char('e'))], + move_line_start: default_bindings![ + plain(KeyCode::Home), + ctrl(KeyCode::Char('a')), + raw(KeyBinding::new(KeyCode::Left, KeyModifiers::SUPER)) + ], + move_line_end: default_bindings![ + plain(KeyCode::End), + ctrl(KeyCode::Char('e')), + raw(KeyBinding::new(KeyCode::Right, KeyModifiers::SUPER)) + ], delete_backward: default_bindings![ plain(KeyCode::Backspace), shift(KeyCode::Backspace), @@ -1753,7 +1761,10 @@ impl RuntimeKeymap { )), alt(KeyCode::Char('d')) ], - kill_line_start: default_bindings![ctrl(KeyCode::Char('u'))], + kill_line_start: default_bindings![ + ctrl(KeyCode::Char('u')), + raw(KeyBinding::new(KeyCode::Backspace, KeyModifiers::SUPER)) + ], kill_whole_line: default_bindings![], kill_line_end: default_bindings![ctrl(KeyCode::Char('k'))], yank: default_bindings![ctrl(KeyCode::Char('y'))], @@ -2681,6 +2692,7 @@ fn parse_keybinding(spec: &str) -> Option { "ctrl" => modifiers |= KeyModifiers::CONTROL, "alt" => modifiers |= KeyModifiers::ALT, "shift" => modifiers |= KeyModifiers::SHIFT, + "super" => modifiers |= KeyModifiers::SUPER, other => { key_name = Some(other.to_string()); break; @@ -2742,11 +2754,11 @@ mod tests { #[test] fn parses_canonical_binding() { - let binding = parse_keybinding("ctrl-alt-shift-a").expect("binding should parse"); + let binding = parse_keybinding("ctrl-alt-shift-super-a").expect("binding should parse"); assert_eq!(binding.parts().0, KeyCode::Char('a')); assert_eq!( binding.parts().1, - KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT + KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT | KeyModifiers::SUPER ); } diff --git a/codex-rs/tui/src/keymap/chords.rs b/codex-rs/tui/src/keymap/chords.rs index fc6855fba5..4c32e26127 100644 --- a/codex-rs/tui/src/keymap/chords.rs +++ b/codex-rs/tui/src/keymap/chords.rs @@ -769,13 +769,13 @@ Windows. Choose a different chord and retry.", } if matches!(prefix_key, KeyCode::Char(_)) - && !crate::key_hint::has_ctrl_or_alt(prefix_modifiers) + && crate::key_hint::is_plain_text_key_event(KeyEvent::new(prefix_key, prefix_modifiers)) && !binding.action.context.allows_plain_chord_prefix() && binding.action.context != KeymapContext::Agents { return Err(format!( "Invalid `{path}` = `{}`: a chord prefix outside Vim or the command center must use ctrl, \ -alt, or a non-character key so ordinary text input is not intercepted.", +alt, super, or a non-character key so ordinary text input is not intercepted.", binding.spec )); } diff --git a/codex-rs/tui/src/keymap/chords_tests.rs b/codex-rs/tui/src/keymap/chords_tests.rs index a83149a8f8..3ba4131e7e 100644 --- a/codex-rs/tui/src/keymap/chords_tests.rs +++ b/codex-rs/tui/src/keymap/chords_tests.rs @@ -189,6 +189,17 @@ fn allows_shared_prefixes_with_distinct_completions() { RuntimeKeymap::from_config(&config).expect("prefix trie can branch on the second stroke"); } +#[test] +fn allows_super_modified_character_prefixes_and_leaders() { + let mut config = TuiKeymap::default(); + config.global.leader = Some(binding("super-k")); + config.global.open_transcript = Some(binding("leader super-t")); + config.global.copy = Some(binding("super-o super-c")); + + RuntimeKeymap::from_config(&config) + .expect("Super-modified characters do not intercept ordinary text input"); +} + #[test] fn allows_plain_prefixes_in_vim_and_repeated_chords_in_all_contexts() { let mut config = TuiKeymap::default(); diff --git a/codex-rs/tui/src/keymap/leader.rs b/codex-rs/tui/src/keymap/leader.rs index 6bbe0de5cf..bd3807fc50 100644 --- a/codex-rs/tui/src/keymap/leader.rs +++ b/codex-rs/tui/src/keymap/leader.rs @@ -9,6 +9,7 @@ use super::resolve_bindings; use crate::key_hint; use codex_config::types::TuiKeymap; use crossterm::event::KeyCode; +use crossterm::event::KeyEvent; use itertools::Itertools; pub(super) fn resolve(config: &TuiKeymap, chords: &mut RuntimeChordKeymap) -> Result<(), String> { @@ -42,11 +43,13 @@ pub(super) fn resolve(config: &TuiKeymap, chords: &mut RuntimeChordKeymap) -> Re let (key, modifiers) = prefix.parts(); let label = prefix.display_label(); if matches!(key, KeyCode::Char(_)) - && (!key_hint::has_ctrl_or_alt(modifiers) || key_hint::is_altgr(modifiers)) + && (key_hint::is_plain_text_key_event(KeyEvent::new(key, modifiers)) + || key_hint::is_altgr(modifiers)) { return Err(format!( - "Invalid `tui.keymap.global.leader` = `{label}`: use ctrl, alt, or a non-character \ -key so ordinary text input is not intercepted. Ctrl-alt characters may be AltGr input on Windows." + "Invalid `tui.keymap.global.leader` = `{label}`: use ctrl, alt, super, or a \ +non-character key so ordinary text input is not intercepted. Ctrl-alt characters may be AltGr \ +input on Windows." )); } #[cfg(unix)] diff --git a/codex-rs/tui/src/keymap_setup.rs b/codex-rs/tui/src/keymap_setup.rs index e9bba1e9dd..7d8faa0b6e 100644 --- a/codex-rs/tui/src/keymap_setup.rs +++ b/codex-rs/tui/src/keymap_setup.rs @@ -668,10 +668,11 @@ fn key_parts_to_config_key_spec( let (code, normalized_modifiers) = crate::key_hint::normalize_key_parts(code, modifiers); modifiers = normalized_modifiers; - let supported_modifiers = KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT; + let supported_modifiers = + KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT | KeyModifiers::SUPER; if !modifiers.difference(supported_modifiers).is_empty() { return Err( - "Only ctrl, alt, and shift modifiers can be stored in `tui.keymap`.".to_string(), + "Only ctrl, alt, shift, and super modifiers can be stored in `tui.keymap`.".to_string(), ); } @@ -732,6 +733,9 @@ fn format_key_spec(modifiers: KeyModifiers, key: &str) -> String { if modifiers.contains(KeyModifiers::SHIFT) { parts.push("shift"); } + if modifiers.contains(KeyModifiers::SUPER) { + parts.push("super"); + } parts.push(key); parts.join("-") } @@ -1282,6 +1286,15 @@ mod tests { assert_snapshot!("keymap_picker_narrow", render_picker(params, /*width*/ 78)); } + #[test] + fn picker_editor_render_snapshot() { + let runtime = RuntimeKeymap::defaults(); + let mut params = build_keymap_picker_params(&runtime, &TuiKeymap::default()); + params.initial_tab_id = Some("editor-shortcuts".to_string()); + + assert_snapshot!("keymap_picker_editor", render_picker(params, /*width*/ 120)); + } + #[test] fn picker_custom_render_snapshot() { let keymap = @@ -1758,12 +1771,12 @@ mod tests { fn key_capture_serializes_modifier_order_for_config() { let event = KeyEvent::new( KeyCode::Char('K'), - KeyModifiers::CONTROL | KeyModifiers::ALT, + KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SUPER, ); assert_eq!( key_event_to_config_key_spec(event), - Ok("ctrl-alt-shift-k".to_string()) + Ok("ctrl-alt-shift-super-k".to_string()) ); } @@ -1957,6 +1970,25 @@ mod tests { ); } + #[test] + fn add_alternate_preserves_super_default_binding() { + let runtime = RuntimeKeymap::defaults(); + let outcome = keymap_with_edit( + &TuiKeymap::default(), + &runtime, + "editor", + "move_line_start", + "f12", + &KeymapEditIntent::AddAlternate, + ) + .expect("add alternate"); + + let KeymapEditOutcome::Updated { bindings, .. } = outcome else { + panic!("expected updated keymap"); + }; + assert_eq!(bindings, vec!["home", "ctrl-a", "super-left", "f12"]); + } + #[test] fn add_alternate_duplicate_is_noop() { let runtime = RuntimeKeymap::defaults(); diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_editor.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_editor.snap new file mode 100644 index 0000000000..dac53fd0d8 --- /dev/null +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_editor.snap @@ -0,0 +1,39 @@ +--- +source: tui/src/keymap_setup.rs +expression: "render_picker(params, 120)" +--- + + Keymap + Inline editor movement and editing shortcuts. + 17 actions. + + All Common Customized (0) Unbound (5) App Composer Editor Vim Navigation Agents Approval › + + Type to search shortcuts + +› Editor Insert Newline ctrl-j, ctrl-m, enter, shift-enter, alt-enter + Editor Move Left left, ctrl-b + Editor Move Right right, ctrl-f + Editor Move Up up, ctrl-p + Editor Move Down down, ctrl-n + Editor Move Word Left alt-b, alt-left, ctrl-left + Editor Move Word Right alt-f, alt-right, ctrl-right + Editor Move Line Start home, ctrl-a, super-left + Editor Move Line End end, ctrl-e, super-right + Editor Delete Backward backspace, shift-backspace, ctrl-h + Editor Delete Forward delete, shift-delete, ctrl-d + Editor Delete Backward Word alt-backspace, ctrl-backspace, ctrl-shift-backspace, ctrl-w, ctrl-alt-h + Editor Delete Forward Word alt-delete, ctrl-delete, ctrl-shift-delete, alt-d + Editor Kill Line Start ctrl-u, super-backspace + Editor - Kill Whole Line unbound + Editor Kill Line End ctrl-k + Editor Yank ctrl-y + + + + + + + + + left/right group · enter edit shortcut · * custom · - unbound · esc close diff --git a/codex-rs/tui/src/startup_draft_input.rs b/codex-rs/tui/src/startup_draft_input.rs index b37e70957e..2031500404 100644 --- a/codex-rs/tui/src/startup_draft_input.rs +++ b/codex-rs/tui/src/startup_draft_input.rs @@ -35,7 +35,12 @@ impl StartupDraftPump { modifiers, kind: KeyEventKind::Press | KeyEventKind::Repeat, .. - }) => !key_hint::has_ctrl_or_alt(*modifiers), + }) => { + !key_hint::has_ctrl_or_alt(*modifiers) + && !modifiers.intersects( + KeyModifiers::SUPER | KeyModifiers::HYPER | KeyModifiers::META, + ) + } TuiEvent::Key(KeyEvent { code: KeyCode::Enter, modifiers, @@ -228,13 +233,14 @@ pub(super) fn handle_startup_draft_key( } } - if key_hint::has_ctrl_or_alt(key.modifiers) && !bottom_pane.is_safe_startup_editor_key(key) - || key.code == KeyCode::Enter && !bottom_pane.is_safe_startup_editor_key(key) - || key - .modifiers - .intersects(KeyModifiers::SUPER | KeyModifiers::HYPER | KeyModifiers::META) - || !bottom_pane.is_safe_startup_editor_key(key) - && !matches!( + let is_safe_startup_editor_key = bottom_pane.is_safe_startup_editor_key(key); + if !is_safe_startup_editor_key + && (key_hint::has_ctrl_or_alt(key.modifiers) + || key.code == KeyCode::Enter + || key + .modifiers + .intersects(KeyModifiers::SUPER | KeyModifiers::HYPER | KeyModifiers::META) + || !matches!( key.code, KeyCode::Char(_) | KeyCode::Enter @@ -247,7 +253,7 @@ pub(super) fn handle_startup_draft_key( | KeyCode::End | KeyCode::Backspace | KeyCode::Delete - ) + )) { return Ok(()); } diff --git a/codex-rs/tui/src/startup_draft_tests.rs b/codex-rs/tui/src/startup_draft_tests.rs index 2cb7703f40..03a76ab430 100644 --- a/codex-rs/tui/src/startup_draft_tests.rs +++ b/codex-rs/tui/src/startup_draft_tests.rs @@ -619,19 +619,22 @@ fn startup_draft_allows_local_editor_shortcuts_without_startup_actions() { } #[cfg(target_os = "windows")] -#[test] -fn startup_draft_preserves_windows_altgr_text_input() { +#[tokio::test] +async fn startup_draft_preserves_windows_altgr_text_input() { let mut pump = startup_test_pump(std::iter::empty()); - handle_startup_draft_key( - &mut pump.bottom_pane, - KeyEvent::new( + pump.bottom_pane.insert_str("first"); + pump.pending_paste_newline = Some((tokio::time::Instant::now(), "\n".to_string())); + let mut tui = crate::tui::test_support::make_test_tui().expect("create test terminal"); + pump.handle_event( + &mut tui, + TuiEvent::Key(KeyEvent::new( KeyCode::Char('@'), KeyModifiers::CONTROL | KeyModifiers::ALT, - ), + )), ) .expect("preserve printable AltGr input"); pump.bottom_pane.flush_composer_paste_burst(); - assert_eq!(pump.bottom_pane.composer_text(), "@"); + assert_eq!(pump.bottom_pane.composer_text(), "first\n@"); } #[tokio::test] @@ -684,7 +687,7 @@ async fn startup_draft_applies_paste_burst_preferences_without_losing_buffered_i } #[tokio::test] -async fn startup_draft_applies_editor_keymap_without_enabling_vim() { +async fn startup_draft_applies_super_editor_keymap_without_inserting_pending_newline() { let codex_home = tempfile::tempdir().expect("create temporary Codex home"); let config = ConfigBuilder::default() .codex_home(codex_home.path().to_path_buf()) @@ -694,7 +697,7 @@ async fn startup_draft_applies_editor_keymap_without_enabling_vim() { let mut settings = crate::local_settings::LocalSettings::from(&config); settings.tui.vim_mode_default = true; settings.tui.keymap.editor.move_line_start = Some(codex_config::types::KeybindingsSpec::One( - codex_config::types::KeybindingSpec("ctrl-z".to_string()), + codex_config::types::KeybindingSpec("super-z".to_string()), )); let mut pump = startup_test_pump(std::iter::empty()); pump.bottom_pane.insert_str("draft"); @@ -707,13 +710,16 @@ async fn startup_draft_applies_editor_keymap_without_enabling_vim() { .expect("insert ordinary text despite the configured Vim mode"); pump.bottom_pane.flush_composer_paste_burst(); assert_eq!(pump.bottom_pane.composer_text(), "draftx"); - handle_startup_draft_key( - &mut pump.bottom_pane, - KeyEvent::new(KeyCode::Char('z'), KeyModifiers::CONTROL), + pump.pending_paste_newline = Some((tokio::time::Instant::now(), "\n".to_string())); + let mut tui = crate::tui::test_support::make_test_tui().expect("create test terminal"); + pump.handle_event( + &mut tui, + TuiEvent::Key(KeyEvent::new(KeyCode::Char('z'), KeyModifiers::SUPER)), ) .expect("honor a configured safe editor shortcut"); + pump.bottom_pane.flush_composer_paste_burst(); assert_eq!(pump.bottom_pane.composer_cursor(), 0); - let mut tui = crate::tui::test_support::make_test_tui().expect("create test terminal"); + assert_eq!(pump.bottom_pane.composer_text(), "draftx"); pump.handle_event(&mut tui, TuiEvent::Key(KeyEvent::from(KeyCode::Enter))) .expect("confirm draft"); pump.apply_settings(&settings, config.cwd.as_path()); diff --git a/codex-rs/tui/src/tui_startup_tests.rs b/codex-rs/tui/src/tui_startup_tests.rs index b0e27aa648..859a097323 100644 --- a/codex-rs/tui/src/tui_startup_tests.rs +++ b/codex-rs/tui/src/tui_startup_tests.rs @@ -93,8 +93,10 @@ fn startup_preserves_typeahead_and_discards_buffered_action_key_after_first_draw let result = (|| -> Result<(), String> { wait_for_file(&draft_ready)?; + // Warp emits Cmd+Left, Cmd+Right, and Cmd+Backspace using these Kitty protocol + // sequences: CSI 1;9D, CSI 1;9C, and CSI 127;9u. master - .write_all(b"abc\r\x1b[DZ") + .write_all(b"abc\r\x1b[DZ\x1b[C\x1b[127;9umiddle\x1b[1;9DL\x1b[1;9CR") .map_err(|err| format!("failed to queue editable startup input: {err}"))?; std::fs::write(&draft_queued, []) .map_err(|err| format!("failed to signal editable startup input: {err}"))?; @@ -285,10 +287,10 @@ async fn startup_typeahead_pty_child() { tui.pause_events(); let draft = startup_draft.into_draft(); assert_eq!( - draft.text, "abZ!c", + draft.text, "LmiddleR!", "startup Enter must not submit the draft" ); - assert_eq!(draft.cursor, 3, "startup cursor edits must survive handoff"); + assert_eq!(draft.cursor, 8, "startup cursor edits must survive handoff"); assert!(draft.local_images.is_empty()); tui.draw(u16::MAX, |_| {}).expect("draw actionable screen"); From 20b4ff2f35f2193608385e4caa8da8ceee45a3cf Mon Sep 17 00:00:00 2001 From: Anthony Tafoya Date: Tue, 13 Oct 2026 20:34:24 +0000 Subject: [PATCH 011/155] Enrich V2 capability discovery with resolved plugin and skill metadata (#53763) ## What changed - Return qualified skill names such as `team:deploy` and parsed `dependencies` and `policy` instead of a separate namespace and raw metadata file. Share `agents/openai.yaml` parsing and validation between skill loaders and executor discovery. - Include each standalone skill's search-root ID and path in `discoveryRoot`, while accepting responses from older executors that omit it. - Add plugin `displayName`, falling back to the manifest name or installation directory. - Materialize inline MCP declarations in `mcpConfig` with the manifest as their source path, and report incomplete discovery when declared MCP or Apps configuration files have no returned contents. ## Testing Add coverage for JSON round trips, omitted `discoveryRoot`, optional and invalid skill metadata, qualified names, display-name fallbacks, and inline MCP configuration. Verify standalone search roots survive cached discovery and sandboxed RPC responses. GitOrigin-RevId: 4124972444ad7c2fb8c6418acbf9a589d797fad2 --- codex-rs/Cargo.lock | 2 +- .../core/tests/suite/executor_discovery_v2.rs | 6 +- codex-rs/exec-server-protocol/Cargo.toml | 1 + .../exec-server-protocol/src/capabilities.rs | 28 ++- .../src/capabilities_tests.rs | 55 ++++- codex-rs/exec-server-protocol/src/protocol.rs | 7 +- .../src/discoverV2/capability_discoveries.rs | 97 +++++++- .../src/discoverV2/capability_locations.rs | 13 +- .../capability_locations/candidates.rs | 14 +- .../tests/capability_discoveries_tests.rs | 227 ++++++++++++++++-- .../tests/capability_locations_tests.rs | 8 +- codex-rs/exec-server/src/lib.rs | 1 + codex-rs/exec-server/tests/capabilities_v2.rs | 35 ++- codex-rs/ext/skills/Cargo.toml | 1 - codex-rs/ext/skills/src/loader/environment.rs | 20 +- codex-rs/ext/skills/src/loader/metadata.rs | 156 +----------- codex-rs/ext/skills/src/loader/mod.rs | 7 - codex-rs/skills/src/lib.rs | 3 + codex-rs/skills/src/metadata.rs | 164 +++++++++++++ codex-rs/skills/src/model.rs | 9 +- 20 files changed, 621 insertions(+), 233 deletions(-) create mode 100644 codex-rs/skills/src/metadata.rs diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index ad3060d741..d2d52d2268 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -3303,6 +3303,7 @@ dependencies = [ "codex-network-proxy", "codex-protocol", "codex-shell-command", + "codex-skills", "codex-utils-path-uri", "pretty_assertions", "serde", @@ -4639,7 +4640,6 @@ dependencies = [ "schemars 0.8.22", "serde", "serde_json", - "serde_yaml", "tempfile", "tokio", "toml 0.9.11+spec-1.1.0", diff --git a/codex-rs/core/tests/suite/executor_discovery_v2.rs b/codex-rs/core/tests/suite/executor_discovery_v2.rs index f8e278ec56..55393cb72d 100644 --- a/codex-rs/core/tests/suite/executor_discovery_v2.rs +++ b/codex-rs/core/tests/suite/executor_discovery_v2.rs @@ -147,11 +147,13 @@ impl Executor { .iter().map(|root| json!({"id":root["id"],"path":root["path"]})).collect::>() })), Some("capabilities/discoverV2") => Some(json!({ - "plugins":[{"id":"inert-sentinel@market","remotePluginId":null, + "plugins":[{"id":"inert-sentinel@market","displayName":"inert-sentinel","remotePluginId":null, "version":"1","root":"file:///inert-sentinel", "files":{"manifest":{"path":"file:///inert-sentinel/.codex-plugin/plugin.json", "contents":"{\"name\":\"inert-sentinel\",\"mcpServers\":{\"inert-sentinel\":{\"command\":\"never-run\"}}}"}, - "mcpConfig":null,"appsConfig":null},"skills":[]}], + "mcpConfig":{"path":"file:///inert-sentinel/.codex-plugin/plugin.json", + "contents":"{\"inert-sentinel\":{\"command\":\"never-run\"}}"}, + "appsConfig":null},"skills":[]}], "skills":[{"name":"inert-sentinel","description":"must not enter the prompt", "shortDescription":null,"path":"file:///inert-sentinel/SKILL.md","metadata":null}], "warnings":[] diff --git a/codex-rs/exec-server-protocol/Cargo.toml b/codex-rs/exec-server-protocol/Cargo.toml index eda1add272..a203df0535 100644 --- a/codex-rs/exec-server-protocol/Cargo.toml +++ b/codex-rs/exec-server-protocol/Cargo.toml @@ -19,6 +19,7 @@ codex-install-context = { workspace = true } codex-network-proxy = { workspace = true } codex-protocol = { workspace = true } codex-shell-command = { workspace = true } +codex-skills = { workspace = true } codex-utils-path-uri = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision", "raw_value"] } diff --git a/codex-rs/exec-server-protocol/src/capabilities.rs b/codex-rs/exec-server-protocol/src/capabilities.rs index 3adb4538f8..3e952f318b 100644 --- a/codex-rs/exec-server-protocol/src/capabilities.rs +++ b/codex-rs/exec-server-protocol/src/capabilities.rs @@ -1,13 +1,14 @@ //! Executor capability inventory; callers apply identity and enablement. use codex_file_system::FileSystemSandboxContext; +use codex_skills::SkillDependencies; +use codex_skills::SkillPolicy; use codex_utils_path_uri::PathUri; use serde::Deserialize; use serde::Serialize; use std::fmt; use std::sync::Arc; -use crate::CapabilityTextFile; use crate::DiscoveredPluginFiles; pub const CAPABILITIES_DISCOVER_V2_METHOD: &str = "capabilities/discoverV2"; @@ -44,6 +45,8 @@ pub struct DiscoverV2CapabilitiesResponse { pub struct ExecutorPlugin { /// Environment-local ID: `@`. pub id: String, + /// Manifest display name, falling back to its name or the installation directory. + pub display_name: String, pub remote_plugin_id: Option, pub version: String, pub root: PathUri, @@ -51,20 +54,30 @@ pub struct ExecutorPlugin { pub skills: Vec, } +/// Executor-owned search root for a standalone skill. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct SkillDiscoveryRoot { + pub id: String, + pub path: PathUri, +} + /// Skill metadata, excluding instructions and resources. #[derive(Clone, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct ExecutorSkill { + /// Final skill name, qualified by the nearest enclosing plugin namespace when present. pub name: String, - /// Nearest enclosing legacy plugin's name, following V1 precedence. - #[serde(default)] - pub namespace: Option, pub description: String, #[serde(default)] pub short_description: Option, /// Path to SKILL.md, not its containing directory. pub path: PathUri, - pub metadata: Option, + /// Absent for plugin skills and responses from older executors. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub discovery_root: Option, + pub dependencies: Option, + pub policy: Option, } impl fmt::Debug for ExecutorPlugin { @@ -95,12 +108,7 @@ impl fmt::Debug for ExecutorSkill { formatter .debug_struct("ExecutorSkill") .field("name", &self.name) - .field("namespace", &self.namespace) .field("path", &self.path) - .field( - "metadata_path", - &self.metadata.as_ref().map(|file| &file.path), - ) .finish() } } diff --git a/codex-rs/exec-server-protocol/src/capabilities_tests.rs b/codex-rs/exec-server-protocol/src/capabilities_tests.rs index d2cdab71b1..eda7263af5 100644 --- a/codex-rs/exec-server-protocol/src/capabilities_tests.rs +++ b/codex-rs/exec-server-protocol/src/capabilities_tests.rs @@ -1,6 +1,7 @@ //! V2 discovery requests and responses round-trip through JSON. use super::*; +use crate::CapabilityTextFile; use pretty_assertions::assert_eq; #[test] @@ -19,16 +20,37 @@ fn discovery_contract_round_trips_json() -> Result<(), Box Result<(), Box(wire.clone())?, + response + ); + // Older executors omit the root metadata. + wire["skills"][0] + .as_object_mut() + .expect("skill object") + .remove("discoveryRoot"); + let mut legacy_response = response; + legacy_response.skills[0].discovery_root = None; assert_eq!( serde_json::from_value::(wire)?, - response + legacy_response ); Ok(()) } diff --git a/codex-rs/exec-server-protocol/src/protocol.rs b/codex-rs/exec-server-protocol/src/protocol.rs index 26614350c3..c0bb0966ee 100644 --- a/codex-rs/exec-server-protocol/src/protocol.rs +++ b/codex-rs/exec-server-protocol/src/protocol.rs @@ -966,7 +966,8 @@ pub struct CapabilityRootsDiscoverResponse { pub roots: Vec, } -/// Recognized UTF-8 capability file materialized by the exec-server. +/// UTF-8 capability contents materialized by the exec-server. +/// `path` identifies the source file; V2 inline MCP contents are extracted from its manifest. #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct CapabilityTextFile { @@ -979,7 +980,9 @@ pub struct CapabilityTextFile { #[serde(rename_all = "camelCase")] pub struct DiscoveredPluginFiles { pub manifest: CapabilityTextFile, - /// File-backed MCP declarations, including the conventional `.mcp.json` fallback. + /// MCP declarations from a selected file, including the conventional `.mcp.json` fallback. + /// V2 also materializes inline declarations, using the manifest as the source path. + /// V1 leaves inline declarations only in `manifest`. #[serde(default)] pub mcp_config: Option, /// File-backed connector declarations. diff --git a/codex-rs/exec-server/src/discoverV2/capability_discoveries.rs b/codex-rs/exec-server/src/discoverV2/capability_discoveries.rs index b681a417c0..5a8e51b024 100644 --- a/codex-rs/exec-server/src/discoverV2/capability_discoveries.rs +++ b/codex-rs/exec-server/src/discoverV2/capability_discoveries.rs @@ -6,16 +6,19 @@ use std::sync::Arc; use codex_file_system::ExecutorFileSystem; use codex_skills::parse_skill_frontmatter_metadata; +use codex_skills::parse_skill_metadata; use futures::StreamExt; use serde::Deserialize; use serde::Serialize; use crate::CapabilityRootDiscoverRequest; use crate::CapabilityRootDiscovery; +use crate::CapabilityTextFile; use crate::DiscoverV2CapabilitiesResponse; use crate::ExecutorPlugin; use crate::ExecutorSkill; use crate::LocalFileSystem; +use crate::SkillDiscoveryRoot; use crate::capability_discovery::MAX_CONCURRENT_ROOTS; use crate::capability_discovery::discover_root; use crate::discover_v2::capability_locations::CapabilityLocation; @@ -39,6 +42,23 @@ struct CapabilityDiscovery { warnings: Vec, } +// Only the metadata V2 returns or needs to materialize discovered configuration. +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct PluginManifestMetadata { + #[serde(default)] + name: String, + interface: Option, + mcp_servers: Option, + apps: Option, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct PluginManifestInterface { + display_name: Option, +} + impl Default for CapabilityDiscovery { fn default() -> Self { Self { @@ -237,18 +257,87 @@ fn parse_root( } ancestor = root.parent(); } + let metadata = skill.metadata.as_ref().and_then(|metadata| { + parse_skill_metadata(&metadata.contents).map_err(|error| { + tracing::warn!(path = %metadata.path, %error, "ignoring invalid discovered skill metadata"); + }).ok() + }).unwrap_or_default(); skills.push(ExecutorSkill { - name: parsed.name, - namespace, + name: namespace + .map(|namespace| format!("{namespace}:{}", parsed.name)) + .unwrap_or(parsed.name), description: parsed.description, short_description: parsed.short_description, path, - metadata: skill.metadata, + discovery_root: location + .standalone_root_id + .as_ref() + .map(|id| SkillDiscoveryRoot { + id: id.clone(), + path: location.root.clone(), + }), + dependencies: metadata.dependencies, + policy: metadata.policy, }); } - let content = if let (Some(plugin), Some(files)) = (location.plugin, discovery.plugin) { + let content = if let (Some(plugin), Some(mut files)) = (location.plugin, discovery.plugin) { + let manifest = + match serde_json::from_str::(&files.manifest.contents) { + Ok(manifest) => manifest, + Err(_) => { + warnings.push(format!( + "invalid plugin manifest at {}", + files.manifest.path + )); + return CapabilityDiscovery { + warnings, + ..Default::default() + }; + } + }; + let name = if manifest.name.trim().is_empty() { + location.root.basename().unwrap_or(manifest.name) + } else { + manifest.name + }; + let display_name = manifest + .interface + .and_then(|interface| interface.display_name) + .map(|display_name| display_name.trim().to_string()) + .filter(|display_name| !display_name.is_empty()) + .unwrap_or(name); + // V2 materializes inline declarations; the path identifies their source manifest. + if files.mcp_config.is_none() { + if let Some(contents) = manifest + .mcp_servers + .as_ref() + .filter(|value| value.is_object()) + { + files.mcp_config = Some(CapabilityTextFile { + path: files.manifest.path.clone(), + contents: contents.to_string(), + }); + } else if manifest + .mcp_servers + .as_ref() + .is_some_and(serde_json::Value::is_string) + { + warnings.push(format!( + "plugin `{}` at {} declares an MCP configuration file, but discovery returned no contents", + plugin.id, location.root + )); + } + } + + if files.apps_config.is_none() && manifest.apps.is_some() { + warnings.push(format!( + "plugin `{}` at {} declares an Apps configuration file, but discovery returned no contents", + plugin.id, location.root + )); + } DiscoveredSource::Plugin(Box::new(ExecutorPlugin { id: plugin.id, + display_name, remote_plugin_id: plugin.remote_plugin_id, version: plugin.version, root: location.root, diff --git a/codex-rs/exec-server/src/discoverV2/capability_locations.rs b/codex-rs/exec-server/src/discoverV2/capability_locations.rs index 12c443af94..e32d460a88 100644 --- a/codex-rs/exec-server/src/discoverV2/capability_locations.rs +++ b/codex-rs/exec-server/src/discoverV2/capability_locations.rs @@ -39,6 +39,7 @@ const AGENTS_SKILLS_SUFFIX: &str = ".agents/skills"; #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub(crate) struct CapabilityLocation { pub root: PathUri, + pub standalone_root_id: Option, pub plugin: Option, } @@ -69,19 +70,22 @@ pub(crate) async fn prewarm_locations( .map(PathUri::to_abs_path) .transpose()?; // Fixed standalone roots extend Flora's V1 root; project skill discovery is deferred. - let mut skill_roots = vec![codex_home.join("skills")]; + let mut skill_roots = vec![("codex-home-skills", codex_home.join("skills"))]; if let Some(home) = user_home { - skill_roots.push(home.join(AGENTS_SKILLS_SUFFIX)); + skill_roots.push(("user-agent-skills", home.join(AGENTS_SKILLS_SUFFIX))); } if let Some(system_root) = &request.system_skills_root { - skill_roots.push(system_root.to_abs_path()?); + skill_roots.push(("system-skills", system_root.to_abs_path()?)); } CandidateCapabilityLocations::resolve( fs, Some(PathUri::from_abs_path(&codex_home.join(PLUGINS_CACHE_DIR))), skill_roots .into_iter() - .map(|root| PathUri::from_abs_path(&root)) + .map(|(id, root)| crate::SkillDiscoveryRoot { + id: id.to_string(), + path: PathUri::from_abs_path(&root), + }) .collect(), ) .await @@ -171,6 +175,7 @@ async fn discover_cached_plugins( }; locations.locations.push(CapabilityLocation { root: PathUri::from_abs_path(&package_root.join(&version)), + standalone_root_id: None, plugin: Some(InstalledPlugin { id, version, diff --git a/codex-rs/exec-server/src/discoverV2/capability_locations/candidates.rs b/codex-rs/exec-server/src/discoverV2/capability_locations/candidates.rs index 332baeb3a2..0036a85c5b 100644 --- a/codex-rs/exec-server/src/discoverV2/capability_locations/candidates.rs +++ b/codex-rs/exec-server/src/discoverV2/capability_locations/candidates.rs @@ -5,6 +5,7 @@ use super::CapabilityLocations; use super::MAX_LOCATIONS; use super::discover_cached_plugins; use crate::LocalFileSystem; +use crate::SkillDiscoveryRoot; use codex_file_system::ExecutorFileSystem; use codex_file_watcher::WatchPath; use codex_utils_path_uri::PathUri; @@ -22,7 +23,7 @@ pub(super) struct CandidateCapabilityLocations { #[derive(Clone, Debug, PartialEq, Eq)] enum CandidateCapabilityLocation { Cache(PathUri), - Standalone(PathUri), + Standalone(SkillDiscoveryRoot), } impl CandidateCapabilityLocations { @@ -30,7 +31,7 @@ impl CandidateCapabilityLocations { pub(super) async fn resolve( fs: &LocalFileSystem, cache_root: Option, - skill_roots: Vec, + skill_roots: Vec, ) -> io::Result { let mut candidates = cache_root .into_iter() @@ -38,7 +39,7 @@ impl CandidateCapabilityLocations { .collect::>(); let mut standalone = skill_roots; let mut seen = std::collections::HashSet::new(); - standalone.retain(|root| seen.insert(root.clone())); + standalone.retain(|root| seen.insert(root.path.clone())); candidates.extend( standalone .into_iter() @@ -49,8 +50,8 @@ impl CandidateCapabilityLocations { let mut retained_candidates = Vec::new(); for candidate in candidates { let root = match &candidate { - CandidateCapabilityLocation::Cache(root) - | CandidateCapabilityLocation::Standalone(root) => root, + CandidateCapabilityLocation::Cache(root) => root, + CandidateCapabilityLocation::Standalone(root) => &root.path, }; let exists = match fs .get_metadata(root, Default::default(), /*sandbox*/ None) @@ -90,7 +91,8 @@ impl CandidateCapabilityLocations { // Standalone roots need no manifest or version selection. CandidateCapabilityLocation::Standalone(root) => Ok(CapabilityLocations { locations: vec![CapabilityLocation { - root: root.clone(), + root: root.path.clone(), + standalone_root_id: Some(root.id.clone()), plugin: None, }], ..Default::default() diff --git a/codex-rs/exec-server/src/discoverV2/tests/capability_discoveries_tests.rs b/codex-rs/exec-server/src/discoverV2/tests/capability_discoveries_tests.rs index dd144081ec..2975953969 100644 --- a/codex-rs/exec-server/src/discoverV2/tests/capability_discoveries_tests.rs +++ b/codex-rs/exec-server/src/discoverV2/tests/capability_discoveries_tests.rs @@ -9,6 +9,7 @@ use crate::CapabilityRootDiscoverRequest; use crate::DiscoverV2CapabilitiesRequest; use crate::ExecutorSkill; use crate::LocalFileSystem; +use crate::SkillDiscoveryRoot; use crate::capability_discovery::discover_root; use crate::discover_v2::capability_locations::tests::MANIFEST; use crate::discover_v2::capability_locations::tests::request; @@ -36,6 +37,24 @@ async fn discovery_preserves_inventory_and_v1_metadata() -> anyhow::Result<()> { MANIFEST, )?; } + let inline_root = "codex/plugins/cache/test/unconfigured/local"; + write( + temp.path(), + "codex/plugins/cache/test/disabled/local/.codex-plugin/plugin.json", + r#"{"name":" ","interface":{"displayName":" "},"mcpServers":"./missing-mcp.json","apps":"./missing-apps.json"}"#, + )?; + let inline_manifest = r#"{"name":"inline","interface":{"displayName":" Inline Plugin "},"mcpServers":{"inline":{"command":"node"}}}"#; + write( + temp.path(), + &format!("{inline_root}/.codex-plugin/plugin.json"), + inline_manifest, + )?; + // Inline declarations take precedence over a conventional MCP file. + write( + temp.path(), + &format!("{inline_root}/.mcp.json"), + r#"{"wrong":{"command":"wrong"}}"#, + )?; let root = "codex/plugins/cache/test/demo/local"; write( temp.path(), @@ -86,6 +105,17 @@ async fn discovery_preserves_inventory_and_v1_metadata() -> anyhow::Result<()> { .await; // V1 keeps undeclared/migrated skills and excludes the skill beyond its depth limit. assert_eq!(v1.skills.len(), 4); + let inline_v1 = discover_root( + &file_system, + CapabilityRootDiscoverRequest { + id: "unconfigured@test".to_string(), + path: PathUri::from_host_native_path(temp.path().join(inline_root))?, + sandbox: None, + }, + ) + .await; + let inline_v1_files = inline_v1.plugin.expect("inline plugin"); + assert_eq!(inline_v1_files.mcp_config, None); let manager = CapabilityManager::new(file_system); manager.seed_prewarmed_locations(request.clone()).await?; let response = manager @@ -102,6 +132,14 @@ async fn discovery_preserves_inventory_and_v1_metadata() -> anyhow::Result<()> { .collect::>(), vec!["demo@test", "disabled@test", "unconfigured@test"], ); + assert_eq!( + response + .plugins + .iter() + .map(|plugin| plugin.display_name.as_str()) + .collect::>(), + vec!["demo", "local", "Inline Plugin"], + ); let plugin = response .plugins .first() @@ -122,38 +160,60 @@ async fn discovery_preserves_inventory_and_v1_metadata() -> anyhow::Result<()> { v1.skills .into_iter() .map(|skill| { - let namespace = if skill + let name = if skill .instructions .path .starts_with(&plugin.root.join("nested")?) { - "team" + "team:deploy" } else { - "demo" + "demo:deploy" }; - Ok(expected_skill(skill.instructions.path, Some(namespace))) + Ok(expected_skill(skill.instructions.path, name)) }) .collect::>>()? ); assert_eq!( response.skills, vec![ - ExecutorSkill { - name: "deploy skill".to_string(), - ..expected_skill( - request.codex_home.join("skills/deploy skill/SKILL.md")?, - /*namespace*/ None, - ) - }, + expected_skill( + request.codex_home.join("skills/deploy skill/SKILL.md")?, + "deploy skill", + ), expected_skill( request .codex_home .join("skills/nested/skills/deploy/SKILL.md")?, - Some("team") + "team:deploy" ), - ], + ] + .into_iter() + .map(|mut skill| { + skill.discovery_root = Some(SkillDiscoveryRoot { + id: "codex-home-skills".to_string(), + path: request.codex_home.join("skills").expect("skills root"), + }); + skill + }) + .collect::>(), + ); + let inline_plugin = response + .plugins + .iter() + .find(|plugin| plugin.id == "unconfigured@test") + .expect("inline plugin"); + assert_eq!(inline_plugin.files.manifest, inline_v1_files.manifest); + assert_eq!( + inline_plugin.files.mcp_config, + Some(crate::CapabilityTextFile { + path: inline_v1_files.manifest.path, + contents: serde_json::json!({"inline": {"command": "node"}}).to_string(), + }) + ); + assert_eq!( + response.warnings, + vec!["some capability metadata could not be loaded; discovery may be incomplete"], ); - assert_eq!(response.warnings, v1.warnings); let json = serde_json::to_string(&response)?; assert!( response.plugins.len() + plugin.skills.len() + response.skills.len() <= MAX_CAPABILITIES @@ -164,14 +224,15 @@ async fn discovery_preserves_inventory_and_v1_metadata() -> anyhow::Result<()> { Ok(()) } -fn expected_skill(path: PathUri, namespace: Option<&str>) -> ExecutorSkill { +fn expected_skill(path: PathUri, name: &str) -> ExecutorSkill { ExecutorSkill { - name: "deploy".to_string(), - namespace: namespace.map(str::to_string), + name: name.to_string(), description: "Deploy the service.".to_string(), short_description: None, path, - metadata: None, + discovery_root: None, + dependencies: None, + policy: None, } } @@ -214,3 +275,133 @@ async fn discovery_reports_location_failures_without_paths() -> anyhow::Result<( } Ok(()) } + +#[tokio::test] +async fn discovery_resolves_optional_skill_metadata() -> anyhow::Result<()> { + use codex_protocol::protocol::Product; + use codex_skills::SkillDependencies; + use codex_skills::SkillPolicy; + use codex_skills::SkillToolDependency; + + let dependencies = Some(SkillDependencies { + tools: vec![SkillToolDependency { + r#type: "mcp".into(), + value: "deploy".into(), + description: None, + transport: Some("stdio".into()), + command: Some("deploy-mcp".into()), + url: None, + oauth_callback_port: Some(3118), + }], + }); + let policy = Some(SkillPolicy { + allow_implicit_invocation: Some(false), + products: vec![Product::Codex, Product::Chatgpt], + }); + for (yaml, dependencies, policy) in [ + (None, None, None), + (Some("interface: [invalid]"), None, None), + (Some("dependencies:\n tools: [{type: mcp}]"), None, None), + (Some("dependencies: {tools: []}"), None, None), + ( + Some( + r#"dependencies: + tools: + - type: " mcp " + value: " deploy " + transport: stdio + command: deploy-mcp + oauth: {callback_port: 3118} + - type: mcp + value: " " +policy: + allow_implicit_invocation: false + products: [codex, CHATGPT] +"#, + ), + dependencies, + policy, + ), + ] { + let temp = tempfile::tempdir()?; + let request = request(temp.path())?; + let plugin_root = "codex/plugins/cache/test/demo/local"; + write( + temp.path(), + &format!("{plugin_root}/.codex-plugin/plugin.json"), + MANIFEST, + )?; + for root in [ + "codex/skills/deploy".to_string(), + format!("{plugin_root}/skills/deploy"), + ] { + write(temp.path(), &format!("{root}/SKILL.md"), SKILL)?; + if let Some(yaml) = yaml { + write(temp.path(), &format!("{root}/agents/openai.yaml"), yaml)?; + } + } + let manager = CapabilityManager::new(LocalFileSystem::unsandboxed()); + manager.seed_prewarmed_locations(request.clone()).await?; + let response = manager + .get_or_refresh_discovery(DiscoverV2CapabilitiesRequest { + cwd: PathUri::from_host_native_path(temp.path().join("project"))?, + sandbox: None, + }) + .await?; + let mut expected = + expected_skill(request.codex_home.join("skills/deploy/SKILL.md")?, "deploy"); + expected.dependencies = dependencies; + expected.policy = policy; + expected.discovery_root = Some(SkillDiscoveryRoot { + id: "codex-home-skills".to_string(), + path: request.codex_home.join("skills")?, + }); + assert_eq!(response.skills, vec![expected.clone()]); + expected.path = request + .codex_home + .join("plugins/cache/test/demo/local/skills/deploy/SKILL.md")?; + expected.name = "demo:deploy".into(); + expected.discovery_root = None; + assert_eq!(response.plugins[0].skills, vec![expected]); + assert_eq!(response.warnings, Vec::::new()); + } + Ok(()) +} + +#[tokio::test] +async fn standalone_skills_retain_their_search_roots() -> anyhow::Result<()> { + let temp = tempfile::tempdir()?; + let request = request(temp.path())?; + let roots = [ + ("codex-home-skills", "codex/skills"), + ("user-agent-skills", "home/.agents/skills"), + ("system-skills", "etc/codex/skills"), + ]; + let mut expected = Vec::new(); + for (id, root) in roots { + for relative in ["deploy/SKILL.md", "nested/deploy/SKILL.md"] { + let path = format!("{root}/{relative}"); + write(temp.path(), &path, SKILL)?; + let mut skill = expected_skill( + PathUri::from_host_native_path(temp.path().join(path))?, + "deploy", + ); + skill.discovery_root = Some(SkillDiscoveryRoot { + id: id.to_string(), + path: PathUri::from_host_native_path(temp.path().join(root))?, + }); + expected.push(skill); + } + } + let manager = CapabilityManager::new(LocalFileSystem::unsandboxed()); + manager.seed_prewarmed_locations(request.clone()).await?; + let query = DiscoverV2CapabilitiesRequest { + cwd: PathUri::from_host_native_path(temp.path().join("project"))?, + sandbox: None, + }; + let response = manager.get_or_refresh_discovery(query.clone()).await?; + assert_eq!(response.skills, expected); + // Cached discovery must retain the same root metadata. + assert_eq!(manager.get_or_refresh_discovery(query).await?, response); + Ok(()) +} diff --git a/codex-rs/exec-server/src/discoverV2/tests/capability_locations_tests.rs b/codex-rs/exec-server/src/discoverV2/tests/capability_locations_tests.rs index 280b1b60ba..5b62a2abb9 100644 --- a/codex-rs/exec-server/src/discoverV2/tests/capability_locations_tests.rs +++ b/codex-rs/exec-server/src/discoverV2/tests/capability_locations_tests.rs @@ -67,15 +67,21 @@ async fn prewarming_resolves_global_locations_without_cwd_or_config() -> anyhow: actual.sort_unstable_by_key(|location| location.root.to_string()); let mut expected = vec![CapabilityLocation { root: request.codex_home.join("plugins/cache/team/demo/1.10.0")?, + standalone_root_id: None, plugin: Some(InstalledPlugin { id: "demo@team".to_string(), version: "1.10.0".to_string(), remote_plugin_id: Some("plugins~demo".to_string()), }), }]; - for root in ["codex/skills", "home/.agents/skills", "etc/codex/skills"] { + for (id, root) in [ + ("codex-home-skills", "codex/skills"), + ("user-agent-skills", "home/.agents/skills"), + ("system-skills", "etc/codex/skills"), + ] { expected.push(CapabilityLocation { root: PathUri::from_host_native_path(temp.path().join(root))?, + standalone_root_id: Some(id.to_string()), plugin: None, }); } diff --git a/codex-rs/exec-server/src/lib.rs b/codex-rs/exec-server/src/lib.rs index 93d7c98fbd..cd928c0fed 100644 --- a/codex-rs/exec-server/src/lib.rs +++ b/codex-rs/exec-server/src/lib.rs @@ -228,6 +228,7 @@ pub use protocol::ShellInfo; pub use protocol::ShellSnapshotRequest; pub use protocol::SignalParams; pub use protocol::SignalResponse; +pub use protocol::SkillDiscoveryRoot; pub use protocol::TerminateParams; pub use protocol::TerminateResponse; pub use protocol::WriteParams; diff --git a/codex-rs/exec-server/tests/capabilities_v2.rs b/codex-rs/exec-server/tests/capabilities_v2.rs index 3eacf46f85..2cc49bac28 100644 --- a/codex-rs/exec-server/tests/capabilities_v2.rs +++ b/codex-rs/exec-server/tests/capabilities_v2.rs @@ -6,10 +6,12 @@ use codex_exec_server::CAPABILITIES_DISCOVER_V2_METHOD; use codex_exec_server::DiscoverV2CapabilitiesRequest; use codex_exec_server::DiscoverV2CapabilitiesResponse; use codex_exec_server::InitializeResponse; +use codex_exec_server::SkillDiscoveryRoot; use codex_exec_server_protocol::JSONRPCMessage; use codex_utils_path_uri::PathUri; use common::exec_server::ExecServerHarness; use common::exec_server::exec_server_with_env; +use pretty_assertions::assert_eq; #[cfg(any(target_os = "linux", target_os = "macos", windows))] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] @@ -71,6 +73,19 @@ async fn v2_rpc_refreshes_metadata_and_enforces_sandbox() -> anyhow::Result<()> .iter() .any(|skill| skill.name == "demo" && skill.description == "original") ); + let expected_root = Some(SkillDiscoveryRoot { + id: "codex-home-skills".to_string(), + path: PathUri::from_host_native_path(codex_home_path.join("skills"))?, + }); + assert_eq!( + first + .skills + .iter() + .find(|skill| skill.name == "demo") + .context("demo skill")? + .discovery_root, + expected_root, + ); assert!(!serde_json::to_string(&first)?.contains("PRIVATE INSTRUCTION BODY")); assert!( @@ -131,7 +146,15 @@ async fn v2_rpc_refreshes_metadata_and_enforces_sandbox() -> anyhow::Result<()> { let response = discover(&mut server, &restricted).await?; assert!(response.plugins.is_empty()); - assert!(response.skills.iter().any(|skill| skill.name == "demo")); + assert_eq!( + response + .skills + .iter() + .find(|skill| skill.name == "demo") + .context("sandboxed demo skill")? + .discovery_root, + expected_root, + ); assert!(!serde_json::to_string(&response)?.contains("mail@market")); } // Windows restricted tokens reject split read access; a supported read-only policy succeeds. @@ -163,7 +186,15 @@ async fn v2_rpc_refreshes_metadata_and_enforces_sandbox() -> anyhow::Result<()> .iter() .any(|plugin| plugin.id == "mail@market") ); - assert!(response.skills.iter().any(|skill| skill.name == "demo")); + assert_eq!( + response + .skills + .iter() + .find(|skill| skill.name == "demo") + .context("sandboxed demo skill")? + .discovery_root, + expected_root, + ); } } diff --git a/codex-rs/ext/skills/Cargo.toml b/codex-rs/ext/skills/Cargo.toml index 80bcfba8cb..96019ce3f9 100644 --- a/codex-rs/ext/skills/Cargo.toml +++ b/codex-rs/ext/skills/Cargo.toml @@ -32,7 +32,6 @@ futures = { workspace = true } schemars = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -serde_yaml = { workspace = true } tokio = { workspace = true, features = ["rt", "sync", "time"] } toml = { workspace = true } tracing = { workspace = true } diff --git a/codex-rs/ext/skills/src/loader/environment.rs b/codex-rs/ext/skills/src/loader/environment.rs index c887ef41c0..b674291d67 100644 --- a/codex-rs/ext/skills/src/loader/environment.rs +++ b/codex-rs/ext/skills/src/loader/environment.rs @@ -24,12 +24,10 @@ use super::discovery::MAX_CONCURRENT_SKILL_LOADS; use super::discovery::SkillDiscoveryOptions; use super::discovery::SkillMetadataDiscovery; use super::discovery::discover_skills; -use super::metadata::SkillMetadataFile; -use super::metadata::resolve_dependencies; -use super::metadata::resolve_policy; use super::metadata::sanitize_single_line; use super::metadata::validate_len; use super::namespace::SkillNamespaceResolver; +use codex_skills::parse_skill_metadata; struct ParsedEnvironmentSkill { path_to_skills_md: PathUri, @@ -269,7 +267,7 @@ pub fn load_environment_skills_from_discovery( .metadata .as_ref() .and_then(|metadata| { - serde_yaml::from_str::(&metadata.contents) + parse_skill_metadata(&metadata.contents) .map_err(|error| { tracing::warn!( path = %metadata.path, @@ -278,12 +276,7 @@ pub fn load_environment_skills_from_discovery( }) .ok() }) - .map(|metadata| { - ( - resolve_dependencies(metadata.dependencies), - resolve_policy(metadata.policy), - ) - }) + .map(|metadata| (metadata.dependencies, metadata.policy)) .unwrap_or((None, None)); let metadata = EnvironmentSkillMetadata { path_to_skills_md: skill.instructions.path.clone(), @@ -367,7 +360,7 @@ async fn read_skill_metadata( return (None, None); } }; - let parsed: SkillMetadataFile = match serde_yaml::from_str(&contents) { + let parsed = match parse_skill_metadata(&contents) { Ok(parsed) => parsed, Err(error) => { tracing::warn!("ignoring {metadata_path}: invalid metadata: {error}"); @@ -375,10 +368,7 @@ async fn read_skill_metadata( } }; - ( - resolve_dependencies(parsed.dependencies), - resolve_policy(parsed.policy), - ) + (parsed.dependencies, parsed.policy) } fn default_skill_name(path: &PathUri) -> String { diff --git a/codex-rs/ext/skills/src/loader/metadata.rs b/codex-rs/ext/skills/src/loader/metadata.rs index 0527b3c881..7c0299d443 100644 --- a/codex-rs/ext/skills/src/loader/metadata.rs +++ b/codex-rs/ext/skills/src/loader/metadata.rs @@ -3,37 +3,19 @@ use std::io; use codex_exec_server::ExecutorFileSystem; use codex_exec_server::GetMetadataOptions; use codex_exec_server::ReadFileOptions; -use codex_protocol::protocol::Product; +use codex_skills::ParsedSkillMetadata; use codex_skills::SkillDependencies; use codex_skills::SkillInterface; use codex_skills::SkillInterfaceAssetPolicy; -use codex_skills::SkillInterfaceFile; use codex_skills::SkillParseError; use codex_skills::SkillPolicy; -use codex_skills::SkillToolDependency; +use codex_skills::parse_skill_metadata; use codex_skills::resolve_skill_interface; use codex_utils_absolute_path::AbsolutePathBuf; -use serde::Deserialize; -use super::MAX_DEPENDENCY_COMMAND_LEN; -use super::MAX_DEPENDENCY_DESCRIPTION_LEN; -use super::MAX_DEPENDENCY_TRANSPORT_LEN; -use super::MAX_DEPENDENCY_TYPE_LEN; -use super::MAX_DEPENDENCY_URL_LEN; -use super::MAX_DEPENDENCY_VALUE_LEN; use super::SKILLS_METADATA_FILENAME; use super::discovery::SkillMetadataDiscovery; -#[derive(Debug, Default, Deserialize)] -pub(super) struct SkillMetadataFile { - #[serde(default)] - interface: Option, - #[serde(default)] - pub(super) dependencies: Option, - #[serde(default)] - pub(super) policy: Option, -} - #[derive(Default)] pub(super) struct LoadedSkillMetadata { pub(super) interface: Option, @@ -41,39 +23,6 @@ pub(super) struct LoadedSkillMetadata { pub(super) policy: Option, } -#[derive(Debug, Default, Deserialize)] -pub(super) struct Dependencies { - #[serde(default)] - tools: Vec, -} - -#[derive(Debug, Deserialize)] -pub(super) struct Policy { - #[serde(default)] - allow_implicit_invocation: Option, - #[serde(default)] - products: Vec, -} - -#[derive(Debug, Default, Deserialize)] -struct DependencyTool { - #[serde(rename = "type")] - kind: Option, - value: Option, - description: Option, - transport: Option, - command: Option, - url: Option, - oauth: Option, -} - -#[derive(Debug, Default, Deserialize)] -#[serde(rename_all = "camelCase")] -struct DependencyOAuth { - #[serde(alias = "callback_port")] - callback_port: Option, -} - pub(super) async fn load_host_skill_metadata( file_system: &dyn ExecutorFileSystem, skill_path: &AbsolutePathBuf, @@ -127,7 +76,7 @@ pub(super) async fn load_host_skill_metadata( } }; - let parsed: SkillMetadataFile = match serde_yaml::from_str(&contents) { + let parsed = match parse_skill_metadata(&contents) { Ok(parsed) => parsed, Err(error) => { tracing::warn!( @@ -138,7 +87,7 @@ pub(super) async fn load_host_skill_metadata( } }; - let SkillMetadataFile { + let ParsedSkillMetadata { interface, dependencies, policy, @@ -149,73 +98,10 @@ pub(super) async fn load_host_skill_metadata( }; LoadedSkillMetadata { interface: resolve_skill_interface(interface, &skill_dir, asset_policy), - dependencies: resolve_dependencies(dependencies), - policy: resolve_policy(policy), + dependencies, + policy, } } -pub(super) fn resolve_dependencies( - dependencies: Option, -) -> Option { - let dependencies = dependencies?; - let tools = dependencies - .tools - .into_iter() - .filter_map(resolve_dependency_tool) - .collect::>(); - if tools.is_empty() { - None - } else { - Some(SkillDependencies { tools }) - } -} - -pub(super) fn resolve_policy(policy: Option) -> Option { - policy.map(|policy| SkillPolicy { - allow_implicit_invocation: policy.allow_implicit_invocation, - products: policy.products, - }) -} - -fn resolve_dependency_tool(tool: DependencyTool) -> Option { - let r#type = resolve_required_str( - tool.kind, - MAX_DEPENDENCY_TYPE_LEN, - "dependencies.tools.type", - )?; - let value = resolve_required_str( - tool.value, - MAX_DEPENDENCY_VALUE_LEN, - "dependencies.tools.value", - )?; - let description = resolve_str( - tool.description, - MAX_DEPENDENCY_DESCRIPTION_LEN, - "dependencies.tools.description", - ); - let transport = resolve_str( - tool.transport, - MAX_DEPENDENCY_TRANSPORT_LEN, - "dependencies.tools.transport", - ); - let command = resolve_str( - tool.command, - MAX_DEPENDENCY_COMMAND_LEN, - "dependencies.tools.command", - ); - let url = resolve_str(tool.url, MAX_DEPENDENCY_URL_LEN, "dependencies.tools.url"); - let oauth_callback_port = tool.oauth.and_then(|oauth| oauth.callback_port); - - Some(SkillToolDependency { - r#type, - value, - description, - transport, - command, - url, - oauth_callback_port, - }) -} - pub(super) fn sanitize_single_line(raw: &str) -> String { raw.split_whitespace().collect::>().join(" ") } @@ -236,33 +122,3 @@ pub(super) fn validate_len( } Ok(()) } - -pub(super) fn resolve_str( - value: Option, - max_len: usize, - field: &'static str, -) -> Option { - let value = value?; - let value = sanitize_single_line(&value); - if value.is_empty() { - tracing::warn!("ignoring {field}: value is empty"); - return None; - } - if value.chars().count() > max_len { - tracing::warn!("ignoring {field}: exceeds maximum length of {max_len} characters"); - return None; - } - Some(value) -} - -fn resolve_required_str( - value: Option, - max_len: usize, - field: &'static str, -) -> Option { - let Some(value) = value else { - tracing::warn!("ignoring {field}: value is missing"); - return None; - }; - resolve_str(Some(value), max_len, field) -} diff --git a/codex-rs/ext/skills/src/loader/mod.rs b/codex-rs/ext/skills/src/loader/mod.rs index 0802dc670c..55df37677b 100644 --- a/codex-rs/ext/skills/src/loader/mod.rs +++ b/codex-rs/ext/skills/src/loader/mod.rs @@ -21,12 +21,5 @@ pub(super) const SKILLS_METADATA_DIR: &str = "agents"; pub(super) const SKILLS_METADATA_FILENAME: &str = "openai.yaml"; pub(super) const MAX_NAME_LEN: usize = 64; pub(super) const MAX_QUALIFIED_NAME_LEN: usize = MAX_NAME_LEN * 2 + 1; -pub(super) const MAX_DESCRIPTION_LEN: usize = 1024; -pub(super) const MAX_DEPENDENCY_TYPE_LEN: usize = MAX_NAME_LEN; -pub(super) const MAX_DEPENDENCY_TRANSPORT_LEN: usize = MAX_NAME_LEN; -pub(super) const MAX_DEPENDENCY_VALUE_LEN: usize = MAX_DESCRIPTION_LEN; -pub(super) const MAX_DEPENDENCY_DESCRIPTION_LEN: usize = MAX_DESCRIPTION_LEN; -pub(super) const MAX_DEPENDENCY_COMMAND_LEN: usize = MAX_DESCRIPTION_LEN; -pub(super) const MAX_DEPENDENCY_URL_LEN: usize = MAX_DESCRIPTION_LEN; pub(super) const MAX_SCAN_DEPTH: usize = 6; pub(super) const MAX_SKILLS_DIRS_PER_ROOT: usize = 2000; diff --git a/codex-rs/skills/src/lib.rs b/codex-rs/skills/src/lib.rs index 7b19d32788..7ac553c8d1 100644 --- a/codex-rs/skills/src/lib.rs +++ b/codex-rs/skills/src/lib.rs @@ -2,6 +2,7 @@ mod interface; mod invocation; mod loading; mod mentions; +mod metadata; mod model; mod name_counts; mod parser; @@ -30,6 +31,8 @@ pub use mentions::extract_tool_mentions_with_sigil; pub use mentions::normalize_skill_path; pub use mentions::plugin_config_name_from_path; pub use mentions::tool_kind_for_path; +pub use metadata::ParsedSkillMetadata; +pub use metadata::parse_skill_metadata; pub use model::EnvironmentSkillMetadata; pub use model::SkillDependencies; pub use model::SkillInterface; diff --git a/codex-rs/skills/src/metadata.rs b/codex-rs/skills/src/metadata.rs new file mode 100644 index 0000000000..bb377e1773 --- /dev/null +++ b/codex-rs/skills/src/metadata.rs @@ -0,0 +1,164 @@ +//! Parses optional skill YAML metadata with shared host and executor validation. + +use codex_protocol::protocol::Product; +use serde::Deserialize; + +use crate::SkillDependencies; +use crate::SkillInterfaceFile; +use crate::SkillPolicy; +use crate::SkillToolDependency; + +const MAX_DEPENDENCY_TYPE_LEN: usize = 64; +const MAX_DEPENDENCY_TRANSPORT_LEN: usize = 64; +const MAX_DEPENDENCY_VALUE_LEN: usize = 1024; +const MAX_DEPENDENCY_DESCRIPTION_LEN: usize = 1024; +const MAX_DEPENDENCY_COMMAND_LEN: usize = 1024; +const MAX_DEPENDENCY_URL_LEN: usize = 1024; + +/// Parsed optional metadata; callers resolve interface assets for their filesystem. +#[derive(Debug, Default)] +pub struct ParsedSkillMetadata { + pub interface: Option, + pub dependencies: Option, + pub policy: Option, +} + +/// Parses `agents/openai.yaml`, dropping invalid individual dependency declarations. +pub fn parse_skill_metadata(contents: &str) -> Result { + let parsed: SkillMetadataFile = serde_yaml::from_str(contents)?; + Ok(ParsedSkillMetadata { + interface: parsed.interface, + dependencies: resolve_dependencies(parsed.dependencies), + policy: resolve_policy(parsed.policy), + }) +} + +#[derive(Debug, Default, Deserialize)] +struct SkillMetadataFile { + #[serde(default)] + interface: Option, + #[serde(default)] + dependencies: Option, + #[serde(default)] + policy: Option, +} + +#[derive(Debug, Default, Deserialize)] +struct Dependencies { + #[serde(default)] + tools: Vec, +} + +#[derive(Debug, Deserialize)] +struct Policy { + #[serde(default)] + allow_implicit_invocation: Option, + #[serde(default)] + products: Vec, +} + +#[derive(Debug, Default, Deserialize)] +struct DependencyTool { + #[serde(rename = "type")] + kind: Option, + value: Option, + description: Option, + transport: Option, + command: Option, + url: Option, + oauth: Option, +} + +#[derive(Debug, Default, Deserialize)] +#[serde(rename_all = "camelCase")] +struct DependencyOAuth { + #[serde(alias = "callback_port")] + callback_port: Option, +} + +fn resolve_dependencies(dependencies: Option) -> Option { + let dependencies = dependencies?; + let tools = dependencies + .tools + .into_iter() + .filter_map(resolve_dependency_tool) + .collect::>(); + if tools.is_empty() { + None + } else { + Some(SkillDependencies { tools }) + } +} + +fn resolve_policy(policy: Option) -> Option { + policy.map(|policy| SkillPolicy { + allow_implicit_invocation: policy.allow_implicit_invocation, + products: policy.products, + }) +} + +fn resolve_dependency_tool(tool: DependencyTool) -> Option { + let r#type = resolve_required_str( + tool.kind, + MAX_DEPENDENCY_TYPE_LEN, + "dependencies.tools.type", + )?; + let value = resolve_required_str( + tool.value, + MAX_DEPENDENCY_VALUE_LEN, + "dependencies.tools.value", + )?; + let description = resolve_str( + tool.description, + MAX_DEPENDENCY_DESCRIPTION_LEN, + "dependencies.tools.description", + ); + let transport = resolve_str( + tool.transport, + MAX_DEPENDENCY_TRANSPORT_LEN, + "dependencies.tools.transport", + ); + let command = resolve_str( + tool.command, + MAX_DEPENDENCY_COMMAND_LEN, + "dependencies.tools.command", + ); + let url = resolve_str(tool.url, MAX_DEPENDENCY_URL_LEN, "dependencies.tools.url"); + let oauth_callback_port = tool.oauth.and_then(|oauth| oauth.callback_port); + + Some(SkillToolDependency { + r#type, + value, + description, + transport, + command, + url, + oauth_callback_port, + }) +} + +fn resolve_str(value: Option, max_len: usize, field: &'static str) -> Option { + let value = value?; + let value = value.split_whitespace().collect::>().join(" "); + if value.is_empty() { + tracing::warn!("ignoring {field}: value is empty"); + return None; + } + if value.chars().count() > max_len { + tracing::warn!("ignoring {field}: exceeds maximum length of {max_len} characters"); + return None; + } + Some(value) +} + +fn resolve_required_str( + value: Option, + max_len: usize, + field: &'static str, +) -> Option { + let Some(value) = value else { + tracing::warn!("ignoring {field}: value is missing"); + return None; + }; + resolve_str(Some(value), max_len, field) +} diff --git a/codex-rs/skills/src/model.rs b/codex-rs/skills/src/model.rs index 13a4764e84..c2d0e57376 100644 --- a/codex-rs/skills/src/model.rs +++ b/codex-rs/skills/src/model.rs @@ -59,7 +59,8 @@ impl EnvironmentSkillMetadata { } } -#[derive(Debug, Clone, PartialEq, Eq, Default)] +#[derive(Debug, Clone, PartialEq, Eq, Default, serde::Serialize, serde::Deserialize)] +#[serde(rename_all = "camelCase")] pub struct SkillPolicy { pub allow_implicit_invocation: Option, // TODO: Enforce product gating in Codex skill selection/injection instead of only parsing and @@ -77,12 +78,14 @@ pub struct SkillInterface { pub default_prompt: Option, } -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)] +#[serde(rename_all = "camelCase")] pub struct SkillDependencies { pub tools: Vec, } -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)] +#[serde(rename_all = "camelCase")] pub struct SkillToolDependency { pub r#type: String, pub value: String, From 8b507a8e4566288b4b35e81905673900198c479b Mon Sep 17 00:00:00 2001 From: Konstantine Kahadze Date: Tue, 13 Oct 2026 22:00:31 +0000 Subject: [PATCH 012/155] Remove redundant Codex manual cache directory check (#53780) `nearestExistingParent` already checks whether the cache path exists and is a directory. Remove the duplicate `stat` check from `usableCacheDir` in the OpenAI docs manual fetcher, retaining the existing parent lookup and write/execute permission checks. GitOrigin-RevId: 42583353bfdd06881171d8b24fa2b2d5b6fb3135 --- .../samples/openai-docs/scripts/fetch-codex-manual.mjs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/codex-rs/skills/src/assets/samples/openai-docs/scripts/fetch-codex-manual.mjs b/codex-rs/skills/src/assets/samples/openai-docs/scripts/fetch-codex-manual.mjs index 887cc888e2..d02fd2822d 100644 --- a/codex-rs/skills/src/assets/samples/openai-docs/scripts/fetch-codex-manual.mjs +++ b/codex-rs/skills/src/assets/samples/openai-docs/scripts/fetch-codex-manual.mjs @@ -242,13 +242,6 @@ const usableCacheDir = async (cacheDir) => { if (!cacheDir) return null; const resolved = path.resolve(cacheDir); - try { - const info = await stat(resolved); - if (!info.isDirectory()) return null; - } catch (error) { - if (error?.code !== "ENOENT") return null; - } - const parent = await nearestExistingParent(resolved); if (!parent) return null; From b56a579fc6f5ca54a690c0e463e0a33f5c276d63 Mon Sep 17 00:00:00 2001 From: Konstantine Kahadze Date: Tue, 13 Oct 2026 22:00:53 +0000 Subject: [PATCH 013/155] Remove the product-gating TODO from `SkillPolicy` (#53781) GitOrigin-RevId: 8cfd2ba212fc944d09ede97d569fea13142ba389 --- codex-rs/skills/src/model.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/codex-rs/skills/src/model.rs b/codex-rs/skills/src/model.rs index c2d0e57376..8881d432a7 100644 --- a/codex-rs/skills/src/model.rs +++ b/codex-rs/skills/src/model.rs @@ -63,8 +63,6 @@ impl EnvironmentSkillMetadata { #[serde(rename_all = "camelCase")] pub struct SkillPolicy { pub allow_implicit_invocation: Option, - // TODO: Enforce product gating in Codex skill selection/injection instead of only parsing and - // storing this metadata. pub products: Vec, } From 6786dccbe7261b75103260475bc0a04cb36c2c0a Mon Sep 17 00:00:00 2001 From: Chris Dong Date: Tue, 13 Oct 2026 22:15:33 +0000 Subject: [PATCH 014/155] Forward client voice session IDs in realtime requests (#53784) ## What changed Add optional `voiceSessionId` to realtime start parameters and forward it as the `voice-session-id` header for WebSocket, WebRTC, and existing-call transports. Keep this client-generated voice session identifier distinct from `realtimeSessionId`, which uses `x-session-id`. ## Testing Extend serialization tests and add coverage for distinct session ID headers, WebRTC request forwarding, and existing-call handshake forwarding. GitOrigin-RevId: cb558dbb9d438f2d34e281199a7e81fe5d33b879 --- .../app-server-exports-experimental.json.zst | Bin 165048 -> 165168 bytes .../src/protocol/common.rs | 6 ++ .../src/protocol/v2/realtime.rs | 4 ++ .../src/request_processors/turn_processor.rs | 1 + .../tests/suite/v2/experimental_api.rs | 2 + .../tests/suite/v2/realtime_conversation.rs | 22 ++++++++ codex-rs/core/src/realtime_conversation.rs | 9 +++ .../core/src/realtime_conversation_tests.rs | 30 ++++++++++ codex-rs/core/tests/suite/compact_remote.rs | 1 + .../core/tests/suite/realtime_attachment.rs | 1 + .../core/tests/suite/realtime_conversation.rs | 53 ++++++++++++++++++ .../tests/suite/realtime_initial_items.rs | 1 + .../core/tests/suite/realtime_misalignment.rs | 1 + .../tests/suite/realtime_sideband_endpoint.rs | 1 + .../core/tests/suite/realtime_system_proxy.rs | 1 + .../core/tests/suite/turn_input_submission.rs | 1 + .../src/conversation_start_params_tests.rs | 1 + codex-rs/protocol/src/protocol.rs | 3 + .../tui/src/app_server_session/realtime.rs | 1 + 19 files changed, 139 insertions(+) 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 b18386f9681398e48984e807c1b00b72b0a27453..00075353eaca864a178fbc30b5d4f04dfc0c6bcd 100644 GIT binary patch delta 120644 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

ZX&uzdM&(62w&YKx;DbR; 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 delta 120581 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

hLXFv> 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 z zx*nVMk1o%Dhh*)S4SCy$aIrD@^*6nXH=pO0>Vz`$ShLa!fO0;|LA&WuG>hMP4giXM zmL<})nQ{==4i6%^89Xw;z(&DuYR|eFGwqm&u2F1g_}9OxUt@a~ko(ocXk$58&5We< z+zvy_Zy0;XDn^KLeC`$@3cu--D1^C0(btd9(of!h8<@1u+x3kpuc_%r3V)Fl3Zbtq z4jv2#`yE>9IO?W5n^h`w^p=jZ2dWM%696b>bYW?8fTidm1UC%D7(3V{NLxa&{Apw$9ptN>!T6( zQg(DTys_%V@KUn(Q;w80>aiS%?43}$=raF*D|Y&^)m}=Y_lu4+s^pGIqb8u1#X04(nxKYduZrTn~g`_J9i$ZtMBPyNJcD%G5@+(UIF zRDt~h9Yb@pLpAl-p`hN>vr6LX;&d;HfQ*&i_^1@>7Rc~?2B*pcA?Gg#R&ktx7De=b zl0if5u@|wSMK8+C*fy>xJ>9KJanW$jCNvM?AP9Y+xwnt!-om;h$03<2Iwl;Bgg=|3 zPj6_1G$!xNG;PfGPT)c)GQi0BMg7w=^wy?@%qtT^OP6t#*`FeR&w_G@R0;L%>l~tQ zFajv|W24RRF!v!!aLsVplI$5S?q!F6=L+neiZjfN*vcMp>;@B9Ci?=ZtOM|IQ1^vXMQC!%$NIrzghDN zn#TqZc@(6903lKm&O&(Lb-_duoC5$5L1!B9P8w#@eAg}`u#cXDLn#e!WIt!Rs~Ow+ z1S<)R2+2G}rUO~^k)@?)8#_X2C;nA^cCN`2o?3I~69VYOn9@$T#ypavw9iEX{_F1# zOl7gvSgOGuRQgrWSQ@LNgiP~)S17cm75)jV6Px|RtC0x&2LLc2b#hg1VLZTBi0?ya z`U#JP>`If3+NMj$aXZwgTmJ!p{73yuA9RY-SpZ2(AVnBT6(bLtYUpSIL~ZK~DOv9j zM&vCT#ZI&yA>UK9|1&_-1+e>QCpx{#FYLKS1Qo5iARJ#jbRLARM$$BYh8|G|a_3^` zQMxU5ZN&unIKY^-M47i9msmkDpPPtCL)p1})JLDHPMRP+~ZLLN)MU8skPYiDJ&XAL~ZViE19rAh|m3{ZcRm^hHOw%a)%Upi`>t zfB@CjhysleGphqa%{$x^D(?bBA%Miyz(ZQ647*m(+!{E|SnQl2j?~WcdczRYnG6S< z8GdhYslD2cX^YVQ>s~PbO8?AQm{j-yDUFJs@2g8+rj*8i0@Z1Tq(@y|y1`IC`uS7D zN9#x?cT+9Cs)Lc=@a!G<1LO$+08eNDAp|D~LotL9MuKGWP+b4a0oJn zXFTrZVl`?zJwtCVe0*=wq1?v79zPg4{>2km9WlsK6iGa!ghn*iYo;9fVG*KvoS#D)!%uKplfP;)pS^l z?aMc|&x|+_sgxACP+Sy8#yQ&;sv{hLJ-6+X;cFWSioxxR47X20i4+*OZ+P53hbc|~ z3M9>^CV>A|B?kh5Y>ra2-#%E;=JUAPA>0W-en8w}2RyJY@mrBsxNnj#**E=G+g^VF zgn!3KqCb>uw-M=lyhbbn@ePQ2OCQR@tFLPAN!4%>DeDd{zf9tv~nrLs~3{d0)#Zd z!1-5cNM|`@R0xs-`p_$fLnVpm!43|d5Nk`k|BQe00osLq8R4i7d1FZIx}YvIbR%5d z-$h4%4FHjQQO!y5(?r$RmG9v1v5^R<0OhOZIEmih@yuqsg7C_gg-5hoSvOrRz1rk5_*n$wNMnZ;;i%*T{L<@ds zwr^4n&d$wWPJR9ePV{kl$$u5nDE8wvndRtzE<_p$5@|%Lmzat)&X1G;|Af0Tlel;* z1$|fhQ*B}Let@=B0uouvQiT)ACcv)+BwJ?)o--EZ4~8{ZGovbFq`I>LK>7X@5lR-7 zosg|gvZ%`CPyiBXS9pz)EW*J660|>BrQ-1j6(_z35)MO&NIbid8vh$1$6Q@D%=vJC zf{;*7us4ts}p5S#;o8jcVife2PimM*4uD>, #[ts(optional = nullable)] pub realtime_session_id: Option, + /// Client-generated identifier for the product voice session. This is distinct from + /// `realtimeSessionId`. + #[ts(optional = nullable)] + pub voice_session_id: Option, #[ts(optional = nullable)] pub transport: Option, /// Overrides the configured realtime protocol version for this session only. diff --git a/codex-rs/app-server/src/request_processors/turn_processor.rs b/codex-rs/app-server/src/request_processors/turn_processor.rs index 1b9a253bec..435f0e3e0a 100644 --- a/codex-rs/app-server/src/request_processors/turn_processor.rs +++ b/codex-rs/app-server/src/request_processors/turn_processor.rs @@ -1283,6 +1283,7 @@ impl TurnRequestProcessor { realtime_end_instructions: params.realtime_end_instructions, prompt: params.prompt, realtime_session_id: params.realtime_session_id, + voice_session_id: params.voice_session_id, transport: params.transport.map(|transport| match transport { ThreadRealtimeStartTransport::Websocket => { ConversationStartTransport::Websocket diff --git a/codex-rs/app-server/tests/suite/v2/experimental_api.rs b/codex-rs/app-server/tests/suite/v2/experimental_api.rs index b3b33bc385..39d0d9b65f 100644 --- a/codex-rs/app-server/tests/suite/v2/experimental_api.rs +++ b/codex-rs/app-server/tests/suite/v2/experimental_api.rs @@ -149,6 +149,7 @@ async fn realtime_conversation_start_requires_experimental_api_capability() -> R realtime_end_instructions: None, prompt: Some(Some("hello".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -291,6 +292,7 @@ async fn realtime_webrtc_start_requires_experimental_api_capability() -> Result< realtime_end_instructions: None, prompt: Some(Some("hello".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ThreadRealtimeStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), diff --git a/codex-rs/app-server/tests/suite/v2/realtime_conversation.rs b/codex-rs/app-server/tests/suite/v2/realtime_conversation.rs index e4f5029ce0..e5cd011a83 100644 --- a/codex-rs/app-server/tests/suite/v2/realtime_conversation.rs +++ b/codex-rs/app-server/tests/suite/v2/realtime_conversation.rs @@ -411,6 +411,7 @@ impl RealtimeE2eHarness { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ThreadRealtimeStartTransport::Webrtc { sdp: offer_sdp.to_string(), }), @@ -473,6 +474,7 @@ impl RealtimeE2eHarness { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -511,6 +513,7 @@ impl RealtimeE2eHarness { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: Some(RealtimeConversationVersion::V3), voice: None, @@ -729,6 +732,7 @@ async fn realtime_conversation_streams_timeline_items() -> Result<()> { realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -927,6 +931,7 @@ async fn realtime_conversation_streams_v2_notifications() -> Result<()> { realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: Some(RealtimeVoice::Cedar), @@ -1507,6 +1512,7 @@ async fn realtime_start_can_skip_startup_context() -> Result<()> { realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -1605,6 +1611,7 @@ async fn realtime_text_output_modality_requests_text_output_and_final_transcript realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -1822,6 +1829,7 @@ async fn realtime_conversation_stop_emits_closed_notification( realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: Some(RealtimeConversationVersion::V1), voice: None, @@ -1980,6 +1988,7 @@ async fn realtime_mode_uses_client_instructions_on_entry_and_exit() -> Result<() realtime_end_instructions: Some(end_instructions.to_string()), prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -2266,6 +2275,7 @@ async fn realtime_webrtc_start_emits_sdp_notification() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ThreadRealtimeStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), @@ -2458,6 +2468,7 @@ async fn existing_call_attaches_without_reinitializing_the_client_session( expected_handshake_uri: &str, ) -> Result<()> { skip_if_no_network!(Ok(())); + let voice_session_id = "voice-session-client-owned"; let mut harness = RealtimeE2eHarness::new( RealtimeTestVersion::V1, @@ -2485,6 +2496,7 @@ async fn existing_call_attaches_without_reinitializing_the_client_session( realtime_end_instructions: None, prompt: None, realtime_session_id: realtime_session_id.map(str::to_string), + voice_session_id: Some(voice_session_id.to_string()), transport: Some(ThreadRealtimeStartTransport::ExistingCall { call_id: "rtc_existing".to_string(), }), @@ -2522,6 +2534,14 @@ async fn existing_call_attaches_without_reinitializing_the_client_session( harness.realtime_server.single_handshake().uri(), expected_handshake_uri ); + assert_eq!( + harness + .realtime_server + .single_handshake() + .header("voice-session-id") + .as_deref(), + Some(voice_session_id) + ); assert!( harness.realtime_server.single_connection().is_empty(), "attaching to an existing call must not overwrite the client session" @@ -2574,6 +2594,7 @@ async fn existing_call_rejects_client_owned_session_configuration(option: &str) realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: Some(ThreadRealtimeStartTransport::ExistingCall { call_id: "rtc_existing".to_string(), }), @@ -4094,6 +4115,7 @@ async fn realtime_webrtc_start_surfaces_backend_error() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ThreadRealtimeStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), diff --git a/codex-rs/core/src/realtime_conversation.rs b/codex-rs/core/src/realtime_conversation.rs index dab0d42f6a..d1c1fb11cf 100644 --- a/codex-rs/core/src/realtime_conversation.rs +++ b/codex-rs/core/src/realtime_conversation.rs @@ -1444,6 +1444,7 @@ async fn prepare_realtime_start( let realtime_api_key = realtime_api_key(auth.as_ref(), &provider)?; realtime_request_headers( requested_realtime_session_id.as_deref(), + params.voice_session_id.as_deref(), Some(realtime_api_key.as_str()), event_parser, originator.as_str(), @@ -1453,6 +1454,7 @@ async fn prepare_realtime_start( | ConversationStartTransport::ExistingCall { .. } => { realtime_request_headers( requested_realtime_session_id.as_deref(), + params.voice_session_id.as_deref(), /*api_key*/ None, event_parser, originator.as_str(), @@ -1951,6 +1953,7 @@ fn realtime_api_key(auth: Option<&CodexAuth>, provider: &ModelProviderInfo) -> C fn realtime_request_headers( realtime_session_id: Option<&str>, + voice_session_id: Option<&str>, api_key: Option<&str>, event_parser: RealtimeEventParser, originator: &str, @@ -1973,6 +1976,12 @@ fn realtime_request_headers( headers.insert("x-session-id", realtime_session_id); } + if let Some(voice_session_id) = voice_session_id + && let Ok(voice_session_id) = HeaderValue::from_str(voice_session_id) + { + headers.insert("voice-session-id", voice_session_id); + } + if let Some(api_key) = api_key { let auth_value = HeaderValue::from_str(&format!("Bearer {api_key}")).map_err(|err| { CodexErr::InvalidRequest(format!("invalid realtime api key header: {err}")) diff --git a/codex-rs/core/src/realtime_conversation_tests.rs b/codex-rs/core/src/realtime_conversation_tests.rs index 98e1e61a18..9d827989aa 100644 --- a/codex-rs/core/src/realtime_conversation_tests.rs +++ b/codex-rs/core/src/realtime_conversation_tests.rs @@ -419,6 +419,7 @@ fn streamed_v3_handoff_omits_the_final_message_prefix() { fn uses_quicksilver_alpha_header_for_realtime_v1() { let headers = realtime_request_headers( Some("session_1"), + /*voice_session_id*/ None, Some("sk-test"), RealtimeEventParser::V1, "codex_work_desktop", @@ -438,6 +439,7 @@ fn uses_quicksilver_alpha_header_for_realtime_v1() { fn omits_quicksilver_alpha_header_for_realtime_v2() { let headers = realtime_request_headers( Some("session_1"), + /*voice_session_id*/ None, Some("sk-test"), RealtimeEventParser::RealtimeV2, "codex_work_desktop", @@ -452,6 +454,7 @@ fn omits_quicksilver_alpha_header_for_realtime_v2() { fn uses_frameless_alpha_header_for_realtime_v3() { let headers = realtime_request_headers( Some("session_1"), + /*voice_session_id*/ None, Some("sk-test"), RealtimeEventParser::FramelessBidi, "codex_work_desktop", @@ -476,6 +479,7 @@ fn realtime_headers_include_only_non_default_originator() { ] { let headers = realtime_request_headers( Some("session_1"), + /*voice_session_id*/ None, Some("sk-test"), RealtimeEventParser::RealtimeV2, originator, @@ -491,3 +495,29 @@ fn realtime_headers_include_only_non_default_originator() { ); } } + +#[test] +fn realtime_headers_keep_realtime_and_voice_session_ids_distinct() { + let headers = realtime_request_headers( + Some("realtime_session_1"), + Some("voice_session_1"), + /*api_key*/ None, + RealtimeEventParser::RealtimeV2, + "codex_work_desktop", + ) + .expect("headers") + .expect("headers"); + + assert_eq!( + headers + .get("x-session-id") + .and_then(|value| value.to_str().ok()), + Some("realtime_session_1") + ); + assert_eq!( + headers + .get("voice-session-id") + .and_then(|value| value.to_str().ok()), + Some("voice_session_1") + ); +} diff --git a/codex-rs/core/tests/suite/compact_remote.rs b/codex-rs/core/tests/suite/compact_remote.rs index a77b923e7e..467a3509d9 100644 --- a/codex-rs/core/tests/suite/compact_remote.rs +++ b/codex-rs/core/tests/suite/compact_remote.rs @@ -117,6 +117,7 @@ async fn start_realtime_conversation(codex: &codex_core::CodexThread) -> Result< realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, diff --git a/codex-rs/core/tests/suite/realtime_attachment.rs b/codex-rs/core/tests/suite/realtime_attachment.rs index ea43c266ed..1edadc7977 100644 --- a/codex-rs/core/tests/suite/realtime_attachment.rs +++ b/codex-rs/core/tests/suite/realtime_attachment.rs @@ -145,6 +145,7 @@ fn params(session: &str, url: &str) -> ConversationStartParams { realtime_end_instructions: None, prompt: None, realtime_session_id: Some(session.to_owned()), + voice_session_id: None, transport: Some(ConversationStartTransport::ExistingCall { call_id: format!("rtc_{session}"), sideband_base_url: Some(url.to_owned()), diff --git a/codex-rs/core/tests/suite/realtime_conversation.rs b/codex-rs/core/tests/suite/realtime_conversation.rs index 31f78c4d11..c4b773aae5 100644 --- a/codex-rs/core/tests/suite/realtime_conversation.rs +++ b/codex-rs/core/tests/suite/realtime_conversation.rs @@ -332,6 +332,7 @@ async fn conversation_start_audio_text_close_round_trip() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -514,6 +515,7 @@ async fn conversation_records_history_without_an_event_observer( realtime_end_instructions: None, prompt: Some(Some("fixture".to_string())), realtime_session_id: Some("voice-1".to_string()), + voice_session_id: None, transport: None, version: None, voice: None, @@ -625,6 +627,7 @@ async fn conversation_start_defaults_to_v2_and_gpt_realtime_1_5() -> Result<()> realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -720,6 +723,7 @@ async fn conversation_websocket_transports_send_codex_headers_without_creating_a realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: Some(transport.clone()), version: Some(RealtimeConversationVersion::V3), voice: None, @@ -870,6 +874,7 @@ async fn conversation_webrtc_frameless_chatgpt_sends_codex_headers_to_backend( let codex = &conversation.thread; assert_eq!(codex.config_snapshot().await.thread_source, thread_source); let requested_realtime_session_id = Uuid::new_v4().to_string(); + let voice_session_id = "voice-session-test".to_string(); codex .submit(Op::RealtimeConversationStart(ConversationStartParams { @@ -893,6 +898,7 @@ async fn conversation_webrtc_frameless_chatgpt_sends_codex_headers_to_backend( realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: Some(requested_realtime_session_id.clone()), + voice_session_id: Some(voice_session_id.clone()), transport: Some(ConversationStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), @@ -935,6 +941,10 @@ async fn conversation_webrtc_frameless_chatgpt_sends_codex_headers_to_backend( .headers .get("x-session-id") .and_then(|value| value.to_str().ok()), + request + .headers + .get("voice-session-id") + .and_then(|value| value.to_str().ok()), request .headers .get("authorization") @@ -947,6 +957,7 @@ async fn conversation_webrtc_frameless_chatgpt_sends_codex_headers_to_backend( Some(expected_session_id.as_str()), Some(expected_thread_id.as_str()), Some(requested_realtime_session_id.as_str()), + Some(voice_session_id.as_str()), Some("Bearer Access Token"), ) ); @@ -1052,6 +1063,7 @@ async fn conversation_webrtc_start_posts_generated_session() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ConversationStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), @@ -1421,6 +1433,7 @@ async fn conversation_webrtc_live_reconnects_sideband_after_unclean_disconnect( Some(Some("backend prompt".to_string())) }, realtime_session_id: attaches_existing_call.then(|| "sess_client_owned".to_string()), + voice_session_id: None, transport: Some(transport), version: Some(RealtimeConversationVersion::V3), voice: None, @@ -1573,6 +1586,7 @@ async fn conversation_webrtc_start_uses_avas_query() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ConversationStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), @@ -1679,6 +1693,7 @@ async fn conversation_webrtc_default_v1_ignores_configured_v2_voice() -> Result< realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ConversationStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), @@ -1747,6 +1762,7 @@ async fn conversation_webrtc_default_v1_rejects_explicit_v2_voice() -> Result<() realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ConversationStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), @@ -1825,6 +1841,7 @@ async fn conversation_webrtc_start_uses_configured_call_base_url_for_avas() -> R realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ConversationStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), @@ -1940,6 +1957,7 @@ async fn conversation_webrtc_close_while_sideband_connecting_drops_pending_join( realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ConversationStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), @@ -2048,6 +2066,7 @@ async fn conversation_webrtc_sideband_connect_failure_closes_with_error() -> Res realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: Some(ConversationStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), @@ -2156,6 +2175,7 @@ async fn conversation_start_uses_openai_env_key_fallback_with_chatgpt_auth() -> realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -2258,6 +2278,7 @@ async fn assert_transport_close_tail_flush( realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -2392,6 +2413,7 @@ async fn conversation_start_preflight_failure_emits_realtime_error_only() -> Res realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -2451,6 +2473,7 @@ async fn conversation_start_connect_failure_emits_realtime_error_only() -> Resul realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -2564,6 +2587,7 @@ async fn conversation_second_start_replaces_runtime() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("old".to_string())), realtime_session_id: Some("conv_old".to_string()), + voice_session_id: None, transport: None, version: None, voice: None, @@ -2602,6 +2626,7 @@ async fn conversation_second_start_replaces_runtime() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("new".to_string())), realtime_session_id: Some("conv_new".to_string()), + voice_session_id: None, transport: None, version: None, voice: None, @@ -2712,6 +2737,7 @@ async fn conversation_uses_experimental_realtime_ws_base_url_override() -> Resul realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -2792,6 +2818,7 @@ async fn conversation_uses_default_realtime_backend_prompt() -> Result<()> { realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -2883,6 +2910,7 @@ async fn conversation_uses_empty_instructions_for_null_or_empty_prompt() -> Resu realtime_end_instructions: None, prompt, realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -2967,6 +2995,7 @@ async fn conversation_uses_explicit_start_voice() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: Some(RealtimeVoice::Breeze), @@ -3041,6 +3070,7 @@ async fn conversation_uses_configured_realtime_voice() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -3100,6 +3130,7 @@ async fn conversation_rejects_voice_for_wrong_realtime_version() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: Some(RealtimeVoice::Cove), @@ -3162,6 +3193,7 @@ async fn conversation_uses_experimental_realtime_ws_backend_prompt_override() -> realtime_end_instructions: None, prompt: Some(Some("prompt from op".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -3248,6 +3280,7 @@ async fn conversation_uses_experimental_realtime_ws_startup_context_override() - realtime_end_instructions: None, prompt: Some(Some("prompt from op".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -3327,6 +3360,7 @@ async fn conversation_disables_realtime_startup_context_with_empty_override() -> realtime_end_instructions: None, prompt: Some(Some("prompt from op".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -3399,6 +3433,7 @@ async fn conversation_start_injects_startup_context_from_thread_history() -> Res realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -3533,6 +3568,7 @@ async fn conversation_startup_context_current_thread_selects_many_turns_by_budge realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -3653,6 +3689,7 @@ async fn conversation_startup_context_falls_back_to_workspace_map() -> Result<() realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -3725,6 +3762,7 @@ async fn conversation_startup_context_is_truncated_and_sent_once_per_start() -> realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -3830,6 +3868,7 @@ async fn conversation_user_text_turn_is_not_sent_to_realtime(ephemeral: bool) -> realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -3971,6 +4010,7 @@ async fn realtime_v2_noop_tool_call_returns_empty_function_output_without_respon realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -4089,6 +4129,7 @@ async fn conversation_mirrors_assistant_message_text_to_realtime_handoff( realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -4223,6 +4264,7 @@ async fn conversation_relays_only_public_reasoning_as_quiet_status(enabled: bool realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -4415,6 +4457,7 @@ async fn conversation_routes_assistant_messages_for_v3_handoff( realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -4609,6 +4652,7 @@ async fn conversation_handoff_persists_across_item_done_until_turn_complete( realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -4775,6 +4819,7 @@ async fn inbound_handoff_request_starts_turn_and_promotes_its_artifact() -> Resu realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -4940,6 +4985,7 @@ async fn inbound_handoff_request_uses_active_transcript() -> Result<()> { realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -5055,6 +5101,7 @@ async fn inbound_handoff_request_sends_transcript_delta_after_each_handoff() -> realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -5194,6 +5241,7 @@ async fn conversation_close_routes_only_remaining_transcript_tail_once() -> Resu realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -5300,6 +5348,7 @@ async fn inbound_conversation_item_does_not_start_turn_and_still_forwards_audio( realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -5435,6 +5484,7 @@ async fn delegated_turn_user_role_echo_does_not_redelegate_and_still_forwards_au realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -5600,6 +5650,7 @@ async fn inbound_handoff_request_does_not_block_realtime_event_forwarding() -> R realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -5785,6 +5836,7 @@ async fn inbound_handoff_request_updates_realtime_state_during_active_turn( realtime_end_instructions: Some("Return to normal text updates.".to_string()), prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, @@ -6026,6 +6078,7 @@ async fn inbound_handoff_request_starts_turn_and_does_not_block_realtime_audio() realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, diff --git a/codex-rs/core/tests/suite/realtime_initial_items.rs b/codex-rs/core/tests/suite/realtime_initial_items.rs index 6122efdd79..ae9cb4e7a0 100644 --- a/codex-rs/core/tests/suite/realtime_initial_items.rs +++ b/codex-rs/core/tests/suite/realtime_initial_items.rs @@ -227,6 +227,7 @@ fn start_params(version: RealtimeConversationVersion) -> ConversationStartParams realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: Some(version), voice: None, diff --git a/codex-rs/core/tests/suite/realtime_misalignment.rs b/codex-rs/core/tests/suite/realtime_misalignment.rs index d823e87540..c45d747818 100644 --- a/codex-rs/core/tests/suite/realtime_misalignment.rs +++ b/codex-rs/core/tests/suite/realtime_misalignment.rs @@ -107,6 +107,7 @@ async fn misalignment_retires_late_voice_handoff_before_it_starts_a_turn() -> Re realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, diff --git a/codex-rs/core/tests/suite/realtime_sideband_endpoint.rs b/codex-rs/core/tests/suite/realtime_sideband_endpoint.rs index c4b4356476..a2b49409b5 100644 --- a/codex-rs/core/tests/suite/realtime_sideband_endpoint.rs +++ b/codex-rs/core/tests/suite/realtime_sideband_endpoint.rs @@ -87,6 +87,7 @@ async fn existing_call_uses_selected_endpoint_and_runtime_auth( realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: Some(ConversationStartTransport::ExistingCall { call_id: "rtc_existing".to_string(), sideband_base_url: match selection { diff --git a/codex-rs/core/tests/suite/realtime_system_proxy.rs b/codex-rs/core/tests/suite/realtime_system_proxy.rs index 7c7da31727..ce2996365d 100644 --- a/codex-rs/core/tests/suite/realtime_system_proxy.rs +++ b/codex-rs/core/tests/suite/realtime_system_proxy.rs @@ -150,6 +150,7 @@ async fn webrtc_sideband_honors_configured_system_proxy() -> Result<()> { realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: Some(ConversationStartTransport::Webrtc { sdp: "v=offer\r\n".to_string(), }), diff --git a/codex-rs/core/tests/suite/turn_input_submission.rs b/codex-rs/core/tests/suite/turn_input_submission.rs index 374fe229eb..6e3628c6e6 100644 --- a/codex-rs/core/tests/suite/turn_input_submission.rs +++ b/codex-rs/core/tests/suite/turn_input_submission.rs @@ -436,6 +436,7 @@ async fn host_drain_closes_realtime_after_handoff_error() -> anyhow::Result<()> realtime_end_instructions: None, prompt: Some(Some("backend prompt".to_string())), realtime_session_id: None, + voice_session_id: None, transport: None, version: None, voice: None, diff --git a/codex-rs/protocol/src/conversation_start_params_tests.rs b/codex-rs/protocol/src/conversation_start_params_tests.rs index 6ccb5e4f1e..d0ea1e0c68 100644 --- a/codex-rs/protocol/src/conversation_start_params_tests.rs +++ b/codex-rs/protocol/src/conversation_start_params_tests.rs @@ -29,6 +29,7 @@ fn realtime_start_debug_redacts_text_and_transport() { realtime_end_instructions: Some(secret.to_owned()), prompt: Some(Some(secret.to_owned())), realtime_session_id: Some(secret.to_owned()), + voice_session_id: Some(secret.to_owned()), transport: None, version: Some(RealtimeConversationVersion::V3), voice: None, diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs index 146209407b..ac01685923 100644 --- a/codex-rs/protocol/src/protocol.rs +++ b/codex-rs/protocol/src/protocol.rs @@ -209,6 +209,9 @@ pub struct ConversationStartParams { pub realtime_end_instructions: Option, pub prompt: Option>, pub realtime_session_id: Option, + /// Client-generated identifier for the product voice session. This is distinct from the + /// Realtime API session identifier. + pub voice_session_id: Option, pub transport: Option, /// Overrides the configured realtime protocol version for this session only. pub version: Option, diff --git a/codex-rs/tui/src/app_server_session/realtime.rs b/codex-rs/tui/src/app_server_session/realtime.rs index 1e8483e103..1ad46db83a 100644 --- a/codex-rs/tui/src/app_server_session/realtime.rs +++ b/codex-rs/tui/src/app_server_session/realtime.rs @@ -47,6 +47,7 @@ impl AppServerSession { realtime_end_instructions: None, prompt: None, realtime_session_id: None, + voice_session_id: None, transport: Some(ThreadRealtimeStartTransport::Webrtc { sdp: offer_sdp }), version: Some(RealtimeConversationVersion::V3), voice, From 815ef9bbc47bef3bde9cfceaaaf3ef74bb43d052 Mon Sep 17 00:00:00 2001 From: ben zhang Date: Tue, 13 Oct 2026 22:35:37 +0000 Subject: [PATCH 015/155] Fix cancellation of macOS user-verification prompts (#53790) ## Why Keychain signing reconstructs its own authentication context, so invalidating the caller's context does not reliably cancel the context that owns the biometric prompt. ## What changed Evaluate the stored key's access-control policy explicitly with `LAContext` before signing. On cancellation, invalidate that context and wait for its authorization callback before releasing the lifecycle lock, rejecting any late success. Reload the key with the authorized context and disable further interaction so signing cannot open another prompt. ## Testing Update unit tests to cover waiting for cancellation completion and rejecting completed authorization after cancellation. Add an ignored macOS hardware test and setup instructions covering persisted Secure Enclave key reuse, signature verification, cancellation, retry signing, and cleanup. GitOrigin-RevId: 4ea9756430c5649654e95e047d1666617503072c --- MODULE.bazel.lock | 1 + codex-rs/Cargo.lock | 14 ++ codex-rs/user-verification/Cargo.toml | 3 +- codex-rs/user-verification/README.md | 59 +++++++ .../user-verification/src/native_operation.rs | 53 +++---- .../src/native_operation_tests.rs | 71 ++++----- .../src/platform_macos/key_protection.rs | 7 +- .../platform_macos/key_protection_tests.rs | 7 +- .../src/platform_macos/provider.rs | 146 +++++++++++++----- codex-rs/user-verification/tests/hardware.rs | 134 ++++++++++++++++ 10 files changed, 381 insertions(+), 114 deletions(-) create mode 100644 codex-rs/user-verification/README.md create mode 100644 codex-rs/user-verification/tests/hardware.rs diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index b4a21c2e4f..beaa6059a2 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1408,6 +1408,7 @@ "objc2-io-surface_0.3.2": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2.5.0\"},{\"default_features\":false,\"name\":\"libc\",\"optional\":true,\"req\":\"^0.2.80\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"objc2\",\"optional\":true,\"req\":\">=0.6.2, <0.8.0\"},{\"default_features\":false,\"features\":[\"CFDictionary\"],\"name\":\"objc2-core-foundation\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"NSDictionary\",\"NSObject\",\"NSString\",\"alloc\"],\"name\":\"objc2-foundation\",\"optional\":true,\"req\":\"^0.3.2\"}],\"features\":{\"IOSurface\":[],\"IOSurfaceAPI\":[],\"IOSurfaceBase\":[],\"IOSurfaceRef\":[\"bitflags\"],\"IOSurfaceTypes\":[\"bitflags\"],\"ObjC\":[\"objc2\"],\"alloc\":[],\"bitflags\":[\"dep:bitflags\"],\"default\":[\"std\",\"IOSurface\",\"IOSurfaceAPI\",\"IOSurfaceBase\",\"IOSurfaceRef\",\"IOSurfaceTypes\",\"bitflags\",\"libc\",\"objc2\",\"objc2-core-foundation\",\"objc2-foundation\"],\"libc\":[\"dep:libc\"],\"objc2\":[\"dep:objc2\",\"objc2-core-foundation?/objc2\"],\"objc2-core-foundation\":[\"dep:objc2-core-foundation\"],\"objc2-foundation\":[\"dep:objc2-foundation\"],\"std\":[\"alloc\"],\"unstable-darwin-objc\":[]}}", "objc2-local-authentication_0.3.2": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"block2\",\"optional\":true,\"req\":\">=0.6.1, <0.8.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"objc2\",\"req\":\">=0.6.2, <0.8.0\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"objc2-foundation\",\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"SecBase\",\"SecKey\",\"objc2\"],\"name\":\"objc2-security\",\"optional\":true,\"req\":\"^0.3.2\"}],\"features\":{\"LABase\":[],\"LABiometryType\":[],\"LACompanionType\":[],\"LAContext\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSError\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"LADomainState\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSValue\"],\"LAEnvironment\":[],\"LAEnvironmentMechanism\":[\"objc2-foundation/NSString\"],\"LAEnvironmentMechanismBiometry\":[\"objc2-foundation/NSData\"],\"LAEnvironmentMechanismCompanion\":[\"objc2-foundation/NSData\"],\"LAEnvironmentMechanismUserPassword\":[],\"LAEnvironmentState\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\"],\"LAError\":[\"objc2-foundation/NSString\"],\"LAPersistedRight\":[],\"LAPrivateKey\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSError\"],\"LAPublicDefines\":[],\"LAPublicKey\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSError\"],\"LARequirement\":[],\"LARight\":[\"objc2-foundation/NSError\",\"objc2-foundation/NSString\"],\"LARightStore\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSError\",\"objc2-foundation/NSString\"],\"LASecret\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSError\"],\"alloc\":[],\"block2\":[\"dep:block2\"],\"default\":[\"std\",\"LABase\",\"LABiometryType\",\"LACompanionType\",\"LAContext\",\"LADomainState\",\"LAEnvironment\",\"LAEnvironmentMechanism\",\"LAEnvironmentMechanismBiometry\",\"LAEnvironmentMechanismCompanion\",\"LAEnvironmentMechanismUserPassword\",\"LAEnvironmentState\",\"LAError\",\"LAPersistedRight\",\"LAPrivateKey\",\"LAPublicDefines\",\"LAPublicKey\",\"LARequirement\",\"LARight\",\"LARightStore\",\"LASecret\",\"block2\",\"objc2-security\"],\"objc2-security\":[\"dep:objc2-security\"],\"std\":[\"alloc\"],\"unstable-darwin-objc\":[]}}", "objc2-quartz-core_0.3.2": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2.5.0\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"block2\",\"optional\":true,\"req\":\">=0.6.1, <0.8.0\"},{\"default_features\":false,\"name\":\"libc\",\"optional\":true,\"req\":\"^0.2.80\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"objc2\",\"req\":\">=0.6.2, <0.8.0\"},{\"default_features\":false,\"features\":[\"CFCGTypes\",\"CFDate\",\"objc2\"],\"name\":\"objc2-core-foundation\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"CGColor\",\"CGColorSpace\",\"CGContext\",\"CGPath\",\"objc2\"],\"name\":\"objc2-core-graphics\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"CVBase\",\"objc2\"],\"name\":\"objc2-core-video\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"objc2-foundation\",\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"MTLAllocation\",\"MTLDevice\",\"MTLDrawable\",\"MTLPixelFormat\",\"MTLResidencySet\",\"MTLResource\",\"MTLTexture\"],\"name\":\"objc2-metal\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"CGLTypes\"],\"name\":\"objc2-open-gl\",\"optional\":true,\"req\":\"^0.3.2\",\"target\":\"cfg(target_os = \\\"macos\\\")\"}],\"features\":{\"CAAnimation\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"CABase\":[],\"CAConstraintLayoutManager\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"CADisplayLink\":[\"objc2-foundation/NSObjCRuntime\",\"objc2-foundation/NSRunLoop\",\"objc2-foundation/NSString\"],\"CAEAGLLayer\":[],\"CAEDRMetadata\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSObject\"],\"CAEmitterCell\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"CAEmitterLayer\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"CAFrameRateRange\":[],\"CAGradientLayer\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"CALayer\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSNull\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"CAMediaTiming\":[\"objc2-foundation/NSString\"],\"CAMediaTimingFunction\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"CAMetalDisplayLink\":[\"objc2-foundation/NSObjCRuntime\",\"objc2-foundation/NSRunLoop\",\"objc2-foundation/NSString\"],\"CAMetalLayer\":[\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\"],\"CAOpenGLLayer\":[\"objc2-foundation/NSObject\"],\"CARemoteLayerClient\":[],\"CARemoteLayerServer\":[],\"CARenderer\":[\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSString\"],\"CAReplicatorLayer\":[\"objc2-foundation/NSObject\"],\"CAScrollLayer\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"CAShapeLayer\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"CATextLayer\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"CATiledLayer\":[\"objc2-foundation/NSObject\"],\"CATransaction\":[\"objc2-foundation/NSString\"],\"CATransform3D\":[\"objc2-foundation/NSValue\"],\"CATransformLayer\":[\"objc2-foundation/NSObject\"],\"CAValueFunction\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"CoreAnimation\":[],\"alloc\":[],\"bitflags\":[\"dep:bitflags\"],\"block2\":[\"dep:block2\"],\"default\":[\"std\",\"CAAnimation\",\"CABase\",\"CAConstraintLayoutManager\",\"CADisplayLink\",\"CAEAGLLayer\",\"CAEDRMetadata\",\"CAEmitterCell\",\"CAEmitterLayer\",\"CAFrameRateRange\",\"CAGradientLayer\",\"CALayer\",\"CAMediaTiming\",\"CAMediaTimingFunction\",\"CAMetalDisplayLink\",\"CAMetalLayer\",\"CAOpenGLLayer\",\"CARemoteLayerClient\",\"CARemoteLayerServer\",\"CARenderer\",\"CAReplicatorLayer\",\"CAScrollLayer\",\"CAShapeLayer\",\"CATextLayer\",\"CATiledLayer\",\"CATransaction\",\"CATransform3D\",\"CATransformLayer\",\"CAValueFunction\",\"CoreAnimation\",\"bitflags\",\"block2\",\"libc\",\"objc2-core-foundation\",\"objc2-core-graphics\",\"objc2-core-video\",\"objc2-metal\"],\"gnustep-1-7\":[],\"gnustep-1-8\":[],\"gnustep-1-9\":[],\"gnustep-2-0\":[],\"gnustep-2-1\":[],\"libc\":[\"dep:libc\"],\"objc2-core-foundation\":[\"dep:objc2-core-foundation\"],\"objc2-core-graphics\":[\"dep:objc2-core-graphics\"],\"objc2-core-video\":[\"dep:objc2-core-video\"],\"objc2-metal\":[\"dep:objc2-metal\"],\"objc2-open-gl\":[\"dep:objc2-open-gl\"],\"std\":[\"alloc\"],\"unstable-darwin-objc\":[]}}", + "objc2-security_0.3.2": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2.5.0\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"block2\",\"optional\":true,\"req\":\">=0.6.1, <0.8.0\"},{\"default_features\":false,\"name\":\"libc\",\"optional\":true,\"req\":\"^0.2.80\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"objc2\",\"optional\":true,\"req\":\">=0.6.2, <0.8.0\"},{\"default_features\":false,\"name\":\"objc2-core-foundation\",\"req\":\"^0.3.2\"}],\"features\":{\"AuthSession\":[\"bitflags\"],\"Authorization\":[\"bitflags\"],\"AuthorizationDB\":[\"objc2-core-foundation/CFBundle\",\"objc2-core-foundation/CFDictionary\"],\"AuthorizationPlugin\":[\"bitflags\",\"objc2-core-foundation/CFArray\"],\"AuthorizationTags\":[],\"CMSDecoder\":[\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFDate\"],\"CMSEncoder\":[\"bitflags\",\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFDate\"],\"CSCommon\":[\"bitflags\"],\"CipherSuite\":[],\"CodeSigning\":[],\"SecACL\":[\"bitflags\",\"objc2-core-foundation/CFArray\"],\"SecAccess\":[\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFError\"],\"SecAccessControl\":[\"bitflags\",\"objc2-core-foundation/CFError\"],\"SecAsn1Coder\":[],\"SecAsn1Templates\":[],\"SecAsn1Types\":[],\"SecBase\":[],\"SecCertificate\":[\"bitflags\",\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFDate\",\"objc2-core-foundation/CFDictionary\",\"objc2-core-foundation/CFError\"],\"SecCertificateOIDs\":[],\"SecCode\":[\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFDictionary\",\"objc2-core-foundation/CFError\",\"objc2-core-foundation/CFURL\"],\"SecCodeHost\":[\"objc2-core-foundation/CFDictionary\",\"objc2-core-foundation/CFURL\"],\"SecCustomTransform\":[\"objc2-core-foundation/CFError\"],\"SecDecodeTransform\":[\"objc2-core-foundation/CFError\"],\"SecDigestTransform\":[\"objc2-core-foundation/CFError\"],\"SecEncodeTransform\":[\"objc2-core-foundation/CFError\"],\"SecEncryptTransform\":[\"objc2-core-foundation/CFError\"],\"SecIdentity\":[\"objc2-core-foundation/CFArray\"],\"SecIdentitySearch\":[],\"SecImportExport\":[\"bitflags\",\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFDictionary\"],\"SecItem\":[\"objc2-core-foundation/CFDictionary\"],\"SecKey\":[\"bitflags\",\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFDictionary\",\"objc2-core-foundation/CFError\"],\"SecKeychain\":[\"bitflags\",\"objc2-core-foundation/CFArray\"],\"SecKeychainItem\":[\"objc2-core-foundation/CFData\"],\"SecKeychainSearch\":[],\"SecPolicy\":[\"objc2-core-foundation/CFDictionary\"],\"SecPolicySearch\":[],\"SecProtocolMetadata\":[],\"SecProtocolObject\":[],\"SecProtocolOptions\":[],\"SecProtocolTypes\":[\"objc2-core-foundation/CFArray\"],\"SecRandom\":[],\"SecReadTransform\":[],\"SecRequirement\":[\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFError\"],\"SecSharedCredential\":[\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFError\"],\"SecSignVerifyTransform\":[\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFError\"],\"SecStaticCode\":[\"objc2-core-foundation/CFDictionary\",\"objc2-core-foundation/CFError\",\"objc2-core-foundation/CFURL\"],\"SecTask\":[\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFDictionary\",\"objc2-core-foundation/CFError\"],\"SecTransform\":[\"objc2-core-foundation/CFDictionary\",\"objc2-core-foundation/CFError\"],\"SecTransformReadTransform\":[\"objc2-core-foundation/CFStream\"],\"SecTrust\":[\"bitflags\",\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFDate\",\"objc2-core-foundation/CFDictionary\",\"objc2-core-foundation/CFError\"],\"SecTrustSettings\":[\"bitflags\",\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFDate\"],\"SecTrustedApplication\":[\"objc2-core-foundation/CFData\"],\"SecureDownload\":[\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFData\",\"objc2-core-foundation/CFDate\",\"objc2-core-foundation/CFURL\"],\"SecureTransport\":[\"objc2-core-foundation/CFArray\",\"objc2-core-foundation/CFData\"],\"alloc\":[],\"bitflags\":[\"dep:bitflags\"],\"block2\":[\"dep:block2\"],\"certextensions\":[],\"cssm\":[],\"cssmaci\":[],\"cssmapi\":[],\"cssmapple\":[],\"cssmcli\":[],\"cssmconfig\":[],\"cssmcspi\":[],\"cssmdli\":[],\"cssmerr\":[],\"cssmkrapi\":[],\"cssmkrspi\":[],\"cssmspi\":[],\"cssmtpi\":[],\"cssmtype\":[],\"default\":[\"std\",\"AuthSession\",\"Authorization\",\"AuthorizationDB\",\"AuthorizationPlugin\",\"AuthorizationTags\",\"CMSDecoder\",\"CMSEncoder\",\"CSCommon\",\"CipherSuite\",\"CodeSigning\",\"SecACL\",\"SecAccess\",\"SecAccessControl\",\"SecAsn1Coder\",\"SecAsn1Templates\",\"SecAsn1Types\",\"SecBase\",\"SecCertificate\",\"SecCertificateOIDs\",\"SecCode\",\"SecCodeHost\",\"SecCustomTransform\",\"SecDecodeTransform\",\"SecDigestTransform\",\"SecEncodeTransform\",\"SecEncryptTransform\",\"SecIdentity\",\"SecIdentitySearch\",\"SecImportExport\",\"SecItem\",\"SecKey\",\"SecKeychain\",\"SecKeychainItem\",\"SecKeychainSearch\",\"SecPolicy\",\"SecPolicySearch\",\"SecProtocolMetadata\",\"SecProtocolObject\",\"SecProtocolOptions\",\"SecProtocolTypes\",\"SecRandom\",\"SecReadTransform\",\"SecRequirement\",\"SecSharedCredential\",\"SecSignVerifyTransform\",\"SecStaticCode\",\"SecTask\",\"SecTransform\",\"SecTransformReadTransform\",\"SecTrust\",\"SecTrustSettings\",\"SecTrustedApplication\",\"SecureDownload\",\"SecureTransport\",\"bitflags\",\"block2\",\"certextensions\",\"cssm\",\"cssmaci\",\"cssmapi\",\"cssmapple\",\"cssmcli\",\"cssmconfig\",\"cssmcspi\",\"cssmdli\",\"cssmerr\",\"cssmkrapi\",\"cssmkrspi\",\"cssmspi\",\"cssmtpi\",\"cssmtype\",\"eisl\",\"emmspi\",\"emmtype\",\"libc\",\"mds\",\"mds_schema\",\"objc2\",\"oids\",\"oidsalg\",\"oidsattr\",\"oidsbase\",\"oidscert\",\"oidscrl\",\"x509defs\"],\"eisl\":[],\"emmspi\":[],\"emmtype\":[],\"libc\":[\"dep:libc\"],\"mds\":[],\"mds_schema\":[],\"objc2\":[\"dep:objc2\",\"objc2-core-foundation/objc2\"],\"oids\":[],\"oidsalg\":[],\"oidsattr\":[],\"oidsbase\":[],\"oidscert\":[],\"oidscrl\":[],\"std\":[\"alloc\"],\"unstable-darwin-objc\":[],\"x509defs\":[]}}", "objc2-ui-kit_0.3.2": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2.5.0\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"block2\",\"optional\":true,\"req\":\">=0.6.1, <0.8.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"objc2\",\"req\":\">=0.6.2, <0.8.0\"},{\"default_features\":false,\"features\":[\"CKContainer\",\"CKRecord\",\"CKShare\",\"CKShareMetadata\"],\"name\":\"objc2-cloud-kit\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"NSManagedObjectContext\",\"NSManagedObjectModel\"],\"name\":\"objc2-core-data\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"CFCGTypes\",\"CFDate\",\"objc2\"],\"name\":\"objc2-core-foundation\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"CGColor\",\"CGContext\",\"CGFont\",\"CGImage\",\"CGPath\",\"objc2\"],\"name\":\"objc2-core-graphics\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"CIColor\",\"CIImage\"],\"name\":\"objc2-core-image\",\"optional\":true,\"req\":\"^0.3.2\",\"target\":\"cfg(not(target_os = \\\"watchos\\\"))\"},{\"default_features\":false,\"features\":[\"CLRegion\"],\"name\":\"objc2-core-location\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"CTFont\",\"CTFontDescriptor\",\"objc2\"],\"name\":\"objc2-core-text\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"objc2-foundation\",\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"CADisplayLink\",\"CAFrameRateRange\",\"CALayer\",\"CAMediaTiming\",\"CATransform3D\",\"objc2-core-foundation\"],\"name\":\"objc2-quartz-core\",\"optional\":true,\"req\":\"^0.3.2\",\"target\":\"cfg(not(target_os = \\\"watchos\\\"))\"},{\"default_features\":false,\"features\":[\"NSSymbolEffect\"],\"name\":\"objc2-symbols\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"UTType\"],\"name\":\"objc2-uniform-type-identifiers\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"UNNotificationResponse\"],\"name\":\"objc2-user-notifications\",\"optional\":true,\"req\":\"^0.3.2\"}],\"features\":{\"DocumentManager\":[],\"NSAdaptiveImageGlyph\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSData\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"NSAttributedString\":[\"bitflags\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSData\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSError\",\"objc2-foundation/NSFileWrapper\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"NSDataAsset\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSData\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"NSDiffableDataSourceSectionSnapshot\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"NSFileProviderExtension\":[],\"NSIndexPath_UIKitAdditions\":[\"objc2-foundation/NSIndexPath\"],\"NSItemProvider_UIKitAdditions\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSData\",\"objc2-foundation/NSError\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSString\"],\"NSLayoutAnchor\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"NSLayoutConstraint\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSString\"],\"NSLayoutManager\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\"],\"NSParagraphStyle\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCharacterSet\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSLocale\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"NSShadow\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"NSStringDrawing\":[\"bitflags\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSString\"],\"NSText\":[],\"NSTextAttachment\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSData\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSFileWrapper\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"NSTextContainer\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"NSTextContentManager\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSError\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\"],\"NSTextElement\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\"],\"NSTextLayoutFragment\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSOperation\"],\"NSTextLayoutManager\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSOperation\",\"objc2-foundation/NSString\"],\"NSTextLineFragment\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\"],\"NSTextList\":[\"bitflags\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"NSTextListElement\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSString\"],\"NSTextRange\":[\"objc2-foundation/NSObjCRuntime\"],\"NSTextSelection\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"NSTextSelectionNavigation\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\"],\"NSTextStorage\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\"],\"NSTextViewportLayoutController\":[],\"NSToolbar_UIKitAdditions\":[],\"NSTouchBar_UIKitAdditions\":[],\"NSUserActivity_NSItemProvider\":[],\"PrintKitUI\":[],\"ShareSheet\":[],\"UIAccelerometer\":[\"objc2-foundation/NSDate\"],\"UIAccessibility\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UIAccessibilityAdditions\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSString\"],\"UIAccessibilityConstants\":[\"bitflags\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSString\"],\"UIAccessibilityContainer\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSRange\"],\"UIAccessibilityContentSizeCategoryImageAdjusting\":[],\"UIAccessibilityCustomAction\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSString\"],\"UIAccessibilityCustomRotor\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSString\"],\"UIAccessibilityElement\":[\"objc2-foundation/NSString\"],\"UIAccessibilityIdentification\":[\"objc2-foundation/NSString\"],\"UIAccessibilityLocationDescriptor\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSString\"],\"UIAccessibilityZoom\":[],\"UIAction\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIActionSheet\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIActivity\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\"],\"UIActivityCollaborationModeRestriction\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIActivityIndicatorView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIActivityItemProvider\":[\"objc2-foundation/NSOperation\",\"objc2-foundation/NSString\"],\"UIActivityItemsConfiguration\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSString\"],\"UIActivityItemsConfigurationReading\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSString\"],\"UIActivityItemsConfigurationReading_ShareSheet\":[\"objc2-foundation/NSString\"],\"UIActivityViewController\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSError\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIAlert\":[],\"UIAlertController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIAlertView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIAppearance\":[\"objc2-foundation/NSArray\"],\"UIApplication\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSData\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSError\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObjCRuntime\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\",\"objc2-foundation/NSUserActivity\"],\"UIApplicationShortcutItem\":[\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIAttachmentBehavior\":[\"objc2-foundation/NSArray\"],\"UIBackgroundConfiguration\":[\"objc2-foundation/NSObject\"],\"UIBackgroundExtensionView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIBandSelectionInteraction\":[],\"UIBarAppearance\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIBarButtonItem\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UIBarButtonItemAppearance\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIBarButtonItemBadge\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIBarButtonItemGroup\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIBarCommon\":[],\"UIBarItem\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIBehavioralStyle\":[],\"UIBezierPath\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIBlurEffect\":[\"objc2-foundation/NSObject\"],\"UIButton\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIButtonConfiguration\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UICalendarSelection\":[],\"UICalendarSelectionMultiDate\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCalendar\"],\"UICalendarSelectionSingleDate\":[\"objc2-foundation/NSCalendar\"],\"UICalendarSelectionWeekOfYear\":[\"objc2-foundation/NSCalendar\"],\"UICalendarView\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCalendar\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDateInterval\",\"objc2-foundation/NSLocale\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSTimeZone\"],\"UICalendarViewDecoration\":[],\"UICanvasFeedbackGenerator\":[],\"UICellAccessory\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UICellConfigurationState\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UICloudSharingController\":[\"bitflags\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSData\",\"objc2-foundation/NSError\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UICollectionLayoutList\":[\"bitflags\",\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSObject\"],\"UICollectionView\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSIndexSet\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSProgress\",\"objc2-foundation/NSString\"],\"UICollectionViewCell\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UICollectionViewCompositionalLayout\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UICollectionViewController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UICollectionViewFlowLayout\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSObject\"],\"UICollectionViewItemRegistration\":[\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSString\"],\"UICollectionViewLayout\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UICollectionViewListCell\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UICollectionViewTransitionLayout\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UICollectionViewUpdateItem\":[\"objc2-foundation/NSIndexPath\"],\"UICollisionBehavior\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\"],\"UIColor\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIColorPickerViewController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIColorWell\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UICommand\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIConfigurationColorTransformer\":[],\"UIConfigurationState\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIContentConfiguration\":[\"objc2-foundation/NSObject\"],\"UIContentSizeCategory\":[\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObjCRuntime\",\"objc2-foundation/NSString\"],\"UIContentSizeCategoryAdjusting\":[],\"UIContentUnavailableButtonProperties\":[\"objc2-foundation/NSObject\"],\"UIContentUnavailableConfiguration\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIContentUnavailableConfigurationState\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIContentUnavailableImageProperties\":[\"objc2-foundation/NSObject\"],\"UIContentUnavailableTextProperties\":[\"objc2-foundation/NSObject\"],\"UIContentUnavailableView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIContextMenuConfiguration\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSSet\"],\"UIContextMenuInteraction\":[\"objc2-foundation/NSObject\"],\"UIContextMenuSystem\":[],\"UIContextualAction\":[\"objc2-foundation/NSString\"],\"UIControl\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UIConversationContext\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSPersonNameComponents\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UIConversationEntry\":[\"objc2-foundation/NSDate\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UICornerConfiguration\":[\"objc2-foundation/NSObject\"],\"UICornerRadius\":[\"objc2-foundation/NSObject\"],\"UIDataDetectors\":[\"bitflags\"],\"UIDataSourceTranslating\":[\"objc2-foundation/NSIndexPath\"],\"UIDatePicker\":[\"objc2-foundation/NSCalendar\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSLocale\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSTimeZone\"],\"UIDeferredMenuElement\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIDevice\":[\"objc2-foundation/NSNotification\",\"objc2-foundation/NSString\",\"objc2-foundation/NSUUID\"],\"UIDiffableDataSource\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSOrderedCollectionDifference\",\"objc2-foundation/NSString\"],\"UIDocument\":[\"bitflags\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSError\",\"objc2-foundation/NSFilePresenter\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSProgress\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\",\"objc2-foundation/NSUndoManager\",\"objc2-foundation/NSUserActivity\"],\"UIDocumentBrowserAction\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIDocumentBrowserViewController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSError\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSProgress\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIDocumentInteractionController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIDocumentMenuViewController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIDocumentPickerExtensionViewController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIDocumentPickerViewController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIDocumentProperties\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSURL\"],\"UIDocumentViewController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIDocumentViewControllerLaunchOptions\":[\"objc2-foundation/NSString\"],\"UIDragInteraction\":[\"objc2-foundation/NSArray\"],\"UIDragItem\":[\"objc2-foundation/NSItemProvider\"],\"UIDragPreview\":[\"objc2-foundation/NSObject\"],\"UIDragPreviewParameters\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSValue\"],\"UIDragSession\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSProgress\",\"objc2-foundation/NSString\"],\"UIDropInteraction\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSProgress\"],\"UIDynamicAnimator\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSString\"],\"UIDynamicBehavior\":[\"objc2-foundation/NSArray\"],\"UIDynamicItemBehavior\":[\"objc2-foundation/NSArray\"],\"UIEditMenuInteraction\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\"],\"UIEvent\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSSet\"],\"UIEventAttribution\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIEventAttributionView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIFeedbackGenerator\":[],\"UIFieldBehavior\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSDate\"],\"UIFindInteraction\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\"],\"UIFindSession\":[\"objc2-foundation/NSString\"],\"UIFocus\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSString\"],\"UIFocusAnimationCoordinator\":[\"objc2-foundation/NSDate\"],\"UIFocusDebugger\":[],\"UIFocusDefines\":[],\"UIFocusEffect\":[\"objc2-foundation/NSObject\"],\"UIFocusGuide\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\"],\"UIFocusMovementHint\":[\"objc2-foundation/NSObject\"],\"UIFocusSystem\":[],\"UIFocusSystem_UIKitAdditions\":[\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIFocusUpdateContext_UIKitAdditions\":[],\"UIFont\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIFontDescriptor\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UIFontMetrics\":[\"objc2-foundation/NSString\"],\"UIFontPickerViewController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIFontPickerViewControllerConfiguration\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSPredicate\",\"objc2-foundation/NSString\"],\"UIFoundation\":[],\"UIGeometry\":[\"bitflags\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"UIGestureRecognizer\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"UIGestureRecognizerSubclass\":[\"objc2-foundation/NSSet\"],\"UIGlassEffect\":[\"objc2-foundation/NSObject\"],\"UIGraphics\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIGraphicsImageRenderer\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSObject\"],\"UIGraphicsPDFRenderer\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSError\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIGraphicsRenderer\":[\"objc2-foundation/NSObject\"],\"UIGraphicsRendererSubclass\":[\"objc2-foundation/NSError\"],\"UIGravityBehavior\":[\"objc2-foundation/NSArray\"],\"UIGuidedAccess\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSError\",\"objc2-foundation/NSString\"],\"UIGuidedAccessRestrictions\":[],\"UIHoverEffect\":[\"objc2-foundation/NSObject\"],\"UIHoverEffectLayer\":[\"objc2-foundation/NSObject\"],\"UIHoverGestureRecognizer\":[\"objc2-foundation/NSCoder\"],\"UIHoverStyle\":[\"objc2-foundation/NSObject\"],\"UIImage\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSData\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIImageAsset\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIImageConfiguration\":[\"objc2-foundation/NSLocale\",\"objc2-foundation/NSObject\"],\"UIImagePickerController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"UIImageReader\":[\"objc2-foundation/NSData\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSURL\"],\"UIImageSymbolConfiguration\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSLocale\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIImageView\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSObject\"],\"UIImpactFeedbackGenerator\":[],\"UIIndirectScribbleInteraction\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\"],\"UIInputSuggestion\":[],\"UIInputView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIInputViewController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\",\"objc2-foundation/NSUUID\"],\"UIInteraction\":[\"objc2-foundation/NSArray\"],\"UIInterface\":[],\"UIKey\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIKeyCommand\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIKeyConstants\":[],\"UIKeyboardLayoutGuide\":[\"objc2-foundation/NSObject\"],\"UIKitCore\":[],\"UIKitDefines\":[],\"UILabel\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UILargeContentViewer\":[\"objc2-foundation/NSNotification\",\"objc2-foundation/NSString\"],\"UILayoutGuide\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UILetterformAwareAdjusting\":[],\"UILexicon\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIListContentConfiguration\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIListContentImageProperties\":[\"objc2-foundation/NSObject\"],\"UIListContentTextProperties\":[\"objc2-foundation/NSObject\"],\"UIListSeparatorConfiguration\":[\"objc2-foundation/NSObject\"],\"UILocalNotification\":[\"objc2-foundation/NSCalendar\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSTimeZone\"],\"UILocalizedIndexedCollation\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\"],\"UILongPressGestureRecognizer\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDate\"],\"UIMailConversationContext\":[\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UIMailConversationEntry\":[\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UIMainMenuSystem\":[\"objc2-foundation/NSObject\"],\"UIManagedDocument\":[\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSError\",\"objc2-foundation/NSFilePresenter\",\"objc2-foundation/NSProgress\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIMenu\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIMenuBuilder\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\"],\"UIMenuController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSString\"],\"UIMenuDisplayPreferences\":[\"objc2-foundation/NSObject\"],\"UIMenuElement\":[\"bitflags\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIMenuLeaf\":[\"objc2-foundation/NSString\"],\"UIMenuSystem\":[],\"UIMessageConversationContext\":[],\"UIMessageConversationEntry\":[],\"UIMotionEffect\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UINavigationBar\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UINavigationBarAppearance\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UINavigationController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UINavigationItem\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\"],\"UINib\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSData\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSString\"],\"UINibDeclarations\":[],\"UINibLoading\":[\"objc2-foundation/NSString\"],\"UINotificationFeedbackGenerator\":[],\"UIOpenURLContext\":[\"objc2-foundation/NSURL\"],\"UIOrientation\":[\"bitflags\"],\"UIPageControl\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIPageControlProgress\":[\"objc2-foundation/NSDate\"],\"UIPageViewController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIPanGestureRecognizer\":[\"bitflags\",\"objc2-foundation/NSCoder\"],\"UIPasteConfiguration\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIPasteConfigurationSupporting\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSItemProvider\"],\"UIPasteControl\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIPasteboard\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSData\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSError\",\"objc2-foundation/NSIndexSet\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIPencilInteraction\":[\"objc2-foundation/NSDate\"],\"UIPickerView\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIPinchGestureRecognizer\":[\"objc2-foundation/NSCoder\"],\"UIPointerAccessory\":[\"objc2-foundation/NSObject\"],\"UIPointerInteraction\":[],\"UIPointerLockState\":[\"objc2-foundation/NSNotification\",\"objc2-foundation/NSString\"],\"UIPointerRegion\":[\"objc2-foundation/NSObject\"],\"UIPointerStyle\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\"],\"UIPopoverBackgroundView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIPopoverController\":[\"objc2-foundation/NSArray\"],\"UIPopoverPresentationController\":[\"objc2-foundation/NSArray\"],\"UIPopoverPresentationControllerSourceItem\":[],\"UIPopoverSupport\":[\"bitflags\"],\"UIPresentationController\":[],\"UIPress\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSDate\"],\"UIPressesEvent\":[\"objc2-foundation/NSSet\"],\"UIPreviewInteraction\":[],\"UIPreviewParameters\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSValue\"],\"UIPrintError\":[\"objc2-foundation/NSError\",\"objc2-foundation/NSString\"],\"UIPrintFormatter\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIPrintInfo\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIPrintInteractionController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSData\",\"objc2-foundation/NSError\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIPrintPageRenderer\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSRange\"],\"UIPrintPaper\":[\"objc2-foundation/NSArray\"],\"UIPrintServiceExtension\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSData\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIPrinter\":[\"bitflags\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UIPrinterPickerController\":[\"objc2-foundation/NSError\"],\"UIProgressView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSProgress\"],\"UIPushBehavior\":[\"objc2-foundation/NSArray\"],\"UIReferenceLibraryViewController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIRefreshControl\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIRegion\":[\"objc2-foundation/NSObject\"],\"UIResponder\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\",\"objc2-foundation/NSUndoManager\",\"objc2-foundation/NSUserActivity\"],\"UIResponder_UIActivityItemsConfiguration\":[],\"UIRotationGestureRecognizer\":[\"objc2-foundation/NSCoder\"],\"UIScene\":[\"objc2-foundation/NSError\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\",\"objc2-foundation/NSUserActivity\"],\"UISceneActivationConditions\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSPredicate\",\"objc2-foundation/NSString\",\"objc2-foundation/NSUserActivity\"],\"UISceneConfiguration\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UISceneDefinitions\":[\"objc2-foundation/NSError\",\"objc2-foundation/NSString\"],\"UISceneDestructionCondition\":[\"objc2-foundation/NSObject\"],\"UISceneEnhancedStateRestoration\":[],\"UISceneOptions\":[\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\",\"objc2-foundation/NSUserActivity\"],\"UISceneSession\":[\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSUserActivity\",\"UISceneConfiguration\"],\"UISceneSessionActivationRequest\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSUserActivity\"],\"UISceneSizeRestrictions\":[],\"UISceneSystemProtectionManager\":[\"objc2-foundation/NSNotification\",\"objc2-foundation/NSString\"],\"UISceneWindowingBehaviors\":[],\"UISceneWindowingControlStyle\":[],\"UIScene_AVAudioSession\":[],\"UIScreen\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSString\"],\"UIScreenEdgePanGestureRecognizer\":[\"objc2-foundation/NSCoder\"],\"UIScreenMode\":[],\"UIScreenshotService\":[\"objc2-foundation/NSData\"],\"UIScribbleInteraction\":[],\"UIScrollEdgeElementContainerInteraction\":[],\"UIScrollView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSSet\"],\"UISearchBar\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"UISearchContainerViewController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UISearchController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UISearchDisplayController\":[\"objc2-foundation/NSString\"],\"UISearchSuggestion\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSString\"],\"UISearchTab\":[\"objc2-foundation/NSString\"],\"UISearchTextField\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UISegmentedControl\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UISelectionFeedbackGenerator\":[],\"UIShadowProperties\":[\"objc2-foundation/NSObject\"],\"UIShape\":[\"objc2-foundation/NSObject\"],\"UISheetPresentationController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\"],\"UISlider\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UISliderTrackConfiguration\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UISmartReplySuggestion\":[\"objc2-foundation/NSString\"],\"UISnapBehavior\":[],\"UISplitViewController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UISplitViewControllerLayoutEnvironment\":[],\"UISpringLoadedInteraction\":[],\"UISpringLoadedInteractionSupporting\":[],\"UIStackView\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIStandardTextCursorView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIStateRestoration\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSString\"],\"UIStatusBarManager\":[],\"UIStepper\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIStoryboard\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSString\"],\"UIStoryboardPopoverSegue\":[\"objc2-foundation/NSString\"],\"UIStoryboardSegue\":[\"objc2-foundation/NSString\"],\"UIStringDrawing\":[\"objc2-foundation/NSString\"],\"UISwipeActionsConfiguration\":[\"objc2-foundation/NSArray\"],\"UISwipeGestureRecognizer\":[\"bitflags\",\"objc2-foundation/NSCoder\"],\"UISwitch\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UISymbolContentTransition\":[\"objc2-foundation/NSObject\"],\"UISymbolEffectCompletion\":[],\"UITab\":[\"objc2-foundation/NSString\"],\"UITabAccessory\":[],\"UITabBar\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UITabBarAppearance\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITabBarController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSProgress\",\"objc2-foundation/NSString\"],\"UITabBarControllerSidebar\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSProgress\"],\"UITabBarItem\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITabGroup\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\"],\"UITabSidebarItem\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\"],\"UITableView\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSIndexPath\",\"objc2-foundation/NSIndexSet\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSProgress\",\"objc2-foundation/NSString\"],\"UITableViewCell\":[\"bitflags\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITableViewController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITableViewHeaderFooterView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITapGestureRecognizer\":[\"objc2-foundation/NSCoder\"],\"UITargetedDragPreview\":[\"objc2-foundation/NSObject\"],\"UITargetedPreview\":[\"objc2-foundation/NSObject\"],\"UITextChecker\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\"],\"UITextCursorDropPositionAnimator\":[],\"UITextCursorView\":[],\"UITextDragPreviewRenderer\":[\"objc2-foundation/NSRange\"],\"UITextDragURLPreviews\":[\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UITextDragging\":[\"bitflags\",\"objc2-foundation/NSArray\"],\"UITextDropProposal\":[\"objc2-foundation/NSObject\"],\"UITextDropping\":[\"objc2-foundation/NSProgress\"],\"UITextField\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"UITextFormattingCoordinator\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSString\"],\"UITextFormattingViewController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITextFormattingViewControllerChangeValue\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"UITextFormattingViewControllerComponent\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITextFormattingViewControllerConfiguration\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\"],\"UITextFormattingViewControllerFormattingDescriptor\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UITextFormattingViewControllerFormattingStyle\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITextInput\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObjCRuntime\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\"],\"UITextInputContext\":[],\"UITextInputTraits\":[\"bitflags\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITextInteraction\":[\"objc2-foundation/NSArray\"],\"UITextItem\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UITextItemInteraction\":[],\"UITextLoupeSession\":[],\"UITextPasteConfigurationSupporting\":[],\"UITextPasteDelegate\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSItemProvider\",\"objc2-foundation/NSString\"],\"UITextSearching\":[\"objc2-foundation/NSObjCRuntime\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSOrderedSet\",\"objc2-foundation/NSString\"],\"UITextSelectionDisplayInteraction\":[\"objc2-foundation/NSArray\"],\"UITextSelectionHandleView\":[],\"UITextSelectionHighlightView\":[\"objc2-foundation/NSArray\"],\"UITextView\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\",\"objc2-foundation/NSValue\"],\"UITimingCurveProvider\":[\"objc2-foundation/NSObject\"],\"UITimingParameters\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSObject\"],\"UIToolTipInteraction\":[\"objc2-foundation/NSString\"],\"UIToolbar\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIToolbarAppearance\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UITouch\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSValue\"],\"UITrackingLayoutGuide\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\"],\"UITrait\":[\"objc2-foundation/NSString\"],\"UITraitCollection\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UITraitListEnvironment\":[],\"UIUpdateActionPhase\":[],\"UIUpdateInfo\":[\"objc2-foundation/NSDate\"],\"UIUpdateLink\":[],\"UIUserActivity\":[\"objc2-foundation/NSUserActivity\"],\"UIUserNotificationSettings\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"UIVibrancyEffect\":[\"objc2-foundation/NSObject\"],\"UIVideoEditorController\":[\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSError\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIView\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIViewAnimating\":[\"objc2-foundation/NSDate\",\"objc2-foundation/NSObject\"],\"UIViewConfigurationState\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIViewController\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSBundle\",\"objc2-foundation/NSCoder\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSExtensionContext\",\"objc2-foundation/NSExtensionRequestHandling\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObjCRuntime\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIViewControllerTransition\":[],\"UIViewControllerTransitionCoordinator\":[\"objc2-foundation/NSDate\",\"objc2-foundation/NSString\"],\"UIViewControllerTransitioning\":[\"objc2-foundation/NSDate\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIViewLayoutRegion\":[],\"UIViewPropertyAnimator\":[\"objc2-foundation/NSDate\",\"objc2-foundation/NSObject\"],\"UIVisualEffect\":[\"objc2-foundation/NSObject\"],\"UIVisualEffectView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\"],\"UIWebView\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSData\",\"objc2-foundation/NSError\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\",\"objc2-foundation/NSURLRequest\"],\"UIWindow\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSNotification\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIWindowScene\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSError\",\"objc2-foundation/NSString\",\"UISceneSizeRestrictions\"],\"UIWindowSceneActivationAction\":[\"objc2-foundation/NSCoder\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UIWindowSceneActivationConfiguration\":[\"objc2-foundation/NSUserActivity\"],\"UIWindowSceneActivationInteraction\":[\"objc2-foundation/NSError\"],\"UIWindowSceneActivationRequestOptions\":[],\"UIWindowSceneDragInteraction\":[],\"UIWindowSceneGeometry\":[\"objc2-foundation/NSObject\"],\"UIWindowSceneGeometryPreferences\":[],\"UIWindowSceneGeometryPreferencesIOS\":[],\"UIWindowSceneGeometryPreferencesMac\":[],\"UIWindowSceneGeometryPreferencesVision\":[],\"UIWindowScenePlacement\":[\"objc2-foundation/NSObject\"],\"UIWindowSceneProminentPlacement\":[\"objc2-foundation/NSObject\"],\"UIWindowScenePushPlacement\":[\"objc2-foundation/NSObject\"],\"UIWindowSceneReplacePlacement\":[\"objc2-foundation/NSObject\"],\"UIWindowSceneStandardPlacement\":[\"objc2-foundation/NSObject\"],\"UIWritingToolsCoordinator\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSString\",\"objc2-foundation/NSUUID\",\"objc2-foundation/NSValue\"],\"UIWritingToolsCoordinatorAnimationParameters\":[],\"UIWritingToolsCoordinatorContext\":[\"objc2-foundation/NSAttributedString\",\"objc2-foundation/NSRange\",\"objc2-foundation/NSUUID\"],\"UIZoomTransitionOptions\":[\"objc2-foundation/NSObject\"],\"UNNotificationResponse_UIKitAdditions\":[],\"alloc\":[],\"bitflags\":[\"dep:bitflags\"],\"block2\":[\"dep:block2\"],\"default\":[\"std\",\"DocumentManager\",\"NSAdaptiveImageGlyph\",\"NSAttributedString\",\"NSDataAsset\",\"NSDiffableDataSourceSectionSnapshot\",\"NSFileProviderExtension\",\"NSIndexPath_UIKitAdditions\",\"NSItemProvider_UIKitAdditions\",\"NSLayoutAnchor\",\"NSLayoutConstraint\",\"NSLayoutManager\",\"NSParagraphStyle\",\"NSShadow\",\"NSStringDrawing\",\"NSText\",\"NSTextAttachment\",\"NSTextContainer\",\"NSTextContentManager\",\"NSTextElement\",\"NSTextLayoutFragment\",\"NSTextLayoutManager\",\"NSTextLineFragment\",\"NSTextList\",\"NSTextListElement\",\"NSTextRange\",\"NSTextSelection\",\"NSTextSelectionNavigation\",\"NSTextStorage\",\"NSTextViewportLayoutController\",\"NSToolbar_UIKitAdditions\",\"NSTouchBar_UIKitAdditions\",\"NSUserActivity_NSItemProvider\",\"PrintKitUI\",\"ShareSheet\",\"UIAccelerometer\",\"UIAccessibility\",\"UIAccessibilityAdditions\",\"UIAccessibilityConstants\",\"UIAccessibilityContainer\",\"UIAccessibilityContentSizeCategoryImageAdjusting\",\"UIAccessibilityCustomAction\",\"UIAccessibilityCustomRotor\",\"UIAccessibilityElement\",\"UIAccessibilityIdentification\",\"UIAccessibilityLocationDescriptor\",\"UIAccessibilityZoom\",\"UIAction\",\"UIActionSheet\",\"UIActivity\",\"UIActivityCollaborationModeRestriction\",\"UIActivityIndicatorView\",\"UIActivityItemProvider\",\"UIActivityItemsConfiguration\",\"UIActivityItemsConfigurationReading\",\"UIActivityItemsConfigurationReading_ShareSheet\",\"UIActivityViewController\",\"UIAlert\",\"UIAlertController\",\"UIAlertView\",\"UIAppearance\",\"UIApplication\",\"UIApplicationShortcutItem\",\"UIAttachmentBehavior\",\"UIBackgroundConfiguration\",\"UIBackgroundExtensionView\",\"UIBandSelectionInteraction\",\"UIBarAppearance\",\"UIBarButtonItem\",\"UIBarButtonItemAppearance\",\"UIBarButtonItemBadge\",\"UIBarButtonItemGroup\",\"UIBarCommon\",\"UIBarItem\",\"UIBehavioralStyle\",\"UIBezierPath\",\"UIBlurEffect\",\"UIButton\",\"UIButtonConfiguration\",\"UICalendarSelection\",\"UICalendarSelectionMultiDate\",\"UICalendarSelectionSingleDate\",\"UICalendarSelectionWeekOfYear\",\"UICalendarView\",\"UICalendarViewDecoration\",\"UICanvasFeedbackGenerator\",\"UICellAccessory\",\"UICellConfigurationState\",\"UICloudSharingController\",\"UICollectionLayoutList\",\"UICollectionView\",\"UICollectionViewCell\",\"UICollectionViewCompositionalLayout\",\"UICollectionViewController\",\"UICollectionViewFlowLayout\",\"UICollectionViewItemRegistration\",\"UICollectionViewLayout\",\"UICollectionViewListCell\",\"UICollectionViewTransitionLayout\",\"UICollectionViewUpdateItem\",\"UICollisionBehavior\",\"UIColor\",\"UIColorPickerViewController\",\"UIColorWell\",\"UICommand\",\"UIConfigurationColorTransformer\",\"UIConfigurationState\",\"UIContentConfiguration\",\"UIContentSizeCategory\",\"UIContentSizeCategoryAdjusting\",\"UIContentUnavailableButtonProperties\",\"UIContentUnavailableConfiguration\",\"UIContentUnavailableConfigurationState\",\"UIContentUnavailableImageProperties\",\"UIContentUnavailableTextProperties\",\"UIContentUnavailableView\",\"UIContextMenuConfiguration\",\"UIContextMenuInteraction\",\"UIContextMenuSystem\",\"UIContextualAction\",\"UIControl\",\"UIConversationContext\",\"UIConversationEntry\",\"UICornerConfiguration\",\"UICornerRadius\",\"UIDataDetectors\",\"UIDataSourceTranslating\",\"UIDatePicker\",\"UIDeferredMenuElement\",\"UIDevice\",\"UIDiffableDataSource\",\"UIDocument\",\"UIDocumentBrowserAction\",\"UIDocumentBrowserViewController\",\"UIDocumentInteractionController\",\"UIDocumentMenuViewController\",\"UIDocumentPickerExtensionViewController\",\"UIDocumentPickerViewController\",\"UIDocumentProperties\",\"UIDocumentViewController\",\"UIDocumentViewControllerLaunchOptions\",\"UIDragInteraction\",\"UIDragItem\",\"UIDragPreview\",\"UIDragPreviewParameters\",\"UIDragSession\",\"UIDropInteraction\",\"UIDynamicAnimator\",\"UIDynamicBehavior\",\"UIDynamicItemBehavior\",\"UIEditMenuInteraction\",\"UIEvent\",\"UIEventAttribution\",\"UIEventAttributionView\",\"UIFeedbackGenerator\",\"UIFieldBehavior\",\"UIFindInteraction\",\"UIFindSession\",\"UIFocus\",\"UIFocusAnimationCoordinator\",\"UIFocusDebugger\",\"UIFocusDefines\",\"UIFocusEffect\",\"UIFocusGuide\",\"UIFocusMovementHint\",\"UIFocusSystem\",\"UIFocusSystem_UIKitAdditions\",\"UIFocusUpdateContext_UIKitAdditions\",\"UIFont\",\"UIFontDescriptor\",\"UIFontMetrics\",\"UIFontPickerViewController\",\"UIFontPickerViewControllerConfiguration\",\"UIFoundation\",\"UIGeometry\",\"UIGestureRecognizer\",\"UIGestureRecognizerSubclass\",\"UIGlassEffect\",\"UIGraphics\",\"UIGraphicsImageRenderer\",\"UIGraphicsPDFRenderer\",\"UIGraphicsRenderer\",\"UIGraphicsRendererSubclass\",\"UIGravityBehavior\",\"UIGuidedAccess\",\"UIGuidedAccessRestrictions\",\"UIHoverEffect\",\"UIHoverEffectLayer\",\"UIHoverGestureRecognizer\",\"UIHoverStyle\",\"UIImage\",\"UIImageAsset\",\"UIImageConfiguration\",\"UIImagePickerController\",\"UIImageReader\",\"UIImageSymbolConfiguration\",\"UIImageView\",\"UIImpactFeedbackGenerator\",\"UIIndirectScribbleInteraction\",\"UIInputSuggestion\",\"UIInputView\",\"UIInputViewController\",\"UIInteraction\",\"UIInterface\",\"UIKey\",\"UIKeyCommand\",\"UIKeyConstants\",\"UIKeyboardLayoutGuide\",\"UIKitCore\",\"UIKitDefines\",\"UILabel\",\"UILargeContentViewer\",\"UILayoutGuide\",\"UILetterformAwareAdjusting\",\"UILexicon\",\"UIListContentConfiguration\",\"UIListContentImageProperties\",\"UIListContentTextProperties\",\"UIListSeparatorConfiguration\",\"UILocalNotification\",\"UILocalizedIndexedCollation\",\"UILongPressGestureRecognizer\",\"UIMailConversationContext\",\"UIMailConversationEntry\",\"UIMainMenuSystem\",\"UIManagedDocument\",\"UIMenu\",\"UIMenuBuilder\",\"UIMenuController\",\"UIMenuDisplayPreferences\",\"UIMenuElement\",\"UIMenuLeaf\",\"UIMenuSystem\",\"UIMessageConversationContext\",\"UIMessageConversationEntry\",\"UIMotionEffect\",\"UINavigationBar\",\"UINavigationBarAppearance\",\"UINavigationController\",\"UINavigationItem\",\"UINib\",\"UINibDeclarations\",\"UINibLoading\",\"UINotificationFeedbackGenerator\",\"UIOpenURLContext\",\"UIOrientation\",\"UIPageControl\",\"UIPageControlProgress\",\"UIPageViewController\",\"UIPanGestureRecognizer\",\"UIPasteConfiguration\",\"UIPasteConfigurationSupporting\",\"UIPasteControl\",\"UIPasteboard\",\"UIPencilInteraction\",\"UIPickerView\",\"UIPinchGestureRecognizer\",\"UIPointerAccessory\",\"UIPointerInteraction\",\"UIPointerLockState\",\"UIPointerRegion\",\"UIPointerStyle\",\"UIPopoverBackgroundView\",\"UIPopoverController\",\"UIPopoverPresentationController\",\"UIPopoverPresentationControllerSourceItem\",\"UIPopoverSupport\",\"UIPresentationController\",\"UIPress\",\"UIPressesEvent\",\"UIPreviewInteraction\",\"UIPreviewParameters\",\"UIPrintError\",\"UIPrintFormatter\",\"UIPrintInfo\",\"UIPrintInteractionController\",\"UIPrintPageRenderer\",\"UIPrintPaper\",\"UIPrintServiceExtension\",\"UIPrinter\",\"UIPrinterPickerController\",\"UIProgressView\",\"UIPushBehavior\",\"UIReferenceLibraryViewController\",\"UIRefreshControl\",\"UIRegion\",\"UIResponder\",\"UIResponder_UIActivityItemsConfiguration\",\"UIRotationGestureRecognizer\",\"UIScene\",\"UISceneActivationConditions\",\"UISceneConfiguration\",\"UISceneDefinitions\",\"UISceneDestructionCondition\",\"UISceneEnhancedStateRestoration\",\"UISceneOptions\",\"UISceneSession\",\"UISceneSessionActivationRequest\",\"UISceneSizeRestrictions\",\"UISceneSystemProtectionManager\",\"UISceneWindowingBehaviors\",\"UISceneWindowingControlStyle\",\"UIScene_AVAudioSession\",\"UIScreen\",\"UIScreenEdgePanGestureRecognizer\",\"UIScreenMode\",\"UIScreenshotService\",\"UIScribbleInteraction\",\"UIScrollEdgeElementContainerInteraction\",\"UIScrollView\",\"UISearchBar\",\"UISearchContainerViewController\",\"UISearchController\",\"UISearchDisplayController\",\"UISearchSuggestion\",\"UISearchTab\",\"UISearchTextField\",\"UISegmentedControl\",\"UISelectionFeedbackGenerator\",\"UIShadowProperties\",\"UIShape\",\"UISheetPresentationController\",\"UISlider\",\"UISliderTrackConfiguration\",\"UISmartReplySuggestion\",\"UISnapBehavior\",\"UISplitViewController\",\"UISplitViewControllerLayoutEnvironment\",\"UISpringLoadedInteraction\",\"UISpringLoadedInteractionSupporting\",\"UIStackView\",\"UIStandardTextCursorView\",\"UIStateRestoration\",\"UIStatusBarManager\",\"UIStepper\",\"UIStoryboard\",\"UIStoryboardPopoverSegue\",\"UIStoryboardSegue\",\"UIStringDrawing\",\"UISwipeActionsConfiguration\",\"UISwipeGestureRecognizer\",\"UISwitch\",\"UISymbolContentTransition\",\"UISymbolEffectCompletion\",\"UITab\",\"UITabAccessory\",\"UITabBar\",\"UITabBarAppearance\",\"UITabBarController\",\"UITabBarControllerSidebar\",\"UITabBarItem\",\"UITabGroup\",\"UITabSidebarItem\",\"UITableView\",\"UITableViewCell\",\"UITableViewController\",\"UITableViewHeaderFooterView\",\"UITapGestureRecognizer\",\"UITargetedDragPreview\",\"UITargetedPreview\",\"UITextChecker\",\"UITextCursorDropPositionAnimator\",\"UITextCursorView\",\"UITextDragPreviewRenderer\",\"UITextDragURLPreviews\",\"UITextDragging\",\"UITextDropProposal\",\"UITextDropping\",\"UITextField\",\"UITextFormattingCoordinator\",\"UITextFormattingViewController\",\"UITextFormattingViewControllerChangeValue\",\"UITextFormattingViewControllerComponent\",\"UITextFormattingViewControllerConfiguration\",\"UITextFormattingViewControllerFormattingDescriptor\",\"UITextFormattingViewControllerFormattingStyle\",\"UITextInput\",\"UITextInputContext\",\"UITextInputTraits\",\"UITextInteraction\",\"UITextItem\",\"UITextItemInteraction\",\"UITextLoupeSession\",\"UITextPasteConfigurationSupporting\",\"UITextPasteDelegate\",\"UITextSearching\",\"UITextSelectionDisplayInteraction\",\"UITextSelectionHandleView\",\"UITextSelectionHighlightView\",\"UITextView\",\"UITimingCurveProvider\",\"UITimingParameters\",\"UIToolTipInteraction\",\"UIToolbar\",\"UIToolbarAppearance\",\"UITouch\",\"UITrackingLayoutGuide\",\"UITrait\",\"UITraitCollection\",\"UITraitListEnvironment\",\"UIUpdateActionPhase\",\"UIUpdateInfo\",\"UIUpdateLink\",\"UIUserActivity\",\"UIUserNotificationSettings\",\"UIVibrancyEffect\",\"UIVideoEditorController\",\"UIView\",\"UIViewAnimating\",\"UIViewConfigurationState\",\"UIViewController\",\"UIViewControllerTransition\",\"UIViewControllerTransitionCoordinator\",\"UIViewControllerTransitioning\",\"UIViewLayoutRegion\",\"UIViewPropertyAnimator\",\"UIVisualEffect\",\"UIVisualEffectView\",\"UIWebView\",\"UIWindow\",\"UIWindowScene\",\"UIWindowSceneActivationAction\",\"UIWindowSceneActivationConfiguration\",\"UIWindowSceneActivationInteraction\",\"UIWindowSceneActivationRequestOptions\",\"UIWindowSceneDragInteraction\",\"UIWindowSceneGeometry\",\"UIWindowSceneGeometryPreferences\",\"UIWindowSceneGeometryPreferencesIOS\",\"UIWindowSceneGeometryPreferencesMac\",\"UIWindowSceneGeometryPreferencesVision\",\"UIWindowScenePlacement\",\"UIWindowSceneProminentPlacement\",\"UIWindowScenePushPlacement\",\"UIWindowSceneReplacePlacement\",\"UIWindowSceneStandardPlacement\",\"UIWritingToolsCoordinator\",\"UIWritingToolsCoordinatorAnimationParameters\",\"UIWritingToolsCoordinatorContext\",\"UIZoomTransitionOptions\",\"UNNotificationResponse_UIKitAdditions\",\"bitflags\",\"block2\",\"objc2-cloud-kit\",\"objc2-core-data\",\"objc2-core-foundation\",\"objc2-core-graphics\",\"objc2-core-image\",\"objc2-core-location\",\"objc2-core-text\",\"objc2-quartz-core\",\"objc2-user-notifications\"],\"objc2-cloud-kit\":[\"dep:objc2-cloud-kit\"],\"objc2-core-data\":[\"dep:objc2-core-data\"],\"objc2-core-foundation\":[\"dep:objc2-core-foundation\"],\"objc2-core-graphics\":[\"dep:objc2-core-graphics\"],\"objc2-core-image\":[\"dep:objc2-core-image\"],\"objc2-core-location\":[\"dep:objc2-core-location\"],\"objc2-core-text\":[\"dep:objc2-core-text\"],\"objc2-quartz-core\":[\"dep:objc2-quartz-core\"],\"objc2-symbols\":[\"dep:objc2-symbols\"],\"objc2-uniform-type-identifiers\":[\"dep:objc2-uniform-type-identifiers\"],\"objc2-user-notifications\":[\"dep:objc2-user-notifications\"],\"std\":[\"alloc\"],\"unstable-darwin-objc\":[]}}", "objc2-user-notifications_0.3.2": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2.5.0\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"block2\",\"optional\":true,\"req\":\">=0.6.1, <0.8.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"objc2\",\"req\":\">=0.6.2, <0.8.0\"},{\"default_features\":false,\"features\":[\"CLRegion\"],\"name\":\"objc2-core-location\",\"optional\":true,\"req\":\"^0.3.2\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"objc2-foundation\",\"req\":\"^0.3.2\"}],\"features\":{\"NSString_UserNotifications\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSString\"],\"UNError\":[\"objc2-foundation/NSString\"],\"UNNotification\":[\"objc2-foundation/NSDate\",\"objc2-foundation/NSObject\"],\"UNNotificationAction\":[\"bitflags\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UNNotificationActionIcon\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UNNotificationAttachment\":[\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSError\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSURL\"],\"UNNotificationAttributedMessageContext\":[],\"UNNotificationCategory\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UNNotificationContent\":[\"objc2-foundation/NSArray\",\"objc2-foundation/NSDictionary\",\"objc2-foundation/NSError\",\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\",\"objc2-foundation/NSValue\"],\"UNNotificationRequest\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UNNotificationResponse\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UNNotificationServiceExtension\":[],\"UNNotificationSettings\":[\"objc2-foundation/NSObject\"],\"UNNotificationSound\":[\"objc2-foundation/NSObject\",\"objc2-foundation/NSString\"],\"UNNotificationTrigger\":[\"objc2-foundation/NSCalendar\",\"objc2-foundation/NSDate\",\"objc2-foundation/NSObject\"],\"UNUserNotificationCenter\":[\"bitflags\",\"objc2-foundation/NSArray\",\"objc2-foundation/NSError\",\"objc2-foundation/NSSet\",\"objc2-foundation/NSString\"],\"alloc\":[],\"bitflags\":[\"dep:bitflags\"],\"block2\":[\"dep:block2\"],\"default\":[\"std\",\"NSString_UserNotifications\",\"UNError\",\"UNNotification\",\"UNNotificationAction\",\"UNNotificationActionIcon\",\"UNNotificationAttachment\",\"UNNotificationAttributedMessageContext\",\"UNNotificationCategory\",\"UNNotificationContent\",\"UNNotificationRequest\",\"UNNotificationResponse\",\"UNNotificationServiceExtension\",\"UNNotificationSettings\",\"UNNotificationSound\",\"UNNotificationTrigger\",\"UNUserNotificationCenter\",\"bitflags\",\"block2\",\"objc2-core-location\"],\"objc2-core-location\":[\"dep:objc2-core-location\"],\"std\":[\"alloc\"],\"unstable-darwin-objc\":[]}}", "objc2_0.6.3": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"backtrace\",\"req\":\"^0.3.74\"},{\"kind\":\"dev\",\"name\":\"core-foundation\",\"req\":\"^0.10.0\",\"target\":\"cfg(target_vendor = \\\"apple\\\")\"},{\"kind\":\"dev\",\"name\":\"iai\",\"req\":\"^0.1\"},{\"kind\":\"dev\",\"name\":\"libc\",\"req\":\"^0.2.158\"},{\"kind\":\"dev\",\"name\":\"memoffset\",\"req\":\"^0.9.0\"},{\"default_features\":false,\"name\":\"objc2-encode\",\"req\":\"^4.1.0\"},{\"default_features\":false,\"name\":\"objc2-exception-helper\",\"optional\":true,\"req\":\"^0.1.1\"},{\"name\":\"objc2-proc-macros\",\"optional\":true,\"req\":\"^0.2.0\"},{\"kind\":\"dev\",\"name\":\"static_assertions\",\"req\":\"^1.1.0\"}],\"features\":{\"alloc\":[\"objc2-encode/alloc\"],\"catch-all\":[\"exception\"],\"default\":[\"std\"],\"disable-encoding-assertions\":[],\"exception\":[\"dep:objc2-exception-helper\"],\"gnustep-1-7\":[\"unstable-static-class\",\"objc2-exception-helper?/gnustep-1-7\"],\"gnustep-1-8\":[\"gnustep-1-7\",\"objc2-exception-helper?/gnustep-1-8\"],\"gnustep-1-9\":[\"gnustep-1-8\",\"objc2-exception-helper?/gnustep-1-9\"],\"gnustep-2-0\":[\"gnustep-1-9\",\"objc2-exception-helper?/gnustep-2-0\"],\"gnustep-2-1\":[\"gnustep-2-0\",\"objc2-exception-helper?/gnustep-2-1\"],\"objc2-proc-macros\":[],\"relax-sign-encoding\":[],\"relax-void-encoding\":[],\"std\":[\"alloc\",\"objc2-encode/std\"],\"unstable-apple-new\":[],\"unstable-arbitrary-self-types\":[],\"unstable-autoreleasesafe\":[],\"unstable-coerce-pointee\":[],\"unstable-compiler-rt\":[\"gnustep-1-7\"],\"unstable-gnustep-strict-apple-compat\":[\"gnustep-1-7\"],\"unstable-objfw\":[],\"unstable-requires-macos\":[],\"unstable-static-class\":[\"dep:objc2-proc-macros\"],\"unstable-static-class-inlined\":[\"unstable-static-class\"],\"unstable-static-sel\":[\"dep:objc2-proc-macros\"],\"unstable-static-sel-inlined\":[\"unstable-static-sel\"],\"unstable-winobjc\":[\"gnustep-1-8\"],\"verify\":[]}}", diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index d2d52d2268..9b4f7e5a07 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -4935,6 +4935,7 @@ name = "codex-user-verification" version = "0.0.0" dependencies = [ "base64 0.22.1", + "block2", "core-foundation 0.10.1", "dirs", "objc2", @@ -10961,8 +10962,10 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48e0b8b339e0d9d2ed4416b7f93f9d4daadff7d4dd797f89867cde11aeac607" dependencies = [ + "block2", "objc2", "objc2-foundation", + "objc2-security", ] [[package]] @@ -10977,6 +10980,17 @@ dependencies = [ "objc2-foundation", ] +[[package]] +name = "objc2-security" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" +dependencies = [ + "bitflags 2.13.1", + "objc2", + "objc2-core-foundation", +] + [[package]] name = "objc2-ui-kit" version = "0.3.2" diff --git a/codex-rs/user-verification/Cargo.toml b/codex-rs/user-verification/Cargo.toml index fe4d5298f0..50aa510964 100644 --- a/codex-rs/user-verification/Cargo.toml +++ b/codex-rs/user-verification/Cargo.toml @@ -15,11 +15,12 @@ thiserror = { workspace = true } tracing = { workspace = true } [target.'cfg(target_os = "macos")'.dependencies] +block2 = "0.6.2" core-foundation = "0.10" dirs = { workspace = true } objc2 = "0.6.3" objc2-foundation = { version = "0.3.2", default-features = false, features = ["std", "NSString"] } -objc2-local-authentication = { version = "0.3.2", default-features = false, features = ["std", "LAContext", "LABiometryType"] } +objc2-local-authentication = { version = "0.3.2", default-features = false, features = ["std", "LAContext", "LABiometryType", "block2", "objc2-security"] } security-framework = { version = "3.5", features = ["OSX_10_15"] } security-framework-sys = "2.15" diff --git a/codex-rs/user-verification/README.md b/codex-rs/user-verification/README.md new file mode 100644 index 0000000000..53150c9c25 --- /dev/null +++ b/codex-rs/user-verification/README.md @@ -0,0 +1,59 @@ +# Native hardware test + +`tests/hardware.rs` exercises the macOS provider with a real persisted Secure +Enclave key: create and reload it, verify a signature, cancel an authentication +request, and sign a new challenge with the same key. It is ignored by default. + +Run on a physical Touch ID Mac with fingerprints enrolled and the lid open. Use +an existing **isolated development app** with a valid provisioning profile and +Keychain Sharing entitlements, plus its Apple Development signing identity. +The test does not use a Wallet account or submit a purchase. Run only one copy at +a time; it reserves the `codex-user-verification-hardware-test` key namespace and +removes that namespace's key before and after the test. + +From the repository root, set `TEMPLATE_APP` to that signed development `.app` +and `SIGNING_IDENTITY` to its signing identity, then run in Bash. Signing the +runner is insufficient: the test executable itself needs the profile and +entitlements. + +```bash +set -euo pipefail +: "${TEMPLATE_APP:?Set the path to the isolated signed development app}" +: "${SIGNING_IDENTITY:?Set its Apple Development identity}" +run_dir=$(mktemp -d) +app="$run_dir/HardwareTest.app" +(cd codex-rs && cargo build --locked -p codex-user-verification --test hardware \ + --message-format=json) > "$run_dir/build.jsonl" +binary=$(jq -r 'select(.reason == "compiler-artifact" and .target.name == "hardware" and .executable != null) | .executable' "$run_dir/build.jsonl") +mkdir -p "$app/Contents/MacOS" +cp "$binary" "$app/Contents/MacOS/hardware" +cp "$TEMPLATE_APP/Contents/Info.plist" "$app/Contents/Info.plist" +cp "$TEMPLATE_APP/Contents/embedded.provisionprofile" "$app/Contents/embedded.provisionprofile" +/usr/libexec/PlistBuddy -c 'Set :CFBundleExecutable hardware' "$app/Contents/Info.plist" +codesign -d --xml --entitlements - "$TEMPLATE_APP" > "$run_dir/entitlements.plist" +codesign --force --options runtime --entitlements "$run_dir/entitlements.plist" \ + --sign "$SIGNING_IDENTITY" "$app" +codesign --verify --strict "$app" +echo "Test bundle: $app" +"$app/Contents/MacOS/hardware" --ignored --exact \ + persisted_key_signing_cancellation_and_retry --nocapture --test-threads=1 +``` + +Use Touch ID for the first prompt, then remove your finger. Leave the +**cancellation** prompt untouched and observe that it appears and closes on its +own. Authenticate the **retry signing** prompt once. Passing assertions verify +both signatures, the cancellation result, and key removal; confirming visible +prompt dismissal is the operator's part of the test. An early interruption fails +the test rather than counting as cancellation. + +If cancellation has not returned ten seconds after it is issued, the watchdog +exits with a failure instead of hanging. After a forced exit, stop any remaining +test process and remove the reserved key with the same signed bundle: + +```bash +CODEX_HARDWARE_TEST_CLEANUP=1 "$app/Contents/MacOS/hardware" --ignored --exact \ + persisted_key_signing_cancellation_and_retry --nocapture --test-threads=1 +``` + +This test covers the native provider. It does not exercise app-server routing, +UI state, closed-lid recovery, or hosted Wallet completion. diff --git a/codex-rs/user-verification/src/native_operation.rs b/codex-rs/user-verification/src/native_operation.rs index 234d25499d..558d8c3cd3 100644 --- a/codex-rs/user-verification/src/native_operation.rs +++ b/codex-rs/user-verification/src/native_operation.rs @@ -1,4 +1,4 @@ -//! Keeps the authentication context on its owner thread while a native operation blocks. +//! Drains asynchronous authentication before releasing its context and lifecycle lock. use crate::UserVerificationError; use crate::UserVerificationFailureReason; @@ -6,46 +6,35 @@ use crate::UserVerificationRequestGuard; use std::sync::mpsc; use std::time::Duration; -pub(crate) fn run_with_cancellation( +pub(crate) fn wait_with_cancellation( guard: &UserVerificationRequestGuard, - operation: impl FnOnce() -> Result + Send, + completion: mpsc::Receiver>, cancel: impl FnOnce(), ) -> Result { - guard.check()?; - let (done_tx, done_rx) = mpsc::sync_channel(1); - std::thread::scope(|scope| { - let worker = std::thread::Builder::new() - .name("user-verification-sign".to_string()) - .spawn_scoped(scope, move || { - let _ = done_tx.send(guard.check().and_then(|()| operation())); - }) - .map_err(|error| { - tracing::warn!(%error, "could not start user-verification signer"); - worker_error() - })?; - let result = loop { - match done_rx.recv_timeout(Duration::from_millis(/*millis*/ 50)) { - Ok(result) => break Some(result), - Err(mpsc::RecvTimeoutError::Timeout) => { - if !guard.is_active() { - cancel(); - break None; - } + let result = loop { + match completion.recv_timeout(Duration::from_millis(/*millis*/ 50)) { + Ok(result) => break result, + Err(mpsc::RecvTimeoutError::Timeout) => { + if !guard.is_active() { + cancel(); + // Invalidation is asynchronous. Keep the lifecycle lock until the + // authentication callback completes, then reject any late success. + break completion + .recv() + .unwrap_or_else(|_| Err(completion_error())); } - Err(mpsc::RecvTimeoutError::Disconnected) => break Some(Err(worker_error())), } - }; - // Join before returning so no signer outlives the context or its lifecycle lock. - worker.join().map_err(|_| worker_error())?; - guard.check()?; - result.unwrap_or_else(|| Err(worker_error())) - }) + Err(mpsc::RecvTimeoutError::Disconnected) => break Err(completion_error()), + } + }; + guard.check()?; + result } -fn worker_error() -> UserVerificationError { +fn completion_error() -> UserVerificationError { UserVerificationError::Failed { reason: UserVerificationFailureReason::ProviderError, - message: "the user-verification signer could not complete".to_string(), + message: "the user-verification authorization could not complete".to_string(), } } diff --git a/codex-rs/user-verification/src/native_operation_tests.rs b/codex-rs/user-verification/src/native_operation_tests.rs index 95b30ab250..84081ebf16 100644 --- a/codex-rs/user-verification/src/native_operation_tests.rs +++ b/codex-rs/user-verification/src/native_operation_tests.rs @@ -1,4 +1,4 @@ -//! Exercises prompt teardown and late-result rejection without requiring biometric hardware. +//! Exercises cancellation completion and late-result rejection without biometric hardware. use super::*; use crate::UserVerificationCancellationReason; @@ -7,34 +7,26 @@ use std::sync::atomic::AtomicBool; use std::sync::atomic::Ordering; #[test] -fn cancellation_tears_down_the_prompt_on_the_context_owner_thread() { +fn cancellation_waits_for_completion_on_the_context_owner_thread() { let guard = UserVerificationRequestGuard::default(); let queued = guard.clone(); - let (started_tx, started_rx) = mpsc::channel(); - let (dismissed_tx, dismissed_rx) = mpsc::channel(); - let (exited_tx, exited_rx) = mpsc::channel(); + let (done_tx, done_rx) = mpsc::sync_channel(0); + let (cancelled_tx, cancelled_rx) = mpsc::channel(); let owner = std::thread::spawn(move || { let owner_thread = std::thread::current().id(); - run_with_cancellation( - &queued, - move || { - started_tx.send(()).expect("authentication started"); - dismissed_rx - .recv_timeout(Duration::from_secs(/*secs*/ 5)) - .expect("prompt dismissed before the deadline"); - exited_tx.send(()).expect("signer exited"); - Ok("late signature") - }, - || { - assert_eq!(std::thread::current().id(), owner_thread); - dismissed_tx.send(()).expect("dismiss authentication"); - }, - ) + wait_with_cancellation(&queued, done_rx, || { + assert_eq!(std::thread::current().id(), owner_thread); + cancelled_tx.send(()).expect("dismiss authentication"); + }) }); - started_rx - .recv_timeout(Duration::from_secs(/*secs*/ 5)) - .expect("signer is waiting for authentication"); guard.cancel(); + cancelled_rx + .recv_timeout(Duration::from_secs(/*secs*/ 5)) + .expect("authentication invalidated"); + assert!(!owner.is_finished()); + done_tx + .send(Ok("late authorization")) + .expect("complete authentication"); assert_eq!( owner.join().expect("owner returned"), Err(UserVerificationError::Cancelled { @@ -42,42 +34,37 @@ fn cancellation_tears_down_the_prompt_on_the_context_owner_thread() { message: "the verification operation is no longer active".to_string(), }) ); - exited_rx.try_recv().expect("signer exited before return"); } #[test] fn completed_operation_does_not_cancel_its_context() { let cancelled = AtomicBool::new(/*v*/ false); + let (done_tx, done_rx) = mpsc::channel(); + done_tx + .send(Ok("authorization")) + .expect("complete authentication"); assert_eq!( - run_with_cancellation( - &UserVerificationRequestGuard::default(), - || Ok("signature"), - || cancelled.store(/*val*/ true, Ordering::Release), - ), - Ok("signature") + wait_with_cancellation(&UserVerificationRequestGuard::default(), done_rx, || { + cancelled.store(/*val*/ true, Ordering::Release) + },), + Ok("authorization") ); assert!(!cancelled.load(Ordering::Acquire)); } #[test] -fn already_cancelled_operation_never_starts_a_signer() { +fn cancellation_rejects_already_completed_authorization() { let guard = UserVerificationRequestGuard::default(); + let (done_tx, done_rx) = mpsc::channel(); + done_tx.send(Ok(())).expect("complete authentication"); guard.cancel(); - let started = AtomicBool::new(/*v*/ false); - let result = run_with_cancellation( - &guard, - || { - started.store(/*val*/ true, Ordering::Release); - Ok(()) - }, - || panic!("no context needs cancellation"), - ); assert_eq!( - result, + wait_with_cancellation(&guard, done_rx, || panic!( + "authentication already completed" + )), Err(UserVerificationError::Cancelled { reason: UserVerificationCancellationReason::Interrupted, message: "the verification operation is no longer active".to_string(), }) ); - assert!(!started.load(Ordering::Acquire)); } diff --git a/codex-rs/user-verification/src/platform_macos/key_protection.rs b/codex-rs/user-verification/src/platform_macos/key_protection.rs index a5b9003f25..456aa3e061 100644 --- a/codex-rs/user-verification/src/platform_macos/key_protection.rs +++ b/codex-rs/user-verification/src/platform_macos/key_protection.rs @@ -9,6 +9,7 @@ use core_foundation::dictionary::CFDictionary; use core_foundation::number::CFNumber; use security_framework::access_control::ProtectionMode; use security_framework::access_control::SecAccessControl; +use security_framework::key::SecKey; use security_framework_sys::access_control::kSecAccessControlBiometryAny; use security_framework_sys::access_control::kSecAccessControlPrivateKeyUsage; use security_framework_sys::item::kSecAttrKeyClass; @@ -27,7 +28,11 @@ pub(super) fn access_control() -> Result Result<(), UserVerificationError> { +pub(super) fn validate(key: &SecKey) -> Result<(), UserVerificationError> { + validate_attributes(&key.attributes()) +} + +fn validate_attributes(attributes: &CFDictionary) -> Result<(), UserVerificationError> { let size = CFNumber::from(/*value*/ 256); // Do not compare opaque SecAccessControl objects: macOS can change their persisted // representation. Biometric signing is enforced by the policy set at key creation. diff --git a/codex-rs/user-verification/src/platform_macos/key_protection_tests.rs b/codex-rs/user-verification/src/platform_macos/key_protection_tests.rs index dc44bf2f8c..c579908fc9 100644 --- a/codex-rs/user-verification/src/platform_macos/key_protection_tests.rs +++ b/codex-rs/user-verification/src/platform_macos/key_protection_tests.rs @@ -32,7 +32,10 @@ fn protected_attributes() -> CFMutableDictionary { #[test] fn reuse_requires_secure_enclave_key_attributes() { let attributes = protected_attributes(); - assert_eq!(validate(&attributes.to_immutable().to_untyped()), Ok(())); + assert_eq!( + validate_attributes(&attributes.to_immutable().to_untyped()), + Ok(()) + ); let alternatives = unsafe { [ (kSecAttrTokenID, CFString::new("software").as_CFType()), @@ -48,7 +51,7 @@ fn reuse_requires_secure_enclave_key_attributes() { let mut attributes = protected_attributes(); attributes.set(unsafe { CFString::wrap_under_get_rule(attribute) }, value); assert_eq!( - validate(&attributes.to_immutable().to_untyped()), + validate_attributes(&attributes.to_immutable().to_untyped()), Err(UserVerificationError::Unavailable { reason: UserVerificationUnavailableReason::ProviderUnavailable, message: "the local credential has incompatible key protection; delete it before enrolling again" diff --git a/codex-rs/user-verification/src/platform_macos/provider.rs b/codex-rs/user-verification/src/platform_macos/provider.rs index 9c532b275f..a1df3604e1 100644 --- a/codex-rs/user-verification/src/platform_macos/provider.rs +++ b/codex-rs/user-verification/src/platform_macos/provider.rs @@ -15,16 +15,21 @@ use crate::UserVerificationRequestGuard; use crate::UserVerificationStatus; use crate::UserVerificationUnavailableReason; use crate::lifecycle_lock::LifecycleLock; -use crate::native_operation::run_with_cancellation; +use crate::native_operation::wait_with_cancellation; use base64::Engine as _; use base64::engine::general_purpose::URL_SAFE_NO_PAD; +use block2::RcBlock; use core_foundation::base::CFType; use core_foundation::base::TCFType as _; use objc2::rc::Retained; +use objc2::runtime::Bool; +use objc2_foundation::NSError; use objc2_foundation::NSString; +use objc2_local_authentication::LAAccessControlOperation; use objc2_local_authentication::LABiometryType; use objc2_local_authentication::LAContext; use objc2_local_authentication::LAPolicy; +use security_framework::access_control::SecAccessControl; use security_framework::base::Error as SecurityError; use security_framework::item::ItemClass; use security_framework::item::ItemSearchOptions; @@ -39,6 +44,9 @@ use security_framework::key::KeyType; use security_framework::key::SecKey; use security_framework::key::Token; use security_framework_sys::base::errSecItemNotFound; +use security_framework_sys::item::kSecAttrAccessControl; +use security_framework_sys::item::kSecValueRef; +use std::sync::mpsc; pub(crate) struct NativeProvider { pub(crate) namespace: UserVerificationKeyNamespace, @@ -168,13 +176,85 @@ impl UserVerificationProvider for NativeProvider { } else { format!("{}\n\n{}", request.title, request.description) }; - // The keychain query retains this context and uses its text for the signing prompt. unsafe { context.setLocalizedFallbackTitle(Some(&NSString::from_str(""))); context.setLocalizedReason(&NSString::from_str(&reason)); } check_biometrics(&context)?; guard.check()?; + // SecKeyCopyAttributes does not guarantee the stored item's access-control attribute. + let attributes = match key_query(&self.namespace.label, &noninteractive_context()) + .load_refs(true) + .load_attributes(true) + .search() + { + Ok(results) => results.into_iter().find_map(|result| match result { + SearchResult::Dict(attributes) => Some(attributes), + _ => None, + }), + Err(error) if error.code() == errSecItemNotFound => { + return Err(UserVerificationError::Unavailable { + reason: UserVerificationUnavailableReason::CredentialMissing, + message: "no user-verification credential has been created".to_string(), + }); + } + Err(error) => return Err(keychain_error(error)), + } + .ok_or_else(|| UserVerificationError::Failed { + reason: UserVerificationFailureReason::ProviderError, + message: "the user-verification key has no attributes".to_string(), + })?; + let key = attributes + .find(unsafe { kSecValueRef.cast() }) + .and_then(|value| unsafe { CFType::wrap_under_get_rule(*value) }.downcast::()) + .ok_or_else(|| UserVerificationError::Failed { + reason: UserVerificationFailureReason::ProviderError, + message: "the user-verification item has no key reference".to_string(), + })?; + key_protection::validate(&key)?; + let access = attributes + .find(unsafe { kSecAttrAccessControl.cast() }) + .and_then(|value| { + unsafe { CFType::wrap_under_get_rule(*value) }.downcast::() + }) + .ok_or_else(|| UserVerificationError::Failed { + reason: UserVerificationFailureReason::ProviderError, + message: "the user-verification key has no access control".to_string(), + })?; + let (done_tx, done_rx) = mpsc::sync_channel(1); + let reply = RcBlock::new(move |success: Bool, error: *mut NSError| { + let result = if success.as_bool() { + Ok(()) + } else if let Some(error) = unsafe { error.as_ref() } { + Err(error::classify( + &error.domain().to_string(), + error.code() as i64, + )) + } else { + Err(UserVerificationError::Failed { + reason: UserVerificationFailureReason::ProviderError, + message: "biometric authorization did not complete".to_string(), + }) + }; + let _ = done_tx.send(result); + }); + guard.check()?; + // Keychain signing reconstructs its own context. Evaluate the key's policy here + // so cancellation invalidates the context that actually owns the prompt. + unsafe { + context.evaluateAccessControl_operation_localizedReason_reply( + &*access.as_concrete_TypeRef().cast(), + LAAccessControlOperation::UseKeySign, + &NSString::from_str(&reason), + &reply, + ); + } + wait_with_cancellation(guard, done_rx, || unsafe { context.invalidate() })?; + // Fetch a new key reference with the authorized, noninteractive context. Signing + // must fail instead of opening another prompt if that authorization is unusable. + unsafe { + context.setInteractionNotAllowed(/*interaction_not_allowed*/ true) + }; let key = find_key(&self.namespace.label, &context, KeyUse::Protected)?.ok_or_else(|| { UserVerificationError::Unavailable { @@ -184,21 +264,12 @@ impl UserVerificationProvider for NativeProvider { })?; let credential = key_info(&key)?; guard.check()?; - let signature = run_with_cancellation( - guard, - || { - key.create_signature( - Algorithm::ECDSASignatureMessageX962SHA256, - &request.challenge, - ) - .map_err(|error| error::classify(&error.domain().to_string(), error.code() as i64)) - }, - || { - // LAContext remains on this thread. Invalidation cancels its pending - // keychain authentication, allowing the signer and lifecycle lock to exit. - unsafe { context.invalidate() }; - }, - ); + let signature = key + .create_signature( + Algorithm::ECDSASignatureMessageX962SHA256, + &request.challenge, + ) + .map_err(|error| error::classify(&error.domain().to_string(), error.code() as i64)); guard.check()?; Ok(UserVerificationProof { credential_id: credential.credential_id, @@ -217,7 +288,7 @@ fn noninteractive_context() -> Retained { } fn check_biometrics(context: &LAContext) -> Result<(), UserVerificationError> { - // canEvaluatePolicy only checks availability; the protected key triggers authentication. + // canEvaluatePolicy only checks availability; evaluating the key's policy authenticates. unsafe { context.canEvaluatePolicy_error(LAPolicy::DeviceOwnerAuthenticationWithBiometrics) } .map_err(|error| error::classify(&error.domain().to_string(), error.code() as i64)) } @@ -232,6 +303,25 @@ fn find_key( context: &LAContext, key_use: KeyUse, ) -> Result, UserVerificationError> { + match key_query(label, context).load_refs(true).search() { + Ok(results) => { + let key = results.into_iter().find_map(|result| match result { + SearchResult::Ref(Reference::Key(key)) => Some(key), + _ => None, + }); + if let Some(key) = &key + && matches!(key_use, KeyUse::Protected) + { + key_protection::validate(key)?; + } + Ok(key) + } + Err(error) if error.code() == errSecItemNotFound => Ok(None), + Err(error) => Err(keychain_error(error)), + } +} + +fn key_query(label: &str, context: &LAContext) -> ItemSearchOptions { // Security accepts an LAContext object as kSecUseAuthenticationContext. Wrapping under // the get rule retains it, and ItemSearchOptions owns that retain for the query lifetime. let authentication = unsafe { CFType::wrap_under_get_rule(std::ptr::from_ref(context).cast()) }; @@ -241,24 +331,8 @@ fn find_key( .key_class(KeyClass::private()) .label(label) .local_authentication_context(Some(authentication)) - .load_refs(true) .limit(Limit::Max(1)); - match options.search() { - Ok(results) => { - let key = results.into_iter().find_map(|result| match result { - SearchResult::Ref(Reference::Key(key)) => Some(key), - _ => None, - }); - if let Some(key) = &key - && matches!(key_use, KeyUse::Protected) - { - key_protection::validate(&key.attributes())?; - } - Ok(key) - } - Err(error) if error.code() == errSecItemNotFound => Ok(None), - Err(error) => Err(keychain_error(error)), - } + options } fn create_key(label: &str) -> Result { @@ -273,7 +347,7 @@ fn create_key(label: &str) -> Result { .set_access_control(access); let key = SecKey::new(&options) .map_err(|error| error::classify(&error.domain().to_string(), error.code() as i64))?; - key_protection::validate(&key.attributes())?; + key_protection::validate(&key)?; Ok(key) } diff --git a/codex-rs/user-verification/tests/hardware.rs b/codex-rs/user-verification/tests/hardware.rs new file mode 100644 index 0000000000..9039ba5f68 --- /dev/null +++ b/codex-rs/user-verification/tests/hardware.rs @@ -0,0 +1,134 @@ +//! Opt-in checks of the persisted Secure Enclave signing and cancellation path. +#![cfg(target_os = "macos")] + +use base64::Engine as _; +use base64::engine::general_purpose::URL_SAFE_NO_PAD; +use codex_user_verification::UserVerificationCancellationReason; +use codex_user_verification::UserVerificationError; +use codex_user_verification::UserVerificationKeyNamespace; +use codex_user_verification::UserVerificationProvider; +use codex_user_verification::UserVerificationRequest; +use codex_user_verification::UserVerificationRequestGuard; +use codex_user_verification::platform_provider; +use p256::ecdsa::Signature; +use p256::ecdsa::VerifyingKey; +use p256::ecdsa::signature::Verifier as _; +use p256::pkcs8::DecodePublicKey as _; +use pretty_assertions::assert_eq; +use std::sync::Arc; +use std::sync::mpsc; +use std::time::Duration; + +const TEST_IDENTITY: &str = "codex-user-verification-hardware-test"; + +struct TestKey(Arc); + +impl Drop for TestKey { + fn drop(&mut self) { + let deleted = self.0.delete(&UserVerificationRequestGuard::default()); + if !std::thread::panicking() { + assert!(deleted.is_ok(), "delete the test credential: {deleted:?}"); + } + } +} + +#[test] +#[ignore = "requires a signed test app, a physical Touch ID Mac, and user interaction; see README.md"] +fn persisted_key_signing_cancellation_and_retry() { + let provider = platform_provider(UserVerificationKeyNamespace::new(TEST_IDENTITY)); + // This namespace is reserved for this test, including cleanup after a killed run. + provider + .delete(&UserVerificationRequestGuard::default()) + .expect("clear any previous test credential"); + if std::env::var_os("CODEX_HARDWARE_TEST_CLEANUP").is_some() { + return; + } + let cleanup = TestKey(Arc::clone(&provider)); + let created = provider + .ensure_key(&UserVerificationRequestGuard::default()) + .expect("create a persisted Secure Enclave key"); + assert!(created.created); + let reloaded = platform_provider(UserVerificationKeyNamespace::new(TEST_IDENTITY)) + .ensure_key(&UserVerificationRequestGuard::default()) + .expect("reload the persisted key"); + assert!(!reloaded.created); + assert_eq!(reloaded.credential, created.credential); + let public_key = VerifyingKey::from_public_key_der( + &URL_SAFE_NO_PAD + .decode(&created.credential.public_key) + .unwrap(), + ) + .unwrap(); + let sign = |request: &UserVerificationRequest| { + let proof = provider + .verify(request, &UserVerificationRequestGuard::default()) + .expect("sign with the persisted key"); + assert_eq!(proof.credential_id, created.credential.credential_id); + let signature = + Signature::from_der(&URL_SAFE_NO_PAD.decode(proof.signature).unwrap()).unwrap(); + public_key.verify(&request.challenge, &signature).unwrap(); + }; + let mut request = UserVerificationRequest { + challenge: b"Local hardware test. No purchase.".to_vec(), + title: "Hardware test: authenticate".into(), + description: "Use Touch ID once, then remove your finger.".into(), + }; + eprintln!("Use Touch ID for the first signature."); + sign(&request); + + request.title = "Hardware test: cancellation".into(); + request.description = + "Leave Touch ID untouched; this prompt should close automatically.".into(); + eprintln!("Leave the next prompt untouched; cancellation follows in three seconds."); + let guard = UserVerificationRequestGuard::default(); + let cancellation = guard.clone(); + let (finished, completion) = mpsc::channel(); + let timer = std::thread::spawn(move || { + if completion.recv_timeout(Duration::from_secs(/* secs */ 3)) + == Err(mpsc::RecvTimeoutError::Timeout) + { + cancellation.cancel(); + if completion.recv_timeout(Duration::from_secs(/* secs */ 10)) + == Err(mpsc::RecvTimeoutError::Timeout) + { + eprintln!( + "Cancellation did not finish. Run with CODEX_HARDWARE_TEST_CLEANUP=1 to remove the test key." + ); + std::process::exit(/* code */ 1); + } + true + } else { + false + } + }); + let result = provider.verify(&request, &guard); + finished.send(()).unwrap(); + assert!( + timer.join().unwrap(), + "verification finished before cancellation" + ); + assert!( + matches!( + result, + Err(UserVerificationError::Cancelled { + reason: UserVerificationCancellationReason::Interrupted, + .. + }) + ), + "unexpected cancellation result: {result:?}" + ); + + request.challenge = b"Retry signing after cancellation.".to_vec(); + request.title = "Hardware test: retry signing".into(); + request.description = "Use Touch ID to sign again with the same stored key.".into(); + eprintln!("Use Touch ID for the retry."); + sign(&request); + drop(cleanup); + assert!( + provider + .status(&UserVerificationRequestGuard::default()) + .unwrap() + .credential + .is_none() + ); +} From a373281e9ef021ffb1b340123ce96c75bac869fb Mon Sep 17 00:00:00 2001 From: jif Date: Tue, 13 Oct 2026 23:00:22 +0000 Subject: [PATCH 016/155] Retain rollout migration locks across worker cancellation (#53794) ## Why Cancelling an async migration caller can leave its blocking compression or decompression worker running. Releasing migration locks before that worker finishes allows other writers or migrations to access files still being processed. ## What changed Share maintenance, cross-process writer, and local writer locks with blocking workers during migration and recovery. Keep those locks held until file work completes, releasing cross-process locks before allowing local writers to proceed. ## Testing Add a regression test for cancelled compression and decompression callers that verifies locks remain held until the worker finishes and the output is complete. Preserve the Unix check that decompression temporaries have owner-only permissions. GitOrigin-RevId: 74855250d89ecab81eaadc2956e328d37b65e72e --- .../src/local/rollout_migration.rs | 61 ++++++-- .../src/local/rollout_migration/publish.rs | 8 ++ .../src/local/rollout_migration_tests.rs | 135 ++++++++++++++---- 3 files changed, 166 insertions(+), 38 deletions(-) diff --git a/codex-rs/thread-store/src/local/rollout_migration.rs b/codex-rs/thread-store/src/local/rollout_migration.rs index c259a6f034..3f54ec1fdb 100644 --- a/codex-rs/thread-store/src/local/rollout_migration.rs +++ b/codex-rs/thread-store/src/local/rollout_migration.rs @@ -7,11 +7,13 @@ //! The important invariant is that we always leave behind either the original legacy rollout or a //! recoverable paginated rollout. Once the rollout path is replaced, the durable `.pending` //! journal must be enough for a later migration run to finish SQLite recovery safely. +//! Compression and decompression workers retain these locks if their async caller is cancelled. use std::collections::HashMap; use std::io; use std::path::Path; use std::path::PathBuf; +use std::sync::Arc; use std::time::Duration; use chrono::DateTime; @@ -24,6 +26,7 @@ use codex_protocol::protocol::ThreadHistoryMode; use codex_protocol::protocol::ThreadSource; use codex_rollout::RolloutItem; use codex_rollout::RolloutLine; +use codex_rollout::RolloutMaintenanceGuard; use serde::Serialize; use tokio::fs::File; use tokio::io::AsyncBufReadExt; @@ -31,9 +34,11 @@ use tokio::io::AsyncReadExt; use tokio::io::AsyncWriteExt; use tokio::io::BufReader; use tokio::io::BufWriter; +use tokio::sync::OwnedMutexGuard; use tokio::time::Instant; use super::LocalThreadStore; +use super::WriterLockGuard; use super::helpers::distinct_thread_metadata_title; use super::helpers::has_guardian_default_title; use super::thread_history; @@ -74,6 +79,14 @@ use telemetry::RolloutMigrationTrigger; const PROJECTION_BATCH_BYTES: u64 = 256 * 1024; const MAX_ROLLOUT_LINE_BYTES: usize = 16 * 1024 * 1024; +/// Shared with blocking workers so cancellation cannot release their file ownership early. +struct MigrationLocks { + _maintenance: Option>, + _writer: WriterLockGuard, + // Let local writers proceed only after releasing the cross-process locks. + _live_writer: OwnedMutexGuard<()>, +} + enum CanonicalizationAttempt { Complete { expected_length: u64, @@ -316,7 +329,7 @@ impl LocalThreadStore { paths: RolloutMigrationPaths, ) -> ThreadStoreResult { let mut limiter = RolloutMigrationRateLimiter::new(options.max_mib_per_second)?; - let _maintenance_guard = match options.mode { + let maintenance_guard = match options.mode { RolloutMigrationMode::DryRun => None, RolloutMigrationMode::Apply => Some( codex_rollout::try_acquire_rollout_maintenance_lock(&self.config.codex_home) @@ -326,7 +339,8 @@ impl LocalThreadStore { .to_string(), })?, ), - }; + } + .map(Arc::new); let mut paths = match paths { RolloutMigrationPaths::Discover => { find_all_rollout_paths(&self.config.codex_home).await? @@ -357,7 +371,13 @@ impl LocalThreadStore { for (index, path) in paths.into_iter().enumerate() { let outcome = self - .migrate_rollout_path(path, &options, &legacy_names, &mut limiter) + .migrate_rollout_path( + path, + &options, + &legacy_names, + &mut limiter, + maintenance_guard.as_ref(), + ) .await?; let outcome_status = outcome.as_ref().map(|outcome| outcome.status); if let Some(outcome) = outcome { @@ -379,6 +399,7 @@ impl LocalThreadStore { options: &RolloutMigrationOptions, legacy_names: &HashMap, limiter: &mut RolloutMigrationRateLimiter, + maintenance_guard: Option<&Arc>, ) -> ThreadStoreResult> { let mut retried_moved_path = false; let metadata = loop { @@ -482,7 +503,6 @@ impl LocalThreadStore { if metadata.meta.history_mode == ThreadHistoryMode::Paginated { let bytes_before = limiter.bytes_processed; let result = if pending_published_migration { - let _live_writer_guard = self.live_writer_locks.lock(thread_id).await; match self .recover_published_migration( thread_id, @@ -490,6 +510,7 @@ impl LocalThreadStore { &journal_path, legacy_names, limiter, + maintenance_guard, ) .await { @@ -535,8 +556,8 @@ impl LocalThreadStore { ))); } - let _live_writer_guard = self.live_writer_locks.lock(thread_id).await; - let _writer_guard = match self.acquire_writer_lock(thread_id) { + let live_writer_guard = self.live_writer_locks.lock(thread_id).await; + let writer_guard = match self.acquire_writer_lock(thread_id) { Ok(guard) => guard, Err(ThreadStoreError::Conflict { message }) => { return Ok(Some(skipped_busy_outcome( @@ -555,6 +576,11 @@ impl LocalThreadStore { ))); } }; + let locks = Arc::new(MigrationLocks { + _maintenance: maintenance_guard.cloned(), + _live_writer: live_writer_guard, + _writer: writer_guard, + }); // SessionMeta gives us the writer-lock id, so archiving can win between that read and // lock acquisition. Once the lock is ours, follow the same rollout to its current path. if !tokio::fs::try_exists(&path) @@ -567,7 +593,7 @@ impl LocalThreadStore { } let bytes_before = limiter.bytes_processed; let result = match self - .migrate_one_rollout(thread_id, &path, &journal_path, kind, legacy_names, limiter) + .migrate_one_rollout(thread_id, &path, kind, legacy_names, limiter, &locks) .await { Ok(()) => Ok(RolloutMigrationStatus::Migrated), @@ -602,10 +628,10 @@ impl LocalThreadStore { &self, thread_id: ThreadId, rollout_path: &Path, - journal_path: &Path, kind: RolloutMigrationKind, legacy_names: &HashMap, limiter: &mut RolloutMigrationRateLimiter, + locks: &Arc, ) -> ClassifiedMigrationResult<()> { if let Some(state_db) = &self.state_db && with_failure_reason( @@ -638,8 +664,9 @@ impl LocalThreadStore { thread_history::delete_thread(self, thread_id).await, RolloutMigrationFailureReason::SqliteMaterializationFailed, )?; + let journal_path = migration_journal_path(&self.config.codex_home, thread_id); with_failure_reason( - write_migration_journal(journal_path).await, + write_migration_journal(&journal_path).await, RolloutMigrationFailureReason::RolloutPublishFailed, )?; @@ -653,7 +680,7 @@ impl LocalThreadStore { let source_permissions = source_metadata.permissions(); let source_path = if let Some(decompressed_path) = decompressed_path.as_ref() { with_failure_reason( - decompress_rollout_to_path(rollout_path, decompressed_path).await, + decompress_rollout_to_path(rollout_path, decompressed_path, locks).await, RolloutMigrationFailureReason::RolloutReadFailed, )?; let decompressed_bytes = with_failure_reason( @@ -783,7 +810,7 @@ impl LocalThreadStore { let publish_result = async { let compressed_staged_path = if compressed { let path = compressed_staged_rollout_path(rollout_path)?; - compress_rollout_to_path(&staged_path, &path, source_permissions, source_modified) + compress_rollout_to_path(&staged_path, &path, source_permissions, source_modified, locks) .await?; Some(path) } else { @@ -817,7 +844,7 @@ impl LocalThreadStore { .map_err(migration_error)?; } sync_parent_directory(rollout_path).await?; - self.finish_published_migration(thread_id, journal_path, legacy_names) + self.finish_published_migration(thread_id, &journal_path, legacy_names) .await } .await; @@ -996,13 +1023,19 @@ impl LocalThreadStore { journal_path: &Path, legacy_names: &HashMap, limiter: &mut RolloutMigrationRateLimiter, + maintenance_guard: Option<&Arc>, ) -> ThreadStoreResult { - let _writer_guard = self.acquire_writer_lock(thread_id)?; + let live_writer_guard = self.live_writer_locks.lock(thread_id).await; + let locks = Arc::new(MigrationLocks { + _maintenance: maintenance_guard.cloned(), + _live_writer: live_writer_guard, + _writer: self.acquire_writer_lock(thread_id)?, + }); let decompressed_path = rollout_path_is_compressed(rollout_path) .then(|| decompressed_staged_rollout_path(rollout_path)) .transpose()?; let projection_path = if let Some(decompressed_path) = decompressed_path.as_ref() { - decompress_rollout_to_path(rollout_path, decompressed_path).await?; + decompress_rollout_to_path(rollout_path, decompressed_path, &locks).await?; let decompressed_bytes = tokio::fs::metadata(decompressed_path) .await .map_err(migration_error)? diff --git a/codex-rs/thread-store/src/local/rollout_migration/publish.rs b/codex-rs/thread-store/src/local/rollout_migration/publish.rs index 4c0f9656fb..731423714c 100644 --- a/codex-rs/thread-store/src/local/rollout_migration/publish.rs +++ b/codex-rs/thread-store/src/local/rollout_migration/publish.rs @@ -14,6 +14,7 @@ use std::io; use std::io::Write; use std::path::Path; use std::path::PathBuf; +use std::sync::Arc; use std::time::SystemTime; #[cfg(unix)] @@ -29,6 +30,7 @@ use tokio::io::AsyncWriteExt; use tokio::io::BufReader; use tokio::io::BufWriter; +use super::MigrationLocks; use super::migration_error; use crate::ThreadStoreResult; @@ -90,10 +92,13 @@ fn staged_path(rollout_path: &Path, suffix: &str) -> ThreadStoreResult pub(super) async fn decompress_rollout_to_path( compressed_path: &Path, plain_path: &Path, + locks: &Arc, ) -> ThreadStoreResult<()> { let compressed_path = compressed_path.to_path_buf(); let plain_path = plain_path.to_path_buf(); + let locks = Arc::clone(locks); tokio::task::spawn_blocking(move || -> io::Result<()> { + let _locks = locks; let input = std::fs::File::open(compressed_path)?; let mut decoder = zstd::stream::read::Decoder::new(input)?; let mut options = std::fs::OpenOptions::new(); @@ -116,10 +121,13 @@ pub(super) async fn compress_rollout_to_path( compressed_path: &Path, permissions: Permissions, modified_at: Option, + locks: &Arc, ) -> ThreadStoreResult<()> { let plain_path = plain_path.to_path_buf(); let compressed_path = compressed_path.to_path_buf(); + let locks = Arc::clone(locks); tokio::task::spawn_blocking(move || -> io::Result<()> { + let _locks = locks; let mut input = std::fs::File::open(plain_path)?; let output = std::fs::OpenOptions::new() .create(true) diff --git a/codex-rs/thread-store/src/local/rollout_migration_tests.rs b/codex-rs/thread-store/src/local/rollout_migration_tests.rs index e06cac6b02..4ddcbd596f 100644 --- a/codex-rs/thread-store/src/local/rollout_migration_tests.rs +++ b/codex-rs/thread-store/src/local/rollout_migration_tests.rs @@ -2,6 +2,7 @@ use std::fs; use std::io::Write; use std::path::Path; use std::path::PathBuf; +use std::sync::Arc; #[cfg(unix)] use std::os::unix::fs::PermissionsExt; @@ -53,13 +54,14 @@ use serde_json::json; use tempfile::TempDir; use super::LocalThreadStore; +use super::MigrationLocks; use super::RolloutMigrationFailureReason; use super::RolloutMigrationMode; use super::RolloutMigrationOptions; use super::RolloutMigrationPaths; use super::RolloutMigrationProgress; use super::RolloutMigrationStatus; -#[cfg(unix)] +use super::compress_rollout_to_path; use super::decompress_rollout_to_path; use super::migration_journal_path; use super::telemetry::RolloutMigrationTrigger; @@ -2672,31 +2674,116 @@ async fn migration_repairs_a_missing_paginated_name_when_rerun() { ); } -#[cfg(unix)] -#[tokio::test] -async fn decompression_temporaries_are_owner_only() { - let home = TempDir::new().expect("create Codex home"); - let thread_id = ThreadId::new(); - let compressed_path = compress_rollout(&write_rollout( - home.path(), - thread_id, - SessionSource::Cli, - vec![user_message("compressed question")], - )); - let plain_path = home.path().join("decompressed.tmp"); +#[test] +fn cancelled_compression_workers_hold_migration_locks() { + let runtime = tokio::runtime::Builder::new_current_thread() + .enable_all() + .max_blocking_threads(1) + .build() + .expect("build runtime"); + runtime.block_on(async { + for compress in [true, false] { + let home = TempDir::new().expect("create Codex home"); + let thread_id = ThreadId::new(); + let plain_path = home.path().join("rollout.jsonl"); + let compressed_path = home.path().join("rollout.jsonl.zst"); + let contents = b"rollout contents\n"; + fs::write(&plain_path, contents).expect("write plain rollout"); + if !compress { + compress_rollout(&plain_path); + } + let source_path = if compress { + &plain_path + } else { + &compressed_path + }; + let permissions = fs::metadata(source_path) + .expect("source metadata") + .permissions(); + let store = LocalThreadStore::new(test_config(home.path()), /*state_db*/ None); + let locks = Arc::new(MigrationLocks { + _maintenance: Some(Arc::new( + codex_rollout::try_acquire_rollout_maintenance_lock(home.path()) + .expect("acquire maintenance lock") + .expect("maintenance lock is available"), + )), + _writer: store + .acquire_writer_lock(thread_id) + .expect("acquire writer lock"), + _live_writer: store.live_writer_locks.lock(thread_id).await, + }); + let coordination = store.live_writer_locks.coordination(thread_id).await; - decompress_rollout_to_path(&compressed_path, &plain_path) - .await - .expect("decompress rollout"); + // Hold the only blocking thread so the real file worker stays queued across cancellation. + let (reached_tx, reached_rx) = tokio::sync::oneshot::channel(); + let (resume_tx, resume_rx) = std::sync::mpsc::channel::<()>(); + let blocker = tokio::task::spawn_blocking(move || { + let _ = reached_tx.send(()); + // Dropping the sender after a failed assertion also lets runtime teardown finish. + let _ = resume_rx.recv(); + }); + reached_rx.await.expect("blocking thread occupied"); + let mut work = Box::pin(async { + if compress { + compress_rollout_to_path( + &plain_path, + &compressed_path, + permissions, + /*modified_at*/ None, + &locks, + ) + .await + } else { + decompress_rollout_to_path(&compressed_path, &plain_path, &locks).await + } + }); + assert!(futures::poll!(&mut work).is_pending()); + drop(work); + drop(locks); - assert_eq!( - fs::metadata(&plain_path) - .expect("read temporary metadata") - .permissions() - .mode() - & 0o777, - 0o600 - ); + assert!( + codex_rollout::try_acquire_rollout_maintenance_lock(home.path()) + .expect("probe maintenance lock") + .is_none() + ); + assert!(matches!( + store.acquire_writer_lock(thread_id), + Err(ThreadStoreError::Conflict { .. }) + )); + assert!(coordination.writer.try_lock().is_err()); + + drop(resume_tx); + blocker.await.expect("release blocking thread"); + // This guard is released last, after the worker's file I/O and other locks. + let _live_writer_guard = coordination.writer.lock().await; + assert!( + codex_rollout::try_acquire_rollout_maintenance_lock(home.path()) + .expect("probe released maintenance lock") + .is_some() + ); + store + .acquire_writer_lock(thread_id) + .expect("writer lock released"); + let decoded = if compress { + zstd::stream::decode_all( + fs::File::open(&compressed_path).expect("open compressed rollout"), + ) + .expect("decode complete rollout") + } else { + #[cfg(unix)] + assert_eq!( + fs::metadata(&plain_path) + .expect("temporary metadata") + .permissions() + .mode() + & 0o777, + 0o600 + ); + fs::read(&plain_path).expect("read decompressed rollout") + }; + assert_eq!(decoded, contents); + } + }); } #[tokio::test] From 8af93416ddf2c56575a7e9c890d5f446ec909943 Mon Sep 17 00:00:00 2001 From: oli-oai Date: Tue, 13 Oct 2026 23:00:45 +0000 Subject: [PATCH 017/155] Use the bundled model catalog in the MCP startup invalidation test (#53795) Set `config.model_catalog` to the bundled catalog in `mcp_invalidation_refreshes_threads_that_are_still_starting` so model resolution completes locally before the test waits for the startup lifecycle hook. GitOrigin-RevId: fd12df5140670dad4c9e2d22fabe73b0437af2b4 --- codex-rs/core/src/thread_manager_tests.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/codex-rs/core/src/thread_manager_tests.rs b/codex-rs/core/src/thread_manager_tests.rs index 0c2d6dc6c2..ad7b5789ec 100644 --- a/codex-rs/core/src/thread_manager_tests.rs +++ b/codex-rs/core/src/thread_manager_tests.rs @@ -1035,6 +1035,10 @@ async fn mcp_invalidation_refreshes_threads_that_are_still_starting() { let temp_dir = tempdir().expect("tempdir"); let mut config = test_config().await; + // Resolve the model locally before waiting for the MCP lifecycle hook. + config.model_catalog = Some( + codex_models_manager::bundled_models_response().expect("bundled model catalog should load"), + ); config.codex_home = temp_dir.path().join("codex-home").abs(); config.cwd = config.codex_home.abs(); std::fs::create_dir_all(&config.codex_home).expect("create codex home"); From 2b2d7923055f3ad4827270edefe65e71293cf26c Mon Sep 17 00:00:00 2001 From: jif Date: Tue, 13 Oct 2026 23:24:01 +0000 Subject: [PATCH 018/155] Refresh Guardian reviews when review context changes (#53797) ## Why Assistant messages delivered during a pending Guardian review can change its evidence. Previously, these context changes aborted the review instead of triggering a fresh assessment. ## What changed Treat changes to local or root review context as stale authorization so Guardian retries with updated evidence. Cancellation and history resets still abort the review. ## Testing Extend local and worker delivery tests to cover refreshed allow and deny decisions, verify that the new review includes the delivered message, and ensure commands execute exactly once after approval and never on stale approval or denial. GitOrigin-RevId: 019205bee6d3f4e8cf6b9268f72bbc5db6b3899e --- codex-rs/core/src/guardian/review_request.rs | 12 +- .../suite/guardian_pending_root_delivery.rs | 230 +++++++++++++++--- 2 files changed, 206 insertions(+), 36 deletions(-) diff --git a/codex-rs/core/src/guardian/review_request.rs b/codex-rs/core/src/guardian/review_request.rs index 798c8806e1..43bfae0312 100644 --- a/codex-rs/core/src/guardian/review_request.rs +++ b/codex-rs/core/src/guardian/review_request.rs @@ -62,15 +62,19 @@ impl ReviewAuthorization { authorization_changed || self.user_message_revision != history.user_message_revision(); let review_context_changed = root_review_changed || self.review_context_revision != history.guardian_review_context_revision(); - // An actual stop or history reset wins over a concurrent authorization change. + // An actual stop or history reset wins over a concurrent evidence change. if self.history_reset.is_cancelled() || cancellation.is_some_and(CancellationToken::is_cancelled) || root_history_changed - || review_context_changed { Some(GuardianReviewSessionOutcome::Aborted) - } else if authorization_changed { - tracing::info!(thread_id = %session.thread_id, "Guardian approval invalidated by an authorization change"); + } else if authorization_changed || review_context_changed { + tracing::info!( + thread_id = %session.thread_id, + authorization_changed, + review_context_changed, + "Guardian approval invalidated by changed review evidence" + ); Some(GuardianReviewSessionOutcome::StaleAuthorization) } else { None diff --git a/codex-rs/core/tests/suite/guardian_pending_root_delivery.rs b/codex-rs/core/tests/suite/guardian_pending_root_delivery.rs index c3c1564e8b..d4b668bcf1 100644 --- a/codex-rs/core/tests/suite/guardian_pending_root_delivery.rs +++ b/codex-rs/core/tests/suite/guardian_pending_root_delivery.rs @@ -3,14 +3,21 @@ use super::*; use anyhow::Context; use codex_history::RetainedContextEntry; +use codex_protocol::approvals::GuardianAssessmentAction; +use codex_protocol::approvals::GuardianAssessmentOutcome; use codex_protocol::protocol::GuardianAssessmentStatus; 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; +#[test_case(GuardianAssessmentOutcome::Allow; "allow after refresh")] +#[test_case(GuardianAssessmentOutcome::Deny; "deny after refresh")] #[tokio::test(flavor = "multi_thread", worker_threads = 4)] -async fn confirmed_root_delivery_invalidates_pending_worker_allow() -> Result<()> { +async fn confirmed_root_delivery_refreshes_pending_worker_allow( + refreshed_outcome: GuardianAssessmentOutcome, +) -> Result<()> { skip_if_no_network!(Ok(())); skip_if_wine_exec!( Ok(()), @@ -33,6 +40,7 @@ async fn confirmed_root_delivery_invalidates_pending_worker_allow() -> Result<() .await?; let root = test.session_configured.thread_id; let mut created_threads = test.thread_manager.subscribe_thread_created(); + let output_file = test.workspace_path_uri("refreshed-worker-allow.txt")?; mount_sse_once_match( &server, @@ -81,7 +89,8 @@ async fn confirmed_root_delivery_invalidates_pending_worker_allow() -> Result<() WORKER_CALL_ID, "exec_command", &json!({ - "cmd": "true", "sandbox_permissions": "require_escalated", + "cmd": "echo executed >> refreshed-worker-allow.txt", + "sandbox_permissions": "require_escalated", "justification": "Review the production deployment." }) .to_string(), @@ -102,20 +111,36 @@ async fn confirmed_root_delivery_invalidates_pending_worker_allow() -> Result<() .mount(&server) .await; let (release_review, review_gate) = oneshot::channel(); - let (review_stream, _) = start_streaming_sse_server(vec![vec![StreamingSseChunk { - gate: Some(review_gate), - body: sse(vec![ + let (release_refreshed_review, refreshed_review_gate) = oneshot::channel(); + let (review_stream, _) = start_streaming_sse_server(vec![ + vec![StreamingSseChunk { + gate: Some(review_gate), + body: sse(vec![ + ev_assistant_message( + "guardian-assessment", + &json!({ + "risk_level": "low", "user_authorization": "high", "outcome": "allow", + "rationale": "The original root context authorized the command." + }) + .to_string(), + ), + ev_completed("guardian-response"), + ]), + }], + vec![StreamingSseChunk { + gate: Some(refreshed_review_gate), + body: sse(vec![ ev_assistant_message( - "guardian-assessment", + "refreshed-guardian-assessment", &json!({ - "risk_level": "low", "user_authorization": "high", "outcome": "allow", - "rationale": "The original root context authorized the command." - }) - .to_string(), + "risk_level": "low", "user_authorization": "high", "outcome": refreshed_outcome, + "rationale": "Decision using the newly delivered assistant context." + }).to_string(), ), - ev_completed("guardian-response"), + ev_completed("refreshed-guardian-response"), ]), - }]]) + }], + ]) .await; wiremock::Mock::given(wiremock::matchers::method("POST")) .and(wiremock::matchers::path("/v1/responses")) @@ -128,10 +153,19 @@ async fn confirmed_root_delivery_invalidates_pending_worker_allow() -> Result<() .insert_header("location", format!("{}/v1/responses", review_stream.uri())), ) .with_priority(/*priority*/ 2) - .up_to_n_times(/*n*/ 1) + .up_to_n_times(/*n*/ 2) .mount(&server) .await; + mount_sse_once_match( + &server, + move |request: &wiremock::Request| { + is_worker_request(request, root) && has_call_output(request, WORKER_CALL_ID) + }, + sse(vec![ev_completed("worker-done")]), + ) + .await; + test.submit_text_turn(INITIAL_PROMPT).await?; let worker = test .thread_manager @@ -178,6 +212,38 @@ async fn confirmed_root_delivery_invalidates_pending_worker_allow() -> Result<() .await .context("confirmed root delivery did not revise worker review context")?; release_review.send(()).expect("release Guardian allow"); + tokio::time::timeout( + Duration::from_secs(/*secs*/ 10), + review_stream.wait_for_request_count(/*count*/ 2), + ) + .await + .context("delivered assistant context did not trigger a fresh review")?; + let requests = server.received_requests().await.expect("recorded requests"); + let reviews = requests + .iter() + .filter_map(request_body) + .filter(|body| { + body["client_metadata"]["x-openai-subagent"] == "guardian" + && !is_hosted_messaging_review_body(body) + }) + .collect::>(); + assert_eq!(reviews.len(), 2); + let original = &reviews[0]; + let refreshed = &reviews[1]; + let delivered_message = format!("assistant: {ROOT_ASSISTANT_REPLY}"); + assert!(!original.to_string().contains(&delivered_message)); + assert!(refreshed.to_string().contains(&delivered_message)); + assert_eq!( + test.fs() + .get_metadata(&output_file, Default::default(), /*sandbox*/ None) + .await + .expect_err("stale allow executed the command") + .kind(), + std::io::ErrorKind::NotFound, + ); + release_refreshed_review + .send(()) + .expect("release fresh Guardian decision"); let status = wait_for_event_match(&worker, |event| match event { EventMsg::GuardianAssessment(assessment) if assessment.status != GuardianAssessmentStatus::InProgress => @@ -187,7 +253,32 @@ async fn confirmed_root_delivery_invalidates_pending_worker_allow() -> Result<() _ => None, }) .await; - assert_eq!(status, GuardianAssessmentStatus::Aborted); + let expected_status = match refreshed_outcome { + GuardianAssessmentOutcome::Allow => GuardianAssessmentStatus::Approved, + GuardianAssessmentOutcome::Deny => GuardianAssessmentStatus::Denied, + }; + assert_eq!(status, expected_status); + wait_for_event(&worker, |event| matches!(event, EventMsg::TurnComplete(_))).await; + match refreshed_outcome { + GuardianAssessmentOutcome::Allow => { + let contents = test + .fs() + .read_file_text(&output_file, Default::default(), /*sandbox*/ None) + .await?; + assert_eq!(contents.lines().collect::>(), vec!["executed"]); + } + GuardianAssessmentOutcome::Deny => { + assert_eq!( + test.fs() + .get_metadata(&output_file, Default::default(), /*sandbox*/ None) + .await + .expect_err("denied action executed") + .kind(), + std::io::ErrorKind::NotFound, + ); + } + } + assert_eq!(review_stream.requests().await.len(), 2); let shutdown = test .thread_manager .shutdown_all_threads_bounded(Duration::from_secs(/*secs*/ 10)) @@ -198,8 +289,12 @@ async fn confirmed_root_delivery_invalidates_pending_worker_allow() -> Result<() Ok(()) } +#[test_case(GuardianAssessmentOutcome::Allow; "allow after refresh")] +#[test_case(GuardianAssessmentOutcome::Deny; "deny after refresh")] #[tokio::test(flavor = "multi_thread", worker_threads = 4)] -async fn confirmed_delivery_invalidates_pending_local_allow() -> Result<()> { +async fn confirmed_delivery_refreshes_pending_local_allow( + refreshed_outcome: GuardianAssessmentOutcome, +) -> Result<()> { skip_if_no_network!(Ok(())); skip_if_wine_exec!( Ok(()), @@ -222,14 +317,13 @@ async fn confirmed_delivery_invalidates_pending_local_allow() -> Result<()> { }) .await?; let root = test.session_configured.thread_id; - let output_file = test.cwd.path().join("stale-local-allow.txt"); - let output_path = shlex::try_join([output_file.to_string_lossy().as_ref()])?; + let output_file = test.workspace_path_uri("refreshed-local-allow.txt")?; let messaging_tool = code_mode_name_for_tool_name(&ToolName::namespaced( "mcp__codex_apps__user_message", "_send_message", )); let command = json!({ - "cmd": format!("printf should-not-run > {output_path}"), + "cmd": "echo executed >> refreshed-local-allow.txt", "sandbox_permissions": "require_escalated", "justification": "Review the production deployment." }); @@ -253,20 +347,36 @@ async fn confirmed_delivery_invalidates_pending_local_allow() -> Result<()> { mount_completion(&server, root, MESSAGE_CALL_ID).await; let (release_review, review_gate) = oneshot::channel(); - let (review_stream, _) = start_streaming_sse_server(vec![vec![StreamingSseChunk { - gate: Some(review_gate), - body: sse(vec![ + let (release_refreshed_review, refreshed_review_gate) = oneshot::channel(); + let (review_stream, _) = start_streaming_sse_server(vec![ + vec![StreamingSseChunk { + gate: Some(review_gate), + body: sse(vec![ + ev_assistant_message( + "local-guardian-allow", + &json!({ + "risk_level": "low", "user_authorization": "high", "outcome": "allow", + "rationale": "The original context authorized the command." + }) + .to_string(), + ), + ev_completed("local-guardian-allow"), + ]), + }], + vec![StreamingSseChunk { + gate: Some(refreshed_review_gate), + body: sse(vec![ ev_assistant_message( - "local-guardian-allow", + "refreshed-guardian-assessment", &json!({ - "risk_level": "low", "user_authorization": "high", "outcome": "allow", - "rationale": "The original context authorized the command." - }) - .to_string(), + "risk_level": "low", "user_authorization": "high", "outcome": refreshed_outcome, + "rationale": "Decision using the newly delivered assistant context." + }).to_string(), ), - ev_completed("local-guardian-allow"), + ev_completed("refreshed-guardian-response"), ]), - }]]) + }], + ]) .await; wiremock::Mock::given(wiremock::matchers::method("POST")) .and(wiremock::matchers::path("/v1/responses")) @@ -281,7 +391,7 @@ async fn confirmed_delivery_invalidates_pending_local_allow() -> Result<()> { .insert_header("location", format!("{}/v1/responses", review_stream.uri())), ) .with_priority(/*priority*/ 2) - .up_to_n_times(/*n*/ 1) + .up_to_n_times(/*n*/ 2) .mount(&server) .await; @@ -325,21 +435,77 @@ async fn confirmed_delivery_invalidates_pending_local_allow() -> Result<()> { .await .context("confirmed delivery was not retained during local review")?; release_review.send(()).expect("release stale local allow"); + tokio::time::timeout( + Duration::from_secs(/*secs*/ 10), + review_stream.wait_for_request_count(/*count*/ 2), + ) + .await + .context("delivered assistant context did not trigger a fresh review")?; + let requests = server.received_requests().await.expect("recorded requests"); + let reviews = requests + .iter() + .filter_map(request_body) + .filter(|body| { + body["client_metadata"]["x-openai-subagent"] == "guardian" + && !is_hosted_messaging_review_body(body) + }) + .collect::>(); + assert_eq!(reviews.len(), 2); + let original = &reviews[0]; + let refreshed = &reviews[1]; + let delivered_message = format!("assistant: {ROOT_ASSISTANT_REPLY}"); + assert!(!original.to_string().contains(&delivered_message)); + assert!(refreshed.to_string().contains(&delivered_message)); + assert_eq!( + test.fs() + .get_metadata(&output_file, Default::default(), /*sandbox*/ None) + .await + .expect_err("stale allow executed the command") + .kind(), + std::io::ErrorKind::NotFound, + ); + release_refreshed_review + .send(()) + .expect("release fresh Guardian decision"); let status = wait_for_event_match(&test.codex, |event| match event { EventMsg::GuardianAssessment(assessment) - if assessment.status == GuardianAssessmentStatus::Aborted => + if assessment.status != GuardianAssessmentStatus::InProgress + && matches!(assessment.action, GuardianAssessmentAction::Command { .. }) => { Some(assessment.status) } _ => None, }) .await; - assert_eq!(status, GuardianAssessmentStatus::Aborted); + let expected_status = match refreshed_outcome { + GuardianAssessmentOutcome::Allow => GuardianAssessmentStatus::Approved, + GuardianAssessmentOutcome::Deny => GuardianAssessmentStatus::Denied, + }; + assert_eq!(status, expected_status); wait_for_event(&test.codex, |event| { matches!(event, EventMsg::TurnComplete(_)) }) .await; - assert!(!output_file.exists(), "stale allow executed the command"); + match refreshed_outcome { + GuardianAssessmentOutcome::Allow => { + let contents = test + .fs() + .read_file_text(&output_file, Default::default(), /*sandbox*/ None) + .await?; + assert_eq!(contents.lines().collect::>(), vec!["executed"]); + } + GuardianAssessmentOutcome::Deny => { + assert_eq!( + test.fs() + .get_metadata(&output_file, Default::default(), /*sandbox*/ None) + .await + .expect_err("denied action executed") + .kind(), + std::io::ErrorKind::NotFound, + ); + } + } + assert_eq!(review_stream.requests().await.len(), 2); test.codex.shutdown_and_wait().await?; review_stream.shutdown().await; Ok(()) From 9e03960cf8807c37fc987bf17b4e745b8b3339d2 Mon Sep 17 00:00:00 2001 From: rka-oai Date: Tue, 13 Oct 2026 23:44:40 +0000 Subject: [PATCH 019/155] Wire background compaction into the turn lifecycle (#53800) ## What changed - Launch background compaction at eligible pre-turn, mid-turn, and post-turn checkpoints when `AsyncCompaction` is enabled, capturing the current world state and client routing state. - Adopt ready results at compaction checkpoints while preserving newer messages, tool outputs, and world-state updates. Continue normally if an optional result is rejected. - Run one foreground compaction if an adopted result still exceeds the context limit. - Prevent cancelled turns from launching new background work while preserving already-running work for later reuse. ## Testing Add unit and scenario coverage for stale history and account changes, cancellation, pending-result reuse and fallback, retained tool outputs, compaction event pairing, and token usage accounting. Add a context snapshot covering a collaboration-mode change while compaction runs. GitOrigin-RevId: 04ac028d9fe2e3ea64aacaaeb351c3c776cf3940 --- codex-rs/core/src/client.rs | 1 - codex-rs/core/src/codex_thread.rs | 8 + codex-rs/core/src/compact_remote_v2.rs | 6 +- .../src/compact_remote_v2_installation.rs | 26 +- .../compact_remote_v2_installation_tests.rs | 180 ++++++ codex-rs/core/src/session/async_compaction.rs | 26 +- .../src/session/async_compaction_tests.rs | 167 +++++ codex-rs/core/src/session/mod.rs | 1 - codex-rs/core/src/session/turn.rs | 181 ++++-- codex-rs/core/tests/suite/scenarios.rs | 602 ++++++++++++++++++ ...tra_async_compaction_with_live_suffix.snap | 117 ++++ 11 files changed, 1235 insertions(+), 80 deletions(-) create mode 100644 codex-rs/core/src/compact_remote_v2_installation_tests.rs create mode 100644 codex-rs/core/src/session/async_compaction_tests.rs create mode 100644 codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_async_compaction_with_live_suffix.snap diff --git a/codex-rs/core/src/client.rs b/codex-rs/core/src/client.rs index 89eb0e1edc..9ef4c05919 100644 --- a/codex-rs/core/src/client.rs +++ b/codex-rs/core/src/client.rs @@ -1479,7 +1479,6 @@ impl<'a> ResponsesHttpExecutor<'a> { } impl ModelClientSession { - #[allow(dead_code)] pub(crate) fn turn_state_with_auth_owner(&self) -> (Option, Option) { let owner = self.client.auth_owner_generation(); let turn_state = (self.websocket_session.auth_owner_generation == owner) diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rs index 8d2cd8351a..a63dc8f4d2 100644 --- a/codex-rs/core/src/codex_thread.rs +++ b/codex-rs/core/src/codex_thread.rs @@ -388,6 +388,14 @@ impl CodexThread { self.session.flush_rollout().await } + /// Test barrier: waits for background compaction without consuming its published result. + /// Call after the request starts, with foreground work gated to prevent new launches. + #[doc(hidden)] + pub async fn wait_for_background_compaction_for_test(&self) { + crate::session::async_compaction::wait_for_background_compaction_for_test(&self.session) + .await; + } + pub async fn submit_with_trace( &self, op: Op, diff --git a/codex-rs/core/src/compact_remote_v2.rs b/codex-rs/core/src/compact_remote_v2.rs index 8d9ca690e3..bacf8c3a5c 100644 --- a/codex-rs/core/src/compact_remote_v2.rs +++ b/codex-rs/core/src/compact_remote_v2.rs @@ -117,7 +117,7 @@ pub(crate) async fn run_inline_remote_auto_compact_task( world_state: Arc, reason: CompactionReason, phase: CompactionPhase, - candidate: Option, + candidate: Option>, fallback: CompactionFallback, ) -> CodexResult { let compaction_metadata = CompactionTurnMetadata::new( @@ -172,7 +172,7 @@ async fn run_remote_compact_task_inner( client_session: Option<&mut ModelClientSession>, world_state: Arc, compaction_metadata: CompactionTurnMetadata, - candidate: Option, + candidate: Option>, fallback: CompactionFallback, ) -> CodexResult { let turn_context = &step_context.turn; @@ -231,7 +231,7 @@ async fn run_remote_compact_task_inner( compaction_metadata, &mut analytics_details, started_item.as_ref(), - candidate, + candidate.map(|candidate| *candidate), fallback, )) .await; diff --git a/codex-rs/core/src/compact_remote_v2_installation.rs b/codex-rs/core/src/compact_remote_v2_installation.rs index 36e11b7153..a13b18ba44 100644 --- a/codex-rs/core/src/compact_remote_v2_installation.rs +++ b/codex-rs/core/src/compact_remote_v2_installation.rs @@ -1,5 +1,5 @@ -//! Materializes and installs foreground or prepared V2 compaction through one lifecycle. -//! A rejected prepared result may fall back once; building and installation share one path. +//! Materializes and installs foreground or prepared V2 compaction through a shared path. +//! A rejected or still-over-budget prepared result may fall back to one foreground request. //! Prepared prefixes are validated by the history replacement primitive before mutation. use super::*; @@ -9,6 +9,10 @@ use crate::context_manager::updates::merge_world_state_updates; use crate::session::CompactedHistoryInstallation; use codex_rollout_trace::CompactionCheckpointTracePayload; +#[cfg(test)] +#[path = "compact_remote_v2_installation_tests.rs"] +mod tests; + #[allow(clippy::too_many_arguments)] pub(super) async fn run_compaction( sess: &Arc, @@ -18,7 +22,7 @@ pub(super) async fn run_compaction( world_state: &WorldState, compaction_metadata: CompactionTurnMetadata, analytics_details: &mut CompactionAnalyticsDetails, - started_item: Option<&TurnItem>, + mut started_item: Option<&TurnItem>, candidate: Option, fallback: CompactionFallback, ) -> CodexResult { @@ -35,8 +39,20 @@ pub(super) async fn run_compaction( Some(candidate), ) .await?; - if installed || fallback == CompactionFallback::Skip { - return Ok(installed); + if installed { + let status = crate::session::context_window::context_window_token_status( + sess, + &replacement_step_context.turn, + ) + .await; + if !status.token_limit_reached { + return Ok(true); + } + // The live suffix can leave an adopted prefix over budget. Try the existing + // foreground path once, with a new item: adoption already completed its item. + started_item = None; + } else if fallback == CompactionFallback::Skip { + return Ok(false); } } build_and_install_compaction( diff --git a/codex-rs/core/src/compact_remote_v2_installation_tests.rs b/codex-rs/core/src/compact_remote_v2_installation_tests.rs new file mode 100644 index 0000000000..5f9e290bd9 --- /dev/null +++ b/codex-rs/core/src/compact_remote_v2_installation_tests.rs @@ -0,0 +1,180 @@ +//! Stale prefixes are skipped or replaced with a fresh request according to caller intent. + +use super::*; +use crate::compact_remote_v2::RemoteCompactV2Attempt; +use crate::context::world_state::WorldState; +use crate::session::CompactionPrefix; +use codex_login::CodexAuth; +use codex_protocol::models::ResponseItem; +use core_test_support::responses; +use pretty_assertions::assert_eq; +use test_case::test_case; +use tokio_util::sync::CancellationToken; + +#[derive(Clone, Copy)] +enum HistoryChange { + Replacement, + Account, +} + +#[test_case(HistoryChange::Replacement, CompactionFallback::Skip; "replacement optional")] +#[test_case(HistoryChange::Account, CompactionFallback::Skip; "account optional")] +#[test_case(HistoryChange::Replacement, CompactionFallback::Foreground; "replacement required")] +#[test_case(HistoryChange::Account, CompactionFallback::Foreground; "account required")] +#[tokio::test] +async fn prepared_prefix_rejection_respects_caller_intent( + change: HistoryChange, + fallback: CompactionFallback, +) { + let server = responses::start_mock_server().await; + let mut provider = + codex_model_provider_info::built_in_model_providers(/*openai_base_url*/ None)["openai"] + .clone(); + provider.base_url = Some(format!("{}/v1", server.uri())); + provider.supports_websockets = false; + let server_uri = server.uri(); + let (sess, turn, _events) = + crate::session::tests::make_session_and_context_with_auth_and_config_and_rx( + CodexAuth::create_dummy_chatgpt_auth_for_testing(), + Vec::new(), + move |config| { + config.model = Some("gpt-5.2".to_string()); + config.model_provider = provider; + config.chatgpt_base_url = server_uri; + let _ = config.features.disable(Feature::TokenBudget); + }, + ) + .await; + let requests = responses::mount_sse_once( + &server, + responses::sse(vec![ + serde_json::json!({"type":"response.output_item.done", "item": { + "type":"compaction", "encrypted_content":"fresh-summary" + }}), + serde_json::json!({"type":"response.completed", "response":{"id":"foreground"}}), + ]), + ) + .await; + let step = sess + .capture_step_context(turn, &CancellationToken::new()) + .await + .expect("capture step"); + let original: ResponseItem = serde_json::from_value(serde_json::json!({ + "type": "message", "role": "user", + "content": [{"type": "input_text", "text": "original turn"}] + })) + .expect("user message"); + sess.replace_history(vec![original.clone()], /*reference_context_item*/ None) + .await; + let history = sess.clone_history().await; + let auth = sess.services.model_client.auth_owner_generation(); + let mut candidate = BackgroundCompactionCandidate { + prefix: CompactionPrefix { + generation: history.history_version(), + len: history.annotated_items().len(), + auth_owner_generation: auth, + }, + model_info: Arc::clone(&step.settings.model_info), + cutoff_world_state: Arc::new(WorldState::default()), + attempt: RemoteCompactV2Attempt { + input_goal_ids: Default::default(), + trace_input_history: None, + prompt_input: vec![original.clone()], + prompt_input_metadata: vec![None], + compaction_output: ResponseItem::Compaction { + id: None, + encrypted_content: "stale-summary".to_string(), + internal_chat_message_metadata_passthrough: None, + }, + compaction_response_id: "prepared".to_string(), + token_usage: Some(TokenUsage { + output_tokens: 777, + cached_input_tokens: 9, + cache_write_input_tokens: 5, + ..Default::default() + }), + owned_client_session: None, + }, + }; + match change { + HistoryChange::Replacement => { + sess.replace_history( + vec![original.clone(), original.clone()], + /*reference_context_item*/ None, + ) + .await; + } + HistoryChange::Account => { + candidate.prefix.auth_owner_generation = Some(auth.unwrap_or_default().wrapping_add(1)); + } + } + // Rewritten histories still fit the captured length; length alone cannot reject them. + let history = sess.clone_history().await; + assert!(history.annotated_items().len() >= candidate.prefix.len); + if !matches!(change, HistoryChange::Account) { + assert_ne!(history.history_version(), candidate.prefix.generation); + } + let before = sess + .clone_history() + .await + .raw_items() + .cloned() + .collect::>(); + let mut analytics = CompactionAnalyticsDetails::default(); + let installed = run_compaction( + &sess, + &step, + &step, + /*client_session*/ None, + &WorldState::default(), + CompactionTurnMetadata::new( + CompactionTrigger::Auto, + CompactionReason::ContextLimit, + CompactionImplementation::ResponsesCompactionV2, + CompactionPhase::PreTurn, + ), + &mut analytics, + /*started_item*/ None, + Some(candidate), + fallback, + ) + .await + .expect("reject stale result without failing compaction"); + // The foreground response has no usage; stale candidate statistics must not leak. + assert_eq!( + ( + analytics.compaction_summary_tokens, + analytics.cached_input_tokens, + analytics.cache_write_input_tokens + ), + (None, None, None), + ); + let after = sess + .clone_history() + .await + .raw_items() + .cloned() + .collect::>(); + match fallback { + CompactionFallback::Skip => { + assert!(!installed); + assert_eq!(analytics.retained_image_count, None); + assert_eq!(requests.requests().len(), 0); + assert_eq!(after, before); + } + CompactionFallback::Foreground => { + assert!(installed); + assert_eq!(requests.requests().len(), 1); + let summaries = after + .iter() + .filter_map(|item| match item { + ResponseItem::Compaction { + encrypted_content, .. + } => Some(encrypted_content.as_str()), + _ => None, + }) + .collect::>(); + assert_eq!(summaries, ["fresh-summary"]); + } + } +} diff --git a/codex-rs/core/src/session/async_compaction.rs b/codex-rs/core/src/session/async_compaction.rs index ea2f5a1d9b..bb80f857fd 100644 --- a/codex-rs/core/src/session/async_compaction.rs +++ b/codex-rs/core/src/session/async_compaction.rs @@ -31,7 +31,8 @@ struct CompactionAttempt { #[derive(Default)] pub(crate) struct AsyncCompactionState { last_attempt: Option, - result: Option>, + // Keep prepared request state off the turn stack while checkpoints await adoption. + result: Option>>, tasks: TaskTracker, shutdown_cancellation: CancellationToken, } @@ -53,6 +54,7 @@ pub(super) async fn maybe_start( step_context: &Arc, world_state: &Arc, phase: CompactionPhase, + turn_cancellation: &CancellationToken, token_status: &ContextWindowTokenStatus, (turn_state, auth_owner_generation): (Option, Option), ) { @@ -87,7 +89,9 @@ pub(super) async fn maybe_start( compaction_hash: model_info.comp_hash.clone(), auth_owner_generation, }; - if state.shutting_down + // Stop blocks new launches; already-running compaction remains session-owned. + if turn_cancellation.is_cancelled() + || state.shutting_down || state.async_compaction.last_attempt.as_ref() == Some(&attempt) || state.history.annotated_items().is_empty() || sess.services.model_client.auth_owner_generation() != auth_owner_generation @@ -124,7 +128,7 @@ pub(super) async fn maybe_start( .await { Ok(candidate) => { - let _ = send.send(candidate); + let _ = send.send(Box::new(candidate)); } Err(error) => { debug!(%error, "discarding unsuccessful background compaction"); @@ -140,7 +144,7 @@ pub(super) async fn maybe_start( pub(super) async fn take_ready( sess: &Session, turn_context: &TurnContext, -) -> Option { +) -> Option> { if !enabled(turn_context) { return None; } @@ -153,7 +157,7 @@ pub(super) async fn take_ready( pub(crate) async fn wait_for_pending( sess: &Session, step_context: &StepContext, -) -> Option { +) -> Option> { if !enabled(&step_context.turn) { return None; } @@ -196,3 +200,15 @@ pub(super) async fn shutdown(sess: &Session) { // Drain completed usage charging before shutdown finishes. tasks.wait().await; } + +/// Test barrier: callers must gate foreground work so it cannot launch another attempt. +pub(crate) async fn wait_for_background_compaction_for_test(sess: &Session) { + let tasks = sess.state.lock().await.async_compaction.tasks.clone(); + // Closing only enables waiting; it neither cancels tasks nor prevents future launches. + tasks.close(); + tasks.wait().await; +} + +#[cfg(test)] +#[path = "async_compaction_tests.rs"] +mod tests; diff --git a/codex-rs/core/src/session/async_compaction_tests.rs b/codex-rs/core/src/session/async_compaction_tests.rs new file mode 100644 index 0000000000..e4a048124b --- /dev/null +++ b/codex-rs/core/src/session/async_compaction_tests.rs @@ -0,0 +1,167 @@ +//! Cancellation prevents new speculation without cancelling session-owned work. + +use super::*; +use codex_analytics::CompactionReason; +use codex_analytics::CompactionTrigger; +use codex_login::CodexAuth; +use codex_protocol::models::ResponseItem; +use codex_protocol::protocol::TokenUsage; +use core_test_support::responses; +use pretty_assertions::assert_eq; + +#[test_case::test_case(CompactionTrigger::Auto; "optional ready adoption")] +#[test_case::test_case(CompactionTrigger::Manual; "manual ready reuse")] +#[tokio::test] +async fn cancelled_turn_skips_launch_but_preserves_existing_work(trigger: CompactionTrigger) { + let phase = CompactionPhase::MidTurn; + let server = responses::start_mock_server().await; + let mut provider = + codex_model_provider_info::built_in_model_providers(/*openai_base_url*/ None)["openai"] + .clone(); + provider.base_url = Some(format!("{}/v1", server.uri())); + provider.supports_websockets = false; + let server_uri = server.uri(); + let (sess, turn, _events) = + crate::session::tests::make_session_and_context_with_auth_and_config_and_rx( + CodexAuth::create_dummy_chatgpt_auth_for_testing(), + Vec::new(), + move |config| { + config.model = Some("gpt-5.2".to_string()); + config.model_context_window = Some(100_000); + config.model_auto_compact_token_limit = Some(90_000); + config.model_provider = provider; + config.chatgpt_base_url = server_uri; + config.features.enable(Feature::AsyncCompaction).unwrap(); + config.features.disable(Feature::TokenBudget).unwrap(); + }, + ) + .await; + let request = responses::mount_sse_once( + &server, + responses::sse(vec![ + serde_json::json!({"type":"response.output_item.done", "item": { + "type":"compaction", "encrypted_content":"prepared-summary" + }}), + responses::ev_completed("prepared"), + ]), + ) + .await; + let turn_cancellation = CancellationToken::new(); + let step = sess + .capture_step_context(Arc::clone(&turn), &turn_cancellation) + .await + .expect("capture step"); + let original: ResponseItem = serde_json::from_value(serde_json::json!({ + "type": "message", "role": "user", + "content": [{"type": "input_text", "text": "original turn"}] + })) + .expect("user message"); + sess.replace_history(vec![original], /*reference_context_item*/ None) + .await; + sess.update_token_usage_info( + &turn, + Some(&TokenUsage { + input_tokens: 70_000, + total_tokens: 70_000, + ..Default::default() + }), + ) + .await + .expect("record usage"); + let status = super::super::context_window::context_window_token_status(&sess, &turn).await; + let world_state = Arc::new(WorldState::default()); + let cancelled = CancellationToken::new(); + cancelled.cancel(); + let auth = sess.services.model_client.auth_owner_generation(); + maybe_start( + &sess, + &step, + &world_state, + phase, + &cancelled, + &status, + (Some("routing".to_string()), auth), + ) + .await; + assert!( + sess.state + .lock() + .await + .async_compaction + .last_attempt + .is_none() + ); + assert_eq!(request.requests().len(), 0); + + // The same eligible work can launch on a live turn, then outlive its cancellation. + maybe_start( + &sess, + &step, + &world_state, + phase, + &turn_cancellation, + &status, + (Some("routing".to_string()), auth), + ) + .await; + turn_cancellation.cancel(); + maybe_start( + &sess, + &step, + &world_state, + phase, + &turn_cancellation, + &status, + (Some("routing".to_string()), auth), + ) + .await; + // Wait for client publication before exercising either ready-result consumer. + wait_for_background_compaction_for_test(&sess).await; + let next_step = sess + .capture_step_context(Arc::clone(&turn), &CancellationToken::new()) + .await + .expect("capture next step"); + match trigger { + CompactionTrigger::Auto => { + let candidate = take_ready(&sess, &turn).await.expect("published candidate"); + let mut client_session = sess.services.model_client.new_session(); + assert!( + crate::compact_remote_v2::run_inline_remote_auto_compact_task( + Arc::clone(&sess), + Arc::clone(&next_step), + next_step, + &mut client_session, + world_state, + CompactionReason::ContextLimit, + phase, + Some(candidate), + crate::compact_remote_v2::CompactionFallback::Skip, + ) + .await + .expect("optional adoption") + ); + } + CompactionTrigger::Manual => { + crate::compact_remote_v2::run_remote_compact_task( + Arc::clone(&sess), + next_step, + world_state, + ) + .await + .expect("manual compaction reuses the completed request"); + } + } + let history = sess.clone_history().await; + let summaries = history + .raw_items() + .filter_map(|item| match item { + ResponseItem::Compaction { + encrypted_content, .. + } => Some(encrypted_content.as_str()), + _ => None, + }) + .collect::>(); + assert_eq!(summaries, ["prepared-summary"]); + assert_eq!(request.requests().len(), 1); + shutdown(&sess).await; +} diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index 2cb1657a5d..9b00655edb 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -238,7 +238,6 @@ use codex_protocol::error::Result as CodexResult; #[cfg(test)] use codex_protocol::exec_output::StreamOutput; -#[allow(dead_code)] pub(crate) mod async_compaction; mod code_mode_warning; mod config_refresh; diff --git a/codex-rs/core/src/session/turn.rs b/codex-rs/core/src/session/turn.rs index 64b42248bc..d1d4362121 100644 --- a/codex-rs/core/src/session/turn.rs +++ b/codex-rs/core/src/session/turn.rs @@ -316,7 +316,7 @@ pub(crate) async fn run_turn( } }, ); - record_context?; + let mut world_state = record_context?; let Some((injection_items, explicitly_enabled_connectors)) = build_skills_and_plugins( &sess, @@ -364,7 +364,8 @@ pub(crate) async fn run_turn( /*candidate*/ None, ) .await?; - sess.record_context_updates_and_set_reference_context_item(first_step_context.as_ref()) + world_state = sess + .record_context_updates_and_set_reference_context_item(first_step_context.as_ref()) .await?; crate::guardian::finalize_guardian_input( &sess, @@ -414,6 +415,23 @@ pub(crate) async fn run_turn( .await; } + if super::async_compaction::enabled(&turn_context) { + let token_status = super::context_window::context_window_token_status( + sess.as_ref(), + turn_context.as_ref(), + ) + .await; + super::async_compaction::maybe_start( + &sess, + &first_step_context, + &world_state, + CompactionPhase::PreTurn, + &cancellation_token, + &token_status, + client_session.turn_state_with_auth_owner(), + ) + .await; + } track_turn_resolved_config_analytics(&sess, &first_step_context, &input).await; let mut last_agent_message: Option = None; @@ -514,7 +532,8 @@ pub(crate) async fn run_turn( ) .await?; - sess.record_step_world_state_if_changed(step_context.as_ref()) + world_state = sess + .record_step_world_state_if_changed(step_context.as_ref()) .await?; // Isolated Guardian reviewers deliberately have no skill catalog. @@ -585,6 +604,21 @@ pub(crate) async fn run_turn( let needs_follow_up = model_needs_follow_up || has_pending_input; let token_limit_reached = token_status.token_limit_reached; + super::async_compaction::maybe_start( + &sess, + &step_context, + &world_state, + if needs_follow_up { + CompactionPhase::MidTurn + } else { + CompactionPhase::PostTurn + }, + &cancellation_token, + &token_status, + client_session.turn_state_with_auth_owner(), + ) + .await; + trace!( turn_id = %turn_context.sub_id, total_usage_tokens = token_status.active_context_tokens, @@ -617,9 +651,16 @@ pub(crate) async fn run_turn( ); } + let candidate = if needs_follow_up { + super::async_compaction::take_ready(&sess, &turn_context).await + } else { + None + }; let should_roll_over = auto_compaction_enabled && needs_follow_up - && (sess.take_new_context_window_request().await || token_limit_reached); + && (sess.take_new_context_window_request().await + || token_limit_reached + || candidate.is_some()); if auto_compaction_enabled { let allow_auto_compact_fallback = !should_roll_over && !token_limit_reached; super::token_budget::maybe_record( @@ -633,40 +674,45 @@ pub(crate) async fn run_turn( // as long as compaction works well in getting us way below the token limit, we shouldn't worry about being in an infinite loop. if should_roll_over { - if let Err(err) = run_auto_compact( + let compacted = run_auto_compact( &sess, Arc::clone(&step_context), Arc::clone(&step_context), &mut client_session, CompactionReason::ContextLimit, CompactionPhase::MidTurn, - /*candidate*/ None, + candidate, ) - .await - { - if matches!(err.details(), CodexErrorDetails::TurnAborted) { - return Err(err); + .await; + match compacted { + Ok(true) => { + if run_pending_session_start_hooks(&sess, &turn_context).await { + return Ok(None); + } + // After a signaled step, drain the steer even if compaction + // leaves the estimated context above the token limit. + can_drain_pending_input = !model_needs_follow_up + || step_context + .preempt + .as_ref() + .is_some_and(CancellationToken::is_cancelled); + continue; + } + Ok(false) => {} + Err(err) => { + if matches!(err.details(), CodexErrorDetails::TurnAborted) { + return Err(err); + } + let error = err.to_codex_protocol_error(); + sess.emit_turn_error_lifecycle( + turn_context.as_ref(), + error.clone(), + err.details(), + ) + .await; + return Ok(None); } - let error = err.to_codex_protocol_error(); - sess.emit_turn_error_lifecycle( - turn_context.as_ref(), - error.clone(), - err.details(), - ) - .await; - return Ok(None); } - if run_pending_session_start_hooks(&sess, &turn_context).await { - return Ok(None); - } - // After a signaled step, drain the steer even if compaction - // leaves the estimated context above the token limit. - can_drain_pending_input = !model_needs_follow_up - || step_context - .preempt - .as_ref() - .is_some_and(CancellationToken::is_cancelled); - continue; } if !needs_follow_up { @@ -732,45 +778,49 @@ pub(crate) async fn run_turn( // Token-budget resets do not summarize, so preserve their existing rollover // policy. Keep summarizing compaction in this task to serialize history updates. let config = &turn_context.config; - let should_compact_after_turn = auto_summarization_enabled + if auto_summarization_enabled && config.model_post_turn_compact_threshold_percent > 0 - && super::context_window::context_window_token_status( + && !sess.input_queue.has_pending_input(&sess.active_turn).await + && !cancellation_token.is_cancelled() + { + let token_status = super::context_window::context_window_token_status( sess.as_ref(), turn_context.as_ref(), ) - .await - .turn_end_compaction_threshold_reached - && !sess.input_queue.has_pending_input(&sess.active_turn).await - && !cancellation_token.is_cancelled(); - if should_compact_after_turn - && let Err(err) = run_auto_compact( - &sess, - Arc::clone(&step_context), - Arc::clone(&step_context), - &mut client_session, - CompactionReason::ContextLimit, - CompactionPhase::PostTurn, - /*candidate*/ None, - ) - .await - { - if matches!( - err.details(), - CodexErrorDetails::Interrupted | CodexErrorDetails::TurnAborted - ) { - return Err(err); - } - let error = err.to_codex_protocol_error(); - if matches!(error, CodexErrorInfo::UsageLimitExceeded) { - // Preserve the completed answer while stopping automatic work. - sess.emit_turn_error_lifecycle( - turn_context.as_ref(), - error, - err.details(), + .await; + let foreground_due = token_status.turn_end_compaction_threshold_reached; + let candidate = + super::async_compaction::take_ready(&sess, &turn_context).await; + if (foreground_due || candidate.is_some()) + && let Err(err) = run_auto_compact( + &sess, + Arc::clone(&step_context), + Arc::clone(&step_context), + &mut client_session, + CompactionReason::ContextLimit, + CompactionPhase::PostTurn, + candidate, ) - .await; + .await + { + if matches!( + err.details(), + CodexErrorDetails::Interrupted | CodexErrorDetails::TurnAborted + ) { + return Err(err); + } + let error = err.to_codex_protocol_error(); + if matches!(error, CodexErrorInfo::UsageLimitExceeded) { + // Preserve the completed answer while stopping automatic work. + sess.emit_turn_error_lifecycle( + turn_context.as_ref(), + error, + err.details(), + ) + .await; + } + warn!(error = %err, "Post-turn compaction failed; preserving the completed turn"); } - warn!(error = %err, "Post-turn compaction failed; preserving the completed turn"); } break; } @@ -1330,8 +1380,9 @@ async fn run_pre_sampling_compact( let token_status = super::context_window::context_window_token_status(sess.as_ref(), turn_context.as_ref()) .await; + let candidate = super::async_compaction::take_ready(sess, turn_context).await; // Compact if the configured auto-compaction budget or usable context window is exhausted. - if token_status.token_limit_reached { + if token_status.token_limit_reached || candidate.is_some() { // Pre-turn compaction runs before run_turn creates the normal sampling step. let step_context = sess .capture_step_context(Arc::clone(turn_context), cancellation_token) @@ -1343,7 +1394,7 @@ async fn run_pre_sampling_compact( client_session, CompactionReason::ContextLimit, CompactionPhase::PreTurn, - /*candidate*/ None, + candidate, ) .await?; } @@ -1460,7 +1511,7 @@ async fn run_auto_compact( client_session: &mut ModelClientSession, reason: CompactionReason, phase: CompactionPhase, - candidate: Option, + candidate: Option>, ) -> CodexResult { let turn_context = &step_context.turn; if matches!(phase, CompactionPhase::PreTurn) diff --git a/codex-rs/core/tests/suite/scenarios.rs b/codex-rs/core/tests/suite/scenarios.rs index e212859bc3..cfad8149ad 100644 --- a/codex-rs/core/tests/suite/scenarios.rs +++ b/codex-rs/core/tests/suite/scenarios.rs @@ -11,6 +11,7 @@ use std::time::Duration; use anyhow::Result; use base64::Engine; use base64::engine::general_purpose::STANDARD as BASE64_STANDARD; +use codex_analytics::CompactionTrigger; use codex_config::ConfigLayerSource; use codex_config::ConfigLayerStack; use codex_config::types::McpServerConfig; @@ -18,6 +19,7 @@ use codex_context_fragments::AnsweredQuestion; use codex_context_fragments::ContextualUserFragment; use codex_core::ForkSnapshot; use codex_core::StartThreadOptions; +use codex_core::TurnInput; use codex_core::TurnInputRequest; use codex_core::compact::AutoCompactionDisabled; use codex_core::config::Config; @@ -29,6 +31,7 @@ use codex_extension_api::ExtensionDataInit; use codex_extension_api::ExtensionRegistry; use codex_extension_api::ExtensionRegistryBuilder; use codex_features::Feature; +use codex_history::RolloutItem; use codex_login::CodexAuth; use codex_models_manager::bundled_models_response; use codex_protocol::capabilities::CapabilityRootLocation; @@ -80,6 +83,7 @@ use core_test_support::skip_if_wine_exec; use core_test_support::stdio_server_bin; use core_test_support::streaming_sse::StreamingSseChunk; use core_test_support::streaming_sse::start_streaming_sse_server; +use core_test_support::test_codex::TestCodex; use core_test_support::test_codex::environment_config_for_selection; use core_test_support::test_codex::executor_path_uri; use core_test_support::test_codex::test_codex; @@ -2173,3 +2177,601 @@ async fn model_catalog_refresh_preserves_tools_and_history() -> Result<()> { )); Ok(()) } + +fn compaction_chunk( + gate: Option>, + events: Vec, +) -> StreamingSseChunk { + StreamingSseChunk { + gate, + body: sse(events), + } +} + +fn compaction_output(value: &str) -> serde_json::Value { + json!({"type": "response.output_item.done", "item": { + "type": "compaction", "encrypted_content": value + }}) +} + +async fn async_compaction_test( + responses_uri: &str, + features: Vec, + configure: impl Fn(&mut Config) + Send + Sync + 'static, +) -> Result<(wiremock::MockServer, TestCodex)> { + let config_server = start_mock_server().await; + let base_url = format!("{responses_uri}/v1"); + let test = test_codex() + .with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()) + .with_config(move |config| { + configure_scenario_catalog(config); + config.model_provider.base_url = Some(base_url); + config.model_context_window = Some(100_000); + for feature in features { + config + .features + .enable(feature) + .expect("enable scenario feature"); + } + config + .features + .enable(Feature::AsyncCompaction) + .expect("enable async compaction"); + config + .features + .disable(Feature::EnableRequestCompression) + .expect("capture raw requests"); + configure(config); + }) + .with_model("gpt-6-astra") + .build_with_auto_env(&config_server) + .await?; + Ok((config_server, test)) +} + +#[derive(Clone, Copy)] +enum LiveSuffix { + User, + Tool, + RetainedTool, + OverBudgetRetainedTool, +} + +#[test_case::test_case(LiveSuffix::User; "newer user")] +#[test_case::test_case(LiveSuffix::Tool; "only assistant and tools")] +#[test_case::test_case(LiveSuffix::RetainedTool; "retained standalone output")] +#[test_case::test_case(LiveSuffix::OverBudgetRetainedTool; "ready adoption still over budget")] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn astra_async_compaction_keeps_work_added_after_its_snapshot( + suffix: LiveSuffix, +) -> Result<()> { + use codex_protocol::config_types::CollaborationMode; + use codex_protocol::config_types::ModeKind; + use codex_protocol::config_types::Settings; + use codex_protocol::protocol::ThreadSettingsOverrides; + use core_test_support::responses::ev_completed_with_tokens; + + skip_if_no_network!(Ok(())); + let over_budget = matches!(suffix, LiveSuffix::OverBudgetRetainedTool); + let retained_output = if over_budget { + format!("delegated work {}", "x ".repeat(12_000)) + } else { + "delegated work".to_string() + }; + let (release_background, background_gate) = oneshot::channel(); + let (release_foreground, foreground_gate) = oneshot::channel(); + let mut responses = vec![ + vec![compaction_chunk( + /*gate*/ None, + vec![ + ev_assistant_message("draft", "I drafted the launch notes."), + ev_completed_with_tokens( + "draft-response", + /*total_tokens*/ if over_budget { 2_000 } else { 70_000 }, + ), + ], + )], + vec![compaction_chunk( + Some(background_gate), + vec![ + compaction_output("ASYNC_LAUNCH_CHECKPOINT"), + ev_completed_with_tokens("compact-response", /*total_tokens*/ 3_000), + ], + )], + vec![ + compaction_chunk( + /*gate*/ None, + vec![ + ev_response_created("team-response"), + ev_assistant_message("team-check", "I will check who is available."), + ], + ), + compaction_chunk( + Some(foreground_gate), + vec![ + ev_function_call_with_namespace("team", "collaboration", "list_agents", "{}"), + ev_completed_with_tokens( + "team-response", + /*total_tokens*/ if over_budget { 9_000 } else { 75_000 }, + ), + ], + ), + ], + vec![compaction_chunk( + /*gate*/ None, + vec![ + ev_assistant_message("answer", "I can finish the notes myself."), + ev_completed_with_tokens( + "answer-response", + /*total_tokens*/ if over_budget { 10 } else { 3_000 }, + ), + ], + )], + ]; + if over_budget { + responses.insert( + 3, + vec![compaction_chunk( + /*gate*/ None, + vec![ + compaction_output("SYNC"), + ev_completed_with_tokens("sync", /*total_tokens*/ 3_000), + ], + )], + ); + } + let (streaming, _completions) = start_streaming_sse_server(responses).await; + let features = match suffix { + LiveSuffix::User => vec![Feature::IncrementalTools], + LiveSuffix::Tool => vec![], + LiveSuffix::RetainedTool | LiveSuffix::OverBudgetRetainedTool => { + vec![Feature::RetainClientToolOutputs] + } + }; + let (_config_server, test) = async_compaction_test(streaming.uri(), features, move |config| { + if over_budget { + config.async_compaction_threshold_percent = 1; + config.model_auto_compact_token_limit = Some(5_000); + } + }) + .await?; + test.codex.ensure_rollout_materialized().await; + let compaction_event = |event: &EventMsg| match event { + EventMsg::ItemStarted(event) if matches!(event.item, TurnItem::ContextCompaction(_)) => { + Some(("started", event.item.id())) + } + EventMsg::ItemCompleted(event) if matches!(event.item, TurnItem::ContextCompaction(_)) => { + Some(("completed", event.item.id())) + } + _ => None, + }; + + test.submit_text_turn("Draft the launch notes.").await?; + let timeout = Duration::from_secs(/*secs*/ 20); + tokio::time::timeout(timeout, streaming.wait_for_request_count(/*count*/ 2)).await?; + let next_input = if matches!(suffix, LiveSuffix::User) { + TurnInputRequest::user_input(vec![text("Check who can finish the notes.")]) + } else { + let item = serde_json::from_value(json!({ + "type": "function_call_output", + "name": "send_message_to_thread", + "namespace": "codex_app", + "output": retained_output, + }))?; + TurnInputRequest::new( + if matches!( + suffix, + LiveSuffix::RetainedTool | LiveSuffix::OverBudgetRetainedTool + ) { + TurnInput::AnnotatedResponseItem( + codex_protocol::turn_input::AnnotatedResponseItem { + item, + annotations: codex_protocol::turn_input::ResponseItemAnnotations { + retain: true, + }, + }, + ) + } else { + TurnInput::ResponseItem(item) + }, + ) + }; + test.codex + .start_or_steer_turn(next_input.with_thread_settings(ThreadSettingsOverrides { + collaboration_mode: Some(CollaborationMode { + mode: ModeKind::Plan, + settings: Settings { + model: "gpt-6-astra".to_string(), + reasoning_effort: None, + developer_instructions: Some( + "Plan Mode: prepare a plan before making changes.".to_string(), + ), + }, + }), + ..Default::default() + })) + .await?; + tokio::time::timeout(timeout, streaming.wait_for_request_count(/*count*/ 3)).await?; + wait_for_event(&test.codex, |event| { + assert_eq!(compaction_event(event), None); + matches!(event, EventMsg::ItemCompleted(event) + if matches!(&event.item, TurnItem::AgentMessage(message) if message.id == "team-check")) + }) + .await; + release_background + .send(()) + .expect("release background compaction"); + // Wait for client publication while foreground work is gated, keeping adoption optional. + tokio::time::timeout( + timeout, + test.codex.wait_for_background_compaction_for_test(), + ) + .await?; + release_foreground + .send(()) + .expect("release foreground work"); + let mut compaction_events = Vec::new(); + wait_for_event(&test.codex, |event| { + compaction_events.extend(compaction_event(event)); + matches!(event, EventMsg::TurnComplete(_)) + }) + .await; + tokio::time::timeout( + timeout, + test.codex.wait_for_background_compaction_for_test(), + ) + .await?; + assert_eq!(compaction_events.len(), if over_budget { 4 } else { 2 }); + for pair in compaction_events.chunks_exact(2) { + assert_eq!((pair[0].0, pair[1].0), ("started", "completed")); + assert_eq!(pair[0].1, pair[1].1); + } + if over_budget { + assert_ne!(compaction_events[0].1, compaction_events[2].1); + } + + let requests = streaming + .requests() + .await + .iter() + .map(|body| serde_json::from_slice::(body)) + .collect::>>()?; + assert_eq!(requests.len(), if over_budget { 5 } else { 4 }); + if over_budget { + let continuation = requests[4]["input"].as_array().expect("continuation input"); + assert!( + continuation + .iter() + .any(|item| item["encrypted_content"] == "SYNC") + ); + assert!( + continuation + .iter() + .any(|item| item["output"] == retained_output) + ); + } + let history = test + .codex + .load_history(/*include_archived*/ false) + .await? + .items; + assert!(history.windows(2).any(|items| matches!(items, + [RolloutItem::Compacted(_), RolloutItem::WorldState(baseline)] + if baseline.full && baseline.state["collaboration_mode"]["mode"] == "plan" + ))); + let input = requests[3]["input"].as_array().expect("request input"); + // The full snapshot normalizes mode text; check the cutoff and later update explicitly. + let position = |text: &str| { + let positions = input + .iter() + .enumerate() + .filter_map(|(i, item)| item.to_string().contains(text).then_some(i)) + .collect::>(); + assert_eq!(positions.len(), 1, "{text}"); + positions[0] + }; + let default = position("# Collaboration Mode: Default"); + let draft = position("Draft the launch notes."); + let compaction = position("ASYNC_LAUNCH_CHECKPOINT"); + let plan = position("Plan Mode"); + if matches!(suffix, LiveSuffix::User) { + let user = position("Check who can finish the notes."); + assert!(draft < compaction && compaction < default && default < plan && plan < user); + let entries = requests.iter().map(SnapshotEntry::body).collect::>(); + insta::assert_snapshot!( + "astra_async_compaction_with_live_suffix", + context_snapshot::format_context_snapshot( + "Astra compacts a completed launch-notes turn in the background. The user switches to Plan mode while it runs. Adoption restores Default mode at the cutoff, then preserves the Plan update, newer user message, and assistant/tool exchange in their original order.", + &entries, + &ContextSnapshotOptions::default().rewrite_known_segments(), + ) + ); + } else { + let tool = position("delegated work"); + if matches!( + suffix, + LiveSuffix::RetainedTool | LiveSuffix::OverBudgetRetainedTool + ) { + assert!(draft < compaction && compaction < default && default < plan && plan < tool); + } else { + assert!(default < draft && draft < compaction && compaction < plan && plan < tool); + } + let assistant = position("I will check who is available."); + let call = input + .iter() + .position(|item| item["type"] == "function_call" && item["call_id"] == "team") + .expect("retained tool call"); + let output = input + .iter() + .position(|item| item["type"] == "function_call_output" && item["call_id"] == "team") + .expect("retained tool output"); + assert!(tool < assistant && assistant < call && call < output); + } + Ok(()) +} + +#[derive(PartialEq)] +enum PendingCompactionOutcome { + Absent, + Success, + SuccessOverBudget, + StaleSuccess, + Failure, + Interrupted, +} + +#[test_case::test_case(PendingCompactionOutcome::Success, CompactionTrigger::Auto; "auto uses pending result")] +#[test_case::test_case(PendingCompactionOutcome::Failure, CompactionTrigger::Auto; "auto falls back after failure")] +#[test_case::test_case(PendingCompactionOutcome::StaleSuccess, CompactionTrigger::Auto; "auto falls back after account changes")] +#[test_case::test_case(PendingCompactionOutcome::Interrupted, CompactionTrigger::Auto; "auto can be interrupted")] +#[test_case::test_case(PendingCompactionOutcome::Absent, CompactionTrigger::Manual; "manual without background")] +#[test_case::test_case(PendingCompactionOutcome::Success, CompactionTrigger::Manual; "manual uses pending result")] +#[test_case::test_case(PendingCompactionOutcome::Failure, CompactionTrigger::Manual; "manual falls back after failure")] +#[test_case::test_case(PendingCompactionOutcome::StaleSuccess, CompactionTrigger::Manual; "manual falls back after account changes")] +#[test_case::test_case(PendingCompactionOutcome::Interrupted, CompactionTrigger::Manual; "manual can be interrupted")] +#[test_case::test_case(PendingCompactionOutcome::SuccessOverBudget, CompactionTrigger::Auto; "pending adoption still over budget")] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn async_compaction_reuses_pending_work( + outcome: PendingCompactionOutcome, + trigger: CompactionTrigger, +) -> Result<()> { + use core_test_support::responses::ev_completed_with_tokens; + + skip_if_no_network!(Ok(())); + let over_budget = outcome == PendingCompactionOutcome::SuccessOverBudget; + let retained_output = format!("LATE_OUTPUT {}", "x ".repeat(12_000)); + let manual = matches!(trigger, CompactionTrigger::Manual); + let has_background = outcome != PendingCompactionOutcome::Absent; + let seed_tokens = if over_budget { + 2_000 + } else if has_background { + 70_000 + } else { + 10_000 + }; + let valid_output = outcome != PendingCompactionOutcome::Failure; + let succeeds = !matches!( + outcome, + PendingCompactionOutcome::Absent + | PendingCompactionOutcome::SuccessOverBudget + | PendingCompactionOutcome::Failure + | PendingCompactionOutcome::StaleSuccess + ); + let response = |id, event, tokens| vec![event, ev_completed_with_tokens(id, tokens)]; + let immediate = |events| vec![compaction_chunk(/*gate*/ None, events)]; + let (release_background, background_gate) = oneshot::channel(); + let mut responses = vec![immediate(response( + "seed", + ev_assistant_message("seed", "seed"), + seed_tokens, + ))]; + if has_background { + responses.push(vec![compaction_chunk( + Some(background_gate), + response( + "background", + if valid_output { + compaction_output("ASYNC") + } else { + ev_assistant_message("invalid", "missing compaction output") + }, + /*tokens*/ 3_000, + ), + )]); + } + if !manual { + responses.push(immediate(response( + "second", + ev_function_call_with_namespace("team", "collaboration", "list_agents", "{}"), + /*tokens*/ if over_budget { 9_000 } else { 91_000 }, + ))); + } + if !succeeds { + responses.push(immediate(response( + "sync", + compaction_output("SYNC"), + /*tokens*/ 3_000, + ))); + } + responses.push(immediate(response( + "continuation", + ev_assistant_message("continuation", "continuation"), + /*tokens*/ if over_budget { 10 } else { 3_000 }, + ))); + let (streaming, mut completions) = start_streaming_sse_server(responses).await; + let (_config_server, test) = async_compaction_test( + streaming.uri(), + if over_budget { + vec![Feature::RetainClientToolOutputs] + } else { + vec![] + }, + move |config| { + if over_budget { + config.async_compaction_threshold_percent = 1; + config.model_auto_compact_token_limit = Some(5_000); + } + }, + ) + .await?; + test.codex.ensure_rollout_materialized().await; + let timeout = Duration::from_secs(/*secs*/ 20); + test.submit_text_turn("first").await?; + if has_background { + tokio::time::timeout(timeout, streaming.wait_for_request_count(/*count*/ 2)).await?; + } + if manual { + test.codex.submit(Op::Compact).await?; + } else if over_budget { + test.codex.start_or_steer_turn(TurnInputRequest::new(TurnInput::AnnotatedResponseItem( + codex_protocol::turn_input::AnnotatedResponseItem { + item: serde_json::from_value(json!({"type": "function_call_output", "name": "send_message_to_thread", "namespace": "codex_app", "output": retained_output}))?, + annotations: codex_protocol::turn_input::ResponseItemAnnotations { retain: true }, + }, + ))).await?; + } else { + test.codex + .start_or_steer_turn(TurnInputRequest::user_input(vec![text("newer")])) + .await?; + } + let started = wait_for_event(&test.codex, |event| { + matches!(event, EventMsg::ItemStarted(event) + if matches!(event.item, TurnItem::ContextCompaction(_))) + }) + .await; + if has_background { + assert_eq!(streaming.requests().await.len(), if manual { 2 } else { 3 }); + } + if outcome == PendingCompactionOutcome::Interrupted { + test.codex.submit(Op::Interrupt).await?; + wait_for_event(&test.codex, |event| { + matches!(event, EventMsg::TurnAborted(_)) + }) + .await; + release_background.send(()).expect("release unused result"); + completions.remove(1).await?; + test.codex.shutdown_and_wait().await?; + assert_eq!(streaming.requests().await.len(), if manual { 2 } else { 3 }); + return Ok(()); + } + if outcome == PendingCompactionOutcome::StaleSuccess { + let auth = test.thread_manager.auth_manager(); + let mut tokens = auth.auth_cached().expect("test auth").get_token_data()?; + tokens.id_token.raw_jwt = "e30.e30.signature".to_string(); + tokens.account_id = Some("second-account".to_string()); + tokens.access_token = "second-account-token".to_string(); + std::fs::write( + test.home.path().join("auth.json"), + serde_json::to_vec( + &json!({"auth_mode":"chatgpt", "tokens":tokens, "last_refresh":chrono::Utc::now()}), + )?, + )?; + auth.reload().await; + } + if has_background { + release_background.send(()).expect("release pending result"); + } + let EventMsg::ItemStarted(started) = started else { + unreachable!(); + }; + let mut starts = vec![started.item.id()]; + let mut completed = Vec::new(); + wait_for_event(&test.codex, |event| { + if let EventMsg::ItemStarted(event) = event + && matches!(event.item, TurnItem::ContextCompaction(_)) + { + starts.push(event.item.id()); + } + if let EventMsg::ItemCompleted(event) = event + && matches!(event.item, TurnItem::ContextCompaction(_)) + { + completed.push(event.item.id()); + } + matches!(event, EventMsg::TurnComplete(_)) + }) + .await; + assert_eq!(completed, starts); + assert_eq!(starts.len(), if over_budget { 2 } else { 1 }); + assert_eq!(starts.iter().collect::>().len(), starts.len()); + tokio::time::timeout( + timeout, + test.codex.wait_for_background_compaction_for_test(), + ) + .await?; + if manual { + test.submit_text_turn("after manual compaction").await?; + } + + let history = test.codex.load_history(/*include_archived*/ false).await?; + let usage = |id| { + history + .items + .iter() + .find_map(|item| match item { + RolloutItem::TokenUsageRecord(record) if record.response_id == id => Some(record), + _ => None, + }) + .expect("persisted usage") + }; + assert!(history.items.iter().all(|item| !matches!(item, + RolloutItem::TokenUsageRecord(record) if record.response_id == "background" + ))); + let continuation = usage("continuation"); + assert_eq!( + ( + continuation.turn_token_usage.total_tokens, + continuation.thread_token_usage.total_tokens, + ), + if over_budget { + (12_010, 14_010) + } else if manual { + (3_000, seed_tokens + if succeeds { 3_000 } else { 6_000 }) + } else if succeeds { + (94_000, 164_000) + } else { + (97_000, 167_000) + }, + ); + + let requests = streaming + .requests() + .await + .iter() + .map(|body| serde_json::from_slice::(body)) + .collect::>>()?; + assert_eq!( + requests.len(), + (if manual { 2 } else { 3 }) + usize::from(has_background) + usize::from(!succeeds) + ); + if over_budget { + for request in &requests[3..] { + assert!( + request["input"] + .as_array() + .expect("compaction or continuation input") + .iter() + .any(|item| item["output"] == retained_output) + ); + } + } + if manual && !succeeds { + let foreground = &requests[requests.len() - 2]; + let metadata: serde_json::Value = serde_json::from_str( + foreground["client_metadata"]["x-codex-turn-metadata"] + .as_str() + .expect("manual foreground metadata"), + )?; + assert_eq!(metadata["compaction"]["trigger"], "manual"); + assert_eq!(metadata["compaction"]["reason"], "user_requested"); + assert_eq!(metadata["compaction"]["phase"], "standalone_turn"); + } + let summaries: Vec<_> = requests.last().expect("continuation")["input"] + .as_array() + .expect("foreground input") + .iter() + .filter(|item| item["type"] == "compaction") + .map(|item| &item["encrypted_content"]) + .collect(); + assert_eq!(summaries, [&json!(if succeeds { "ASYNC" } else { "SYNC" })]); + Ok(()) +} diff --git a/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_async_compaction_with_live_suffix.snap b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_async_compaction_with_live_suffix.snap new file mode 100644 index 0000000000..fb8b1f915c --- /dev/null +++ b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_async_compaction_with_live_suffix.snap @@ -0,0 +1,117 @@ +--- +source: core/tests/suite/scenarios.rs +expression: "context_snapshot::format_context_snapshot(\"Astra compacts a completed launch-notes turn in the background. The user switches to Plan mode while it runs. Adoption restores Default mode at the cutoff, then preserves the Plan update, newer user message, and assistant/tool exchange in their original order.\",\n&entries, &ContextSnapshotOptions::default().rewrite_known_segments(),)" +--- +Scenario: Astra compacts a completed launch-notes turn in the background. The user switches to Plan mode while it runs. Adoption restores Default mode at the cutoff, then preserves the Plan update, newer user message, and assistant/tool exchange in their original order. + +## Window 1 +-- request 1 (request) -- +00:additional_tools/developer (3; hash=bf2e30605ff5dc17): + - namespace/functions; hash=fada4a476a3754dd + - custom/exec + - function/wait + - function/request_user_input + - function/request_user_input_async + - namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317 + - function/sleep + - namespace/collaboration: Tools for spawning and managing sub-agents.; hash=2c8d6295978dbe63 + - function/followup_task + - function/interrupt_agent + - function/list_agents + - function/send_message + - function/spawn_agent + - function/wait_agent +01:message/developer: + +02:message/developer[2]: + [01] + [02] +03:message/developer: + +04:message/developer: + +05:message/user: + +06:message/user: + Draft the launch notes. +-- request 2 (request) -- +07:message/assistant: + I drafted the launch notes. +08:compaction_trigger + +## Window 2 (after request 2: input diverged at item 08) +-- request 3 (request) -- +00:additional_tools/developer (3; hash=bf2e30605ff5dc17): + - namespace/functions; hash=fada4a476a3754dd + - custom/exec + - function/wait + - function/request_user_input + - function/request_user_input_async + - namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317 + - function/sleep + - namespace/collaboration: Tools for spawning and managing sub-agents.; hash=2c8d6295978dbe63 + - function/followup_task + - function/interrupt_agent + - function/list_agents + - function/send_message + - function/spawn_agent + - function/wait_agent +01:message/developer: + +02:message/developer[2]: + [01] + [02] +03:message/developer: + +04:message/developer: + +05:message/user: + +06:message/user: + Draft the launch notes. +07:message/assistant: + I drafted the launch notes. +08:message/developer: + +09:message/user: + Check who can finish the notes. + +## Window 3 (after request 3: input diverged at item 02) +-- request 4 (request) -- +00:additional_tools/developer (3; hash=bf2e30605ff5dc17): + - namespace/functions; hash=fada4a476a3754dd + - custom/exec + - function/wait + - function/request_user_input + - function/request_user_input_async + - namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317 + - function/sleep + - namespace/collaboration: Tools for spawning and managing sub-agents.; hash=2c8d6295978dbe63 + - function/followup_task + - function/interrupt_agent + - function/list_agents + - function/send_message + - function/spawn_agent + - function/wait_agent +01:message/developer: + +02:message/user: + Draft the launch notes. +03:compaction:encrypted=true; chars=23; hash=159cfcb231cc70f0 +04:message/developer[2]: + [01] + [02] +05:message/developer: + +06:message/developer: + +07:message/user: + +08:message/developer: + +09:message/user: + Check who can finish the notes. +10:message/assistant: + I will check who is available. +11:function_call/collaboration.list_agents:{} +12:function_call_output:{"agents":[{"agent_name":"/root","agent_status":"running"}]} From 923f276f579c64251825ba767ff5bc36a28e36a0 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Tue, 13 Oct 2026 23:49:31 +0000 Subject: [PATCH 020/155] Keep the Agent command center visible during archive and delete (#53804) ## Why Archive and delete progress replaced the task list, hiding the selected task and surrounding context while the request was pending. ## What changed Render progress as a centered dialog over the Agent command center. Preserve the selected task and shared scroll/filter state, and re-render the backdrop on terminal resize. ## Testing Update narrow-terminal snapshots for both archive and delete to cover the progress overlay, task list, and selected row. Adapt the existing modal input-isolation test to supply a backdrop. GitOrigin-RevId: e155478aeaddef189fbc53b27b8ff05d54bc3711 --- codex-rs/tui/src/app/agents_overview.rs | 2 +- .../agents_overview_action_progress_tests.rs | 34 ++++++++++++++++--- .../tui/src/app/agents_overview_actions.rs | 28 ++++++++++++++- codex-rs/tui/src/app/agents_overview_tests.rs | 2 +- ...ons__progress_tests__archive_progress.snap | 31 ++++++++++++++--- ...ions__progress_tests__delete_progress.snap | 31 ++++++++++++++--- codex-rs/tui/src/bottom_pane/view_stack.rs | 2 +- 7 files changed, 111 insertions(+), 19 deletions(-) diff --git a/codex-rs/tui/src/app/agents_overview.rs b/codex-rs/tui/src/app/agents_overview.rs index ed8b8f0081..00f0633861 100644 --- a/codex-rs/tui/src/app/agents_overview.rs +++ b/codex-rs/tui/src/app/agents_overview.rs @@ -1221,7 +1221,7 @@ impl App { #[cfg(test)] #[path = "agents_overview_tests.rs"] -mod tests; +pub(super) mod tests; fn agents_overview_group( thread: &Thread, diff --git a/codex-rs/tui/src/app/agents_overview_action_progress_tests.rs b/codex-rs/tui/src/app/agents_overview_action_progress_tests.rs index 49ac829858..546b77fdab 100644 --- a/codex-rs/tui/src/app/agents_overview_action_progress_tests.rs +++ b/codex-rs/tui/src/app/agents_overview_action_progress_tests.rs @@ -1,6 +1,9 @@ //! Progress rendering and input isolation while lifecycle requests are pending. use super::*; +use crate::app::agents_overview::tests::overview_thread; +use crate::chatwidget::tests::helpers::normalize_agent_center_snapshot; +use codex_app_server_protocol::ThreadStatus; use futures::stream; use pretty_assertions::assert_eq; use ratatui::Terminal; @@ -37,6 +40,7 @@ async fn modal_consumes_input_and_finishes_after_input_closes() -> color_eyre::R run_lifecycle_modal( &mut tui, AgentsOverviewAction::Archive, + &Paragraph::new("Agent command center"), async { wait_for_input.await.expect("all modal input was consumed"); tokio::task::yield_now().await; @@ -50,18 +54,38 @@ async fn modal_consumes_input_and_finishes_after_input_closes() -> color_eyre::R Ok(()) } -#[test] -fn lifecycle_progress_wraps_at_narrow_widths() { +#[tokio::test] +async fn lifecycle_progress_wraps_at_narrow_widths() { + let (app, _rx, _op_rx) = crate::app::tests::make_test_app_with_channels().await; + let threads = ["First task", "Selected task", "Last task"] + .into_iter() + .enumerate() + .map(|(index, name)| { + overview_thread( + ThreadId::from_u128(index as u128 + 1), + /*parent_thread_id*/ None, + name, + ThreadStatus::Idle, + ) + }) + .collect(); + let backdrop = app.agents_overview_view(threads, Some(ThreadId::from_u128(/*value*/ 2))); for (action, name) in [ (AgentsOverviewAction::Archive, "archive_progress"), (AgentsOverviewAction::Delete, "delete_progress"), ] { let progress = LifecycleProgress(action); - let mut terminal = - Terminal::new(TestBackend::new(36, progress.desired_height(/*width*/ 36))).unwrap(); + let progress = DialogOverlay { + backdrop: RenderableItem::Borrowed(&backdrop), + dialog: CenteredView(&progress), + }; + let mut terminal = Terminal::new(TestBackend::new(36, 24)).unwrap(); terminal .draw(|frame| progress.render(frame.area(), frame.buffer_mut())) .unwrap(); - insta::assert_snapshot!(name, terminal.backend()); + insta::assert_snapshot!( + name, + normalize_agent_center_snapshot(terminal.backend().to_string()) + ); } } diff --git a/codex-rs/tui/src/app/agents_overview_actions.rs b/codex-rs/tui/src/app/agents_overview_actions.rs index 9a03223034..9afbe1e269 100644 --- a/codex-rs/tui/src/app/agents_overview_actions.rs +++ b/codex-rs/tui/src/app/agents_overview_actions.rs @@ -6,10 +6,14 @@ use super::App; use crate::app_event::AgentsOverviewAction; use crate::app_event::AppEvent; use crate::app_server_session::AppServerSession; +use crate::bottom_pane::BottomPaneView; +use crate::bottom_pane::CenteredView; +use crate::bottom_pane::DialogOverlay; use crate::bottom_pane::SelectionItem; use crate::bottom_pane::SelectionViewParams; use crate::chatwidget::ChatWidget; use crate::render::renderable::Renderable; +use crate::render::renderable::RenderableItem; use crate::tui; use crate::wrapping::word_wrap_lines; use codex_app_server_protocol::ClientRequest; @@ -75,14 +79,21 @@ impl Renderable for LifecycleProgress { } } +impl BottomPaneView for LifecycleProgress {} + /// Keep the terminal responsive without dispatching navigation or queued task events. async fn run_lifecycle_modal( tui: &mut tui::Tui, action: AgentsOverviewAction, + backdrop: &dyn Renderable, operation: impl Future, events: impl Stream + Unpin, ) -> color_eyre::Result { let progress = LifecycleProgress(action); + let progress = DialogOverlay { + backdrop: RenderableItem::Borrowed(backdrop), + dialog: CenteredView(&progress), + }; tui.draw(u16::MAX, |frame| { progress.render(frame.area(), frame.buffer_mut()); })?; @@ -265,6 +276,20 @@ impl App { let mut removes_primary = self.primary_thread_id == Some(thread_id); let mut attempted = false; let primary_thread_id = self.primary_thread_id; + // Retain the displayed selection and shared scroll/filter state while the RPC + // borrows the live widget to stop voice. Re-render on resize rather than freezing pixels. + let selected_thread_id = self + .chat_widget + .selected_index_for_present_view(super::agents_overview::AGENTS_OVERVIEW_VIEW_ID) + .and_then(|index| self.agents_overview.visible_thread_ids.get(index).copied()); + let threads = self + .agents_overview + .threads + .values() + .flatten() + .cloned() + .collect(); + let backdrop = self.agents_overview_view(threads, selected_thread_id); let events = tui.event_stream(); let operation = async { let result = async { @@ -310,7 +335,8 @@ impl App { } (result, detach_primary) }; - let (result, detach_primary) = run_lifecycle_modal(tui, action, operation, events).await?; + let (result, detach_primary) = + run_lifecycle_modal(tui, action, &backdrop, operation, events).await?; if attempted { // A read started before the RPC can contain stale task and approval state. if let Some(refresh) = self.agents_overview.refresh_task.take() { diff --git a/codex-rs/tui/src/app/agents_overview_tests.rs b/codex-rs/tui/src/app/agents_overview_tests.rs index 78c018f14d..b28efb8d17 100644 --- a/codex-rs/tui/src/app/agents_overview_tests.rs +++ b/codex-rs/tui/src/app/agents_overview_tests.rs @@ -242,7 +242,7 @@ async fn overview_right_preserves_editors_and_offline_state() { assert!(rx.try_recv().is_err()); } -fn overview_thread( +pub(in crate::app) fn overview_thread( thread_id: ThreadId, parent_thread_id: Option, name: &str, diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__archive_progress.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__archive_progress.snap index d6bd0e16e7..ba3b35a524 100644 --- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__archive_progress.snap +++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__archive_progress.snap @@ -1,8 +1,29 @@ --- source: tui/src/app/agents_overview_action_progress_tests.rs -assertion_line: 62 -expression: terminal.backend() +assertion_line: 86 +expression: normalize_agent_center_snapshot(terminal.backend().to_string()) --- -"Archiving task… " -"Please wait. Task switching is " -"unavailable until this finishes. " +" Agent command center Group: Pr… " +" All 3 Needs you 0 › " +" ──────────────────────────────── " +" Tasks " +" /tmp/project 3 " +" ○ First task " +" › ○ Selected task " +" ○ Last task " +" " +" " +" Archiving task… " +" Please wait. Task switching is " +" unavailable until this finishes. " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" ? help esc back ↑/↓ move ent… " diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__delete_progress.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__delete_progress.snap index 2a2f6f66c3..3ed43f3b66 100644 --- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__delete_progress.snap +++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__delete_progress.snap @@ -1,8 +1,29 @@ --- source: tui/src/app/agents_overview_action_progress_tests.rs -assertion_line: 62 -expression: terminal.backend() +assertion_line: 86 +expression: normalize_agent_center_snapshot(terminal.backend().to_string()) --- -"Deleting task… " -"Please wait. Task switching is " -"unavailable until this finishes. " +" Agent command center Group: Pr… " +" All 3 Needs you 0 › " +" ──────────────────────────────── " +" Tasks " +" /tmp/project 3 " +" ○ First task " +" › ○ Selected task " +" ○ Last task " +" " +" " +" Deleting task… " +" Please wait. Task switching is " +" unavailable until this finishes. " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" ? help esc back ↑/↓ move ent… " diff --git a/codex-rs/tui/src/bottom_pane/view_stack.rs b/codex-rs/tui/src/bottom_pane/view_stack.rs index fb1d91a126..e300dfc83f 100644 --- a/codex-rs/tui/src/bottom_pane/view_stack.rs +++ b/codex-rs/tui/src/bottom_pane/view_stack.rs @@ -70,7 +70,7 @@ impl Renderable for ViewStack<'_> { } /// A dialog placed within the supplied viewport, without taking over its backdrop. -pub(crate) struct CenteredView<'a>(pub(super) &'a dyn BottomPaneView); +pub(crate) struct CenteredView<'a>(pub(crate) &'a dyn BottomPaneView); impl Renderable for CenteredView<'_> { fn render(&self, area: Rect, buf: &mut Buffer) { From ca2b076fffbc24ad5fa57258ece8a8277b326138 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Tue, 13 Oct 2026 23:50:11 +0000 Subject: [PATCH 021/155] Add safe diagnostics to workspace routing configuration errors (#53805) ## Why Workspace routing reported generic requirements load and reload failures, hiding the cause. Raw configuration errors can contain secrets, so exposing their messages directly is unsafe. ## What changed Include a safe reason in configuration load and reload errors: file locations or non-file line and column numbers, cloud error categories and HTTP status codes, known network policy denials, or OS error details. Exclude raw parser messages, configuration contents, and backend-supplied policy names and IDs. ## Testing Add regression coverage for configuration locations, cloud failures, and network policy denials. Verify that malformed local and cloud configuration reports useful errors without exposing secret values or policy identifiers, and still prevents workspace routing from falling back to startup configuration. GitOrigin-RevId: a71484c700d32662ced9e19041dbedda5d1da8a5 --- .../account_processor/workspace_routing.rs | 99 +++++++++++++++++-- .../workspace_routing_tests.rs | 47 +++++++-- .../tests/suite/v2/workspace_routing.rs | 33 +++++-- 3 files changed, 153 insertions(+), 26 deletions(-) diff --git a/codex-rs/app-server/src/request_processors/account_processor/workspace_routing.rs b/codex-rs/app-server/src/request_processors/account_processor/workspace_routing.rs index 90c8781b5b..e5028e3370 100644 --- a/codex-rs/app-server/src/request_processors/account_processor/workspace_routing.rs +++ b/codex-rs/app-server/src/request_processors/account_processor/workspace_routing.rs @@ -6,6 +6,8 @@ use super::*; use codex_app_server_protocol::AccountRoutingOverride; use codex_backend_client::AccountEntry; +use codex_config::ConfigLoadError; +use codex_http_client::NetworkPolicyDenied; use codex_login::WorkspaceRouting; use codex_login::WorkspaceRoutingRequest; use codex_login::WorkspaceRoutingResolver; @@ -54,11 +56,12 @@ pub(super) enum AccountReadError { Routing(#[from] WorkspaceRoutingError), } -/// Routing failure categories carry no account, URL, or backend data. +/// Routing failures carry no account, URL, or backend data. Config failures retain +/// only a location or structured error category, never the raw config error. #[derive(Debug, PartialEq, Eq, thiserror::Error)] pub(super) enum WorkspaceRoutingError { - #[error("failed to load workspace requirements")] - RequirementsLoad, + #[error("failed to load workspace requirements: {0}")] + RequirementsLoad(String), #[error("workspace routing requires a ChatGPT account id")] MissingAccountId, #[error("workspace routing discovery cancelled")] @@ -73,8 +76,8 @@ pub(super) enum WorkspaceRoutingError { MissingWorkspace, #[error("duplicate workspace in routing discovery")] DuplicateWorkspace, - #[error("failed to reload workspace requirements")] - RequirementsReload, + #[error("failed to reload workspace requirements: {0}")] + RequirementsReload(String), #[error("configuration changed during workspace routing discovery; retry account/read")] ConfigurationChanged, #[error("invalid model provider URL")] @@ -103,6 +106,77 @@ pub(super) enum WorkspaceRoutingError { InvalidBackendOrigin, } +fn workspace_config_load_reason(error: &io::Error) -> String { + // Parser messages and cloud bundle errors can quote secrets, even without + // their source snippets. Retain only structured diagnostics before these + // errors reach JSON-RPC clients, login notifications, or tracing. + let mut current = error + .get_ref() + .map(|source| source as &(dyn std::error::Error + 'static)); + while let Some(source) = current { + if let Some(config) = source.downcast_ref::() { + let config = config.config_error(); + let start = config.range.start; + // Non-file diagnostics store a display name, which can contain + // backend-supplied policy names and IDs, in this field. + if !config.path.is_absolute() { + return format!( + "invalid non-file configuration at line {}, column {}", + start.line, start.column + ); + } + return format!( + "invalid configuration at {}:{}:{}", + config.path.display(), + start.line, + start.column + ); + } + if let Some(cloud) = source.downcast_ref::() { + let reason = match cloud.code() { + CloudConfigBundleLoadErrorCode::Timeout => "request timed out", + CloudConfigBundleLoadErrorCode::Auth + | CloudConfigBundleLoadErrorCode::RequestFailed => { + // Cloud loading currently erases the typed denial. Match + // only known safe policy messages, never forward raw text. + let message = cloud.to_string(); + if let Some(policy) = [ + NetworkPolicyDenied::Unavailable, + NetworkPolicyDenied::Destination, + NetworkPolicyDenied::Revoked, + NetworkPolicyDenied::UnsupportedTransport, + ] + .into_iter() + .find(|policy| policy.to_string() == message) + { + return policy.to_string(); + } + if cloud.code() == CloudConfigBundleLoadErrorCode::Auth { + "authentication failed" + } else { + "request failed" + } + } + CloudConfigBundleLoadErrorCode::InvalidBundle => "invalid bundle", + CloudConfigBundleLoadErrorCode::Internal => "internal error", + }; + return match cloud.status_code() { + Some(status) => format!("cloud config: {reason} (HTTP {status})"), + None => format!("cloud config: {reason}"), + }; + } + if let Some(policy) = source.downcast_ref::() { + return policy.to_string(); + } + current = source.source(); + } + // Use the OS error or kind, never an untyped error's potentially secret message. + match error.raw_os_error() { + Some(code) => io::Error::from_raw_os_error(code).to_string(), + None => error.kind().to_string(), + } +} + impl WorkspaceRoutingResolver for AccountRequestProcessor { fn resolve( &self, @@ -237,7 +311,12 @@ impl AccountRequestProcessor { { self.config.as_ref().clone() } - Err(_) => return Err(WorkspaceRoutingError::RequirementsLoad.into()), + Err(error) => { + return Err(WorkspaceRoutingError::RequirementsLoad( + workspace_config_load_reason(&error), + ) + .into()); + } }; let auth = self.auth_manager.auth_cached(); let provider = create_model_provider( @@ -353,9 +432,11 @@ impl AccountRequestProcessor { if accounts.next().is_some() { return Err(WorkspaceRoutingError::DuplicateWorkspace.into()); } - let latest_config = load_config() - .await - .map_err(|_| WorkspaceRoutingError::RequirementsReload)?; + let latest_config = load_config().await.map_err(|error| { + WorkspaceRoutingError::RequirementsReload(workspace_config_load_reason( + &error, + )) + })?; if latest_config.chatgpt_base_url != config.chatgpt_base_url || latest_config.model_provider != config.model_provider || latest_config diff --git a/codex-rs/app-server/src/request_processors/account_processor/workspace_routing_tests.rs b/codex-rs/app-server/src/request_processors/account_processor/workspace_routing_tests.rs index cc06d5086e..7ae5fff4da 100644 --- a/codex-rs/app-server/src/request_processors/account_processor/workspace_routing_tests.rs +++ b/codex-rs/app-server/src/request_processors/account_processor/workspace_routing_tests.rs @@ -5,6 +5,27 @@ use pretty_assertions::assert_eq; use serde_json::Value; use test_case::test_case; +#[test_case(CloudConfigBundleLoadErrorCode::RequestFailed, "cloud config: request failed"; "request")] +#[test_case(CloudConfigBundleLoadErrorCode::Auth, "cloud config: authentication failed"; "refresh")] +fn cloud_failures_preserve_policy_denials_but_redact_other_messages( + code: CloudConfigBundleLoadErrorCode, + redacted: &str, +) { + let denied = NetworkPolicyDenied::Destination.to_string(); + for (message, expected) in [ + (denied.clone(), denied), + ( + "destination denied by application network policy: sk-test-private-value".into(), + redacted.into(), + ), + ] { + let error = io::Error::other(CloudConfigBundleLoadError::new( + code, /*status_code*/ None, message, + )); + assert_eq!(workspace_config_load_reason(&error), expected); + } +} + #[test_case(None; "signed_out")] #[test_case(Some("dummy"); "api_key")] #[tokio::test] @@ -119,15 +140,23 @@ async fn background_routing_skips_config_until_chatgpt_sign_in( ); assert!(loads.load(Ordering::SeqCst) > initial_loads); - std::fs::write(home.path().join("config.toml"), "invalid = [")?; - assert!(matches!( - processor - .read_account_for_background_workspace_routing() - .await, - Err(AccountReadError::Routing( - WorkspaceRoutingError::RequirementsLoad - )) - )); + let config_path = home.path().join("config.toml"); + std::fs::write(&config_path, "invalid = [ 'sk-test-private-value',")?; + let Err(error) = processor + .read_account_for_background_workspace_routing() + .await + else { + panic!("invalid config must prevent workspace routing"); + }; + let message = error.to_string(); + assert!( + message.starts_with(&format!( + "failed to load workspace requirements: invalid configuration at {}:1:", + config_path.display(), + )), + "{message}" + ); + assert!(!message.contains("sk-test-private-value"), "{message}"); Ok(()) } diff --git a/codex-rs/app-server/tests/suite/v2/workspace_routing.rs b/codex-rs/app-server/tests/suite/v2/workspace_routing.rs index 67f2041f49..a36df8e062 100644 --- a/codex-rs/app-server/tests/suite/v2/workspace_routing.rs +++ b/codex-rs/app-server/tests/suite/v2/workspace_routing.rs @@ -395,19 +395,32 @@ async fn api_only_login_does_not_discover_chatgpt_routing() -> Result<()> { Ok(()) } +#[test_case( + json!({"requirements_toml": {"enterprise_managed": [{ + "id": "invalid", "name": "Invalid requirements", "contents": "application = 'sk-test-private-value'", + }]}}), + "failed to load workspace requirements: cloud config: invalid bundle"; + "invalid_requirements" +)] +#[test_case( + json!({"config_toml": {"enterprise_managed": [{ + "id": "sk-test-private-id", "name": "sk-test-private-name", "contents": "model = 123", + }]}}), + "failed to load workspace requirements: invalid non-file configuration at line 1, column 9"; + "invalid_non_file_config" +)] #[tokio::test] -async fn failed_workspace_requirements_do_not_fall_back_to_startup_config() -> Result<()> { +async fn failed_workspace_requirements_do_not_fall_back_to_startup_config( + bundle: Value, + expected_message: &str, +) -> Result<()> { let backend = MockServer::start().await; let home = TempDir::new()?; config(&home, &backend).await?; let mut server = start(&home).await?; backend.reset().await; Mock::given(path("/backend-api/wham/config/bundle")) - .respond_with(ResponseTemplate::new(200).set_body_json( - json!({"requirements_toml": {"enterprise_managed": [{ - "id": "invalid", "name": "Invalid requirements", "contents": "application = true", - }]}}), - )) + .respond_with(ResponseTemplate::new(200).set_body_json(bundle)) .mount(&backend) .await; Mock::given(path("/backend-api/wham/accounts/check")) @@ -421,7 +434,10 @@ async fn failed_workspace_requirements_do_not_fall_back_to_startup_config() -> R server.read_stream_until_notification_message("account/login/completed"), ) .await??; - assert_eq!(notification.params.unwrap()["success"], false); + assert_eq!( + notification.params.expect("account/login/completed params")["success"], + false + ); let request = server .send_get_account_request(GetAccountParams { refresh_token: false, @@ -432,7 +448,8 @@ async fn failed_workspace_requirements_do_not_fall_back_to_startup_config() -> R server.read_stream_until_error_message(RequestId::Integer(request)), ) .await??; - assert_eq!(error.error.message, "failed to load workspace requirements"); + assert_eq!(error.error.code, -32603); + assert_eq!(error.error.message, expected_message); backend.verify().await; Ok(()) } From eb1d7065f8b1b2fb3d197bc66448deb432ab0a12 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 14 Oct 2026 00:42:30 +0000 Subject: [PATCH 022/155] Support daemon installation from Windows WinGet packages (#53811) ## Why WinGet archives place the CLI and code mode host at the package root, while daemon installation expects them under `bin/`. This layout mismatch prevents installing the daemon from a WinGet CLI package. ## What changed Validate WinGet packages in their original layout before converting the staged copy to the daemon layout. Move the executables under `bin/`, update the package entrypoint and optional voice manifest checksum key, and hash the final tree for release reuse. Leave the source package unchanged. ## Testing Add a Windows integration test covering daemon startup, repeated `update --from-cli --yes` calls, rewritten manifests, and rejection of an incomplete package without changing the selected release or source manifests. GitOrigin-RevId: e78c461a557a4d005fe1f5fe37fb5ba05bb38608 --- .../app-server-daemon/src/prepare_install.rs | 70 +++++++--- .../src/prepare_install_tests.rs | 2 +- .../cli/tests/app_server_daemon_windows.rs | 126 ++++++++++++++++++ 3 files changed, 181 insertions(+), 17 deletions(-) create mode 100644 codex-rs/cli/tests/app_server_daemon_windows.rs diff --git a/codex-rs/app-server-daemon/src/prepare_install.rs b/codex-rs/app-server-daemon/src/prepare_install.rs index 3b09a604db..a313e940f7 100644 --- a/codex-rs/app-server-daemon/src/prepare_install.rs +++ b/codex-rs/app-server-daemon/src/prepare_install.rs @@ -1,5 +1,6 @@ //! Installs complete CLI packages after confirmation. Initial starts preserve //! existing selections; explicit replacements migrate to dedicated packages and stay pinned. +//! WinGet sources are verified in their original layout before staging a canonical daemon package. use std::path::Path; use std::path::PathBuf; @@ -154,17 +155,21 @@ async fn prepare_from_package( let manifest: CodexPackageManifest = serde_json::from_slice(&manifest_bytes)?; let version = manifest.version.to_string(); let target = platform_target()?; - let metadata: serde_json::Value = serde_json::from_slice(&manifest_bytes)?; + let mut metadata: serde_json::Value = serde_json::from_slice(&manifest_bytes)?; let entrypoint = if cfg!(windows) { "bin/codex.exe" } else { "bin/codex" }; + let source_entrypoint = metadata["entrypoint"].as_str().unwrap_or_default(); + let winget = cfg!(windows) + && metadata["layoutVersion"] == 1 + && source_entrypoint == format!("codex-{target}.exe"); anyhow::ensure!( - metadata["target"] == target && metadata["entrypoint"] == entrypoint, + metadata["target"] == target && (source_entrypoint == entrypoint || winget), "the CLI package does not match this platform or executable" ); - validate_package(source)?; + validate_package(source, source_entrypoint)?; // A local build may replace the executable while confirmation is pending. let running_identity = managed_install::executable_identity(running_exe).await?; if mode == InstallMode::Replace { @@ -227,11 +232,10 @@ async fn prepare_from_package( .prefix(".staging.") .tempdir_in(&releases)?; let digest = package_tree(source, Some(stage.path()))?; - validate_package(stage.path())?; let staged_exe = if cfg!(target_os = "macos") && stage.path().join("CodexCLI.app").is_dir() { stage.path().join("CodexCLI.app/Contents/MacOS/codex") } else { - stage.path().join(entrypoint) + stage.path().join(source_entrypoint) }; anyhow::ensure!( package_tree(source, /*destination*/ None)? == digest @@ -241,6 +245,42 @@ async fn prepare_from_package( .same_contents(&running_identity), "the CLI package changed while preparing the daemon or differs from the running executable" ); + // Reverse the WinGet archive's root filenames only after verifying the copied + // source. Hash the final tree for reuse, since it now differs from the source. + let digest = if winget { + std::fs::create_dir_all(stage.path().join("bin"))?; + #[cfg(windows)] + { + windows::publish_release(&staged_exe, &stage.path().join(entrypoint)).await?; + windows::publish_release( + &stage.path().join("codex-code-mode-host.exe"), + &stage.path().join("bin/codex-code-mode-host.exe"), + ) + .await?; + } + let voice_path = stage.path().join("codex-resources/voice/manifest.json"); + if voice_path.try_exists()? { + let mut voice: serde_json::Value = + serde_json::from_slice(&std::fs::read(&voice_path)?)?; + let checksums = voice["sha256"] + .as_object_mut() + .context("invalid WinGet voice manifest checksums")?; + let checksum = checksums + .remove(source_entrypoint) + .context("WinGet voice manifest is missing the CLI checksum")?; + checksums.insert(entrypoint.to_string(), checksum); + std::fs::write(voice_path, serde_json::to_vec_pretty(&voice)?)?; + } + metadata["entrypoint"] = entrypoint.into(); + std::fs::write( + stage.path().join("codex-package.json"), + serde_json::to_vec_pretty(&metadata)?, + )?; + package_tree(stage.path(), /*destination*/ None)? + } else { + digest + }; + validate_package(stage.path(), entrypoint)?; let binary_version = managed_install::managed_codex_version(&stage.path().join(entrypoint)).await?; anyhow::ensure!( @@ -429,19 +469,17 @@ fn stable_version(value: &str) -> Option { .then_some(version) } -fn validate_package(root: &Path) -> Result<()> { +fn validate_package(root: &Path, entrypoint: &str) -> Result<()> { + let code_mode_host = Path::new(entrypoint).with_file_name(if cfg!(windows) { + "codex-code-mode-host.exe" + } else { + "codex-code-mode-host" + }); + let code_mode_host = code_mode_host.to_string_lossy(); let mut names = vec![ "codex-package.json", - if cfg!(windows) { - "bin/codex.exe" - } else { - "bin/codex" - }, - if cfg!(windows) { - "bin/codex-code-mode-host.exe" - } else { - "bin/codex-code-mode-host" - }, + entrypoint, + code_mode_host.as_ref(), if cfg!(windows) { "codex-path/rg.exe" } else { diff --git a/codex-rs/app-server-daemon/src/prepare_install_tests.rs b/codex-rs/app-server-daemon/src/prepare_install_tests.rs index eaa89527c7..8901063ab5 100644 --- a/codex-rs/app-server-daemon/src/prepare_install_tests.rs +++ b/codex-rs/app-server-daemon/src/prepare_install_tests.rs @@ -78,7 +78,7 @@ async fn seeds_full_package() { std::fs::read_to_string(standalone.join("auto-update-version")).expect("marker"), selected.file_name().expect("name").to_string_lossy() ); - assert!(validate_package(&selected).is_ok()); + assert!(validate_package(&selected, "bin/codex").is_ok()); } #[tokio::test] diff --git a/codex-rs/cli/tests/app_server_daemon_windows.rs b/codex-rs/cli/tests/app_server_daemon_windows.rs new file mode 100644 index 0000000000..5f955cd11d --- /dev/null +++ b/codex-rs/cli/tests/app_server_daemon_windows.rs @@ -0,0 +1,126 @@ +//! Exercises daemon installation from the Windows WinGet archive layout. +#![cfg(windows)] + +use anyhow::Result; +use anyhow::ensure; +use codex_utils_cargo_bin::copy_executable; +use pretty_assertions::assert_eq; +use serde_json::Value; +use sha2::Digest; +use sha2::Sha256; +use std::process::Command; + +#[test] +fn winget_package_starts_and_reselects_daemon() -> Result<()> { + if codex_app_server_daemon::is_elevated()? { + eprintln!("requires a non-elevated Windows runner"); + return Ok(()); + } + let temp = tempfile::tempdir()?; + let home = temp.path().join("home"); + let package = temp.path().join("WinGet/Packages/OpenAI.Codex"); + let target = format!("{}-pc-windows-msvc", std::env::consts::ARCH); + let entrypoint = format!("codex-{target}.exe"); + let codex = package.join(&entrypoint); + for directory in ["bin", "codex-path", "codex-resources/voice"] { + std::fs::create_dir_all(package.join(directory))?; + } + copy_executable(&codex_utils_cargo_bin::cargo_bin("codex")?, &codex)?; + for helper in [ + "codex-code-mode-host.exe", + "codex-path/rg.exe", + "codex-resources/codex-command-runner.exe", + "codex-resources/codex-windows-sandbox-setup.exe", + ] { + std::fs::write(package.join(helper), b"runtime fixture")?; + } + let mut metadata = serde_json::json!({ + "layoutVersion": 1, "version": env!("CARGO_PKG_VERSION"), + "target": target, "entrypoint": entrypoint + }); + let manifest_bytes = serde_json::to_vec(&metadata)?; + std::fs::write(package.join("codex-package.json"), &manifest_bytes)?; + let checksum = format!("{:x}", Sha256::digest(std::fs::read(&codex)?)); + let voice_bytes = serde_json::to_vec(&serde_json::json!({ + "sha256": { &entrypoint: checksum, "codex-resources/voice/runtime": "untouched" } + }))?; + std::fs::write( + package.join("codex-resources/voice/manifest.json"), + &voice_bytes, + )?; + + let current = home.join("packages/app-server-daemon/current"); + // Drop before temp so assertion failures also release the managed executable. + struct StopDaemon(Command); + impl Drop for StopDaemon { + fn drop(&mut self) { + let _ = self.0.output(); + } + } + let mut stop = Command::new(&codex); + stop.env("CODEX_HOME", &home) + .args(["app-server", "daemon", "stop"]); + let mut daemon = StopDaemon(stop); + for args in [ + vec!["start"], + vec!["update", "--from-cli", "--yes"], + vec!["update", "--from-cli", "--yes"], + ] { + let output = Command::new(&codex) + .env("CODEX_HOME", &home) + .args(["app-server", "daemon"]) + .args(&args) + .output()?; + ensure!( + output.status.success(), + "daemon {args:?} failed: {}", + String::from_utf8_lossy(&output.stderr) + ); + } + let selected_metadata: Value = + serde_json::from_slice(&std::fs::read(current.join("codex-package.json"))?)?; + metadata["entrypoint"] = "bin/codex.exe".into(); + assert_eq!(selected_metadata, metadata); + let selected_voice: Value = serde_json::from_slice(&std::fs::read( + current.join("codex-resources/voice/manifest.json"), + )?)?; + assert_eq!( + selected_voice, + serde_json::json!({ + "sha256": { + "bin/codex.exe": checksum, + "codex-resources/voice/runtime": "untouched" + } + }) + ); + assert_eq!( + std::fs::read(current.join("bin/codex-code-mode-host.exe"))?, + b"runtime fixture" + ); + let selected = current.canonicalize()?; + std::fs::remove_file(package.join("codex-code-mode-host.exe"))?; + let invalid = Command::new(&codex) + .env("CODEX_HOME", &home) + .args(["app-server", "daemon", "update", "--from-cli", "--yes"]) + .output()?; + ensure!( + !invalid.status.success(), + "an incomplete WinGet package was accepted" + ); + assert_eq!(current.canonicalize()?, selected); + assert_eq!( + std::fs::read(package.join("codex-package.json"))?, + manifest_bytes + ); + assert_eq!( + std::fs::read(package.join("codex-resources/voice/manifest.json"))?, + voice_bytes + ); + let stopped = daemon.0.output()?; + ensure!( + stopped.status.success(), + "failed to stop daemon: {}", + String::from_utf8_lossy(&stopped.stderr) + ); + Ok(()) +} From c3733756a969aa20e23a2a90e0da16646b4c100c Mon Sep 17 00:00:00 2001 From: Dylan Hurd Date: Wed, 14 Oct 2026 01:01:47 +0000 Subject: [PATCH 023/155] Reject Guardian review threads during interactive CLI resume (#53816) ## What changed Check the selected thread's app-server metadata before resuming it in the TUI. Reject Guardian review threads with a clear error and suggest `codex resume ` when a parent session is available. Preserve existing resume behavior if the metadata read fails. ## Testing Add a regression test for Guardian thread rejection and the parent-session hint. Update daemon startup coverage to select a saved session when testing `resume`. GitOrigin-RevId: 64b43bb24b5e24eec14c8204c6e15232387dade8 --- codex-rs/cli/tests/daemon_startup.rs | 28 ++++++++++++- codex-rs/tui/src/lib.rs | 62 ++++++++++++++++++++++++++++ codex-rs/tui/src/session_resume.rs | 25 ++++++++++- 3 files changed, 113 insertions(+), 2 deletions(-) diff --git a/codex-rs/cli/tests/daemon_startup.rs b/codex-rs/cli/tests/daemon_startup.rs index f507583635..0c6c5a8671 100644 --- a/codex-rs/cli/tests/daemon_startup.rs +++ b/codex-rs/cli/tests/daemon_startup.rs @@ -316,7 +316,33 @@ async fn daemon_startup(command: &str) -> Result<()> { "UseAmazonBedrock" } else { args.extend([command.into(), "--strict-config".into()]); - steps.push_back(("Nosessionsyet", b"\x1b")); + if command == "resume" { + let thread_id = "00000000-0000-0000-0000-000000000001"; + let sessions = home.path().join("sessions/2025/01/05"); + fs::create_dir_all(&sessions)?; + let metadata = serde_json::json!({ + "timestamp": "2025-01-05T12:00:00Z", + "type": "session_meta", + "payload": { + "session_id": thread_id, "id": thread_id, + "timestamp": "2025-01-05T12:00:00Z", "cwd": workspace_path, + "originator": "codex", "cli_version": "0.0.0", + "source": "cli", "model_provider": "openai" + } + }); + let message = serde_json::json!({ + "timestamp": "2025-01-05T12:00:00Z", + "type": "event_msg", + "payload": {"type": "user_message", "message": "Saved resume session", "kind": "plain"} + }); + fs::write( + sessions.join(format!("rollout-2025-01-05T12-00-00-{thread_id}.jsonl")), + format!("{metadata}\n{message}\n"), + )?; + steps.push_back(("Savedresumesession", b"\r")); + } else { + steps.push_back(("Nosessionsyet", b"\x1b")); + } steps.push_back(("GPT-5.6-Terra", b"\x14")); if elevated { "Runningasadministrator:sharedbackgroundserverdisabled." diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs index a3fb5447b0..734c0f7f1b 100644 --- a/codex-rs/tui/src/lib.rs +++ b/codex-rs/tui/src/lib.rs @@ -1824,6 +1824,22 @@ async fn run_ratatui_app( }, }; + if let resume_picker::SessionSelection::Resume(target) = &session_selection { + let validation = startup_draft + .run_until( + &mut tui, + session_resume::validate_resume_target(&mut app_server, target.thread_id), + ) + .await; + if let Err(err) = validation + .map_err(color_eyre::Report::from) + .and_then(|result| result) + { + shutdown_startup_session(Some(app_server), &mut terminal_restore_guard).await; + return Err(err); + } + } + // Remote startup keeps its existing explicit --cd trust check. Resolving other // remote folders requires authoritative project-root information from the server. if !uses_remote_workspace || remote_cwd_override.is_some() { @@ -2731,6 +2747,52 @@ requires_openai_auth = {requires_openai_auth} .await } + #[tokio::test] + async fn startup_resume_rejects_guardian_thread() -> color_eyre::Result<()> { + let temp_dir = TempDir::new()?; + let config = build_config(&temp_dir).await?; + let thread_id = write_session_rollout( + temp_dir.path(), + "2025-01-05T12-00-00", + "2025-01-05T12:00:00Z", + "Guardian review", + &config.model_provider_id, + config.cwd.as_path(), + )?; + let rollout_path = temp_dir + .path() + .join("sessions/2025/01/05") + .join(format!("rollout-2025-01-05T12-00-00-{thread_id}.jsonl")); + let rollout = std::fs::read_to_string(&rollout_path)?; + let (meta, history) = rollout.split_once('\n').expect("rollout has metadata"); + let mut meta: serde_json::Value = serde_json::from_str(meta)?; + meta["payload"]["source"] = serde_json::json!({"subagent": {"other": "guardian"}}); + meta["payload"]["parent_thread_id"] = + serde_json::json!("00000000-0000-0000-0000-000000000001"); + std::fs::write(&rollout_path, format!("{meta}\n{history}"))?; + + let state_db = + init_state_db_for_app_server_target(&config, &AppServerTarget::Embedded).await?; + let mut app_server = start_app_server_for_picker( + &config, + &AppServerTarget::Embedded, + Vec::new(), + LoaderOverrides::without_managed_config_for_tests(), + state_db, + Arc::new(EnvironmentManager::default_for_tests()), + ) + .await?; + let error = session_resume::validate_resume_target(&mut app_server, thread_id) + .await + .expect_err("Guardian resume should be rejected"); + insta::assert_snapshot!(error.to_string(), @" + Cannot resume a Guardian review thread. + Resume its parent session instead: codex resume 00000000-0000-0000-0000-000000000001 + "); + app_server.shutdown().await?; + Ok(()) + } + #[tokio::test] async fn startup_resume_and_fork_use_configured_or_explicit_cwd() -> color_eyre::Result<()> { for (action, configured_mode, has_explicit_cwd, expected_directory) in [ diff --git a/codex-rs/tui/src/session_resume.rs b/codex-rs/tui/src/session_resume.rs index 0c1b839683..6d60a67bfc 100644 --- a/codex-rs/tui/src/session_resume.rs +++ b/codex-rs/tui/src/session_resume.rs @@ -1,7 +1,8 @@ //! Resolve saved-session state needed before resuming or forking a thread. //! //! The app-server API owns thread metadata. This module coordinates the TUI-specific -//! cwd prompt using the cwd reported by the selected thread. +//! cwd prompt using the cwd reported by the selected thread and checks Guardian +//! eligibility for interactive CLI resume. use std::path::Path; use std::path::PathBuf; @@ -42,6 +43,28 @@ pub(crate) fn effective_resume_cwd_mode( } } +pub(crate) async fn validate_resume_target( + app_server: &mut AppServerSession, + thread_id: ThreadId, +) -> color_eyre::Result<()> { + let Ok(thread) = app_server + .thread_read(thread_id, /*include_turns*/ false) + .await + else { + // Preserve existing resume behavior when this metadata check is unavailable. + return Ok(()); + }; + if codex_state::is_guardian_review_source(&thread.source.into()) { + let parent_hint = thread + .parent_thread_id + .map_or_else(String::new, |parent_id| { + format!("\nResume its parent session instead: codex resume {parent_id}") + }); + color_eyre::eyre::bail!("Cannot resume a Guardian review thread.{parent_hint}"); + } + Ok(()) +} + pub(crate) async fn read_session_cwd( app_server: &mut AppServerSession, thread_id: ThreadId, From 0960e379a5555f1b6d7b97d7980039902213c26c Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 14 Oct 2026 01:43:08 +0000 Subject: [PATCH 024/155] Prune unused app-server daemon releases safely (#53827) ## What changed - Record the current and previous dedicated daemon selections in `selection-history`, bound to the selection link's identity. Preserve that history when an install leaves the selection unchanged. - Prune unused releases after package preparation and scheduled update processing, including updates that require no restart. Retain the current and previous selections, packages used by the daemon or updater, and the calling executable's package. - Require lifecycle and installer locks, valid selection history, and verified package boundaries before cleanup. Skip unsafe or unrecognized packages and retire releases before best-effort deletion so partial failures are not retried. - Resolve the updater's actual executable identity after an executable handoff that preserves its PID. ## Testing Extend coverage for stale selection history, retention of the last two selections, packages containing external symlinks, partial deletion and reinstall, cleanup without restarting the daemon, and repeated installs preserving selection history. GitOrigin-RevId: 19a04db1cc356a2219f2afb137b9525e249ab6fb --- codex-rs/app-server-daemon/src/backend/pid.rs | 9 + codex-rs/app-server-daemon/src/lib.rs | 16 ++ .../app-server-daemon/src/managed_install.rs | 4 +- .../app-server-daemon/src/prepare_install.rs | 27 +- .../src/prepare_install_tests.rs | 78 ++++++ .../app-server-daemon/src/release_pruning.rs | 251 ++++++++++++++++++ codex-rs/app-server-daemon/src/update_loop.rs | 2 +- .../src/update_loop_tests.rs | 25 +- scripts/install/install.ps1 | 62 ++++- scripts/install/install.sh | 20 +- scripts/install/test_install_sh.py | 6 + 11 files changed, 479 insertions(+), 21 deletions(-) create mode 100644 codex-rs/app-server-daemon/src/release_pruning.rs diff --git a/codex-rs/app-server-daemon/src/backend/pid.rs b/codex-rs/app-server-daemon/src/backend/pid.rs index fce30642d5..60e793e18d 100644 --- a/codex-rs/app-server-daemon/src/backend/pid.rs +++ b/codex-rs/app-server-daemon/src/backend/pid.rs @@ -93,6 +93,15 @@ impl PidBackend { pub(crate) async fn running_executable_identity(&self) -> Result> { match self.read_pid_file_state().await? { PidFileState::Running(record) if self.record_is_active(&record).await? => { + // Updaters can exec a different release without changing PID. Only the + // updater itself can reliably identify its executable after a handoff. + if matches!(self.command_kind, PidCommandKind::UpdateLoop { .. }) + && record.pid == std::process::id() + { + return crate::managed_install::executable_identity(&std::env::current_exe()?) + .await + .map(Some); + } Ok(record.executable_identity) } _ => Ok(None), diff --git a/codex-rs/app-server-daemon/src/lib.rs b/codex-rs/app-server-daemon/src/lib.rs index 7b19c16567..3b4fc6c3ed 100644 --- a/codex-rs/app-server-daemon/src/lib.rs +++ b/codex-rs/app-server-daemon/src/lib.rs @@ -16,6 +16,7 @@ pub use launch::restart_with_features; pub use launch::start_with_features; mod managed_install; mod prepare_install; +mod release_pruning; pub use prepare_install::InstallRequest; pub use prepare_install::update_from_cli; mod remote_control_client; @@ -521,6 +522,7 @@ impl Daemon { &self, mode: RestartMode, managed_codex_bin: &Path, + package_root: &Path, ) -> Result { let operation_lock = self.open_operation_lock_file().await?; if !try_lock_file(&operation_lock)? { @@ -616,6 +618,20 @@ impl Daemon { { return Ok(RestartIfRunningOutcome::AlreadyCurrent); } + // All exits for busy, not-ready or superseded selections precede cleanup. + // Keep the operation lock, and recheck readiness's selection under both locks. + if package_root.ends_with("app-server-daemon") + && let Ok(_install_lock) = install_lock::acquire_install_lock(package_root).await + && let Ok(current_bin) = self.current_managed_codex_bin() + && managed_install::resolved_managed_codex_bin(¤t_bin) + .await + .ok() + .as_deref() + == Some(managed_codex_bin) + && let Err(error) = release_pruning::prune(self, package_root, &settings).await + { + tracing::debug!(%error, "skipped daemon release pruning"); + } Ok(outcome) } diff --git a/codex-rs/app-server-daemon/src/managed_install.rs b/codex-rs/app-server-daemon/src/managed_install.rs index 067ebcabad..6a60e3c49b 100644 --- a/codex-rs/app-server-daemon/src/managed_install.rs +++ b/codex-rs/app-server-daemon/src/managed_install.rs @@ -186,7 +186,7 @@ pub(crate) struct ExecutableIdentity { digest: [u8; 32], // Distinguish release generations whose executable bytes are identical. #[serde(default, skip_serializing_if = "Option::is_none")] - path_digest: Option<[u8; 32]>, + pub(crate) path_digest: Option<[u8; 32]>, } impl ExecutableIdentity { @@ -222,7 +222,7 @@ pub(crate) fn executable_identity_from_reader( }) } -fn path_digest(path: &Path) -> [u8; 32] { +pub(crate) fn path_digest(path: &Path) -> [u8; 32] { let mut hasher = blake3::Hasher::new(); #[cfg(unix)] { diff --git a/codex-rs/app-server-daemon/src/prepare_install.rs b/codex-rs/app-server-daemon/src/prepare_install.rs index a313e940f7..40cf40b944 100644 --- a/codex-rs/app-server-daemon/src/prepare_install.rs +++ b/codex-rs/app-server-daemon/src/prepare_install.rs @@ -309,6 +309,7 @@ async fn prepare_from_package( #[cfg(not(windows))] std::fs::rename(stage.path(), &release)?; } + let release = release.canonicalize()?; let standalone = home.join("packages/standalone"); let canonical_source = source.canonicalize()?; let follows_latest = mode == InstallMode::Missing @@ -377,15 +378,22 @@ async fn prepare_from_package( } else if marker.exists() { std::fs::remove_file(marker)?; } - #[cfg(unix)] - { - let temporary = tempfile::TempDir::new_in(&root)?; - let link = temporary.path().join("current"); - std::os::unix::fs::symlink(&release, &link)?; - std::fs::rename(link, root.join("current"))?; + if previous_release.as_deref() != Some(release.as_path()) { + #[cfg(unix)] + { + let temporary = tempfile::TempDir::new_in(&root)?; + let link = temporary.path().join("current"); + std::os::unix::fs::symlink(&release, &link)?; + std::fs::rename(link, root.join("current"))?; + } + #[cfg(windows)] + windows::select_release(&root, &release)?; + if let Err(error) = + crate::release_pruning::record_selection(&root, previous_release.as_deref()) + { + tracing::warn!(%error, "could not record daemon selection for pruning"); + } } - #[cfg(windows)] - windows::select_release(&root, &release)?; if backend.is_some() { let selected = Daemon { pid_file: daemon.pid_file.with_file_name(crate::DAEMON_PID_FILE_NAME), @@ -400,6 +408,9 @@ async fn prepare_from_package( )?; selected.wait_until_ready().await?; } + if let Err(error) = crate::release_pruning::prune(daemon, &root, settings).await { + tracing::debug!(%error, "skipped daemon release pruning"); + } Ok(true) } diff --git a/codex-rs/app-server-daemon/src/prepare_install_tests.rs b/codex-rs/app-server-daemon/src/prepare_install_tests.rs index 8901063ab5..446f031f1a 100644 --- a/codex-rs/app-server-daemon/src/prepare_install_tests.rs +++ b/codex-rs/app-server-daemon/src/prepare_install_tests.rs @@ -3,6 +3,7 @@ use super::InstallMode; use super::prepare_from_package; use super::validate_package; +use crate::release_pruning; use crate::settings::DaemonSettings; use pretty_assertions::assert_eq; use std::path::Path; @@ -79,6 +80,75 @@ async fn seeds_full_package() { selected.file_name().expect("name").to_string_lossy() ); assert!(validate_package(&selected, "bin/codex").is_ok()); + + let root = standalone; + let releases = root.join("releases").canonicalize().unwrap(); + let target = super::platform_target().unwrap(); + // Reinstall the seed's exact package after partially deleting an older copy. + let original = old; + let digest = super::package_tree(&original, /*destination*/ None).unwrap(); + let old = releases.join(format!("local-{digest}-{target}")); + let previous = releases.join(format!("0.151.0-{target}")); + package(&old, "0.152.0"); + // Match the alias present in actual Unix downloads. + std::os::unix::fs::symlink("bin/codex", old.join("codex")).unwrap(); + package(&previous, "0.151.0"); + let outside = temp.path().join("outside"); + package(&outside, "0.149.0"); + let linked = releases.join(format!("0.148.0-{target}")); + package(&linked, "0.148.0"); + std::os::unix::fs::symlink(&outside, linked.join("codex-resources/other")).unwrap(); + let _operation_lock = daemon.acquire_operation_lock().await.unwrap(); + let _install_lock = crate::install_lock::acquire_install_lock(&root) + .await + .unwrap(); + + // An older selector can move away and back without updating history. + // The name alone must not authorize deletion. + std::fs::remove_file(root.join("current")).unwrap(); + std::os::unix::fs::symlink(&previous, root.join("current")).unwrap(); + std::fs::remove_file(root.join("current")).unwrap(); + std::os::unix::fs::symlink(&selected, root.join("current")).unwrap(); + let _ = release_pruning::prune(&daemon, &root, &settings).await; + assert!(old.join("codex-resources/nested/runtime").is_file()); + + release_pruning::record_selection(&root, Some(&previous)).unwrap(); + // Root can delete read-only files. Other users simulate a real partial failure. + use std::os::unix::fs::PermissionsExt; + let read_only = old.join("codex-resources/nested"); + std::fs::set_permissions(&read_only, std::fs::Permissions::from_mode(0o555)).unwrap(); + let _ = release_pruning::prune(&daemon, &root, &settings).await; + assert!(!old.exists()); + for retained in [&selected, &previous, &outside, &linked] { + assert!(retained.join("codex-resources/nested/runtime").is_file()); + } + + // Reinstall after a partial deletion, and verify that leftovers are not retried. + drop(_install_lock); + drop(_operation_lock); + if unsafe { libc::geteuid() } != 0 { + let leftover = std::fs::read_dir(&releases) + .unwrap() + .map(Result::unwrap) + .find(|entry| entry.file_name().to_string_lossy().starts_with(".retired.")) + .unwrap() + .path() + .join("release/codex-resources/nested"); + std::fs::set_permissions(&leftover, std::fs::Permissions::from_mode(0o755)).unwrap(); + prepare_from_package( + &daemon, + &settings, + InstallMode::Replace, + Some(&original), + &old_bin, + |_| Ok(true), + ) + .await + .unwrap(); + assert_eq!(root.join("current").canonicalize().unwrap(), old); + // Subsequent pruning does not retry a retirement, even when deletable now. + assert_eq!(std::fs::read(leftover.join("runtime")).unwrap(), b"runtime"); + } } #[tokio::test] @@ -336,6 +406,14 @@ async fn explicit_selection_requires_unchanged_cli_and_pins_all_versions() { std::fs::read(&bin).unwrap() ); assert_eq!(std::fs::read(previous.join("bin/codex")).unwrap(), before); + // Different resources, even at the same version: retain last two selections. + for entry in std::fs::read_dir(root.join("releases")).unwrap() { + let path = entry.unwrap().path().canonicalize().unwrap(); + assert!( + [&selected, &previous].contains(&&path), + "unexpected release: {path:?}" + ); + } assert!(!root.join("auto-update-version").exists()); assert!(daemon.running_backend(&settings).await.unwrap().is_none()); previous = selected; diff --git a/codex-rs/app-server-daemon/src/release_pruning.rs b/codex-rs/app-server-daemon/src/release_pruning.rs new file mode 100644 index 0000000000..6386def696 --- /dev/null +++ b/codex-rs/app-server-daemon/src/release_pruning.rs @@ -0,0 +1,251 @@ +//! Tracks dedicated selections under the installer lock. Pruning requires both lifecycle and +//! installer locks and valid history; inspect idle packages before a single best-effort retirement. + +use std::io::Write; +use std::path::Path; + +use anyhow::Context; +use anyhow::Result; +#[cfg(windows)] +use windows_sys::Win32::Storage::FileSystem as winfs; + +use crate::Daemon; +use crate::backend; +use crate::managed_install; +use crate::settings::DaemonSettings; + +#[derive(serde::Deserialize)] +struct Manifest { + version: semver::Version, + target: String, + entrypoint: String, +} + +#[cfg(unix)] +fn selection_identity(current: &Path) -> Result { + use std::os::unix::fs::MetadataExt; + let meta = current.symlink_metadata()?; + Ok(format!( + "{} {} {}.{:09}", + meta.dev(), + meta.ino(), + meta.ctime(), + meta.ctime_nsec() + )) +} + +#[cfg(windows)] +fn selection_identity(current: &Path) -> Result { + use std::os::windows::fs::OpenOptionsExt; + use std::os::windows::io::AsRawHandle; + use windows_sys::Win32::System::IO::DeviceIoControl; + + let file = std::fs::OpenOptions::new() + .access_mode(winfs::FILE_READ_ATTRIBUTES) + .share_mode(winfs::FILE_SHARE_READ | winfs::FILE_SHARE_WRITE | winfs::FILE_SHARE_DELETE) + .custom_flags(winfs::FILE_FLAG_BACKUP_SEMANTICS | winfs::FILE_FLAG_OPEN_REPARSE_POINT) + .open(current)?; + // FSCTL_READ_FILE_USN_DATA, with default V2 record version. The input is always + // "current", so 1024 bytes accommodates its journal record including the file name. + let mut record = [0u8; 1024]; + let mut returned = 0; + if unsafe { + DeviceIoControl( + file.as_raw_handle(), + 0x0009_00eb, + std::ptr::null(), + 0, + record.as_mut_ptr().cast(), + record.len() as u32, + &raw mut returned, + std::ptr::null_mut(), + ) + } == 0 + { + return Err(std::io::Error::last_os_error().into()); + } + let usn = i64::from_le_bytes(record[24..32].try_into()?); + anyhow::ensure!( + returned >= 32 && u16::from_le_bytes(record[4..6].try_into()?) == 2 && usn > 0, + "no reliable daemon selection journal record" + ); + let file_id = u64::from_le_bytes(record[8..16].try_into()?); + Ok(format!("{file_id:x} {usn:x}")) +} + +/// Call after changing the selection, while holding the installer lock. +pub(crate) fn record_selection(root: &Path, previous: Option<&Path>) -> Result<()> { + let current = root.join("current"); + let selected = current.canonicalize()?; + let previous = previous + .and_then(Path::file_name) + .unwrap_or_default() + .to_string_lossy(); + // If previous came from a shared install, conservatively retain its name here too. + let name = selected.file_name().unwrap_or_default().to_string_lossy(); + let identity = selection_identity(¤t)?; + let mut file = tempfile::NamedTempFile::new_in(root)?; + write!(file, "{name}\n{previous}\n{identity}\n")?; + file.persist(root.join("selection-history"))?; + Ok(()) +} + +/// Only ordinary files/directories can belong to a release. Linux device IDs alone +/// cannot distinguish same-device bind mounts; missing procfs disables pruning. +fn owned_mount(path: &Path) -> Result { + let meta = path.symlink_metadata()?; + anyhow::ensure!( + meta.is_dir() || meta.is_file(), + "not an ordinary package entry" + ); + #[cfg(windows)] + { + use std::os::windows::fs::MetadataExt; + anyhow::ensure!( + meta.file_attributes() & winfs::FILE_ATTRIBUTE_REPARSE_POINT == 0, + "package entry is a reparse point" + ); + // Volume mount points on Windows are reparse points. + Ok(0) + } + #[cfg(target_os = "linux")] + { + use std::os::fd::AsRawFd; + use std::os::unix::fs::OpenOptionsExt; + let file = std::fs::OpenOptions::new() + .read(true) + .custom_flags(libc::O_NOFOLLOW | libc::O_NONBLOCK) + .open(path)?; + let info = std::fs::read_to_string(format!("/proc/self/fdinfo/{}", file.as_raw_fd()))?; + info.lines() + .find_map(|line| line.strip_prefix("mnt_id:")) + .context("unknown package mount")? + .trim() + .parse() + .context("invalid package mount") + } + #[cfg(all(unix, not(target_os = "linux")))] + { + use std::os::unix::fs::MetadataExt; + Ok(meta.dev()) + } +} + +pub(crate) async fn prune(daemon: &Daemon, root: &Path, settings: &DaemonSettings) -> Result<()> { + let home = daemon + .settings_file + .parent() + .and_then(Path::parent) + .context("missing Codex home")?; + // Require a real dedicated root, never a shared alias or an in-progress migration. + let releases = root.join("releases"); + let mount = owned_mount(&home.join("packages"))?; + anyhow::ensure!( + root == home.join("packages/app-server-daemon") + && owned_mount(root)? == mount + && owned_mount(&releases)? == mount + && root.join(".migration-current").symlink_metadata().is_err(), + "invalid daemon package directory" + ); + let releases = releases.canonicalize()?; + let current = root.join("current"); + let selected = current.canonicalize()?; + let history = std::fs::read_to_string(root.join("selection-history"))?; + let previous = history + .lines() + .nth(1) + .context("missing previous selection")?; + let name = selected + .file_name() + .context("missing selection")? + .to_string_lossy(); + anyhow::ensure!( + selected.parent() == Some(releases.as_path()) + && history == format!("{name}\n{previous}\n{}\n", selection_identity(¤t)?) + && (previous.is_empty() + || Path::new(previous).file_name().and_then(|n| n.to_str()) == Some(previous)), + "invalid or stale daemon selection" + ); + let paths = daemon.current_installation()?.backend_paths(settings); + let server = backend::pid_backend(paths.clone()); + let updater = backend::pid_update_loop_backend(paths); + anyhow::ensure!( + server.is_starting_or_running().await? + || crate::client::probe(&daemon.socket_path).await.is_err(), + "unmanaged daemon" + ); + let mut identities = Vec::new(); + for worker in [server, updater] { + if worker.is_starting_or_running().await? { + identities.push( + worker + .running_executable_identity() + .await? + .and_then(|identity| identity.path_digest) + .context("unknown running package")?, + ); + } + } + let caller = std::env::current_exe()?.canonicalize()?; + 'releases: for entry in std::fs::read_dir(&releases)? { + let entry = entry?; + let path = entry.path(); + if path == selected + || entry.file_name() == previous + || caller.starts_with(&path) + || !owned_mount(&path).is_ok_and(|id| id == mount) + { + continue; + } + let Some(manifest) = std::fs::File::open(path.join("codex-package.json")) + .ok() + .and_then(|file| serde_json::from_reader::<_, Manifest>(file).ok()) + else { + continue; + }; + // Accept only managed release names, never arbitrary or legacy folders. + let Some(name) = entry.file_name().to_str().map(str::to_owned) else { + continue; + }; + let local = name + .strip_prefix("local-") + .and_then(|s| s.strip_suffix(&format!("-{}", manifest.target))); + if !(name == format!("{}-{}", manifest.version, manifest.target) + || local.is_some_and(|digest| blake3::Hash::from_hex(digest).is_ok())) + || !matches!(manifest.entrypoint.as_str(), "bin/codex" | "bin/codex.exe") + { + continue; + } + let Ok(executable) = path.join(manifest.entrypoint).canonicalize() else { + continue; + }; + if identities.contains(&managed_install::path_digest(&executable)) { + continue; + } + let mut pending = vec![path.clone()]; + while let Some(child) = pending.pop() { + // The Unix installer adds this alias; it never traverses outside the release. + #[cfg(unix)] + if child == path.join("codex") + && std::fs::read_link(&child).ok().as_deref() == Some(Path::new("bin/codex")) + { + continue; + } + if !owned_mount(&child).is_ok_and(|id| id == mount) { + continue 'releases; + } + if child.is_dir() { + for entry in std::fs::read_dir(child)? { + pending.push(entry?.path()); + } + } + } + // Clean up a failed rename, but never retry deletion after retirement. + let retired = tempfile::Builder::new() + .prefix(".retired.") + .tempdir_in(&releases)?; + std::fs::rename(&path, retired.path().join("release"))?; + std::fs::remove_dir_all(retired.keep())?; + } + Ok(()) +} diff --git a/codex-rs/app-server-daemon/src/update_loop.rs b/codex-rs/app-server-daemon/src/update_loop.rs index 5e28ad8856..faa1138c4b 100644 --- a/codex-rs/app-server-daemon/src/update_loop.rs +++ b/codex-rs/app-server-daemon/src/update_loop.rs @@ -446,7 +446,7 @@ async fn update_once( return Ok((UpdateLoopControl::Stop, None)); } match daemon - .try_restart_if_running(restart_mode, &managed_codex_bin) + .try_restart_if_running(restart_mode, &managed_codex_bin, &package_root) .await? { RestartIfRunningOutcome::Busy => { diff --git a/codex-rs/app-server-daemon/src/update_loop_tests.rs b/codex-rs/app-server-daemon/src/update_loop_tests.rs index a7894b81f6..02aca068a1 100644 --- a/codex-rs/app-server-daemon/src/update_loop_tests.rs +++ b/codex-rs/app-server-daemon/src/update_loop_tests.rs @@ -720,14 +720,33 @@ async fn test_control_server( #[tokio::test] async fn scheduled_no_op_preserves_daemon_and_hands_off_stale_updater() { let home = TempDir::new().expect("home"); - let (daemon, _) = manual_update_daemon(&home); + let (mut daemon, release) = manual_update_daemon(&home); + let root = home.path().join("packages/app-server-daemon"); + std::fs::rename(home.path().join("packages/standalone"), &root).unwrap(); + daemon = daemon.current_installation().unwrap(); + let stale = root + .join("releases") + .join(release.replace("1.0.0", "0.8.0")); + std::fs::create_dir_all(stale.join("bin")).unwrap(); + std::fs::copy(&daemon.managed_codex_bin, stale.join("bin/codex")).unwrap(); + std::fs::write( + stale.join("codex-package.json"), + serde_json::json!({ + "version": "0.8.0", + "target": release.strip_prefix("1.0.0-").unwrap(), + "entrypoint": "bin/codex" + }) + .to_string(), + ) + .unwrap(); + crate::release_pruning::record_selection(&root, /*previous*/ None).unwrap(); let settings = crate::settings::DaemonSettings::default(); let backend = crate::backend::pid_backend(daemon.backend_paths(&settings)); backend.start().await.expect("start daemon"); let server = test_control_server(&daemon, home.path()).await; let pid_record = std::fs::read(&daemon.pid_file).expect("daemon PID record"); let no_op = FakeInstallerHttp::new(InstallerResponse::Success( - b"# CODEX_INSTALL_IF_LATEST\nexit 0\n".to_vec(), + b"# CODEX_INSTALL_IF_LATEST CODEX_INSTALL_DAEMON_ONLY\nexit 0\n".to_vec(), )); let outcome = super::update_once( @@ -751,6 +770,8 @@ async fn scheduled_no_op_preserves_daemon_and_hands_off_stale_updater() { std::fs::read(&daemon.pid_file).expect("daemon PID record"), pid_record ); + assert!(daemon.managed_codex_bin.is_file()); + assert!(!stale.exists()); backend.stop().await.expect("stop daemon"); server.abort(); } diff --git a/scripts/install/install.ps1 b/scripts/install/install.ps1 index 05657ee2ff..e9d0bc8057 100644 --- a/scripts/install/install.ps1 +++ b/scripts/install/install.ps1 @@ -522,7 +522,7 @@ function Move-OldStandaloneBinIfApproved { function Add-JunctionSupportType { # Older installer types remain loaded when users rerun irm | iex in one session. - if (([System.Management.Automation.PSTypeName]'CodexInstaller.JunctionV2').Type) { + if (([System.Management.Automation.PSTypeName]'CodexInstaller.JunctionV3').Type) { return } @@ -536,7 +536,7 @@ using Microsoft.Win32.SafeHandles; namespace CodexInstaller { - public static class JunctionV2 + public static class JunctionV3 { private const uint GENERIC_WRITE = 0x40000000; private const uint FILE_SHARE_READ = 0x00000001; @@ -574,6 +574,35 @@ namespace CodexInstaller private static extern uint GetFinalPathNameByHandleW( SafeFileHandle file, StringBuilder path, uint length, uint flags); + // Read the journal entry for the junction itself, never the target. + // Unlike a timestamp this changes on an in-place retarget, including away and back. + public static string SelectionIdentity(string path) + { + using (SafeFileHandle handle = CreateFileW( + path, 0x80, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + IntPtr.Zero, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, IntPtr.Zero)) + { + if (handle.IsInvalid) { throw new Win32Exception(Marshal.GetLastWin32Error()); } + IntPtr buffer = Marshal.AllocHGlobal(1024); + try { + int returned; + // No input requests USN_RECORD_V2. current's filename fits in 1024 bytes. + if (!DeviceIoControl(handle, 0x000900eb, null, 0, buffer, 1024, out returned, IntPtr.Zero)) { + throw new Win32Exception(Marshal.GetLastWin32Error()); + } + long usn = Marshal.ReadInt64(buffer, 24); + if (returned < 32 || Marshal.ReadInt16(buffer, 4) != 2 || usn <= 0) { + throw new IOException("No reliable daemon selection journal record."); + } + return Marshal.ReadInt64(buffer, 8).ToString("x") + + " " + usn.ToString("x"); + } finally { + Marshal.FreeHGlobal(buffer); + } + } + } + public static string ResolveDirectory(string path) { using (SafeFileHandle handle = CreateFileW( @@ -660,7 +689,7 @@ function Set-JunctionTarget { ) Add-JunctionSupportType - [CodexInstaller.JunctionV2]::SetTarget($LinkPath, $TargetPath) + [CodexInstaller.JunctionV3]::SetTarget($LinkPath, $TargetPath) } function Test-IsJunction { @@ -691,14 +720,14 @@ function Ensure-Junction { $item = Get-Item -LiteralPath $LinkPath -Force if (Test-IsJunction -Path $LinkPath) { Add-JunctionSupportType - $existingTarget = [CodexInstaller.JunctionV2]::ResolveDirectory($LinkPath) + $existingTarget = [CodexInstaller.JunctionV3]::ResolveDirectory($LinkPath) if (-not [string]::IsNullOrWhiteSpace($InstallerOwnedTargetPrefix)) { - $ownedTargetPrefix = [CodexInstaller.JunctionV2]::ResolveDirectory($InstallerOwnedTargetPrefix) + "\" + $ownedTargetPrefix = [CodexInstaller.JunctionV3]::ResolveDirectory($InstallerOwnedTargetPrefix) + "\" if (-not $existingTarget.StartsWith($ownedTargetPrefix, [System.StringComparison]::OrdinalIgnoreCase)) { throw "Refusing to retarget junction at $LinkPath because it is not managed by this installer." } } - if ($existingTarget.Equals([CodexInstaller.JunctionV2]::ResolveDirectory($TargetPath), [System.StringComparison]::OrdinalIgnoreCase)) { + if ($existingTarget.Equals([CodexInstaller.JunctionV3]::ResolveDirectory($TargetPath), [System.StringComparison]::OrdinalIgnoreCase)) { return } @@ -1030,7 +1059,7 @@ try { $currentTarget = if (Test-Path -LiteralPath $currentDir) { (Get-Item -LiteralPath $currentDir).Target } else { $null } if ($Release -ne "latest" -or [string]::IsNullOrEmpty($previousRelease) -or [string]::IsNullOrEmpty($currentTarget) -or -not (Test-Path -LiteralPath (Join-Path $releasesDir $previousRelease)) -or - [CodexInstaller.JunctionV2]::ResolveDirectory($currentDir) -ne [CodexInstaller.JunctionV2]::ResolveDirectory((Join-Path $releasesDir $previousRelease))) { + [CodexInstaller.JunctionV3]::ResolveDirectory($currentDir) -ne [CodexInstaller.JunctionV3]::ResolveDirectory((Join-Path $releasesDir $previousRelease))) { if ($env:CODEX_INSTALL_IF_CURRENT -eq "1") { throw "Daemon selection changed; retry the update." } $script:guardRejected = $true return @@ -1119,7 +1148,26 @@ try { throw "The production release does not support daemon-owned packages; the current selection was left unchanged." } } + $previousDirectory = $null + if ($daemonOnly -and -not $deferSelection) { + Add-JunctionSupportType + if (Test-Path -LiteralPath $currentDir) { + $previousDirectory = [CodexInstaller.JunctionV3]::ResolveDirectory($currentDir) + } + } Ensure-Junction -LinkPath $currentDir -TargetPath $releaseDir -InstallerOwnedTargetPrefix $releasesDir + if ($daemonOnly -and -not $deferSelection -and + $previousDirectory -cne [CodexInstaller.JunctionV3]::ResolveDirectory($currentDir)) { + try { + $previousName = if ($null -eq $previousDirectory) { "" } else { Split-Path -Leaf $previousDirectory } + $selectionId = [CodexInstaller.JunctionV3]::SelectionIdentity($currentDir) + $history = Join-Path $standaloneRoot "selection-history" + [System.IO.File]::WriteAllText("$history.tmp.$PID", "$releaseName`n$previousName`n$selectionId`n") + Move-Item -LiteralPath "$history.tmp.$PID" -Destination $history -Force -ErrorAction Stop + } catch { + Write-WarningStep "Could not record daemon selection; pruning will be skipped." + } + } if ($Release -eq "latest") { $tempMarker = "$autoUpdateVersion.tmp.$PID" [System.IO.File]::WriteAllText($tempMarker, $releaseName) diff --git a/scripts/install/install.sh b/scripts/install/install.sh index 58815c797e..f27d1642be 100755 --- a/scripts/install/install.sh +++ b/scripts/install/install.sh @@ -1267,8 +1267,26 @@ if [ "$DAEMON_ONLY" = "1" ] && [ "${CODEX_INSTALL_DEFER_SELECTION:-0}" != "1" ]; echo "The production release does not support daemon-owned packages; the current selection was left unchanged." >&2 exit 1 fi + # A no-op must not replace the selection link: history is bound to it. + selected_dir="$(cd -P "$release_dir" && pwd)" + previous_dir="$(cd -P "$CURRENT_LINK" 2>/dev/null && pwd)" || previous_dir="" + if [ "$previous_dir" != "$selected_dir" ]; then + update_current_link "$release_dir" + if ! ( + history="$STANDALONE_ROOT/selection-history" + # GNU and BSD stat both inspect the link itself by default. + selection_id="$(LC_ALL=C stat -c '%d %i %.9Z' "$CURRENT_LINK" 2>/dev/null || + LC_ALL=C stat -f '%d %i %Fc' "$CURRENT_LINK")" + printf '%s\n%s\n%s\n' "$release_name" "${previous_dir##*/}" "$selection_id" > "$history.tmp.$$" + mv -f "$history.tmp.$$" "$history" + ); then + warn "Could not record daemon selection; pruning will be skipped." + fi + fi +else + # Do not publish history for a migration until Rust has committed the cutover. + update_current_link "$release_dir" fi -update_current_link "$release_dir" if [ "$RELEASE" = "latest" ]; then printf '%s' "$release_name" > "$AUTO_UPDATE_VERSION.tmp.$$" mv -f "$AUTO_UPDATE_VERSION.tmp.$$" "$AUTO_UPDATE_VERSION" diff --git a/scripts/install/test_install_sh.py b/scripts/install/test_install_sh.py index 06465d9372..2d495cddaf 100644 --- a/scripts/install/test_install_sh.py +++ b/scripts/install/test_install_sh.py @@ -183,6 +183,12 @@ class InstallShTest(unittest.TestCase): (daemon / "current").resolve(), daemon / "releases" / release_name ) self.assertEqual((daemon / "auto-update-version").read_text(), release_name) + history = daemon / "selection-history" + original_history = history.read_bytes() + self.assertEqual(history.read_text().splitlines()[:2], [release_name, ""]) + repeated, _ = run_installer_in(root, "latest", daemon_only=True, **options) + self.assertEqual(repeated.returncode, 0, repeated.stderr) + self.assertEqual(history.read_bytes(), original_history) options["daemon_only"] = True local = daemon / "releases/local-development" local.mkdir() From 1b6e0d8145e1fe5b2663d32fbe7ee02f51a10e1c Mon Sep 17 00:00:00 2001 From: tongzhou wang Date: Wed, 14 Oct 2026 01:52:32 +0000 Subject: [PATCH 025/155] Track content provenance through prompt assembly and compaction (#53831) ## Why Message roles and content classifications do not identify who supplied each context part. Source attribution needs to survive prompt assembly and history truncation, including messages that combine text from different producers. ## What changed - Add per-part `ContentItemMetadata` for user input, developer instructions, `AGENTS.md`, skills, harness context, command hooks, and tool context with optional callable namespaces. - Carry attribution alongside content and classifications through contextual fragments, extension prompts, hook output, and agent messages. Keep tool-provided context-window hints separate from harness text. - Preserve the source of retained text slices during compaction and attribute generated truncation notices to the harness. Default missing historical attribution to unknown. - Attribute host MCP calls using cached tool namespaces only when catalog revisions remain stable, without starting servers or refreshing catalogs for attribution. - Send the new metadata to Responses Lite and strip it from requests to endpoints that do not support it. ## Testing Extend compaction tests to cover mixed sources, missing or extra metadata entries, and discarded media. Update Responses Lite request assertions to verify endpoint-specific attribution handling. GitOrigin-RevId: b0ebc929b7c60f3ec49d1affbf897312d63edcc8 --- .../tests/suite/v2/history_notes_extension.rs | 6 +- .../src/connection_manager/tool_catalog.rs | 2 +- codex-rs/codex-mcp/src/lib.rs | 1 + codex-rs/codex-mcp/src/runtime.rs | 70 ++++++-- .../src/annotated_content.rs | 169 ++++++++++++++++-- codex-rs/context-fragments/src/fragment.rs | 68 +++++-- codex-rs/context-fragments/src/lib.rs | 3 + codex-rs/core/src/agent/control.rs | 27 ++- codex-rs/core/src/client.rs | 6 + codex-rs/core/src/codex_thread.rs | 1 + codex-rs/core/src/compact.rs | 83 ++++++--- codex-rs/core/src/compact_tests.rs | 97 +++++++++- .../context/contextual_user_message_tests.rs | 1 + .../core/src/context/current_time_reminder.rs | 10 ++ .../src/context/developer_instructions.rs | 5 + .../src/context/hook_additional_context.rs | 14 +- .../core/src/context/token_budget_context.rs | 35 +++- .../core/src/context/user_instructions.rs | 5 + .../managed_developer_instructions.rs | 5 + codex-rs/core/src/context/world_state/mod.rs | 4 + .../src/context/world_state/model_catalog.rs | 17 +- .../context/world_state/multi_agent_mode.rs | 16 +- .../world_state/multi_agent_mode_tests.rs | 8 +- .../world_state/multi_agent_usage_hint.rs | 20 ++- ...ests__snapshots_namespace_transitions.snap | 24 +++ .../core/src/context/world_state/tools.rs | 24 ++- .../context/world_state/top_level_tools.rs | 8 +- .../world_state/top_level_tools_tests.rs | 10 +- .../context/world_state/world_state_tests.rs | 16 +- .../core/src/context_manager/history_tests.rs | 6 + codex-rs/core/src/context_manager/updates.rs | 21 +-- .../core/src/context_manager/updates_tests.rs | 3 + codex-rs/core/src/event_mapping.rs | 47 +++-- codex-rs/core/src/event_mapping_tests.rs | 2 + codex-rs/core/src/hook_mcp_executor.rs | 11 +- codex-rs/core/src/hook_runtime.rs | 19 +- codex-rs/core/src/image_preparation.rs | 3 +- codex-rs/core/src/image_preparation_tests.rs | 7 + codex-rs/core/src/session/mod.rs | 65 ++++--- codex-rs/core/src/session/tests.rs | 14 ++ codex-rs/core/src/session/world_state.rs | 22 ++- codex-rs/core/src/thread_manager_tests.rs | 2 + codex-rs/core/tests/suite/compact.rs | 4 +- .../tests/suite/guardian_retained_context.rs | 8 +- codex-rs/core/tests/suite/mcp_auth_refresh.rs | 2 +- codex-rs/core/tests/suite/responses_lite.rs | 32 ++-- codex-rs/core/tests/suite/token_budget.rs | 3 +- .../extension-api/src/contributors/prompt.rs | 62 +++++-- .../src/contributors/world_state.rs | 13 ++ .../src/async_scorer/config_tests.rs | 4 +- .../src/async_scorer/decisions_tests.rs | 19 +- .../src/async_scorer/extension_tests.rs | 21 +++ .../src/async_scorer/sampler_tests.rs | 3 + codex-rs/ext/history-notes/src/extension.rs | 3 +- .../tests/history_notes_extension.rs | 3 +- codex-rs/ext/skills/src/extension.rs | 3 +- codex-rs/ext/skills/src/fragments.rs | 9 + codex-rs/ext/skills/src/world_state.rs | 18 +- codex-rs/hooks/src/context.rs | 18 ++ codex-rs/hooks/src/engine/command_runner.rs | 26 ++- codex-rs/hooks/src/engine/dispatcher.rs | 3 +- codex-rs/hooks/src/engine/mcp_runner.rs | 8 +- codex-rs/hooks/src/engine/mcp_runner_tests.rs | 8 +- codex-rs/hooks/src/engine/mod.rs | 1 + codex-rs/hooks/src/engine/mod_tests.rs | 15 +- codex-rs/hooks/src/events/common.rs | 12 +- codex-rs/hooks/src/events/compact.rs | 1 + codex-rs/hooks/src/events/interrupt_tests.rs | 1 + codex-rs/hooks/src/events/post_tool_use.rs | 8 +- codex-rs/hooks/src/events/pre_tool_use.rs | 8 +- .../hooks/src/events/session_end_tests.rs | 1 + codex-rs/hooks/src/events/session_start.rs | 13 +- codex-rs/hooks/src/events/stop.rs | 12 +- .../hooks/src/events/user_prompt_submit.rs | 9 +- codex-rs/hooks/src/lib.rs | 3 + codex-rs/hooks/src/mcp.rs | 8 +- codex-rs/hooks/src/output_spill.rs | 16 +- codex-rs/hooks/src/output_spill_tests.rs | 12 +- .../src/multi_agent_instructions_tests.rs | 4 +- .../src/permissions_instructions_tests.rs | 4 +- codex-rs/protocol/src/items.rs | 35 ++-- codex-rs/protocol/src/models.rs | 24 ++- .../src/models/executed_tool_calls.rs | 1 + codex-rs/protocol/src/models/item_metadata.rs | 147 +++++++++++++++ codex-rs/utils/string/src/lib.rs | 2 + codex-rs/utils/string/src/truncate.rs | 104 ++++------- 86 files changed, 1299 insertions(+), 389 deletions(-) create mode 100644 codex-rs/hooks/src/context.rs diff --git a/codex-rs/app-server/tests/suite/v2/history_notes_extension.rs b/codex-rs/app-server/tests/suite/v2/history_notes_extension.rs index 177590a6a2..bc12a8b839 100644 --- a/codex-rs/app-server/tests/suite/v2/history_notes_extension.rs +++ b/codex-rs/app-server/tests/suite/v2/history_notes_extension.rs @@ -205,7 +205,11 @@ async fn app_server_uses_configured_notes_backend_for_context_window_hints( }) .count(); assert_eq!(bridge_calls, usize::from(!use_history_notes_extension)); - let developer_messages = request.message_input_texts("developer"); + let developer_messages: Vec<_> = request + .message_input_text_groups("developer") + .into_iter() + .map(|parts| parts.concat()) + .collect(); let context_window = developer_messages .iter() .find(|text| text.contains("")) diff --git a/codex-rs/codex-mcp/src/connection_manager/tool_catalog.rs b/codex-rs/codex-mcp/src/connection_manager/tool_catalog.rs index 6aeae1ca2e..45cea49bb0 100644 --- a/codex-rs/codex-mcp/src/connection_manager/tool_catalog.rs +++ b/codex-rs/codex-mcp/src/connection_manager/tool_catalog.rs @@ -65,7 +65,7 @@ pub fn tool_is_model_visible(tool: &ToolInfo) -> bool { } /// Catalog identity within one published connection set, including cached declarations. -#[derive(PartialEq, Eq)] +#[derive(Clone, PartialEq, Eq)] pub(crate) enum BindingCatalogRevision { Ready(ClientToolCatalogRevision), Cached(u64), diff --git a/codex-rs/codex-mcp/src/lib.rs b/codex-rs/codex-mcp/src/lib.rs index 7dd122b45a..4d1da4f1ec 100644 --- a/codex-rs/codex-mcp/src/lib.rs +++ b/codex-rs/codex-mcp/src/lib.rs @@ -26,6 +26,7 @@ pub use runtime::McpRuntime; pub use runtime::McpRuntimeContext; pub use runtime::McpRuntimeInput; pub use runtime::McpStartupPolicy; +pub use runtime::McpToolCallResult; pub use runtime::apply_http_headers_helper; pub use sandbox_metadata::MCP_SANDBOX_LAUNCHER_META_KEY; pub use sandbox_metadata::MCP_SANDBOX_STATE_CAPABILITY; diff --git a/codex-rs/codex-mcp/src/runtime.rs b/codex-rs/codex-mcp/src/runtime.rs index 0e74e2ebdf..3f3d543ea0 100644 --- a/codex-rs/codex-mcp/src/runtime.rs +++ b/codex-rs/codex-mcp/src/runtime.rs @@ -71,6 +71,14 @@ pub enum McpStartupPolicy { LazyWhenCached, } +/// A host-requested tool result and its identity in the published MCP catalog. +pub struct McpToolCallResult { + pub result: CallToolResult, + /// None when the cached catalog is missing, changed, or has no entry for the tool. + /// This is not MCP wire metadata. + pub source_tool_namespace: Option, +} + /// Configuration and owning-thread state needed to materialize an MCP runtime. pub struct McpRuntimeInput { pub startup_policy: McpStartupPolicy, @@ -639,6 +647,19 @@ impl McpRuntime { self.latest_connections().list_all_tools().await } + pub async fn latest_read_resource( + &self, + server: &str, + params: ReadResourceRequestParams, + ) -> anyhow::Result { + self.latest_connections() + .read_resource(server, params) + .await + } + + /// Calls a tool for the host, using a cached namespace only if its catalogs stay unchanged. + /// Missing or changed catalogs leave the namespace unknown. Attribution never starts + /// servers or refreshes their catalogs. #[allow(clippy::too_many_arguments)] pub async fn latest_call_tool( &self, @@ -649,8 +670,16 @@ impl McpRuntime { meta: Option, requested_timeout: Option, wait_for_server: bool, - ) -> anyhow::Result { - self.latest_connections() + ) -> anyhow::Result { + let current = self.current.load_full(); + let cached = current + .cached_binding + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner) + .as_ref() + .and_then(|cached| Some((cached.catalog_revisions.clone(), cached.binding.upgrade()?))); + let result = current + .connections .call_tool( server, tool, @@ -660,17 +689,32 @@ impl McpRuntime { requested_timeout, wait_for_server, ) - .await - } - - pub async fn latest_read_resource( - &self, - server: &str, - params: ReadResourceRequestParams, - ) -> anyhow::Result { - self.latest_connections() - .read_resource(server, params) - .await + .await?; + // Host calls use live connections, unlike model calls pinned to a binding. + // Check after dispatch so a refresh before or during the call invalidates attribution. + // Revisions include client identity and increase on catalog changes. Reading them + // does not start servers or refresh catalogs; all catalogs matter for name collisions. + let namespace = if let Some((revisions, binding)) = cached + && current + .connections + .stable_catalog_revisions( + /*required_servers*/ &[], + /*required_plugins*/ &HashSet::new(), + ) + .await + .as_ref() + == Some(&revisions) + { + binding + .tool_info(server, tool) + .map(|info| info.callable_namespace.clone()) + } else { + None + }; + Ok(McpToolCallResult { + result, + source_tool_namespace: namespace, + }) } pub async fn latest_wait_for_server_ready(&self, server: &str, timeout: Duration) -> bool { diff --git a/codex-rs/context-fragments/src/annotated_content.rs b/codex-rs/context-fragments/src/annotated_content.rs index 8f02a9240c..2ed317f142 100644 --- a/codex-rs/context-fragments/src/annotated_content.rs +++ b/codex-rs/context-fragments/src/annotated_content.rs @@ -1,23 +1,95 @@ +//! Keep content and its positional annotations together during history edits. + use codex_protocol::models::ContentItem; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::models::ResponseItem; +use codex_utils_string::plan_token_truncation; -/// Model-visible content paired with its harness-owned classification. +/// Content, classification and attribution travel together through edits and truncation. #[derive(Clone, Debug, PartialEq)] pub struct AnnotatedContent { content: ContentItem, kind: ContentItemKind, + metadata: ContentItemMetadata, +} + +/// Applies the string truncator's head/tail selection to the combined text. +/// Retained slices keep their kind and source; the generated notice has harness +/// provenance. Non-text parts are retained unchanged, without cloning media. +pub fn truncate_annotated_text( + parts: Vec, + max_tokens: usize, +) -> Vec { + let text: String = parts + .iter() + .filter_map(|part| match part.content() { + ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => { + Some(text.as_str()) + } + ContentItem::InputImage { .. } | ContentItem::InputAudio { .. } => None, + }) + .collect(); + let Some(truncation) = plan_token_truncation(&text, max_tokens) else { + return parts; + }; + let mut notice = Some(AnnotatedContent::text( + truncation.marker, + ContentItemKind("unknown".to_string()), + ContentItemMetadata::harness(), + )); + let mut result = Vec::with_capacity(parts.len() + 2); + let mut offset = 0; + for part in parts { + let length = match part.content() { + ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => text.len(), + ContentItem::InputImage { .. } | ContentItem::InputAudio { .. } => { + result.push(part); + continue; + } + }; + let start = offset; + offset += length; + if offset <= truncation.removed.start || start >= truncation.removed.end { + result.push(part); + continue; + } + let prefix_end = truncation.removed.start.saturating_sub(start); + let suffix_start = truncation.removed.end.saturating_sub(start).min(length); + if prefix_end > 0 { + result.push(part.text_slice(0..prefix_end)); + } + if let Some(notice) = notice.take() { + result.push(notice); + } + if suffix_start < length { + result.push(part.text_slice(suffix_start..length)); + } + } + result } impl AnnotatedContent { /// Creates content and its classification together. pub fn new(content: ContentItem, kind: ContentItemKind) -> Self { - Self { content, kind } + Self { + content, + kind, + metadata: ContentItemMetadata::default(), + } } - /// Creates model-visible input text and its classification together. - pub fn input_text(text: impl Into, kind: ContentItemKind) -> Self { - Self::new(ContentItem::InputText { text: text.into() }, kind) + /// Creates text with the attribution supplied by its producer. + pub fn text( + text: impl Into, + kind: ContentItemKind, + metadata: ContentItemMetadata, + ) -> Self { + Self { + content: ContentItem::InputText { text: text.into() }, + kind, + metadata, + } } /// Returns the model-visible content. @@ -35,16 +107,54 @@ impl AnnotatedContent { &self.kind } - /// Separates the content from its classification at an API boundary. - pub fn into_parts(self) -> (ContentItem, ContentItemKind) { - (self.content, self.kind) + /// Separates content and its positional annotations at an API boundary. + pub fn into_parts(self) -> (ContentItem, ContentItemKind, ContentItemMetadata) { + (self.content, self.kind, self.metadata) + } + + // Called only for the UTF-8-aligned text ranges selected by the truncator. + fn text_slice(&self, range: std::ops::Range) -> Self { + let content = match &self.content { + ContentItem::InputText { text } => ContentItem::InputText { + text: text[range].to_owned(), + }, + ContentItem::OutputText { text, .. } => ContentItem::OutputText { + text: text[range].to_owned(), + // Original offsets and token probabilities do not describe a shortened slice. + annotations: None, + logprobs: None, + }, + ContentItem::InputImage { .. } | ContentItem::InputAudio { .. } => { + unreachable!("only text parts have byte ranges") + } + }; + Self { + content, + kind: self.kind.clone(), + metadata: self.metadata.clone(), + } } } -/// Takes a message's content together with its positional classifications. +/// Assembles a message without separating its content from its attribution. +pub fn message_from_parts(role: impl Into, parts: Vec) -> ResponseItem { + let mut item = ResponseItem::Message { + status: None, + encrypted_content: None, + id: None, + role: role.into(), + content: Vec::new(), + phase: None, + internal_chat_message_metadata_passthrough: None, + }; + set_annotated_content(&mut item, parts); + item +} + +/// Takes a message's content together with its classification and source metadata. /// /// Legacy messages, including persisted rollouts, may not have classifications. -/// Missing entries are classified as unknown so the message remains usable. +/// Missing entries have unknown classification and source so the message remains usable. pub fn to_annotated_content(item: &mut ResponseItem) -> Option> { let ResponseItem::Message { content, @@ -59,6 +169,10 @@ pub fn to_annotated_content(item: &mut ResponseItem) -> Option Option, @@ -85,14 +208,22 @@ pub fn set_annotated_content( return None; }; - let (updated_content, content_item_kinds): (Vec<_>, Vec<_>) = annotated_content - .into_iter() - .map(AnnotatedContent::into_parts) - .unzip(); + let mut updated_content = Vec::with_capacity(annotated_content.len()); + let mut content_item_kinds = Vec::with_capacity(annotated_content.len()); + let mut content_item_metadata = Vec::with_capacity(annotated_content.len()); + for annotated in annotated_content { + let (content, kind, metadata) = annotated.into_parts(); + updated_content.push(content); + content_item_kinds.push(kind); + content_item_metadata.push(metadata); + } *content = updated_content; - internal_chat_message_metadata_passthrough - .get_or_insert_default() - .content_item_kinds = Some(content_item_kinds); + let metadata = internal_chat_message_metadata_passthrough.get_or_insert_default(); + metadata.content_item_kinds = Some(content_item_kinds); + metadata.content_item_metadata = content_item_metadata + .iter() + .any(|metadata| metadata != &ContentItemMetadata::default()) + .then_some(content_item_metadata); Some(()) } diff --git a/codex-rs/context-fragments/src/fragment.rs b/codex-rs/context-fragments/src/fragment.rs index f3f1c3bb8b..8d681dddab 100644 --- a/codex-rs/context-fragments/src/fragment.rs +++ b/codex-rs/context-fragments/src/fragment.rs @@ -1,6 +1,7 @@ use crate::AnnotatedContent; +use crate::message_from_parts; use codex_protocol::models::ContentItemKind; -use codex_protocol::models::InternalChatMessageMetadataPassthrough; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::models::ResponseItem; /// A rendered contextual fragment and the role that owns its annotated content. @@ -35,22 +36,7 @@ impl RenderedFragment { impl From for ResponseItem { fn from(fragment: RenderedFragment) -> Self { let (role, annotated_content) = fragment.into_parts(); - let (content, content_kind) = annotated_content.into_parts(); - - Self::Message { - status: None, - encrypted_content: None, - id: None, - role: role.to_string(), - content: vec![content], - phase: None, - internal_chat_message_metadata_passthrough: Some( - InternalChatMessageMetadataPassthrough { - content_item_kinds: Some(vec![content_kind]), - ..Default::default() - }, - ), - } + message_from_parts(role, vec![annotated_content]) } } @@ -66,6 +52,22 @@ impl From for ResponseItem { pub trait ContextualUserFragment { fn role(&self) -> &'static str; + /// Attribution is supplied when the fragment is produced, never inferred from rendered text. + fn content_metadata(&self) -> ContentItemMetadata { + ContentItemMetadata::harness() + } + + /// Binds producer attribution before this fragment is rendered or persisted. + fn with_metadata(self, metadata: ContentItemMetadata) -> AttributedFragment + where + Self: Sized, + { + AttributedFragment { + fragment: self, + metadata, + } + } + /// Returns a stable `.` classification, using `generic` for shared fragments. fn content_kind(&self) -> ContentItemKind; @@ -99,7 +101,7 @@ pub trait ContextualUserFragment { fn render_fragment(&self) -> RenderedFragment { RenderedFragment::new( self.role(), - AnnotatedContent::input_text(self.render(), self.content_kind()), + AnnotatedContent::text(self.render(), self.content_kind(), self.content_metadata()), ) } @@ -115,6 +117,36 @@ pub trait ContextualUserFragment { } } +/// A contextual fragment with attribution supplied by its producer. +pub struct AttributedFragment { + fragment: F, + metadata: ContentItemMetadata, +} + +impl ContextualUserFragment for AttributedFragment { + fn role(&self) -> &'static str { + self.fragment.role() + } + fn content_kind(&self) -> ContentItemKind { + self.fragment.content_kind() + } + fn markers(&self) -> (&'static str, &'static str) { + self.fragment.markers() + } + fn type_markers() -> (&'static str, &'static str) { + F::type_markers() + } + fn body(&self) -> String { + self.fragment.body() + } + fn render(&self) -> String { + self.fragment.render() + } + fn content_metadata(&self) -> ContentItemMetadata { + self.metadata.clone() + } +} + pub(crate) fn matches_marked_text(start_marker: &str, end_marker: &str, text: &str) -> bool { if start_marker.is_empty() || end_marker.is_empty() { return false; diff --git a/codex-rs/context-fragments/src/lib.rs b/codex-rs/context-fragments/src/lib.rs index 5f2b266cf4..f141275e00 100644 --- a/codex-rs/context-fragments/src/lib.rs +++ b/codex-rs/context-fragments/src/lib.rs @@ -8,8 +8,11 @@ mod recap_prompt; pub use additional_context::AdditionalContextDeveloperFragment; pub use additional_context::AdditionalContextUserFragment; pub use annotated_content::AnnotatedContent; +pub use annotated_content::message_from_parts; pub use annotated_content::set_annotated_content; pub use annotated_content::to_annotated_content; +pub use annotated_content::truncate_annotated_text; +pub use fragment::AttributedFragment; pub use fragment::ContextualUserFragment; pub use fragment::RenderedFragment; diff --git a/codex-rs/core/src/agent/control.rs b/codex-rs/core/src/agent/control.rs index 895cd26802..8da7b524c1 100644 --- a/codex-rs/core/src/agent/control.rs +++ b/codex-rs/core/src/agent/control.rs @@ -11,6 +11,7 @@ use crate::agent_communication::AgentCommunicationContext; use crate::agent_communication::AgentCommunicationKind; use crate::config::Config; use crate::config::RolloutBudgetConfig; +use crate::context::ContextualUserFragment; use crate::context::SubagentNotification; use crate::environment_selection::TurnEnvironmentSnapshot; use crate::session::emit_subagent_session_started; @@ -32,6 +33,8 @@ use codex_protocol::error::Result as CodexResult; use codex_protocol::items::SubAgentActivityItem; use codex_protocol::items::TurnItem; use codex_protocol::models::ContentItem; +use codex_protocol::models::ContentItemMetadata; +use codex_protocol::models::ContentItemNamespace; use codex_protocol::models::MessagePhase; use codex_protocol::models::ResponseItem; use codex_protocol::protocol::Event; @@ -550,11 +553,27 @@ impl LocalAgentControl { let Ok(parent_thread) = state.get_thread(parent_thread_id).await else { return; }; + let config = parent_thread.config().await; + let namespace = match parent_thread + .multi_agent_version() + .unwrap_or_else(|| config.multi_agent_version_from_features()) + { + MultiAgentVersion::Disabled => None, + MultiAgentVersion::V1 => Some(ContentItemNamespace::MultiAgentV1), + MultiAgentVersion::V2 => Some( + config + .multi_agent_v2 + .tool_namespace + .clone() + .map(ContentItemNamespace::from) + .unwrap_or(ContentItemNamespace::Functions), + ), + }; parent_thread - .inject_fragment_without_turn(SubagentNotification::new( - child_reference.as_str(), - status, - )) + .inject_fragment_without_turn( + SubagentNotification::new(child_reference.as_str(), status) + .with_metadata(ContentItemMetadata::tool(namespace)), + ) .await; }; tokio::spawn(async move { diff --git a/codex-rs/core/src/client.rs b/codex-rs/core/src/client.rs index 9ef4c05919..0bab5f257a 100644 --- a/codex-rs/core/src/client.rs +++ b/codex-rs/core/src/client.rs @@ -1004,6 +1004,12 @@ impl ModelClient { prefix.push(instructions); } input.splice(0..0, prefix); + if !model_info.use_responses_lite { + // Only RLite accepts per-content attribution until the Responses API schema expands. + for item in &mut input { + item.clear_content_item_metadata(); + } + } if !is_openai { for item in &mut input { item.clear_internal_chat_message_metadata_passthrough(); diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rs index a63dc8f4d2..f52b464936 100644 --- a/codex-rs/core/src/codex_thread.rs +++ b/codex-rs/core/src/codex_thread.rs @@ -1217,6 +1217,7 @@ impl CodexThread { /*requested_timeout*/ None, /*wait_for_server*/ true, ) .await + .map(|call| call.result) } pub fn enabled(&self, feature: Feature) -> bool { diff --git a/codex-rs/core/src/compact.rs b/codex-rs/core/src/compact.rs index 71761349e4..abd7dfd570 100644 --- a/codex-rs/core/src/compact.rs +++ b/codex-rs/core/src/compact.rs @@ -34,6 +34,9 @@ use codex_analytics::CompactionStatus; use codex_analytics::CompactionStrategy; use codex_analytics::CompactionTrigger; use codex_analytics::now_unix_seconds; +use codex_context_fragments::AnnotatedContent; +use codex_context_fragments::set_annotated_content; +use codex_context_fragments::truncate_annotated_text; use codex_history::CodexHarnessMetadata; use codex_history::ResponseItemEnvelope; use codex_protocol::ResponseItemId; @@ -52,9 +55,7 @@ use codex_protocol::protocol::EventMsg; use codex_protocol::protocol::WarningEvent; use codex_protocol::user_input::UserInput; use codex_rollout_trace::InferenceTraceContext; -use codex_utils_output_truncation::TruncationPolicy; use codex_utils_output_truncation::approx_token_count; -use codex_utils_output_truncation::truncate_text; use futures::prelude::*; use tracing::error; @@ -565,8 +566,8 @@ pub fn content_items_to_text(content: &[ContentItem]) -> Option { #[derive(Clone, Debug, PartialEq)] pub(crate) struct CompactedUserMessage<'a> { - // Flattened text is only for the existing budget and truncation policy. - // Whole text messages retain their exact content parts and annotations. + // Flattened text is only for budgeting and recognizing summaries. The + // output is built from original parts, never reconstructed from this text. // Borrow from the history snapshot until selected output is materialized. message: String, original: &'a ResponseItem, @@ -724,41 +725,65 @@ fn build_compacted_history_with_limit( else { continue; }; - let mut passthrough = internal_chat_message_metadata_passthrough.clone(); let mut harness_metadata = message.harness_metadata.cloned(); - let content = if tokens <= remaining + let preserve_content = tokens <= remaining && content .iter() - .all(|part| matches!(part, ContentItem::InputText { .. })) - { - content.clone() - } else { - // Rebuild only the text fallback; never clone discarded media. - if let Some(kinds) = passthrough - .as_mut() - .and_then(|metadata| metadata.content_item_kinds.as_mut()) - { - *kinds = vec![ContentItemKind("user.text".to_owned())]; - } - vec![ContentItem::InputText { - text: truncate_text(&message.message, TruncationPolicy::Tokens(remaining)), - }] + .all(|part| matches!(part, ContentItem::InputText { .. })); + let mut item = ResponseItem::Message { + status: None, + encrypted_content: None, + id: id.clone(), + role: "user".to_owned(), + content: if preserve_content { + content.clone() + } else { + Vec::new() + }, + phase: None, + internal_chat_message_metadata_passthrough: + internal_chat_message_metadata_passthrough.clone(), }; + if !preserve_content { + // Select text and its annotations by the same source index. + // Do not clone discarded images/audio or infer their text's source. + let metadata = internal_chat_message_metadata_passthrough.as_ref(); + let mut parts: Vec<_> = crate::event_mapping::user_input_parts(content) + .filter_map(|(index, part)| { + let ContentItem::InputText { text } = part else { + return None; + }; + let kind = metadata + .and_then(|metadata| metadata.content_item_kinds.as_ref()) + .and_then(|kinds| kinds.get(index)) + .cloned() + .unwrap_or_else(|| ContentItemKind("unknown".to_string())); + let source = metadata + .and_then(|metadata| metadata.content_item_metadata.as_ref()) + .and_then(|sources| sources.get(index)) + .cloned() + .unwrap_or_default(); + Some(AnnotatedContent::text(text, kind, source)) + }) + .collect(); + if parts.is_empty() { + // Preserve the existing empty-text fallback for media-only input. + parts.push(AnnotatedContent::new( + ContentItem::InputText { + text: String::new(), + }, + ContentItemKind("unknown".to_string()), + )); + } + set_annotated_content(&mut item, truncate_annotated_text(parts, remaining)); + } if tokens > remaining && let Some(metadata) = &mut harness_metadata { metadata.mark_retained_sources_incomplete(); } selected_messages.push(ResponseItemEnvelope { - item: ResponseItem::Message { - status: None, - encrypted_content: None, - id: id.clone(), - role: "user".to_owned(), - content, - phase: None, - internal_chat_message_metadata_passthrough: passthrough, - }, + item, metadata: harness_metadata, }); if tokens > remaining { diff --git a/codex-rs/core/src/compact_tests.rs b/codex-rs/core/src/compact_tests.rs index 2b5f93c69e..02be9c3499 100644 --- a/codex-rs/core/src/compact_tests.rs +++ b/codex-rs/core/src/compact_tests.rs @@ -11,6 +11,7 @@ use codex_login::CodexAuth; use codex_model_provider_info::ModelProviderInfo; use codex_protocol::ResponseItemId; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::models::DEFAULT_IMAGE_DETAIL; use codex_protocol::models::ExecutedToolCall; use codex_protocol::models::FunctionCallOutputPayload; @@ -356,6 +357,17 @@ fn collect_annotated_user_messages_extracts_user_text_only( if !preserve_content { item = user_message(expected_text); + if let ResponseItem::Message { + internal_chat_message_metadata_passthrough, + .. + } = &mut item + { + *internal_chat_message_metadata_passthrough = + Some(InternalChatMessageMetadataPassthrough { + content_item_kinds: Some(vec![ContentItemKind("unknown".to_string())]), + ..Default::default() + }); + } } let expected = ResponseItemEnvelope { item, @@ -454,13 +466,35 @@ fn collect_user_messages_filters_legacy_warnings() { ); } -#[test] -fn build_token_limited_compacted_history_truncates_overlong_user_messages() { +#[test_case(1, None; "legacy")] +#[test_case(1, Some(vec![ContentItemMetadata::user()]); "user")] +#[test_case(2, Some(vec![ContentItemMetadata::user(); 2]); "multiple user parts")] +#[test_case(2, Some(vec![ContentItemMetadata::user(), ContentItemMetadata::harness()]); "mixed sources")] +#[test_case(1, Some(vec![ContentItemMetadata::default()]); "unknown")] +#[test_case(1, Some(vec![]); "missing entry")] +#[test_case(1, Some(vec![ContentItemMetadata::user(); 2]); "extra entry")] +fn build_token_limited_compacted_history_truncates_overlong_user_messages( + content_parts: usize, + attribution: Option>, +) { // Use a small truncation limit so the test remains fast while still validating // that oversized user content is truncated. let max_tokens = 16; let big = "word ".repeat(200); let mut original = ResponseItemEnvelope::new(user_message(&big)); + if let ResponseItem::Message { + content, + internal_chat_message_metadata_passthrough, + .. + } = &mut original.item + { + *content = vec![ContentItem::InputText { text: big.clone() }; content_parts]; + *internal_chat_message_metadata_passthrough = + Some(InternalChatMessageMetadataPassthrough { + content_item_metadata: attribution.clone(), + ..Default::default() + }); + } original .item .set_id(Some(ResponseItemId::with_suffix("msg", "long-user"))); @@ -477,7 +511,44 @@ fn build_token_limited_compacted_history_truncates_overlong_user_messages() { let summary_message = &history[1].item; let truncated_text = match truncated_message { - ResponseItem::Message { role, content, .. } if role == "user" => { + ResponseItem::Message { + role, + content, + internal_chat_message_metadata_passthrough, + .. + } if role == "user" => { + let source_at = |index| { + attribution + .as_ref() + .and_then(|sources| sources.get(index)) + .cloned() + .unwrap_or_default() + }; + assert_eq!( + content, + &vec![ + ContentItem::InputText { + text: big[..32].to_string() + }, + ContentItem::InputText { + text: format!("…{} tokens truncated…", 250 * content_parts - max_tokens) + }, + ContentItem::InputText { + text: big[big.len() - 32..].to_string() + }, + ] + ); + assert_eq!( + internal_chat_message_metadata_passthrough + .as_ref() + .unwrap() + .content_item_metadata, + Some(vec![ + source_at(0), + ContentItemMetadata::harness(), + source_at(content_parts - 1) + ]) + ); content_items_to_text(content).unwrap_or_default() } other => panic!("unexpected item in history: {other:?}"), @@ -527,19 +598,29 @@ fn build_token_limited_compacted_history_appends_summary_message() { assert_eq!(summary, summary_text); } -#[test] -fn build_compacted_history_preserves_user_message_passthrough_metadata() { +#[test_case(false; "legacy")] +#[test_case(true; "attributed text with discarded media")] +fn build_compacted_history_preserves_user_message_passthrough_metadata(attributed: bool) { let original = serde_json::from_value(json!({ "type": "message", "role": "user", "id": ResponseItemId::with_suffix("msg", "user"), "content": [ + {"type": "input_text", "text": ""}, {"type": "input_image", "image_url": "file://image.png"}, + {"type": "input_text", "text": ""}, {"type": "input_text", "text": "first user message"}, - {"type": "input_audio", "audio_url": "file://audio.wav"} + {"type": "input_text", "text": ""} ], "internal_chat_message_metadata_passthrough": { "turn_id": "turn-1", - "content_item_kinds": ["user.image", "user.text", "user.audio"] + "content_item_kinds": ["unknown", "user.image", "unknown", "user.text", "unknown", "user.audio", "unknown"], + "content_item_metadata": attributed.then(|| { + let mut sources = vec![ContentItemMetadata::harness(); 7]; + sources[3] = ContentItemMetadata::user(); + sources + }) } })) .unwrap(); @@ -572,6 +653,8 @@ fn build_compacted_history_preserves_user_message_passthrough_metadata() { content_item_kinds: Some(vec![ContentItemKind( "user.text".to_string() )]), + content_item_metadata: attributed + .then(|| vec![ContentItemMetadata::user()]), ..Default::default() }, ), diff --git a/codex-rs/core/src/context/contextual_user_message_tests.rs b/codex-rs/core/src/context/contextual_user_message_tests.rs index cc6772d8f9..5c564fb960 100644 --- a/codex-rs/core/src/context/contextual_user_message_tests.rs +++ b/codex-rs/core/src/context/contextual_user_message_tests.rs @@ -171,6 +171,7 @@ fn detects_hook_prompt_fragment_and_roundtrips_escaping() { vec![HookPromptFragment { text: r#"Retry with "waves" & "#.to_string(), hook_run_id: "hook-run-1".to_string(), + metadata: Default::default(), }], ); assert!(!text.contains(""waves" & ")); diff --git a/codex-rs/core/src/context/current_time_reminder.rs b/codex-rs/core/src/context/current_time_reminder.rs index 2273cbc04c..4eb7ff43a8 100644 --- a/codex-rs/core/src/context/current_time_reminder.rs +++ b/codex-rs/core/src/context/current_time_reminder.rs @@ -3,6 +3,8 @@ use chrono::Utc; use super::ContextualUserFragment; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; +use codex_protocol::models::ContentItemNamespace; pub(crate) struct CurrentTimeReminder { current_time: DateTime, @@ -21,6 +23,10 @@ impl CurrentTimeReminder { } impl ContextualUserFragment for CurrentTimeReminder { + fn content_metadata(&self) -> ContentItemMetadata { + ContentItemMetadata::tool(Some(ContentItemNamespace::Clock)) + } + fn content_kind(&self) -> ContentItemKind { ContentItemKind("current_time.reminder".to_string()) } @@ -49,6 +55,10 @@ impl CurrentTimeUnavailable { } impl ContextualUserFragment for CurrentTimeUnavailable { + fn content_metadata(&self) -> ContentItemMetadata { + ContentItemMetadata::tool(Some(ContentItemNamespace::Clock)) + } + fn content_kind(&self) -> ContentItemKind { ContentItemKind("current_time.unavailable".to_string()) } diff --git a/codex-rs/core/src/context/developer_instructions.rs b/codex-rs/core/src/context/developer_instructions.rs index 6ccb83e85a..bd42a600fc 100644 --- a/codex-rs/core/src/context/developer_instructions.rs +++ b/codex-rs/core/src/context/developer_instructions.rs @@ -1,5 +1,6 @@ use super::ContextualUserFragment; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; #[derive(Debug, Clone, PartialEq, Eq)] pub(crate) struct DeveloperInstructions { @@ -15,6 +16,10 @@ impl DeveloperInstructions { } impl ContextualUserFragment for DeveloperInstructions { + fn content_metadata(&self) -> ContentItemMetadata { + ContentItemMetadata::developer_instructions(/*from_additional_requirements*/ false) + } + fn content_kind(&self) -> ContentItemKind { ContentItemKind("generic.developer_instructions".to_string()) } diff --git a/codex-rs/core/src/context/hook_additional_context.rs b/codex-rs/core/src/context/hook_additional_context.rs index 9fe2bcc299..d3117c2e9d 100644 --- a/codex-rs/core/src/context/hook_additional_context.rs +++ b/codex-rs/core/src/context/hook_additional_context.rs @@ -1,14 +1,16 @@ use super::ContextualUserFragment; +use codex_hooks::HookContext; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; #[derive(Debug, Clone, PartialEq)] pub(crate) struct HookAdditionalContext { - text: String, + context: HookContext, } impl HookAdditionalContext { - pub(crate) fn new(text: impl Into) -> Self { - Self { text: text.into() } + pub(crate) fn new(context: HookContext) -> Self { + Self { context } } } @@ -30,6 +32,10 @@ impl ContextualUserFragment for HookAdditionalContext { } fn body(&self) -> String { - self.text.clone() + self.context.text.clone() + } + + fn content_metadata(&self) -> ContentItemMetadata { + self.context.metadata.clone() } } diff --git a/codex-rs/core/src/context/token_budget_context.rs b/codex-rs/core/src/context/token_budget_context.rs index dd984505b0..04fb4cb549 100644 --- a/codex-rs/core/src/context/token_budget_context.rs +++ b/codex-rs/core/src/context/token_budget_context.rs @@ -3,8 +3,12 @@ use super::world_state::PreviousSectionState; use super::world_state::WorldStateSection; use crate::context::world_state::SectionTransition; use crate::context::world_state::WorldStateUpdate; +use codex_context_fragments::AnnotatedContent; +use codex_context_fragments::message_from_parts; use codex_protocol::AgentPath; +use codex_protocol::models::ContentItem; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ResponseItem; use codex_protocol::protocol::CONTEXT_WINDOW_CLOSE_TAG; use codex_protocol::protocol::CONTEXT_WINDOW_GUIDANCE_CLOSE_TAG; use codex_protocol::protocol::CONTEXT_WINDOW_GUIDANCE_OPEN_TAG; @@ -17,7 +21,6 @@ pub(crate) struct TokenBudgetContext { first_window_id: Uuid, previous_window_id: Option, window_id: Uuid, - thread_hint: Option, } impl TokenBudgetContext { @@ -26,16 +29,39 @@ impl TokenBudgetContext { first_window_id: Uuid, previous_window_id: Option, window_id: Uuid, - thread_hint: Option, ) -> Self { Self { agent_path, first_window_id, previous_window_id, window_id, - thread_hint, } } + + /// Wraps tool hints without losing their source or changing the concatenated prompt text. + pub(crate) fn render_with_hints(&self, hints: Vec) -> ResponseItem { + if hints.is_empty() { + return ContextualUserFragment::into(self.clone()); + } + let mut content = vec![AnnotatedContent::text( + format!("{CONTEXT_WINDOW_OPEN_TAG}{}", self.body()), + self.content_kind(), + self.content_metadata(), + )]; + for mut part in hints { + let ContentItem::InputText { text } = part.content_mut() else { + unreachable!("context-window hints are text prompt fragments"); + }; + text.push('\n'); + content.push(part); + } + content.push(AnnotatedContent::text( + CONTEXT_WINDOW_CLOSE_TAG, + self.content_kind(), + self.content_metadata(), + )); + message_from_parts(self.role(), content) + } } impl ContextualUserFragment for TokenBudgetContext { @@ -66,9 +92,6 @@ impl ContextualUserFragment for TokenBudgetContext { if let Some(previous_window_id) = self.previous_window_id { lines.push(format!("Previous context window id: {previous_window_id}")); } - if let Some(thread_hint) = &self.thread_hint { - lines.push(thread_hint.clone()); - } format!("\n{}\n", lines.join("\n")) } } diff --git a/codex-rs/core/src/context/user_instructions.rs b/codex-rs/core/src/context/user_instructions.rs index f75cb24d57..2ceecbf7c5 100644 --- a/codex-rs/core/src/context/user_instructions.rs +++ b/codex-rs/core/src/context/user_instructions.rs @@ -1,5 +1,6 @@ use super::ContextualUserFragment; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; #[derive(Debug, Clone, PartialEq)] pub(crate) struct UserInstructions { @@ -8,6 +9,10 @@ pub(crate) struct UserInstructions { } impl ContextualUserFragment for UserInstructions { + fn content_metadata(&self) -> ContentItemMetadata { + ContentItemMetadata::agents_md() + } + fn content_kind(&self) -> ContentItemKind { ContentItemKind("agents_md.instructions".to_string()) } diff --git a/codex-rs/core/src/context/world_state/managed_developer_instructions.rs b/codex-rs/core/src/context/world_state/managed_developer_instructions.rs index e59bcef834..be5bc85f5f 100644 --- a/codex-rs/core/src/context/world_state/managed_developer_instructions.rs +++ b/codex-rs/core/src/context/world_state/managed_developer_instructions.rs @@ -6,6 +6,7 @@ use super::WorldStateUpdate; use crate::context::ContextualUserFragment; use codex_config::Sourced; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; use codex_utils_string::approx_bytes_for_tokens; use codex_utils_string::approx_tokens_from_byte_count; use serde::Deserialize; @@ -24,6 +25,10 @@ pub(crate) struct ManagedDeveloperInstructions { } impl ContextualUserFragment for ManagedDeveloperInstructions { + fn content_metadata(&self) -> ContentItemMetadata { + ContentItemMetadata::developer_instructions(/*from_additional_requirements*/ true) + } + fn content_kind(&self) -> ContentItemKind { ContentItemKind("managed_config.developer_instructions".to_string()) } diff --git a/codex-rs/core/src/context/world_state/mod.rs b/codex-rs/core/src/context/world_state/mod.rs index 857649f662..6a23a30c15 100644 --- a/codex-rs/core/src/context/world_state/mod.rs +++ b/codex-rs/core/src/context/world_state/mod.rs @@ -278,6 +278,10 @@ struct WorldStateContextFragment { } impl ContextualUserFragment for WorldStateContextFragment { + fn content_metadata(&self) -> codex_protocol::models::ContentItemMetadata { + self.fragment.metadata().clone() + } + fn content_kind(&self) -> ContentItemKind { self.content_kind.clone() } diff --git a/codex-rs/core/src/context/world_state/model_catalog.rs b/codex-rs/core/src/context/world_state/model_catalog.rs index b46c9bf774..3f768b3b21 100644 --- a/codex-rs/core/src/context/world_state/model_catalog.rs +++ b/codex-rs/core/src/context/world_state/model_catalog.rs @@ -12,6 +12,8 @@ use crate::agent::child_config::model_supports_multi_agent_backend; use crate::context::ContextualUserFragment; use crate::context::environment_context::push_xml_escaped_text; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; +use codex_protocol::models::ContentItemNamespace; use codex_protocol::openai_models::ModelPreset; use codex_protocol::protocol::MultiAgentVersion; @@ -24,6 +26,7 @@ const OMITTED_NOTICE: &str = "Additional model choices omitted.\n"; #[derive(Clone, Default)] pub(crate) struct ModelCatalogState { catalog: String, + namespace: Option, } impl ModelCatalogState { @@ -82,11 +85,23 @@ impl ModelCatalogState { catalog.push_str(&escaped); catalog.push('\n'); } - Self { catalog } + Self { + catalog, + namespace: None, + } + } + + pub(crate) fn with_namespace(mut self, namespace: Option) -> Self { + self.namespace = namespace; + self } } impl ContextualUserFragment for ModelCatalogState { + fn content_metadata(&self) -> ContentItemMetadata { + ContentItemMetadata::tool(self.namespace.clone()) + } + fn content_kind(&self) -> ContentItemKind { ContentItemKind("multi_agent.model_catalog".to_string()) } diff --git a/codex-rs/core/src/context/world_state/multi_agent_mode.rs b/codex-rs/core/src/context/world_state/multi_agent_mode.rs index 4a575da4d3..3ff875db45 100644 --- a/codex-rs/core/src/context/world_state/multi_agent_mode.rs +++ b/codex-rs/core/src/context/world_state/multi_agent_mode.rs @@ -7,6 +7,8 @@ use super::multi_agent_usage_hint::MultiAgentUsageHintState; use crate::context::ContextualUserFragment; use crate::context::multi_agent_mode_instructions::MultiAgentModeInstructions; use codex_protocol::config_types::MultiAgentMode; +use codex_protocol::models::ContentItemMetadata; +use codex_protocol::models::ContentItemNamespace; use codex_utils_output_truncation::TruncationPolicy; use codex_utils_output_truncation::truncate_text; use serde::Deserialize; @@ -20,6 +22,8 @@ pub(crate) struct MultiAgentModeState { mode: Option, #[serde(default, skip_serializing_if = "Option::is_none")] usage_hint_hash: Option, + #[serde(skip)] + namespace: Option, } impl MultiAgentModeState { @@ -33,9 +37,15 @@ impl MultiAgentModeState { mode @ (MultiAgentMode::ExplicitRequestOnly | MultiAgentMode::Proactive) => mode, }), usage_hint_hash: None, + namespace: None, } } + pub(crate) fn with_namespace(mut self, namespace: ContentItemNamespace) -> Self { + self.namespace = Some(namespace); + self + } + pub(crate) fn with_usage_hint(mut self, usage_hint: &MultiAgentUsageHintState) -> Self { self.usage_hint_hash = Some(usage_hint.fingerprint.clone()); self @@ -81,8 +91,10 @@ impl WorldStateSection for MultiAgentModeState { } }; - let fragment = MultiAgentModeInstructions::from_mode(mode) - .map(|instructions| Box::new(instructions) as Box); + let fragment = MultiAgentModeInstructions::from_mode(mode).map(|instructions| { + Box::new(instructions.with_metadata(ContentItemMetadata::tool(self.namespace.clone()))) + as Box + }); ( Some(self.clone()), WorldStateUpdate::optional_boxed_fragment(fragment), diff --git a/codex-rs/core/src/context/world_state/multi_agent_mode_tests.rs b/codex-rs/core/src/context/world_state/multi_agent_mode_tests.rs index 041b765459..4897929f16 100644 --- a/codex-rs/core/src/context/world_state/multi_agent_mode_tests.rs +++ b/codex-rs/core/src/context/world_state/multi_agent_mode_tests.rs @@ -136,8 +136,12 @@ fn catalog_role_updates_remain_separate_from_active_mode() { assert_eq!( updates, vec![ - ContextualUserFragment::into(current_role), - ContextualUserFragment::into(expected_mode), + ContextualUserFragment::into(current_role.with_metadata( + codex_protocol::models::ContentItemMetadata::tool(/*namespace*/ None) + )), + ContextualUserFragment::into(expected_mode.with_metadata( + codex_protocol::models::ContentItemMetadata::tool(/*namespace*/ None) + )), ], ); } diff --git a/codex-rs/core/src/context/world_state/multi_agent_usage_hint.rs b/codex-rs/core/src/context/world_state/multi_agent_usage_hint.rs index 42892220ca..77d65dc277 100644 --- a/codex-rs/core/src/context/world_state/multi_agent_usage_hint.rs +++ b/codex-rs/core/src/context/world_state/multi_agent_usage_hint.rs @@ -6,12 +6,15 @@ use super::WorldStateUpdate; use crate::context::ContextualUserFragment; use crate::context::MultiAgentRoleInstructions; use crate::context::MultiAgentUsageHint; +use codex_protocol::models::ContentItemMetadata; +use codex_protocol::models::ContentItemNamespace; /// Configured or model-owned multi-agent instructions currently visible to the model. #[derive(Clone, Debug)] pub(crate) struct MultiAgentUsageHintState { instructions: MultiAgentRoleInstructions, pub(super) fingerprint: WorldStateHash, + namespace: Option, } impl MultiAgentUsageHintState { @@ -20,8 +23,14 @@ impl MultiAgentUsageHintState { Self { instructions, fingerprint, + namespace: None, } } + + pub(crate) fn with_namespace(mut self, namespace: ContentItemNamespace) -> Self { + self.namespace = Some(namespace); + self + } } impl WorldStateSection for MultiAgentUsageHintState { @@ -43,11 +52,14 @@ impl WorldStateSection for MultiAgentUsageHintState { PreviousSectionState::Unknown => None, PreviousSectionState::Known(_) | PreviousSectionState::Absent => { if self.instructions.markers().0.is_empty() { - Some(Box::new(MultiAgentUsageHint::new( - &self.instructions.body(), - ))) + Some(Box::new( + MultiAgentUsageHint::new(&self.instructions.body()) + .with_metadata(ContentItemMetadata::tool(self.namespace.clone())), + )) } else { - Some(Box::new(self.instructions.clone())) + Some(Box::new(self.instructions.clone().with_metadata( + ContentItemMetadata::tool(self.namespace.clone()), + ))) } } }; diff --git a/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__top_level_tools__tests__snapshots_namespace_transitions.snap b/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__top_level_tools__tests__snapshots_namespace_transitions.snap index 413a35bb53..b3a5073648 100644 --- a/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__top_level_tools__tests__snapshots_namespace_transitions.snap +++ b/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__top_level_tools__tests__snapshots_namespace_transitions.snap @@ -74,6 +74,14 @@ None "internal_chat_message_metadata_passthrough": { "content_item_kinds": [ "tools.incremental_update" + ], + "content_item_metadata": [ + { + "provenance": { + "hook": false, + "type": "harness" + } + } ] }, "role": "developer", @@ -134,6 +142,14 @@ The following namespaces are no longer available. Do not call tools in them unle "internal_chat_message_metadata_passthrough": { "content_item_kinds": [ "tools.incremental_update" + ], + "content_item_metadata": [ + { + "provenance": { + "hook": false, + "type": "harness" + } + } ] }, "role": "developer", @@ -208,6 +224,14 @@ None "internal_chat_message_metadata_passthrough": { "content_item_kinds": [ "tools.incremental_update" + ], + "content_item_metadata": [ + { + "provenance": { + "hook": false, + "type": "harness" + } + } ] }, "role": "developer", diff --git a/codex-rs/core/src/context/world_state/tools.rs b/codex-rs/core/src/context/world_state/tools.rs index 74582ab77d..de2757e07d 100644 --- a/codex-rs/core/src/context/world_state/tools.rs +++ b/codex-rs/core/src/context/world_state/tools.rs @@ -8,12 +8,15 @@ use super::SectionTransition; use super::WorldStateContextFragment; use super::WorldStateSection; use super::WorldStateUpdate; +use crate::context::ContextualUserFragment; use codex_extension_api::ExtensionMetrics; use codex_extension_api::RenderedWorldStateFragment; use codex_otel::THREAD_TOOLS_FRAGMENT_BYTES_METRIC; use codex_otel::THREAD_TOOLS_METRIC_BUCKETS; use codex_otel::THREAD_TOOLS_NAMESPACES_TOTAL_METRIC; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; +use codex_protocol::models::ContentItemNamespace; use codex_protocol::protocol::TOOLS_CLOSE_TAG; use codex_protocol::protocol::TOOLS_OPEN_TAG; use std::collections::BTreeMap; @@ -138,14 +141,19 @@ impl WorldStateSection for ToolsState { record_fragment_metrics(self.metrics.as_ref(), previous, &rendered); ( Some(current), - vec![WorldStateUpdate::fragment(WorldStateContextFragment { - fragment: RenderedWorldStateFragment::new( - "developer", - (TOOLS_OPEN_TAG, TOOLS_CLOSE_TAG), - rendered.body, - ), - content_kind: ContentItemKind("tools.deferred_namespaces".to_string()), - })], + vec![WorldStateUpdate::fragment( + WorldStateContextFragment { + fragment: RenderedWorldStateFragment::new( + "developer", + (TOOLS_OPEN_TAG, TOOLS_CLOSE_TAG), + rendered.body, + ), + content_kind: ContentItemKind("tools.deferred_namespaces".to_string()), + } + .with_metadata(ContentItemMetadata::tool(Some( + ContentItemNamespace::ToolSearch, + ))), + )], ) } } diff --git a/codex-rs/core/src/context/world_state/top_level_tools.rs b/codex-rs/core/src/context/world_state/top_level_tools.rs index e046f193e9..89881fca9f 100644 --- a/codex-rs/core/src/context/world_state/top_level_tools.rs +++ b/codex-rs/core/src/context/world_state/top_level_tools.rs @@ -17,6 +17,7 @@ use codex_prompts::ResolvedIncrementalToolMessages; use codex_protocol::error::CodexErrorDetails; use codex_protocol::error::Result; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::models::ResponseItem; use serde_json::Value; use std::collections::BTreeMap; @@ -187,8 +188,11 @@ impl WorldStateSection for TopLevelToolsState { text }; if !text.is_empty() { - namespace_updates - .push(WorldStateUpdate::fragment(DeveloperInstructions::new(text))); + namespace_updates.push(WorldStateUpdate::fragment( + DeveloperInstructions::new(text).with_metadata(ContentItemMetadata::tool( + Some(name.to_string().into()), + )), + )); } } } diff --git a/codex-rs/core/src/context/world_state/top_level_tools_tests.rs b/codex-rs/core/src/context/world_state/top_level_tools_tests.rs index d205e37a1f..210abce3c9 100644 --- a/codex-rs/core/src/context/world_state/top_level_tools_tests.rs +++ b/codex-rs/core/src/context/world_state/top_level_tools_tests.rs @@ -458,9 +458,13 @@ fn namespace_description_change_does_not_repeat_unchanged_tools( if expected.is_empty() { Vec::new() } else { - vec![ContextualUserFragment::into(DeveloperInstructions::new( - expected, - ))] + vec![ContextualUserFragment::into( + DeveloperInstructions::new(expected).with_metadata( + codex_protocol::models::ContentItemMetadata::tool(Some( + codex_protocol::models::ContentItemNamespace::Functions, + )), + ), + )] } ); assert!( diff --git a/codex-rs/core/src/context/world_state/world_state_tests.rs b/codex-rs/core/src/context/world_state/world_state_tests.rs index 8e9769394b..22376209f7 100644 --- a/codex-rs/core/src/context/world_state/world_state_tests.rs +++ b/codex-rs/core/src/context/world_state/world_state_tests.rs @@ -192,11 +192,14 @@ fn extension_owned_section_uses_its_stable_id_as_content_kind_feature() { world_state.add_extension_section(WorldStateSectionContribution::new("extension_test", |_| { ( Some(json!({"value": "after"})), - Some(RenderedWorldStateFragment::new( - "developer", - ("", ""), - "after", - )), + Some( + RenderedWorldStateFragment::new( + "developer", + ("", ""), + "after", + ) + .with_metadata(codex_protocol::models::ContentItemMetadata::skills()), + ), ) })); @@ -211,9 +214,10 @@ fn extension_owned_section_uses_its_stable_id_as_content_kind_feature() { .collect::>(), vec![( "developer", - AnnotatedContent::input_text( + AnnotatedContent::text( "after", ContentItemKind("extension_test.instructions".to_string()), + codex_protocol::models::ContentItemMetadata::skills(), ), )] ); diff --git a/codex-rs/core/src/context_manager/history_tests.rs b/codex-rs/core/src/context_manager/history_tests.rs index 8f22910ed2..f657b5f79e 100644 --- a/codex-rs/core/src/context_manager/history_tests.rs +++ b/codex-rs/core/src/context_manager/history_tests.rs @@ -46,6 +46,8 @@ use image::Luma; use image::Rgba; use pretty_assertions::assert_eq; use regex_lite::Regex; +use serde_json::from_value; +use serde_json::json; use test_case::test_case; const EXEC_FORMAT_MAX_BYTES: usize = 10_000; @@ -1297,6 +1299,10 @@ fn for_prompt_strips_media_when_model_does_not_support_it() { ContentItemKind("audio.unsupported".to_string()), ContentItemKind("user.text".to_string()), ]), + content_item_metadata: from_value(json!([ + {}, {"harness_injected": true}, {"harness_injected": true}, {} + ])) + .unwrap(), ..Default::default() }, ), diff --git a/codex-rs/core/src/context_manager/updates.rs b/codex-rs/core/src/context_manager/updates.rs index 1052d92d9a..fa3ded9147 100644 --- a/codex-rs/core/src/context_manager/updates.rs +++ b/codex-rs/core/src/context_manager/updates.rs @@ -4,29 +4,18 @@ use crate::context::world_state::Placement; use crate::context::world_state::WorldStateUpdate; use crate::context::world_state::WorldStateUpdateContent; use codex_context_fragments::RenderedFragment; -use codex_protocol::models::InternalChatMessageMetadataPassthrough; +use codex_context_fragments::message_from_parts; use codex_protocol::models::ResponseItem; pub(crate) fn build_rendered_message(fragments: Vec) -> Option { let role = fragments.first()?.role(); debug_assert!(fragments.iter().all(|fragment| fragment.role() == role)); - let (content, content_item_kinds): (Vec<_>, Vec<_>) = fragments + let content = fragments .into_iter() - .map(|fragment| fragment.into_parts().1.into_parts()) - .unzip(); + .map(|fragment| fragment.into_parts().1) + .collect(); - Some(ResponseItem::Message { - status: None, - encrypted_content: None, - id: None, - role: role.to_string(), - content, - phase: None, - internal_chat_message_metadata_passthrough: Some(InternalChatMessageMetadataPassthrough { - content_item_kinds: Some(content_item_kinds), - ..Default::default() - }), - }) + Some(message_from_parts(role, content)) } pub(crate) fn merge_world_state_updates(updates: Vec) -> Vec { diff --git a/codex-rs/core/src/context_manager/updates_tests.rs b/codex-rs/core/src/context_manager/updates_tests.rs index 50472118bc..357c04e302 100644 --- a/codex-rs/core/src/context_manager/updates_tests.rs +++ b/codex-rs/core/src/context_manager/updates_tests.rs @@ -4,6 +4,7 @@ use super::*; use crate::context::ContextualUserFragment; use codex_protocol::models::ContentItem; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::InternalChatMessageMetadataPassthrough; use pretty_assertions::assert_eq; use serde_json::json; @@ -44,6 +45,7 @@ fn fragment(role: &'static str, text: &'static str) -> TestFragment { } fn message(role: &str, texts: &[&str]) -> ResponseItem { + let provenance = serde_json::from_value(json!({"harness_injected": true})).unwrap(); ResponseItem::Message { status: None, encrypted_content: None, @@ -57,6 +59,7 @@ fn message(role: &str, texts: &[&str]) -> ResponseItem { .collect(), phase: None, internal_chat_message_metadata_passthrough: Some(InternalChatMessageMetadataPassthrough { + content_item_metadata: Some(vec![provenance; texts.len()]), content_item_kinds: Some( texts .iter() diff --git a/codex-rs/core/src/event_mapping.rs b/codex-rs/core/src/event_mapping.rs index c0fe8308fa..482614699a 100644 --- a/codex-rs/core/src/event_mapping.rs +++ b/codex-rs/core/src/event_mapping.rs @@ -95,6 +95,36 @@ fn is_contextual_dev_fragment(content_item: &ContentItem) -> bool { }) } +/// User-input parts with their original indices. Media wrapper labels are not +/// user text; retain the indices so history edits can carry the right annotations. +pub(crate) fn user_input_parts( + message: &[ContentItem], +) -> impl Iterator { + message + .iter() + .enumerate() + .filter(|(idx, content_item)| match content_item { + ContentItem::InputText { text } => { + let is_image_label = ((is_local_image_open_tag_text(text) + || is_image_open_tag_text(text)) + && matches!(message.get(idx + 1), Some(ContentItem::InputImage { .. }))) + || (*idx > 0 + && (is_local_image_close_tag_text(text) || is_image_close_tag_text(text)) + && matches!(message.get(idx - 1), Some(ContentItem::InputImage { .. }))); + let is_audio_label = ((is_local_audio_open_tag_text(text) + || is_audio_open_tag_text(text)) + && matches!(message.get(idx + 1), Some(ContentItem::InputAudio { .. }))) + || (*idx > 0 + && (is_local_audio_close_tag_text(text) || is_audio_close_tag_text(text)) + && matches!(message.get(idx - 1), Some(ContentItem::InputAudio { .. }))); + !is_image_label && !is_audio_label + } + ContentItem::InputImage { .. } + | ContentItem::InputAudio { .. } + | ContentItem::OutputText { .. } => true, + }) +} + fn parse_user_message(message: &[ContentItem]) -> Option { if is_contextual_user_message_content(message) { return None; @@ -102,24 +132,9 @@ fn parse_user_message(message: &[ContentItem]) -> Option { let mut content: Vec = Vec::new(); - for (idx, content_item) in message.iter().enumerate() { + for (_, content_item) in user_input_parts(message) { match content_item { ContentItem::InputText { text } => { - let is_image_label = ((is_local_image_open_tag_text(text) - || is_image_open_tag_text(text)) - && matches!(message.get(idx + 1), Some(ContentItem::InputImage { .. }))) - || (idx > 0 - && (is_local_image_close_tag_text(text) || is_image_close_tag_text(text)) - && matches!(message.get(idx - 1), Some(ContentItem::InputImage { .. }))); - let is_audio_label = ((is_local_audio_open_tag_text(text) - || is_audio_open_tag_text(text)) - && matches!(message.get(idx + 1), Some(ContentItem::InputAudio { .. }))) - || (idx > 0 - && (is_local_audio_close_tag_text(text) || is_audio_close_tag_text(text)) - && matches!(message.get(idx - 1), Some(ContentItem::InputAudio { .. }))); - if is_image_label || is_audio_label { - continue; - } content.push(UserInput::Text { text: text.clone(), // Model input content does not carry UI element ranges. diff --git a/codex-rs/core/src/event_mapping_tests.rs b/codex-rs/core/src/event_mapping_tests.rs index 853f652691..053efd660d 100644 --- a/codex-rs/core/src/event_mapping_tests.rs +++ b/codex-rs/core/src/event_mapping_tests.rs @@ -453,6 +453,7 @@ fn parses_hook_prompt_message_as_distinct_turn_item() { HookPromptFragment { text: "Retry with exactly the phrase meow meow meow.".to_string(), hook_run_id: "hook-run-1".to_string(), + metadata: Default::default(), } ); } @@ -490,6 +491,7 @@ fn parses_hook_prompt_and_hides_other_contextual_fragments() { vec![HookPromptFragment { text: "Retry with care & joy.".to_string(), hook_run_id: "hook-run-1".to_string(), + metadata: Default::default(), }] ); } diff --git a/codex-rs/core/src/hook_mcp_executor.rs b/codex-rs/core/src/hook_mcp_executor.rs index 7fa0b78d42..279da61394 100644 --- a/codex-rs/core/src/hook_mcp_executor.rs +++ b/codex-rs/core/src/hook_mcp_executor.rs @@ -3,6 +3,7 @@ use std::sync::Arc; use anyhow::bail; use codex_hooks::HookMcpCall; use codex_hooks::HookMcpExecutor; +use codex_hooks::HookMcpOutput; use codex_mcp::McpRuntime; use codex_protocol::ThreadId; use futures::FutureExt; @@ -16,7 +17,7 @@ pub(crate) struct CoreHookMcpExecutor { } impl HookMcpExecutor for CoreHookMcpExecutor { - fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result> { + fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result> { async move { let mut metadata = call.metadata.unwrap_or_default(); metadata.insert( @@ -24,7 +25,7 @@ impl HookMcpExecutor for CoreHookMcpExecutor { Value::String(self.thread_id.to_string()), ); - let result = self + let call_result = self .runtime .latest_call_tool( &call.server, @@ -36,6 +37,7 @@ impl HookMcpExecutor for CoreHookMcpExecutor { /*wait_for_server*/ false, ) .await?; + let result = call_result.result; let text = result .content .iter() @@ -50,7 +52,10 @@ impl HookMcpExecutor for CoreHookMcpExecutor { bail!("MCP tool returned an error: {text}"); } - Ok(text) + Ok(HookMcpOutput { + text, + source_tool_namespace: call_result.source_tool_namespace, + }) } .boxed() } diff --git a/codex-rs/core/src/hook_runtime.rs b/codex-rs/core/src/hook_runtime.rs index 1eb54fa25b..4cbb06f81f 100644 --- a/codex-rs/core/src/hook_runtime.rs +++ b/codex-rs/core/src/hook_runtime.rs @@ -75,7 +75,7 @@ use crate::turn_metadata::ExecutionMetadata; pub(crate) struct HookRuntimeOutcome { pub should_stop: bool, - pub additional_contexts: Vec, + pub additional_contexts: Vec, } pub(crate) enum PreToolUseHookResult { @@ -718,7 +718,7 @@ pub(crate) async fn record_pending_input( turn_context: &Arc, model_info: &ModelInfo, pending_input: TurnInput, - additional_contexts: Vec, + additional_contexts: Vec, persist_context: PersistContext, ) { match pending_input { @@ -790,7 +790,10 @@ pub(crate) async fn drain_async_hook_results( .entries .iter() .filter(|entry| entry.kind == HookOutputEntryKind::Context) - .map(|entry| entry.text.clone()) + .map(|entry| codex_hooks::HookContext { + text: entry.text.clone(), + metadata: codex_protocol::models::ContentItemMetadata::command_hook(), + }) .collect::>(); if before_user_prompt { @@ -849,7 +852,7 @@ impl HookRuntimeOutcome { pub(crate) async fn record_additional_contexts( sess: &Arc, turn_context: &Arc, - additional_contexts: Vec, + additional_contexts: Vec, ) { let developer_messages = additional_context_messages(additional_contexts); if developer_messages.is_empty() { @@ -864,7 +867,9 @@ pub(crate) async fn record_additional_contexts( .await; } -fn additional_context_messages(additional_contexts: Vec) -> Vec { +fn additional_context_messages( + additional_contexts: Vec, +) -> Vec { additional_contexts .into_iter() .map(HookAdditionalContext::new) @@ -1104,8 +1109,8 @@ mod tests { #[test] fn additional_context_messages_stay_separate_and_ordered() { let messages = additional_context_messages(vec![ - "first tide note".to_string(), - "second tide note".to_string(), + codex_hooks::HookContext::harness("first tide note".to_string()), + codex_hooks::HookContext::harness("second tide note".to_string()), ]); assert_eq!(messages.len(), 2); diff --git a/codex-rs/core/src/image_preparation.rs b/codex-rs/core/src/image_preparation.rs index e3be1a0612..ae7e97f9db 100644 --- a/codex-rs/core/src/image_preparation.rs +++ b/codex-rs/core/src/image_preparation.rs @@ -283,9 +283,10 @@ async fn prepare_message_content( Ok(_) => {} Err(error) => { warn!(%error, "failed to prepare message image"); - *item = AnnotatedContent::input_text( + *item = AnnotatedContent::text( error.placeholder(), ContentItemKind("images.preparation_error".to_string()), + codex_protocol::models::ContentItemMetadata::harness(), ); } } diff --git a/codex-rs/core/src/image_preparation_tests.rs b/codex-rs/core/src/image_preparation_tests.rs index f890b48e20..72f2a0420e 100644 --- a/codex-rs/core/src/image_preparation_tests.rs +++ b/codex-rs/core/src/image_preparation_tests.rs @@ -20,6 +20,8 @@ use image::ImageBuffer; use image::ImageFormat; use image::Rgba; use pretty_assertions::assert_eq; +use serde_json::from_value; +use serde_json::json; use super::*; @@ -144,6 +146,7 @@ async fn preparation_preserves_small_image_bytes_and_replaces_remote_urls() { content_item_kinds: Some(vec![ContentItemKind( "images.preparation_error".to_string() )]), + content_item_metadata: from_value(json!([{"harness_injected": true}])).unwrap(), ..Default::default() } ), @@ -425,6 +428,8 @@ async fn resize_notices_count_file_backed_images_and_skip_failed_images() { ContentItemKind("images.preparation_error".to_string()), ContentItemKind("user.image".to_string()), ]), + content_item_metadata: from_value(json!([{}, {}, {"harness_injected": true}, {}])) + .unwrap(), ..Default::default() }), ); @@ -481,6 +486,7 @@ async fn resize_notices_count_file_backed_images_and_skip_failed_images() { content_item_kinds: Some(vec![ContentItemKind( "images.resize_notice".to_string() )]), + content_item_metadata: from_value(json!([{"harness_injected": true}])).unwrap(), ..Default::default() }, ), @@ -536,6 +542,7 @@ async fn resize_notices_count_file_backed_images_and_skip_failed_images() { content_item_kinds: Some(vec![ContentItemKind( "images.resize_notice".to_string() )]), + content_item_metadata: from_value(json!([{"harness_injected": true}])).unwrap(), ..Default::default() }, ), diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index 9b00655edb..b285c606be 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -131,6 +131,8 @@ use codex_protocol::models::BaseInstructions; use codex_protocol::models::BaseInstructionsProvenance; use codex_protocol::models::ContentItem; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; +use codex_protocol::models::ContentItemNamespace; use codex_protocol::models::ImageReference; use codex_protocol::models::InternalChatMessageMetadataPassthrough; use codex_protocol::models::PermissionProfile; @@ -3598,6 +3600,7 @@ impl Session { *internal_chat_message_metadata_passthrough = Some(InternalChatMessageMetadataPassthrough { content_item_kinds: Some(content_item_kinds), + content_item_metadata: Some(vec![ContentItemMetadata::user(); content.len()]), ..Default::default() }); } @@ -4045,7 +4048,31 @@ impl Session { model_info: &ModelInfo, communication: InterAgentCommunication, ) { - let response_item = communication.to_model_input_item(); + let mut response_item = communication.to_model_input_item(); + if let ResponseItem::AgentMessage { + content, + internal_chat_message_metadata_passthrough, + .. + } = &mut response_item + { + internal_chat_message_metadata_passthrough + .get_or_insert_default() + .content_item_metadata + .get_or_insert_with(|| { + vec![ + ContentItemMetadata::tool(Some( + turn_context + .config + .multi_agent_v2 + .tool_namespace + .clone() + .map(ContentItemNamespace::from) + .unwrap_or(ContentItemNamespace::Functions), + )); + content.len() + ] + }); + } let (items, _) = self .prepare_conversation_items_for_history( turn_context, @@ -4448,7 +4475,7 @@ impl Session { let turn_context = step_context.turn.as_ref(); let mut developer_sections = Vec::::with_capacity(8); let mut contextual_user_sections = Vec::::with_capacity(2); - let mut separate_developer_sections = Vec::::new(); + let mut separate_developer_messages = Vec::::new(); let mut context_window_hints = Vec::new(); let (session_source, auto_compact_window_ids) = { let state = self.state.lock().await; @@ -4505,7 +4532,7 @@ impl Session { { match fragment.slot() { PromptSlot::ContextWindow => { - context_window_hints.push(fragment.text().to_string()); + context_window_hints.push(fragment.into_content()); } PromptSlot::DeveloperPolicy | PromptSlot::DeveloperCapabilities => { developer_sections.push(fragment.into()); @@ -4543,7 +4570,7 @@ impl Session { .token_budget .as_ref() .is_some_and(|config| config.use_history_notes_extension) - && let Some(mcp_result) = self + && let Some((text, source_tool_namespace)) = self .services .mcp_runtime .latest_call_tool( @@ -4559,8 +4586,9 @@ impl Session { ) .await .ok() - .and_then(|result| { - let text = result + .and_then(|call| { + let text = call + .result .content .iter() .filter_map(|content| { @@ -4569,12 +4597,16 @@ impl Session { .filter(|text| !text.is_empty()) .collect::>() .join("\n"); - (!text.is_empty()).then_some(text) + (!text.is_empty()).then_some((text, call.source_tool_namespace)) }) { - context_window_hints.push(mcp_result); + context_window_hints.push(codex_context_fragments::AnnotatedContent::text( + text, + ContentItemKind("notes.thread_hint".to_string()), + ContentItemMetadata::tool(source_tool_namespace.map(Into::into)), + )); } - separate_developer_sections.push( + separate_developer_messages.push( crate::context::TokenBudgetContext::new( session_source .get_agent_path() @@ -4582,9 +4614,8 @@ impl Session { auto_compact_window_ids.first_window_id, auto_compact_window_ids.previous_window_id, auto_compact_window_ids.window_id, - (!context_window_hints.is_empty()).then(|| context_window_hints.join("\n")), ) - .render_fragment(), + .render_with_hints(context_window_hints), ); } let (snapshot, updates) = world_state.render_full(); @@ -4624,13 +4655,13 @@ impl Session { "developer" if fragment.markers().0 == MultiAgentRoleInstructions::type_markers().0 => { - separate_developer_sections.push(fragment.render_fragment()); + separate_developer_messages.push(fragment.render_fragment().into()); } "developer" if update.placement == Placement::Standalone && fragment.markers().0.is_empty() => { - separate_developer_sections.push(fragment.render_fragment()); + separate_developer_messages.push(fragment.render_fragment().into()); } "developer" => developer_sections.push(fragment.render_fragment()), "user" => contextual_user_sections.push(fragment.render_fragment()), @@ -4651,13 +4682,7 @@ impl Session { ) { items.push(developer_message); } - for section in separate_developer_sections.drain(..) { - if let Some(developer_message) = - crate::context_manager::updates::build_rendered_message(vec![section]) - { - items.push(developer_message); - } - } + items.append(&mut separate_developer_messages); if let Some(initial_multi_agent_mode) = initial_multi_agent_mode && let Some(message) = crate::context_manager::updates::build_rendered_message(vec![ diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index e0370838c6..427457042f 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -161,6 +161,7 @@ use codex_protocol::mcp::McpAttributionStatus; use codex_protocol::models::BaseInstructions; use codex_protocol::models::ContentItem; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::models::InternalChatMessageMetadataPassthrough; use codex_protocol::models::ResponseItem; use codex_protocol::protocol::AskForApproval; @@ -2783,6 +2784,11 @@ async fn record_inter_agent_communication_sets_turn_id_in_rollout_and_resume() { /*trigger_turn*/ false, ); let mut expected_item = communication.to_model_input_item(); + let mut expected = serde_json::to_value(&expected_item).unwrap(); + expected["internal_chat_message_metadata_passthrough"] = json!({ + "content_item_metadata": [{"harness_injected": true, "source_tool_namespace": "collaboration"}], + }); + expected_item = serde_json::from_value(expected).unwrap(); expected_item.set_turn_id_if_missing(&turn_context.sub_id); session @@ -3174,6 +3180,11 @@ async fn prepares_resumed_history_before_installing_it() { ContentItemKind("images.preparation_error".to_string()), ContentItemKind("unknown".to_string()), ]), + content_item_metadata: Some(vec![ + ContentItemMetadata::harness(), + ContentItemMetadata::harness(), + ContentItemMetadata::default(), + ]), ..Default::default() }, ), @@ -4162,6 +4173,9 @@ async fn record_initial_history_assigns_and_persists_id_for_forked_response_item content_item_kinds: Some(vec![ContentItemKind( "generic.developer_instructions".to_string(), )]), + content_item_metadata: Some(vec![ContentItemMetadata::developer_instructions( + /*from_additional_requirements*/ false, + )]), ..Default::default() }), }; diff --git a/codex-rs/core/src/session/world_state.rs b/codex-rs/core/src/session/world_state.rs index 9d59defb79..3426f76a54 100644 --- a/codex-rs/core/src/session/world_state.rs +++ b/codex-rs/core/src/session/world_state.rs @@ -34,6 +34,7 @@ use codex_prompts::ResolvedModelMessages; use codex_prompts::render_model_instructions; use codex_protocol::error::Result as CodexResult; use codex_protocol::models::BaseInstructionsProvenance; +use codex_protocol::models::ContentItemNamespace; use codex_protocol::protocol::MultiAgentVersion; use codex_tools::ToolName; @@ -174,7 +175,6 @@ impl Session { window_ids.first_window_id, window_ids.previous_window_id, window_ids.window_id, - /*thread_hint*/ None, )); } let guidance = step_context @@ -358,11 +358,20 @@ impl Session { world_state.add_extension_section(section); } } + let v2_namespace = turn_context + .config + .multi_agent_v2 + .tool_namespace + .clone() + .map(ContentItemNamespace::from) + .unwrap_or(ContentItemNamespace::Functions); let mut multi_agent_mode = MultiAgentModeState::new( super::multi_agents::effective_multi_agent_mode(step_context), - ); + ) + .with_namespace(v2_namespace.clone()); if let Some(usage_hint_text) = super::multi_agents::usage_hint_text(step_context) { - let usage_hint = MultiAgentUsageHintState::new(usage_hint_text); + let usage_hint = + MultiAgentUsageHintState::new(usage_hint_text).with_namespace(v2_namespace.clone()); multi_agent_mode = multi_agent_mode.with_usage_hint(&usage_hint); world_state.add_section(usage_hint); } @@ -399,7 +408,12 @@ impl Session { ) } else { ModelCatalogState::default() - }, + } + .with_namespace(match turn_context.multi_agent_version { + MultiAgentVersion::Disabled => None, + MultiAgentVersion::V1 => Some(ContentItemNamespace::MultiAgentV1), + MultiAgentVersion::V2 => Some(v2_namespace), + }), ); if !crate::guardian::is_basic_session_source(&turn_context.session_source) { world_state.add_section(ManagedDeveloperInstructionsState::new( diff --git a/codex-rs/core/src/thread_manager_tests.rs b/codex-rs/core/src/thread_manager_tests.rs index ad7b5789ec..0800effb8a 100644 --- a/codex-rs/core/src/thread_manager_tests.rs +++ b/codex-rs/core/src/thread_manager_tests.rs @@ -28,6 +28,7 @@ use codex_protocol::mcp::MCP_APP_UI_EXTENSION_ID; use codex_protocol::mcp::OPENAI_FORM_EXTENSION_ID; use codex_protocol::models::ContentItem; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::models::InternalChatMessageMetadataPassthrough; use codex_protocol::models::ReasoningItemReasoningSummary; use codex_protocol::models::ResponseItem; @@ -3093,6 +3094,7 @@ fn multi_agent_v2_interrupted_marker_uses_developer_input_message() { content_item_kinds: Some(vec![ContentItemKind( "generic.turn_aborted".to_string() )]), + content_item_metadata: Some(vec![ContentItemMetadata::harness()]), ..Default::default() } ), diff --git a/codex-rs/core/tests/suite/compact.rs b/codex-rs/core/tests/suite/compact.rs index 8442310771..ee8b2e6985 100644 --- a/codex-rs/core/tests/suite/compact.rs +++ b/codex-rs/core/tests/suite/compact.rs @@ -5909,6 +5909,7 @@ async fn remote_v2_compaction_refreshes_instructions_and_preserves_them_on_cold_ )?; let mut builder = test_codex() .with_home(Arc::clone(&home)) + .with_model_info_override("gpt-5.5", |model| model.use_responses_lite = true) .with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()); let test = builder.build(&server).await?; @@ -5968,6 +5969,7 @@ async fn remote_v2_compaction_refreshes_instructions_and_preserves_them_on_cold_ let resumed_cwd = test.config.cwd.clone(); let mut resume_builder = test_codex() .with_home(Arc::clone(&home)) + .with_model_info_override("gpt-5.5", |model| model.use_responses_lite = true) .with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()) .with_config(move |config| config.cwd = resumed_cwd); let resumed = resume_builder @@ -5983,7 +5985,7 @@ async fn remote_v2_compaction_refreshes_instructions_and_preserves_them_on_cold_ assert_single_instruction_fragment(&requests[3], &new_fragment); let resumed_input = requests[3].input(); assert_eq!( - resumed_input.get(1..=replacement_history.len()), + resumed_input.get(2..=replacement_history.len() + 1), Some(replacement_history.as_slice()), "remote-v2 cold resume should replay persisted replacement history verbatim" ); diff --git a/codex-rs/core/tests/suite/guardian_retained_context.rs b/codex-rs/core/tests/suite/guardian_retained_context.rs index 18f2292a1a..7fea5d2ee3 100644 --- a/codex-rs/core/tests/suite/guardian_retained_context.rs +++ b/codex-rs/core/tests/suite/guardian_retained_context.rs @@ -10,6 +10,7 @@ use anyhow::Result; use codex_core::CodexThread; use codex_core::ForkSnapshot; use codex_core::TurnInputRequest; +use codex_core::compact::content_items_to_text; use codex_core::config::Config; use codex_core::config::ThreadStoreConfig; use codex_extension_api::ExtensionFuture; @@ -886,11 +887,10 @@ async fn standalone_fork_retains_inherited_user_instructions( .items() .find_map(|item| match item { ResponseItem::Message { role, content, .. } if role == "user" => { - let [ContentItem::InputText { text }] = content.as_slice() else { - return None; - }; + // Compaction keeps the retained text and truncation notice in separate parts. + let text = content_items_to_text(content)?; text.starts_with("You may publish the release.") - .then(|| text.clone()) + .then_some(text) } _ => None, }) diff --git a/codex-rs/core/tests/suite/mcp_auth_refresh.rs b/codex-rs/core/tests/suite/mcp_auth_refresh.rs index 67bfe7f09b..03d42e2707 100644 --- a/codex-rs/core/tests/suite/mcp_auth_refresh.rs +++ b/codex-rs/core/tests/suite/mcp_auth_refresh.rs @@ -143,7 +143,7 @@ async fn hosted_plugin_runtime_ps_mcp_tool_calls_use_current_auth_manager_token( /*wait_for_server*/ true, ) .await?; - assert_eq!(tool_result.is_error, Some(false)); + assert_eq!(tool_result.result.is_error, Some(false)); let requests = server .received_requests() diff --git a/codex-rs/core/tests/suite/responses_lite.rs b/codex-rs/core/tests/suite/responses_lite.rs index d109c4154c..dde83441f3 100644 --- a/codex-rs/core/tests/suite/responses_lite.rs +++ b/codex-rs/core/tests/suite/responses_lite.rs @@ -133,21 +133,23 @@ async fn base_instructions_use_input_items(responses_lite: bool) -> Result<()> { .as_str() .is_some_and(|id| id.starts_with("msg_")) ); - assert_eq!( - instructions, - &serde_json::json!({ - "id": instructions["id"], - "type": "message", - "role": "developer", - "content": [{ - "type": "input_text", - "text": "test instructions", - }], - "internal_chat_message_metadata_passthrough": { - "content_item_kinds": ["model.base_instructions"], - }, - }) - ); + let mut expected_instructions = serde_json::json!({ + "id": instructions["id"], + "type": "message", + "role": "developer", + "content": [{ + "type": "input_text", + "text": "test instructions", + }], + "internal_chat_message_metadata_passthrough": { + "content_item_kinds": ["model.base_instructions"], + }, + }); + if responses_lite { + expected_instructions["internal_chat_message_metadata_passthrough"]["content_item_metadata"] = + serde_json::json!([{"provenance": {"type": "harness", "hook": false}}]); + } + assert_eq!(instructions, &expected_instructions); let tools = if responses_lite { assert!(body.get("tools").is_none()); diff --git a/codex-rs/core/tests/suite/token_budget.rs b/codex-rs/core/tests/suite/token_budget.rs index a0b23a1db7..23fae98781 100644 --- a/codex-rs/core/tests/suite/token_budget.rs +++ b/codex-rs/core/tests/suite/token_budget.rs @@ -76,8 +76,9 @@ fn model_token_budget_config() -> ModelTokenBudgetConfig { fn token_budget_contexts(request: &ResponsesRequest) -> Vec { let context_window_prefix = format!("{CONTEXT_WINDOW_OPEN_TAG}\n"); request - .message_input_texts("developer") + .message_input_text_groups("developer") .into_iter() + .map(|parts| parts.concat()) .filter(|text| text.starts_with(&context_window_prefix)) .collect() } diff --git a/codex-rs/ext/extension-api/src/contributors/prompt.rs b/codex-rs/ext/extension-api/src/contributors/prompt.rs index 73a12e3a6a..59a77ed3a9 100644 --- a/codex-rs/ext/extension-api/src/contributors/prompt.rs +++ b/codex-rs/ext/extension-api/src/contributors/prompt.rs @@ -1,8 +1,11 @@ -// All this file should be replaced by the existing fragment implementation ofc +//! Extension prompt placement with content and producer attribution kept together. use codex_context_fragments::AnnotatedContent; +use codex_context_fragments::ContextualUserFragment; use codex_context_fragments::RenderedFragment; +use codex_protocol::models::ContentItem; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub enum PromptSlot { @@ -12,20 +15,48 @@ pub enum PromptSlot { ContextWindow, } -#[derive(Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq)] pub struct PromptFragment { slot: PromptSlot, - text: String, - content_kind: ContentItemKind, + content: AnnotatedContent, } impl PromptFragment { - /// Creates a prompt fragment for the given slot. + /// Places a contextual fragment in the prompt, preserving its text, kind, and source. + /// The slot determines placement within the developer message, regardless of its original role. + pub fn from_fragment(slot: PromptSlot, fragment: &impl ContextualUserFragment) -> Self { + Self { + slot, + content: AnnotatedContent::text( + fragment.render(), + fragment.content_kind(), + fragment.content_metadata(), + ), + } + } + + /// Creates harness-provided context for the given slot. pub fn new(slot: PromptSlot, text: impl Into, content_kind: ContentItemKind) -> Self { Self { slot, - text: text.into(), - content_kind, + content: AnnotatedContent::text(text, content_kind, ContentItemMetadata::harness()), + } + } + + /// Creates tool-supplied context without changing its prompt placement. + pub fn tool( + slot: PromptSlot, + text: impl Into, + content_kind: ContentItemKind, + namespace: String, + ) -> Self { + Self { + slot, + content: AnnotatedContent::text( + text, + content_kind, + ContentItemMetadata::tool(Some(namespace.into())), + ), } } @@ -46,20 +77,25 @@ impl PromptFragment { /// Returns the model-visible text. pub fn text(&self) -> &str { - &self.text + let ContentItem::InputText { text } = self.content.content() else { + unreachable!("prompt fragments contain text"); + }; + text } /// Returns the producer-owned classification of the model-visible text. pub fn content_kind(&self) -> &ContentItemKind { - &self.content_kind + self.content.kind() + } + + /// Consumes the placement wrapper when assembling a shared context message. + pub fn into_content(self) -> AnnotatedContent { + self.content } } impl From for RenderedFragment { fn from(fragment: PromptFragment) -> Self { - Self::new( - "developer", - AnnotatedContent::input_text(fragment.text, fragment.content_kind), - ) + Self::new("developer", fragment.content) } } diff --git a/codex-rs/ext/extension-api/src/contributors/world_state.rs b/codex-rs/ext/extension-api/src/contributors/world_state.rs index 19dbb91001..c2f33d6204 100644 --- a/codex-rs/ext/extension-api/src/contributors/world_state.rs +++ b/codex-rs/ext/extension-api/src/contributors/world_state.rs @@ -4,6 +4,7 @@ use codex_exec_server_protocol::ExecutorCapabilityDiscoverySnapshot; use codex_exec_server_protocol::ExecutorCapabilityDiscoveryV2Snapshot; use codex_protocol::ThreadId; use codex_protocol::capabilities::SelectedCapabilityRoot; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::openai_models::ModelInfo; use codex_protocol::protocol::TurnEnvironmentSelection; use serde_json::Value; @@ -50,6 +51,7 @@ pub struct RenderedWorldStateFragment { role: &'static str, markers: (&'static str, &'static str), body: String, + metadata: ContentItemMetadata, } impl RenderedWorldStateFragment { @@ -62,9 +64,20 @@ impl RenderedWorldStateFragment { role, markers, body: body.into(), + metadata: ContentItemMetadata::harness(), } } + /// Attach the producer's source before the harness assembles the context message. + pub fn with_metadata(mut self, metadata: ContentItemMetadata) -> Self { + self.metadata = metadata; + self + } + + pub fn metadata(&self) -> &ContentItemMetadata { + &self.metadata + } + pub fn role(&self) -> &'static str { self.role } diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs index 77543cf4a5..5b35ddefb9 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs @@ -17,7 +17,7 @@ fn rendered_classifier_text(config: &GuardianV2Config, policy: &str) -> String { let (_, content) = config .render_classifier_instructions(policy, "") .into_parts(); - let (ContentItem::InputText { text }, _) = content.into_parts() else { + let (ContentItem::InputText { text }, _, _) = content.into_parts() else { panic!("classifier instructions must be text"); }; text @@ -53,7 +53,7 @@ fn extra_policy_reaches_templated_and_legacy_classifier_instructions() { let (_, content) = config .render_classifier_instructions(policy, extra_policy) .into_parts(); - let (ContentItem::InputText { text }, _) = content.into_parts() else { + let (ContentItem::InputText { text }, _, _) = content.into_parts() else { panic!("classifier instructions must be text"); }; assert_eq!( diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs index 80d5fa1d5b..ddcd6f154b 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs @@ -8,6 +8,7 @@ use codex_http_client::HttpClientBuilder; use codex_login::AuthManager; use codex_login::CodexAuth; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; use pretty_assertions::assert_eq; use wiremock::Mock; use wiremock::MockServer; @@ -21,7 +22,11 @@ use wiremock::matchers::path; fn adapter_rejects_unsupported_evidence() { let rubric = RenderedFragment::new( "developer", - AnnotatedContent::input_text("Classify risk.", ContentItemKind("guardian.test".into())), + AnnotatedContent::text( + "Classify risk.", + ContentItemKind("guardian.test".into()), + ContentItemMetadata::harness(), + ), ); let user: ResponseItem = serde_json::from_value(json!({"type":"message", "role":"user", "content":[ {"type":"input_text", "text":"Authorized task"}, {"type":"input_text", "text":"Planned action"} @@ -57,7 +62,11 @@ fn adapter_rejects_unsupported_evidence() { fn adapter_preserves_trusted_tool_authority_and_scope() { let rubric = RenderedFragment::new( "developer", - AnnotatedContent::input_text("Classify risk.", ContentItemKind("guardian.test".into())), + AnnotatedContent::text( + "Classify risk.", + ContentItemKind("guardian.test".into()), + ContentItemMetadata::harness(), + ), ); let tool = TrustedTool { server: "example".into(), @@ -220,7 +229,11 @@ async fn http_contract_and_untrusted_response_validation() { let mut request = super::super::sampler::tests::sample_request("turn"); request.instructions = RenderedFragment::new( "developer", - AnnotatedContent::input_text("Classify risk", ContentItemKind("guardian.test".into())), + AnnotatedContent::text( + "Classify risk", + ContentItemKind("guardian.test".into()), + ContentItemMetadata::harness(), + ), ); let body = json!({"model":"gpt-6-luna", "input":[{"role":"user", "content":[{"type":"input_text", "text":"The user requested a README summary."}]}], diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs index ba624f70e2..38319bef7a 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs @@ -1387,6 +1387,9 @@ classifier_instructions = "Predict future violations.\n# Security Policy\n{{ ten "role": "developer", "internal_chat_message_metadata_passthrough": { "content_item_kinds": ["guardian.classifier_instructions"], + "content_item_metadata": [{ + "provenance": {"type": "harness", "hook": false}, + }], }, "content": [{ "type": "input_text", @@ -1429,6 +1432,9 @@ max_classifier_instruction_tokens = 256 "role": "developer", "internal_chat_message_metadata_passthrough": { "content_item_kinds": ["guardian.classifier_instructions"], + "content_item_metadata": [{ + "provenance": {"type": "harness", "hook": false}, + }], }, "content": [{ "type": "input_text", @@ -1515,6 +1521,9 @@ max_recent_non_user_entries = 8 "role": "developer", "internal_chat_message_metadata_passthrough": { "content_item_kinds": ["guardian.classifier_instructions"], + "content_item_metadata": [{ + "provenance": {"type": "harness", "hook": false}, + }], }, "content": [{ "type": "input_text", @@ -1953,6 +1962,9 @@ async fn contributor_uses_model_defaults_and_preserves_local_overrides() -> Resu "role": "developer", "internal_chat_message_metadata_passthrough": { "content_item_kinds": ["guardian.classifier_instructions"], + "content_item_metadata": [{ + "provenance": {"type": "harness", "hook": false}, + }], }, "content": [{ "type": "input_text", @@ -2142,6 +2154,9 @@ async fn contributor_samples_tool_calls_with_the_existing_luna_pool() -> Result< "role": "developer", "internal_chat_message_metadata_passthrough": { "content_item_kinds": ["guardian.classifier_instructions"], + "content_item_metadata": [{ + "provenance": {"type": "harness", "hook": false}, + }], }, "content": [{ "type": "input_text", @@ -2839,6 +2854,9 @@ async fn contributor_uses_catalog_policy_without_a_configured_override() -> Resu "role": "developer", "internal_chat_message_metadata_passthrough": { "content_item_kinds": ["guardian.classifier_instructions"], + "content_item_metadata": [{ + "provenance": {"type": "harness", "hook": false}, + }], }, "content": [{ "type": "input_text", @@ -2885,6 +2903,9 @@ async fn contributor_preserves_uncapped_classifier_instructions() -> Result<()> "role": "developer", "internal_chat_message_metadata_passthrough": { "content_item_kinds": ["guardian.classifier_instructions"], + "content_item_metadata": [{ + "provenance": {"type": "harness", "hook": false}, + }], }, "content": [{ "type": "input_text", diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/sampler_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/sampler_tests.rs index 873f1191fe..cf3e8343ea 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/sampler_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/sampler_tests.rs @@ -263,6 +263,9 @@ fn assert_classifier_instructions(request: &serde_json::Value) { }], "internal_chat_message_metadata_passthrough": { "content_item_kinds": ["guardian.classifier_instructions"], + "content_item_metadata": [{ + "provenance": {"type": "harness", "hook": false}, + }], }, }) ); diff --git a/codex-rs/ext/history-notes/src/extension.rs b/codex-rs/ext/history-notes/src/extension.rs index a5b259f1a9..ff425ec8fa 100644 --- a/codex-rs/ext/history-notes/src/extension.rs +++ b/codex-rs/ext/history-notes/src/extension.rs @@ -145,10 +145,11 @@ impl ContextContributor for HistoryNotesExtension { if text.is_empty() { return Vec::new(); } - vec![PromptFragment::new( + vec![PromptFragment::tool( PromptSlot::ContextWindow, text, ContentItemKind("notes.thread_hint".to_string()), + "notes".to_string(), )] }) } diff --git a/codex-rs/ext/history-notes/tests/history_notes_extension.rs b/codex-rs/ext/history-notes/tests/history_notes_extension.rs index 219155a3ca..02e7a4d41c 100644 --- a/codex-rs/ext/history-notes/tests/history_notes_extension.rs +++ b/codex-rs/ext/history-notes/tests/history_notes_extension.rs @@ -165,10 +165,11 @@ async fn installed_extension_exposes_and_invokes_history_notes_tools() -> TestRe .await; assert_eq!( hints, - vec![PromptFragment::new( + vec![PromptFragment::tool( PromptSlot::ContextWindow, THREAD_HINT, ContentItemKind("notes.thread_hint".to_string()), + "notes".to_string(), )] ); diff --git a/codex-rs/ext/skills/src/extension.rs b/codex-rs/ext/skills/src/extension.rs index c38a9d82df..225e4c3c39 100644 --- a/codex-rs/ext/skills/src/extension.rs +++ b/codex-rs/ext/skills/src/extension.rs @@ -17,6 +17,7 @@ use codex_extension_api::ExtensionMetrics; use codex_extension_api::ExtensionRegistryBuilder; use codex_extension_api::ExtensionWarning; use codex_extension_api::PromptFragment; +use codex_extension_api::PromptSlot; use codex_extension_api::SelectedPluginSnapshot; use codex_extension_api::SkillInvocationContributor; use codex_extension_api::SkillInvocationInput; @@ -239,7 +240,7 @@ where rendered .fragment .map(|fragment| { - PromptFragment::developer_capability(fragment.render(), fragment.content_kind()) + PromptFragment::from_fragment(PromptSlot::DeveloperCapabilities, &fragment) }) .into_iter() .collect() diff --git a/codex-rs/ext/skills/src/fragments.rs b/codex-rs/ext/skills/src/fragments.rs index 0e2e3018db..7ee33f5e5e 100644 --- a/codex-rs/ext/skills/src/fragments.rs +++ b/codex-rs/ext/skills/src/fragments.rs @@ -1,5 +1,6 @@ use codex_extension_api::ContextualUserFragment; use codex_protocol::models::ContentItemKind; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::protocol::SKILLS_INSTRUCTIONS_CLOSE_TAG; use codex_protocol::protocol::SKILLS_INSTRUCTIONS_OPEN_TAG; @@ -37,6 +38,10 @@ impl AvailableSkillsInstructions { } impl ContextualUserFragment for AvailableSkillsInstructions { + fn content_metadata(&self) -> ContentItemMetadata { + ContentItemMetadata::skills() + } + fn role(&self) -> &'static str { "developer" } @@ -74,6 +79,10 @@ pub(crate) struct SkillResourceAccess { } impl ContextualUserFragment for SkillInstructions { + fn content_metadata(&self) -> ContentItemMetadata { + ContentItemMetadata::skills() + } + fn role(&self) -> &'static str { "user" } diff --git a/codex-rs/ext/skills/src/world_state.rs b/codex-rs/ext/skills/src/world_state.rs index d4ad2dc041..14a855d616 100644 --- a/codex-rs/ext/skills/src/world_state.rs +++ b/codex-rs/ext/skills/src/world_state.rs @@ -1,6 +1,7 @@ use codex_extension_api::PreviousWorldStateSection; use codex_extension_api::RenderedWorldStateFragment; use codex_extension_api::WorldStateSectionContribution; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::protocol::SKILLS_INSTRUCTIONS_CLOSE_TAG; use codex_protocol::protocol::SKILLS_INSTRUCTIONS_OPEN_TAG; use serde::Serialize; @@ -82,7 +83,7 @@ pub(crate) fn executor_skills_world_state_section( "developer", (SKILLS_INSTRUCTIONS_OPEN_TAG, SKILLS_INSTRUCTIONS_CLOSE_TAG), "\n## Skills update\nThe previously listed selected-environment skills are available again.\n", - )), + ).with_metadata(ContentItemMetadata::skills())), ); } } @@ -102,7 +103,7 @@ pub(crate) fn executor_skills_world_state_section( "developer", (SKILLS_INSTRUCTIONS_OPEN_TAG, SKILLS_INSTRUCTIONS_CLOSE_TAG), body, - )), + ).with_metadata(ContentItemMetadata::skills())), ) }) .with_legacy_matcher(|role, text| { @@ -187,11 +188,14 @@ fn skills_world_state_section( ( Some(snapshot.clone()), - Some(RenderedWorldStateFragment::new( - "developer", - (SKILLS_INSTRUCTIONS_OPEN_TAG, SKILLS_INSTRUCTIONS_CLOSE_TAG), - body, - )), + Some( + RenderedWorldStateFragment::new( + "developer", + (SKILLS_INSTRUCTIONS_OPEN_TAG, SKILLS_INSTRUCTIONS_CLOSE_TAG), + body, + ) + .with_metadata(ContentItemMetadata::skills()), + ), ) }); match retained_body { diff --git a/codex-rs/hooks/src/context.rs b/codex-rs/hooks/src/context.rs new file mode 100644 index 0000000000..d4afe5afe5 --- /dev/null +++ b/codex-rs/hooks/src/context.rs @@ -0,0 +1,18 @@ +//! Model-visible hook context, attributed by the executor that produced it. + +use codex_protocol::models::ContentItemMetadata; + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct HookContext { + pub text: String, + pub metadata: ContentItemMetadata, +} + +impl HookContext { + pub fn harness(text: String) -> Self { + Self { + text, + metadata: ContentItemMetadata::harness(), + } + } +} diff --git a/codex-rs/hooks/src/engine/command_runner.rs b/codex-rs/hooks/src/engine/command_runner.rs index 674f5bd2ed..d323c2131e 100644 --- a/codex-rs/hooks/src/engine/command_runner.rs +++ b/codex-rs/hooks/src/engine/command_runner.rs @@ -43,7 +43,6 @@ use super::dispatcher::hook_handler_type_label; use super::dispatcher::hook_scope_label; use super::dispatcher::hook_source_label; use super::dispatcher::scope_for_event; -use crate::output_spill::AdditionalContext; use crate::output_spill::HookOutputSpiller; use codex_protocol::ThreadId; use codex_protocol::protocol::HookCompletedEvent; @@ -141,21 +140,17 @@ impl CommandHookRuntime { for entry in std::mem::take(&mut hook_result.run.entries) { match entry.kind { HookOutputEntryKind::Context => { - if let Some(text) = runtime + let text = runtime .output_spiller - .maybe_spill_additional_contexts(vec![AdditionalContext { - text: entry.text, - limit: handler.additional_context_limit, - }]) - .await - .into_iter() - .next() - { - entries.push(HookOutputEntry { - kind: HookOutputEntryKind::Context, - text, - }); - } + .maybe_spill_text_with_limit( + entry.text, + handler.additional_context_limit, + ) + .await; + entries.push(HookOutputEntry { + kind: HookOutputEntryKind::Context, + text, + }); } HookOutputEntryKind::Warning => warnings.push(entry), HookOutputEntryKind::Error => entries.push(entry), @@ -371,6 +366,7 @@ fn finish_command_run( ) -> HandlerRunResult { Span::current().record("hook.command_outcome", completion.outcome); HandlerRunResult { + context_metadata: codex_protocol::models::ContentItemMetadata::command_hook(), started_at, completed_at: chrono::Utc::now().timestamp(), duration_ms: started.elapsed().as_millis().try_into().unwrap_or(i64::MAX), diff --git a/codex-rs/hooks/src/engine/dispatcher.rs b/codex-rs/hooks/src/engine/dispatcher.rs index b34118d6f2..30c0c34961 100644 --- a/codex-rs/hooks/src/engine/dispatcher.rs +++ b/codex-rs/hooks/src/engine/dispatcher.rs @@ -146,7 +146,8 @@ pub(crate) async fn execute_handlers_with_metadata( pending.push(async move { let result = execute_handler(engine, &handler, &input_json, cwd, /*metadata*/ None).await; - (configured_order, parse(&handler, result, turn_id)) + let parsed = parse(&handler, result, turn_id); + (configured_order, parsed) }); } diff --git a/codex-rs/hooks/src/engine/mcp_runner.rs b/codex-rs/hooks/src/engine/mcp_runner.rs index 71bf050e0f..18cb81e185 100644 --- a/codex-rs/hooks/src/engine/mcp_runner.rs +++ b/codex-rs/hooks/src/engine/mcp_runner.rs @@ -4,6 +4,7 @@ use std::time::Instant; use anyhow::Context; use anyhow::Result; +use codex_protocol::models::ContentItemMetadata; use regex::Regex; use serde_json::Map; use serde_json::Value; @@ -75,11 +76,12 @@ pub(crate) async fn run_mcp_tool( } .await; - let (exit_code, stdout, error) = match result { - Ok(output) => (Some(0), output, None), - Err(error) => (None, String::new(), Some(error.to_string())), + let (exit_code, stdout, error, source_tool_namespace) = match result { + Ok(output) => (Some(0), output.text, None, output.source_tool_namespace), + Err(error) => (None, String::new(), Some(error.to_string()), None), }; HandlerRunResult { + context_metadata: ContentItemMetadata::tool(source_tool_namespace.map(Into::into)), started_at, completed_at: chrono::Utc::now().timestamp(), duration_ms: started.elapsed().as_millis().try_into().unwrap_or(i64::MAX), diff --git a/codex-rs/hooks/src/engine/mcp_runner_tests.rs b/codex-rs/hooks/src/engine/mcp_runner_tests.rs index a16613ea07..4c4726d284 100644 --- a/codex-rs/hooks/src/engine/mcp_runner_tests.rs +++ b/codex-rs/hooks/src/engine/mcp_runner_tests.rs @@ -15,6 +15,7 @@ use crate::engine::ConfiguredHandler; use crate::engine::ConfiguredHandlerKind; use crate::mcp::HookMcpCall; use crate::mcp::HookMcpExecutor; +use crate::mcp::HookMcpOutput; use codex_protocol::protocol::HookEventName; use codex_protocol::protocol::HookSource; use codex_utils_absolute_path::test_support::PathBufExt; @@ -26,10 +27,13 @@ struct RecordingExecutor { } impl HookMcpExecutor for RecordingExecutor { - fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result> { + fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result> { async move { self.calls.lock().expect("lock calls").push(call); - Ok(self.output.clone()) + Ok(HookMcpOutput { + text: self.output.clone(), + source_tool_namespace: Some("security".into()), + }) } .boxed() } diff --git a/codex-rs/hooks/src/engine/mod.rs b/codex-rs/hooks/src/engine/mod.rs index 5f4972d407..75110866e1 100644 --- a/codex-rs/hooks/src/engine/mod.rs +++ b/codex-rs/hooks/src/engine/mod.rs @@ -131,6 +131,7 @@ pub(crate) enum ConfiguredHandlerKind { #[derive(Debug)] pub(crate) struct HandlerRunResult { + pub context_metadata: codex_protocol::models::ContentItemMetadata, pub started_at: i64, pub completed_at: i64, pub duration_ms: i64, diff --git a/codex-rs/hooks/src/engine/mod_tests.rs b/codex-rs/hooks/src/engine/mod_tests.rs index e7484cc4d6..9c5f46fdfa 100644 --- a/codex-rs/hooks/src/engine/mod_tests.rs +++ b/codex-rs/hooks/src/engine/mod_tests.rs @@ -51,6 +51,7 @@ use crate::events::stop::StopHookTarget; use crate::events::stop::StopRequest; use crate::mcp::HookMcpCall; use crate::mcp::HookMcpExecutor; +use crate::mcp::HookMcpOutput; fn cwd() -> AbsolutePathBuf { AbsolutePathBuf::current_dir().expect("current dir") @@ -2240,7 +2241,7 @@ struct StaticMcpExecutor { } impl HookMcpExecutor for StaticMcpExecutor { - fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result> { + fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result> { async move { let output = self .outputs_by_tool @@ -2248,7 +2249,10 @@ impl HookMcpExecutor for StaticMcpExecutor { .unwrap_or(&self.output) .clone(); self.calls.lock().expect("lock MCP calls").push(call); - Ok(output) + Ok(HookMcpOutput { + text: output, + source_tool_namespace: None, + }) } .boxed() } @@ -2655,11 +2659,14 @@ async fn executor_stop_hooks_do_not_delay_stop_completion() { } impl HookMcpExecutor for BlockingMcpExecutor { - fn execute(&self, _call: HookMcpCall) -> BoxFuture<'_, anyhow::Result> { + fn execute(&self, _call: HookMcpCall) -> BoxFuture<'_, anyhow::Result> { async move { self.started.notify_one(); self.release.notified().await; - Ok(String::new()) + Ok(HookMcpOutput { + text: String::new(), + source_tool_namespace: None, + }) } .boxed() } diff --git a/codex-rs/hooks/src/events/common.rs b/codex-rs/hooks/src/events/common.rs index c6e1a1d324..2a58d51634 100644 --- a/codex-rs/hooks/src/events/common.rs +++ b/codex-rs/hooks/src/events/common.rs @@ -9,6 +9,7 @@ use crate::engine::ConfiguredHandler; use crate::engine::HandlerSourcePath; use crate::engine::dispatcher; use crate::output_spill::AdditionalContext; +use codex_protocol::models::ContentItemMetadata; /// Identifies a thread-spawned subagent when a normal hook runs inside it. #[derive(Debug, Clone, PartialEq, Eq)] @@ -39,13 +40,17 @@ pub(crate) fn append_additional_context( additional_contexts_for_model: &mut Vec, handler: &ConfiguredHandler, additional_context: String, + metadata: &ContentItemMetadata, ) { entries.push(HookOutputEntry { kind: HookOutputEntryKind::Context, text: additional_context.clone(), }); additional_contexts_for_model.push(AdditionalContext { - text: additional_context, + context: crate::HookContext { + text: additional_context, + metadata: metadata.clone(), + }, limit: handler.additional_context_limit, }); } @@ -53,10 +58,7 @@ pub(crate) fn append_additional_context( pub(crate) fn flatten_additional_contexts<'a>( additional_contexts: impl IntoIterator, ) -> Vec { - additional_contexts - .into_iter() - .flat_map(|chunk| chunk.iter().cloned()) - .collect() + additional_contexts.into_iter().flatten().cloned().collect() } pub(crate) fn serialization_failure_hook_events( diff --git a/codex-rs/hooks/src/events/compact.rs b/codex-rs/hooks/src/events/compact.rs index 82bd6c6cf5..2509baae46 100644 --- a/codex-rs/hooks/src/events/compact.rs +++ b/codex-rs/hooks/src/events/compact.rs @@ -542,6 +542,7 @@ mod tests { fn run_result(exit_code: Option, stdout: &str, stderr: &str) -> HandlerRunResult { HandlerRunResult { + context_metadata: codex_protocol::models::ContentItemMetadata::harness(), started_at: 1_700_000_000, completed_at: 1_700_000_001, duration_ms: 12, diff --git a/codex-rs/hooks/src/events/interrupt_tests.rs b/codex-rs/hooks/src/events/interrupt_tests.rs index 3d8642c845..7ce3822126 100644 --- a/codex-rs/hooks/src/events/interrupt_tests.rs +++ b/codex-rs/hooks/src/events/interrupt_tests.rs @@ -117,6 +117,7 @@ fn handler() -> ConfiguredHandler { fn run_result(exit_code: Option, stdout: &str, stderr: &str) -> HandlerRunResult { HandlerRunResult { + context_metadata: codex_protocol::models::ContentItemMetadata::harness(), started_at: 1, completed_at: 2, duration_ms: 1, diff --git a/codex-rs/hooks/src/events/post_tool_use.rs b/codex-rs/hooks/src/events/post_tool_use.rs index 0ca0f6c673..1c62d364d1 100644 --- a/codex-rs/hooks/src/events/post_tool_use.rs +++ b/codex-rs/hooks/src/events/post_tool_use.rs @@ -40,7 +40,7 @@ pub struct PostToolUseRequest { pub struct PostToolUseOutcome { pub hook_events: Vec, pub should_block: bool, - pub additional_contexts: Vec, + pub additional_contexts: Vec, pub feedback_message: Option, } @@ -206,6 +206,7 @@ fn parse_completed( &mut additional_contexts_for_model, handler, additional_context, + &run_result.context_metadata, ); } if handler.can_apply_control_effects() { @@ -391,7 +392,9 @@ mod tests { PostToolUseHandlerData { should_block: false, additional_contexts_for_model: vec![AdditionalContext { - text: "Remember the bash cleanup note.".to_string(), + context: crate::HookContext::harness( + "Remember the bash cleanup note.".to_string() + ), limit: AdditionalContextLimit::from_config(Some(17)), }], feedback_messages_for_model: Vec::new(), @@ -608,6 +611,7 @@ mod tests { fn run_result(exit_code: Option, stdout: &str, stderr: &str) -> HandlerRunResult { HandlerRunResult { + context_metadata: codex_protocol::models::ContentItemMetadata::harness(), started_at: 1_700_000_000, completed_at: 1_700_000_001, duration_ms: 12, diff --git a/codex-rs/hooks/src/events/pre_tool_use.rs b/codex-rs/hooks/src/events/pre_tool_use.rs index e57b823a1c..a47b1ff2b0 100644 --- a/codex-rs/hooks/src/events/pre_tool_use.rs +++ b/codex-rs/hooks/src/events/pre_tool_use.rs @@ -40,7 +40,7 @@ pub struct PreToolUseOutcome { pub hook_events: Vec, pub should_block: bool, pub block_reason: Option, - pub additional_contexts: Vec, + pub additional_contexts: Vec, pub updated_input: Option, } @@ -229,6 +229,7 @@ fn parse_completed( &mut additional_contexts_for_model, handler, additional_context, + &run_result.context_metadata, ); } if handler.can_apply_control_effects() { @@ -530,7 +531,7 @@ mod tests { should_block: true, block_reason: Some("do not run that".to_string()), additional_contexts_for_model: vec![AdditionalContext { - text: "remember this".to_string(), + context: crate::HookContext::harness("remember this".to_string()), limit: Default::default(), }], updated_input: None, @@ -630,7 +631,7 @@ mod tests { should_block: true, block_reason: Some("do not run that".to_string()), additional_contexts_for_model: vec![AdditionalContext { - text: "nope".to_string(), + context: crate::HookContext::harness("nope".to_string()), limit: AdditionalContextLimit::from_config(Some(13)), }], updated_input: None, @@ -792,6 +793,7 @@ mod tests { fn run_result(exit_code: Option, stdout: &str, stderr: &str) -> HandlerRunResult { HandlerRunResult { + context_metadata: codex_protocol::models::ContentItemMetadata::harness(), started_at: 1, completed_at: 2, duration_ms: 1, diff --git a/codex-rs/hooks/src/events/session_end_tests.rs b/codex-rs/hooks/src/events/session_end_tests.rs index 05fa107d4f..2a1ada4a78 100644 --- a/codex-rs/hooks/src/events/session_end_tests.rs +++ b/codex-rs/hooks/src/events/session_end_tests.rs @@ -43,6 +43,7 @@ fn session_end_ignores_successful_output() { let completed = parse_completed( &handler(/*matcher*/ None), HandlerRunResult { + context_metadata: codex_protocol::models::ContentItemMetadata::harness(), started_at: 1, completed_at: 2, duration_ms: 1, diff --git a/codex-rs/hooks/src/events/session_start.rs b/codex-rs/hooks/src/events/session_start.rs index 3aff0fe946..79ea63f335 100644 --- a/codex-rs/hooks/src/events/session_start.rs +++ b/codex-rs/hooks/src/events/session_start.rs @@ -84,7 +84,7 @@ pub struct SessionStartOutcome { pub hook_events: Vec, pub should_stop: bool, pub stop_reason: Option, - pub additional_contexts: Vec, + pub additional_contexts: Vec, } #[derive(Debug, PartialEq, Eq)] @@ -267,6 +267,7 @@ fn parse_completed( &mut additional_contexts_for_model, handler, additional_context, + &run_result.context_metadata, ); } let _ = parsed.universal.suppress_output; @@ -308,6 +309,7 @@ fn parse_completed( &mut additional_contexts_for_model, handler, additional_context, + &run_result.context_metadata, ); } } @@ -386,7 +388,7 @@ mod tests { should_stop: false, stop_reason: None, additional_contexts_for_model: vec![AdditionalContext { - text: "hello from hook".to_string(), + context: crate::HookContext::harness("hello from hook".to_string()), limit: AdditionalContextLimit::from_config(Some(7)), }], } @@ -419,7 +421,7 @@ mod tests { should_stop: true, stop_reason: Some("pause".to_string()), additional_contexts_for_model: vec![AdditionalContext { - text: "do not inject".to_string(), + context: crate::HookContext::harness("do not inject".to_string()), limit: Default::default(), }], } @@ -486,7 +488,7 @@ mod tests { should_stop: false, stop_reason: None, additional_contexts_for_model: vec![AdditionalContext { - text: "hello from subagent hook".to_string(), + context: crate::HookContext::harness("hello from subagent hook".to_string()), limit: AdditionalContextLimit::from_config(Some(4_096)), }], } @@ -520,7 +522,7 @@ mod tests { should_stop: false, stop_reason: None, additional_contexts_for_model: vec![AdditionalContext { - text: "child context".to_string(), + context: crate::HookContext::harness("child context".to_string()), limit: Default::default(), }], } @@ -561,6 +563,7 @@ mod tests { fn run_result(exit_code: Option, stdout: &str, stderr: &str) -> HandlerRunResult { HandlerRunResult { + context_metadata: codex_protocol::models::ContentItemMetadata::harness(), started_at: 1, completed_at: 2, duration_ms: 1, diff --git a/codex-rs/hooks/src/events/stop.rs b/codex-rs/hooks/src/events/stop.rs index be2be9100e..5e2b300153 100644 --- a/codex-rs/hooks/src/events/stop.rs +++ b/codex-rs/hooks/src/events/stop.rs @@ -390,10 +390,11 @@ fn parse_completed( }; let continuation_fragments = continuation_prompt .map(|prompt| { - vec![HookPromptFragment::from_single_hook( - prompt, - completed.run.id.clone(), - )] + vec![HookPromptFragment { + text: prompt, + hook_run_id: completed.run.id.clone(), + metadata: run_result.context_metadata, + }] }) .unwrap_or_default(); @@ -497,6 +498,7 @@ mod tests { continuation_fragments: vec![HookPromptFragment { text: "retry with tests".to_string(), hook_run_id: parsed.completed.run.id.clone(), + metadata: codex_protocol::models::ContentItemMetadata::harness(), }], } ); @@ -574,6 +576,7 @@ mod tests { continuation_fragments: vec![HookPromptFragment { text: "retry with tests".to_string(), hook_run_id: parsed.completed.run.id.clone(), + metadata: codex_protocol::models::ContentItemMetadata::harness(), }], } ); @@ -711,6 +714,7 @@ mod tests { fn run_result(exit_code: Option, stdout: &str, stderr: &str) -> HandlerRunResult { HandlerRunResult { + context_metadata: codex_protocol::models::ContentItemMetadata::harness(), started_at: 1, completed_at: 2, duration_ms: 1, diff --git a/codex-rs/hooks/src/events/user_prompt_submit.rs b/codex-rs/hooks/src/events/user_prompt_submit.rs index 9124431bc1..bc856b251a 100644 --- a/codex-rs/hooks/src/events/user_prompt_submit.rs +++ b/codex-rs/hooks/src/events/user_prompt_submit.rs @@ -37,7 +37,7 @@ pub struct UserPromptSubmitOutcome { pub hook_events: Vec, pub should_stop: bool, pub stop_reason: Option, - pub additional_contexts: Vec, + pub additional_contexts: Vec, } #[derive(Debug, PartialEq, Eq)] @@ -176,6 +176,7 @@ fn parse_completed( &mut additional_contexts_for_model, handler, additional_context, + &run_result.context_metadata, ); } let _ = parsed.universal.suppress_output; @@ -221,6 +222,7 @@ fn parse_completed( &mut additional_contexts_for_model, handler, additional_context, + &run_result.context_metadata, ); } } @@ -317,7 +319,7 @@ mod tests { should_stop: true, stop_reason: Some("pause".to_string()), additional_contexts_for_model: vec![AdditionalContext { - text: "do not inject".to_string(), + context: crate::HookContext::harness("do not inject".to_string()), limit: Default::default(), }], } @@ -356,7 +358,7 @@ mod tests { should_stop: true, stop_reason: Some("slow down".to_string()), additional_contexts_for_model: vec![AdditionalContext { - text: "do not inject".to_string(), + context: crate::HookContext::harness("do not inject".to_string()), limit: Default::default(), }], } @@ -480,6 +482,7 @@ mod tests { fn run_result(exit_code: Option, stdout: &str, stderr: &str) -> HandlerRunResult { HandlerRunResult { + context_metadata: codex_protocol::models::ContentItemMetadata::harness(), started_at: 1, completed_at: 2, duration_ms: 1, diff --git a/codex-rs/hooks/src/lib.rs b/codex-rs/hooks/src/lib.rs index 6abc173535..9be500af78 100644 --- a/codex-rs/hooks/src/lib.rs +++ b/codex-rs/hooks/src/lib.rs @@ -1,4 +1,5 @@ mod config_rules; +mod context; mod declarations; mod engine; pub(crate) mod events; @@ -52,6 +53,7 @@ pub const HOOK_EVENT_NAMES_WITH_MATCHERS: [&str; 9] = [ "SubagentStop", ]; +pub use context::HookContext; pub use events::compact::PostCompactRequest; pub use events::compact::PreCompactOutcome; pub use events::compact::PreCompactRequest; @@ -79,6 +81,7 @@ pub use events::user_prompt_submit::UserPromptSubmitRequest; pub use legacy_notify::legacy_notify_json; pub use mcp::HookMcpCall; pub use mcp::HookMcpExecutor; +pub use mcp::HookMcpOutput; pub use registry::HookListOutcome; pub use registry::Hooks; pub use registry::HooksConfig; diff --git a/codex-rs/hooks/src/mcp.rs b/codex-rs/hooks/src/mcp.rs index 49d907df80..ca95d7b0cb 100644 --- a/codex-rs/hooks/src/mcp.rs +++ b/codex-rs/hooks/src/mcp.rs @@ -15,10 +15,16 @@ pub struct HookMcpCall { pub timeout: Duration, } +/// Text returned by an MCP hook and the callable namespace that supplied it. +pub struct HookMcpOutput { + pub text: String, + pub source_tool_namespace: Option, +} + /// Executes already-connected MCP tools on behalf of hooks without coupling this crate to core. /// /// Implementations own server readiness, policy enforcement, timeout handling, and elicitation. pub trait HookMcpExecutor: Send + Sync { /// Returns text that is interpreted using ordinary command-hook output semantics. - fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result>; + fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result>; } diff --git a/codex-rs/hooks/src/output_spill.rs b/codex-rs/hooks/src/output_spill.rs index b60ac97399..a11eebf078 100644 --- a/codex-rs/hooks/src/output_spill.rs +++ b/codex-rs/hooks/src/output_spill.rs @@ -1,3 +1,4 @@ +use crate::HookContext; use codex_protocol::ThreadId; use codex_protocol::items::HookPromptFragment; use codex_utils_absolute_path::AbsolutePathBuf; @@ -32,7 +33,7 @@ impl Default for AdditionalContextLimit { #[derive(Debug, Clone, PartialEq, Eq)] pub(crate) struct AdditionalContext { - pub text: String, + pub context: HookContext, pub limit: AdditionalContextLimit, } @@ -61,7 +62,7 @@ impl HookOutputSpiller { .await } - async fn maybe_spill_text_with_limit( + pub(crate) async fn maybe_spill_text_with_limit( &self, text: String, limit: AdditionalContextLimit, @@ -93,13 +94,11 @@ impl HookOutputSpiller { pub(crate) async fn maybe_spill_additional_contexts( &self, contexts: Vec, - ) -> Vec { + ) -> Vec { let mut spilled = Vec::with_capacity(contexts.len()); - for context in contexts { - spilled.push( - self.maybe_spill_text_with_limit(context.text, context.limit) - .await, - ); + for AdditionalContext { mut context, limit } in contexts { + context.text = self.maybe_spill_text_with_limit(context.text, limit).await; + spilled.push(context); } spilled } @@ -113,6 +112,7 @@ impl HookOutputSpiller { spilled.push(HookPromptFragment { text: self.maybe_spill_text(fragment.text).await, hook_run_id: fragment.hook_run_id, + metadata: fragment.metadata, }); } spilled diff --git a/codex-rs/hooks/src/output_spill_tests.rs b/codex-rs/hooks/src/output_spill_tests.rs index 6b72c956ce..6bbd90e33c 100644 --- a/codex-rs/hooks/src/output_spill_tests.rs +++ b/codex-rs/hooks/src/output_spill_tests.rs @@ -60,15 +60,15 @@ async fn additional_contexts_apply_limits_individually() -> Result<()> { let output = spiller .maybe_spill_additional_contexts(vec![ AdditionalContext { - text: limited_text.clone(), + context: crate::HookContext::harness(limited_text.clone()), limit: AdditionalContextLimit::from_config(Some(1)), }, AdditionalContext { - text: unlimited_text.clone(), + context: crate::HookContext::harness(unlimited_text.clone()), limit: AdditionalContextLimit::from_config(Some(0)), }, AdditionalContext { - text: unlimited_text.clone(), + context: crate::HookContext::harness(unlimited_text.clone()), limit: AdditionalContextLimit::from_config(Some(usize::MAX)), }, ]) @@ -76,8 +76,8 @@ async fn additional_contexts_apply_limits_individually() -> Result<()> { let [limited_output, zero_limit_output, high_limit_output] = output.as_slice() else { panic!("expected one output for each additional context"); }; - assert!(limited_output.contains("Full hook output saved to:")); - assert_eq!(zero_limit_output, &unlimited_text); - assert_eq!(high_limit_output, &unlimited_text); + assert!(limited_output.text.contains("Full hook output saved to:")); + assert_eq!(&zero_limit_output.text, &unlimited_text); + assert_eq!(&high_limit_output.text, &unlimited_text); Ok(()) } diff --git a/codex-rs/prompts/src/multi_agent_instructions_tests.rs b/codex-rs/prompts/src/multi_agent_instructions_tests.rs index 82fbb871ad..ba3078823c 100644 --- a/codex-rs/prompts/src/multi_agent_instructions_tests.rs +++ b/codex-rs/prompts/src/multi_agent_instructions_tests.rs @@ -3,6 +3,7 @@ use super::*; use codex_context_fragments::AnnotatedContent; use codex_context_fragments::RenderedFragment; +use codex_protocol::models::ContentItemMetadata; use pretty_assertions::assert_eq; #[test] @@ -32,9 +33,10 @@ fn role_segment_filters_base_and_appends_bundled_guidance() { instructions.render_fragment(), RenderedFragment::new( "developer", - AnnotatedContent::input_text( + AnnotatedContent::text( expected_text, ContentItemKind("multi_agent.role_instructions".to_string()), + ContentItemMetadata::harness(), ), ), ); diff --git a/codex-rs/prompts/src/permissions_instructions_tests.rs b/codex-rs/prompts/src/permissions_instructions_tests.rs index 586fcc134a..51a8492f4a 100644 --- a/codex-rs/prompts/src/permissions_instructions_tests.rs +++ b/codex-rs/prompts/src/permissions_instructions_tests.rs @@ -4,6 +4,7 @@ use super::*; use crate::ResolvedModelMessages; use codex_context_fragments::AnnotatedContent; use codex_context_fragments::RenderedFragment; +use codex_protocol::models::ContentItemMetadata; use codex_protocol::openai_models::ApprovalMessages; use codex_protocol::openai_models::PermissionMessages; use codex_protocol::permissions::FileSystemAccessMode; @@ -738,9 +739,10 @@ fn preserves_supplied_path_spellings_and_order() { instructions.render_fragment(), RenderedFragment::new( "developer", - AnnotatedContent::input_text( + AnnotatedContent::text( format!("{expected_body}"), ContentItemKind("permissions.instructions".to_string()), + ContentItemMetadata::harness(), ), ), ); diff --git a/codex-rs/protocol/src/items.rs b/codex-rs/protocol/src/items.rs index 709890809d..220e98a1a3 100644 --- a/codex-rs/protocol/src/items.rs +++ b/codex-rs/protocol/src/items.rs @@ -5,9 +5,11 @@ use crate::dynamic_tools::DynamicToolCallOutputContentItem; use crate::mcp::CallToolResult; use crate::memory_citation::MemoryCitation; use crate::models::ContentItem; +use crate::models::ContentItemMetadata; use crate::models::FunctionCallOutputBody; use crate::models::ImageDetail; use crate::models::ImageReference; +use crate::models::InternalChatMessageMetadataPassthrough; use crate::models::MessagePhase; use crate::models::ResponseItem; use crate::models::WebSearchAction; @@ -108,6 +110,11 @@ pub struct HookPromptItem { pub struct HookPromptFragment { pub text: String, pub hook_run_id: String, + /// Emission-time attribution; persisted on the ResponseItem, not the UI hook fragment. + #[serde(skip)] + #[ts(skip)] + #[schemars(skip)] + pub metadata: ContentItemMetadata, } #[derive(Debug, Deserialize, Serialize)] @@ -668,19 +675,20 @@ impl HookPromptFragment { Self { text: text.into(), hook_run_id: hook_run_id.into(), + metadata: ContentItemMetadata::default(), } } } pub fn build_hook_prompt_message(fragments: &[HookPromptFragment]) -> Option { - let content = fragments - .iter() - .filter(|fragment| !fragment.hook_run_id.trim().is_empty()) - .filter_map(|fragment| { - serialize_hook_prompt_fragment(&fragment.text, &fragment.hook_run_id) - .map(|text| ContentItem::InputText { text }) - }) - .collect::>(); + let mut content = Vec::new(); + let mut metadata = Vec::new(); + for fragment in fragments { + if let Some(text) = serialize_hook_prompt_fragment(&fragment.text, &fragment.hook_run_id) { + content.push(ContentItem::InputText { text }); + metadata.push(fragment.metadata.clone()); + } + } if content.is_empty() { return None; @@ -693,7 +701,13 @@ pub fn build_hook_prompt_message(fragments: &[HookPromptFragment]) -> Option Option { return None; } - Some(HookPromptFragment { text, hook_run_id }) + Some(HookPromptFragment::from_single_hook(text, hook_run_id)) } fn serialize_hook_prompt_fragment(text: &str, hook_run_id: &str) -> Option { @@ -865,6 +879,7 @@ mod tests { HookPromptFragment { text: "Retry with tests.".to_string(), hook_run_id: "hook-run-1".to_string(), + metadata: Default::default(), } ); } diff --git a/codex-rs/protocol/src/models.rs b/codex-rs/protocol/src/models.rs index b2ce4a10a6..755c2ce675 100644 --- a/codex-rs/protocol/src/models.rs +++ b/codex-rs/protocol/src/models.rs @@ -53,6 +53,9 @@ pub use executed_tool_calls::bound_executed_tool_calls_for_message; pub use executed_tool_calls::executed_tool_call_metadata_bytes; pub use executed_tool_calls::normalize_executed_tool_call_completeness; pub use item_metadata::ContentItemKind; +pub use item_metadata::ContentItemMetadata; +pub use item_metadata::ContentItemNamespace; +pub use item_metadata::ContentItemProvenance; /// Controls the per-command sandbox override requested by a shell-like tool call. #[derive( @@ -986,6 +989,12 @@ pub struct InternalChatMessageMetadataPassthrough { #[schemars(skip)] #[ts(skip)] pub content_item_kinds: Option>, + /// Positional source attribution for `content`; missing historical entries are Unknown. + #[serde_as(deserialize_as = "serde_with::DefaultOnError")] + #[serde(default, skip_serializing_if = "Option::is_none")] + #[schemars(skip)] + #[ts(skip)] + pub content_item_metadata: Option>, // Ignore input values so requests and rollout reloads cannot fake tool call records. // A resumed thread can record new calls, but cannot prove old calls from this payload. /// Host-owned Code Mode cell shared by its `exec` and subsequent `wait` outputs. @@ -1492,7 +1501,7 @@ impl ResponseItem { } } - /// Removes content item classifications while preserving other passthrough metadata. + /// Removes content item classifications and attribution, preserving other metadata. pub fn clear_content_item_kinds(&mut self) { let Some(metadata) = self.internal_chat_message_metadata_passthrough_mut() else { return; @@ -1502,11 +1511,24 @@ impl ResponseItem { }; metadata_value.content_item_kinds = None; + metadata_value.content_item_metadata = None; if metadata_value == &InternalChatMessageMetadataPassthrough::default() { *metadata = None; } } + /// Removes per-content attribution for endpoints that do not yet accept it. + pub fn clear_content_item_metadata(&mut self) { + if let Some(metadata) = self.internal_chat_message_metadata_passthrough_mut() + && let Some(value) = metadata + { + value.content_item_metadata = None; + if value == &InternalChatMessageMetadataPassthrough::default() { + *metadata = None; + } + } + } + fn internal_chat_message_metadata_passthrough( &self, ) -> Option<&InternalChatMessageMetadataPassthrough> { diff --git a/codex-rs/protocol/src/models/executed_tool_calls.rs b/codex-rs/protocol/src/models/executed_tool_calls.rs index 7b2fe4c2d5..95151c2694 100644 --- a/codex-rs/protocol/src/models/executed_tool_calls.rs +++ b/codex-rs/protocol/src/models/executed_tool_calls.rs @@ -37,6 +37,7 @@ fn executed_tool_call_metadata_field_bytes( } else if metadata.turn_id.is_some() || metadata.create_time.is_some() || metadata.content_item_kinds.is_some() + || metadata.content_item_metadata.is_some() { bytes + 1 } else { diff --git a/codex-rs/protocol/src/models/item_metadata.rs b/codex-rs/protocol/src/models/item_metadata.rs index af08dfa827..c3d1326697 100644 --- a/codex-rs/protocol/src/models/item_metadata.rs +++ b/codex-rs/protocol/src/models/item_metadata.rs @@ -1,3 +1,5 @@ +//! Per-part context sources, independent of message role, visibility, and trust. + use serde::Deserialize; use serde::Serialize; @@ -12,6 +14,151 @@ impl ContentItemKind { } } +/// A callable namespace. Built-ins are typed; configured and MCP namespaces stay open. +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +#[serde(from = "String", into = "String")] +pub enum ContentItemNamespace { + Clock, + Functions, + ToolSearch, + Collaboration, + MultiAgentV1, + Other(String), +} + +impl From for ContentItemNamespace { + fn from(namespace: String) -> Self { + match namespace.as_str() { + "clock" => Self::Clock, + "functions" => Self::Functions, + "tool_search" => Self::ToolSearch, + "collaboration" => Self::Collaboration, + "multi_agent_v1" => Self::MultiAgentV1, + _ => Self::Other(namespace), + } + } +} + +impl From for String { + fn from(namespace: ContentItemNamespace) -> Self { + match namespace { + ContentItemNamespace::Clock => "clock".to_string(), + ContentItemNamespace::Functions => "functions".to_string(), + ContentItemNamespace::ToolSearch => "tool_search".to_string(), + ContentItemNamespace::Collaboration => "collaboration".to_string(), + ContentItemNamespace::MultiAgentV1 => "multi_agent_v1".to_string(), + ContentItemNamespace::Other(namespace) => namespace, + } + } +} + +/// Who supplied a part. Tool-related context remains Tool even when the harness writes it. +#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)] +#[serde(tag = "type", rename_all = "snake_case")] +pub enum ContentItemProvenance { + /// History saved before attribution, or content whose source is not known. + #[default] + #[serde(alias = "user_configured")] + Unknown, + /// The regular developer-instruction slot or additional requirements-layer instructions. + DeveloperInstructions { from_additional_requirements: bool }, + /// Skill catalogs, usage guidance, and selected skill contents. + Skills, + /// Instructions loaded from AGENTS.md. + AgentsMd, + /// Harness-managed context; command-hook output is distinguished from built-in context. + Harness { + #[serde(default)] + hook: bool, + }, + /// A tool result or tool-specific context; an unlisted tool can have no known namespace. + Tool { + #[serde(default, skip_serializing_if = "Option::is_none")] + namespace: Option, + }, + /// Ordinary user input, not an injected instruction fragment with a user role. + User, +} + +/// Attribution for one position in a harness-emitted item's content array. +#[derive(Debug, Clone, Default, Serialize, PartialEq, Eq)] +pub struct ContentItemMetadata { + pub provenance: ContentItemProvenance, +} + +impl<'de> Deserialize<'de> for ContentItemMetadata { + fn deserialize>(deserializer: D) -> Result { + // Older records may lack attribution. Neither the old user_configured category + // nor a bare harness_injected:false identifies a source precisely enough. + #[derive(Deserialize)] + struct StoredMetadata { + #[serde(default)] + provenance: Option, + #[serde(default)] + harness_injected: Option, + #[serde(default)] + source_tool_namespace: Option, + } + let stored = StoredMetadata::deserialize(deserializer)?; + let provenance = stored.provenance.unwrap_or_else(|| { + match (stored.source_tool_namespace, stored.harness_injected) { + (Some(namespace), _) => ContentItemProvenance::Tool { + namespace: Some(namespace.into()), + }, + (None, Some(true)) => ContentItemProvenance::Harness { hook: false }, + (None, Some(false) | None) => ContentItemProvenance::Unknown, + } + }); + Ok(Self { provenance }) + } +} + +impl ContentItemMetadata { + pub fn harness() -> Self { + Self { + provenance: ContentItemProvenance::Harness { hook: false }, + } + } + + pub fn command_hook() -> Self { + Self { + provenance: ContentItemProvenance::Harness { hook: true }, + } + } + + pub fn developer_instructions(from_additional_requirements: bool) -> Self { + Self { + provenance: ContentItemProvenance::DeveloperInstructions { + from_additional_requirements, + }, + } + } + + pub fn skills() -> Self { + Self { + provenance: ContentItemProvenance::Skills, + } + } + + pub fn agents_md() -> Self { + Self { + provenance: ContentItemProvenance::AgentsMd, + } + } + + pub fn user() -> Self { + Self { + provenance: ContentItemProvenance::User, + } + } + + pub fn tool(namespace: Option) -> Self { + Self { + provenance: ContentItemProvenance::Tool { namespace }, + } + } +} + #[cfg(test)] #[path = "item_metadata_tests.rs"] mod tests; diff --git a/codex-rs/utils/string/src/lib.rs b/codex-rs/utils/string/src/lib.rs index cacbb9e2e5..cbc755829c 100644 --- a/codex-rs/utils/string/src/lib.rs +++ b/codex-rs/utils/string/src/lib.rs @@ -3,9 +3,11 @@ mod truncate; pub use json::to_ascii_json_string; pub use json::to_json_string_bounded; +pub use truncate::TextTruncation; pub use truncate::approx_bytes_for_tokens; pub use truncate::approx_token_count; pub use truncate::approx_tokens_from_byte_count; +pub use truncate::plan_token_truncation; pub use truncate::truncate_middle_chars; pub use truncate::truncate_middle_with_marker; pub use truncate::truncate_middle_with_token_budget; diff --git a/codex-rs/utils/string/src/truncate.rs b/codex-rs/utils/string/src/truncate.rs index 075d78fd7a..acad740803 100644 --- a/codex-rs/utils/string/src/truncate.rs +++ b/codex-rs/utils/string/src/truncate.rs @@ -1,15 +1,45 @@ //! Utilities for truncating large chunks of output while preserving a prefix //! and suffix on UTF-8 boundaries. +use std::ops::Range; + const APPROX_BYTES_PER_TOKEN: usize = 4; +/// Replaces one UTF-8-aligned range with a notice. Callers can apply the same +/// edit to annotated text without losing the sources of the retained slices. +pub struct TextTruncation { + pub removed: Range, + pub marker: String, +} + +/// Plans the existing head/tail token truncation. The marker is outside the +/// retained-text budget, just as it is in [`truncate_middle_with_token_budget`]. +pub fn plan_token_truncation(s: &str, max_tokens: usize) -> Option { + let max_bytes = approx_bytes_for_tokens(max_tokens); + if s.len() <= max_bytes { + return None; + } + let (left_budget, right_budget) = split_budget(max_bytes); + let removed = s.floor_char_boundary(left_budget)..s.ceil_char_boundary(s.len() - right_budget); + let removed_tokens = approx_tokens_from_byte_count(s.len() - max_bytes); + Some(TextTruncation { + removed, + marker: format!("…{removed_tokens} tokens truncated…"), + }) +} + /// Retain at most `max_bytes` from a string's ends and add a character-count /// marker outside that budget. /// /// Use [`truncate_middle_with_marker`] when the complete result must fit a hard /// byte limit. pub fn truncate_middle_chars(s: &str, max_bytes: usize) -> String { - truncate_with_byte_estimate(s, max_bytes, /*use_tokens*/ false) + if s.len() <= max_bytes { + return s.to_string(); + } + let (left_budget, right_budget) = split_budget(max_bytes); + let (removed_chars, left, right) = split_string(s, left_budget, right_budget); + assemble_truncated_output(left, right, &format!("…{removed_chars} chars truncated…")) } /// Truncate the middle of a UTF-8 string so the result, including `marker`, is @@ -37,18 +67,13 @@ pub fn truncate_middle_with_marker(s: &str, max_bytes: usize, marker: &str) -> S /// truncated string and `Some(original_token_count)` if truncation occurred; /// otherwise returns the original string and `None`. pub fn truncate_middle_with_token_budget(s: &str, max_tokens: usize) -> (String, Option) { - if s.is_empty() { - return (String::new(), None); - } - - if max_tokens > 0 && s.len() <= approx_bytes_for_tokens(max_tokens) { + let Some(truncation) = plan_token_truncation(s, max_tokens) else { return (s.to_string(), None); - } - - let truncated = truncate_with_byte_estimate( - s, - approx_bytes_for_tokens(max_tokens), - /*use_tokens*/ true, + }; + let truncated = assemble_truncated_output( + &s[..truncation.removed.start], + &s[truncation.removed.end..], + &truncation.marker, ); let total_tokens = u64::try_from(approx_token_count(s)).unwrap_or(u64::MAX); @@ -59,45 +84,6 @@ pub fn truncate_middle_with_token_budget(s: &str, max_tokens: usize) -> (String, } } -fn truncate_with_byte_estimate(s: &str, max_bytes: usize, use_tokens: bool) -> String { - if s.is_empty() { - return String::new(); - } - - if max_bytes == 0 { - let total_chars = if use_tokens { 0 } else { s.chars().count() }; - return format_truncation_marker( - use_tokens, - removed_units(use_tokens, s.len(), total_chars), - ); - } - - if s.len() <= max_bytes { - return s.to_string(); - } - - let total_bytes = s.len(); - let (left_budget, right_budget) = split_budget(max_bytes); - let (removed_chars, left, right) = if use_tokens { - // Token markers depend only on byte counts; avoid scanning the discarded middle. - let prefix_end = s.floor_char_boundary(left_budget); - let suffix_start = s.ceil_char_boundary(total_bytes - right_budget); - (0, &s[..prefix_end], &s[suffix_start..]) - } else { - split_string(s, left_budget, right_budget) - }; - let marker = format_truncation_marker( - use_tokens, - removed_units( - use_tokens, - total_bytes.saturating_sub(max_bytes), - removed_chars, - ), - ); - - assemble_truncated_output(left, right, &marker) -} - pub fn approx_token_count(text: &str) -> usize { let len = text.len(); len.saturating_add(APPROX_BYTES_PER_TOKEN.saturating_sub(1)) / APPROX_BYTES_PER_TOKEN @@ -158,22 +144,6 @@ fn split_budget(budget: usize) -> (usize, usize) { (left, budget - left) } -fn format_truncation_marker(use_tokens: bool, removed_count: u64) -> String { - if use_tokens { - format!("…{removed_count} tokens truncated…") - } else { - format!("…{removed_count} chars truncated…") - } -} - -fn removed_units(use_tokens: bool, removed_bytes: usize, removed_chars: usize) -> u64 { - if use_tokens { - approx_tokens_from_byte_count(removed_bytes) - } else { - u64::try_from(removed_chars).unwrap_or(u64::MAX) - } -} - fn assemble_truncated_output(prefix: &str, suffix: &str, marker: &str) -> String { let mut out = String::with_capacity(prefix.len() + marker.len() + suffix.len() + 1); out.push_str(prefix); From 2f05c0a71f59fb2f05800846351f3e9926c3e52b Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 14 Oct 2026 02:43:18 +0000 Subject: [PATCH 026/155] Fix daemon updater socket binding and bootstrap readiness on Unix (#53845) ## Why The updater bound its socket directly beneath `CODEX_HOME`, which can exceed Unix socket path limits. Bootstrap could also report success before the updater's manual-update socket was ready. ## What changed - Reuse the control socket's protected binding and cleanup guard for the updater, with a symlink at the advertised socket path. - Remove stale updater socket entries before startup while preserving regular files. - Wait up to 30 seconds for supported automatic updaters to publish their socket, without connecting as a readiness probe. Report updater exit or timeout with stderr log context. - Preserve compatibility with older updaters that lack the manual-update command. ## Testing Add Unix integration tests for updater readiness with a long `CODEX_HOME` path and bootstrap failure when a regular file blocks the updater socket, verifying that the file is preserved and the daemon remains running. GitOrigin-RevId: 57fdcbe4e6907ece68ba66178cf81f258527560c --- codex-rs/app-server-daemon/src/lib.rs | 53 +++++++++++++++++++ codex-rs/app-server-daemon/src/update_loop.rs | 15 ++++-- codex-rs/app-server-transport/src/lib.rs | 2 + .../app-server-transport/src/transport/mod.rs | 2 + .../src/transport/unix_socket.rs | 43 +++++++++------ codex-rs/cli/tests/app_server_daemon.rs | 46 ++++++++++++++++ 6 files changed, 141 insertions(+), 20 deletions(-) diff --git a/codex-rs/app-server-daemon/src/lib.rs b/codex-rs/app-server-daemon/src/lib.rs index 3b4fc6c3ed..0b65a9a7b8 100644 --- a/codex-rs/app-server-daemon/src/lib.rs +++ b/codex-rs/app-server-daemon/src/lib.rs @@ -853,6 +853,19 @@ impl Daemon { backend::pid_update_loop_backend(self.backend_paths(&settings)) .stop() .await?; + #[cfg(unix)] + { + use std::os::unix::fs::FileTypeExt; + + // A stopped older updater can leave its socket behind. Remove only + // the rendezvous entry before starting, so readiness cannot be stale. + let path = self.manual_update_socket_path(); + if let Ok(metadata) = tokio::fs::symlink_metadata(&path).await + && (metadata.file_type().is_socket() || metadata.file_type().is_symlink()) + { + tokio::fs::remove_file(path).await?; + } + } if let Some(backend) = self.running_backend_instance(&settings).await? { if let Err(err) = thread_recovery::discard_pending(self) { eprintln!("warning: failed to clear stale daemon recovery before bootstrap: {err}"); @@ -866,6 +879,46 @@ impl Daemon { backend.start().await?; let info = self.wait_until_ready().await?; let auto_update_enabled = managed.ensure_managed_updater(&settings).await?; + #[cfg(unix)] + // Older automatic updaters have no manual request socket to wait for. + if auto_update_enabled + && managed_install::supports_daemon_command( + &managed.managed_codex_bin, + &["update", "--help"], + ) + .await + { + use std::os::unix::fs::FileTypeExt; + + let updater = backend::pid_update_loop_backend(managed.backend_paths(&settings)); + let path = managed.manual_update_socket_path(); + // Match the manual-update client's startup allowance: the updater + // verifies its executable before publishing its listener. + let deadline = tokio::time::Instant::now() + Duration::from_secs(30); + loop { + // Do not connect: even an empty probe can consume a one-shot + // updater's restore authority. Old updaters also publish sockets. + let running = updater.is_starting_or_running().await?; + if running + && tokio::fs::metadata(&path) + .await + .is_ok_and(|metadata| metadata.file_type().is_socket()) + { + break; + } + if !running || tokio::time::Instant::now() >= deadline { + let reason = if running { "timed out" } else { "exited" }; + let mut context = format!( + "daemon updater {reason} before becoming ready on {}", + path.display() + ); + backend::append_stderr_log_tail_context(&managed.update_pid_file, &mut context) + .await; + return Err(anyhow!(context)); + } + sleep(START_POLL_INTERVAL).await; + } + } let managed_codex_version = managed.managed_codex_version_best_effort().await; Ok(BootstrapOutput { status: BootstrapStatus::Bootstrapped, diff --git a/codex-rs/app-server-daemon/src/update_loop.rs b/codex-rs/app-server-daemon/src/update_loop.rs index faa1138c4b..ced80c7567 100644 --- a/codex-rs/app-server-daemon/src/update_loop.rs +++ b/codex-rs/app-server-daemon/src/update_loop.rs @@ -130,10 +130,17 @@ async fn run_with_http( .context("updater socket has no parent")?, ) .await?; - if socket_path.exists() { - tokio::fs::remove_file(&socket_path).await?; - } - let mut listener = Some(codex_uds::UnixListener::bind(&socket_path).await?); + #[cfg(unix)] + let (listener, _socket_guard) = + codex_app_server_transport::bind_private_daemon_socket(&socket_path).await?; + #[cfg(windows)] + let listener = { + if socket_path.exists() { + tokio::fs::remove_file(&socket_path).await?; + } + codex_uds::UnixListener::bind(&socket_path).await? + }; + let mut listener = Some(listener); #[cfg(windows)] updater.mark_ready().await?; let needs_managed_handoff = diff --git a/codex-rs/app-server-transport/src/lib.rs b/codex-rs/app-server-transport/src/lib.rs index 7b91ece217..946b0be967 100644 --- a/codex-rs/app-server-transport/src/lib.rs +++ b/codex-rs/app-server-transport/src/lib.rs @@ -23,6 +23,7 @@ pub use transport::AppServerTransportParseError; pub use transport::CHANNEL_CAPACITY; pub use transport::ConnectionOrigin; pub use transport::DaemonShutdownAccess; +pub use transport::DaemonSocketFileGuard; pub use transport::REMOTE_CONTROL_DISABLED_ENV_VAR; pub use transport::RemoteControlDisabledByRequirements; pub use transport::RemoteControlEnableError; @@ -35,6 +36,7 @@ pub use transport::TransportEvent; pub use transport::acquire_app_server_startup_lock; pub use transport::app_server_control_socket_path; pub use transport::app_server_startup_lock_path; +pub use transport::bind_private_daemon_socket; pub use transport::daemon_recovery_file_path; pub use transport::start_control_socket_acceptor; pub use transport::start_remote_control; diff --git a/codex-rs/app-server-transport/src/transport/mod.rs b/codex-rs/app-server-transport/src/transport/mod.rs index 232ce948b0..8ec79543e9 100644 --- a/codex-rs/app-server-transport/src/transport/mod.rs +++ b/codex-rs/app-server-transport/src/transport/mod.rs @@ -43,7 +43,9 @@ pub use remote_control::take_remote_control_disabled_env; pub use stdio::start_stdio_connection; pub use unix_socket::AppServerStartupLock; pub use unix_socket::DaemonShutdownAccess; +pub use unix_socket::DaemonSocketFileGuard; pub use unix_socket::acquire_app_server_startup_lock; +pub use unix_socket::bind_private_daemon_socket; pub use unix_socket::start_control_socket_acceptor; pub use websocket::start_websocket_acceptor; diff --git a/codex-rs/app-server-transport/src/transport/unix_socket.rs b/codex-rs/app-server-transport/src/transport/unix_socket.rs index afc69753b2..89a2cace33 100644 --- a/codex-rs/app-server-transport/src/transport/unix_socket.rs +++ b/codex-rs/app-server-transport/src/transport/unix_socket.rs @@ -46,6 +46,27 @@ pub async fn start_control_socket_acceptor( shutdown_token: CancellationToken, daemon_shutdown_access: DaemonShutdownAccess, ) -> IoResult> { + let (listener, socket_guard) = bind_private_daemon_socket(socket_path.as_path()).await?; + info!( + socket_path = %socket_guard.socket_path.display(), + "app-server control socket listening" + ); + + Ok(tokio::spawn(run_control_socket_acceptor( + listener, + transport_event_tx, + shutdown_token, + socket_guard, + daemon_shutdown_access, + ))) +} + +/// Binds a private daemon socket, retaining its advertised path as a rendezvous +/// alias on Unix. Keep the guard alive for as long as the listener is in use. +pub async fn bind_private_daemon_socket( + socket_path: &Path, +) -> IoResult<(UnixListener, DaemonSocketFileGuard)> { + let socket_path = AbsolutePathBuf::from_absolute_path(socket_path)?; #[cfg(unix)] let (socket_path, rendezvous_path, mut startup_lock) = { use std::os::unix::fs::MetadataExt; @@ -99,7 +120,7 @@ pub async fn start_control_socket_acceptor( { startup_lock.remove_on_drop = true; } - let socket_guard = ControlSocketFileGuard { + let socket_guard = DaemonSocketFileGuard { socket_path, #[cfg(unix)] rendezvous_path, @@ -116,25 +137,14 @@ pub async fn start_control_socket_acceptor( )?; #[cfg(unix)] socket_guard._startup_lock._file.unlock()?; - info!( - socket_path = %socket_guard.socket_path.display(), - "app-server control socket listening" - ); - - Ok(tokio::spawn(run_control_socket_acceptor( - listener, - transport_event_tx, - shutdown_token, - socket_guard, - daemon_shutdown_access, - ))) + Ok((listener, socket_guard)) } async fn run_control_socket_acceptor( mut listener: UnixListener, transport_event_tx: mpsc::Sender, shutdown_token: CancellationToken, - socket_guard: ControlSocketFileGuard, + socket_guard: DaemonSocketFileGuard, daemon_shutdown_access: DaemonShutdownAccess, ) { let _socket_guard = socket_guard; @@ -445,7 +455,8 @@ async fn set_control_socket_permissions(_socket_path: &Path) -> IoResult<()> { Ok(()) } -struct ControlSocketFileGuard { +/// Owns the socket files and startup lock until the listener is shut down. +pub struct DaemonSocketFileGuard { socket_path: AbsolutePathBuf, #[cfg(unix)] rendezvous_path: AbsolutePathBuf, @@ -456,7 +467,7 @@ struct ControlSocketFileGuard { _directory_guard: std::os::windows::io::OwnedHandle, } -impl Drop for ControlSocketFileGuard { +impl Drop for DaemonSocketFileGuard { fn drop(&mut self) { #[cfg(unix)] if std::fs::read_link(self.rendezvous_path.as_path()) diff --git a/codex-rs/cli/tests/app_server_daemon.rs b/codex-rs/cli/tests/app_server_daemon.rs index e05bedffe7..7129f9f34b 100644 --- a/codex-rs/cli/tests/app_server_daemon.rs +++ b/codex-rs/cli/tests/app_server_daemon.rs @@ -171,6 +171,52 @@ fn managed_daemon_restarts_from_deleted_working_directory() -> Result<()> { Ok(()) } +#[test] +fn bootstrap_updater_is_ready_in_deep_codex_home() -> Result<()> { + let mut daemon = TestDaemon::new()?; + let deep_home = tempfile::Builder::new() + .prefix(&"deep-codex-home-".repeat(8)) + .tempdir_in("/tmp")?; + for name in ["packages", "app-server-daemon"] { + std::fs::rename(daemon.home.path().join(name), deep_home.path().join(name))?; + } + daemon.home = deep_home; + let state = daemon.home.path().join("app-server-daemon"); + std::fs::write( + state.join("settings.json"), + br#"{"shutdownGraceSeconds":0}"#, + )?; + let socket = state.join("app-server-updater.sock"); + let result = daemon.lifecycle("bootstrap")?; + assert_eq!(result["autoUpdateEnabled"], true); + assert_eq!(result["status"], "bootstrapped"); + signal(daemon.pid("app-server-updater.pid")?, /*signal*/ 0)?; + let target = socket.canonicalize()?; + let _connection = std::os::unix::net::UnixStream::connect(target)?; + assert_eq!(daemon.lifecycle("version")?["status"], "running"); + Ok(()) +} + +#[test] +fn bootstrap_reports_updater_bind_failure() -> Result<()> { + let daemon = TestDaemon::new()?; + let state = daemon.home.path().join("app-server-daemon"); + std::fs::write( + state.join("settings.json"), + br#"{"shutdownGraceSeconds":0}"#, + )?; + let socket = state.join("app-server-updater.sock"); + std::fs::write(&socket, b"not a socket")?; + let result = daemon + .command() + .args(["app-server", "daemon", "bootstrap"]) + .output()?; + assert!(!result.status.success()); + assert_eq!(std::fs::read(socket)?, b"not a socket"); + assert_eq!(daemon.lifecycle("version")?["status"], "running"); + Ok(()) +} + #[test] fn explicit_restart_applies_feature_overrides_and_preserves_saved_settings() -> Result<()> { let daemon = TestDaemon::new()?; From e342df7b668acea2a0417d56cf872dab837276ef Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Wed, 14 Oct 2026 03:19:59 +0000 Subject: [PATCH 027/155] Reuse staged file digests when preparing daemon installs (#53853) ## Why Daemon installation rereads staged files to verify the executable and hash the normalized WinGet package, even though staging already computed their digests. ## What changed Cache file digests while copying the package and reuse them for the staged executable comparison and final WinGet tree hash. Update cached paths when moving WinGet executables and refresh digests when rewriting manifests. Continue hashing source packages and existing releases from disk so digest reuse does not bypass content validation. ## Testing Extend the installation test to corrupt an existing release's `codex-package.json` and verify that reinstalling rejects it while preserving the current selection. GitOrigin-RevId: 429da2ad8b2ee50f07ffb14b79281ab262a2d1a1 --- .../app-server-daemon/src/managed_install.rs | 2 +- .../app-server-daemon/src/prepare_install.rs | 82 ++++++++++++------- .../src/prepare_install_tests.rs | 24 +++++- 3 files changed, 77 insertions(+), 31 deletions(-) diff --git a/codex-rs/app-server-daemon/src/managed_install.rs b/codex-rs/app-server-daemon/src/managed_install.rs index 6a60e3c49b..1afe10c856 100644 --- a/codex-rs/app-server-daemon/src/managed_install.rs +++ b/codex-rs/app-server-daemon/src/managed_install.rs @@ -183,7 +183,7 @@ pub(crate) async fn managed_codex_version(codex_bin: &Path) -> Result { #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub(crate) struct ExecutableIdentity { - digest: [u8; 32], + pub(crate) digest: [u8; 32], // Distinguish release generations whose executable bytes are identical. #[serde(default, skip_serializing_if = "Option::is_none")] pub(crate) path_digest: Option<[u8; 32]>, diff --git a/codex-rs/app-server-daemon/src/prepare_install.rs b/codex-rs/app-server-daemon/src/prepare_install.rs index 40cf40b944..ef09b6dab1 100644 --- a/codex-rs/app-server-daemon/src/prepare_install.rs +++ b/codex-rs/app-server-daemon/src/prepare_install.rs @@ -2,6 +2,7 @@ //! existing selections; explicit replacements migrate to dedicated packages and stay pinned. //! WinGet sources are verified in their original layout before staging a canonical daemon package. +use std::collections::BTreeMap; use std::path::Path; use std::path::PathBuf; @@ -231,18 +232,18 @@ async fn prepare_from_package( let stage = tempfile::Builder::new() .prefix(".staging.") .tempdir_in(&releases)?; - let digest = package_tree(source, Some(stage.path()))?; + let mut staged_digests = BTreeMap::new(); + let digest = package_tree(source, Some(stage.path()), &mut staged_digests)?; let staged_exe = if cfg!(target_os = "macos") && stage.path().join("CodexCLI.app").is_dir() { - stage.path().join("CodexCLI.app/Contents/MacOS/codex") + Path::new("CodexCLI.app/Contents/MacOS/codex") } else { - stage.path().join(source_entrypoint) + Path::new(source_entrypoint) }; anyhow::ensure!( - package_tree(source, /*destination*/ None)? == digest + package_tree(source, /*destination*/ None, &mut BTreeMap::new())? == digest && std::fs::read(stage.path().join("codex-package.json"))? == manifest_bytes - && managed_install::executable_identity(&staged_exe) - .await? - .same_contents(&running_identity), + && staged_digests.get(staged_exe).map(blake3::Hash::as_bytes) + == Some(&running_identity.digest), "the CLI package changed while preparing the daemon or differs from the running executable" ); // Reverse the WinGet archive's root filenames only after verifying the copied @@ -250,13 +251,17 @@ async fn prepare_from_package( let digest = if winget { std::fs::create_dir_all(stage.path().join("bin"))?; #[cfg(windows)] - { - windows::publish_release(&staged_exe, &stage.path().join(entrypoint)).await?; - windows::publish_release( - &stage.path().join("codex-code-mode-host.exe"), - &stage.path().join("bin/codex-code-mode-host.exe"), - ) - .await?; + for (from, to) in [ + (staged_exe, Path::new(entrypoint)), + ( + Path::new("codex-code-mode-host.exe"), + Path::new("bin/codex-code-mode-host.exe"), + ), + ] { + windows::publish_release(&stage.path().join(from), &stage.path().join(to)).await?; + if let Some(digest) = staged_digests.remove(from) { + staged_digests.insert(to.to_path_buf(), digest); + } } let voice_path = stage.path().join("codex-resources/voice/manifest.json"); if voice_path.try_exists()? { @@ -269,14 +274,18 @@ async fn prepare_from_package( .remove(source_entrypoint) .context("WinGet voice manifest is missing the CLI checksum")?; checksums.insert(entrypoint.to_string(), checksum); - std::fs::write(voice_path, serde_json::to_vec_pretty(&voice)?)?; + let bytes = serde_json::to_vec_pretty(&voice)?; + std::fs::write(voice_path, &bytes)?; + staged_digests.insert( + PathBuf::from("codex-resources/voice/manifest.json"), + blake3::hash(&bytes), + ); } metadata["entrypoint"] = entrypoint.into(); - std::fs::write( - stage.path().join("codex-package.json"), - serde_json::to_vec_pretty(&metadata)?, - )?; - package_tree(stage.path(), /*destination*/ None)? + let bytes = serde_json::to_vec_pretty(&metadata)?; + std::fs::write(stage.path().join("codex-package.json"), &bytes)?; + staged_digests.insert(PathBuf::from("codex-package.json"), blake3::hash(&bytes)); + package_tree(stage.path(), /*destination*/ None, &mut staged_digests)? } else { digest }; @@ -296,7 +305,7 @@ async fn prepare_from_package( if release.try_exists()? { anyhow::ensure!( !release.symlink_metadata()?.file_type().is_symlink() - && package_tree(&release, /*destination*/ None)? == digest, + && package_tree(&release, /*destination*/ None, &mut BTreeMap::new())? == digest, "an existing daemon release has different contents; refusing to overwrite it" ); } else { @@ -416,7 +425,13 @@ async fn prepare_from_package( /// Hash the complete tree and optionally copy those same bytes. Relative file /// links are materialized; escaping links and directory links are rejected. -fn package_tree(root: &Path, destination: Option<&Path>) -> Result { +/// Only reuse digests for a private staging directory; source and release +/// validation must pass a fresh map. +fn package_tree( + root: &Path, + destination: Option<&Path>, + file_digests: &mut BTreeMap, +) -> Result { let canonical_root = root.canonicalize()?; let mut hasher = blake3::Hasher::new(); let mut paths = vec![root.to_path_buf()]; @@ -454,19 +469,28 @@ fn package_tree(root: &Path, destination: Option<&Path>) -> Result { paths.extend(entries); } else { anyhow::ensure!(metadata.is_file(), "package contains an unsupported file"); - let bytes = std::fs::read(&path)?; + let digest = if let Some(digest) = file_digests.get(relative) + && destination.is_none() + { + *digest + } else { + let bytes = std::fs::read(&path)?; + let digest = blake3::hash(&bytes); + if let Some(destination) = destination { + let target = destination.join(relative); + std::fs::write(&target, bytes)?; + std::fs::set_permissions(target, metadata.permissions())?; + } + file_digests.insert(relative.to_path_buf(), digest); + digest + }; hasher.update(b"file"); - hasher.update(blake3::hash(&bytes).as_bytes()); + hasher.update(digest.as_bytes()); #[cfg(unix)] { use std::os::unix::fs::PermissionsExt; hasher.update(&(metadata.permissions().mode() & 0o777).to_le_bytes()); } - if let Some(destination) = destination { - let target = destination.join(relative); - std::fs::write(&target, bytes)?; - std::fs::set_permissions(target, metadata.permissions())?; - } } } Ok(hasher.finalize().to_hex().to_string()) diff --git a/codex-rs/app-server-daemon/src/prepare_install_tests.rs b/codex-rs/app-server-daemon/src/prepare_install_tests.rs index 446f031f1a..ee33ca866b 100644 --- a/codex-rs/app-server-daemon/src/prepare_install_tests.rs +++ b/codex-rs/app-server-daemon/src/prepare_install_tests.rs @@ -1,5 +1,7 @@ //! Covers complete-package staging, conservative selection, and legacy preservation. #![cfg(unix)] +use std::collections::BTreeMap; + use super::InstallMode; use super::prepare_from_package; use super::validate_package; @@ -86,7 +88,8 @@ async fn seeds_full_package() { let target = super::platform_target().unwrap(); // Reinstall the seed's exact package after partially deleting an older copy. let original = old; - let digest = super::package_tree(&original, /*destination*/ None).unwrap(); + let digest = + super::package_tree(&original, /*destination*/ None, &mut BTreeMap::new()).unwrap(); let old = releases.join(format!("local-{digest}-{target}")); let previous = releases.join(format!("0.151.0-{target}")); package(&old, "0.152.0"); @@ -418,6 +421,25 @@ async fn explicit_selection_requires_unchanged_cli_and_pins_all_versions() { assert!(daemon.running_backend(&settings).await.unwrap().is_none()); previous = selected; } + + // Reusing a release must still validate its current contents from disk. + std::fs::write(previous.join("codex-package.json"), b"corrupt manifest").unwrap(); + let error = prepare_from_package( + &daemon(&home), + &settings, + InstallMode::Replace, + Some(&source), + &bin, + |_| Ok(true), + ) + .await + .unwrap_err(); + assert!( + error + .to_string() + .contains("existing daemon release has different contents") + ); + assert_eq!(root.join("current").canonicalize().unwrap(), previous); } } From c22a06c18070c3e33bd2648c7210a00a2a9f6f80 Mon Sep 17 00:00:00 2001 From: Ian MacLeod Date: Wed, 14 Oct 2026 03:43:32 +0000 Subject: [PATCH 028/155] Record bucketed terminal sizes in TUI telemetry (#53859) ## What changed - Add `terminal_columns` and `terminal_rows` buckets to `codex.tui.start`. - Record `codex.tui.terminal_size` for new turns in the active thread and for resize bucket changes after the terminal size settles for 15 seconds. Reuse launch context and suppress duplicate turn notifications. - Respect analytics consent for the built-in metrics exporter while allowing explicitly configured OTLP collectors. Apply consent checks to the active exporter across provider replacements. ## Testing Add coverage for exporter replacement and consent after config reloads. Extend the PTY integration test to verify startup size buckets, turn-start observations, and delayed resize observations with analytics disabled and an explicit OTLP collector. GitOrigin-RevId: e01a900cd3f04a36731078f725c75374596cb01b --- codex-rs/cli/tests/worktree.rs | 90 +++++++++++++++++-- codex-rs/otel/src/metrics/client.rs | 24 +++++ codex-rs/otel/src/metrics/client_tests.rs | 57 ++++++++++++ codex-rs/tui/src/app.rs | 1 + codex-rs/tui/src/app/startup.rs | 39 ++++++++ codex-rs/tui/src/app/test_support.rs | 1 + codex-rs/tui/src/app/tests.rs | 5 ++ .../tests/terminal_size_telemetry_tests.rs | 26 ++++++ codex-rs/tui/src/app/thread_routing.rs | 17 ++++ codex-rs/tui/src/chatwidget.rs | 4 + codex-rs/tui/src/daemon_startup_tests.rs | 1 + codex-rs/tui/src/daemon_telemetry.rs | 16 ++-- codex-rs/tui/src/lib.rs | 8 +- codex-rs/tui/src/startup_orchestration.rs | 10 ++- codex-rs/tui/src/terminal_size_telemetry.rs | 64 +++++++++++++ codex-rs/tui/src/tui.rs | 2 + 16 files changed, 349 insertions(+), 16 deletions(-) create mode 100644 codex-rs/otel/src/metrics/client_tests.rs create mode 100644 codex-rs/tui/src/app/tests/terminal_size_telemetry_tests.rs create mode 100644 codex-rs/tui/src/terminal_size_telemetry.rs diff --git a/codex-rs/cli/tests/worktree.rs b/codex-rs/cli/tests/worktree.rs index 664b2e1d65..f3c41547ec 100644 --- a/codex-rs/cli/tests/worktree.rs +++ b/codex-rs/cli/tests/worktree.rs @@ -9,6 +9,7 @@ use std::io::Write as _; use std::path::Path; use std::process::Command; use std::time::Duration; +use std::time::Instant; #[cfg(not(unix))] use tempfile::TempDir; use wiremock::Mock; @@ -252,6 +253,10 @@ trust_level = "trusted" env.insert("TERM".into(), "xterm-256color".into()); env.insert("TERM_PROGRAM".into(), "unrecognized-terminal".into()); env.insert("OTEL_METRIC_EXPORT_INTERVAL".into(), "100".into()); + env.insert( + "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE".into(), + "delta".into(), + ); for key in [ "CODEX_EXEC_SERVER_URL", "CODEX_ACCESS_TOKEN", @@ -335,8 +340,8 @@ trust_level = "trusted" } let (metric_tx, mut metric_rx) = tokio::sync::mpsc::unbounded_channel(); Mock::given(wiremock::matchers::path("/metrics")) - .respond_with(move |_: &wiremock::Request| { - let _ = metric_tx.send(()); + .respond_with(move |request: &wiremock::Request| { + let _ = metric_tx.send(request.body.clone()); ResponseTemplate::new(200).set_body_json(serde_json::json!({})) }) .mount(&server) @@ -409,7 +414,8 @@ trust_level = "trusted" if analytics { args.extend([ "-c".into(), - "analytics.enabled=true".into(), + // An explicit collector is independent of built-in analytics consent. + "analytics.enabled=false".into(), "-c".into(), format!( "otel.metrics_exporter={{otlp-http={{endpoint=\"{}/metrics\",protocol=\"json\"}}}}", @@ -551,9 +557,44 @@ trust_level = "trusted" .with_context(|| format!("daemon status timed out: {output}"))??; } if analytics { - tokio::time::timeout(Duration::from_secs(/*secs*/ 10), metric_rx.recv()) - .await? - .context("metrics export while the TUI is running")?; + for reason in ["turn_start", "resize"] { + let started = Instant::now(); + let wait = if reason == "resize" { + session.resize(codex_utils_pty::TerminalSize { + rows: 80, + cols: 240, + })?; + Duration::from_secs(/*secs*/ 30) + } else { + Duration::from_secs(/*secs*/ 10) + }; + tokio::time::timeout(wait, async { + loop { + tokio::select! { + body = metric_rx.recv() => { + let payload: Value = serde_json::from_slice(&body.context("metric body")?)?; + let found = payload["resourceMetrics"].as_array().into_iter().flatten() + .flat_map(|resource| resource["scopeMetrics"].as_array().into_iter().flatten()) + .flat_map(|scope| scope["metrics"].as_array().into_iter().flatten()) + .filter(|metric| metric["name"] == "codex.tui.terminal_size") + .flat_map(|metric| metric["sum"]["dataPoints"].as_array().into_iter().flatten()) + .any(|point| point["attributes"].as_array().into_iter().flatten().any(|attribute| + attribute["key"] == "observation_reason" && attribute["value"]["stringValue"] == reason)); + if found { return Ok::<_, anyhow::Error>(()); } + } + bytes = stdout.recv() => { + let bytes = bytes.context("TUI exited before size observation")?; + output.push_str(&String::from_utf8_lossy(&bytes)); + let replies = queries.feed(&bytes); + if !replies.is_empty() { session.writer_sender().send(replies).await?; } + } + } + } + }).await.with_context(|| format!("waiting for {reason} observation"))??; + if reason == "resize" { + assert!(started.elapsed() >= Duration::from_secs(/*secs*/ 15)); + } + } } let startup_result = observed.as_ref().map(|result| result.as_ref().map(|_| ())); assert!( @@ -637,6 +678,7 @@ trust_level = "trusted" .flat_map(|metric| metric["sum"]["dataPoints"].as_array().into_iter().flatten()) .next() .context("codex.tui.start data point")?; + assert_eq!(point["asInt"], 1); let tags = point["attributes"] .as_array() .context("codex.tui.start attributes")? @@ -653,6 +695,8 @@ trust_level = "trusted" let mut expected_tags = HashMap::from([ ("app_server_mode", "in_process"), ("terminal_name", "unknown"), + ("terminal_columns", "120-239"), + ("terminal_rows", "40-79"), ("multiplexer", "none"), ("daemon_selection_reason", "incompatible_option"), ( @@ -680,6 +724,40 @@ trust_level = "trusted" ]); } assert_eq!(tags, expected_tags); + let observations = exported + .iter() + .filter(|metric| metric["name"] == "codex.tui.terminal_size") + .flat_map(|metric| metric["sum"]["dataPoints"].as_array().into_iter().flatten()) + .collect::>(); + assert_eq!(observations.len(), 2); + for observation in observations { + assert_eq!(observation["asInt"], 1); + let observation_tags = observation["attributes"] + .as_array() + .context("observation attributes")? + .iter() + .map(|attribute| { + Ok(( + attribute["key"].as_str().context("observation key")?, + attribute["value"]["stringValue"] + .as_str() + .context("observation value")?, + )) + }) + .collect::>>()?; + let reason = observation_tags["observation_reason"]; + let mut expected = expected_tags.clone(); + expected.insert("observation_reason", reason); + match reason { + "turn_start" => {} + "resize" => { + expected.insert("terminal_columns", "240-479"); + expected.insert("terminal_rows", "80-119"); + } + other => anyhow::bail!("unexpected observation: {other}"), + } + assert_eq!(observation_tags, expected); + } } else { assert!(metrics.is_empty(), "metrics exporter disabled"); } diff --git a/codex-rs/otel/src/metrics/client.rs b/codex-rs/otel/src/metrics/client.rs index 8bbb12cdc5..9564f1eef4 100644 --- a/codex-rs/otel/src/metrics/client.rs +++ b/codex-rs/otel/src/metrics/client.rs @@ -43,6 +43,10 @@ use std::sync::Weak; use std::time::Duration; use tracing::debug; +#[cfg(test)] +#[path = "client_tests.rs"] +mod tests; + const ENV_ATTRIBUTE: &str = "env"; const METER_NAME: &str = "codex"; const MILLISECOND_DURATION_UNIT: &str = "ms"; @@ -109,6 +113,7 @@ pub(super) struct MetricsClientInner { histograms: Mutex>>, duration_histograms: Mutex>>, runtime_reader: Option>, + requires_analytics_consent: bool, statsig_disabled_metrics: &'static [&'static str], default_tags: BTreeMap, } @@ -358,6 +363,8 @@ impl MetricsClient { ) }); + let requires_analytics_consent = + matches!(exporter, MetricsExporter::Otlp(OtelExporter::Statsig)); let (meter_provider, meter) = match exporter { MetricsExporter::InMemory(exporter) => { build_provider(resource, exporter, export_interval, runtime_reader.clone()) @@ -391,6 +398,7 @@ impl MetricsClient { histograms: Mutex::new(HashMap::new()), duration_histograms: Mutex::new(HashMap::new()), runtime_reader, + requires_analytics_consent, statsig_disabled_metrics, default_tags, }), @@ -414,6 +422,22 @@ impl MetricsClient { .counter(name, /*description*/ None, inc, tags) } + /// Record a counter while applying analytics consent only to the built-in exporter. + /// The consent check and recording use the same exporter even during provider replacement. + pub fn counter_with_analytics_consent( + &self, + name: &str, + inc: i64, + tags: &[(&str, &str)], + analytics_enabled: bool, + ) -> Result<()> { + let inner = self.active_inner(); + if inner.requires_analytics_consent && !analytics_enabled { + return Ok(()); + } + inner.counter(name, /*description*/ None, inc, tags) + } + /// Send a single counter increment with an instrument description. pub fn counter_with_description( &self, diff --git a/codex-rs/otel/src/metrics/client_tests.rs b/codex-rs/otel/src/metrics/client_tests.rs new file mode 100644 index 0000000000..5363a3f53e --- /dev/null +++ b/codex-rs/otel/src/metrics/client_tests.rs @@ -0,0 +1,57 @@ +//! Consent follows the actual counter destination across exporter replacements. + +use super::*; +use opentelemetry_sdk::metrics::data::AggregatedMetrics; +use opentelemetry_sdk::metrics::data::MetricData; +use opentelemetry_sdk::metrics::data::ScopeMetrics; +use opentelemetry_sdk::metrics::data::SumDataPoint; +use pretty_assertions::assert_eq; + +#[test] +fn counter_consent_uses_the_active_exporter() -> Result<()> { + let mut builtin = MetricsClient::new( + MetricsConfig::in_memory("test", "test", "1", Default::default()).with_runtime_reader(), + )?; + // Use the existing in-memory exporter to observe the built-in consent policy without + // contacting Statsig (the real Statsig exporter is disabled in debug builds). + Arc::get_mut(&mut builtin.inner) + .expect("unique provider") + .requires_analytics_consent = true; + let custom = MetricsClient::new( + MetricsConfig::in_memory("test", "test", "1", Default::default()).with_runtime_reader(), + )?; + let active = Arc::new(RwLock::new(Arc::clone(&builtin.inner))); + let metrics = MetricsClient { + inner: Arc::clone(&builtin.inner), + active: Some(Arc::clone(&active)), + }; + + // A config reload alone does not replace the installed built-in exporter. + for analytics_enabled in [false, true] { + metrics.counter_with_analytics_consent( + "test.observations", + /*inc*/ 1, + &[], + analytics_enabled, + )?; + } + *active.write().unwrap() = Arc::clone(&custom.inner); + metrics.counter_with_analytics_consent( + "test.observations", + /*inc*/ 1, + &[], + /*analytics_enabled*/ false, + )?; + + let mut counts = Vec::new(); + for destination in [&builtin, &custom] { + let snapshot = destination.snapshot()?; + for metric in snapshot.scope_metrics().flat_map(ScopeMetrics::metrics) { + if let AggregatedMetrics::U64(MetricData::Sum(sum)) = metric.data() { + counts.extend(sum.data_points().map(SumDataPoint::value)); + } + } + } + assert_eq!(counts, vec![1, 1]); + Ok(()) +} diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs index 1b07e9826d..9a324aa3bd 100644 --- a/codex-rs/tui/src/app.rs +++ b/codex-rs/tui/src/app.rs @@ -536,6 +536,7 @@ pub(crate) struct App { config_notification_test_pending: Option, model_catalog: Arc, pub(crate) session_telemetry: SessionTelemetry, + terminal_size_tags: crate::terminal_size_telemetry::LaunchTags, pub(crate) app_event_tx: AppEventSender, pub(crate) chat_widget: ChatWidget, workspace_command_runner: Option, diff --git a/codex-rs/tui/src/app/startup.rs b/codex-rs/tui/src/app/startup.rs index 4c329f3787..c053d540f1 100644 --- a/codex-rs/tui/src/app/startup.rs +++ b/codex-rs/tui/src/app/startup.rs @@ -889,6 +889,7 @@ See the Codex keymap documentation for supported actions and examples." config_notification_test_pending: None, model_catalog, session_telemetry: session_telemetry.clone(), + terminal_size_tags: tui.terminal_size_tags.clone(), app_event_tx, chat_widget, workspace_command_runner: Some(workspace_command_runner), @@ -1160,6 +1161,9 @@ See the Codex keymap documentation for supported actions and examples." ); } + let mut last_screen_size = tui.terminal.last_known_screen_size; + let mut settled_size_tags = crate::terminal_size_telemetry::tags(last_screen_size); + let mut pending_resize: Option<(ratatui::layout::Size, Instant)> = None; let mut listen_for_app_server_events = true; let mut reconnect = None; let mut waiting_for_initial_session_configured = wait_for_initial_session_configured; @@ -1263,6 +1267,19 @@ See the Codex keymap documentation for supported actions and examples." && has_pending_app_events || (!waiting_for_initial_session_configured && app.has_queued_startup_protected_request()); + // The screen cache is physical geometry, not the inline viewport. This also + // notices the final size after returning from a standalone nested screen. + let size = tui.terminal.last_known_screen_size; + if !crate::terminal_size_telemetry::enabled(&app.config) + || app.terminal_size_tags.is_empty() + { + pending_resize = None; + settled_size_tags = crate::terminal_size_telemetry::tags(size); + } else if size != last_screen_size { + pending_resize = + Some((size, Instant::now() + Duration::from_secs(/*secs*/ 15))); + } + last_screen_size = size; let rate_limit_poll_deadline = app .chat_widget .rate_limit_refresh_interval() @@ -1390,6 +1407,28 @@ See the Codex keymap documentation for supported actions and examples." } AppRunControl::Continue } + () = async { + match pending_resize { + Some((_, deadline)) => tokio::time::sleep_until(tokio::time::Instant::from_std(deadline)).await, + None => std::future::pending().await, + } + } => { + if let Some((expected, _)) = pending_resize.take() + && crate::terminal_size_telemetry::enabled(&app.config) + { + let actual = crate::terminal_size_telemetry::read_size(); + if actual != expected { + pending_resize = Some((actual, Instant::now() + Duration::from_secs(/*secs*/ 15))); + } else { + let tags = crate::terminal_size_telemetry::tags(actual); + if tags != settled_size_tags { + crate::terminal_size_telemetry::record(&app.terminal_size_tags, &app.config, "resize", actual); + } + settled_size_tags = tags; + } + } + AppRunControl::Continue + } () = async { match rate_limit_poll_deadline { Some(deadline) => { diff --git a/codex-rs/tui/src/app/test_support.rs b/codex-rs/tui/src/app/test_support.rs index 9394604dd2..a0efb33101 100644 --- a/codex-rs/tui/src/app/test_support.rs +++ b/codex-rs/tui/src/app/test_support.rs @@ -26,6 +26,7 @@ pub(crate) async fn make_test_app() -> Box { config_notification_test_pending: None, model_catalog: chat_widget.model_catalog(), session_telemetry, + terminal_size_tags: Vec::new(), app_event_tx, chat_widget, workspace_command_runner: None, diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs index 40c30df923..4fb6b8ac08 100644 --- a/codex-rs/tui/src/app/tests.rs +++ b/codex-rs/tui/src/app/tests.rs @@ -1,5 +1,8 @@ //! App-level orchestration tests for the TUI. +#[path = "tests/terminal_size_telemetry_tests.rs"] +mod terminal_size_telemetry_tests; + #[path = "tests/copy_mode_tests.rs"] mod copy_mode_tests; #[path = "tests/mcp_login_tests.rs"] @@ -6264,6 +6267,7 @@ async fn make_test_app() -> Box { config_notification_test_pending: None, model_catalog: chat_widget.model_catalog(), session_telemetry, + terminal_size_tags: Vec::new(), app_event_tx, chat_widget, workspace_command_runner: None, @@ -6389,6 +6393,7 @@ pub(super) async fn make_test_app_with_channels() -> ( config_notification_test_pending: None, model_catalog: chat_widget.model_catalog(), session_telemetry, + terminal_size_tags: Vec::new(), app_event_tx, chat_widget, workspace_command_runner: None, diff --git a/codex-rs/tui/src/app/tests/terminal_size_telemetry_tests.rs b/codex-rs/tui/src/app/tests/terminal_size_telemetry_tests.rs new file mode 100644 index 0000000000..9542f599f2 --- /dev/null +++ b/codex-rs/tui/src/app/tests/terminal_size_telemetry_tests.rs @@ -0,0 +1,26 @@ +//! Terminal-size observation eligibility follows the config reloaded for resume. + +use super::*; +use pretty_assertions::assert_eq; + +#[tokio::test] +async fn terminal_size_telemetry_respects_reloaded_exporter_and_consent() -> Result<()> { + let (mut app, _app_event_rx, _op_rx) = Box::pin(make_test_app_with_channels()).await; + let cwd = app.config.cwd.to_path_buf(); + let mut enabled = Vec::new(); + for config in [ + "[otel]\nmetrics_exporter = \"statsig\"\n", + "[otel]\nmetrics_exporter = \"none\"\n", + "[otel]\nmetrics_exporter = \"statsig\"\n[analytics]\nenabled = false\n", + "analytics.enabled = false\n[otel.metrics_exporter.otlp-http]\nendpoint = \"http://127.0.0.1:4318/v1/metrics\"\nprotocol = \"json\"\n", + ] { + std::fs::write(app.config.codex_home.join("config.toml"), config)?; + let (config, local_settings) = + Box::pin(app.rebuild_config_for_resume_or_fallback(&cwd, cwd.clone())).await?; + app.config = config; + app.local_settings = local_settings; + enabled.push(crate::terminal_size_telemetry::enabled(&app.config)); + } + assert_eq!(enabled, vec![true, false, false, true]); + Ok(()) +} diff --git a/codex-rs/tui/src/app/thread_routing.rs b/codex-rs/tui/src/app/thread_routing.rs index c8d16dc9c6..f73bca912a 100644 --- a/codex-rs/tui/src/app/thread_routing.rs +++ b/codex-rs/tui/src/app/thread_routing.rs @@ -2059,6 +2059,23 @@ impl App { } pub(super) fn handle_thread_event_now(&mut self, event: ThreadBufferedEvent) { + // Replay has its own handler; suppress repeated notifications for the current turn. + if crate::terminal_size_telemetry::enabled(&self.config) + && !self.terminal_size_tags.is_empty() + && let ThreadBufferedEvent::Notification(notification) = &event + && let ServerNotification::TurnStarted(started) = notification.as_ref() + && self + .active_thread_id + .is_some_and(|id| id.to_string() == started.thread_id) + && self.chat_widget.last_turn_id() != Some(started.turn.id.as_str()) + { + crate::terminal_size_telemetry::record( + &self.terminal_size_tags, + &self.config, + "turn_start", + crate::terminal_size_telemetry::read_size(), + ); + } let needs_refresh = matches!( &event, ThreadBufferedEvent::Notification(notification) diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index 2f74f843d5..fccd6e2c20 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -1950,6 +1950,10 @@ impl ChatWidget { .unwrap_or_default() } + pub(crate) fn last_turn_id(&self) -> Option<&str> { + self.turn_lifecycle.last_turn_id.as_deref() + } + pub(crate) fn thread_id(&self) -> Option { self.thread_id } diff --git a/codex-rs/tui/src/daemon_startup_tests.rs b/codex-rs/tui/src/daemon_startup_tests.rs index 2a6a2eaf1f..0d534c4a0c 100644 --- a/codex-rs/tui/src/daemon_startup_tests.rs +++ b/codex-rs/tui/src/daemon_startup_tests.rs @@ -125,6 +125,7 @@ fn daemon_launch_telemetry_records_once_on_connection_or_early_return() { let observations = std::cell::RefCell::new(Vec::new()); let launch = daemon_telemetry::Launch(Some(|target: &AppServerTarget, actual: bool| { observations.borrow_mut().push((target.clone(), actual)); + Vec::new() })); if connected { launch.record(&AppServerTarget::Embedded, connected); diff --git a/codex-rs/tui/src/daemon_telemetry.rs b/codex-rs/tui/src/daemon_telemetry.rs index 7f74003589..0c5a050791 100644 --- a/codex-rs/tui/src/daemon_telemetry.rs +++ b/codex-rs/tui/src/daemon_telemetry.rs @@ -1,19 +1,21 @@ //! Records automatic daemon startup and ensures launch observations survive setup failures. use super::*; +use crate::terminal_size_telemetry::LaunchTags; /// Emit once after connection, or as unconfirmed if startup returns early. -pub(super) struct Launch(pub(super) Option); +pub(super) struct Launch LaunchTags>(pub(super) Option); -impl Launch { - pub(super) fn record(mut self, target: &AppServerTarget, connected: bool) { - if let Some(record) = self.0.take() { - record(target, connected); - } +impl LaunchTags> Launch { + pub(super) fn record(mut self, target: &AppServerTarget, connected: bool) -> LaunchTags { + self.0 + .take() + .map(|record| record(target, connected)) + .unwrap_or_default() } } -impl Drop for Launch { +impl LaunchTags> Drop for Launch { fn drop(&mut self) { if let Some(record) = self.0.take() { record(&AppServerTarget::Embedded, /*connected*/ false); diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs index 734c0f7f1b..545c0d48d3 100644 --- a/codex-rs/tui/src/lib.rs +++ b/codex-rs/tui/src/lib.rs @@ -230,6 +230,7 @@ mod temporary_structured_request; mod terminal_hyperlinks; mod terminal_palette; mod terminal_probe; +mod terminal_size_telemetry; mod terminal_title; mod terminal_visualization_instructions; mod text_formatting; @@ -1159,7 +1160,9 @@ async fn run_ratatui_app( managed_worktree: Option, daemon_startup_warning: Option, managed_daemon: bool, - launch_telemetry: daemon_telemetry::Launch, + launch_telemetry: daemon_telemetry::Launch< + impl FnOnce(&AppServerTarget, bool) -> terminal_size_telemetry::LaunchTags, + >, startup_draft: startup_draft::StartupDraft, ) -> color_eyre::Result { let uses_remote_workspace = app_server_target.uses_remote_workspace(); @@ -1226,7 +1229,8 @@ async fn run_ratatui_app( ), ) .await; - launch_telemetry.record(&app_server_target, matches!(&startup_app_server, Ok(Ok(_)))); + tui.terminal_size_tags = + launch_telemetry.record(&app_server_target, matches!(&startup_app_server, Ok(Ok(_)))); let mut app_server_session = match startup_app_server { Ok(Ok(app_server)) => { AppServerSession::new(app_server, app_server_target.thread_params_mode()) diff --git a/codex-rs/tui/src/startup_orchestration.rs b/codex-rs/tui/src/startup_orchestration.rs index c29d464adc..a96e25bbfd 100644 --- a/codex-rs/tui/src/startup_orchestration.rs +++ b/codex-rs/tui/src/startup_orchestration.rs @@ -285,6 +285,9 @@ pub(super) async fn run_main_inner( }) .await .map_err(std::io::Error::other)??; + // Snapshot the backend size sampled during init, before any viewport changes or resizes. + let initial_terminal_size = initialized_terminal.terminal.last_known_screen_size; + let terminal_size_tags = crate::terminal_size_telemetry::tags(initial_terminal_size); let startup_presentation::StartupPresentation { bootstrap_config, config_cwd, @@ -684,6 +687,7 @@ pub(super) async fn run_main_inner( Vec::new() }; let mut launch_tags = daemon_settings.to_vec(); + launch_tags.extend(terminal_size_tags); launch_tags.extend([ ("daemon_selection_reason", selection_reason), ( @@ -697,7 +701,9 @@ pub(super) async fn run_main_inner( ]); // Record the first connection attempt's actual mode, including embedded fallback; never reconnects. let launch_telemetry = move |target: &AppServerTarget, connected: bool| { - let Some(metrics) = metrics else { return }; + let Some(metrics) = metrics else { + return Vec::new(); + }; let app_server_mode = match (connected, target) { (false, _) => "unconfirmed", (true, AppServerTarget::Embedded) => "in_process", @@ -733,6 +739,8 @@ pub(super) async fn run_main_inner( ("multiplexer", multiplexer), ]); let _ = metrics.counter("codex.tui.start", /*inc*/ 1, &launch_tags); + launch_tags.retain(|(key, _)| !matches!(*key, "terminal_columns" | "terminal_rows")); + launch_tags }; let launch_telemetry = daemon_telemetry::Launch(Some(launch_telemetry)); let state_db = startup_draft diff --git a/codex-rs/tui/src/terminal_size_telemetry.rs b/codex-rs/tui/src/terminal_size_telemetry.rs new file mode 100644 index 0000000000..336a59a491 --- /dev/null +++ b/codex-rs/tui/src/terminal_size_telemetry.rs @@ -0,0 +1,64 @@ +//! Shared terminal-cell buckets and best-effort observations using the existing metrics provider. + +use crate::legacy_core::config::Config; +use codex_config::types::OtelExporterKind; +use ratatui::layout::Size; + +pub(crate) type LaunchTags = Vec<(&'static str, &'static str)>; + +pub(crate) fn enabled(config: &Config) -> bool { + match config.otel.metrics_exporter { + OtelExporterKind::None => false, + OtelExporterKind::Statsig => config.analytics_enabled != Some(false), + OtelExporterKind::OtlpHttp { .. } | OtelExporterKind::OtlpGrpc { .. } => true, + } +} + +pub(crate) fn tags(size: Size) -> [(&'static str, &'static str); 2] { + // Keep values compatible with metrics tag validation; `<` and `+` are rejected. + let columns = match size.width { + 0 => "unknown", + 1..40 => "under-40", + 40..80 => "40-79", + 80..120 => "80-119", + 120..240 => "120-239", + 240..480 => "240-479", + 480.. => "480-and-up", + }; + let rows = match size.height { + 0 => "unknown", + 1..15 => "under-15", + 15..24 => "15-23", + 24..40 => "24-39", + 40..80 => "40-79", + 80..120 => "80-119", + 120.. => "120-and-up", + }; + [("terminal_columns", columns), ("terminal_rows", rows)] +} + +pub(crate) fn read_size() -> Size { + // On Unix, size() may synchronously spawn tput when the direct query fails. + #[cfg(unix)] + let size = crossterm::terminal::window_size().map(|size| Size::new(size.columns, size.rows)); + // Windows size() queries the console directly; window_size() is unsupported there. + #[cfg(not(unix))] + let size = crossterm::terminal::size().map(|(width, height)| Size::new(width, height)); + size.unwrap_or_default() +} + +pub(crate) fn record(context: &LaunchTags, config: &Config, reason: &'static str, size: Size) { + if !context.is_empty() + && let Some(metrics) = codex_otel::global() + { + let mut labels = context.clone(); + labels.extend(tags(size)); + labels.push(("observation_reason", reason)); + let _ = metrics.counter_with_analytics_consent( + "codex.tui.terminal_size", + /*inc*/ 1, + &labels, + config.analytics_enabled != Some(false), + ); + } +} diff --git a/codex-rs/tui/src/tui.rs b/codex-rs/tui/src/tui.rs index dd0fc95ccd..01201ec1a0 100644 --- a/codex-rs/tui/src/tui.rs +++ b/codex-rs/tui/src/tui.rs @@ -664,6 +664,7 @@ pub struct Tui { frame_requester: FrameRequester, draw_tx: broadcast::Sender<()>, event_broker: Arc, + pub(crate) terminal_size_tags: crate::terminal_size_telemetry::LaunchTags, pub(crate) terminal: Terminal, pending_history_lines: Vec, clear_thread_switch_on_draw: bool, @@ -741,6 +742,7 @@ impl Tui { frame_requester, draw_tx, event_broker: Arc::new(event_broker), + terminal_size_tags: Vec::new(), terminal, pending_history_lines: vec![], clear_thread_switch_on_draw: false, From cb03f28a4034b6ee901885808d27182ac586830a Mon Sep 17 00:00:00 2001 From: rhan-oai Date: Wed, 14 Oct 2026 05:30:02 +0000 Subject: [PATCH 029/155] Refresh model instructions in incremental-tool context windows (#53872) ## Why Incremental-tool windows recorded base instructions only at setup, so a catalog refresh for the same model could leave active instructions stale. Instruction changes need to reach the model without rewriting the existing history prefix. ## What changed - Track model identity and instruction content independently, appending a `model_instructions` developer message when either changes. Explicitly mark replacement or removal of base instructions, and avoid repeating unchanged updates. - Start new windows after compaction with the latest model instructions while preserving custom base instructions. - Preserve the recorded window base during local compaction retries, including empty instructions, and rebuild current model instructions when reconstructing child context. ## Testing Add integration tests and request snapshots for catalog refreshes, instruction removal, model switches, compaction, restart, and forks. Extend regression coverage for legacy snapshots and local compaction retries. GitOrigin-RevId: eeca69067b4d9cd91c817732d79b4d5c1faa18b9 --- codex-rs/core/src/agent/control/spawn.rs | 6 + codex-rs/core/src/agent/control_tests.rs | 74 +++- codex-rs/core/src/compact.rs | 14 +- codex-rs/core/src/compact_tests.rs | 62 +++- .../core/src/context/base_instructions.rs | 26 +- codex-rs/core/src/context/mod.rs | 2 + .../core/src/context/model_instructions.rs | 52 +++ .../context/world_state/base_instructions.rs | 28 -- codex-rs/core/src/context/world_state/mod.rs | 21 +- .../core/src/context/world_state/model.rs | 105 +++++- .../src/context/world_state/model_tests.rs | 53 ++- codex-rs/core/src/context_manager/history.rs | 8 +- codex-rs/core/src/session/tests.rs | 4 + codex-rs/core/src/session/world_state.rs | 83 +++-- .../core/tests/suite/base_instructions.rs | 350 ++++++++++++++++++ codex-rs/core/tests/suite/mod.rs | 1 + codex-rs/core/tests/suite/scenarios.rs | 3 + .../suite/scenarios_incremental_tools.rs | 67 +++- .../suite/scenarios_model_instructions.rs | 104 ++++++ ..._incremental_tools__incremental_tools.snap | 44 ++- ...tions__incremental_model_instructions.snap | 100 +++++ 21 files changed, 1063 insertions(+), 144 deletions(-) create mode 100644 codex-rs/core/src/context/model_instructions.rs delete mode 100644 codex-rs/core/src/context/world_state/base_instructions.rs create mode 100644 codex-rs/core/tests/suite/base_instructions.rs create mode 100644 codex-rs/core/tests/suite/scenarios_model_instructions.rs create mode 100644 codex-rs/core/tests/suite/snapshots/all__suite__scenarios__model_instructions__incremental_model_instructions.snap diff --git a/codex-rs/core/src/agent/control/spawn.rs b/codex-rs/core/src/agent/control/spawn.rs index 70cf8b7ef0..cc68bfdd3b 100644 --- a/codex-rs/core/src/agent/control/spawn.rs +++ b/codex-rs/core/src/agent/control/spawn.rs @@ -18,6 +18,7 @@ use crate::context::CurrentTimeReminder; use crate::context::CurrentTimeUnavailable; use crate::context::DeveloperInstructions; use crate::context::ManagedDeveloperInstructions; +use crate::context::ModelInstructions; use crate::context::MultiAgentModeInstructions; use crate::context::MultiAgentRoleInstructions; use crate::context::MultiAgentUsageHint; @@ -133,6 +134,10 @@ fn retain_forked_developer_message(item: &mut ResponseItem, usage_hint_texts: &[ return false; }; content.retain(|content_item| { + // Leave base instructions for the later context-baseline retention check. + if content_item.kind().as_str() == BaseInstructionsFragment::KIND { + return true; + } // Persisted role hints can predate the current bundled wording and lack markers. if matches!( content_item.kind().as_str(), @@ -1181,6 +1186,7 @@ impl LocalAgentControl { return true; }; if ManagedDeveloperInstructions::matches_text(text) + || ModelInstructions::matches_text(text) || PersistentModeState::matches_text(text) { // If the child will rebuild its initial context, drop the inherited diff --git a/codex-rs/core/src/agent/control_tests.rs b/codex-rs/core/src/agent/control_tests.rs index 6d97eceb2e..3f5ac6590b 100644 --- a/codex-rs/core/src/agent/control_tests.rs +++ b/codex-rs/core/src/agent/control_tests.rs @@ -21,8 +21,10 @@ use crate::agent_communication::AgentCommunicationKind; use crate::config::AgentRoleConfig; use crate::config::Config; use crate::config::ConfigBuilder; +use crate::context::BaseInstructionsFragment; use crate::context::ContextualUserFragment; use crate::context::ManagedDeveloperInstructions; +use crate::context::ModelInstructions; use crate::context::MultiAgentRoleInstructions; use crate::context::SubagentNotification; use crate::context::world_state::IncrementalToolsHint; @@ -47,6 +49,7 @@ use codex_history::ResumedHistory; use codex_history::RolloutItem; use codex_login::AuthManager; use codex_login::CodexAuth; +use codex_models_manager::model_info::model_info_from_slug; use codex_protocol::AgentPath; use codex_protocol::ResponseItemId; use codex_protocol::capabilities::CapabilityRootLocation; @@ -74,6 +77,7 @@ use codex_protocol::models::InternalChatMessageMetadataPassthrough; use codex_protocol::models::MessagePhase; use codex_protocol::models::PermissionProfile; use codex_protocol::models::ResponseItem; +use codex_protocol::openai_models::ModelsResponse; use codex_protocol::openai_models::ReasoningEffort; use codex_protocol::protocol::AskForApproval; use codex_protocol::protocol::EnvironmentConfigState; @@ -2815,6 +2819,11 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() { let managed_fragment = "\nParent developer instructions.\n"; let persistent_fragment = "\nParent developer instructions.\n"; + let replacement_fragment = ModelInstructions { + model: None, + instructions: Some("Updated model instructions.".to_string()), + } + .render(); let harness = AgentControlHarness::new().await; let mut parent_config = harness.config.clone(); let _ = parent_config.features.enable(Feature::MultiAgentV2); @@ -2933,6 +2942,9 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() { ContentItem::InputText { text: persistent_fragment.to_string(), }, + ContentItem::InputText { + text: replacement_fragment.clone(), + }, ], phase: None, internal_chat_message_metadata_passthrough: Some( @@ -2943,6 +2955,7 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() { ContentItemKind("generic.developer_policy".to_string()), ContentItemKind("managed_config.developer_instructions".to_string()), ContentItemKind("persistent_mode.instructions".to_string()), + ContentItemKind("model.instructions".to_string()), ]), ..Default::default() }, @@ -3084,6 +3097,9 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() { ContentItem::InputText { text: persistent_fragment.to_string(), }, + ContentItem::InputText { + text: replacement_fragment, + }, ], phase: None, internal_chat_message_metadata_passthrough: Some( @@ -3093,6 +3109,7 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() { ContentItemKind("generic.developer_policy".to_string()), ContentItemKind("managed_config.developer_instructions".to_string()), ContentItemKind("persistent_mode.instructions".to_string()), + ContentItemKind("model.instructions".to_string()), ]), ..Default::default() }, @@ -3689,9 +3706,16 @@ async fn spawn_agent_full_fork_legacy_compaction_rebuilds_child_instructions_onc Some("Parent developer instructions."), ), ] { - let harness = AgentControlHarness::new().await; + let mut harness = AgentControlHarness::new().await; let mut parent_config = harness.config.clone(); let _ = parent_config.features.enable(Feature::MultiAgentV2); + let _ = parent_config.features.enable(Feature::IncrementalTools); + let mut model = model_info_from_slug("gpt-5.5"); + model.use_responses_lite = true; + parent_config.model_catalog = Some(ModelsResponse { + models: vec![model], + }); + parent_config.base_instructions = Some("Current model instructions.".to_string()); parent_config.developer_instructions = parent_developer_instructions.map(str::to_string); let mut requirements = parent_config.config_layer_stack.requirements().clone(); requirements.additional_developer_instructions = Some(codex_config::Sourced::new( @@ -3710,6 +3734,28 @@ async fn spawn_agent_full_fork_legacy_compaction_rebuilds_child_instructions_onc requirements_toml, ) .expect("managed requirements stack"); + let auth_manager = AuthManager::from_auth_for_testing(CodexAuth::from_api_key("dummy")); + harness.manager = ThreadManager::new( + &parent_config, + auth_manager.clone(), + crate::thread_manager::build_models_manager(&parent_config, auth_manager), + crate::CodexAppsToolsCache::default(), + SessionSource::Exec, + Arc::new(codex_exec_server::EnvironmentManager::default_for_tests()), + empty_extension_registry(), + Arc::new(crate::test_support::EmptyUserInstructionsProvider), + /*analytics_events_client*/ None, + crate::thread_manager::passthrough_image_store(), + crate::thread_manager::thread_store_from_config( + &parent_config, + harness.state_db.clone(), + ), + crate::thread_manager::local_agent_graph_store_from_state_db(harness.state_db.as_ref()), + uuid::Uuid::new_v4().to_string(), + /*attestation_provider*/ None, + /*external_time_provider*/ None, + ); + harness.control = harness.manager.agent_control(); let mut child_config = parent_config.clone(); child_config.multi_agent_v2.preserve_fork_prefix = preserve_fork_prefix; child_config.developer_instructions = Some("Child developer instructions.".to_string()); @@ -3800,6 +3846,15 @@ async fn spawn_agent_full_fork_legacy_compaction_rebuilds_child_instructions_onc phase: None, internal_chat_message_metadata_passthrough: None, })); + rollout_items.extend([ + rollout_response_item(ContextualUserFragment::into(BaseInstructionsFragment( + "Original model instructions.".to_string(), + ))), + rollout_response_item(ContextualUserFragment::into(ModelInstructions { + model: None, + instructions: Some("Updated model instructions.".to_string()), + })), + ]); rollout_items.push(rollout_response_item(ContextualUserFragment::into( IncrementalToolsHint( codex_prompts::ResolvedIncrementalToolMessages::default().tool_update_hint, @@ -3906,7 +3961,11 @@ async fn spawn_agent_full_fork_legacy_compaction_rebuilds_child_instructions_onc let history = child_thread.session.clone_history().await; let mut instruction_count = 0; let mut managed_instructions = Vec::new(); + let mut model_instructions = Vec::new(); for item in history.raw_items() { + if let Some(base) = BaseInstructionsFragment::text_from_item(item) { + model_instructions.push(base); + } let ResponseItem::Message { role, content, .. } = item else { continue; }; @@ -3916,6 +3975,9 @@ async fn spawn_agent_full_fork_legacy_compaction_rebuilds_child_instructions_onc for content_item in content { if let ContentItem::InputText { text } = content_item { instruction_count += usize::from(text == "Child developer instructions."); + if ModelInstructions::matches_text(text) { + model_instructions.push(text.as_str()); + } if ManagedDeveloperInstructions::matches_text(text) { managed_instructions.push(text.as_str()); } @@ -3923,9 +3985,13 @@ async fn spawn_agent_full_fork_legacy_compaction_rebuilds_child_instructions_onc } } assert_eq!( - (instruction_count, managed_instructions), - (1, vec![current_managed_fragment.as_str()]), - "{case}: canonical context reconstruction must keep only the current child and managed developer instructions" + (instruction_count, managed_instructions, model_instructions), + ( + 1, + vec![current_managed_fragment.as_str()], + vec!["Current model instructions."], + ), + "{case}: canonical context reconstruction must keep only the current child, managed, and model instructions" ); let _ = harness diff --git a/codex-rs/core/src/compact.rs b/codex-rs/core/src/compact.rs index abd7dfd570..03c60ee1cd 100644 --- a/codex-rs/core/src/compact.rs +++ b/codex-rs/core/src/compact.rs @@ -280,6 +280,16 @@ async fn run_compact_task_inner_impl( &[initial_input_for_turn.into()], turn_context.model_info().truncation_policy.into(), ); + let mut fallback_instructions = sess.get_prompt_base_instructions().await; + if let Some(text) = history + .raw_items() + .find_map(BaseInstructionsFragment::text_from_item) + { + fallback_instructions.text = text.to_owned(); + } else if history.has_tool_declarations() { + // An incremental window has no recorded base item when its instructions are empty. + fallback_instructions.text.clear(); + } let max_retries = turn_context.provider.info().stream_max_retries(); let mut retries = 0; @@ -297,14 +307,14 @@ async fn run_compact_task_inner_impl( let turn_input_len = turn_input.len(); let base_instructions = if turn_input .iter() - .any(BaseInstructionsFragment::matches_item) + .any(|item| BaseInstructionsFragment::text_from_item(item).is_some()) { BaseInstructions { text: String::new(), provenance: None, } } else { - sess.get_prompt_base_instructions().await + fallback_instructions.clone() }; let prompt = Prompt { input: turn_input, diff --git a/codex-rs/core/src/compact_tests.rs b/codex-rs/core/src/compact_tests.rs index 02be9c3499..cc80b0479b 100644 --- a/codex-rs/core/src/compact_tests.rs +++ b/codex-rs/core/src/compact_tests.rs @@ -27,7 +27,7 @@ use test_case::test_case; #[test_case(true; "metadata enabled")] #[test_case(false; "metadata disabled after capture")] #[tokio::test] -async fn local_compaction_respects_tool_metadata_state( +async fn local_compaction_retries_preserve_instructions_and_tool_metadata( metadata_enabled: bool, ) -> anyhow::Result<()> { skip_if_no_network!(Ok(())); @@ -48,7 +48,13 @@ async fn local_compaction_respects_tool_metadata_state( ) .await; - let mut items = vec![user_message("Update the plan")]; + // Retries trim the original prefix and early user messages. + let mut items = vec![ + ContextualUserFragment::into(BaseInstructionsFragment("Window A".to_string())), + user_message("First turn"), + user_message("Rebuilt context"), + user_message("Update the plan"), + ]; for index in 0..300 { let call_id = format!("direct-{index}"); let arguments = json!({"plan": [{"step": "x".repeat(7 * 1024), "status": "completed"}]}); @@ -152,12 +158,17 @@ async fn local_compaction_respects_tool_metadata_state( let _ = session.refresh_runtime_config(current_config, config).await; } - let mock = responses::mount_sse_once( + let failed = responses::sse_failed("failed", "context_length_exceeded", "Context too long"); + let mock = responses::mount_sse_sequence( &server, - responses::sse(vec![ - responses::ev_assistant_message("summary", "The prior calls finished."), - responses::ev_completed("compact-response"), - ]), + vec![ + failed.clone(), + failed, + responses::sse(vec![ + responses::ev_assistant_message("summary", "The prior calls finished."), + responses::ev_completed("compact-response"), + ]), + ], ) .await; let step = session @@ -180,16 +191,26 @@ async fn local_compaction_respects_tool_metadata_state( ) .await?; - let request = mock.single_request(); - assert!(request.inputs_of_type("compaction_trigger").is_empty()); + let requests = mock.requests(); assert_eq!( - request.custom_tool_call_output("exec"), - serde_json::to_value(expected_code_mode_output)?, + requests + .iter() + .map(|request| request.message_input_texts("developer").into_iter().next()) + .collect::>(), + [ + Some("Window A".to_string()), + Some("Window A".to_string()), + Some("Window A".to_string()) + ], ); + for request in &requests { + assert!(request.inputs_of_type("compaction_trigger").is_empty()); + assert_eq!( + request.custom_tool_call_output("exec"), + serde_json::to_value(&expected_code_mode_output)?, + ); + } for mut output in outputs { - let call_id = output["call_id"].as_str().expect("source call id"); - let compact_output = request.function_call_output(call_id); - assert_eq!(compact_output["output"], json!("Plan updated")); if !metadata_enabled { let metadata = output["internal_chat_message_metadata_passthrough"] .as_object_mut() @@ -197,10 +218,15 @@ async fn local_compaction_respects_tool_metadata_state( metadata.remove("executed_tool_calls"); metadata.remove("tool_calls_complete"); } - assert_eq!( - compact_output["internal_chat_message_metadata_passthrough"], - output["internal_chat_message_metadata_passthrough"] - ); + let call_id = output["call_id"].as_str().expect("source call id"); + for request in &requests { + let compact_output = request.function_call_output(call_id); + assert_eq!(compact_output["output"], json!("Plan updated")); + assert_eq!( + compact_output["internal_chat_message_metadata_passthrough"], + output["internal_chat_message_metadata_passthrough"] + ); + } } let compacted_history = session.clone_history().await; let expected_summary = format!("{SUMMARY_PREFIX}\nThe prior calls finished."); diff --git a/codex-rs/core/src/context/base_instructions.rs b/codex-rs/core/src/context/base_instructions.rs index 6ef7d583c6..d81895a243 100644 --- a/codex-rs/core/src/context/base_instructions.rs +++ b/codex-rs/core/src/context/base_instructions.rs @@ -1,4 +1,7 @@ +//! Initial base instructions, recorded in history for incremental-tools windows. + use super::ContextualUserFragment; +use codex_protocol::models::ContentItem; use codex_protocol::models::ContentItemKind; use codex_protocol::models::ResponseItem; @@ -8,18 +11,29 @@ pub(crate) struct BaseInstructionsFragment(pub(crate) String); impl BaseInstructionsFragment { pub(crate) const KIND: &str = "model.base_instructions"; - pub(crate) fn matches_item(item: &ResponseItem) -> bool { + /// Reads only a dedicated, harness-classified base item, including an explicitly empty base. + pub(crate) fn text_from_item(item: &ResponseItem) -> Option<&str> { let ResponseItem::Message { + role, + content, internal_chat_message_metadata_passthrough: Some(metadata), .. } = item else { - return false; + return None; }; - metadata - .content_item_kinds - .as_ref() - .is_some_and(|kinds| kinds.iter().any(|kind| kind.as_str() == Self::KIND)) + match ( + role.as_str(), + content.as_slice(), + metadata.content_item_kinds.as_deref(), + ) { + ("developer", [ContentItem::InputText { text }], Some([kind])) + if kind.as_str() == Self::KIND => + { + Some(text) + } + _ => None, + } } } diff --git a/codex-rs/core/src/context/mod.rs b/codex-rs/core/src/context/mod.rs index 4f2d3f9e2b..a6a4f600e5 100644 --- a/codex-rs/core/src/context/mod.rs +++ b/codex-rs/core/src/context/mod.rs @@ -35,6 +35,7 @@ mod legacy_apply_patch_exec_command_warning; mod legacy_model_mismatch_warning; mod legacy_unified_exec_process_limit_warning; mod memory; +mod model_instructions; mod model_switch_instructions; mod multi_agent_mode_instructions; mod multi_agent_usage_hint; @@ -108,6 +109,7 @@ pub(crate) use legacy_apply_patch_exec_command_warning::LegacyApplyPatchExecComm pub(crate) use legacy_model_mismatch_warning::LegacyModelMismatchWarning; pub(crate) use legacy_unified_exec_process_limit_warning::LegacyUnifiedExecProcessLimitWarning; pub use memory::MemoryContextFragment; +pub(crate) use model_instructions::ModelInstructions; pub(crate) use model_switch_instructions::ModelSwitchInstructions; pub(crate) use multi_agent_mode_instructions::MultiAgentModeInstructions; pub(crate) use multi_agent_usage_hint::MultiAgentUsageHint; diff --git a/codex-rs/core/src/context/model_instructions.rs b/codex-rs/core/src/context/model_instructions.rs new file mode 100644 index 0000000000..199c25ebd8 --- /dev/null +++ b/codex-rs/core/src/context/model_instructions.rs @@ -0,0 +1,52 @@ +//! A single model-context fragment for independent model and instruction changes. + +use super::ContextualUserFragment; +use codex_protocol::models::ContentItemKind; + +const REPLACEMENT_NOTICE: &str = + "The following instructions replace the previous base instructions:"; +const REMOVAL_NOTICE: &str = + "The previous base instructions no longer apply. No replacement base instructions are active."; + +#[derive(Clone, Debug, PartialEq)] +pub(crate) struct ModelInstructions { + pub(crate) model: Option, + /// None leaves instructions unchanged; Some replaces them, including an empty value. + pub(crate) instructions: Option, +} + +impl ContextualUserFragment for ModelInstructions { + fn content_kind(&self) -> ContentItemKind { + ContentItemKind("model.instructions".to_string()) + } + + fn role(&self) -> &'static str { + "developer" + } + + fn markers(&self) -> (&'static str, &'static str) { + Self::type_markers() + } + + fn type_markers() -> (&'static str, &'static str) { + ("", "") + } + + fn body(&self) -> String { + let mut body = String::from("\n"); + if let Some(model) = &self.model { + body.push_str(&format!("The current model is {model}.\n")); + } + match &self.instructions { + Some(instructions) if instructions.is_empty() => { + body.push_str(REMOVAL_NOTICE); + body.push('\n'); + } + Some(instructions) => { + body.push_str(&format!("{REPLACEMENT_NOTICE}\n\n{instructions}\n")); + } + None => {} + } + body + } +} diff --git a/codex-rs/core/src/context/world_state/base_instructions.rs b/codex-rs/core/src/context/world_state/base_instructions.rs deleted file mode 100644 index ac79a45425..0000000000 --- a/codex-rs/core/src/context/world_state/base_instructions.rs +++ /dev/null @@ -1,28 +0,0 @@ -//! Records fixed base instructions alongside tool declarations at the start of each window. - -use super::PreviousSectionState; -use super::SectionTransition; -use super::WorldStateHash; -use super::WorldStateSection; -use super::WorldStateUpdate; -use crate::context::BaseInstructionsFragment; - -pub(crate) struct BaseInstructionsState(pub(crate) String); - -impl WorldStateSection for BaseInstructionsState { - const ID: &'static str = "base_instructions"; - type Snapshot = WorldStateHash; - - fn render_diff( - &self, - previous: PreviousSectionState<'_, Self::Snapshot>, - ) -> SectionTransition { - let fragment = BaseInstructionsFragment(self.0.clone()); - let hash = WorldStateHash::from_fragment(&fragment); - let updates = WorldStateUpdate::optional_prefix_boxed_fragment( - (matches!(previous, PreviousSectionState::Absent) && !self.0.is_empty()) - .then(|| Box::new(fragment) as _), - ); - (Some(hash), updates) - } -} diff --git a/codex-rs/core/src/context/world_state/mod.rs b/codex-rs/core/src/context/world_state/mod.rs index 6a23a30c15..aff148f7e5 100644 --- a/codex-rs/core/src/context/world_state/mod.rs +++ b/codex-rs/core/src/context/world_state/mod.rs @@ -1,6 +1,5 @@ mod agents_md; mod apps_instructions; -mod base_instructions; mod collaboration_mode; mod compact_permissions; mod context_window_guidance; @@ -40,7 +39,6 @@ use std::fmt; pub(crate) use agents_md::AgentsMdState; pub(crate) use apps_instructions::AppsInstructionsState; -pub(crate) use base_instructions::BaseInstructionsState; pub(crate) use collaboration_mode::CollaborationModeState; pub(crate) use compact_permissions::CompactPermissionsState; pub(crate) use context_window_guidance::ContextWindowGuidanceState; @@ -108,18 +106,6 @@ impl WorldStateUpdate { .collect() } - pub(crate) fn optional_prefix_boxed_fragment( - fragment: Option>, - ) -> Vec { - fragment - .into_iter() - .map(|fragment| Self { - placement: Placement::Prefix, - content: WorldStateUpdateContent::Fragment(fragment), - }) - .collect() - } - pub(crate) fn standalone(mut self) -> Self { self.placement = Placement::Standalone; self @@ -195,7 +181,7 @@ impl ErasedWorldStateSection for S { } fn has_retained_fragment_matcher(&self) -> bool { - S::has_retained_fragment_matcher() + WorldStateSection::has_current_retained_fragment_matcher(self) } fn matches_retained_fragment(&self, role: &str, text: &str) -> bool { @@ -345,6 +331,11 @@ pub(crate) trait WorldStateSection: Send + Sync + 'static { false } + /// Whether this instance requires its rendered fragment to survive in history. + fn has_current_retained_fragment_matcher(&self) -> bool { + Self::has_retained_fragment_matcher() + } + /// Recognizes this section's rendered fragment in retained model history. fn matches_retained_fragment(_role: &str, _text: &str) -> bool { false diff --git a/codex-rs/core/src/context/world_state/model.rs b/codex-rs/core/src/context/world_state/model.rs index 2a15a61fd8..08461e6db2 100644 --- a/codex-rs/core/src/context/world_state/model.rs +++ b/codex-rs/core/src/context/world_state/model.rs @@ -1,14 +1,35 @@ +//! Owns model context in both window modes. Ordinary windows retain model-switch behavior; +//! incremental windows record the base and refresh instructions without replacing their prefix. + use super::PreviousSectionState; use super::SectionTransition; +use super::WorldStateHash; use super::WorldStateSection; use super::WorldStateUpdate; +use crate::context::BaseInstructionsFragment; use crate::context::ContextualUserFragment; +use crate::context::ModelInstructions; use crate::context::ModelSwitchInstructions; +use serde::Deserialize; +use serde::Serialize; -/// Model identity and the instructions needed when that identity changes. +/// Ordinary windows and older rollouts record only the model. +#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)] +#[serde(untagged)] +pub(crate) enum ModelInstructionsSnapshot { + WithInstructions { + model: String, + instructions: WorldStateHash, + }, + ModelOnly(String), +} + +/// Model identity and instructions relevant to the current window. #[derive(Clone, Debug)] pub(crate) struct ModelInstructionsState { - model: String, + /// The current tracking format is chosen by window mode, independently of saved state. + snapshot: ModelInstructionsSnapshot, + /// Ordinary-window fallback when the saved model snapshot is unavailable. previous_model: Option, instructions: String, } @@ -16,23 +37,36 @@ pub(crate) struct ModelInstructionsState { impl ModelInstructionsState { pub(crate) fn new(model: &str, previous_model: Option<&str>, instructions: String) -> Self { Self { - model: model.to_string(), + snapshot: ModelInstructionsSnapshot::ModelOnly(model.to_string()), previous_model: previous_model.map(str::to_string), instructions, } } + + pub(crate) fn for_incremental_tools(model: &str, instructions: String) -> Self { + let instructions = BaseInstructionsFragment(instructions); + let instructions_hash = WorldStateHash::from_fragment(&instructions); + Self { + snapshot: ModelInstructionsSnapshot::WithInstructions { + model: model.to_string(), + instructions: instructions_hash, + }, + previous_model: None, + instructions: instructions.0, + } + } } impl WorldStateSection for ModelInstructionsState { const ID: &'static str = "model"; - type Snapshot = String; + type Snapshot = ModelInstructionsSnapshot; fn matches_legacy_fragment(role: &str, text: &str) -> bool { role == "developer" && ModelSwitchInstructions::matches_text(text) } - fn has_retained_fragment_matcher() -> bool { - true + fn has_current_retained_fragment_matcher(&self) -> bool { + matches!(self.snapshot, ModelInstructionsSnapshot::ModelOnly(_)) } fn matches_retained_fragment(role: &str, text: &str) -> bool { @@ -43,22 +77,59 @@ impl WorldStateSection for ModelInstructionsState { &self, previous: PreviousSectionState<'_, Self::Snapshot>, ) -> SectionTransition { - let current = self.model.clone(); - let model_changed = match previous { - PreviousSectionState::Known(previous) => previous != &self.model, - PreviousSectionState::Unknown | PreviousSectionState::Absent => self - .previous_model - .as_deref() - .is_some_and(|previous| previous != self.model), + let (model, instructions_hash) = match &self.snapshot { + ModelInstructionsSnapshot::ModelOnly(model) => (model, None), + ModelInstructionsSnapshot::WithInstructions { + model, + instructions, + } => (model, Some(instructions)), }; - - let fragment: Option> = + if instructions_hash.is_some() && !matches!(previous, PreviousSectionState::Known(_)) { + // Like tools, reassert full setup when the comparison state is missing. + if self.instructions.is_empty() { + return (Some(self.snapshot.clone()), Vec::new()); + } + return ( + Some(self.snapshot.clone()), + vec![WorldStateUpdate::prefix_item(ContextualUserFragment::into( + BaseInstructionsFragment(self.instructions.clone()), + ))], + ); + } + let (previous_model, previous_instructions_hash) = match previous { + PreviousSectionState::Known(ModelInstructionsSnapshot::ModelOnly(model)) => { + (Some(model), None) + } + PreviousSectionState::Known(ModelInstructionsSnapshot::WithInstructions { + model, + instructions, + }) if instructions_hash.is_some() => (Some(model), Some(instructions)), + // Ordinary windows keep their fallback for an unrecognized incremental snapshot. + PreviousSectionState::Known(ModelInstructionsSnapshot::WithInstructions { .. }) + | PreviousSectionState::Unknown + | PreviousSectionState::Absent => (self.previous_model.as_ref(), None), + }; + let model_changed = previous_model.is_some_and(|previous| previous != model); + // Legacy model-only snapshots refresh instructions only when the model changes. + let instructions_changed = instructions_hash.is_some_and(|current| { + previous_instructions_hash.map_or(model_changed, |previous| previous != current) + }); + if instructions_hash.is_some() && !model_changed && !instructions_changed { + return (None, Vec::new()); + } + let fragment: Option> = if instructions_hash.is_some() { + Some(Box::new(ModelInstructions { + model: model_changed.then(|| model.clone()), + instructions: instructions_changed.then(|| self.instructions.clone()), + })) + } else { (model_changed && !self.instructions.is_empty()).then(|| { Box::new(ModelSwitchInstructions::new(self.instructions.clone())) as Box - }); + }) + }; ( - Some(current), + Some(self.snapshot.clone()), WorldStateUpdate::optional_standalone_boxed_fragment(fragment), ) } diff --git a/codex-rs/core/src/context/world_state/model_tests.rs b/codex-rs/core/src/context/world_state/model_tests.rs index f83cc5ba32..a303b40728 100644 --- a/codex-rs/core/src/context/world_state/model_tests.rs +++ b/codex-rs/core/src/context/world_state/model_tests.rs @@ -5,10 +5,18 @@ use pretty_assertions::assert_eq; #[test] fn model_change_renders_when_persisted_or_inferred_from_previous_turn() { let state = ModelInstructionsState::new("gpt-new", Some("gpt-old"), "instructions".into()); - let previous = "gpt-old".to_string(); + let previous = ModelInstructionsSnapshot::ModelOnly("gpt-old".to_string()); + let previous_incremental = serde_json::from_value(serde_json::json!({ + "model": "gpt-new", + "instructions": WorldStateHash::from_fragment(&BaseInstructionsFragment( + "instructions".into(), + )), + })) + .unwrap(); for previous in [ PreviousSectionState::Known(&previous), + PreviousSectionState::Known(&previous_incremental), PreviousSectionState::Unknown, PreviousSectionState::Absent, ] { @@ -26,14 +34,14 @@ fn model_change_renders_when_persisted_or_inferred_from_previous_turn() { #[test] fn unchanged_model_does_not_render() { let state = ModelInstructionsState::new("gpt-test", Some("gpt-test"), "instructions".into()); - let previous = "gpt-test".to_string(); + let previous = ModelInstructionsSnapshot::ModelOnly("gpt-test".to_string()); - assert!( - state - .render_fragment_diff(PreviousSectionState::Known(&previous)) - .1 - .is_none() + let (snapshot, fragment) = state.render_fragment_diff(PreviousSectionState::Known(&previous)); + assert_eq!( + serde_json::to_value(snapshot).unwrap(), + serde_json::json!("gpt-test") ); + assert!(fragment.is_none()); assert!( state .render_fragment_diff(PreviousSectionState::Absent) @@ -41,3 +49,34 @@ fn unchanged_model_does_not_render() { .is_none() ); } + +#[test] +fn legacy_model_snapshot_keeps_its_window_until_model_change_or_compaction() { + let legacy: ModelInstructionsSnapshot = serde_json::from_str("\"gpt-old\"").unwrap(); + let same_model = ModelInstructionsState::for_incremental_tools("gpt-old", "new prompt".into()); + let (snapshot, updates) = same_model.render_diff(PreviousSectionState::Known(&legacy)); + assert!(snapshot.is_none()); + assert!(updates.is_empty()); + + let new_model = ModelInstructionsState::for_incremental_tools("gpt-new", "new prompt".into()); + let (snapshot, updates) = new_model.render_diff(PreviousSectionState::Known(&legacy)); + assert!(snapshot.is_some()); + assert_eq!(updates.len(), 1); + + for previous in [PreviousSectionState::Absent, PreviousSectionState::Unknown] { + let (snapshot, updates) = same_model.render_diff(previous); + assert_eq!( + crate::context_manager::updates::merge_world_state_updates(updates), + vec![ContextualUserFragment::into(BaseInstructionsFragment( + "new prompt".into() + ))] + ); + let snapshot = snapshot.unwrap(); + assert!( + same_model + .render_diff(PreviousSectionState::Known(&snapshot)) + .1 + .is_empty() + ); + } +} diff --git a/codex-rs/core/src/context_manager/history.rs b/codex-rs/core/src/context_manager/history.rs index db1c0e4096..f39be3fb41 100644 --- a/codex-rs/core/src/context_manager/history.rs +++ b/codex-rs/core/src/context_manager/history.rs @@ -662,9 +662,11 @@ impl ContextManager { &self, base_instructions: &BaseInstructions, ) -> Option { - // Incremental windows already account for their recorded base instructions below. - let has_recorded_instructions = - self.raw_items().any(BaseInstructionsFragment::matches_item); + // Incremental windows supply instructions through history, including an empty base. + let has_recorded_instructions = self.has_tool_declarations() + || self + .raw_items() + .any(|item| BaseInstructionsFragment::text_from_item(item).is_some()); let base_tokens = if has_recorded_instructions { 0 } else { diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index 427457042f..14a88521ba 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -11388,6 +11388,10 @@ async fn build_initial_context_uses_retained_step_after_model_change() { let messages = model_info.model_messages.as_mut().unwrap(); messages.instructions_template = Some("A instructions".to_string()); }); + session.state.lock().await.base_instructions_provenance = + Some(codex_protocol::models::BaseInstructionsProvenance::Model { + model: "base-model".to_string(), + }); session .set_previous_turn_settings(Some(PreviousTurnSettings { model: "base-model".to_string(), diff --git a/codex-rs/core/src/session/world_state.rs b/codex-rs/core/src/session/world_state.rs index 3426f76a54..7b33283897 100644 --- a/codex-rs/core/src/session/world_state.rs +++ b/codex-rs/core/src/session/world_state.rs @@ -6,7 +6,6 @@ use crate::connectors; use crate::context::TokenBudgetContext; use crate::context::world_state::AgentsMdState; use crate::context::world_state::AppsInstructionsState; -use crate::context::world_state::BaseInstructionsState; use crate::context::world_state::CollaborationModeState; use crate::context::world_state::CompactPermissionsState; use crate::context::world_state::ContextWindowGuidanceState; @@ -76,35 +75,54 @@ impl Session { selected_capability_root_count = step_context.selected_capability_roots.len(), "building step world state" ); - let model_instructions = render_model_instructions(model_info); - let model_instructions = if !turn_context.config.update_plan_enabled - && turn_context.config.model_catalog.is_none() - && (turn_context.config.base_instructions.is_none() - || matches!( - turn_context.config.base_instructions_provenance, - Some(BaseInstructionsProvenance::Model { .. }) - )) { - codex_prompts::without_update_plan_instructions(&model_instructions) - } else { - model_instructions + let render_current_instructions = || { + let instructions = render_model_instructions(model_info); + if !turn_context.config.update_plan_enabled + && turn_context.config.model_catalog.is_none() + && (incremental_tools + || turn_context.config.base_instructions.is_none() + || matches!( + turn_context.config.base_instructions_provenance, + Some(BaseInstructionsProvenance::Model { .. }) + )) + { + codex_prompts::without_update_plan_instructions(&instructions) + } else { + instructions + } }; - let base_instructions = self.get_prompt_base_instructions().await.text; - let previous_model = { - let state = self.state.lock().await; - state - .previous_turn_settings() - .map(|previous| previous.model) - .or_else(|| { - state - .base_instructions_provenance - .as_ref() - .and_then(|provenance| match provenance { - BaseInstructionsProvenance::Model { model } => Some(model), - BaseInstructionsProvenance::Custom => None, - }) - .filter(|_| base_instructions != model_instructions) - .cloned() - }) + let model_state = if incremental_tools { + let base_instructions = self.get_base_instructions().await; + let instructions = match base_instructions.provenance { + Some(BaseInstructionsProvenance::Model { .. }) => render_current_instructions(), + Some(BaseInstructionsProvenance::Custom) | None => base_instructions.text, + }; + ModelInstructionsState::for_incremental_tools(&model_info.slug, instructions) + } else { + let model_instructions = render_current_instructions(); + let base_instructions = self.get_prompt_base_instructions().await.text; + let previous_model = { + let state = self.state.lock().await; + state + .previous_turn_settings() + .map(|previous| previous.model) + .or_else(|| { + state + .base_instructions_provenance + .as_ref() + .and_then(|provenance| match provenance { + BaseInstructionsProvenance::Model { model } => Some(model), + BaseInstructionsProvenance::Custom => None, + }) + .filter(|_| base_instructions != model_instructions) + .cloned() + }) + }; + ModelInstructionsState::new( + &model_info.slug, + previous_model.as_deref(), + model_instructions, + ) }; let environment_subagents = if turn_context.config.include_environment_context { match turn_context.multi_agent_version { @@ -152,13 +170,8 @@ impl Session { definitions, Some(Arc::clone(&extension_metrics)), )?); - world_state.add_section(BaseInstructionsState(base_instructions)); } - world_state.add_section(ModelInstructionsState::new( - &model_info.slug, - previous_model.as_deref(), - model_instructions, - )); + world_state.add_section(model_state); let token_budget_enabled = turn_context.config.features.enabled(Feature::TokenBudget) && step_context .settings diff --git a/codex-rs/core/tests/suite/base_instructions.rs b/codex-rs/core/tests/suite/base_instructions.rs new file mode 100644 index 0000000000..8769dd313a --- /dev/null +++ b/codex-rs/core/tests/suite/base_instructions.rs @@ -0,0 +1,350 @@ +//! Base instructions stay fixed within a context window and refresh when a new window opens. + +use anyhow::Result; +use codex_core::ForkSnapshot; +use codex_core::StartThreadOptions; +use codex_core::TurnInputRequest; +use codex_features::Feature; +use codex_login::CodexAuth; +use codex_models_manager::manager::RefreshStrategy; +use codex_models_manager::model_info::model_info_from_slug; +use codex_protocol::openai_models::ModelInfo; +use codex_protocol::openai_models::ModelVisibility; +use codex_protocol::openai_models::ModelsResponse; +use codex_protocol::protocol::EventMsg::TurnComplete; +use codex_protocol::protocol::Op; +use codex_protocol::protocol::ThreadHistoryMode; +use codex_protocol::protocol::ThreadSettingsOverrides; +use codex_protocol::user_input::UserInput; +use core_test_support::responses; +use core_test_support::responses::ResponsesRequest as Request; +use core_test_support::skip_if_no_network; +use core_test_support::skip_if_remote; +use core_test_support::test_codex::TestCodex; +use core_test_support::test_codex::test_codex; +use core_test_support::wait_for_event; +use pretty_assertions::assert_eq; +use serde_json::json; +use test_case::test_case; +use wiremock::MockServer; + +const MODEL: &str = "gpt-5.4"; +const SWITCHED_MODEL: &str = "gpt-5.2"; +const ORIGINAL: &str = "original managed base instructions"; +const UPDATED: &str = "updated managed base instructions"; +const SWITCHED: &str = "switched managed base instructions"; + +fn managed_model(slug: &str, instructions: &str) -> ModelInfo { + let mut model = model_info_from_slug(slug); + model.use_responses_lite = true; + model.visibility = ModelVisibility::List; + model + .model_messages + .as_mut() + .expect("model messages") + .instructions_template = Some(instructions.to_string()); + model +} + +async fn refresh_catalog(test: &TestCodex, server: &MockServer, model: &str, instructions: &str) { + let etag = format!("\"{model}-{}\"", instructions.len()); + let models = vec![managed_model(model, instructions)]; + responses::mount_models_once_with_etag(server, ModelsResponse { models }, &etag).await; + let client_factory = codex_core::test_support::default_http_client_factory(); + test.thread_manager + .get_models_manager() + .list_models(RefreshStrategy::Online, client_factory) + .await; +} + +async fn send_turn(test: &TestCodex, server: &MockServer, text: &str) -> Result { + let response = responses::mount_sse_once(server, responses::sse_completed(text)).await; + test.submit_text_turn(text).await?; + Ok(response.single_request()) +} + +async fn switch_model(test: &TestCodex, server: &MockServer, model: &str) -> Result { + let overrides = ThreadSettingsOverrides { + model: Some(model.to_string()), + ..Default::default() + }; + core_test_support::submit_thread_settings(&test.codex, overrides).await?; + send_turn(test, server, "switch models").await +} + +async fn compact(test: &TestCodex, server: &MockServer) -> Result<()> { + let events = vec![ + json!({"type": "response.output_item.done", "item": { + "type": "compaction", "encrypted_content": "summary" + }}), + responses::ev_completed("compaction"), + ]; + responses::mount_sse_once(server, responses::sse(events)).await; + test.codex.submit(Op::Compact).await?; + wait_for_event(&test.codex, |event| matches!(event, TurnComplete(_))).await; + Ok(()) +} + +fn model_updates(request: &Request) -> Vec { + request + .message_input_texts("developer") + .into_iter() + .filter(|text| text.contains("")) + .collect() +} + +fn assert_request_base(request: &Request, base: &str) { + let developer = request.message_input_texts("developer"); + assert!(request.body_json().get("instructions").is_none()); + if !base.is_empty() { + let first_message = request + .input() + .into_iter() + .find(|item| item["type"] != "additional_tools") + .expect("base instruction prefix"); + assert_eq!(first_message["content"][0]["text"], base); + } + assert_eq!( + developer + .iter() + .filter(|text| text.as_str() == base) + .count(), + usize::from(!base.is_empty()) + ); +} + +#[test_case(true, None; "managed incremental instructions")] +#[test_case(false, None; "flag disabled")] +#[test_case(true, Some("user-supplied instructions"); "custom instructions")] +#[test_case(true, Some(""); "empty custom instructions")] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn catalog_and_model_changes_preserve_the_window_base( + incremental_tools: bool, + custom_instructions: Option<&'static str>, +) -> Result<()> { + skip_if_no_network!(Ok(())); + + let server = MockServer::start().await; + let models = vec![managed_model(MODEL, ORIGINAL)]; + responses::mount_models_once_with_etag(&server, ModelsResponse { models }, "\"v1\"").await; + let test = test_codex() + .with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()) + .with_model(MODEL) + .with_config(move |config| { + config.base_instructions = custom_instructions.map(str::to_string); + if incremental_tools { + config + .features + .enable(Feature::IncrementalTools) + .expect("enable incremental tools"); + } else { + config + .features + .disable(Feature::IncrementalTools) + .expect("disable incremental tools"); + } + }) + .build_with_auto_env(&server) + .await?; + let first_request = send_turn(&test, &server, "first turn").await?; + assert!(model_updates(&first_request).is_empty()); + + refresh_catalog(&test, &server, MODEL, UPDATED).await; + let updated_request = send_turn(&test, &server, "use refreshed instructions").await?; + let mut updates = Vec::new(); + if incremental_tools && custom_instructions.is_none() { + updates.push(format!("\nThe following instructions replace the previous base instructions:\n\n{UPDATED}\n")); + } + assert_eq!(model_updates(&updated_request), updates); + assert_eq!( + updated_request.has_content_kinds(&["model.instructions"]), + incremental_tools && custom_instructions.is_none() + ); + assert!(updated_request.input().starts_with(&first_request.input())); + let unchanged_request = send_turn(&test, &server, "keep refreshed instructions").await?; + assert_eq!(model_updates(&unchanged_request), updates); + + refresh_catalog(&test, &server, MODEL, "").await; + let cleared_request = send_turn(&test, &server, "clear managed instructions").await?; + if incremental_tools && custom_instructions.is_none() { + updates.push("\nThe previous base instructions no longer apply. No replacement base instructions are active.\n".to_string()); + } + assert_eq!(model_updates(&cleared_request), updates); + + for request in [ + first_request, + updated_request, + unchanged_request, + cleared_request, + ] { + assert_request_base(&request, custom_instructions.unwrap_or(ORIGINAL)); + } + + compact(&test, &server).await?; + let compacted_request = send_turn(&test, &server, "keep cleared instructions").await?; + if !incremental_tools { + assert_request_base(&compacted_request, ORIGINAL); + assert!(model_updates(&compacted_request).is_empty()); + return Ok(()); + } + assert_request_base(&compacted_request, custom_instructions.unwrap_or_default()); + assert!(model_updates(&compacted_request).is_empty()); + assert!(!compacted_request.body_contains_text(ORIGINAL)); + assert!(!compacted_request.body_contains_text(UPDATED)); + + refresh_catalog(&test, &server, SWITCHED_MODEL, SWITCHED).await; + let switched_request = switch_model(&test, &server, SWITCHED_MODEL).await?; + let updates = vec![match custom_instructions { + None => format!( + "\nThe current model is {SWITCHED_MODEL}.\nThe following instructions replace the previous base instructions:\n\n{SWITCHED}\n" + ), + Some(_) => format!( + "\nThe current model is {SWITCHED_MODEL}.\n" + ), + }]; + assert_eq!(model_updates(&switched_request), updates); + assert_request_base(&switched_request, custom_instructions.unwrap_or_default()); + + Ok(()) +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn rebuilding_retained_context_reasserts_current_instructions() -> Result<()> { + skip_if_no_network!(Ok(())); + skip_if_remote!(Ok(()), "the rollout fixture is edited on the host"); + + let server = MockServer::start().await; + let builder = |instructions: &'static str| { + test_codex() + .with_model(MODEL) + .with_history_mode(Some(ThreadHistoryMode::Legacy)) + .with_config(move |config| { + config.model_catalog = Some(ModelsResponse { + models: vec![managed_model(MODEL, instructions)], + }); + config + .features + .enable(Feature::IncrementalTools) + .expect("enable incremental tools"); + }) + }; + let initial = builder(ORIGINAL).build_with_auto_env(&server).await?; + let first = send_turn(&initial, &server, "start the conversation").await?; + initial.codex.shutdown_and_wait().await?; + let path = initial.codex.rollout_path().expect("rollout path"); + + // A missing turn-context record forces full reassertion within the retained window. + let mut lines = Vec::new(); + for line in std::fs::read_to_string(&path)?.lines() { + let item: serde_json::Value = serde_json::from_str(line)?; + if item["type"] == "turn_context" { + continue; + } + lines.push(line.to_string()); + } + std::fs::write(&path, format!("{}\n", lines.join("\n")))?; + + let resumed = builder(UPDATED) + .resume(&server, initial.home.clone(), path) + .await?; + let request = send_turn(&resumed, &server, "resume with updated instructions").await?; + assert!(request.input().starts_with(&first.input())); + assert_request_base(&request, ORIGINAL); + assert_eq!( + request + .message_input_texts("developer") + .into_iter() + .filter(|text| text.as_str() == ORIGINAL || text.as_str() == UPDATED) + .collect::>(), + vec![ORIGINAL, UPDATED], + ); + Ok(()) +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn model_switches_refresh_the_window_base_across_compaction_and_restart() -> Result<()> { + skip_if_no_network!(Ok(())); + + const SAME_PROMPT_MODEL: &str = "gpt-5.1"; + let server = MockServer::start().await; + let builder = || { + test_codex().with_model(MODEL).with_config(move |config| { + config + .features + .enable(Feature::IncrementalTools) + .expect("enable incremental tools"); + config.model_catalog = Some(ModelsResponse { + models: vec![ + managed_model(MODEL, ORIGINAL), + managed_model(SWITCHED_MODEL, SWITCHED), + managed_model(SAME_PROMPT_MODEL, SWITCHED), + ], + }); + }) + }; + let test = builder().build_with_auto_env(&server).await?; + let first_request = send_turn(&test, &server, "first turn").await?; + assert!(model_updates(&first_request).is_empty()); + let switched_request = switch_model(&test, &server, SWITCHED_MODEL).await?; + let mut expected_updates = vec![format!( + "\nThe current model is {SWITCHED_MODEL}.\nThe following instructions replace the previous base instructions:\n\n{SWITCHED}\n" + )]; + assert_eq!(model_updates(&switched_request), expected_updates); + + let same_prompt_request = switch_model(&test, &server, SAME_PROMPT_MODEL).await?; + expected_updates.push(format!( + "\nThe current model is {SAME_PROMPT_MODEL}.\n" + )); + assert_eq!(model_updates(&same_prompt_request), expected_updates); + + compact(&test, &server).await?; + let compacted_request = send_turn(&test, &server, "continue after compaction").await?; + assert_request_base(&compacted_request, SWITCHED); + assert!(model_updates(&compacted_request).is_empty()); + assert!(!compacted_request.body_contains_text(ORIGINAL)); + test.codex.flush_rollout().await?; + let mut fork_config = test.config.clone(); + fork_config.model = Some(SAME_PROMPT_MODEL.to_string()); + let fork = test + .thread_manager + .fork_legacy_thread( + ForkSnapshot::Interrupted, + StartThreadOptions::new(fork_config), + test.codex.rollout_path().expect("rollout path"), + ) + .await?; + let fork_response = + responses::mount_sse_once(&server, responses::sse_completed("fork after compaction")).await; + fork.thread + .start_or_steer_turn(TurnInputRequest::user_input(vec![UserInput::Text { + text: "continue in fork".into(), + text_elements: Vec::new(), + }])) + .await?; + wait_for_event(&fork.thread, |event| matches!(event, TurnComplete(_))).await; + let fork_request = fork_response.single_request(); + assert_request_base(&fork_request, SWITCHED); + assert!(model_updates(&fork_request).is_empty()); + assert!(!fork_request.body_contains_text(ORIGINAL)); + + let resumed = builder() + .with_model(SAME_PROMPT_MODEL) + .restart(&server, &test) + .await?; + let resumed_request = send_turn(&resumed, &server, "continue after restart").await?; + assert_request_base(&resumed_request, SWITCHED); + assert!(model_updates(&resumed_request).is_empty()); + assert!(!resumed_request.body_contains_text(ORIGINAL)); + let resumed_input = resumed_request.input(); + let compacted_input = compacted_request.input(); + if test.executor_environment().exec_server_url().is_some() { + assert!(resumed_input[1..].starts_with(&compacted_input[1..])); + } else { + assert!(resumed_input.starts_with(&compacted_input)); + } + + for request in [first_request, switched_request, same_prompt_request] { + assert_request_base(&request, ORIGINAL); + } + Ok(()) +} diff --git a/codex-rs/core/tests/suite/mod.rs b/codex-rs/core/tests/suite/mod.rs index bc2f075304..d64ef3a06d 100644 --- a/codex-rs/core/tests/suite/mod.rs +++ b/codex-rs/core/tests/suite/mod.rs @@ -55,6 +55,7 @@ mod approvals; mod audio_truncation; mod auth_recovery_policy; mod auto_review; +mod base_instructions; #[path = "bedrock_multi_agent_tests.rs"] mod bedrock_multi_agent; #[path = "bedrock_service_tier_tests.rs"] diff --git a/codex-rs/core/tests/suite/scenarios.rs b/codex-rs/core/tests/suite/scenarios.rs index cfad8149ad..2f55a0c935 100644 --- a/codex-rs/core/tests/suite/scenarios.rs +++ b/codex-rs/core/tests/suite/scenarios.rs @@ -105,6 +105,9 @@ mod incremental_tools; #[path = "scenarios_incremental_tools_resume.rs"] mod incremental_tools_resume; +#[path = "scenarios_model_instructions.rs"] +mod model_instructions; + #[path = "scenarios_code_mode_settled_helpers_tests.rs"] mod code_mode_settled_helpers; diff --git a/codex-rs/core/tests/suite/scenarios_incremental_tools.rs b/codex-rs/core/tests/suite/scenarios_incremental_tools.rs index 16e7f58c02..b434a16845 100644 --- a/codex-rs/core/tests/suite/scenarios_incremental_tools.rs +++ b/codex-rs/core/tests/suite/scenarios_incremental_tools.rs @@ -6,6 +6,8 @@ use codex_protocol::openai_models::CodeModeToolMessages; use codex_protocol::openai_models::IncrementalToolMessages; use codex_protocol::openai_models::ToolMessage; use codex_protocol::openai_models::ToolMode; +use codex_protocol::protocol::EventMsg; +use codex_protocol::protocol::Op; use codex_protocol::protocol::ThreadSettingsOverrides; use core_test_support::context_snapshot; use core_test_support::context_snapshot::ContextSnapshotOptions; @@ -13,7 +15,9 @@ use core_test_support::responses; use core_test_support::skip_if_no_network; use core_test_support::skip_if_wine_exec; use core_test_support::test_codex::test_codex; +use core_test_support::wait_for_event; use core_test_support::wait_for_mcp_server; +use pretty_assertions::assert_eq; use serde_json::json; use test_case::test_case; @@ -30,8 +34,21 @@ async fn incremental_tools_append_changed_catalog_without_rewriting_history( let server = responses::start_mock_server().await; let mock = responses::mount_sse_sequence( &server, - (1..=4) - .map(|index| responses::sse(vec![responses::ev_completed(&format!("resp-{index}"))])) + (1..=if use_responses_lite { 6 } else { 4 }) + .map(|index| { + let mut events = Vec::new(); + if index == 5 { + events.push(json!({ + "type": "response.output_item.done", + "item": { + "type": "compaction", + "encrypted_content": "INCREMENTAL_TOOLS_CHECKPOINT", + }, + })); + } + events.push(responses::ev_completed(&format!("resp-{index}"))); + responses::sse(events) + }) .collect(), ) .await; @@ -39,14 +56,24 @@ async fn incremental_tools_append_changed_catalog_without_rewriting_history( .with_model_info_override("gpt-5.4", move |model| { model.use_responses_lite = use_responses_lite; model.tool_mode = Some(ToolMode::CodeMode); + if use_responses_lite { + model + .model_messages + .as_mut() + .expect("model messages") + .instructions_template = + Some("Use the available tools to help the user.".to_string()); + } }) - .with_config(|config| { + .with_config(move |config| { config .features .enable(Feature::IncrementalTools) .expect("enable incremental tools"); - config.base_instructions = - Some("Use the available tools to help the user.".to_string()); + if !use_responses_lite { + config.base_instructions = + Some("Use the available tools to help the user.".to_string()); + } config.code_mode.disable_in_process_fallback = true; let catalog = config.model_catalog.as_mut().expect("model catalog"); let mut updated = catalog @@ -56,6 +83,13 @@ async fn incremental_tools_append_changed_catalog_without_rewriting_history( .expect("source model") .clone(); updated.slug = "updated-tools-model".to_string(); + if use_responses_lite { + updated + .model_messages + .as_mut() + .expect("model messages") + .instructions_template = Some("Review results before responding.".to_string()); + } updated .model_messages .get_or_insert_default() @@ -86,8 +120,29 @@ async fn incremental_tools_append_changed_catalog_without_rewriting_history( .await?; test.submit_text_turn("Continue with the same updated tools.") .await?; + if use_responses_lite { + test.codex.submit(Op::Compact).await?; + wait_for_event(&test.codex, |event| { + matches!(event, EventMsg::TurnComplete(_)) + }) + .await; + test.submit_text_turn("Continue after compaction.").await?; + } let requests = mock.requests(); + if use_responses_lite { + for request in &requests[..5] { + assert_eq!( + request.instructions_text(), + "Use the available tools to help the user." + ); + } + assert!(!requests[5].body_contains_text("Use the available tools to help the user.")); + assert_eq!( + requests[5].instructions_text(), + "Review results before responding." + ); + } insta::assert_snapshot!( if use_responses_lite { "incremental_tools" @@ -96,7 +151,7 @@ async fn incremental_tools_append_changed_catalog_without_rewriting_history( }, context_snapshot::format_request_history_snapshot( if use_responses_lite { - "Tool definitions enter history in one batch; a catalog change appends one developer notice before only the changed exec definition, without modifying namespace descriptions. The next unchanged turn appends only user input." + "Tool definitions precede the initial base instructions. A model switch appends one developer notice, changed tools, and replacement instructions without rewriting the prefix; compaction starts a new window with the updated base." } else { "Regular Responses requests carry the full current tool catalog without an incremental notice; changed execution instructions replace the catalog on subsequent requests." }, diff --git a/codex-rs/core/tests/suite/scenarios_model_instructions.rs b/codex-rs/core/tests/suite/scenarios_model_instructions.rs new file mode 100644 index 0000000000..2e16542430 --- /dev/null +++ b/codex-rs/core/tests/suite/scenarios_model_instructions.rs @@ -0,0 +1,104 @@ +//! Instruction refresh and compaction with an unchanged model and tool catalog. + +use super::*; +use codex_models_manager::manager::RefreshStrategy; +use codex_models_manager::model_info::model_info_from_slug; +use codex_protocol::openai_models::ModelVisibility; +use codex_protocol::openai_models::ModelsResponse; +use core_test_support::responses; + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn catalog_refresh_replaces_instructions_and_compaction_installs_latest_base() -> Result<()> { + skip_if_no_network!(Ok(())); + + let server = wiremock::MockServer::start().await; + let mut model = model_info_from_slug("gpt-5.4"); + model.use_responses_lite = true; + model.visibility = ModelVisibility::List; + model + .model_messages + .get_or_insert_default() + .instructions_template = Some("Help the user complete their task.".to_string()); + responses::mount_models_once_with_etag( + &server, + ModelsResponse { + models: vec![model.clone()], + }, + "\"instructions-v1\"", + ) + .await; + let mock = mount_sse_sequence( + &server, + (1..=5) + .map(|index| { + let mut events = Vec::new(); + if index == 4 { + events.push(json!({ + "type": "response.output_item.done", + "item": { + "type": "compaction", + "encrypted_content": "MODEL_INSTRUCTIONS_CHECKPOINT", + }, + })); + } + events.push(ev_completed(&format!("resp-{index}"))); + sse(events) + }) + .collect(), + ) + .await; + let test = test_codex() + .with_model(&model.slug) + .with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()) + .with_config(|config| { + config.workspace_roots = vec![config.cwd.clone()]; + config + .features + .enable(Feature::IncrementalTools) + .expect("enable incremental tools"); + }) + .build_with_auto_env(&server) + .await?; + test.submit_turn("Begin work.").await?; + + model + .model_messages + .get_or_insert_default() + .instructions_template = Some("Check your work before responding.".to_string()); + responses::mount_models_once_with_etag( + &server, + ModelsResponse { + models: vec![model], + }, + "\"instructions-v2\"", + ) + .await; + test.thread_manager + .get_models_manager() + .list_models( + RefreshStrategy::Online, + codex_core::test_support::default_http_client_factory(), + ) + .await; + test.submit_turn("Continue with refreshed instructions.") + .await?; + test.submit_turn("Continue without further changes.") + .await?; + test.codex.submit(Op::Compact).await?; + wait_for_event(&test.codex, |event| { + assert!(!matches!(event, EventMsg::Error(_)), "{event:?}"); + matches!(event, EventMsg::TurnComplete(_)) + }) + .await; + test.submit_turn("Continue after compaction.").await?; + + insta::assert_snapshot!( + "incremental_model_instructions", + context_snapshot::format_request_history_snapshot( + "A same-model catalog refresh appends replacement instructions once without changing tools or the prefix. Compaction starts a new window with the latest base.", + &mock.requests(), + &ContextSnapshotOptions::default().include_request_settings(), + ) + ); + Ok(()) +} diff --git a/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__incremental_tools__incremental_tools.snap b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__incremental_tools__incremental_tools.snap index 73d233a689..6e02804c35 100644 --- a/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__incremental_tools__incremental_tools.snap +++ b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__incremental_tools__incremental_tools.snap @@ -1,8 +1,8 @@ --- source: core/tests/suite/scenarios_incremental_tools.rs -expression: "context_snapshot::format_request_history_snapshot(\"Tool definitions enter history in one batch; a catalog change appends one developer notice before only the changed exec definition, without modifying namespace descriptions. The next unchanged turn appends only user input.\",\n&requests,\n&ContextSnapshotOptions::default().rewrite_known_segments().include_request_settings(),)" +expression: "context_snapshot::format_request_history_snapshot(if use_responses_lite\n{\n \"Tool definitions precede the initial base instructions. A model switch appends one developer notice, changed tools, and replacement instructions without rewriting the prefix; compaction starts a new window with the updated base.\"\n} else\n{\n \"Regular Responses requests carry the full current tool catalog without an incremental notice; changed execution instructions replace the catalog on subsequent requests.\"\n}, &requests,\n&ContextSnapshotOptions::default().rewrite_known_segments().include_request_settings(),)" --- -Scenario: Tool definitions enter history in one batch; a catalog change appends one developer notice before only the changed exec definition, without modifying namespace descriptions. The next unchanged turn appends only user input. +Scenario: Tool definitions precede the initial base instructions. A model switch appends one developer notice, changed tools, and replacement instructions without rewriting the prefix; compaction starts a new window with the updated base. ## Window 1 Settings: @@ -68,9 +68,47 @@ Settings: relative to window 1 - namespace/functions; hash=771cad2ff250d2f3 - custom/exec 08:message/developer: - + + The current model is updated-tools-model. + The following instructions replace the previous base instructions: + + Review results before responding. + 09:message/user: Continue with the updated execution instructions. -- request 4 (turn) -- 10:message/user: Continue with the same updated tools. +-- request 5 (compaction) -- +11:compaction_trigger + +## Window 3 (after request 5: input diverged at item 00) +Settings: same as window 2 +-- request 6 (turn) -- +00:additional_tools/developer (2; hash=1322c3a339378659): + - namespace/functions; hash=9d5d7a0adab05fef + - custom/exec + - function/wait + - function/exec_command + - function/write_stdin + - function/request_user_input + - custom/apply_patch + - function/view_image + - tool_search: # Tool discovery Searches over deferred tool metadata with BM25 and exposes matching tools for t...; args=[limit, query]; hash=400cd6ac61d524a9 +01:message/developer: + +02:message/user: + Begin work. +03:message/user: + Continue with the same tools. +04:message/user: + Continue with the updated execution instructions. +05:message/developer: + +06:message/user: + +07:message/user: + Continue with the same updated tools. +08:compaction:encrypted=true; chars=28; hash=e4a73156e0a498bc +09:message/user: + Continue after compaction. diff --git a/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__model_instructions__incremental_model_instructions.snap b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__model_instructions__incremental_model_instructions.snap new file mode 100644 index 0000000000..0a1d2ba5a5 --- /dev/null +++ b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__model_instructions__incremental_model_instructions.snap @@ -0,0 +1,100 @@ +--- +source: core/tests/suite/scenarios_model_instructions.rs +expression: "context_snapshot::format_request_history_snapshot(\"A same-model catalog refresh appends replacement instructions once without changing tools or the prefix. Compaction starts a new window with the latest base.\",\n&mock.requests(),\n&ContextSnapshotOptions::default().include_request_settings(),)" +--- +Scenario: A same-model catalog refresh appends replacement instructions once without changing tools or the prefix. Compaction starts a new window with the latest base. + +## Window 1 +Settings: + include: ["reasoning.encrypted_content"] + model: "gpt-5.4" + parallel_tool_calls: false + prompt_cache_key: "" + reasoning: {"context":"all_turns","summary":"auto"} + store: false + stream: true + tool_choice: "auto" +-- request 1 (turn) -- +00:additional_tools/developer (2; hash=946019c94afdd69a): + - namespace/functions; hash=ce01915b77cef9ee + - function/exec_command + - function/write_stdin + - function/request_user_input + - function/view_image + - namespace/multi_agent_v1: Tools for spawning and managing sub-agents.; hash=d492855cc7064c73 + - function/close_agent + - function/resume_agent + - function/send_input + - function/spawn_agent + - function/wait_agent +01:message/developer: + Help the user complete their task. +02:message/developer: + + Filesystem sandboxing defines which files can be read or written. `sandbox_mode` is `danger-full-access`...ll commands are permitted. Network access is enabled. [hash=c134061cebb94a1b] + Approval policy is currently never. Do not provide the `sandbox_permissions` for any reason, commands will be rejected. + +03:message/user: + + + + + + <...e="unrestricted" /> [hash=d40b2f45cb028888] + +04:message/user: + Begin work. +-- request 2 (turn) -- +05:message/developer: + + The following instructions replace the previous base instructions: + + Check your work before responding. + +06:message/user: + Continue with refreshed instructions. +-- request 3 (turn) -- +07:message/user: + Continue without further changes. +-- request 4 (compaction) -- +08:compaction_trigger + +## Window 2 (after request 4: input diverged at item 01) +Settings: same as window 1 +-- request 5 (turn) -- +00:additional_tools/developer (2; hash=946019c94afdd69a): + - namespace/functions; hash=ce01915b77cef9ee + - function/exec_command + - function/write_stdin + - function/request_user_input + - function/view_image + - namespace/multi_agent_v1: Tools for spawning and managing sub-agents.; hash=d492855cc7064c73 + - function/close_agent + - function/resume_agent + - function/send_input + - function/spawn_agent + - function/wait_agent +01:message/developer: + Check your work before responding. +02:message/user: + Begin work. +03:message/user: + Continue with refreshed instructions. +04:message/developer: + + Filesystem sandboxing defines which files can be read or written. `sandbox_mode` is `danger-full-access`...ll commands are permitted. Network access is enabled. [hash=c134061cebb94a1b] + Approval policy is currently never. Do not provide the `sandbox_permissions` for any reason, commands will be rejected. + +05:message/user: + + + + + + <...e="unrestricted" /> [hash=d40b2f45cb028888] + +06:message/user: + Continue without further changes. +07:compaction:encrypted=true; chars=29; hash=a44318b8dfee766d +08:message/user: + Continue after compaction. From 7eed30ad1beaebc20b7d848ce9ee887525a379b0 Mon Sep 17 00:00:00 2001 From: Benjamin Carlsson Date: Wed, 14 Oct 2026 05:55:29 +0000 Subject: [PATCH 030/155] Preserve running turn recovery across thread settings updates (#53879) ## Why Standalone thread settings updates cleared the running turn's continuation lineage, preventing recovery after a daemon restart. ## What changed Preserve continuation lineage while a task is registered. Continue invalidating pending continuations for idle, reserved, and finishing turns, and record started-turn lineage atomically with task registration. ## Testing Extend settings invalidation coverage to idle, reserved, and finishing turns. Exercise an in-flight reasoning effort update before compaction, then verify cold resume preserves the turn's frozen settings and allows continuation. Wait for thread idle before testing idle continuation. GitOrigin-RevId: d7c316af6a4c871790bb57f0af9892bb30871ac8 --- codex-rs/core/src/session/tests.rs | 11 ++++- codex-rs/core/src/session/thread_settings.rs | 15 +++++- codex-rs/core/src/session/turn_input.rs | 2 +- codex-rs/core/src/tasks/mod.rs | 13 ++--- codex-rs/core/tests/suite/compact.rs | 47 ++++++++++++++++++- ...mpaction_cold_resume_after_completion.snap | 4 +- .../core/tests/suite/turn_input_submission.rs | 5 ++ 7 files changed, 83 insertions(+), 14 deletions(-) diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index 14a88521ba..e18314e5cc 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -6134,12 +6134,21 @@ async fn mcp_attribution_checkpoints_cover_batch_prefixes_compaction_and_restore assert_eq!(restored.mcp_attribution_snapshot(), expected); } +#[test_case(None; "idle")] +#[test_case(Some(ActiveTurn::default()); "reserved turn")] +#[test_case(Some(ActiveTurn { + finishing: Some(tokio_util::sync::CancellationToken::new()), + ..Default::default() +}); "finishing turn")] #[tokio::test] -async fn standalone_settings_invalidate_continuation_before_delivering_acceptance() { +async fn standalone_settings_invalidate_continuation_before_delivering_acceptance( + active_turn: Option, +) { let (mut session, turn_context) = make_session_and_context().await; let (tx, rx) = async_channel::bounded(1); session.tx_event = tx; session.state.lock().await.last_started_turn_id = Some("superseded-turn".into()); + *session.active_turn.lock().await = active_turn; session .tx_event .send(Event { diff --git a/codex-rs/core/src/session/thread_settings.rs b/codex-rs/core/src/session/thread_settings.rs index c45ce098c6..f07d921dc2 100644 --- a/codex-rs/core/src/session/thread_settings.rs +++ b/codex-rs/core/src/session/thread_settings.rs @@ -31,14 +31,25 @@ impl Session { } /// Applies standalone thread settings. The caller holds the persistence permit through notification. +#[expect( + clippy::await_holding_invalid_type, + reason = "the active-turn guard makes continuation invalidation atomic with turn admission" +)] pub(super) async fn update( session: &Session, overrides: impl Into>, ) -> ConstraintResult { let updates = prepare_update(overrides, &session.services.selected_capability_roots); let commit = session.update_settings(updates).await?; - // Standalone settings changes supersede a pending automatic continuation. - session.state.lock().await.last_started_turn_id = None; + let active_turn = session.active_turn.lock().await; + // A registered running task retains its lineage so it can be recovered after a daemon + // restart. Reservations and finishing turns have no interrupted work to continue. + if active_turn + .as_ref() + .is_none_or(|active_turn| active_turn.task.is_none()) + { + session.state.lock().await.last_started_turn_id = None; + } Ok(commit.snapshot) } diff --git a/codex-rs/core/src/session/turn_input.rs b/codex-rs/core/src/session/turn_input.rs index 74a7592de8..d9cbe2f2e1 100644 --- a/codex-rs/core/src/session/turn_input.rs +++ b/codex-rs/core/src/session/turn_input.rs @@ -688,7 +688,7 @@ async fn steer( } impl Session { - /// Called under the active-turn lock before running any task or lifecycle callback. + /// Called under the active-turn lock when registering a task (or a realtime transcript turn). pub(crate) async fn record_started_turn( &self, turn_id: &str, diff --git a/codex-rs/core/src/tasks/mod.rs b/codex-rs/core/src/tasks/mod.rs index 6a3e95ee80..3aa4c55b04 100644 --- a/codex-rs/core/src/tasks/mod.rs +++ b/codex-rs/core/src/tasks/mod.rs @@ -283,7 +283,7 @@ impl Session { #[expect( clippy::await_holding_invalid_type, - reason = "record the started turn atomically with its active reservation" + reason = "record the started turn atomically with task registration" )] pub(crate) async fn start_task( self: &Arc, @@ -328,11 +328,6 @@ impl Session { let (pending_items, _) = self.input_queue.drain_mailbox_input_items().await; let turn_state = { let mut active = self.active_turn.lock().await; - self.record_started_turn( - &turn_context.sub_id, - (task_kind == TaskKind::Regular).then(|| turn_context.attribution()), - ) - .await; let turn = active.get_or_insert_with(ActiveTurn::default); debug_assert!(turn.task.is_none()); turn.finishing = None; @@ -352,6 +347,12 @@ impl Session { let mut active = self.active_turn.lock().await; let turn = active.get_or_insert_with(ActiveTurn::default); debug_assert!(turn.task.is_none()); + // Record lineage only when the task starts: settings changes can invalidate a reservation. + self.record_started_turn( + &turn_context.sub_id, + (task_kind == TaskKind::Regular).then(|| turn_context.attribution()), + ) + .await; let agent_execution_guard = self.services.agent_control.admit_turn( turn_context.multi_agent_version, &turn_context.session_source, diff --git a/codex-rs/core/tests/suite/compact.rs b/codex-rs/core/tests/suite/compact.rs index ee8b2e6985..93b183f472 100644 --- a/codex-rs/core/tests/suite/compact.rs +++ b/codex-rs/core/tests/suite/compact.rs @@ -22,6 +22,7 @@ use codex_protocol::models::PermissionProfile; use codex_protocol::openai_models::ModelInfo; use codex_protocol::openai_models::ModelServiceTier; use codex_protocol::openai_models::ModelsResponse; +use codex_protocol::openai_models::ReasoningEffort; use codex_protocol::protocol::AskForApproval; use codex_protocol::protocol::CodexErrorInfo; use codex_protocol::protocol::EventMsg; @@ -32,6 +33,8 @@ use codex_protocol::protocol::ItemStartedEvent; use codex_protocol::protocol::Op; use codex_protocol::protocol::ThreadSettingsOverrides; use codex_protocol::protocol::WarningEvent; +use codex_protocol::request_user_input::RequestUserInputAnswer; +use codex_protocol::request_user_input::RequestUserInputResponse; use codex_protocol::user_input::UserInput; use codex_utils_absolute_path::AbsolutePathBuf; use codex_utils_path_uri::PathUri; @@ -4690,7 +4693,18 @@ async fn paginated_compaction_cold_resume_from_bounded_suffix() -> Result<()> { &server, vec![ sse(vec![ - ev_function_call(DUMMY_CALL_ID, DUMMY_FUNCTION_NAME, "{}"), + ev_function_call( + DUMMY_CALL_ID, + "request_user_input", + &json!({"questions": [{ + "id": "next", "header": "Next", "question": "Continue?", + "options": [ + {"label": "Yes", "description": "Continue."}, + {"label": "No", "description": "Stop."} + ] + }]}) + .to_string(), + ), ev_completed_with_tokens("before-compact", /*total_tokens*/ 96), ]), sse(vec![ @@ -4744,6 +4758,8 @@ async fn paginated_compaction_cold_resume_from_bounded_suffix() -> Result<()> { }, ) .await?; + // The resumed turn retains its frozen settings, even after an in-flight update. + let expected_settings = test.codex.thread_settings_snapshot().await; let codex_core::TurnInputSubmission::Started { turn_id, .. } = test .codex .start_or_steer_turn(TurnInputRequest::user_input(vec![UserInput::Text { @@ -4754,11 +4770,38 @@ async fn paginated_compaction_cold_resume_from_bounded_suffix() -> Result<()> { else { panic!("initial turn did not start"); }; + // Change settings while the turn is blocked, before compaction checkpoints its lineage. + wait_for_event(&test.codex, |event| { + matches!(event, EventMsg::RequestUserInput(_)) + }) + .await; + core_test_support::submit_thread_settings( + &test.codex, + ThreadSettingsOverrides { + effort: Some(Some(ReasoningEffort::High)), + ..Default::default() + }, + ) + .await?; + test.codex.checkpoint_thread_settings().await?; + test.codex + .submit(Op::UserInputAnswer { + id: turn_id.clone(), + response: RequestUserInputResponse { + answers: [( + "next".into(), + RequestUserInputAnswer { + answers: vec!["Yes".into()], + }, + )] + .into(), + }, + }) + .await?; wait_for_event(&test.codex, |event| { matches!(event, EventMsg::TurnComplete(_)) }) .await; - let expected_settings = test.codex.thread_settings_snapshot().await; let path = test.codex.rollout_path().expect("rollout path"); test.codex.shutdown_and_wait().await?; test.thread_manager diff --git a/codex-rs/core/tests/suite/snapshots/all__suite__compact__compaction_cold_resume_after_completion.snap b/codex-rs/core/tests/suite/snapshots/all__suite__compact__compaction_cold_resume_after_completion.snap index 2477eb2974..93d6715ad1 100644 --- a/codex-rs/core/tests/suite/snapshots/all__suite__compact__compaction_cold_resume_after_completion.snap +++ b/codex-rs/core/tests/suite/snapshots/all__suite__compact__compaction_cold_resume_after_completion.snap @@ -63,8 +63,8 @@ Scenario: Real paginated mid-turn compaction and cold resume from the bounded su 04:message/user: function call limit push -05:function_call/test_tool:{} -06:function_call_output:unsupported call: test_tool +05:function_call/request_user_input:{"questions":[{"header":"Next","id":"next","options":[{"description":"Continue.","label":"Yes"},{"description":"Stop.","label":"No"}],"question":"Continue?"}]} +06:function_call_output:{"answers":{"next":{"answers":["Yes"]}}} 07:message/user: diff --git a/codex-rs/core/tests/suite/turn_input_submission.rs b/codex-rs/core/tests/suite/turn_input_submission.rs index 6e3628c6e6..2dfa42279c 100644 --- a/codex-rs/core/tests/suite/turn_input_submission.rs +++ b/codex-rs/core/tests/suite/turn_input_submission.rs @@ -997,8 +997,11 @@ async fn recovery_preserves_durable_turn_attribution( #[tokio::test] async fn continue_turn_if_idle_starts_new_turn_with_internal_input() { let server = responses::start_mock_server().await; + let mut extensions = ExtensionRegistryBuilder::new(); + extensions.thread_lifecycle_contributor(Arc::new(ThreadIdle)); let test = test_codex() .with_model("gpt-5.6-sol") + .with_extensions(Arc::new(extensions.build())) .with_config(|config| { config .features @@ -1027,6 +1030,7 @@ async fn continue_turn_if_idle_starts_new_turn_with_internal_input() { matches!(event, EventMsg::TurnComplete(_)) }) .await; + ThreadIdle::wait(&test.codex).await; let mock = responses::mount_sse_once(&server, responses::sse_completed("continued")).await; let input = ContextualUserFragment::into(InternalModelContextFragment::new( InternalContextSource::from_static("daemon_recovery"), @@ -1058,6 +1062,7 @@ async fn continue_turn_if_idle_starts_new_turn_with_internal_input() { matches!(event, EventMsg::TurnComplete(_)) }) .await; + ThreadIdle::wait(&test.codex).await; let request = mock.single_request(); assert!(request.has_content_kinds(&["daemon_recovery.internal_context"])); let metadata: Value = serde_json::from_str( From 4906ddf5b80d4cf4e54ac1a22dc000c389835e9c Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 14 Oct 2026 07:01:04 +0000 Subject: [PATCH 031/155] Resume unloaded subagent threads when selected in the TUI (#53895) ## Why Persisted subagent threads could be reported as unavailable when selected after unloading, even though their saved history could be restored. ## What changed Attempt to resume selected threads marked closed, including those with a cached live channel, and restore their transcript through the existing attachment flow. ## Testing Extend coverage for V1 and V2 subagents to verify saved transcript restoration, the appropriate direct-input behavior, and reattachment when a close notification from the previous runtime is still queued. GitOrigin-RevId: f45d16b954ce5f9f30ca4c6c6f640937390dd78d --- codex-rs/tui/src/app/session_lifecycle.rs | 21 +-- codex-rs/tui/src/app/tests.rs | 120 +++++++++++++----- ..._tests__selected_unloaded_subagent_V1.snap | 8 ++ ..._tests__selected_unloaded_subagent_V2.snap | 8 ++ 4 files changed, 109 insertions(+), 48 deletions(-) create mode 100644 codex-rs/tui/src/snapshots/codex_tui__app__tests__selected_unloaded_subagent_V1.snap create mode 100644 codex-rs/tui/src/snapshots/codex_tui__app__tests__selected_unloaded_subagent_V2.snap diff --git a/codex-rs/tui/src/app/session_lifecycle.rs b/codex-rs/tui/src/app/session_lifecycle.rs index a4fff209ab..d6e030c9a8 100644 --- a/codex-rs/tui/src/app/session_lifecycle.rs +++ b/codex-rs/tui/src/app/session_lifecycle.rs @@ -372,11 +372,7 @@ impl App { .thread_event_channels .get(&thread_id) .is_some_and(|channel| channel.attachment() == ThreadEventAttachment::ExternalWriter); - if self - .thread_event_channels - .get(&thread_id) - .is_some_and(|channel| channel.attachment() == ThreadEventAttachment::Live) - { + if !self.should_attach_live_thread_for_selection(thread_id) { return Ok(true); } @@ -613,11 +609,6 @@ impl App { return Ok(()); } } - } else if !self.thread_event_channels.contains_key(&thread_id) && is_replay_only { - self.add_agents_overview_error(format!( - "Agent thread {thread_id} is no longer available." - )); - return Ok(()); } let previous_thread_id = self.active_thread_id; // Notifications already routed to the active channel must reach the old @@ -781,13 +772,13 @@ impl App { } pub(super) fn should_attach_live_thread_for_selection(&self, thread_id: ThreadId) -> bool { - self.thread_event_channels + self.agent_navigation .get(&thread_id) - .is_none_or(|channel| channel.attachment() != ThreadEventAttachment::Live) - && self - .agent_navigation + .is_some_and(|entry| entry.is_closed) + || self + .thread_event_channels .get(&thread_id) - .is_none_or(|entry| !entry.is_closed || self.thread_unavailable(thread_id)) + .is_none_or(|channel| channel.attachment() != ThreadEventAttachment::Live) } pub(super) fn reset_for_thread_switch(&mut self, tui: &mut tui::Tui) -> Result<()> { diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs index 4fb6b8ac08..6ffec87971 100644 --- a/codex-rs/tui/src/app/tests.rs +++ b/codex-rs/tui/src/app/tests.rs @@ -128,6 +128,7 @@ use codex_utils_absolute_path::test_support::PathExt; use crate::chatwidget::ChatWidgetInit; use crate::chatwidget::create_initial_user_message; +use crate::chatwidget::tests::helpers::normalize_snapshot_paths; use crate::chatwidget::tests::helpers::render_bottom_popup; use crate::chatwidget::tests::helpers::set_active_cell; use crate::chatwidget::tests::make_chatwidget_manual_with_sender; @@ -2733,13 +2734,31 @@ fn selected_and_resumed_threads_use_server_capability_for_v1_and_v2_children() - "type": "session_meta", "payload": serde_json::to_value(session_meta)?, }); - std::fs::write(rollout_path, format!("{session_meta_line}\n"))?; + let saved_message = format!("Saved work from child-{index}"); + let response_item = serde_json::json!({ + "timestamp": timestamp, + "type": "response_item", + "payload": { + "type": "message", "role": "user", + "content": [{"type": "input_text", "text": saved_message}] + } + }); + let user_message = serde_json::json!({ + "timestamp": timestamp, + "type": "event_msg", + "payload": {"type": "user_message", "message": saved_message, "kind": "plain"} + }); + std::fs::write( + rollout_path, + format!("{session_meta_line}\n{response_item}\n{user_message}\n"), + )?; child_thread_ids.push(child_thread_id); } // Cold-resume the persisted V2 root so its children are registered before selection. + app.config.thread_unload_delay = Duration::ZERO; let mut app_server = Box::pin(crate::start_embedded_app_server_for_picker( - app.chat_widget.config_ref(), + &app.config, )) .await?; let root = Box::pin(app_server.resume_thread( @@ -2751,20 +2770,82 @@ fn selected_and_resumed_threads_use_server_capability_for_v1_and_v2_children() - .await?; app.enqueue_primary_thread_session(root.session, root.turns) .await?; - for (child_thread_id, multi_agent_version) in child_thread_ids + let mut tui = crate::tui::test_support::make_test_tui()?; + for (index, (child_thread_id, multi_agent_version)) in child_thread_ids .iter() .copied() .zip([MultiAgentVersion::V1, MultiAgentVersion::V2]) + .enumerate() { - assert!( - app.attach_live_thread_for_selection(&mut app_server, child_thread_id) - .await? + while app_event_rx.try_recv().is_ok() {} + assert_eq!( + app_server.thread_read(child_thread_id, /*include_turns*/ false).await?.status, + codex_app_server_protocol::ThreadStatus::NotLoaded ); + app.select_agent_thread(&mut tui, &mut app_server, child_thread_id) + .await?; + assert_eq!(app.active_thread_id, Some(child_thread_id)); assert_eq!( app.agent_navigation.is_parent_owned(child_thread_id), multi_agent_version == MultiAgentVersion::V2 ); + assert_app_snapshot!( + format!("selected_unloaded_subagent_{multi_agent_version:?}"), + normalize_snapshot_paths(render_bottom_popup(&app.chat_widget, /*width*/ 80)) + ); + let saved_message = format!("Saved work from child-{index}"); + while let Ok(event) = app_event_rx.try_recv() { + if let AppEvent::InsertHistoryCell(cell) = event { + app.transcript_cells.push(Arc::from(cell)); + } + } + assert!( + app.render_transcript_lines_for_reflow(/*width*/ 80) + .lines + .iter() + .any(|line| rendered_line_text(line).contains(&saved_message)) + ); + app.select_agent_thread(&mut tui, &mut app_server, root_thread_id) + .await?; + app_server.thread_unsubscribe(child_thread_id).await?; + let closed = tokio::time::timeout(Duration::from_secs(/*secs*/ 5), async { + while let Some(event) = app_server.next_event().await { + if matches!(&event, + codex_app_server_client::AppServerEvent::ServerNotification(notification) + if matches!(notification.as_ref(), ServerNotification::ThreadClosed(closed) + if closed.thread_id == child_thread_id.to_string())) + { + return event; + } + } + panic!("server event stream ended before the child closed"); + }) + .await?; + while app_event_rx.try_recv().is_ok() {} + app.select_agent_thread(&mut tui, &mut app_server, child_thread_id) + .await?; + // A queued close from the old runtime must not undo the new attachment. + app.handle_app_server_event(&app_server, closed).await; + app.drain_active_thread_events(&mut tui).await?; + assert_eq!(app.active_thread_id, Some(child_thread_id)); + assert!(!matches!( + app_server.thread_read(child_thread_id, /*include_turns*/ false).await?.status, + codex_app_server_protocol::ThreadStatus::NotLoaded + )); + while let Ok(event) = app_event_rx.try_recv() { + if let AppEvent::InsertHistoryCell(cell) = event { + app.transcript_cells.push(Arc::from(cell)); + } + } + assert!( + app.render_transcript_lines_for_reflow(/*width*/ 80) + .lines + .iter() + .any(|line| rendered_line_text(line).contains(&saved_message)) + ); } + app.select_agent_thread(&mut tui, &mut app_server, root_thread_id) + .await?; app.agent_navigation .record_sub_agent_activity(SubAgentActivityDisplay { @@ -2792,7 +2873,6 @@ fn selected_and_resumed_threads_use_server_capability_for_v1_and_v2_children() - assert!(!app.agent_navigation.is_parent_owned(child_thread_ids[0])); assert!(app.agent_navigation.is_parent_owned(child_thread_ids[1])); - let mut tui = crate::tui::test_support::make_test_tui()?; app.select_agent_thread(&mut tui, &mut app_server, child_thread_ids[0]) .await?; while app_event_rx.try_recv().is_ok() {} @@ -2932,32 +3012,6 @@ fn attach_live_thread_for_selection_rejects_unmaterialized_fallback_threads() -> }) } -#[tokio::test] -async fn should_attach_live_thread_for_selection_skips_closed_metadata_only_threads() { - let mut app = make_test_app().await; - let thread_id = ThreadId::new(); - app.agent_navigation.upsert( - thread_id, - Some("Ghost".to_string()), - Some("worker".to_string()), - /*is_closed*/ true, - ); - - assert!(!app.should_attach_live_thread_for_selection(thread_id)); - - app.agent_navigation.upsert( - thread_id, - Some("Ghost".to_string()), - Some("worker".to_string()), - /*is_closed*/ false, - ); - assert!(app.should_attach_live_thread_for_selection(thread_id)); - - app.thread_event_channels - .insert(thread_id, ThreadEventChannel::new(/*capacity*/ 1)); - assert!(!app.should_attach_live_thread_for_selection(thread_id)); -} - #[tokio::test] async fn refresh_agent_picker_thread_liveness_prunes_closed_metadata_only_threads() -> Result<()> { let mut app = Box::pin(make_test_app()).await; diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__tests__selected_unloaded_subagent_V1.snap b/codex-rs/tui/src/snapshots/codex_tui__app__tests__selected_unloaded_subagent_V1.snap new file mode 100644 index 0000000000..1252049489 --- /dev/null +++ b/codex-rs/tui/src/snapshots/codex_tui__app__tests__selected_unloaded_subagent_V1.snap @@ -0,0 +1,8 @@ +--- +source: tui/src/app/tests.rs +assertion_line: 2769 +expression: "render_bottom_popup(&app.chat_widget, 80)" +--- +› Ask Codex to do anything + + GPT-6.1-Sol default · /tmp/project · child-0 [worker] diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__tests__selected_unloaded_subagent_V2.snap b/codex-rs/tui/src/snapshots/codex_tui__app__tests__selected_unloaded_subagent_V2.snap new file mode 100644 index 0000000000..b36b6636f4 --- /dev/null +++ b/codex-rs/tui/src/snapshots/codex_tui__app__tests__selected_unloaded_subagent_V2.snap @@ -0,0 +1,8 @@ +--- +source: tui/src/app/tests.rs +assertion_line: 2769 +expression: "render_bottom_popup(&app.chat_widget, 80)" +--- +› Viewing sub-agent — direct input is disabled + + GPT-6.1-Sol default · /tmp/project · child-1 [worker] From 97771b1d78cf6366bc3946fe9e4bbca4ebee31d1 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 14 Oct 2026 07:01:50 +0000 Subject: [PATCH 032/155] Isolate daemon package tests to reduce disk contention (#53897) ## Why Daemon package tests copy full debug CLI packages. Running these I/O-heavy cases alongside other tests can increase shared-disk writeback pressure. ## What changed - Move package installation and replacement coverage into the `app_server_daemon_package` test binary, sharing daemon fixtures with the lifecycle tests. - Reserve all nextest test threads for each package test and add an exclusive Bazel target that runs the cases serially on Linux and macOS. - Hard-link the prepared fixture executable during package setup, while retaining real independent package copies in the installer. GitOrigin-RevId: 255ac8caf75d9eb61bafe68f1f9bcfa99ee72484 --- codex-rs/.config/nextest.toml | 8 +- codex-rs/cli/BUILD.bazel | 32 ++ codex-rs/cli/Cargo.toml | 4 + codex-rs/cli/tests/app_server_daemon.rs | 337 +----------------- .../cli/tests/app_server_daemon/package.rs | 219 ++++++++++++ .../cli/tests/app_server_daemon/support.rs | 140 ++++++++ 6 files changed, 408 insertions(+), 332 deletions(-) create mode 100644 codex-rs/cli/tests/app_server_daemon/package.rs create mode 100644 codex-rs/cli/tests/app_server_daemon/support.rs diff --git a/codex-rs/.config/nextest.toml b/codex-rs/.config/nextest.toml index f370a0aa36..0dd671758e 100644 --- a/codex-rs/.config/nextest.toml +++ b/codex-rs/.config/nextest.toml @@ -12,13 +12,15 @@ slow-timeout = { period = "1m", terminate-after = 2 } [[profile.default.overrides]] # This case validates and copies both the initial and replacement debug package. -filter = 'package(codex-cli) & binary(app_server_daemon) & test(=packaged_daemon_start_and_explicit_replacement)' +filter = 'package(codex-cli) & binary(=app_server_daemon_package) & test(=packaged_daemon_start_and_explicit_replacement)' slow-timeout = { period = "1m", terminate-after = 3 } +threads-required = "num-test-threads" [[profile.default.overrides]] -# These cases copy a full debug CLI package and launch its new executable. -filter = 'package(codex-cli) & binary(app_server_daemon) & test(packaged_daemon_)' +# These copies must not compete with other tests on the same runner. +filter = 'package(codex-cli) & binary(=app_server_daemon_package)' slow-timeout = { period = "1m", terminate-after = 2 } +threads-required = "num-test-threads" [profile.default.junit] path = "junit.xml" diff --git a/codex-rs/cli/BUILD.bazel b/codex-rs/cli/BUILD.bazel index d9673f989f..ec69a56834 100644 --- a/codex-rs/cli/BUILD.bazel +++ b/codex-rs/cli/BUILD.bazel @@ -1,3 +1,6 @@ +load("@crates//:data.bzl", "DEP_DATA") +load("@crates//:defs.bzl", "all_crate_deps") +load("@rules_rust//rust:defs.bzl", "rust_test") load("//:defs.bzl", "MACOS_WEBRTC_RUSTC_LINK_FLAGS", "codex_rust_crate") load("//bazel/platforms:release_binaries.bzl", "multiplatform_binaries") load("//bazel/rules:e2e_benchmark.bzl", "codex_e2e_benchmark") @@ -14,6 +17,35 @@ codex_rust_crate( test_data_extra = glob(["src/**/snapshots/**"]), ) +# Real installation copies a full debug package. Run after other Bazel tests +# on the CI runner so remote executors do not amplify shared-disk writeback. +rust_test( + name = "cli-app_server_daemon_package-test", + timeout = "long", + srcs = [ + "tests/app_server_daemon/package.rs", + "tests/app_server_daemon/support.rs", + ], + args = ["--test-threads=1"], + crate_name = "app_server_daemon_package", + crate_root = "tests/app_server_daemon/package.rs", + data = [":codex"], + env = {"CARGO_BIN_EXE_codex": "$(rlocationpath :codex)"}, + rustc_env = {"BAZEL_PACKAGE": "codex-rs/cli"}, + rustc_flags = MACOS_WEBRTC_RUSTC_LINK_FLAGS, + tags = ["exclusive"], + target_compatible_with = select({ + "@platforms//os:linux": [], + "@platforms//os:macos": [], + "//conditions:default": ["@platforms//:incompatible"], + }), + version = DEP_DATA["codex-rs/cli"]["version"], + deps = all_crate_deps( + normal = True, + normal_dev = True, + ), +) + release_binary( binary = ":codex", ) diff --git a/codex-rs/cli/Cargo.toml b/codex-rs/cli/Cargo.toml index 608921c370..9443824741 100644 --- a/codex-rs/cli/Cargo.toml +++ b/codex-rs/cli/Cargo.toml @@ -14,6 +14,10 @@ path = "src/main.rs" name = "logs_client" path = "src/bin/logs_client.rs" +[[test]] +name = "app_server_daemon_package" +path = "tests/app_server_daemon/package.rs" + [lib] name = "codex_cli" path = "src/lib.rs" diff --git a/codex-rs/cli/tests/app_server_daemon.rs b/codex-rs/cli/tests/app_server_daemon.rs index 7129f9f34b..72b10fa51b 100644 --- a/codex-rs/cli/tests/app_server_daemon.rs +++ b/codex-rs/cli/tests/app_server_daemon.rs @@ -1,7 +1,13 @@ +//! Managed daemon lifecycle through the public CLI, using isolated standalone fixtures. #![cfg(unix)] -use std::path::PathBuf; -use std::process::Child; +#[path = "app_server_daemon/support.rs"] +mod support; + +use support::TestDaemon; +use support::signal; +use support::wait_for_exit; + use std::process::Command; use std::process::Stdio; use std::time::Duration; @@ -10,109 +16,8 @@ use std::time::Instant; use anyhow::Context; use anyhow::Result; use anyhow::ensure; -use codex_utils_cargo_bin::copy_executable; use pretty_assertions::assert_eq; use serde_json::Value; -use tempfile::TempDir; - -struct TestDaemon { - home: TempDir, - codex: PathBuf, - unmanaged: Option, -} - -impl TestDaemon { - fn new() -> Result { - let home = tempfile::Builder::new().tempdir_in("/tmp")?; - let codex = codex_utils_cargo_bin::cargo_bin("codex")?; - let codex_source = std::fs::canonicalize(&codex)?; - let target = if cfg!(target_os = "macos") { - format!("{}-apple-darwin", std::env::consts::ARCH) - } else { - format!("{}-unknown-linux-musl", std::env::consts::ARCH) - }; - let standalone = home.path().join("packages/standalone"); - let release_name = format!("0.0.0-{target}"); - let managed = standalone - .join("releases") - .join(&release_name) - .join("bin/codex"); - std::fs::create_dir_all(managed.parent().context("managed bin parent")?)?; - // Preserve the installed path without invalidating the shared CLI's Rosetta cache. - #[cfg(all(target_os = "macos", target_arch = "x86_64"))] - { - copy_executable(&codex_source, &managed)?; - // Translate the fixture before timed daemon capability and readiness checks. - ensure!( - Command::new(&managed) - .env("CODEX_HOME", home.path()) - .arg("--version") - .output()? - .status - .success(), - "failed to prepare managed test executable" - ); - } - #[cfg(not(all(target_os = "macos", target_arch = "x86_64")))] - if std::fs::hard_link(&codex_source, &managed).is_err() { - copy_executable(&codex_source, &managed)?; - } - std::fs::write(standalone.join("auto-update-version"), &release_name)?; - std::os::unix::fs::symlink( - PathBuf::from("releases").join(release_name), - standalone.join("current"), - )?; - // Model a daemon that was previously launched and is currently stopped. - let state = home.path().join("app-server-daemon"); - std::fs::create_dir(&state)?; - std::fs::write(state.join("app-server.stderr.log"), b"")?; - Ok(Self { - home, - codex, - unmanaged: None, - }) - } - - fn command(&self) -> Command { - let mut command = Command::new(&self.codex); - command.env("CODEX_HOME", self.home.path()); - command - } - - fn lifecycle(&self, action: &str) -> Result { - let output = self - .command() - .args(["app-server", "daemon", action]) - .output()?; - ensure!( - output.status.success(), - "daemon {action} failed: {}", - String::from_utf8_lossy(&output.stderr) - ); - Ok(serde_json::from_slice(&output.stdout)?) - } - - fn pid(&self, name: &str) -> Result { - let record = std::fs::read(self.home.path().join("app-server-daemon").join(name)) - .with_context(|| format!("failed to read {name}"))?; - Ok(serde_json::from_slice::(&record)?["pid"] - .as_u64() - .context("pid missing")? as u32) - } -} - -impl Drop for TestDaemon { - fn drop(&mut self) { - if let Some(mut child) = self.unmanaged.take() { - let _ = child.kill(); - let _ = child.wait(); - } - let _ = self.lifecycle("stop"); - if let Ok(pid) = self.pid("app-server-updater.pid") { - let _ = signal(pid, libc::SIGTERM); - } - } -} #[test] fn managed_daemon_restarts_from_deleted_working_directory() -> Result<()> { @@ -303,32 +208,6 @@ fn explicit_restart_applies_feature_overrides_and_preserves_saved_settings() -> Ok(()) } -fn signal(pid: u32, signal: libc::c_int) -> Result<()> { - let raw_pid = libc::pid_t::try_from(pid).context("pid out of range")?; - ensure!( - unsafe { libc::kill(raw_pid, signal) } == 0, - "failed to signal pid {pid}: {}", - std::io::Error::last_os_error() - ); - Ok(()) -} - -fn wait_for_exit(pid: u32) -> Result<()> { - let deadline = Instant::now() + Duration::from_secs(30); - loop { - let output = Command::new("/bin/ps") - .args(["-p", &pid.to_string(), "-o", "stat="]) - .output() - .context("failed to invoke ps")?; - let state = String::from_utf8_lossy(&output.stdout); - if !output.status.success() || state.trim().starts_with('Z') { - return Ok(()); - } - ensure!(Instant::now() < deadline, "pid {pid} did not exit: {state}"); - std::thread::sleep(Duration::from_millis(50)); - } -} - #[cfg(any(target_os = "linux", target_os = "macos"))] #[test] fn managed_identity_survives_locale_and_timezone_changes() -> Result<()> { @@ -671,203 +550,3 @@ fn manual_update_rejects_an_unowned_installation() -> Result<()> { assert!(daemon.pid("app-server-updater.pid").is_err()); Ok(()) } - -#[derive(Clone, Copy, PartialEq, Eq)] -enum InitialDaemon { - Missing, - Legacy, -} - -fn packaged_daemon_launch(action: &str, initial: InitialDaemon) -> Result<()> { - let mut daemon = TestDaemon::new()?; - let standalone = daemon.home.path().join("packages/standalone"); - let package = if action == "start" && initial == InitialDaemon::Missing { - standalone.join("releases/caller") - } else { - daemon.home.path().join("cli-package") - }; - for directory in ["bin", "codex-path", "codex-resources"] { - std::fs::create_dir_all(package.join(directory))?; - } - copy_executable(&daemon.codex, &package.join("bin/codex"))?; - daemon.codex = package.join("bin/codex"); - for helper in [ - "bin/codex-code-mode-host", - "codex-path/rg", - "codex-resources/bwrap", - ] { - codex_utils_cargo_bin::write_executable(&package.join(helper), "runtime fixture")?; - } - let target = format!( - "{}-{}", - std::env::consts::ARCH, - if cfg!(target_os = "macos") { - "apple-darwin" - } else if cfg!(target_env = "gnu") { - "unknown-linux-gnu" - } else { - "unknown-linux-musl" - } - ); - std::fs::write( - package.join("codex-package.json"), - serde_json::to_vec(&serde_json::json!({ - "version": env!("CARGO_PKG_VERSION"), "target": target, "entrypoint": "bin/codex" - }))?, - )?; - if action == "start" && initial == InitialDaemon::Missing { - std::fs::remove_file(standalone.join("current"))?; - std::os::unix::fs::symlink(&package, standalone.join("current"))?; - } - let cli_selection = standalone.join("current").canonicalize()?; - let state = daemon.home.path().join("app-server-daemon"); - if initial == InitialDaemon::Missing { - std::fs::remove_file(state.join("app-server.stderr.log"))?; - } - std::fs::write( - state.join("settings.json"), - br#"{"shutdownGraceSeconds":0}"#, - )?; - let cli_before = daemon.codex.canonicalize()?; - let result = daemon - .command() - .args(["app-server", "daemon", action]) - .output() - .context("failed to launch packaged daemon fixture")?; - ensure!( - result.status.success(), - "{}", - String::from_utf8_lossy(&result.stderr) - ); - assert_eq!( - String::from_utf8_lossy(&result.stderr).contains("Installing daemon from CLI version"), - initial == InitialDaemon::Missing - ); - let output: Value = serde_json::from_slice(&result.stdout)?; - let dedicated = daemon - .home - .path() - .canonicalize()? - .join("packages/app-server-daemon"); - let (initial_root, initial_pid_file) = match initial { - InitialDaemon::Missing => (&dedicated, "daemon.pid"), - InitialDaemon::Legacy => (&standalone, "app-server.pid"), - }; - assert_eq!( - output["managedCodexPath"], - initial_root - .canonicalize()? - .join("current/bin/codex") - .to_str() - .context("managed path is not UTF-8")? - ); - assert_eq!(daemon.codex.canonicalize()?, cli_before); - assert_eq!(standalone.join("current").canonicalize()?, cli_selection); - assert!(state.join(initial_pid_file).exists()); - let legacy_updater = match initial { - InitialDaemon::Missing => { - assert!(!state.join("app-server-updater.pid").exists()); - None - } - InitialDaemon::Legacy => Some(daemon.pid("app-server-updater.pid")?), - }; - if action == "start" { - let initial_current = initial_root.join("current"); - let current = dedicated.join("current"); - let original = initial_current.canonicalize()?; - let original_pid = daemon.pid(initial_pid_file)?; - let settings_before = std::fs::read(state.join("settings.json"))?; - let refused = daemon - .command() - .args(["app-server", "daemon", "update", "--from-cli"]) - .output()?; - assert!(!refused.status.success()); - assert!(String::from_utf8_lossy(&refused.stderr).contains("rerun with --yes")); - assert_eq!(daemon.pid(initial_pid_file)?, original_pid); - assert_eq!(initial_current.canonicalize()?, original); - if initial == InitialDaemon::Legacy { - assert!(!current.exists()); - } - - std::fs::remove_file(package.join("bin/codex-code-mode-host"))?; - let invalid = daemon - .command() - .args(["app-server", "daemon", "update", "--from-cli", "--yes"]) - .output()?; - assert!(!invalid.status.success()); - assert_eq!(daemon.pid(initial_pid_file)?, original_pid); - assert_eq!(initial_current.canonicalize()?, original); - if initial == InitialDaemon::Legacy { - assert!(!current.exists()); - } - codex_utils_cargo_bin::write_executable( - &package.join("bin/codex-code-mode-host"), - "replacement helper", - )?; - let replaced = daemon - .command() - .args(["app-server", "daemon", "update", "--from-cli", "--yes"]) - .output()?; - ensure!( - replaced.status.success(), - "{}", - String::from_utf8_lossy(&replaced.stderr) - ); - let output: Value = serde_json::from_slice(&replaced.stdout)?; - assert_eq!(output["status"], "updated"); - assert_ne!(daemon.pid("daemon.pid")?, original_pid); - wait_for_exit(original_pid)?; - if let Some(pid) = legacy_updater { - wait_for_exit(pid)?; - } - assert!(!state.join("app-server.pid").exists()); - assert!(!state.join("app-server-updater.pid").exists()); - assert_eq!( - output["managedCodexPath"], - current - .join("bin/codex") - .to_str() - .context("managed path is not UTF-8")? - ); - assert_ne!(current.canonicalize()?, original); - assert!(!dedicated.join("auto-update-version").exists()); - assert_eq!(std::fs::read(state.join("settings.json"))?, settings_before); - assert_eq!( - std::fs::read(current.join("bin/codex-code-mode-host"))?, - b"replacement helper" - ); - if initial == InitialDaemon::Missing { - assert_eq!( - std::fs::read(original.join("bin/codex-code-mode-host"))?, - b"runtime fixture" - ); - } - assert_eq!(daemon.lifecycle("start")?["status"], "alreadyRunning"); - assert_eq!(daemon.lifecycle("stop")?["status"], "stopped"); - assert_eq!(standalone.join("current").canonicalize()?, cli_selection); - } - if action == "bootstrap" { - assert_eq!(output["autoUpdateEnabled"], false); - } - Ok(()) -} - -#[test] -fn packaged_daemon_start_and_explicit_replacement() -> Result<()> { - packaged_daemon_launch("start", InitialDaemon::Missing) -} - -#[test] -fn packaged_daemon_restart_seeds_local_package() -> Result<()> { - packaged_daemon_launch("restart", InitialDaemon::Missing) -} - -#[test] -fn packaged_daemon_bootstrap_seeds_local_package() -> Result<()> { - packaged_daemon_launch("bootstrap", InitialDaemon::Missing) -} - -#[test] -fn packaged_daemon_explicit_replacement_migrates_running_legacy() -> Result<()> { - packaged_daemon_launch("start", InitialDaemon::Legacy) -} diff --git a/codex-rs/cli/tests/app_server_daemon/package.rs b/codex-rs/cli/tests/app_server_daemon/package.rs new file mode 100644 index 0000000000..6c010c59d4 --- /dev/null +++ b/codex-rs/cli/tests/app_server_daemon/package.rs @@ -0,0 +1,219 @@ +//! Real package installation and replacement through the daemon CLI. +//! Keep these I/O-heavy cases separate from ordinary lifecycle coverage. +#![cfg(unix)] + +mod support; + +use anyhow::Context; +use anyhow::Result; +use anyhow::ensure; +use pretty_assertions::assert_eq; +use serde_json::Value; +use support::TestDaemon; +use support::wait_for_exit; + +#[derive(Clone, Copy, PartialEq, Eq)] +enum InitialDaemon { + Missing, + Legacy, +} + +fn packaged_daemon_launch(action: &str, initial: InitialDaemon) -> Result<()> { + let mut daemon = TestDaemon::new()?; + let standalone = daemon.home.path().join("packages/standalone"); + let package = if action == "start" && initial == InitialDaemon::Missing { + standalone.join("releases/caller") + } else { + daemon.home.path().join("cli-package") + }; + for directory in ["bin", "codex-path", "codex-resources"] { + std::fs::create_dir_all(package.join(directory))?; + } + // Both paths are in this test's temp home and therefore on the same filesystem. + // Reuse its prepared (and on Intel macOS, translated) executable. The installer + // still makes a real independent package copy; only fixture setup shares this inode. + std::fs::hard_link( + standalone.join("current/bin/codex"), + package.join("bin/codex"), + )?; + daemon.codex = package.join("bin/codex"); + for helper in [ + "bin/codex-code-mode-host", + "codex-path/rg", + "codex-resources/bwrap", + ] { + codex_utils_cargo_bin::write_executable(&package.join(helper), "runtime fixture")?; + } + let target = format!( + "{}-{}", + std::env::consts::ARCH, + if cfg!(target_os = "macos") { + "apple-darwin" + } else if cfg!(target_env = "gnu") { + "unknown-linux-gnu" + } else { + "unknown-linux-musl" + } + ); + std::fs::write( + package.join("codex-package.json"), + serde_json::to_vec(&serde_json::json!({ + "version": env!("CARGO_PKG_VERSION"), "target": target, "entrypoint": "bin/codex" + }))?, + )?; + if action == "start" && initial == InitialDaemon::Missing { + std::fs::remove_file(standalone.join("current"))?; + std::os::unix::fs::symlink(&package, standalone.join("current"))?; + } + let cli_selection = standalone.join("current").canonicalize()?; + let state = daemon.home.path().join("app-server-daemon"); + if initial == InitialDaemon::Missing { + std::fs::remove_file(state.join("app-server.stderr.log"))?; + } + std::fs::write( + state.join("settings.json"), + br#"{"shutdownGraceSeconds":0}"#, + )?; + let cli_before = daemon.codex.canonicalize()?; + let result = daemon + .command() + .args(["app-server", "daemon", action]) + .output() + .context("failed to launch packaged daemon fixture")?; + ensure!( + result.status.success(), + "{}", + String::from_utf8_lossy(&result.stderr) + ); + assert_eq!( + String::from_utf8_lossy(&result.stderr).contains("Installing daemon from CLI version"), + initial == InitialDaemon::Missing + ); + let output: Value = serde_json::from_slice(&result.stdout)?; + let dedicated = daemon + .home + .path() + .canonicalize()? + .join("packages/app-server-daemon"); + let (initial_root, initial_pid_file) = match initial { + InitialDaemon::Missing => (&dedicated, "daemon.pid"), + InitialDaemon::Legacy => (&standalone, "app-server.pid"), + }; + assert_eq!( + output["managedCodexPath"], + initial_root + .canonicalize()? + .join("current/bin/codex") + .to_str() + .context("managed path is not UTF-8")? + ); + assert_eq!(daemon.codex.canonicalize()?, cli_before); + assert_eq!(standalone.join("current").canonicalize()?, cli_selection); + assert!(state.join(initial_pid_file).exists()); + let legacy_updater = match initial { + InitialDaemon::Missing => { + assert!(!state.join("app-server-updater.pid").exists()); + None + } + InitialDaemon::Legacy => Some(daemon.pid("app-server-updater.pid")?), + }; + if action == "start" { + let initial_current = initial_root.join("current"); + let current = dedicated.join("current"); + let original = initial_current.canonicalize()?; + let original_pid = daemon.pid(initial_pid_file)?; + let settings_before = std::fs::read(state.join("settings.json"))?; + let refused = daemon + .command() + .args(["app-server", "daemon", "update", "--from-cli"]) + .output()?; + assert!(!refused.status.success()); + assert!(String::from_utf8_lossy(&refused.stderr).contains("rerun with --yes")); + assert_eq!(daemon.pid(initial_pid_file)?, original_pid); + assert_eq!(initial_current.canonicalize()?, original); + if initial == InitialDaemon::Legacy { + assert!(!current.exists()); + } + + std::fs::remove_file(package.join("bin/codex-code-mode-host"))?; + let invalid = daemon + .command() + .args(["app-server", "daemon", "update", "--from-cli", "--yes"]) + .output()?; + assert!(!invalid.status.success()); + assert_eq!(daemon.pid(initial_pid_file)?, original_pid); + assert_eq!(initial_current.canonicalize()?, original); + if initial == InitialDaemon::Legacy { + assert!(!current.exists()); + } + codex_utils_cargo_bin::write_executable( + &package.join("bin/codex-code-mode-host"), + "replacement helper", + )?; + let replaced = daemon + .command() + .args(["app-server", "daemon", "update", "--from-cli", "--yes"]) + .output()?; + ensure!( + replaced.status.success(), + "{}", + String::from_utf8_lossy(&replaced.stderr) + ); + let output: Value = serde_json::from_slice(&replaced.stdout)?; + assert_eq!(output["status"], "updated"); + assert_ne!(daemon.pid("daemon.pid")?, original_pid); + wait_for_exit(original_pid)?; + if let Some(pid) = legacy_updater { + wait_for_exit(pid)?; + } + assert!(!state.join("app-server.pid").exists()); + assert!(!state.join("app-server-updater.pid").exists()); + assert_eq!( + output["managedCodexPath"], + current + .join("bin/codex") + .to_str() + .context("managed path is not UTF-8")? + ); + assert_ne!(current.canonicalize()?, original); + assert!(!dedicated.join("auto-update-version").exists()); + assert_eq!(std::fs::read(state.join("settings.json"))?, settings_before); + assert_eq!( + std::fs::read(current.join("bin/codex-code-mode-host"))?, + b"replacement helper" + ); + if initial == InitialDaemon::Missing { + assert_eq!( + std::fs::read(original.join("bin/codex-code-mode-host"))?, + b"runtime fixture" + ); + } + assert_eq!(daemon.lifecycle("start")?["status"], "alreadyRunning"); + assert_eq!(daemon.lifecycle("stop")?["status"], "stopped"); + assert_eq!(standalone.join("current").canonicalize()?, cli_selection); + } + if action == "bootstrap" { + assert_eq!(output["autoUpdateEnabled"], false); + } + Ok(()) +} + +#[test] +fn packaged_daemon_start_and_explicit_replacement() -> Result<()> { + packaged_daemon_launch("start", InitialDaemon::Missing) +} + +#[test] +fn packaged_daemon_restart_seeds_local_package() -> Result<()> { + packaged_daemon_launch("restart", InitialDaemon::Missing) +} + +#[test] +fn packaged_daemon_bootstrap_seeds_local_package() -> Result<()> { + packaged_daemon_launch("bootstrap", InitialDaemon::Missing) +} + +#[test] +fn packaged_daemon_explicit_replacement_migrates_running_legacy() -> Result<()> { + packaged_daemon_launch("start", InitialDaemon::Legacy) +} diff --git a/codex-rs/cli/tests/app_server_daemon/support.rs b/codex-rs/cli/tests/app_server_daemon/support.rs new file mode 100644 index 0000000000..5a2a0d5170 --- /dev/null +++ b/codex-rs/cli/tests/app_server_daemon/support.rs @@ -0,0 +1,140 @@ +//! Isolated installed-CLI fixtures and PID cleanup for Unix daemon integration tests. +//! Every test owns its home and CLI selection; only immutable executable contents are shared. + +use std::path::PathBuf; +use std::process::Child; +use std::process::Command; +use std::time::Duration; +use std::time::Instant; + +use anyhow::Context; +use anyhow::Result; +use anyhow::ensure; +use codex_utils_cargo_bin::copy_executable; +use serde_json::Value; +use tempfile::TempDir; + +pub(super) struct TestDaemon { + pub(super) home: TempDir, + pub(super) codex: PathBuf, + pub(super) unmanaged: Option, +} + +impl TestDaemon { + pub(super) fn new() -> Result { + let home = tempfile::Builder::new().tempdir_in("/tmp")?; + let codex = codex_utils_cargo_bin::cargo_bin("codex")?; + let codex_source = std::fs::canonicalize(&codex)?; + let target = if cfg!(target_os = "macos") { + format!("{}-apple-darwin", std::env::consts::ARCH) + } else { + format!("{}-unknown-linux-musl", std::env::consts::ARCH) + }; + let standalone = home.path().join("packages/standalone"); + let release_name = format!("0.0.0-{target}"); + let managed = standalone + .join("releases") + .join(&release_name) + .join("bin/codex"); + std::fs::create_dir_all(managed.parent().context("managed bin parent")?)?; + // Preserve the installed path without invalidating the shared CLI's Rosetta cache. + #[cfg(all(target_os = "macos", target_arch = "x86_64"))] + { + copy_executable(&codex_source, &managed)?; + // Translate the fixture before timed daemon capability and readiness checks. + ensure!( + Command::new(&managed) + .env("CODEX_HOME", home.path()) + .arg("--version") + .output()? + .status + .success(), + "failed to prepare managed test executable" + ); + } + #[cfg(not(all(target_os = "macos", target_arch = "x86_64")))] + if std::fs::hard_link(&codex_source, &managed).is_err() { + copy_executable(&codex_source, &managed)?; + } + std::fs::write(standalone.join("auto-update-version"), &release_name)?; + std::os::unix::fs::symlink( + PathBuf::from("releases").join(release_name), + standalone.join("current"), + )?; + // Model a daemon that was previously launched and is currently stopped. + let state = home.path().join("app-server-daemon"); + std::fs::create_dir(&state)?; + std::fs::write(state.join("app-server.stderr.log"), b"")?; + Ok(Self { + home, + codex, + unmanaged: None, + }) + } + + pub(super) fn command(&self) -> Command { + let mut command = Command::new(&self.codex); + command.env("CODEX_HOME", self.home.path()); + command + } + + pub(super) fn lifecycle(&self, action: &str) -> Result { + let output = self + .command() + .args(["app-server", "daemon", action]) + .output()?; + ensure!( + output.status.success(), + "daemon {action} failed: {}", + String::from_utf8_lossy(&output.stderr) + ); + Ok(serde_json::from_slice(&output.stdout)?) + } + + pub(super) fn pid(&self, name: &str) -> Result { + let record = std::fs::read(self.home.path().join("app-server-daemon").join(name)) + .with_context(|| format!("failed to read {name}"))?; + Ok(serde_json::from_slice::(&record)?["pid"] + .as_u64() + .context("pid missing")? as u32) + } +} + +impl Drop for TestDaemon { + fn drop(&mut self) { + if let Some(mut child) = self.unmanaged.take() { + let _ = child.kill(); + let _ = child.wait(); + } + let _ = self.lifecycle("stop"); + if let Ok(pid) = self.pid("app-server-updater.pid") { + let _ = signal(pid, libc::SIGTERM); + } + } +} + +pub(super) fn signal(pid: u32, signal: libc::c_int) -> Result<()> { + let raw_pid = libc::pid_t::try_from(pid).context("pid out of range")?; + ensure!( + unsafe { libc::kill(raw_pid, signal) } == 0, + "failed to signal pid {pid}: {}", + std::io::Error::last_os_error() + ); + Ok(()) +} + +pub(super) fn wait_for_exit(pid: u32) -> Result<()> { + let deadline = Instant::now() + Duration::from_secs(30); + loop { + let output = Command::new("/bin/ps") + .args(["-p", &pid.to_string(), "-o", "stat="]) + .output() + .context("failed to invoke ps")?; + let state = String::from_utf8_lossy(&output.stdout); + if !output.status.success() || state.trim().starts_with('Z') { + return Ok(()); + } + ensure!(Instant::now() < deadline, "pid {pid} did not exit: {state}"); + std::thread::sleep(Duration::from_millis(50)); + } +} From 95273b84fbff40f9df7d71d50f1ca52c6489b25d Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 14 Oct 2026 07:57:45 +0000 Subject: [PATCH 033/155] Keep the agent dashboard browsable during task removal (#53908) ## Why Archiving or deleting a task blocked dashboard navigation until the server request finished. ## What changed Keep the dashboard interactive for browsing while archive and delete requests are pending. Hide the affected task immediately and show an inline progress message. Allow selection movement and search while preventing task switching, new tasks, and leaving the dashboard until the request completes. Preserve the dashboard selection when removing the current task detaches the session. ## Testing Update archive and delete progress tests and snapshots to cover navigation, resize handling, immediate task hiding, and suppression of task switching and creation while requests are pending. GitOrigin-RevId: ff6555602bcd84d38e00de55c3032f442589fdcb --- codex-rs/tui/src/app/agent_center/render.rs | 10 + .../agents_overview_action_progress_tests.rs | 172 ++++++++++-------- .../tui/src/app/agents_overview_actions.rs | 126 ++++++------- codex-rs/tui/src/app/agents_overview_view.rs | 15 +- ...ons__progress_tests__archive_progress.snap | 51 +++--- ...ions__progress_tests__delete_progress.snap | 51 +++--- 6 files changed, 233 insertions(+), 192 deletions(-) diff --git a/codex-rs/tui/src/app/agent_center/render.rs b/codex-rs/tui/src/app/agent_center/render.rs index 1d8adef4f8..ade3530cd9 100644 --- a/codex-rs/tui/src/app/agent_center/render.rs +++ b/codex-rs/tui/src/app/agent_center/render.rs @@ -217,6 +217,16 @@ impl Renderable for AgentsOverviewView { .creating_worktree .then(|| "Creating worktree…".to_owned()) }) + .or_else(|| { + state.removal.map(|action| match action { + AgentsOverviewAction::Archive => { + "Archiving task… You can still browse.".to_owned() + } + AgentsOverviewAction::Delete => { + "Deleting task… You can still browse.".to_owned() + } + }) + }) .or_else(|| { (state.refresh_failed && !state.loading).then(|| "Error loading tasks".to_owned()) }) diff --git a/codex-rs/tui/src/app/agents_overview_action_progress_tests.rs b/codex-rs/tui/src/app/agents_overview_action_progress_tests.rs index 546b77fdab..3be55d62cc 100644 --- a/codex-rs/tui/src/app/agents_overview_action_progress_tests.rs +++ b/codex-rs/tui/src/app/agents_overview_action_progress_tests.rs @@ -1,9 +1,10 @@ -//! Progress rendering and input isolation while lifecycle requests are pending. +//! The dashboard remains browsable while lifecycle requests hold the server lock. use super::*; -use crate::app::agents_overview::tests::overview_thread; use crate::chatwidget::tests::helpers::normalize_agent_center_snapshot; -use codex_app_server_protocol::ThreadStatus; +use crate::test_support::PathBufExt; +use crate::test_support::test_path_buf; +use crossterm::event::KeyCode; use futures::stream; use pretty_assertions::assert_eq; use ratatui::Terminal; @@ -14,78 +15,105 @@ use std::time::Duration; #[tokio::test] async fn modal_consumes_input_and_finishes_after_input_closes() -> color_eyre::Result<()> { - let mut tui = crate::tui::test_support::make_test_tui()?; - tui.pause_events(); - let (finished_input, wait_for_input) = tokio::sync::oneshot::channel(); - let mut finished_input = Some(finished_input); - let mut events = VecDeque::from([ - tui::TuiEvent::Key(crossterm::event::KeyCode::Esc.into()), - tui::TuiEvent::Paste("ignore this input".into()), - tui::TuiEvent::Draw, - tui::TuiEvent::Resize(ratatui::layout::Size::new(80, 24)), - tui::TuiEvent::FocusGained, - ]); - let events = stream::poll_fn(move |_| { - if let Some(event) = events.pop_front() { - Poll::Ready(Some(event)) - } else { - if let Some(finished_input) = finished_input.take() { - let _ = finished_input.send(()); - } - Poll::Ready(None) - } - }); - let result = tokio::time::timeout( - Duration::from_secs(5), - run_lifecycle_modal( - &mut tui, - AgentsOverviewAction::Archive, - &Paragraph::new("Agent command center"), - async { - wait_for_input.await.expect("all modal input was consumed"); - tokio::task::yield_now().await; - "operation finished" - }, - events, - ), - ) - .await??; - assert_eq!(result, "operation finished"); - Ok(()) -} - -#[tokio::test] -async fn lifecycle_progress_wraps_at_narrow_widths() { - let (app, _rx, _op_rx) = crate::app::tests::make_test_app_with_channels().await; - let threads = ["First task", "Selected task", "Last task"] - .into_iter() - .enumerate() - .map(|(index, name)| { - overview_thread( - ThreadId::from_u128(index as u128 + 1), - /*parent_thread_id*/ None, - name, - ThreadStatus::Idle, - ) - }) - .collect(); - let backdrop = app.agents_overview_view(threads, Some(ThreadId::from_u128(/*value*/ 2))); - for (action, name) in [ + for (action, snapshot) in [ (AgentsOverviewAction::Archive, "archive_progress"), (AgentsOverviewAction::Delete, "delete_progress"), ] { - let progress = LifecycleProgress(action); - let progress = DialogOverlay { - backdrop: RenderableItem::Borrowed(&backdrop), - dialog: CenteredView(&progress), - }; - let mut terminal = Terminal::new(TestBackend::new(36, 24)).unwrap(); - terminal - .draw(|frame| progress.render(frame.area(), frame.buffer_mut())) - .unwrap(); - insta::assert_snapshot!( - name, - normalize_agent_center_snapshot(terminal.backend().to_string()) + let (mut app, mut rx, _) = crate::app::tests::make_test_app_with_channels().await; + let mut server = crate::start_embedded_app_server_for_picker(&app.config).await?; + for index in 1..=3 { + let id = ThreadId::from_string( + &app_test_support::create_fake_rollout( + &app.config.codex_home, + &format!("2025-01-0{index}T12-00-00"), + &format!("2025-01-0{index}T12:00:00Z"), + &format!("Task {index}"), + Some(&app.config.model_provider_id), + /*git_info*/ None, + ) + .expect("materialize task"), + )?; + let mut thread = server.thread_read(id, /*include_turns*/ false).await?; + thread.cwd = test_path_buf("/tmp/project").abs(); + app.agents_overview.threads.insert(id, Some(thread)); + } + let threads = app + .agents_overview + .threads + .values() + .flatten() + .cloned() + .collect(); + let view = app.agents_overview_view(threads, /*selected_thread_id*/ None); + app.agents_overview.visible_thread_ids = view.thread_ids(); + app.chat_widget.show_bottom_pane_view(Box::new(view)); + let removed = app.agents_overview.visible_thread_ids[0]; + app.prepare_agents_overview_removal(&HashSet::from([removed])); + app.agents_overview.hidden_threads.insert(removed); + app.agents_overview.view_state.lock().unwrap().removal = Some(action); + app.repaint_agents_overview(); + assert!(!app.agents_overview.visible_thread_ids.contains(&removed)); + while rx.try_recv().is_ok() {} + let mut tui = crate::tui::test_support::make_test_tui()?; + tui.pause_events(); + let (finished_input, wait_for_input) = tokio::sync::oneshot::channel(); + let mut finished_input = Some(finished_input); + let mut events = VecDeque::from([ + tui::TuiEvent::Key(KeyCode::End.into()), + // Leaving and server mutations wait without accumulating actions. + tui::TuiEvent::Key(KeyCode::Esc.into()), + tui::TuiEvent::Key(KeyCode::Enter.into()), + tui::TuiEvent::Key(KeyCode::Char('n').into()), + tui::TuiEvent::Draw, + tui::TuiEvent::Resize(ratatui::layout::Size::new(66, 20)), + tui::TuiEvent::FocusGained, + ]); + let events = stream::poll_fn(move |_| { + if let Some(event) = events.pop_front() { + Poll::Ready(Some(event)) + } else { + if let Some(finished_input) = finished_input.take() { + let _ = finished_input.send(()); + } + Poll::Ready(None) + } + }); + let result = tokio::time::timeout( + Duration::from_secs(5), + run_lifecycle_modal( + &mut tui, + &mut app, + async { + wait_for_input.await.expect("all modal input was consumed"); + "operation finished" + }, + events, + ), + ) + .await??; + assert_eq!(result, "operation finished"); + assert_eq!( + tui.terminal.last_known_screen_size, + ratatui::layout::Size::new(66, 20) ); + let selected = app + .chat_widget + .selected_index_for_active_view(AGENTS_OVERVIEW_VIEW_ID) + .expect("dashboard stays open"); + assert_eq!(selected, app.agents_overview.visible_thread_ids.len() - 1); + assert!( + !std::iter::from_fn(|| rx.try_recv().ok()).any(|event| matches!( + event, + AppEvent::SelectAgentsOverviewThread { .. } + | AppEvent::NewAgentsOverviewSession { .. } + )) + ); + let mut terminal = Terminal::new(TestBackend::new(80, 24))?; + terminal.draw(|frame| app.chat_widget.render(frame.area(), frame.buffer_mut()))?; + let text = normalize_agent_center_snapshot(terminal.backend().to_string()); + let age = regex_lite::Regex::new(r" +[0-9]+d ago").unwrap(); + insta::assert_snapshot!(snapshot, age.replace_all(&text, " [age]")); + server.shutdown().await?; } + Ok(()) } diff --git a/codex-rs/tui/src/app/agents_overview_actions.rs b/codex-rs/tui/src/app/agents_overview_actions.rs index 9afbe1e269..782e78bba4 100644 --- a/codex-rs/tui/src/app/agents_overview_actions.rs +++ b/codex-rs/tui/src/app/agents_overview_actions.rs @@ -1,19 +1,16 @@ //! Server RPCs own lifecycle outcomes; successful actions invalidate dashboard group caches. -//! A modal keeps rendering during RPCs while deferring navigation and task notifications. +//! Keep the dashboard browsable during RPCs while deferring task notifications. //! Removing the current root leaves an unattached dashboard, even when it is empty. use super::App; +use super::agents_overview::AGENTS_OVERVIEW_VIEW_ID; use crate::app_event::AgentsOverviewAction; use crate::app_event::AppEvent; use crate::app_server_session::AppServerSession; -use crate::bottom_pane::BottomPaneView; -use crate::bottom_pane::CenteredView; -use crate::bottom_pane::DialogOverlay; use crate::bottom_pane::SelectionItem; use crate::bottom_pane::SelectionViewParams; use crate::chatwidget::ChatWidget; use crate::render::renderable::Renderable; -use crate::render::renderable::RenderableItem; use crate::tui; use crate::wrapping::word_wrap_lines; use codex_app_server_protocol::ClientRequest; @@ -52,51 +49,14 @@ impl Renderable for LifecycleHeader { } } -struct LifecycleProgress(AgentsOverviewAction); - -impl LifecycleProgress { - fn header(&self) -> LifecycleHeader { - let title = match self.0 { - AgentsOverviewAction::Archive => "Archiving task…", - AgentsOverviewAction::Delete => "Deleting task…", - }; - LifecycleHeader(vec![ - title.bold().into(), - "Please wait. Task switching is unavailable until this finishes." - .dim() - .into(), - ]) - } -} - -impl Renderable for LifecycleProgress { - fn render(&self, area: Rect, buf: &mut Buffer) { - self.header().render(area, buf); - } - - fn desired_height(&self, width: u16) -> u16 { - self.header().desired_height(width) - } -} - -impl BottomPaneView for LifecycleProgress {} - -/// Keep the terminal responsive without dispatching navigation or queued task events. +/// Keep browsing responsive without queuing actions against a locked server. async fn run_lifecycle_modal( tui: &mut tui::Tui, - action: AgentsOverviewAction, - backdrop: &dyn Renderable, + app: &mut App, operation: impl Future, events: impl Stream + Unpin, ) -> color_eyre::Result { - let progress = LifecycleProgress(action); - let progress = DialogOverlay { - backdrop: RenderableItem::Borrowed(backdrop), - dialog: CenteredView(&progress), - }; - tui.draw(u16::MAX, |frame| { - progress.render(frame.area(), frame.buffer_mut()); - })?; + app.render_chat_widget_frame(tui, tui.terminal.last_known_screen_size)?; let mut events = events.fuse(); tokio::pin!(operation); let result = loop { @@ -104,13 +64,28 @@ async fn run_lifecycle_modal( biased; result = &mut operation => break result, Some(event) = events.next() => { - tui.screen_size_for_event(&event)?; + let screen_size = tui.screen_size_for_event(&event)?; + if matches!(&event, tui::TuiEvent::Paste(_) | tui::TuiEvent::FocusLost) { + app.cancel_pending_key_chord(); + } + let dashboard_active = app.chat_widget + .selected_index_for_active_view(AGENTS_OVERVIEW_VIEW_ID) + .is_some(); match event { + tui::TuiEvent::Key(key) if dashboard_active => { + if let Some(key) = app.route_key_chord_event(tui, key) { + app.chat_widget.handle_key_event_with_activation_key(key, app.routed_key_activation); + } + tui.frame_requester().schedule_frame(); + } + tui::TuiEvent::Paste(text) if dashboard_active => { + app.chat_widget.handle_paste(text); + tui.frame_requester().schedule_frame(); + } tui::TuiEvent::Key(_) | tui::TuiEvent::Paste(_) | tui::TuiEvent::FocusLost | tui::TuiEvent::Mouse(_) => {} tui::TuiEvent::Draw | tui::TuiEvent::Resize(_) | tui::TuiEvent::Resume | tui::TuiEvent::FocusGained => { - tui.draw(u16::MAX, |frame| { - progress.render(frame.area(), frame.buffer_mut()); - })?; + app.expire_pending_key_chord(); + app.render_chat_widget_frame(tui, screen_size)?; } } } @@ -276,25 +251,26 @@ impl App { let mut removes_primary = self.primary_thread_id == Some(thread_id); let mut attempted = false; let primary_thread_id = self.primary_thread_id; - // Retain the displayed selection and shared scroll/filter state while the RPC - // borrows the live widget to stop voice. Re-render on resize rather than freezing pixels. - let selected_thread_id = self - .chat_widget - .selected_index_for_present_view(super::agents_overview::AGENTS_OVERVIEW_VIEW_ID) - .and_then(|index| self.agents_overview.visible_thread_ids.get(index).copied()); - let threads = self - .agents_overview - .threads - .values() - .flatten() - .cloned() - .collect(); - let backdrop = self.agents_overview_view(threads, selected_thread_id); let events = tui.event_stream(); + self.prepare_agents_overview_removal(&HashSet::from([thread_id])); + let hidden = self.agents_overview.hidden_threads.insert(thread_id); + { + let mut state = self + .agents_overview + .view_state + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); + state.removal = Some(action); + // Confirmation may have been opened from the rename editor. + state.rename_target = None; + } + self.repaint_agents_overview(); + let voice_result = self + .stop_voice_for_removed_thread(app_server, thread_id) + .await; let operation = async { let result = async { - self.stop_voice_for_removed_thread(app_server, thread_id) - .await?; + voice_result?; if let Some(primary) = primary_thread_id && primary != thread_id { @@ -335,8 +311,16 @@ impl App { } (result, detach_primary) }; - let (result, detach_primary) = - run_lifecycle_modal(tui, action, &backdrop, operation, events).await?; + let outcome = run_lifecycle_modal(tui, self, operation, events).await; + if hidden { + self.agents_overview.hidden_threads.remove(&thread_id); + } + self.agents_overview + .view_state + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner) + .removal = None; + let (result, detach_primary) = outcome?; if attempted { // A read started before the RPC can contain stale task and approval state. if let Some(refresh) = self.agents_overview.refresh_task.take() { @@ -398,6 +382,14 @@ impl App { } } if detach_primary { + self.agents_overview.selection_after_removal = + self.agents_overview.selection_after_removal.or_else(|| { + self.chat_widget + .selected_index_for_present_view(AGENTS_OVERVIEW_VIEW_ID) + .and_then(|index| { + self.agents_overview.visible_thread_ids.get(index).copied() + }) + }); self.reset_for_thread_switch(tui)?; self.pending_thread_switch_resets += 1; self.app_event_tx diff --git a/codex-rs/tui/src/app/agents_overview_view.rs b/codex-rs/tui/src/app/agents_overview_view.rs index 4beec41237..22393ac97b 100644 --- a/codex-rs/tui/src/app/agents_overview_view.rs +++ b/codex-rs/tui/src/app/agents_overview_view.rs @@ -156,6 +156,8 @@ pub(super) struct AgentsOverviewViewState { pub(super) has_more: bool, show_more_selected: bool, pub(super) connection_notice: Option<&'static str>, + /// Browse only while the server holds its lifecycle lock. + pub(super) removal: Option, pub(super) server_version_notice: Option, search: String, searching: bool, @@ -588,6 +590,9 @@ impl BottomPaneView for AgentsOverviewView { self.reconcile_command_center_selection(); return CancellationEvent::Handled; } + if state.removal.is_some() { + return CancellationEvent::Handled; + } CancellationEvent::NotHandled } @@ -647,7 +652,9 @@ impl BottomPaneView for AgentsOverviewView { return; } - if (self.state().connection_notice.is_some() || self.state().creating_worktree) + if (self.state().connection_notice.is_some() + || self.state().creating_worktree + || self.state().removal.is_some()) && self.keymap.action_for(key) != Some(ListAction::Cancel) { match self.keymap.action_for(key) { @@ -656,6 +663,12 @@ impl BottomPaneView for AgentsOverviewView { Some(action @ (ListAction::PageUp | ListAction::PageDown)) => { self.page_selection(action) } + Some(ListAction::JumpTop) => { + self.selected = self.visible_indices().first().copied().unwrap_or(0); + } + Some(ListAction::JumpBottom) => { + self.selected = self.visible_indices().last().copied().unwrap_or(0); + } _ => {} } return; diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__archive_progress.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__archive_progress.snap index ba3b35a524..b7d216eada 100644 --- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__archive_progress.snap +++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__archive_progress.snap @@ -1,29 +1,28 @@ --- source: tui/src/app/agents_overview_action_progress_tests.rs -assertion_line: 86 -expression: normalize_agent_center_snapshot(terminal.backend().to_string()) +expression: "age.replace_all(&text, \" [age]\")" --- -" Agent command center Group: Pr… " -" All 3 Needs you 0 › " -" ──────────────────────────────── " -" Tasks " -" /tmp/project 3 " -" ○ First task " -" › ○ Selected task " -" ○ Last task " -" " -" " -" Archiving task… " -" Please wait. Task switching is " -" unavailable until this finishes. " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" ? help esc back ↑/↓ move ent… " +" Agent command center Group: Project g " +" All 2 Needs you 0 Working 0 Ready 0 Inactive 2 " +" ──────────────────────────────────────────────────────────────────────────── " +" Tasks Status Updated " +" /tmp/project 2 " +" ○ Task 2 Inactive [age] " +" › ○ Task 1 Inactive [age] " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" Archiving task… You can still browse. " diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__delete_progress.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__delete_progress.snap index 3ed43f3b66..10370ac2a4 100644 --- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__delete_progress.snap +++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview_actions__progress_tests__delete_progress.snap @@ -1,29 +1,28 @@ --- source: tui/src/app/agents_overview_action_progress_tests.rs -assertion_line: 86 -expression: normalize_agent_center_snapshot(terminal.backend().to_string()) +expression: "age.replace_all(&text, \" [age]\")" --- -" Agent command center Group: Pr… " -" All 3 Needs you 0 › " -" ──────────────────────────────── " -" Tasks " -" /tmp/project 3 " -" ○ First task " -" › ○ Selected task " -" ○ Last task " -" " -" " -" Deleting task… " -" Please wait. Task switching is " -" unavailable until this finishes. " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" ? help esc back ↑/↓ move ent… " +" Agent command center Group: Project g " +" All 2 Needs you 0 Working 0 Ready 0 Inactive 2 " +" ──────────────────────────────────────────────────────────────────────────── " +" Tasks Status Updated " +" /tmp/project 2 " +" ○ Task 2 Inactive [age] " +" › ○ Task 1 Inactive [age] " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" Deleting task… You can still browse. " From 400f2356d60c4663d46817a40b4d09c5c86f35ad Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 09:37:17 +0000 Subject: [PATCH 034/155] Preserve conversation history when compaction fails (#53932) ## Why Compaction could record partial output before the response completed, leaving failed summaries in conversation history and persisted rollouts. ## What changed Buffer compaction output until `response.completed` so failed or incomplete attempts leave no partial output in history. Record successful output before the response completion notification, preserving its compaction metadata. ## Testing Add regression coverage for preserving messages, tool results, and token usage after a disconnected compaction stream, including after restart. Verify incomplete compaction output is excluded from subsequent requests and successful output remains observable and persisted. GitOrigin-RevId: 8651200b2aae616000c55c1ed63283f3e2c1b8d5 --- codex-rs/core/src/compact.rs | 38 ++--- codex-rs/core/tests/suite/compact.rs | 243 ++++++++++++++++++++++++--- 2 files changed, 239 insertions(+), 42 deletions(-) diff --git a/codex-rs/core/src/compact.rs b/codex-rs/core/src/compact.rs index 03c60ee1cd..0bc35f63ad 100644 --- a/codex-rs/core/src/compact.rs +++ b/codex-rs/core/src/compact.rs @@ -858,26 +858,8 @@ async fn drain_to_completed( )); }; match event { - Ok(ResponseEvent::OutputItemDone(item)) => { - if matches!(phase, CompactionPhase::PostTurn) { - // Commit post-turn summaries only after success; failures must leave both - // the live history and persisted rollout intact. - output.push(item); - } else { - sess.record_annotated_conversation_items( - turn_context, - turn_context.model_info(), - vec![ResponseItemEnvelope { - item, - metadata: Some(CodexHarnessMetadata { - compaction_output: true, - ..Default::default() - }), - }], - ) - .await; - } - } + // Keep each attempt isolated until the response completes successfully. + Ok(ResponseEvent::OutputItemDone(item)) => output.push(item), Ok(ResponseEvent::ServerReasoningIncluded(included)) => { sess.set_server_reasoning_included(included).await; } @@ -890,6 +872,22 @@ async fn drain_to_completed( usage_metadata, .. }) => { + if !matches!(phase, CompactionPhase::PostTurn) { + for item in std::mem::take(&mut output) { + sess.record_annotated_conversation_items( + turn_context, + turn_context.model_info(), + vec![ResponseItemEnvelope { + item, + metadata: Some(CodexHarnessMetadata { + compaction_output: true, + ..Default::default() + }), + }], + ) + .await; + } + } sess.record_observed_response_completed( turn_context, &response_id, diff --git a/codex-rs/core/tests/suite/compact.rs b/codex-rs/core/tests/suite/compact.rs index 93b183f472..ededffe9d5 100644 --- a/codex-rs/core/tests/suite/compact.rs +++ b/codex-rs/core/tests/suite/compact.rs @@ -19,6 +19,7 @@ use codex_protocol::config_types::Settings; use codex_protocol::items::TurnItem; use codex_protocol::models::ImageReference; use codex_protocol::models::PermissionProfile; +use codex_protocol::models::ResponseItem; use codex_protocol::openai_models::ModelInfo; use codex_protocol::openai_models::ModelServiceTier; use codex_protocol::openai_models::ModelsResponse; @@ -1174,6 +1175,17 @@ async fn incomplete_response_during_compaction_is_terminal_and_counted( let server = start_mock_server().await; let previous_model = "gpt-5.4"; let selected_model = "gpt-5.2"; + let incomplete = sse(vec![ + ev_assistant_message("discarded", "DISCARDED_INCOMPLETE_SUMMARY"), + json!({ + "type": "response.incomplete", + "response": { + "id": "incomplete-compaction", + "incomplete_details": {"reason": "max_output_tokens"}, + "usage": reported_usage + } + }), + ]); let response_mock = mount_sse_sequence( &server, vec![ @@ -1181,14 +1193,8 @@ async fn incomplete_response_during_compaction_is_terminal_and_counted( ev_assistant_message("initial", "Initial reply."), ev_completed_with_tokens("initial", /*total_tokens*/ 120_000), ]), - sse(vec![json!({ - "type": "response.incomplete", - "response": { - "id": "incomplete-compaction", - "incomplete_details": {"reason": "max_output_tokens"}, - "usage": reported_usage - } - })]), + incomplete.clone(), + incomplete, ], ) .await; @@ -1215,7 +1221,9 @@ async fn incomplete_response_during_compaction_is_terminal_and_counted( }) .build_with_auto_env(&server) .await?; - test.submit_turn("hello").await?; + // A real large history remains installed after failure. Server usage also + // includes request overhead that the local history estimate does not count. + test.submit_turn(&"x".repeat(440_000)).await?; // A smaller selected model forces compaction with the previous model. // An incomplete result must stop both retries and fallback to the selected model. test.codex @@ -1272,6 +1280,138 @@ async fn incomplete_response_during_compaction_is_terminal_and_counted( .collect::>(), vec![json!(previous_model), json!(previous_model)], ); + // Failure has not made the original oversized history fit the smaller model. + // The next turn must attempt compaction again without retaining partial output. + test.codex + .start_or_steer_turn(TurnInputRequest::user_input(vec![UserInput::Text { + text: "continue after the failed compaction".into(), + text_elements: Vec::new(), + }])) + .await?; + wait_for_event(&test.codex, |event| { + matches!(event, EventMsg::TurnComplete(_)) + }) + .await; + let requests = response_mock.requests(); + assert_eq!(requests.len(), 3); + assert_eq!(requests[2].body_json()["model"], json!(previous_model)); + assert!( + body_contains_text(&requests[2].body_json().to_string(), SUMMARIZATION_PROMPT) + || !requests[2].inputs_of_type("compaction_trigger").is_empty() + ); + assert!(!body_contains_text( + &requests[2].body_json().to_string(), + "DISCARDED_INCOMPLETE_SUMMARY", + )); + } + Ok(()) +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn failed_compaction_preserves_history_after_restart() -> Result<()> { + skip_if_no_network!(Ok(())); + + let server = start_mock_server().await; + let initial = mount_sse_sequence( + &server, + vec![ + sse(vec![ + ev_assistant_message("before-tool", "Checking the original state."), + ev_exec_command_call("original-tool", "echo ORIGINAL_TOOL_RESULT"), + ev_completed_with_tokens("tool-response", /*total_tokens*/ 1_000), + ]), + sse(vec![ + ev_assistant_message("after-tool", FIRST_REPLY), + ev_completed_with_tokens("initial-response", /*total_tokens*/ 2_000), + ]), + ], + ) + .await; + let model_provider = non_openai_model_provider(&server); + let mut builder = test_codex() + .with_pre_build_hook(allow_echo_commands) + .with_config(move |config| { + config.model_provider = model_provider; + config.model_provider.stream_max_retries = Some(0); + set_test_compact_prompt(config); + }); + let test = builder.build_with_auto_env(&server).await?; + test.submit_turn("inspect the original state").await?; + assert_eq!(initial.requests().len(), 2); + let original_usage = test.codex.token_usage_info().await.expect("original usage"); + + let failed_compaction = mount_sse_once( + &server, + sse(vec![ + ev_reasoning_item("discarded-reasoning", &["Summarizing"], &[]), + ev_assistant_message("discarded-summary", "DISCARDED_PARTIAL_SUMMARY"), + ]), + ) + .await; + test.codex.submit(Op::Compact).await?; + let mut errors = Vec::new(); + wait_for_event(&test.codex, |event| { + if let EventMsg::Error(error) = event { + errors.push(error.message.clone()); + } + matches!(event, EventMsg::TurnComplete(_)) + }) + .await; + assert_eq!( + errors, + vec!["stream disconnected before completion: stream closed before response.completed"] + ); + assert_eq!(test.codex.token_usage_info().await, Some(original_usage)); + + let original_request = failed_compaction.single_request(); + let original_items = original_request + .input() + .into_iter() + .filter(|item| { + item["role"] == "assistant" + || item["type"] == "reasoning" + || item["call_id"] == "original-tool" + }) + .collect::>(); + assert_eq!(original_items.len(), 4); + assert!( + original_request + .function_call_output("original-tool") + .to_string() + .contains("ORIGINAL_TOOL_RESULT") + ); + + // A live follow-up and a compaction retry after restart must both see the original evidence. + let follow_up = mount_sse_once(&server, sse(vec![ev_completed("follow-up")])).await; + test.submit_text_turn("continue after the failed compaction") + .await?; + let model_provider = test.config.model_provider.clone(); + builder = builder.with_config(move |config| { + config.model_provider = model_provider; + set_test_compact_prompt(config); + }); + let resumed = builder.restart_with_auto_env(&server, &test).await?; + let retry = mount_sse_once( + &server, + sse(vec![ + ev_assistant_message("valid-summary", SUMMARY_TEXT), + ev_completed("successful-compaction"), + ]), + ) + .await; + resumed.codex.submit(Op::Compact).await?; + assert_compaction_uses_turn_lifecycle_id(&resumed.codex).await; + for request in [follow_up.single_request(), retry.single_request()] { + let retained_items = request + .input() + .into_iter() + .filter(|item| { + item["role"] == "assistant" + || item["type"] == "reasoning" + || item["call_id"] == "original-tool" + }) + .collect::>(); + assert_eq!(retained_items, original_items); } Ok(()) } @@ -1289,19 +1429,34 @@ async fn manual_compact_records_durable_and_local_token_usage() { ev_assistant_message("m1", SUMMARY_TEXT), ev_completed_with_tokens("r1", /*total_tokens*/ 0), ]); - mount_sse_once(&server, sse_compact).await; + mount_sse_sequence( + &server, + vec![ + sse(vec![ + ev_assistant_message("initial", FIRST_REPLY), + ev_completed_with_tokens("initial", /*total_tokens*/ 1_000), + ]), + sse_compact, + ], + ) + .await; let model_provider = non_openai_model_provider(&server); let mut builder = test_codex().with_config(move |config| { config.model_provider = model_provider; set_test_compact_prompt(config); }); - let test = builder.build(&server).await.unwrap(); + let test = builder.build_with_auto_env(&server).await.unwrap(); + test.submit_turn("hello").await.unwrap(); let rollout_path = test.codex.rollout_path().expect("rollout path"); let codex = test.codex; // Trigger manual compact and collect TokenCount events for the compact turn. codex.submit(Op::Compact).await.unwrap(); + wait_for_event(&codex, |event| { + matches!(event, EventMsg::RawResponseCompleted(response) if response.response_id == "r1") + }) + .await; // First TokenCount: from the compact API call (usage.total_tokens = 0). let first = wait_for_event_match(&codex, |ev| match ev { @@ -1347,9 +1502,9 @@ async fn manual_compact_records_durable_and_local_token_usage() { _ => None, }) .collect::>(); - assert_eq!(records.len(), 1); - assert_eq!(records[0].response_id, "r1"); - assert_eq!(records[0].usage.total_tokens, 0); + assert_eq!(records.len(), 2); + assert_eq!(records[1].response_id, "r1"); + assert_eq!(records[1].usage.total_tokens, 0); let compacted = rollout_items .iter() .find_map(|item| match item { @@ -1362,7 +1517,7 @@ async fn manual_compact_records_durable_and_local_token_usage() { compacted.compaction_response_id.as_deref(), compacted.latest_token_usage_record.as_ref(), ), - (Some("r1"), records.first().copied()) + (Some("r1"), records.last().copied()) ); } @@ -1376,10 +1531,15 @@ async fn manual_compact_emits_context_compaction_items() { ev_assistant_message("m1", FIRST_REPLY), ev_completed("r1"), ]); - let sse2 = sse(vec![ - ev_assistant_message("m2", SUMMARY_TEXT), - ev_completed("r2"), - ]); + let reasoning = ev_reasoning_item("compact-reasoning", &["Summarizing the conversation"], &[]); + let summary = ev_assistant_message("m2", SUMMARY_TEXT); + let mut expected_summary = summary["item"].clone(); + expected_summary["internal_chat_message_metadata_passthrough"] = + json!({ "content_item_kinds": ["unknown"] }); + let mut expected_raw_items = [reasoning["item"].clone(), expected_summary] + .map(|item| serde_json::from_value::(item).unwrap()) + .to_vec(); + let sse2 = sse(vec![reasoning, summary, ev_completed("r2")]); mount_sse_sequence(&server, vec![sse1, sse2]).await; let model_provider = non_openai_model_provider(&server); @@ -1387,7 +1547,8 @@ async fn manual_compact_emits_context_compaction_items() { config.model_provider = model_provider; set_test_compact_prompt(config); }); - let codex = builder.build(&server).await.unwrap().codex; + let test = builder.build_with_auto_env(&server).await.unwrap(); + let codex = &test.codex; codex .start_or_steer_turn(TurnInputRequest::user_input(vec![UserInput::Text { @@ -1396,14 +1557,19 @@ async fn manual_compact_emits_context_compaction_items() { }])) .await .unwrap(); - wait_for_event(&codex, |event| matches!(event, EventMsg::TurnComplete(_))).await; + wait_for_event(codex, |event| matches!(event, EventMsg::TurnComplete(_))).await; - codex.submit(Op::Compact).await.unwrap(); + let compact_turn_id = codex.submit(Op::Compact).await.unwrap(); + for item in &mut expected_raw_items { + item.set_turn_id_if_missing(&compact_turn_id); + } let mut started_item = None; let mut completed_item = None; let mut legacy_event = false; let mut saw_turn_complete = false; + let mut raw_items = Vec::new(); + let mut raw_items_at_response_completion = None; while !saw_turn_complete || started_item.is_none() || completed_item.is_none() || !legacy_event { @@ -1427,6 +1593,10 @@ async fn manual_compact_emits_context_compaction_items() { EventMsg::TurnComplete(_) => { saw_turn_complete = true; } + EventMsg::RawResponseItem(event) => raw_items.push(event.item), + EventMsg::RawResponseCompleted(_) => { + raw_items_at_response_completion = Some(raw_items.clone()); + } _ => {} } } @@ -1435,6 +1605,35 @@ async fn manual_compact_emits_context_compaction_items() { let completed_item = completed_item.expect("context compaction item completed"); assert_eq!(started_item.id, completed_item.id); assert!(legacy_event); + // Raw output remains observable before the terminal response notification, + // independently of when the summary is installed into conversation history. + assert_eq!( + raw_items_at_response_completion, + Some(expected_raw_items.clone()) + ); + + let rollout = + fs::read_to_string(test.codex.rollout_path().expect("rollout path")).expect("read rollout"); + let persisted_output = rollout + .lines() + .map(|line| { + codex_rollout::parse_rollout_line(line) + .expect("rollout item") + .item + }) + .filter_map(|item| match item { + RolloutItem::ResponseItem(envelope) + if envelope + .metadata + .as_ref() + .is_some_and(|metadata| metadata.compaction_output) => + { + Some(envelope.item) + } + _ => None, + }) + .collect::>(); + assert_eq!(persisted_output, expected_raw_items); } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] From 5670b1c18e861e5f89bafaff768b86ed579edd81 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 10:12:07 +0000 Subject: [PATCH 035/155] Bound rollout input for memory extraction (#53940) ## What changed Read rollout evidence from newest to oldest for both memory versions, retaining up to 8 MiB of sanitized response items and inter-agent communications, then restore chronological order. Skip malformed records and records larger than 1 MiB, and require valid session metadata in the first record within that limit. ## Testing Add coverage for the retained byte budget, newest-record ordering, malformed and oversized records, and unsupported session metadata. Extend extraction request tests for both memory versions to verify that evidence after an oversized record reaches the model. GitOrigin-RevId: 55ccbc2477ecb059830d3a55be12bcbc21235303 --- codex-rs/memories/write/src/phase1.rs | 3 +- codex-rs/memories/write/src/rollout_input.rs | 69 ++++++++++++++++++- .../memories/write/src/rollout_input_tests.rs | 60 ++++++++++++++++ codex-rs/memories/write/src/startup_tests.rs | 28 +++++++- 4 files changed, 156 insertions(+), 4 deletions(-) diff --git a/codex-rs/memories/write/src/phase1.rs b/codex-rs/memories/write/src/phase1.rs index aa11ce276a..cddb20dadc 100644 --- a/codex-rs/memories/write/src/phase1.rs +++ b/codex-rs/memories/write/src/phase1.rs @@ -10,7 +10,6 @@ use crate::runtime::MemoryStartupContext; use crate::runtime::StageOneRequestContext; use codex_config::types::MemoriesConfig; use codex_core::Prompt; -use codex_core::RolloutRecorder; use codex_core::config::Config; use codex_protocol::MemoryVersion; use codex_protocol::ResponseItemId; @@ -264,7 +263,7 @@ mod job { rollout_git_branch: Option<&str>, stage_one_context: &StageOneRequestContext, ) -> anyhow::Result<(StageOneOutput, Option)> { - let (rollout_items, _, _) = RolloutRecorder::load_rollout_items(rollout_path).await?; + let rollout_items = crate::rollout_input::read_recent_rollout_items(rollout_path).await?; let rollout_contents = match config.memories.version { MemoryVersion::V1 => serialize_filtered_rollout_response_items(&rollout_items)?, MemoryVersion::V2 => crate::rollout_input::serialize_tiered_input( diff --git a/codex-rs/memories/write/src/rollout_input.rs b/codex-rs/memories/write/src/rollout_input.rs index 2d45c7b63b..65b4461e85 100644 --- a/codex-rs/memories/write/src/rollout_input.rs +++ b/codex-rs/memories/write/src/rollout_input.rs @@ -1,4 +1,4 @@ -//! Selects v2 extraction evidence by provenance, then restores chronological order. +//! Reads recent rollout evidence and selects v2 input by provenance in chronological order. //! Human replies retain their questions; message media is replaced with placeholders. //! Budgets use the same token estimate as the rest of the memory pipeline. //! Extraction chunks preserve selected evidence in order within bounded messages. @@ -11,13 +11,80 @@ use codex_protocol::models::MessagePhase; use codex_protocol::models::ResponseItem; use codex_protocol::protocol::InterAgentCommunication; use codex_protocol::request_user_input::RequestUserInputResponse; +use codex_rollout::ReverseJsonlScanner; use codex_rollout::RolloutItem; +use codex_rollout::ScanOutcome; +use codex_rollout::open_rollout_seekable_reader; use codex_rollout::should_persist_response_item_for_memories; use codex_secrets::redact_secrets; use codex_utils_output_truncation::TruncationPolicy; use codex_utils_output_truncation::approx_bytes_for_tokens; use codex_utils_output_truncation::truncate_text; use std::collections::HashMap; +use std::io::BufRead; +use std::io::Read; +use std::path::Path; + +const MAX_ROLLOUT_BYTES: usize = 8 * 1024 * 1024; +const MAX_RECORD_BYTES: usize = 1024 * 1024; + +/// Keeps the newest sanitized evidence that fits the byte budget, then restores source order. +/// Compressed rollouts use the existing temporary-file reader. Older evidence and records over +/// the per-record limit are intentionally omitted; this is not a complete history for resume. +/// The first line must contain valid session metadata within the same record limit. +pub(crate) async fn read_recent_rollout_items(path: &Path) -> anyhow::Result> { + let path = path.to_owned(); + let (stop, keep_running) = tokio::sync::oneshot::channel::<()>(); + let task = tokio::task::spawn_blocking(move || -> anyhow::Result> { + let mut reader = open_rollout_seekable_reader(&path)?; + // Validate this session's format from its header, not metadata copied into fork history. + // Bound the header read too: session metadata may contain large instructions or schemas. + let mut header = String::new(); + std::io::BufReader::new((&mut reader).take(MAX_RECORD_BYTES as u64)) + .read_line(&mut header)?; + anyhow::ensure!( + matches!( + codex_rollout::parse_rollout_line(&header)?.item, + RolloutItem::SessionMeta(_) + ), + "memory extraction requires valid session metadata within the record limit" + ); + let mut scanner = ReverseJsonlScanner::new(reader)?.with_max_record_bytes(MAX_RECORD_BYTES); + let mut remaining = MAX_ROLLOUT_BYTES; + let mut items = Vec::new(); + while !stop.is_closed() { + let Some(outcome) = scanner.scan_next_rollout_line()? else { + break; + }; + let ScanOutcome::Parsed(mut line) = outcome else { + continue; + }; + if !matches!( + &line.item, + RolloutItem::ResponseItem(_) | RolloutItem::InterAgentCommunication(_) + ) { + continue; + } + if let RolloutItem::ResponseItem(item) = &mut line.item { + let Some(sanitized) = sanitize_response_item_for_memories(&item.item) else { + continue; + }; + item.item = sanitized; + } + let Some(next_remaining) = remaining.checked_sub(serde_json::to_vec(&line.item)?.len()) + else { + break; + }; + remaining = next_remaining; + items.push(line.item); + } + items.reverse(); + Ok(items) + }); + let result = task.await?; + drop(keep_running); + result +} const OMITTED: &str = "[... response items omitted ...]\n"; const TRUNCATION_RESERVE_BYTES: usize = 96; diff --git a/codex-rs/memories/write/src/rollout_input_tests.rs b/codex-rs/memories/write/src/rollout_input_tests.rs index 5cdd2baeb5..2878f396f3 100644 --- a/codex-rs/memories/write/src/rollout_input_tests.rs +++ b/codex-rs/memories/write/src/rollout_input_tests.rs @@ -1,5 +1,65 @@ use super::*; use pretty_assertions::assert_eq; +use std::io::Write; + +#[tokio::test] +async fn recent_rollout_items_bound_history_and_preserve_newest_records() -> anyhow::Result<()> { + let home = tempfile::tempdir()?; + let path = home.path().join("rollout.jsonl"); + let mut file = std::fs::File::create(&path)?; + let metadata = serde_json::json!({ + "timestamp": "2026-10-12T00:00:00Z", + "type": "session_meta", + "payload": codex_rollout::SessionMeta::default() + }); + writeln!(file, "{metadata}")?; + let old = serde_json::json!({ + "timestamp": "2026-10-12T00:00:00Z", + "type": "response_item", + "payload": {"type": "message", "role": "user", "content": [ + {"type": "input_text", "text": "older evidence".repeat(/*n*/ 20_000)} + ]} + }); + let old = serde_json::to_string(&old)?; + for _ in 0..(MAX_ROLLOUT_BYTES / old.len() + 2) { + writeln!(file, "{old}")?; + } + let mut newest = Vec::new(); + for text in ["recent question", "latest correction 🦀"] { + // Neither an oversized nor a malformed record may hide the newest valid evidence. + writeln!(file, "{}", "x".repeat(MAX_RECORD_BYTES + 1))?; + file.write_all(b"\xff\n")?; + let line = serde_json::json!({ + "timestamp": "2026-10-12T00:00:00Z", + "type": "response_item", + "payload": {"type": "message", "role": "user", "content": [ + {"type": "input_text", "text": text} + ]} + }); + writeln!(file, "{line}")?; + newest.push(codex_rollout::decode_rollout_line(line)?.item); + } + drop(file); + + let items = read_recent_rollout_items(&path).await?; + assert_eq!( + serde_json::to_value(&items[items.len() - newest.len()..])?, + serde_json::to_value(&newest)? + ); + let retained_bytes = items.iter().try_fold(/*init*/ 0, |bytes, item| { + serde_json::to_vec(item).map(|json| bytes + json.len()) + })?; + assert!(retained_bytes <= MAX_ROLLOUT_BYTES); + let older_item_bytes = + serde_json::to_vec(&codex_rollout::parse_rollout_line(&old)?.item)?.len(); + assert!(retained_bytes + older_item_bytes > MAX_ROLLOUT_BYTES); + + let mut metadata = metadata; + metadata["payload"]["history_mode"] = serde_json::json!("future"); + std::fs::write(&path, format!("{metadata}\n{old}\n"))?; + assert!(read_recent_rollout_items(&path).await.is_err()); + Ok(()) +} #[test] fn extraction_chunks_preserve_unicode_evidence_with_bounded_messages() { diff --git a/codex-rs/memories/write/src/startup_tests.rs b/codex-rs/memories/write/src/startup_tests.rs index 1f2cb94f6b..009b8a6dbe 100644 --- a/codex-rs/memories/write/src/startup_tests.rs +++ b/codex-rs/memories/write/src/startup_tests.rs @@ -897,6 +897,20 @@ async fn run_memory_phase_one_model_request_test( contents.push_str(&serde_json::to_string(&line)?); contents.push('\n'); } + // Exercise bounded reading through the actual extraction request, for both memory versions. + contents.push_str(&"x".repeat(1024 * 1024 + 1)); + contents.push('\n'); + contents.push_str( + &json!({ + "timestamp": chrono::Utc::now().to_rfc3339(), + "type": "response_item", + "payload": {"type": "message", "role": "user", "content": [ + {"type": "input_text", "text": "newest correction after an oversized record"} + ]} + }) + .to_string(), + ); + contents.push('\n'); tokio::fs::write(&path, &contents).await?; db.update_thread_git_info( source_id, @@ -935,6 +949,7 @@ async fn run_memory_phase_one_model_request_test( let request = wait_for_single_request(&response).await; let evidence = request.message_input_texts("user").join(""); assert!(evidence.contains("replay-bearing assistant evidence")); + assert!(evidence.contains("newest correction after an oversized record")); assert!(!evidence.contains("encrypted_content")); if version == codex_protocol::MemoryVersion::V1 { assert!(evidence.contains("memory_test_tool")); @@ -1272,7 +1287,18 @@ async fn seed_stage1_candidate( ), }; let jsonl = serde_json::to_string(&line)?; - tokio::fs::write(&rollout_path, format!("{jsonl}\n")).await?; + let meta = json!({ + "timestamp": updated_at.to_rfc3339(), + "type": "session_meta", + "payload": codex_rollout::SessionMeta { + id: thread_id, + session_id: thread_id.into(), + timestamp: updated_at.to_rfc3339(), + cwd: codex_home.to_path_buf(), + ..Default::default() + } + }); + tokio::fs::write(&rollout_path, format!("{meta}\n{jsonl}\n")).await?; let mut metadata_builder = codex_state::ThreadMetadataBuilder::new( thread_id, From 78dc2503840d05f4411ae184bb5560ef327fce3c Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 10:39:18 +0000 Subject: [PATCH 036/155] Stop rollout reads when the calling task is cancelled (#53947) ## Why Blocking rollout reads can continue decompressing and scanning history after the calling async task is dropped. ## What changed Propagate caller cancellation through rollout readers, prefix validation, model-context scans, history materialization, and working-directory lookup. Check cancellation during compressed input and output, bounded reads, seeks, and between history records. Return an error on cancellation so partial history cannot be mistaken for a complete read. ## Testing Add regression coverage for dropping a caller during decompression, cancelling compressed input and output (including skippable frames), cancelling reads and seeks on plain and decoded snapshots, and cancelling history materialization between records. GitOrigin-RevId: e3dac952789b53402f2a5f17c2a2232506feb9d6 --- codex-rs/exec/src/lib.rs | 10 +- codex-rs/memories/write/src/rollout_input.rs | 2 +- codex-rs/rollout/src/compression_tests.rs | 2 +- codex-rs/rollout/src/seekable_reader.rs | 86 +++++++++++++-- codex-rs/rollout/src/seekable_reader_tests.rs | 100 ++++++++++++++++-- .../thread-store/src/local/model_context.rs | 18 +++- .../thread-store/src/local/rollout_lineage.rs | 4 +- .../local/thread_history_materialization.rs | 27 +++-- .../thread_history_materialization_tests.rs | 15 +++ codex-rs/tui/src/worktree_startup.rs | 10 +- 10 files changed, 236 insertions(+), 38 deletions(-) diff --git a/codex-rs/exec/src/lib.rs b/codex-rs/exec/src/lib.rs index f97ce42737..0a40529c82 100644 --- a/codex-rs/exec/src/lib.rs +++ b/codex-rs/exec/src/lib.rs @@ -1826,8 +1826,10 @@ async fn latest_thread_cwd(thread: &AppServerThread) -> PathBuf { async fn parse_latest_turn_context_cwd(path: &Path) -> Option { let path = path.to_path_buf(); - tokio::task::spawn_blocking(move || { - let reader = codex_rollout::open_rollout_seekable_reader(&path).ok()?; + let (stop, keep_running) = tokio::sync::oneshot::channel::<()>(); + let result = tokio::task::spawn_blocking(move || { + let reader = + codex_rollout::open_rollout_seekable_reader(&path, || stop.is_closed()).ok()?; let mut scanner = codex_rollout::ReverseJsonlScanner::new(reader).ok()?; while let Some(outcome) = scanner.scan_next_rollout_line().ok()? { if let codex_rollout::ScanOutcome::Parsed(RolloutLine { @@ -1842,7 +1844,9 @@ async fn parse_latest_turn_context_cwd(path: &Path) -> Option { }) .await .ok() - .flatten() + .flatten(); + drop(keep_running); + result } fn cwds_match(current_cwd: &Path, session_cwd: &Path) -> bool { diff --git a/codex-rs/memories/write/src/rollout_input.rs b/codex-rs/memories/write/src/rollout_input.rs index 65b4461e85..e0f9e643d1 100644 --- a/codex-rs/memories/write/src/rollout_input.rs +++ b/codex-rs/memories/write/src/rollout_input.rs @@ -36,7 +36,7 @@ pub(crate) async fn read_recent_rollout_items(path: &Path) -> anyhow::Result(); let task = tokio::task::spawn_blocking(move || -> anyhow::Result> { - let mut reader = open_rollout_seekable_reader(&path)?; + let mut reader = open_rollout_seekable_reader(&path, || stop.is_closed())?; // Validate this session's format from its header, not metadata copied into fork history. // Bound the header read too: session metadata may contain large instructions or schemas. let mut header = String::new(); diff --git a/codex-rs/rollout/src/compression_tests.rs b/codex-rs/rollout/src/compression_tests.rs index a4171801dd..40ec1ceb64 100644 --- a/codex-rs/rollout/src/compression_tests.rs +++ b/codex-rs/rollout/src/compression_tests.rs @@ -519,7 +519,7 @@ async fn worker_compresses_archived_fork_chain() -> anyhow::Result<()> { ] { assert!(!path.exists(), "compression should replace {path:?}"); let mut restored = Vec::new(); - crate::open_rollout_seekable_reader(path)?.read_to_end(&mut restored)?; + crate::open_rollout_seekable_reader(path, || false)?.read_to_end(&mut restored)?; assert_eq!(restored, original); } Ok(()) diff --git a/codex-rs/rollout/src/seekable_reader.rs b/codex-rs/rollout/src/seekable_reader.rs index 17b7e4a022..a72617aeaa 100644 --- a/codex-rs/rollout/src/seekable_reader.rs +++ b/codex-rs/rollout/src/seekable_reader.rs @@ -2,11 +2,13 @@ //! //! Offsets always address the original JSONL bytes. Readers retain an open file, or an anonymous //! decoded snapshot, so a concurrent compression cannot invalidate an in-progress scan. +//! Cancellation is checked during decompression and subsequent bounded reads and seeks. use std::fs::File; use std::io; use std::io::Read; use std::io::Seek; +use std::io::SeekFrom; use std::path::Path; use std::time::Duration; @@ -67,15 +69,68 @@ pub fn read_rollout_prefix(path: &Path, max_bytes: usize) -> io::Result io::Result { - match RolloutReader::open(path)? { - RolloutReader::Plain(file) => Ok(file), +/// `is_cancelled` must observe the lifetime of the calling task. Cancellation returns an error, +/// never EOF, so callers cannot mistake a partial read for a complete history. +pub fn open_rollout_seekable_reader( + path: &Path, + is_cancelled: impl Fn() -> bool, +) -> io::Result { + if is_cancelled() { + return Err(io::Error::other("rollout read cancelled")); + } + let file = match RolloutReader::open(path)? { + RolloutReader::Plain(file) => file, RolloutReader::Compressed(file) => { let mut decoded = tempfile::tempfile()?; - io::copy(&mut zstd::stream::read::Decoder::new(file)?, &mut decoded)?; + // Empty and skippable frames can consume input without producing decoded bytes. + let file = CancellableReader { + inner: file, + is_cancelled: &is_cancelled, + }; + let mut reader = CancellableReader { + inner: zstd::stream::read::Decoder::new(file)?, + is_cancelled: &is_cancelled, + }; + io::copy(&mut reader, &mut decoded)?; decoded.rewind()?; - Ok(decoded) + decoded } + }; + Ok(CancellableReader { + inner: file, + is_cancelled, + }) +} + +struct CancellableReader { + inner: R, + is_cancelled: F, +} + +impl bool> CancellableReader { + fn check_cancelled(&self) -> io::Result<()> { + if (self.is_cancelled)() { + // Interrupted is retried by io::copy and read_exact, defeating cancellation. + return Err(io::Error::other("rollout read cancelled")); + } + Ok(()) + } +} + +impl bool> Read for CancellableReader { + fn read(&mut self, buffer: &mut [u8]) -> io::Result { + self.check_cancelled()?; + let limit = buffer.len().min(64 * 1024); + let read = self.inner.read(&mut buffer[..limit])?; + self.check_cancelled()?; + Ok(read) + } +} + +impl bool> Seek for CancellableReader { + fn seek(&mut self, position: SeekFrom) -> io::Result { + self.check_cancelled()?; + self.inner.seek(position) } } @@ -84,10 +139,21 @@ pub fn open_rollout_seekable_reader(path: &Path) -> io::Result { /// A known first-frame size is a lower bound even for concatenated zstd frames. New compressed /// rollouts include that size, so ordinary lineage validation only reads the header. Older frames /// without a size, and prefixes extending beyond the first frame, are decoded up to the bound. -pub fn rollout_contains_prefix(path: &Path, end_byte_offset: u64) -> io::Result { +pub fn rollout_contains_prefix( + path: &Path, + end_byte_offset: u64, + is_cancelled: impl Fn() -> bool, +) -> io::Result { + if is_cancelled() { + return Err(io::Error::other("rollout read cancelled")); + } match RolloutReader::open(path)? { RolloutReader::Plain(file) => Ok(end_byte_offset <= file.metadata()?.len()), - RolloutReader::Compressed(mut file) => { + RolloutReader::Compressed(file) => { + let mut file = CancellableReader { + inner: file, + is_cancelled: &is_cancelled, + }; // A zstd frame header occupies at most 18 bytes. let mut header = [0; 18]; let read = file.read(&mut header)?; @@ -99,7 +165,11 @@ pub fn rollout_contains_prefix(path: &Path, end_byte_offset: u64) -> io::Result< return Ok(true); } file.rewind()?; - let mut prefix = zstd::stream::read::Decoder::new(file)?.take(end_byte_offset); + let mut prefix = CancellableReader { + inner: zstd::stream::read::Decoder::new(file)?, + is_cancelled: &is_cancelled, + } + .take(end_byte_offset); Ok(io::copy(&mut prefix, &mut io::sink())? == end_byte_offset) } } diff --git a/codex-rs/rollout/src/seekable_reader_tests.rs b/codex-rs/rollout/src/seekable_reader_tests.rs index abc2866490..5156598810 100644 --- a/codex-rs/rollout/src/seekable_reader_tests.rs +++ b/codex-rs/rollout/src/seekable_reader_tests.rs @@ -1,3 +1,4 @@ +use std::cell::Cell; use std::fs; use std::io::Read; use std::io::Seek; @@ -8,8 +9,78 @@ use pretty_assertions::assert_eq; use super::*; +#[tokio::test] +async fn dropping_the_caller_stops_compressed_materialization() -> anyhow::Result<()> { + let home = tempfile::tempdir()?; + let path = home.path().join("rollout.jsonl.zst"); + let original = vec![b'x'; 1024 * 1024]; + let compressed = zstd::stream::encode_all(original.as_slice(), /*level*/ 3)?; + fs::write(&path, &compressed)?; + + let (started_tx, started_rx) = tokio::sync::oneshot::channel(); + let (resume_tx, resume_rx) = std::sync::mpsc::channel(); + let (finished_tx, finished_rx) = tokio::sync::oneshot::channel(); + let read_path = path.clone(); + let task = tokio::spawn(async move { + let (stop, keep_running) = tokio::sync::oneshot::channel::<()>(); + let worker = tokio::task::spawn_blocking(move || { + let checks = Cell::new(0); + let started = Cell::new(Some(started_tx)); + let result = open_rollout_seekable_reader(&read_path, || { + checks.set(checks.get() + 1); + // Check on open and around the first source read and decoded chunk. + // Pause after that chunk so a check only before decompression cannot pass. + if checks.get() >= 5 + && let Some(started) = started.take() + { + let _ = started.send(()); + let _ = resume_rx.recv(); + } + stop.is_closed() + }); + let _ = finished_tx.send(result.err().map(|error| error.kind())); + }); + let result = worker.await; + drop(keep_running); + result + }); + + started_rx.await?; + task.abort(); + assert!(task.await.unwrap_err().is_cancelled()); + resume_tx.send(())?; + assert_eq!(finished_rx.await?, Some(io::ErrorKind::Other)); + assert_eq!(fs::read(&path)?, compressed); + assert!(!path.with_extension("").exists()); + Ok(()) +} + #[test] -fn compressed_offsets_preserve_exact_bytes_and_open_snapshots() -> io::Result<()> { +fn cancellation_stops_compressed_input_and_output() -> io::Result<()> { + let home = tempfile::tempdir()?; + let path = home.path().join("rollout.jsonl.zst"); + let original = vec![b'x'; 1024 * 1024]; + let mut skippable = 0x184D2A50_u32.to_le_bytes().to_vec(); + skippable.extend((original.len() as u32).to_le_bytes()); + skippable.extend(&original); + // Exercise many input reads with no output, and many output reads from little input. + for bytes in [ + skippable, + zstd::stream::encode_all(original.as_slice(), /*level*/ 3)?, + ] { + fs::write(&path, bytes)?; + drop(open_rollout_seekable_reader(&path, || false)?); + let checks = Cell::new(0); + let cancelled = || checks.replace(checks.get() + 1) >= 10; + assert!(open_rollout_seekable_reader(&path, cancelled).is_err()); + checks.set(0); + assert!(rollout_contains_prefix(&path, original.len() as u64, cancelled).is_err()); + } + Ok(()) +} + +#[test] +fn read_snapshots_preserve_bytes_and_report_cancellation() -> io::Result<()> { let home = tempfile::tempdir()?; let path = home.path().join("rollout.jsonl"); let compressed = path.with_extension("jsonl.zst"); @@ -19,7 +90,9 @@ fn compressed_offsets_preserve_exact_bytes_and_open_snapshots() -> io::Result<() zstd::stream::encode_all(original, /*level*/ 3)?, )?; - let mut reader = open_rollout_seekable_reader(&path)?; + let cancelled = Cell::new(false); + let is_cancelled = || cancelled.get(); + let mut reader = open_rollout_seekable_reader(&path, is_cancelled)?; // The retained snapshot must remain valid after another caller materializes the logical path. fs::write(&path, b"replacement\n")?; fs::remove_file(&compressed)?; @@ -29,10 +102,10 @@ fn compressed_offsets_preserve_exact_bytes_and_open_snapshots() -> io::Result<() assert_eq!(suffix, original[7..]); let mut current = Vec::new(); - open_rollout_seekable_reader(&compressed)?.read_to_end(&mut current)?; + open_rollout_seekable_reader(&compressed, || false)?.read_to_end(&mut current)?; assert_eq!(current, b"replacement\n"); - let mut plain_snapshot = open_rollout_seekable_reader(&path)?; + let mut plain_snapshot = open_rollout_seekable_reader(&path, is_cancelled)?; fs::write( &compressed, zstd::stream::encode_all(current.as_slice(), /*level*/ 3)?, @@ -41,6 +114,16 @@ fn compressed_offsets_preserve_exact_bytes_and_open_snapshots() -> io::Result<() let mut retained = Vec::new(); plain_snapshot.read_to_end(&mut retained)?; assert_eq!(retained, current); + reader.rewind()?; + plain_snapshot.rewind()?; + cancelled.set(true); + for mut reader in [reader, plain_snapshot] { + assert_eq!( + reader.read_to_end(&mut Vec::new()).unwrap_err().kind(), + io::ErrorKind::Other + ); + assert_eq!(reader.rewind().unwrap_err().kind(), io::ErrorKind::Other); + } Ok(()) } @@ -67,11 +150,12 @@ fn prefix_bounds_support_sized_unsized_and_concatenated_frames() -> io::Result<( (concatenated, [first, second].concat()), ] { fs::write(&path, compressed)?; - assert!(rollout_contains_prefix(&path, first.len() as u64)?); - assert!(rollout_contains_prefix(&path, expected.len() as u64)?); - assert!(!rollout_contains_prefix(&path, expected.len() as u64 + 1)?); + let contains = |end| rollout_contains_prefix(&path, end, || false); + assert!(contains(first.len() as u64)?); + assert!(contains(expected.len() as u64)?); + assert!(!contains(expected.len() as u64 + 1)?); let mut actual = Vec::new(); - open_rollout_seekable_reader(&path)?.read_to_end(&mut actual)?; + open_rollout_seekable_reader(&path, || false)?.read_to_end(&mut actual)?; assert_eq!(actual, expected); assert!(!path.with_extension("").exists()); } diff --git a/codex-rs/thread-store/src/local/model_context.rs b/codex-rs/thread-store/src/local/model_context.rs index 13a81b71ad..bcfd460b20 100644 --- a/codex-rs/thread-store/src/local/model_context.rs +++ b/codex-rs/thread-store/src/local/model_context.rs @@ -115,10 +115,13 @@ pub(super) async fn load_for_fork( // Recover only the runtime version before applying the fork cutoff. Stop at the // newest version-bearing context instead of retaining the source's full replay. let source_lineage = lineage.clone(); + let (stop, keep_running) = tokio::sync::oneshot::channel::<()>(); session_meta.meta.multi_agent_version = tokio::task::spawn_blocking(move || { for segment in source_lineage.segments().iter().rev() { - let file = - codex_rollout::open_rollout_seekable_reader(segment.rollout_path.as_path())?; + let file = codex_rollout::open_rollout_seekable_reader( + segment.rollout_path.as_path(), + || stop.is_closed(), + )?; let mut scanner = match segment.end.map(|end| end.end_byte_offset) { Some(end_byte_offset) => ReverseJsonlScanner::new_at(file, end_byte_offset)?, None => ReverseJsonlScanner::new(file)?, @@ -145,6 +148,7 @@ pub(super) async fn load_for_fork( .map_err(|err| ThreadStoreError::Internal { message: format!("failed to read fork runtime version: {err}"), })?; + drop(keep_running); } match history_base { Some(history_base) => { @@ -159,13 +163,15 @@ async fn scan_model_context_from_lineage( lineage: RolloutLineage, session_meta: SessionMetaLine, ) -> ThreadStoreResult> { + let (stop, keep_running) = tokio::sync::oneshot::channel::<()>(); let scan = tokio::task::spawn_blocking(move || { - scan_model_context_from_lineage_blocking(&lineage, session_meta) + scan_model_context_from_lineage_blocking(&lineage, session_meta, || stop.is_closed()) }) .await .map_err(|err| ThreadStoreError::Internal { message: format!("failed to join model context scan: {err}"), })?; + drop(keep_running); match scan { Ok(items) => Ok(items), Err(err) => Err(ThreadStoreError::Internal { @@ -177,10 +183,14 @@ async fn scan_model_context_from_lineage( fn scan_model_context_from_lineage_blocking( lineage: &RolloutLineage, session_meta: SessionMetaLine, + is_cancelled: impl Fn() -> bool, ) -> io::Result> { let mut scan = ModelContextScan::default(); 'segments: for segment in lineage.segments().iter().rev() { - let file = codex_rollout::open_rollout_seekable_reader(segment.rollout_path.as_path())?; + let file = codex_rollout::open_rollout_seekable_reader( + segment.rollout_path.as_path(), + &is_cancelled, + )?; let mut scanner = match segment.end.map(|end| end.end_byte_offset) { Some(end_byte_offset) => ReverseJsonlScanner::new_at(file, end_byte_offset)?, None => ReverseJsonlScanner::new(file)?, diff --git a/codex-rs/thread-store/src/local/rollout_lineage.rs b/codex-rs/thread-store/src/local/rollout_lineage.rs index 556ca03767..c38440a2dc 100644 --- a/codex-rs/thread-store/src/local/rollout_lineage.rs +++ b/codex-rs/thread-store/src/local/rollout_lineage.rs @@ -284,8 +284,9 @@ async fn validate_cutoff_bounds( } let path = rollout_path.to_path_buf(); let end_byte_offset = end.end_byte_offset; + let (stop, keep_running) = tokio::sync::oneshot::channel::<()>(); let contains_prefix = tokio::task::spawn_blocking(move || { - codex_rollout::rollout_contains_prefix(&path, end_byte_offset) + codex_rollout::rollout_contains_prefix(&path, end_byte_offset, || stop.is_closed()) }) .await .map_err(|err| ThreadStoreError::Internal { @@ -297,6 +298,7 @@ async fn validate_cutoff_bounds( rollout_path.display() ), })?; + drop(keep_running); if !contains_prefix { return Err(malformed_lineage( requested_thread_id, diff --git a/codex-rs/thread-store/src/local/thread_history_materialization.rs b/codex-rs/thread-store/src/local/thread_history_materialization.rs index a543302c38..c6cfa9de8e 100644 --- a/codex-rs/thread-store/src/local/thread_history_materialization.rs +++ b/codex-rs/thread-store/src/local/thread_history_materialization.rs @@ -91,7 +91,8 @@ async fn read_projection_steps( ) -> ThreadStoreResult<(Vec, u64)> { let path = rollout_path.to_path_buf(); let span = tracing::Span::current(); - tokio::task::spawn_blocking(move || { + let (stop, keep_running) = tokio::sync::oneshot::channel::<()>(); + let result = tokio::task::spawn_blocking(move || { let _entered = span.enter(); read_projection_steps_sync( &path, @@ -99,12 +100,15 @@ async fn read_projection_steps( expected_ordinal, thread_id, subagent_history_start_ordinal, + || stop.is_closed(), ) }) .await .map_err(|err| ThreadStoreError::Internal { message: format!("failed to join rollout projection read: {err}"), - })? + })?; + drop(keep_running); + result } /// Read and project the complete durable prefix in one blocking task. @@ -114,15 +118,16 @@ fn read_projection_steps_sync( expected_ordinal: u64, thread_id: ThreadId, subagent_history_start_ordinal: Option, + is_cancelled: impl Fn() -> bool, ) -> ThreadStoreResult<(Vec, u64)> { - let mut file = match codex_rollout::open_rollout_seekable_reader(rollout_path) { + let mut file = match codex_rollout::open_rollout_seekable_reader(rollout_path, &is_cancelled) { Ok(file) => file, Err(err) if err.kind() == std::io::ErrorKind::NotFound && start_offset == 0 => { return Ok((Vec::new(), 0)); } Err(err) => return Err(thread_store_io_error(err)), }; - let file_end_offset = file.metadata().map_err(thread_store_io_error)?.len(); + let file_end_offset = file.seek(SeekFrom::End(0)).map_err(thread_store_io_error)?; let byte_count = file_end_offset .checked_sub(start_offset) @@ -139,15 +144,19 @@ fn read_projection_steps_sync( .map_err(thread_store_io_error)?; // Only project the newline-terminated prefix; leave a trailing partial record for the next // pass. - let complete_byte_count = bytes - .iter() - .rposition(|byte| *byte == b'\n') - .map_or(0, |index| index + 1); let mut projections = Vec::new(); let mut next_ordinal = expected_ordinal; let mut next_offset = start_offset; let mut line_start_offset = start_offset; - for line_bytes in bytes[..complete_byte_count].split_inclusive(|byte| *byte == b'\n') { + for line_bytes in bytes.split_inclusive(|byte| *byte == b'\n') { + if is_cancelled() { + return Err(thread_store_io_error(std::io::Error::other( + "rollout read cancelled", + ))); + } + if !line_bytes.ends_with(b"\n") { + break; + } let line_end_offset = line_start_offset .checked_add(u64::try_from(line_bytes.len()).map_err(|_| { ThreadStoreError::Internal { diff --git a/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs b/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs index 0d260df188..45bb268678 100644 --- a/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs +++ b/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs @@ -1,3 +1,4 @@ +use std::cell::Cell; use std::fs; use std::io::Write; use std::path::Path; @@ -2470,6 +2471,20 @@ async fn blank_and_rejected_rollout_lines_advance_projection() { .expect("queue valid retry"); recorder.flush().await.expect("flush valid retry"); + // Replay this small file, cancelling between records after its single read completes. + let checks = Cell::new(0); + assert!( + super::read_projection_steps_sync( + rollout_path.as_path(), + /*start_offset*/ 0, + /*expected_ordinal*/ 0, + thread_id, + /*subagent_history_start_ordinal*/ None, + || checks.replace(checks.get() + 1) >= 6, + ) + .is_err() + ); + super::materialize_to_sqlite(&store, thread_id, rollout_path.as_path()) .await .expect("project valid retry after rejected line"); diff --git a/codex-rs/tui/src/worktree_startup.rs b/codex-rs/tui/src/worktree_startup.rs index 3d194468ac..c1d1ca31ca 100644 --- a/codex-rs/tui/src/worktree_startup.rs +++ b/codex-rs/tui/src/worktree_startup.rs @@ -95,8 +95,10 @@ impl ManagedTuiWorktree { async fn latest_thread_cwd(path: Option, fallback: PathBuf) -> PathBuf { let Some(path) = path else { return fallback }; - tokio::task::spawn_blocking(move || { - let reader = codex_rollout::open_rollout_seekable_reader(&path).ok()?; + let (stop, keep_running) = tokio::sync::oneshot::channel::<()>(); + let result = tokio::task::spawn_blocking(move || { + let reader = + codex_rollout::open_rollout_seekable_reader(&path, || stop.is_closed()).ok()?; let mut scanner = codex_rollout::ReverseJsonlScanner::new(reader).ok()?; while let Some(outcome) = scanner.scan_next_rollout_line().ok()? { if let codex_rollout::ScanOutcome::Parsed(codex_rollout::RolloutLine { @@ -112,7 +114,9 @@ async fn latest_thread_cwd(path: Option, fallback: PathBuf) -> PathBuf .await .ok() .flatten() - .unwrap_or(fallback) + .unwrap_or(fallback); + drop(keep_running); + result } #[allow(clippy::too_many_arguments)] From 0d58012ec20d0f42ea1c11056815e4a0c5122e99 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 11:59:55 +0000 Subject: [PATCH 037/155] Test memory extraction budgets with excluded items and ciphertext (#53963) Extend phase-one request tests for both memory versions with reasoning, developer messages, and assistant ciphertext whose combined size exceeds the reader budget while individual records remain below the record limit. Verify that earlier extraction evidence and assistant text alongside large ciphertext remain in the request, with `encrypted_content` excluded. GitOrigin-RevId: f0e85e368e5a94d491d0aa4ae1688f47d873ccd9 --- codex-rs/memories/write/src/startup_tests.rs | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/codex-rs/memories/write/src/startup_tests.rs b/codex-rs/memories/write/src/startup_tests.rs index 009b8a6dbe..f80624ac62 100644 --- a/codex-rs/memories/write/src/startup_tests.rs +++ b/codex-rs/memories/write/src/startup_tests.rs @@ -897,6 +897,30 @@ async fn run_memory_phase_one_model_request_test( contents.push_str(&serde_json::to_string(&line)?); contents.push('\n'); } + // Each block exceeds the 8 MiB reader budget, while each record stays below 1 MiB. + // Excluded items and ciphertext must not displace the earlier extraction evidence. + for item in [ + json!({"type":"reasoning", "summary":[], + "encrypted_content":"r".repeat(/*n*/ 512 * 1024)}), + json!({"type":"message", "role":"developer", "content":[ + {"type":"input_text", "text":"d".repeat(/*n*/ 512 * 1024)}, + ]}), + json!({"type":"message", "role":"assistant", "phase":"final_answer", + "encrypted_content":"a".repeat(/*n*/ 512 * 1024), "content":[ + {"type":"output_text", "text":"small assistant evidence behind ciphertext"}, + ]}), + ] { + let line = RolloutLine { + timestamp: chrono::Utc::now().to_rfc3339(), + ordinal: None, + item: RolloutItem::ResponseItem(serde_json::from_value::(item)?.into()), + }; + let line = serde_json::to_string(&line)?; + for _ in 0..16 { + contents.push_str(&line); + contents.push('\n'); + } + } // Exercise bounded reading through the actual extraction request, for both memory versions. contents.push_str(&"x".repeat(1024 * 1024 + 1)); contents.push('\n'); @@ -949,6 +973,7 @@ async fn run_memory_phase_one_model_request_test( let request = wait_for_single_request(&response).await; let evidence = request.message_input_texts("user").join(""); assert!(evidence.contains("replay-bearing assistant evidence")); + assert!(evidence.contains("small assistant evidence behind ciphertext")); assert!(evidence.contains("newest correction after an oversized record")); assert!(!evidence.contains("encrypted_content")); if version == codex_protocol::MemoryVersion::V1 { From 7a08c5f6271e818d832eb9061dac935936e2b539 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 12:22:49 +0000 Subject: [PATCH 038/155] Avoid reconnect races in the daemon restart test (#53969) ## Why PTY reads can split a redraw while the reconnect notice is temporarily erased. The test can then submit `/status` before reconnection finishes, when Enter is suppressed. ## What changed Make the `discovered` daemon startup test inspect only completed synchronized terminal updates. Type `/status` separately from Enter and wait for its command popup before submitting. Gate both inputs on a replacement daemon PID and the absence of the reconnect notice. GitOrigin-RevId: a99af0f26753d81458dbce2c30ecc120ff78d3f4 --- codex-rs/cli/tests/daemon_startup.rs | 30 +++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/codex-rs/cli/tests/daemon_startup.rs b/codex-rs/cli/tests/daemon_startup.rs index 0c6c5a8671..8b7cea4cc8 100644 --- a/codex-rs/cli/tests/daemon_startup.rs +++ b/codex-rs/cli/tests/daemon_startup.rs @@ -281,7 +281,10 @@ async fn daemon_startup(command: &str) -> Result<()> { steps.push_back(("·daemon-restart-test", b"/daemon\r")); steps.push_back(("Restartbackgroundserver", b"2")); steps.push_back(("Restartbackgroundserver?", b"2\r")); - steps.push_back(("GPT-5.6-Terra", b"/status\r")); + // Offline editing preserves text but suppresses Enter. Observe the command + // popup in a complete connected frame before submitting the retained draft. + steps.push_back(("GPT-5.6-Terra", b"/status")); + steps.push_back(("/statusshowcurrentsessionconfigurationandtokenusage", b"\r")); "Server:Localbackgroundserver" } else if elevated_launch || command == "restrictive-job" && elevated { if let Some(action) = command.strip_prefix("elevated-") { @@ -401,6 +404,15 @@ async fn daemon_startup(command: &str) -> Result<()> { *query = ""; } } + // PTY reads can split a redraw after the reconnect notice is erased but + // before it is repainted. Only inspect completed synchronized updates. + if command == "discovered" + && output + .rfind("\x1b[?2026l") + .is_none_or(|end| output[end..].contains("\x1b[?2026h")) + { + continue; + } let text: String = screen .screen() .contents() @@ -421,14 +433,14 @@ async fn daemon_startup(command: &str) -> Result<()> { }) { continue; } - // The old header can linger while the daemon stops. Do not send - // /status until the new process is up and reconnect has finished. - if steps.len() == 1 - && (!fs::read(&pid_file).is_ok_and(|pid| Some(pid) != existing_daemon) - || text.contains("Reconnecting")) - { - continue; - } + } + // The old header can linger while the daemon stops. Check both + // the draft and its Enter against the replacement process and UI. + if (*input == b"/status" || *input == b"\r") + && (!fs::read(&pid_file).is_ok_and(|pid| Some(pid) != existing_daemon) + || text.contains("Reconnecting")) + { + continue; } } if disabling && *ready == "Backgroundserverhasincompatiblefeaturesettings" { From 835cd7552d6a089bbdfeb21b001cb76c503249c7 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 13:48:39 +0000 Subject: [PATCH 039/155] Skip service backoff for stale Guardian authorization retries (#53987) ## Why Stale authorization requires refreshing local evidence, so service retry backoff unnecessarily delays the next review attempt. ## What changed Yield cooperatively before retrying `StaleAuthorization`, then check cancellation and the shared deadline. Keep retries within the existing attempt budget. ## Testing Extend paused-time tests to cover recovery with fresh evidence and exhaustion of the shared attempt budget, asserting that retries incur no backoff and return the final attempt's evidence. GitOrigin-RevId: fda7ddd040a761d08883740bb5e7aaecacfa6091 --- codex-rs/ext/guardian-reviewer/src/retry.rs | 16 ++++++ .../ext/guardian-reviewer/src/retry_tests.rs | 53 ++++++++++++++----- 2 files changed, 56 insertions(+), 13 deletions(-) diff --git a/codex-rs/ext/guardian-reviewer/src/retry.rs b/codex-rs/ext/guardian-reviewer/src/retry.rs index dd98638fe5..0e2df7e965 100644 --- a/codex-rs/ext/guardian-reviewer/src/retry.rs +++ b/codex-rs/ext/guardian-reviewer/src/retry.rs @@ -1,5 +1,6 @@ //! Applies one review's attempt budget, deadline and cancellation to host-owned sessions. //! Resubmissions are independent; this layer keeps no state between approval requests. +//! Changed local evidence retries cooperatively without service backoff, under the same limits. use crate::GuardianReviewError; use crate::GuardianReviewOutcome; @@ -80,6 +81,21 @@ async fn wait_before_guardian_retry( deadline: Instant, external_cancel: Option<&CancellationToken>, ) -> Option { + if matches!( + outcome, + GuardianReviewOutcome::Error(GuardianReviewError::StaleAuthorization) + ) { + // This is a local evidence refresh, not a failed service request. Yield so + // cancellation and queued context updates can run before capturing it again. + tokio::task::yield_now().await; + return if external_cancel.is_some_and(CancellationToken::is_cancelled) { + Some(GuardianReviewError::Cancelled) + } else if Instant::now() >= deadline { + Some(GuardianReviewError::Timeout) + } else { + None + }; + } let exponential_delay = 200.0 * 2.0_f64.powi(attempt_count.saturating_sub(1) as i32); let jitter = rand::rng().random_range(0.9..1.1); let retry_delay = Duration::from_millis((exponential_delay * jitter) as u64); diff --git a/codex-rs/ext/guardian-reviewer/src/retry_tests.rs b/codex-rs/ext/guardian-reviewer/src/retry_tests.rs index 3ee4d74922..e868debc65 100644 --- a/codex-rs/ext/guardian-reviewer/src/retry_tests.rs +++ b/codex-rs/ext/guardian-reviewer/src/retry_tests.rs @@ -163,32 +163,59 @@ async fn guardian_review_retry_wait_honors_deadline() { assert!(matches!(error, Some(GuardianReviewError::Timeout))); } -#[tokio::test] -async fn stale_authorization_uses_the_shared_attempt_budget() { +#[test_case::test_case(2; "recovers with fresh evidence")] +#[test_case::test_case(4; "exhausts the shared budget")] +#[tokio::test(start_paused = true)] +async fn stale_authorization_uses_the_shared_attempt_budget(success_on_attempt: i64) { let mut attempts = 0; - let (outcome, analytics, _) = run_with_retry( + let started_at = Instant::now(); + let deadline = started_at + Duration::from_secs(/*secs*/ 90); + let (outcome, analytics, evidence) = run_with_retry( GuardianReviewSessionLimits { max_attempts: 3, - deadline: Instant::now() + Duration::from_secs(/*secs*/ 90), + deadline, }, /*external_cancel*/ None, - |_deadline| { + |attempt_deadline| { + assert_eq!(attempt_deadline, deadline); attempts += 1; - async { + let attempt = attempts; + async move { ( - GuardianReviewOutcome::Error(GuardianReviewError::StaleAuthorization), + if attempt == success_on_attempt { + GuardianReviewOutcome::CachedApproval + } else { + GuardianReviewOutcome::Error(GuardianReviewError::StaleAuthorization) + }, GuardianReviewAnalyticsResult::without_session(), - None::<()>, + Some(attempt), ) } }, ) .await; - assert!(matches!( - outcome, - GuardianReviewOutcome::Error(GuardianReviewError::StaleAuthorization) - )); - assert_eq!((attempts, analytics.attempt_count), (3, 3)); + assert_eq!( + started_at.elapsed(), + Duration::ZERO, + "stale authorization retries should not wait for service backoff" + ); + if success_on_attempt <= 3 { + assert!(matches!(outcome, GuardianReviewOutcome::CachedApproval)); + } else { + assert!(matches!( + outcome, + GuardianReviewOutcome::Error(GuardianReviewError::StaleAuthorization) + )); + } + let expected_attempts = success_on_attempt.min(3); + assert_eq!( + (attempts, analytics.attempt_count, evidence), + ( + expected_attempts, + expected_attempts, + Some(expected_attempts) + ) + ); } #[tokio::test] From 0b73618146d55a2565589bf4e2d5e40e8f298d9e Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 14:00:19 +0000 Subject: [PATCH 040/155] Keep host MCP and plugin configuration local with remote environments (#53990) ## Why A remote primary environment could supply its working directory and workspace roots to host plugins and MCP processes, breaking relative MCP executable resolution and applying the wrong workspace permissions. ## What changed - Build host configuration from the local environment, falling back to the session's host working directory and runtime workspace roots when no local environment is selected. Preserve explicitly empty local roots. - Use the same host configuration for MCP startup and refresh, and refresh MCP state when runtime workspace roots change. - Keep repository skill discovery paired with the primary executor's working directory and filesystem. - Box skill warmup and turn context construction futures to reduce enclosing future sizes. ## Testing Extend the MCP integration test to cover a remote primary with populated, empty, or absent local roots; relative executable resolution before and after refresh; workspace-root revocation; and remote repository skill discovery. GitOrigin-RevId: 21a73c90507b55fd94261e7bf348695ff8466a24 --- codex-rs/core/src/environment_selection.rs | 24 ++-- codex-rs/core/src/lib.rs | 1 + codex-rs/core/src/session/mcp_runtime.rs | 28 +--- codex-rs/core/src/session/mod.rs | 1 - codex-rs/core/src/session/session.rs | 21 ++- codex-rs/core/src/session/tests.rs | 10 +- codex-rs/core/src/session/turn_context.rs | 73 +++++----- codex-rs/core/src/skills.rs | 36 +++++ codex-rs/core/tests/suite/rmcp_client.rs | 157 ++++++++++++++++++++- 9 files changed, 258 insertions(+), 93 deletions(-) diff --git a/codex-rs/core/src/environment_selection.rs b/codex-rs/core/src/environment_selection.rs index f85efc1e79..f0a70ef14d 100644 --- a/codex-rs/core/src/environment_selection.rs +++ b/codex-rs/core/src/environment_selection.rs @@ -13,7 +13,6 @@ use codex_exec_server::EnvironmentConnectionState; use codex_exec_server::EnvironmentInfo; use codex_exec_server::EnvironmentManager; use codex_exec_server::ExecServerError; -use codex_exec_server::ExecutorFileSystem; use codex_exec_server::SelectedCapabilityRootsStatus; use codex_protocol::capabilities::CapabilityRootLocation; use codex_protocol::capabilities::EnvironmentCapabilityRoots; @@ -1152,14 +1151,6 @@ impl TurnEnvironmentSnapshot { self.turn_environments().next() } - /// Returns the first selected environment's host folders, even if setup is not ready yet. - pub(crate) fn primary_workspace_roots(&self) -> Vec { - self.primary_workspace_root_uris() - .iter() - .filter_map(|root| root.to_abs_path().ok()) - .collect() - } - /// Returns the first selection's executor paths, even when setup is not ready yet. pub(crate) fn primary_workspace_root_uris(&self) -> &[PathUri] { let selection = match self.environments.first() { @@ -1187,20 +1178,26 @@ impl TurnEnvironmentSnapshot { } pub(crate) fn local_environment_cwd(&self) -> Option { + self.local_selection() + .and_then(|selection| selection.cwd.to_abs_path().ok()) + } + + /// The local workspace remains host-owned while its executor is still starting. + pub(crate) fn local_selection(&self) -> Option<&TurnEnvironmentSelection> { self.environments .iter() .find_map(|environment| match environment { TurnEnvironmentState::Ready(environment) if !environment.environment.is_remote() => { - environment.cwd().to_abs_path().ok() + Some(&environment.selection) } TurnEnvironmentState::Ready(_) => None, TurnEnvironmentState::Starting(environment) if environment.selection.environment_id == codex_exec_server::LOCAL_ENVIRONMENT_ID => { - environment.selection.cwd.to_abs_path().ok() + Some(&environment.selection) } TurnEnvironmentState::Starting(_) | TurnEnvironmentState::Failed { .. } => None, }) @@ -1277,11 +1274,6 @@ impl TurnEnvironmentSnapshot { .collect() } - pub(crate) fn primary_filesystem(&self) -> Option> { - self.primary() - .map(|environment| environment.environment.get_filesystem()) - } - pub(crate) fn single_local_environment(&self) -> Option<&TurnEnvironment> { if self.starting().next().is_some() { return None; diff --git a/codex-rs/core/src/lib.rs b/codex-rs/core/src/lib.rs index 08b52fc2e1..e722464838 100644 --- a/codex-rs/core/src/lib.rs +++ b/codex-rs/core/src/lib.rs @@ -135,6 +135,7 @@ pub mod sandboxing; mod session_prefix; mod skills; pub(crate) use skills::maybe_emit_implicit_skill_invocation; +#[cfg(test)] pub(crate) use skills::skills_load_input_from_config; mod stream_events_utils; pub mod test_support; diff --git a/codex-rs/core/src/session/mcp_runtime.rs b/codex-rs/core/src/session/mcp_runtime.rs index b813458ffa..a249e36da2 100644 --- a/codex-rs/core/src/session/mcp_runtime.rs +++ b/codex-rs/core/src/session/mcp_runtime.rs @@ -39,6 +39,7 @@ impl Session { next: &SessionConfiguration, ) -> bool { current.cwd() != next.cwd() + || current.runtime_workspace_roots != next.runtime_workspace_roots || current.step_settings.approval_policy.value() != next.step_settings.approval_policy.value() || current.step_settings.approvals_reviewer != next.step_settings.approvals_reviewer @@ -79,19 +80,9 @@ impl Session { state.active_disabled_plugin_ids.clone(), ) }; - let cwd = environments - .primary() - .and_then(|environment| environment.cwd().to_abs_path().ok()) - .unwrap_or_else(|| session_configuration.cwd().clone()); - let config = self.build_per_turn_config( - &session_configuration, - cwd, - environments.primary_workspace_roots(), - ); - let local_process_cwd = environments - .local_environment_cwd() - .unwrap_or_else(|| session_configuration.cwd().clone()) - .to_path_buf(); + let config = + self.build_per_turn_config(&session_configuration, environments.local_selection()); + let local_process_cwd = config.cwd.to_path_buf(); McpDesiredState { config: Arc::new(config), @@ -111,19 +102,12 @@ impl Session { auth: Option, mcp_projection: McpRuntimeProjection, resolved_environments: &TurnEnvironmentSnapshot, - mcp_runtime_cwd: PathBuf, ) -> anyhow::Result<()> { - let cwd = AbsolutePathBuf::from_absolute_path(mcp_runtime_cwd) - .unwrap_or_else(|_| session_configuration.cwd().clone()); let config = self.build_per_turn_config( session_configuration, - cwd, - resolved_environments.primary_workspace_roots(), + resolved_environments.local_selection(), ); - let local_process_cwd = resolved_environments - .local_environment_cwd() - .unwrap_or_else(|| session_configuration.cwd().clone()) - .to_path_buf(); + let local_process_cwd = config.cwd.to_path_buf(); let desired = McpDesiredState { config: Arc::new(config), auth, diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index b285c606be..516db0886a 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -53,7 +53,6 @@ use crate::session::step_settings::ResolvedStepSettings; use crate::session::step_settings::StepSettings; use crate::session::turn_context::TurnEnvironment; use crate::shell_snapshot::SnapshotCredentialBrokerState; -use crate::skills_load_input_from_config; use crate::stream_events_utils::mark_thread_memory_mode_polluted_if_external_context; use crate::turn_metadata::TurnMetadataState; use crate::turn_timing::now_unix_timestamp_ms; diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rs index 725f213d2b..6de001d0dc 100644 --- a/codex-rs/core/src/session/session.rs +++ b/codex-rs/core/src/session/session.rs @@ -646,11 +646,13 @@ async fn warm_plugins_and_skills_for_session_init( return Vec::new(); } - let fs = turn_environments.primary_filesystem(); let effective_skill_roots = plugin_outcome.effective_plugin_skill_roots(); - let plugin_skill_snapshots = plugins_manager.plugin_skill_snapshots_for_config(&plugins_input); - let skills_input = skills_load_input_from_config(config.as_ref(), effective_skill_roots) - .with_plugin_skill_snapshots(plugin_skill_snapshots); + let (skills_input, fs) = crate::skills::skills_load_input_for_environments( + &config, + &plugins_manager, + effective_skill_roots, + turn_environments, + ); skills_service .snapshot_for_config(&skills_input, fs) .await @@ -1173,11 +1175,6 @@ impl Session { let mcp_originator = session_configuration.originator.clone(); let mcp_session_source = session_configuration.session_source.clone(); let mcp_disabled_plugin_ids = session_configuration.disabled_plugin_ids.clone(); - let mcp_runtime_cwd = environment_selections - .first() - .and_then(|environment| environment.cwd.to_abs_path().ok()) - .map(|cwd| cwd.to_path_buf()) - .unwrap_or_else(|| session_configuration.cwd().to_path_buf()); let auth_and_mcp_fut = async move { let auth = mcp_auth.await; if config_for_mcp.features.plugin_recommendations_enabled() { @@ -1480,14 +1477,15 @@ impl Session { session_configuration.environments = turn_environments.selections(); let resolved_environments = turn_environments.snapshot().await; let agents_md_manager = Arc::new(AgentsMdManager::new(instructions)); - let plugin_skill_warmup = warm_plugins_and_skills_for_session_init( + // Keep discovery's future out of the large embedded startup/resume frame. + let plugin_skill_warmup = Box::pin(warm_plugins_and_skills_for_session_init( Arc::clone(&config), Arc::clone(&plugins_manager), Arc::clone(&skills_service), &resolved_environments, extensions.as_ref(), &session_configuration.session_source, - ) + )) .instrument(info_span!( "session_init.plugin_skill_warmup", otel.name = "session_init.plugin_skill_warmup", @@ -1943,7 +1941,6 @@ impl Session { latest_auth, mcp_projection, &resolved_environments, - mcp_runtime_cwd, ) .await?; sess.start_mcp_prewarm_worker(mcp_prewarm_rx, mcp_auth_changes); diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index e18314e5cc..592d0e37f7 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -7022,10 +7022,7 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) { }; let per_turn_config = session.build_per_turn_config( &session_configuration, - session_configuration.cwd().clone(), - crate::environment_selection::ThreadEnvironments::primary_workspace_roots_for( - &session_configuration.environments, - ), + resolved_turn_environments.local_selection(), ); let plugins_input = per_turn_config.plugins_config_input(); let plugin_outcome = session @@ -9290,10 +9287,7 @@ where }); let per_turn_config = session.build_per_turn_config( &session_configuration, - session_configuration.cwd().clone(), - crate::environment_selection::ThreadEnvironments::primary_workspace_roots_for( - &session_configuration.environments, - ), + resolved_turn_environments.local_selection(), ); let plugins_input = per_turn_config.plugins_config_input(); let plugin_outcome = session diff --git a/codex-rs/core/src/session/turn_context.rs b/codex-rs/core/src/session/turn_context.rs index 40cf7657a6..aa94539f19 100644 --- a/codex-rs/core/src/session/turn_context.rs +++ b/codex-rs/core/src/session/turn_context.rs @@ -939,13 +939,26 @@ impl Session { pub(crate) fn build_per_turn_config( &self, session_configuration: &SessionConfiguration, - cwd: AbsolutePathBuf, - workspace_roots: Vec, + local_environment: Option<&TurnEnvironmentSelection>, ) -> Config { // todo(aibrahim): store this state somewhere else so we don't need to mut config let config = session_configuration.original_config_do_not_use.clone(); let mut per_turn_config = (*config).clone(); - per_turn_config.cwd = cwd; + // Config is consumed by host plugins and MCP processes. Executor paths and + // permissions remain on their captured environment attachments. + per_turn_config.cwd = local_environment + .and_then(|environment| environment.cwd.to_abs_path().ok()) + .unwrap_or_else(|| session_configuration.cwd().clone()); + let workspace_roots = local_environment.map_or_else( + || session_configuration.runtime_workspace_roots.clone(), + |environment| { + environment + .workspace_roots + .iter() + .filter_map(|root| root.to_abs_path().ok()) + .collect() + }, + ); per_turn_config.permissions.approval_policy = session_configuration.step_settings.approval_policy.clone(); per_turn_config.workspace_roots = workspace_roots.clone(); @@ -989,14 +1002,15 @@ impl Session { &self, session_configuration: &SessionConfiguration, ) -> Config { - let workspace_roots = - crate::environment_selection::ThreadEnvironments::primary_workspace_roots_for( - &session_configuration.environments, - ); let mut config = self.build_per_turn_config( session_configuration, - session_configuration.cwd().clone(), - workspace_roots, + session_configuration + .environments + .iter() + .find(|environment| { + environment.environment_id == codex_exec_server::LOCAL_ENVIRONMENT_ID + && !matches!(environment.config, EnvironmentConfigState::Failed(_)) + }), ); config.model = Some( session_configuration @@ -1210,14 +1224,15 @@ impl Session { turn_environments: TurnEnvironmentSnapshot, options: NewTurnContextOptions, ) -> Arc { - self.new_turn_context_from_configuration( + // Keep context construction out of the enclosing turn and history futures. + Box::pin(self.new_turn_context_from_configuration( sub_id, session_configuration, turn_environments, options, TurnContextBuildMode::Full, self.git_enrichment_policy, - ) + )) .await } @@ -1227,14 +1242,14 @@ impl Session { session_configuration: SessionConfiguration, ) -> Arc { let turn_environments = self.services.turn_environments.snapshot().await; - self.new_turn_context_from_configuration( + Box::pin(self.new_turn_context_from_configuration( sub_id, session_configuration, turn_environments, NewTurnContextOptions::default(), TurnContextBuildMode::StartupPrewarm, GitEnrichmentPolicy::Skip, - ) + )) .await } @@ -1249,17 +1264,12 @@ impl Session { git_enrichment_policy: GitEnrichmentPolicy, ) -> Arc { let primary_turn_environment = turn_environments.primary(); - // TODO(anp): Migrate per-turn config and legacy TurnContext cwd consumers to PathUri so - // a foreign primary environment does not fall back to the session's host cwd. + let per_turn_config = + self.build_per_turn_config(&session_configuration, turn_environments.local_selection()); + // Legacy turn consumers still refer to the primary executor's repository. let cwd = primary_turn_environment - .as_ref() - .and_then(|turn_environment| turn_environment.cwd().to_abs_path().ok()) + .and_then(|environment| environment.cwd().to_abs_path().ok()) .unwrap_or_else(|| session_configuration.cwd().clone()); - let per_turn_config = self.build_per_turn_config( - &session_configuration, - cwd.clone(), - turn_environments.primary_workspace_roots(), - ); let network_permission_profile = primary_turn_environment .map(TurnEnvironment::permission_profile) .cloned() @@ -1308,15 +1318,12 @@ impl Session { HostSkillsSnapshot::new(Arc::new(SkillLoadOutcome::default())) } else { let effective_skill_roots = plugin_outcome.effective_plugin_skill_roots(); - let plugin_skill_snapshots = self - .services - .plugins_manager - .plugin_skill_snapshots_for_config(&plugins_input); - let skills_input = - skills_load_input_from_config(&per_turn_config, effective_skill_roots) - .with_plugin_skill_snapshots(plugin_skill_snapshots); - let fs = primary_turn_environment - .map(|turn_environment| turn_environment.environment.get_filesystem()); + let (skills_input, fs) = crate::skills::skills_load_input_for_environments( + &per_turn_config, + &self.services.plugins_manager, + effective_skill_roots, + &turn_environments, + ); self.services .skills_service .snapshot_for_config(&skills_input, fs) @@ -1444,14 +1451,14 @@ impl Session { async fn new_default_turn_for(&self, build_mode: TurnContextBuildMode) -> Arc { let session_configuration = self.default_turn_configuration().await; let turn_environments = self.services.turn_environments.snapshot().await; - self.new_turn_context_from_configuration( + Box::pin(self.new_turn_context_from_configuration( self.next_internal_sub_id(), session_configuration, turn_environments, NewTurnContextOptions::default(), build_mode, self.git_enrichment_policy, - ) + )) .await } diff --git a/codex-rs/core/src/skills.rs b/codex-rs/core/src/skills.rs index 9dca956b9b..43ca328cf6 100644 --- a/codex-rs/core/src/skills.rs +++ b/codex-rs/core/src/skills.rs @@ -1,4 +1,5 @@ use crate::config::Config; +use crate::environment_selection::TurnEnvironmentSnapshot; use crate::session::session::Session; use crate::session::turn_context::TurnContext; use codex_analytics::InvocationType; @@ -6,6 +7,8 @@ use codex_analytics::SkillInvocation; use codex_analytics::SkillInvocationLocation; use codex_analytics::TrackEventsContext; use codex_analytics::build_track_events_context; +use codex_core_plugins::PluginsManager; +use codex_exec_server::ExecutorFileSystem; use codex_extension_api::SkillInvocationInput; use codex_extension_api::SkillInvocationKind; use codex_otel::SkillInvocationEvent; @@ -21,11 +24,13 @@ use codex_utils_absolute_path::AbsolutePathBuf; use codex_utils_path_uri::PathUri; use codex_utils_plugins::PluginSkillRoot; use std::collections::HashSet; +use std::sync::Arc; use tokio::sync::Mutex; #[derive(Debug, Default)] struct ImplicitSkillInvocations(Mutex>); +#[cfg(test)] pub(crate) fn skills_load_input_from_config( config: &Config, effective_skill_roots: Vec, @@ -37,6 +42,37 @@ pub(crate) fn skills_load_input_from_config( ) } +/// Pair repository discovery inputs with their captured filesystem owner. +/// Keep preparation synchronous so it adds no nested startup or resume future. +pub(crate) fn skills_load_input_for_environments( + config: &Config, + plugins_manager: &PluginsManager, + effective_skill_roots: Vec, + environments: &TurnEnvironmentSnapshot, +) -> (HostSkillsLoadInput, Option>) { + // Preserve primary-repository discovery independently of the host config cwd. + let workspace = environments.primary().and_then(|environment| { + environment + .cwd() + .to_abs_path() + .ok() + .map(|cwd| (cwd, environment.environment.get_filesystem())) + }); + let (cwd, fs) = match workspace { + Some((cwd, fs)) => (cwd, Some(fs)), + None => (config.cwd.clone(), None), + }; + let input = HostSkillsLoadInput::new( + cwd, + effective_skill_roots, + config.config_layer_stack.clone(), + ) + .with_plugin_skill_snapshots( + plugins_manager.plugin_skill_snapshots_for_config(&config.plugins_config_input()), + ); + (input, fs) +} + pub(crate) async fn emit_explicit_skill_invocations( sess: &Session, turn_context: &TurnContext, diff --git a/codex-rs/core/tests/suite/rmcp_client.rs b/codex-rs/core/tests/suite/rmcp_client.rs index fb0572ae45..2c0fcf270b 100644 --- a/codex-rs/core/tests/suite/rmcp_client.rs +++ b/codex-rs/core/tests/suite/rmcp_client.rs @@ -2072,6 +2072,10 @@ async fn stdio_server_uses_configured_cwd_before_runtime_fallback() -> anyhow::R #[serial(mcp_cwd)] async fn local_stdio_server_uses_runtime_fallback_cwd_when_config_omits_cwd() -> anyhow::Result<()> { + use codex_core::StartThreadOptions; + use core_test_support::exec_server::ExecServerProcess; + use core_test_support::test_codex::local; + skip_if_no_network!(Ok(())); let server = responses::start_mock_server().await; @@ -2085,9 +2089,26 @@ async fn local_stdio_server_uses_runtime_fallback_cwd_when_config_omits_cwd() -> .expect("test stdio server binary should have a file name"), ); let relative_command = relative_server_path.to_string_lossy().into_owned(); + let additional_workspace = tempdir()?; + let additional_root = AbsolutePathBuf::try_from(additional_workspace.path().to_path_buf())?; - let fixture = test_codex() + let mut extensions = codex_extension_api::ExtensionRegistryBuilder::new(); + codex_skills_extension::install(&mut extensions, |config: &Config| { + codex_skills_extension::SkillsExtensionConfig { + include_instructions: config.include_skill_instructions, + max_context_tokens: config.skill_max_context_tokens, + bundled_skills_enabled: config.bundled_skills_enabled(), + cloud_skill_enabled: config.cloud_skill_enabled, + shadow_selection_enabled: config.features.enabled(Feature::SkillSearch), + } + }); + let mut fixture = test_codex() + .with_extensions(Arc::new(extensions.build())) .with_config(move |config| { + config.workspace_roots = vec![config.cwd.clone(), additional_root.clone()]; + config + .permissions + .set_workspace_roots(config.workspace_roots.clone()); *expected_cwd_for_config .lock() .expect("expected cwd lock should not be poisoned") = @@ -2128,6 +2149,140 @@ async fn local_stdio_server_uses_runtime_fallback_cwd_when_config_omits_cwd() -> call_cwd_tool(&server, &fixture, server_name, "call-local-fallback-cwd").await?; assert_cwd_tool_output(&structured, &expected_cwd); + + // The relative MCP executable exists only in the host workspace. A remote + // primary must not change its command resolution at startup or refresh. + let executor = ExecServerProcess::start().await?; + let remote_workspace = tempdir()?; + let remote_skill = remote_workspace + .path() + .join(".agents/skills/remote-fixture"); + fs::create_dir_all(&remote_skill)?; + fs::write( + remote_skill.join("SKILL.md"), + "---\nname: remote-fixture\ndescription: Remote repository skill fixture\n---\nRemote instructions\n", + )?; + let manager = fixture.thread_manager.environment_manager(); + manager.upsert_environment( + "other".to_string(), + executor.websocket_url.clone(), + /*connect_timeout*/ None, + )?; + for local_roots in [ + Some(vec![fixture.config.cwd.clone()]), + Some(Vec::new()), + None, + ] { + let mut environments = vec![TurnEnvironmentRequest { + environment_id: "other".to_string(), + cwd: PathUri::from_host_native_path(remote_workspace.path())?, + workspace_roots: vec![PathUri::from_host_native_path(remote_workspace.path())?], + config: EnvironmentConfigState::FromThread, + }]; + if let Some(roots) = &local_roots { + let mut local = local(fixture.config.cwd.clone()).into_request(); + local.workspace_roots = roots.iter().map(PathUri::from_abs_path).collect(); + environments.push(local); + } + let started = fixture + .thread_manager + .start_thread(StartThreadOptions { + environments: Some(environments), + ..StartThreadOptions::new(fixture.config.clone()) + }) + .await?; + fixture.codex = started.thread; + fixture.session_configured = started.session_configured; + wait_for_mcp_server(&fixture.codex, server_name).await?; + + // A fresh thread must still discover the primary executor's repository + // skills; host routing must not silently replace them with local skills. + let request = responses::mount_sse_once( + &server, + responses::sse(vec![responses::ev_completed("remote-skills")]), + ) + .await; + fixture.submit_turn("list repository skills").await?; + assert!( + request + .single_request() + .message_input_texts("developer") + .join("\n") + .contains("Remote repository skill fixture") + ); + + let initial = call_cwd_tool(&server, &fixture, server_name, "before-refresh").await?; + assert_cwd_tool_output(&initial, &expected_cwd); + fixture.codex.submit(Op::RefreshMcpServers).await?; + let refreshed = call_cwd_tool(&server, &fixture, server_name, "after-refresh").await?; + assert_cwd_tool_output(&refreshed, &expected_cwd); + + // Host MCP policy follows explicit local roots, including an empty list, + // and falls back to the saved host roots only when local is absent. + for (phase, updated_roots) in [("initial", None), ("revoked", Some(Vec::new()))] { + let expected_roots = local_roots + .as_ref() + .or(updated_roots.as_ref()) + .unwrap_or(&fixture.config.workspace_roots) + .clone(); + let call_id = format!("host-sandbox-{phase}"); + mount_sse_once( + &server, + responses::sse(vec![ + responses::ev_function_call_with_namespace( + &call_id, + &format!("mcp__{server_name}"), + "sandbox_meta", + "{}", + ), + responses::ev_completed("sandbox-meta"), + ]), + ) + .await; + let final_request = mount_sse_once( + &server, + responses::sse(vec![responses::ev_completed("sandbox-meta-done")]), + ) + .await; + fixture + .codex + .start_or_steer_turn( + TurnInputRequest::user_input(vec![UserInput::Text { + text: "inspect host MCP permissions".into(), + text_elements: Vec::new(), + }]) + .with_thread_settings(ThreadSettingsOverrides { + permission_profile: Some(PermissionProfile::workspace_write()), + runtime_workspace_roots: updated_roots, + ..Default::default() + }), + ) + .await?; + wait_for_event(&fixture.codex, |event| { + matches!(event, EventMsg::TurnComplete(_)) + }) + .await; + let output = final_request + .single_request() + .function_call_output(&call_id); + let metadata: Value = serde_json::from_str(split_wall_time_wrapped_output( + output["output"] + .as_str() + .context("sandbox metadata output")?, + ))?; + assert_eq!( + metadata.get(MCP_SANDBOX_STATE_CAPABILITY), + Some(&serde_json::to_value(SandboxState { + permission_profile: PermissionProfile::workspace_write() + .materialize_project_roots_with_workspace_roots(&expected_roots), + codex_linux_sandbox_exe: fixture.config.codex_linux_sandbox_exe.clone(), + sandbox_cwd: PathUri::from_abs_path(&fixture.config.cwd), + use_legacy_landlock: false, + use_mxc: false, + })?), + ); + } + } server.verify().await; Ok(()) } From f87ba04ec3cd386a92e775405b252a310b40bb0d Mon Sep 17 00:00:00 2001 From: tejsudha-openai Date: Wed, 14 Oct 2026 14:05:23 +0000 Subject: [PATCH 041/155] Report the reason for ChatGPT token refresh requests (#53991) ## What changed Include a `refresh_reason` diagnostic in ChatGPT OAuth token refresh requests to distinguish `proactive_expiry`, `scheduled`, `unauthorized_recovery`, and `forced` refreshes. Omit the field for gateway refresh requests. ## Testing Extend refresh tests to check the reported reasons, including scheduled refreshes when access token expiry is unavailable. GitOrigin-RevId: b0294a61ffc3089a66e7b132d4f45661a9e18d38 --- codex-rs/login/src/auth/manager.rs | 73 +++++++++++++++------- codex-rs/login/src/gateway_auth.rs | 1 + codex-rs/login/src/oauth/client.rs | 24 +++++++ codex-rs/login/src/oauth/client_tests.rs | 5 +- codex-rs/login/src/oauth/mod.rs | 1 + codex-rs/login/tests/suite/auth_refresh.rs | 57 +++++++++++++++++ 6 files changed, 137 insertions(+), 24 deletions(-) diff --git a/codex-rs/login/src/auth/manager.rs b/codex-rs/login/src/auth/manager.rs index cdc9c8d356..88c80f5af2 100644 --- a/codex-rs/login/src/auth/manager.rs +++ b/codex-rs/login/src/auth/manager.rs @@ -62,6 +62,7 @@ use crate::default_client::create_default_auth_client; use crate::oauth::ErrorBodyLimit; use crate::oauth::OAuthClient; use crate::oauth::OAuthError; +use crate::oauth::RefreshReason; use crate::oauth::RefreshTokenGrant; use crate::oauth::TokenEncoding; use crate::oauth::TokenEndpoint; @@ -1627,6 +1628,7 @@ fn persist_tokens( async fn request_chatgpt_token_refresh( refresh_token: String, client: &HttpClient, + refresh_reason: RefreshReason, ) -> Result { let client_id = oauth_client_id(); let endpoint = refresh_token_endpoint(); @@ -1644,6 +1646,7 @@ async fn request_chatgpt_token_refresh( .refresh(RefreshTokenGrant { refresh_token: &refresh_token, resource: None, + refresh_reason: Some(refresh_reason), }) .await { @@ -2011,14 +2014,18 @@ impl UnauthorizedRecovery { } } UnauthorizedRecoveryStep::RefreshToken => { - self.manager.refresh_token_from_authority().await?; + self.manager + .refresh_token_from_authority_with_reason(RefreshReason::UnauthorizedRecovery) + .await?; self.step = UnauthorizedRecoveryStep::Done; return Ok(UnauthorizedRecoveryStepResult { auth_state_changed: Some(true), }); } UnauthorizedRecoveryStep::ExternalRefresh => { - self.manager.refresh_token_from_authority().await?; + self.manager + .refresh_token_from_authority_with_reason(RefreshReason::UnauthorizedRecovery) + .await?; self.step = UnauthorizedRecoveryStep::Done; return Ok(UnauthorizedRecoveryStepResult { auth_state_changed: Some(true), @@ -2395,8 +2402,8 @@ impl AuthManager { } let auth = self.auth_cached()?; - if Self::should_refresh_proactively(&auth) - && let Err(err) = self.refresh_token().await + if let Some(reason) = Self::proactive_refresh_reason(&auth) + && let Err(err) = self.refresh_token_with_reason(reason).await { tracing::error!("Failed to refresh token: {}", err); return Some(auth); @@ -2843,6 +2850,13 @@ impl AuthManager { /// we can assume that the source already refreshed it. Otherwise, ask the /// token authority to refresh. pub async fn refresh_token(&self) -> Result<(), RefreshTokenError> { + self.refresh_token_with_reason(RefreshReason::Forced).await + } + + async fn refresh_token_with_reason( + &self, + reason: RefreshReason, + ) -> Result<(), RefreshTokenError> { let _refresh_guard = self.refresh_lock.acquire().await.map_err(|_| { RefreshTokenError::Permanent(RefreshTokenFailedError::new( RefreshTokenFailedReason::Other, @@ -2868,7 +2882,7 @@ impl AuthManager { tracing::info!("Skipping token refresh because auth changed after guarded reload."); Ok(()) } - ReloadOutcome::ReloadedNoChange => self.refresh_token_from_authority_impl().await, + ReloadOutcome::ReloadedNoChange => self.refresh_token_from_authority_impl(reason).await, ReloadOutcome::Skipped => { Err(RefreshTokenError::Permanent(RefreshTokenFailedError::new( RefreshTokenFailedReason::Other, @@ -2882,16 +2896,27 @@ impl AuthManager { /// it and update the shared cache. If the token refresh fails, returns the /// error to the caller. pub async fn refresh_token_from_authority(&self) -> Result<(), RefreshTokenError> { + self.refresh_token_from_authority_with_reason(RefreshReason::Forced) + .await + } + + async fn refresh_token_from_authority_with_reason( + &self, + reason: RefreshReason, + ) -> Result<(), RefreshTokenError> { let _refresh_guard = self.refresh_lock.acquire().await.map_err(|_| { RefreshTokenError::Permanent(RefreshTokenFailedError::new( RefreshTokenFailedReason::Other, REFRESH_TOKEN_UNKNOWN_MESSAGE.to_string(), )) })?; - self.refresh_token_from_authority_impl().await + self.refresh_token_from_authority_impl(reason).await } - async fn refresh_token_from_authority_impl(&self) -> Result<(), RefreshTokenError> { + async fn refresh_token_from_authority_impl( + &self, + reason: RefreshReason, + ) -> Result<(), RefreshTokenError> { tracing::info!("Refreshing token"); let attempted_auth = self.auth_cached(); @@ -2913,8 +2938,12 @@ impl AuthManager { "Token data is not available.", )) })?; - self.refresh_and_persist_chatgpt_token(chatgpt_auth, token_data.refresh_token) - .await + self.refresh_and_persist_chatgpt_token( + chatgpt_auth, + token_data.refresh_token, + reason, + ) + .await } Some( CodexAuth::ApiKey(_) @@ -2998,28 +3027,24 @@ impl AuthManager { .is_some_and(AuthMode::uses_codex_backend) } - fn should_refresh_proactively(auth: &CodexAuth) -> bool { + fn proactive_refresh_reason(auth: &CodexAuth) -> Option { let chatgpt_auth = match auth { CodexAuth::Chatgpt(chatgpt_auth) => chatgpt_auth, - _ => return false, + _ => return None, }; - let auth_dot_json = match chatgpt_auth.current_auth_json() { - Some(auth_dot_json) => auth_dot_json, - None => return false, - }; + let auth_dot_json = chatgpt_auth.current_auth_json()?; if let Some(tokens) = auth_dot_json.tokens.as_ref() && let Ok(Some(expires_at)) = parse_jwt_expiration(&tokens.access_token) { - return expires_at + return (expires_at <= Utc::now() - + chrono::Duration::minutes(CHATGPT_ACCESS_TOKEN_REFRESH_WINDOW_MINUTES); + + chrono::Duration::minutes(CHATGPT_ACCESS_TOKEN_REFRESH_WINDOW_MINUTES)) + .then_some(RefreshReason::ProactiveExpiry); } - let last_refresh = match auth_dot_json.last_refresh { - Some(last_refresh) => last_refresh, - None => return false, - }; - last_refresh < Utc::now() - chrono::Duration::days(TOKEN_REFRESH_INTERVAL) + let last_refresh = auth_dot_json.last_refresh?; + (last_refresh < Utc::now() - chrono::Duration::days(TOKEN_REFRESH_INTERVAL)) + .then_some(RefreshReason::Scheduled) } async fn refresh_external_auth( @@ -3090,8 +3115,10 @@ impl AuthManager { &self, auth: &ChatgptAuth, refresh_token: String, + reason: RefreshReason, ) -> Result<(), RefreshTokenError> { - let refresh_response = request_chatgpt_token_refresh(refresh_token, auth.client()).await?; + let refresh_response = + request_chatgpt_token_refresh(refresh_token, auth.client(), reason).await?; persist_tokens( auth.storage(), diff --git a/codex-rs/login/src/gateway_auth.rs b/codex-rs/login/src/gateway_auth.rs index 00871113ed..8ceb769e01 100644 --- a/codex-rs/login/src/gateway_auth.rs +++ b/codex-rs/login/src/gateway_auth.rs @@ -321,6 +321,7 @@ impl GatewayAuthManager { .refresh::(RefreshTokenGrant { refresh_token, resource: self.state.config.resource.as_deref(), + refresh_reason: None, }) .await { diff --git a/codex-rs/login/src/oauth/client.rs b/codex-rs/login/src/oauth/client.rs index f9a1d453d5..78de50c50e 100644 --- a/codex-rs/login/src/oauth/client.rs +++ b/codex-rs/login/src/oauth/client.rs @@ -39,6 +39,27 @@ pub(crate) struct AuthorizationCodeGrant<'a> { pub(crate) struct RefreshTokenGrant<'a> { pub refresh_token: &'a str, pub resource: Option<&'a str>, + pub refresh_reason: Option, +} + +/// Caller-reported diagnostics for AuthAPI; never evidence of token validity. +#[derive(Clone, Copy, Debug)] +pub(crate) enum RefreshReason { + ProactiveExpiry, + Scheduled, + UnauthorizedRecovery, + Forced, +} + +impl RefreshReason { + fn as_str(self) -> &'static str { + match self { + Self::ProactiveExpiry => "proactive_expiry", + Self::Scheduled => "scheduled", + Self::UnauthorizedRecovery => "unauthorized_recovery", + Self::Forced => "forced", + } + } } /// Shared OAuth protocol implementation; callers retain tokens, storage, and recovery decisions. @@ -85,6 +106,9 @@ impl<'a> OAuthClient<'a> { if let Some(resource) = grant.resource { parameters.push(("resource", resource)); } + if let Some(reason) = grant.refresh_reason { + parameters.push(("refresh_reason", reason.as_str())); + } self.exchange(¶meters, &[grant.refresh_token]).await } diff --git a/codex-rs/login/src/oauth/client_tests.rs b/codex-rs/login/src/oauth/client_tests.rs index 17e93ed5ce..8b2ae9b2bb 100644 --- a/codex-rs/login/src/oauth/client_tests.rs +++ b/codex-rs/login/src/oauth/client_tests.rs @@ -184,6 +184,7 @@ async fn rejection_preserves_status_and_omits_oversized_diagnostics() { .refresh::(RefreshTokenGrant { refresh_token, resource: Some("urn:gateway"), + refresh_reason: None, }) .await; let Err(OAuthError::Rejected(error)) = result else { @@ -227,6 +228,7 @@ async fn rejection_keeps_status_when_reading_the_body_fails() { .refresh::(RefreshTokenGrant { refresh_token: "refresh", resource: None, + refresh_reason: None, }) .await; let Err(OAuthError::Rejected(error)) = result else { @@ -287,7 +289,8 @@ async fn success_body_revocation_preserves_the_policy_error() { tokio::join!( form.refresh::(RefreshTokenGrant { refresh_token: "refresh", - resource: None + resource: None, + refresh_reason: None, }), server ) diff --git a/codex-rs/login/src/oauth/mod.rs b/codex-rs/login/src/oauth/mod.rs index 329e1be1e8..8ac9a559d0 100644 --- a/codex-rs/login/src/oauth/mod.rs +++ b/codex-rs/login/src/oauth/mod.rs @@ -16,6 +16,7 @@ pub(crate) use authorization::build_authorization_url; pub(crate) use authorization::generate_state; pub(crate) use client::AuthorizationCodeGrant; pub(crate) use client::OAuthClient; +pub(crate) use client::RefreshReason; pub(crate) use client::RefreshTokenGrant; pub(crate) use client::TokenEncoding; pub(crate) use client::TokenEndpoint; diff --git a/codex-rs/login/tests/suite/auth_refresh.rs b/codex-rs/login/tests/suite/auth_refresh.rs index 5e353de173..60b6d2a3fe 100644 --- a/codex-rs/login/tests/suite/auth_refresh.rs +++ b/codex-rs/login/tests/suite/auth_refresh.rs @@ -32,6 +32,7 @@ use tempfile::TempDir; use wiremock::Mock; use wiremock::MockServer; use wiremock::ResponseTemplate; +use wiremock::matchers::body_partial_json; use wiremock::matchers::method; use wiremock::matchers::path; @@ -119,6 +120,7 @@ async fn refresh_token_honors_respect_system_proxy() -> Result<()> { "client_id": "staging-client", "grant_type": "refresh_token", "refresh_token": INITIAL_REFRESH_TOKEN, + "refresh_reason": "forced", }) ); return Ok(()); @@ -224,6 +226,7 @@ async fn refresh_token_succeeds_updates_storage() -> Result<()> { "client_id": "staging-client", "grant_type": "refresh_token", "refresh_token": INITIAL_REFRESH_TOKEN, + "refresh_reason": "forced", }) ); @@ -333,6 +336,9 @@ async fn auth_refreshes_when_access_token_is_near_expiry() -> Result<()> { let server = MockServer::start().await; Mock::given(method("POST")) .and(path("/oauth/token")) + .and(body_partial_json( + json!({"refresh_reason": "proactive_expiry"}), + )) .respond_with(ResponseTemplate::new(200).set_body_json(json!({ "access_token": "new-access-token", "refresh_token": "new-refresh-token" @@ -388,6 +394,54 @@ async fn auth_refreshes_when_access_token_is_near_expiry() -> Result<()> { Ok(()) } +#[serial_test::serial(auth_env)] +#[tokio::test] +async fn auth_reports_scheduled_refresh_when_access_token_expiry_is_unavailable() -> Result<()> { + skip_if_no_network!(Ok(())); + + let server = MockServer::start().await; + Mock::given(method("POST")) + .and(path("/oauth/token")) + .and(body_partial_json(json!({"refresh_reason": "scheduled"}))) + .respond_with(ResponseTemplate::new(/*s*/ 200).set_body_json(json!({ + "access_token": "new-access-token", + "refresh_token": "new-refresh-token" + }))) + .expect(/*r*/ 1) + .mount(&server) + .await; + + let ctx = RefreshTokenTestContext::new(&server).await?; + let initial_tokens = build_tokens(INITIAL_ACCESS_TOKEN, INITIAL_REFRESH_TOKEN); + ctx.write_auth(&AuthDotJson { + auth_mode: Some(AuthMode::Chatgpt), + openai_api_key: None, + tokens: Some(initial_tokens.clone()), + last_refresh: Some(Utc::now() - Duration::days(9)), + agent_identity: None, + personal_access_token: None, + bedrock_api_key: None, + bedrock_access_keys: None, + }) + .await?; + + let refreshed = ctx + .auth_manager + .auth() + .await + .context("auth should refresh")?; + assert_eq!( + refreshed.get_token_data()?, + TokenData { + access_token: "new-access-token".to_string(), + refresh_token: "new-refresh-token".to_string(), + ..initial_tokens + } + ); + server.verify().await; + Ok(()) +} + #[serial_test::serial(auth_env)] #[tokio::test] async fn auth_skips_access_token_outside_refresh_window() -> Result<()> { @@ -1294,6 +1348,9 @@ async fn unauthorized_recovery_reloads_then_refreshes_tokens() -> Result<()> { let server = MockServer::start().await; Mock::given(method("POST")) .and(path("/oauth/token")) + .and(body_partial_json( + json!({"refresh_reason": "unauthorized_recovery"}), + )) .respond_with(ResponseTemplate::new(200).set_body_json(json!({ "access_token": "recovered-access-token", "refresh_token": "recovered-refresh-token" From 954750be9c4044e7ef2fea18e22648e8c6c4cb0f Mon Sep 17 00:00:00 2001 From: jif-oai Date: Wed, 14 Oct 2026 14:18:28 +0000 Subject: [PATCH 042/155] Bump `rustls` to `0.23.46` (#53996) GitOrigin-RevId: 08c39511bd3afc32072b731802e2370f535cc87b --- MODULE.bazel.lock | 2 +- codex-rs/Cargo.lock | 4 ++-- codex-rs/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index beaa6059a2..5bb5817226 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1654,7 +1654,7 @@ "rustls-webpki_0.103.13": "{\"dependencies\":[{\"default_features\":false,\"name\":\"aws-lc-rs\",\"optional\":true,\"req\":\"^1.14\"},{\"kind\":\"dev\",\"name\":\"base64\",\"req\":\"^0.22\"},{\"kind\":\"dev\",\"name\":\"bencher\",\"req\":\"^0.1.5\"},{\"kind\":\"dev\",\"name\":\"bzip2\",\"req\":\"^0.6\"},{\"kind\":\"dev\",\"name\":\"once_cell\",\"req\":\"^1.17.2\"},{\"default_features\":false,\"name\":\"pki-types\",\"package\":\"rustls-pki-types\",\"req\":\"^1.12\"},{\"default_features\":false,\"features\":[\"aws_lc_rs\"],\"kind\":\"dev\",\"name\":\"rcgen\",\"req\":\"^0.14.2\"},{\"default_features\":false,\"name\":\"ring\",\"optional\":true,\"req\":\"^0.17\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"},{\"name\":\"untrusted\",\"req\":\"^0.9\"},{\"kind\":\"dev\",\"name\":\"x509-parser\",\"req\":\"^0.18.1\"}],\"features\":{\"alloc\":[\"ring?/alloc\",\"pki-types/alloc\"],\"aws-lc-rs\":[\"dep:aws-lc-rs\",\"aws-lc-rs/aws-lc-sys\",\"aws-lc-rs/prebuilt-nasm\"],\"aws-lc-rs-fips\":[\"dep:aws-lc-rs\",\"aws-lc-rs/fips\"],\"aws-lc-rs-unstable\":[\"aws-lc-rs\",\"aws-lc-rs/unstable\"],\"default\":[\"std\"],\"ring\":[\"dep:ring\"],\"std\":[\"alloc\",\"pki-types/std\"]}}", "rustls-webpki_0.103.15": "{\"dependencies\":[{\"default_features\":false,\"name\":\"aws-lc-rs\",\"optional\":true,\"req\":\"^1.18\"},{\"kind\":\"dev\",\"name\":\"base64\",\"req\":\"^0.23\"},{\"kind\":\"dev\",\"name\":\"bencher\",\"req\":\"^0.1.5\"},{\"kind\":\"dev\",\"name\":\"bzip2\",\"req\":\"^0.6\"},{\"kind\":\"dev\",\"name\":\"once_cell\",\"req\":\"^1.17.2\"},{\"default_features\":false,\"name\":\"pki-types\",\"package\":\"rustls-pki-types\",\"req\":\"^1.12\"},{\"default_features\":false,\"features\":[\"aws_lc_rs\"],\"kind\":\"dev\",\"name\":\"rcgen\",\"req\":\"^0.14.2\"},{\"default_features\":false,\"name\":\"ring\",\"optional\":true,\"req\":\"^0.17\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"},{\"name\":\"untrusted\",\"req\":\"^0.9\"},{\"kind\":\"dev\",\"name\":\"x509-parser\",\"req\":\"^0.18.1\"}],\"features\":{\"alloc\":[\"ring?/alloc\",\"pki-types/alloc\"],\"aws-lc-rs\":[\"dep:aws-lc-rs\",\"aws-lc-rs/aws-lc-sys\",\"aws-lc-rs/prebuilt-nasm\"],\"aws-lc-rs-fips\":[\"dep:aws-lc-rs\",\"aws-lc-rs/fips\"],\"aws-lc-rs-unstable\":[\"aws-lc-rs\"],\"default\":[\"std\"],\"ring\":[\"dep:ring\"],\"std\":[\"alloc\",\"pki-types/std\"]}}", "rustls_0.23.40": "{\"dependencies\":[{\"default_features\":false,\"name\":\"aws-lc-rs\",\"optional\":true,\"req\":\"^1.14\"},{\"kind\":\"dev\",\"name\":\"base64\",\"req\":\"^0.22\"},{\"kind\":\"dev\",\"name\":\"bencher\",\"req\":\"^0.1.5\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"brotli\",\"optional\":true,\"req\":\"^8\"},{\"name\":\"brotli-decompressor\",\"optional\":true,\"req\":\"^5.0.0\"},{\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11\"},{\"default_features\":false,\"features\":[\"default-hasher\",\"inline-more\"],\"name\":\"hashbrown\",\"optional\":true,\"req\":\"^0.15\"},{\"kind\":\"dev\",\"name\":\"hex\",\"req\":\"^0.4\"},{\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.8\"},{\"kind\":\"dev\",\"name\":\"log\",\"req\":\"^0.4.8\"},{\"kind\":\"dev\",\"name\":\"macro_rules_attribute\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"num-bigint\",\"req\":\"^0.4.4\"},{\"default_features\":false,\"features\":[\"alloc\",\"race\"],\"name\":\"once_cell\",\"req\":\"^1.16\"},{\"features\":[\"alloc\"],\"name\":\"pki-types\",\"package\":\"rustls-pki-types\",\"req\":\"^1.12\"},{\"default_features\":false,\"features\":[\"pem\",\"aws_lc_rs\"],\"kind\":\"dev\",\"name\":\"rcgen\",\"req\":\"^0.14\"},{\"name\":\"ring\",\"optional\":true,\"req\":\"^0.17\"},{\"kind\":\"build\",\"name\":\"rustversion\",\"optional\":true,\"req\":\"^1.0.6\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1\"},{\"default_features\":false,\"name\":\"subtle\",\"req\":\"^2.5.0\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"time\",\"req\":\"^0.3.6\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"webpki\",\"package\":\"rustls-webpki\",\"req\":\"^0.103.5\"},{\"kind\":\"dev\",\"name\":\"webpki-roots\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"x509-parser\",\"req\":\"^0.17\"},{\"name\":\"zeroize\",\"req\":\"^1.8\"},{\"name\":\"zlib-rs\",\"optional\":true,\"req\":\"^0.6\"}],\"features\":{\"aws-lc-rs\":[\"aws_lc_rs\"],\"aws_lc_rs\":[\"dep:aws-lc-rs\",\"webpki/aws-lc-rs\",\"aws-lc-rs/aws-lc-sys\",\"aws-lc-rs/prebuilt-nasm\"],\"brotli\":[\"dep:brotli\",\"dep:brotli-decompressor\",\"std\"],\"custom-provider\":[],\"default\":[\"aws_lc_rs\",\"logging\",\"prefer-post-quantum\",\"std\",\"tls12\"],\"fips\":[\"aws_lc_rs\",\"aws-lc-rs?/fips\",\"webpki/aws-lc-rs-fips\"],\"logging\":[\"log\"],\"prefer-post-quantum\":[\"aws_lc_rs\"],\"read_buf\":[\"rustversion\",\"std\"],\"ring\":[\"dep:ring\",\"webpki/ring\"],\"std\":[\"webpki/std\",\"pki-types/std\",\"once_cell/std\"],\"tls12\":[],\"zlib\":[\"dep:zlib-rs\"]}}", - "rustls_0.23.45": "{\"dependencies\":[{\"default_features\":false,\"name\":\"aws-lc-rs\",\"optional\":true,\"req\":\"^1.18\"},{\"kind\":\"dev\",\"name\":\"base64\",\"req\":\"^0.22\"},{\"kind\":\"dev\",\"name\":\"bencher\",\"req\":\"^0.1.5\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"brotli\",\"optional\":true,\"req\":\"^8\"},{\"name\":\"brotli-decompressor\",\"optional\":true,\"req\":\"^5.0.0\"},{\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11\"},{\"default_features\":false,\"features\":[\"default-hasher\",\"inline-more\"],\"name\":\"hashbrown\",\"optional\":true,\"req\":\"^0.15\"},{\"kind\":\"dev\",\"name\":\"hex\",\"req\":\"^0.4\"},{\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.8\"},{\"kind\":\"dev\",\"name\":\"log\",\"req\":\"^0.4.8\"},{\"kind\":\"dev\",\"name\":\"macro_rules_attribute\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"num-bigint\",\"req\":\"^0.4.4\"},{\"default_features\":false,\"features\":[\"alloc\",\"race\"],\"name\":\"once_cell\",\"req\":\"^1.16\"},{\"features\":[\"alloc\"],\"name\":\"pki-types\",\"package\":\"rustls-pki-types\",\"req\":\"^1.12\"},{\"default_features\":false,\"features\":[\"pem\",\"aws_lc_rs\"],\"kind\":\"dev\",\"name\":\"rcgen\",\"req\":\"^0.14\"},{\"name\":\"ring\",\"optional\":true,\"req\":\"^0.17\"},{\"kind\":\"build\",\"name\":\"rustversion\",\"optional\":true,\"req\":\"^1.0.6\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1\"},{\"default_features\":false,\"name\":\"subtle\",\"req\":\"^2.5.0\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"time\",\"req\":\"^0.3.6\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"webpki\",\"package\":\"rustls-webpki\",\"req\":\"^0.103.14\"},{\"kind\":\"dev\",\"name\":\"webpki-roots\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"x509-parser\",\"req\":\"^0.17\"},{\"name\":\"zeroize\",\"req\":\"^1.8\"},{\"name\":\"zlib-rs\",\"optional\":true,\"req\":\"^0.6\"}],\"features\":{\"aws-lc-rs\":[\"aws_lc_rs\"],\"aws_lc_rs\":[\"dep:aws-lc-rs\",\"webpki/aws-lc-rs\",\"aws-lc-rs/aws-lc-sys\",\"aws-lc-rs/prebuilt-nasm\"],\"brotli\":[\"dep:brotli\",\"dep:brotli-decompressor\",\"std\"],\"custom-provider\":[],\"default\":[\"aws_lc_rs\",\"logging\",\"prefer-post-quantum\",\"std\",\"tls12\"],\"fips\":[\"aws_lc_rs\",\"aws-lc-rs?/fips\",\"webpki/aws-lc-rs-fips\"],\"logging\":[\"log\"],\"prefer-post-quantum\":[\"aws_lc_rs\"],\"read_buf\":[\"rustversion\",\"std\"],\"ring\":[\"dep:ring\",\"webpki/ring\"],\"std\":[\"webpki/std\",\"pki-types/std\",\"once_cell/std\"],\"tls12\":[],\"zlib\":[\"dep:zlib-rs\"]}}", + "rustls_0.23.46": "{\"dependencies\":[{\"default_features\":false,\"name\":\"aws-lc-rs\",\"optional\":true,\"req\":\"^1.18\"},{\"kind\":\"dev\",\"name\":\"base64\",\"req\":\"^0.22\"},{\"kind\":\"dev\",\"name\":\"bencher\",\"req\":\"^0.1.5\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"brotli\",\"optional\":true,\"req\":\"^8\"},{\"name\":\"brotli-decompressor\",\"optional\":true,\"req\":\"^5.0.0\"},{\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11\"},{\"default_features\":false,\"features\":[\"default-hasher\",\"inline-more\"],\"name\":\"hashbrown\",\"optional\":true,\"req\":\"^0.15\"},{\"kind\":\"dev\",\"name\":\"hex\",\"req\":\"^0.4\"},{\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.8\"},{\"kind\":\"dev\",\"name\":\"log\",\"req\":\"^0.4.8\"},{\"kind\":\"dev\",\"name\":\"macro_rules_attribute\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"num-bigint\",\"req\":\"^0.4.4\"},{\"default_features\":false,\"features\":[\"alloc\",\"race\"],\"name\":\"once_cell\",\"req\":\"^1.16\"},{\"features\":[\"alloc\"],\"name\":\"pki-types\",\"package\":\"rustls-pki-types\",\"req\":\"^1.12\"},{\"default_features\":false,\"features\":[\"pem\",\"aws_lc_rs\"],\"kind\":\"dev\",\"name\":\"rcgen\",\"req\":\"^0.14\"},{\"name\":\"ring\",\"optional\":true,\"req\":\"^0.17\"},{\"kind\":\"build\",\"name\":\"rustversion\",\"optional\":true,\"req\":\"^1.0.6\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1\"},{\"default_features\":false,\"name\":\"subtle\",\"req\":\"^2.5.0\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"time\",\"req\":\"^0.3.6\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"webpki\",\"package\":\"rustls-webpki\",\"req\":\"^0.103.14\"},{\"kind\":\"dev\",\"name\":\"webpki-roots\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"x509-parser\",\"req\":\"^0.17\"},{\"name\":\"zeroize\",\"req\":\"^1.8\"},{\"name\":\"zlib-rs\",\"optional\":true,\"req\":\"^0.6\"}],\"features\":{\"aws-lc-rs\":[\"aws_lc_rs\"],\"aws_lc_rs\":[\"dep:aws-lc-rs\",\"webpki/aws-lc-rs\",\"aws-lc-rs/aws-lc-sys\",\"aws-lc-rs/prebuilt-nasm\"],\"brotli\":[\"dep:brotli\",\"dep:brotli-decompressor\",\"std\"],\"custom-provider\":[],\"default\":[\"aws_lc_rs\",\"logging\",\"prefer-post-quantum\",\"std\",\"tls12\"],\"fips\":[\"aws_lc_rs\",\"aws-lc-rs?/fips\",\"webpki/aws-lc-rs-fips\"],\"logging\":[\"log\"],\"prefer-post-quantum\":[\"aws_lc_rs\"],\"read_buf\":[\"rustversion\",\"std\"],\"ring\":[\"dep:ring\",\"webpki/ring\"],\"std\":[\"webpki/std\",\"pki-types/std\",\"once_cell/std\"],\"tls12\":[],\"zlib\":[\"dep:zlib-rs\"]}}", "rustversion_1.0.22": "{\"dependencies\":[{\"features\":[\"diff\"],\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.49\"}],\"features\":{}}", "rustyline_14.0.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"assert_matches\",\"req\":\"^1.2\"},{\"name\":\"bitflags\",\"req\":\"^2.0\"},{\"default_features\":false,\"name\":\"buffer-redux\",\"optional\":true,\"req\":\"^1.0\",\"target\":\"cfg(unix)\"},{\"name\":\"cfg-if\",\"req\":\"^1.0\"},{\"name\":\"clipboard-win\",\"req\":\"^5.0\",\"target\":\"cfg(windows)\"},{\"kind\":\"dev\",\"name\":\"doc-comment\",\"req\":\"^0.3\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11\"},{\"name\":\"fd-lock\",\"optional\":true,\"req\":\"^4.0.0\"},{\"name\":\"home\",\"optional\":true,\"req\":\"^0.5.4\"},{\"name\":\"libc\",\"req\":\"^0.2\"},{\"name\":\"log\",\"req\":\"^0.4\"},{\"name\":\"memchr\",\"req\":\"^2.0\"},{\"default_features\":false,\"features\":[\"fs\",\"ioctl\",\"poll\",\"signal\",\"term\"],\"name\":\"nix\",\"req\":\"^0.28\",\"target\":\"cfg(unix)\"},{\"name\":\"radix_trie\",\"optional\":true,\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"},{\"name\":\"regex\",\"optional\":true,\"req\":\"^1.5.5\"},{\"default_features\":false,\"features\":[\"bundled\",\"backup\"],\"name\":\"rusqlite\",\"optional\":true,\"req\":\"^0.31.0\"},{\"name\":\"rustyline-derive\",\"optional\":true,\"req\":\"^0.10.0\"},{\"default_features\":false,\"name\":\"signal-hook\",\"optional\":true,\"req\":\"^0.3\",\"target\":\"cfg(unix)\"},{\"default_features\":false,\"name\":\"skim\",\"optional\":true,\"req\":\"^0.10\",\"target\":\"cfg(unix)\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.1.0\"},{\"name\":\"termios\",\"optional\":true,\"req\":\"^0.3.3\",\"target\":\"cfg(unix)\"},{\"name\":\"unicode-segmentation\",\"req\":\"^1.0\"},{\"name\":\"unicode-width\",\"req\":\"^0.1\"},{\"name\":\"utf8parse\",\"req\":\"^0.2\",\"target\":\"cfg(unix)\"},{\"features\":[\"Win32_Foundation\",\"Win32_System_Console\",\"Win32_Security\",\"Win32_System_Threading\",\"Win32_UI_Input_KeyboardAndMouse\"],\"name\":\"windows-sys\",\"req\":\"^0.52.0\",\"target\":\"cfg(windows)\"}],\"features\":{\"case_insensitive_history_search\":[\"regex\"],\"custom-bindings\":[\"radix_trie\"],\"default\":[\"custom-bindings\",\"with-dirs\",\"with-file-history\"],\"derive\":[\"rustyline-derive\"],\"with-dirs\":[\"home\"],\"with-file-history\":[\"fd-lock\"],\"with-fuzzy\":[\"skim\"],\"with-sqlite-history\":[\"rusqlite\"]}}", "ryu_1.0.22": "{\"dependencies\":[{\"default_features\":false,\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8\",\"target\":\"cfg(not(miri))\"},{\"name\":\"no-panic\",\"optional\":true,\"req\":\"^0.1\"},{\"kind\":\"dev\",\"name\":\"num_cpus\",\"req\":\"^1.8\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.9\"},{\"kind\":\"dev\",\"name\":\"rand_xorshift\",\"req\":\"^0.4\"}],\"features\":{\"small\":[]}}", diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index 9b4f7e5a07..eb392ab371 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -13578,9 +13578,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.45" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "aws-lc-rs", "log", diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml index 465e7aeb4f..b4ad791915 100644 --- a/codex-rs/Cargo.toml +++ b/codex-rs/Cargo.toml @@ -451,7 +451,7 @@ reqwest = { version = "0.12", features = ["cookies"] } rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", rev = "4048ac40e958fb1a7d614617a2ae8d26666ee2fa", version = "=3.5.1", default-features = false } runfiles = { git = "https://github.com/dzbarsky/rules_rust", rev = "b56cbaa8465e74127f1ea216f813cd377295ad81" } rustix = { version = "1.1.4", features = ["net"] } -rustls = { version = "0.23.45", default-features = false, features = [ +rustls = { version = "0.23.46", default-features = false, features = [ "aws_lc_rs", "std", ] } From c6327eba6a5a31304c289f2121cc74f56f9a441b Mon Sep 17 00:00:00 2001 From: bbrown-oai Date: Wed, 14 Oct 2026 14:28:18 +0000 Subject: [PATCH 043/155] Filter rollout filenames before checking compressed siblings (#53997) ## Why Filesystem lookups by thread or rollout ID check whether unrelated compressed rollouts have an uncompressed sibling. These checks are unnecessary when the filename does not match the requested ID. ## What changed Apply the thread or rollout ID filter before resolving plain/compressed file precedence. Preserve preference for uncompressed files and selection of the newest rollout for a thread. ## Testing Extend lookup tests to cover unrelated compressed files, uncompressed-file precedence, missing rollout IDs, and rollout ID tie-breaking for files with the same timestamp. GitOrigin-RevId: 5bdb56ebec8031fceb5f6adbfcf644ad010e52f2 --- codex-rs/rollout/src/compression_tests.rs | 32 +++++++++++ codex-rs/rollout/src/list.rs | 65 +++++++++++++---------- codex-rs/rollout/src/tests.rs | 7 ++- 3 files changed, 75 insertions(+), 29 deletions(-) diff --git a/codex-rs/rollout/src/compression_tests.rs b/codex-rs/rollout/src/compression_tests.rs index 40ec1ceb64..22e1d66744 100644 --- a/codex-rs/rollout/src/compression_tests.rs +++ b/codex-rs/rollout/src/compression_tests.rs @@ -777,6 +777,14 @@ async fn find_thread_path_by_id_handles_compressed_rollout_filenames() -> anyhow compress_now(&rollout_path)?; let compressed_path = compressed_rollout_path(&rollout_path); + for id in 1000..1064 { + let unrelated_path = compressed_rollout_path(&rollout_path.with_file_name(format!( + "rollout-2025-01-03T12-00-00-{}.jsonl", + Uuid::from_u128(id) + ))); + fs::write(unrelated_path, zstd::stream::encode_all(&b""[..], 0)?)?; + } + assert_eq!( crate::find_thread_path_by_id_str( home.path(), @@ -784,8 +792,32 @@ async fn find_thread_path_by_id_handles_compressed_rollout_filenames() -> anyhow /*state_db_ctx*/ None ) .await?, + Some(compressed_path.clone()) + ); + assert_eq!( + crate::find_rollout_path_by_rollout_id(home.path(), thread_id).await?, Some(compressed_path) ); + + write_rollout(&rollout_path, thread_id, "plain filename lookup")?; + assert_eq!( + crate::find_thread_path_by_id_str( + home.path(), + &uuid.to_string(), + /*state_db_ctx*/ None + ) + .await?, + Some(rollout_path.clone()) + ); + assert_eq!( + crate::find_rollout_path_by_rollout_id(home.path(), thread_id).await?, + Some(rollout_path) + ); + let missing_rollout_id = ThreadId::from_string(&Uuid::from_u128(2000).to_string())?; + assert_eq!( + crate::find_rollout_path_by_rollout_id(home.path(), missing_rollout_id).await?, + None + ); assert_eq!( crate::find_thread_path_by_id_str(home.path(), "not-a-uuid", /*state_db_ctx*/ None).await?, None diff --git a/codex-rs/rollout/src/list.rs b/codex-rs/rollout/src/list.rs index bfed9a7097..bdead9e5cb 100644 --- a/codex-rs/rollout/src/list.rs +++ b/codex-rs/rollout/src/list.rs @@ -1417,31 +1417,33 @@ async fn find_thread_path_by_id_from_filenames( return Ok(None); }; let mut newest = None; - visit_rollout_filenames::<()>(root, |file_name, path| { - if file_name.thread_id() != target { - return ControlFlow::Continue(()); - } - let rollout_id = Uuid::parse_str(&file_name.rollout_id().to_string()).ok(); - let Some(rollout_id) = rollout_id else { - return ControlFlow::Continue(()); - }; - // Rollout filenames only encode timestamps to second precision, so use the UUIDv7 - // rollout ID as a deterministic tie-breaker when multiple files are created in the same - // second. - let candidate = (file_name.timestamp(), rollout_id, path); - if newest.as_ref().is_none_or(|(timestamp, id, _)| { - candidate.0 > *timestamp || (candidate.0 == *timestamp && candidate.1 > *id) - }) { - newest = Some(candidate); - } - ControlFlow::Continue(()) - }) + visit_rollout_filenames::<()>( + root, + |file_name| file_name.thread_id() == target, + |file_name, path| { + let rollout_id = Uuid::parse_str(&file_name.rollout_id().to_string()).ok(); + let Some(rollout_id) = rollout_id else { + return ControlFlow::Continue(()); + }; + // Rollout filenames only encode timestamps to second precision, so use the UUIDv7 + // rollout ID as a deterministic tie-breaker when multiple files are created in the same + // second. + let candidate = (file_name.timestamp(), rollout_id, path); + if newest.as_ref().is_none_or(|(timestamp, id, _)| { + candidate.0 > *timestamp || (candidate.0 == *timestamp && candidate.1 > *id) + }) { + newest = Some(candidate); + } + ControlFlow::Continue(()) + }, + ) .await?; Ok(newest.map(|(_timestamp, _id, path)| path)) } async fn visit_rollout_filenames( root: &Path, + matches: impl Fn(&RolloutFileName) -> bool, mut visitor: impl FnMut(RolloutFileName, PathBuf) -> ControlFlow, ) -> io::Result> { let mut stack = vec![root.to_path_buf()]; @@ -1461,10 +1463,19 @@ async fn visit_rollout_filenames( if !file_type.is_file() { continue; } - let Some(rollout_file) = compression::RolloutFile::from_path(path) else { + // Check filename matches before RolloutFile::from_path(), which calls + // Path::exists() to check for a compressed rollout's plain sibling. + let Some(file_name) = path + .file_name() + .and_then(OsStr::to_str) + .and_then(RolloutFileName::parse) + else { continue; }; - let Some(file_name) = RolloutFileName::parse(rollout_file.plain_file_name()) else { + if !matches(&file_name) { + continue; + } + let Some(rollout_file) = compression::RolloutFile::from_path(path) else { continue; }; if let ControlFlow::Break(found) = visitor(file_name, rollout_file.into_path()) { @@ -1479,13 +1490,11 @@ async fn find_rollout_path_by_rollout_id_from_filenames( root: &Path, rollout_id: RolloutId, ) -> io::Result> { - visit_rollout_filenames(root, |file_name, path| { - if file_name.rollout_id() == rollout_id { - ControlFlow::Break(path) - } else { - ControlFlow::Continue(()) - } - }) + visit_rollout_filenames( + root, + |file_name| file_name.rollout_id() == rollout_id, + |_file_name, path| ControlFlow::Break(path), + ) .await } diff --git a/codex-rs/rollout/src/tests.rs b/codex-rs/rollout/src/tests.rs index 3f61385a97..79202c45bb 100644 --- a/codex-rs/rollout/src/tests.rs +++ b/codex-rs/rollout/src/tests.rs @@ -227,12 +227,17 @@ async fn filesystem_lookup_distinguishes_thread_ids_from_rollout_ids() { "sessions/2025/01/04/rollout-{reverted_ts}-{thread_uuid}_{rollout_uuid}.jsonl" )); fs::rename(reverted_source, reverted_path.as_path()).unwrap(); + let subsequent_rollout_uuid = Uuid::from_u128(403); + let subsequent_path = home.join(format!( + "sessions/2025/01/04/rollout-{reverted_ts}-{thread_uuid}_{subsequent_rollout_uuid}.jsonl" + )); + fs::copy(&reverted_path, &subsequent_path).unwrap(); assert_eq!( find_thread_path_by_id_str(home, &thread_uuid.to_string(), /*state_db_ctx*/ None) .await .unwrap(), - Some(reverted_path.clone()) + Some(subsequent_path) ); assert_eq!( find_rollout_path_by_rollout_id(home, thread_id_from_uuid(rollout_uuid)) From 0c02887a0c4d09a99eb8e078aa12ff3edc9eb331 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 14:49:32 +0000 Subject: [PATCH 044/155] Include compressed rollouts in doctor storage statistics (#54003) ## Why Doctor's rollout statistics only counted `.jsonl` files, omitting storage used by compressed `.jsonl.zst` rollouts. ## What changed Recognize compressed rollouts when collecting active and archived file counts, total bytes, and average bytes. Count both physical files when plain and compressed representations coexist, while continuing to ignore unrelated files and compression temporary files. ## Testing Extend the rollout statistics test to cover nested plain and compressed files, coexisting representations, archived compressed rollouts, and ignored files, with a snapshot of the reported counts and sizes. GitOrigin-RevId: 46197f9741884668b50fb6a1d0a07060020f12ed --- codex-rs/cli/src/doctor.rs | 39 ++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/codex-rs/cli/src/doctor.rs b/codex-rs/cli/src/doctor.rs index 533cf0d4e8..10d1cefc92 100644 --- a/codex-rs/cli/src/doctor.rs +++ b/codex-rs/cli/src/doctor.rs @@ -2273,6 +2273,7 @@ fn collect_rollout_stats_inner(path: &Path, stats: &mut RolloutStats) { } fn is_rollout_file(path: &Path) -> bool { + let path = codex_rollout::plain_rollout_path(path); path.extension() == Some(OsStr::new("jsonl")) && path .file_name() @@ -3846,7 +3847,7 @@ mod tests { } #[test] - fn collect_rollout_stats_counts_nested_rollout_files() { + fn rollout_stats_details_count_plain_and_compressed_files() { let temp = tempfile::tempdir().expect("create temp dir"); let nested = temp .path() @@ -3860,14 +3861,40 @@ mod tests { "12345", ) .expect("write rollout file"); + // Storage totals include both physical files if both representations exist. + std::fs::write( + nested.join("rollout-2026-05-13T00-00-00-test.jsonl.zst"), + "1234567", + ) + .expect("write compressed sibling"); + std::fs::write( + nested.join("rollout-2026-05-13T01-00-00-compressed.jsonl.zst"), + "123", + ) + .expect("write compressed rollout"); std::fs::write(nested.join("not-a-rollout.jsonl"), "ignored").expect("write ignored jsonl"); + std::fs::write(nested.join("not-a-rollout.jsonl.zst"), "ignored") + .expect("write ignored compressed file"); + std::fs::write( + nested.join("rollout-2026-05-13T01-00-00-compressed.jsonl.zst.tmp"), + "ignored", + ) + .expect("write compression temp file"); - let stats = collect_rollout_stats(&temp.path().join("sessions")); + let archived = temp.path().join("archived_sessions"); + std::fs::create_dir(&archived).expect("create archived rollout dir"); + std::fs::write( + archived.join("rollout-2026-05-13T02-00-00-archived.jsonl.zst"), + "1234", + ) + .expect("write archived compressed rollout"); - assert_eq!(stats.files, 1); - assert_eq!(stats.total_bytes, 5); - assert_eq!(stats.average_bytes(), 5); - assert_eq!(stats.error, None); + let mut details = Vec::new(); + rollout_stats_details(&mut details, temp.path()); + insta::assert_snapshot!(details.join("\n"), @r" + active rollout files: 3 files, 15 total bytes, 5 average bytes + archived rollout files: 1 files, 4 total bytes, 4 average bytes + "); } #[tokio::test] From 76ed3b484d62ccceb9fa512ff4dd139f421814c3 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 15:13:39 +0000 Subject: [PATCH 045/155] Fix session lookup and resume after rollout compression (#54008) ## Why Compression replaces `.jsonl` rollout files with `.jsonl.zst` files, so checking only the original path can skip existing sessions. Compression can also replace a file between path lookup and canonicalization. ## What changed - Resolve compressed rollout alternatives when selecting the latest local session. - Retry rollout path resolution when files disappear during lookup or canonicalization. ## Testing Extend coverage to verify latest-session filtering after startup compression and resuming a compressed rollout through its original relative `.jsonl` path with preserved turns. GitOrigin-RevId: a4d5c399567ab4c7cd8aaa8b5f38821ee8b8d802 --- .../tests/suite/v2/rollout_compress_tests.rs | 35 ++++++++++++++- .../thread-store/src/local/read_thread.rs | 44 ++++++++++++++----- codex-rs/tui/src/lib.rs | 33 ++++++++++++-- 3 files changed, 95 insertions(+), 17 deletions(-) diff --git a/codex-rs/app-server/tests/suite/v2/rollout_compress_tests.rs b/codex-rs/app-server/tests/suite/v2/rollout_compress_tests.rs index 46ad929a22..f33f956a8b 100644 --- a/codex-rs/app-server/tests/suite/v2/rollout_compress_tests.rs +++ b/codex-rs/app-server/tests/suite/v2/rollout_compress_tests.rs @@ -1,11 +1,13 @@ -//! Exercises the compression trigger through the public app-server API. +//! Exercises compression and subsequent resume through the public app-server API. use std::time::Duration; use anyhow::Result; use app_test_support::DEFAULT_CLIENT_NAME; +use app_test_support::MockResponsesConfig; use app_test_support::TestAppServer; use app_test_support::create_fake_rollout; +use app_test_support::create_mock_responses_server_repeating_assistant; use app_test_support::rollout_path; use codex_app_server_protocol::ClientInfo; use codex_app_server_protocol::ClientRequest; @@ -14,6 +16,10 @@ use codex_app_server_protocol::JSONRPCErrorError; use codex_app_server_protocol::JSONRPCMessage; use codex_app_server_protocol::RequestId; use codex_app_server_protocol::RolloutCompressResponse; +use codex_app_server_protocol::ThreadReadParams; +use codex_app_server_protocol::ThreadReadResponse; +use codex_app_server_protocol::ThreadResumeParams; +use codex_app_server_protocol::ThreadResumeResponse; use pretty_assertions::assert_eq; use tempfile::TempDir; use tokio::time::timeout; @@ -22,7 +28,9 @@ const READ_TIMEOUT: Duration = Duration::from_secs(/*secs*/ 20); #[tokio::test] async fn rollout_compress_runs_after_startup_with_compression_disabled() -> Result<()> { + let server = create_mock_responses_server_repeating_assistant("Done").await; let codex_home = TempDir::new()?; + MockResponsesConfig::new(&server.uri()).write(codex_home.path())?; let mut app_server = TestAppServer::builder() .with_codex_home(codex_home.path()) .with_args(&["-c", "features.local_thread_store_compression=false"]) @@ -35,12 +43,21 @@ async fn rollout_compress_runs_after_startup_with_compression_disabled() -> Resu filename_ts, "2025-01-05T12:00:00Z", "Saved user message", - /*model_provider*/ None, + Some("mock_provider"), /*git_info*/ None, )?; let path = rollout_path(codex_home.path(), filename_ts, &thread_id); let original = std::fs::read_to_string(&path)?; let compressed_path = path.with_extension("jsonl.zst"); + let before: ThreadReadResponse = app_server + .request(|request_id| ClientRequest::ThreadRead { + request_id, + params: ThreadReadParams { + thread_id: thread_id.clone(), + include_turns: true, + }, + }) + .await?; let response: RolloutCompressResponse = app_server .request(|request_id| ClientRequest::RolloutCompress { @@ -61,7 +78,21 @@ async fn rollout_compress_runs_after_startup_with_compression_disabled() -> Resu while let Some(line) = reader.next_line().await? { lines.push(line); } + drop(reader); assert_eq!(lines.join("\n") + "\n", original); + let relative_path = path.strip_prefix(codex_home.path())?.to_path_buf(); + let resumed: ThreadResumeResponse = app_server + .request(|request_id| ClientRequest::ThreadResume { + request_id, + params: ThreadResumeParams { + thread_id: thread_id.clone(), + path: Some(relative_path), + ..Default::default() + }, + }) + .await?; + assert_eq!(resumed.thread.id, thread_id); + assert_eq!(resumed.thread.turns, before.thread.turns); Ok(()) } diff --git a/codex-rs/thread-store/src/local/read_thread.rs b/codex-rs/thread-store/src/local/read_thread.rs index 3401702d75..c5dd2e085d 100644 --- a/codex-rs/thread-store/src/local/read_thread.rs +++ b/codex-rs/thread-store/src/local/read_thread.rs @@ -227,17 +227,39 @@ pub(super) async fn resolve_requested_rollout_path( } _ => {} } - let Some(path) = codex_rollout::existing_rollout_path(path.as_path()).await else { - return Err(ThreadStoreError::InvalidRequest { - message: format!( - "failed to resolve rollout path `{}`: file does not exist", - path.display() - ), - }); - }; - std::fs::canonicalize(path.as_path()).map_err(|err| ThreadStoreError::InvalidRequest { - message: format!("failed to resolve rollout path `{}`: {err}", path.display()), - }) + // Compression can replace the physical file after lookup, before canonicalization. + // Resolve again from the requested path so either representation remains usable. + let mut retries_remaining = 3; + loop { + let resolved_path = match codex_rollout::existing_rollout_path(path.as_path()).await { + Some(path) => path, + None if retries_remaining > 0 => { + retries_remaining -= 1; + continue; + } + None => { + return Err(ThreadStoreError::InvalidRequest { + message: format!( + "failed to resolve rollout path `{}`: file does not exist", + path.display() + ), + }); + } + }; + match std::fs::canonicalize(&resolved_path) { + Err(err) if err.kind() == std::io::ErrorKind::NotFound && retries_remaining > 0 => { + retries_remaining -= 1; + } + result => { + return result.map_err(|err| ThreadStoreError::InvalidRequest { + message: format!( + "failed to resolve rollout path `{}`: {err}", + resolved_path.display() + ), + }); + } + } + } } async fn attach_history_if_requested( diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs index 545c0d48d3..7a12cc9767 100644 --- a/codex-rs/tui/src/lib.rs +++ b/codex-rs/tui/src/lib.rs @@ -864,10 +864,14 @@ async fn lookup_latest_session_target_with_app_server( .data .into_iter() .find_map(session_target_from_app_server_thread); - if target.as_ref().is_some_and(|target| { - uses_remote_workspace || target.path.as_deref().is_some_and(std::path::Path::exists) - }) { - return Ok(target); + if let Some(target) = target + && (uses_remote_workspace + || match target.path.as_deref() { + Some(path) => codex_rollout::existing_rollout_path(path).await.is_some(), + None => false, + }) + { + return Ok(Some(target)); } } Ok(None) @@ -3511,6 +3515,9 @@ requires_openai_auth = {requires_openai_auth} config .features .set_enabled(codex_features::Feature::Worktrees, /*enabled*/ false)?; + config + .features + .enable(codex_features::Feature::LocalThreadStoreCompression)?; let model_provider = config.model_provider_id.as_str(); let project_thread_id = write_session_rollout( temp_dir.path(), @@ -3536,6 +3543,14 @@ requires_openai_auth = {requires_openai_auth} model_provider, &other_cwd, )?; + let rollout_paths = [ + ("2025-01-02T10-00-00", project_thread_id), + ("2025-01-02T11-00-00", linked_thread_id), + ("2025-01-02T12-00-00", other_thread_id), + ] + .map(|(timestamp, thread_id)| { + app_test_support::rollout_path(temp_dir.path(), timestamp, &thread_id.to_string()) + }); let mut app_server = AppServerSession::new( codex_app_server_client::AppServerClient::InProcess( @@ -3543,6 +3558,16 @@ requires_openai_auth = {requires_openai_auth} ), ThreadParamsMode::Embedded, ); + // Exercise the logical .jsonl paths returned by thread/list after startup compression. + tokio::time::timeout(std::time::Duration::from_secs(/*secs*/ 30), async { + while rollout_paths + .iter() + .any(|path| path.exists() || !path.with_extension("jsonl.zst").exists()) + { + tokio::time::sleep(std::time::Duration::from_millis(/*millis*/ 10)).await; + } + }) + .await?; let filter_cwd = latest_session_cwd_filter( /*uses_remote_workspace*/ false, /*remote_cwd_override*/ None, &config, /*show_all*/ false, From 81aee8c86ba2549e53f82ea56f163c3e450fb55a Mon Sep 17 00:00:00 2001 From: iceweasel-oai Date: Wed, 14 Oct 2026 16:25:04 +0000 Subject: [PATCH 046/155] Preserve Windows startup variables and MXC child environment defaults (#54027) ## Why Windows MXC needs valid host startup variables, while an empty child environment must remain empty for the SDK to select Windows user-profile defaults. ## What changed - Replace caller overrides of `SystemDrive` and `LOCALAPPDATA` case-insensitively with nonempty Unicode host values, failing before launch if either is unavailable. - Track whether the original child environment was empty, ignoring launcher transport keys. Supply host `SystemRoot` for launcher bootstrap in that case, then clear the bootstrap environment before the SDK selects defaults. ## Testing Extend transport tests to cover host-value replacement and preservation of empty child environments. Strengthen the PowerShell fallback RPC test to require `SystemDrive`, `LOCALAPPDATA`, `USERPROFILE`, and `PATH` in the child. GitOrigin-RevId: a097e1079069ef897ebb5ba5e63546328c5faeaa --- .../tests/exec_process/windows_sandbox.rs | 2 +- codex-rs/mxc-sandbox/README.md | 13 ++++++++-- codex-rs/mxc-sandbox/src/lib.rs | 6 +++++ codex-rs/mxc-sandbox/src/policy_tests.rs | 4 ++++ codex-rs/mxc-sandbox/src/transport.rs | 24 ++++++++++++++++--- codex-rs/mxc-sandbox/src/transport_tests.rs | 9 +++++++ 6 files changed, 52 insertions(+), 6 deletions(-) diff --git a/codex-rs/exec-server/tests/exec_process/windows_sandbox.rs b/codex-rs/exec-server/tests/exec_process/windows_sandbox.rs index 3a5ceb9e3d..f34aa493ea 100644 --- a/codex-rs/exec-server/tests/exec_process/windows_sandbox.rs +++ b/codex-rs/exec-server/tests/exec_process/windows_sandbox.rs @@ -48,7 +48,7 @@ async fn powershell_alias_falls_back_without_primary_runtime_over_rpc( .into_owned(), "-NoProfile".to_owned(), "-Command".to_owned(), - "Write-Output 'fallback-ok'".to_owned(), + "if (!$env:SystemDrive -or !$env:LOCALAPPDATA -or !$env:USERPROFILE -or !$env:PATH) { throw 'missing Windows defaults' }; Write-Output 'fallback-ok'".to_owned(), ], cwd, env_policy: None, diff --git a/codex-rs/mxc-sandbox/README.md b/codex-rs/mxc-sandbox/README.md index 0f1f75117e..c67c0bbb62 100644 --- a/codex-rs/mxc-sandbox/README.md +++ b/codex-rs/mxc-sandbox/README.md @@ -45,6 +45,13 @@ request: the canonical `PermissionProfile`, policy cwd, proxy context, and exact argv. The helper inherits command cwd, environment, and stdio from the shared process path; policy cwd can differ from command cwd. +Windows MXC reserves `SystemDrive` and `LOCALAPPDATA` for the host's validated, +nonempty values in both wrapper and explicit child environments. Caller +overrides are replaced case-insensitively; unavailable host values fail before +launch with a diagnostic naming the variable. +Windows may virtualize the child's `LOCALAPPDATA` into a sandbox directory +beneath the host profile. + The request uses launcher-only environment chunks to leave Windows' command-line budget to the workload. Payloads are limited to 1,000,000 UTF-8 bytes and chunks to 4096 bytes; the helper removes them before native process creation. Use @@ -70,8 +77,10 @@ to 4096 bytes; the helper removes them before native process creation. Use command are not implicitly granted. - The native API represents paths and environment values as Unicode strings. Non-Unicode values fail instead of undergoing lossy conversion. -- An empty child environment uses the Windows user-profile defaults. Nonempty - environments remain explicit. +- An empty child environment still uses the Windows user-profile defaults. + Supplying only two keys would turn it into an incomplete explicit environment, + so the wrapper's bootstrap values are removed before the SDK selects defaults. + Nonempty environments remain explicit except for these two host-owned values. - The upstream runner terminates remaining descendants when the foreground process exits, as well as on cancellation. Both existing Windows backends preserve descendants after normal exit, so detached servers currently lose diff --git a/codex-rs/mxc-sandbox/src/lib.rs b/codex-rs/mxc-sandbox/src/lib.rs index e19d67d08c..5dc92bdeb4 100644 --- a/codex-rs/mxc-sandbox/src/lib.rs +++ b/codex-rs/mxc-sandbox/src/lib.rs @@ -18,6 +18,7 @@ use anyhow::Result; use anyhow::ensure; use codex_network_proxy::ManagedNetworkSandboxContext; use codex_protocol::models::PermissionProfile; +use codex_windows_sandbox::environment_transport; use serde::Deserialize; use serde::Serialize; @@ -46,6 +47,8 @@ struct MxcCommand { sandbox_policy_cwd: PathBuf, managed_network: Option, command: Vec, + #[serde(default)] + default_child_env: bool, } /// Inputs used to build an MXC helper invocation. @@ -80,6 +83,9 @@ pub fn create_command_args(args: CreateMxcCommandArgsParams<'_>) -> Result MxcCommand { sandbox_policy_cwd: cwd.to_owned(), managed_network: None, command: vec!["program.exe".to_owned(), "--arg".to_owned()], + default_child_env: false, } } @@ -173,6 +174,7 @@ fn wrapper_preserves_exact_argv_and_separate_command_cwd() -> Result<()> { "quotes\" and slash\\".to_owned(), ]; let mut env = HashMap::new(); + codex_windows_sandbox::environment_transport::encode("stale", &mut env)?; let wrapped = create_command_args(CreateMxcCommandArgsParams { command: argv.clone(), permission_profile: &profile, @@ -182,6 +184,8 @@ fn wrapper_preserves_exact_argv_and_separate_command_cwd() -> Result<()> { })?; assert_eq!(wrapped, vec![crate::CODEX_WINDOWS_MXC_ARG1]); let parsed = crate::transport::decode(&mut env)?; + assert!(parsed.default_child_env); + assert!(env.is_empty()); assert_eq!( ( &parsed.permissions, diff --git a/codex-rs/mxc-sandbox/src/transport.rs b/codex-rs/mxc-sandbox/src/transport.rs index 9ce957ed61..5cb5d1c954 100644 --- a/codex-rs/mxc-sandbox/src/transport.rs +++ b/codex-rs/mxc-sandbox/src/transport.rs @@ -1,5 +1,5 @@ -//! Bounded launcher-only environment transport for policies too large for -//! Windows command lines. Every transport variable is removed before spawn. +//! Bounded launcher transport. Windows startup variables are host-owned; +//! an original-empty marker preserves the SDK's user-profile defaults. use std::collections::HashMap; @@ -11,6 +11,19 @@ use codex_windows_sandbox::environment_transport; use crate::MxcCommand; pub(super) fn encode(command: &MxcCommand, env: &mut HashMap) -> Result<()> { + // SDK profile defaults depend on the launcher's SystemRoot. + #[cfg(windows)] + for key in ["SystemDrive", "LOCALAPPDATA"] + .into_iter() + .chain(command.default_child_env.then_some("SystemRoot")) + { + let value = std::env::var(key) + .ok() + .filter(|value| !value.is_empty()) + .with_context(|| format!("MXC requires nonempty Unicode host {key}"))?; + env.retain(|name, _| !name.eq_ignore_ascii_case(key)); + env.insert(key.to_owned(), value); + } let payload = serde_json::to_string(command)?; environment_transport::encode(&payload, env) } @@ -18,7 +31,12 @@ pub(super) fn encode(command: &MxcCommand, env: &mut HashMap) -> #[cfg(any(windows, test))] pub(super) fn decode(env: &mut HashMap) -> Result { let payload = environment_transport::decode_and_scrub(env)?; - serde_json::from_str(&payload).context("invalid MXC launcher request") + let command: MxcCommand = + serde_json::from_str(&payload).context("invalid MXC launcher request")?; + if command.default_child_env { + env.clear(); + } + Ok(command) } #[cfg(test)] diff --git a/codex-rs/mxc-sandbox/src/transport_tests.rs b/codex-rs/mxc-sandbox/src/transport_tests.rs index 3a92b96198..984cfb04cd 100644 --- a/codex-rs/mxc-sandbox/src/transport_tests.rs +++ b/codex-rs/mxc-sandbox/src/transport_tests.rs @@ -19,6 +19,7 @@ fn command(args: Vec) -> MxcCommand { sandbox_policy_cwd: PathBuf::from("workspace"), managed_network: None, command: args, + default_child_env: false, } } @@ -31,6 +32,10 @@ fn large_unicode_launch_roundtrips_and_never_reaches_child_environment() -> Resu ]; let expected_env = HashMap::from([("CUSTOM".to_owned(), "value".to_owned())]); let mut env = expected_env.clone(); + #[cfg(windows)] + env.extend( + ["systemdrive", "LocalAppData"].map(|key| (key.to_owned(), "caller-only".to_owned())), + ); environment_transport::encode("stale", &mut env)?; let request = command(args); encode(&request, &mut env)?; @@ -42,6 +47,10 @@ fn large_unicode_launch_roundtrips_and_never_reaches_child_environment() -> Resu serde_json::to_value(decode(&mut env)?)?, serde_json::to_value(request)? ); + #[cfg(windows)] + for key in ["SystemDrive", "LOCALAPPDATA"] { + assert_eq!(env.remove(key), Some(std::env::var(key)?)); + } assert_eq!(env, expected_env); Ok(()) } From 8cbce633876eb71be1e897c1599c713cec7a262c Mon Sep 17 00:00:00 2001 From: Yuzhu Shen Date: Wed, 14 Oct 2026 16:38:32 +0000 Subject: [PATCH 047/155] Bound concurrent Git diffs for untracked files (#54032) ## Why Collecting a diff previously launched a Git process for every untracked file at once, allowing process counts to grow with the number of files. ## What changed Limit untracked-file diffs to eight concurrent operations per collection while preserving patch order and skipping failed file diffs. Concurrent collections each retain their own limit. ## Testing Add tests for independent concurrency limits, failed-file handling, and patch order and application with tracked changes, binary files, and filenames containing spaces or a leading dash. GitOrigin-RevId: 896e896eae62ba9b7acf3e8946c235fe725ced40 --- codex-rs/git-utils/src/diff_tests.rs | 259 +++++++++++++++++++++++++++ codex-rs/git-utils/src/info.rs | 22 ++- 2 files changed, 274 insertions(+), 7 deletions(-) create mode 100644 codex-rs/git-utils/src/diff_tests.rs diff --git a/codex-rs/git-utils/src/diff_tests.rs b/codex-rs/git-utils/src/diff_tests.rs new file mode 100644 index 0000000000..89186469e4 --- /dev/null +++ b/codex-rs/git-utils/src/diff_tests.rs @@ -0,0 +1,259 @@ +//! Verifies patch compatibility and bounded, independent untracked-diff collections. + +use super::diff_against_sha; +use crate::GitSha; +use codex_utils_process::background_command; +use pretty_assertions::assert_eq; +use std::path::Path; + +fn git(cwd: &Path, args: &[&str]) { + let output = background_command("git") + .args(args) + .current_dir(cwd) + .output() + .expect("run Git"); + assert!(output.status.success(), "Git {args:?} failed: {output:?}"); +} + +#[tokio::test] +async fn tracked_and_untracked_patches_preserve_order_and_apply() { + let repo = tempfile::tempdir().expect("create repository"); + git(repo.path(), &["init", "-q"]); + git(repo.path(), &["config", "core.autocrlf", "false"]); + git(repo.path(), &["config", "core.fsmonitor", "false"]); + std::fs::write(repo.path().join("tracked.txt"), "before\n").expect("write tracked file"); + git(repo.path(), &["add", "tracked.txt"]); + git( + repo.path(), + &[ + "-c", + "user.name=Codex Tests", + "-c", + "user.email=codex-tests@example.com", + "-c", + "commit.gpgsign=false", + "-c", + if cfg!(windows) { + "core.hooksPath=NUL" + } else { + "core.hooksPath=/dev/null" + }, + "commit", + "-qm", + "initial", + ], + ); + let files: [(&str, &[u8]); 4] = [ + ("tracked.txt", b"after\n"), + ("-new.txt", b"leading dash\n"), + ("a space.txt", b"space in filename\n"), + ("z.bin", b"\x00\x01\xffbinary\x00\xfe"), + ]; + for (name, contents) in files { + std::fs::write(repo.path().join(name), contents).expect("write changed file"); + } + let cwd = repo.path().to_path_buf(); + // The production caller spawns collection; this also checks its Send bound. + let patch = tokio::spawn(async move { + diff_against_sha(Path::new("git"), &cwd, &GitSha::new("HEAD")).await + }) + .await + .expect("join collection") + .expect("collect patch"); + assert_eq!( + patch + .lines() + .filter(|line| line.starts_with("diff --git ")) + .collect::>(), + vec![ + "diff --git a/tracked.txt b/tracked.txt", + "diff --git a/-new.txt b/-new.txt", + "diff --git a/a space.txt b/a space.txt", + "diff --git a/z.bin b/z.bin", + ] + ); + assert!(patch.contains("GIT binary patch")); + git(repo.path(), &["reset", "--hard", "-q", "HEAD"]); + for (name, _) in &files[1..] { + std::fs::remove_file(repo.path().join(name)).expect("remove untracked file"); + } + let patch_file = tempfile::NamedTempFile::new().expect("create patch file"); + std::fs::write(patch_file.path(), patch).expect("save patch"); + git( + repo.path(), + &[ + "apply", + "--binary", + patch_file.path().to_str().expect("patch path"), + ], + ); + assert_eq!( + files.map(|(name, _)| std::fs::read(repo.path().join(name)).expect("read applied file")), + files.map(|(_, contents)| contents.to_vec()) + ); +} + +#[cfg(target_os = "linux")] +struct GatedGit { + directory: tempfile::TempDir, + gates: Vec, + ready: std::fs::File, + events: futures::channel::mpsc::UnboundedReceiver, + reader: Option>, +} + +#[cfg(target_os = "linux")] +impl GatedGit { + fn new(file_counts: &[usize]) -> Self { + use std::io::BufRead; + + let directory = tempfile::tempdir().expect("create fixture directory"); + let ready_path = directory.path().join("ready"); + let mut paths = vec![ready_path]; + for (batch, count) in file_counts.iter().enumerate() { + let cwd = directory.path().join(format!("batch-{batch}")); + std::fs::create_dir(&cwd).expect("create batch directory"); + paths.extend((0..*count).map(|index| cwd.join(format!("file-{index:02}")))); + } + let output = background_command("mkfifo") + .args(&paths) + .output() + .expect("create FIFO gates"); + assert!(output.status.success(), "mkfifo failed: {output:?}"); + let mut gates: Vec<_> = paths + .iter() + .map(|path| { + // Linux permits O_RDWR on a FIFO without another opener, so cleanup + // can always release gates even when their child has not started. + std::fs::OpenOptions::new() + .read(true) + .write(true) + .open(path) + .expect("open FIFO") + }) + .collect(); + let ready = gates.remove(0); + let input = ready.try_clone().expect("clone readiness FIFO"); + let (sender, events) = futures::channel::mpsc::unbounded(); + codex_utils_cargo_bin::write_executable( + &directory.path().join("git"), + r#"#!/bin/sh +while [ "$1" = '-c' ]; do shift 2; done +case "$1" in +config) exit 1 ;; +ls-files) for file in file-*; do printf '%s\n' "$file"; done ;; +diff) + case " $* " in + *' --no-index '*) + for file do :; done + printf '%s/%s\n' "$PWD" "$file" > ../ready + read -r release < "$file" + if [ "$file" = 'file-04' ]; then printf 'failed-output\n'; exit 2; fi + printf '%s\n' "$file" + exit 1 ;; + *) printf 'tracked\n' ;; + esac ;; +esac +"#, + ) + .expect("write fake Git"); + let reader = std::thread::spawn(move || { + for line in std::io::BufReader::new(input).lines() { + let Ok(line) = line else { break }; + if line == "stop" || sender.unbounded_send(line).is_err() { + break; + } + } + }); + Self { + directory, + gates, + ready, + events, + reader: Some(reader), + } + } + + async fn ready(&mut self, batches: usize) { + use futures::StreamExt; + + for _ in 0..8 * batches { + tokio::time::timeout(std::time::Duration::from_secs(3), self.events.next()) + .await + .expect("each collection must fill its own eight slots") + .expect("read readiness event"); + } + } + + fn children(&self) -> usize { + use std::os::unix::ffi::OsStrExt; + + let wrapper = self.directory.path().join("git"); + let mut children = std::collections::BTreeSet::new(); + for task in std::fs::read_dir("/proc/self/task").expect("list test threads") { + let task = task.expect("read thread entry"); + if let Ok(pids) = std::fs::read_to_string(task.path().join("children")) { + children.extend(pids.split_whitespace().map(str::to_string)); + } + } + children + .into_iter() + .filter(|pid| { + std::fs::read(format!("/proc/{pid}/cmdline")).is_ok_and(|args| { + args.split(|byte| *byte == 0) + .any(|arg| arg == wrapper.as_os_str().as_bytes()) + }) + }) + .count() + } + + fn release(&mut self) { + use std::io::Write; + for gate in &mut self.gates { + let _ = gate.write_all(b"go\n"); + } + } +} + +#[cfg(target_os = "linux")] +impl Drop for GatedGit { + fn drop(&mut self) { + use std::io::Write; + self.release(); + let _ = self.ready.write_all(b"stop\n"); + if let Some(reader) = self.reader.take() { + reader.join().expect("join readiness reader"); + } + } +} + +#[cfg(target_os = "linux")] +#[tokio::test] +async fn untracked_collections_bound_children_independently_and_skip_failed_files() { + // At most 16 Git children even if the bound regresses. Keeping both phases + // in one test also prevents the fixtures from overlapping under nextest. + for counts in [&[12][..], &[8, 8][..]] { + let mut fixture = GatedGit::new(counts); + let collections: Vec<_> = (0..counts.len()) + .map(|batch| { + let git = fixture.directory.path().join("git"); + let cwd = fixture.directory.path().join(format!("batch-{batch}")); + tokio::spawn( + async move { diff_against_sha(&git, &cwd, &GitSha::new("HEAD")).await }, + ) + }) + .collect(); + fixture.ready(counts.len()).await; + let children = fixture.children(); + fixture.release(); + for (collection, count) in collections.into_iter().zip(counts) { + let expected = "tracked\n".to_string() + + &(0..*count) + .filter(|index| *index != 4) + .map(|index| format!("file-{index:02}\n")) + .collect::(); + assert_eq!(collection.await.expect("join collection"), Some(expected)); + } + assert_eq!(children, 8 * counts.len()); + } +} diff --git a/codex-rs/git-utils/src/info.rs b/codex-rs/git-utils/src/info.rs index aec8a01dad..0d9af38b3a 100644 --- a/codex-rs/git-utils/src/info.rs +++ b/codex-rs/git-utils/src/info.rs @@ -3,7 +3,8 @@ use std::collections::HashSet; use std::path::Path; use std::path::PathBuf; -use futures::future::join_all; +use futures::StreamExt; +use futures::stream; use schemars::JsonSchema; use serde::Deserialize; use serde::Serialize; @@ -39,6 +40,7 @@ pub fn get_git_repo_root(base_dir: &Path) -> Option { /// Timeout for git commands to prevent freezing on large repositories const GIT_COMMAND_TIMEOUT: TokioDuration = TokioDuration::from_secs(5); const DISABLED_HOOKS_PATH: &str = if cfg!(windows) { "NUL" } else { "/dev/null" }; +const MAX_CONCURRENT_UNTRACKED_DIFFS: usize = 8; #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, TS)] pub struct GitInfo { @@ -359,7 +361,7 @@ pub async fn git_diff_to_remote(cwd: &Path) -> Option { let remotes = get_git_remotes(cwd).await?; let branches = branch_ancestry(cwd).await?; let base_sha = find_closest_sha(cwd, &branches, &remotes).await?; - let diff = diff_against_sha(cwd, &base_sha).await?; + let diff = diff_against_sha(Path::new("git"), cwd, &base_sha).await?; Some(GitDiffToRemote { sha: base_sha, @@ -704,8 +706,7 @@ async fn find_closest_sha(cwd: &Path, branches: &[String], remotes: &[String]) - closest_sha.map(|(sha, _)| sha) } -async fn diff_against_sha(cwd: &Path, sha: &GitSha) -> Option { - let git = Path::new("git"); +async fn diff_against_sha(git: &Path, cwd: &Path, sha: &GitSha) -> Option { let fsmonitor = detect_local_fsmonitor_override(git, cwd).await; let output = run_git_command_with_timeout_from( git, @@ -756,9 +757,12 @@ async fn diff_against_sha(cwd: &Path, sha: &GitSha) -> Option { ]; run_git_command_with_timeout_from(git, &args_vec, cwd, fsmonitor).await }); - let results = join_all(futures_iter).await; - for extra in results.into_iter().flatten() { - if extra.status.code().is_some_and(|c| c == 0 || c == 1) + // Keep earlier children reading and finishing while more paths remain. + let results = stream::iter(futures_iter).buffered(MAX_CONCURRENT_UNTRACKED_DIFFS); + futures::pin_mut!(results); + while let Some(extra) = results.next().await { + if let Some(extra) = extra + && extra.status.code().is_some_and(|c| c == 0 || c == 1) && let Ok(s) = String::from_utf8(extra.stdout) { diff.push_str(&s); @@ -770,6 +774,10 @@ async fn diff_against_sha(cwd: &Path, sha: &GitSha) -> Option { Some(diff) } +#[cfg(test)] +#[path = "diff_tests.rs"] +mod diff_tests; + fn find_ancestor_git_entry(base_dir: &Path) -> Option<(PathBuf, PathBuf)> { let mut dir = base_dir.to_path_buf(); From c0cfbfbb989ff80c4027c8ea86a15d411d1d5214 Mon Sep 17 00:00:00 2001 From: josh-oai Date: Wed, 14 Oct 2026 16:46:39 +0000 Subject: [PATCH 048/155] Extend memory extension resource retention to 14 days (#54033) ## What changed Increase memory extension resource retention from 7 to 14 days before pruning. ## Testing Update pruning and startup test fixtures for the 14-day retention window, including resources at the exact cutoff. GitOrigin-RevId: 5044a1262c8806245d90d567cd84b21aa0d3da43 --- codex-rs/memories/write/src/extensions/prune_tests.rs | 8 ++++---- codex-rs/memories/write/src/lib.rs | 2 +- codex-rs/memories/write/src/startup_tests.rs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/codex-rs/memories/write/src/extensions/prune_tests.rs b/codex-rs/memories/write/src/extensions/prune_tests.rs index ee70ba1afb..bdaf92d8ec 100644 --- a/codex-rs/memories/write/src/extensions/prune_tests.rs +++ b/codex-rs/memories/write/src/extensions/prune_tests.rs @@ -27,9 +27,9 @@ async fn prunes_only_old_resources_from_extensions_with_instructions() { .expect("parse now"), Utc, ); - let old_file = chronicle_resources.join("2026-04-06T11-59-59-abcd-10min-old.md"); - let exact_cutoff_file = chronicle_resources.join("2026-04-07T12-00-00-abcd-10min-cutoff.md"); - let recent_file = chronicle_resources.join("2026-04-08T12-00-00-abcd-10min-recent.md"); + let old_file = chronicle_resources.join("2026-03-30T11-59-59-abcd-10min-old.md"); + let exact_cutoff_file = chronicle_resources.join("2026-03-31T12-00-00-abcd-10min-cutoff.md"); + let recent_file = chronicle_resources.join("2026-04-01T12-00-00-abcd-10min-recent.md"); let invalid_file = chronicle_resources.join("not-a-timestamp.md"); for file in [&old_file, &exact_cutoff_file, &recent_file, &invalid_file] { tokio::fs::write(file, "resource") @@ -41,7 +41,7 @@ async fn prunes_only_old_resources_from_extensions_with_instructions() { tokio::fs::create_dir_all(&ignored_resources) .await .expect("create ignored resources"); - let ignored_old_file = ignored_resources.join("2026-04-06T11-59-59-abcd-10min-old.md"); + let ignored_old_file = ignored_resources.join("2026-03-30T11-59-59-abcd-10min-old.md"); tokio::fs::write(&ignored_old_file, "ignored") .await .expect("write ignored resource"); diff --git a/codex-rs/memories/write/src/lib.rs b/codex-rs/memories/write/src/lib.rs index 2ea3384f2e..9430767672 100644 --- a/codex-rs/memories/write/src/lib.rs +++ b/codex-rs/memories/write/src/lib.rs @@ -42,7 +42,7 @@ mod artifacts { mod extension_resources { pub(super) const FILENAME_TS_FORMAT: &str = "%Y-%m-%dT%H-%M-%S"; - pub(super) const RETENTION_DAYS: i64 = 7; + pub(super) const RETENTION_DAYS: i64 = 14; } mod guard_limits { diff --git a/codex-rs/memories/write/src/startup_tests.rs b/codex-rs/memories/write/src/startup_tests.rs index f80624ac62..0167dfc6a8 100644 --- a/codex-rs/memories/write/src/startup_tests.rs +++ b/codex-rs/memories/write/src/startup_tests.rs @@ -520,12 +520,12 @@ async fn memories_startup_phase2_prunes_old_extension_resources() -> anyhow::Res .await?; let old_file = chronicle_resources.join(format!( "{}-abcd-10min-old.md", - (now - chrono::Duration::days(8)).format("%Y-%m-%dT%H-%M-%S") + (now - chrono::Duration::days(15)).format("%Y-%m-%dT%H-%M-%S") )); tokio::fs::write(&old_file, "old resource").await?; let recent_file = chronicle_resources.join(format!( "{}-abcd-10min-recent.md", - (now - chrono::Duration::days(6)).format("%Y-%m-%dT%H-%M-%S") + (now - chrono::Duration::days(13)).format("%Y-%m-%dT%H-%M-%S") )); tokio::fs::write(&recent_file, "recent resource").await?; seed_required_memory_artifacts(&home.path().join("memories")).await?; @@ -586,7 +586,7 @@ async fn memories_startup_phase2_prunes_old_extension_resources_without_stage1_i .await?; let old_file = chronicle_resources.join(format!( "{}-abcd-10min-old.md", - (now - chrono::Duration::days(8)).format("%Y-%m-%dT%H-%M-%S") + (now - chrono::Duration::days(15)).format("%Y-%m-%dT%H-%M-%S") )); tokio::fs::write(&old_file, "old resource").await?; seed_required_memory_artifacts(&home.path().join("memories")).await?; From 538858165396ecf77861cadfeb1c2840287131c9 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 17:04:52 +0000 Subject: [PATCH 049/155] Return async Guardian approvals before review cleanup finishes (#54039) ## Why An asynchronous approval currently waits for the redundant synchronous review to finish cancellation cleanup before returning a decision. ## What changed Cancel the redundant review and let it drain under the parent's `ReviewerTasks` tracker so a current approval can return immediately. Revalidate the approval and check cancellation before approving the action. Hosts without a task tracker continue to wait for cleanup. Keep the reviewer reservation held until cleanup completes, and let shutdown join the tracked attempt. Discard late results and evidence from the cancelled review. ## Testing Add tests covering current, invalidated, and cancelled approvals while cleanup is blocked, suppression of late evidence, reviewer reservations during cleanup, and shutdown waiting for abandoned attempts. GitOrigin-RevId: f227738e545243f99c19a6c557a78d330f9d2767 --- codex-rs/ext/guardian-reviewer/src/outcome.rs | 2 +- .../ext/guardian-reviewer/src/pool_tests.rs | 75 ++++++ codex-rs/ext/guardian-reviewer/src/review.rs | 62 +++-- .../ext/guardian-reviewer/src/review_tests.rs | 216 ++++++++++++++++++ 4 files changed, 340 insertions(+), 15 deletions(-) create mode 100644 codex-rs/ext/guardian-reviewer/src/review_tests.rs diff --git a/codex-rs/ext/guardian-reviewer/src/outcome.rs b/codex-rs/ext/guardian-reviewer/src/outcome.rs index 9f9aca5918..738ae555f2 100644 --- a/codex-rs/ext/guardian-reviewer/src/outcome.rs +++ b/codex-rs/ext/guardian-reviewer/src/outcome.rs @@ -7,7 +7,7 @@ use tokio::time::Instant; #[derive(Debug)] pub enum GuardianReviewOutcome { - /// Approved by current async evidence after the redundant attempt was drained. + /// Approved by current async evidence; the redundant attempt is cancelled and drained. CachedApproval, Completed(GuardianAssessment), Error(GuardianReviewError), diff --git a/codex-rs/ext/guardian-reviewer/src/pool_tests.rs b/codex-rs/ext/guardian-reviewer/src/pool_tests.rs index 8db04a23c3..c392e2301f 100644 --- a/codex-rs/ext/guardian-reviewer/src/pool_tests.rs +++ b/codex-rs/ext/guardian-reviewer/src/pool_tests.rs @@ -3,6 +3,81 @@ use pretty_assertions::assert_eq; use std::sync::atomic::AtomicUsize; use std::sync::atomic::Ordering; +#[tokio::test] +async fn tracked_review_stays_reserved_until_cleanup_finishes() { + let runtime = Arc::new(ReviewerTasks::default()); + let next_id = Arc::new(AtomicUsize::new(/*v*/ 0)); + let pool = Arc::new(ReviewerPool::new( + Arc::clone(&runtime), + move |_, _, _, _, _| { + let id = next_id.fetch_add(/*val*/ 1, Ordering::SeqCst); + Box::pin(async move { Ok(Session(id)) }) + }, + )); + let (selected, mut selections) = tokio::sync::mpsc::unbounded_channel(); + let release = Arc::new(Semaphore::new(/*permits*/ 0)); + let (finished, done) = tokio::sync::oneshot::channel(); + let pending = { + let pool = Arc::clone(&pool); + let request = Request { + fresh: false, + selected: selected.clone(), + release: Some(Arc::clone(&release)), + }; + runtime.tasks.spawn(async move { + pool.review(request).await; + finished.send(()).unwrap(); + }) + }; + assert_eq!(selections.recv().await, Some(0)); + drop(pending); + assert_eq!(runtime.tasks.len(), 1); + + // A concurrent request must fork while the original attempt is still draining. + pool.review(Request { + fresh: false, + selected: selected.clone(), + release: None, + }) + .await; + assert_eq!(selections.recv().await, Some(1)); + release.add_permits(/*n*/ 1); + done.await.unwrap(); + pool.review(Request { + fresh: false, + selected: selected.clone(), + release: None, + }) + .await; + assert_eq!(selections.recv().await, Some(0)); + + // Shutdown must also join an attempt whose caller has stopped waiting. + let release = Arc::new(Semaphore::new(/*permits*/ 0)); + let pending = { + let pool = Arc::clone(&pool); + let request = Request { + fresh: false, + selected, + release: Some(Arc::clone(&release)), + }; + runtime.tasks.spawn(async move { + pool.review(request).await; + }) + }; + assert_eq!(selections.recv().await, Some(0)); + drop(pending); + let shutdown = pool.shutdown(); + tokio::pin!(shutdown); + tokio::select! { + biased; + () = &mut shutdown => panic!("shutdown must join the pending attempt"), + () = std::future::ready(()) => {} + } + release.add_permits(/*n*/ 1); + shutdown.await; + assert_eq!(runtime.tasks.len(), 0); +} + struct Session(usize); impl ReviewerSession for Session { diff --git a/codex-rs/ext/guardian-reviewer/src/review.rs b/codex-rs/ext/guardian-reviewer/src/review.rs index 10e3e65fd0..a2625ebbd7 100644 --- a/codex-rs/ext/guardian-reviewer/src/review.rs +++ b/codex-rs/ext/guardian-reviewer/src/review.rs @@ -1,5 +1,6 @@ //! Owns synchronous review orchestration, reporting and outcome accounting. //! The host binds the original action, captures evidence and enforces authorization. +//! Async approvals can return while cancelled attempts finish under the parent's task tracker. use crate::GuardianReviewError; use crate::GuardianReviewOutcome; @@ -21,16 +22,20 @@ use codex_protocol::protocol::ReviewDecision; use codex_protocol::protocol::WarningEvent; use std::future::Future; use std::sync::Arc; +use std::sync::atomic::AtomicI64; +use std::sync::atomic::Ordering; use tokio::time::Instant; use tokio_util::sync::CancellationToken; /// Operations bound to one immutable action and its issuing context. /// Hosts validate authority, publish supplied events and interrupt only the selected turn; /// they do not select Guardian outcomes, retry policy or reporting effects. -pub trait ReviewHost: Send + Sync { - type Prepared: Send + Sync; +/// Clones retain the same action and context. A cancelled attempt may keep its host and +/// prepared state alive under the parent's task tracker after approval returns. +pub trait ReviewHost: Clone + Send + Sync + 'static { + type Prepared: Send + Sync + 'static; /// Evidence captured for one completed assessment, never reused by another attempt. - type Evidence: Send; + type Evidence: Send + 'static; /// Returns the target's rules, or no evidence when they cannot be resolved. fn permissions(&self) -> Option; /// Captures the turn currently servicing reviews, which may differ from a yielded cell's origin. @@ -106,24 +111,49 @@ impl SynchronousApprovalReviewer for ReviewRequest<'_, H> { self.host .emit(EventMsg::GuardianAssessment(report.started_event())) .await; + let prepared = Arc::new(prepared); let cancellation = self.cancellation.child_token(); - let mut review = Box::pin(crate::run_with_retry( - GuardianReviewSessionLimits { - max_attempts: crate::MAX_REVIEW_ATTEMPTS, - deadline, - }, - Some(&cancellation), - |deadline| self.host.attempt(&prepared, deadline, &cancellation), - )); + let attempts = Arc::new(AtomicI64::new(/*v*/ 0)); + let mut review = Box::pin({ + let host = self.host.clone(); + let prepared = Arc::clone(&prepared); + let cancellation = cancellation.clone(); + let attempts = Arc::clone(&attempts); + async move { + crate::run_with_retry( + GuardianReviewSessionLimits { + max_attempts: crate::MAX_REVIEW_ATTEMPTS, + deadline, + }, + Some(&cancellation), + |deadline| { + attempts.fetch_add(/*val*/ 1, Ordering::Relaxed); + host.attempt(&prepared, deadline, &cancellation) + }, + ) + .await + } + }); let (outcome, analytics, evidence) = if let Some(async_approval) = async_approval { tokio::select! { biased; result = &mut review => result, () = async_approval => { - // The async approval won. Finish cancellation through the existing - // reviewer cleanup; the retry loop is never restarted. cancellation.cancel(); - let (_, analytics, _) = review.await; + let analytics = if let Some(runtime) = self.thread_store.get::() { + // Keep driving the same attempt: its pool reservation stays held + // until it drains, and parent shutdown joins the tracked cleanup. + runtime.tasks.spawn(async move { let _ = review.await; }); + // Final session and usage metadata are not available yet. + GuardianReviewAnalyticsResult { + attempt_count: attempts.load(Ordering::Relaxed), + ..GuardianReviewAnalyticsResult::without_session() + } + } else { + // Hosts without a lifetime tracker must finish cleanup here. + let (_, analytics, _) = review.await; + analytics + }; let outcome = if !self.host.cached_approval_is_current(&prepared).await || self.cancellation.is_cancelled() { GuardianReviewOutcome::Error(GuardianReviewError::Cancelled) @@ -207,3 +237,7 @@ impl SynchronousApprovalReviewer for ReviewRequest<'_, H> { }) } } + +#[cfg(test)] +#[path = "review_tests.rs"] +mod tests; diff --git a/codex-rs/ext/guardian-reviewer/src/review_tests.rs b/codex-rs/ext/guardian-reviewer/src/review_tests.rs new file mode 100644 index 0000000000..f4660f048e --- /dev/null +++ b/codex-rs/ext/guardian-reviewer/src/review_tests.rs @@ -0,0 +1,216 @@ +//! Exercises async approval and authorization at the host boundary while cleanup is gated. + +use super::*; +use crate::ReviewMetadata; +use codex_analytics::AnalyticsEventsClient; +use codex_analytics::GuardianApprovalRequestSource; +use codex_analytics::GuardianReviewedAction; +use codex_extension_api::ExtensionData; +use codex_otel::SessionTelemetry; +use codex_protocol::ThreadId; +use codex_protocol::approvals::GuardianAssessmentAction; +use codex_protocol::config_types::ApprovalsReviewer; +use codex_protocol::items::ModelInvocationContext; +use codex_protocol::openai_models::GuardianScope; +use codex_protocol::protocol::AskForApproval; +use codex_protocol::protocol::SessionSource; +use pretty_assertions::assert_eq; +use serde_json::json; +use std::sync::atomic::AtomicBool; +use std::sync::atomic::AtomicUsize; +use std::sync::atomic::Ordering; +use tokio::sync::Notify; +use tokio::sync::Semaphore; + +#[derive(Clone)] +struct GatedHost { + started: Arc, + cleaning: Arc, + cleanup: Arc, + cleaned: Arc, + evidence_recorded: Arc, + current: bool, + validations: Arc, +} + +impl ReviewHost for GatedHost { + type Prepared = (); + type Evidence = (); + + fn permissions(&self) -> Option { + None + } + async fn servicing_turn(&self) -> Option<(String, Arc)> { + None + } + fn validate_action(&self) -> Result<(&str, Option<&str>), ReviewDecision> { + Ok(("turn", Some("call"))) + } + async fn prepare( + &self, + approval_id: &str, + reason: GuardianReviewReason, + _: Instant, + _: &CancellationToken, + ) -> Result<((), ReviewReport), ReviewDecision> { + Ok(( + (), + ReviewReport::new(ReviewMetadata { + thread_id: "thread".into(), + turn_id: "turn".into(), + review_id: approval_id.into(), + target_item_id: Some("call".into()), + plugin_id: None, + script_path: None, + approval_request_source: GuardianApprovalRequestSource::MainTurn, + reviewed_action: GuardianReviewedAction::RequestPermissions {}, + action: GuardianAssessmentAction::RequestPermissions { + reason: None, + permissions: Default::default(), + }, + review_reason: reason, + model_context: ModelInvocationContext { + model_slug: "test".into(), + reasoning_effort: None, + }, + }), + )) + } + async fn attempt( + &self, + _: &(), + _: Instant, + cancellation: &CancellationToken, + ) -> ( + GuardianReviewOutcome, + GuardianReviewAnalyticsResult, + Option<()>, + ) { + self.started.notify_one(); + cancellation.cancelled().await; + self.cleaning.notify_one(); + let _permit = self.cleanup.acquire().await.unwrap(); + self.cleaned.store(true, Ordering::SeqCst); + // A terminal verdict racing with cancellation must not publish late evidence. + ( + GuardianReviewOutcome::Completed( + crate::parse_guardian_assessment(r#"{"outcome":"deny"}"#).unwrap(), + ), + GuardianReviewAnalyticsResult::without_session(), + Some(()), + ) + } + async fn cached_approval_is_current(&self, _: &()) -> bool { + self.validations.fetch_add(/*val*/ 1, Ordering::SeqCst); + self.current + } + async fn emit(&self, _: EventMsg) {} + async fn record_evidence(&self, _: &(), _: (), _: &GuardianAssessmentEvent) { + self.evidence_recorded.store(true, Ordering::SeqCst); + } + async fn interrupt(&self, _: &str, _: EventMsg, _: ErrorEvent) { + panic!("cached approval must not interrupt the parent"); + } +} + +#[derive(Clone, Copy)] +enum ApprovalState { + Current, + Invalidated, + Cancelled, +} + +#[test_case::test_case(ApprovalState::Current; "current action")] +#[test_case::test_case(ApprovalState::Invalidated; "invalidated action")] +#[test_case::test_case(ApprovalState::Cancelled; "cancelled action")] +#[tokio::test] +async fn async_approval_revalidates_without_waiting_for_tracked_cleanup(state: ApprovalState) { + let host = GatedHost { + started: Arc::new(Notify::new()), + cleaning: Arc::new(Notify::new()), + cleanup: Arc::new(Semaphore::new(/*permits*/ 0)), + cleaned: Arc::new(AtomicBool::new(/*v*/ false)), + evidence_recorded: Arc::new(AtomicBool::new(/*v*/ false)), + current: !matches!(state, ApprovalState::Invalidated), + validations: Arc::new(AtomicUsize::new(/*v*/ 0)), + }; + let thread_id = ThreadId::new(); + let store = ExtensionData::new(thread_id.to_string()); + let runtime = store.get_or_init(crate::ReviewerTasks::default); + let model: ModelInfo = serde_json::from_value(json!({ + "slug":"test", "display_name":"test", "supported_reasoning_levels":[], + "shell_type":"unified_exec", "visibility":"list", "supported_in_api":true, + "priority":0, "support_verbosity":false, + "truncation_policy":{"mode":"bytes","limit":10000}, "experimental_supported_tools":[] + })) + .unwrap(); + let telemetry = SessionTelemetry::new( + thread_id, + "test", + "test", + /*account_id*/ None, + /*account_email*/ None, + /*auth_mode*/ None, + "test".into(), + /*log_user_prompts*/ false, + "test".into(), + SessionSource::Exec, + ); + let analytics = AnalyticsEventsClient::disabled(); + let action = json!({}); + let request = ReviewRequest { + host: host.clone(), + approval_id: "approval", + tool_call_id: Some("call"), + action: Some(&action), + thread_id, + thread_store: &store, + category: GuardianScope::Permissions, + approval_policy: AskForApproval::OnRequest, + approvals_reviewer: ApprovalsReviewer::AutoReview, + require_guardian: false, + require_synchronous_review: false, + model_requires_review: false, + async_enabled: true, + retried: false, + escalated_exec: false, + full_access: false, + cancellation: CancellationToken::new(), + model: &model, + telemetry: &telemetry, + log_assessments: false, + analytics: &analytics, + metrics: None, + }; + let decision = request.review( + GuardianReviewReason::MissingScore, + Some(Box::pin(async { + host.started.notified().await; + if matches!(state, ApprovalState::Cancelled) { + request.cancellation.cancel(); + } + })), + ); + tokio::pin!(decision); + let decision = tokio::select! { + biased; + decision = &mut decision => decision, + () = host.cleaning.notified() => panic!("async decision waited for the cancelled review to drain"), + }; + assert_eq!( + decision, + Some(match state { + ApprovalState::Current => ReviewDecision::Approved, + ApprovalState::Invalidated | ApprovalState::Cancelled => ReviewDecision::Abort, + }) + ); + assert_eq!(host.validations.load(Ordering::SeqCst), 1); + host.cleaning.notified().await; + assert!(!host.cleaned.load(Ordering::SeqCst)); + assert_eq!(runtime.tasks.len(), 1); + runtime.tasks.close(); + host.cleanup.add_permits(/*n*/ 1); + runtime.tasks.wait().await; + assert!(host.cleaned.load(Ordering::SeqCst)); + assert!(!host.evidence_recorded.load(Ordering::SeqCst)); +} From cec8c6fb876e90b20250ec740e970e3f33b7396f Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Wed, 14 Oct 2026 17:19:03 +0000 Subject: [PATCH 050/155] Keep fork lineage ahead of paginated transcript history (#54044) ## Why Loading older history could place transcript entries before the `Thread forked from` notice, separating fork lineage from the session header. ## What changed Treat fork lineage as a session prefix in both the TUI transcript and transcript overlay so older pages are inserted after it. ## Testing Add regression tests for repeated history prepends in both paths, verifying that fork lineage stays first. GitOrigin-RevId: 71497fb7ffa992c72ee08617d318aa3119e71275 --- codex-rs/tui/src/app/history_pagination.rs | 8 +--- .../tui/src/app/history_pagination_tests.rs | 40 +++++++++++++++++++ codex-rs/tui/src/chatwidget/session_flow.rs | 3 +- codex-rs/tui/src/history_cell/session.rs | 21 ++++++++++ codex-rs/tui/src/pager_overlay/transcript.rs | 8 +--- .../tui/src/pager_overlay/transcript_tests.rs | 23 +++++++++++ 6 files changed, 90 insertions(+), 13 deletions(-) diff --git a/codex-rs/tui/src/app/history_pagination.rs b/codex-rs/tui/src/app/history_pagination.rs index 32a606c24b..bd04368c10 100644 --- a/codex-rs/tui/src/app/history_pagination.rs +++ b/codex-rs/tui/src/app/history_pagination.rs @@ -6,9 +6,8 @@ use std::ops::Range; use super::*; use crate::app_server_session::HISTORY_ITEM_PAGE_LIMIT; use crate::app_server_session::thread_items_page_params; -use crate::history_cell::SessionHeaderHistoryCell; -use crate::history_cell::SessionInfoCell; use crate::history_cell::UserHistoryCell; +use crate::history_cell::is_session_history_prefix_cell; use crate::pager_overlay::TranscriptHistoryState; use crate::thread_transcript::RawReasoningVisibility; use crate::thread_transcript::thread_items_to_transcript_cells; @@ -265,10 +264,7 @@ impl App { } else { self.transcript_cells .iter() - .rposition(|cell| { - cell.as_any().is::() - || cell.as_any().is::() - }) + .rposition(|cell| is_session_history_prefix_cell(cell.as_ref())) .map_or(/*default*/ 0, |index| index.saturating_add(/*rhs*/ 1)) }; let inserted = index..index + cells.len(); diff --git a/codex-rs/tui/src/app/history_pagination_tests.rs b/codex-rs/tui/src/app/history_pagination_tests.rs index e64fa5bc2a..f33a9347e5 100644 --- a/codex-rs/tui/src/app/history_pagination_tests.rs +++ b/codex-rs/tui/src/app/history_pagination_tests.rs @@ -4,6 +4,7 @@ use super::*; use crate::app::test_support::make_test_app; use crate::history_cell::ComputerActivityCell; use crate::history_cell::FinalMessageSeparator; +use crate::history_cell::ForkedThreadHistoryCell; use codex_app_server_protocol::TurnItemsView; use codex_app_server_protocol::UserInput; use pretty_assertions::assert_eq; @@ -60,6 +61,45 @@ fn user_cell(message: &str) -> Arc { }) } +#[tokio::test] +async fn fork_lineage_stays_before_repeated_older_history_pages() { + let mut app = make_test_app().await; + app.transcript_cells = vec![ + Arc::new(ForkedThreadHistoryCell( + crate::history_cell::PlainHistoryCell::new(vec!["Thread forked from parent".into()]), + )), + Arc::new(crate::history_cell::PlainHistoryCell::new(vec![ + "recent history".into(), + ])), + ]; + + app.prepend_older_transcript_cells(vec![Arc::new(crate::history_cell::PlainHistoryCell::new( + vec!["older history".into()], + ))]); + app.prepend_older_transcript_cells(vec![Arc::new(crate::history_cell::PlainHistoryCell::new( + vec!["oldest history".into()], + ))]); + + let rendered = app + .transcript_cells + .iter() + .flat_map(|cell| cell.display_lines(/*width*/ 80)) + .map(|line| { + line.spans + .into_iter() + .map(|span| span.content.into_owned()) + .collect::() + }) + .collect::>() + .join("\n"); + insta::assert_snapshot!(rendered, @r###" + Thread forked from parent + oldest history + older history + recent history + "###); +} + #[test] fn repeated_prompt_matching_removes_only_the_hidden_occurrence() { let cells = vec![user_cell("repeat"), user_cell("other"), user_cell("repeat")]; diff --git a/codex-rs/tui/src/chatwidget/session_flow.rs b/codex-rs/tui/src/chatwidget/session_flow.rs index 6077a0f9ef..2d39a08d0c 100644 --- a/codex-rs/tui/src/chatwidget/session_flow.rs +++ b/codex-rs/tui/src/chatwidget/session_flow.rs @@ -3,6 +3,7 @@ //! checks the previous model when it applies the final selection. use super::*; +use crate::history_cell::ForkedThreadHistoryCell; use crate::style::accent_color; impl ChatWidget { @@ -310,7 +311,7 @@ impl ChatWidget { .into() }; self.app_event_tx.send(AppEvent::InsertHistoryCell(Box::new( - PlainHistoryCell::new(vec![line]), + ForkedThreadHistoryCell(PlainHistoryCell::new(vec![line])), ))); } diff --git a/codex-rs/tui/src/history_cell/session.rs b/codex-rs/tui/src/history_cell/session.rs index 48295d4b85..237ef9ec96 100644 --- a/codex-rs/tui/src/history_cell/session.rs +++ b/codex-rs/tui/src/history_cell/session.rs @@ -103,6 +103,20 @@ impl HistoryCell for SessionNoticeCell { } } +/// Fork lineage that stays with the session header when older history is prepended. +#[derive(Debug)] +pub(crate) struct ForkedThreadHistoryCell(pub(crate) PlainHistoryCell); + +impl HistoryCell for ForkedThreadHistoryCell { + fn display_lines(&self, width: u16) -> Vec> { + self.0.display_lines(width) + } + + fn raw_lines(&self) -> Vec> { + self.0.raw_lines() + } +} + #[derive(Debug)] pub struct SessionInfoCell(CompositeHistoryCell); @@ -165,6 +179,13 @@ impl HistoryCell for SessionInfoCell { } } +/// Session-level cells that stay ahead of every loaded transcript page. +pub(crate) fn is_session_history_prefix_cell(cell: &dyn HistoryCell) -> bool { + cell.as_any().is::() + || cell.as_any().is::() + || cell.as_any().is::() +} + #[expect( clippy::too_many_arguments, reason = "keep local preferences separate while the legacy Config parameter is still required" diff --git a/codex-rs/tui/src/pager_overlay/transcript.rs b/codex-rs/tui/src/pager_overlay/transcript.rs index 4aaae519b6..44097d4515 100644 --- a/codex-rs/tui/src/pager_overlay/transcript.rs +++ b/codex-rs/tui/src/pager_overlay/transcript.rs @@ -5,8 +5,7 @@ use super::*; use crate::history_cell::HistoryRenderMode; -use crate::history_cell::SessionHeaderHistoryCell; -use crate::history_cell::SessionInfoCell; +use crate::history_cell::is_session_history_prefix_cell; use crate::keymap::RuntimeKeymap; use crate::motion::MotionMode; use crate::transcript_view::TranscriptBookmark; @@ -313,10 +312,7 @@ impl TranscriptOverlay { let index = self .cells .iter() - .rposition(|cell| { - cell.as_any().is::() - || cell.as_any().is::() - }) + .rposition(|cell| is_session_history_prefix_cell(cell.as_ref())) .map_or(/*default*/ 0, |index| index + 1); let added = cells.len(); self.cells.splice(index..index, cells); diff --git a/codex-rs/tui/src/pager_overlay/transcript_tests.rs b/codex-rs/tui/src/pager_overlay/transcript_tests.rs index 2a9d327646..d0f9fc109f 100644 --- a/codex-rs/tui/src/pager_overlay/transcript_tests.rs +++ b/codex-rs/tui/src/pager_overlay/transcript_tests.rs @@ -60,6 +60,29 @@ fn scrolling_prepend_and_resize_preserve_reading_content() { assert!(!overlay.is_scrolled_to_bottom()); } +#[test] +fn repeated_prepend_keeps_fork_lineage_first() { + let lineage: Arc = Arc::new(history_cell::ForkedThreadHistoryCell( + history_cell::PlainHistoryCell::new(vec!["fork lineage".into()]), + )); + let mut overlay = transcript_overlay(vec![ + Arc::clone(&lineage), + Arc::new(TestCell { + lines: vec!["recent".into()], + }), + ]); + + let older = overlay.prepend(vec![Arc::new(TestCell { + lines: vec!["older".into()], + })]); + let oldest = overlay.prepend(vec![Arc::new(TestCell { + lines: vec!["oldest".into()], + })]); + + assert_eq!((older, oldest), (1, 1)); + assert!(Arc::ptr_eq(&overlay.cells[0], &lineage)); +} + #[tokio::test] async fn activity_hint_uses_the_configured_pager_jump_binding() -> Result<()> { let mut tui = crate::tui::test_support::make_test_tui()?; From 3ee99cde7074a09f57b8cd1c4b42a3dbc06ca023 Mon Sep 17 00:00:00 2001 From: vkg-oai Date: Wed, 14 Oct 2026 17:20:06 +0000 Subject: [PATCH 051/155] Track approval cancellation sources and Guardian context changes (#54046) ## What changed - Preserve approval resolution sources through tool errors and tag cancelled MCP approvals with `error_type=approval`, `error_code=cancelled`, and `approval_source` (`guardian`, `user`, `hook`, or `unknown`). The source identifies the reviewer, not who caused cancellation. - Record `context_changed` when validating a Guardian allow against changed authorization or review context, even when a concurrent stop or history reset determines the outcome. Retain the flag across retries and fresh-checkpoint recovery, and include it in the Guardian review counter. GitOrigin-RevId: a19a986a7565f9a78a9bb2eaabdb5651834d28b8 --- codex-rs/analytics/src/events.rs | 4 ++ codex-rs/core/src/guardian/review_request.rs | 17 ++++++-- .../core/src/guardian/review_session_setup.rs | 8 +++- codex-rs/core/src/mcp_tool_call.rs | 31 ++++++++++---- codex-rs/core/src/mcp_tool_call/telemetry.rs | 23 ++++++++++ .../core/src/mcp_tool_call/telemetry_tests.rs | 6 +++ codex-rs/core/src/mcp_tool_call_tests.rs | 35 +++++++++++++--- codex-rs/core/src/tools/approvals.rs | 42 +++++++++++++++---- codex-rs/core/src/tools/mod.rs | 1 + codex-rs/core/src/tools/network_approval.rs | 2 +- codex-rs/core/src/tools/orchestrator.rs | 9 ++-- .../core/src/unified_exec/process_manager.rs | 1 + codex-rs/ext/guardian-reviewer/src/metrics.rs | 2 + codex-rs/ext/guardian-reviewer/src/retry.rs | 3 ++ 14 files changed, 153 insertions(+), 31 deletions(-) diff --git a/codex-rs/analytics/src/events.rs b/codex-rs/analytics/src/events.rs index 5306749b5c..2cb33836b3 100644 --- a/codex-rs/analytics/src/events.rs +++ b/codex-rs/analytics/src/events.rs @@ -538,6 +538,9 @@ pub struct GuardianReviewAnalyticsResult { pub terminal_status: GuardianReviewTerminalStatus, pub failure_reason: Option, pub attempt_count: i64, + /// An allow was validated against changed parent/root authorization or review context. + /// Retained across attempts; this does not identify the cause of a later cancellation. + pub context_changed: bool, pub risk_level: Option, pub user_authorization: Option, pub outcome: Option, @@ -564,6 +567,7 @@ impl GuardianReviewAnalyticsResult { terminal_status: GuardianReviewTerminalStatus::FailedClosed, failure_reason: None, attempt_count: 1, + context_changed: false, risk_level: None, user_authorization: None, outcome: None, diff --git a/codex-rs/core/src/guardian/review_request.rs b/codex-rs/core/src/guardian/review_request.rs index 43bfae0312..613b7efb61 100644 --- a/codex-rs/core/src/guardian/review_request.rs +++ b/codex-rs/core/src/guardian/review_request.rs @@ -34,12 +34,19 @@ pub(in crate::guardian) struct ReviewAuthorization { history_reset: CancellationToken, } +/// Keeps observed context changes separate from the invalidation outcome. +/// A concurrent stop or history reset can take precedence over changed context. +pub(in crate::guardian) struct ReviewInvalidation { + pub(in crate::guardian) outcome: codex_guardian_reviewer::GuardianReviewSessionOutcome, + pub(in crate::guardian) context_changed: bool, +} + impl ReviewAuthorization { pub(in crate::guardian) async fn invalidation( &self, session: &Session, cancellation: Option<&CancellationToken>, - ) -> Option { + ) -> Option { use codex_guardian_reviewer::GuardianReviewSessionOutcome; let root_snapshot = session @@ -63,7 +70,7 @@ impl ReviewAuthorization { let review_context_changed = root_review_changed || self.review_context_revision != history.guardian_review_context_revision(); // An actual stop or history reset wins over a concurrent evidence change. - if self.history_reset.is_cancelled() + let outcome = if self.history_reset.is_cancelled() || cancellation.is_some_and(CancellationToken::is_cancelled) || root_history_changed { @@ -78,7 +85,11 @@ impl ReviewAuthorization { Some(GuardianReviewSessionOutcome::StaleAuthorization) } else { None - } + }; + outcome.map(|outcome| ReviewInvalidation { + outcome, + context_changed: authorization_changed || review_context_changed, + }) } } diff --git a/codex-rs/core/src/guardian/review_session_setup.rs b/codex-rs/core/src/guardian/review_session_setup.rs index ce3fd4bd13..ed1447f317 100644 --- a/codex-rs/core/src/guardian/review_session_setup.rs +++ b/codex-rs/core/src/guardian/review_session_setup.rs @@ -314,13 +314,15 @@ impl ReviewerRequest for PreparedReview { assessment.outcome == super::super::GuardianAssessmentOutcome::Allow }) && let Some(authorization) = &self.params.authorization - && let Some(outcome) = authorization + && let Some(invalidation) = authorization .invalidation( &self.params.parent_session, self.params.external_cancel.as_ref(), ) .await { + let outcome = invalidation.outcome; + result.analytics.context_changed |= invalidation.context_changed; result.disposition = if matches!(outcome, GuardianReviewSessionOutcome::StaleAuthorization) && result.disposition == SessionDisposition::Reusable @@ -378,7 +380,9 @@ pub(crate) async fn run_guardian_review_session( Arc::make_mut(&mut prepared.context).reviewer_selection = ReviewerSelection::FreshParentCheckpoint; prepared.recovery_requested = Arc::default(); - pool.review(prepared).await + let (outcome, mut analytics) = pool.review(prepared).await; + analytics.context_changed |= result.1.context_changed; + (outcome, analytics) } else { result } diff --git a/codex-rs/core/src/mcp_tool_call.rs b/codex-rs/core/src/mcp_tool_call.rs index 991ad9083c..0cc6b1fc4a 100644 --- a/codex-rs/core/src/mcp_tool_call.rs +++ b/codex-rs/core/src/mcp_tool_call.rs @@ -16,6 +16,7 @@ use crate::session::session::Session; use crate::session::step_context::StepContext; use crate::session::turn_context::TurnContext; use crate::tools::ApprovalContext; +use crate::tools::ApprovalResolutionSource; use crate::tools::context::ToolCallOrigin; use crate::tools::hook_names::HookToolName; use crate::tools::lifecycle::process_mcp_tool_result; @@ -275,7 +276,7 @@ pub(crate) async fn handle_mcp_tool_call( } else { McpToolApprovalPolicy::for_server(approval_mode) }; - if let Some(decision) = maybe_request_mcp_tool_approval( + if let Some(approval) = maybe_request_mcp_tool_approval( &sess, step_context, cancellation_token, @@ -290,7 +291,9 @@ pub(crate) async fn handle_mcp_tool_call( ) .await { - let result = match decision { + let cancellation_outcome = matches!(approval.decision, ReviewDecision::Abort) + .then(|| McpCallMetricOutcome::approval_cancelled(approval.source)); + let result = match approval.decision { decision @ (ReviewDecision::Approved | ReviewDecision::ApprovedForSession | ReviewDecision::ApprovedMcpPolicyAmendment @@ -356,7 +359,8 @@ pub(crate) async fn handle_mcp_tool_call( }; let status = if result.is_ok() { "ok" } else { "error" }; - let outcome = McpCallMetricOutcome::from_status(status); + let outcome = + cancellation_outcome.unwrap_or_else(|| McpCallMetricOutcome::from_status(status)); emit_mcp_call_metrics( &step_context.session_telemetry, &outcome, @@ -1467,6 +1471,12 @@ fn mcp_tool_approval_prompt_options( } } +#[derive(Debug, PartialEq, Eq)] +struct McpToolApproval { + decision: ReviewDecision, + source: Option, +} + #[expect(clippy::too_many_arguments)] async fn maybe_request_mcp_tool_approval( sess: &Arc, @@ -1480,7 +1490,7 @@ async fn maybe_request_mcp_tool_approval( config: &codex_mcp::McpConfig, permission_profile: &PermissionProfile, policy: McpToolApprovalPolicy, -) -> Option { +) -> Option { let turn_context = &step_context.turn; let strict_auto_review = turn_context.strict_auto_review_enabled(); let approvals_reviewer = connectors::mcp_approvals_reviewer_from_layers( @@ -1522,7 +1532,10 @@ async fn maybe_request_mcp_tool_approval( && let Some(key) = session_approval_key.as_ref() && mcp_tool_approval_is_remembered(sess, key).await { - return Some(ReviewDecision::Approved); + return Some(McpToolApproval { + decision: ReviewDecision::Approved, + source: None, + }); } let action = ApprovalAction::McpToolCall { @@ -1563,13 +1576,15 @@ async fn maybe_request_mcp_tool_approval( retry_reason: None, network_approval_context: None, }; - Some( - match sess.request_approval(action, approval_context).await { + let approval = sess.request_approval(action, approval_context).await; + Some(McpToolApproval { + decision: match approval.result { Ok(decision) => decision, Err(ToolError::Rejected(rejection)) => ReviewDecision::denied(rejection), Err(ToolError::Codex(_)) => ReviewDecision::Abort, }, - ) + source: approval.source, + }) } pub(crate) async fn request_mcp_tool_user_approval( diff --git a/codex-rs/core/src/mcp_tool_call/telemetry.rs b/codex-rs/core/src/mcp_tool_call/telemetry.rs index 1614e88a72..76aadd4ef6 100644 --- a/codex-rs/core/src/mcp_tool_call/telemetry.rs +++ b/codex-rs/core/src/mcp_tool_call/telemetry.rs @@ -7,6 +7,8 @@ use codex_protocol::mcp::CallToolResult; use serde_json::Value as JsonValue; use tracing::Span; +use crate::tools::ApprovalResolutionSource; + const MCP_CALL_COUNT_METRIC: &str = "codex.mcp.call"; const MCP_CALL_DURATION_METRIC: &str = "codex.mcp.call.duration_ms"; const MCP_CALL_ERROR_COUNT_METRIC: &str = "codex.mcp.call.error"; @@ -25,6 +27,7 @@ pub(super) struct McpCallMetricOutcome { status: &'static str, error_type: Option<&'static str>, error_code: Option, + approval_source: Option<&'static str>, } impl McpCallMetricOutcome { @@ -33,6 +36,21 @@ impl McpCallMetricOutcome { status, error_type: None, error_code: None, + approval_source: None, + } + } + + pub(super) fn approval_cancelled(source: Option) -> Self { + Self { + status: "error", + error_type: Some("approval"), + error_code: Some("cancelled".to_string()), + approval_source: Some(match source { + Some(ApprovalResolutionSource::Guardian) => "guardian", + Some(ApprovalResolutionSource::User) => "user", + Some(ApprovalResolutionSource::Hook) => "hook", + None => "unknown", + }), } } } @@ -69,6 +87,9 @@ pub(super) fn emit_mcp_call_metrics( let mut error_tags = tags; error_tags.push(("error_type", sanitize_metric_tag_value(error_type))); error_tags.push(("error_code", error_code.to_string())); + if let Some(approval_source) = outcome.approval_source { + error_tags.push(("approval_source", approval_source.to_string())); + } let error_tag_refs: Vec<(&str, &str)> = error_tags .iter() .map(|(key, value)| (*key, value.as_str())) @@ -138,6 +159,7 @@ pub(super) fn mcp_call_metric_outcome( status: "error", error_type: Some(MCP_CALL_ERROR_TYPE_TOOL_RESULT), error_code: Some(sanitize_metric_tag_value(&error_code)), + approval_source: None, } } Ok(_) => McpCallMetricOutcome::from_status("ok"), @@ -145,6 +167,7 @@ pub(super) fn mcp_call_metric_outcome( status: "error", error_type: Some(MCP_CALL_ERROR_TYPE_MCP_REQUEST), error_code: Some(MCP_CALL_ERROR_CODE_UNKNOWN.to_string()), + approval_source: None, }, } } diff --git a/codex-rs/core/src/mcp_tool_call/telemetry_tests.rs b/codex-rs/core/src/mcp_tool_call/telemetry_tests.rs index 8b17d5f6b2..80b67e167d 100644 --- a/codex-rs/core/src/mcp_tool_call/telemetry_tests.rs +++ b/codex-rs/core/src/mcp_tool_call/telemetry_tests.rs @@ -43,6 +43,7 @@ fn mcp_call_metric_outcome_distinguishes_request_and_tool_errors() { status: "ok", error_type: None, error_code: None, + approval_source: None, } ); assert_eq!( @@ -54,6 +55,7 @@ fn mcp_call_metric_outcome_distinguishes_request_and_tool_errors() { status: "error", error_type: Some(MCP_CALL_ERROR_TYPE_TOOL_RESULT), error_code: Some("RATE_LIMITED".to_string()), + approval_source: None, } ); assert_eq!( @@ -62,6 +64,7 @@ fn mcp_call_metric_outcome_distinguishes_request_and_tool_errors() { status: "error", error_type: Some(MCP_CALL_ERROR_TYPE_MCP_REQUEST), error_code: Some(MCP_CALL_ERROR_CODE_UNKNOWN.to_string()), + approval_source: None, } ); } @@ -79,6 +82,7 @@ fn mcp_call_metric_outcome_reports_server_tool_error_codes() { status: "error", error_type: Some(MCP_CALL_ERROR_TYPE_TOOL_RESULT), error_code: Some("arbitrary-user-value".to_string()), + approval_source: None, } ); } @@ -105,6 +109,7 @@ fn mcp_call_metric_outcome_reads_auth_error_code_from_meta() { status: "error", error_type: Some(MCP_CALL_ERROR_TYPE_TOOL_RESULT), error_code: Some("UNAUTHORIZED".to_string()), + approval_source: None, } ); } @@ -123,6 +128,7 @@ fn mcp_call_metric_outcome_bounds_and_sanitizes_error_code() { status: "error", error_type: Some(MCP_CALL_ERROR_TYPE_TOOL_RESULT), error_code: Some(format!("BAD_CODE_{}", "x".repeat(247))), + approval_source: None, } ); } diff --git a/codex-rs/core/src/mcp_tool_call_tests.rs b/codex-rs/core/src/mcp_tool_call_tests.rs index 1dc06e3d00..7192660f38 100644 --- a/codex-rs/core/src/mcp_tool_call_tests.rs +++ b/codex-rs/core/src/mcp_tool_call_tests.rs @@ -2944,7 +2944,13 @@ async fn permission_request_hook_allows_mcp_tool_call() { ) .await; - assert_eq!(decision, Some(ReviewDecision::Approved)); + assert_eq!( + decision, + Some(McpToolApproval { + decision: ReviewDecision::Approved, + source: Some(ApprovalResolutionSource::Hook), + }) + ); let log = std::fs::read_to_string(log_path).expect("read MCP permission hook log"); let inputs = log .lines() @@ -3015,7 +3021,13 @@ async fn permission_request_hook_uses_hook_tool_name_without_metadata() { ) .await; - assert_eq!(decision, Some(ReviewDecision::Approved)); + assert_eq!( + decision, + Some(McpToolApproval { + decision: ReviewDecision::Approved, + source: Some(ApprovalResolutionSource::Hook), + }) + ); let log = std::fs::read_to_string(log_path).expect("read MCP permission hook log"); let inputs = log .lines() @@ -3102,7 +3114,13 @@ async fn permission_request_hook_runs_after_remembered_mcp_approval() { ) .await; - assert_eq!(decision, Some(ReviewDecision::Approved)); + assert_eq!( + decision, + Some(McpToolApproval { + decision: ReviewDecision::Approved, + source: None, + }) + ); assert!( !log_path.exists(), "remembered approval should skip PermissionRequest hooks" @@ -3202,7 +3220,11 @@ async fn strict_auto_review_forces_guardian_for_mcp_policy_skip() { ) .await; - let Some(ReviewDecision::Denied { rejection: message }) = decision else { + let Some(McpToolApproval { + decision: ReviewDecision::Denied { rejection: message }, + source: Some(ApprovalResolutionSource::Guardian), + }) = decision + else { panic!("guardian-denied MCP approval should carry a rejection message"); }; assert!(message.contains("Reason: The tool call would expose private calendar data")); @@ -3313,7 +3335,10 @@ async fn assert_mcp_user_approval_persistence( .await .expect("MCP approval task timed out") .expect("MCP approval task failed"), - Some(expected_decision), + Some(McpToolApproval { + decision: expected_decision, + source: Some(ApprovalResolutionSource::User), + }), ); } diff --git a/codex-rs/core/src/tools/approvals.rs b/codex-rs/core/src/tools/approvals.rs index 16197b56d3..2052f5948c 100644 --- a/codex-rs/core/src/tools/approvals.rs +++ b/codex-rs/core/src/tools/approvals.rs @@ -388,12 +388,20 @@ impl ApprovalAction { } #[derive(Clone, Copy, Debug, PartialEq, Eq)] -enum ApprovalResolutionSource { +pub(crate) enum ApprovalResolutionSource { Hook, Guardian, User, } +/// Preserves the approval path even when the decision becomes a tool error. +/// The source identifies the reviewer, not the actor that caused cancellation. +#[must_use] +pub(crate) struct ApprovalResult { + pub(crate) result: Result, + pub(crate) source: Option, +} + #[derive(Clone, Debug, PartialEq, Eq)] struct ApprovalResolution { decision: ReviewDecision, @@ -440,7 +448,7 @@ impl Session { self: &Arc, action: ApprovalAction, ctx: ApprovalContext, - ) -> Result { + ) -> ApprovalResult { // Stdin that exceeds current permissions needs a fresh sandbox approval. // Strict review of ordinary input follows the same routing as ordinary exec. let policy = ctx.review_context.turn().approval_policy(); @@ -450,7 +458,10 @@ impl Session { && let Some(reason) = prompt_is_rejected_by_policy(policy, /*prompt_is_rule*/ false) { - return Err(ToolError::Rejected(reason.to_string())); + return ApprovalResult { + result: Err(ToolError::Rejected(reason.to_string())), + source: None, + }; } let is_mcp_tool_call = matches!(&action, ApprovalAction::McpToolCall { .. }); let is_network_approval = matches!(&action, ApprovalAction::NetworkAccess { .. }); @@ -485,8 +496,12 @@ impl Session { if !is_network_approval { record_resolution(&ctx, &resolution); } + let source = Some(resolution.source); if is_mcp_tool_call && resolution.decision == ReviewDecision::ApprovedMcpPolicyAmendment { - return Ok(resolution.decision); + return ApprovalResult { + result: Ok(resolution.decision), + source, + }; } if is_network_approval { match (&resolution.decision, resolution.source) { @@ -496,17 +511,26 @@ impl Session { }, _, ) if network_policy_amendment.action == NetworkPolicyRuleAction::Deny => { - return Ok(resolution.decision); + return ApprovalResult { + result: Ok(resolution.decision), + source, + }; } (ReviewDecision::Abort, ApprovalResolutionSource::Guardian) => { - return Err(ToolError::Rejected( - "automatic approval review was cancelled".to_string(), - )); + return ApprovalResult { + result: Err(ToolError::Rejected( + "automatic approval review was cancelled".to_string(), + )), + source, + }; } _ => {} } } - resolution.into_tool_result(ctx.review_context.turn().model_info()) + ApprovalResult { + result: resolution.into_tool_result(ctx.review_context.turn().model_info()), + source, + } } async fn request_reviewer_approval( diff --git a/codex-rs/core/src/tools/mod.rs b/codex-rs/core/src/tools/mod.rs index 501ce5fe4e..7523d8b6ec 100644 --- a/codex-rs/core/src/tools/mod.rs +++ b/codex-rs/core/src/tools/mod.rs @@ -29,6 +29,7 @@ use std::borrow::Cow; use crate::session::turn_context::TurnContext; pub(crate) use approvals::ApprovalContext; +pub(crate) use approvals::ApprovalResolutionSource; use codex_features::Feature; use codex_protocol::exec_output::ExecToolCallOutput; use codex_protocol::openai_models::ModelInfo; diff --git a/codex-rs/core/src/tools/network_approval.rs b/codex-rs/core/src/tools/network_approval.rs index 78924010a2..7eb6860729 100644 --- a/codex-rs/core/src/tools/network_approval.rs +++ b/codex-rs/core/src/tools/network_approval.rs @@ -819,7 +819,7 @@ impl NetworkApprovalService { } else { approval.await }; - let approval_decision = match approval_result { + let approval_decision = match approval_result.result { Ok(decision) => decision, Err(ToolError::Rejected(rejection)) => { if let Some(owner_call) = owner_call.as_ref() { diff --git a/codex-rs/core/src/tools/orchestrator.rs b/codex-rs/core/src/tools/orchestrator.rs index e7f544458b..46fd29d030 100644 --- a/codex-rs/core/src/tools/orchestrator.rs +++ b/codex-rs/core/src/tools/orchestrator.rs @@ -187,7 +187,8 @@ impl ToolOrchestrator { tool_ctx .session .request_approval(action, approval_ctx) - .await?; + .await + .result?; already_approved = true; } else { otel.tool_decision( @@ -220,7 +221,8 @@ impl ToolOrchestrator { tool_ctx .session .request_approval(action, approval_ctx) - .await?; + .await + .result?; already_approved = true; } } @@ -511,7 +513,8 @@ impl ToolOrchestrator { tool_ctx .session .request_approval(action, approval_ctx) - .await?; + .await + .result?; } let retry_sandbox_requested = !unsandboxed_allowed diff --git a/codex-rs/core/src/unified_exec/process_manager.rs b/codex-rs/core/src/unified_exec/process_manager.rs index cda8c59dd8..37a4759b82 100644 --- a/codex-rs/core/src/unified_exec/process_manager.rs +++ b/codex-rs/core/src/unified_exec/process_manager.rs @@ -977,6 +977,7 @@ impl UnifiedExecProcessManager { .session .request_approval(approval, approval_context) .await + .result .map_err(UnifiedExecError::StdinApproval)?; } diff --git a/codex-rs/ext/guardian-reviewer/src/metrics.rs b/codex-rs/ext/guardian-reviewer/src/metrics.rs index 48809cdf94..8813d307e2 100644 --- a/codex-rs/ext/guardian-reviewer/src/metrics.rs +++ b/codex-rs/ext/guardian-reviewer/src/metrics.rs @@ -46,6 +46,7 @@ pub(crate) fn emit_guardian_review_metrics( }; let mut counter_tag_refs = tag_refs.clone(); counter_tag_refs.extend(mcp_tags.iter().map(|(key, value)| (*key, value.as_str()))); + counter_tag_refs.push(("context_changed", bool_tag(result.context_changed))); session_telemetry.counter( GUARDIAN_REVIEW_COUNT_METRIC, /*inc*/ 1, @@ -463,6 +464,7 @@ mod tests { ]); let mut expected_counter_tags = expected_base_tags.clone(); expected_counter_tags.extend(expected_mcp_tags); + expected_counter_tags.insert("context_changed".to_string(), "false".to_string()); assert_eq!((attrs, value), (expected_counter_tags, 1)); assert_eq!( diff --git a/codex-rs/ext/guardian-reviewer/src/retry.rs b/codex-rs/ext/guardian-reviewer/src/retry.rs index 0e2df7e965..7bae2d989b 100644 --- a/codex-rs/ext/guardian-reviewer/src/retry.rs +++ b/codex-rs/ext/guardian-reviewer/src/retry.rs @@ -45,9 +45,12 @@ where } = limits; assert!(max_attempts > 0, "guardian review must run at least once"); let mut attempt_count = 1; + let mut context_changed = false; loop { let (outcome, mut analytics_result, evidence) = run_attempt(deadline).await; analytics_result.attempt_count = attempt_count; + context_changed |= analytics_result.context_changed; + analytics_result.context_changed = context_changed; if attempt_count >= max_attempts || !should_retry_guardian_review(&outcome) { return (outcome, analytics_result, evidence); } From 764a70fc113d494c38e7874c01efba15a5e4e6d8 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 14 Oct 2026 17:20:59 +0000 Subject: [PATCH 052/155] Restore elapsed time for replayed in-progress turns (#54047) ## Why Replaying an in-progress turn reset the TUI's `Working` timer to zero, hiding time already spent on the turn. ## What changed Initialize the status timer from the turn's `started_at` timestamp when replaying turns or turn-start notifications. Keep the zero-time fallback when the timestamp is missing, and clamp future timestamps to zero elapsed time. ## Testing Extend history replay tests to verify elapsed time for both thread snapshots and replayed in-progress turns, and normalize the timer in rendering snapshots. GitOrigin-RevId: 36a48f43d0d7aa530f1bfe6dbefa9f0885cbd6c7 --- codex-rs/tui/src/chatwidget/protocol.rs | 6 ++- codex-rs/tui/src/chatwidget/replay.rs | 2 +- ...get__tests__replayed_in_progress_turn.snap | 4 +- .../src/chatwidget/tests/history_replay.rs | 50 ++++++++++++++++--- codex-rs/tui/src/chatwidget/turn_runtime.rs | 10 ++++ 5 files changed, 61 insertions(+), 11 deletions(-) diff --git a/codex-rs/tui/src/chatwidget/protocol.rs b/codex-rs/tui/src/chatwidget/protocol.rs index 0065ef473b..b68e13a2dd 100644 --- a/codex-rs/tui/src/chatwidget/protocol.rs +++ b/codex-rs/tui/src/chatwidget/protocol.rs @@ -102,7 +102,11 @@ impl ChatWidget { self.last_non_retry_error = None; if !matches!(replay_kind, Some(ReplayKind::ResumeInitialMessages)) { self.warning_display_state.startup_complete = true; - self.on_task_started(); + if from_replay { + self.on_replayed_task_started(notification.turn.started_at); + } else { + self.on_task_started(); + } } } ServerNotification::TurnCompleted(notification) => { diff --git a/codex-rs/tui/src/chatwidget/replay.rs b/codex-rs/tui/src/chatwidget/replay.rs index 1ebff8fcb3..8f573351ca 100644 --- a/codex-rs/tui/src/chatwidget/replay.rs +++ b/codex-rs/tui/src/chatwidget/replay.rs @@ -146,7 +146,7 @@ impl ChatWidget { self.warning_display_state.startup_complete = true; self.turn_lifecycle.last_turn_id = Some(turn_id.clone()); self.last_non_retry_error = None; - self.on_task_started(); + self.on_replayed_task_started(started_at); } let trailing_reasoning_id = (status == TurnStatus::InProgress) .then(|| items.last()) diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__replayed_in_progress_turn.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__replayed_in_progress_turn.snap index 4661f024d7..126e67cc09 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__replayed_in_progress_turn.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__replayed_in_progress_turn.snap @@ -1,8 +1,8 @@ --- source: tui/src/chatwidget/tests/history_replay.rs -expression: "normalize_completion_timestamps(& (render_bottom_popup(&chat, 80)))" +expression: "timer.replace_all(&normalize_snapshot_paths(render_bottom_popup(&chat, 80)),\n\"( •\")" --- -• Working (0s • esc to interrupt) +• Working ( • esc to interrupt) › Ask Codex to do anything diff --git a/codex-rs/tui/src/chatwidget/tests/history_replay.rs b/codex-rs/tui/src/chatwidget/tests/history_replay.rs index 93662ffac4..26388ec042 100644 --- a/codex-rs/tui/src/chatwidget/tests/history_replay.rs +++ b/codex-rs/tui/src/chatwidget/tests/history_replay.rs @@ -1631,15 +1631,38 @@ async fn live_reasoning_summary_drops_empty_parts_without_losing_content() { async fn thread_snapshot_replayed_turn_started_marks_task_running() { let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; - replay_turn_started(&mut chat, ReplayKind::ThreadSnapshot); + let started_at = chrono::Utc::now().timestamp() - 125; + chat.handle_server_notification( + ServerNotification::TurnStarted(TurnStartedNotification { + thread_id: "thread-1".to_string(), + turn: AppServerTurn { + started_at: Some(started_at), + ..app_server_turn( + "turn-1", + AppServerTurnStatus::InProgress, + /*duration_ms*/ None, + /*error*/ None, + ) + }, + }), + Some(ReplayKind::ThreadSnapshot), + ); drain_insert_history(&mut rx); assert!(chat.bottom_pane.is_task_running()); - let status = chat - .bottom_pane - .status_widget() - .expect("status indicator should be visible"); - assert_eq!(status.header(), "Working"); + let before = chrono::Utc::now().timestamp() - started_at; + let elapsed = chat.bottom_pane.status_elapsed().unwrap().as_secs() as i64; + let after = chrono::Utc::now().timestamp() - started_at; + // The wire timestamp has second precision; reads may be separated by any CI delay. + assert!( + (before - 1..=after).contains(&elapsed), + "{elapsed} not in {before}..={after}" + ); + let timer = regex_lite::Regex::new(r"\(\d+(?:h \d+m \d+s|m \d+s|s) •").unwrap(); + insta::assert_snapshot!( + timer.replace_all(render_bottom_first_row(&chat, /*width*/ 80).trim(), "( •"), + @"• Working ( • esc to interrupt)" + ); } #[tokio::test] @@ -1655,9 +1678,11 @@ async fn replayed_in_progress_turn_marks_task_running() { let (mut chat, mut rx, mut op_rx) = make_chatwidget_manual(/*model_override*/ None).await; chat.thread_id = Some(ThreadId::new()); + let started_at = chrono::Utc::now().timestamp() - 125; chat.replay_thread_turns( vec![AppServerTurn { items_view, + started_at: Some(started_at), ..app_server_turn( "turn-1", AppServerTurnStatus::InProgress, @@ -1676,9 +1701,20 @@ async fn replayed_in_progress_turn_marks_task_running() { ), (true, Some("turn-1")), ); + let before = chrono::Utc::now().timestamp() - started_at; + let elapsed = chat.bottom_pane.status_elapsed().unwrap().as_secs() as i64; + let after = chrono::Utc::now().timestamp() - started_at; + assert!( + (before - 1..=after).contains(&elapsed), + "{elapsed} not in {before}..={after}" + ); + let timer = regex_lite::Regex::new(r"\(\d+(?:h \d+m \d+s|m \d+s|s) •").unwrap(); assert_chatwidget_snapshot!( "replayed_in_progress_turn", - normalize_snapshot_paths(render_bottom_popup(&chat, /*width*/ 80)), + timer.replace_all( + &normalize_snapshot_paths(render_bottom_popup(&chat, /*width*/ 80)), + "( •" + ), ); chat.handle_key_event(KeyEvent::new(KeyCode::Char('c'), KeyModifiers::CONTROL)); diff --git a/codex-rs/tui/src/chatwidget/turn_runtime.rs b/codex-rs/tui/src/chatwidget/turn_runtime.rs index 575410965b..2b394230f8 100644 --- a/codex-rs/tui/src/chatwidget/turn_runtime.rs +++ b/codex-rs/tui/src/chatwidget/turn_runtime.rs @@ -114,6 +114,16 @@ impl ChatWidget { self.request_redraw(); } + pub(super) fn on_replayed_task_started(&mut self, started_at: Option) { + self.on_task_started(); + if let Some(started_at) = started_at { + let elapsed_secs = chrono::Utc::now().timestamp().saturating_sub(started_at); + self.bottom_pane.reset_status_timer(Duration::from_secs( + elapsed_secs.try_into().unwrap_or_default(), + )); + } + } + pub(super) fn on_task_complete( &mut self, last_agent_message: Option, From 534c70863c107e2bdedfa25b72bc1b035cb3208f Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 14 Oct 2026 17:21:59 +0000 Subject: [PATCH 053/155] Defer folder trust checks until starting a task from agents overview (#54048) ## Why The Agent Command Center does not open a workspace, so viewing it should not require consent for the launch directory. ## What changed Skip startup folder consent when opening the agents overview, while preserving initialization for the embedded fallback. Check folder trust before starting the first task, including through `/new` after dismissing the overview. On Windows, retain the sandbox setup prompt after folder trust is granted. ## Testing Add CLI tests for starting a task from an untrusted folder through the overview and through `/new` after dismissing it. A terminal snapshot verifies that the overview appears before folder consent. GitOrigin-RevId: 129be14a354b8abde2e8430c81599e2064ccac87 --- codex-rs/cli/tests/daemon_startup.rs | 59 ++++++++++++++++++- ...agents_overview_before_folder_consent.snap | 58 ++++++++++++++++++ codex-rs/tui/src/app/resume_config.rs | 4 ++ codex-rs/tui/src/app/session_lifecycle.rs | 22 +++++++ .../tui/src/app/tests/new_session_tests.rs | 5 ++ codex-rs/tui/src/lib.rs | 11 +++- 6 files changed, 154 insertions(+), 5 deletions(-) create mode 100644 codex-rs/cli/tests/snapshots/daemon_startup__agents_overview_before_folder_consent.snap diff --git a/codex-rs/cli/tests/daemon_startup.rs b/codex-rs/cli/tests/daemon_startup.rs index 8b7cea4cc8..a78093e73a 100644 --- a/codex-rs/cli/tests/daemon_startup.rs +++ b/codex-rs/cli/tests/daemon_startup.rs @@ -20,6 +20,18 @@ async fn agents_can_offer_restart_for_managed_daemon() -> Result<()> { daemon_startup("agents").await } +#[tokio::test] +#[cfg(unix)] +async fn agents_defers_launch_directory_trust_until_starting_a_task() -> Result<()> { + daemon_startup("agents-untrusted").await +} + +#[tokio::test] +#[cfg(unix)] +async fn agents_checks_trust_when_starting_after_dismissing_overview() -> Result<()> { + daemon_startup("agents-untrusted-new").await +} + #[tokio::test] #[cfg(unix)] async fn discovered_managed_daemon_can_restart_with_auto_start_disabled() -> Result<()> { @@ -173,13 +185,18 @@ async fn daemon_startup(command: &str) -> Result<()> { tui.disable_paste_burst = true\n\ {}\n\ notice.model_migrations.\"gpt-5.6-terra\" = \"gpt-6-sol\"\n\ - [projects.{}]\ntrust_level = \"trusted\"\n", + [projects.{}]\ntrust_level = \"{}\"\n", if command == "discovered" { "tui.status_line=[\"model\",\"thread-id\",\"thread-name\"]" } else { "" }, serde_json::to_string(&workspace_path)?, + if command.starts_with("agents-untrusted") { + "untrusted" + } else { + "trusted" + }, ), )?; let mismatch = command.starts_with("mismatch-"); @@ -216,7 +233,13 @@ async fn daemon_startup(command: &str) -> Result<()> { let mut steps: VecDeque<(&str, &[u8])> = VecDeque::new(); if matches!( command, - "start" | "agents" | "discovered" | "bedrock-running" | "restrictive-job" + "start" + | "agents" + | "agents-untrusted" + | "agents-untrusted-new" + | "discovered" + | "bedrock-running" + | "restrictive-job" ) || mismatch { // A selected package with a stopped daemon avoids installing a release. @@ -273,6 +296,15 @@ async fn daemon_startup(command: &str) -> Result<()> { steps.push_back(("GPT-5.6-Terra", b"/daemon\r")); steps.push_back(("Restartbackgroundserver", b"\x1b[F\r")); "Restartbackgroundserver?" + } else if command.starts_with("agents-untrusted") { + args.push("agents".into()); + if command == "agents-untrusted-new" { + steps.push_back(("Notasksyet", b"\x1b")); + steps.push_back(("GPT-5.6-Terra", b"/new\r")); + } else { + steps.push_back(("Notasksyet", b"n")); + } + "entercontinue·escback" } else if command == "discovered" { args.extend(["--disable".into(), "daemon_auto_start".into()]); // Empty drafts need not survive a daemon restart. Renaming materializes the @@ -382,6 +414,7 @@ async fn daemon_startup(command: &str) -> Result<()> { let writer = session.writer_sender(); let mut stdout = spawned.stdout_rx; let mut output = String::new(); + let mut initial_agents_screen = String::new(); let mut screen = vt100::Parser::new( /*rows*/ 40, /*cols*/ 120, /*scrollback_len*/ 0, ); @@ -422,6 +455,12 @@ async fn daemon_startup(command: &str) -> Result<()> { if let Some((ready, input)) = steps.front() && text.contains(ready) { + if command == "agents-untrusted" && *ready == "Notasksyet" { + if !text.contains("enteropennnew") { + continue; + } + initial_agents_screen = screen.screen().contents(); + } if command == "discovered" { if *ready == "Restartbackgroundserver?" { existing_daemon = Some(fs::read(&pid_file)?); @@ -456,6 +495,22 @@ async fn daemon_startup(command: &str) -> Result<()> { steps.pop_front(); output.clear(); } else if steps.is_empty() && text.contains(expected) { + if command == "agents-untrusted" { + let transition = format!( + "{initial_agents_screen}\n\n--- Start a task ---\n\n{}", + screen.screen().contents() + ) + .replace(&*workspace_path.to_string_lossy(), "[WORKSPACE]") + .replace(&*home.path().to_string_lossy(), "[CODEX_HOME]") + .replace(" tab/⇧tab filter", "tab/shift+tab filter"); + let transition = transition.lines().map(str::trim_end).collect::>().join("\n"); + let snapshot = codex_utils_cargo_bin::find_resource!( + "tests/snapshots/daemon_startup__agents_overview_before_folder_consent.snap" + )?; + insta::with_settings!({snapshot_path => snapshot.parent().context("snapshot has no parent")?}, { + insta::assert_snapshot!("agents_overview_before_folder_consent", transition); + }); + } if mismatch { let previous_pid = existing_daemon.as_ref().context("missing original daemon PID")?; ensure!((fs::read(&pid_file)? != *previous_pid) == restart); diff --git a/codex-rs/cli/tests/snapshots/daemon_startup__agents_overview_before_folder_consent.snap b/codex-rs/cli/tests/snapshots/daemon_startup__agents_overview_before_folder_consent.snap new file mode 100644 index 0000000000..5273276df5 --- /dev/null +++ b/codex-rs/cli/tests/snapshots/daemon_startup__agents_overview_before_folder_consent.snap @@ -0,0 +1,58 @@ +--- +source: cli/tests/daemon_startup.rs +expression: transition +--- + Agent command center Group: Project g + All 0 Needs you 0 Working 0 Ready 0 Inactive 0 tab/shift+tab filter + ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────── + No tasks yet │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + │ + ? help esc back ↑/↓ move enter open n new + +--- Start a task --- + + + Folder access + [WORKSPACE] + + Config, hooks, and exec policies from untrusted folders stay disabled. Trusted project folders can still contribute + settings. Skills still load, and tools follow your permission settings. Opening will not change saved trust. + +› 1. Open restricted + 2. Back to Agent Command Center + + enter continue · esc back diff --git a/codex-rs/tui/src/app/resume_config.rs b/codex-rs/tui/src/app/resume_config.rs index 1cfe074c07..80feda2d99 100644 --- a/codex-rs/tui/src/app/resume_config.rs +++ b/codex-rs/tui/src/app/resume_config.rs @@ -229,6 +229,10 @@ impl App { )); AppRunControl::Continue })?; + #[cfg(target_os = "windows")] + if result.directory_trust_persisted && self.current_displayed_thread_id().is_none() { + self.windows_sandbox.prompt_after_trust = true; + } // Directory changes review hooks once, after attaching the destination. if result.directory_trust_persisted && options.resumed_thread.is_none() diff --git a/codex-rs/tui/src/app/session_lifecycle.rs b/codex-rs/tui/src/app/session_lifecycle.rs index d6e030c9a8..27059f87ea 100644 --- a/codex-rs/tui/src/app/session_lifecycle.rs +++ b/codex-rs/tui/src/app/session_lifecycle.rs @@ -987,6 +987,28 @@ impl App { } return; } + // Dismissing the initial agents overview can expose /new before any folder consent. + // Resolve trust before loading defaults and applying explicit permission choices. + if self.current_displayed_thread_id().is_none() { + let mut config = self.chat_widget.config_ref().clone(); + let cwd = config.cwd.to_path_buf(); + if let Err(control) = self + .confirm_directory_trust( + tui, + app_server, + &mut config, + &cwd, + crate::onboarding::DirectoryTrustOptions::default(), + /*startup_draft*/ None, + ) + .await + { + if matches!(control, AppRunControl::Exit(_)) { + self.app_event_tx.send(AppEvent::Exit(ExitMode::Immediate)); + } + return; + } + } // Start a fresh in-memory session while preserving resumability via persisted rollout // history. If an initial message is provided, `enqueue_primary_thread_session` suppresses it // until the new session is configured and any replayed turns have been rendered. diff --git a/codex-rs/tui/src/app/tests/new_session_tests.rs b/codex-rs/tui/src/app/tests/new_session_tests.rs index 9f03f668a2..6e567ecdc5 100644 --- a/codex-rs/tui/src/app/tests/new_session_tests.rs +++ b/codex-rs/tui/src/app/tests/new_session_tests.rs @@ -409,6 +409,11 @@ async fn replacement_preserves_remote_launch_paths_and_older_servers() -> Result home.path().join("config.toml"), "model = \"configured-model\"\n", )?; + app.enqueue_primary_thread_session( + test_thread_session(ThreadId::new(), app.config.cwd.to_path_buf()), + Vec::new(), + ) + .await?; let (server, requests, proxy) = start_recording_app_server_with_history( &app.config, capabilities, diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs index 7a12cc9767..7aa9aa80f0 100644 --- a/codex-rs/tui/src/lib.rs +++ b/codex-rs/tui/src/lib.rs @@ -1848,9 +1848,14 @@ async fn run_ratatui_app( } } - // Remote startup keeps its existing explicit --cd trust check. Resolving other - // remote folders requires authoritative project-root information from the server. - if !uses_remote_workspace || remote_cwd_override.is_some() { + // The shared overview does not open a workspace; session selection checks trust when needed. + // Embedded fallback cannot show the overview and still needs normal startup initialization. + if (!matches!( + session_selection, + resume_picker::SessionSelection::AgentsOverview + ) || matches!(app_server_target, AppServerTarget::Embedded)) + && (!uses_remote_workspace || remote_cwd_override.is_some()) + { let resumed_thread = if matches!(app_server_target, AppServerTarget::LocalDaemon { .. }) && let resume_picker::SessionSelection::Resume(target) = &session_selection { From 9671d20fc82ea269d49ecc70b29a8630b29c1a32 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 14 Oct 2026 17:22:42 +0000 Subject: [PATCH 054/155] Scope TUI skill refreshes and workspace commands to explicit directories (#54050) ## Why A queued skill refresh can outlive the workspace it was requested for when the working directory changes. ## What changed - Refresh skills for the current working directory when the skills management popup closes. - Ignore queued `ListSkills` commands whose directories do not include the current working directory. - Require an explicit working directory when constructing `WorkspaceCommand` and always pass it to app-server command execution. Update Git and GitHub metadata probes to use the constructor. ## Testing Extend regression tests to verify that closing skill management refreshes the configured working directory and that stale skill refreshes after a directory change do not issue a `skills/list` request. GitOrigin-RevId: 47ad1d95930840b3f6f0e20d7d8fe8d025e789e6 --- .../app/tests/session_lifecycle_requests.rs | 10 ++++++++++ codex-rs/tui/src/app/thread_routing.rs | 7 +++++++ codex-rs/tui/src/app_event_sender.rs | 8 -------- .../tui/src/bottom_pane/skills_toggle_view.rs | 2 -- codex-rs/tui/src/branch_summary.rs | 9 ++------- codex-rs/tui/src/chatwidget/skills.rs | 1 + .../src/chatwidget/tests/history_replay.rs | 9 ++++++++- codex-rs/tui/src/get_git_diff.rs | 11 ++++------- codex-rs/tui/src/workspace_command.rs | 19 ++++++++----------- 9 files changed, 40 insertions(+), 36 deletions(-) diff --git a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs index ed67f0bf9d..5f5d4615ad 100644 --- a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs +++ b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs @@ -4589,6 +4589,16 @@ async fn changing_directory_preserves_project_trust_permissions_history_and_hook let source = codex_utils_path_uri::PathUri::from_abs_path(&agents.abs()); assert!(configured.instruction_source_paths.contains(&source)); assert_eq!(configured.approvals_reviewer, ApprovalsReviewer::AutoReview); + let earlier_skills_requests = recorded_params(&requests, "skills/list"); + app.submit_active_thread_op( + &mut server, + AppCommand::list_skills(vec![current.clone()], /*force_reload*/ true), + ) + .await?; + assert_eq!( + recorded_params(&requests, "skills/list"), + earlier_skills_requests + ); let (cwd, result) = (current.clone(), Err("stale skills".into())); let skills = AppEvent::SkillsListLoaded { cwd, result }; let (cwd, plugins) = (current.clone(), Some(vec![])); diff --git a/codex-rs/tui/src/app/thread_routing.rs b/codex-rs/tui/src/app/thread_routing.rs index f73bca912a..95591b4933 100644 --- a/codex-rs/tui/src/app/thread_routing.rs +++ b/codex-rs/tui/src/app/thread_routing.rs @@ -924,6 +924,13 @@ impl App { Ok(true) } AppCommand::ListSkills { cwds, force_reload } => { + // A queued refresh can outlive the workspace it was requested for. + if !cwds + .iter() + .any(|cwd| cwd == self.chat_widget.config_ref().cwd.as_path()) + { + return Ok(true); + } self.handle_skills_list_result( app_server .skills_list(codex_app_server_protocol::SkillsListParams { diff --git a/codex-rs/tui/src/app_event_sender.rs b/codex-rs/tui/src/app_event_sender.rs index dac6b8cbe8..0057b90ad0 100644 --- a/codex-rs/tui/src/app_event_sender.rs +++ b/codex-rs/tui/src/app_event_sender.rs @@ -3,7 +3,6 @@ //! This wraps the raw channel so call sites can submit typed `AppCommand`s //! without duplicating event construction or session logging behavior. -use std::path::PathBuf; use std::sync::Arc; use std::sync::atomic::AtomicBool; use std::sync::atomic::Ordering; @@ -86,13 +85,6 @@ impl AppEventSender { self.send(AppEvent::CodexOp(AppCommand::review(target))); } - pub(crate) fn list_skills(&self, cwds: Vec, force_reload: bool) { - self.send(AppEvent::CodexOp(AppCommand::list_skills( - cwds, - force_reload, - ))); - } - pub(crate) fn user_input_answer( &self, thread_id: ThreadId, diff --git a/codex-rs/tui/src/bottom_pane/skills_toggle_view.rs b/codex-rs/tui/src/bottom_pane/skills_toggle_view.rs index 3124fd25f3..9bd9084614 100644 --- a/codex-rs/tui/src/bottom_pane/skills_toggle_view.rs +++ b/codex-rs/tui/src/bottom_pane/skills_toggle_view.rs @@ -224,8 +224,6 @@ impl SkillsToggleView { } self.complete = true; self.app_event_tx.send(AppEvent::ManageSkillsClosed); - self.app_event_tx - .list_skills(Vec::new(), /*force_reload*/ true); } fn rows_height(&self, rows: &[GenericDisplayRow]) -> u16 { diff --git a/codex-rs/tui/src/branch_summary.rs b/codex-rs/tui/src/branch_summary.rs index 6329e43422..a14a25f104 100644 --- a/codex-rs/tui/src/branch_summary.rs +++ b/codex-rs/tui/src/branch_summary.rs @@ -480,11 +480,7 @@ async fn run_git_command( argv.push(codex_git_utils::SAFE_BARE_REPOSITORY_CONFIG.to_string()); argv.extend(args.iter().map(|arg| (*arg).to_string())); runner - .run( - WorkspaceCommand::new(argv) - .cwd(cwd.to_path_buf()) - .env("GIT_OPTIONAL_LOCKS", "0"), - ) + .run(WorkspaceCommand::new(argv, cwd.to_path_buf()).env("GIT_OPTIONAL_LOCKS", "0")) .await } @@ -502,8 +498,7 @@ async fn run_gh_command( argv.extend(args.iter().map(|arg| (*arg).to_string())); runner .run( - WorkspaceCommand::new(argv) - .cwd(cwd.to_path_buf()) + WorkspaceCommand::new(argv, cwd.to_path_buf()) .env("GH_PROMPT_DISABLED", "1") .env("GIT_TERMINAL_PROMPT", "0"), ) diff --git a/codex-rs/tui/src/chatwidget/skills.rs b/codex-rs/tui/src/chatwidget/skills.rs index 56bb6071f9..f505fdde38 100644 --- a/codex-rs/tui/src/chatwidget/skills.rs +++ b/codex-rs/tui/src/chatwidget/skills.rs @@ -101,6 +101,7 @@ impl ChatWidget { } pub(crate) fn handle_manage_skills_closed(&mut self) { + self.refresh_skills_for_current_cwd(/*force_reload*/ true); let Some(initial_state) = self.skills_initial_state.take() else { return; }; diff --git a/codex-rs/tui/src/chatwidget/tests/history_replay.rs b/codex-rs/tui/src/chatwidget/tests/history_replay.rs index 26388ec042..9655f96ff6 100644 --- a/codex-rs/tui/src/chatwidget/tests/history_replay.rs +++ b/codex-rs/tui/src/chatwidget/tests/history_replay.rs @@ -597,7 +597,7 @@ async fn replayed_user_message_preserves_remote_image_urls() { #[tokio::test] async fn session_configured_syncs_widget_config_permissions_and_cwd() { - let (mut chat, _rx, _ops) = make_chatwidget_manual(/*model_override*/ None).await; + let (mut chat, _rx, mut ops) = make_chatwidget_manual(/*model_override*/ None).await; chat.config .permissions @@ -675,6 +675,13 @@ async fn session_configured_syncs_widget_config_permissions_and_cwd() { expected_app_server_permission_profile ); assert_eq!(&chat.config_ref().cwd, &expected_cwd); + while ops.try_recv().is_ok() {} + chat.handle_manage_skills_closed(); + assert!(matches!( + ops.try_recv(), + Ok(AppCommand::ListSkills { cwds, force_reload: true }) + if cwds == vec![expected_cwd.to_path_buf()] + )); let updated_profile = PermissionProfile::workspace_write(); chat.set_permission_profile_from_session_snapshot(PermissionProfileSnapshot::legacy( diff --git a/codex-rs/tui/src/get_git_diff.rs b/codex-rs/tui/src/get_git_diff.rs index b3893cf493..11812b3984 100644 --- a/codex-rs/tui/src/get_git_diff.rs +++ b/codex-rs/tui/src/get_git_diff.rs @@ -36,7 +36,7 @@ impl FsmonitorProbeRunner for WorkspaceFsmonitorProbeRunner<'_> { let argv = ["git", "-c", codex_git_utils::SAFE_BARE_REPOSITORY_CONFIG] .into_iter() .chain(args.iter().copied()); - let command = WorkspaceCommand::new(argv).cwd(self.cwd.to_path_buf()); + let command = WorkspaceCommand::new(argv, self.cwd.to_path_buf()); match self.runner.run(command).await { Ok(output) if output.success() => Some(output.stdout.into_bytes()), _ => None, @@ -242,8 +242,7 @@ async fn run_git_command( ] .into_iter() .chain(args.iter().copied()); - let mut command = WorkspaceCommand::new(argv) - .cwd(cwd.to_path_buf()) + let mut command = WorkspaceCommand::new(argv, cwd.to_path_buf()) .timeout(DIFF_COMMAND_TIMEOUT) .disable_output_cap(); if !config_overrides.is_empty() { @@ -830,7 +829,7 @@ mod tests { fn assert_command_metadata(commands: &[WorkspaceCommand], cwd: &Path) { for command in commands { - assert_eq!(command.cwd.as_deref(), Some(cwd)); + assert_eq!(command.cwd.as_path(), cwd); if matches!( command.argv.get(3).map(String::as_str), Some("config" | "version") @@ -911,9 +910,7 @@ mod tests { > { Box::pin(async move { let mut process = ProcessCommand::new(&command.argv[0]); - process - .args(&command.argv[1..]) - .current_dir(command.cwd.expect("test command cwd")); + process.args(&command.argv[1..]).current_dir(command.cwd); for (key, value) in command.env { match value { Some(value) => { diff --git a/codex-rs/tui/src/workspace_command.rs b/codex-rs/tui/src/workspace_command.rs index 6d3c030603..5d0014a388 100644 --- a/codex-rs/tui/src/workspace_command.rs +++ b/codex-rs/tui/src/workspace_command.rs @@ -37,8 +37,8 @@ pub(crate) type WorkspaceCommandRunner = Arc; pub(crate) struct WorkspaceCommand { /// Program and arguments to execute without shell interpolation. pub(crate) argv: Vec, - /// Working directory for the command, if different from app-server's session cwd. - pub(crate) cwd: Option, + /// Explicit working directory on the host that executes the command. + pub(crate) cwd: PathBuf, /// Environment overrides where `None` removes a variable. pub(crate) env: HashMap>, /// Maximum wall-clock duration before app-server cancels the command. @@ -49,22 +49,19 @@ pub(crate) struct WorkspaceCommand { impl WorkspaceCommand { /// Creates a workspace command with conservative defaults for metadata probes. - pub(crate) fn new(argv: impl IntoIterator>) -> Self { + pub(crate) fn new( + argv: impl IntoIterator>, + cwd: impl Into, + ) -> Self { Self { argv: argv.into_iter().map(Into::into).collect(), - cwd: None, + cwd: cwd.into(), env: HashMap::new(), timeout: Duration::from_secs(/*secs*/ 5), disable_output_cap: false, } } - /// Sets the command working directory. - pub(crate) fn cwd(mut self, cwd: impl Into) -> Self { - self.cwd = Some(cwd.into()); - self - } - /// Adds or replaces one environment variable override. pub(crate) fn env(mut self, key: impl Into, value: impl Into) -> Self { self.env.insert(key.into(), Some(value.into())); @@ -192,7 +189,7 @@ impl WorkspaceCommandExecutor for AppServerWorkspaceCommandRunner { disable_output_cap: command.disable_output_cap, disable_timeout: false, timeout_ms: Some(timeout_ms), - cwd: command.cwd, + cwd: Some(command.cwd), env, size: None, sandbox_policy: None, From 2b21129c6b8120e63f9ac510fe99e8b02ef43292 Mon Sep 17 00:00:00 2001 From: marksteinbrick-oai Date: Wed, 14 Oct 2026 17:28:15 +0000 Subject: [PATCH 055/155] Add Responses API client metadata patches for turn start and steer (#54053) ## Why Clients need a way to update individual turn metadata entries without replacing the existing client metadata map. ## What changed Add the experimental `responsesapiClientMetadataPatch` field to `turn/start` and `turn/steer`. Patches add or overwrite entries while retaining other keys and apply after `responsesapiClientMetadata` when both are supplied. The existing field retains replacement semantics, including clearing unprotected entries with an empty map. Continue protecting reserved metadata keys and preserving targeted `misalignment_override` continuations across updates. ## Testing Extend the app-server metadata integration test to cover replacement and patch steering, patch precedence at turn start, preservation of unrelated entries during patches, and protection of targeted continuations. GitOrigin-RevId: 8c4da3ba1b87329da20b5295846bdcf3a88126de --- codex-rs/analytics/src/client_tests.rs | 1 + .../src/tests/suite/turns/requests_tests.rs | 1 + .../app-server-exports-experimental.json.zst | Bin 165168 -> 165261 bytes .../src/protocol/v2/tests.rs | 1 + .../src/protocol/v2/turn.rs | 12 ++++++ .../src/message_processor_tracing_tests.rs | 1 + .../src/request_processors/turn_processor.rs | 4 +- .../tests/suite/v2/client_metadata.rs | 27 ++++++++++-- .../tests/suite/v2/realtime_conversation.rs | 2 + .../app-server/tests/suite/v2/turn_start.rs | 3 ++ .../app-server/tests/suite/v2/turn_steer.rs | 4 ++ codex-rs/core/src/mcp_tool_call_tests.rs | 19 +++++---- codex-rs/core/src/session/turn_input.rs | 30 ++++++-------- codex-rs/core/src/turn_metadata.rs | 24 +++++++---- codex-rs/core/src/turn_metadata_tests.rs | 39 ++++++++++++------ codex-rs/exec/src/lib.rs | 1 + codex-rs/protocol/src/turn_input.rs | 26 ++++++++++-- codex-rs/tui/src/app_server_session.rs | 2 + 18 files changed, 143 insertions(+), 54 deletions(-) diff --git a/codex-rs/analytics/src/client_tests.rs b/codex-rs/analytics/src/client_tests.rs index 13c942612b..e28a38e503 100644 --- a/codex-rs/analytics/src/client_tests.rs +++ b/codex-rs/analytics/src/client_tests.rs @@ -594,6 +594,7 @@ fn sample_turn_steer_request() -> ClientRequest { client_user_message_id: None, input: Vec::new(), responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, }, } diff --git a/codex-rs/analytics/src/tests/suite/turns/requests_tests.rs b/codex-rs/analytics/src/tests/suite/turns/requests_tests.rs index a739235359..2df7ff3a1e 100644 --- a/codex-rs/analytics/src/tests/suite/turns/requests_tests.rs +++ b/codex-rs/analytics/src/tests/suite/turns/requests_tests.rs @@ -55,6 +55,7 @@ fn sample_turn_steer_request( }, ], responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, }, } 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 00075353eaca864a178fbc30b5d4f04dfc0c6bcd..f632cc10f6f86a543d990dc1d70e2a9d8464a0b1 100644 GIT binary patch delta 121151 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 delta 121049 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

E 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 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 404cba091f..bd7eed55a0 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/tests.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/tests.rs @@ -5089,6 +5089,7 @@ fn turn_start_params_preserve_explicit_null_service_tier() { root_turn_id: None, tool_output: None, responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, environments: None, cwd: None, diff --git a/codex-rs/app-server-protocol/src/protocol/v2/turn.rs b/codex-rs/app-server-protocol/src/protocol/v2/turn.rs index b09a191289..38b00228a6 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/turn.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/turn.rs @@ -198,6 +198,7 @@ pub struct TurnStartParams { #[ts(optional = nullable)] pub tool_output: Option>, /// Optional metadata to enrich Codex's ResponsesAPI turn metadata. + /// Replaces unprotected client-provided entries when supplied; an empty map clears them. /// /// Entries are flattened into the JSON string sent as /// `client_metadata["x-codex-turn-metadata"]` on ResponsesAPI HTTP and websocket requests. @@ -207,6 +208,11 @@ pub struct TurnStartParams { #[experimental("turn/start.responsesapiClientMetadata")] #[ts(optional = nullable)] pub responsesapi_client_metadata: Option>, + /// Merge entries into the ResponsesAPI turn metadata without removing existing entries. + /// Applied after `responsesapiClientMetadata` if both are provided; reserved keys remain protected. + #[experimental("turn/start.responsesapiClientMetadataPatch")] + #[ts(optional = nullable)] + pub responsesapi_client_metadata_patch: Option>, /// Optional client-provided context fragments keyed by an opaque source identifier. #[experimental("turn/start.additionalContext")] #[ts(optional = nullable)] @@ -314,6 +320,7 @@ pub struct TurnSteerParams { pub client_user_message_id: Option, pub input: Vec, /// Optional metadata to enrich Codex's ResponsesAPI turn metadata. + /// Replaces unprotected client-provided entries when supplied; an empty map clears them. /// /// Entries are flattened into the JSON string sent as /// `client_metadata["x-codex-turn-metadata"]` on ResponsesAPI HTTP and websocket requests. @@ -323,6 +330,11 @@ pub struct TurnSteerParams { #[experimental("turn/steer.responsesapiClientMetadata")] #[ts(optional = nullable)] pub responsesapi_client_metadata: Option>, + /// Merge entries into the ResponsesAPI turn metadata without removing existing entries. + /// Applied after `responsesapiClientMetadata` if both are provided; reserved keys remain protected. + #[experimental("turn/steer.responsesapiClientMetadataPatch")] + #[ts(optional = nullable)] + pub responsesapi_client_metadata_patch: Option>, /// Optional client-provided context fragments keyed by an opaque source identifier. #[experimental("turn/steer.additionalContext")] #[ts(optional = nullable)] diff --git a/codex-rs/app-server/src/message_processor_tracing_tests.rs b/codex-rs/app-server/src/message_processor_tracing_tests.rs index 518df3077e..ca4aeeda37 100644 --- a/codex-rs/app-server/src/message_processor_tracing_tests.rs +++ b/codex-rs/app-server/src/message_processor_tracing_tests.rs @@ -688,6 +688,7 @@ async fn turn_start_jsonrpc_span_parents_core_turn_spans() -> Result<()> { root_turn_id: None, tool_output: None, responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, cwd: None, runtime_workspace_roots: None, diff --git a/codex-rs/app-server/src/request_processors/turn_processor.rs b/codex-rs/app-server/src/request_processors/turn_processor.rs index 435f0e3e0a..de3bdf6f5d 100644 --- a/codex-rs/app-server/src/request_processors/turn_processor.rs +++ b/codex-rs/app-server/src/request_processors/turn_processor.rs @@ -673,6 +673,7 @@ impl TurnRequestProcessor { }) .with_additional_context(additional_context) .with_responses_metadata(params.responsesapi_client_metadata) + .with_responses_metadata_patch(params.responsesapi_client_metadata_patch) .with_trace(self.request_trace_context(&request_id).await), ) .await @@ -1088,7 +1089,8 @@ impl TurnRequestProcessor { client_id: params.client_user_message_id, }) .with_additional_context(additional_context) - .with_responses_metadata(params.responsesapi_client_metadata), + .with_responses_metadata(params.responsesapi_client_metadata) + .with_responses_metadata_patch(params.responsesapi_client_metadata_patch), params.expected_turn_id, ) .await diff --git a/codex-rs/app-server/tests/suite/v2/client_metadata.rs b/codex-rs/app-server/tests/suite/v2/client_metadata.rs index 1d22a7a8f6..76fe254834 100644 --- a/codex-rs/app-server/tests/suite/v2/client_metadata.rs +++ b/codex-rs/app-server/tests/suite/v2/client_metadata.rs @@ -449,8 +449,12 @@ async fn turn_start_sends_nested_subagent_lineage_after_cold_thread_resume_v2() Ok(()) } +#[test_case::test_case(false; "replacement")] +#[test_case::test_case(true; "patch")] #[tokio::test] -async fn turn_steer_updates_client_metadata_on_follow_up_responses_request_v2() -> Result<()> { +async fn turn_steer_updates_client_metadata_on_follow_up_responses_request_v2( + patch_steer: bool, +) -> Result<()> { skip_if_no_network!(Ok(())); let codex_home = TempDir::new()?; @@ -489,7 +493,8 @@ async fn turn_steer_updates_client_metadata_on_follow_up_responses_request_v2() let start_metadata = HashMap::from([ ("fiber_run_id".to_string(), "fiber-start-123".to_string()), - ("source".to_string(), "initial-source".to_string()), + ("source".to_string(), "snapshot-source".to_string()), + ("start_only".to_string(), "start-value".to_string()), ( "misalignment_override".to_string(), r#"{"review_target":"RB._~:-opaque"}"#.to_string(), @@ -504,7 +509,11 @@ async fn turn_steer_updates_client_metadata_on_follow_up_responses_request_v2() text_elements: Vec::new(), }], turn_trigger: Some("user".to_string()), - responsesapi_client_metadata: Some(start_metadata.clone()), + responsesapi_client_metadata: Some(start_metadata), + responsesapi_client_metadata_patch: Some(HashMap::from([( + "source".to_string(), + "initial-source".to_string(), + )])), ..Default::default() }) .await?; @@ -528,6 +537,11 @@ async fn turn_steer_updates_client_metadata_on_follow_up_responses_request_v2() r#"{"review_target":"RC"}"#.to_string(), ), ]); + let (responsesapi_client_metadata, responsesapi_client_metadata_patch) = if patch_steer { + (None, Some(steer_metadata)) + } else { + (Some(steer_metadata), None) + }; let steer_req = mcp .send_turn_steer_request(TurnSteerParams { thread_id: thread.id.clone(), @@ -536,7 +550,8 @@ async fn turn_steer_updates_client_metadata_on_follow_up_responses_request_v2() text: "Focus on the failure".to_string(), text_elements: Vec::new(), }], - responsesapi_client_metadata: Some(steer_metadata.clone()), + responsesapi_client_metadata, + responsesapi_client_metadata_patch, additional_context: None, expected_turn_id: turn_id.clone(), }) @@ -578,6 +593,10 @@ async fn turn_steer_updates_client_metadata_on_follow_up_responses_request_v2() assert_eq!(second_metadata["turn_id"].as_str(), Some(turn_id.as_str())); assert_eq!(second_metadata["turn_trigger"].as_str(), Some("user")); assert_eq!(second_metadata["source"].as_str(), Some("steer-source")); + assert_eq!( + second_metadata["start_only"].as_str(), + patch_steer.then_some("start-value") + ); assert_eq!( second_metadata["misalignment_override"], first_metadata["misalignment_override"], diff --git a/codex-rs/app-server/tests/suite/v2/realtime_conversation.rs b/codex-rs/app-server/tests/suite/v2/realtime_conversation.rs index e5cd011a83..45fd9fb86e 100644 --- a/codex-rs/app-server/tests/suite/v2/realtime_conversation.rs +++ b/codex-rs/app-server/tests/suite/v2/realtime_conversation.rs @@ -1316,6 +1316,7 @@ async fn realtime_timeline_splits_accepted_steering_and_persists_promoted_artifa additional_context: None, client_user_message_id: None, responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, }) .await?; let rejected = timeout( @@ -1348,6 +1349,7 @@ async fn realtime_timeline_splits_accepted_steering_and_persists_promoted_artifa additional_context: None, client_user_message_id: Some("accepted-steer".to_string()), responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, }) .await?; let accepted: TurnSteerResponse = diff --git a/codex-rs/app-server/tests/suite/v2/turn_start.rs b/codex-rs/app-server/tests/suite/v2/turn_start.rs index ab566dc094..a6e9595df2 100644 --- a/codex-rs/app-server/tests/suite/v2/turn_start.rs +++ b/codex-rs/app-server/tests/suite/v2/turn_start.rs @@ -3406,6 +3406,7 @@ async fn turn_start_explicit_local_environment_updates_legacy_cwd_between_turns( root_turn_id: None, tool_output: None, responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, cwd: Some(first_cwd.clone()), runtime_workspace_roots: None, @@ -3461,6 +3462,7 @@ async fn turn_start_explicit_local_environment_updates_legacy_cwd_between_turns( root_turn_id: None, tool_output: None, responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, cwd: None, runtime_workspace_roots: None, @@ -4682,6 +4684,7 @@ async fn direct_input_to_multi_agent_v2_subagent_is_rejected( text_elements: Vec::new(), }], responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, expected_turn_id: "any-active-turn".to_string(), }) diff --git a/codex-rs/app-server/tests/suite/v2/turn_steer.rs b/codex-rs/app-server/tests/suite/v2/turn_steer.rs index 7eac21362a..374b537c3c 100644 --- a/codex-rs/app-server/tests/suite/v2/turn_steer.rs +++ b/codex-rs/app-server/tests/suite/v2/turn_steer.rs @@ -72,6 +72,7 @@ async fn turn_steer_requires_active_turn() -> Result<()> { text_elements: Vec::new(), }], responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, expected_turn_id: "turn-does-not-exist".to_string(), }) @@ -185,6 +186,7 @@ async fn turn_steer_rejects_oversized_text_input() -> Result<()> { text_elements: Vec::new(), }], responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, expected_turn_id: turn.id.clone(), }) @@ -300,6 +302,7 @@ async fn turn_steer_returns_active_turn_id() -> Result<()> { text_elements: Vec::new(), }], responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, expected_turn_id: turn.id.clone(), }, @@ -435,6 +438,7 @@ async fn turn_steer_rejects_context_only_input_without_merging_context() -> Resu client_user_message_id: None, input: Vec::new(), responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context, expected_turn_id: turn.id, }) diff --git a/codex-rs/core/src/mcp_tool_call_tests.rs b/codex-rs/core/src/mcp_tool_call_tests.rs index 7192660f38..e4b9dbfe73 100644 --- a/codex-rs/core/src/mcp_tool_call_tests.rs +++ b/codex-rs/core/src/mcp_tool_call_tests.rs @@ -41,6 +41,7 @@ use codex_protocol::protocol::McpInvocation; use codex_protocol::protocol::SessionSource; use codex_protocol::protocol::SubAgentSource; use codex_protocol::protocol::TurnEnvironmentSelection; +use codex_protocol::turn_input::ResponsesApiClientMetadataUpdate; use codex_utils_path_uri::PathUri; use core_test_support::hooks::trusted_config_layer_stack; use core_test_support::responses::ev_assistant_message; @@ -1087,15 +1088,19 @@ async fn mcp_tool_call_request_meta_includes_turn_metadata_for_custom_server() { let (_, turn_context) = make_session_and_context().await; let turn_context = Arc::new(turn_context); let step_context = StepContext::for_test(Arc::clone(&turn_context)); + let client_metadata = HashMap::from([ + ( + "node_repl_auto_review_required".to_string(), + "true".to_string(), + ), + ("node_repl_disabled".to_string(), "true".to_string()), + ]); turn_context .turn_metadata_state - .set_responsesapi_client_metadata(HashMap::from([ - ( - "node_repl_auto_review_required".to_string(), - "true".to_string(), - ), - ("node_repl_disabled".to_string(), "true".to_string()), - ])); + .update_responsesapi_client_metadata(ResponsesApiClientMetadataUpdate { + replacement: Some(client_metadata), + ..Default::default() + }); let expected_turn_metadata = expected_mcp_turn_metadata(&turn_context); let meta = build_mcp_tool_call_request_meta( diff --git a/codex-rs/core/src/session/turn_input.rs b/codex-rs/core/src/session/turn_input.rs index d9cbe2f2e1..77f95f6466 100644 --- a/codex-rs/core/src/session/turn_input.rs +++ b/codex-rs/core/src/session/turn_input.rs @@ -44,6 +44,7 @@ use codex_protocol::protocol::SubAgentSource; use codex_protocol::protocol::ThreadSettingsOverrides; use codex_protocol::turn_input::AnnotatedResponseItem; use codex_protocol::turn_input::NotSubmittedReason; +use codex_protocol::turn_input::ResponsesApiClientMetadataUpdate; use codex_protocol::turn_input::TurnInput as SubmittedTurnInput; use codex_protocol::turn_input::TurnInputMode; use codex_protocol::turn_input::TurnInputRequest; @@ -52,7 +53,6 @@ use codex_protocol::turn_input::TurnStartOptions; use codex_protocol::user_input::UserInput; use serde_json::Value; use std::collections::BTreeMap; -use std::collections::HashMap; use std::sync::Arc; use uuid::Uuid; @@ -418,11 +418,9 @@ async fn start_or_steer( else { unreachable!("explicit user input can enter Plan mode"); }; - if let Some(responsesapi_client_metadata) = responsesapi_client_metadata { - turn_context - .turn_metadata_state - .set_responsesapi_client_metadata(responsesapi_client_metadata); - } + turn_context + .turn_metadata_state + .update_responsesapi_client_metadata(responsesapi_client_metadata); session .maybe_emit_model_warnings_for_turn(turn_context.as_ref()) .await; @@ -572,11 +570,9 @@ async fn start_if_idle( return Err(error); } }; - if let Some(responsesapi_client_metadata) = responsesapi_client_metadata { - turn_context - .turn_metadata_state - .set_responsesapi_client_metadata(responsesapi_client_metadata); - } + turn_context + .turn_metadata_state + .update_responsesapi_client_metadata(responsesapi_client_metadata); session .maybe_emit_model_warnings_for_turn(turn_context.as_ref()) .await; @@ -807,7 +803,7 @@ impl Session { additional_context: BTreeMap, expected_turn_id: Option<&str>, required_final_output_json_schema: Option<&Value>, - responsesapi_client_metadata: Option>, + responsesapi_client_metadata: ResponsesApiClientMetadataUpdate, origin: UserInputOrigin, ) -> Result<(String, String), NotSubmittedReason> { let mut active = self.active_turn.lock().await; @@ -856,12 +852,10 @@ impl Session { } let mut pending_input = merge_additional_context_input(self, additional_context).await; - if let Some(responsesapi_client_metadata) = responsesapi_client_metadata { - active_task - .turn_context - .turn_metadata_state - .set_responsesapi_client_metadata(responsesapi_client_metadata); - } + active_task + .turn_context + .turn_metadata_state + .update_responsesapi_client_metadata(responsesapi_client_metadata); let input = match input { SubmittedTurnInput::UserInput { content, client_id } => { diff --git a/codex-rs/core/src/turn_metadata.rs b/codex-rs/core/src/turn_metadata.rs index db22fdcb5b..3e62e747f8 100644 --- a/codex-rs/core/src/turn_metadata.rs +++ b/codex-rs/core/src/turn_metadata.rs @@ -1,5 +1,4 @@ use std::collections::BTreeMap; -use std::collections::HashMap; use std::future::Future; use std::path::PathBuf; use std::sync::Arc; @@ -38,6 +37,7 @@ use codex_protocol::openai_models::ModelInfo; use codex_protocol::openai_models::ReasoningEffort as ReasoningEffortConfig; use codex_protocol::protocol::SessionSource; use codex_protocol::protocol::ThreadSource; +use codex_protocol::turn_input::ResponsesApiClientMetadataUpdate; use codex_utils_absolute_path::AbsolutePathBuf; use codex_utils_git_discovery::GitRootDiscovery; @@ -383,23 +383,31 @@ impl TurnMetadataState { self.root_turn_id.get().cloned() } - pub(crate) fn set_responsesapi_client_metadata( + pub(crate) fn update_responsesapi_client_metadata( &self, - responsesapi_client_metadata: HashMap, + update: ResponsesApiClientMetadataUpdate, ) { - let mut metadata = filter_extra_metadata(responsesapi_client_metadata); + let replacement = update.replacement.map(filter_extra_metadata); + let patch = update.patch.map(filter_extra_metadata).unwrap_or_default(); + if replacement.is_none() && patch.is_empty() { + return; + } let mut current = self .responsesapi_client_metadata .write() .unwrap_or_else(std::sync::PoisonError::into_inner); - if let Some(continuation) = current + let continuation = current .get("misalignment_override") .filter(|value| is_targeted_continuation(value)) - { + .cloned(); + if let Some(replacement) = replacement { + *current = replacement; + } + current.extend(patch); + if let Some(continuation) = continuation { // Steering may update other metadata, but cannot replace the reviewed block. - metadata.insert("misalignment_override".to_string(), continuation.clone()); + current.insert("misalignment_override".to_string(), continuation); } - *current = metadata; } pub(crate) fn set_responses_api_metadata( diff --git a/codex-rs/core/src/turn_metadata_tests.rs b/codex-rs/core/src/turn_metadata_tests.rs index f0f69e641e..a8adf7c025 100644 --- a/codex-rs/core/src/turn_metadata_tests.rs +++ b/codex-rs/core/src/turn_metadata_tests.rs @@ -684,7 +684,7 @@ fn turn_metadata_state_ignores_client_reserved_metadata_before_start() { /*auto_review_enabled*/ false, &model_info_from_slug("gpt-5.4"), ); - state.set_responsesapi_client_metadata(HashMap::from([ + let client_metadata = HashMap::from([ ( LEGACY_CODE_MODE_TOOL_NAMES_KEY.to_string(), "client-supplied".to_string(), @@ -722,7 +722,11 @@ fn turn_metadata_state_ignores_client_reserved_metadata_before_start() { "true".to_string(), ), (NODE_REPL_DISABLED_KEY.to_string(), "true".to_string()), - ])); + ]); + state.update_responsesapi_client_metadata(ResponsesApiClientMetadataUpdate { + replacement: Some(client_metadata), + ..Default::default() + }); let header = test_turn_metadata_header(&state); let json: Value = serde_json::from_str(&header).expect("json"); @@ -792,7 +796,7 @@ fn turn_metadata_state_merges_client_metadata_without_replacing_reserved_fields( state.set_parent_turn_id("parent-turn-a".to_string()); state.set_root_turn_id("root-turn-a".to_string()); state.set_turn_trigger("goal".to_string()); - state.set_responsesapi_client_metadata(HashMap::from([ + let client_metadata = HashMap::from([ ( "codex_security_surface".to_string(), "client-supplied".to_string(), @@ -861,7 +865,11 @@ fn turn_metadata_state_merges_client_metadata_without_replacing_reserved_fields( "turn_started_at_unix_ms".to_string(), "client-supplied".to_string(), ), - ])); + ]); + state.update_responsesapi_client_metadata(ResponsesApiClientMetadataUpdate { + replacement: Some(client_metadata), + ..Default::default() + }); state.set_turn_started_at_unix_ms(/*turn_started_at_unix_ms*/ 1_700_000_000_123); let header = test_turn_metadata_header(&state); assert!(header.is_ascii()); @@ -996,12 +1004,15 @@ fn turn_metadata_state_merges_client_metadata_without_replacing_reserved_fields( .into_iter() .collect(), ); - state.set_responsesapi_client_metadata( - client - .map(|source| ("source".to_string(), source)) - .into_iter() - .collect(), - ); + state.update_responsesapi_client_metadata(ResponsesApiClientMetadataUpdate { + replacement: Some( + client + .map(|source| ("source".to_string(), source)) + .into_iter() + .collect(), + ), + ..Default::default() + }); assert_eq!(state.codex_turn_source(), expected); } } @@ -1071,13 +1082,17 @@ fn turn_metadata_state_overlays_compaction_only_on_compaction_requests( serde_json::from_str(&test_turn_responses_metadata_json(&state, "thread-a:1")) .expect("json"); assert!(ordinary_json.get("misalignment_override").is_none()); - state.set_responsesapi_client_metadata(HashMap::from([ + let client_metadata = HashMap::from([ ("compaction".to_string(), "client-supplied".to_string()), ( "misalignment_override".to_string(), continuation.to_string(), ), - ])); + ]); + state.update_responsesapi_client_metadata(ResponsesApiClientMetadataUpdate { + replacement: Some(client_metadata), + ..Default::default() + }); let mcp_metadata = state .current_meta_value_for_mcp_request(test_mcp_turn_metadata_context()) diff --git a/codex-rs/exec/src/lib.rs b/codex-rs/exec/src/lib.rs index 0a40529c82..4ce2d52855 100644 --- a/codex-rs/exec/src/lib.rs +++ b/codex-rs/exec/src/lib.rs @@ -1240,6 +1240,7 @@ async fn run_exec_session(args: ExecRunArgs) -> anyhow::Result<()> { input: items.into_iter().map(Into::into).collect(), tool_output: None, responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, environments: None, cwd: Some(default_cwd), diff --git a/codex-rs/protocol/src/turn_input.rs b/codex-rs/protocol/src/turn_input.rs index 7e9977959c..687e0c73d9 100644 --- a/codex-rs/protocol/src/turn_input.rs +++ b/codex-rs/protocol/src/turn_input.rs @@ -66,10 +66,19 @@ pub struct TurnInputRequest { pub thread_settings: ThreadSettingsOverrides, pub start: TurnStartOptions, pub additional_context: BTreeMap, - pub responsesapi_client_metadata: Option>, + pub responsesapi_client_metadata: ResponsesApiClientMetadataUpdate, pub trace: Option, } +/// An optional replacement followed by a patch to the turn's client metadata. +#[derive(Clone, Debug, Default)] +pub struct ResponsesApiClientMetadataUpdate { + /// Replaces the existing map, including when empty. + pub replacement: Option>, + /// Adds or overwrites keys without removing other entries. + pub patch: Option>, +} + /// Attribution retained across recovery, sleep, and model-context compaction. #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, TS)] pub struct TurnAttribution { @@ -114,7 +123,7 @@ impl TurnInputRequest { thread_settings: ThreadSettingsOverrides::default(), start: TurnStartOptions::default(), additional_context: BTreeMap::new(), - responsesapi_client_metadata: None, + responsesapi_client_metadata: ResponsesApiClientMetadataUpdate::default(), trace: None, } } @@ -153,12 +162,21 @@ impl TurnInputRequest { self } - /// Responses metadata attached whether this request starts or steers. + /// Replaces Responses client metadata whether this request starts or steers. pub fn with_responses_metadata( mut self, responsesapi_client_metadata: Option>, ) -> Self { - self.responsesapi_client_metadata = responsesapi_client_metadata; + self.responsesapi_client_metadata.replacement = responsesapi_client_metadata; + self + } + + /// Adds or overwrites Responses client metadata entries after any replacement. + pub fn with_responses_metadata_patch( + mut self, + responsesapi_client_metadata_patch: Option>, + ) -> Self { + self.responsesapi_client_metadata.patch = responsesapi_client_metadata_patch; self } diff --git a/codex-rs/tui/src/app_server_session.rs b/codex-rs/tui/src/app_server_session.rs index 837fcb13c2..ccf3767182 100644 --- a/codex-rs/tui/src/app_server_session.rs +++ b/codex-rs/tui/src/app_server_session.rs @@ -1458,6 +1458,7 @@ impl AppServerSession { input: items, tool_output: None, responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, environments: None, cwd: Some(cwd), @@ -1524,6 +1525,7 @@ impl AppServerSession { client_user_message_id: Some(client_user_message_id), input: items, responsesapi_client_metadata: None, + responsesapi_client_metadata_patch: None, additional_context: None, expected_turn_id: turn_id, }, From 80ad49e3b7ca466cd35fc012bf1e23bed836de72 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 17:45:49 +0000 Subject: [PATCH 056/155] Coalesce overlapping native TLS root certificate loads (#54056) ## Why Concurrent TLS client builds can independently load the same platform trust store. Share overlapping loads while preserving fresh trust reads for later builds. ## What changed - Share one in-flight native root load without reusing completed loads. - Bypass sharing when `SSL_CERT_FILE` or `SSL_CERT_DIR` is set, and continue reading custom CA bundles independently for every build. ## Testing Add tests for overlapping loads, fresh trust after completion, and recovery from a panicking loader. Extend TLS handshake coverage to verify that replacing a custom CA file affects new configurations while existing configurations retain their trust, and that empty or removed files produce errors. GitOrigin-RevId: 1465ef3faf82f53651d9dbfe314341b17346580b --- codex-rs/http-client/src/custom_ca.rs | 14 +--- .../http-client/src/custom_ca_tls_tests.rs | 31 +++++++-- codex-rs/http-client/src/lib.rs | 1 + codex-rs/http-client/src/native_roots.rs | 68 +++++++++++++++++++ .../http-client/src/native_roots_tests.rs | 55 +++++++++++++++ 5 files changed, 153 insertions(+), 16 deletions(-) create mode 100644 codex-rs/http-client/src/native_roots.rs create mode 100644 codex-rs/http-client/src/native_roots_tests.rs diff --git a/codex-rs/http-client/src/custom_ca.rs b/codex-rs/http-client/src/custom_ca.rs index 6ca705d0ab..4b4e3d973b 100644 --- a/codex-rs/http-client/src/custom_ca.rs +++ b/codex-rs/http-client/src/custom_ca.rs @@ -6,6 +6,8 @@ //! `reqwest::ClientBuilder` or rustls client config, layer in custom CA support, and either get //! back a configured transport or a user-facing error that explains how to fix a misconfigured CA //! bundle. +//! Concurrent native-root reads may share one in-flight load; later builds reload trust, and +//! custom CA files are read independently for every build. //! //! The module intentionally has a narrow responsibility: //! @@ -49,7 +51,6 @@ use std::sync::Arc; use codex_utils_rustls_provider::ensure_rustls_crypto_provider; use rustls::ClientConfig; -use rustls::RootCertStore; use rustls_pki_types::CertificateDer; use rustls_pki_types::pem::PemObject; use rustls_pki_types::pem::SectionKind; @@ -247,16 +248,7 @@ fn build_rustls_client_config( // Start from the platform roots so websocket callers keep the same baseline trust behavior // they would get from tungstenite's default rustls connector, then layer in the Codex custom // CA bundle on top when configured. - let mut root_store = RootCertStore::empty(); - let rustls_native_certs::CertificateResult { certs, errors, .. } = - rustls_native_certs::load_native_certs(); - if !errors.is_empty() { - warn!( - native_root_error_count = errors.len(), - "encountered errors while loading native root certificates" - ); - } - let _ = root_store.add_parsable_certificates(certs); + let mut root_store = (*crate::native_roots::load()).clone(); if let Some(bundle) = bundle { let certificates = bundle.load_certificates()?; diff --git a/codex-rs/http-client/src/custom_ca_tls_tests.rs b/codex-rs/http-client/src/custom_ca_tls_tests.rs index fb3c78fe14..3c7c5a15c7 100644 --- a/codex-rs/http-client/src/custom_ca_tls_tests.rs +++ b/codex-rs/http-client/src/custom_ca_tls_tests.rs @@ -1,4 +1,4 @@ -//! Handshake coverage for the custom trust path retained by Windows realtime connections. +//! Handshake and fresh-file-read coverage for shared custom trust configuration. use super::CODEX_CA_CERT_ENV; use super::ConfiguredCaBundle; @@ -26,11 +26,11 @@ fn custom_intermediate_trust_preserves_hostname_validation() { let temp = tempfile::TempDir::new().unwrap(); let path = temp.path().join("intermediate.pem"); std::fs::write(&path, intermediate.pem()).unwrap(); - let config = build_rustls_client_config(Some(&ConfiguredCaBundle { + let bundle = ConfiguredCaBundle { source_env: CODEX_CA_CERT_ENV, path, - })) - .unwrap(); + }; + let config = build_rustls_client_config(Some(&bundle)).unwrap(); let server = Arc::new( rustls::ServerConfig::builder() .with_no_client_auth() @@ -42,7 +42,7 @@ fn custom_intermediate_trust_preserves_hostname_validation() { handshake(config.clone(), server.clone(), "localhost"), Ok(()) ); - let error = handshake(config, server, "wrong.example").unwrap_err(); + let error = handshake(config.clone(), server.clone(), "wrong.example").unwrap_err(); assert!( matches!( error, @@ -53,6 +53,27 @@ fn custom_intermediate_trust_preserves_hostname_validation() { ), "{error:?}" ); + + std::fs::write(&bundle.path, include_str!("../tests/fixtures/test-ca.pem")).unwrap(); + let replaced = build_rustls_client_config(Some(&bundle)).unwrap(); + assert!(matches!( + handshake(replaced, server.clone(), "localhost"), + Err(rustls::Error::InvalidCertificate( + rustls::CertificateError::UnknownIssuer + )) + )); + assert_eq!(handshake(config, server, "localhost"), Ok(())); + + std::fs::write(&bundle.path, "").unwrap(); + assert!(matches!( + build_rustls_client_config(Some(&bundle)), + Err(super::BuildCustomCaTransportError::InvalidCaFile { .. }) + )); + std::fs::remove_file(&bundle.path).unwrap(); + assert!(matches!( + build_rustls_client_config(Some(&bundle)), + Err(super::BuildCustomCaTransportError::ReadCaFile { .. }) + )); } fn handshake( diff --git a/codex-rs/http-client/src/lib.rs b/codex-rs/http-client/src/lib.rs index 5eb01f021b..ccef4a6113 100644 --- a/codex-rs/http-client/src/lib.rs +++ b/codex-rs/http-client/src/lib.rs @@ -5,6 +5,7 @@ mod client_builder; mod client_tls; mod custom_ca; mod error; +mod native_roots; mod network_policy; mod outbound_proxy; mod request; diff --git a/codex-rs/http-client/src/native_roots.rs b/codex-rs/http-client/src/native_roots.rs new file mode 100644 index 0000000000..4dbc4fa47b --- /dev/null +++ b/codex-rs/http-client/src/native_roots.rs @@ -0,0 +1,68 @@ +//! Coalesces overlapping platform-root reads without retaining completed trust snapshots. +//! Later callers always reload. File/directory overrides bypass coalescing so their contents +//! are reread independently; custom Codex CA bundles are handled by the caller. + +use std::sync::Arc; +use std::sync::Mutex; +use std::sync::OnceLock; +use std::sync::Weak; + +use rustls::RootCertStore; + +#[derive(Default)] +struct NativeRootsLoader { + in_flight: Mutex>>>, +} + +impl NativeRootsLoader { + fn load(&self, load: impl FnOnce() -> RootCertStore) -> Arc { + let pending = { + let mut in_flight = self + .in_flight + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); + match in_flight + .upgrade() + .filter(|pending| pending.get().is_none()) + { + Some(pending) => pending, + None => { + let pending = Arc::new(OnceLock::new()); + *in_flight = Arc::downgrade(&pending); + pending + } + } + }; + Arc::clone(pending.get_or_init(|| Arc::new(load()))) + } +} + +pub(crate) fn load() -> Arc { + // rustls-native-certs treats these as overrides of the platform store. + // Preserve fresh file reads even when several callers construct clients together. + if std::env::var_os("SSL_CERT_FILE").is_some() || std::env::var_os("SSL_CERT_DIR").is_some() { + return Arc::new(load_roots()); + } + static LOADER: NativeRootsLoader = NativeRootsLoader { + in_flight: Mutex::new(Weak::new()), + }; + LOADER.load(load_roots) +} + +fn load_roots() -> RootCertStore { + let rustls_native_certs::CertificateResult { certs, errors, .. } = + rustls_native_certs::load_native_certs(); + if !errors.is_empty() { + tracing::warn!( + native_root_error_count = errors.len(), + "encountered errors while loading native root certificates" + ); + } + let mut roots = RootCertStore::empty(); + let _ = roots.add_parsable_certificates(certs); + roots +} + +#[cfg(test)] +#[path = "native_roots_tests.rs"] +mod tests; diff --git a/codex-rs/http-client/src/native_roots_tests.rs b/codex-rs/http-client/src/native_roots_tests.rs new file mode 100644 index 0000000000..613491d823 --- /dev/null +++ b/codex-rs/http-client/src/native_roots_tests.rs @@ -0,0 +1,55 @@ +//! Verifies overlapping root loads, fresh trust generations, and panic recovery. + +use super::*; +use pretty_assertions::assert_eq; +use rustls_pki_types::CertificateDer; +use rustls_pki_types::pem::PemObject; +use std::sync::mpsc; +use std::thread; + +#[test] +fn concurrent_loads_share_roots_but_completed_loads_are_never_reused() { + let loader = NativeRootsLoader::default(); + let (entered, started) = mpsc::channel(); + let (release, released) = mpsc::channel(); + thread::scope(|scope| { + let first_loader = &loader; + let first = scope.spawn(move || { + first_loader.load(|| { + entered.send(()).unwrap(); + released.recv().unwrap(); + RootCertStore::empty() + }) + }); + started.recv().unwrap(); + let pending = loader.in_flight.lock().unwrap().upgrade().unwrap(); + let second = scope.spawn(|| loader.load(|| panic!("overlapping load must be shared"))); + // Wait for the second caller to own this generation before allowing it to finish. + while Arc::strong_count(&pending) < 3 { + thread::yield_now(); + } + drop(loader.in_flight.lock().unwrap()); + release.send(()).unwrap(); + let first = first.join().unwrap(); + let second = second.join().unwrap(); + assert!(Arc::ptr_eq(&first, &second)); + + // Keep the old generation alive: completion, not refcount expiry, must force a reload. + let updated = loader.load(|| { + let mut roots = RootCertStore::empty(); + roots.add_parsable_certificates( + CertificateDer::pem_slice_iter(include_bytes!("../tests/fixtures/test-ca.pem")) + .map(Result::unwrap), + ); + roots + }); + assert_eq!((first.len(), second.len(), updated.len()), (0, 0, 1)); + }); +} + +#[test] +fn panicking_load_does_not_poison_later_trust_reads() { + let loader = NativeRootsLoader::default(); + assert!(std::panic::catch_unwind(|| loader.load(|| panic!("interrupted load"))).is_err()); + assert!(loader.load(RootCertStore::empty).is_empty()); +} From 1f7fe9b0afb301f895b2d56ae8c05c2cfb19e440 Mon Sep 17 00:00:00 2001 From: swastik-oai Date: Wed, 14 Oct 2026 17:46:04 +0000 Subject: [PATCH 057/155] Distinguish unsupported evidence in Decisions comparison metrics (#54057) ## Why Unsupported evidence currently shares a single Decisions comparison reason, making it difficult to distinguish why a comparison was skipped. ## What changed Report separate reasons for unsupported developer messages, other non-user messages, trusted skills, images, and audio. Keep these outcomes classified as `skipped` and retain the generic reason for other unsupported evidence. Expose `TrustedSkills::KIND` for identifying trusted skill fragments. ## Testing Expand adapter tests for the distinct rejection reasons and add a lifecycle case verifying that trusted skill evidence skips the Decisions request, reports `trusted_skills`, and preserves the baseline score. GitOrigin-RevId: 98f076d1aa6771d0209e7f5910eed0dcc40c6263 --- .../guardian-v2/src/async_scorer/decisions.rs | 27 +++++++-- .../async_scorer/decisions_lifecycle_tests.rs | 13 ++++- .../src/async_scorer/decisions_tests.rs | 58 +++++++++++++++---- .../guardian-v2/src/async_scorer/metrics.rs | 17 +++++- .../guardian-context/src/trusted_skills.rs | 7 ++- 5 files changed, 102 insertions(+), 20 deletions(-) diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/decisions.rs b/codex-rs/ext/guardian-v2/src/async_scorer/decisions.rs index eebaa04b7f..cc27cfa69e 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/decisions.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/decisions.rs @@ -7,6 +7,7 @@ use super::sampler::LunaSampler; use super::sampler::LunaSamplingRequest; use codex_context_fragments::RenderedFragment; +use codex_guardian_context::TrustedSkills; use codex_guardian_context::TrustedTool; use codex_history::ResponseItemEnvelope; use codex_http_client::HttpClient; @@ -44,6 +45,16 @@ pub(super) enum DecisionsError { ClientSetup, #[error("Decisions cannot represent the complete classifier evidence")] UnsupportedEvidence, + #[error("Decisions cannot represent this developer message")] + UnsupportedDeveloperMessage, + #[error("Decisions cannot represent this non-user message")] + UnsupportedNonUserMessage, + #[error("Decisions cannot represent trusted skill evidence")] + UnsupportedTrustedSkills, + #[error("Decisions cannot represent this image evidence")] + UnsupportedImage, + #[error("Decisions cannot represent audio evidence")] + UnsupportedAudio, #[error("Decisions input exceeds the request limit")] InputTooLarge, #[error("Decisions request timed out")] @@ -247,7 +258,11 @@ fn request_body( continue; } ("user", _, _) => {} - _ => return Err(DecisionsError::UnsupportedEvidence), + ("developer", _, Some([kind])) if kind.0 == TrustedSkills::KIND => { + return Err(DecisionsError::UnsupportedTrustedSkills); + } + ("developer", _, _) => return Err(DecisionsError::UnsupportedDeveloperMessage), + _ => return Err(DecisionsError::UnsupportedNonUserMessage), } let mut parts = Vec::new(); for part in content { @@ -268,9 +283,13 @@ fn request_body( json!({"type": "input_image", "image_url": image_url, "detail": null}), ); } - ContentItem::InputImage { .. } - | ContentItem::InputAudio { .. } - | ContentItem::OutputText { .. } => { + ContentItem::InputImage { .. } => { + return Err(DecisionsError::UnsupportedImage); + } + ContentItem::InputAudio { .. } => { + return Err(DecisionsError::UnsupportedAudio); + } + ContentItem::OutputText { .. } => { return Err(DecisionsError::UnsupportedEvidence); } } diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_lifecycle_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_lifecycle_tests.rs index 530381a7e0..5aa4a83bd5 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_lifecycle_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_lifecycle_tests.rs @@ -13,6 +13,7 @@ async fn decisions_disagreement_failures_and_disabled_flag_preserve_baseline() - ("cannot_escalate", true, 200, "high", "low", 0.0), ("cannot_lower", true, 200, "low", "high", 1.0), ("candidate_failure", true, 403, "low", "low", 0.0), + ("unsupported_skills", true, 200, "low", "low", 0.0), ("baseline_failure", true, 200, "low", "invalid", 1.0), ] { let server = responses::start_mock_server().await; @@ -69,7 +70,9 @@ async fn decisions_disagreement_failures_and_disabled_flag_preserve_baseline() - "choice":choice}] })), ) - .expect(/*r*/ u64::from(enabled && case != "not_initialized")) + .expect(/*r*/ u64::from( + enabled && !matches!(case, "not_initialized" | "unsupported_skills"), + )) .mount(&decisions_server) .await; // Inject only the transport, using the existing mock HTTP server instead of credentials. @@ -84,6 +87,11 @@ async fn decisions_disagreement_failures_and_disabled_flag_preserve_baseline() - } else { assert!(store.get::().is_none()); } + if case == "unsupported_skills" { + store + .get_or_init(codex_core::context::GuardianReviewEvidence::default) + .record_trusted_skill("turn-1", "/skills/example/SKILL.md".into()); + } metrics.0.lock().unwrap().clear(); fixture.score_tool(ToolName::plain("read_file")).await; let score = tokio::time::timeout(ASYNC_TEST_TIMEOUT, async { @@ -135,6 +143,7 @@ async fn decisions_disagreement_failures_and_disabled_flag_preserve_baseline() - } let (outcome, reason) = match case { "not_initialized" => ("skipped", "not_initialized"), + "unsupported_skills" => ("skipped", "trusted_skills"), "candidate_failure" => ("failure", "http_403"), _ => ("success", "none"), }; @@ -153,7 +162,7 @@ async fn decisions_disagreement_failures_and_disabled_flag_preserve_baseline() - )], "{case}" ); - if case == "not_initialized" { + if matches!(case, "not_initialized" | "unsupported_skills") { let comparisons = metrics.0.lock().unwrap().iter().filter(|sample| matches!(sample, RecordedMetric::Counter(name, _, _) if name == "codex.guardian_v2.decisions_comparison.comparison")) .cloned().collect::>(); diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs index ddcd6f154b..64c18185bb 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs @@ -41,21 +41,46 @@ fn adapter_rejects_unsupported_evidence() { &[user.clone(), trusted], /*parent_compaction*/ None ), - Err(DecisionsError::UnsupportedEvidence) + Err(DecisionsError::UnsupportedDeveloperMessage) ); + for role in ["assistant", "system", "unknown"] { + let item = serde_json::from_value(json!({ + "type":"message", "role":role, + "content":[{"type":"input_text", "text":"evidence"}] + })) + .unwrap(); + assert_eq!( + request_body(&rubric, &[item], /*parent_compaction*/ None), + Err(DecisionsError::UnsupportedNonUserMessage) + ); + } assert_eq!( request_body(&rubric, std::slice::from_ref(&user), Some(&user)), Err(DecisionsError::UnsupportedEvidence) ); - let image: ResponseItem = - serde_json::from_value(json!({"type":"message", "role":"user", "content":[ - {"type":"input_image", "image_url":"https://example.com/image.png"} - ]})) + for (content, expected_error) in [ + ( + json!({"type":"input_image", "image_url":"https://example.com/image.png"}), + DecisionsError::UnsupportedImage, + ), + ( + json!({"type":"input_audio", "audio_url":"data:audio/wav;base64,AA=="}), + DecisionsError::UnsupportedAudio, + ), + ( + json!({"type":"output_text", "text":"text"}), + DecisionsError::UnsupportedEvidence, + ), + ] { + let evidence: ResponseItem = serde_json::from_value(json!({ + "type":"message", "role":"user", "content":[content] + })) .unwrap(); - assert_eq!( - request_body(&rubric, &[image], /*parent_compaction*/ None), - Err(DecisionsError::UnsupportedEvidence) - ); + assert_eq!( + request_body(&rubric, &[evidence], /*parent_compaction*/ None), + Err(expected_error) + ); + } } #[test] @@ -107,6 +132,10 @@ fn adapter_preserves_trusted_tool_authority_and_scope() { "internal_chat_message_metadata_passthrough", json!({"content_item_kinds": [TrustedTool::KIND, TrustedTool::KIND]}), ), + ( + "internal_chat_message_metadata_passthrough", + json!({"content_item_kinds": [TrustedTool::KIND, TrustedSkills::KIND]}), + ), ( "content", json!([ @@ -119,12 +148,21 @@ fn adapter_preserves_trusted_tool_authority_and_scope() { json!([{"type": "input_image", "image_url": "data:image/png;base64,AA=="}]), ), ] { + let expected_error = if field == "internal_chat_message_metadata_passthrough" + && replacement["content_item_kinds"][0] == TrustedSkills::KIND + { + DecisionsError::UnsupportedTrustedSkills + } else if field == "role" { + DecisionsError::UnsupportedNonUserMessage + } else { + DecisionsError::UnsupportedDeveloperMessage + }; let mut unsupported = trusted.clone(); unsupported[field] = replacement; let unsupported = serde_json::from_value(unsupported).unwrap(); assert_eq!( request_body(&rubric, &[unsupported], /*parent_compaction*/ None), - Err(DecisionsError::UnsupportedEvidence) + Err(expected_error) ); } } diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/metrics.rs b/codex-rs/ext/guardian-v2/src/async_scorer/metrics.rs index a2f2de215f..e82fb210a1 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/metrics.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/metrics.rs @@ -187,6 +187,11 @@ pub(super) fn decisions_failure_reason(error: DecisionsError) -> &'static str { DecisionsError::Credentials => "credentials_unavailable", DecisionsError::ClientSetup => "request_build_error", DecisionsError::UnsupportedEvidence => "decisions_unsupported_evidence", + DecisionsError::UnsupportedDeveloperMessage => "developer_message", + DecisionsError::UnsupportedNonUserMessage => "non_user_message", + DecisionsError::UnsupportedTrustedSkills => "trusted_skills", + DecisionsError::UnsupportedImage => "image", + DecisionsError::UnsupportedAudio => "audio", DecisionsError::InputTooLarge => "input_too_large", DecisionsError::Timeout => "transport_timeout", // The adapter erases transport details; do not claim a specific network failure. @@ -214,9 +219,15 @@ pub(super) fn record_decisions_comparison( Ok((result, duration)) => { let outcome = match &result { Ok(_) => "success", - Err(DecisionsError::UnsupportedEvidence | DecisionsError::InputTooLarge) => { - "skipped" - } + Err( + DecisionsError::UnsupportedEvidence + | DecisionsError::UnsupportedDeveloperMessage + | DecisionsError::UnsupportedNonUserMessage + | DecisionsError::UnsupportedTrustedSkills + | DecisionsError::UnsupportedImage + | DecisionsError::UnsupportedAudio + | DecisionsError::InputTooLarge, + ) => "skipped", Err(_) => "failure", }; record_decisions_comparison_outcome( diff --git a/codex-rs/guardian-context/src/trusted_skills.rs b/codex-rs/guardian-context/src/trusted_skills.rs index 0907a7e177..0cbf56695d 100644 --- a/codex-rs/guardian-context/src/trusted_skills.rs +++ b/codex-rs/guardian-context/src/trusted_skills.rs @@ -20,9 +20,14 @@ pub struct TrustedSkills { pub paths: Vec, } +impl TrustedSkills { + /// Classification attached to this fragment's rendered text. + pub const KIND: &str = "guardian.trusted_skills"; +} + impl ContextualUserFragment for TrustedSkills { fn content_kind(&self) -> ContentItemKind { - ContentItemKind("guardian.trusted_skills".to_owned()) + ContentItemKind(Self::KIND.to_owned()) } fn role(&self) -> &'static str { From 9e7b2a577f4ab1a098194126555e82869e9bb473 Mon Sep 17 00:00:00 2001 From: duc-openai Date: Wed, 14 Oct 2026 17:47:10 +0000 Subject: [PATCH 058/155] Forward turn metadata to image generation and edit requests (#54058) ## Why Native extensions need configured Responses metadata for request attribution, but extension calls used the MCP metadata template, which omits it. Image requests also did not forward the turn metadata to the backend. ## What changed Use the Responses metadata template for native extension calls while continuing to exclude tool inventory. Forward the resulting metadata in the `x-codex-turn-metadata` header on image generation and edit requests. ## Testing Extend metadata tests to cover configured values in extension calls and app-server tests to verify `display_name` and `turn_trigger` on image generation and edit requests, including a Unicode display name. GitOrigin-RevId: a2ffaa4d15259c662917612391b8717ee34b9c6c --- .../tests/suite/v2/imagegen_extension.rs | 69 ++++++++++++++++--- .../src/tools/handlers/extension_tools.rs | 2 +- codex-rs/core/src/turn_metadata.rs | 20 +++++- codex-rs/core/src/turn_metadata_tests.rs | 8 +++ codex-rs/ext/image-generation/src/backend.rs | 20 +++++- codex-rs/ext/image-generation/src/tool.rs | 12 +++- 6 files changed, 113 insertions(+), 18 deletions(-) diff --git a/codex-rs/app-server/tests/suite/v2/imagegen_extension.rs b/codex-rs/app-server/tests/suite/v2/imagegen_extension.rs index 849a94f65d..b7fc11d2f2 100644 --- a/codex-rs/app-server/tests/suite/v2/imagegen_extension.rs +++ b/codex-rs/app-server/tests/suite/v2/imagegen_extension.rs @@ -119,10 +119,27 @@ async fn standalone_image_generation_returns_saved_path_hint_to_model( .with_env_overrides(&[("OPENAI_API_KEY", None)]) .build_initialized_with_timeout(DEFAULT_READ_TIMEOUT) .await?; - let turn_id = start_image_generation_turn( + let turn_id = start_turn( &mut mcp, ThreadStartParams { service_name: Some("chatgpt_cca".to_string()), + config: Some( + [( + "responses_api_metadata".to_string(), + json!({ + "display_name": "Image test 🚀", + }), + )] + .into(), + ), + ..Default::default() + }, + TurnStartParams { + input: vec![V2UserInput::Text { + text: "Generate an image".to_string(), + text_elements: Vec::new(), + }], + turn_trigger: Some("page_prompt".to_string()), ..Default::default() }, ) @@ -183,6 +200,15 @@ async fn standalone_image_generation_returns_saved_path_hint_to_model( "chatgpt_cca" ); assert_image_turn_id_header(&image_request, &turn_id)?; + let metadata = serde_json::from_str::( + image_request + .headers + .get("x-codex-turn-metadata") + .context("image request should include the current turn metadata")? + .to_str()?, + )?; + assert_eq!(metadata["display_name"], "Image test 🚀"); + assert_eq!(metadata["turn_trigger"], "page_prompt"); let requests = response_mock.requests(); assert_eq!(requests.len(), 2); @@ -971,10 +997,13 @@ async fn start_image_generation_turn( start_turn( mcp, thread_start_params, - vec![V2UserInput::Text { - text: "Generate an image".to_string(), - text_elements: Vec::new(), - }], + TurnStartParams { + input: vec![V2UserInput::Text { + text: "Generate an image".to_string(), + text_elements: Vec::new(), + }], + ..Default::default() + }, ) .await } @@ -1025,9 +1054,22 @@ async fn run_image_edit_test( &mut mcp, ThreadStartParams { service_name: Some("chatgpt_cca".to_string()), + config: Some( + [( + "responses_api_metadata".to_string(), + json!({ + "display_name": "Image edit test", + }), + )] + .into(), + ), + ..Default::default() + }, + TurnStartParams { + input, + turn_trigger: Some("page_prompt".to_string()), ..Default::default() }, - input, ) .await?; let completed = timeout( @@ -1063,6 +1105,15 @@ async fn run_image_edit_test( "chatgpt_cca" ); assert_image_turn_id_header(image_request, &turn_id)?; + let metadata = serde_json::from_str::( + image_request + .headers + .get("x-codex-turn-metadata") + .context("image edit request should include the current turn metadata")? + .to_str()?, + )?; + assert_eq!(metadata["display_name"], "Image edit test"); + assert_eq!(metadata["turn_trigger"], "page_prompt"); Ok(( image_request.body_json::()?, completed_image, @@ -1084,7 +1135,7 @@ fn assert_image_turn_id_header(request: &wiremock::Request, expected_turn_id: &s async fn start_turn( mcp: &mut TestAppServer, thread_start_params: ThreadStartParams, - input: Vec, + turn_start_params: TurnStartParams, ) -> Result { let thread_req = mcp .send_thread_start_request_with_auto_env(thread_start_params) @@ -1095,9 +1146,7 @@ async fn start_turn( let turn_req = mcp .send_turn_start_request(TurnStartParams { thread_id: thread.id, - client_user_message_id: None, - input, - ..Default::default() + ..turn_start_params }) .await?; let TurnStartResponse { turn } = diff --git a/codex-rs/core/src/tools/handlers/extension_tools.rs b/codex-rs/core/src/tools/handlers/extension_tools.rs index d6eeb84616..70e7ed0164 100644 --- a/codex-rs/core/src/tools/handlers/extension_tools.rs +++ b/codex-rs/core/src/tools/handlers/extension_tools.rs @@ -195,7 +195,7 @@ async fn to_extension_call<'a>( let codex_turn_metadata = invocation .turn .turn_metadata_state - .current_meta_value_for_mcp_request(ExecutionMetadata::from_settings( + .current_meta_value_for_extension_request(ExecutionMetadata::from_settings( &invocation.step_context.settings, )) .and_then(|metadata| to_ascii_json_string(&metadata).ok()); diff --git a/codex-rs/core/src/turn_metadata.rs b/codex-rs/core/src/turn_metadata.rs index 3e62e747f8..70e76f8713 100644 --- a/codex-rs/core/src/turn_metadata.rs +++ b/codex-rs/core/src/turn_metadata.rs @@ -276,7 +276,23 @@ impl TurnMetadataState { &self, execution: ExecutionMetadata<'_>, ) -> Option { - let mut responses_metadata = self.mcp_metadata_template(); + self.current_meta_value_for_tool_request(self.mcp_metadata_template(), execution) + } + + pub(crate) fn current_meta_value_for_extension_request( + &self, + execution: ExecutionMetadata<'_>, + ) -> Option { + // Native extensions need configured Responses metadata for request attribution, + // which the MCP template omits for external servers. + self.current_meta_value_for_tool_request(self.responses_metadata_template(), execution) + } + + fn current_meta_value_for_tool_request( + &self, + mut responses_metadata: CodexResponsesMetadata, + execution: ExecutionMetadata<'_>, + ) -> Option { if responses_metadata .extra .get("misalignment_override") @@ -286,7 +302,7 @@ impl TurnMetadataState { responses_metadata.extra.remove("misalignment_override"); } execution.apply_to(&mut responses_metadata); - // Never serialize harness-owned tool inventory for external MCP servers. + // Never serialize harness-owned tool inventory for tool requests. responses_metadata.tool_namespaces_info = None; let Value::Object(mut metadata) = responses_metadata.turn_metadata_value()? else { return None; diff --git a/codex-rs/core/src/turn_metadata_tests.rs b/codex-rs/core/src/turn_metadata_tests.rs index a8adf7c025..0987dd3468 100644 --- a/codex-rs/core/src/turn_metadata_tests.rs +++ b/codex-rs/core/src/turn_metadata_tests.rs @@ -972,6 +972,14 @@ fn turn_metadata_state_merges_client_metadata_without_replacing_reserved_fields( assert!(meta.get(WINDOW_ID_KEY).is_none()); assert!(meta.get("codex_security_surface").is_none()); assert!(meta.get(ANALYTICS_ENABLED_KEY).is_none()); + let extension_meta = state + .current_meta_value_for_extension_request(test_mcp_turn_metadata_context()) + .expect("extension metadata should be present"); + assert_eq!(extension_meta["codex_security_surface"], "sdk"); + assert_eq!(extension_meta["source"], " Configured_Source "); + assert_eq!(extension_meta[TURN_TRIGGER_KEY], "goal"); + assert_eq!(extension_meta["model"], "gpt-5.4"); + assert!(extension_meta.get(TOOL_NAMESPACES_INFO_KEY).is_none()); assert_eq!(state.workspace_kind().as_deref(), Some("projectless")); assert_eq!( (state.turn_trigger(), state.codex_turn_source()), diff --git a/codex-rs/ext/image-generation/src/backend.rs b/codex-rs/ext/image-generation/src/backend.rs index 105667dbe4..cc18531775 100644 --- a/codex-rs/ext/image-generation/src/backend.rs +++ b/codex-rs/ext/image-generation/src/backend.rs @@ -5,6 +5,7 @@ use codex_api::ImageResponse; use codex_api::ImagesClient; use codex_api::ReqwestTransport; use codex_api::map_api_error; +use codex_core::X_CODEX_TURN_METADATA_HEADER; use codex_http_client::ClientRouteClass; use codex_http_client::HttpClientFactory; use codex_login::default_client::add_originator_header; @@ -101,12 +102,13 @@ impl CodexImagesBackend { &self, request: ImageGenerationRequest, turn_id: &str, + codex_turn_metadata: Option<&str>, ) -> Result<(ImageResponse, Option), ImageBackendError> { self.client() .await? .generate( &request, - image_request_headers(self.originator.as_deref(), turn_id), + image_request_headers(self.originator.as_deref(), turn_id, codex_turn_metadata), ) .await .map_err(ImageBackendError::from_image_request) @@ -117,19 +119,24 @@ impl CodexImagesBackend { &self, request: ImageEditRequest, turn_id: &str, + codex_turn_metadata: Option<&str>, ) -> Result<(ImageResponse, Option), ImageBackendError> { self.client() .await? .edit( &request, - image_request_headers(self.originator.as_deref(), turn_id), + image_request_headers(self.originator.as_deref(), turn_id, codex_turn_metadata), ) .await .map_err(ImageBackendError::from_image_request) } } -fn image_request_headers(originator: Option<&str>, turn_id: &str) -> HeaderMap { +fn image_request_headers( + originator: Option<&str>, + turn_id: &str, + codex_turn_metadata: Option<&str>, +) -> HeaderMap { let mut headers = HeaderMap::new(); if let Ok(turn_id) = HeaderValue::from_str(turn_id) { headers.insert(X_CODEX_IMAGE_TURN_ID_HEADER, turn_id); @@ -137,5 +144,12 @@ fn image_request_headers(originator: Option<&str>, turn_id: &str) -> HeaderMap { if let Some(originator) = originator { add_originator_header(&mut headers, originator); } + + if let Some(metadata) = codex_turn_metadata + && let Ok(metadata) = HeaderValue::from_str(metadata) + { + headers.insert(X_CODEX_TURN_METADATA_HEADER, metadata); + } + headers } diff --git a/codex-rs/ext/image-generation/src/tool.rs b/codex-rs/ext/image-generation/src/tool.rs index d2777fb202..781d1e03ff 100644 --- a/codex-rs/ext/image-generation/src/tool.rs +++ b/codex-rs/ext/image-generation/src/tool.rs @@ -169,8 +169,16 @@ impl ImageGenerationTool { )) .await; let result = match request { - ImageRequest::Generate(request) => self.backend.generate(request, &call.turn_id).await, - ImageRequest::Edit(request) => self.backend.edit(request, &call.turn_id).await, + ImageRequest::Generate(request) => { + self.backend + .generate(request, &call.turn_id, call.codex_turn_metadata.as_deref()) + .await + } + ImageRequest::Edit(request) => { + self.backend + .edit(request, &call.turn_id, call.codex_turn_metadata.as_deref()) + .await + } } .map_err(|error| { ( From b7ba02f88095cd3c039709157618c03909d47a26 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Wed, 14 Oct 2026 17:55:37 +0000 Subject: [PATCH 059/155] Support store-owned preparation when resuming threads (#54059) ## Why Thread stores need a way to reuse history and writer state loaded while preparing a resume, rather than loading them again during session startup. ## What changed - Add an opaque, single-use `ThreadStoreResumePreparation` and an optional preparation in `StartThreadOptions`. - Pass preparation through session startup to `ThreadStore::resume_thread_with_preparation`, which defaults to an unsupported-operation error. - Reject preparation for ephemeral threads or threads without resumed history. Continue using `resume_thread` when no preparation is supplied. ## Testing Add a regression test verifying that supplied preparation selects the prepared store path and propagates its unsupported-operation error instead of falling back to ordinary resume. GitOrigin-RevId: 26537d9b83443bd56341d6afc713f32b999dc67c --- codex-rs/core/src/codex_delegate.rs | 1 + codex-rs/core/src/session/mod.rs | 4 ++ codex-rs/core/src/session/session.rs | 10 +++- codex-rs/core/src/session/tests.rs | 2 + .../core/src/session/tests/guardian_tests.rs | 1 + codex-rs/core/src/thread_manager.rs | 13 +++++ codex-rs/core/tests/suite/resume.rs | 48 +++++++++++++++++++ codex-rs/thread-store/src/lib.rs | 1 + codex-rs/thread-store/src/live_thread.rs | 11 ++++- codex-rs/thread-store/src/local/mod.rs | 3 ++ codex-rs/thread-store/src/store.rs | 48 +++++++++++++++++++ 11 files changed, 139 insertions(+), 3 deletions(-) diff --git a/codex-rs/core/src/codex_delegate.rs b/codex-rs/core/src/codex_delegate.rs index e2c30ad988..4a77f764bf 100644 --- a/codex-rs/core/src/codex_delegate.rs +++ b/codex-rs/core/src/codex_delegate.rs @@ -121,6 +121,7 @@ pub(crate) async fn run_codex_thread_interactive( code_mode_session_provider: parent_session.services.code_mode_service.session_provider(), extensions, conversation_history, + resume_preparation: None, history_initialization, disabled_plugin_ids: (isolation == codex_extension_api::SessionIsolation::Inherit) .then(|| parent_ctx.disabled_plugin_ids.clone()), diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index 516db0886a..aad25b40d8 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -188,6 +188,7 @@ use codex_thread_store::ReadThreadParams; use codex_thread_store::ResumeThreadParams; use codex_thread_store::ThreadPersistenceMetadata; use codex_thread_store::ThreadStore; +use codex_thread_store::ThreadStoreResumePreparation; use codex_utils_audio::prepare_response_items as prepare_audio_response_items; use codex_utils_git_discovery::GitRootDiscovery; use codex_utils_output_truncation::with_serialization_allowance; @@ -495,6 +496,7 @@ pub(crate) struct SessionSpawnArgs { pub(crate) code_mode_session_provider: Arc, pub(crate) extensions: Arc>, pub(crate) conversation_history: InitialHistory, + pub(crate) resume_preparation: Option, pub(crate) history_initialization: HistoryInitialization, pub(crate) disabled_plugin_ids: Option>, pub(crate) requested_history_mode: Option, @@ -610,6 +612,7 @@ impl Session { code_mode_session_provider, extensions, conversation_history, + resume_preparation, history_initialization, disabled_plugin_ids, requested_history_mode, @@ -991,6 +994,7 @@ impl Session { analytics_events_client, image_store, thread_store, + resume_preparation, parent_rollout_thread_trace, attestation_provider, external_time_provider, diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rs index 6de001d0dc..830127290f 100644 --- a/codex-rs/core/src/session/session.rs +++ b/codex-rs/core/src/session/session.rs @@ -807,6 +807,7 @@ impl Session { analytics_events_client: Option, image_store: Arc, thread_store: Arc, + resume_preparation: Option, parent_rollout_thread_trace: ThreadTraceContext, attestation_provider: Option>, external_time_provider: Option>, @@ -1130,8 +1131,13 @@ impl Session { let (context_tx, context_rx) = tokio::sync::oneshot::channel(); let live_thread = guard .acquire(async move { - let (live_thread, history) = - LiveThread::resume(store, history_mode, params).await?; + let (live_thread, history) = LiveThread::resume( + store, + history_mode, + params, + resume_preparation, + ) + .await?; // Cancellation still leaves the writer with the acquisition guard. let _ = context_tx.send(history); Ok(live_thread) diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index 592d0e37f7..9b3ec7b698 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -7208,6 +7208,7 @@ async fn make_session_with_config_and_rx( codex_thread_store::LocalThreadStoreConfig::from_config(config.as_ref()), /*state_db*/ None, )), + /*resume_preparation*/ None, codex_rollout_trace::ThreadTraceContext::disabled(), /*attestation_provider*/ None, /*external_time_provider*/ None, @@ -7350,6 +7351,7 @@ async fn make_session_with_history_source_and_agent_control_and_rx( .expect("state db should initialize"), ), )), + /*resume_preparation*/ None, codex_rollout_trace::ThreadTraceContext::disabled(), /*attestation_provider*/ None, /*external_time_provider*/ None, diff --git a/codex-rs/core/src/session/tests/guardian_tests.rs b/codex-rs/core/src/session/tests/guardian_tests.rs index ab9a2be02e..e70fa5fd8f 100644 --- a/codex-rs/core/src/session/tests/guardian_tests.rs +++ b/codex-rs/core/src/session/tests/guardian_tests.rs @@ -1303,6 +1303,7 @@ async fn guardian_subagent_does_not_inherit_parent_exec_policy_rules() { code_mode_session_provider: Arc::new(codex_code_mode::DisabledCodeModeSessionProvider), extensions: codex_extension_api::empty_extension_registry(), conversation_history: InitialHistory::New, + resume_preparation: None, history_initialization: HistoryInitialization::New, disabled_plugin_ids: None, requested_history_mode: None, diff --git a/codex-rs/core/src/thread_manager.rs b/codex-rs/core/src/thread_manager.rs index 2fb6da8d71..4910246f07 100644 --- a/codex-rs/core/src/thread_manager.rs +++ b/codex-rs/core/src/thread_manager.rs @@ -108,6 +108,7 @@ use codex_thread_store::StoredThread; use codex_thread_store::ThreadMetadataPatch; use codex_thread_store::ThreadStore; use codex_thread_store::ThreadStoreError; +use codex_thread_store::ThreadStoreResumePreparation; use codex_thread_store::UpdateThreadMetadataParams; use codex_utils_absolute_path::AbsolutePathBuf; use codex_utils_git_discovery::GitRootDiscovery; @@ -283,6 +284,8 @@ pub struct StartThreadOptions { pub thread_instructions_provider: Option>, pub allow_provider_model_fallback: bool, pub initial_history: InitialHistory, + /// Store-owned state prepared while loading the resumed history. + pub resume_preparation: Option, /// Parent captured for `start_thread`, including a parent not in the live registry. pub internal_parent: Option, pub history_mode: Option, @@ -313,6 +316,7 @@ impl StartThreadOptions { thread_instructions_provider: None, allow_provider_model_fallback: false, initial_history: InitialHistory::New, + resume_preparation: None, internal_parent: None, history_mode: None, session_source: None, @@ -2106,6 +2110,7 @@ impl ThreadManagerState { thread_instructions_provider, allow_provider_model_fallback, initial_history, + resume_preparation, internal_parent: _, history_mode, session_source, @@ -2122,6 +2127,13 @@ impl ThreadManagerState { mut reserved_thread_id, disabled_plugin_ids, } = options; + if resume_preparation.is_some() + && (config.ephemeral || !matches!(&initial_history, InitialHistory::Resumed(_))) + { + return Err(CodexErr::InvalidRequest( + "thread store resume preparation requires a persisted resumed thread".to_string(), + )); + } let inherited_environments = captured_environments.or(inherited_environments); let session_source = session_source.unwrap_or_else(|| self.session_source.clone()); // Older callers and saved reviewers identify isolation through their source. @@ -2339,6 +2351,7 @@ impl ThreadManagerState { code_mode_session_provider: Arc::clone(&self.code_mode_session_provider), extensions, conversation_history: initial_history, + resume_preparation, history_initialization, disabled_plugin_ids, requested_history_mode: history_mode, diff --git a/codex-rs/core/tests/suite/resume.rs b/codex-rs/core/tests/suite/resume.rs index b78e305857..138a73a203 100644 --- a/codex-rs/core/tests/suite/resume.rs +++ b/codex-rs/core/tests/suite/resume.rs @@ -4,12 +4,15 @@ use codex_core::TurnInputRequest; use codex_history::InitialHistory; use codex_history::ResumedHistory; use codex_protocol::config_types::WindowsSandboxLevel; +use codex_protocol::error::CodexErrorDetails; use codex_protocol::mcp::ClientMcpExtensions; use codex_protocol::protocol::EventMsg; use codex_protocol::protocol::ThreadHistoryMode; use codex_protocol::protocol::ThreadSettingsOverrides; use codex_protocol::user_input::UserInput; +use codex_thread_store::InMemoryThreadStore; use codex_thread_store::LoadThreadHistoryParams; +use codex_thread_store::ThreadStoreResumePreparation; use core_test_support::responses::ev_assistant_message; use core_test_support::responses::ev_completed; use core_test_support::responses::ev_response_created; @@ -23,6 +26,51 @@ use core_test_support::wait_for_event; use pretty_assertions::assert_eq; use std::sync::Arc; +/// A supplied preparation must select the prepared store path instead of silently falling back to +/// an ordinary resume. +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn resume_uses_prepared_store_path_when_preparation_is_present() -> Result<()> { + skip_if_no_network!(Ok(())); + + let server = start_mock_server().await; + let initial = test_codex() + .with_thread_store(Arc::new(InMemoryThreadStore::default())) + .build_with_auto_env(&server) + .await?; + let thread_id = initial.session_configured.thread_id; + initial.codex.shutdown_and_wait().await?; + initial.thread_manager.remove_thread(&thread_id).await; + let context = initial + .thread_store + .load_latest_model_context(LoadThreadHistoryParams { + thread_id, + include_archived: true, + }) + .await?; + + let mut options = initial.start_thread_options().await; + options.initial_history = InitialHistory::Resumed(ResumedHistory { + history_revision: context.revision, + conversation_id: context.thread_id, + history: Arc::new(context.items), + rollout_path: None, + }); + options.resume_preparation = Some(ThreadStoreResumePreparation::new(())); + + let Err(err) = initial.thread_manager.start_thread(options).await else { + panic!("prepared resume unexpectedly used the ordinary store path"); + }; + assert!( + matches!( + err.details(), + CodexErrorDetails::UnsupportedOperation(message) + if message == "resume_thread_with_preparation is not supported yet" + ), + "unexpected prepared resume error: {err}" + ); + Ok(()) +} + #[test_case::test_case(None, ThreadHistoryMode::Paginated; "store default")] #[test_case::test_case(Some(ThreadHistoryMode::Legacy), ThreadHistoryMode::Legacy; "explicit legacy")] #[test_case::test_case(Some(ThreadHistoryMode::Paginated), ThreadHistoryMode::Paginated; "explicit paginated")] diff --git a/codex-rs/thread-store/src/lib.rs b/codex-rs/thread-store/src/lib.rs index 9cf1267574..8e0eccabec 100644 --- a/codex-rs/thread-store/src/lib.rs +++ b/codex-rs/thread-store/src/lib.rs @@ -58,6 +58,7 @@ pub use queue_store::QueueStore; pub use store::PersistContext; pub use store::ThreadStore; pub use store::ThreadStoreFuture; +pub use store::ThreadStoreResumePreparation; pub use thread_attachments::AddThreadAttachmentParams; pub use thread_attachments::ListThreadAttachmentThreadsParams; pub use thread_attachments::ListThreadAttachmentsParams; diff --git a/codex-rs/thread-store/src/live_thread.rs b/codex-rs/thread-store/src/live_thread.rs index ab18df6d8e..a6de95b297 100644 --- a/codex-rs/thread-store/src/live_thread.rs +++ b/codex-rs/thread-store/src/live_thread.rs @@ -26,6 +26,7 @@ use crate::ThreadStore; use crate::ThreadStoreError; use crate::ThreadStoreFuture; use crate::ThreadStoreResult; +use crate::ThreadStoreResumePreparation; use crate::UpdateThreadMetadataParams; use crate::thread_metadata_sync::ThreadMetadataSync; @@ -182,6 +183,7 @@ impl LiveThread { thread_store: Arc, history_mode: ThreadHistoryMode, mut params: ResumeThreadParams, + resume_preparation: Option, ) -> ThreadStoreResult<(Self, Arc>)> { let thread_id = params.thread_id; let metadata = if history_mode == ThreadHistoryMode::Paginated @@ -197,7 +199,14 @@ impl LiveThread { } else { None }; - let history = thread_store.resume_thread(params.clone()).await?; + let history = match resume_preparation { + Some(preparation) => { + thread_store + .resume_thread_with_preparation(params.clone(), preparation) + .await? + } + None => thread_store.resume_thread(params.clone()).await?, + }; params.history = Some(Arc::clone(&history)); let metadata_sync = ThreadMetadataSync::for_resume(¶ms, metadata.as_ref()); Ok(( diff --git a/codex-rs/thread-store/src/local/mod.rs b/codex-rs/thread-store/src/local/mod.rs index 5ec4719cc2..2df77f7239 100644 --- a/codex-rs/thread-store/src/local/mod.rs +++ b/codex-rs/thread-store/src/local/mod.rs @@ -1027,6 +1027,7 @@ mod tests { memory_mode: ThreadMemoryMode::Enabled, }, }, + /*resume_preparation*/ None, ) .await .expect("resume paginated thread from its requested rollout"); @@ -1377,6 +1378,7 @@ mod tests { memory_mode: ThreadMemoryMode::Enabled, }, }, + /*resume_preparation*/ None, ) .await .expect("resume live thread"); @@ -1433,6 +1435,7 @@ mod tests { memory_mode: ThreadMemoryMode::Enabled, }, }, + /*resume_preparation*/ None, ) .await .expect("resume external live thread"); diff --git a/codex-rs/thread-store/src/store.rs b/codex-rs/thread-store/src/store.rs index d604f47875..762861e771 100644 --- a/codex-rs/thread-store/src/store.rs +++ b/codex-rs/thread-store/src/store.rs @@ -2,6 +2,7 @@ use codex_protocol::ThreadId; use codex_protocol::protocol::ThreadHistoryMode; use codex_rollout::RolloutItem; use std::any::Any; +use std::fmt; use std::future::Future; use std::pin::Pin; use std::sync::Arc; @@ -65,6 +66,37 @@ use crate::UpdatedProject; /// Future returned by [`ThreadStore`] operations. pub type ThreadStoreFuture<'a, T> = Pin> + Send + 'a>>; +/// Data a [`ThreadStore`] has already loaded while preparing a thread for resume. +/// +/// Core does not inspect this value. It gives the value back to the store when reopening the +/// thread, allowing the store to reuse the loaded history and writer state instead of loading them +/// again. The value can only be used once because it may own resources that cannot be copied. +pub struct ThreadStoreResumePreparation { + state: Box, +} + +impl ThreadStoreResumePreparation { + pub fn new(state: T) -> Self { + Self { + state: Box::new(state), + } + } + + pub fn downcast(self) -> Result { + match self.state.downcast::() { + Ok(state) => Ok(*state), + Err(state) => Err(Self { state }), + } + } +} + +impl fmt::Debug for ThreadStoreResumePreparation { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("ThreadStoreResumePreparation") + .finish_non_exhaustive() + } +} + /// Why thread persistence is being requested. #[derive(Clone, Copy, Debug, Eq, PartialEq)] pub enum PersistContext { @@ -155,6 +187,22 @@ pub trait ThreadStore: Any + Send + Sync { params: ResumeThreadParams, ) -> ThreadStoreFuture<'_, Arc>>; + /// Reopens a thread using implementation-owned state prepared before Core startup. + /// + /// Stores should only override this when they also produce the preparation. The returned + /// history and failure cleanup guarantees are the same as [`Self::resume_thread`]. + fn resume_thread_with_preparation( + &self, + _params: ResumeThreadParams, + _preparation: ThreadStoreResumePreparation, + ) -> ThreadStoreFuture<'_, Arc>> { + Box::pin(async { + Err(ThreadStoreError::Unsupported { + operation: "resume_thread_with_preparation", + }) + }) + } + /// Appends raw rollout items to a live thread. /// /// Implementations should apply the shared rollout persistence policy before writing durable From 9d3ae38e13aecaf018c03d5c1331c91f8c985e0f Mon Sep 17 00:00:00 2001 From: ben zhang Date: Wed, 14 Oct 2026 18:10:07 +0000 Subject: [PATCH 060/155] Limit unarchive scans to the requested thread's archived rollouts (#54060) ## Why Unarchiving a thread previously read rollout metadata across both active and archived history, including unrelated threads. ## What changed Use `RolloutReferenceIndex::scan_archived_threads` to restrict discovery to archived files whose canonical filenames match the requested thread. Continue validating ownership through session metadata and include compressed and reverted rollouts. ## Testing Add coverage for compressed and replacement archived rollouts, metadata ownership mismatches, unrelated filenames, and exclusion of active rollouts. GitOrigin-RevId: 8784f3502b839dcb4a3839744010e350d0196545 --- .../rollout/src/rollout_reference_index.rs | 16 ++++++ .../src/rollout_reference_index_tests.rs | 55 +++++++++++++++++++ codex-rs/thread-store/src/local/helpers.rs | 13 ----- .../src/local/unarchive_thread.rs | 13 ++++- 4 files changed, 82 insertions(+), 15 deletions(-) diff --git a/codex-rs/rollout/src/rollout_reference_index.rs b/codex-rs/rollout/src/rollout_reference_index.rs index a55d2344f9..2b21b82487 100644 --- a/codex-rs/rollout/src/rollout_reference_index.rs +++ b/codex-rs/rollout/src/rollout_reference_index.rs @@ -71,6 +71,22 @@ impl RolloutReferenceIndex { Self::scan_paths(vec![codex_home.join(SESSIONS_SUBDIR)], Some(&thread_ids)).await } + /// Scans archived files whose canonical filenames belong to the requested threads. + /// + /// Metadata still determines ownership among the candidates. Reference counts are partial + /// and must not be used to decide whether a rollout can be deleted or compressed. + pub async fn scan_archived_threads( + codex_home: &Path, + thread_ids: &[ThreadId], + ) -> io::Result { + let thread_ids = thread_ids.iter().copied().collect(); + Self::scan_paths( + vec![codex_home.join(ARCHIVED_SESSIONS_SUBDIR)], + Some(&thread_ids), + ) + .await + } + async fn scan_paths( mut stack: Vec, thread_ids: Option<&HashSet>, diff --git a/codex-rs/rollout/src/rollout_reference_index_tests.rs b/codex-rs/rollout/src/rollout_reference_index_tests.rs index 036e870724..9d61db09c4 100644 --- a/codex-rs/rollout/src/rollout_reference_index_tests.rs +++ b/codex-rs/rollout/src/rollout_reference_index_tests.rs @@ -247,6 +247,61 @@ async fn filtered_unarchived_scan_validates_candidate_ownership() -> anyhow::Res Ok(()) } +/// Restoring a thread must include its compressed/reverted files without scanning other history. +#[tokio::test] +async fn filtered_archived_scan_includes_only_owned_archived_candidates() -> anyhow::Result<()> { + let home = TempDir::new()?; + let owner_uuid = Uuid::from_u128(60); + let owner_id = thread_id(owner_uuid)?; + let replacement_id = thread_id(Uuid::from_u128(61))?; + let other_uuid = Uuid::from_u128(62); + let other_id = thread_id(other_uuid)?; + let mismatched_id = thread_id(Uuid::from_u128(63))?; + let original_path = archived_rollout_path(home.path(), owner_uuid); + let replacement_path = original_path.with_file_name(format!( + "rollout-2025-01-03T12-00-00-{owner_id}_{replacement_id}.jsonl" + )); + write_rollout(original_path.clone(), owner_id, /*history_base*/ None)?; + compress_now(&original_path)?; + write_rollout( + replacement_path.clone(), + owner_id, + Some(history_position(owner_id)), + )?; + + // A matching filename is only a candidate: metadata must confirm ownership. + let mismatched_path = original_path.with_file_name(format!( + "rollout-2025-01-03T12-00-00-{owner_id}_{mismatched_id}.jsonl" + )); + write_rollout(mismatched_path, other_id, /*history_base*/ None)?; + // Unrelated filenames are excluded before reading their metadata. + write_rollout( + archived_rollout_path(home.path(), other_uuid), + owner_id, + /*history_base*/ None, + )?; + write_rollout( + active_rollout_path(home.path(), owner_uuid), + owner_id, + /*history_base*/ None, + )?; + + let index = RolloutReferenceIndex::scan_archived_threads(home.path(), &[owner_id]).await?; + let mut owned: Vec<_> = index + .rollouts_for_thread(owner_id) + .map(|(id, path)| (id, path.to_path_buf())) + .collect(); + owned.sort_by_key(|(id, _)| id.to_string()); + assert_eq!( + owned, + vec![ + (owner_id, original_path.with_extension("jsonl.zst")), + (replacement_id, replacement_path), + ] + ); + Ok(()) +} + #[tokio::test] async fn self_history_base_does_not_count_as_reference() -> anyhow::Result<()> { let home = TempDir::new()?; diff --git a/codex-rs/thread-store/src/local/helpers.rs b/codex-rs/thread-store/src/local/helpers.rs index 3c8433dcc5..b9de0906c4 100644 --- a/codex-rs/thread-store/src/local/helpers.rs +++ b/codex-rs/thread-store/src/local/helpers.rs @@ -68,19 +68,6 @@ pub(super) fn rollout_path_is_archived(codex_home: &Path, path: &Path) -> bool { .any(|component| component.as_os_str() == OsStr::new(ARCHIVED_SESSIONS_SUBDIR)) } -/// Returns rollout files whose session metadata belongs to `thread_id`. -pub(super) async fn owned_rollout_paths( - store: &LocalThreadStore, - thread_id: ThreadId, -) -> ThreadStoreResult> { - RolloutReferenceIndex::scan(store.config.codex_home.as_path()) - .await - .map_err(|err| ThreadStoreError::Internal { - message: format!("failed to scan thread rollout files: {err}"), - }) - .map(|index| owned_rollout_paths_from_index(&index, thread_id)) -} - pub(super) fn owned_rollout_paths_from_index( index: &RolloutReferenceIndex, thread_id: ThreadId, diff --git a/codex-rs/thread-store/src/local/unarchive_thread.rs b/codex-rs/thread-store/src/local/unarchive_thread.rs index 017d18ad00..8bf975c269 100644 --- a/codex-rs/thread-store/src/local/unarchive_thread.rs +++ b/codex-rs/thread-store/src/local/unarchive_thread.rs @@ -1,5 +1,5 @@ use super::LocalThreadStore; -use super::helpers::owned_rollout_paths; +use super::helpers::owned_rollout_paths_from_index; use super::helpers::restore_rollout_moves; use super::helpers::rollout_path_is_archived; use super::helpers::scoped_rollout_path; @@ -10,6 +10,7 @@ use crate::ReadThreadParams; use crate::StoredThread; use crate::ThreadStoreError; use crate::ThreadStoreResult; +use codex_rollout::RolloutReferenceIndex; use codex_rollout::rollout_date_parts; use super::thread_rollout_resolver; @@ -34,7 +35,15 @@ pub(super) async fn unarchive_thread( message: format!("no archived rollout found for thread id {thread_id}"), })?; - let mut rollout_paths = owned_rollout_paths(store, thread_id).await?; + let reference_index = RolloutReferenceIndex::scan_archived_threads( + store.config.codex_home.as_path(), + &[thread_id], + ) + .await + .map_err(|err| ThreadStoreError::Internal { + message: format!("failed to scan thread rollout files: {err}"), + })?; + let mut rollout_paths = owned_rollout_paths_from_index(&reference_index, thread_id); if !rollout_paths.contains(&selected_archived_path) { rollout_paths.push(selected_archived_path.clone()); } From 0fd85b075288c4fee50f0df3e4e4f98f80c693fe Mon Sep 17 00:00:00 2001 From: iceweasel-oai Date: Wed, 14 Oct 2026 18:50:33 +0000 Subject: [PATCH 061/155] Fix Windows environment handling for remote MCP servers (#54069) ## Why Remote MCP environment filtering could drop `SystemDrive` and `LocalAppData`. Explicit overrides also need Windows-aware merging to replace inherited variables with differently cased names. ## What changed - Preserve `SYSTEMDRIVE` and `LOCALAPPDATA` when remote environment variables activate the allowlist. - Apply explicit environment overrides through the executor environment policy, while retaining the final overlay for variables excluded by the allowlist. ## Testing Extend environment-policy tests to cover the additional Windows variables, overrides with differently cased names, and the final overlay used by older executors. GitOrigin-RevId: 36df69117f248536e47cf7e1d855b99a138fe698 --- .../rmcp-client/src/stdio_server_launcher.rs | 65 ++++++++++++++++--- 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/codex-rs/rmcp-client/src/stdio_server_launcher.rs b/codex-rs/rmcp-client/src/stdio_server_launcher.rs index 195e00765f..92ccfa2107 100644 --- a/codex-rs/rmcp-client/src/stdio_server_launcher.rs +++ b/codex-rs/rmcp-client/src/stdio_server_launcher.rs @@ -623,7 +623,7 @@ impl ExecutorStdioServerLauncher { argv, cwd, shell_snapshot: None, - env_policy: Some(Self::remote_env_policy(&remote_env_vars)), + env_policy: Some(Self::remote_env_policy(&remote_env_vars, &env)), env, tty: false, pipe_stdin: true, @@ -679,7 +679,10 @@ impl ExecutorStdioServerLauncher { .map_err(|_| anyhow!("{label} must be valid Unicode for remote MCP stdio")) } - fn remote_env_policy(remote_env_vars: &[String]) -> ExecEnvPolicy { + fn remote_env_policy( + remote_env_vars: &[String], + env: &HashMap, + ) -> ExecEnvPolicy { let include_only = if remote_env_vars.is_empty() { Vec::new() } else { @@ -692,7 +695,7 @@ impl ExecutorStdioServerLauncher { // inputs even when explicit remote vars activate this allowlist. crate::utils::DEFAULT_ENV_VARS .iter() - .chain(["SYSTEMROOT", "TEMP", "TMP"].iter()) + .chain(["SYSTEMROOT", "TEMP", "TMP", "SYSTEMDRIVE", "LOCALAPPDATA"].iter()) .map(|name| (*name).to_string()) .chain(remote_env_vars.iter().cloned()) .collect() @@ -705,7 +708,9 @@ impl ExecutorStdioServerLauncher { }, ignore_default_excludes: true, exclude: Vec::new(), - r#set: HashMap::new(), + // Apply overrides through the policy's Windows-aware merge, including + // on older executors. Keep the final overlay for names filtered out below. + r#set: env.clone(), include_only, } } @@ -717,10 +722,11 @@ mod tests { use codex_protocol::config_types::EnvironmentVariablePattern; use codex_protocol::config_types::ShellEnvironmentPolicy; use codex_protocol::shell_environment; + use pretty_assertions::assert_eq; #[test] fn remote_env_policy_uses_core_env_without_remote_source_vars() { - let policy = ExecutorStdioServerLauncher::remote_env_policy(&[]); + let policy = ExecutorStdioServerLauncher::remote_env_policy(&[], &HashMap::new()); assert_eq!(policy.inherit, ShellEnvironmentPolicyInherit::Core); assert!(policy.include_only.is_empty()); @@ -728,7 +734,10 @@ mod tests { #[test] fn remote_env_policy_includes_remote_source_vars_without_full_env() { - let policy = ExecutorStdioServerLauncher::remote_env_policy(&["REMOTE_TOKEN".to_string()]); + let policy = ExecutorStdioServerLauncher::remote_env_policy( + &["REMOTE_TOKEN".to_string()], + &HashMap::new(), + ); assert_eq!(policy.inherit, ShellEnvironmentPolicyInherit::All); assert!( @@ -745,9 +754,11 @@ mod tests { #[test] fn remote_env_policy_effectively_filters_unrequested_vars() { - let exec_policy = - ExecutorStdioServerLauncher::remote_env_policy(&["REMOTE_TOKEN".to_string()]); - let policy = ShellEnvironmentPolicy { + let exec_policy = ExecutorStdioServerLauncher::remote_env_policy( + &["REMOTE_TOKEN".to_string()], + &HashMap::new(), + ); + let mut policy = ShellEnvironmentPolicy { inherit: exec_policy.inherit, ignore_default_excludes: exec_policy.ignore_default_excludes, exclude: exec_policy @@ -768,6 +779,11 @@ mod tests { [ ("PATH".to_string(), "/remote/bin".to_string()), ("SystemRoot".to_string(), r"C:\Windows".to_string()), + ("SystemDrive".to_string(), "C:".to_string()), + ( + "LocalAppData".to_string(), + r"C:\Users\test\AppData\Local".to_string(), + ), ( "TEMP".to_string(), r"C:\Users\test\AppData\Local\Temp".to_string(), @@ -787,6 +803,11 @@ mod tests { ); assert_eq!(env.get("PATH").map(String::as_str), Some("/remote/bin")); + assert_eq!(env.get("SystemDrive").map(String::as_str), Some("C:")); + assert_eq!( + env.get("LocalAppData").map(String::as_str), + Some(r"C:\Users\test\AppData\Local") + ); assert_eq!( env.get("SystemRoot").map(String::as_str), Some(r"C:\Windows") @@ -802,5 +823,31 @@ mod tests { Some("remote-secret") ); assert!(!env.contains_key("UNREQUESTED_SECRET")); + + let overrides = HashMap::from([ + ("SYSTEMDRIVE".to_string(), "D:".to_string()), + ("LOCALAPPDATA".to_string(), r"D:\McpProfile".to_string()), + ("EXPLICIT_ONLY".to_string(), "configured".to_string()), + ]); + policy.r#set = ExecutorStdioServerLauncher::remote_env_policy( + &["REMOTE_TOKEN".to_string()], + &overrides, + ) + .r#set; + let mut child_env = + shell_environment::create_env_from_vars(env.clone(), &policy, /*thread_id*/ None); + assert_eq!( + child_env.get("LOCALAPPDATA").map(String::as_str), + Some(r"D:\McpProfile") + ); + // Older executors apply the final overlay with a case-sensitive merge. + child_env.extend(overrides.clone()); + let mut expected = env; + if cfg!(windows) { + expected.remove("SystemDrive"); + expected.remove("LocalAppData"); + } + expected.extend(overrides); + assert_eq!(child_env, expected); } } From ae110493973d5b72f60d42efe2fae91d51ca9c0e Mon Sep 17 00:00:00 2001 From: smurching-oai Date: Wed, 14 Oct 2026 19:00:45 +0000 Subject: [PATCH 062/155] Expose gateway authentication as a reusable OAuth session API (#54070) ## What changed Rename the grant manager and supporting modules in `codex-rs/login` to expose `OAuthSessionManager`, its configuration and status types, `OAuthLoginControl`, and `subscribe_oauth_session_status`. Keep the existing gateway API names as compatibility aliases and retain the credential storage paths and namespace so saved credentials remain usable. Update the existing authentication tests to use the OAuth session API. GitOrigin-RevId: 72cea12be606dde28cf42809e7f8b8807cbc4a2a --- codex-rs/login/src/lib.rs | 25 ++-- .../src/{gateway_auth.rs => oauth_session.rs} | 94 +++++++-------- ..._callback.rs => oauth_session_callback.rs} | 0 ...y_auth_login.rs => oauth_session_login.rs} | 107 +++++++++--------- ..._tests.rs => oauth_session_login_tests.rs} | 94 +++++++++------ ...th_storage.rs => oauth_session_storage.rs} | 7 +- ...ests.rs => oauth_session_storage_tests.rs} | 16 +-- ...y_auth_tests.rs => oauth_session_tests.rs} | 40 +++---- ...y_auth_token.rs => oauth_session_token.rs} | 4 +- 9 files changed, 212 insertions(+), 175 deletions(-) rename codex-rs/login/src/{gateway_auth.rs => oauth_session.rs} (88%) rename codex-rs/login/src/{gateway_auth_callback.rs => oauth_session_callback.rs} (100%) rename codex-rs/login/src/{gateway_auth_login.rs => oauth_session_login.rs} (79%) rename codex-rs/login/src/{gateway_auth_login_tests.rs => oauth_session_login_tests.rs} (88%) rename codex-rs/login/src/{gateway_auth_storage.rs => oauth_session_storage.rs} (91%) rename codex-rs/login/src/{gateway_auth_storage_tests.rs => oauth_session_storage_tests.rs} (93%) rename codex-rs/login/src/{gateway_auth_tests.rs => oauth_session_tests.rs} (97%) rename codex-rs/login/src/{gateway_auth_token.rs => oauth_session_token.rs} (98%) diff --git a/codex-rs/login/src/lib.rs b/codex-rs/login/src/lib.rs index abbbf1d897..ea82416d62 100644 --- a/codex-rs/login/src/lib.rs +++ b/codex-rs/login/src/lib.rs @@ -9,8 +9,8 @@ pub use auth::WorkspaceRoutingSession; mod callback_params; mod device_code_auth; -mod gateway_auth; mod oauth; +mod oauth_session; mod outbound_proxy; mod pkce; mod server; @@ -75,10 +75,19 @@ pub use auth_env_telemetry::collect_auth_env_telemetry; pub use outbound_proxy::AuthRouteConfig; pub use token_data::TokenData; -pub use gateway_auth::GatewayAuthConfig; -pub use gateway_auth::GatewayAuthError; -pub use gateway_auth::GatewayAuthManager; -pub use gateway_auth::GatewayAuthStatus; -pub use gateway_auth::GatewayAuthStatusChange; -pub use gateway_auth::GatewayLoginControl; -pub use gateway_auth::subscribe_gateway_auth_status; +// Existing inference-gateway names continue to refer to the same grant manager. +pub use oauth_session::OAuthLoginControl as GatewayLoginControl; +pub use oauth_session::OAuthSessionConfig as GatewayAuthConfig; +pub use oauth_session::OAuthSessionError as GatewayAuthError; +pub use oauth_session::OAuthSessionManager as GatewayAuthManager; +pub use oauth_session::OAuthSessionStatus as GatewayAuthStatus; +pub use oauth_session::OAuthSessionStatusChange as GatewayAuthStatusChange; +pub use oauth_session::subscribe_oauth_session_status as subscribe_gateway_auth_status; + +pub use oauth_session::OAuthLoginControl; +pub use oauth_session::OAuthSessionConfig; +pub use oauth_session::OAuthSessionError; +pub use oauth_session::OAuthSessionManager; +pub use oauth_session::OAuthSessionStatus; +pub use oauth_session::OAuthSessionStatusChange; +pub use oauth_session::subscribe_oauth_session_status; diff --git a/codex-rs/login/src/gateway_auth.rs b/codex-rs/login/src/oauth_session.rs similarity index 88% rename from codex-rs/login/src/gateway_auth.rs rename to codex-rs/login/src/oauth_session.rs index 8ceb769e01..4119aab553 100644 --- a/codex-rs/login/src/gateway_auth.rs +++ b/codex-rs/login/src/oauth_session.rs @@ -32,40 +32,40 @@ use tokio::sync::Mutex; use url::Host; use url::Url; -#[path = "gateway_auth_callback.rs"] +#[path = "oauth_session_callback.rs"] mod callback; -#[path = "gateway_auth_login.rs"] +#[path = "oauth_session_login.rs"] mod login; -#[path = "gateway_auth_storage.rs"] +#[path = "oauth_session_storage.rs"] mod storage; -#[path = "gateway_auth_token.rs"] +#[path = "oauth_session_token.rs"] mod token; -pub use login::GatewayAuthStatus; -pub use login::GatewayAuthStatusChange; -pub use login::GatewayLoginControl; -pub use login::subscribe_gateway_auth_status; +pub use login::OAuthLoginControl; +pub use login::OAuthSessionStatus; +pub use login::OAuthSessionStatusChange; +pub use login::subscribe_oauth_session_status; use callback::CallbackListener; -use storage::GatewayAuthStorage; +use storage::OAuthSessionStorage; use token::StoredToken; use token::TokenResponse; const REFRESH_SKEW_SECONDS: i64 = 30; const HTTP_TIMEOUT: Duration = Duration::from_secs(/*secs*/ 20); -/// Gateway authentication states that require user action rather than request retries. +/// Credential states that require user action rather than request retries. #[derive(Clone, Copy, Debug, PartialEq, Eq, thiserror::Error)] -pub enum GatewayAuthError { +pub enum OAuthSessionError { #[error("Gateway sign-in required. Choose Sign in or Reconnect, then retry your request")] LoginRequired, #[error("Gateway authentication is in progress; retry after sign-in")] LoginInProgress, } -/// Public-client OAuth settings for a model provider. +/// Public-client OAuth settings that identify one configured authorization grant. #[derive(Clone, PartialEq, Eq)] -pub struct GatewayAuthConfig { +pub struct OAuthSessionConfig { pub authorization_url: String, pub token_url: String, pub client_id: String, @@ -74,11 +74,11 @@ pub struct GatewayAuthConfig { pub redirect_port: Option, } -/// Resolves and persists an OAuth access token for a model provider. +/// Resolves and persists an OAuth access token without knowing how a consumer uses it. #[derive(Clone)] -pub struct GatewayAuthManager { - control: Arc, - state: Arc, +pub struct OAuthSessionManager { + control: Arc, + state: Arc, } enum RefreshPolicy { @@ -103,20 +103,20 @@ enum RefreshOutcome { LoginRequired, } -struct GatewayAuthState { - config: GatewayAuthConfig, +struct OAuthSessionState { + config: OAuthSessionConfig, codex_home: PathBuf, - storage: GatewayAuthStorage, + storage: OAuthSessionStorage, http_client: HttpClient, - cached_token: Arc>, + cached_token: Arc>, // Reserve explicit login independently of background credential reads and refreshes. login_attempt: Arc>, - status: tokio::sync::watch::Sender>, - status_tx: tokio::sync::broadcast::Sender, + status: tokio::sync::watch::Sender>, + status_tx: tokio::sync::broadcast::Sender, } #[derive(Clone, Default, PartialEq, Eq)] -struct GatewayAuthCache { +struct OAuthSessionCache { token: Option, // Retain rotated credentials across a failed save. The prior persisted token remains // available for comparison so retrying cannot overwrite a newer external login. @@ -125,11 +125,11 @@ struct GatewayAuthCache { login_required: Option, } -impl GatewayAuthManager { - /// Creates independent gateway credentials in their encrypted store using the caller's HTTP policy. +impl OAuthSessionManager { + /// Creates a configured OAuth session using the caller's encrypted store and HTTP policy. /// Token grants never follow redirects or include primary-provider credentials or request logs. pub fn new( - config: GatewayAuthConfig, + config: OAuthSessionConfig, codex_home: PathBuf, http_client_factory: &HttpClientFactory, keyring: Arc, @@ -144,14 +144,14 @@ impl GatewayAuthManager { ) .map_err(|_| io::Error::other("failed to create provider OAuth HTTP client"))?; Ok(Self { - control: GatewayLoginControl::for_host(&codex_home, http_client_factory), - state: Arc::new(GatewayAuthState { + control: OAuthLoginControl::for_host(&codex_home, http_client_factory), + state: Arc::new(OAuthSessionState { config, status_tx: login::status_sender_for_host(&codex_home, http_client_factory), - storage: GatewayAuthStorage::new(codex_home.clone(), keyring), + storage: OAuthSessionStorage::new(codex_home.clone(), keyring), codex_home, http_client, - cached_token: Arc::new(Mutex::new(GatewayAuthCache::default())), + cached_token: Arc::new(Mutex::new(OAuthSessionCache::default())), login_attempt: Arc::new(Mutex::new(())), status: tokio::sync::watch::channel(/*init*/ None).0, }), @@ -186,7 +186,7 @@ impl GatewayAuthManager { let terminal_status = self.state.status.borrow().as_ref().is_some_and(|snapshot| { matches!( snapshot.status, - GatewayAuthStatus::NotReady | GatewayAuthStatus::Failed { .. } + OAuthSessionStatus::NotReady | OAuthSessionStatus::Failed { .. } ) }); // A cached token may predate the failed login. Only persisted replacements can clear it. @@ -216,11 +216,11 @@ impl GatewayAuthManager { let terminal_matches = self.state.status.borrow().as_ref().is_some_and(|snapshot| { matches!( snapshot.status, - GatewayAuthStatus::NotReady | GatewayAuthStatus::Failed { .. } + OAuthSessionStatus::NotReady | OAuthSessionStatus::Failed { .. } ) && snapshot.credential.as_ref() == Some(token) }); if !terminal_matches { - self.publish_status(GatewayAuthStatus::Succeeded, Some(token)); + self.publish_status(OAuthSessionStatus::Succeeded, Some(token)); } let access_token = token.access_token.clone(); cached.login_required = None; @@ -234,7 +234,7 @@ impl GatewayAuthManager { Err(error) => Err(error), Ok(RefreshOutcome::AccessToken(access_token)) => { cached.login_required = None; - manager.publish_status(GatewayAuthStatus::Succeeded, cached.token.as_ref()); + manager.publish_status(OAuthSessionStatus::Succeeded, cached.token.as_ref()); Ok(access_token) } Ok(RefreshOutcome::LoginRequired) => { @@ -249,8 +249,8 @@ impl GatewayAuthManager { if result.as_ref().is_err_and(|error| { error .get_ref() - .and_then(|source| source.downcast_ref::()) - == Some(&GatewayAuthError::LoginRequired) + .and_then(|source| source.downcast_ref::()) + == Some(&OAuthSessionError::LoginRequired) }) && !self .control .explicit_login @@ -263,7 +263,7 @@ impl GatewayAuthManager { async fn persist_pending( &self, - cached: &mut GatewayAuthCache, + cached: &mut OAuthSessionCache, credential_lock: &Arc, ) -> io::Result { let token = cached @@ -289,7 +289,7 @@ impl GatewayAuthManager { async fn refresh( &self, - cached: &mut GatewayAuthCache, + cached: &mut OAuthSessionCache, policy: &RefreshPolicy, ) -> io::Result { let credential_lock = Arc::new(storage::lock_credentials(&self.state.codex_home).await?); @@ -418,7 +418,7 @@ impl GatewayAuthManager { async fn authorize_with_browser( &self, - cached: &mut GatewayAuthCache, + cached: &mut OAuthSessionCache, open_browser: impl FnOnce(&Url), ) -> io::Result { let pkce = generate_pkce(); @@ -470,7 +470,7 @@ impl GatewayAuthManager { })?; cached.pending = Some(response.into_stored(/*previous_refresh_token*/ None)?); let access_token = self.persist_pending(cached, &credential_lock).await?; - self.publish_status(GatewayAuthStatus::Succeeded, cached.token.as_ref()); + self.publish_status(OAuthSessionStatus::Succeeded, cached.token.as_ref()); Ok(access_token) } @@ -488,11 +488,11 @@ impl GatewayAuthManager { } } -impl fmt::Debug for GatewayAuthConfig { +impl fmt::Debug for OAuthSessionConfig { fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result { // Configured URLs may contain issuer-specific credentials in arbitrary query keys. formatter - .debug_struct("GatewayAuthConfig") + .debug_struct("OAuthSessionConfig") .field("client_id", &self.client_id) .field("scopes", &self.scopes) .field("redirect_port", &self.redirect_port) @@ -500,10 +500,10 @@ impl fmt::Debug for GatewayAuthConfig { } } -impl fmt::Debug for GatewayAuthManager { +impl fmt::Debug for OAuthSessionManager { fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result { formatter - .debug_struct("GatewayAuthManager") + .debug_struct("OAuthSessionManager") .field("config", &self.state.config) .finish_non_exhaustive() } @@ -515,7 +515,7 @@ fn token_is_usable(token: &StoredToken) -> bool { .is_none_or(|expires_at| expires_at > Utc::now().timestamp() + REFRESH_SKEW_SECONDS) } -fn validate_config(config: &GatewayAuthConfig) -> io::Result<()> { +fn validate_config(config: &OAuthSessionConfig) -> io::Result<()> { let authorization = validate_oauth_url( &config.authorization_url, "provider OAuth authorization endpoint", @@ -573,5 +573,5 @@ fn validate_oauth_url(value: &str, description: &str) -> io::Result { } #[cfg(test)] -#[path = "gateway_auth_tests.rs"] +#[path = "oauth_session_tests.rs"] mod tests; diff --git a/codex-rs/login/src/gateway_auth_callback.rs b/codex-rs/login/src/oauth_session_callback.rs similarity index 100% rename from codex-rs/login/src/gateway_auth_callback.rs rename to codex-rs/login/src/oauth_session_callback.rs diff --git a/codex-rs/login/src/gateway_auth_login.rs b/codex-rs/login/src/oauth_session_login.rs similarity index 79% rename from codex-rs/login/src/gateway_auth_login.rs rename to codex-rs/login/src/oauth_session_login.rs index d6840c3f44..443366d2d4 100644 --- a/codex-rs/login/src/gateway_auth_login.rs +++ b/codex-rs/login/src/oauth_session_login.rs @@ -12,7 +12,7 @@ use tokio::sync::broadcast; /// Readiness and browser authorization progress for a gateway credential. #[derive(Clone, Debug, PartialEq, Eq)] -pub enum GatewayAuthStatus { +pub enum OAuthSessionStatus { NotReady, Started, Succeeded, @@ -22,26 +22,26 @@ pub enum GatewayAuthStatus { // Keep terminal status tied to its credential and retain successful credential expiry for busy reads. // Deliberately omit Debug: this snapshot contains credentials. #[derive(Clone)] -pub(super) struct GatewayAuthStatusSnapshot { - pub(super) status: GatewayAuthStatus, +pub(super) struct OAuthSessionStatusSnapshot { + pub(super) status: OAuthSessionStatus, pub(super) credential: Option, } /// A credential status change scoped to the configured OAuth account. #[derive(Clone, Debug)] -pub struct GatewayAuthStatusChange { - pub config: GatewayAuthConfig, - pub status: GatewayAuthStatus, +pub struct OAuthSessionStatusChange { + pub config: OAuthSessionConfig, + pub status: OAuthSessionStatus, } /// Browser policy shared by gateway managers with the same home and network configuration. #[derive(Debug)] -pub struct GatewayLoginControl { +pub struct OAuthLoginControl { pub(super) explicit_login: AtomicBool, - status_tx: broadcast::Sender, + status_tx: broadcast::Sender, } -impl GatewayLoginControl { +impl OAuthLoginControl { /// Returns the control shared across this runtime's provider configurations. pub fn for_runtime(runtime: &crate::AuthRuntimeConfig) -> Arc { Self::for_host( @@ -51,7 +51,7 @@ impl GatewayLoginControl { } pub(super) fn for_host(codex_home: &std::path::Path, factory: &HttpClientFactory) -> Arc { - type Controls = Vec<(PathBuf, HttpClientFactory, Arc)>; + type Controls = Vec<(PathBuf, HttpClientFactory, Arc)>; static CONTROLS: OnceLock> = OnceLock::new(); let mut controls = CONTROLS .get_or_init(std::sync::Mutex::default) @@ -94,10 +94,10 @@ impl GatewayLoginControl { /// Subscribes to gateway status changes for this home and network configuration. /// The subscription also covers managers created after configuration changes. -pub fn subscribe_gateway_auth_status( +pub fn subscribe_oauth_session_status( runtime: &crate::AuthRuntimeConfig, -) -> broadcast::Receiver { - GatewayLoginControl::for_runtime(runtime) +) -> broadcast::Receiver { + OAuthLoginControl::for_runtime(runtime) .status_tx .subscribe() } @@ -105,29 +105,29 @@ pub fn subscribe_gateway_auth_status( pub(super) fn status_sender_for_host( codex_home: &std::path::Path, factory: &HttpClientFactory, -) -> broadcast::Sender { - GatewayLoginControl::for_host(codex_home, factory) +) -> broadcast::Sender { + OAuthLoginControl::for_host(codex_home, factory) .status_tx .clone() } -impl GatewayAuthManager { +impl OAuthSessionManager { /// Returns the OAuth account configuration used to scope status notifications. - pub fn config(&self) -> &GatewayAuthConfig { + pub fn config(&self) -> &OAuthSessionConfig { &self.state.config } /// Returns whether the status changed and a notification was published. pub(super) fn publish_status( &self, - status: GatewayAuthStatus, + status: OAuthSessionStatus, credential: Option<&StoredToken>, ) -> bool { let credential = match status { - GatewayAuthStatus::NotReady - | GatewayAuthStatus::Failed { .. } - | GatewayAuthStatus::Succeeded => credential.cloned(), - GatewayAuthStatus::Started => None, + OAuthSessionStatus::NotReady + | OAuthSessionStatus::Failed { .. } + | OAuthSessionStatus::Succeeded => credential.cloned(), + OAuthSessionStatus::Started => None, }; let mut changed = false; self.state.status.send_if_modified(|previous| { @@ -141,12 +141,12 @@ impl GatewayAuthManager { { return false; } - *previous = Some(GatewayAuthStatusSnapshot { + *previous = Some(OAuthSessionStatusSnapshot { status: status.clone(), credential, }); if changed { - let _ = self.state.status_tx.send(GatewayAuthStatusChange { + let _ = self.state.status_tx.send(OAuthSessionStatusChange { config: self.state.config.clone(), status: status.clone(), }); @@ -159,19 +159,19 @@ impl GatewayAuthManager { pub(super) fn login_required_error(&self, credential: Option<&StoredToken>) -> io::Error { // Requests must re-prompt even after an earlier NotReady notification was dismissed. // Passive readiness reads continue to use the deduplicated publisher above. - if !self.publish_status(GatewayAuthStatus::NotReady, credential) { - let _ = self.state.status_tx.send(GatewayAuthStatusChange { + if !self.publish_status(OAuthSessionStatus::NotReady, credential) { + let _ = self.state.status_tx.send(OAuthSessionStatusChange { config: self.state.config.clone(), - status: GatewayAuthStatus::NotReady, + status: OAuthSessionStatus::NotReady, }); } io::Error::new( io::ErrorKind::PermissionDenied, - GatewayAuthError::LoginRequired, + OAuthSessionError::LoginRequired, ) } - pub(super) async fn lock_cached_token(&self) -> io::Result> { + pub(super) async fn lock_cached_token(&self) -> io::Result> { let mut status = self.state.status.subscribe(); let lock = Arc::clone(&self.state.cached_token).lock_owned(); tokio::pin!(lock); @@ -179,11 +179,11 @@ impl GatewayAuthManager { if status .borrow_and_update() .as_ref() - .is_some_and(|snapshot| snapshot.status == GatewayAuthStatus::Started) + .is_some_and(|snapshot| snapshot.status == OAuthSessionStatus::Started) { return Err(io::Error::new( io::ErrorKind::WouldBlock, - GatewayAuthError::LoginInProgress, + OAuthSessionError::LoginInProgress, )); } tokio::select! { @@ -195,14 +195,14 @@ impl GatewayAuthManager { } /// Reads readiness without refreshing credentials, opening a browser, or waiting for login. - pub async fn status(&self) -> io::Result { + pub async fn status(&self) -> io::Result { let manager = self.clone(); tokio::task::spawn_blocking(move || manager.status_blocking()) .await .map_err(|_| io::Error::other("provider OAuth readiness task failed"))? } - fn status_blocking(&self) -> io::Result { + fn status_blocking(&self) -> io::Result { let mut status_changes = self.state.status.subscribe(); let previous_cache = { let Ok(cached) = self.state.cached_token.try_lock() else { @@ -211,9 +211,9 @@ impl GatewayAuthManager { if status_changes .borrow_and_update() .as_ref() - .is_some_and(|snapshot| snapshot.status == GatewayAuthStatus::Started) + .is_some_and(|snapshot| snapshot.status == OAuthSessionStatus::Started) { - return Ok(GatewayAuthStatus::Started); + return Ok(OAuthSessionStatus::Started); } cached.clone() }; @@ -233,7 +233,7 @@ impl GatewayAuthManager { let terminal = snapshot.as_ref().filter(|snapshot| { matches!( snapshot.status, - GatewayAuthStatus::NotReady | GatewayAuthStatus::Failed { .. } + OAuthSessionStatus::NotReady | OAuthSessionStatus::Failed { .. } ) }); if stored.as_ref().is_some_and(token_is_usable) @@ -245,31 +245,31 @@ impl GatewayAuthManager { cached.token = stored; cached.pending = None; cached.login_required = None; - self.publish_status(GatewayAuthStatus::Succeeded, cached.token.as_ref()); - return Ok(GatewayAuthStatus::Succeeded); + self.publish_status(OAuthSessionStatus::Succeeded, cached.token.as_ref()); + return Ok(OAuthSessionStatus::Succeeded); } if let Some(snapshot) = terminal { return Ok(snapshot.status.clone()); } - self.publish_status(GatewayAuthStatus::NotReady, stored.as_ref()); - Ok(GatewayAuthStatus::NotReady) + self.publish_status(OAuthSessionStatus::NotReady, stored.as_ref()); + Ok(OAuthSessionStatus::NotReady) } - fn snapshot_status(&self) -> GatewayAuthStatus { - let mut status = GatewayAuthStatus::NotReady; + fn snapshot_status(&self) -> OAuthSessionStatus { + let mut status = OAuthSessionStatus::NotReady; // Check and downgrade atomically so an expired observation cannot overwrite // a completed refresh or newly started login. self.state.status.send_if_modified(|snapshot| { let Some(snapshot) = snapshot else { return false; }; - let expired = snapshot.status == GatewayAuthStatus::Succeeded + let expired = snapshot.status == OAuthSessionStatus::Succeeded && !snapshot.credential.as_ref().is_some_and(token_is_usable); if expired { - snapshot.status = GatewayAuthStatus::NotReady; - let _ = self.state.status_tx.send(GatewayAuthStatusChange { + snapshot.status = OAuthSessionStatus::NotReady; + let _ = self.state.status_tx.send(OAuthSessionStatusChange { config: self.state.config.clone(), - status: GatewayAuthStatus::NotReady, + status: OAuthSessionStatus::NotReady, }); } status = snapshot.status.clone(); @@ -289,7 +289,10 @@ impl GatewayAuthManager { let _login_attempt = Arc::clone(&self.state.login_attempt) .try_lock_owned() .map_err(|_| { - io::Error::new(io::ErrorKind::WouldBlock, GatewayAuthError::LoginInProgress) + io::Error::new( + io::ErrorKind::WouldBlock, + OAuthSessionError::LoginInProgress, + ) })?; tokio::pin!(cancel); let mut cached = tokio::select! { @@ -305,7 +308,7 @@ impl GatewayAuthManager { credential: cached.token.clone(), completed: false, }; - self.publish_status(GatewayAuthStatus::Started, /*credential*/ None); + self.publish_status(OAuthSessionStatus::Started, /*credential*/ None); let result = tokio::select! { biased; _ = &mut cancel => Err(io::Error::new(io::ErrorKind::Interrupted, "Gateway sign-in was canceled")), @@ -335,7 +338,7 @@ impl GatewayAuthManager { } struct LoginStatusGuard<'a> { - manager: &'a GatewayAuthManager, + manager: &'a OAuthSessionManager, credential: Option, completed: bool, } @@ -344,8 +347,8 @@ impl LoginStatusGuard<'_> { fn finish(&mut self, result: &io::Result) { self.manager.publish_status( match result { - Ok(_) => GatewayAuthStatus::Succeeded, - Err(error) => GatewayAuthStatus::Failed { + Ok(_) => OAuthSessionStatus::Succeeded, + Err(error) => OAuthSessionStatus::Failed { message: error.to_string(), }, }, @@ -359,7 +362,7 @@ impl Drop for LoginStatusGuard<'_> { fn drop(&mut self) { if !self.completed { self.manager.publish_status( - GatewayAuthStatus::Failed { + OAuthSessionStatus::Failed { message: "Gateway sign-in was canceled".to_string(), }, self.credential.as_ref(), diff --git a/codex-rs/login/src/gateway_auth_login_tests.rs b/codex-rs/login/src/oauth_session_login_tests.rs similarity index 88% rename from codex-rs/login/src/gateway_auth_login_tests.rs rename to codex-rs/login/src/oauth_session_login_tests.rs index bb1e5a1319..95eb6cb565 100644 --- a/codex-rs/login/src/gateway_auth_login_tests.rs +++ b/codex-rs/login/src/oauth_session_login_tests.rs @@ -1,8 +1,8 @@ //! Explicit browser login shares credentials with request consumers and remains cancellable. use super::*; -use crate::GatewayAuthError; -use crate::GatewayAuthStatus; +use crate::OAuthSessionError; +use crate::OAuthSessionStatus; use pretty_assertions::assert_eq; use tokio::sync::Notify; @@ -15,8 +15,8 @@ async fn status_subscriptions_survive_gateway_changes_and_are_isolated_by_home() auth_route_config: transport_default_auth_route_config(), }; // Subscribe before any manager exists, as app-server does without gateway configuration. - let mut events = crate::subscribe_gateway_auth_status(&runtime); - crate::GatewayLoginControl::for_runtime(&runtime).require_explicit_login(); + let mut events = crate::subscribe_oauth_session_status(&runtime); + crate::OAuthLoginControl::for_runtime(&runtime).require_explicit_login(); let keyring = Arc::new(MockKeyringStore::default()); let (other_manager, _other_home) = client(config(&server), keyring.clone()); other_manager.resolve_access_token().await.unwrap_err(); @@ -28,7 +28,7 @@ async fn status_subscriptions_survive_gateway_changes_and_are_isolated_by_home() for client_id in ["first-gateway", "replacement-gateway"] { let mut gateway = config(&server); gateway.client_id = client_id.to_string(); - let manager = GatewayAuthManager::new( + let manager = OAuthSessionManager::new( gateway.clone(), home.path().to_path_buf(), runtime.auth_route_config.http_client_factory(), @@ -42,7 +42,7 @@ async fn status_subscriptions_survive_gateway_changes_and_are_isolated_by_home() .unwrap(); assert_eq!( (event.config, event.status), - (gateway, GatewayAuthStatus::NotReady) + (gateway, OAuthSessionStatus::NotReady) ); // The next gateway must reach the same subscriber after the last manager is dropped. drop(manager); @@ -69,7 +69,10 @@ async fn cancel_releases_callback_while_reads_and_requests_stay_responsive() { }); let check = async { let callback = url_rx.await.unwrap(); - assert_eq!(observer.status().await.unwrap(), GatewayAuthStatus::Started); + assert_eq!( + observer.status().await.unwrap(), + OAuthSessionStatus::Started + ); assert_eq!( observer.resolve_access_token().await.unwrap_err().kind(), std::io::ErrorKind::WouldBlock @@ -79,13 +82,13 @@ async fn cancel_releases_callback_while_reads_and_requests_stay_responsive() { }; let (result, callback) = tokio::join!(login, check); assert_eq!(result.unwrap_err().kind(), std::io::ErrorKind::Interrupted); - let failed = GatewayAuthStatus::Failed { + let failed = OAuthSessionStatus::Failed { message: "Gateway sign-in was canceled".to_string(), }; assert_eq!(observer.status().await.unwrap(), failed); assert_eq!( events.recv().await.unwrap().status, - GatewayAuthStatus::Started + OAuthSessionStatus::Started ); assert_eq!(events.recv().await.unwrap().status, failed); tokio::time::timeout(Duration::from_secs(/*secs*/ 2), async { @@ -115,9 +118,9 @@ async fn credential_read_failure_finishes_login_status() { assert_eq!(error.to_string(), message); assert_eq!( events.try_recv().unwrap().status, - GatewayAuthStatus::Started + OAuthSessionStatus::Started ); - let failed = GatewayAuthStatus::Failed { + let failed = OAuthSessionStatus::Failed { message: message.into(), }; assert_eq!(events.try_recv().unwrap().status, failed); @@ -160,10 +163,13 @@ async fn rejected_credentials_stay_not_ready_until_replaced() { .kind(), std::io::ErrorKind::PermissionDenied ); - assert_eq!(manager.status().await.unwrap(), GatewayAuthStatus::NotReady); + assert_eq!( + manager.status().await.unwrap(), + OAuthSessionStatus::NotReady + ); assert_eq!( events.try_recv().unwrap().status, - GatewayAuthStatus::NotReady + OAuthSessionStatus::NotReady ); for _ in 0..2 { assert_eq!( @@ -172,9 +178,12 @@ async fn rejected_credentials_stay_not_ready_until_replaced() { ); assert_eq!( events.try_recv().unwrap().status, - GatewayAuthStatus::NotReady + OAuthSessionStatus::NotReady + ); + assert_eq!( + manager.status().await.unwrap(), + OAuthSessionStatus::NotReady ); - assert_eq!(manager.status().await.unwrap(), GatewayAuthStatus::NotReady); assert!(matches!( events.try_recv(), Err(tokio::sync::broadcast::error::TryRecvError::Empty) @@ -197,7 +206,7 @@ async fn rejected_credentials_stay_not_ready_until_replaced() { ); assert_eq!( manager.status().await.unwrap(), - GatewayAuthStatus::Succeeded + OAuthSessionStatus::Succeeded ); assert_eq!(manager.resolve_access_token().await.unwrap(), "replacement"); @@ -236,7 +245,7 @@ async fn rejected_credentials_stay_not_ready_until_replaced() { let cache_lock = Arc::clone(&manager.state.cached_token).lock_owned().await; assert_eq!( manager.status().await.unwrap(), - GatewayAuthStatus::Succeeded + OAuthSessionStatus::Succeeded ); drop(cache_lock); assert_eq!(manager.resolve_access_token().await.unwrap(), "signed-in"); @@ -256,12 +265,15 @@ async fn dropping_login_clears_in_progress_status() { .await }); started_rx.await.unwrap(); - assert_eq!(observer.status().await.unwrap(), GatewayAuthStatus::Started); + assert_eq!( + observer.status().await.unwrap(), + OAuthSessionStatus::Started + ); login.abort(); assert!(login.await.unwrap_err().is_cancelled()); assert_eq!( observer.status().await.unwrap(), - GatewayAuthStatus::Failed { + OAuthSessionStatus::Failed { message: "Gateway sign-in was canceled".to_string() } ); @@ -279,7 +291,7 @@ async fn expired_readiness_stays_not_ready_while_refresh_is_blocked() { }; manager.save_token(&expired).unwrap(); // Seed the last successful observation with a credential that has since expired. - manager.publish_status(GatewayAuthStatus::Succeeded, Some(&expired)); + manager.publish_status(OAuthSessionStatus::Succeeded, Some(&expired)); let mut events = manager.state.status_tx.subscribe(); Mock::given(method("POST")) .and(path("/token")) @@ -291,7 +303,10 @@ async fn expired_readiness_stays_not_ready_while_refresh_is_blocked() { .mount(&server) .await; if read_before_refresh { - assert_eq!(manager.status().await.unwrap(), GatewayAuthStatus::NotReady); + assert_eq!( + manager.status().await.unwrap(), + OAuthSessionStatus::NotReady + ); } // Block the real refresh on the cross-process store lock after it takes the cache lock. let store_lock = super::super::storage::lock_credentials(home.path()) @@ -307,11 +322,17 @@ async fn expired_readiness_stays_not_ready_while_refresh_is_blocked() { } }) => ready.expect("refresh holds cache lock"), } - assert_eq!(manager.status().await.unwrap(), GatewayAuthStatus::NotReady); - assert_eq!(manager.status().await.unwrap(), GatewayAuthStatus::NotReady); + assert_eq!( + manager.status().await.unwrap(), + OAuthSessionStatus::NotReady + ); + assert_eq!( + manager.status().await.unwrap(), + OAuthSessionStatus::NotReady + ); assert_eq!( events.try_recv().unwrap().status, - GatewayAuthStatus::NotReady + OAuthSessionStatus::NotReady ); assert!(matches!( events.try_recv(), @@ -324,16 +345,16 @@ async fn expired_readiness_stays_not_ready_while_refresh_is_blocked() { let cache_lock = Arc::clone(&manager.state.cached_token).lock_owned().await; assert_eq!( manager.status().await.unwrap(), - GatewayAuthStatus::Succeeded + OAuthSessionStatus::Succeeded ); drop(cache_lock); assert_eq!( events.try_recv().unwrap().status, - GatewayAuthStatus::Succeeded + OAuthSessionStatus::Succeeded ); assert_eq!( manager.status().await.unwrap(), - GatewayAuthStatus::Succeeded + OAuthSessionStatus::Succeeded ); } } @@ -365,12 +386,12 @@ async fn external_credentials_recover_missing_and_failed_readiness() { .login_with_browser(cancel.notified(), |_| cancel.notify_one()) .await .unwrap_err(); - GatewayAuthStatus::Failed { + OAuthSessionStatus::Failed { message: "Gateway sign-in was canceled".into(), } } else { manager.resolve_access_token().await.unwrap_err(); - GatewayAuthStatus::NotReady + OAuthSessionStatus::NotReady }; assert_eq!(manager.status().await.unwrap(), expected); if failed_login { @@ -397,7 +418,7 @@ async fn external_credentials_recover_missing_and_failed_readiness() { } assert_eq!( manager.status().await.unwrap(), - GatewayAuthStatus::Succeeded + OAuthSessionStatus::Succeeded ); assert_eq!(manager.resolve_access_token().await.unwrap(), "replacement"); } @@ -433,9 +454,9 @@ async fn login_waits_for_background_credentials_and_can_cancel_while_queued() { assert_eq!( duplicate .get_ref() - .and_then(|error| error.downcast_ref::()) + .and_then(|error| error.downcast_ref::()) .copied(), - Some(GatewayAuthError::LoginInProgress), + Some(OAuthSessionError::LoginInProgress), ); if cancel_while_queued { cancel.notify_one(); @@ -444,13 +465,16 @@ async fn login_waits_for_background_credentials_and_can_cancel_while_queued() { .unwrap() .unwrap_err(); assert_eq!(error.kind(), std::io::ErrorKind::Interrupted); - assert_eq!(manager.status().await.unwrap(), GatewayAuthStatus::NotReady); + assert_eq!( + manager.status().await.unwrap(), + OAuthSessionStatus::NotReady + ); drop(cache_lock); } else { drop(cache_lock); let check = async { url_rx.await.unwrap(); - assert_eq!(manager.status().await.unwrap(), GatewayAuthStatus::Started); + assert_eq!(manager.status().await.unwrap(), OAuthSessionStatus::Started); cancel.notify_one(); }; let (result, ()) = tokio::join!(login, check); @@ -514,7 +538,7 @@ async fn legacy_policy_authorizes_missing_and_rejected_credentials() { ); assert_eq!( manager.status().await.unwrap(), - GatewayAuthStatus::Succeeded + OAuthSessionStatus::Succeeded ); } } diff --git a/codex-rs/login/src/gateway_auth_storage.rs b/codex-rs/login/src/oauth_session_storage.rs similarity index 91% rename from codex-rs/login/src/gateway_auth_storage.rs rename to codex-rs/login/src/oauth_session_storage.rs index 9ef7ececd2..a82b53fff5 100644 --- a/codex-rs/login/src/gateway_auth_storage.rs +++ b/codex-rs/login/src/oauth_session_storage.rs @@ -1,4 +1,5 @@ -//! Persists gateway credentials and serializes exchanges across all configurations in one store. +//! Persists configured OAuth grants and serializes exchanges in one encrypted store. +//! Gateway storage paths and namespace are retained so existing credentials remain usable. use std::fs::File; use std::fs::OpenOptions; @@ -49,9 +50,9 @@ pub(super) async fn lock_credentials(codex_home: &Path) -> io::Result { Ok(file) } -pub(super) struct GatewayAuthStorage(SecretsManager); +pub(super) struct OAuthSessionStorage(SecretsManager); -impl GatewayAuthStorage { +impl OAuthSessionStorage { pub(super) fn new(codex_home: PathBuf, keyring: Arc) -> Self { Self(SecretsManager::new_with_keyring_store_and_namespace( codex_home, diff --git a/codex-rs/login/src/gateway_auth_storage_tests.rs b/codex-rs/login/src/oauth_session_storage_tests.rs similarity index 93% rename from codex-rs/login/src/gateway_auth_storage_tests.rs rename to codex-rs/login/src/oauth_session_storage_tests.rs index 0548940fb4..88ec677d8c 100644 --- a/codex-rs/login/src/gateway_auth_storage_tests.rs +++ b/codex-rs/login/src/oauth_session_storage_tests.rs @@ -53,7 +53,7 @@ impl KeyringStore for BlockingKeyring { } } -fn blocking_client() -> (GatewayAuthManager, tempfile::TempDir, Arc) { +fn blocking_client() -> (OAuthSessionManager, tempfile::TempDir, Arc) { let home = tempfile::tempdir().unwrap(); let keyring = Arc::new(BlockingKeyring { inner: MockKeyringStore::default(), @@ -61,7 +61,7 @@ fn blocking_client() -> (GatewayAuthManager, tempfile::TempDir, Arc()), - Some(&crate::GatewayAuthError::LoginInProgress), + .and_then(|error| error.downcast_ref::()), + Some(&crate::OAuthSessionError::LoginInProgress), ); assert_eq!( manager.status().await.unwrap(), - crate::GatewayAuthStatus::Started + crate::OAuthSessionStatus::Started ); assert_eq!( events.try_recv().unwrap().status, - crate::GatewayAuthStatus::Started + crate::OAuthSessionStatus::Started ); cancel.notify_one(); let error = tokio::time::timeout(Duration::from_secs(/*secs*/ 2), login) @@ -179,7 +179,7 @@ async fn cancel_during_keyring_read_releases_login_and_cached_credentials() { assert_eq!(error.kind(), std::io::ErrorKind::Interrupted); assert_eq!( events.try_recv().unwrap().status, - crate::GatewayAuthStatus::Failed { + crate::OAuthSessionStatus::Failed { message: "Gateway sign-in was canceled".into(), } ); diff --git a/codex-rs/login/src/gateway_auth_tests.rs b/codex-rs/login/src/oauth_session_tests.rs similarity index 97% rename from codex-rs/login/src/gateway_auth_tests.rs rename to codex-rs/login/src/oauth_session_tests.rs index 53a68e8383..7007c0f606 100644 --- a/codex-rs/login/src/gateway_auth_tests.rs +++ b/codex-rs/login/src/oauth_session_tests.rs @@ -17,24 +17,24 @@ use wiremock::matchers::body_string_contains; use wiremock::matchers::method; use wiremock::matchers::path; -use super::GatewayAuthConfig; -use super::GatewayAuthManager; +use super::OAuthSessionConfig; +use super::OAuthSessionManager; use super::StoredToken; use super::callback::CallbackListener; use crate::test_support::transport_default_auth_route_config; -#[path = "gateway_auth_login_tests.rs"] +#[path = "oauth_session_login_tests.rs"] mod login_tests; -#[path = "gateway_auth_storage_tests.rs"] +#[path = "oauth_session_storage_tests.rs"] mod storage_tests; fn client( - config: GatewayAuthConfig, + config: OAuthSessionConfig, keyring: Arc, -) -> (GatewayAuthManager, tempfile::TempDir) { +) -> (OAuthSessionManager, tempfile::TempDir) { let home = tempfile::tempdir().expect("Codex home"); - let manager = GatewayAuthManager::new( + let manager = OAuthSessionManager::new( config, home.path().to_path_buf(), transport_default_auth_route_config().http_client_factory(), @@ -45,8 +45,8 @@ fn client( (manager, home) } -fn config(server: &MockServer) -> GatewayAuthConfig { - GatewayAuthConfig { +fn config(server: &MockServer) -> OAuthSessionConfig { + OAuthSessionConfig { authorization_url: format!("{}/authorize", server.uri()), token_url: format!("{}/token", server.uri()), client_id: "codex-test".to_string(), @@ -56,8 +56,8 @@ fn config(server: &MockServer) -> GatewayAuthConfig { } } -fn loopback_config() -> GatewayAuthConfig { - GatewayAuthConfig { +fn loopback_config() -> OAuthSessionConfig { + OAuthSessionConfig { authorization_url: "http://127.0.0.1:18080/authorize".to_string(), token_url: "http://127.0.0.1:18080/token".to_string(), client_id: "codex-test".to_string(), @@ -68,7 +68,7 @@ fn loopback_config() -> GatewayAuthConfig { } fn save_token( - client: &GatewayAuthManager, + client: &OAuthSessionManager, access_token: &str, refresh_token: Option<&str>, expires_at: i64, @@ -158,7 +158,7 @@ async fn expired_tokens_refresh_once_when_the_response_omits_rotation_and_expiry Utc::now().timestamp() - 1, ); - let other = GatewayAuthManager::new( + let other = OAuthSessionManager::new( client.state.config.clone(), client.state.codex_home.clone(), transport_default_auth_route_config().http_client_factory(), @@ -193,7 +193,7 @@ async fn different_configurations_refresh_under_the_same_store_lock() { let (first, home) = client(config(&server), keyring.clone()); let mut other_config = first.state.config.clone(); other_config.client_id = "other-client".to_string(); - let second = GatewayAuthManager::new( + let second = OAuthSessionManager::new( other_config, home.path().to_path_buf(), transport_default_auth_route_config().http_client_factory(), @@ -462,13 +462,13 @@ async fn query_credentials_are_not_exposed_by_echoed_errors_or_truncated_request let message = "Gateway sign-in failed; check the gateway configuration and credential store."; assert_eq!(error.to_string(), message); - let failed = crate::GatewayAuthStatus::Failed { + let failed = crate::OAuthSessionStatus::Failed { message: message.into(), }; assert_eq!(manager.status().await.unwrap(), failed); assert_eq!( events.try_recv().unwrap().status, - crate::GatewayAuthStatus::Started + crate::OAuthSessionStatus::Started ); let event = events.try_recv().unwrap(); assert_eq!(event.status, failed); @@ -483,7 +483,7 @@ async fn gateway_credentials_use_a_dedicated_encrypted_file_and_reload_large_tok let keyring = Arc::new(MockKeyringStore::default()); let access_token = "gateway-token-".repeat(/*n*/ 512); let config = loopback_config(); - let client = GatewayAuthManager::new( + let client = OAuthSessionManager::new( config.clone(), codex_home.path().to_path_buf(), transport_default_auth_route_config().http_client_factory(), @@ -506,7 +506,7 @@ async fn gateway_credentials_use_a_dedicated_encrypted_file_and_reload_large_tok ); assert!(!codex_home.path().join("secrets/codex_auth.age").exists()); - let reloaded = GatewayAuthManager::new( + let reloaded = OAuthSessionManager::new( config, codex_home.path().to_path_buf(), transport_default_auth_route_config().http_client_factory(), @@ -796,7 +796,7 @@ async fn cancelled_refresh_still_records_rotated_or_rejected_credentials() { drop(cached); assert_eq!( manager.status().await.unwrap(), - crate::GatewayAuthStatus::NotReady + crate::OAuthSessionStatus::NotReady ); assert_eq!( manager.resolve_access_token().await.unwrap_err().kind(), @@ -815,7 +815,7 @@ async fn cancelled_refresh_still_records_rotated_or_rejected_credentials() { ); assert_eq!( manager.status().await.unwrap(), - crate::GatewayAuthStatus::Succeeded + crate::OAuthSessionStatus::Succeeded ); } } diff --git a/codex-rs/login/src/gateway_auth_token.rs b/codex-rs/login/src/oauth_session_token.rs similarity index 98% rename from codex-rs/login/src/gateway_auth_token.rs rename to codex-rs/login/src/oauth_session_token.rs index e175fc6358..ecf0086bb2 100644 --- a/codex-rs/login/src/gateway_auth_token.rs +++ b/codex-rs/login/src/oauth_session_token.rs @@ -9,7 +9,7 @@ use codex_secrets::redact_secrets; use serde::Deserialize; use serde::Serialize; -use super::GatewayAuthConfig; +use super::OAuthSessionConfig; #[derive(Clone, Deserialize, Serialize, PartialEq, Eq)] pub(super) struct StoredToken { @@ -78,7 +78,7 @@ impl TokenResponse { pub(super) fn endpoint_error( error: OAuthError, - config: &GatewayAuthConfig, + config: &OAuthSessionConfig, grant_type: &str, redirect_uri: Option<&str>, ) -> io::Error { From 80b88a700e4300022fe1893ecca9b8376d0c85d9 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 19:39:32 +0000 Subject: [PATCH 063/155] Avoid false URL-launch detections in literal PowerShell commands (#54076) ## Why PowerShell safety checks can mistake a literal `start` argument for a URL-launch command, or combine a process launch with a URL from a separate command. ## What changed Classify independently parsed literal PowerShell commands separately so commands such as `Write-Output start 'https://example.com'` do not trigger URL-launch checks. Retain conservative checks for pipelines, script state, executable strings, and shell or terminal wrappers, while continuing to detect actual URL launches and destructive commands. ## Testing Add policy regression coverage for literal arguments, separate commands, URL launches, wrappers, and destructive commands, plus a Windows integration test covering execution and policy rejection. GitOrigin-RevId: 2878aa86bc36b44c60230cc1de3430922b28b81a --- codex-rs/core/src/exec_policy.rs | 23 +++- .../src/exec_policy/executable_identity.rs | 18 ++- codex-rs/core/src/exec_policy_tests.rs | 79 +++++++++++++ .../core/src/exec_policy_windows_tests.rs | 2 +- codex-rs/core/tests/suite/exec_policy.rs | 88 +++++++++++++++ .../command_safety/is_dangerous_command.rs | 9 ++ .../windows_dangerous_commands.rs | 104 +++++++++++++++--- 7 files changed, 302 insertions(+), 21 deletions(-) diff --git a/codex-rs/core/src/exec_policy.rs b/codex-rs/core/src/exec_policy.rs index 79d564e338..7e307e4f4a 100644 --- a/codex-rs/core/src/exec_policy.rs +++ b/codex-rs/core/src/exec_policy.rs @@ -161,6 +161,8 @@ pub(crate) enum ExecPolicyCommandOrigin { /// PowerShell wrapper, so use PowerShell-specific unmatched-command /// heuristics for the lowered words. PowerShell, + /// Strictly lowered commands with no pipeline or executable-string dependencies. + PowerShellLiteral, } #[derive(Clone, Copy)] @@ -730,6 +732,11 @@ fn dangerous_command_match_for_origin( command_platform, ) } + ExecPolicyCommandOrigin::PowerShellLiteral => { + codex_shell_command::is_dangerous_command::dangerous_powershell_literal_words_match( + command, + ) + } } } @@ -887,13 +894,15 @@ fn commands_for_exec_policy_for_platform( } if command_platform == DangerousCommandPlatform::Windows + && let Some((_, script)) = + codex_shell_command::powershell::extract_powershell_command(command) && let Some(commands) = - codex_shell_command::powershell::parse_powershell_command_into_plain_commands(command) + codex_shell_command::powershell::parse_powershell_script_into_plain_commands(script) && !commands.is_empty() { return ExecPolicyCommands { + command_origin: powershell_command_origin(script, &commands), commands, - command_origin: ExecPolicyCommandOrigin::PowerShell, }; } @@ -903,6 +912,16 @@ fn commands_for_exec_policy_for_platform( } } +fn powershell_command_origin(script: &str, commands: &[Vec]) -> ExecPolicyCommandOrigin { + if codex_shell_command::is_dangerous_command::powershell_commands_are_independent( + script, commands, + ) { + ExecPolicyCommandOrigin::PowerShellLiteral + } else { + ExecPolicyCommandOrigin::PowerShell + } +} + /// Derive a proposed execpolicy amendment when a command requires user approval /// - If any execpolicy rule prompts, return None, because an amendment would not skip that policy requirement. /// - Otherwise return the first heuristics Prompt. diff --git a/codex-rs/core/src/exec_policy/executable_identity.rs b/codex-rs/core/src/exec_policy/executable_identity.rs index c85fa184bb..d85b075285 100644 --- a/codex-rs/core/src/exec_policy/executable_identity.rs +++ b/codex-rs/core/src/exec_policy/executable_identity.rs @@ -3,6 +3,7 @@ use super::ExecPolicyCommandOrigin; use super::ExecPolicyCommands; use super::ExecPolicyManager; use super::commands_for_exec_policy_for_platform; +use super::powershell_command_origin; use crate::shell::Shell; use crate::tools::sandboxing::ExecApprovalRequirement; use codex_shell_command::is_dangerous_command::DangerousCommandPlatform; @@ -27,11 +28,18 @@ impl ExecPolicyManager { let mut policy_commands = if command_platform == DangerousCommandPlatform::Windows { match extract_powershell_command(command) { - Some((_, script)) => ExecPolicyCommands { - commands: parse_powershell_script_into_plain_commands(script) - .unwrap_or_else(|| vec![command.to_vec()]), - command_origin: ExecPolicyCommandOrigin::PowerShell, - }, + Some((_, script)) => { + let commands = parse_powershell_script_into_plain_commands(script); + let command_origin = commands + .as_ref() + .map_or(ExecPolicyCommandOrigin::PowerShell, |commands| { + powershell_command_origin(script, commands) + }); + ExecPolicyCommands { + commands: commands.unwrap_or_else(|| vec![command.to_vec()]), + command_origin, + } + } None => commands_for_exec_policy_for_platform(command, command_platform), } } else { diff --git a/codex-rs/core/src/exec_policy_tests.rs b/codex-rs/core/src/exec_policy_tests.rs index b8dbf30c85..c17b910a26 100644 --- a/codex-rs/core/src/exec_policy_tests.rs +++ b/codex-rs/core/src/exec_policy_tests.rs @@ -2485,3 +2485,82 @@ async fn exec_policy_warnings_ignore_untrusted_project_rules_without_config_toml Ok(()) } + +#[tokio::test] +async fn windows_powershell_policy_classifies_only_independent_literal_commands() { + for (script, expected) in [ + ( + "project-cli subtask start --text 'https://example.com'", + Decision::Allow, + ), + ("Write-Output start 'https://example.com'", Decision::Allow), + ( + "Start-Process notepad.exe; Invoke-WebRequest 'http://127.0.0.1/health'", + Decision::Allow, + ), + ("Start-Process 'https://example.com'", Decision::Forbidden), + ( + "Write-Output start 'https://example.com' | Out-String", + Decision::Forbidden, + ), + ( + "$target = 'https://example.com/'; Start-Process $target", + Decision::Forbidden, + ), + ( + "Write-Output 'Start-Process https://example.com'", + Decision::Forbidden, + ), + ( + "wmic process call create 'powershell.exe -Command Start-Process https://example.com'", + Decision::Forbidden, + ), + ("cmd /c start https://example.com", Decision::Forbidden), + ( + "wt cmd.exe /c start https://example.com", + Decision::Forbidden, + ), + ( + "wt.exe cmd.exe /c start https://example.com", + Decision::Forbidden, + ), + ("wt.exe cmd.exe /c echo hello", Decision::Allow), + ("Remove-Item test -Force", Decision::Forbidden), + ] { + for flags in [&["-Command"][..], &["-NonInteractive", "-Command"][..]] { + for configured_executable in ["pwsh", "other-shell"] { + let manager = ExecPolicyManager::new(Arc::new(Policy::empty())); + let command = [vec_str(&["pwsh"]), vec_str(flags), vec_str(&[script])].concat(); + let shell = crate::shell::Shell { + shell_type: crate::shell::ShellType::PowerShell, + shell_path: PathBuf::from(configured_executable), + }; + let requirement = manager + .create_exec_approval_requirement_for_shell( + ExecApprovalRequest { + command: &command, + approval_policy: AskForApproval::Never, + permission_profile: PermissionProfile::Disabled, + environment_policy: None, + windows_sandbox_level: WindowsSandboxLevel::Disabled, + sandbox_permissions: SandboxPermissions::UseDefault, + prefix_rule: None, + allow_prefix_rules: AllowPrefixRules::Honor, + }, + &shell, + DangerousCommandPlatform::Windows, + ) + .await; + let actual = match requirement { + ExecApprovalRequirement::Skip { .. } => Decision::Allow, + ExecApprovalRequirement::NeedsApproval { .. } => Decision::Prompt, + ExecApprovalRequirement::Forbidden { .. } => Decision::Forbidden, + }; + assert_eq!( + actual, expected, + "{command:?}; shell: {configured_executable}" + ); + } + } + } +} diff --git a/codex-rs/core/src/exec_policy_windows_tests.rs b/codex-rs/core/src/exec_policy_windows_tests.rs index b07932eda1..e078d57e23 100644 --- a/codex-rs/core/src/exec_policy_windows_tests.rs +++ b/codex-rs/core/src/exec_policy_windows_tests.rs @@ -61,7 +61,7 @@ fn commands_for_exec_policy_parses_powershell_shell_wrapper() { commands_for_exec_policy(&command), ExecPolicyCommands { commands: vec![vec!["echo".to_string(), "blocked".to_string()]], - command_origin: ExecPolicyCommandOrigin::PowerShell, + command_origin: ExecPolicyCommandOrigin::PowerShellLiteral, } ); } diff --git a/codex-rs/core/tests/suite/exec_policy.rs b/codex-rs/core/tests/suite/exec_policy.rs index aef95b4df0..fb7ad89755 100644 --- a/codex-rs/core/tests/suite/exec_policy.rs +++ b/codex-rs/core/tests/suite/exec_policy.rs @@ -513,6 +513,94 @@ async fn unified_exec_disabled_windows_sandbox_rejects_managed_read_only_command Ok(()) } +#[tokio::test] +#[cfg_attr(not(windows), ignore = "requires native Windows PowerShell execution")] +async fn powershell_independent_literal_commands_preserve_url_launch_checks() -> Result<()> { + core_test_support::skip_if_remote!(Ok(()), "requires local Windows PowerShell execution"); + let shell_path = codex_shell_command::powershell::try_find_powershell_executable_blocking() + .ok_or_else(|| anyhow::anyhow!("Windows PowerShell is unavailable"))? + .to_path_buf(); + + for (script, expected_output) in [ + ( + "Write-Output start 'https://example.invalid/diagnostic'", + Some("https://example.invalid/diagnostic"), + ), + ( + "Start-Process cmd.exe -ArgumentList '/c exit 0' -Wait; Write-Output 'https://example.invalid/diagnostic'", + Some("https://example.invalid/diagnostic"), + ), + ("Start-Process 'https://example.invalid/diagnostic'", None), + ( + "wt.exe cmd.exe /c start https://example.invalid/diagnostic", + None, + ), + ( + "Write-Output start 'https://example.invalid/diagnostic' | Out-String", + None, + ), + ( + "$target = 'https://example.invalid/diagnostic'; Start-Process $target", + None, + ), + ] { + let server = start_mock_server().await; + let user_shell = codex_shell_command::shell_detect::DetectedShell { + shell_type: codex_shell_command::shell_detect::ShellType::PowerShell, + shell_path: shell_path.clone(), + } + .into(); + let mut builder = test_codex() + .with_user_shell(user_shell) + .with_config(|config| { + config + .features + .enable(Feature::UnifiedExec) + .expect("test config should allow feature update"); + }); + let test = builder.build_with_auto_env(&server).await?; + let call_id = "powershell-policy"; + let args = json!({ "cmd": script, "login": false, "yield_time_ms": 10_000 }); + mount_sse_once( + &server, + sse(vec![ + ev_response_created("powershell-command"), + ev_function_call(call_id, "exec_command", &serde_json::to_string(&args)?), + ev_completed("powershell-command"), + ]), + ) + .await; + let results_mock = mount_sse_once( + &server, + sse(vec![ + ev_assistant_message("done", "done"), + ev_completed("powershell-result"), + ]), + ) + .await; + + test.submit_turn("run the PowerShell command").await?; + let output = results_mock + .single_request() + .function_call_output_text(call_id) + .expect("shell call should produce a tool response"); + match expected_output { + Some(expected_output) => { + assert!( + output.contains("Process exited with code 0"), + "{script}: {output}" + ); + assert!(output.contains(expected_output), "{script}: {output}"); + } + None => assert!( + output.contains("rejected: blocked by policy"), + "{script}: {output}" + ), + } + } + Ok(()) +} + #[tokio::test] async fn execpolicy_blocks_shell_invocation() -> Result<()> { let mut builder = test_codex().with_config(|config| { diff --git a/codex-rs/shell-command/src/command_safety/is_dangerous_command.rs b/codex-rs/shell-command/src/command_safety/is_dangerous_command.rs index aa2f4d50a3..2440f17001 100644 --- a/codex-rs/shell-command/src/command_safety/is_dangerous_command.rs +++ b/codex-rs/shell-command/src/command_safety/is_dangerous_command.rs @@ -1,6 +1,7 @@ use crate::bash::parse_shell_lc_literal_commands; #[path = "windows_dangerous_commands.rs"] mod windows_dangerous_commands; +pub use windows_dangerous_commands::powershell_commands_are_independent; /// The platform whose command semantics should be used for safety checks. #[derive(Clone, Copy, Debug, Eq, PartialEq)] @@ -93,6 +94,14 @@ pub fn dangerous_powershell_words_match( } } +/// Classifies a strictly lowered command from an independent literal PowerShell script. +pub fn dangerous_powershell_literal_words_match( + command: &[String], +) -> Option { + windows_dangerous_commands::is_dangerous_powershell_literal_words(command) + .then_some(DangerousCommandMatch::Other) +} + fn executable_name_lookup_key(raw: &str, platform: DangerousCommandPlatform) -> Option { match platform { DangerousCommandPlatform::Posix => raw diff --git a/codex-rs/shell-command/src/command_safety/windows_dangerous_commands.rs b/codex-rs/shell-command/src/command_safety/windows_dangerous_commands.rs index cc1ae671c8..8072b881b1 100644 --- a/codex-rs/shell-command/src/command_safety/windows_dangerous_commands.rs +++ b/codex-rs/shell-command/src/command_safety/windows_dangerous_commands.rs @@ -1,3 +1,4 @@ +use crate::command_safety::powershell_tree_sitter::try_parse_powershell_commands; use once_cell::sync::Lazy; use regex::Regex; use shlex::split as shlex_split; @@ -25,17 +26,82 @@ fn is_dangerous_powershell(command: &[String]) -> bool { if !is_powershell_executable(exe) { return false; } - // Parse the PowerShell invocation to get a flat token list we can scan for - // dangerous cmdlets/COM calls plus any URL-looking arguments. This is a - // best-effort shlex split of the script text, not a full PS parser. let Some(parsed) = parse_powershell_invocation(rest) else { return false; }; + if let Some(script) = parsed.script + && let Some(commands) = try_parse_powershell_commands(script) + && powershell_commands_are_independent(script, &commands) + { + return commands + .iter() + .any(|words| is_dangerous_powershell_literal_words(words)); + } is_dangerous_powershell_words(&parsed.tokens) } +/// Whether strictly lowered commands can be classified independently of the rest of the script. +pub fn powershell_commands_are_independent(script: &str, commands: &[Vec]) -> bool { + // Deliberately keep even quoted pipes and `||` chains on the existing path. Do not + // model pipeline data, command rebinding, or strings that may execute using script state. + !script.contains('|') + && commands.iter().all(|words| { + !matches!( + words + .first() + .and_then(|word| executable_basename(word)) + .as_deref(), + Some( + "set-alias" + | "sal" + | "new-alias" + | "nal" + | "set-item" + | "si" + | "new-item" + | "ni" + ) + ) && !words.iter().skip(1).any(|word| { + let word = word.to_ascii_lowercase(); + [ + "start-process", + "invoke-item", + "shellexecute", + "shell.application", + ] + .iter() + .any(|marker| word.contains(marker)) + }) + }) +} + +enum PowerShellCommandKind { + Opaque, + IndependentLiteral, +} + pub(crate) fn is_dangerous_powershell_words(words: &[String]) -> bool { + classify_powershell_words(words, PowerShellCommandKind::Opaque) +} + +pub(crate) fn is_dangerous_powershell_literal_words(words: &[String]) -> bool { + // Shell and terminal wrappers can interpret later words as commands, including `start`. + let kind = if words.first().is_some_and(|word| { + is_powershell_executable(word) + || matches!( + executable_basename(word).as_deref(), + Some("cmd" | "cmd.exe" | "wt" | "wt.exe") + ) + }) { + PowerShellCommandKind::Opaque + } else { + PowerShellCommandKind::IndependentLiteral + }; + classify_powershell_words(words, kind) +} + +fn classify_powershell_words(words: &[String], kind: PowerShellCommandKind) -> bool { let tokens_lc: Vec = words .iter() .map(|t| t.trim_matches('\'').trim_matches('"').to_ascii_lowercase()) @@ -43,11 +109,13 @@ pub(crate) fn is_dangerous_powershell_words(words: &[String]) -> bool { let has_url = args_have_url(words); if has_url - && tokens_lc.iter().any(|t| { - matches!( - t.as_str(), - "start-process" | "start" | "saps" | "invoke-item" | "ii" - ) || t.contains("start-process") + && tokens_lc.iter().enumerate().any(|(index, t)| { + ((index == 0 || matches!(kind, PowerShellCommandKind::Opaque)) + && matches!( + t.as_str(), + "start-process" | "start" | "saps" | "invoke-item" | "ii" + )) + || t.contains("start-process") || t.contains("invoke-item") }) { @@ -365,11 +433,12 @@ fn is_browser_executable(name: &str) -> bool { ) } -struct ParsedPowershell { +struct ParsedPowershell<'a> { tokens: Vec, + script: Option<&'a str>, } -fn parse_powershell_invocation(args: &[String]) -> Option { +fn parse_powershell_invocation(args: &[String]) -> Option> { if args.is_empty() { return None; } @@ -385,7 +454,10 @@ fn parse_powershell_invocation(args: &[String]) -> Option { return None; } let tokens = shlex_split(script)?; - return Some(ParsedPowershell { tokens }); + return Some(ParsedPowershell { + tokens, + script: Some(script), + }); } _ if lower.starts_with("-command:") || lower.starts_with("/command:") => { if idx + 1 != args.len() { @@ -393,7 +465,10 @@ fn parse_powershell_invocation(args: &[String]) -> Option { } let (_, script) = arg.split_once(':')?; let tokens = shlex_split(script)?; - return Some(ParsedPowershell { tokens }); + return Some(ParsedPowershell { + tokens, + script: Some(script), + }); } "-nologo" | "-noprofile" | "-noninteractive" | "-mta" | "-sta" => { idx += 1; @@ -403,7 +478,10 @@ fn parse_powershell_invocation(args: &[String]) -> Option { } _ => { let rest = args[idx..].to_vec(); - return Some(ParsedPowershell { tokens: rest }); + return Some(ParsedPowershell { + tokens: rest, + script: None, + }); } } } From 71923ba3051dc99d3a617c256f686d7415fc1cfc Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 14 Oct 2026 19:40:09 +0000 Subject: [PATCH 064/155] Update `gix` to 0.89.0 and `gix-url` to 0.40.0 (#54078) Refresh the Cargo and Bazel lockfiles for the updated dependencies. GitOrigin-RevId: aedf8dc910d03bd0b170177afb5fa5afc86d27db --- MODULE.bazel.lock | 117 ++++--- codex-rs/Cargo.lock | 740 ++++++++++++++++---------------------------- codex-rs/Cargo.toml | 4 +- 3 files changed, 325 insertions(+), 536 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 5bb5817226..19067bbe7f 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -728,6 +728,7 @@ "audioadapter-sample_5.2.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"audio-codec-algorithms\",\"req\":\"^0.8.1\"},{\"default_features\":false,\"name\":\"num-traits\",\"req\":\"^0.2.15\"}],\"features\":{\"default\":[\"std\"],\"std\":[\"num-traits/std\"]}}", "audioadapter_5.0.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.6\"},{\"default_features\":false,\"name\":\"num-traits\",\"optional\":true,\"req\":\"^0.2.15\"},{\"default_features\":false,\"features\":[\"std\"],\"kind\":\"dev\",\"name\":\"num-traits\",\"req\":\"^0.2.15\"}],\"features\":{\"default\":[],\"test-utils\":[\"dep:num-traits\"]}}", "autocfg_1.5.0": "{\"dependencies\":[],\"features\":{}}", + "autocfg_1.5.1": "{\"dependencies\":[],\"features\":{}}", "aws-config_1.8.12": "{\"dependencies\":[{\"features\":[\"test-util\"],\"name\":\"aws-credential-types\",\"req\":\"^1.2.11\"},{\"name\":\"aws-runtime\",\"req\":\"^1.5.17\"},{\"default_features\":false,\"name\":\"aws-sdk-signin\",\"optional\":true,\"req\":\"^1.2.0\"},{\"default_features\":false,\"name\":\"aws-sdk-sso\",\"optional\":true,\"req\":\"^1.91.0\"},{\"default_features\":false,\"name\":\"aws-sdk-ssooidc\",\"optional\":true,\"req\":\"^1.93.0\"},{\"default_features\":false,\"name\":\"aws-sdk-sts\",\"req\":\"^1.95.0\"},{\"name\":\"aws-smithy-async\",\"req\":\"^1.2.7\"},{\"features\":[\"rt-tokio\",\"test-util\"],\"kind\":\"dev\",\"name\":\"aws-smithy-async\",\"req\":\"^1.2.7\"},{\"name\":\"aws-smithy-http\",\"req\":\"^0.62.6\"},{\"features\":[\"default-client\",\"test-util\"],\"kind\":\"dev\",\"name\":\"aws-smithy-http-client\",\"req\":\"^1.1.5\"},{\"name\":\"aws-smithy-json\",\"req\":\"^0.61.8\"},{\"features\":[\"client\"],\"name\":\"aws-smithy-runtime\",\"req\":\"^1.9.5\"},{\"features\":[\"client\",\"test-util\"],\"kind\":\"dev\",\"name\":\"aws-smithy-runtime\",\"req\":\"^1.9.5\"},{\"features\":[\"client\"],\"name\":\"aws-smithy-runtime-api\",\"req\":\"^1.9.3\"},{\"features\":[\"test-util\"],\"kind\":\"dev\",\"name\":\"aws-smithy-runtime-api\",\"req\":\"^1.9.3\"},{\"name\":\"aws-smithy-types\",\"req\":\"^1.3.5\"},{\"name\":\"aws-types\",\"req\":\"^1.3.11\"},{\"name\":\"base64-simd\",\"optional\":true,\"req\":\"^0.8.0\"},{\"name\":\"bytes\",\"req\":\"^1.1.0\"},{\"name\":\"fastrand\",\"req\":\"^2.3.0\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"futures-util\",\"req\":\"^0.3.29\"},{\"name\":\"hex\",\"optional\":true,\"req\":\"^0.4.3\"},{\"name\":\"http\",\"req\":\"^1\"},{\"name\":\"p256\",\"optional\":true,\"req\":\"^0.13.2\"},{\"default_features\":false,\"features\":[\"std\",\"std_rng\"],\"name\":\"rand\",\"optional\":true,\"req\":\"^0.8.5\"},{\"name\":\"ring\",\"optional\":true,\"req\":\"^0.17.5\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1\"},{\"name\":\"sha2\",\"optional\":true,\"req\":\"^0.10.9\"},{\"features\":[\"parsing\"],\"name\":\"time\",\"req\":\"^0.3.4\"},{\"features\":[\"sync\"],\"name\":\"tokio\",\"req\":\"^1.13.1\"},{\"features\":[\"full\",\"test-util\"],\"kind\":\"dev\",\"name\":\"tokio\",\"req\":\"^1.23.1\"},{\"name\":\"tracing\",\"req\":\"^0.1\"},{\"features\":[\"fmt\",\"json\"],\"kind\":\"dev\",\"name\":\"tracing-subscriber\",\"req\":\"^0.3.16\"},{\"kind\":\"dev\",\"name\":\"tracing-test\",\"req\":\"^0.2.4\"},{\"name\":\"url\",\"req\":\"^2.5.4\"},{\"name\":\"uuid\",\"optional\":true,\"req\":\"^1.18.1\"},{\"name\":\"zeroize\",\"optional\":true,\"req\":\"^1\"}],\"features\":{\"allow-compilation\":[],\"behavior-version-latest\":[],\"client-hyper\":[\"aws-smithy-runtime/default-https-client\"],\"credentials-login\":[\"dep:aws-sdk-signin\",\"dep:sha2\",\"dep:zeroize\",\"dep:hex\",\"dep:base64-simd\",\"dep:uuid\",\"uuid?/v4\",\"dep:p256\",\"p256?/arithmetic\",\"p256?/pem\",\"dep:rand\"],\"credentials-process\":[\"tokio/process\"],\"default\":[\"default-https-client\",\"rt-tokio\",\"credentials-process\",\"sso\"],\"default-https-client\":[\"aws-smithy-runtime/default-https-client\"],\"rt-tokio\":[\"aws-smithy-async/rt-tokio\",\"aws-smithy-runtime/rt-tokio\",\"tokio/rt\"],\"rustls\":[\"client-hyper\"],\"sso\":[\"dep:aws-sdk-sso\",\"dep:aws-sdk-ssooidc\",\"dep:ring\",\"dep:hex\",\"dep:zeroize\",\"aws-smithy-runtime-api/http-auth\"],\"test-util\":[\"aws-runtime/test-util\"]}}", "aws-credential-types_1.2.11": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"async-trait\",\"req\":\"^0.1.74\"},{\"name\":\"aws-smithy-async\",\"req\":\"^1.2.7\"},{\"features\":[\"client\",\"http-auth\"],\"name\":\"aws-smithy-runtime-api\",\"req\":\"^1.9.3\"},{\"features\":[\"test-util\"],\"kind\":\"dev\",\"name\":\"aws-smithy-runtime-api\",\"req\":\"^1.9.3\"},{\"name\":\"aws-smithy-types\",\"req\":\"^1.3.5\"},{\"features\":[\"full\",\"test-util\",\"rt\"],\"kind\":\"dev\",\"name\":\"tokio\",\"req\":\"^1.23.1\"},{\"name\":\"zeroize\",\"req\":\"^1.7.0\"}],\"features\":{\"hardcoded-credentials\":[],\"test-util\":[\"aws-smithy-runtime-api/test-util\"]}}", "aws-lc-rs_1.18.1": "{\"dependencies\":[{\"name\":\"aws-lc-fips-sys\",\"optional\":true,\"req\":\"^0.14.2\"},{\"default_features\":false,\"name\":\"aws-lc-sys\",\"optional\":true,\"req\":\"^0.45.0\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"clap\",\"req\":\"^4.4\"},{\"kind\":\"dev\",\"name\":\"hex\",\"req\":\"^0.4.3\"},{\"kind\":\"dev\",\"name\":\"lazy_static\",\"req\":\"^1.5.0\"},{\"kind\":\"dev\",\"name\":\"paste\",\"req\":\"^1.0.15\"},{\"kind\":\"dev\",\"name\":\"regex\",\"req\":\"^1.11.1\"},{\"name\":\"untrusted\",\"optional\":true,\"req\":\"^0.7.1\"},{\"name\":\"zeroize\",\"req\":\"^1.8.1\"}],\"features\":{\"alloc\":[],\"asan\":[\"aws-lc-sys?/asan\",\"aws-lc-fips-sys?/asan\"],\"bindgen\":[\"aws-lc-sys?/bindgen\",\"aws-lc-fips-sys?/bindgen\"],\"default\":[\"aws-lc-sys\",\"alloc\",\"ring-io\",\"ring-sig-verify\"],\"dev-tests-only\":[],\"fips\":[\"dep:aws-lc-fips-sys\"],\"legacy-des\":[\"aws-lc-sys?/all-bindings\"],\"non-fips\":[\"aws-lc-sys\"],\"prebuilt-nasm\":[\"aws-lc-sys?/prebuilt-nasm\"],\"ring-io\":[\"dep:untrusted\"],\"ring-sig-verify\":[\"dep:untrusted\"],\"test_logging\":[],\"unstable\":[]}}", @@ -926,6 +927,10 @@ "debugid_0.8.0": "{\"dependencies\":[{\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.85\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0.37\"},{\"name\":\"uuid\",\"req\":\"^1.0.0\"}],\"features\":{}}", "debugserver-types_0.5.0": "{\"dependencies\":[{\"name\":\"schemafy\",\"req\":\"^0.5.0\"},{\"features\":[\"derive\"],\"name\":\"serde\",\"req\":\"^1.0\"},{\"name\":\"serde_json\",\"req\":\"^1.0\"}],\"features\":{}}", "deflate64_0.1.10": "{\"dependencies\":[{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"bytemuck\",\"req\":\"^1.13.1\"},{\"kind\":\"dev\",\"name\":\"proptest\",\"req\":\"^1.2.0\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.7.1\"}],\"features\":{}}", + "defmt-macros_1.1.1": "{\"dependencies\":[{\"name\":\"defmt-parser\",\"req\":\"=1.0.0\"},{\"kind\":\"dev\",\"name\":\"maplit\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1\"},{\"name\":\"proc-macro2\",\"req\":\"^1\"},{\"name\":\"quote\",\"req\":\"^1\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"rstest\",\"req\":\"^0.19\"},{\"features\":[\"full\",\"extra-traits\"],\"name\":\"syn\",\"req\":\"^2\"}],\"features\":{\"unstable-test\":[]}}", + "defmt-parser_1.0.0": "{\"dependencies\":[{\"default_features\":false,\"kind\":\"dev\",\"name\":\"rstest\",\"req\":\"^0.19\"},{\"name\":\"thiserror\",\"req\":\"^2\"}],\"features\":{\"unstable\":[]}}", + "defmt_0.3.100": "{\"dependencies\":[{\"name\":\"defmt10\",\"package\":\"defmt\",\"req\":\"^1\"}],\"features\":{\"alloc\":[\"defmt10/alloc\"],\"avoid-default-panic\":[\"defmt10/avoid-default-panic\"],\"encoding-raw\":[\"defmt10/encoding-raw\"],\"encoding-rzcobs\":[\"defmt10/encoding-rzcobs\"],\"ip_in_core\":[\"defmt10/ip_in_core\"],\"unstable-test\":[\"defmt10/unstable-test\"]}}", + "defmt_1.1.1": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^1\"},{\"name\":\"defmt-macros\",\"req\":\"=1.1.1\"},{\"kind\":\"dev\",\"name\":\"rustc_version\",\"req\":\"^0.4\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1\"}],\"features\":{\"alloc\":[],\"avoid-default-panic\":[],\"encoding-raw\":[],\"encoding-rzcobs\":[],\"ip_in_core\":[],\"unstable-test\":[\"defmt-macros/unstable-test\"]}}", "deltae_0.3.2": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"clap\",\"req\":\"^4.2.1\"}],\"features\":{}}", "deno_core_icudata_0.77.0": "{\"dependencies\":[],\"features\":{}}", "der-parser_10.0.0": "{\"dependencies\":[{\"name\":\"asn1-rs\",\"req\":\"^0.7\"},{\"name\":\"bitvec\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"cookie-factory\",\"optional\":true,\"req\":\"^0.3.0\"},{\"default_features\":false,\"name\":\"displaydoc\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.4\"},{\"name\":\"nom\",\"req\":\"^7.0\"},{\"name\":\"num-bigint\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"num-traits\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0\"},{\"name\":\"rusticata-macros\",\"req\":\"^4.0\"},{\"kind\":\"dev\",\"name\":\"test-case\",\"req\":\"^3.0\"}],\"features\":{\"as_bitvec\":[\"bitvec\"],\"bigint\":[\"num-bigint\"],\"default\":[\"std\"],\"serialize\":[\"std\",\"cookie-factory\"],\"std\":[],\"unstable\":[]}}", @@ -1007,9 +1012,10 @@ "fancy-regex_0.11.0": "{\"dependencies\":[{\"name\":\"bit-set\",\"req\":\"^0.5\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"matches\",\"req\":\"^0.1.8\"},{\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1.0.1\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"regex\",\"req\":\"^1.3.8\"}],\"features\":{\"default\":[\"unicode\",\"perf\"],\"perf\":[\"regex/perf\"],\"perf-cache\":[\"regex/perf-cache\"],\"perf-dfa\":[\"regex/perf-dfa\"],\"perf-inline\":[\"regex/perf-inline\"],\"perf-literal\":[\"regex/perf-literal\"],\"track_caller\":[],\"unicode\":[\"regex/unicode\"]}}", "fancy-regex_0.16.2": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bit-set\",\"req\":\"^0.8\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.5\"},{\"kind\":\"dev\",\"name\":\"matches\",\"req\":\"^0.1.10\"},{\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"regex\",\"req\":\"^1.10\"},{\"default_features\":false,\"features\":[\"alloc\",\"syntax\",\"meta\",\"nfa\",\"dfa\",\"hybrid\"],\"name\":\"regex-automata\",\"req\":\"^0.4\"},{\"default_features\":false,\"name\":\"regex-syntax\",\"req\":\"^0.8\"}],\"features\":{\"default\":[\"unicode\",\"perf\",\"std\"],\"perf\":[\"regex-automata/perf\"],\"std\":[\"regex-automata/std\",\"regex-syntax/std\",\"bit-set/std\"],\"track_caller\":[],\"unicode\":[\"regex-automata/unicode\",\"regex-syntax/unicode\"]}}", "fast-srgb8_1.0.0": "{\"dependencies\":[],\"features\":{}}", - "faster-hex_0.10.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"bytes\",\"req\":\"^1.4.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.5\"},{\"name\":\"heapless\",\"req\":\"^0.8\",\"target\":\"cfg(not(feature = \\\"alloc\\\"))\"},{\"kind\":\"dev\",\"name\":\"hex\",\"req\":\"^0.3.2\"},{\"kind\":\"dev\",\"name\":\"proptest\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"rustc-hex\",\"req\":\"^1.0\"},{\"default_features\":false,\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"}],\"features\":{\"alloc\":[],\"default\":[\"std\",\"serde\"],\"serde\":[\"dep:serde\",\"alloc\"],\"std\":[\"alloc\",\"serde?/std\"]}}", + "faster-hex_0.10.1": "{\"dependencies\":[{\"kind\":\"build\",\"name\":\"autocfg\",\"req\":\"^1.5.1\"},{\"kind\":\"dev\",\"name\":\"bytes\",\"req\":\"^1.4.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.5\"},{\"name\":\"defmt\",\"optional\":true,\"req\":\"^0.3\"},{\"name\":\"heapless\",\"req\":\"^0.8\",\"target\":\"cfg(not(feature = \\\"alloc\\\"))\"},{\"kind\":\"dev\",\"name\":\"hex\",\"req\":\"^0.3.2\"},{\"kind\":\"dev\",\"name\":\"proptest\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"rustc-hex\",\"req\":\"^1.0\"},{\"default_features\":false,\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"}],\"features\":{\"alloc\":[\"defmt?/alloc\"],\"default\":[\"std\",\"serde\"],\"defmt-03\":[\"dep:defmt\"],\"serde\":[\"dep:serde\",\"alloc\"],\"std\":[\"alloc\",\"serde?/std\"]}}", "fastrand_2.3.0": "{\"dependencies\":[{\"features\":[\"js\"],\"name\":\"getrandom\",\"optional\":true,\"req\":\"^0.2\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"kind\":\"dev\",\"name\":\"getrandom\",\"req\":\"^0.2\"},{\"features\":[\"js\"],\"kind\":\"dev\",\"name\":\"getrandom\",\"req\":\"^0.2\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"},{\"kind\":\"dev\",\"name\":\"wasm-bindgen-test\",\"req\":\"^0.3\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"kind\":\"dev\",\"name\":\"wyhash\",\"req\":\"^0.5\"}],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"js\":[\"std\",\"getrandom\"],\"std\":[\"alloc\"]}}", "fastrand_2.4.1": "{\"dependencies\":[{\"features\":[\"wasm_js\"],\"name\":\"getrandom\",\"optional\":true,\"req\":\"^0.3.4\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"kind\":\"dev\",\"name\":\"getrandom\",\"req\":\"^0.3.4\"},{\"features\":[\"wasm_js\"],\"kind\":\"dev\",\"name\":\"getrandom\",\"req\":\"^0.3.4\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.9\"},{\"kind\":\"dev\",\"name\":\"wasm-bindgen-test\",\"req\":\"^0.3\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"kind\":\"dev\",\"name\":\"wyhash\",\"req\":\"^0.6\"}],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"js\":[\"std\",\"getrandom\"],\"std\":[\"alloc\"]}}", + "fastrand_2.5.0": "{\"dependencies\":[{\"features\":[\"wasm_js\"],\"name\":\"getrandom\",\"optional\":true,\"req\":\"^0.4\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"kind\":\"dev\",\"name\":\"getrandom\",\"req\":\"^0.4\"},{\"features\":[\"wasm_js\"],\"kind\":\"dev\",\"name\":\"getrandom\",\"req\":\"^0.4\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.10\"},{\"kind\":\"dev\",\"name\":\"wasm-bindgen-test\",\"req\":\"^0.3\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"kind\":\"dev\",\"name\":\"wyhash\",\"req\":\"^0.6\"}],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"js\":[\"std\",\"getrandom\"],\"std\":[\"alloc\"]}}", "fax_0.2.6": "{\"dependencies\":[{\"name\":\"fax_derive\",\"req\":\"^0.2.0\"},{\"kind\":\"dev\",\"name\":\"tiff\",\"req\":\"^0.9\"}],\"features\":{\"debug\":[]}}", "fax_derive_0.2.0": "{\"dependencies\":[{\"name\":\"proc-macro2\",\"req\":\"^1.0\"},{\"name\":\"quote\",\"req\":\"^1.0\"},{\"name\":\"syn\",\"req\":\"^2.0\"}],\"features\":{}}", "fd-lock_4.0.4": "{\"dependencies\":[{\"name\":\"cfg-if\",\"req\":\"^1.0.0\"},{\"features\":[\"fs\"],\"name\":\"rustix\",\"req\":\"^1.0.0\",\"target\":\"cfg(unix)\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.0.8\"},{\"features\":[\"Win32_Foundation\",\"Win32_Storage_FileSystem\",\"Win32_System_IO\"],\"name\":\"windows-sys\",\"req\":\">=0.52.0, <0.60.0\",\"target\":\"cfg(windows)\"}],\"features\":{}}", @@ -1094,59 +1100,49 @@ "git+https://github.com/openai-oss-forks/tungstenite-rs?rev=4fffad30fe373adbdcffab9545e9e9bf4f2fc19f#4fffad30fe373adbdcffab9545e9e9bf4f2fc19f_tungstenite": "{\"dependencies\":[{\"name\":\"bytes\",\"req\":\"1.9.0\"},{\"default_features\":true,\"features\":[],\"name\":\"data-encoding\",\"optional\":true,\"req\":\"2\"},{\"default_features\":false,\"features\":[\"zlib-rs\"],\"name\":\"flate2\",\"optional\":true,\"req\":\"1.1.0\"},{\"default_features\":true,\"features\":[],\"name\":\"headers\",\"optional\":true,\"req\":\"0.4.0\"},{\"default_features\":true,\"features\":[],\"name\":\"http\",\"optional\":true,\"req\":\"1.0\"},{\"default_features\":true,\"features\":[],\"name\":\"httparse\",\"optional\":true,\"req\":\"1.3.4\"},{\"name\":\"log\",\"req\":\"0.4.8\"},{\"default_features\":true,\"features\":[],\"name\":\"native-tls-crate\",\"optional\":true,\"package\":\"native-tls\",\"req\":\"0.2.3\"},{\"name\":\"rand\",\"req\":\"0.9.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"rustls\",\"optional\":true,\"req\":\"0.23.0\"},{\"default_features\":true,\"features\":[],\"name\":\"rustls-native-certs\",\"optional\":true,\"req\":\"0.8.0\"},{\"default_features\":true,\"features\":[],\"name\":\"rustls-pki-types\",\"optional\":true,\"req\":\"1.0\"},{\"default_features\":true,\"features\":[],\"name\":\"sha1\",\"optional\":true,\"req\":\"0.10\"},{\"name\":\"thiserror\",\"req\":\"2.0.7\"},{\"default_features\":true,\"features\":[],\"name\":\"url\",\"optional\":true,\"req\":\"2.1.0\"},{\"name\":\"utf-8\",\"req\":\"0.7.5\"},{\"default_features\":true,\"features\":[],\"name\":\"webpki-roots\",\"optional\":true,\"req\":\"0.26\"}],\"features\":{\"__rustls-tls\":[\"rustls\",\"rustls-pki-types\"],\"default\":[\"handshake\"],\"deflate\":[\"headers\",\"flate2\"],\"handshake\":[\"data-encoding\",\"headers\",\"httparse\",\"sha1\"],\"headers\":[\"http\",\"dep:headers\"],\"native-tls\":[\"native-tls-crate\"],\"native-tls-vendored\":[\"native-tls\",\"native-tls-crate/vendored\"],\"proxy\":[\"handshake\"],\"rustls-tls-native-roots\":[\"__rustls-tls\",\"rustls-native-certs\"],\"rustls-tls-webpki-roots\":[\"__rustls-tls\",\"webpki-roots\"],\"url\":[\"dep:url\"]},\"strip_prefix\":\"\"}", "git+https://github.com/rust-lang/rust-clippy?rev=21baba9c10c5d179915cae82e6247bc2337872fb#21baba9c10c5d179915cae82e6247bc2337872fb_clippy_utils": "{\"dependencies\":[{\"default_features\":false,\"features\":[],\"name\":\"arrayvec\",\"optional\":false,\"req\":\"0.7\"},{\"name\":\"itertools\",\"req\":\"0.15\"},{\"name\":\"rustc_apfloat\",\"req\":\"0.2.0\"}],\"features\":{},\"strip_prefix\":\"clippy_utils\"}", "git2_0.21.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2.1.0\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"clap\",\"req\":\"^4.4.13\"},{\"name\":\"libc\",\"req\":\"^0.2\"},{\"name\":\"libgit2-sys\",\"req\":\"^0.18.4\"},{\"name\":\"log\",\"req\":\"^0.4.8\"},{\"name\":\"openssl-probe\",\"optional\":true,\"req\":\"^0.1\",\"target\":\"cfg(all(unix, not(target_os = \\\"macos\\\")))\"},{\"name\":\"openssl-sys\",\"optional\":true,\"req\":\"^0.9.45\",\"target\":\"cfg(all(unix, not(target_os = \\\"macos\\\")))\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.1.0\"},{\"features\":[\"formatting\"],\"kind\":\"dev\",\"name\":\"time\",\"req\":\"^0.3.47\"},{\"name\":\"url\",\"optional\":true,\"req\":\"^2.5.4\"},{\"kind\":\"dev\",\"name\":\"url\",\"req\":\"^2.5.4\"}],\"features\":{\"cred\":[\"dep:url\"],\"default\":[],\"https\":[\"libgit2-sys/https\",\"openssl-sys\",\"openssl-probe\",\"cred\"],\"ssh\":[\"libgit2-sys/ssh\",\"cred\"],\"unstable\":[],\"unstable-sha256\":[\"libgit2-sys/unstable-sha256\"],\"vendored-libgit2\":[\"libgit2-sys/vendored\"],\"vendored-openssl\":[\"openssl-sys/vendored\",\"libgit2-sys/vendored-openssl\"],\"zlib-ng-compat\":[\"libgit2-sys/zlib-ng-compat\"]}}", - "gix-actor_0.40.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-date\",\"req\":\"^0.15.0\"},{\"name\":\"gix-error\",\"req\":\"^0.2.0\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"features\":[\"simd\"],\"name\":\"winnow\",\"req\":\"^0.7.14\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-date/serde\"]}}", - "gix-archive_0.30.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"features\":[\"zlib-rs\"],\"name\":\"flate2\",\"optional\":true,\"req\":\"^1.1.9\"},{\"name\":\"gix-date\",\"req\":\"^0.15.1\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"optional\":true,\"req\":\"^0.11.2\"},{\"name\":\"gix-worktree-stream\",\"req\":\"^0.30.0\"},{\"name\":\"rawzip\",\"optional\":true,\"req\":\"^0.4.3\"},{\"name\":\"tar\",\"optional\":true,\"req\":\"^0.4.38\"}],\"features\":{\"default\":[\"tar\",\"tar_gz\",\"zip\"],\"sha1\":[\"gix-worktree-stream/sha1\",\"gix-object/sha1\"],\"tar\":[\"dep:tar\",\"dep:gix-path\"],\"tar_gz\":[\"tar\",\"dep:flate2\"],\"zip\":[\"dep:rawzip\",\"dep:flate2\"]}}", - "gix-attributes_0.31.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"name\":\"gix-glob\",\"req\":\"^0.24.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.1\"},{\"name\":\"gix-quote\",\"req\":\"^0.7.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"name\":\"kstring\",\"req\":\"^2.0.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"},{\"name\":\"unicode-bom\",\"req\":\"^2.0.3\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-glob/serde\",\"kstring/serde\"]}}", - "gix-bitmap_0.3.0": "{\"dependencies\":[{\"name\":\"gix-error\",\"req\":\"^0.2.0\"}],\"features\":{}}", - "gix-blame_0.11.0": "{\"dependencies\":[{\"name\":\"gix-commitgraph\",\"req\":\"^0.35.0\"},{\"name\":\"gix-date\",\"req\":\"^0.15.1\"},{\"default_features\":false,\"features\":[\"blob\",\"blob-experimental\"],\"name\":\"gix-diff\",\"req\":\"^0.61.0\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-revwalk\",\"req\":\"^0.29.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"name\":\"gix-traverse\",\"req\":\"^0.55.0\"},{\"default_features\":false,\"features\":[\"attributes\"],\"name\":\"gix-worktree\",\"req\":\"^0.50.0\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.4.0\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-commitgraph/sha1\",\"gix-diff/sha1\",\"gix-hash/sha1\",\"gix-object/sha1\",\"gix-revwalk/sha1\",\"gix-traverse/sha1\",\"gix-worktree/sha1\"]}}", - "gix-chunk_0.7.0": "{\"dependencies\":[{\"name\":\"gix-error\",\"req\":\"^0.2.0\"}],\"features\":{}}", - "gix-command_0.8.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.1\"},{\"name\":\"gix-quote\",\"req\":\"^0.7.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"name\":\"shell-words\",\"req\":\"^1.1\"}],\"features\":{}}", - "gix-commitgraph_0.35.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-chunk\",\"req\":\"^0.7.0\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"memmap2\",\"req\":\"^0.9.10\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"bstr/serde\"],\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-config-value_0.17.1": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.1\"},{\"name\":\"libc\",\"req\":\"^0.2\",\"target\":\"cfg(not(windows))\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\"]}}", - "gix-config_0.54.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-config-value\",\"req\":\"^0.17.1\"},{\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-glob\",\"req\":\"^0.24.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-ref\",\"req\":\"^0.61.0\"},{\"name\":\"gix-sec\",\"req\":\"^0.13.2\"},{\"name\":\"memchr\",\"req\":\"^2\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"},{\"name\":\"unicode-bom\",\"req\":\"^2.0.3\"},{\"features\":[\"simd\"],\"name\":\"winnow\",\"req\":\"^0.7.14\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-sec/serde\",\"gix-ref/serde\",\"gix-glob/serde\",\"gix-config-value/serde\"],\"sha1\":[\"gix-ref/sha1\"]}}", - "gix-date_0.15.1": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"name\":\"itoa\",\"req\":\"^1.0.17\"},{\"name\":\"jiff\",\"req\":\"^0.2.21\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.4.1\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"features\":[\"write\"],\"name\":\"smallvec\",\"req\":\"^1.15.1\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\"]}}", - "gix-diff_0.61.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"features\":[\"js\"],\"name\":\"getrandom\",\"optional\":true,\"req\":\"^0.2.17\"},{\"name\":\"gix-attributes\",\"optional\":true,\"req\":\"^0.31.0\"},{\"name\":\"gix-command\",\"optional\":true,\"req\":\"^0.8.0\"},{\"name\":\"gix-filter\",\"optional\":true,\"req\":\"^0.28.0\"},{\"name\":\"gix-fs\",\"optional\":true,\"req\":\"^0.19.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-index\",\"optional\":true,\"req\":\"^0.49.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"optional\":true,\"req\":\"^0.11.2\"},{\"name\":\"gix-pathspec\",\"optional\":true,\"req\":\"^0.16.1\"},{\"name\":\"gix-tempfile\",\"optional\":true,\"req\":\"^21.0.0\"},{\"name\":\"gix-trace\",\"optional\":true,\"req\":\"^0.1.18\"},{\"name\":\"gix-traverse\",\"optional\":true,\"req\":\"^0.55.0\"},{\"default_features\":false,\"features\":[\"attributes\"],\"name\":\"gix-worktree\",\"optional\":true,\"req\":\"^0.50.0\"},{\"name\":\"imara-diff\",\"optional\":true,\"req\":\"^0.1.8\"},{\"name\":\"imara-diff-v2\",\"optional\":true,\"package\":\"imara-diff\",\"req\":\"^0.2.0\"},{\"kind\":\"dev\",\"name\":\"imara-diff-v2\",\"package\":\"imara-diff\",\"req\":\"^0.2.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"blob\":[\"dep:imara-diff\",\"dep:gix-filter\",\"dep:gix-worktree\",\"dep:gix-path\",\"dep:gix-fs\",\"dep:gix-command\",\"dep:gix-tempfile\",\"dep:gix-trace\",\"dep:gix-traverse\"],\"blob-experimental\":[\"dep:imara-diff-v2\"],\"default\":[\"blob\",\"index\"],\"index\":[\"dep:gix-index\",\"dep:gix-pathspec\",\"dep:gix-attributes\"],\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"gix-object/serde\",\"gix-index?/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"wasm\":[\"dep:getrandom\"]}}", - "gix-dir_0.23.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-discover\",\"req\":\"^0.49.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-ignore\",\"req\":\"^0.19.1\"},{\"name\":\"gix-index\",\"req\":\"^0.49.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-pathspec\",\"req\":\"^0.16.1\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"features\":[\"bstr\"],\"name\":\"gix-utils\",\"req\":\"^0.3.1\"},{\"default_features\":false,\"name\":\"gix-worktree\",\"req\":\"^0.50.0\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.4.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-discover/sha1\",\"gix-index/sha1\",\"gix-object/sha1\",\"gix-worktree/sha1\"]}}", - "gix-discover_0.49.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"defer\",\"req\":\"^0.2.1\",\"target\":\"cfg(target_os = \\\"macos\\\")\"},{\"name\":\"dunce\",\"req\":\"^1.0.3\",\"target\":\"cfg(windows)\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-ref\",\"req\":\"^0.61.0\"},{\"name\":\"gix-sec\",\"req\":\"^0.13.2\"},{\"kind\":\"dev\",\"name\":\"is_ci\",\"req\":\"^1.1.1\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"serial_test\",\"req\":\"^3.4.0\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\",\"target\":\"cfg(any(unix, windows))\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-ref/sha1\"]}}", - "gix-error_0.2.1": "{\"dependencies\":[{\"name\":\"anyhow\",\"optional\":true,\"req\":\"^1.0.102\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"}],\"features\":{\"anyhow\":[\"dep:anyhow\"],\"auto-chain-error\":[],\"tree-error\":[]}}", - "gix-features_0.46.2": "{\"dependencies\":[{\"default_features\":false,\"kind\":\"dev\",\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"bytes\",\"optional\":true,\"req\":\"^1.11.1\"},{\"name\":\"bytesize\",\"optional\":true,\"req\":\"^2.3.1\"},{\"name\":\"crc32fast\",\"optional\":true,\"req\":\"^1.5.0\"},{\"name\":\"crossbeam-channel\",\"optional\":true,\"req\":\"^0.5.15\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-path\",\"optional\":true,\"req\":\"^0.11.2\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"name\":\"gix-utils\",\"optional\":true,\"req\":\"^0.3.1\"},{\"name\":\"libc\",\"req\":\"^0.2.182\",\"target\":\"cfg(unix)\"},{\"name\":\"once_cell\",\"optional\":true,\"req\":\"^1.21.3\"},{\"default_features\":false,\"name\":\"parking_lot\",\"optional\":true,\"req\":\"^0.12.4\"},{\"name\":\"prodash\",\"optional\":true,\"req\":\"^31.0.0\"},{\"name\":\"thiserror\",\"optional\":true,\"req\":\"^2.0.18\"},{\"name\":\"walkdir\",\"optional\":true,\"req\":\"^2.3.2\"},{\"name\":\"zlib-rs\",\"optional\":true,\"req\":\"^0.6.2\"}],\"features\":{\"cache-efficiency-debug\":[],\"crc32\":[\"dep:crc32fast\"],\"default\":[],\"fs-read-dir\":[\"dep:gix-utils\"],\"io-pipe\":[\"dep:bytes\"],\"once_cell\":[\"dep:once_cell\"],\"parallel\":[\"dep:crossbeam-channel\",\"dep:parking_lot\"],\"progress\":[\"prodash\"],\"progress-unit-bytes\":[\"dep:bytesize\",\"prodash?/unit-bytes\"],\"progress-unit-human-numbers\":[\"prodash?/unit-human\"],\"tracing\":[\"gix-trace/tracing\"],\"tracing-detail\":[\"gix-trace/tracing-detail\"],\"walkdir\":[\"dep:walkdir\",\"dep:gix-path\",\"dep:gix-utils\"],\"zlib\":[\"dep:zlib-rs\",\"dep:thiserror\"]}}", - "gix-filter_0.28.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"encoding_rs\",\"req\":\"^0.8.32\"},{\"name\":\"gix-attributes\",\"req\":\"^0.31.0\"},{\"name\":\"gix-command\",\"req\":\"^0.8.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"features\":[\"blocking-io\"],\"name\":\"gix-packetline\",\"req\":\"^0.21.2\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-quote\",\"req\":\"^0.7.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"name\":\"gix-utils\",\"req\":\"^0.3.1\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"serial_test\",\"req\":\"^3.4.0\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\",\"gix-object/sha1\"]}}", - "gix-fs_0.19.2": "{\"dependencies\":[{\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"crossbeam-channel\",\"req\":\"^0.5.15\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"fastrand\",\"req\":\"^2.1.0\"},{\"features\":[\"fs-read-dir\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-utils\",\"req\":\"^0.3.1\"},{\"kind\":\"dev\",\"name\":\"is_ci\",\"req\":\"^1.1.1\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"serde\":[\"dep:serde\"]}}", - "gix-glob_0.24.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-features\",\"req\":\"^0.46.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"bitflags/serde\"]}}", - "gix-hash_0.23.0": "{\"dependencies\":[{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"faster-hex\",\"req\":\"^0.10.0\"},{\"features\":[\"progress\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"default_features\":false,\"name\":\"sha1-checked\",\"optional\":true,\"req\":\"^0.10.0\"},{\"default_features\":false,\"name\":\"sha2\",\"optional\":true,\"req\":\"^0.10.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"default\":[],\"serde\":[\"dep:serde\",\"faster-hex/serde\"],\"sha1\":[\"dep:sha1-checked\"],\"sha256\":[\"dep:sha2\"]}}", - "gix-hashtable_0.13.0": "{\"dependencies\":[{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"default_features\":false,\"features\":[\"inline-more\"],\"name\":\"hashbrown\",\"req\":\"^0.16.0\"},{\"name\":\"parking_lot\",\"req\":\"^0.12.4\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-ignore_0.19.1": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"name\":\"gix-glob\",\"req\":\"^0.24.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.16\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"unicode-bom\",\"req\":\"^2.0.3\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-glob/serde\"]}}", - "gix-index_0.49.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"filetime\",\"req\":\"^0.2.27\"},{\"name\":\"fnv\",\"req\":\"^1.0.7\"},{\"name\":\"gix-bitmap\",\"req\":\"^0.3.0\"},{\"features\":[\"progress\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-lock\",\"req\":\"^21.0.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-traverse\",\"req\":\"^0.55.0\"},{\"name\":\"gix-utils\",\"req\":\"^0.3.1\"},{\"name\":\"gix-validate\",\"req\":\"^0.11.0\"},{\"name\":\"hashbrown\",\"req\":\"^0.16.0\"},{\"name\":\"itoa\",\"req\":\"^1.0.17\"},{\"name\":\"libc\",\"req\":\"^0.2.182\",\"target\":\"cfg(not(windows))\"},{\"name\":\"memmap2\",\"req\":\"^0.9.10\"},{\"default_features\":false,\"features\":[\"std\",\"fs\"],\"name\":\"rustix\",\"req\":\"^1.1.2\",\"target\":\"cfg(not(windows))\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"serde\":[\"dep:serde\",\"smallvec/serde\",\"gix-hash/serde\"],\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-lock_21.0.2": "{\"dependencies\":[{\"default_features\":false,\"name\":\"gix-tempfile\",\"req\":\"^21.0.0\"},{\"default_features\":false,\"name\":\"gix-utils\",\"req\":\"^0.3.1\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{}}", - "gix-merge_0.14.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-command\",\"req\":\"^0.8.0\"},{\"default_features\":false,\"features\":[\"blob\"],\"name\":\"gix-diff\",\"req\":\"^0.61.0\"},{\"name\":\"gix-filter\",\"req\":\"^0.28.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-index\",\"req\":\"^0.49.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-quote\",\"req\":\"^0.7.0\"},{\"default_features\":false,\"features\":[\"merge_base\"],\"name\":\"gix-revision\",\"req\":\"^0.43.0\"},{\"name\":\"gix-revwalk\",\"req\":\"^0.29.0\"},{\"name\":\"gix-tempfile\",\"req\":\"^21.0.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"default_features\":false,\"features\":[\"attributes\"],\"name\":\"gix-worktree\",\"req\":\"^0.50.0\"},{\"name\":\"imara-diff\",\"req\":\"^0.1.8\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.4.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"kind\":\"dev\",\"name\":\"termtree\",\"req\":\"^1.0.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"gix-object/serde\"],\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-negotiate_0.29.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"name\":\"gix-commitgraph\",\"req\":\"^0.35.0\"},{\"name\":\"gix-date\",\"req\":\"^0.15.1\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-revwalk\",\"req\":\"^0.29.0\"}],\"features\":{\"sha1\":[\"gix-commitgraph/sha1\",\"gix-hash/sha1\",\"gix-object/sha1\",\"gix-revwalk/sha1\"]}}", - "gix-object_0.58.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-actor\",\"req\":\"^0.40.0\"},{\"name\":\"gix-date\",\"req\":\"^0.15.1\"},{\"features\":[\"progress\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.13.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-utils\",\"req\":\"^0.3.1\"},{\"name\":\"gix-validate\",\"req\":\"^0.11.0\"},{\"name\":\"itoa\",\"req\":\"^1.0.17\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"features\":[\"write\"],\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"kind\":\"dev\",\"name\":\"termtree\",\"req\":\"^1.0.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"},{\"features\":[\"simd\"],\"name\":\"winnow\",\"req\":\"^0.7.14\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"smallvec/serde\",\"gix-hash/serde\",\"gix-actor/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"verbose-object-parsing-errors\":[\"winnow/std\"]}}", - "gix-odb_0.78.0": "{\"dependencies\":[{\"name\":\"arc-swap\",\"req\":\"^1.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"features\":[\"walkdir\",\"zlib\",\"crc32\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.13.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"default_features\":false,\"name\":\"gix-pack\",\"req\":\"^0.68.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-quote\",\"req\":\"^0.7.0\"},{\"name\":\"parking_lot\",\"req\":\"^0.12.4\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"tempfile\",\"req\":\"^3.26.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"gix-object/serde\",\"gix-pack/serde\"],\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-pack_0.68.0": "{\"dependencies\":[{\"name\":\"clru\",\"optional\":true,\"req\":\"^0.6.1\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-chunk\",\"req\":\"^0.7.0\"},{\"default_features\":false,\"name\":\"gix-diff\",\"optional\":true,\"req\":\"^0.61.0\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"features\":[\"crc32\",\"progress\",\"zlib\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"features\":[\"sha256\"],\"kind\":\"dev\",\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-hashtable\",\"optional\":true,\"req\":\"^0.13.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"default_features\":false,\"name\":\"gix-tempfile\",\"optional\":true,\"req\":\"^21.0.0\",\"target\":\"cfg(not(target_arch = \\\"wasm32\\\"))\"},{\"name\":\"gix-traverse\",\"optional\":true,\"req\":\"^0.55.0\"},{\"name\":\"memmap2\",\"req\":\"^0.9.10\"},{\"default_features\":false,\"name\":\"parking_lot\",\"optional\":true,\"req\":\"^0.12.4\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"},{\"name\":\"uluru\",\"optional\":true,\"req\":\"^3.0.0\"}],\"features\":{\"default\":[\"generate\",\"streaming-input\"],\"generate\":[\"dep:gix-traverse\",\"dep:gix-diff\",\"dep:parking_lot\",\"dep:gix-hashtable\"],\"object-cache-dynamic\":[\"dep:clru\",\"dep:gix-hashtable\"],\"pack-cache-lru-dynamic\":[\"dep:clru\"],\"pack-cache-lru-static\":[\"dep:uluru\"],\"serde\":[\"dep:serde\",\"gix-object/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"streaming-input\":[\"dep:parking_lot\",\"dep:gix-tempfile\"],\"wasm\":[\"gix-diff?/wasm\"]}}", - "gix-packetline_0.21.2": "{\"dependencies\":[{\"features\":[\"attributes\"],\"kind\":\"dev\",\"name\":\"async-std\",\"req\":\"^1.9.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"faster-hex\",\"req\":\"^0.10.0\"},{\"name\":\"futures-io\",\"optional\":true,\"req\":\"^0.3.32\"},{\"name\":\"futures-lite\",\"optional\":true,\"req\":\"^2.1.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"kind\":\"dev\",\"name\":\"maybe-async\",\"req\":\"^0.2.6\"},{\"name\":\"pin-project-lite\",\"optional\":true,\"req\":\"^0.2.6\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"async-io\":[\"dep:futures-io\",\"futures-lite\",\"dep:pin-project-lite\"],\"blocking-io\":[],\"default\":[],\"serde\":[\"dep:serde\",\"bstr/serde\",\"faster-hex/serde\"]}}", - "gix-path_0.11.2": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"name\":\"gix-validate\",\"req\":\"^0.11.0\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"serial_test\",\"req\":\"^3.4.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"},{\"features\":[\"Win32_System_Com\",\"Win32_System_Threading\",\"Win32_UI_Shell\"],\"kind\":\"dev\",\"name\":\"windows\",\"req\":\"^0.62.1\",\"target\":\"cfg(windows)\"},{\"kind\":\"dev\",\"name\":\"winreg\",\"req\":\"^0.55.0\",\"target\":\"cfg(windows)\"}],\"features\":{}}", - "gix-pathspec_0.16.1": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-attributes\",\"req\":\"^0.31.0\"},{\"name\":\"gix-config-value\",\"req\":\"^0.17.1\"},{\"name\":\"gix-glob\",\"req\":\"^0.24.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"kind\":\"dev\",\"name\":\"serial_test\",\"req\":\"^3.4.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{}}", - "gix-protocol_0.59.0": "{\"dependencies\":[{\"features\":[\"attributes\"],\"kind\":\"dev\",\"name\":\"async-std\",\"req\":\"^1.9.0\"},{\"name\":\"async-trait\",\"optional\":true,\"req\":\"^0.1.51\"},{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"futures-io\",\"optional\":true,\"req\":\"^0.3.32\"},{\"name\":\"futures-lite\",\"optional\":true,\"req\":\"^2.1.0\"},{\"name\":\"gix-credentials\",\"optional\":true,\"req\":\"^0.37.1\"},{\"name\":\"gix-date\",\"req\":\"^0.15.1\"},{\"features\":[\"progress\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-lock\",\"optional\":true,\"req\":\"^21.0.0\"},{\"name\":\"gix-negotiate\",\"optional\":true,\"req\":\"^0.29.0\"},{\"name\":\"gix-object\",\"optional\":true,\"req\":\"^0.58.0\"},{\"kind\":\"dev\",\"name\":\"gix-packetline\",\"req\":\"^0.21.2\"},{\"name\":\"gix-ref\",\"req\":\"^0.61.0\"},{\"name\":\"gix-refspec\",\"optional\":true,\"req\":\"^0.39.0\"},{\"name\":\"gix-revwalk\",\"optional\":true,\"req\":\"^0.29.0\"},{\"name\":\"gix-shallow\",\"req\":\"^0.10.0\"},{\"name\":\"gix-trace\",\"optional\":true,\"req\":\"^0.1.18\"},{\"name\":\"gix-transport\",\"req\":\"^0.55.1\"},{\"name\":\"gix-utils\",\"req\":\"^0.3.1\"},{\"name\":\"maybe-async\",\"req\":\"^0.2.6\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"},{\"features\":[\"simd\"],\"name\":\"winnow\",\"req\":\"^0.7.14\"}],\"features\":{\"async-client\":[\"gix-transport/async-client\",\"dep:async-trait\",\"dep:futures-io\",\"futures-lite\",\"handshake\",\"fetch\"],\"blocking-client\":[\"gix-transport/blocking-client\",\"maybe-async/is_sync\",\"handshake\",\"fetch\"],\"fetch\":[\"dep:gix-negotiate\",\"dep:gix-object\",\"dep:gix-revwalk\",\"dep:gix-lock\",\"dep:gix-refspec\",\"dep:gix-trace\"],\"handshake\":[\"dep:gix-credentials\"],\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-transport/serde\",\"gix-hash/serde\",\"gix-shallow/serde\"],\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-quote_0.7.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-error\",\"req\":\"^0.2.0\"},{\"name\":\"gix-utils\",\"req\":\"^0.3.1\"}],\"features\":{}}", - "gix-ref_0.61.0": "{\"dependencies\":[{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"name\":\"gix-actor\",\"req\":\"^0.40.0\"},{\"features\":[\"walkdir\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-lock\",\"req\":\"^21.0.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"default_features\":false,\"name\":\"gix-tempfile\",\"req\":\"^21.0.0\"},{\"name\":\"gix-utils\",\"req\":\"^0.3.1\"},{\"name\":\"gix-validate\",\"req\":\"^0.11.0\"},{\"name\":\"memmap2\",\"req\":\"^0.9.10\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"},{\"features\":[\"simd\"],\"name\":\"winnow\",\"req\":\"^0.7.14\"}],\"features\":{\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"gix-actor/serde\",\"gix-object/serde\"],\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-refspec_0.39.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"name\":\"gix-glob\",\"req\":\"^0.24.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"default_features\":false,\"name\":\"gix-revision\",\"req\":\"^0.43.0\"},{\"name\":\"gix-validate\",\"req\":\"^0.11.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-revision_0.43.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"name\":\"gix-commitgraph\",\"req\":\"^0.35.0\"},{\"name\":\"gix-date\",\"req\":\"^0.15.1\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-hashtable\",\"optional\":true,\"req\":\"^0.13.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-revwalk\",\"req\":\"^0.29.0\"},{\"name\":\"gix-trace\",\"optional\":true,\"req\":\"^0.1.18\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"kind\":\"dev\",\"name\":\"permutohedron\",\"req\":\"^0.2.4\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"default\":[\"describe\",\"merge_base\"],\"describe\":[\"dep:gix-trace\",\"dep:gix-hashtable\"],\"merge_base\":[\"dep:gix-trace\",\"dep:bitflags\"],\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"gix-object/serde\"],\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-revwalk_0.29.0": "{\"dependencies\":[{\"name\":\"gix-commitgraph\",\"req\":\"^0.35.0\"},{\"name\":\"gix-date\",\"req\":\"^0.15.1\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.13.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-commitgraph/sha1\",\"gix-hash/sha1\",\"gix-hashtable/sha1\",\"gix-object/sha1\"]}}", - "gix-sec_0.13.2": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\",\"target\":\"cfg(windows)\"},{\"name\":\"libc\",\"req\":\"^0.2.182\",\"target\":\"cfg(not(windows))\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\"},{\"features\":[\"Win32_Foundation\",\"Win32_Security_Authorization\",\"Win32_Storage_FileSystem\",\"Win32_System_Memory\",\"Win32_System_Threading\"],\"name\":\"windows-sys\",\"req\":\"^0.61.1\",\"target\":\"cfg(windows)\"}],\"features\":{\"serde\":[\"dep:serde\",\"bitflags/serde\"]}}", - "gix-shallow_0.10.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-lock\",\"req\":\"^21.0.0\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"nonempty/serialize\"],\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-status_0.28.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"filetime\",\"req\":\"^0.2.27\"},{\"default_features\":false,\"features\":[\"blob\"],\"name\":\"gix-diff\",\"optional\":true,\"req\":\"^0.61.0\"},{\"name\":\"gix-dir\",\"optional\":true,\"req\":\"^0.23.0\"},{\"features\":[\"progress\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-filter\",\"req\":\"^0.28.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-index\",\"req\":\"^0.49.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-pathspec\",\"req\":\"^0.16.1\"},{\"default_features\":false,\"features\":[\"attributes\"],\"name\":\"gix-worktree\",\"req\":\"^0.50.0\"},{\"name\":\"portable-atomic\",\"req\":\"^1\",\"target\":\"cfg(not(target_has_atomic = \\\"64\\\"))\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"],\"worktree-rewrites\":[\"dep:gix-dir\",\"dep:gix-diff\"]}}", - "gix-submodule_0.28.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-config\",\"req\":\"^0.54.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-pathspec\",\"req\":\"^0.16.1\"},{\"name\":\"gix-refspec\",\"req\":\"^0.39.0\"},{\"name\":\"gix-url\",\"req\":\"^0.35.2\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-config/sha1\",\"gix-refspec/sha1\"]}}", - "gix-tempfile_21.0.2": "{\"dependencies\":[{\"name\":\"dashmap\",\"optional\":true,\"req\":\"^6.0.1\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"default_features\":false,\"name\":\"libc\",\"req\":\"^0.2.182\",\"target\":\"cfg(not(windows))\"},{\"name\":\"parking_lot\",\"req\":\"^0.12.4\"},{\"default_features\":false,\"name\":\"signal-hook\",\"optional\":true,\"req\":\"^0.4.3\"},{\"name\":\"signal-hook-registry\",\"optional\":true,\"req\":\"^1.4.8\"},{\"name\":\"tempfile\",\"req\":\"^3.26.0\"}],\"features\":{\"default\":[\"hp-hashmap\"],\"hp-hashmap\":[\"dep:dashmap\"],\"signals\":[\"dep:signal-hook\",\"dep:signal-hook-registry\"]}}", - "gix-trace_0.1.18": "{\"dependencies\":[{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"tracing\",\"optional\":true,\"req\":\"^0.1.44\"}],\"features\":{\"default\":[],\"tracing\":[\"dep:tracing\"],\"tracing-detail\":[]}}", - "gix-transport_0.55.1": "{\"dependencies\":[{\"name\":\"async-std\",\"optional\":true,\"req\":\"^1.12.0\"},{\"features\":[\"attributes\"],\"kind\":\"dev\",\"name\":\"async-std\",\"req\":\"^1.9.0\"},{\"name\":\"async-trait\",\"optional\":true,\"req\":\"^0.1.51\"},{\"name\":\"base64\",\"optional\":true,\"req\":\"^0.22.1\"},{\"kind\":\"dev\",\"name\":\"blocking\",\"req\":\"^1.6.2\"},{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"default_features\":false,\"name\":\"curl\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"futures-io\",\"optional\":true,\"req\":\"^0.3.32\"},{\"name\":\"futures-lite\",\"optional\":true,\"req\":\"^2.1.0\"},{\"name\":\"gix-command\",\"req\":\"^0.8.0\"},{\"name\":\"gix-credentials\",\"optional\":true,\"req\":\"^0.37.1\"},{\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-packetline\",\"req\":\"^0.21.2\"},{\"name\":\"gix-quote\",\"req\":\"^0.7.0\"},{\"name\":\"gix-sec\",\"req\":\"^0.13.2\"},{\"name\":\"gix-url\",\"req\":\"^0.35.2\"},{\"kind\":\"dev\",\"name\":\"maybe-async\",\"req\":\"^0.2.6\"},{\"name\":\"pin-project-lite\",\"optional\":true,\"req\":\"^0.2.6\"},{\"default_features\":false,\"features\":[\"blocking\",\"charset\",\"http2\"],\"name\":\"reqwest\",\"optional\":true,\"req\":\"^0.13.2\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"async-client\":[\"gix-packetline/async-io\",\"async-trait\",\"futures-lite\",\"futures-io\",\"pin-project-lite\"],\"blocking-client\":[\"gix-packetline/blocking-io\"],\"default\":[],\"http-client\":[\"base64\",\"gix-features/io-pipe\",\"blocking-client\",\"gix-credentials\"],\"http-client-curl\":[\"curl\",\"http-client\"],\"http-client-curl-openssl\":[\"http-client-curl\",\"curl/ssl\"],\"http-client-curl-rust-tls\":[\"http-client-curl\",\"curl/rustls\"],\"http-client-insecure-credentials\":[],\"http-client-reqwest\":[\"reqwest\",\"http-client\"],\"http-client-reqwest-native-tls\":[\"http-client-reqwest\",\"reqwest/native-tls\"],\"http-client-reqwest-rust-tls\":[\"http-client-reqwest\",\"reqwest/rustls\"],\"http-client-reqwest-rust-tls-trust-dns\":[\"http-client-reqwest\",\"reqwest/rustls\",\"reqwest/hickory-dns\"],\"serde\":[\"dep:serde\",\"bstr/serde\"]}}", - "gix-traverse_0.55.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"name\":\"gix-commitgraph\",\"req\":\"^0.35.0\"},{\"name\":\"gix-date\",\"req\":\"^0.15.1\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.13.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-revwalk\",\"req\":\"^0.29.0\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"]}}", - "gix-url_0.35.2": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"assert_matches\",\"req\":\"^1.5.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.1\"},{\"name\":\"percent-encoding\",\"req\":\"^2.3.1\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\"]}}", - "gix-utils_0.3.1": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"optional\":true,\"req\":\"^1.12.0\"},{\"name\":\"fastrand\",\"req\":\"^2.0.0\"},{\"default_features\":false,\"name\":\"unicode-normalization\",\"req\":\"^0.1.19\"}],\"features\":{\"bstr\":[\"dep:bstr\"]}}", - "gix-validate_0.11.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"}],\"features\":{}}", - "gix-worktree-state_0.28.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-filter\",\"req\":\"^0.28.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-index\",\"req\":\"^0.49.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"default_features\":false,\"features\":[\"attributes\"],\"name\":\"gix-worktree\",\"req\":\"^0.50.0\"},{\"name\":\"io-close\",\"req\":\"^0.3.7\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"}],\"features\":{\"sha1\":[\"gix-filter/sha1\",\"gix-index/sha1\",\"gix-object/sha1\",\"gix-worktree/sha1\"]}}", - "gix-worktree-stream_0.30.0": "{\"dependencies\":[{\"name\":\"gix-attributes\",\"req\":\"^0.31.0\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"features\":[\"progress\",\"io-pipe\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-filter\",\"req\":\"^0.28.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-traverse\",\"req\":\"^0.55.0\"},{\"name\":\"parking_lot\",\"req\":\"^0.12.4\"}],\"features\":{\"sha1\":[\"gix-filter/sha1\",\"gix-hash/sha1\",\"gix-object/sha1\",\"gix-traverse/sha1\"]}}", - "gix-worktree_0.50.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-attributes\",\"optional\":true,\"req\":\"^0.31.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-glob\",\"req\":\"^0.24.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-ignore\",\"req\":\"^0.19.1\"},{\"name\":\"gix-index\",\"req\":\"^0.49.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-validate\",\"optional\":true,\"req\":\"^0.11.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"attributes\":[\"dep:gix-attributes\",\"dep:gix-validate\"],\"default\":[\"attributes\"],\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-index/serde\",\"gix-hash/serde\",\"gix-object/serde\",\"gix-attributes?/serde\",\"gix-ignore/serde\"],\"sha1\":[\"gix-hash/sha1\"]}}", - "gix_0.81.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"anyhow\",\"req\":\"^1\"},{\"name\":\"async-std\",\"optional\":true,\"req\":\"^1.12.0\"},{\"features\":[\"attributes\"],\"kind\":\"dev\",\"name\":\"async-std\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-actor\",\"req\":\"^0.40.0\"},{\"default_features\":false,\"name\":\"gix-archive\",\"optional\":true,\"req\":\"^0.30.0\"},{\"name\":\"gix-attributes\",\"optional\":true,\"req\":\"^0.31.0\"},{\"name\":\"gix-blame\",\"optional\":true,\"req\":\"^0.11.0\"},{\"name\":\"gix-command\",\"optional\":true,\"req\":\"^0.8.0\"},{\"name\":\"gix-commitgraph\",\"req\":\"^0.35.0\"},{\"name\":\"gix-config\",\"req\":\"^0.54.0\"},{\"name\":\"gix-credentials\",\"optional\":true,\"req\":\"^0.37.1\"},{\"name\":\"gix-date\",\"req\":\"^0.15.1\"},{\"default_features\":false,\"name\":\"gix-diff\",\"req\":\"^0.61.0\"},{\"name\":\"gix-dir\",\"optional\":true,\"req\":\"^0.23.0\"},{\"name\":\"gix-discover\",\"req\":\"^0.49.0\"},{\"name\":\"gix-error\",\"req\":\"^0.2.1\"},{\"features\":[\"progress\",\"once_cell\"],\"name\":\"gix-features\",\"req\":\"^0.46.2\"},{\"name\":\"gix-filter\",\"optional\":true,\"req\":\"^0.28.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.19.2\"},{\"name\":\"gix-glob\",\"req\":\"^0.24.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"features\":[\"sha256\"],\"kind\":\"dev\",\"name\":\"gix-hash\",\"req\":\"^0.23.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.13.0\"},{\"name\":\"gix-ignore\",\"optional\":true,\"req\":\"^0.19.1\"},{\"name\":\"gix-index\",\"optional\":true,\"req\":\"^0.49.0\"},{\"name\":\"gix-lock\",\"req\":\"^21.0.0\"},{\"name\":\"gix-mailmap\",\"optional\":true,\"req\":\"^0.32.0\"},{\"default_features\":false,\"name\":\"gix-merge\",\"optional\":true,\"req\":\"^0.14.0\"},{\"name\":\"gix-negotiate\",\"optional\":true,\"req\":\"^0.29.0\"},{\"name\":\"gix-object\",\"req\":\"^0.58.0\"},{\"name\":\"gix-odb\",\"req\":\"^0.78.0\"},{\"default_features\":false,\"features\":[\"object-cache-dynamic\"],\"name\":\"gix-pack\",\"req\":\"^0.68.0\"},{\"name\":\"gix-path\",\"req\":\"^0.11.2\"},{\"name\":\"gix-pathspec\",\"optional\":true,\"req\":\"^0.16.1\"},{\"name\":\"gix-prompt\",\"optional\":true,\"req\":\"^0.14.1\"},{\"name\":\"gix-protocol\",\"req\":\"^0.59.0\"},{\"name\":\"gix-ref\",\"req\":\"^0.61.0\"},{\"name\":\"gix-refspec\",\"req\":\"^0.39.0\"},{\"default_features\":false,\"name\":\"gix-revision\",\"req\":\"^0.43.0\"},{\"name\":\"gix-revwalk\",\"req\":\"^0.29.0\"},{\"name\":\"gix-sec\",\"req\":\"^0.13.2\"},{\"name\":\"gix-shallow\",\"req\":\"^0.10.0\"},{\"features\":[\"worktree-rewrites\"],\"name\":\"gix-status\",\"optional\":true,\"req\":\"^0.28.0\"},{\"name\":\"gix-submodule\",\"optional\":true,\"req\":\"^0.28.0\"},{\"default_features\":false,\"name\":\"gix-tempfile\",\"req\":\"^21.0.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.1.18\"},{\"name\":\"gix-transport\",\"optional\":true,\"req\":\"^0.55.1\"},{\"name\":\"gix-traverse\",\"req\":\"^0.55.0\"},{\"name\":\"gix-url\",\"req\":\"^0.35.2\"},{\"name\":\"gix-utils\",\"req\":\"^0.3.1\"},{\"name\":\"gix-validate\",\"req\":\"^0.11.0\"},{\"default_features\":false,\"name\":\"gix-worktree\",\"optional\":true,\"req\":\"^0.50.0\"},{\"name\":\"gix-worktree-state\",\"optional\":true,\"req\":\"^0.28.0\"},{\"name\":\"gix-worktree-stream\",\"optional\":true,\"req\":\"^0.30.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"is_ci\",\"req\":\"^1.1.1\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"name\":\"parking_lot\",\"optional\":true,\"req\":\"^0.12.4\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.4.0\"},{\"features\":[\"progress-tree\"],\"name\":\"prodash\",\"optional\":true,\"req\":\"^31.0.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"regex\",\"optional\":true,\"req\":\"^1.12.3\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"serial_test\",\"req\":\"^3.4.0\"},{\"default_features\":false,\"name\":\"signal-hook\",\"optional\":true,\"req\":\"^0.4.3\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"kind\":\"dev\",\"name\":\"termtree\",\"req\":\"^1.0.0\"},{\"name\":\"thiserror\",\"req\":\"^2.0.18\"},{\"kind\":\"dev\",\"name\":\"walkdir\",\"req\":\"^2.3.2\"}],\"features\":{\"async-network-client\":[\"gix-protocol/async-client\",\"gix-pack/streaming-input\",\"dep:gix-transport\",\"attributes\",\"credentials\"],\"async-network-client-async-std\":[\"async-std\",\"async-network-client\",\"gix-transport/async-std\"],\"attributes\":[\"excludes\",\"dep:gix-filter\",\"dep:gix-pathspec\",\"dep:gix-attributes\",\"dep:gix-submodule\",\"gix-worktree?/attributes\",\"command\"],\"auto-chain-error\":[\"gix-error/auto-chain-error\"],\"basic\":[\"blob-diff\",\"revision\",\"index\"],\"blame\":[\"dep:gix-blame\",\"blob-diff\"],\"blob-diff\":[\"gix-diff/blob\",\"attributes\"],\"blocking-http-transport-curl\":[\"blocking-network-client\",\"gix-transport/http-client-curl\"],\"blocking-http-transport-curl-openssl\":[\"blocking-http-transport-curl\",\"gix-transport/http-client-curl-openssl\"],\"blocking-http-transport-curl-rustls\":[\"blocking-http-transport-curl\",\"gix-transport/http-client-curl-rust-tls\"],\"blocking-http-transport-reqwest\":[\"blocking-network-client\",\"gix-transport/http-client-reqwest\"],\"blocking-http-transport-reqwest-native-tls\":[\"blocking-http-transport-reqwest\",\"gix-transport/http-client-reqwest-native-tls\"],\"blocking-http-transport-reqwest-rust-tls\":[\"blocking-http-transport-reqwest\",\"gix-transport/http-client-reqwest-rust-tls\"],\"blocking-http-transport-reqwest-rust-tls-trust-dns\":[\"blocking-http-transport-reqwest\",\"gix-transport/http-client-reqwest-rust-tls-trust-dns\"],\"blocking-network-client\":[\"gix-protocol/blocking-client\",\"gix-pack/streaming-input\",\"dep:gix-transport\",\"attributes\",\"credentials\"],\"cache-efficiency-debug\":[\"gix-features/cache-efficiency-debug\"],\"comfort\":[\"gix-features/progress-unit-bytes\",\"gix-features/progress-unit-human-numbers\"],\"command\":[\"dep:gix-command\"],\"credentials\":[\"dep:gix-credentials\",\"dep:gix-prompt\",\"dep:gix-negotiate\"],\"default\":[\"max-performance-safe\",\"comfort\",\"basic\",\"extras\",\"auto-chain-error\",\"sha1\"],\"dirwalk\":[\"dep:gix-dir\",\"attributes\",\"excludes\"],\"excludes\":[\"dep:gix-ignore\",\"dep:gix-worktree\",\"index\"],\"extras\":[\"worktree-stream\",\"worktree-archive\",\"revparse-regex\",\"mailmap\",\"excludes\",\"attributes\",\"worktree-mutation\",\"credentials\",\"interrupt\",\"status\",\"dirwalk\",\"blame\"],\"hp-tempfile-registry\":[\"gix-tempfile/hp-hashmap\"],\"index\":[\"dep:gix-index\"],\"interrupt\":[\"dep:signal-hook\",\"gix-tempfile/signals\",\"dep:parking_lot\"],\"mailmap\":[\"dep:gix-mailmap\",\"revision\"],\"max-control\":[\"parallel\",\"pack-cache-lru-static\",\"pack-cache-lru-dynamic\"],\"max-performance\":[\"max-performance-safe\"],\"max-performance-safe\":[\"max-control\"],\"merge\":[\"tree-editor\",\"blob-diff\",\"dep:gix-merge\",\"attributes\"],\"need-more-recent-msrv\":[\"merge\",\"tree-editor\"],\"pack-cache-lru-dynamic\":[\"gix-pack/pack-cache-lru-dynamic\"],\"pack-cache-lru-static\":[\"gix-pack/pack-cache-lru-static\"],\"parallel\":[\"gix-features/parallel\"],\"progress-tree\":[\"prodash/progress-tree\"],\"revision\":[\"gix-revision/describe\",\"gix-revision/merge_base\",\"index\"],\"revparse-regex\":[\"regex\",\"revision\"],\"serde\":[\"dep:serde\",\"gix-pack/serde\",\"gix-object/serde\",\"gix-protocol/serde\",\"gix-transport?/serde\",\"gix-ref/serde\",\"gix-odb/serde\",\"gix-index?/serde\",\"gix-mailmap?/serde\",\"gix-url/serde\",\"gix-attributes?/serde\",\"gix-ignore?/serde\",\"gix-revision/serde\",\"gix-worktree?/serde\",\"gix-commitgraph/serde\",\"gix-credentials?/serde\"],\"sha1\":[\"gix-archive?/sha1\",\"gix-blame?/sha1\",\"gix-commitgraph/sha1\",\"gix-config/sha1\",\"gix-diff/sha1\",\"gix-dir?/sha1\",\"gix-discover/sha1\",\"gix-filter?/sha1\",\"gix-hash/sha1\",\"gix-hashtable/sha1\",\"gix-index?/sha1\",\"gix-merge?/sha1\",\"gix-negotiate?/sha1\",\"gix-object/sha1\",\"gix-odb/sha1\",\"gix-pack/sha1\",\"gix-protocol/sha1\",\"gix-ref/sha1\",\"gix-refspec/sha1\",\"gix-revision/sha1\",\"gix-revwalk/sha1\",\"gix-shallow/sha1\",\"gix-status?/sha1\",\"gix-submodule?/sha1\",\"gix-traverse/sha1\",\"gix-worktree?/sha1\",\"gix-worktree-state?/sha1\",\"gix-worktree-stream?/sha1\"],\"status\":[\"gix-status\",\"dirwalk\",\"index\",\"blob-diff\",\"gix-diff/index\"],\"tracing\":[\"gix-features/tracing\"],\"tracing-detail\":[\"gix-features/tracing-detail\",\"tracing\"],\"tree-editor\":[],\"tree-error\":[\"gix-error/tree-error\"],\"verbose-object-parsing-errors\":[\"gix-object/verbose-object-parsing-errors\"],\"worktree-archive\":[\"gix-archive\",\"worktree-stream\",\"attributes\"],\"worktree-mutation\":[\"attributes\",\"dep:gix-worktree-state\"],\"worktree-stream\":[\"gix-worktree-stream\",\"attributes\"],\"zlib-ng\":[\"gix-features/zlib\"],\"zlib-ng-compat\":[\"gix-features/zlib\"],\"zlib-rs\":[\"gix-features/zlib\"],\"zlib-stock\":[\"gix-features/zlib\"]}}", + "gix-actor_0.44.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-date\",\"req\":\"^0.18.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-date/serde\"]}}", + "gix-attributes_0.37.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-glob\",\"req\":\"^0.29.0\"},{\"name\":\"gix-parallel\",\"req\":\"^0.50.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-quote\",\"req\":\"^0.10.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"unicode-bom\",\"req\":\"^2.0.3\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-glob/serde\"]}}", + "gix-chunk_0.10.0": "{\"dependencies\":[{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"}],\"features\":{}}", + "gix-command_0.12.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-quote\",\"req\":\"^0.10.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"}],\"features\":{}}", + "gix-commitgraph_0.41.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-chunk\",\"req\":\"^0.10.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"memmap2\",\"req\":\"^0.9.11\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"bstr/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-config-value_0.21.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"libc\",\"req\":\"^0.2\",\"target\":\"cfg(not(windows))\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\"]}}", + "gix-config_0.62.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"bytesize\",\"req\":\"^2.3.1\"},{\"features\":[\"stats\"],\"kind\":\"dev\",\"name\":\"cap\",\"req\":\"^0.1.2\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-config-value\",\"req\":\"^0.21.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-glob\",\"req\":\"^0.29.0\"},{\"name\":\"gix-parallel\",\"req\":\"^0.50.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-ref\",\"req\":\"^0.69.0\"},{\"name\":\"gix-sec\",\"req\":\"^0.16.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"serial_test\",\"req\":\"^3.4.0\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"unicode-bom\",\"req\":\"^2.0.3\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-sec/serde\",\"gix-ref/serde\",\"gix-glob/serde\",\"gix-config-value/serde\"],\"sha1\":[\"gix-ref/sha1\"],\"sha256\":[\"gix-ref/sha256\"]}}", + "gix-date_0.18.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"itoa\",\"req\":\"^1.0.17\"},{\"name\":\"jiff\",\"req\":\"^0.2.25\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.4.1\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\"]}}", + "gix-diff_0.69.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"features\":[\"wasm_js\"],\"name\":\"getrandom\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"gix-attributes\",\"optional\":true,\"req\":\"^0.37.0\"},{\"name\":\"gix-command\",\"optional\":true,\"req\":\"^0.12.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-filter\",\"optional\":true,\"req\":\"^0.36.0\"},{\"name\":\"gix-fs\",\"optional\":true,\"req\":\"^0.24.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-index\",\"optional\":true,\"req\":\"^0.57.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"name\":\"gix-path\",\"optional\":true,\"req\":\"^0.14.0\"},{\"name\":\"gix-pathspec\",\"optional\":true,\"req\":\"^0.22.0\"},{\"name\":\"gix-tempfile\",\"optional\":true,\"req\":\"^26.0.0\"},{\"name\":\"gix-trace\",\"optional\":true,\"req\":\"^0.3.0\"},{\"name\":\"gix-traverse\",\"optional\":true,\"req\":\"^0.63.0\"},{\"default_features\":false,\"features\":[\"attributes\"],\"name\":\"gix-worktree\",\"optional\":true,\"req\":\"^0.58.0\"},{\"name\":\"imara-diff\",\"optional\":true,\"package\":\"gix-imara-diff\",\"req\":\"^0.3.1\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.4.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"blob\":[\"dep:imara-diff\",\"dep:gix-filter\",\"dep:gix-worktree\",\"dep:gix-path\",\"dep:gix-fs\",\"dep:gix-command\",\"dep:gix-tempfile\",\"dep:gix-trace\",\"dep:gix-traverse\"],\"default\":[\"blob\",\"index\"],\"index\":[\"dep:gix-index\",\"dep:gix-pathspec\",\"dep:gix-attributes\"],\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"gix-object/serde\",\"gix-index?/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"],\"wasm\":[\"dep:getrandom\"]}}", + "gix-discover_0.57.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"defer\",\"req\":\"^0.2.1\",\"target\":\"cfg(target_os = \\\"macos\\\")\"},{\"name\":\"dunce\",\"req\":\"^1.0.3\",\"target\":\"cfg(windows)\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.24.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-ref\",\"req\":\"^0.69.0\"},{\"name\":\"gix-sec\",\"req\":\"^0.16.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"is_ci\",\"req\":\"^1.1.1\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"serial_test\",\"req\":\"^3.4.0\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\",\"target\":\"cfg(any(unix, windows))\"}],\"features\":{\"sha1\":[\"gix-ref/sha1\"],\"sha256\":[\"gix-ref/sha256\"]}}", + "gix-error_0.5.0": "{\"dependencies\":[{\"name\":\"anyhow\",\"optional\":true,\"req\":\"^1.0.102\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"optional\":true,\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"}],\"features\":{\"anyhow\":[\"dep:anyhow\"],\"auto-chain-error\":[],\"bstr\":[\"dep:bstr\"],\"error-print-location\":[],\"tree-error\":[]}}", + "gix-filter_0.36.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"encoding_rs\",\"req\":\"^0.8.32\"},{\"name\":\"gix-attributes\",\"req\":\"^0.37.0\"},{\"name\":\"gix-command\",\"req\":\"^0.12.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"features\":[\"blocking-io\"],\"name\":\"gix-packetline\",\"req\":\"^0.24.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-quote\",\"req\":\"^0.10.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"],\"test-helper\":[\"gix-error/error-print-location\"]}}", + "gix-fs_0.24.0": "{\"dependencies\":[{\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"crossbeam-channel\",\"req\":\"^0.5.15\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-parallel\",\"req\":\"^0.50.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"is_ci\",\"req\":\"^1.1.1\"},{\"name\":\"libc\",\"req\":\"^0.2.186\",\"target\":\"cfg(unix)\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\"},{\"name\":\"walkdir\",\"optional\":true,\"req\":\"^2.3.2\"}],\"features\":{\"serde\":[\"dep:serde\"],\"walkdir\":[\"dep:walkdir\"]}}", + "gix-glob_0.29.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.24.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"bitflags/serde\"]}}", + "gix-hash_0.28.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"bstr\",\"optional\":true,\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"faster-hex\",\"req\":\"^0.10.1\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"features\":[\"progress\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"sha1dc\",\"optional\":true,\"req\":\"^0.1.3\"},{\"default_features\":false,\"name\":\"sha2\",\"optional\":true,\"req\":\"^0.11.0\"}],\"features\":{\"bstr\":[\"dep:bstr\"],\"default\":[],\"serde\":[\"dep:serde\",\"faster-hex/serde\"],\"sha1\":[\"dep:sha1dc\"],\"sha256\":[\"dep:sha2\"]}}", + "gix-hashtable_0.18.0": "{\"dependencies\":[{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"default_features\":false,\"features\":[\"inline-more\"],\"name\":\"hashbrown\",\"req\":\"^0.17.1\"},{\"name\":\"parking_lot\",\"req\":\"^0.12.4\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-lock_26.0.0": "{\"dependencies\":[{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.24.0\"},{\"default_features\":false,\"name\":\"gix-tempfile\",\"req\":\"^26.0.0\"},{\"default_features\":false,\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"features\":[\"filters\"],\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\"}],\"features\":{}}", + "gix-macros_0.2.0": "{\"dependencies\":[{\"name\":\"proc-macro2\",\"req\":\"^1.0\"},{\"name\":\"quote\",\"req\":\"^1.0\"},{\"features\":[\"full\",\"fold\"],\"name\":\"syn\",\"req\":\"^2.0\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0\"}],\"features\":{}}", + "gix-note_0.3.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\",\"gix-object/sha1\"],\"sha256\":[\"gix-hash/sha256\",\"gix-object/sha256\"]}}", + "gix-object_0.66.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-actor\",\"req\":\"^0.44.0\"},{\"name\":\"gix-command\",\"optional\":true,\"req\":\"^0.12.0\"},{\"name\":\"gix-date\",\"req\":\"^0.18.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.18.0\"},{\"name\":\"gix-path\",\"optional\":true,\"req\":\"^0.14.0\"},{\"name\":\"gix-tempfile\",\"optional\":true,\"req\":\"^26.0.0\"},{\"features\":[\"progress\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"name\":\"gix-validate\",\"req\":\"^0.13.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"itoa\",\"req\":\"^1.0.17\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"features\":[\"write\"],\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"kind\":\"dev\",\"name\":\"termtree\",\"req\":\"^1.0.0\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"smallvec/serde\",\"gix-hash/serde\",\"gix-actor/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"],\"signature\":[\"dep:gix-command\",\"dep:gix-path\",\"dep:gix-tempfile\"]}}", + "gix-odb_0.86.0": "{\"dependencies\":[{\"name\":\"arc-swap\",\"req\":\"^1.9.0\"},{\"name\":\"crc32fast\",\"req\":\"^1.5.0\"},{\"kind\":\"dev\",\"name\":\"crossbeam-channel\",\"req\":\"^0.5.15\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"kind\":\"dev\",\"name\":\"filetime\",\"req\":\"^0.2.29\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"features\":[\"walkdir\"],\"name\":\"gix-fs\",\"req\":\"^0.24.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.18.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"default_features\":false,\"name\":\"gix-pack\",\"req\":\"^0.76.0\"},{\"name\":\"gix-parallel\",\"req\":\"^0.50.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-quote\",\"req\":\"^0.10.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"features\":[\"progress\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"name\":\"gix-zlib\",\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"maplit\",\"req\":\"^1.0.2\"},{\"name\":\"memmap2\",\"req\":\"^0.9.11\"},{\"name\":\"parking_lot\",\"req\":\"^0.12.4\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"tempfile\",\"req\":\"^3.26.0\"}],\"features\":{\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"gix-object/serde\",\"gix-pack/serde\"],\"sha1\":[\"gix-hash/sha1\",\"gix-pack/sha1\"],\"sha256\":[\"gix-hash/sha256\",\"gix-pack/sha256\"]}}", + "gix-pack_0.76.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"kind\":\"dev\",\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"clru\",\"optional\":true,\"req\":\"^0.6.1\"},{\"name\":\"crc32fast\",\"req\":\"^1.5.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"crossbeam-deque\",\"optional\":true,\"req\":\"^0.8.6\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-chunk\",\"req\":\"^0.10.0\"},{\"default_features\":false,\"name\":\"gix-diff\",\"optional\":true,\"req\":\"^0.69.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-hashtable\",\"optional\":true,\"req\":\"^0.18.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"name\":\"gix-parallel\",\"req\":\"^0.50.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"default_features\":false,\"name\":\"gix-tempfile\",\"optional\":true,\"req\":\"^26.0.0\",\"target\":\"cfg(not(target_arch = \\\"wasm32\\\"))\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"name\":\"gix-traverse\",\"optional\":true,\"req\":\"^0.63.0\"},{\"features\":[\"interrupt\",\"progress\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"name\":\"gix-zlib\",\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"maplit\",\"req\":\"^1.0.2\"},{\"name\":\"memmap2\",\"req\":\"^0.9.11\"},{\"default_features\":false,\"name\":\"parking_lot\",\"optional\":true,\"req\":\"^0.12.4\"},{\"features\":[\"progress-log\"],\"kind\":\"dev\",\"name\":\"prodash\",\"req\":\"^31.0.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"uluru\",\"optional\":true,\"req\":\"^3.0.0\"}],\"features\":{\"default\":[\"generate\",\"streaming-input\"],\"generate\":[\"dep:gix-traverse\",\"dep:gix-diff\",\"dep:parking_lot\",\"dep:gix-hashtable\"],\"object-cache-dynamic\":[\"dep:clru\",\"dep:gix-hashtable\"],\"pack-cache-lru-dynamic\":[\"dep:clru\"],\"pack-cache-lru-static\":[\"dep:uluru\"],\"parallel\":[\"gix-parallel/parallel\",\"dep:crossbeam-deque\"],\"serde\":[\"dep:serde\",\"gix-object/serde\",\"gix-zlib/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"],\"streaming-input\":[\"dep:parking_lot\",\"dep:gix-tempfile\"],\"testing\":[],\"wasm\":[\"gix-diff?/wasm\"]}}", + "gix-packetline_0.24.0": "{\"dependencies\":[{\"features\":[\"attributes\"],\"kind\":\"dev\",\"name\":\"async-std\",\"req\":\"^1.9.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"faster-hex\",\"req\":\"^0.10.1\"},{\"name\":\"futures-io\",\"optional\":true,\"req\":\"^0.3.32\"},{\"name\":\"futures-lite\",\"optional\":true,\"req\":\"^2.1.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"pin-project-lite\",\"optional\":true,\"req\":\"^0.2.6\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"async-io\":[\"dep:futures-io\",\"futures-lite\",\"dep:pin-project-lite\"],\"blocking-io\":[],\"default\":[],\"serde\":[\"dep:serde\",\"bstr/serde\",\"faster-hex/serde\"]}}", + "gix-parallel_0.50.0": "{\"dependencies\":[{\"name\":\"crossbeam-channel\",\"optional\":true,\"req\":\"^0.5.15\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"once_cell\",\"optional\":true,\"req\":\"^1.21.3\"},{\"default_features\":false,\"name\":\"parking_lot\",\"optional\":true,\"req\":\"^0.12.4\"},{\"default_features\":false,\"features\":[\"registry\"],\"kind\":\"dev\",\"name\":\"tracing-subscriber\",\"req\":\"^0.3.22\"}],\"features\":{\"default\":[],\"once_cell\":[\"dep:once_cell\"],\"parallel\":[\"dep:crossbeam-channel\",\"dep:parking_lot\"]}}", + "gix-path_0.14.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"name\":\"gix-validate\",\"req\":\"^0.13.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"serial_test\",\"req\":\"^3.4.0\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\"},{\"features\":[\"Win32_System_Com\",\"Win32_System_Threading\",\"Win32_UI_Shell\"],\"kind\":\"dev\",\"name\":\"windows\",\"req\":\"^0.62.1\",\"target\":\"cfg(windows)\"},{\"kind\":\"dev\",\"name\":\"winreg\",\"req\":\"^0.56.0\",\"target\":\"cfg(windows)\"}],\"features\":{}}", + "gix-protocol_0.67.0": "{\"dependencies\":[{\"features\":[\"attributes\"],\"kind\":\"dev\",\"name\":\"async-std\",\"req\":\"^1.9.0\"},{\"name\":\"async-trait\",\"optional\":true,\"req\":\"^0.1.51\"},{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"futures-io\",\"optional\":true,\"req\":\"^0.3.32\"},{\"name\":\"futures-lite\",\"optional\":true,\"req\":\"^2.1.0\"},{\"name\":\"gix-credentials\",\"optional\":true,\"req\":\"^0.42.0\"},{\"name\":\"gix-date\",\"req\":\"^0.18.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-lock\",\"optional\":true,\"req\":\"^26.0.0\"},{\"name\":\"gix-macros\",\"req\":\"^0.2.0\"},{\"name\":\"gix-negotiate\",\"optional\":true,\"req\":\"^0.37.0\"},{\"name\":\"gix-object\",\"optional\":true,\"req\":\"^0.66.0\"},{\"kind\":\"dev\",\"name\":\"gix-packetline\",\"req\":\"^0.24.0\"},{\"name\":\"gix-ref\",\"req\":\"^0.69.0\"},{\"name\":\"gix-refspec\",\"optional\":true,\"req\":\"^0.47.0\"},{\"name\":\"gix-revwalk\",\"optional\":true,\"req\":\"^0.37.0\"},{\"name\":\"gix-shallow\",\"req\":\"^0.15.0\"},{\"name\":\"gix-trace\",\"optional\":true,\"req\":\"^0.3.0\"},{\"name\":\"gix-transport\",\"req\":\"^0.61.0\"},{\"features\":[\"progress\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"async-client\":[\"gix-transport/async-client\",\"dep:async-trait\",\"dep:futures-io\",\"futures-lite\",\"handshake\",\"fetch\"],\"blocking-client\":[\"gix-transport/blocking-client\",\"handshake\",\"fetch\"],\"fetch\":[\"dep:gix-negotiate\",\"dep:gix-object\",\"dep:gix-revwalk\",\"dep:gix-lock\",\"dep:gix-refspec\",\"dep:gix-trace\"],\"handshake\":[\"dep:gix-credentials\"],\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-transport/serde\",\"gix-hash/serde\",\"gix-shallow/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-quote_0.10.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-utils\",\"req\":\"^0.5.0\"}],\"features\":{}}", + "gix-ref_0.69.0": "{\"dependencies\":[{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"name\":\"gix-actor\",\"req\":\"^0.44.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"features\":[\"walkdir\"],\"name\":\"gix-fs\",\"req\":\"^0.24.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-lock\",\"req\":\"^26.0.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"name\":\"gix-parallel\",\"req\":\"^0.50.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"default_features\":false,\"name\":\"gix-tempfile\",\"req\":\"^26.0.0\"},{\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"name\":\"gix-validate\",\"req\":\"^0.13.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"libc\",\"req\":\"^0.2.186\",\"target\":\"cfg(unix)\"},{\"name\":\"memmap2\",\"req\":\"^0.9.11\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"gix-actor/serde\",\"gix-object/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-refspec_0.47.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-validate\",\"req\":\"^0.13.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-revision_0.51.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"name\":\"gix-commitgraph\",\"req\":\"^0.41.0\"},{\"name\":\"gix-date\",\"req\":\"^0.18.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-hashtable\",\"optional\":true,\"req\":\"^0.18.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"name\":\"gix-revwalk\",\"req\":\"^0.37.0\"},{\"name\":\"gix-trace\",\"optional\":true,\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"kind\":\"dev\",\"name\":\"permutohedron\",\"req\":\"^0.2.4\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"default\":[\"describe\",\"merge_base\"],\"describe\":[\"dep:gix-trace\",\"dep:gix-hashtable\"],\"merge_base\":[\"dep:gix-trace\",\"dep:bitflags\"],\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"gix-object/serde\"],\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-revwalk_0.37.0": "{\"dependencies\":[{\"name\":\"gix-commitgraph\",\"req\":\"^0.41.0\"},{\"name\":\"gix-date\",\"req\":\"^0.18.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.18.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-sec_0.16.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\",\"target\":\"cfg(windows)\"},{\"name\":\"libc\",\"req\":\"^0.2.186\",\"target\":\"cfg(not(windows))\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\"},{\"features\":[\"Win32_Foundation\",\"Win32_Security_Authorization\",\"Win32_Storage_FileSystem\",\"Win32_System_Memory\",\"Win32_System_Threading\"],\"name\":\"windows-sys\",\"req\":\"^0.61.1\",\"target\":\"cfg(windows)\"}],\"features\":{\"serde\":[\"dep:serde\",\"bitflags/serde\"]}}", + "gix-shallow_0.15.0": "{\"dependencies\":[{\"default_features\":false,\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-lock\",\"req\":\"^26.0.0\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.26.0\"}],\"features\":{\"serde\":[\"dep:serde\",\"gix-hash/serde\",\"nonempty/serialize\"],\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-tempfile_26.0.0": "{\"dependencies\":[{\"name\":\"dashmap\",\"optional\":true,\"req\":\"^6.2.1\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.24.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"default_features\":false,\"name\":\"libc\",\"req\":\"^0.2.186\",\"target\":\"cfg(not(windows))\"},{\"name\":\"parking_lot\",\"req\":\"^0.12.4\"},{\"default_features\":false,\"name\":\"signal-hook\",\"optional\":true,\"req\":\"^0.4.3\"},{\"name\":\"signal-hook-registry\",\"optional\":true,\"req\":\"^1.4.8\"},{\"name\":\"tempfile\",\"req\":\"^3.26.0\"},{\"features\":[\"Win32_Storage_FileSystem\"],\"name\":\"windows-sys\",\"req\":\"^0.61.1\",\"target\":\"cfg(windows)\"}],\"features\":{\"default\":[\"hp-hashmap\"],\"hp-hashmap\":[\"dep:dashmap\"],\"signals\":[\"dep:signal-hook\",\"dep:signal-hook-registry\"]}}", + "gix-trace_0.3.0": "{\"dependencies\":[{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-error\",\"optional\":true,\"req\":\"^0.5.0\"},{\"default_features\":false,\"name\":\"libc\",\"optional\":true,\"req\":\"^0.2.186\",\"target\":\"cfg(unix)\"},{\"name\":\"nu-ansi-term\",\"optional\":true,\"req\":\"^0.50.3\"},{\"features\":[\"write\"],\"name\":\"smallvec\",\"optional\":true,\"req\":\"^1.15.1\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"tracing\",\"optional\":true,\"req\":\"^0.1.44\"},{\"default_features\":false,\"features\":[\"fmt\"],\"name\":\"tracing-subscriber\",\"optional\":true,\"req\":\"^0.3.22\"},{\"default_features\":false,\"features\":[\"env-filter\"],\"kind\":\"dev\",\"name\":\"tracing-subscriber\",\"req\":\"^0.3.22\"}],\"features\":{\"default\":[],\"forest\":[\"tracing\",\"dep:tracing-subscriber\",\"dep:gix-error\",\"dep:smallvec\"],\"forest-ansi\":[\"forest\",\"dep:nu-ansi-term\"],\"forest-cpu-time\":[\"forest\",\"dep:libc\"],\"tracing\":[\"dep:tracing\"],\"tracing-detail\":[]}}", + "gix-transport_0.61.0": "{\"dependencies\":[{\"name\":\"async-std\",\"optional\":true,\"req\":\"^1.12.0\"},{\"features\":[\"attributes\"],\"kind\":\"dev\",\"name\":\"async-std\",\"req\":\"^1.9.0\"},{\"name\":\"async-trait\",\"optional\":true,\"req\":\"^0.1.51\"},{\"name\":\"base64\",\"optional\":true,\"req\":\"^0.22.1\"},{\"kind\":\"dev\",\"name\":\"blocking\",\"req\":\"^1.6.2\"},{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"default_features\":false,\"name\":\"curl\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"futures-io\",\"optional\":true,\"req\":\"^0.3.32\"},{\"name\":\"futures-lite\",\"optional\":true,\"req\":\"^2.1.0\"},{\"name\":\"gix-command\",\"req\":\"^0.12.0\"},{\"name\":\"gix-credentials\",\"optional\":true,\"req\":\"^0.42.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-packetline\",\"req\":\"^0.24.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-quote\",\"req\":\"^0.10.0\"},{\"name\":\"gix-sec\",\"req\":\"^0.16.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"name\":\"gix-url\",\"req\":\"^0.40.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"parking_lot\",\"optional\":true,\"req\":\"^0.12.4\"},{\"name\":\"pin-project-lite\",\"optional\":true,\"req\":\"^0.2.6\"},{\"default_features\":false,\"features\":[\"blocking\",\"charset\",\"http2\"],\"name\":\"reqwest\",\"optional\":true,\"req\":\"^0.13.4\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"async-client\":[\"gix-packetline/async-io\",\"async-trait\",\"futures-lite\",\"futures-io\",\"pin-project-lite\"],\"blocking-client\":[\"gix-packetline/blocking-io\"],\"default\":[],\"http-client\":[\"base64\",\"parking_lot\",\"gix-utils/io-pipe\",\"blocking-client\",\"gix-credentials\"],\"http-client-curl\":[\"curl\",\"http-client\"],\"http-client-curl-openssl\":[\"http-client-curl\",\"curl/ssl\"],\"http-client-curl-rust-tls\":[\"http-client-curl\",\"curl/rustls\"],\"http-client-insecure-credentials\":[],\"http-client-reqwest\":[\"reqwest\",\"http-client\"],\"http-client-reqwest-native-tls\":[\"http-client-reqwest\",\"reqwest/native-tls\"],\"http-client-reqwest-rust-tls\":[\"http-client-reqwest\",\"reqwest/rustls\"],\"http-client-reqwest-rust-tls-trust-dns\":[\"http-client-reqwest\",\"reqwest/rustls\",\"reqwest/hickory-dns\"],\"serde\":[\"dep:serde\",\"bstr/serde\"]}}", + "gix-traverse_0.63.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2\"},{\"name\":\"gix-commitgraph\",\"req\":\"^0.41.0\"},{\"name\":\"gix-date\",\"req\":\"^0.18.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.18.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"name\":\"gix-revwalk\",\"req\":\"^0.37.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-url_0.40.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"assert_matches\",\"req\":\"^1.5.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"percent-encoding\",\"req\":\"^2.3.1\"},{\"default_features\":false,\"features\":[\"std\",\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0.150\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\"]}}", + "gix-utils_0.5.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"optional\":true,\"req\":\"^1.12.0\"},{\"name\":\"bytes\",\"optional\":true,\"req\":\"^1.11.1\"},{\"name\":\"bytesize\",\"optional\":true,\"req\":\"^2.3.1\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"name\":\"fastrand\",\"req\":\"^2.4.1\"},{\"name\":\"getrandom\",\"req\":\"^0.4\",\"target\":\"cfg(not(all(target_arch = \\\"wasm32\\\", target_os = \\\"unknown\\\")))\"},{\"name\":\"gix-error\",\"optional\":true,\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"prodash\",\"optional\":true,\"req\":\"^31.0.1\"},{\"default_features\":false,\"name\":\"unicode-normalization\",\"req\":\"^0.1.19\"}],\"features\":{\"bstr\":[\"dep:bstr\"],\"cache-efficiency-debug\":[],\"interrupt\":[\"dep:gix-error\"],\"io-pipe\":[\"dep:bytes\"],\"progress\":[\"dep:prodash\"],\"progress-unit-bytes\":[\"dep:bytesize\",\"prodash?/unit-bytes\"],\"progress-unit-human-numbers\":[\"prodash?/unit-human\"]}}", + "gix-validate_0.13.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"}],\"features\":{}}", + "gix-worktree-stream_0.38.0": "{\"dependencies\":[{\"name\":\"gix-attributes\",\"req\":\"^0.37.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-filter\",\"req\":\"^0.36.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.24.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"features\":[\"parallel\"],\"name\":\"gix-parallel\",\"req\":\"^0.50.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"name\":\"gix-traverse\",\"req\":\"^0.63.0\"},{\"features\":[\"io-pipe\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"name\":\"parking_lot\",\"req\":\"^0.12.4\"}],\"features\":{\"sha1\":[\"gix-hash/sha1\"],\"sha256\":[\"gix-hash/sha256\"]}}", + "gix-zlib_0.3.0": "{\"dependencies\":[{\"default_features\":false,\"kind\":\"dev\",\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"zlib-rs\",\"req\":\"^0.6.2\"}],\"features\":{\"serde\":[\"dep:serde\"]}}", + "gix_0.89.0": "{\"dependencies\":[{\"name\":\"async-std\",\"optional\":true,\"req\":\"^1.12.0\"},{\"features\":[\"attributes\"],\"kind\":\"dev\",\"name\":\"async-std\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-actor\",\"req\":\"^0.44.0\"},{\"default_features\":false,\"name\":\"gix-archive\",\"optional\":true,\"req\":\"^0.38.0\"},{\"name\":\"gix-attributes\",\"optional\":true,\"req\":\"^0.37.0\"},{\"name\":\"gix-blame\",\"optional\":true,\"req\":\"^0.19.0\"},{\"name\":\"gix-command\",\"optional\":true,\"req\":\"^0.12.0\"},{\"name\":\"gix-commitgraph\",\"req\":\"^0.41.0\"},{\"name\":\"gix-config\",\"req\":\"^0.62.0\"},{\"name\":\"gix-credentials\",\"optional\":true,\"req\":\"^0.42.0\"},{\"name\":\"gix-date\",\"req\":\"^0.18.0\"},{\"default_features\":false,\"name\":\"gix-diff\",\"req\":\"^0.69.0\"},{\"name\":\"gix-dir\",\"optional\":true,\"req\":\"^0.31.0\"},{\"name\":\"gix-discover\",\"req\":\"^0.57.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-filter\",\"optional\":true,\"req\":\"^0.36.0\"},{\"name\":\"gix-fs\",\"req\":\"^0.24.0\"},{\"name\":\"gix-glob\",\"req\":\"^0.29.0\"},{\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"kind\":\"dev\",\"name\":\"gix-hash\",\"req\":\"^0.28.0\"},{\"name\":\"gix-hashtable\",\"req\":\"^0.18.0\"},{\"name\":\"gix-ignore\",\"optional\":true,\"req\":\"^0.24.0\"},{\"name\":\"gix-index\",\"optional\":true,\"req\":\"^0.57.0\"},{\"name\":\"gix-lock\",\"req\":\"^26.0.0\"},{\"name\":\"gix-mailmap\",\"optional\":true,\"req\":\"^0.36.0\"},{\"default_features\":false,\"name\":\"gix-merge\",\"optional\":true,\"req\":\"^0.22.0\"},{\"name\":\"gix-negotiate\",\"optional\":true,\"req\":\"^0.37.0\"},{\"name\":\"gix-note\",\"optional\":true,\"req\":\"^0.3.0\"},{\"name\":\"gix-object\",\"req\":\"^0.66.0\"},{\"name\":\"gix-odb\",\"req\":\"^0.86.0\"},{\"default_features\":false,\"features\":[\"object-cache-dynamic\"],\"name\":\"gix-pack\",\"req\":\"^0.76.0\"},{\"default_features\":false,\"features\":[\"generate\",\"streaming-input\"],\"kind\":\"dev\",\"name\":\"gix-pack\",\"req\":\"^0.76.0\"},{\"features\":[\"once_cell\"],\"name\":\"gix-parallel\",\"req\":\"^0.50.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-pathspec\",\"optional\":true,\"req\":\"^0.22.0\"},{\"name\":\"gix-prompt\",\"optional\":true,\"req\":\"^0.19.0\"},{\"name\":\"gix-protocol\",\"req\":\"^0.67.0\"},{\"name\":\"gix-quote\",\"req\":\"^0.10.0\"},{\"name\":\"gix-ref\",\"req\":\"^0.69.0\"},{\"name\":\"gix-refspec\",\"req\":\"^0.47.0\"},{\"default_features\":false,\"name\":\"gix-revision\",\"req\":\"^0.51.0\"},{\"name\":\"gix-revwalk\",\"req\":\"^0.37.0\"},{\"name\":\"gix-sec\",\"req\":\"^0.16.0\"},{\"name\":\"gix-shallow\",\"req\":\"^0.15.0\"},{\"features\":[\"worktree-rewrites\"],\"name\":\"gix-status\",\"optional\":true,\"req\":\"^0.36.0\"},{\"name\":\"gix-submodule\",\"optional\":true,\"req\":\"^0.36.0\"},{\"default_features\":false,\"name\":\"gix-tempfile\",\"req\":\"^26.0.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"name\":\"gix-transport\",\"optional\":true,\"req\":\"^0.61.0\"},{\"name\":\"gix-traverse\",\"req\":\"^0.63.0\"},{\"name\":\"gix-url\",\"req\":\"^0.40.0\"},{\"features\":[\"bstr\",\"interrupt\",\"progress\"],\"name\":\"gix-utils\",\"req\":\"^0.5.0\"},{\"name\":\"gix-validate\",\"req\":\"^0.13.0\"},{\"default_features\":false,\"name\":\"gix-worktree\",\"optional\":true,\"req\":\"^0.58.0\"},{\"name\":\"gix-worktree-state\",\"optional\":true,\"req\":\"^0.36.0\"},{\"name\":\"gix-worktree-stream\",\"optional\":true,\"req\":\"^0.38.0\"},{\"name\":\"gix-zlib\",\"req\":\"^0.3.0\"},{\"features\":[\"filters\"],\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"is_ci\",\"req\":\"^1.1.1\"},{\"name\":\"nonempty\",\"req\":\"^0.12.0\"},{\"name\":\"parking_lot\",\"optional\":true,\"req\":\"^0.12.4\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.4.0\"},{\"features\":[\"progress-tree\"],\"name\":\"prodash\",\"optional\":true,\"req\":\"^31.0.1\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"regex\",\"optional\":true,\"req\":\"^1.12.3\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"serial_test\",\"req\":\"^3.4.0\"},{\"default_features\":false,\"name\":\"signal-hook\",\"optional\":true,\"req\":\"^0.4.3\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"kind\":\"dev\",\"name\":\"termtree\",\"req\":\"^1.0.0\"}],\"features\":{\"anyhow\":[\"gix-error/anyhow\"],\"async-network-client\":[\"gix-protocol/async-client\",\"gix-pack/streaming-input\",\"dep:gix-transport\",\"attributes\",\"credentials\"],\"async-network-client-async-std\":[\"async-std\",\"async-network-client\",\"gix-transport/async-std\"],\"attributes\":[\"excludes\",\"dep:gix-filter\",\"dep:gix-pathspec\",\"dep:gix-attributes\",\"dep:gix-submodule\",\"gix-worktree?/attributes\",\"command\"],\"auto-chain-error\":[\"gix-error/auto-chain-error\"],\"basic\":[\"blob-diff\",\"revision\",\"index\"],\"blame\":[\"dep:gix-blame\",\"blob-diff\"],\"blob-diff\":[\"gix-diff/blob\",\"attributes\"],\"blocking-http-transport-curl\":[\"blocking-network-client\",\"gix-transport/http-client-curl\"],\"blocking-http-transport-curl-openssl\":[\"blocking-http-transport-curl\",\"gix-transport/http-client-curl-openssl\"],\"blocking-http-transport-curl-rustls\":[\"blocking-http-transport-curl\",\"gix-transport/http-client-curl-rust-tls\"],\"blocking-http-transport-reqwest\":[\"blocking-network-client\",\"gix-transport/http-client-reqwest\"],\"blocking-http-transport-reqwest-native-tls\":[\"blocking-http-transport-reqwest\",\"gix-transport/http-client-reqwest-native-tls\"],\"blocking-http-transport-reqwest-rust-tls\":[\"blocking-http-transport-reqwest\",\"gix-transport/http-client-reqwest-rust-tls\"],\"blocking-http-transport-reqwest-rust-tls-trust-dns\":[\"blocking-http-transport-reqwest\",\"gix-transport/http-client-reqwest-rust-tls-trust-dns\"],\"blocking-network-client\":[\"gix-protocol/blocking-client\",\"gix-pack/streaming-input\",\"dep:gix-transport\",\"attributes\",\"credentials\"],\"cache-efficiency-debug\":[\"gix-utils/cache-efficiency-debug\"],\"comfort\":[\"progress-unit-bytes\",\"progress-unit-human-numbers\"],\"command\":[\"dep:gix-command\",\"gix-object/signature\"],\"credentials\":[\"dep:gix-credentials\",\"dep:gix-prompt\",\"dep:gix-negotiate\"],\"default\":[\"max-performance-safe\",\"comfort\",\"basic\",\"extras\",\"auto-chain-error\",\"sha1\"],\"dirwalk\":[\"dep:gix-dir\",\"attributes\",\"excludes\"],\"error-print-location\":[\"gix-error/error-print-location\"],\"excludes\":[\"dep:gix-ignore\",\"dep:gix-worktree\",\"index\"],\"extras\":[\"worktree-stream\",\"worktree-archive\",\"revparse-regex\",\"mailmap\",\"excludes\",\"attributes\",\"worktree-mutation\",\"credentials\",\"interrupt\",\"status\",\"dirwalk\",\"blame\",\"merge\",\"notes\"],\"hp-tempfile-registry\":[\"gix-tempfile/hp-hashmap\"],\"index\":[\"dep:gix-index\"],\"interrupt\":[\"dep:signal-hook\",\"gix-tempfile/signals\",\"dep:parking_lot\"],\"mailmap\":[\"dep:gix-mailmap\",\"revision\"],\"max-control\":[\"parallel\",\"pack-cache-lru-static\",\"pack-cache-lru-dynamic\"],\"max-performance\":[\"max-performance-safe\"],\"max-performance-safe\":[\"max-control\"],\"merge\":[\"blob-diff\",\"dep:gix-merge\",\"attributes\"],\"notes\":[\"dep:gix-note\"],\"pack-cache-lru-dynamic\":[\"gix-pack/pack-cache-lru-dynamic\"],\"pack-cache-lru-static\":[\"gix-pack/pack-cache-lru-static\"],\"parallel\":[\"gix-parallel/parallel\",\"gix-pack/parallel\"],\"progress-tree\":[\"prodash/progress-tree\"],\"progress-unit-bytes\":[\"gix-utils/progress-unit-bytes\"],\"progress-unit-human-numbers\":[\"gix-utils/progress-unit-human-numbers\"],\"revision\":[\"gix-revision/describe\",\"gix-revision/merge_base\",\"index\"],\"revparse-regex\":[\"regex\",\"revision\"],\"serde\":[\"dep:serde\",\"gix-pack/serde\",\"gix-object/serde\",\"gix-protocol/serde\",\"gix-transport?/serde\",\"gix-ref/serde\",\"gix-odb/serde\",\"gix-index?/serde\",\"gix-mailmap?/serde\",\"gix-url/serde\",\"gix-attributes?/serde\",\"gix-ignore?/serde\",\"gix-revision/serde\",\"gix-worktree?/serde\",\"gix-commitgraph/serde\",\"gix-credentials?/serde\"],\"sha1\":[\"gix-hash/sha1\",\"gix-pack/sha1\",\"gix-note?/sha1\",\"gix-worktree-stream?/sha1\"],\"sha256\":[\"gix-hash/sha256\",\"gix-object/sha256\",\"gix-pack/sha256\",\"gix-note?/sha256\",\"gix-worktree-stream?/sha256\"],\"status\":[\"gix-status\",\"dirwalk\",\"index\",\"blob-diff\",\"gix-diff/index\"],\"tracing\":[\"gix-trace/tracing\"],\"tracing-detail\":[\"gix-trace/tracing-detail\",\"tracing\"],\"tree-error\":[\"gix-error/tree-error\"],\"worktree-archive\":[\"gix-archive\",\"worktree-stream\",\"attributes\"],\"worktree-mutation\":[\"status\",\"dep:gix-worktree-state\",\"gix-worktree/add\",\"gix-worktree/remove\"],\"worktree-stream\":[\"gix-worktree-stream\",\"attributes\",\"parallel\"]}}", "glib-macros_0.22.6": "{\"dependencies\":[{\"default_features\":false,\"kind\":\"dev\",\"name\":\"glib\",\"req\":\"^0.22.0\"},{\"name\":\"heck\",\"req\":\"^0.5\"},{\"name\":\"proc-macro-crate\",\"optional\":true,\"req\":\"^3.3\"},{\"name\":\"proc-macro2\",\"req\":\"^1.0\"},{\"name\":\"quote\",\"req\":\"^1.0\"},{\"features\":[\"full\"],\"name\":\"syn\",\"req\":\"^2.0.113\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1\"}],\"features\":{\"default\":[\"proc_macro_crate\"],\"proc_macro_crate\":[\"proc-macro-crate\"]}}", "glib-sys_0.22.8": "{\"dependencies\":[{\"name\":\"libc\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"shell-words\",\"req\":\"^1.0.0\"},{\"kind\":\"build\",\"name\":\"system-deps\",\"req\":\"^7\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3\"}],\"features\":{\"v2_58\":[],\"v2_60\":[\"v2_58\"],\"v2_62\":[\"v2_60\"],\"v2_64\":[\"v2_62\"],\"v2_66\":[\"v2_64\"],\"v2_68\":[\"v2_66\"],\"v2_70\":[\"v2_68\"],\"v2_72\":[\"v2_70\"],\"v2_74\":[\"v2_72\"],\"v2_76\":[\"v2_74\"],\"v2_78\":[\"v2_76\"],\"v2_80\":[\"v2_78\"],\"v2_82\":[\"v2_80\"],\"v2_84\":[\"v2_82\"],\"v2_86\":[\"v2_84\"],\"v2_88\":[\"v2_86\"],\"v2_90\":[\"v2_88\"]}}", "glib_0.22.8": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2.10\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"futures-channel\",\"optional\":true,\"req\":\"^0.3\"},{\"default_features\":false,\"name\":\"futures-core\",\"optional\":true,\"req\":\"^0.3\"},{\"name\":\"futures-executor\",\"optional\":true,\"req\":\"^0.3\"},{\"default_features\":false,\"name\":\"futures-task\",\"optional\":true,\"req\":\"^0.3\"},{\"name\":\"futures-util\",\"optional\":true,\"req\":\"^0.3\"},{\"name\":\"gio-sys\",\"optional\":true,\"req\":\"^0.22.0\"},{\"kind\":\"dev\",\"name\":\"gir-format-check\",\"req\":\"^0.1\"},{\"default_features\":false,\"name\":\"glib-macros\",\"req\":\"^0.22.0\"},{\"name\":\"glib-sys\",\"req\":\"^0.22.0\"},{\"name\":\"gobject-sys\",\"req\":\"^0.22.0\"},{\"name\":\"libc\",\"req\":\"^0.2\"},{\"name\":\"memchr\",\"req\":\"^2.8.0\"},{\"name\":\"rs-log\",\"optional\":true,\"package\":\"log\",\"req\":\"^0.4\"},{\"features\":[\"union\",\"const_generics\",\"const_new\"],\"name\":\"smallvec\",\"req\":\"^1.15\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1\"}],\"features\":{\"compiletests\":[],\"default\":[\"gio\",\"futures\"],\"futures\":[\"futures-core\",\"futures-task\",\"futures-executor\",\"futures-channel\",\"futures-util\"],\"gio\":[\"gio-sys\",\"futures\"],\"log\":[\"rs-log\"],\"log_kv\":[\"log\",\"rs-log/kv\"],\"log_macros\":[\"log\"],\"v2_58\":[\"glib-sys/v2_58\",\"gobject-sys/v2_58\"],\"v2_60\":[\"v2_58\",\"glib-sys/v2_60\"],\"v2_62\":[\"v2_60\",\"glib-sys/v2_62\",\"gobject-sys/v2_62\"],\"v2_64\":[\"v2_62\",\"glib-sys/v2_64\"],\"v2_66\":[\"v2_64\",\"glib-sys/v2_66\",\"gobject-sys/v2_66\"],\"v2_68\":[\"v2_66\",\"glib-sys/v2_68\",\"gobject-sys/v2_68\"],\"v2_70\":[\"v2_68\",\"glib-sys/v2_70\",\"gobject-sys/v2_70\"],\"v2_72\":[\"v2_70\",\"glib-sys/v2_72\",\"gobject-sys/v2_72\"],\"v2_74\":[\"v2_72\",\"glib-sys/v2_74\",\"gobject-sys/v2_74\"],\"v2_76\":[\"v2_74\",\"glib-sys/v2_76\",\"gobject-sys/v2_76\"],\"v2_78\":[\"v2_76\",\"glib-sys/v2_78\",\"gobject-sys/v2_78\"],\"v2_80\":[\"v2_78\",\"glib-sys/v2_80\",\"gobject-sys/v2_80\"],\"v2_82\":[\"v2_80\",\"glib-sys/v2_82\",\"gobject-sys/v2_82\"],\"v2_84\":[\"v2_82\",\"glib-sys/v2_84\",\"gobject-sys/v2_84\"],\"v2_86\":[\"v2_84\",\"glib-sys/v2_86\",\"gobject-sys/v2_86\"],\"v2_88\":[\"v2_86\",\"glib-sys/v2_88\"],\"v2_90\":[\"v2_88\",\"glib-sys/v2_90\"]}}", @@ -1236,8 +1232,6 @@ "ignore_0.4.25": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"kind\":\"dev\",\"name\":\"bstr\",\"req\":\"^1.6.2\"},{\"kind\":\"dev\",\"name\":\"crossbeam-channel\",\"req\":\"^0.5.15\"},{\"name\":\"crossbeam-deque\",\"req\":\"^0.8.3\"},{\"name\":\"globset\",\"req\":\"^0.4.18\"},{\"name\":\"log\",\"req\":\"^0.4.20\"},{\"name\":\"memchr\",\"req\":\"^2.6.3\"},{\"default_features\":false,\"features\":[\"std\",\"perf\",\"syntax\",\"meta\",\"nfa\",\"hybrid\",\"dfa-onepass\"],\"name\":\"regex-automata\",\"req\":\"^0.4.0\"},{\"name\":\"same-file\",\"req\":\"^1.0.6\"},{\"name\":\"walkdir\",\"req\":\"^2.4.0\"},{\"name\":\"winapi-util\",\"req\":\"^0.1.2\",\"target\":\"cfg(windows)\"}],\"features\":{\"simd-accel\":[]}}", "image-webp_0.2.4": "{\"dependencies\":[{\"name\":\"byteorder-lite\",\"req\":\"^0.1.0\"},{\"kind\":\"dev\",\"name\":\"paste\",\"req\":\"^1.0.14\"},{\"kind\":\"dev\",\"name\":\"png\",\"req\":\"^0.17.12\"},{\"name\":\"quick-error\",\"req\":\"^2.0.1\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8.5\"},{\"kind\":\"dev\",\"name\":\"webp\",\"req\":\"^0.3.0\"}],\"features\":{\"_benchmarks\":[]}}", "image_0.25.9": "{\"dependencies\":[{\"features\":[\"extern_crate_alloc\"],\"name\":\"bytemuck\",\"req\":\"^1.8.0\"},{\"name\":\"byteorder-lite\",\"req\":\"^0.1.0\"},{\"name\":\"color_quant\",\"optional\":true,\"req\":\"^1.1\"},{\"kind\":\"dev\",\"name\":\"crc32fast\",\"req\":\"^1.2.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.5.0\"},{\"name\":\"dav1d\",\"optional\":true,\"req\":\"^0.10.3\"},{\"default_features\":false,\"name\":\"exr\",\"optional\":true,\"req\":\"^1.74.0\"},{\"name\":\"gif\",\"optional\":true,\"req\":\"^0.14.0\"},{\"kind\":\"dev\",\"name\":\"glob\",\"req\":\"^0.3\"},{\"name\":\"image-webp\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"moxcms\",\"req\":\"^0.7.4\"},{\"name\":\"mp4parse\",\"optional\":true,\"req\":\"^0.17.0\"},{\"kind\":\"dev\",\"name\":\"num-complex\",\"req\":\"^0.4\"},{\"name\":\"num-traits\",\"req\":\"^0.2.0\"},{\"name\":\"png\",\"optional\":true,\"req\":\"^0.18.0\"},{\"name\":\"qoi\",\"optional\":true,\"req\":\"^0.4\"},{\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1\"},{\"default_features\":false,\"name\":\"ravif\",\"optional\":true,\"req\":\"^0.12\"},{\"name\":\"rayon\",\"optional\":true,\"req\":\"^1.7.0\"},{\"default_features\":false,\"name\":\"rgb\",\"optional\":true,\"req\":\"^0.8.48\"},{\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.214\"},{\"name\":\"tiff\",\"optional\":true,\"req\":\"^0.10.3\"},{\"default_features\":false,\"name\":\"zune-core\",\"optional\":true,\"req\":\"^0.5.0\"},{\"name\":\"zune-jpeg\",\"optional\":true,\"req\":\"^0.5.5\"}],\"features\":{\"avif\":[\"dep:ravif\",\"dep:rgb\"],\"avif-native\":[\"dep:mp4parse\",\"dep:dav1d\"],\"benchmarks\":[],\"bmp\":[],\"color_quant\":[\"dep:color_quant\"],\"dds\":[],\"default\":[\"rayon\",\"default-formats\"],\"default-formats\":[\"avif\",\"bmp\",\"dds\",\"exr\",\"ff\",\"gif\",\"hdr\",\"ico\",\"jpeg\",\"png\",\"pnm\",\"qoi\",\"tga\",\"tiff\",\"webp\"],\"exr\":[\"dep:exr\"],\"ff\":[],\"gif\":[\"dep:gif\",\"dep:color_quant\"],\"hdr\":[],\"ico\":[\"bmp\",\"png\"],\"jpeg\":[\"dep:zune-core\",\"dep:zune-jpeg\"],\"nasm\":[\"ravif?/asm\"],\"png\":[\"dep:png\"],\"pnm\":[],\"qoi\":[\"dep:qoi\"],\"rayon\":[\"dep:rayon\",\"ravif?/threading\",\"exr?/rayon\"],\"serde\":[\"dep:serde\"],\"tga\":[],\"tiff\":[\"dep:tiff\"],\"webp\":[\"dep:image-webp\"]}}", - "imara-diff_0.1.8": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"expect-test\",\"req\":\"^1.4.0\"},{\"default_features\":false,\"features\":[\"default-hasher\",\"inline-more\"],\"name\":\"hashbrown\",\"req\":\"^0.15\"}],\"features\":{\"default\":[\"unified_diff\"],\"unified_diff\":[]}}", - "imara-diff_0.2.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"expect-test\",\"req\":\"^1.4.0\"},{\"default_features\":false,\"features\":[\"default-hasher\",\"inline-more\"],\"name\":\"hashbrown\",\"req\":\"^0.15\"},{\"name\":\"memchr\",\"req\":\"^2.7.4\"}],\"features\":{\"default\":[\"unified_diff\"],\"unified_diff\":[]}}", "include_dir_0.7.4": "{\"dependencies\":[{\"name\":\"glob\",\"optional\":true,\"req\":\"^0.3\"},{\"name\":\"include_dir_macros\",\"req\":\"^0.7.4\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3\"}],\"features\":{\"default\":[],\"metadata\":[\"include_dir_macros/metadata\"],\"nightly\":[\"include_dir_macros/nightly\"]}}", "include_dir_macros_0.7.4": "{\"dependencies\":[{\"name\":\"proc-macro2\",\"req\":\"^1\"},{\"name\":\"quote\",\"req\":\"^1\"}],\"features\":{\"metadata\":[],\"nightly\":[]}}", "indenter_0.3.4": "{\"dependencies\":[],\"features\":{\"default\":[],\"std\":[]}}", @@ -1253,7 +1247,6 @@ "intl-memoizer_0.5.3": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"fluent-langneg\",\"req\":\"^0.13\"},{\"kind\":\"dev\",\"name\":\"intl_pluralrules\",\"req\":\"^7.0\"},{\"name\":\"type-map\",\"req\":\"^0.5\"},{\"name\":\"unic-langid\",\"req\":\"^0.9\"}],\"features\":{}}", "intl_pluralrules_7.0.2": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.3\"},{\"name\":\"unic-langid\",\"req\":\"^0.9\"},{\"features\":[\"macros\"],\"kind\":\"dev\",\"name\":\"unic-langid\",\"req\":\"^0.9\"}],\"features\":{}}", "inventory_0.3.24": "{\"dependencies\":[{\"name\":\"rustversion\",\"req\":\"^1.0\",\"target\":\"cfg(target_family = \\\"wasm\\\")\"},{\"kind\":\"dev\",\"name\":\"rustversion\",\"req\":\"^1.0\"},{\"features\":[\"diff\"],\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.108\"}],\"features\":{}}", - "io-close_0.3.7": "{\"dependencies\":[{\"name\":\"libc\",\"req\":\"^0.2.80\",\"target\":\"cfg(unix)\"},{\"name\":\"os_pipe\",\"optional\":true,\"req\":\"^0.9.2\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.1.0\"},{\"features\":[\"handleapi\",\"std\",\"winsock2\"],\"name\":\"winapi\",\"req\":\"^0.3.9\",\"target\":\"cfg(windows)\"}],\"features\":{}}", "io_tee_0.1.1": "{\"dependencies\":[],\"features\":{}}", "ipconfig_0.3.2": "{\"dependencies\":[{\"name\":\"socket2\",\"req\":\"^0.5.1\",\"target\":\"cfg(windows)\"},{\"name\":\"widestring\",\"req\":\"^1.0.2\",\"target\":\"cfg(windows)\"},{\"features\":[\"Win32_Foundation\",\"Win32_Networking_WinSock\",\"Win32_System_Registry\"],\"name\":\"windows-sys\",\"req\":\"^0.48.0\",\"target\":\"cfg(windows)\"},{\"name\":\"winreg\",\"optional\":true,\"req\":\"^0.50.0\",\"target\":\"cfg(windows)\"}],\"features\":{\"computer\":[\"winreg\"],\"default\":[\"computer\"]}}", "ipnet_2.11.0": "{\"dependencies\":[{\"name\":\"heapless\",\"optional\":true,\"req\":\"^0\"},{\"name\":\"schemars\",\"optional\":true,\"req\":\"^0.8\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"package\":\"serde\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"serde_test\",\"req\":\"^1\"}],\"features\":{\"default\":[\"std\"],\"json\":[\"serde\",\"schemars\"],\"ser_as_str\":[\"heapless\"],\"std\":[]}}", @@ -1267,12 +1260,15 @@ "itoa_1.0.17": "{\"dependencies\":[{\"default_features\":false,\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8\",\"target\":\"cfg(not(miri))\"},{\"name\":\"no-panic\",\"optional\":true,\"req\":\"^0.1\"}],\"features\":{}}", "itoa_1.0.18": "{\"dependencies\":[{\"default_features\":false,\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8\",\"target\":\"cfg(not(miri))\"},{\"name\":\"no-panic\",\"optional\":true,\"req\":\"^0.1\"}],\"features\":{}}", "ixdtf_0.6.4": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.5.0\",\"target\":\"cfg(not(target_arch = \\\"wasm32\\\"))\"},{\"default_features\":false,\"features\":[\"std\"],\"kind\":\"dev\",\"name\":\"serde-json-core\",\"req\":\"^0.6.0\"}],\"features\":{\"default\":[\"duration\"],\"duration\":[]}}", + "jiff-core_0.1.1": "{\"dependencies\":[{\"features\":[\"derive\"],\"name\":\"arbitrary\",\"optional\":true,\"req\":\"^1.4.2\"},{\"name\":\"defmt\",\"optional\":true,\"req\":\"^1.0.0\"},{\"default_features\":false,\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.21\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1.0.0\"}],\"features\":{\"alloc\":[\"defmt?/alloc\"],\"arbitrary\":[\"dep:arbitrary\",\"std\"],\"default\":[\"std\",\"tz-fat\"],\"defmt\":[\"dep:defmt\"],\"logging\":[\"dep:log\"],\"std\":[\"alloc\",\"log?/std\"],\"tz-fat\":[]}}", "jiff-static_0.2.23": "{\"dependencies\":[{\"name\":\"jiff-tzdb\",\"optional\":true,\"req\":\"^0.1.6\"},{\"name\":\"proc-macro2\",\"req\":\"^1.0.93\"},{\"name\":\"quote\",\"req\":\"^1.0.38\"},{\"name\":\"syn\",\"req\":\"^2.0.98\"}],\"features\":{\"default\":[],\"perf-inline\":[],\"tz-fat\":[],\"tzdb\":[\"dep:jiff-tzdb\"]}}", "jiff-static_0.2.24": "{\"dependencies\":[{\"name\":\"jiff-tzdb\",\"optional\":true,\"req\":\"^0.1.6\"},{\"name\":\"proc-macro2\",\"req\":\"^1.0.93\"},{\"name\":\"quote\",\"req\":\"^1.0.38\"},{\"name\":\"syn\",\"req\":\"^2.0.98\"}],\"features\":{\"default\":[],\"perf-inline\":[],\"tz-fat\":[],\"tzdb\":[\"dep:jiff-tzdb\"]}}", + "jiff-static_0.2.38": "{\"dependencies\":[{\"name\":\"jcore\",\"package\":\"jiff-core\",\"req\":\"^0.1\"},{\"name\":\"jiff-tzdb\",\"optional\":true,\"req\":\"^0.1.6\"},{\"name\":\"proc-macro2\",\"req\":\"^1.0.93\"},{\"name\":\"quote\",\"req\":\"^1.0.38\"},{\"name\":\"syn\",\"req\":\"^2.0.98\"}],\"features\":{\"default\":[],\"perf-inline\":[],\"tz-fat\":[],\"tzdb\":[\"dep:jiff-tzdb\"]}}", "jiff-tzdb-platform_0.1.3": "{\"dependencies\":[{\"name\":\"jiff-tzdb\",\"req\":\"^0.1.4\"}],\"features\":{}}", "jiff-tzdb_0.1.6": "{\"dependencies\":[],\"features\":{}}", "jiff_0.2.23": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"anyhow\",\"req\":\"^1.0.81\"},{\"features\":[\"serde\"],\"kind\":\"dev\",\"name\":\"chrono\",\"req\":\"^0.4.38\"},{\"kind\":\"dev\",\"name\":\"chrono-tz\",\"req\":\"^0.10.0\"},{\"kind\":\"dev\",\"name\":\"hifitime\",\"req\":\"^3.9.0\",\"target\":\"cfg(not(target_family = \\\"wasm\\\"))\"},{\"kind\":\"dev\",\"name\":\"humantime\",\"req\":\"^2.1.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.39.0\"},{\"name\":\"jiff-static\",\"req\":\"=0.2.23\",\"target\":\"cfg(any())\"},{\"name\":\"jiff-static\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"jiff-tzdb\",\"optional\":true,\"req\":\"^0.1.6\"},{\"name\":\"jiff-tzdb-platform\",\"optional\":true,\"req\":\"^0.1.3\",\"target\":\"cfg(any(windows, target_family = \\\"wasm\\\"))\"},{\"name\":\"js-sys\",\"optional\":true,\"req\":\"^0.3.50\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"default_features\":false,\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.21\"},{\"kind\":\"dev\",\"name\":\"log\",\"req\":\"^0.4.21\"},{\"default_features\":false,\"name\":\"portable-atomic\",\"req\":\"^1.10.0\",\"target\":\"cfg(not(target_has_atomic = \\\"ptr\\\"))\"},{\"default_features\":false,\"name\":\"portable-atomic-util\",\"req\":\"^0.2.4\",\"target\":\"cfg(not(target_has_atomic = \\\"ptr\\\"))\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1.0.3\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0.203\"},{\"default_features\":false,\"name\":\"serde_core\",\"optional\":true,\"req\":\"^1.0.221\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0.117\"},{\"kind\":\"dev\",\"name\":\"serde_yaml\",\"req\":\"^0.9.34\"},{\"kind\":\"dev\",\"name\":\"tabwriter\",\"req\":\"^1.4.0\"},{\"features\":[\"local-offset\",\"macros\",\"parsing\"],\"kind\":\"dev\",\"name\":\"time\",\"req\":\"^0.3.36\"},{\"kind\":\"dev\",\"name\":\"time-tz\",\"req\":\"^2.0.0\"},{\"kind\":\"dev\",\"name\":\"tzfile\",\"req\":\"^0.1.3\"},{\"kind\":\"dev\",\"name\":\"walkdir\",\"req\":\"^2.5.0\"},{\"name\":\"wasm-bindgen\",\"optional\":true,\"req\":\"^0.2.70\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"default_features\":false,\"features\":[\"Win32_Foundation\",\"Win32_System_Time\"],\"name\":\"windows-sys\",\"optional\":true,\"req\":\">=0.52.0, <=0.61\",\"target\":\"cfg(windows)\"}],\"features\":{\"alloc\":[\"serde_core?/alloc\",\"portable-atomic-util/alloc\"],\"default\":[\"std\",\"tz-system\",\"tz-fat\",\"tzdb-bundle-platform\",\"tzdb-zoneinfo\",\"tzdb-concatenated\",\"perf-inline\"],\"js\":[\"dep:wasm-bindgen\",\"dep:js-sys\"],\"logging\":[\"dep:log\"],\"perf-inline\":[],\"serde\":[\"dep:serde_core\"],\"static\":[\"static-tz\",\"jiff-static?/tzdb\"],\"static-tz\":[\"dep:jiff-static\"],\"std\":[\"alloc\",\"log?/std\",\"serde_core?/std\"],\"tz-fat\":[\"jiff-static?/tz-fat\"],\"tz-system\":[\"std\",\"dep:windows-sys\"],\"tzdb-bundle-always\":[\"dep:jiff-tzdb\",\"alloc\"],\"tzdb-bundle-platform\":[\"dep:jiff-tzdb-platform\",\"alloc\"],\"tzdb-concatenated\":[\"std\"],\"tzdb-zoneinfo\":[\"std\"]}}", "jiff_0.2.24": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"anyhow\",\"req\":\"^1.0.81\"},{\"features\":[\"serde\"],\"kind\":\"dev\",\"name\":\"chrono\",\"req\":\"^0.4.38\"},{\"kind\":\"dev\",\"name\":\"chrono-tz\",\"req\":\"^0.10.0\"},{\"kind\":\"dev\",\"name\":\"hifitime\",\"req\":\"^3.9.0\",\"target\":\"cfg(not(target_family = \\\"wasm\\\"))\"},{\"kind\":\"dev\",\"name\":\"humantime\",\"req\":\"^2.1.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.39.0\"},{\"name\":\"jiff-static\",\"req\":\"=0.2.24\",\"target\":\"cfg(any())\"},{\"name\":\"jiff-static\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"jiff-tzdb\",\"optional\":true,\"req\":\"^0.1.6\"},{\"name\":\"jiff-tzdb-platform\",\"optional\":true,\"req\":\"^0.1.3\",\"target\":\"cfg(any(windows, target_family = \\\"wasm\\\"))\"},{\"name\":\"js-sys\",\"optional\":true,\"req\":\"^0.3.50\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"default_features\":false,\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.21\"},{\"kind\":\"dev\",\"name\":\"log\",\"req\":\"^0.4.21\"},{\"default_features\":false,\"name\":\"portable-atomic\",\"req\":\"^1.10.0\",\"target\":\"cfg(not(target_has_atomic = \\\"ptr\\\"))\"},{\"default_features\":false,\"name\":\"portable-atomic-util\",\"req\":\"^0.2.4\",\"target\":\"cfg(not(target_has_atomic = \\\"ptr\\\"))\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1.0.3\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0.203\"},{\"default_features\":false,\"name\":\"serde_core\",\"optional\":true,\"req\":\"^1.0.221\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0.117\"},{\"kind\":\"dev\",\"name\":\"serde_yaml\",\"req\":\"^0.9.34\"},{\"kind\":\"dev\",\"name\":\"tabwriter\",\"req\":\"^1.4.0\"},{\"features\":[\"local-offset\",\"macros\",\"parsing\"],\"kind\":\"dev\",\"name\":\"time\",\"req\":\"^0.3.36\"},{\"kind\":\"dev\",\"name\":\"time-tz\",\"req\":\"^2.0.0\"},{\"kind\":\"dev\",\"name\":\"tzfile\",\"req\":\"^0.1.3\"},{\"kind\":\"dev\",\"name\":\"walkdir\",\"req\":\"^2.5.0\"},{\"name\":\"wasm-bindgen\",\"optional\":true,\"req\":\"^0.2.70\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"default_features\":false,\"features\":[\"Win32_Foundation\",\"Win32_System_Time\"],\"name\":\"windows-sys\",\"optional\":true,\"req\":\">=0.52.0, <=0.61\",\"target\":\"cfg(windows)\"}],\"features\":{\"alloc\":[\"serde_core?/alloc\",\"portable-atomic-util/alloc\"],\"default\":[\"std\",\"tz-system\",\"tz-fat\",\"tzdb-bundle-platform\",\"tzdb-zoneinfo\",\"tzdb-concatenated\",\"perf-inline\"],\"js\":[\"dep:wasm-bindgen\",\"dep:js-sys\"],\"logging\":[\"dep:log\"],\"perf-inline\":[],\"serde\":[\"dep:serde_core\"],\"static\":[\"static-tz\",\"jiff-static?/tzdb\"],\"static-tz\":[\"dep:jiff-static\"],\"std\":[\"alloc\",\"log?/std\",\"serde_core?/std\"],\"tz-fat\":[\"jiff-static?/tz-fat\"],\"tz-system\":[\"std\",\"dep:windows-sys\"],\"tzdb-bundle-always\":[\"dep:jiff-tzdb\",\"alloc\"],\"tzdb-bundle-platform\":[\"dep:jiff-tzdb-platform\",\"alloc\"],\"tzdb-concatenated\":[\"std\"],\"tzdb-zoneinfo\":[\"std\"]}}", + "jiff_0.2.38": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"anyhow\",\"req\":\"^1.0.81\"},{\"features\":[\"derive\"],\"name\":\"arbitrary\",\"optional\":true,\"req\":\"^1.4.2\"},{\"features\":[\"serde\"],\"kind\":\"dev\",\"name\":\"chrono\",\"req\":\"^0.4.38\"},{\"kind\":\"dev\",\"name\":\"chrono-tz\",\"req\":\"^0.10.0\"},{\"name\":\"defmt\",\"optional\":true,\"req\":\"^1.0.0\"},{\"kind\":\"dev\",\"name\":\"hifitime\",\"req\":\"^4.3.0\",\"target\":\"cfg(not(target_family = \\\"wasm\\\"))\"},{\"kind\":\"dev\",\"name\":\"humantime\",\"req\":\"^2.1.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.39.0\"},{\"default_features\":false,\"name\":\"jcore\",\"package\":\"jiff-core\",\"req\":\"^0.1.0\"},{\"name\":\"jiff-static\",\"req\":\"=0.2.38\",\"target\":\"cfg(any())\"},{\"name\":\"jiff-static\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"jiff-tzdb\",\"optional\":true,\"req\":\"^0.1.9\"},{\"name\":\"jiff-tzdb-platform\",\"optional\":true,\"req\":\"^0.1.3\",\"target\":\"cfg(any(windows, target_family = \\\"wasm\\\"))\"},{\"name\":\"js-sys\",\"optional\":true,\"req\":\"^0.3.50\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"default_features\":false,\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.21\"},{\"kind\":\"dev\",\"name\":\"log\",\"req\":\"^0.4.21\"},{\"default_features\":false,\"name\":\"portable-atomic\",\"req\":\"^1.10.0\",\"target\":\"cfg(not(target_has_atomic = \\\"ptr\\\"))\"},{\"default_features\":false,\"name\":\"portable-atomic-util\",\"req\":\"^0.2.4\",\"target\":\"cfg(not(target_has_atomic = \\\"ptr\\\"))\"},{\"default_features\":false,\"features\":[\"use-std\"],\"kind\":\"dev\",\"name\":\"postcard\",\"req\":\"^1.1.3\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1.0.3\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0.203\"},{\"default_features\":false,\"name\":\"serde_core\",\"optional\":true,\"req\":\"^1.0.221\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0.117\"},{\"kind\":\"dev\",\"name\":\"serde_yaml\",\"req\":\"^0.9.34\"},{\"kind\":\"dev\",\"name\":\"tabwriter\",\"req\":\"^1.4.0\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.27.0\"},{\"features\":[\"local-offset\",\"macros\",\"parsing\"],\"kind\":\"dev\",\"name\":\"time\",\"req\":\"^0.3.36\"},{\"kind\":\"dev\",\"name\":\"time-tz\",\"req\":\"^2.0.0\"},{\"kind\":\"dev\",\"name\":\"tzfile\",\"req\":\"^0.1.3\"},{\"kind\":\"dev\",\"name\":\"walkdir\",\"req\":\"^2.5.0\"},{\"name\":\"wasm-bindgen\",\"optional\":true,\"req\":\"^0.2.70\",\"target\":\"cfg(all(any(target_arch = \\\"wasm32\\\", target_arch = \\\"wasm64\\\"), target_os = \\\"unknown\\\"))\"},{\"name\":\"windows-link\",\"optional\":true,\"req\":\"^0.2.1\",\"target\":\"cfg(windows)\"}],\"features\":{\"alloc\":[\"jcore/alloc\",\"serde_core?/alloc\",\"portable-atomic-util/alloc\",\"defmt?/alloc\"],\"arbitrary\":[\"dep:arbitrary\",\"jcore/arbitrary\",\"std\"],\"default\":[\"std\",\"tz-system\",\"tz-fat\",\"tzdb-bundle-platform\",\"tzdb-zoneinfo\",\"tzdb-concatenated\",\"perf-inline\"],\"defmt\":[\"dep:defmt\",\"jcore/defmt\"],\"js\":[\"dep:wasm-bindgen\",\"dep:js-sys\"],\"logging\":[\"dep:log\",\"jcore/logging\"],\"perf-inline\":[],\"serde\":[\"dep:serde_core\"],\"static\":[\"static-tz\",\"jiff-static?/tzdb\"],\"static-tz\":[\"dep:jiff-static\"],\"std\":[\"alloc\",\"jcore/std\",\"log?/std\",\"serde_core?/std\"],\"tz-fat\":[\"jcore/tz-fat\",\"jiff-static?/tz-fat\"],\"tz-system\":[\"std\",\"dep:windows-link\"],\"tzdb-bundle-always\":[\"dep:jiff-tzdb\",\"alloc\"],\"tzdb-bundle-platform\":[\"dep:jiff-tzdb-platform\",\"alloc\"],\"tzdb-concatenated\":[\"std\"],\"tzdb-zoneinfo\":[\"std\"]}}", "jni-macros_0.22.4": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"javac\",\"req\":\"^0.1.0\"},{\"name\":\"proc-macro2\",\"req\":\"^1.0\"},{\"name\":\"quote\",\"req\":\"^1.0\"},{\"kind\":\"build\",\"name\":\"rustc_version\",\"req\":\"^0.4\"},{\"kind\":\"dev\",\"name\":\"rusty-fork\",\"req\":\"^0.3.0\"},{\"name\":\"simd_cesu8\",\"req\":\"^1.0.1\"},{\"features\":[\"full\"],\"name\":\"syn\",\"req\":\"^2.0\"},{\"kind\":\"dev\",\"name\":\"thiserror\",\"req\":\"^2\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1\"}],\"features\":{}}", "jni-sys-macros_0.4.1": "{\"dependencies\":[{\"name\":\"quote\",\"req\":\"^1\"},{\"features\":[\"full\"],\"name\":\"syn\",\"req\":\"^2\"}],\"features\":{}}", "jni-sys_0.3.1": "{\"dependencies\":[{\"name\":\"jni_sys_04\",\"package\":\"jni-sys\",\"req\":\"^0.4\"},{\"kind\":\"dev\",\"name\":\"thiserror\",\"req\":\"^2\"}],\"features\":{\"default\":[]}}", @@ -1334,13 +1330,12 @@ "matchers_0.2.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"syntax\",\"dfa-build\",\"dfa-search\"],\"name\":\"regex-automata\",\"req\":\"^0.4\"}],\"features\":{\"unicode\":[\"regex-automata/unicode\"]}}", "matchit_0.8.4": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"actix-router\",\"req\":\"^0.2.7\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.3.4\"},{\"kind\":\"dev\",\"name\":\"gonzales\",\"req\":\"^0.0.3-beta\"},{\"features\":[\"full\"],\"kind\":\"dev\",\"name\":\"hyper\",\"req\":\"^0.14\"},{\"kind\":\"dev\",\"name\":\"path-tree\",\"req\":\"^0.2.2\"},{\"kind\":\"dev\",\"name\":\"regex\",\"req\":\"^1.5.4\"},{\"kind\":\"dev\",\"name\":\"route-recognizer\",\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"routefinder\",\"req\":\"^0.5.2\"},{\"features\":[\"full\"],\"kind\":\"dev\",\"name\":\"tokio\",\"req\":\"^1\"},{\"features\":[\"make\",\"util\"],\"kind\":\"dev\",\"name\":\"tower\",\"req\":\"^0.4\"}],\"features\":{\"__test_helpers\":[],\"default\":[]}}", "matchit_0.9.1": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"actix-router\",\"req\":\"^0.5\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.5\"},{\"kind\":\"dev\",\"name\":\"gonzales\",\"req\":\"^0.0.3-beta\"},{\"kind\":\"dev\",\"name\":\"http-body-util\",\"req\":\"^0.1\"},{\"features\":[\"http1\",\"server\"],\"kind\":\"dev\",\"name\":\"hyper\",\"req\":\"^1\"},{\"features\":[\"tokio\"],\"kind\":\"dev\",\"name\":\"hyper-util\",\"req\":\"^0.1\"},{\"kind\":\"dev\",\"name\":\"path-tree\",\"req\":\"^0.8\"},{\"kind\":\"dev\",\"name\":\"regex\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"route-recognizer\",\"req\":\"^0.3\"},{\"kind\":\"dev\",\"name\":\"routefinder\",\"req\":\"^0.5\"},{\"features\":[\"full\"],\"kind\":\"dev\",\"name\":\"tokio\",\"req\":\"^1\"},{\"features\":[\"make\",\"util\"],\"kind\":\"dev\",\"name\":\"tower\",\"req\":\"^0.5.2\"},{\"kind\":\"dev\",\"name\":\"wayfind\",\"req\":\"^0.8\"}],\"features\":{\"__test_helpers\":[],\"default\":[]}}", - "maybe-async_0.2.10": "{\"dependencies\":[{\"features\":[\"attributes\"],\"kind\":\"dev\",\"name\":\"async-std\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"async-trait\",\"req\":\"^0.1\"},{\"name\":\"proc-macro2\",\"req\":\"^1.0\"},{\"name\":\"quote\",\"req\":\"^1.0\"},{\"features\":[\"visit-mut\",\"full\"],\"name\":\"syn\",\"req\":\"^2.0\"},{\"features\":[\"macros\",\"rt-multi-thread\"],\"kind\":\"dev\",\"name\":\"tokio\",\"req\":\"^1\"},{\"features\":[\"diff\"],\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1\"}],\"features\":{\"default\":[],\"is_sync\":[]}}", "md-5_0.10.6": "{\"dependencies\":[{\"name\":\"cfg-if\",\"req\":\"^1.0\"},{\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"features\":[\"dev\"],\"kind\":\"dev\",\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.2.2\"},{\"name\":\"md5-asm\",\"optional\":true,\"req\":\"^0.5\",\"target\":\"cfg(any(target_arch = \\\"x86\\\", target_arch = \\\"x86_64\\\"))\"}],\"features\":{\"asm\":[\"md5-asm\"],\"default\":[\"std\"],\"force-soft\":[],\"loongarch64_asm\":[],\"oid\":[\"digest/oid\"],\"std\":[\"digest/std\"]}}", "md-5_0.11.0": "{\"dependencies\":[{\"name\":\"cfg-if\",\"req\":\"^1\"},{\"name\":\"digest\",\"req\":\"^0.11\"},{\"features\":[\"dev\"],\"kind\":\"dev\",\"name\":\"digest\",\"req\":\"^0.11\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^1\"}],\"features\":{\"alloc\":[\"digest/alloc\"],\"default\":[\"alloc\",\"oid\"],\"oid\":[\"digest/oid\"],\"zeroize\":[\"digest/zeroize\"]}}", "md5_0.8.0": "{\"dependencies\":[],\"features\":{\"default\":[\"std\"],\"std\":[]}}", "memchr_2.8.0": "{\"dependencies\":[{\"name\":\"core\",\"optional\":true,\"package\":\"rustc-std-workspace-core\",\"req\":\"^1.0.0\"},{\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.20\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1.0.3\"}],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"libc\":[],\"logging\":[\"dep:log\"],\"rustc-dep-of-std\":[\"core\"],\"std\":[\"alloc\"],\"use_std\":[\"std\"]}}", "memchr_2.8.1": "{\"dependencies\":[{\"name\":\"core\",\"optional\":true,\"package\":\"rustc-std-workspace-core\",\"req\":\"^1.0.0\"},{\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.20\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1.0.3\"}],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"libc\":[],\"logging\":[\"dep:log\"],\"rustc-dep-of-std\":[\"core\"],\"std\":[\"alloc\"],\"use_std\":[\"std\"]}}", - "memmap2_0.9.10": "{\"dependencies\":[{\"name\":\"libc\",\"req\":\"^0.2.151\",\"target\":\"cfg(unix)\"},{\"kind\":\"dev\",\"name\":\"owning_ref\",\"req\":\"^0.4.1\"},{\"name\":\"stable_deref_trait\",\"optional\":true,\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3\"}],\"features\":{}}", + "memmap2_0.9.11": "{\"dependencies\":[{\"name\":\"libc\",\"req\":\"^0.2.151\",\"target\":\"cfg(unix)\"},{\"kind\":\"dev\",\"name\":\"owning_ref\",\"req\":\"^0.4.1\"},{\"name\":\"stable_deref_trait\",\"optional\":true,\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3\"}],\"features\":{}}", "memmem_0.1.1": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^0.2\"}],\"features\":{}}", "memoffset_0.9.1": "{\"dependencies\":[{\"kind\":\"build\",\"name\":\"autocfg\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"doc-comment\",\"req\":\"^0.3\"}],\"features\":{\"default\":[],\"unstable_const\":[],\"unstable_offset_of\":[]}}", "mime_0.3.17": "{\"dependencies\":[],\"features\":{}}", @@ -1506,7 +1501,7 @@ "proc-macro-error3_3.1.1": "{\"dependencies\":[{\"name\":\"proc-macro-error-attr3\",\"req\":\"=3.1.1\"},{\"name\":\"proc-macro2\",\"req\":\"^1.0.91\"},{\"name\":\"quote\",\"req\":\"^1.0.35\"},{\"default_features\":false,\"name\":\"syn2\",\"optional\":true,\"package\":\"syn\",\"req\":\"^2.0.46\"},{\"default_features\":false,\"name\":\"syn3\",\"optional\":true,\"package\":\"syn\",\"req\":\"^3\"},{\"features\":[\"full\"],\"kind\":\"dev\",\"name\":\"syn3\",\"package\":\"syn\",\"req\":\"^3\"},{\"features\":[\"diff\"],\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.99\"}],\"features\":{\"__ui_tests\":[],\"default\":[\"syn3-error\"],\"nightly\":[],\"syn-error\":[\"syn3-error\"],\"syn2-error\":[\"dep:syn2\"],\"syn3-error\":[\"dep:syn3\"]}}", "proc-macro2_1.0.106": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"flate2\",\"req\":\"^1.0\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"quote\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"rayon\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"rustversion\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"tar\",\"req\":\"^0.4\"},{\"name\":\"unicode-ident\",\"req\":\"^1.0\"}],\"features\":{\"default\":[\"proc-macro\"],\"nightly\":[],\"proc-macro\":[],\"span-locations\":[]}}", "process-wrap_10.0.0": "{\"dependencies\":[{\"name\":\"futures\",\"optional\":true,\"req\":\"^0.3.30\"},{\"name\":\"indexmap\",\"req\":\"^2.9.0\"},{\"default_features\":false,\"features\":[\"fs\",\"poll\",\"signal\"],\"name\":\"nix\",\"optional\":true,\"req\":\"^0.31.1\",\"target\":\"cfg(unix)\"},{\"kind\":\"dev\",\"name\":\"remoteprocess\",\"req\":\"^0.5.0\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.20.0\"},{\"features\":[\"io-util\",\"macros\",\"process\",\"rt\"],\"name\":\"tokio\",\"optional\":true,\"req\":\"^1.38.2\"},{\"features\":[\"io-util\",\"macros\",\"process\",\"rt\",\"rt-multi-thread\",\"time\"],\"kind\":\"dev\",\"name\":\"tokio\",\"req\":\"^1.38.2\"},{\"name\":\"tracing\",\"optional\":true,\"req\":\"^0.1.40\"},{\"name\":\"windows\",\"optional\":true,\"req\":\"^0.62.2\",\"target\":\"cfg(windows)\"}],\"features\":{\"creation-flags\":[\"dep:windows\",\"windows/Win32_System_Threading\"],\"default\":[\"creation-flags\",\"job-object\",\"kill-on-drop\",\"process-group\",\"process-session\",\"tracing\"],\"job-object\":[\"dep:windows\",\"windows/Win32_Security\",\"windows/Win32_System_Diagnostics_ToolHelp\",\"windows/Win32_System_IO\",\"windows/Win32_System_JobObjects\",\"windows/Win32_System_Threading\"],\"kill-on-drop\":[],\"process-group\":[],\"process-session\":[\"process-group\"],\"reset-sigmask\":[],\"std\":[\"dep:nix\"],\"tokio1\":[\"dep:nix\",\"dep:futures\",\"dep:tokio\"],\"tracing\":[\"dep:tracing\"]}}", - "prodash_31.0.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"argh\",\"req\":\"^0.1.3\"},{\"kind\":\"dev\",\"name\":\"async-executor\",\"req\":\"^1.1.0\"},{\"name\":\"async-io\",\"optional\":true,\"req\":\"^2.2.1\"},{\"kind\":\"dev\",\"name\":\"async-io\",\"req\":\"^2.2.1\"},{\"kind\":\"dev\",\"name\":\"blocking\",\"req\":\"^1.0.0\"},{\"name\":\"bytesize\",\"optional\":true,\"req\":\"^2.0.1\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.1\"},{\"default_features\":false,\"name\":\"crosstermion\",\"optional\":true,\"req\":\"^0.16.0\"},{\"default_features\":false,\"features\":[\"termination\"],\"name\":\"ctrlc\",\"optional\":true,\"req\":\"^3.1.4\"},{\"default_features\":false,\"name\":\"dashmap\",\"optional\":true,\"req\":\"^6.0.1\"},{\"default_features\":false,\"features\":[\"humantime\"],\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11.0\"},{\"kind\":\"dev\",\"name\":\"futures\",\"req\":\"^0.3.5\"},{\"default_features\":false,\"name\":\"futures-core\",\"optional\":true,\"req\":\"^0.3.4\"},{\"name\":\"futures-lite\",\"optional\":true,\"req\":\"^2.1.0\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"futures-util\",\"req\":\"^0.3.4\"},{\"name\":\"human_format\",\"optional\":true,\"req\":\"^1.0.3\"},{\"name\":\"is-terminal\",\"optional\":true,\"req\":\"^0.4.9\"},{\"kind\":\"dev\",\"name\":\"is-terminal\",\"req\":\"^0.4.9\"},{\"name\":\"jiff\",\"optional\":true,\"req\":\"^0.2.4\"},{\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.8\"},{\"kind\":\"dev\",\"name\":\"once_cell\",\"req\":\"^1.4.0\"},{\"default_features\":false,\"name\":\"parking_lot\",\"optional\":true,\"req\":\"^0.12.1\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8.1\"},{\"default_features\":false,\"name\":\"signal-hook\",\"optional\":true,\"req\":\"^0.4.1\"},{\"default_features\":false,\"name\":\"tui\",\"optional\":true,\"package\":\"ratatui\",\"req\":\"^0.30.0\"},{\"name\":\"tui-react\",\"optional\":true,\"req\":\"^0.24.0\"},{\"name\":\"unicode-segmentation\",\"optional\":true,\"req\":\"^1.6.0\"},{\"name\":\"unicode-width\",\"optional\":true,\"req\":\"^0.2.2\"}],\"features\":{\"default\":[\"progress-tree\"],\"local-time\":[\"jiff\"],\"progress-log\":[\"log\"],\"progress-tree\":[\"parking_lot\"],\"progress-tree-hp-hashmap\":[\"dashmap\"],\"progress-tree-log\":[\"log\"],\"render-line\":[\"crosstermion/color\",\"jiff\",\"unicode-width\"],\"render-line-autoconfigure\":[\"is-terminal\"],\"render-line-crossterm\":[\"crosstermion/crossterm\"],\"render-tui\":[\"tui\",\"unicode-segmentation\",\"unicode-width\",\"crosstermion/input-async\",\"tui-react\",\"futures-lite\",\"futures-core\",\"async-io\",\"jiff\"],\"render-tui-crossterm\":[\"crosstermion/tui-react-crossterm\",\"crosstermion/input-async-crossterm\"],\"unit-bytes\":[\"bytesize\"],\"unit-duration\":[\"jiff\"],\"unit-human\":[\"human_format\"]}}", + "prodash_31.0.1": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"argh\",\"req\":\"^0.1.19\"},{\"kind\":\"dev\",\"name\":\"async-executor\",\"req\":\"^1.14.0\"},{\"name\":\"async-io\",\"optional\":true,\"req\":\"^2.2.1\"},{\"kind\":\"dev\",\"name\":\"async-io\",\"req\":\"^2.2.1\"},{\"kind\":\"dev\",\"name\":\"blocking\",\"req\":\"^1.0.0\"},{\"name\":\"bytesize\",\"optional\":true,\"req\":\"^2.0.1\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"default_features\":false,\"name\":\"crosstermion\",\"optional\":true,\"req\":\"^0.16.0\"},{\"default_features\":false,\"features\":[\"termination\"],\"name\":\"ctrlc\",\"optional\":true,\"req\":\"^3.5.2\"},{\"default_features\":false,\"name\":\"dashmap\",\"optional\":true,\"req\":\"^6.2.1\"},{\"default_features\":false,\"features\":[\"humantime\"],\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11.10\"},{\"kind\":\"dev\",\"name\":\"futures\",\"req\":\"^0.3.32\"},{\"default_features\":false,\"name\":\"futures-core\",\"optional\":true,\"req\":\"^0.3.32\"},{\"name\":\"futures-lite\",\"optional\":true,\"req\":\"^2.1.0\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"futures-util\",\"req\":\"^0.3.32\"},{\"name\":\"human_format\",\"optional\":true,\"req\":\"^1.2.1\"},{\"name\":\"jiff\",\"optional\":true,\"req\":\"^0.2.27\"},{\"name\":\"log\",\"optional\":true,\"req\":\"^0.4.30\"},{\"kind\":\"dev\",\"name\":\"once_cell\",\"req\":\"^1.21.4\"},{\"default_features\":false,\"name\":\"parking_lot\",\"optional\":true,\"req\":\"^0.12.1\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.10.1\"},{\"default_features\":false,\"name\":\"signal-hook\",\"optional\":true,\"req\":\"^0.4.4\"},{\"default_features\":false,\"name\":\"tui\",\"optional\":true,\"package\":\"ratatui\",\"req\":\"^0.30.0\"},{\"name\":\"tui-react\",\"optional\":true,\"req\":\"^0.24.0\"},{\"name\":\"unicode-segmentation\",\"optional\":true,\"req\":\"^1.13.2\"},{\"name\":\"unicode-width\",\"optional\":true,\"req\":\"^0.2.2\"}],\"features\":{\"default\":[\"progress-tree\"],\"local-time\":[\"jiff\"],\"progress-log\":[\"log\"],\"progress-tree\":[\"parking_lot\"],\"progress-tree-hp-hashmap\":[\"dashmap\"],\"progress-tree-log\":[\"log\"],\"render-line\":[\"crosstermion/color\",\"jiff\",\"unicode-width\"],\"render-line-autoconfigure\":[],\"render-line-crossterm\":[\"crosstermion/crossterm\"],\"render-tui\":[\"tui\",\"unicode-segmentation\",\"unicode-width\",\"crosstermion/input-async\",\"tui-react\",\"futures-lite\",\"futures-core\",\"async-io\",\"jiff\"],\"render-tui-crossterm\":[\"crosstermion/tui-react-crossterm\",\"crosstermion/input-async-crossterm\"],\"unit-bytes\":[\"bytesize\"],\"unit-duration\":[\"jiff\"],\"unit-human\":[\"human_format\"]}}", "proptest_1.9.0": "{\"dependencies\":[{\"name\":\"bit-set\",\"optional\":true,\"req\":\"^0.8.0\"},{\"name\":\"bit-vec\",\"optional\":true,\"req\":\"^0.8.0\"},{\"name\":\"bitflags\",\"req\":\"^2.9\"},{\"default_features\":false,\"name\":\"num-traits\",\"req\":\"^0.2.15\"},{\"name\":\"proptest-macro\",\"optional\":true,\"req\":\"^0.4.0\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"rand\",\"req\":\"^0.9\"},{\"default_features\":false,\"name\":\"rand_chacha\",\"req\":\"^0.9\"},{\"name\":\"rand_xorshift\",\"req\":\"^0.4\"},{\"kind\":\"dev\",\"name\":\"regex\",\"req\":\"^1.0\"},{\"name\":\"regex-syntax\",\"optional\":true,\"req\":\"^0.8\"},{\"default_features\":false,\"name\":\"rusty-fork\",\"optional\":true,\"req\":\"^0.3.0\"},{\"name\":\"tempfile\",\"optional\":true,\"req\":\"^3.0\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"=1.0.112\"},{\"name\":\"unarray\",\"req\":\"^0.1.4\"},{\"name\":\"x86\",\"optional\":true,\"req\":\"^0.52.0\"}],\"features\":{\"alloc\":[],\"atomic64bit\":[],\"attr-macro\":[\"proptest-macro\"],\"bit-set\":[\"dep:bit-set\",\"dep:bit-vec\"],\"default\":[\"std\",\"fork\",\"timeout\",\"bit-set\"],\"default-code-coverage\":[\"std\",\"fork\",\"timeout\",\"bit-set\"],\"fork\":[\"std\",\"rusty-fork\",\"tempfile\"],\"handle-panics\":[\"std\"],\"hardware-rng\":[\"x86\"],\"no_std\":[\"num-traits/libm\"],\"std\":[\"rand/std\",\"rand/os_rng\",\"regex-syntax\",\"num-traits/std\"],\"timeout\":[\"fork\",\"rusty-fork/timeout\"],\"unstable\":[]}}", "prost-build_0.14.3": "{\"dependencies\":[{\"default_features\":false,\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11\"},{\"name\":\"heck\",\"req\":\">=0.4, <=0.5\"},{\"default_features\":false,\"features\":[\"use_alloc\"],\"name\":\"itertools\",\"req\":\">=0.10, <=0.14\"},{\"name\":\"log\",\"req\":\"^0.4.4\"},{\"default_features\":false,\"name\":\"multimap\",\"req\":\">=0.8, <=0.10\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"petgraph\",\"req\":\"^0.8\"},{\"name\":\"prettyplease\",\"optional\":true,\"req\":\"^0.2\"},{\"default_features\":false,\"name\":\"prost\",\"req\":\"^0.14.3\"},{\"default_features\":false,\"name\":\"prost-types\",\"req\":\"^0.14.3\"},{\"default_features\":false,\"name\":\"pulldown-cmark\",\"optional\":true,\"req\":\"^0.13\"},{\"name\":\"pulldown-cmark-to-cmark\",\"optional\":true,\"req\":\"^22\"},{\"default_features\":false,\"features\":[\"std\",\"unicode-bool\"],\"name\":\"regex\",\"req\":\"^1.8.1\"},{\"features\":[\"full\"],\"name\":\"syn\",\"optional\":true,\"req\":\"^2\"},{\"name\":\"tempfile\",\"req\":\"^3\"}],\"features\":{\"cleanup-markdown\":[\"dep:pulldown-cmark\",\"dep:pulldown-cmark-to-cmark\"],\"default\":[\"format\"],\"format\":[\"dep:prettyplease\",\"dep:syn\"]}}", "prost-derive_0.14.3": "{\"dependencies\":[{\"name\":\"anyhow\",\"req\":\"^1.0.1\"},{\"name\":\"itertools\",\"req\":\">=0.10.1, <=0.14\"},{\"name\":\"proc-macro2\",\"req\":\"^1.0.60\"},{\"name\":\"quote\",\"req\":\"^1\"},{\"features\":[\"extra-traits\"],\"name\":\"syn\",\"req\":\"^2\"}],\"features\":{}}", @@ -1712,10 +1707,10 @@ "serial2_0.2.33": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"assert2\",\"req\":\"^0.3.11\"},{\"name\":\"cfg-if\",\"req\":\"^1.0.0\",\"target\":\"cfg(unix)\"},{\"name\":\"libc\",\"req\":\"^0.2.109\",\"target\":\"cfg(unix)\"},{\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0.108\"},{\"features\":[\"commapi\",\"fileapi\",\"handleapi\",\"ioapiset\",\"std\",\"synchapi\",\"winbase\",\"winerror\",\"winreg\"],\"name\":\"winapi\",\"req\":\"^0.3.9\",\"target\":\"cfg(windows)\"}],\"features\":{\"doc\":[],\"doc-cfg\":[],\"rs4xx\":[],\"serde\":[\"dep:serde\"],\"unix\":[],\"windows\":[]}}", "serial_test_3.3.1": "{\"dependencies\":[{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2\"},{\"default_features\":false,\"name\":\"env_logger\",\"optional\":true,\"req\":\">=0.6.1\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"fslock\",\"optional\":true,\"req\":\"^0.2\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"futures-executor\",\"optional\":true,\"req\":\"^0.3\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"futures-util\",\"optional\":true,\"req\":\"^0.3\"},{\"default_features\":false,\"features\":[\"use_std\"],\"kind\":\"dev\",\"name\":\"itertools\",\"req\":\">=0.4\"},{\"name\":\"log\",\"optional\":true,\"req\":\">=0.4.4\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"once_cell\",\"req\":\"^1.19\"},{\"default_features\":false,\"name\":\"parking_lot\",\"req\":\"^0.12\"},{\"default_features\":false,\"name\":\"scc\",\"req\":\"^2\"},{\"name\":\"serial_test_derive\",\"req\":\"~3.3.1\"}],\"features\":{\"async\":[\"dep:futures-executor\",\"dep:futures-util\",\"serial_test_derive/async\"],\"default\":[\"logging\",\"async\"],\"docsrs\":[\"dep:document-features\"],\"file_locks\":[\"dep:fslock\"],\"logging\":[\"dep:log\"],\"test_logging\":[\"logging\",\"dep:env_logger\",\"serial_test_derive/test_logging\"]}}", "serial_test_derive_3.3.1": "{\"dependencies\":[{\"default_features\":false,\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\">=0.6.1\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"prettyplease\",\"req\":\"^0.2\"},{\"default_features\":false,\"features\":[\"proc-macro\"],\"name\":\"proc-macro2\",\"req\":\"^1.0.60\"},{\"default_features\":false,\"name\":\"quote\",\"req\":\"^1\"},{\"default_features\":false,\"features\":[\"full\",\"printing\",\"parsing\",\"clone-impls\"],\"name\":\"syn\",\"req\":\"^2\"}],\"features\":{\"async\":[],\"default\":[],\"file_locks\":[],\"test_logging\":[]}}", - "sha1-checked_0.10.0": "{\"dependencies\":[{\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"features\":[\"dev\"],\"kind\":\"dev\",\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.4\"},{\"default_features\":false,\"features\":[\"compress\"],\"name\":\"sha1\",\"req\":\"^0.10.6\"},{\"default_features\":false,\"name\":\"zeroize\",\"optional\":true,\"req\":\"^1.7\"}],\"features\":{\"default\":[\"oid\",\"std\"],\"oid\":[\"digest/oid\",\"sha1/oid\"],\"std\":[\"digest/std\",\"sha1/std\"],\"zeroize\":[\"dep:zeroize\"]}}", "sha1_0.10.6": "{\"dependencies\":[{\"name\":\"cfg-if\",\"req\":\"^1.0\"},{\"name\":\"cpufeatures\",\"req\":\"^0.2\",\"target\":\"cfg(any(target_arch = \\\"aarch64\\\", target_arch = \\\"x86\\\", target_arch = \\\"x86_64\\\"))\"},{\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"features\":[\"dev\"],\"kind\":\"dev\",\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.2.2\"},{\"name\":\"sha1-asm\",\"optional\":true,\"req\":\"^0.5\",\"target\":\"cfg(any(target_arch = \\\"aarch64\\\", target_arch = \\\"x86\\\", target_arch = \\\"x86_64\\\"))\"}],\"features\":{\"asm\":[\"sha1-asm\"],\"compress\":[],\"default\":[\"std\"],\"force-soft\":[],\"loongarch64_asm\":[],\"oid\":[\"digest/oid\"],\"std\":[\"digest/std\"]}}", "sha1_0.11.0": "{\"dependencies\":[{\"name\":\"cfg-if\",\"req\":\"^1.0\"},{\"name\":\"cpufeatures\",\"req\":\"^0.3\",\"target\":\"cfg(any(target_arch = \\\"aarch64\\\", target_arch = \\\"x86\\\", target_arch = \\\"x86_64\\\"))\"},{\"name\":\"digest\",\"req\":\"^0.11\"},{\"features\":[\"dev\"],\"kind\":\"dev\",\"name\":\"digest\",\"req\":\"^0.11\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^1\"}],\"features\":{\"alloc\":[\"digest/alloc\"],\"default\":[\"alloc\",\"oid\"],\"oid\":[\"digest/oid\"],\"zeroize\":[\"digest/zeroize\"]}}", "sha1_smol_1.0.1": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"openssl\",\"req\":\"^0.10\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.4\"},{\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"}],\"features\":{\"alloc\":[],\"std\":[\"alloc\"]}}", + "sha1dc_0.1.5": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^1\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"quickcheck\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"sha1\",\"req\":\"^0.11\"}],\"features\":{\"default\":[\"std\"],\"std\":[]}}", "sha2_0.10.9": "{\"dependencies\":[{\"name\":\"cfg-if\",\"req\":\"^1.0\"},{\"name\":\"cpufeatures\",\"req\":\"^0.2\",\"target\":\"cfg(any(target_arch = \\\"aarch64\\\", target_arch = \\\"x86_64\\\", target_arch = \\\"x86\\\"))\"},{\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"features\":[\"dev\"],\"kind\":\"dev\",\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.2.2\"},{\"name\":\"sha2-asm\",\"optional\":true,\"req\":\"^0.6.1\",\"target\":\"cfg(any(target_arch = \\\"aarch64\\\", target_arch = \\\"x86_64\\\", target_arch = \\\"x86\\\"))\"}],\"features\":{\"asm\":[\"sha2-asm\"],\"asm-aarch64\":[\"asm\"],\"compress\":[],\"default\":[\"std\"],\"force-soft\":[],\"force-soft-compact\":[],\"loongarch64_asm\":[],\"oid\":[\"digest/oid\"],\"std\":[\"digest/std\"]}}", "sha2_0.11.0": "{\"dependencies\":[{\"name\":\"cfg-if\",\"req\":\"^1\"},{\"name\":\"cpufeatures\",\"req\":\"^0.3\",\"target\":\"cfg(any(target_arch = \\\"aarch64\\\", target_arch = \\\"x86_64\\\", target_arch = \\\"x86\\\"))\"},{\"name\":\"digest\",\"req\":\"^0.11\"},{\"features\":[\"dev\"],\"kind\":\"dev\",\"name\":\"digest\",\"req\":\"^0.11\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^1\"}],\"features\":{\"alloc\":[\"digest/alloc\"],\"default\":[\"alloc\",\"oid\"],\"oid\":[\"digest/oid\"],\"zeroize\":[\"digest/zeroize\"]}}", "sha3_0.10.9": "{\"dependencies\":[{\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"features\":[\"dev\"],\"kind\":\"dev\",\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.2.2\"},{\"name\":\"keccak\",\"req\":\"^0.1.4\"},{\"default_features\":false,\"name\":\"zeroize\",\"optional\":true,\"req\":\"^1.6.0\"}],\"features\":{\"asm\":[\"keccak/asm\"],\"default\":[\"std\"],\"oid\":[\"digest/oid\"],\"reset\":[],\"std\":[\"digest/std\"]}}", diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index eb392ab371..094cd52d20 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -254,7 +254,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -265,7 +265,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -745,9 +745,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-config" @@ -6254,6 +6254,46 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" +[[package]] +name = "defmt" +version = "0.3.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" +dependencies = [ + "defmt 1.1.1", +] + +[[package]] +name = "defmt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1" +dependencies = [ + "bitflags 1.3.2", + "defmt-macros", +] + +[[package]] +name = "defmt-macros" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8" +dependencies = [ + "defmt-parser", + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "defmt-parser" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" +dependencies = [ + "thiserror 2.0.18", +] + [[package]] name = "deltae" version = "0.3.2" @@ -6492,7 +6532,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6849,7 +6889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -6954,21 +6994,23 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "faster-hex" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7223ae2d2f179b803433d9c830478527e92b8117eab39460edae7f1614d9fb73" +checksum = "04839bdf9d8c10f66806fad16b852fc72aab80873aebc3cb69d85b4fa41543ed" dependencies = [ + "autocfg", + "defmt 0.3.100", "heapless 0.8.0", "serde", ] [[package]] name = "fastrand" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" dependencies = [ - "getrandom 0.2.17", + "getrandom 0.4.2", ] [[package]] @@ -7501,160 +7543,108 @@ dependencies = [ "gobject-sys", "libc", "system-deps", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "gix" -version = "0.81.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0473c64d9ccbcfb9953a133b47c8b9a335b87ac6c52b983ee4b03d49000b0f3f" +checksum = "2156d2e07fc3afa7632a82bf3cb0db91f995645a2852f642105c9ac9b52e1cb2" dependencies = [ "gix-actor", - "gix-archive", - "gix-blame", "gix-commitgraph", "gix-config", "gix-date", "gix-diff", - "gix-dir", "gix-discover", "gix-error", - "gix-features", - "gix-filter", "gix-fs", "gix-glob", "gix-hash", "gix-hashtable", - "gix-index", "gix-lock", - "gix-merge", - "gix-negotiate", + "gix-note", "gix-object", "gix-odb", "gix-pack", + "gix-parallel", "gix-path", "gix-protocol", + "gix-quote", "gix-ref", "gix-refspec", "gix-revision", "gix-revwalk", "gix-sec", "gix-shallow", - "gix-status", - "gix-submodule", "gix-tempfile", "gix-trace", "gix-traverse", "gix-url", "gix-utils", "gix-validate", - "gix-worktree", - "gix-worktree-state", "gix-worktree-stream", + "gix-zlib", "nonempty", "smallvec", - "thiserror 2.0.18", ] [[package]] name = "gix-actor" -version = "0.40.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e5e5b518339d5e6718af108fd064d4e9ba33caf728cf487352873d76411df35" +checksum = "2127da41042965ed205568a52443465806944f71c8acd73f48ec94b8cd8e798e" dependencies = [ "bstr", "gix-date", "gix-error", - "winnow 0.7.14", -] - -[[package]] -name = "gix-archive" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "651c99be11aac9b303483193ae50b45eb6e094da4f5ed797019b03948f51aad6" -dependencies = [ - "bstr", - "gix-date", - "gix-error", - "gix-object", - "gix-worktree-stream", ] [[package]] name = "gix-attributes" -version = "0.31.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c233d6eaa098c0ca5ce03236fd7a96e27f1abe72fad74b46003fbd11fe49563c" +checksum = "0feca0b8919aba9f123b75de54062dd61eb37d2a2130f34be520da6ed8b8ef72" dependencies = [ "bstr", + "gix-error", "gix-glob", + "gix-parallel", "gix-path", "gix-quote", "gix-trace", - "kstring", "smallvec", - "thiserror 2.0.18", "unicode-bom", ] -[[package]] -name = "gix-bitmap" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7add20f40d060db8c9b1314d499bac6ed7480f33eb113ce3e1cf5d6ff85d989" -dependencies = [ - "gix-error", -] - -[[package]] -name = "gix-blame" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77aaf9f7348f4da3ebfbfbbc35fa0d07155d98377856198dde6f695fd648705" -dependencies = [ - "gix-commitgraph", - "gix-date", - "gix-diff", - "gix-error", - "gix-hash", - "gix-object", - "gix-revwalk", - "gix-trace", - "gix-traverse", - "gix-worktree", - "smallvec", - "thiserror 2.0.18", -] - [[package]] name = "gix-chunk" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1096b6608fbe5d27fb4984e20f992b4e76fb8c613f6acb87d07c5831b53a6959" +checksum = "626335faf30ed235744642c2309aa370683b8bb2757f1c22a807e274dff60074" dependencies = [ "gix-error", ] [[package]] name = "gix-command" -version = "0.8.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b849c65a609f50d02f8a2774fe371650b3384a743c79c2a070ce0da49b7fb7da" +checksum = "ac560c05e19455016a4a94b33a77debe59aaed8783da32a73d31c9975947152e" dependencies = [ "bstr", + "gix-error", "gix-path", "gix-quote", "gix-trace", - "shell-words", ] [[package]] name = "gix-commitgraph" -version = "0.35.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3196655fd1443f3c58a48c114aa480be3e4e87b393d7292daaa0d543862eb445" +checksum = "dfede9936d4b789867c09722576aea4ceb0e3aacf962eef035ebab0686b41a80" dependencies = [ "bstr", "gix-chunk", @@ -7666,145 +7656,97 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.54.0" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08939b4c4ed7a663d0e64be9e1e9bdf23a1fb4fcee1febdf449f12229542e50d" +checksum = "65a9c000fa9a9154f22ffc8f8d74426e9300d759c2029e8701e2ba39d5d464ea" dependencies = [ "bstr", "gix-config-value", - "gix-features", + "gix-error", "gix-glob", + "gix-parallel", "gix-path", "gix-ref", "gix-sec", - "memchr", + "gix-trace", + "gix-utils", "smallvec", - "thiserror 2.0.18", "unicode-bom", - "winnow 0.7.14", ] [[package]] name = "gix-config-value" -version = "0.17.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "441a300bc3645a1f45cba495b9175f90f47256ce43f2ee161da0031e3ac77c92" +checksum = "ab206c2fccfd35e0de7fb1b424997cfd42912062c66dae024e08a06e22d46674" dependencies = [ "bitflags 2.13.1", "bstr", + "gix-error", "gix-path", + "gix-utils", "libc", - "thiserror 2.0.18", ] [[package]] name = "gix-date" -version = "0.15.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39acf819aa9fee65e4838a2eec5cb2506e47ebb89e02a5ab9918196e491571ea" +checksum = "0f7eeeecc599082f32b5ea6a8c4c734e38be9730e2c09e3fe2851bb4692393e9" dependencies = [ "bstr", "gix-error", "itoa", "jiff", - "smallvec", ] [[package]] name = "gix-diff" -version = "0.61.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88f3b3475e5d3877d7c30c40827cc2441936ce890efc226e5ba4afe3a7ae33f0" +checksum = "aa640963fdcbc6b4718e48593c3917f5ae764b59fb5a96313cb5a757246d041d" dependencies = [ "bstr", - "gix-command", - "gix-filter", - "gix-fs", + "gix-error", "gix-hash", "gix-object", - "gix-path", - "gix-tempfile", - "gix-trace", - "gix-traverse", - "gix-worktree", - "imara-diff 0.1.8", - "imara-diff 0.2.0", - "thiserror 2.0.18", -] - -[[package]] -name = "gix-dir" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da4604a360988f0ba8efe6f90093ca5a844f4a7f8e1a3dcda501ec44e600ea9" -dependencies = [ - "bstr", - "gix-discover", - "gix-fs", - "gix-ignore", - "gix-index", - "gix-object", - "gix-path", - "gix-pathspec", - "gix-trace", - "gix-utils", - "gix-worktree", - "thiserror 2.0.18", ] [[package]] name = "gix-discover" -version = "0.49.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65bd3330fe0cb9d40d875bf862fd5e8ad6fa4164ddbc4842fbeb889c3f0b2c6" +checksum = "a7d0f8fd2c7e4b458eb3081362d49b54bd0131d23ecd49be802085a11f0d3cee" dependencies = [ "bstr", "dunce", + "gix-error", "gix-fs", "gix-path", "gix-ref", "gix-sec", - "thiserror 2.0.18", ] [[package]] name = "gix-error" -version = "0.2.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e86d01da904d4a9265def43bd42a18c5e6dc7000a73af512946ba14579c9fbd" +checksum = "aef6406003c4117d640329fe2c35386f4e137a628bb28d3f50209db159b48bc4" dependencies = [ "bstr", ] -[[package]] -name = "gix-features" -version = "0.46.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752493cd4b1d5eaaa0138a7493f65c96863fefa990fc021e0e519579e389ab20" -dependencies = [ - "bytes", - "crc32fast", - "gix-path", - "gix-trace", - "gix-utils", - "libc", - "once_cell", - "prodash", - "thiserror 2.0.18", - "walkdir", - "zlib-rs 0.6.3", -] - [[package]] name = "gix-filter" -version = "0.28.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37598282a6566da6fb52667570c7fe0aedcb122ac886724a9e62a2180523e35" +checksum = "9d8d932ee4043f7d77d15ee58d2be2bc95accea5dd1d77fd145de1b7c504551b" dependencies = [ "bstr", "encoding_rs", "gix-attributes", "gix-command", + "gix-error", "gix-hash", "gix-object", "gix-packetline", @@ -7813,274 +7755,218 @@ dependencies = [ "gix-trace", "gix-utils", "smallvec", - "thiserror 2.0.18", ] [[package]] name = "gix-fs" -version = "0.19.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a964b4aec683eb0bacb87533defa80805bb4768056371a47ab38b00a2d377b72" +checksum = "44a05d043e670c055cd8b53d078562dc0bc1e322bff6b0376b407d37cf72dcc5" dependencies = [ "bstr", - "fastrand", - "gix-features", + "gix-error", + "gix-parallel", "gix-path", "gix-utils", - "thiserror 2.0.18", + "libc", + "walkdir", ] [[package]] name = "gix-glob" -version = "0.24.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03e6cd88cc0dc1eafa1fddac0fb719e4e74b6ea58dd016e71125fde4a326bee" +checksum = "7b0d03ab50fa841621031960679caf7fe94940968d9a0736d12a580f2c03e525" dependencies = [ "bitflags 2.13.1", "bstr", - "gix-features", + "gix-fs", "gix-path", + "gix-trace", + "gix-utils", ] [[package]] name = "gix-hash" -version = "0.23.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fb896a02d9ab96fa518475a5f30ad3952010f801a8de5840f633f4a6b985dfb" +checksum = "40ca156064e378d8c657084365846cedb8dc498c6ea4500965a64d74f12af2be" dependencies = [ "faster-hex", - "gix-features", - "sha1-checked", - "thiserror 2.0.18", + "gix-error", + "gix-utils", + "sha1dc", ] [[package]] name = "gix-hashtable" -version = "0.13.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2664216fc5e89b51e756a4a3ac676315602ce2dac07acf1da959a22038d69b33" +checksum = "916cb6b2ec42ffaca624e7867bb382a4673015cb4ffcd7330b48085d02e4c615" dependencies = [ "gix-hash", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "parking_lot", ] -[[package]] -name = "gix-ignore" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f915dcf6911e3027537166d34e13f0fe101ed12225178d2ae29cd1272cff26" -dependencies = [ - "bstr", - "gix-glob", - "gix-path", - "gix-trace", - "unicode-bom", -] - -[[package]] -name = "gix-index" -version = "0.49.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bae54ab14e4e74d5dda60b82ea7afad7c8eb3be68283d6d5f29bd2e6d47fff7" -dependencies = [ - "bitflags 2.13.1", - "bstr", - "filetime", - "fnv", - "gix-bitmap", - "gix-features", - "gix-fs", - "gix-hash", - "gix-lock", - "gix-object", - "gix-traverse", - "gix-utils", - "gix-validate", - "hashbrown 0.16.1", - "itoa", - "libc", - "memmap2", - "rustix 1.1.4", - "smallvec", - "thiserror 2.0.18", -] - [[package]] name = "gix-lock" -version = "21.0.2" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054fbd0989700c69dc5aa80bc66944f05df1e15aa7391a9e42aca7366337905f" +checksum = "4b2f7f5bd6b9fcd0b0dc58b0e6a708f3a47c3313876571dfe800c926c069aa5c" dependencies = [ + "gix-error", + "gix-fs", "gix-tempfile", "gix-utils", - "thiserror 2.0.18", ] [[package]] -name = "gix-merge" -version = "0.14.0" +name = "gix-macros" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4606747466512d22c2dffc019142e1941238f543987ea51353c938cca80c500" +checksum = "f11f5429ca73cc3758c9f53af56a9fba100a8701c5b4bc30e29b8b0b15288991" dependencies = [ - "bstr", - "gix-command", - "gix-diff", - "gix-filter", - "gix-fs", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "gix-quote", - "gix-revision", - "gix-revwalk", - "gix-tempfile", - "gix-trace", - "gix-worktree", - "imara-diff 0.1.8", - "nonempty", - "thiserror 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.117", ] [[package]] -name = "gix-negotiate" -version = "0.29.0" +name = "gix-note" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea064c7595eea08fdd01c70748af747d9acc40f727b61f4c8a2145a5c5fc28c" +checksum = "bd364f8bdceaed9e7f3ae40f324b16e39f20e9c7e6a6a058f7c6ec66c3e6205c" dependencies = [ - "bitflags 2.13.1", - "gix-commitgraph", - "gix-date", + "gix-error", "gix-hash", "gix-object", - "gix-revwalk", ] [[package]] name = "gix-object" -version = "0.58.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cafb802bb688a7c1e69ef965612ff5ff859f046bfb616377e4a0ba4c01e43d47" +checksum = "f0e38f50177e211642af154f9a7f710b7a3a637e635f9b6adb9d51973b0f9209" dependencies = [ "bstr", "gix-actor", "gix-date", - "gix-features", + "gix-error", "gix-hash", "gix-hashtable", - "gix-path", "gix-utils", "gix-validate", "itoa", "smallvec", - "thiserror 2.0.18", - "winnow 0.7.14", ] [[package]] name = "gix-odb" -version = "0.78.0" +version = "0.86.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24833ae9323b4f7079575fb9f961cf9c414b0afbec428a536ab8e7dd93bc002b" +checksum = "ca444f33f2140876ed6b5313c2b550b4af699008193c96f3bff5023afa9ef4ea" dependencies = [ "arc-swap", - "gix-features", + "crc32fast", + "gix-error", "gix-fs", "gix-hash", "gix-hashtable", "gix-object", "gix-pack", + "gix-parallel", "gix-path", "gix-quote", + "gix-trace", + "gix-utils", + "gix-zlib", + "memmap2", "parking_lot", "tempfile", - "thiserror 2.0.18", ] [[package]] name = "gix-pack" -version = "0.68.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3484119cd19859d7d7639413c27e192478fa354d3f4ff5f7e3c041e8040f0f4" +checksum = "bc5024cc503cd29461a705ae90b9eae772fa8f0e6fafc1c48513877dc374de05" dependencies = [ "clru", + "crc32fast", "gix-chunk", "gix-error", - "gix-features", "gix-hash", "gix-hashtable", "gix-object", + "gix-parallel", "gix-path", + "gix-trace", + "gix-utils", + "gix-zlib", "memmap2", "smallvec", - "thiserror 2.0.18", ] [[package]] name = "gix-packetline" -version = "0.21.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be19313dcdb7dff75a3ce2f99be00878458295bcc3b6c7f0005591597573345c" +checksum = "830e51b227f6a925fe9308858ac91170dd00fa2880f5480fc81e8a4594fe2c35" dependencies = [ "bstr", "faster-hex", + "gix-error", "gix-trace", - "thiserror 2.0.18", +] + +[[package]] +name = "gix-parallel" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e994cf1eec247ba4be7f9e7c0d58cc73f83eecb5fcb9feb595df5ba3d2078546" +dependencies = [ + "crossbeam-channel", + "gix-trace", + "once_cell", + "parking_lot", ] [[package]] name = "gix-path" -version = "0.11.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c31d4373bda7fab9eb01822927b55185a378d6e1bf737e0a54c743ad806658" +checksum = "a6d563d4d0c975ed0df4e853f9ec962a2ba46633b1d324e1a5582541fcae0c6b" dependencies = [ "bstr", + "gix-error", "gix-trace", "gix-validate", - "thiserror 2.0.18", -] - -[[package]] -name = "gix-pathspec" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89611f13544ca5ebeb68a502673814ef57200df60c24a61c2ce7b96f612f08b" -dependencies = [ - "bitflags 2.13.1", - "bstr", - "gix-attributes", - "gix-config-value", - "gix-glob", - "gix-path", - "thiserror 2.0.18", ] [[package]] name = "gix-protocol" -version = "0.59.0" +version = "0.67.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38666350736b5877c79f57ddae02bde07a4ce186d889adc391e831cddcbe76" +checksum = "832b5dc46a3c0a6f6fa8f8e571c11074add4b545c6789799ae6d6c36ae1a294e" dependencies = [ "bstr", "gix-date", - "gix-features", + "gix-error", "gix-hash", + "gix-macros", "gix-ref", "gix-shallow", "gix-transport", "gix-utils", - "maybe-async", "nonempty", - "thiserror 2.0.18", - "winnow 0.7.14", ] [[package]] name = "gix-quote" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68533db71259c8776dd4e770d2b7b98696213ecdc1f5c9e3507119e274e0c578" +checksum = "c7f92bc1b13c09e88388578e8aa1e987ec35f28fca158c13b1baa7ab1a85b124" dependencies = [ "bstr", "gix-error", @@ -8089,48 +7975,43 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.61.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2159978abb99b7027c8579d15211e262ef0ef2594d5cecb3334fbcbdfe2997c" +checksum = "073bc0928e1f747823b1eaed94918119dacef4c616532bc3d17e5b7457863471" dependencies = [ "gix-actor", - "gix-features", + "gix-error", "gix-fs", "gix-hash", "gix-lock", "gix-object", + "gix-parallel", "gix-path", "gix-tempfile", "gix-utils", "gix-validate", "memmap2", - "thiserror 2.0.18", - "winnow 0.7.14", ] [[package]] name = "gix-refspec" -version = "0.39.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc806ee13f437428f8a1ba4c72ecfaa3f20e14f5f0d4c2bc17d0b33e794aa6ac" +checksum = "ccc7010dae0df2900aa77cc67f8aca042cd80e35938ccc179010d863b1d42a0c" dependencies = [ "bstr", "gix-error", - "gix-glob", "gix-hash", - "gix-revision", "gix-validate", "smallvec", - "thiserror 2.0.18", ] [[package]] name = "gix-revision" -version = "0.43.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c08f1ec5d1e6a524f8ba291c41f0ccaef64e48ed0e8cf790b3461cae45f6d3d" +checksum = "63210c1943b67fa700806c3c3486fc16a92b3ea871f5cf092340b8eec10a0ca1" dependencies = [ - "bitflags 2.13.1", "bstr", "gix-commitgraph", "gix-date", @@ -8138,15 +8019,14 @@ dependencies = [ "gix-hash", "gix-object", "gix-revwalk", - "gix-trace", "nonempty", ] [[package]] name = "gix-revwalk" -version = "0.29.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4b2b87772b21ca449249e86d32febadba5cba32b0fcce804ab9cefc6f2111c" +checksum = "800479fbbf1e7f94f663e07943a91add5499343e7aac611a81e6a0460fd44af6" dependencies = [ "gix-commitgraph", "gix-date", @@ -8155,14 +8035,13 @@ dependencies = [ "gix-hashtable", "gix-object", "smallvec", - "thiserror 2.0.18", ] [[package]] name = "gix-sec" -version = "0.13.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf82ae037de9c62850ce67beaa92ec8e3e17785ea307cdde7618edc215603b4f" +checksum = "5640f642a1b471616d48230b1def7ca743cb30903441ff84800cafbab3c0fddf" dependencies = [ "bitflags 2.13.1", "gix-path", @@ -8172,193 +8051,139 @@ dependencies = [ [[package]] name = "gix-shallow" -version = "0.10.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf60711c9083b2364b3fac8a352444af76b17201f3682fdebe74fa66d89a772" +checksum = "94bc0720a3d6b10f18e3ac382a7780bcfc4c6bee94a8b5857b8e4ec94c50d754" dependencies = [ "bstr", + "gix-error", "gix-hash", "gix-lock", "nonempty", - "thiserror 2.0.18", -] - -[[package]] -name = "gix-status" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d6c598e3fdbc352fba1c5ba7e709e69402fafbc44d9295edad2e3c4738996b" -dependencies = [ - "bstr", - "filetime", - "gix-diff", - "gix-dir", - "gix-features", - "gix-filter", - "gix-fs", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "gix-pathspec", - "gix-worktree", - "portable-atomic", - "thiserror 2.0.18", -] - -[[package]] -name = "gix-submodule" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5c3929c5e6821f651d35e8420f72fea3cfafe9fc1e928a61e718b462c72a5" -dependencies = [ - "bstr", - "gix-config", - "gix-path", - "gix-pathspec", - "gix-refspec", - "gix-url", - "thiserror 2.0.18", ] [[package]] name = "gix-tempfile" -version = "21.0.2" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22227f6b203f511ff451c33c89899e87e4f571fc596b06f68e6e613a6508528" +checksum = "e9275c8ae0646d840ae0156d3f90d39b7beea6e31a398afb9ee72feb293a269c" dependencies = [ - "dashmap", "gix-fs", "libc", "parking_lot", "tempfile", + "windows-sys 0.61.2", ] [[package]] name = "gix-trace" -version = "0.1.18" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69a13643b8437d4ca6845e08143e847a36ca82903eed13303475d0ae8b162e0" +checksum = "133f2de116104d637541831b6acb157898556d5eeec363ab2eb1c583adc6bb56" [[package]] name = "gix-transport" -version = "0.55.1" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a521e39c6235ce63ed6c001e2dd79818c830b82c3b7b59247ee7b229c39ec9bb" +checksum = "2e43d6b0097ea9f2f266d5d6c43b8f615ed3da7c686ec8771cd17c1cb33cb0de" dependencies = [ "bstr", "gix-command", - "gix-features", + "gix-error", "gix-packetline", + "gix-path", "gix-quote", "gix-sec", + "gix-trace", "gix-url", - "thiserror 2.0.18", + "gix-utils", ] [[package]] name = "gix-traverse" -version = "0.55.0" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963dc2afcdb611092aa587c3f9365e749ac0a0892ff27662dbc75f26c953fbec" +checksum = "a668a6e7f7688e5a43eaf161f1471ffc559de1a5fd8471e861c64d59d1699e1e" dependencies = [ "bitflags 2.13.1", "gix-commitgraph", "gix-date", + "gix-error", "gix-hash", "gix-hashtable", "gix-object", "gix-revwalk", "smallvec", - "thiserror 2.0.18", ] [[package]] name = "gix-url" -version = "0.35.2" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d28e8af3d42581190da884f013caf254d2fd4d6ab102408f08d21bfa11de6c8d" +checksum = "04317dea7a5dd5253bbcab060c230f3de6a57d17cc9600c6cd7030bf4795b414" dependencies = [ "bstr", + "gix-error", "gix-path", + "gix-utils", "percent-encoding", - "thiserror 2.0.18", ] [[package]] name = "gix-utils" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "befcdbdfb1238d2854591f760a48711bed85e72d80a10e8f2f93f656746ef7c5" +checksum = "830639b49e83df93de7803ff0031a6c82d2a395dec7c4a068e37e97b0ce61bca" dependencies = [ "bstr", + "bytes", "fastrand", + "getrandom 0.4.2", + "gix-error", + "prodash", "unicode-normalization", ] [[package]] name = "gix-validate" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec1eff98d91941f47766367cba1be746bab662bad761d9891ae6f7882f7840b" +checksum = "cbcd59cc52742468bc5c8a0e7123390d154f45e6cbd37461b0dcecdc681f2179" dependencies = [ "bstr", -] - -[[package]] -name = "gix-worktree" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6bd5830cbc43c9c00918b826467d2afad685b195cb82329cde2b2d116d2c578" -dependencies = [ - "bstr", - "gix-attributes", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-ignore", - "gix-index", - "gix-object", - "gix-path", - "gix-validate", -] - -[[package]] -name = "gix-worktree-state" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644a1681f96e1be43c2a8384337d9d220e7624f50db54beda70997052aebf707" -dependencies = [ - "bstr", - "gix-features", - "gix-filter", - "gix-fs", - "gix-index", - "gix-object", - "gix-path", - "gix-worktree", - "io-close", - "thiserror 2.0.18", + "gix-error", ] [[package]] name = "gix-worktree-stream" -version = "0.30.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e3fb70a1f650a5cec7d5b8d10d6d6fe86daf3cf15bde08ba0c70988a2932c3" +checksum = "28d2789610e8179d4e0e8e51170a52a66483c103a8ad3c7db4d075b571856cb6" dependencies = [ "gix-attributes", "gix-error", - "gix-features", "gix-filter", "gix-fs", "gix-hash", "gix-object", + "gix-parallel", "gix-path", + "gix-trace", "gix-traverse", + "gix-utils", "parking_lot", ] +[[package]] +name = "gix-zlib" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2edb206bf06f3c801f4f6789c696396171558ab9b4c7f1fe3ba4d39b00b0f4" +dependencies = [ + "gix-error", + "zlib-rs 0.6.3", +] + [[package]] name = "glib" version = "0.22.8" @@ -9402,25 +9227,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "imara-diff" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d34b7d42178945f775e84bc4c36dde7c1c6cdfea656d3354d009056f2bb3d2" -dependencies = [ - "hashbrown 0.15.5", -] - -[[package]] -name = "imara-diff" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f01d462f766df78ab820dd06f5eb700233c51f0f4c2e846520eaf4ba6aa5c5c" -dependencies = [ - "hashbrown 0.15.5", - "memchr", -] - [[package]] name = "include_dir" version = "0.7.4" @@ -9561,16 +9367,6 @@ dependencies = [ "rustversion", ] -[[package]] -name = "io-close" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "io_tee" version = "0.1.1" @@ -9613,7 +9409,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -9669,25 +9465,38 @@ checksum = "84de9d95a6d2547d9b77ee3f25fa0ee32e3c3a6484d47a55adebc0439c077992" [[package]] name = "jiff" -version = "0.2.23" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" +checksum = "b2b005715dcbeb0089a3c0dab99f2ff1cc3b2525323552703d648585d342a383" dependencies = [ + "defmt 1.1.1", + "jiff-core", "jiff-static", "jiff-tzdb-platform", "log", "portable-atomic", "portable-atomic-util", "serde_core", - "windows-sys 0.52.0", + "windows-link", +] + +[[package]] +name = "jiff-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e52fe76043ccecc9005d2305ebaadf7d7fc0cc89ca6baa10a94d6bc68c7128c" +dependencies = [ + "defmt 1.1.1", + "log", ] [[package]] name = "jiff-static" -version = "0.2.23" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" +checksum = "2cc9817253cf7c7ee4684451bd327e88d6f3658014e54a29198625590650695c" dependencies = [ + "jiff-core", "proc-macro2", "quote", "syn 2.0.117", @@ -10223,17 +10032,6 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3eede3bdf92f3b4f9dc04072a9ce5ab557d5ec9038773bf9ffcd5588b3cc05b" -[[package]] -name = "maybe-async" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "md-5" version = "0.10.6" @@ -10268,9 +10066,9 @@ checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" [[package]] name = "memmap2" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3" +checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0" dependencies = [ "libc", ] @@ -10597,7 +10395,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -11327,7 +11125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -11949,9 +11747,9 @@ dependencies = [ [[package]] name = "prodash" -version = "31.0.0" +version = "31.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962200e2d7d551451297d9fdce85138374019ada198e30ea9ede38034e27604c" +checksum = "cf52d87428247c5aa3760ac8e7d8b13ec7b3579b955a8c3f311668b6860acba5" dependencies = [ "parking_lot", ] @@ -12261,7 +12059,7 @@ dependencies = [ "libc", "log", "socket2 0.6.3", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -13573,7 +13371,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -13632,7 +13430,7 @@ dependencies = [ "security-framework 3.5.1", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -14242,22 +14040,18 @@ dependencies = [ "digest 0.11.3", ] -[[package]] -name = "sha1-checked" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89f599ac0c323ebb1c6082821a54962b839832b03984598375bff3975b804423" -dependencies = [ - "digest 0.10.7", - "sha1 0.10.6", -] - [[package]] name = "sha1_smol" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" +[[package]] +name = "sha1dc" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b0ebf6537e3e8db8bb7d21ecb6d7399738c953c757945c6b95e46c4e95df7b" + [[package]] name = "sha2" version = "0.10.9" @@ -14456,7 +14250,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -15286,7 +15080,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -15342,7 +15136,7 @@ dependencies = [ "parking_lot", "rustix 1.1.4", "signal-hook", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -17093,7 +16887,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml index b4ad791915..48d05279d0 100644 --- a/codex-rs/Cargo.toml +++ b/codex-rs/Cargo.toml @@ -379,8 +379,8 @@ file-id = "0.2.3" flate2 = "1.1.8" futures = { version = "0.3", default-features = false } gethostname = "1.1.0" -gix = { version = "0.81.0", default-features = false, features = ["sha1"] } -gix-url = "0.35.2" +gix = { version = "0.89.0", default-features = false, features = ["sha1"] } +gix-url = "0.40.0" glob = "0.3" globset = "0.4" hmac = "0.12.1" From 4ae6016a93880877f8f5f79a64e462c466d6b3f9 Mon Sep 17 00:00:00 2001 From: Matthew Zeng Date: Wed, 14 Oct 2026 19:48:57 +0000 Subject: [PATCH 065/155] Retire rejected MCP OAuth refresh tokens (#54079) ## Why Coordinated MCP OAuth refresh must stop retrying a definitively rejected refresh token, including after the runtime is rebuilt. ## What changed Remove the rejected refresh token while preserving the access token and credential record. Compare stored credentials under the appropriate locks before writing so a replacement login is preserved, and update file entries using their existing keys. Keep rejection handling alive through caller cancellation and prevent reuse within the runtime even if persistence fails. For ordinary direct-keyring credentials shared across `CODEX_HOME` directories, retire the token only in the current runtime because locking does not span those directories. Report persistence failures without exposing backend diagnostics. ## Testing Add coverage for reauthentication after runtime rebuild, legacy file keys, cancellation with a concurrent credential replacement, keyring scope, and persistence failures with diagnostic redaction. GitOrigin-RevId: a6e602ca2e2893ed711d853becc45142d9575fab --- .../tests/suite/mcp_oauth_refresh_tests.rs | 118 ++++++++++++++++++ codex-rs/rmcp-client/src/oauth.rs | 6 +- .../rmcp-client/src/oauth/credential_store.rs | 108 ++++++++++++++++ .../rmcp-client/src/oauth/resolved_store.rs | 105 ++++++++++++++++ .../src/oauth/tests/credential_store_tests.rs | 96 ++++++++++++++ .../src/oauth/tests/persistor_tests.rs | 54 ++++++++ 6 files changed, 485 insertions(+), 2 deletions(-) diff --git a/codex-rs/core/tests/suite/mcp_oauth_refresh_tests.rs b/codex-rs/core/tests/suite/mcp_oauth_refresh_tests.rs index 6f7d1a5618..c0207b95ee 100644 --- a/codex-rs/core/tests/suite/mcp_oauth_refresh_tests.rs +++ b/codex-rs/core/tests/suite/mcp_oauth_refresh_tests.rs @@ -8,12 +8,16 @@ use std::sync::Arc; use codex_config::DEFAULT_MCP_SERVER_ENVIRONMENT_ID; use codex_config::McpServerConfig; +use codex_config::types::AuthKeyringBackendKind; use codex_config::types::OAuthCredentialsStoreMode; use codex_features::Feature; use codex_protocol::items::McpToolCallStatus; use codex_protocol::items::TurnItem; use codex_protocol::mcp::CallToolResult; use codex_protocol::protocol::EventMsg; +use codex_protocol::protocol::McpStartupFailureReason; +use codex_protocol::protocol::McpStartupStatus; +use codex_rmcp_client::stored_oauth_credentials; use core_test_support::apps_test_server::AppsTestServer; use core_test_support::responses; use core_test_support::skip_if_no_network; @@ -27,6 +31,7 @@ use test_case::test_case; use wiremock::Mock; use wiremock::ResponseTemplate; use wiremock::matchers::body_partial_json; +use wiremock::matchers::body_string_contains; use wiremock::matchers::method; use wiremock::matchers::path; @@ -35,6 +40,119 @@ enum ConfigRefreshPath { Mcp, } +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[serial(codex_home)] +async fn rejected_refresh_requires_reauthentication_after_runtime_rebuild() -> anyhow::Result<()> { + skip_if_no_network!(Ok(())); + + let responses_server = responses::start_mock_server().await; + let mcp_server = responses::start_mock_server().await; + let http_server = AppsTestServer::mount(&mcp_server).await?; + let server_name = "rejected_refresh"; + let server_url = format!("{}/api/codex/ps/mcp", http_server.chatgpt_base_url); + Mock::given(method("GET")) + .and(path( + "/.well-known/oauth-authorization-server/api/codex/ps/mcp", + )) + .respond_with(ResponseTemplate::new(200).set_body_json(json!({ + "issuer": server_url, + "authorization_endpoint": format!("{}/oauth/authorize", mcp_server.uri()), + "token_endpoint": format!("{}/oauth/token", mcp_server.uri()), + }))) + .mount(&mcp_server) + .await; + Mock::given(method("POST")) + .and(path("/oauth/token")) + .and(body_string_contains( + "refresh_token=synthetic-refresh-token", + )) + .respond_with(ResponseTemplate::new(400).set_body_json(json!({"error": "invalid_grant"}))) + .expect(1) + .mount(&mcp_server) + .await; + let server_config: McpServerConfig = serde_json::from_value(json!({ + "url": server_url, + "environment_id": DEFAULT_MCP_SERVER_ENVIRONMENT_ID, + }))?; + let credential_name = server_config.oauth_credential_name(server_name); + let home = Arc::new(tempfile::tempdir()?); + let _codex_home_guard = EnvVarGuard::set("CODEX_HOME", home.path().as_os_str()); + write_fallback_oauth_tokens( + credential_name.as_ref(), + &server_url, + "test-client-id", + "synthetic-access-token", + "synthetic-refresh-token", + OAuthCredentialExpiry::Expired, + ) + .await?; + // Another binary may have saved the same credential under a different computed key. + let credentials_path = home.path().join(".credentials.json"); + let saved: serde_json::Map = + serde_json::from_slice(&std::fs::read(&credentials_path)?)?; + let entry = saved.into_values().next().expect("seeded file entry"); + std::fs::write( + &credentials_path, + serde_json::to_vec(&json!({"!legacy-key": entry}))?, + )?; + let mut expected = stored_oauth_credentials( + credential_name.as_ref(), + &server_url, + OAuthCredentialsStoreMode::File, + AuthKeyringBackendKind::default(), + )? + .expect("seeded credentials"); + expected.token_response.0.set_refresh_token(None); + + // Rebuilding the agent must observe durable retirement, not retry the rejected token. + for _ in 0..2 { + let server_config = server_config.clone(); + let fixture = test_codex() + .with_home(Arc::clone(&home)) + .with_config(move |config| { + config + .features + .enable(Feature::McpOAuthRefreshCoordination) + .expect("test config should allow coordinated OAuth refresh"); + config.mcp_oauth_credentials_store_mode = OAuthCredentialsStoreMode::File; + config + .mcp_servers + .set([(server_name.to_string(), server_config)].into()) + .expect("test config should allow the OAuth server"); + }) + // The OAuth provider stays on the host when the executor is remote. + .build_with_remote_and_local_env(&responses_server) + .await?; + let mut failures = Vec::new(); + wait_for_event(&fixture.codex, |event| { + if let EventMsg::McpStartupUpdate(update) = event + && update.server == server_name + && let McpStartupStatus::Failed { reason, .. } = &update.status + { + failures.push(*reason); + } + matches!(event, EventMsg::McpStartupComplete(_)) + }) + .await; + assert_eq!( + failures, + vec![Some(McpStartupFailureReason::ReauthenticationRequired)] + ); + assert_eq!( + stored_oauth_credentials( + credential_name.as_ref(), + &server_url, + OAuthCredentialsStoreMode::File, + AuthKeyringBackendKind::default(), + )?, + Some(expected.clone()), + ); + fixture.codex.shutdown_and_wait().await?; + } + mcp_server.verify().await; + Ok(()) +} + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn http_auth_challenge_reaches_agent_tool_call_events_without_replay() -> anyhow::Result<()> { skip_if_no_network!(Ok(())); diff --git a/codex-rs/rmcp-client/src/oauth.rs b/codex-rs/rmcp-client/src/oauth.rs index a0773a768e..f80cd6eb47 100644 --- a/codex-rs/rmcp-client/src/oauth.rs +++ b/codex-rs/rmcp-client/src/oauth.rs @@ -881,12 +881,14 @@ struct FallbackTokenEntry { fn load_oauth_tokens_from_file(server_name: &str, url: &str) -> Result> { let _store_lock = OAuthStoreLock::acquire_for_read(OAuthStore::File)?; load_oauth_tokens_from_file_with_lock_held(server_name, url) + .map(|entry| entry.map(|(_, tokens)| tokens)) } +/// Retains the matched entry's key. The caller must hold the File aggregate-store lock. fn load_oauth_tokens_from_file_with_lock_held( server_name: &str, url: &str, -) -> Result> { +) -> Result> { let Some(store) = read_fallback_file_unlocked()? else { return Ok(None); }; @@ -939,7 +941,7 @@ fn load_oauth_tokens_from_file_with_lock_held( }; refresh_expires_in_from_timestamp(&mut stored); - return Ok(Some(stored)); + return Ok(Some((stored_key.clone(), stored))); } Ok(None) diff --git a/codex-rs/rmcp-client/src/oauth/credential_store.rs b/codex-rs/rmcp-client/src/oauth/credential_store.rs index c191e6936a..d7e6bc5e90 100644 --- a/codex-rs/rmcp-client/src/oauth/credential_store.rs +++ b/codex-rs/rmcp-client/src/oauth/credential_store.rs @@ -12,6 +12,9 @@ //! so replacement logins still cause a rebuild. //! Synchronous store operations run off the Tokio workers so caller deadlines remain pollable. //! Blocking mutations retain the caller's transaction guard even if their await is cancelled. +//! Definitive refresh rejection removes only refresh capability, retaining the existing record +//! format and access token. Shared direct-keyring entries are retired only in this runtime until +//! cross-home locking exists. A local rejected snapshot also prevents reuse after a write failure. use std::sync::Arc; use std::sync::Weak; @@ -19,6 +22,7 @@ use std::sync::Weak; use anyhow::Context; use anyhow::Result; use codex_config::McpServerOAuthConfig; +use codex_config::types::AuthKeyringBackendKind; use codex_keyring_store::DefaultKeyringStore; use codex_keyring_store::KeyringStore; use futures::future::BoxFuture; @@ -42,6 +46,7 @@ use super::WrappedOAuthTokenResponse; use super::normalized_oauth_credentials; use super::refresh_expires_in_from_timestamp; use super::refresh_transaction::REFRESH_REQUEST_TIMEOUT; +use super::resolved_store::Backend; use super::token_needs_refresh; use super::validate_refresh_token_issuer; @@ -60,6 +65,7 @@ struct OAuthCredentialStoreInner { keyring: K, oauth_config: Option, last_credentials: Mutex>, + rejected_credentials: Mutex>, refresh_guard: Mutex>, } @@ -80,6 +86,7 @@ impl OAuthCredentialStore { keyring, oauth_config, last_credentials: Mutex::new(Some(tokens)), + rejected_credentials: Mutex::new(None), refresh_guard: Mutex::new(Weak::new()), }), held_refresh_guard: None, @@ -146,6 +153,11 @@ impl OAuthCredentialStore { .map_err(credential_store_error)? .map_err(credential_store_error)? .ok_or(AuthError::AuthorizationRequired)?; + if normalized_oauth_credentials(Some(&tokens)) + == *self.inner.rejected_credentials.lock().await + { + return Err(AuthError::AuthorizationRequired); + } self.validate_connection(&tokens)?; *self.inner.last_credentials.lock().await = Some(tokens); *self.inner.refresh_guard.lock().await = Arc::downgrade(&guard); @@ -288,6 +300,102 @@ impl CredentialStore for OAuthCredentialStore }) } + fn on_refresh_token_rejected<'life0, 'life1, 'async_trait>( + &'life0 self, + credentials: &'life1 StoredCredentials, + ) -> BoxFuture<'async_trait, Result<(), AuthError>> + where + 'life0: 'async_trait, + 'life1: 'async_trait, + Self: 'async_trait, + { + Box::pin(async move { + let guard = self + .inner + .refresh_guard + .lock() + .await + .upgrade() + .context("OAuth credential mutation requires an active refresh guard") + .map_err(credential_store_error)?; + let credentials = credentials.clone(); + let inner = Arc::clone(&self.inner); + // Own both cache retirement and persistence: cancellation must not leave a reusable + // cached token after the durable mutation, or release the guard before either finishes. + tokio::spawn(async move { + let Some(expected) = + normalized_oauth_credentials(inner.last_credentials.lock().await.as_ref()) + else { + return Ok(()); + }; + let mut attempted = credentials + .token_response + .ok_or(AuthError::AuthorizationRequired)?; + attempted.set_expires_in(None); + if credentials.client_id != expected.client_id + || credentials.issuer != expected.issuer + || WrappedOAuthTokenResponse(attempted) != expected.token_response + { + return Ok(()); + } + *inner.rejected_credentials.lock().await = Some(expected.clone()); + let mut retired = expected.clone(); + retired.token_response.0.set_refresh_token(None); + *inner.last_credentials.lock().await = Some(retired.clone()); + if inner.store.backend == Backend::Keyring(AuthKeyringBackendKind::Direct) + && !inner.server_name.starts_with("ema-idp:") + { + // Ordinary direct-keyring entries are shared across CODEX_HOMEs, but their + // refresh locks are not. Do not risk overwriting another home's newer login. + // Enterprise entries include the home in their key and remain protected. + warn!( + server_name = %inner.server_name, + "rejected MCP OAuth refresh token retired only in this connection; shared direct-keyring storage lacks cross-home coordination" + ); + return Ok(()); + } + let store_inner = Arc::clone(&inner); + let result = tokio::task::spawn_blocking(move || -> Result<()> { + let _guard = guard; + // The aggregate-store transaction also excludes legacy persistors that + // do not participate in the per-credential refresh guard. + store_inner.store.retire_refresh_token_if_matches( + &store_inner.keyring, + &store_inner.server_name, + &store_inner.url, + &expected, + ) + }) + .await + .context("OAuth rejected credential mutation task failed") + .map_err(credential_store_error) + .and_then(|result| result.map_err(credential_store_error)); + // This task can outlive its caller, so report failures here without logging + // backend error text that may contain credential material. + if result.is_err() { + warn!( + server_name = %inner.server_name, + "failed to persist rejected MCP OAuth refresh token retirement" + ); + } + result + }) + .await + // RMCP logs callback errors. Neither backend diagnostics nor task panic text + // may cross that boundary, even though the owned task reports failure safely. + .unwrap_or_else(|_| { + Err(AuthError::CredentialStoreError( + "OAuth rejection task failed".to_string(), + )) + }) + .map_err(|_| { + AuthError::CredentialStoreError( + "failed to retire rejected MCP OAuth refresh token".to_string(), + ) + }) + }) + } + fn acquire_refresh_guard<'life0, 'async_trait>( &'life0 self, ) -> BoxFuture<'async_trait, Result, AuthError>> diff --git a/codex-rs/rmcp-client/src/oauth/resolved_store.rs b/codex-rs/rmcp-client/src/oauth/resolved_store.rs index bdd29b58f9..f141c9cd74 100644 --- a/codex-rs/rmcp-client/src/oauth/resolved_store.rs +++ b/codex-rs/rmcp-client/src/oauth/resolved_store.rs @@ -24,8 +24,13 @@ use super::load_oauth_tokens_from_file; use super::load_oauth_tokens_from_file_with_lock_held; use super::load_oauth_tokens_from_keyring; use super::load_oauth_tokens_from_secrets_keyring_with_lock_held; +use super::normalized_oauth_credentials; +use super::read_fallback_file_unlocked; +use super::save_oauth_tokens_to_direct_keyring; use super::save_oauth_tokens_to_file; +use super::save_oauth_tokens_to_secrets_keyring_with_lock_held; use super::save_oauth_tokens_with_keyring; +use super::write_fallback_file; /// Concrete credential store resolved for one MCP OAuth client lifecycle. /// @@ -129,6 +134,7 @@ impl ResolvedOAuthCredentialStore { Backend::File => { let _store_lock = OAuthStoreLock::try_acquire_for_read(OAuthStore::File)?; load_oauth_tokens_from_file_with_lock_held(server_name, url) + .map(|entry| entry.map(|(_, tokens)| tokens)) .context("failed to probe OAuth tokens from resolved file storage") } Backend::Keyring(AuthKeyringBackendKind::Direct) => { @@ -192,6 +198,105 @@ impl ResolvedOAuthCredentialStore { result } + /// Retires a rejected refresh token only while its durable snapshot still matches. + /// + /// File and Secrets keep one exclusive aggregate lock across the comparison and write, + /// including against legacy writers that do not take the caller's refresh guard. Direct + /// keyring callers must hold that guard and use a home-scoped enterprise credential. + pub(crate) fn retire_refresh_token_if_matches( + self, + keyring_store: &K, + server_name: &str, + url: &str, + expected: &StoredOAuthTokens, + ) -> Result<()> { + let mut observation = telemetry::resolved(self, Operation::Load); + let mut _store_lock = None; + let mut file_key = None; + let current = (|| -> Result<_> { + _store_lock = match self.backend { + Backend::File => Some(OAuthStoreLock::acquire_for_write(OAuthStore::File)?), + Backend::Keyring(AuthKeyringBackendKind::Secrets) => { + Some(OAuthStoreLock::acquire_for_write(OAuthStore::Secrets)?) + } + Backend::Keyring(AuthKeyringBackendKind::Direct) => None, + }; + match self.backend { + Backend::File => Ok( + load_oauth_tokens_from_file_with_lock_held(server_name, url)?.map( + |(key, tokens)| { + file_key = Some(key); + tokens + }, + ), + ), + Backend::Keyring(AuthKeyringBackendKind::Secrets) => { + load_oauth_tokens_from_secrets_keyring_with_lock_held( + keyring_store, + server_name, + url, + ) + .map_err(anyhow::Error::from) + } + Backend::Keyring(AuthKeyringBackendKind::Direct) => load_oauth_tokens_from_keyring( + keyring_store, + AuthKeyringBackendKind::Direct, + server_name, + url, + ) + .map_err(anyhow::Error::from), + } + })(); + observation.record_load_attempt(telemetry::store(self), ¤t); + if matches!(self.backend, Backend::Keyring(_)) + && let Err(error) = ¤t + { + telemetry::record_secure_error(&mut observation, error.as_ref()); + } + drop(observation); + let current = current?; + if normalized_oauth_credentials(current.as_ref()) + != normalized_oauth_credentials(Some(expected)) + { + return Ok(()); + } + let mut retired = expected.clone(); + retired.token_response.0.set_refresh_token(None); + let mut observation = telemetry::resolved(self, Operation::Save); + let result = match self.backend { + Backend::File => { + let mut store = read_fallback_file_unlocked()?.context("OAuth file disappeared")?; + // Reuse the key we compared: another binary may compute a different key. + let key = file_key.context("missing loaded OAuth file key")?; + store + .get_mut(&key) + .context("OAuth file entry disappeared")? + .refresh_token = None; + write_fallback_file(&store) + } + Backend::Keyring(AuthKeyringBackendKind::Secrets) => { + let serialized = + serde_json::to_string(&retired).context("failed to serialize OAuth tokens")?; + save_oauth_tokens_to_secrets_keyring_with_lock_held( + keyring_store, + server_name, + &retired, + &serialized, + ) + } + Backend::Keyring(AuthKeyringBackendKind::Direct) => { + save_oauth_tokens_to_direct_keyring(keyring_store, server_name, &retired) + } + }; + observation.record_save_attempt(telemetry::store(self), &result); + if matches!(self.backend, Backend::Keyring(_)) + && let Err(error) = &result + { + telemetry::record_secure_error(&mut observation, error.as_ref()); + } + result + } + /// Deletes credentials only from this already-resolved authority. pub(crate) fn delete( self, diff --git a/codex-rs/rmcp-client/src/oauth/tests/credential_store_tests.rs b/codex-rs/rmcp-client/src/oauth/tests/credential_store_tests.rs index 575ed835cd..02dc54a270 100644 --- a/codex-rs/rmcp-client/src/oauth/tests/credential_store_tests.rs +++ b/codex-rs/rmcp-client/src/oauth/tests/credential_store_tests.rs @@ -25,6 +25,7 @@ use crate::oauth::compute_store_key; use crate::oauth::load_oauth_tokens_from_file; use crate::oauth::normalized_oauth_credentials; use crate::oauth::save_oauth_tokens_to_file; +use crate::oauth::save_oauth_tokens_to_file_with_lock_held; use crate::oauth::store_lock::OAuthStore; use crate::oauth::store_lock::OAuthStoreLock; @@ -289,3 +290,98 @@ async fn storage_roundtrip_preserves_absolute_and_unknown_expiry() -> Result<()> } Ok(()) } + +#[tokio::test(flavor = "current_thread")] +async fn cancelled_rejection_retains_guard_and_preserves_replacement() -> Result<()> { + let _env = TempCodexHome::new(); + let initial = sample_tokens(); + save_oauth_tokens_to_file(&initial)?; + let store = OAuthCredentialStore::new( + initial.clone(), + ResolvedOAuthCredentialStore::file(), + MockKeyringStore::default(), + /*oauth_config*/ None, + ); + let credentials = store.load().await?.unwrap(); + assert!(matches!( + store.on_refresh_token_rejected(&credentials).await, + Err(AuthError::CredentialStoreError(error)) if error.contains("active refresh guard") + )); + let guard = store.acquire_transaction_guard().await?; + let aggregate_lock = OAuthStoreLock::acquire_for_write(OAuthStore::File)?; + let mut mutation = store.on_refresh_token_rejected(&credentials); + assert!(futures::poll!(&mut mutation).is_pending()); + drop(mutation); + drop(guard); + let mut contender = Box::pin(RefreshCredentialLock::acquire_for_server( + &initial.server_name, + &initial.url, + )); + assert!(futures::poll!(&mut contender).is_pending()); + let mut replacement = initial.clone(); + replacement + .token_response + .0 + .set_refresh_token(Some(RefreshToken::new("replacement-refresh".into()))); + // A legacy writer may finish while retirement is waiting for the aggregate lock. + save_oauth_tokens_to_file_with_lock_held(&replacement)?; + drop(aggregate_lock); + let _guard = tokio::time::timeout(Duration::from_secs(/*secs*/ 5), contender).await??; + let mut expected = initial.clone(); + expected.token_response.0.set_refresh_token(None); + let durable = load_oauth_tokens_from_file(&initial.server_name, &initial.url)?.unwrap(); + assert_tokens_match_without_expiry(&durable, &replacement); + assert_eq!( + store.stored_credentials().await, + normalized_oauth_credentials(Some(&expected)) + ); + Ok(()) +} + +#[tokio::test(flavor = "current_thread")] +async fn keyring_rejection_respects_credential_scope() -> Result<()> { + for kind in [ + AuthKeyringBackendKind::Direct, + AuthKeyringBackendKind::Secrets, + ] { + let _env = TempCodexHome::new(); + let initial = sample_tokens(); + let keyring = MockKeyringStore::default(); + let authority = ResolvedOAuthCredentialStore::keyring(kind); + authority.save(&keyring, &initial.server_name, &initial)?; + let store = OAuthCredentialStore::new( + initial.clone(), + authority, + keyring.clone(), + /*oauth_config*/ None, + ); + let guard = store.acquire_transaction_guard().await?; + store + .on_refresh_token_rejected(&store.load().await?.unwrap()) + .await?; + let mut retired = initial.clone(); + retired.token_response.0.set_refresh_token(None); + let expected_durable = match kind { + AuthKeyringBackendKind::Direct => &initial, + AuthKeyringBackendKind::Secrets => &retired, + }; + assert_tokens_match_without_expiry( + &authority + .load(&keyring, &initial.server_name, &initial.url)? + .unwrap(), + expected_durable, + ); + assert_eq!( + store.stored_credentials().await, + normalized_oauth_credentials(Some(&retired)) + ); + drop(guard); + if kind == AuthKeyringBackendKind::Direct { + assert!(matches!( + store.acquire_transaction_guard().await, + Err(AuthError::AuthorizationRequired) + )); + } + } + Ok(()) +} diff --git a/codex-rs/rmcp-client/src/oauth/tests/persistor_tests.rs b/codex-rs/rmcp-client/src/oauth/tests/persistor_tests.rs index e938bcec48..a8b2eb499e 100644 --- a/codex-rs/rmcp-client/src/oauth/tests/persistor_tests.rs +++ b/codex-rs/rmcp-client/src/oauth/tests/persistor_tests.rs @@ -29,6 +29,7 @@ use tracing::Subscriber; use tracing::span::Attributes; use tracing::span::Record; use tracing::subscriber::Interest; +use tracing_test::traced_test; use wiremock::Mock; use wiremock::MockServer; use wiremock::ResponseTemplate; @@ -53,6 +54,7 @@ use crate::oauth::compute_expires_at_millis; use crate::oauth::compute_store_key; use crate::oauth::delete_oauth_tokens; use crate::oauth::load_oauth_tokens_from_file; +use crate::oauth::normalized_oauth_credentials; use crate::oauth::refresh_lock::RefreshCredentialLock; use crate::oauth::save_oauth_tokens; use crate::oauth::save_oauth_tokens_to_file; @@ -465,6 +467,58 @@ async fn rejected_refresh_token_requires_reauthorization() -> Result<()> { Ok(()) } +#[tokio::test(flavor = "current_thread")] +#[traced_test] +async fn rejection_callback_failure_keeps_reauthentication_and_redacts_diagnostics() -> Result<()> { + let (env, server, initial) = test_context().await?; + save_oauth_tokens_to_file(&initial)?; + let (auth_manager, store) = coordinated_manager_for(&initial).await?; + let credentials_path = env.path().join(".credentials.json"); + Mock::given(method("POST")) + .and(path("/oauth/token")) + .respond_with(move |_: &wiremock::Request| { + // The provider rejects after the guarded reread. Make retirement fail with a + // deserialization error containing a sentinel credential value. + std::fs::write( + &credentials_path, + r#"{"invalid-entry":"credential-backend-secret"}"#, + ) + .expect("corrupt the synthetic credential store"); + ResponseTemplate::new(400).set_body_json(serde_json::json!({"error": "invalid_grant"})) + }) + .expect(1) + .mount(&server) + .await; + let error = OAuthRuntime::Coordinated { + auth_manager, + store: store.clone(), + } + .refresh_if_needed() + .await + .expect_err("rejected credentials must still require reauthentication"); + assert!(is_authentication_required_error(&error)); + let mut expected = initial.clone(); + expected.token_response.0.set_refresh_token(None); + assert_eq!( + store.stored_credentials().await, + normalized_oauth_credentials(Some(&expected)) + ); + assert!(logs_contain( + "failed to persist rejected MCP OAuth refresh token retirement" + )); + assert!(logs_contain("Failed to handle rejected refresh token")); + assert!(!logs_contain("credential-backend-secret")); + // A failed durable retirement must not let this runtime reuse the same credential. + std::fs::remove_file(env.path().join(".credentials.json"))?; + save_oauth_tokens_to_file(&initial)?; + assert!(matches!( + store.acquire_transaction_guard().await, + Err(AuthError::AuthorizationRequired) + )); + server.verify().await; + Ok(()) +} + #[tokio::test(flavor = "current_thread")] async fn changed_issuer_requires_reauthorization_before_refresh() -> Result<()> { let (_env, server, mut initial) = test_context().await?; From 57b5e89be8efbf72bdf9f4502d1d046e369cd85d Mon Sep 17 00:00:00 2001 From: Benjamin Carlsson Date: Wed, 14 Oct 2026 19:52:52 +0000 Subject: [PATCH 066/155] Extract TUI user-turn submission into a dedicated module (#54080) ## What changed Move `AppCommand::UserTurn` handling from `thread_routing.rs` into `user_turn_submission.rs`. Keep turn creation, permission resolution, and active-turn steering behavior together, preserving retry and queueing behavior. GitOrigin-RevId: b4f798cf20a4609d959f4d9b19447ba3c4baba0a --- codex-rs/tui/src/app.rs | 1 + codex-rs/tui/src/app/thread_routing.rs | 194 +------------------ codex-rs/tui/src/app/user_turn_submission.rs | 180 +++++++++++++++++ 3 files changed, 184 insertions(+), 191 deletions(-) create mode 100644 codex-rs/tui/src/app/user_turn_submission.rs diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs index 9a324aa3bd..c8b40454cd 100644 --- a/codex-rs/tui/src/app.rs +++ b/codex-rs/tui/src/app.rs @@ -277,6 +277,7 @@ mod thread_settings; mod thread_title; mod transcript_export; mod tui_mode_picker; +mod user_turn_submission; mod user_verification; mod user_verification_errors; mod user_verification_requests; diff --git a/codex-rs/tui/src/app/thread_routing.rs b/codex-rs/tui/src/app/thread_routing.rs index 95591b4933..cb2d4e6387 100644 --- a/codex-rs/tui/src/app/thread_routing.rs +++ b/codex-rs/tui/src/app/thread_routing.rs @@ -661,6 +661,9 @@ impl App { thread_id: ThreadId, op: &AppCommand, ) -> Result { + if user_turn_submission::try_submit_user_turn(self, app_server, thread_id, op).await? { + return Ok(true); + } match op { AppCommand::Interrupt => { let mut turn_id = self @@ -732,197 +735,6 @@ impl App { }); Ok(true) } - AppCommand::UserTurn { - client_user_message_id, - items, - cwd, - approval_policy, - approvals_reviewer, - active_permission_profile: _, - model, - effort, - summary, - service_tier, - final_output_json_schema, - collaboration_mode, - } => { - let mut should_start_turn = true; - if let Some(turn_id) = self.active_turn_id_for_thread(thread_id).await { - let mut steer_turn_id = turn_id; - let mut retried_after_turn_mismatch = false; - loop { - match app_server - .turn_steer( - thread_id, - steer_turn_id.clone(), - client_user_message_id.clone(), - items.to_vec(), - ) - .await - { - Ok(_) => { - if self.active_thread_id == Some(thread_id) - && self.chat_widget.thread_id() == Some(thread_id) - { - crate::startup_recovery::acknowledged(client_user_message_id); - } - return Ok(true); - } - Err(error) => { - if let Some(turn_error) = - active_turn_not_steerable_turn_error(&error) - { - if !self.chat_widget.enqueue_rejected_steer() { - self.chat_widget.add_error_message(turn_error.message); - } - return Ok(true); - } - match active_turn_steer_race(&error) { - Some(ActiveTurnSteerRace::Missing) => { - if let Some(channel) = - self.thread_event_channels.get(&thread_id) - { - let mut store = channel.store.lock().await; - store.clear_active_turn_id(); - } - should_start_turn = true; - break; - } - Some(ActiveTurnSteerRace::ExpectedTurnMismatch { - actual_turn_id, - }) if !retried_after_turn_mismatch - && actual_turn_id != steer_turn_id => - { - // Review flows can swap the active turn before the TUI - // processes the corresponding notification. Retry once with - // the server-reported turn id so non-steerable review turns - // still fall through to the existing queueing behavior. - if let Some(channel) = - self.thread_event_channels.get(&thread_id) - { - let mut store = channel.store.lock().await; - store.set_active_turn_id(actual_turn_id.clone()); - } - steer_turn_id = actual_turn_id; - retried_after_turn_mismatch = true; - } - Some(ActiveTurnSteerRace::ExpectedTurnMismatch { - actual_turn_id, - }) => { - if let Some(channel) = - self.thread_event_channels.get(&thread_id) - { - let mut store = channel.store.lock().await; - store.set_active_turn_id(actual_turn_id); - } - return Err(error.into()); - } - None => return Err(error.into()), - } - } - } - } - } - if should_start_turn { - let enabled = self.chat_widget.daybreak_enabled - && !self.chat_widget.side_conversation_active() - && !self.side_threads.contains_key(&thread_id); - let eligible_account = self.chat_widget.daybreak_account_eligible(); - let cyber_access_program = match crate::daybreak::program_for_turn( - &self.chat_widget.model_catalog().models, - model, - eligible_account, - enabled, - ) { - Ok(program) => program, - Err(message) => { - if !self - .chat_widget - .handle_turn_start_rejection(message.clone()) - { - self.chat_widget.add_error_message(message); - } - return Ok(true); - } - }; - let config = self.chat_widget.config_ref(); - let selected_profile = - self.pending_server_profiles.get(&thread_id).or_else(|| { - self.agents_overview - .requested_permission_profiles - .get(&thread_id) - }); - let selected_active = selected_profile - .map(|profile| ActivePermissionProfile::new(profile.profile_id.clone())); - let (turn_approval_policy, turn_approvals_reviewer) = - if let Some(profile) = selected_profile { - ( - profile.approval_policy, - profile.approvals_reviewer.map(Into::into), - ) - } else if self.app_server_target.thread_params_mode() - == crate::app_server_session::ThreadParamsMode::Remote - { - ( - Some(config.permissions.approval_policy.value().into()), - Some(config.approvals_reviewer.into()), - ) - } else { - ( - Some(*approval_policy), - Some( - approvals_reviewer - .unwrap_or(config.approvals_reviewer) - .into(), - ), - ) - }; - // Only explicit choices may override the saved server profile. - let explicit_profile = self - .runtime_permission_profile_override - .as_ref() - .filter(|profile| { - profile.turn_override - == RuntimePermissionProfileTurnOverride::LegacySandbox - }); - let permissions_override = Self::turn_permissions_override_from_config( - config, - selected_active.as_ref().or_else(|| { - explicit_profile - .and_then(|profile| profile.active_permission_profile.as_ref()) - }), - explicit_profile - .and_then(RuntimePermissionProfileOverride::turn_permission_profile), - ); - let response = app_server - .turn_start( - thread_id, - client_user_message_id.clone(), - items.to_vec(), - cwd.clone(), - turn_approval_policy, - turn_approvals_reviewer, - permissions_override, - config.permissions.user_visible_workspace_roots(), - model.to_string(), - effort.clone(), - *summary, - service_tier.clone(), - collaboration_mode.clone(), - final_output_json_schema.clone(), - cyber_access_program.map(Into::into), - ) - .await?; - if self.active_thread_id == Some(thread_id) - && self.chat_widget.thread_id() == Some(thread_id) - { - crate::startup_recovery::acknowledged(client_user_message_id); - self.chat_widget - .record_safety_buffering_turn(response.turn.id, op); - } - } - Ok(true) - } AppCommand::ListSkills { cwds, force_reload } => { // A queued refresh can outlive the workspace it was requested for. if !cwds diff --git a/codex-rs/tui/src/app/user_turn_submission.rs b/codex-rs/tui/src/app/user_turn_submission.rs new file mode 100644 index 0000000000..4f41521265 --- /dev/null +++ b/codex-rs/tui/src/app/user_turn_submission.rs @@ -0,0 +1,180 @@ +//! User-turn submission, including permission resolution and active-turn steer races. +//! +//! This is the single app-server submission path for both new user turns and steering. + +use super::*; + +pub(super) async fn try_submit_user_turn( + app: &mut App, + app_server: &mut AppServerSession, + thread_id: ThreadId, + op: &AppCommand, +) -> Result { + let AppCommand::UserTurn { + client_user_message_id, + items, + cwd, + approval_policy, + approvals_reviewer, + active_permission_profile: _, + model, + effort, + summary, + service_tier, + final_output_json_schema, + collaboration_mode, + } = op + else { + return Ok(false); + }; + if let Some(turn_id) = app.active_turn_id_for_thread(thread_id).await { + let mut steer_turn_id = turn_id; + let mut retried_after_turn_mismatch = false; + loop { + match app_server + .turn_steer( + thread_id, + steer_turn_id.clone(), + client_user_message_id.clone(), + items.to_vec(), + ) + .await + { + Ok(_) => { + if app.active_thread_id == Some(thread_id) + && app.chat_widget.thread_id() == Some(thread_id) + { + crate::startup_recovery::acknowledged(client_user_message_id); + } + return Ok(true); + } + Err(error) => { + if let Some(turn_error) = active_turn_not_steerable_turn_error(&error) { + if !app.chat_widget.enqueue_rejected_steer() { + app.chat_widget.add_error_message(turn_error.message); + } + return Ok(true); + } + match active_turn_steer_race(&error) { + Some(ActiveTurnSteerRace::Missing) => { + if let Some(channel) = app.thread_event_channels.get(&thread_id) { + let mut store = channel.store.lock().await; + store.clear_active_turn_id(); + } + break; + } + Some(ActiveTurnSteerRace::ExpectedTurnMismatch { actual_turn_id }) + if !retried_after_turn_mismatch && actual_turn_id != steer_turn_id => + { + // Review flows can swap the active turn before the TUI + // processes the corresponding notification. Retry once with + // the server-reported turn id so non-steerable review turns + // still fall through to the existing queueing behavior. + if let Some(channel) = app.thread_event_channels.get(&thread_id) { + let mut store = channel.store.lock().await; + store.set_active_turn_id(actual_turn_id.clone()); + } + steer_turn_id = actual_turn_id; + retried_after_turn_mismatch = true; + } + Some(ActiveTurnSteerRace::ExpectedTurnMismatch { actual_turn_id }) => { + if let Some(channel) = app.thread_event_channels.get(&thread_id) { + let mut store = channel.store.lock().await; + store.set_active_turn_id(actual_turn_id); + } + return Err(error.into()); + } + None => return Err(error.into()), + } + } + } + } + } + let eligible_account = app.chat_widget.daybreak_account_eligible(); + let enabled = app.chat_widget.daybreak_enabled + && !app.chat_widget.side_conversation_active() + && !app.side_threads.contains_key(&thread_id); + let cyber_access_program = match crate::daybreak::program_for_turn( + &app.chat_widget.model_catalog().models, + model, + eligible_account, + enabled, + ) { + Ok(program) => program, + Err(message) => { + if !app.chat_widget.handle_turn_start_rejection(message.clone()) { + app.chat_widget.add_error_message(message); + } + return Ok(true); + } + }; + let config = app.chat_widget.config_ref(); + let selected_profile = app.pending_server_profiles.get(&thread_id).or_else(|| { + app.agents_overview + .requested_permission_profiles + .get(&thread_id) + }); + let selected_active = + selected_profile.map(|profile| ActivePermissionProfile::new(profile.profile_id.clone())); + let (turn_approval_policy, turn_approvals_reviewer) = if let Some(profile) = selected_profile { + ( + profile.approval_policy, + profile.approvals_reviewer.map(Into::into), + ) + } else if app.app_server_target.thread_params_mode() + == crate::app_server_session::ThreadParamsMode::Remote + { + ( + Some(config.permissions.approval_policy.value().into()), + Some(config.approvals_reviewer.into()), + ) + } else { + ( + Some(*approval_policy), + Some( + approvals_reviewer + .unwrap_or(config.approvals_reviewer) + .into(), + ), + ) + }; + // Only explicit choices may override the saved server profile. + let explicit_profile = app + .runtime_permission_profile_override + .as_ref() + .filter(|profile| { + profile.turn_override == RuntimePermissionProfileTurnOverride::LegacySandbox + }); + let permissions_override = App::turn_permissions_override_from_config( + config, + selected_active.as_ref().or_else(|| { + explicit_profile.and_then(|profile| profile.active_permission_profile.as_ref()) + }), + explicit_profile.and_then(RuntimePermissionProfileOverride::turn_permission_profile), + ); + let response = app_server + .turn_start( + thread_id, + client_user_message_id.clone(), + items.to_vec(), + cwd.clone(), + turn_approval_policy, + turn_approvals_reviewer, + permissions_override, + config.permissions.user_visible_workspace_roots(), + model.to_string(), + effort.clone(), + *summary, + service_tier.clone(), + collaboration_mode.clone(), + final_output_json_schema.clone(), + cyber_access_program.map(Into::into), + ) + .await?; + if app.active_thread_id == Some(thread_id) && app.chat_widget.thread_id() == Some(thread_id) { + crate::startup_recovery::acknowledged(client_user_message_id); + app.chat_widget + .record_safety_buffering_turn(response.turn.id, op); + } + Ok(true) +} From 01ff831ce9c1c9d3ae98f271014b22401308ec06 Mon Sep 17 00:00:00 2001 From: Benjamin Carlsson Date: Wed, 14 Oct 2026 19:54:54 +0000 Subject: [PATCH 067/155] Centralize vertical navigation in TUI list views (#54081) ## What changed Add `ListKeymap::vertical_action_for` and `ScrollState::apply_vertical_action` to share key resolution, selection movement, and visibility handling across the experimental features, hooks, memories, skills, and multi-select views. Preserve navigation priority, search input handling, and item reordering precedence. ## Testing Update scroll-state tests to exercise the shared action handler and picker tests to navigate through key events. Cover overlapping page-down and move-left bindings when item reordering is disabled. GitOrigin-RevId: 29927b0a4de0fbeb4c0dd19c418b8f60fffb8a7d --- .../bottom_pane/experimental_features_view.rs | 63 +++-------- .../tui/src/bottom_pane/hooks_browser_view.rs | 49 ++------- .../src/bottom_pane/memories_settings_view.rs | 65 +++-------- .../src/bottom_pane/multi_select_picker.rs | 102 +++++------------- codex-rs/tui/src/bottom_pane/scroll_state.rs | 43 ++++++-- .../tui/src/bottom_pane/skills_toggle_view.rs | 65 ++--------- codex-rs/tui/src/keymap.rs | 14 +++ 7 files changed, 121 insertions(+), 280 deletions(-) diff --git a/codex-rs/tui/src/bottom_pane/experimental_features_view.rs b/codex-rs/tui/src/bottom_pane/experimental_features_view.rs index 63a5bd85e1..805e3eff38 100644 --- a/codex-rs/tui/src/bottom_pane/experimental_features_view.rs +++ b/codex-rs/tui/src/bottom_pane/experimental_features_view.rs @@ -163,48 +163,6 @@ impl ExperimentalFeaturesView { rows } - fn move_up(&mut self) { - let len = self.visible_len(); - if len == 0 { - return; - } - self.state.move_up_wrap(len); - self.state.ensure_visible(len, MAX_POPUP_ROWS.min(len)); - } - - fn move_down(&mut self) { - let len = self.visible_len(); - if len == 0 { - return; - } - self.state.move_down_wrap(len); - self.state.ensure_visible(len, MAX_POPUP_ROWS.min(len)); - } - - fn page_up(&mut self) { - let len = self.visible_len(); - let visible = MAX_POPUP_ROWS.min(len); - self.state.page_up_clamped(len, visible); - } - - fn page_down(&mut self) { - let len = self.visible_len(); - let visible = MAX_POPUP_ROWS.min(len); - self.state.page_down_clamped(len, visible); - } - - fn jump_top(&mut self) { - let len = self.visible_len(); - let visible = MAX_POPUP_ROWS.min(len); - self.state.jump_top(len, visible); - } - - fn jump_bottom(&mut self) { - let len = self.visible_len(); - let visible = MAX_POPUP_ROWS.min(len); - self.state.jump_bottom(len, visible); - } - fn toggle_selected(&mut self) { let Some(selected_idx) = self.state.selected_idx else { return; @@ -375,13 +333,22 @@ impl BottomPaneView for ExperimentalFeaturesView { } fn handle_key_event(&mut self, key_event: KeyEvent) { + if let Some(action) = self.keymap.vertical_action_for(key_event) { + let len = self.visible_len(); + if len == 0 + && matches!( + action, + crate::keymap::ListAction::MoveUp | crate::keymap::ListAction::MoveDown + ) + { + return; + } + self.state + .apply_vertical_action(action, len, MAX_POPUP_ROWS.min(len)); + return; + } + match key_event { - _ if self.keymap.move_up.is_pressed(key_event) => self.move_up(), - _ if self.keymap.move_down.is_pressed(key_event) => self.move_down(), - _ if self.keymap.page_up.is_pressed(key_event) => self.page_up(), - _ if self.keymap.page_down.is_pressed(key_event) => self.page_down(), - _ if self.keymap.jump_top.is_pressed(key_event) => self.jump_top(), - _ if self.keymap.jump_bottom.is_pressed(key_event) => self.jump_bottom(), KeyEvent { code: KeyCode::Char(' '), modifiers: KeyModifiers::NONE, diff --git a/codex-rs/tui/src/bottom_pane/hooks_browser_view.rs b/codex-rs/tui/src/bottom_pane/hooks_browser_view.rs index 1e31fa5a58..b73eca721c 100644 --- a/codex-rs/tui/src/bottom_pane/hooks_browser_view.rs +++ b/codex-rs/tui/src/bottom_pane/hooks_browser_view.rs @@ -165,38 +165,6 @@ impl HooksBrowserView { .and_then(|idx| self.entry.hooks.get(idx)) } - fn move_up(&mut self) { - let len = self.page_len(); - self.state.move_up_wrap(len); - self.state.ensure_visible(len, self.max_visible_rows()); - } - - fn move_down(&mut self) { - let len = self.page_len(); - self.state.move_down_wrap(len); - self.state.ensure_visible(len, self.max_visible_rows()); - } - - fn page_up(&mut self) { - let len = self.page_len(); - self.state.page_up_clamped(len, self.max_visible_rows()); - } - - fn page_down(&mut self) { - let len = self.page_len(); - self.state.page_down_clamped(len, self.max_visible_rows()); - } - - fn jump_top(&mut self) { - let len = self.page_len(); - self.state.jump_top(len, self.max_visible_rows()); - } - - fn jump_bottom(&mut self) { - let len = self.page_len(); - self.state.jump_bottom(len, self.max_visible_rows()); - } - fn page_len(&self) -> usize { match self.page { HooksBrowserPage::Events => codex_protocol::protocol::HookEventName::iter().count(), @@ -204,10 +172,6 @@ impl HooksBrowserView { } } - fn max_visible_rows(&self) -> usize { - MAX_POPUP_ROWS.min(self.page_len().max(1)) - } - fn open_selected_event(&mut self) { let Some(event_name) = self.selected_event() else { return; @@ -613,13 +577,14 @@ impl BottomPaneView for HooksBrowserView { } fn handle_key_event(&mut self, key_event: KeyEvent) { + if let Some(action) = self.keymap.vertical_action_for(key_event) { + let len = self.page_len(); + self.state + .apply_vertical_action(action, len, MAX_POPUP_ROWS.min(len.max(1))); + return; + } + match key_event { - _ if self.keymap.move_up.is_pressed(key_event) => self.move_up(), - _ if self.keymap.move_down.is_pressed(key_event) => self.move_down(), - _ if self.keymap.page_up.is_pressed(key_event) => self.page_up(), - _ if self.keymap.page_down.is_pressed(key_event) => self.page_down(), - _ if self.keymap.jump_top.is_pressed(key_event) => self.jump_top(), - _ if self.keymap.jump_bottom.is_pressed(key_event) => self.jump_bottom(), _ if self.keymap.accept.is_pressed(key_event) && self.page == HooksBrowserPage::Events => { diff --git a/codex-rs/tui/src/bottom_pane/memories_settings_view.rs b/codex-rs/tui/src/bottom_pane/memories_settings_view.rs index cd78eb3994..5cc386266e 100644 --- a/codex-rs/tui/src/bottom_pane/memories_settings_view.rs +++ b/codex-rs/tui/src/bottom_pane/memories_settings_view.rs @@ -223,50 +223,6 @@ impl MemoriesSettingsView { .collect() } - fn move_up(&mut self) { - let len = self.visible_len(); - if len == 0 { - return; - } - let state = self.active_state_mut(); - state.move_up_wrap(len); - state.ensure_visible(len, MAX_POPUP_ROWS.min(len)); - } - - fn move_down(&mut self) { - let len = self.visible_len(); - if len == 0 { - return; - } - let state = self.active_state_mut(); - state.move_down_wrap(len); - state.ensure_visible(len, MAX_POPUP_ROWS.min(len)); - } - - fn page_up(&mut self) { - let len = self.visible_len(); - let visible = MAX_POPUP_ROWS.min(len); - self.active_state_mut().page_up_clamped(len, visible); - } - - fn page_down(&mut self) { - let len = self.visible_len(); - let visible = MAX_POPUP_ROWS.min(len); - self.active_state_mut().page_down_clamped(len, visible); - } - - fn jump_top(&mut self) { - let len = self.visible_len(); - let visible = MAX_POPUP_ROWS.min(len); - self.active_state_mut().jump_top(len, visible); - } - - fn jump_bottom(&mut self) { - let len = self.visible_len(); - let visible = MAX_POPUP_ROWS.min(len); - self.active_state_mut().jump_bottom(len, visible); - } - fn toggle_selected(&mut self) { if self.reset_confirmation.is_some() { return; @@ -321,13 +277,22 @@ impl BottomPaneView for MemoriesSettingsView { } fn handle_key_event(&mut self, key_event: KeyEvent) { + if let Some(action) = self.keymap.vertical_action_for(key_event) { + let len = self.visible_len(); + if len == 0 + && matches!( + action, + crate::keymap::ListAction::MoveUp | crate::keymap::ListAction::MoveDown + ) + { + return; + } + self.active_state_mut() + .apply_vertical_action(action, len, MAX_POPUP_ROWS.min(len)); + return; + } + match key_event { - _ if self.keymap.move_up.is_pressed(key_event) => self.move_up(), - _ if self.keymap.move_down.is_pressed(key_event) => self.move_down(), - _ if self.keymap.page_up.is_pressed(key_event) => self.page_up(), - _ if self.keymap.page_down.is_pressed(key_event) => self.page_down(), - _ if self.keymap.jump_top.is_pressed(key_event) => self.jump_top(), - _ if self.keymap.jump_bottom.is_pressed(key_event) => self.jump_bottom(), KeyEvent { code: KeyCode::Char(' '), modifiers: KeyModifiers::NONE, diff --git a/codex-rs/tui/src/bottom_pane/multi_select_picker.rs b/codex-rs/tui/src/bottom_pane/multi_select_picker.rs index cf0bb3410c..a16920a926 100644 --- a/codex-rs/tui/src/bottom_pane/multi_select_picker.rs +++ b/codex-rs/tui/src/bottom_pane/multi_select_picker.rs @@ -353,46 +353,6 @@ impl MultiSelectPicker { } } - /// Moves the selection cursor up, wrapping to the bottom if at the top. - fn move_up(&mut self) { - let len = self.visible_len(); - self.state.move_up_wrap(len); - let visible = Self::max_visible_rows(len); - self.state.ensure_visible(len, visible); - } - - /// Moves the selection cursor down, wrapping to the top if at the bottom. - fn move_down(&mut self) { - let len = self.visible_len(); - self.state.move_down_wrap(len); - let visible = Self::max_visible_rows(len); - self.state.ensure_visible(len, visible); - } - - fn page_up(&mut self) { - let len = self.visible_len(); - let visible = Self::max_visible_rows(len); - self.state.page_up_clamped(len, visible); - } - - fn page_down(&mut self) { - let len = self.visible_len(); - let visible = Self::max_visible_rows(len); - self.state.page_down_clamped(len, visible); - } - - fn jump_top(&mut self) { - let len = self.visible_len(); - let visible = Self::max_visible_rows(len); - self.state.jump_top(len, visible); - } - - fn jump_bottom(&mut self) { - let len = self.visible_len(); - let visible = Self::max_visible_rows(len); - self.state.jump_bottom(len, visible); - } - /// Toggles the enabled state of the currently selected item. /// /// Updates the preview line and invokes the `on_change` callback if set. @@ -543,37 +503,30 @@ impl BottomPaneView for MultiSelectPicker { // plain j/k only apply through non-text events or modified bindings. let allow_plain_char_navigation = !is_plain_text_key_event(key_event); + if allow_plain_char_navigation + && self.ordering_enabled + && self.keymap.move_left.is_pressed(key_event) + { + self.move_selected_item(Direction::Up); + return; + } + if allow_plain_char_navigation + && self.ordering_enabled + && self.keymap.move_right.is_pressed(key_event) + { + self.move_selected_item(Direction::Down); + return; + } + if allow_plain_char_navigation + && let Some(action) = self.keymap.vertical_action_for(key_event) + { + let len = self.visible_len(); + self.state + .apply_vertical_action(action, len, Self::max_visible_rows(len)); + return; + } + match key_event { - _ if allow_plain_char_navigation - && self.ordering_enabled - && self.keymap.move_left.is_pressed(key_event) => - { - self.move_selected_item(Direction::Up); - } - _ if allow_plain_char_navigation - && self.ordering_enabled - && self.keymap.move_right.is_pressed(key_event) => - { - self.move_selected_item(Direction::Down); - } - _ if allow_plain_char_navigation && self.keymap.move_up.is_pressed(key_event) => { - self.move_up() - } - _ if allow_plain_char_navigation && self.keymap.move_down.is_pressed(key_event) => { - self.move_down() - } - _ if allow_plain_char_navigation && self.keymap.page_up.is_pressed(key_event) => { - self.page_up() - } - _ if allow_plain_char_navigation && self.keymap.page_down.is_pressed(key_event) => { - self.page_down() - } - _ if allow_plain_char_navigation && self.keymap.jump_top.is_pressed(key_event) => { - self.jump_top() - } - _ if allow_plain_char_navigation && self.keymap.jump_bottom.is_pressed(key_event) => { - self.jump_bottom() - } KeyEvent { code: KeyCode::Backspace, .. @@ -958,7 +911,7 @@ mod tests { vec!["theme-colors", "model", "branch"] ); - picker.move_down(); + picker.handle_key_event(KeyEvent::from(KeyCode::Down)); picker.move_selected_item(Direction::Up); assert_eq!( picker @@ -1050,6 +1003,7 @@ mod tests { let (tx, _rx) = unbounded_channel::(); let mut keymap = RuntimeKeymap::defaults().list; keymap.page_down = vec![key_hint::ctrl(KeyCode::Char('d'))]; + keymap.move_left = keymap.page_down.clone(); keymap.page_up = vec![key_hint::ctrl(KeyCode::Char('u'))]; keymap.jump_bottom = vec![key_hint::ctrl(KeyCode::Char('e'))]; keymap.jump_top = vec![key_hint::ctrl(KeyCode::Char('a'))]; @@ -1063,7 +1017,7 @@ mod tests { .map(|idx| { item( &format!("item-{idx}"), - /*orderable*/ true, + /*orderable*/ false, /*section_break_after*/ false, ) }) @@ -1102,7 +1056,7 @@ mod tests { .collect(), ); picker.header = Box::new(()); - picker.jump_bottom(); + picker.handle_key_event(KeyEvent::from(KeyCode::End)); let mut snapshots = Vec::new(); for height in 1..=7 { let area = Rect::new(/*x*/ 0, /*y*/ 0, /*width*/ 80, height); @@ -1183,7 +1137,7 @@ mod tests { buf }; let first = render(&picker); - picker.jump_bottom(); + picker.handle_key_event(KeyEvent::from(KeyCode::End)); picker.toggle_selected(); picker.move_selected_item(Direction::Up); let last = render(&picker); diff --git a/codex-rs/tui/src/bottom_pane/scroll_state.rs b/codex-rs/tui/src/bottom_pane/scroll_state.rs index ce208c7952..b90148c326 100644 --- a/codex-rs/tui/src/bottom_pane/scroll_state.rs +++ b/codex-rs/tui/src/bottom_pane/scroll_state.rs @@ -1,3 +1,5 @@ +use crate::keymap::ListAction; + /// Generic scroll/selection state for a vertical list menu. /// /// Encapsulates the common behavior of a selectable list that supports: @@ -25,6 +27,28 @@ impl ScrollState { } } + /// Apply a vertical list action and keep the resulting selection visible. + pub fn apply_vertical_action(&mut self, action: ListAction, len: usize, visible_rows: usize) { + match action { + ListAction::MoveUp => { + self.move_up_wrap(len); + self.ensure_visible(len, visible_rows); + } + ListAction::MoveDown => { + self.move_down_wrap(len); + self.ensure_visible(len, visible_rows); + } + ListAction::PageUp => self.page_up_clamped(len, visible_rows), + ListAction::PageDown => self.page_down_clamped(len, visible_rows), + ListAction::JumpTop => self.jump_top(len, visible_rows), + ListAction::JumpBottom => self.jump_bottom(len, visible_rows), + ListAction::MoveLeft + | ListAction::MoveRight + | ListAction::Accept + | ListAction::Cancel => {} + } + } + /// Reset selection and scroll. pub fn reset(&mut self) { self.selected_idx = None; @@ -144,6 +168,7 @@ impl ScrollState { #[cfg(test)] mod tests { use super::ScrollState; + use crate::keymap::ListAction; #[test] fn wrap_navigation_and_visibility() { @@ -156,16 +181,14 @@ mod tests { s.ensure_visible(len, vis); assert_eq!(s.scroll_top, 0); - s.move_up_wrap(len); - s.ensure_visible(len, vis); + s.apply_vertical_action(ListAction::MoveUp, len, vis); assert_eq!(s.selected_idx, Some(len - 1)); match s.selected_idx { Some(sel) => assert!(s.scroll_top <= sel), None => panic!("expected Some(selected_idx) after wrap"), } - s.move_down_wrap(len); - s.ensure_visible(len, vis); + s.apply_vertical_action(ListAction::MoveDown, len, vis); assert_eq!(s.selected_idx, Some(0)); assert_eq!(s.scroll_top, 0); } @@ -177,27 +200,27 @@ mod tests { let vis = 4; s.clamp_selection(len); - s.page_down_clamped(len, vis); + s.apply_vertical_action(ListAction::PageDown, len, vis); assert_eq!(s.selected_idx, Some(4)); assert_eq!(s.scroll_top, 1); - s.page_down_clamped(len, vis); + s.apply_vertical_action(ListAction::PageDown, len, vis); assert_eq!(s.selected_idx, Some(8)); assert_eq!(s.scroll_top, 5); - s.page_down_clamped(len, vis); + s.apply_vertical_action(ListAction::PageDown, len, vis); assert_eq!(s.selected_idx, Some(9)); assert_eq!(s.scroll_top, 6); - s.page_up_clamped(len, vis); + s.apply_vertical_action(ListAction::PageUp, len, vis); assert_eq!(s.selected_idx, Some(5)); assert_eq!(s.scroll_top, 5); - s.jump_top(len, vis); + s.apply_vertical_action(ListAction::JumpTop, len, vis); assert_eq!(s.selected_idx, Some(0)); assert_eq!(s.scroll_top, 0); - s.jump_bottom(len, vis); + s.apply_vertical_action(ListAction::JumpBottom, len, vis); assert_eq!(s.selected_idx, Some(9)); assert_eq!(s.scroll_top, 6); } diff --git a/codex-rs/tui/src/bottom_pane/skills_toggle_view.rs b/codex-rs/tui/src/bottom_pane/skills_toggle_view.rs index 9bd9084614..c63a75b5d5 100644 --- a/codex-rs/tui/src/bottom_pane/skills_toggle_view.rs +++ b/codex-rs/tui/src/bottom_pane/skills_toggle_view.rs @@ -162,44 +162,6 @@ impl SkillsToggleView { .collect() } - fn move_up(&mut self) { - let len = self.visible_len(); - self.state.move_up_wrap(len); - let visible = Self::max_visible_rows(len); - self.state.ensure_visible(len, visible); - } - - fn move_down(&mut self) { - let len = self.visible_len(); - self.state.move_down_wrap(len); - let visible = Self::max_visible_rows(len); - self.state.ensure_visible(len, visible); - } - - fn page_up(&mut self) { - let len = self.visible_len(); - let visible = Self::max_visible_rows(len); - self.state.page_up_clamped(len, visible); - } - - fn page_down(&mut self) { - let len = self.visible_len(); - let visible = Self::max_visible_rows(len); - self.state.page_down_clamped(len, visible); - } - - fn jump_top(&mut self) { - let len = self.visible_len(); - let visible = Self::max_visible_rows(len); - self.state.jump_top(len, visible); - } - - fn jump_bottom(&mut self) { - let len = self.visible_len(); - let visible = Self::max_visible_rows(len); - self.state.jump_bottom(len, visible); - } - fn toggle_selected(&mut self) { let Some(idx) = self.state.selected_idx else { return; @@ -241,25 +203,16 @@ impl BottomPaneView for SkillsToggleView { // plain j/k only apply through non-text events or modified bindings. let allow_plain_char_navigation = !is_plain_text_key_event(key_event); + if allow_plain_char_navigation + && let Some(action) = self.keymap.vertical_action_for(key_event) + { + let len = self.visible_len(); + self.state + .apply_vertical_action(action, len, Self::max_visible_rows(len)); + return; + } + match key_event { - _ if allow_plain_char_navigation && self.keymap.move_up.is_pressed(key_event) => { - self.move_up() - } - _ if allow_plain_char_navigation && self.keymap.move_down.is_pressed(key_event) => { - self.move_down() - } - _ if allow_plain_char_navigation && self.keymap.page_up.is_pressed(key_event) => { - self.page_up() - } - _ if allow_plain_char_navigation && self.keymap.page_down.is_pressed(key_event) => { - self.page_down() - } - _ if allow_plain_char_navigation && self.keymap.jump_top.is_pressed(key_event) => { - self.jump_top() - } - _ if allow_plain_char_navigation && self.keymap.jump_bottom.is_pressed(key_event) => { - self.jump_bottom() - } KeyEvent { code: KeyCode::Backspace, .. diff --git a/codex-rs/tui/src/keymap.rs b/codex-rs/tui/src/keymap.rs index a2294dd90f..5a8f3aa93d 100644 --- a/codex-rs/tui/src/keymap.rs +++ b/codex-rs/tui/src/keymap.rs @@ -413,6 +413,20 @@ impl ListKeymap { .find(|action| self.bindings_for(*action).is_pressed(event)) } + /// Resolve only vertical navigation, preserving its historical priority. + pub(crate) fn vertical_action_for(&self, event: KeyEvent) -> Option { + [ + ListAction::MoveUp, + ListAction::MoveDown, + ListAction::PageUp, + ListAction::PageDown, + ListAction::JumpTop, + ListAction::JumpBottom, + ] + .into_iter() + .find(|action| self.bindings_for(*action).is_pressed(event)) + } + pub(crate) fn has_chord_prefix(&self, event: KeyEvent) -> bool { self.chord_hints.bindings.iter().any(|binding| { binding.action.context.overlaps(KeymapContext::List) From 8094365e6a2da38be1cd37d58f308c496e3f7ac9 Mon Sep 17 00:00:00 2001 From: felixxia-oai Date: Wed, 14 Oct 2026 19:56:28 +0000 Subject: [PATCH 068/155] Stabilize the Guardian network review timeout test (#54082) ## Why Advancing the test clock expires the review, but command cancellation and output drainage still run asynchronously. The model can poll before the final timeout failure is available. ## What changed Hold the initial tool result until the command emits `ExecCommandEnd`, with a bounded wait that also catches unexpected approval requests or turn completion. Only request a poll when the initial result reports a running process, and accept the timeout output from either `exec_command` or `write_stdin`. Keep the assertions that the model receives the timeout explanation without a user approval prompt or a misleading user-rejection message. GitOrigin-RevId: 219a1579dce35caf8f0d45b1d92a7343ec1a8935 --- codex-rs/core/tests/suite/network_approval.rs | 67 ++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/codex-rs/core/tests/suite/network_approval.rs b/codex-rs/core/tests/suite/network_approval.rs index 9bf595e64e..64a97413c9 100644 --- a/codex-rs/core/tests/suite/network_approval.rs +++ b/codex-rs/core/tests/suite/network_approval.rs @@ -14,6 +14,10 @@ use codex_exec_server::CreateDirectoryOptions; use codex_exec_server::LOCAL_ENVIRONMENT_ID; use codex_exec_server::REMOTE_ENVIRONMENT_ID; use codex_exec_server::RemoveOptions; +use codex_extension_api::ExtensionRegistryBuilder; +use codex_extension_api::ToolFinishInput; +use codex_extension_api::ToolLifecycleContributor; +use codex_extension_api::ToolLifecycleFuture; use codex_features::Feature; use codex_history::RolloutItem; #[cfg(unix)] @@ -665,10 +669,34 @@ async fn timed_out_guardian_network_review_uses_timeout_outcome_without_user_fal skip_if_no_network!(Ok(())); skip_if_sandbox!(Ok(())); - let server = start_mock_server().await; - let test = managed_network_unified_exec_test(&server).await?; + struct HoldExecResult { + call_id: &'static str, + release: tokio::sync::Notify, + } + + impl ToolLifecycleContributor for HoldExecResult { + fn on_tool_finish<'a>(&'a self, input: ToolFinishInput<'a>) -> ToolLifecycleFuture<'a> { + Box::pin(async move { + if input.call_id == self.call_id { + self.release.notified().await; + } + }) + } + } + let call_id = "guardian-network-timeout"; let poll_call_id = "guardian-network-timeout-poll"; + let hold_result = Arc::new(HoldExecResult { + call_id, + release: tokio::sync::Notify::new(), + }); + let mut extensions = ExtensionRegistryBuilder::new(); + extensions.tool_lifecycle_contributor(hold_result.clone()); + let server = start_mock_server().await; + let test = managed_network_unified_exec_builder(&[])? + .with_extensions(Arc::new(extensions.build())) + .build_with_remote_and_local_env(&server) + .await?; mount_sse_once_match( &server, |request: &wiremock::Request| { @@ -700,7 +728,9 @@ async fn timed_out_guardian_network_review_uses_timeout_outcome_without_user_fal mount_sse_once_match( &server, |request: &wiremock::Request| { - !is_guardian_request(request) && request_body_contains(request, call_id) + !is_guardian_request(request) + && request_body_contains(request, call_id) + && request_body_contains(request, "Process running with session ID 1000") }, sse(vec![ ev_response_created("resp-guardian-timeout-parent-followup"), @@ -720,7 +750,7 @@ async fn timed_out_guardian_network_review_uses_timeout_outcome_without_user_fal let parent_final = mount_sse_once_match( &server, |request: &wiremock::Request| { - !is_guardian_request(request) && request_body_contains(request, poll_call_id) + !is_guardian_request(request) && request_body_contains(request, call_id) }, sse(vec![ ev_response_created("resp-guardian-timeout-parent-final"), @@ -742,12 +772,33 @@ async fn timed_out_guardian_network_review_uses_timeout_outcome_without_user_fal tokio::time::pause(); tokio::time::advance(Duration::from_secs(91)).await; tokio::time::resume(); + + // The clock jump expires the review, but cancellation and output drainage + // still run asynchronously. Hold the tool result until its terminal event + // so the model cannot poll before the final failure is available. + let completion = tokio::time::timeout( + Duration::from_secs(/*secs*/ 10), + wait_for_event(&test.codex, |event| match event { + EventMsg::ExecCommandEnd(event) => event.call_id == call_id, + EventMsg::ExecApprovalRequest(_) | EventMsg::TurnComplete(_) => true, + _ => false, + }), + ) + .await; + // notify_one retains a permit if the tool-finish callback has not run yet. + hold_result.release.notify_one(); + let completion = completion.context("timed out waiting for the network command to finish")?; + assert!( + matches!(completion, EventMsg::ExecCommandEnd(_)), + "unexpected event before command completion: {completion:?}" + ); wait_for_completion_without_network_prompt(&test).await; - let tool_output = parent_final - .requests() - .iter() - .find_map(|request| request.function_call_output_text(poll_call_id)) + let request = parent_final.single_request(); + // If the initial exec call already returned its final error, no poll is needed. + let tool_output = request + .function_call_output_text(poll_call_id) + .or_else(|| request.function_call_output_text(call_id)) .context("expected timed-out Guardian tool output")?; assert!( tool_output.contains(concat!( From cd8d61b223d95fd540bb646d627e7f0e7cfa6146 Mon Sep 17 00:00:00 2001 From: Dmitriy Kovalenko Date: Wed, 14 Oct 2026 20:28:47 +0000 Subject: [PATCH 069/155] Upgrade Bazel's `rules_python` to 2.4.2 (#54087) ## What changed - Upgrade `rules_python` from 1.7.0 to 2.4.2 and update `MODULE.bazel.lock`. - Enable `--windows_enable_symlinks` in `.bazelrc`, as `rules_python` 2.x requires symlink support for Windows Python launchers. GitOrigin-RevId: 303da258c74b18d0d0df8d4eebb830c57f14cca4 --- .bazelrc | 2 + MODULE.bazel | 2 +- MODULE.bazel.lock | 646 ++++++++++++++++++++++++++++++++++------------ 3 files changed, 477 insertions(+), 173 deletions(-) diff --git a/.bazelrc b/.bazelrc index b7698b896e..4e2195c6b7 100644 --- a/.bazelrc +++ b/.bazelrc @@ -8,6 +8,8 @@ common --repo_contents_cache=~/.cache/bazel-repo-contents-cache common --repository_cache=~/.cache/bazel-repo-cache common --remote_cache_compression startup --experimental_remote_repo_contents_cache +# rules_python 2.x requires symlink support for Windows Python launchers. +startup --windows_enable_symlinks common --experimental_platform_in_output_dir diff --git a/MODULE.bazel b/MODULE.bazel index d946666bec..ab81530b0b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -175,7 +175,7 @@ single_version_override( version = "0.15.1", ) -bazel_dep(name = "rules_python", version = "1.7.0") +bazel_dep(name = "rules_python", version = "2.4.2") voice_python = use_extension("@rules_python//python/extensions:python.bzl", "python") voice_python.defaults(python_version = "3.11") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 19067bbe7f..120af1b348 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -229,7 +229,8 @@ "https://bcr.bazel.build/modules/rules_python/1.6.0/MODULE.bazel": "7e04ad8f8d5bea40451cf80b1bd8262552aa73f841415d20db96b7241bd027d8", "https://bcr.bazel.build/modules/rules_python/1.6.3/MODULE.bazel": "a7b80c42cb3de5ee2a5fa1abc119684593704fcd2fec83165ebe615dec76574f", "https://bcr.bazel.build/modules/rules_python/1.7.0/MODULE.bazel": "d01f995ecd137abf30238ad9ce97f8fc3ac57289c8b24bd0bf53324d937a14f8", - "https://bcr.bazel.build/modules/rules_python/1.7.0/source.json": "028a084b65dcf8f4dc4f82f8778dbe65df133f234b316828a82e060d81bdce32", + "https://bcr.bazel.build/modules/rules_python/2.4.2/MODULE.bazel": "fde4307b6765b6f261c40a2c08140a5d10e3aa9b6c12e23bb57d31b7ce124c29", + "https://bcr.bazel.build/modules/rules_python/2.4.2/source.json": "225828a44c27fa97ba8a594e6fd3b752061779f052d40c4bb5d6b45f2ded567b", "https://bcr.bazel.build/modules/rules_rs/0.0.96/MODULE.bazel": "678fdcee5a9847611276770eab47190dda04a41973b7bf6037e50a3f98e49e09", "https://bcr.bazel.build/modules/rules_rs/0.0.96/source.json": "2b52d3d209324bd4aaa4896aa0e8b28d0123856b4ade32ebd7bf24b4fded6f12", "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c", @@ -247,11 +248,12 @@ "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c", "https://bcr.bazel.build/modules/stardoc/0.7.0/MODULE.bazel": "05e3d6d30c099b6770e97da986c53bd31844d7f13d41412480ea265ac9e8079c", "https://bcr.bazel.build/modules/stardoc/0.7.2/MODULE.bazel": "fc152419aa2ea0f51c29583fab1e8c99ddefd5b3778421845606ee628629e0e5", - "https://bcr.bazel.build/modules/stardoc/0.7.2/source.json": "58b029e5e901d6802967754adf0a9056747e8176f017cfe3607c0851f4d42216", "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/MODULE.bazel": "5e463fbfba7b1701d957555ed45097d7f984211330106ccd1352c6e0af0dcf91", "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.2/MODULE.bazel": "75aab2373a4bbe2a1260b9bf2a1ebbdbf872d3bd36f80bff058dccd82e89422f", "https://bcr.bazel.build/modules/tar.bzl/0.10.4/MODULE.bazel": "e8f9ff79199e8d9eaad7f1b0a77ad74b30bb82d794b87d8ca942bead5de83ae9", "https://bcr.bazel.build/modules/tar.bzl/0.10.4/source.json": "20143442376c03426f6135292ba02d825cb75308aa47e6bf42dd4cc5a435c2ff", + "https://bcr.bazel.build/modules/toml.bzl/0.4.1/MODULE.bazel": "6bc0b938f03ade8d58c2fca0ad5c3fa12b4764e1e1927ad50b0c860286db2167", + "https://bcr.bazel.build/modules/toml.bzl/0.4.1/source.json": "86a90afd8b43c9b69ad31f5c03998c3adcf4b08175e621addb93e3a38eec538b", "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43", "https://bcr.bazel.build/modules/upb/0.0.0-20230516-61a97ef/MODULE.bazel": "c0df5e35ad55e264160417fd0875932ee3c9dda63d9fccace35ac62f45e1b6f9", "https://bcr.bazel.build/modules/windows_support/0.2.0/MODULE.bazel": "aa17e272ca57409a71a53dae29bdadea721f9c8eeb4c136d1eaa1ee5f33b18a3", @@ -383,178 +385,10 @@ } } }, - "@@rules_python+//python/extensions:config.bzl%config": { - "general": { - "bzlTransitiveDigest": "dzD8Q2YmrP3fz8saWLHPmlwPLO91ImtTmP/c9JKTStM=", - "usagesDigest": "ZVSXMAGpD+xzVNPuvF1IoLBkty7TROO0+akMapt1pAg=", - "recordedInputs": [ - "REPO_MAPPING:rules_python+,bazel_tools bazel_tools", - "REPO_MAPPING:rules_python+,pypi__build rules_python++config+pypi__build", - "REPO_MAPPING:rules_python+,pypi__click rules_python++config+pypi__click", - "REPO_MAPPING:rules_python+,pypi__colorama rules_python++config+pypi__colorama", - "REPO_MAPPING:rules_python+,pypi__importlib_metadata rules_python++config+pypi__importlib_metadata", - "REPO_MAPPING:rules_python+,pypi__installer rules_python++config+pypi__installer", - "REPO_MAPPING:rules_python+,pypi__more_itertools rules_python++config+pypi__more_itertools", - "REPO_MAPPING:rules_python+,pypi__packaging rules_python++config+pypi__packaging", - "REPO_MAPPING:rules_python+,pypi__pep517 rules_python++config+pypi__pep517", - "REPO_MAPPING:rules_python+,pypi__pip rules_python++config+pypi__pip", - "REPO_MAPPING:rules_python+,pypi__pip_tools rules_python++config+pypi__pip_tools", - "REPO_MAPPING:rules_python+,pypi__pyproject_hooks rules_python++config+pypi__pyproject_hooks", - "REPO_MAPPING:rules_python+,pypi__setuptools rules_python++config+pypi__setuptools", - "REPO_MAPPING:rules_python+,pypi__tomli rules_python++config+pypi__tomli", - "REPO_MAPPING:rules_python+,pypi__wheel rules_python++config+pypi__wheel", - "REPO_MAPPING:rules_python+,pypi__zipp rules_python++config+pypi__zipp" - ], - "generatedRepoSpecs": { - "rules_python_internal": { - "repoRuleId": "@@rules_python+//python/private:internal_config_repo.bzl%internal_config_repo", - "attributes": { - "transition_setting_generators": {}, - "transition_settings": [] - } - }, - "pypi__build": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/e2/03/f3c8ba0a6b6e30d7d18c40faab90807c9bb5e9a1e3b2fe2008af624a9c97/build-1.2.1-py3-none-any.whl", - "sha256": "75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__click": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl", - "sha256": "ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__colorama": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", - "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__importlib_metadata": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/2d/0a/679461c511447ffaf176567d5c496d1de27cbe34a87df6677d7171b2fbd4/importlib_metadata-7.1.0-py3-none-any.whl", - "sha256": "30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__installer": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl", - "sha256": "05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__more_itertools": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/50/e2/8e10e465ee3987bb7c9ab69efb91d867d93959095f4807db102d07995d94/more_itertools-10.2.0-py3-none-any.whl", - "sha256": "686b06abe565edfab151cb8fd385a05651e1fdf8f0a14191e4439283421f8684", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__packaging": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl", - "sha256": "2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__pep517": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/25/6e/ca4a5434eb0e502210f591b97537d322546e4833dcb4d470a48c375c5540/pep517-0.13.1-py3-none-any.whl", - "sha256": "31b206f67165b3536dd577c5c3f1518e8fbaf38cbc57efff8369a392feff1721", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__pip": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/8a/6a/19e9fe04fca059ccf770861c7d5721ab4c2aebc539889e97c7977528a53b/pip-24.0-py3-none-any.whl", - "sha256": "ba0d021a166865d2265246961bec0152ff124de910c5cc39f1156ce3fa7c69dc", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__pip_tools": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/0d/dc/38f4ce065e92c66f058ea7a368a9c5de4e702272b479c0992059f7693941/pip_tools-7.4.1-py3-none-any.whl", - "sha256": "4c690e5fbae2f21e87843e89c26191f0d9454f362d8acdbd695716493ec8b3a9", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__pyproject_hooks": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/ae/f3/431b9d5fe7d14af7a32340792ef43b8a714e7726f1d7b69cc4e8e7a3f1d7/pyproject_hooks-1.1.0-py3-none-any.whl", - "sha256": "7ceeefe9aec63a1064c18d939bdc3adf2d8aa1988a510afec15151578b232aa2", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__setuptools": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/90/99/158ad0609729111163fc1f674a5a42f2605371a4cf036d0441070e2f7455/setuptools-78.1.1-py3-none-any.whl", - "sha256": "c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__tomli": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl", - "sha256": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__wheel": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/7d/cd/d7460c9a869b16c3dd4e1e403cce337df165368c71d6af229a74699622ce/wheel-0.43.0-py3-none-any.whl", - "sha256": "55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__zipp": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "url": "https://files.pythonhosted.org/packages/da/55/a03fd7240714916507e1fcf7ae355bd9d9ed2e6db492595f1a67f61681be/zipp-3.18.2-py3-none-any.whl", - "sha256": "dce197b859eb796242b0622af1b8beb0a722d52aa2f57133ead08edd5bf5374e", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - } - } - } - }, "@@rules_python+//python/uv:uv.bzl%uv": { "general": { - "bzlTransitiveDigest": "ijW9KS7qsIY+yBVvJ+Nr1mzwQox09j13DnE3iIwaeTM=", - "usagesDigest": "H8dQoNZcoqP+Mu0tHZTi4KHATzvNkM5ePuEqoQdklIU=", + "bzlTransitiveDigest": "DafUArm1CsjJZcemT0FvUq9rUch+pq38+JqfOBJCpm8=", + "usagesDigest": "mM5nr0rInol5uct6JfVpNViqAYYCaAo3qdfPr4gsFGQ=", "recordedInputs": [ "REPO_MAPPING:rules_python+,bazel_tools bazel_tools", "REPO_MAPPING:rules_python+,platforms platforms" @@ -657,6 +491,474 @@ } }, "facts": { + "@@rules_python+//python/extensions:pip.bzl%pip": { + "dist_hashes": { + "https://pypi.org/simple": { + "backports-tarfile": { + "https://files.pythonhosted.org/packages/86/72/cd9b395f25e290e633655a100af28cb253e4393396264a98bd5f5951d50f/backports_tarfile-1.2.0.tar.gz": "sha256:d75e02c268746e1b8144c278978b6e98e85de6ad16f8e4b0844a154557eca991", + "https://files.pythonhosted.org/packages/b9/fa/123043af240e49752f1c4bd24da5053b6bd00cad78c2be53c0d1e8b975bc/backports.tarfile-1.2.0-py3-none-any.whl": "sha256:77e284d754527b01fb1e6fa8a1afe577858ebe4e9dad8919e34c862cb399bc34" + }, + "certifi": { + "https://files.pythonhosted.org/packages/0b/a7/71ac2cff56fec219ed242bb11b8efb69fcc4bec75db06fb7bfe35de520e6/certifi-2026.7.22-py3-none-any.whl": "sha256:62f22742b58a1a33014a2b6b706588a8d7e2a88ae7bd1a6ebe8c992928483775", + "https://files.pythonhosted.org/packages/a3/c2/24167ea9858356b47a87a50d39908bfdb72ceeefe0041586e704e5376b3a/certifi-2026.7.22.tar.gz": "sha256:741e2c3b351ddf169a738da9f2c048608ff7f2c5cc02f1ebc6b118bb090d5d55" + }, + "cffi": { + "https://files.pythonhosted.org/packages/01/9a/11f687cb39d6a3504060d5242f04f48c735afb4d3d533958a20594890cb2/cffi-2.1.1-cp313-cp313-win_arm64.whl": "sha256:63bbfd5ded17c4840ac07cd8f1c21ba9d9708141f840b324f422f41b207e3973", + "https://files.pythonhosted.org/packages/02/10/4b3c75dde3d9663c9e02ba05c2668b954f671d4bbe346413ca8c696b295a/cffi-2.1.1-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl": "sha256:fcd22650c908d7b7da162bbfaab594a1227a15d1643a98c68b122ac642fa2264", + "https://files.pythonhosted.org/packages/09/b8/eefc0e06913b70aa153bf74c946094a18f58fd4aff11b7f372bfdfdca050/cffi-2.1.1-cp310-cp310-musllinux_1_2_i686.whl": "sha256:3d22a20b1fb1632cc72c22f95f7b0d2961c3e1c235f245ba4c606c4771035659", + "https://files.pythonhosted.org/packages/0b/e9/d0061c364cde06ee43168a0d076ac1da512cbc380d44767b844ba34fe2b6/cffi-2.1.1-cp314-cp314-win32.whl": "sha256:1a18a57b58cfb21fc28d72e876acf10eaed67a1ed96226f92af4df681d571c4c", + "https://files.pythonhosted.org/packages/0c/75/2f5207ff6d1a613133b23a5203cc0c2a628313b5eb3974d7956ae3c57950/cffi-2.1.1-cp315-cp315-macosx_11_0_arm64.whl": "sha256:2ae64be792b8966f2c69538199728b290e34726562896df1e5dc8ffd8d8188e8", + "https://files.pythonhosted.org/packages/0d/fc/5f74e293fced6edb51af3a46c4ccf6c23c9943774ecb375ddbd522c76add/cffi-2.1.1-cp315-cp315-manylinux2014_s390x.manylinux_2_17_s390x.whl": "sha256:471cee653ae88de62096552e6d24ccb4a5adb8c8c9f10b5054d0122c15bf2779", + "https://files.pythonhosted.org/packages/10/69/43965eccfdead3b9220015fd1320e117be8c6ed01a62ffab76eeb752f5d5/cffi-2.1.1-cp312-cp312-macosx_10_15_x86_64.whl": "sha256:c8c69575568085ba0b1b10c0249d779a214aea6f6522e949a0fc9fb0fcb449d0", + "https://files.pythonhosted.org/packages/17/0b/ba385d8ccedf926c3cd06e8e2f327027da5afe5f0eb30f1f7bc43ac55125/cffi-2.1.1-cp310-cp310-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl": "sha256:42e2f76b9455f5a9a844f770bf3e200ed3da0e15f5df3db9c31fe80b04b3d004", + "https://files.pythonhosted.org/packages/18/d4/03026f0c850cbbaa9030750490225b4a7f4d524ea4df72c3cc740a90f4ef/cffi-2.1.1-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.whl": "sha256:75f80557d1389eddbd0de2681f6a390a0c5338c31ddaa821381c203fc3fd50d9", + "https://files.pythonhosted.org/packages/1b/8a/af668013284634733f02d683458a0728739c7d6ddb5e14cb0c20832266fe/cffi-2.1.1-cp315-cp315-macosx_10_15_x86_64.whl": "sha256:fb92203a88b3d3053034db775110081c49d28be6551923805e039924093761e4", + "https://files.pythonhosted.org/packages/23/59/40338bf421c5accea1d45158170c87006ef1cd371b05c077e76476949728/cffi-2.1.1-cp314-cp314t-macosx_10_15_x86_64.whl": "sha256:7750c6449dff7864bb9bb27ddfb0267756189201a3afc911d82b3caacd70dfc3", + "https://files.pythonhosted.org/packages/28/f7/dabe6da2466ecbd82dc62e7342dc6b1065dad990c06f00f0ede9ebf2a0ed/cffi-2.1.1-cp311-cp311-musllinux_1_2_aarch64.whl": "sha256:7225e4514edb64eb6740324353e0da0711954fd8d7da4576755b1c6e09b697cd", + "https://files.pythonhosted.org/packages/2a/9c/92934c3bea9f785b23eba304538c0b4d37a2a96d2431eb3a1bc87a11aa19/cffi-2.1.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:49cbc70e6542d4ccccb936558d1064a8012541e78f821f955cff24e357776c94", + "https://files.pythonhosted.org/packages/34/34/a95870b9221e09cf4f2ce3178b1a210abdfe63a1bd357da940418d7b8d15/cffi-2.1.1-cp313-cp313-musllinux_1_2_x86_64.whl": "sha256:e0bcb7e0f677f543555d2adff3bf19c05f66cdb4796e5ff602442ab2fe3c4ef7", + "https://files.pythonhosted.org/packages/37/15/180e0dab27b9312c7479003d14c9e547634b7dcb934e2cc4650e1b131a7a/cffi-2.1.1-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl": "sha256:9f8d177621de5cb38ee3e731eda45d421db093ec0739f46a5594babda7987a98", + "https://files.pythonhosted.org/packages/37/6f/3b5ce4c3b2192d250f04908f2bfd91ef34552ec8f7716a5d4abdb8d67bb2/cffi-2.1.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:f16c709686a78c727bbbf059f92b0bf41c6fc60deec706d2dc19f529175a6125", + "https://files.pythonhosted.org/packages/43/1f/1c3d90d91811c8f86ced9ed637956c54bfe5b79ca98fe976d7f8c8979f6b/cffi-2.1.1-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl": "sha256:6a8dddef476fab96d066d578fc88526767b836ab5ab21754e1d5bf3879c31c7c", + "https://files.pythonhosted.org/packages/44/16/29e6d01b388bef055ecd6ca8244b3f4d336bd09e92d5d892187b9601084e/cffi-2.1.1-cp315-cp315-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:aeae0e330c9f6acd681f647d46cefd30c29f93e3392882e792e82080c9691399", + "https://files.pythonhosted.org/packages/44/de/f98430906df1545ffde0d543dd124a7a439bc2cd32b36b9c53f805df7333/cffi-2.1.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:68e62fe11f30d5ca8289242866f0a5291402d8529ca2178ab8afc5c9694ae890", + "https://files.pythonhosted.org/packages/4d/45/ba4c93527bc38616a8bd36488acb69a2212d60486794f0c1f318949bbb76/cffi-2.1.1-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl": "sha256:e2d65b31f36619cda3999b78b2aa9632e76b78448e7a56fc4240824200e7c4fc", + "https://files.pythonhosted.org/packages/50/e3/f6234a833e6e08c7007003074723c406559eecf9b48dfc97471e5a8eb7a0/cffi-2.1.1-cp315-cp315-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl": "sha256:246fa40ce8645a614ff682e0b70f37134e460eaf93a775e0cbe3cca585a67a80", + "https://files.pythonhosted.org/packages/52/86/2976131c639aead931c5bee5aba67e4b09fbeb8018b6f282f70803f923a7/cffi-2.1.1-cp315-cp315t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:363e05fa78e15116c3c32c210ee36884fd6b9afa6d440e47112c3bd511d64cb6", + "https://files.pythonhosted.org/packages/53/b2/6187f46f2912276a3ae284076109cc5c8680482f11f766ccf26db4a86427/cffi-2.1.1-cp315-cp315t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:937c0052c05a31ca1daf18de3158eed4dbfcb9cc107adbea227728d647be701e", + "https://files.pythonhosted.org/packages/54/7d/16e5a096677b5e313ca80cd5e5170efa3ea44624a82bb111925522da64b1/cffi-2.1.1-cp312-cp312-macosx_11_0_arm64.whl": "sha256:f81b3b8f3d4e343550fa4baa0e479bba9f2d29ce9c2e9b51d1ce1718d7442fcf", + "https://files.pythonhosted.org/packages/55/41/4c7042f317b9217502988f0873af87e16ad606dc20f84e546e3e6ce9764c/cffi-2.1.1-cp313-cp313-macosx_11_0_arm64.whl": "sha256:19ee6127ee34de7d83ce3d371ebc5ed91addbdcc39f9ab15ce4eb35a4e534971", + "https://files.pythonhosted.org/packages/56/78/31f00c1bcd97c9bbf55f1bfdf5bc809a5de8887473e90bb9960dca825e80/cffi-2.1.1-cp314-cp314t-win_amd64.whl": "sha256:616f097f2fe415bc92a247f02e11f634e1f9e9a83d327e3c915c15089c87869e", + "https://files.pythonhosted.org/packages/56/e6/8941622732edec876dd17d0453dce07317ae96db34f2ec1436c9d3785986/cffi-2.1.1-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl": "sha256:811bd1e21d32de12efca32393a0ab3f5133b54fce9bd44b8bd77ab07da14bf6a", + "https://files.pythonhosted.org/packages/60/a6/8b149b2c3f2e11aaa1618ef64500b45f50f22c57a977a4dff1aff1f91042/cffi-2.1.1-cp313-cp313-win_amd64.whl": "sha256:1aa5645c30469b09530c4ebca77ebf8f17618293c58f8549cb1a543a50236e7d", + "https://files.pythonhosted.org/packages/64/b3/f8aa4f3e34986c7e4ec45072d1b1b9dd295b6b18007b45518d79726dd725/cffi-2.1.1-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl": "sha256:3143d81e29e1e20a9ce10901ec369012947876596f75a222235965f2b7ae832e", + "https://files.pythonhosted.org/packages/67/b8/b42132ca113dc567d37684437b46ca1dafc885902b02a110a02d5b511857/cffi-2.1.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:58acb8ab8e295e6c5ea12f888cbb13cf21511ef2a3303a23f4325c29d17fe5c1", + "https://files.pythonhosted.org/packages/6a/5b/717f1526b9957b34456313c31645c5b82b8fb5c3fe9e4752999be7128bfc/cffi-2.1.1-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl": "sha256:4a7c934f7360e8cd64fe9efadcbd10c7c6364f531e432b9a4bf5ccbc9e0e8b50", + "https://files.pythonhosted.org/packages/6d/cd/a361394c94b2129d604bb846f624a8e88255a3ee33129c434a00d715e64f/cffi-2.1.1-cp315-cp315t-win32.whl": "sha256:06c72bb76605a4b0cd0aad6930b69d4baf7dd5d806cfc409b824191099700e66", + "https://files.pythonhosted.org/packages/6f/13/4e56852824a03cdf68523a35686f1c28eacd4bd30a7b0a78e682e6e6e1d3/cffi-2.1.1-cp310-cp310-musllinux_1_2_x86_64.whl": "sha256:1dea0e4d7d4f11f619fe8c1d76caf49e24405b4b5743c0e3be16a500ecd930c9", + "https://files.pythonhosted.org/packages/70/c6/d0ea84713fe46b243a436a18fcd47d639732747e21635c8a27191b06dc30/cffi-2.1.1-cp312-cp312-win_arm64.whl": "sha256:7bde5e4cc5c10140859842b9d383af292b22639a4dffb725314baf45968cef80", + "https://files.pythonhosted.org/packages/70/d2/16d99a0c4948febc0ebd133a13b2f688ff7f8cb04da971e1128872ce0c03/cffi-2.1.1-cp311-cp311-macosx_10_15_x86_64.whl": "sha256:c8d2c9fd1f2d16f780d15127abb050d13d1a76c03a4bd87d7e4980e45e511e12", + "https://files.pythonhosted.org/packages/70/ea/839b50531021a647fb5e929f72cf97bc1ff702b5472166164b5b6e76b851/cffi-2.1.1-cp313-cp313-win32.whl": "sha256:334644fbac4eff73d985a17a91226df55d0f394160c4cfb880e084c8f7161cac", + "https://files.pythonhosted.org/packages/73/c0/77ba02423c2f7d7091143c45cd49e0e6575c4c1967394bb542bd923a9b74/cffi-2.1.1-cp311-cp311-win_amd64.whl": "sha256:42f6930c31dc7f50732c9ae793c2786c7b6b044195967bbdde40bb9be81c4cc0", + "https://files.pythonhosted.org/packages/75/77/60bebf6f818bec84210ac5b6979ce4eeadce6fbbaabc9c7ab23e506d1ce5/cffi-2.1.1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:194cffa889098ced9976c3fc6340305e43f6303657d298da55366907c05c22d6", + "https://files.pythonhosted.org/packages/76/af/2aeb4dbb5fc41a04161ae9ff1518de7cec08e164f44a8ce6a4cf7fd2cd1d/cffi-2.1.1-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl": "sha256:31348097ff5bbe827ccc41795d4dd099d9f0625e7def00ee653c137a490c2a6c", + "https://files.pythonhosted.org/packages/7b/1b/58496f2ed0a35de575250c02a43ab3cc2c04d494a88fed31c1cabc0fd176/cffi-2.1.1-cp314-cp314t-win_arm64.whl": "sha256:ad2c86c495b899d862ea0f4b42891b8713a3bd45dd4105c7fd51c2a72f39f3a5", + "https://files.pythonhosted.org/packages/7c/47/9f1f85f9672ceda4984dc6c4f8824e8558992a2972c3d3c81fb8eb28d4ba/cffi-2.1.1-cp311-cp311-win_arm64.whl": "sha256:c7659f22557c5a0bc4855cd635f55edec690cc008a40768527762cb9fb263455", + "https://files.pythonhosted.org/packages/7d/47/5ecf1023850036e674c77ec4de86182d309ae344e39e7cba984b7df5d647/cffi-2.1.1-cp314-cp314t-macosx_11_0_arm64.whl": "sha256:0beceaabe56af686895136a2de78db54ecd8e4046b236b8fd6d6cb61389e9bf2", + "https://files.pythonhosted.org/packages/7e/ae/a56fa8c4686ad50e148fcbc8d3ae0d03915ff5c30d795058988c24118cef/cffi-2.1.1-cp315-cp315t-macosx_11_0_arm64.whl": "sha256:4be96343e422f2dfcd12ab5c9f5aebe03f82f737c6bffeca6830b3875cb44aab", + "https://files.pythonhosted.org/packages/80/10/c5c0cbf0a657aecf59ef511409734230bf556f05a0d6c9eed7aa5c0a0166/cffi-2.1.1-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl": "sha256:456a61fa52d579ebf9df2e9552ead5129855dbaff6c1e5a9b1bc408809bdc062", + "https://files.pythonhosted.org/packages/80/e9/b6ef565e452acb932fb0cb5443f44a78efbd1233e566f02b5a83855e9115/cffi-2.1.1-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.whl": "sha256:28907ab9bfb6aa13184cfc17c6b8e1023c5ab6fd7076d8c20a35e59fe04f8f29", + "https://files.pythonhosted.org/packages/80/fb/0bb75b7039588c074b37ae99f40d9bfddf990ecb2fbc346ebccd2e56b9be/cffi-2.1.1-cp312-cp312-win32.whl": "sha256:046bfc24911b37851ee1b51aab8bffe713d89c68c6a057b09484ce9fd5f69b4e", + "https://files.pythonhosted.org/packages/81/10/5dc0e7bdd18e22107054288283380fc97a06ae3f1656a106908d666a3c88/cffi-2.1.1-cp314-cp314-musllinux_1_2_x86_64.whl": "sha256:5c58fe613dc5e5336357eff555824a314d8e43282600435c8d1cb6a7a2fedd13", + "https://files.pythonhosted.org/packages/82/1d/a4aaf9babd75acb4d5f223bff71533bee748dd770a382619a798960ee9ba/cffi-2.1.1-cp314-cp314-musllinux_1_2_aarch64.whl": "sha256:64faea20f4e2613363a1a9b9c7dd73058f3ecd00133a511e72ad7c511658f527", + "https://files.pythonhosted.org/packages/87/5b/da4e39efe18eeb89cf580ea9cfc66b6a7c3eadb808fc0cc1d3a295cb5a5d/cffi-2.1.1-cp314-cp314-win_arm64.whl": "sha256:ab36d55f9ed2d067327667c2fea18dda018eb628dd6347aa01dda6cf1f5d3836", + "https://files.pythonhosted.org/packages/8a/f6/c3ad28bd19f77047a03084424fbd4cbe997303267c14423737324be0385d/cffi-2.1.1-cp315-cp315t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl": "sha256:df423d40ee8654634421812bc3b196da3f9bd7d32929da813f8394c4348a5358", + "https://files.pythonhosted.org/packages/8d/b0/0b44f47c60b01b57b6e2bbd92343f13a85a1d93bc46ccf6e47e244acd99c/cffi-2.1.1-cp314-cp314t-musllinux_1_2_x86_64.whl": "sha256:25792eac27877609e7bb06d42ff88278a6624fff2ba9bbb523c09616b117e80f", + "https://files.pythonhosted.org/packages/94/1a/4b2f7c92293ba05cbd4a9a1b28faaf0326272d9488e6354657571c48a7aa/cffi-2.1.1-cp310-cp310-macosx_11_0_arm64.whl": "sha256:ca82be1a1d406ecfe1d25dc16cb33488e5a16bf4438c9fb590484ea29d92478b", + "https://files.pythonhosted.org/packages/94/e6/bcc91b283be94735e268487a054004f0aa19947b6348fa367db53230abc8/cffi-2.1.1-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl": "sha256:f24fb43132a4c6b4cb4eb029492919b2db645be6808d738f244fd146c03c32cb", + "https://files.pythonhosted.org/packages/95/95/86342356ff5953b3fb06f7ef7c5bee212d45e770abc7218d451b9148313c/cffi-2.1.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:a931079504ecc49efed7744c476a5c343a92fabf66dec2db95edb1b2fdc770e2", + "https://files.pythonhosted.org/packages/99/7f/040f9e163e4acac3ee3d85b02d00b2576e7ca980d8785f0a3a5f1a9bf7f5/cffi-2.1.1-cp310-cp310-win32.whl": "sha256:7ce713ace7c0e4520535b42b77eaa742c16dab813978064913e5a3cf82973b41", + "https://files.pythonhosted.org/packages/9a/95/eff5f0cee78d2eabc7eebffec40d3fc1876b5f3c95582e018bb4b99601f2/cffi-2.1.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:51b31d1c98274844cfd7838ce00bfc27c7423a4dc00fc0772fc3331c2cc90676", + "https://files.pythonhosted.org/packages/9b/b5/ba2b299993c26577d529b6ae29841f9e15b9fcf004d65f423f4fcf94ade9/cffi-2.1.1-cp315-cp315t-win_amd64.whl": "sha256:d9c275eaacd24aa73f94ffd6de08fc3f932424d8b6c376f4bed7cde376fe7bc3", + "https://files.pythonhosted.org/packages/9d/f4/035513d4117049066b4779dc3b7c0c0fdad175fa13731c9f4003f1cd1478/cffi-2.1.1-cp313-cp313-ios_13_0_arm64_iphoneos.whl": "sha256:b5bdfd1c873d4e093aabc0ca84c4ca6dbc4f752afb5c86f146d9742580c9da2e", + "https://files.pythonhosted.org/packages/9e/ef/008a1939e372c06329a3fce4279c02f328488f3526744906eeec3da7ad5f/cffi-2.1.1.tar.gz": "sha256:dd31f52ea1086513bb9df30f8fcee9b8918323ae067a3d5b78bc826a000712be", + "https://files.pythonhosted.org/packages/a0/cd/ccac9013a5bd9fd764de118674ab9c805b5ca10c19270d90ee273f8b2240/cffi-2.1.1-cp315-cp315t-manylinux2014_s390x.manylinux_2_17_s390x.whl": "sha256:a730a083190634c65cca36ba5f489531576ebd79bcd5c8e172130f6453127231", + "https://files.pythonhosted.org/packages/a0/d2/6cd24ae3be000a634109c247d1475d62e5616d0dc78c82770942ec384248/cffi-2.1.1-cp312-cp312-musllinux_1_2_aarch64.whl": "sha256:208f941bb9d18e768138677f0a6d2ce01f590df56043dda1df1535ac57c88517", + "https://files.pythonhosted.org/packages/a3/b9/0f2e58b2cefa33255bff36935d42b13180fe559bba82596540eb404bde7d/cffi-2.1.1-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:5a59cc1c4442bc3d5c703bf720b51138d0bfc173618807c9ee2490a7541dd3d9", + "https://files.pythonhosted.org/packages/a4/18/fa7f1f6857d5eb88a4ca99ffcbfb7c387a287ccc154c64a73e86314745d7/cffi-2.1.1-cp315-cp315-musllinux_1_2_aarch64.whl": "sha256:42a494cee34437f05546455144f2b5d9ac09b1face62bcfce597d2e521066688", + "https://files.pythonhosted.org/packages/a5/a7/a67c733254d6e7373f7822f8082d8d6beade791e0cf12a7611f376fa61c7/cffi-2.1.1-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl": "sha256:a6e721d4b0e45d5b65e87534470e67b18dcd092c83f68fba09f152b9cbc061af", + "https://files.pythonhosted.org/packages/a7/06/1c3e01e3ba14c39f6d10bfbac52753b7e22259e38088e5cfe1d704918690/cffi-2.1.1-cp314-cp314-win_amd64.whl": "sha256:3222ba5d678f80a030e6afbcc33dc1ae5cb45facabb61cee2c7016b8432fde48", + "https://files.pythonhosted.org/packages/a7/46/2e5fdde8555706dd98139a910ca11be02809f3f605ce956f655d0214e100/cffi-2.1.1-cp313-cp313-macosx_10_15_x86_64.whl": "sha256:9d2055050ea716bd38b7f7f1579c275386646b4894c155a3e2f3cd62ed41b7c6", + "https://files.pythonhosted.org/packages/a7/92/500760486c8baab49a7a8a58ba7fc3355ec3974b454b8a09e528efde9e1d/cffi-2.1.1-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl": "sha256:6e192623c49c94421616a5778fba35cf0d5a8d000650c1967ef4448ee5cdd990", + "https://files.pythonhosted.org/packages/aa/29/35e016098c814cd93de9cd320c66b5bfba14dc6ecedd3cb518fa7c408c69/cffi-2.1.1-cp315-cp315t-win_arm64.whl": "sha256:d18e5ac0f2f03f4f518d3e23db0f0cad7faa1da8620e9c09461d443bbf6e6692", + "https://files.pythonhosted.org/packages/ac/0c/33a7aeab2f9c76918c52e084beb39c570db3588133412929e8ec06fab90b/cffi-2.1.1-cp315-cp315t-musllinux_1_2_aarch64.whl": "sha256:770de9db11e84213beec501cfcaa013b019820ca881e03344dea5844f7876d94", + "https://files.pythonhosted.org/packages/ad/5a/4707a0dc1f203f5dde5a907b0d4e3c25d71120241048bd5bc6f1bb9d4e71/cffi-2.1.1-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl": "sha256:154852545011f779917b11c78db2358d095da62a9a172b78ad0a583ee5adc0d0", + "https://files.pythonhosted.org/packages/ad/66/c19feabb28485b6e0bbaaafa90837a1ef5d302e90f2178bd33f17a49879b/cffi-2.1.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:3311ed60d36f83378794e1009ac6258bafbf81f7888b4caa7b35a521e3f95813", + "https://files.pythonhosted.org/packages/b0/ae/679bf47e73fd77b352171727f07de559a003f14de5d02b904a6ec1fa73ca/cffi-2.1.1-cp310-cp310-musllinux_1_2_aarch64.whl": "sha256:5bb4e7ea95dcd6a014a6fef62e62467d67d8e582326443f3d68e71d6320a9fcf", + "https://files.pythonhosted.org/packages/b1/db/dceb9dd5b231e1da801793f8acc9f3c52a7e1afe40bb1aae37e02b0faad5/cffi-2.1.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:c1453022f490d2459a11819d83ad1d586e9ff65a12ac3e705ffebd46d3685dcf", + "https://files.pythonhosted.org/packages/b3/a9/9db617d05d7367c1ad0ab00b3aa6e6f9281edd689b4ee9ea0e5a84e89c97/cffi-2.1.1-cp314-cp314-macosx_11_0_arm64.whl": "sha256:661c298b4821edebead0c91edd2b00374d67ad7c5a1f7a91d4442633b79d6a72", + "https://files.pythonhosted.org/packages/b4/c6/ab025d75d2c26c19b087c0124e75ee31cb65032f4fe345d356d8c507ab97/cffi-2.1.1-cp311-cp311-musllinux_1_2_x86_64.whl": "sha256:f5cfbc5fe74540d335175b656c725d74d90e3730c626d92575eea35029d9afaa", + "https://files.pythonhosted.org/packages/b6/d2/2cde336b375f55c76ca670f0be3978cc048e31e24f3b4d7ce8473150a388/cffi-2.1.1-cp310-cp310-macosx_10_15_x86_64.whl": "sha256:baed1e86cc735622097354b9d1281406caf42ff42a886d29faa8e8d1630333be", + "https://files.pythonhosted.org/packages/ba/0b/644a2ec1a4eaba49c2939410bb1eb1d25b09d6d0582f5d2f95c537043725/cffi-2.1.1-cp310-cp310-win_amd64.whl": "sha256:a48d62ab9d6f4f98c983223a547af44be6ca3691074c31cecced6facd3ba2dc1", + "https://files.pythonhosted.org/packages/c1/8f/9ebe220eab48a093d1a5a5e339ab0dc7316eef3bb04d63c42f0251b61f50/cffi-2.1.1-cp315-cp315-ios_13_0_arm64_iphoneos.whl": "sha256:dddad92b554513a31f272570678ba307fb9f618f05e3d4a5eacafff9eae03e1d", + "https://files.pythonhosted.org/packages/cb/52/3fa190537004dd7f0ab860a6dc7c0175b8667f68d1e618a46f5498d30250/cffi-2.1.1-cp312-cp312-musllinux_1_2_x86_64.whl": "sha256:210019b6c7cf07f081b4c54635c8cf744377001350e29cc0f81c4377b4797735", + "https://files.pythonhosted.org/packages/cc/4b/b3a2da8570c704ffc0f9762cdc3ec0f02c8573798e0b5cf7f11c82bbb70f/cffi-2.1.1-cp315-cp315-win_arm64.whl": "sha256:27350daa11d4f10c540e6e89dada4c54feb7256ad03e9a4dc075ebad7ba360d1", + "https://files.pythonhosted.org/packages/cd/95/31b535a9f0220ae9f357de4a08d57ce89cb417653c2fd9f075f50822a388/cffi-2.1.1-cp311-cp311-macosx_11_0_arm64.whl": "sha256:398aff33cee2767e3e781d2554c54bd0dff386bb437581e0d8011fde1a942ec1", + "https://files.pythonhosted.org/packages/ce/87/616202d8e51342c07d2534c510111c4cc37201775ce8f60802c9335d1edd/cffi-2.1.1-cp311-cp311-musllinux_1_2_i686.whl": "sha256:df913725b79db7bcf03448f36b7bf8815363417d5b58deecf9305e3e30f0f21a", + "https://files.pythonhosted.org/packages/d0/ef/5443574510a1207e6f6bc38ba6e1f1de36cb48fef07b2728bb896a21f430/cffi-2.1.1-cp315-cp315t-macosx_10_15_x86_64.whl": "sha256:c26608d2222fb1e94487e4a387d85f13eb55d5ed725cb25a0c589ac4ee60e7bc", + "https://files.pythonhosted.org/packages/d3/7b/d6bbf82b8b96e7391438898c42f5bd96dd02030fd5b64937d248220003e2/cffi-2.1.1-cp314-cp314-ios_13_0_arm64_iphoneos.whl": "sha256:7dbb61fe3a7699468030f71bbe5f8a0e326a151daa91beb11a6fc1f980c55e1c", + "https://files.pythonhosted.org/packages/d5/6c/bfa0b87b03b9238148beca990292843c9396ba069b54496596594173de7b/cffi-2.1.1-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl": "sha256:a4f00aa42f75d6e4595e8866e748cc1705adc0cddfeb2ca86d0d03993d63ba03", + "https://files.pythonhosted.org/packages/d9/79/615cc094e2fb508cade7de88d3b4f6c4ec2bab695c97bce9153dc65aadf5/cffi-2.1.1-cp312-cp312-win_amd64.whl": "sha256:f53e442b08449d42821fa4a4fba000095af9f62742a500f978a9f557ec44339a", + "https://files.pythonhosted.org/packages/d9/99/c4b0c17cacdc9c3b8f280026286a9826d6a208c0f047591a3c3ce99b91fd/cffi-2.1.1-cp314-cp314-macosx_10_15_x86_64.whl": "sha256:d28630f5854ab07ab1fd4aba756de52326c82e6be15d414b12793f1975048b54", + "https://files.pythonhosted.org/packages/db/e2/7e8109f65445bdc673a7b54f02c677de462db75674220fd1335efc8eb598/cffi-2.1.1-cp311-cp311-win32.whl": "sha256:f8ec5e643a9a937f64e1999eb9f75d072263751912dc5cd06d3c85f8f44be7c3", + "https://files.pythonhosted.org/packages/df/62/14f74b9543e605d17701dc797b815958b8bb70b7624ce1b832ddad48ed6c/cffi-2.1.1-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl": "sha256:aa9511c62d14da7aacc9b4bf51f3f697a621e83b2d6919008243c3aad168eea3", + "https://files.pythonhosted.org/packages/e0/31/5158704cc474ab65c1647932e88be78dc0873f47130e253be38bcaf13d01/cffi-2.1.1-cp315-cp315-win_amd64.whl": "sha256:e6e8cff14d6fb0be70a09c0bdc58096f501952d04624ebf867e0e56da2df8960", + "https://files.pythonhosted.org/packages/e0/9f/e8e3dfa04a1b4c241f8c91faacad872b4d4efd051d49764ad4e2fd4b9fea/cffi-2.1.1-cp315-cp315-musllinux_1_2_x86_64.whl": "sha256:cc572dace3f60ef98d7b12ff411d20f5362feb31a0439eab0085bbfd349982d7", + "https://files.pythonhosted.org/packages/e2/31/9e1313b0a6e30e91b3b3d3fff51ae99c857c07738e3afcce1f7334e1b7ab/cffi-2.1.1-cp315-cp315-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:507a24c282e0f42f8ed737cf048572cbf580468da5555764a8331735e9c736b6", + "https://files.pythonhosted.org/packages/e3/26/2cde30fdde421130bfc18f70395731a6e6b2053c6a1978a5258ff04e72fa/cffi-2.1.1-cp315-cp315t-musllinux_1_2_x86_64.whl": "sha256:7da0c5eff80f0197f3b3d1232ec5a682a9325f4ae9016a78f5f5ca35f9ced1f5", + "https://files.pythonhosted.org/packages/e9/02/4e7d553a7ac4b4238b38b3c1b80d486e9d4436f8d2acbf87a0997fe3f402/cffi-2.1.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:b0431303acaea1089ad4b3e9ce4e6518193def1118d4073ca848635ee4ea2e96", + "https://files.pythonhosted.org/packages/eb/d2/3b7176cb570a1d3e27faf67b72f591af508036e0d8b2be2ef9af9e8c84bb/cffi-2.1.1-cp314-cp314t-win32.whl": "sha256:8ef53b2de9bcb9197d31854256575d59dbac0cba72ac627bb291ef5eceb74be4", + "https://files.pythonhosted.org/packages/eb/ff/7b3429ff53aafe931ed8a5fc69f481bbef7ba6de87ddcbb63d08f483f613/cffi-2.1.1-cp313-cp313-musllinux_1_2_aarch64.whl": "sha256:a2d7755bef5a12ed488f4ef1f1b69ee9191d7396083b755a5d2295f6edb4768b", + "https://files.pythonhosted.org/packages/f7/a4/4399daaf8f7dfee9d7c3327fdb0426ee041cc63edc358b93911ceb2bfc7a/cffi-2.1.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:34e261f78cb6ceaaa36f42f2613f4380d94d9c759a9c73c769ee6e0247364632", + "https://files.pythonhosted.org/packages/f8/7e/8debeb04f1ab9fe2a6963964cd6f1aaf7192627b83926586a6a4e089c9fa/cffi-2.1.1-cp315-cp315-win32.whl": "sha256:4f42141fc14250de6dde5ee7ea4432be017252d91f19c5ad043c084cea629cac", + "https://files.pythonhosted.org/packages/fa/01/579d39fb8bef00a335a23d83757b44feb24cd6345a2c451b64cb67b9c362/cffi-2.1.1-cp314-cp314t-musllinux_1_2_aarch64.whl": "sha256:5e7cecbaadb83884793e05828cee59b210b24583b9c7425d0ba6a754fe22eb4e", + "https://files.pythonhosted.org/packages/ff/69/844bad3ece306c4782c2ecb93597035b6690d48704b803914c199da1e8b3/cffi-2.1.1-cp315-cp315-ios_13_0_arm64_iphonesimulator.whl": "sha256:da0e573f9f97159390c89d9f1a9e41908b66d408cc5b58d08cf3847d844c531b" + }, + "charset-normalizer": { + "https://files.pythonhosted.org/packages/01/65/d43b714731bb2f40d4053dfa00ecfc1c5a301f8e3316c5db3a09af59fe94/charset_normalizer-3.5.1-cp37-abi3-win32.whl": "sha256:dd732602a7009217f658d5863d12d79d373a4de0eebc111094bcdd3bb8e0a6cc", + "https://files.pythonhosted.org/packages/02/fc/0d9ab98fa7a61394353e8acd0f5f60fc6e94a4615f574af8be0eca14a7ef/charset_normalizer-3.5.1-cp39-cp39-musllinux_1_2_riscv64.whl": "sha256:433c5a81eade63b47e522303bad236f59dba55ea6951746f5558355eeed8c75d", + "https://files.pythonhosted.org/packages/03/3b/0cc9a26777334ab2f2e3089b948bbf4e4fe72ea70b897715ef6415043ec8/charset_normalizer-3.5.1-cp315-cp315-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:baf3775a2635e5a11fbd5e4e64ee69c7e86875d224a5c72aca4c141064589a90", + "https://files.pythonhosted.org/packages/03/6d/439231dfc3ccfa6f8c06477b7da2219cbd41a2de3d49084df8ec7b5100f2/charset_normalizer-3.5.1-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:e9fbdce1e47394b09bc9f26ab117dfc8d6491977a11d86f592bb42c779db2fda", + "https://files.pythonhosted.org/packages/06/ae/7ae8807410dfa33f8e6f1715740adeaafa8a816cc4cb33508f54b1f7c896/charset_normalizer-3.5.1-cp314-cp314t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:7ac76cf9afd34929d76eb7fcb63be476a4853d8a96f0dcf2d0db68a0cbdf9885", + "https://files.pythonhosted.org/packages/09/0a/d3646670292ce8d8f8cc11ac067d44885e697a5591f57a9221128da5e7b3/charset_normalizer-3.5.1-cp313-cp313-ios_13_0_arm64_iphoneos.whl": "sha256:9362dd90aa7dab48c0054a21187791ccf05473f7dba5d92b8033ae62164675e7", + "https://files.pythonhosted.org/packages/09/53/27923ce5cc6cbccb832037b27dca98882d9c53e9b69e866bbbef4aae7fc8/charset_normalizer-3.5.1-cp313-cp313-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:d59b75732e9b6f27388e10c14b0259cc5f2e48c78627d185e6a177b58ad3cffe", + "https://files.pythonhosted.org/packages/0d/35/731ac04aa0a097fc1c97f0994c375bdb230c6c96619db794208fe664e9ce/charset_normalizer-3.5.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl": "sha256:c7b742bf31c88566b4bb6335a7f393bb322e580b6bb98df7bd0c25e6e3519ce8", + "https://files.pythonhosted.org/packages/10/4c/dc48409274a1817ff349711d26c62aa0c597df865d4d69ef79160c859193/charset_normalizer-3.5.1-cp315-cp315t-musllinux_1_2_riscv64.whl": "sha256:77efcff2b23071c349402ac1066667a3d011f62398d81408c9b88ad991747c9e", + "https://files.pythonhosted.org/packages/17/d4/b65c433fc521e58b5f54293982a5e51c05cb5f2dd3f1c7a6acb65b75324e/charset_normalizer-3.5.1-cp311-cp311-win_arm64.whl": "sha256:ae31a1a1db2ee6cc2942fccaf695c934bc7f3db9f2133a3fef1f367cf1a4ab10", + "https://files.pythonhosted.org/packages/18/57/a305c968be1ca13f3dd1b32f445877e97addf55d80b65c7cb35fac82b777/charset_normalizer-3.5.1-cp313-cp313-android_24_x86_64.whl": "sha256:88ca277405c2d3b71c4e1c2ee0e7966e807bcba86a69d11e19ba199d18ae4491", + "https://files.pythonhosted.org/packages/18/96/2b3a21492d9f65171ac75d872f5018260013d00bfa0ff70ec9f179148cbd/charset_normalizer-3.5.1-cp37-abi3-musllinux_1_2_ppc64le.whl": "sha256:4c4fb141a727957c93edfe5c32a26ceb6b5f6461d67146e2d39f51e16170bea8", + "https://files.pythonhosted.org/packages/1b/ee/e4e10a94d51cd1ee638aa7e00b65399e6b2a4e8376ab6d2eac9f95586671/charset_normalizer-3.5.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl": "sha256:58d4aa13a59c969dbfdf9e6a9560e242cbfd9e8a8f50c2747714df1a423adf65", + "https://files.pythonhosted.org/packages/1c/6c/c73fa9d5a85f6ab05395de61c5f6984e0a9ff40bb5ff888d46dff02526c6/charset_normalizer-3.5.1-cp314-cp314t-macosx_10_15_universal2.whl": "sha256:fbc597639158fd7c14d55e808718848319540f51b0e6746e3eefa59723a4a348", + "https://files.pythonhosted.org/packages/1c/a5/cbe418bbc6ecdfc3e05a0116002897c4b403a5e838d697e64c78e9f0190d/charset_normalizer-3.5.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:823f82903d189af463d7df250ef1f7f696f3cee08cc8d91deb565e8d425f6506", + "https://files.pythonhosted.org/packages/1e/25/ed3f9919c5aef8cc818be1f972f565f7610d7b2076b8ebb98839516ffc3c/charset_normalizer-3.5.1-cp315-cp315t-win32.whl": "sha256:ac13b004224fb341e1e25a1ed5e19d32f57cdb2a403e01f003b46f051a550f6f", + "https://files.pythonhosted.org/packages/20/c8/c36f6e0b2dfec351bd38cbc05362697e58bcd073d7dbd95154290c9714ce/charset_normalizer-3.5.1-cp310-cp310-musllinux_1_2_ppc64le.whl": "sha256:07ffd07412fc5d5e84cd8952acf9ff7e4ed7a708e69d1bada19d8ba91711353f", + "https://files.pythonhosted.org/packages/22/95/b4618ce912e6db0b1aae89ba788e38e8a7eba0f3025cc66e8c0699f977b2/charset_normalizer-3.5.1-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:6b7430cf5728e68f6c462254009a6ef4086e1bea43cf2f57aa9c55fb4f50ff96", + "https://files.pythonhosted.org/packages/26/de/d8e48c135ae480879539cdb179c8d3b50c7879497d75dd899b5763b69cee/charset_normalizer-3.5.1-cp315-cp315-musllinux_1_2_armv7l.whl": "sha256:838648accb3a7fd9803fd45c87bce8509648eb0c11bc34e216141300977244f2", + "https://files.pythonhosted.org/packages/27/e9/61c01fb8b804692569c036b3fc50495814502dcf13a60649c6055390b02c/charset_normalizer-3.5.1-cp314-cp314t-win_arm64.whl": "sha256:fdb8a068947befafba9952162645dc2fecaeb400e64584829ed5e9b2fbe21a7f", + "https://files.pythonhosted.org/packages/28/53/a2d249ebddf47b889a100c0bdcb61a2f9dbb8bc24ef325cc062e4f476877/charset_normalizer-3.5.1-cp315-cp315t-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:e4b018dc5a0eee4676e38fe84a47a427816c590b93b55d9025274ec4d6ffc2dc", + "https://files.pythonhosted.org/packages/28/f0/0c0ceec6d98b7daa62e361e418135d59685811d79ba11529aad5cdf15e84/charset_normalizer-3.5.1-cp311-cp311-musllinux_1_2_aarch64.whl": "sha256:0722590aabf9dc6a6c0343d523c05458fa2b5047dbe6302fd526bb570600753f", + "https://files.pythonhosted.org/packages/29/cd/2b812ce5e888f1ce69a5350281e58aab07ae64a958ecae8912f30865718e/charset_normalizer-3.5.1-cp314-cp314-android_24_arm64_v8a.whl": "sha256:774d157f112367ff4abd29019f38f023c24e00e56edc7829c20e358a5a913ad8", + "https://files.pythonhosted.org/packages/2b/b8/11d4840bfc99330cc7fbcc2681ee5a044553a6e77655508d8f9b2bff7b34/charset_normalizer-3.5.1-cp37-abi3-musllinux_1_2_armv7l.whl": "sha256:36047af20e17097c3bb9476c2b7655f2f7aa51322c0ba58c07695bedf755a950", + "https://files.pythonhosted.org/packages/2e/1d/0fc91aeaeb3c83b748f532399ce67cf84604b48297405d740000f7a9e786/charset_normalizer-3.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl": "sha256:85d5855daafc240cc045c026d7a15fd198a09b0fc8ff6f5ecbb5297b509cb11e", + "https://files.pythonhosted.org/packages/2e/57/de221f1745a90d418199761967e2776bfe2c275a1194220985e8c1d37833/charset_normalizer-3.5.1-cp315-cp315-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:854066be00447fa8de2ccbbe893e2ffc4b123ef16d897af794c1e18bd4a714b0", + "https://files.pythonhosted.org/packages/30/27/78873dc8b6a56357517b74b6bb9568b80450e7bb4f6ef7e3fa9d22aa0bd7/charset_normalizer-3.5.1-cp312-cp312-macosx_10_13_universal2.whl": "sha256:5b6d1386bf0096d26d3a863dc0a487a5b4eb9aa93cf5ba69683d29dde6b9d60f", + "https://files.pythonhosted.org/packages/30/c7/63565f860921457feba93bae6c86fb7746deb4cffeed2f375cb845318146/charset_normalizer-3.5.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:e71c909f353863b2b89c83de2ebed71ea6d0df8a6ef65a128193c5e650766bef", + "https://files.pythonhosted.org/packages/31/e7/1d994be1b93d41e9502b8b0460eaa88a1dd8df335df415db87d6c3e91ab2/charset_normalizer-3.5.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:94d78ecec2605a8d0398b0f365d5f12a63248438516f5dac536a5eff7337df4a", + "https://files.pythonhosted.org/packages/32/90/fcc850bae791abd2e0c041847f13e270aa08692a79f3e00de6d2dce1cb50/charset_normalizer-3.5.1-cp315-cp315-musllinux_1_2_x86_64.whl": "sha256:687c9ca3035544b113bea2055e180af96fb63c0c476e22a9180f51925186e7b7", + "https://files.pythonhosted.org/packages/32/cd/4f564b8f132de25db594efc706897069f016790cea63a5669c9df2675f64/charset_normalizer-3.5.1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl": "sha256:96eefc178f8636b9c760c5829345307fd81cfae9ab1e80997dbddeb0f54ee9a3", + "https://files.pythonhosted.org/packages/34/17/672c251a888ed2aebcdd2fe830ad0104e25ff83c43f5c4f9c15e9fc6853c/charset_normalizer-3.5.1-cp314-cp314t-musllinux_1_2_armv7l.whl": "sha256:52ec005752a56ae79547a05c0139ca2501a0c866390b6115008456b9f0e7cde1", + "https://files.pythonhosted.org/packages/34/f7/b13b1ccae2c8ec63980d13be1890eb73f8aeabbfce02a24aabc0908788f5/charset_normalizer-3.5.1-cp315-cp315t-musllinux_1_2_x86_64.whl": "sha256:4d26f14f041e83dd8edfd61f4cd4fa7285d31798b5bf1f28e70c367ba6c41d61", + "https://files.pythonhosted.org/packages/35/4f/b911ed898b26a09789eba9c9200c999aff6c61b4bafaf4838e56d1a1e1a3/charset_normalizer-3.5.1-cp37-abi3-win_amd64.whl": "sha256:70055ff39b97c99e7ae40ea3e393fb62aa2e44dbd9b29f8d14f42fb0025c3959", + "https://files.pythonhosted.org/packages/35/5a/337e4663a5eae6de99db940ee8066d4145caafb61327db62deda15313cce/charset_normalizer-3.5.1-cp312-cp312-musllinux_1_2_riscv64.whl": "sha256:7235dc28fc6dd9d832ac7c7bce95367dedb85929f17368a0c2bee1e080b9acbf", + "https://files.pythonhosted.org/packages/35/8a/3d130aeabcaf3d2466af76b7b141c08d9e89c9016ab4b7cdd0f7dc2d1c62/charset_normalizer-3.5.1-cp37-abi3-musllinux_1_2_s390x.whl": "sha256:3588e376b3ea2eea84976f67273d679f229e24c66dce7b82ae45aef04ff6e072", + "https://files.pythonhosted.org/packages/37/2e/651d910af6d0fba325eee1cda37ec5443462ed25360e666c144166eb6091/charset_normalizer-3.5.1-cp313-cp313-musllinux_1_2_s390x.whl": "sha256:35fe081843b35aad20ffeccec3eeffbe637b15d14f3fb22cc1b59cd8ec17e93c", + "https://files.pythonhosted.org/packages/37/ab/4e4510e1e288478e2c8333131d1c1382382ba8cd2165053c79e39d1da961/charset_normalizer-3.5.1-cp311-cp311-win32.whl": "sha256:ac00177c4831ffa650f8609e4bdddd5fe09c03b1c0c47acece7e6ea20421598b", + "https://files.pythonhosted.org/packages/38/fe/341861ac118dae06f3ec0eb487488af52128f2ef2faf0b11003944d22259/charset_normalizer-3.5.1-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:7c0c10730342b0c9b35dd1d619beb8214e520bd96a1f870f452680b238aab3e0", + "https://files.pythonhosted.org/packages/3b/32/9b8929bf384061ee1fe5d9c27c6f9776d3d824039ad4e14c88ec00c7808e/charset_normalizer-3.5.1-cp315-cp315t-macosx_10_15_universal2.whl": "sha256:59171c6e45bf07d0d5cab3b0bf81d945035530f6873398b3b531c31184d46663", + "https://files.pythonhosted.org/packages/3d/bb/618749d70f792b44252a777bf89bfb86823b9bbc1ea13fe8ce759b07f38a/charset_normalizer-3.5.1-cp314-cp314-musllinux_1_2_riscv64.whl": "sha256:fce8cbd4997efeb450bd298b54f755dcdff18d496f7a5ddbb4867c6d7c88fdc3", + "https://files.pythonhosted.org/packages/3e/11/e6f5b9a3d0e55b0ef7505cd3765cdd48f22db89994c947b316f52f801fd8/charset_normalizer-3.5.1-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:256dd4d85d9e4dc595e2bc983c980e73f62ddeb3165c58b4c3dfe78c5c8548c1", + "https://files.pythonhosted.org/packages/3f/fc/f6a85abebd42ce4da2f1db0aa56cc6a0df1995e318b3875d14401b8381d1/charset_normalizer-3.5.1-cp314-cp314t-musllinux_1_2_ppc64le.whl": "sha256:2bced4061f000f7187254a02ad3433ae17eaf991747ceea2f478422590a5bba9", + "https://files.pythonhosted.org/packages/42/85/f9e22af69af67c54cce42be9455d9c81294f918b4ccc454db01f66efcac2/charset_normalizer-3.5.1-cp311-cp311-musllinux_1_2_ppc64le.whl": "sha256:bd6c173f04743d483881bffa1478d5a4624475b8cd1d2194956a75548e191c18", + "https://files.pythonhosted.org/packages/46/22/111e5be3b740d5c2a5bfcedb3d237b6591e5c2e82ae9d6ffcb121fe0909c/charset_normalizer-3.5.1-cp312-cp312-musllinux_1_2_armv7l.whl": "sha256:5d8531a6569d025f68e2321e7638fb7978f23db58e5f69f56913837aae03816e", + "https://files.pythonhosted.org/packages/49/e0/716601f3cc69be7b198951150c75ead1ece33c3c8036ff6ffa46029659a0/charset_normalizer-3.5.1-cp37-abi3-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:343fb4f2821043bd87095f7b08a1a181febc8e36ac64212143bbfd0a0e1bc235", + "https://files.pythonhosted.org/packages/4a/4e/8544831ef59d8f27ce92c80871380fdacc8076a8a56ed62f82e54f991333/charset_normalizer-3.5.1-cp315-cp315-macosx_10_15_universal2.whl": "sha256:9085f87b0e38a2b92b8923059b4e8789fe40d9279712d15dcc670048d77079af", + "https://files.pythonhosted.org/packages/4d/66/70dfad64f15be09c15ccfee81330a7e515895dbe296dd23114e9a231268a/charset_normalizer-3.5.1-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:fa48b1b63d639f9483e0633e092f5851e2348c352f1f9bb6c8182f87884ef876", + "https://files.pythonhosted.org/packages/4d/81/ae557d3c44d1a1d688696d60563413a0866a91b7ebc50f20df838be3d8c8/charset_normalizer-3.5.1-cp314-cp314t-win_amd64.whl": "sha256:acaf604462bf330b0d07e7a07c1d6e4adac79e5fb13e9c5140590542cafacc00", + "https://files.pythonhosted.org/packages/4f/ab/74a55fd803916a35ac461daf002708191aac19b546b80dc8cabfedc63d98/charset_normalizer-3.5.1-cp314-cp314-musllinux_1_2_x86_64.whl": "sha256:9ac4444d8d4fd4c4bd08bf451ed3167aa9e7ec6cdb41b648794f1d1103652e36", + "https://files.pythonhosted.org/packages/53/31/7f79c671d827080d6eecd697fbbeb4f0f6f8507bf4c5625b5f6398ec5876/charset_normalizer-3.5.1-cp39-cp39-win_amd64.whl": "sha256:012a22b88a77ca2e59b98ac5889b0deb604147666032f45e6d6e217634d2550d", + "https://files.pythonhosted.org/packages/55/53/7d819bd23a00ef45039146fa2cce1daa2f0771e758c5653ee1f6edac91ed/charset_normalizer-3.5.1-cp310-cp310-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:00668ebb0609751758682eb0b5857e7c35b9f00e84dfdef062e103244ec94d45", + "https://files.pythonhosted.org/packages/55/66/3bb56a47f7dcba014055b1a1d33c6f08bbe9c1e74dba154cfa25f90ae885/charset_normalizer-3.5.1-cp315-cp315t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:19a3dd5aa73cef1c99687c4fc57db016a9c17104ae1185da88ba566a5d3bebe4", + "https://files.pythonhosted.org/packages/58/67/62df6a907162461f372e95cbbc1bc64c7457e86abcc851feb84409a11eff/charset_normalizer-3.5.1-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:3e5e1224c0a6a90e05843e07adfec669edebec17801c67072f51e59561d63c0b", + "https://files.pythonhosted.org/packages/58/ad/b9aecf38d805cbcf84fa94f14c5d972a16561e20296a11dc799a5dcf3763/charset_normalizer-3.5.1-cp310-cp310-musllinux_1_2_x86_64.whl": "sha256:494b70049a4d69aec6e8137c13af4cf8db8c9f9820a1392ac293b0dd2987a818", + "https://files.pythonhosted.org/packages/5b/75/5b20dd1e6573a01a08158fe104104fa2c8abf941745596954185726cd46c/charset_normalizer-3.5.1-cp313-cp313-win_arm64.whl": "sha256:fd0a274c0e5f9a21565cd9d3dd749b61f96b7aa1e20a93aa1ba4029518f2e5c0", + "https://files.pythonhosted.org/packages/5b/97/fb4e82231aba271ffd775a1b4993b0defc4e3059f286ae41d9433409fe85/charset_normalizer-3.5.1-cp37-abi3-macosx_10_9_universal2.whl": "sha256:41876ee62a3dddf48ff1121ad8f0798032aa03f2fd35f21f34a4cab14f18d8d2", + "https://files.pythonhosted.org/packages/5c/64/12b4c2a11ee8df4fcc518c78b0d93e3a92bd3d5253d1617ce74ff0e8c7ef/charset_normalizer-3.5.1-cp313-cp313-musllinux_1_2_riscv64.whl": "sha256:90b7481fb62fbe172c558bc6fd1c4c98d82004a54a7551f20e11ac9bf0b8708c", + "https://files.pythonhosted.org/packages/5e/fa/40414471acf0aa0692ca77305aa00e434fcd8288f0941c93c30e9a5f8f2f/charset_normalizer-3.5.1-cp315-cp315-musllinux_1_2_s390x.whl": "sha256:cc0329df4caaceb950d2f580b5ac716a377f7059624a0bafaeaf8a218c6ed774", + "https://files.pythonhosted.org/packages/62/16/46556278c2168d12df9da7fede5dc6fc70e60301b26a82bbeec238c9cfe3/charset_normalizer-3.5.1-cp312-cp312-win32.whl": "sha256:cfa1c0cc3a8f9f53f1243a5a99ac36fd003880199383b37672e86ddda9cb07e2", + "https://files.pythonhosted.org/packages/64/60/7c5469f455f4fa65d39da9f088dffc1a586560bfb9e3279441eed78bd469/charset_normalizer-3.5.1-cp39-cp39-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:994e883d17c559cdfd38c84003c8b27d25424a1077272a17e7cd27bfe0bf57b2", + "https://files.pythonhosted.org/packages/64/77/9ae101cb33bd9f681551e82a2b9e08eec99ff715458340931370f4228de9/charset_normalizer-3.5.1-cp39-cp39-musllinux_1_2_x86_64.whl": "sha256:eb12fb2ba69ffa05f8695f61c69e591dc4b4a12ac3757ac8af8adb259bf56d17", + "https://files.pythonhosted.org/packages/67/c4/217755fd1abc50d326c252922cd642002758095a81ff45010337b8b3ef65/charset_normalizer-3.5.1-cp315-cp315-musllinux_1_2_ppc64le.whl": "sha256:195ce897c6153c0700078142cf8efe3e6454ca4cf4357499e4078dfd83396626", + "https://files.pythonhosted.org/packages/69/2b/d8be3523ddf9f0b0f3e56d1359034aa10653a4d11564c697f802b4775766/charset_normalizer-3.5.1-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:ce854f5f478050ade5a238731c4ca985a7d3b3cb53ff600a9b5c3b689b5f0a7a", + "https://files.pythonhosted.org/packages/69/d5/43c2b3e9d8267092b913eb8b0603f0f71993c395632886bd37a7223f96cf/charset_normalizer-3.5.1-cp315-cp315t-win_amd64.whl": "sha256:35aea775dc2bd5f54cd84a1cd2696cc3207c479cb9cf0bd346f0d343e4300ddb", + "https://files.pythonhosted.org/packages/6a/b6/034f6802e9c3f6418966cfabb7db8c9252cc2429c5098f41cc43af804149/charset_normalizer-3.5.1-cp311-cp311-macosx_10_9_universal2.whl": "sha256:eda059b6bc8bc0812d626fd91a7ce01bf583df0a61296eff390fd94141a34e30", + "https://files.pythonhosted.org/packages/6f/89/bb5108dc6c3651dca963f2b0a3ba19bbcb370c94e1b6d3e0e844a58e6dca/charset_normalizer-3.5.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl": "sha256:b9af956078716df40d985fb0dfeb2c2120c5ca92ba4ff4b388acfd01cdc14d08", + "https://files.pythonhosted.org/packages/71/aa/554e2614f38fc34c58ff1d0911ae8535ad2516440d5482d76fe59f1088b0/charset_normalizer-3.5.1-cp310-cp310-macosx_10_9_universal2.whl": "sha256:d1ee1e296209fdce05b81b663250eefa02213a2da7b41bf26f7829b8ba3545aa", + "https://files.pythonhosted.org/packages/74/76/f2fc7380f056cc273a53af37f50d08ad54b2c59f61078f31432edcf1c2bd/charset_normalizer-3.5.1-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl": "sha256:4c9548dc78002099910abaebc0a72ac58b7d30931869e0351c09b507dff4ece3", + "https://files.pythonhosted.org/packages/75/9c/019fbb9f4834491a160951349b1a3714439376f66e5f7cf18b4f18f0c7aa/charset_normalizer-3.5.1-cp37-abi3-musllinux_1_2_aarch64.whl": "sha256:a2028475ba855475b8b4d3cfeb4994269c967aea8b9892dfba907f4263a863a3", + "https://files.pythonhosted.org/packages/76/4e/362d4f9fdcdf5556fb2aa3ce7d4a58ebce03ed1ff03aa1d9aca8d02f13f3/charset_normalizer-3.5.1-cp313-cp313-pyemscripten_2025_0_wasm32.whl": "sha256:9d9a0dc7cbe9bec24c3f767c9122c41fe5a1bc43f47cd099d00d393e09769de4", + "https://files.pythonhosted.org/packages/76/84/6f1290fa07ae6978d3960caa3eb1b8019bf9284ab7c2297b00c099ef4250/charset_normalizer-3.5.1-cp312-cp312-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:1d1c7a53a6c2103925cdd6d7229f8c567379f211c869793df679f2e9f738c369", + "https://files.pythonhosted.org/packages/79/71/6ee3a48a21e844e5079d8e9b2e91c641da5a7912a748e9e94c9e3ab9ce1c/charset_normalizer-3.5.1-cp39-cp39-musllinux_1_2_s390x.whl": "sha256:13e3afe97712e8887cd516e960c63f0b93122971e5b5e4b2622fe7701771e838", + "https://files.pythonhosted.org/packages/7a/7c/4938c329b6a9d446f6a59aa2092ff7118f274209b5ed0e26893d1d30a63c/charset_normalizer-3.5.1-cp314-cp314-win_amd64.whl": "sha256:c658c50ac0c98cd755a2dd50b7977d3bca7df401dcc47fbdfa87db53ef7d4e8b", + "https://files.pythonhosted.org/packages/7a/c2/071575791dcc88316c0a9a65ce38897a82e4cfe4a325f0f7fe1b1ac47bcf/charset_normalizer-3.5.1-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:394fea06235c8543390050ed5f529187074b029fb027213f6c46ac11ab5d950e", + "https://files.pythonhosted.org/packages/7c/c1/49a91fe7e97c8140094ca5c64161ab623a70d9f636bf834eace14048acb5/charset_normalizer-3.5.1-cp315-cp315t-musllinux_1_2_armv7l.whl": "sha256:252d099029bcbea642f2a06c4ed5046bdf8b5a8150b64afa5e027e88b106e5ee", + "https://files.pythonhosted.org/packages/7d/07/469f78af590f7d5cd48e20d8dbfa3d66deeff9ba37768c04d886b5afd45c/charset_normalizer-3.5.1-cp315-cp315t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:ced3fdd71aaa83ce593746c2edb42b7a59cb4c19c8b5c407781c72e493aae55a", + "https://files.pythonhosted.org/packages/7e/3f/ffb64458527c7668031d5eb095d978de561958dc9f5b53f8e488a533e603/charset_normalizer-3.5.1-cp314-cp314-musllinux_1_2_s390x.whl": "sha256:6c9cdde8becb25a7fde49924511aa2644d6f8081cc8df8e9452724303348d8e3", + "https://files.pythonhosted.org/packages/7f/a6/e3b46852424246065355644f4fb6dbccc0239a42a2eee27ecfc8957f0bcd/charset_normalizer-3.5.1-cp315-cp315-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:2679de311c7946dde5d3b6f44941844133ff5c7cb86099c0061ab1e8901c20a8", + "https://files.pythonhosted.org/packages/80/c2/a7379b840292d0c1ab9fbd17d1f3967aa81794dc95bc74be8999d7fedcf7/charset_normalizer-3.5.1-cp37-abi3-musllinux_1_2_x86_64.whl": "sha256:e199fb99720074809a7720f1c0b4d919eea8b87e88713e0f8f602f7bef543d9d", + "https://files.pythonhosted.org/packages/81/58/d325912115caec62d6bdd77bbab5e0b7da5d234a9f20affdffcbcb530d0b/charset_normalizer-3.5.1-cp315-cp315t-musllinux_1_2_s390x.whl": "sha256:a5cbd90ecf0fc62e64726917ad083b73001f0563657a87ec3c0b504e277dc90d", + "https://files.pythonhosted.org/packages/82/38/083a24028304bc85bb9e376fed801178423dcbb67495f73b6ea0624e1894/charset_normalizer-3.5.1-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:b54e7e13267d49ffbfe68e25b3cbd774dab38fa37238f71265e91b36146eb21c", + "https://files.pythonhosted.org/packages/84/79/a88c181e7f4a7579696fedb34fa63844ede2ff7caf44c5f321cec57d92fb/charset_normalizer-3.5.1-cp39-cp39-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:e06efa066f7dbadbc84ebc126a97c452a6451dfcf589d89d788484949e1cf795", + "https://files.pythonhosted.org/packages/85/54/46000450ada53bd9eac5429a2c8c54cd2d9b39c0c255f229aea9af0948a5/charset_normalizer-3.5.1-cp314-cp314-musllinux_1_2_ppc64le.whl": "sha256:bb57753e36e4855b8ca375069482250a6246372331a3e4f3407eaebb007443f5", + "https://files.pythonhosted.org/packages/86/2e/b93135b5034b1157fb29554b0d06d4844ce62282f0e0a14036f93d7ee2e7/charset_normalizer-3.5.1-cp310-cp310-win_arm64.whl": "sha256:a6d095662e73e74f0a49988e0593373e243e3a52e27bfeea0a859e88acf4a0f5", + "https://files.pythonhosted.org/packages/86/d3/e367787febe4e74769dec0f406f2c3c8d1b955fce5aee1fd0f94e8367a45/charset_normalizer-3.5.1-cp315-cp315-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:8fe532b3c966d1fb794e0698e4589d0444017ae77fc0b31edea13c0e35bcc449", + "https://files.pythonhosted.org/packages/87/bd/fbc24d825c66f1c74f6ccdea3742c3d8354a4888e86d1315a197fee69061/charset_normalizer-3.5.1-cp310-cp310-musllinux_1_2_aarch64.whl": "sha256:950f23cb393f85543777b0433f082cddd25b51ab398eac7971146495679efe5f", + "https://files.pythonhosted.org/packages/88/be/55127bfca72c0cff6c022488d140d7c5b04c771e3b72e9bdb4836d54979d/charset_normalizer-3.5.1-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:f6f7deae3feb4edfa2efaf7c574fe88cbf055038a6abdb40188e4fff66d5699f", + "https://files.pythonhosted.org/packages/8a/33/56d97ade41c8db611e727168c52ae46c9224c362ec28d4b65d7e9869e8da/charset_normalizer-3.5.1-cp313-cp313-win_amd64.whl": "sha256:aea996a6aba25260827c9ea511d1addfde2da9eb686ac961838509086188b7e6", + "https://files.pythonhosted.org/packages/8a/76/c681192bbda3d55356db5dadd64381d5202b37c6b598fcda5282e88b5d3d/charset_normalizer-3.5.1-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:ab743e9bc90c1f73552ec33e10e3331315acd2c397b36065b591b0181de533cc", + "https://files.pythonhosted.org/packages/8c/c2/027335f0aa337a2a2e121bac1ad88c4f02ba6053ea0926802784f3db11af/charset_normalizer-3.5.1-cp315-cp315-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:8ac8c94b6539074e0f40899301273ac8402b9b3e01c7b7ba269ff30340aaaf20", + "https://files.pythonhosted.org/packages/90/c6/b09e05e6db7f64338e0dc067c79577b1138da86c1e38369096851d96be88/charset_normalizer-3.5.1-cp313-cp313-musllinux_1_2_x86_64.whl": "sha256:fd0350afdc3aabd5576f60ea109228bd5538139713c7b094c5cd27c73a98bc6f", + "https://files.pythonhosted.org/packages/95/b5/a18d0dd1157ab655cc2cb14a545f4a4784bbad70ab3502412e36097502d9/charset_normalizer-3.5.1-cp315-cp315t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:04368edf83514385ffc3e1cfd4546e595f4f1272dd23ba437a93a9cc3741d47b", + "https://files.pythonhosted.org/packages/96/10/e9aa7923d3ddac652c99a1c5f7be494e737e151566a44abe018daf757f2c/charset_normalizer-3.5.1-cp315-cp315t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:9dbdd9205662134957cf0c324f639bdc5031c0ca056e2369e238db75187c0f11", + "https://files.pythonhosted.org/packages/98/66/7c42677e739ba66746b297e2046918d793078094dc239e1e72768cffccc6/charset_normalizer-3.5.1-cp314-cp314t-musllinux_1_2_riscv64.whl": "sha256:9eea3ab2597a5e65fe65296e2d6a84570845a6b55532d90333d740d48bbc850a", + "https://files.pythonhosted.org/packages/9a/4c/be49ada26b1f0232d57aa89bbebf997a5cc2332a5616b6eca26ff680044d/charset_normalizer-3.5.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:4582c27e8c889d64811987b5967fbd3ae0c823fe1fd933b543d55ac20bb475fa", + "https://files.pythonhosted.org/packages/9d/7a/4c6c298171e6b3e745633180ff59350fc0ca0db1ffd28df1e369e0579f71/charset_normalizer-3.5.1-cp312-cp312-win_amd64.whl": "sha256:3617ac3cfd8b9888f145ad89dd6e692285834b0201c6074a5eeaad3fd4d668c2", + "https://files.pythonhosted.org/packages/9e/4a/a6ee107430768a5334e6d63f31f148a04a1a491ef161a1ac9415a73f2fa8/charset_normalizer-3.5.1-cp314-cp314-android_24_x86_64.whl": "sha256:26422d45fd13551cf564c58932f7d72b4f58b93b0fcf18c35ba6be12b46bb102", + "https://files.pythonhosted.org/packages/9f/2f/fe3f187327aac18e2d54e9d2b08e15d27bf9b642d9e51c219f130fc34d1a/charset_normalizer-3.5.1-cp37-abi3-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl": "sha256:a6dac12ff6b846103483683f60c5f8fee205121adc58ffd87e90a90a3af69e99", + "https://files.pythonhosted.org/packages/9f/cf/7568d8c1c9100b7c8bab9035215a6b36b32b39bb50cabaee9389c4606887/charset_normalizer-3.5.1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl": "sha256:789b8982559ae28dad2356519f841655756cdcd96616410590ae0b17454ee64f", + "https://files.pythonhosted.org/packages/a0/2a/6a9034b7d3c60b17499afb482df5878bf9fa20b50cc3887d5ef017a833db/charset_normalizer-3.5.1-cp314-cp314-pyemscripten_2026_0_wasm32.whl": "sha256:f03ac127268b43ef4fe9e6ab6794a6794b49485a0cc0c1db79876d2f33f75bc7", + "https://files.pythonhosted.org/packages/a1/5d/9ed554480eda8e447b673648628fdc29574d23dbad01fe11837adedd1cae/charset_normalizer-3.5.1-cp315-cp315-win_arm64.whl": "sha256:5fc45d653ea8c9a20479167e11d4a0f8cb2fa3470737ab6f9c827532313187b7", + "https://files.pythonhosted.org/packages/a4/2d/64a13610fd28c80f97aff0ea5cf31cf255d220a8243ac0c78c66fd3d874d/charset_normalizer-3.5.1-cp39-cp39-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:5e2d0e146dcb57034f8b97dc58d2d512cb90aba253960ce449f695fec6a82c6f", + "https://files.pythonhosted.org/packages/a4/a0/562247944386f7d4ef94467e84876600cc1e0f1b93239aaa9213d2bc3cbd/charset_normalizer-3.5.1-cp313-cp313-macosx_10_13_universal2.whl": "sha256:e90251c0c7bdd54a100a0dce3c07b7e637278c93af29dbf78ebb89a58c4bac7d", + "https://files.pythonhosted.org/packages/a4/c8/ab42b07cfd82e919f427fcfaa7c41abae8242833ad1aad66d42bae40b669/charset_normalizer-3.5.1-cp311-cp311-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl": "sha256:0b2b1b3fa5670c127b246df1d0c059defd41f689a868a3b9d79df9b1cac42d22", + "https://files.pythonhosted.org/packages/a5/e9/e925ca7569cf9fb9701fd82503fee73eea5268fdb856bdd64947092d3daa/charset_normalizer-3.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl": "sha256:c010f5581d9c612804cc59fcf7b524b707fbcb72828551237ab545bb5c7034af", + "https://files.pythonhosted.org/packages/a8/76/9aad3e9c8865e5e0efa9a7f6f81c37a67635a985145ecd44528a81e088ee/charset_normalizer-3.5.1-cp315-cp315t-win_arm64.whl": "sha256:fb78f6e7fcd8ad785d28cd577168bc1aaee827b25bb8755638f694794ea98f0a", + "https://files.pythonhosted.org/packages/ac/33/eeb384dbd8dec570661354592f4f2e1b2fcc92585624d146a000caf53841/charset_normalizer-3.5.1-cp314-cp314-win_arm64.whl": "sha256:4bea7f8ebe90bbd7f0e4a2de42ca6924ba23e3e76418c408ff82f1d46fabd687", + "https://files.pythonhosted.org/packages/ad/c3/525f508cd1e58d0450ac55ed40ac75bc3a97482c59def5278456a5fbf03c/charset_normalizer-3.5.1-cp315-cp315t-musllinux_1_2_aarch64.whl": "sha256:9b5db6052055d34d41230fb78d7c439c23dc536a9896f6cb039e8dd92cfc1263", + "https://files.pythonhosted.org/packages/ae/10/3d8c777cf9024615295aa1b808324ad5b4a77855869c00824bad74ffaf8a/charset_normalizer-3.5.1-cp314-cp314t-win32.whl": "sha256:58d3e12c88e0950bca850ae1f7c256055c097639c2edb9eb123af9807d8b15e4", + "https://files.pythonhosted.org/packages/af/3d/391b193eb9f3e84b02f9314088c386debdc0debee843535aaea2e2c6715d/charset_normalizer-3.5.1-cp315-cp315-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl": "sha256:5c84bec0ab5ae0c64bfe73a7d2adcb5ce73b467523fc27fd6a28ab2aa6cbe35a", + "https://files.pythonhosted.org/packages/af/af/53afe99068b3c10b4cbae592a52ef72a7c92c0188440e83ee3a078fd8f75/charset_normalizer-3.5.1-cp315-cp315-win32.whl": "sha256:706bfd38730a5ac7a365793269a00f4e988178cec121391f4248d84ad8c972e9", + "https://files.pythonhosted.org/packages/b1/ba/ef83ae3aca816393decfa3530976f38a79812d707b80b580ac33b83f9877/charset_normalizer-3.5.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:f9f8405c2c758532c74fed975dbee57be1f31a6e865c031870c79a6ed3212ada", + "https://files.pythonhosted.org/packages/b2/2c/45847198c16f4b38090cc7423b2b6a9008e438704d8ab413211832498d31/charset_normalizer-3.5.1-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:ba2f37ee79e6338845261a3c5b1784e5d1acdff2c0785b284f1b633033d136ab", + "https://files.pythonhosted.org/packages/b2/e0/489aa2a33b944077d4c2c705c245d833dc12cd571a52fc67eaf273f5373a/charset_normalizer-3.5.1-cp39-cp39-musllinux_1_2_aarch64.whl": "sha256:55261ac0d2941c42f196dd576f543d87a8ee03cd6f5e30dfb4d807b2e3b9121a", + "https://files.pythonhosted.org/packages/b4/d4/703be739b26acce318bd29eb3b25b7209e1b1f527f9eae3d1f1f01fdde2b/charset_normalizer-3.5.1-cp313-cp313-win32.whl": "sha256:d63600d620ad0064c3a748b950ac5ea38a80190e5498532efefa4b7b3f1da1f3", + "https://files.pythonhosted.org/packages/b7/23/b38a20598d5a825f85d9d7636860e56ff0db1479f86497a6e485aa9326f7/charset_normalizer-3.5.1-cp310-cp310-win32.whl": "sha256:94fbf1c0c6cc0d3d5e50f9a9313a8cdca90dd696d34b381cd1704f8c9e939f20", + "https://files.pythonhosted.org/packages/b7/52/643d11ffd60e9ac2fd1fb87e167a19285b9eefeff4a40e63c87cbfbeab36/charset_normalizer-3.5.1-cp312-cp312-musllinux_1_2_x86_64.whl": "sha256:ba501e667c17d8411f98e67a022d9604ef179aff0e459b7e292c796837c13573", + "https://files.pythonhosted.org/packages/b8/d7/34d8e404e358d2adcc5a228c2134643af00104c8fb0bf525f3688d756f05/charset_normalizer-3.5.1-cp315-cp315-musllinux_1_2_riscv64.whl": "sha256:978eab16f55b4ab2c2a745be9a0a840bf8f09a7f227d9c76eb30214d078865a5", + "https://files.pythonhosted.org/packages/b9/2d/918d0e98a0e679469ed05bb2d90c2088b4d315bb612969d8499f76fb5210/charset_normalizer-3.5.1-cp310-cp310-musllinux_1_2_armv7l.whl": "sha256:c1dcc36dcb96abc02236e182d17e0f71430152a6c2c7447421da2d2dc144edea", + "https://files.pythonhosted.org/packages/b9/90/082cc45599c392f28c036a497f49e0634041a785fc3849c80ccf396d096f/charset_normalizer-3.5.1-cp310-cp310-musllinux_1_2_s390x.whl": "sha256:a545775cfe815855ea32d7c27731d79da358ef2055b4a25830231b1622dd18aa", + "https://files.pythonhosted.org/packages/ba/ed/1dd7cfebb4e75812934c49ca3b79757d11948053f7937ab7070c151f3c55/charset_normalizer-3.5.1-cp311-cp311-musllinux_1_2_s390x.whl": "sha256:6e2912d4babbc65196ac13c2f53468dc57fb8b9c25ef913e8c59ddf7c6dc0e1b", + "https://files.pythonhosted.org/packages/bc/61/2cb6ad133dbbb449fa2d37ccae973232f4827e799af258d15e589a3d1e9e/charset_normalizer-3.5.1-cp313-cp313-android_24_arm64_v8a.whl": "sha256:4f298bdadb8f0b9e5672877f647d1be9373ef5320c9e2f049795e26cad28b6a9", + "https://files.pythonhosted.org/packages/bd/67/0f40eaf8d1b6e7cf15e82382a2965efaca787fc1c2794b7021d37aaf5036/charset_normalizer-3.5.1-cp313-cp313-musllinux_1_2_ppc64le.whl": "sha256:5c0ea61a470e070686aa30892fed79e297d2c8d0ab46b8bcdf027d38c51da591", + "https://files.pythonhosted.org/packages/bf/eb/239c84503cc9e3ba6eb34686a24bc66e84f3924efdd7e38e751a19f6bc10/charset_normalizer-3.5.1-cp311-cp311-musllinux_1_2_x86_64.whl": "sha256:3d27167433c0d5f18dc850f07d0b3816221984fecdc405d6c157a6f0b8f8e9e6", + "https://files.pythonhosted.org/packages/c0/24/ef36367d38b9ddd4bccbf72888c342e8de1f5ae506fa0b2dcf970e2732a1/charset_normalizer-3.5.1-cp313-cp313-musllinux_1_2_aarch64.whl": "sha256:c71fb0d56c920c269cd3e2e3fe7c610e3f1fdb21a6ce60efa6430ff63676cea6", + "https://files.pythonhosted.org/packages/c0/8c/58efc6393e405a8d52b241d31dd9118352c247e4017110c3edfdb4618f0d/charset_normalizer-3.5.1-cp39-cp39-musllinux_1_2_ppc64le.whl": "sha256:2e9cf9253119d8e5d111f05d71626786fd3d6193817316eab1ca088cdb8593cf", + "https://files.pythonhosted.org/packages/c1/ce/9962938e179cf9f699d3f1e7b3114b5d7642dee6a893745229f9dd04f274/charset_normalizer-3.5.1-cp314-cp314-musllinux_1_2_armv7l.whl": "sha256:329fc3ccb63ad22d867d84c2adea759a64079a37ba4a343433b02c7a2816871e", + "https://files.pythonhosted.org/packages/c3/92/de7e32ed05341e7a9c4c877c318418197b7f2d66a3b68d561bf2ac57ca3e/charset_normalizer-3.5.1-cp37-abi3-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl": "sha256:4b599739b93b2cbeded49645ae3c8d1405c29ddfbceac1545c87a3f9580a9e96", + "https://files.pythonhosted.org/packages/c3/d9/35ae3f64f29d0179c35c3baefe575904df2913dde519129c7f75995a2b1d/charset_normalizer-3.5.1-cp314-cp314-ios_13_0_arm64_iphoneos.whl": "sha256:09a7bba9f739468c8e78c36a75c33768e53cb1959fc638f510454c14683f00d5", + "https://files.pythonhosted.org/packages/c4/25/d5f4198819e6059735a84e8d0bfb72dc33976da67b97adcd3fb5a5e07ec6/charset_normalizer-3.5.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:0c6dfb5ca6723eeed15aa8e564a014d69fcb8812f94eef11fe3631e0508199f5", + "https://files.pythonhosted.org/packages/c4/58/c9295c61e3f826ba7d874f0fd1c5e335dbec928d7b9146b33b48d14a25f1/charset_normalizer-3.5.1-cp39-cp39-win_arm64.whl": "sha256:29880d17a8eb0b5cfdfd8944b468322928059aa35f1f5fa8ff22b149ec0b42f8", + "https://files.pythonhosted.org/packages/c8/e3/d119f86a01f9331e8186175f24873b1d74a7ee9e2e4b4d68f9947dae5afd/charset_normalizer-3.5.1-cp315-cp315-musllinux_1_2_aarch64.whl": "sha256:21b82d8082f6f5e7f456ef0bd16323d08de1266efbfeb476e64b2a91d1471a4e", + "https://files.pythonhosted.org/packages/c9/bc/f46a132041b29e4a8779ed712d3df1bf112e94ca8de58b66d7ec2c0cf8b9/charset_normalizer-3.5.1-cp315-cp315-win_amd64.whl": "sha256:92caef967d287a407085d61176fce4012b1dd62daed4eb6d5ceb26d3d2538712", + "https://files.pythonhosted.org/packages/ca/7b/311b3e02e8c4092400c449c850a760d8c45d900983c83a70cc07208c551d/charset_normalizer-3.5.1-cp310-cp310-musllinux_1_2_riscv64.whl": "sha256:f5542f9b941279d82d41eb0aa9f98eba36fe4df5c7086c651df7944935b37182", + "https://files.pythonhosted.org/packages/ca/85/f82f8a92e31c7519410e2e1afdc630f28ec47490ce2c09a11c1a43cbb459/charset_normalizer-3.5.1-cp312-cp312-musllinux_1_2_s390x.whl": "sha256:4abdc5f9ad448c1ecbfae2974b820535d6bc6e7eef63babbab3d81cf46968c71", + "https://files.pythonhosted.org/packages/cc/61/d01fc49b8dea277640b55a9e15960dbca9fdc8c9fde18e572d39c59f4019/charset_normalizer-3.5.1-py3-none-any.whl": "sha256:6df0ec430f9a831772c23ca5a224cba36517a58a84bb32c32bb59a9fa67c47f6", + "https://files.pythonhosted.org/packages/cc/a4/689bb42e8e7cd492f3cb64907c6bc00ad247ec9a3628cd3f8eed126e8ae1/charset_normalizer-3.5.1-cp314-cp314-musllinux_1_2_aarch64.whl": "sha256:01e93745f7f219b703b60ba7afead36cfc4242782be5af484673fc500df12da5", + "https://files.pythonhosted.org/packages/cd/d7/eb95a042f0dd22e304b0b6472b154f3546a1a039a9ee89ccb2a7f61591fc/charset_normalizer-3.5.1-cp312-cp312-win_arm64.whl": "sha256:88e85ab89cb822c1e635f51d6d32e488f94e002e70e2f492bdb8b945543f345a", + "https://files.pythonhosted.org/packages/ce/48/5a97e84d63af1d55c07439cb80e56d99a8efb4295700eb4e18c0d1615d2c/charset_normalizer-3.5.1-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:0d929fc574b4d6fd9e7c0f5c2ede8716a41911923aa7fa5fce38e0818aa4a1ac", + "https://files.pythonhosted.org/packages/d0/91/bc145e42f93d6601b9a26f5421af2d7c3093ae6e6d03b8e583c9cebbf530/charset_normalizer-3.5.1-cp39-cp39-macosx_10_9_universal2.whl": "sha256:85de3134b5379856e323ba37c19c9256d39425f7b76a63af52b09fb4664c2e8f", + "https://files.pythonhosted.org/packages/d1/91/249943372195935ff7393eae5842c7dae6fd04401e512bbd69dab1aae40b/charset_normalizer-3.5.1-cp39-cp39-win32.whl": "sha256:56490c595a28b1bb27dfc583e816152a9767721ef58b2c03b13f954d2f707420", + "https://files.pythonhosted.org/packages/d2/21/83fffb77864408b8bf0fe1ca603926401d6f8775a8e150b39aacc9958f8a/charset_normalizer-3.5.1-cp310-cp310-win_amd64.whl": "sha256:be47f99644b208bff7766314013f9acf57b056b04191d570d68ad14022cf5b1d", + "https://files.pythonhosted.org/packages/d3/05/71bfc5caa0abcc45aea1f6a4d50ac68e59605ddc7666fe8494f4cd229665/charset_normalizer-3.5.1-cp37-abi3-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:ae4a097991662cd4fff0ddc74e0fe7874f82e00042fa0ea00855645ed0c79598", + "https://files.pythonhosted.org/packages/d3/58/56a48c296601274c4689b864a8e2dfb209b81dfcb39472753ce95eea662b/charset_normalizer-3.5.1-cp315-cp315t-musllinux_1_2_ppc64le.whl": "sha256:6199d5606e2bbf2b096cf64d03f8b6790c91081d5ac866b8e7bb6422738cc60c", + "https://files.pythonhosted.org/packages/d3/bc/f528dfb78d3bfdc8ee6aeea81eb22e6918d03e4442d373a79717f17de45e/charset_normalizer-3.5.1-cp39-cp39-musllinux_1_2_armv7l.whl": "sha256:5ca0555312ae2fe82715cada7fac375530c2f3349e1eaa1bcb33d0283ac79a18", + "https://files.pythonhosted.org/packages/d5/fa/6a7e2a7c4b5451912b8c417732df79574354443592a88d616de03da66ae5/charset_normalizer-3.5.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:aa2bb0b37202dca27175591f761108b5d34096ade1191ffe4808bdf6b1571488", + "https://files.pythonhosted.org/packages/d6/aa/a69a2028e8bd052476c245460ab19d7de595de084dd968f2d75cd50c3e25/charset_normalizer-3.5.1-cp37-abi3-musllinux_1_2_riscv64.whl": "sha256:2f293479cce755c75f1697e87c409b7ae4c555c7dfecb6e988ad13abba943031", + "https://files.pythonhosted.org/packages/d7/c7/9e48cee5c161fe24da823b61bf381921d77cb994a0a4de148e95018c1984/charset_normalizer-3.5.1-cp37-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:cee5dd7c6fb5dd52a0fe2a740f9bc6e3593f5f8b1788bde49de02086f30182b2", + "https://files.pythonhosted.org/packages/db/ab/55e683ba0fff2e43adafc10daa3001eac90fdaa419a97227d5a7067eedde/charset_normalizer-3.5.1-cp313-cp313-musllinux_1_2_armv7l.whl": "sha256:485a0d363cafefcd2538a73c7c838daa2035f09b2c9f9b5e3133f80c6aeb84c2", + "https://files.pythonhosted.org/packages/de/93/d51ec556e01042fed6f993ea859311bc7917b466684182fbbceb6ca24762/charset_normalizer-3.5.1-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl": "sha256:977cdbd483a9cff38179bea4fd754289a6f2195c7abd414aba85410b3e66cc5e", + "https://files.pythonhosted.org/packages/de/d8/a50b79237f417af10f8c2a501ce8d1ca87829a22e69117891ca4ba20a69e/charset_normalizer-3.5.1-cp314-cp314t-musllinux_1_2_s390x.whl": "sha256:496846868fea80e479324862fa877f02411f2fd0f83b79ccee2607aa68b2a032", + "https://files.pythonhosted.org/packages/e0/91/39c3af510b0aa32bbda03374259200f28430febfd1bf5e511fe765282ce5/charset_normalizer-3.5.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl": "sha256:15f024313246a4ed976c60f440bb8d257815513a681d212ff74fd46f7d715a90", + "https://files.pythonhosted.org/packages/e3/57/32f0ccea59e8612057c61d6fd22ef2cb63cca93c9fe594094919696ac170/charset_normalizer-3.5.1-cp311-cp311-win_amd64.whl": "sha256:f9b1e28d0e8dbfa858abdba91d6b547beaf2df1a59bec6da6faae7b96a4991a9", + "https://files.pythonhosted.org/packages/e5/3f/143b048436775b0f76ac3eec145c019e8173ccc2885c8f20319b996d5e83/charset_normalizer-3.5.1.tar.gz": "sha256:6117b84ea48435e5356dc737f5121485c30920ba43375fa7b434fd753df0eac3", + "https://files.pythonhosted.org/packages/e7/80/b9348b5d3041209f98b4cdad7655766369233f1d533f4f4f7558e9717bec/charset_normalizer-3.5.1-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:6e5e4d73d588ca5ed09df1b7dcd1b203d1df3c542e3f50d126c947d432b10731", + "https://files.pythonhosted.org/packages/e7/a0/47b18adeed31c8f16ba9700f32c1b18594cfa09f47eb672a488c273c22bf/charset_normalizer-3.5.1-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:e6621fb2a4988d6e53eedc455e5903e2679f3967b8acb3d639f1b63c14a2e893", + "https://files.pythonhosted.org/packages/e9/40/095ce62fa078483cccc1fa2b36e6bc9580b85422a20ee9f925341c50e44f/charset_normalizer-3.5.1-cp314-cp314-macosx_10_15_universal2.whl": "sha256:c428c6c31eb5f4277d7f8eccaf767fbd548ddd5ce3c8b4f4cbbfab3d96b5904c", + "https://files.pythonhosted.org/packages/e9/a3/887c1642f0da26000b0e0652d91071113c0e72cea33952e225cf589f49a9/charset_normalizer-3.5.1-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl": "sha256:a3a370082ce34d0612f421e15fe011c53bb1feff21a26d06ad4fb244dab5a375", + "https://files.pythonhosted.org/packages/f0/3e/48f4cd187b1c33189d86039e9cbe4f92c05454175504b44ff81806d4d1bf/charset_normalizer-3.5.1-cp311-cp311-musllinux_1_2_armv7l.whl": "sha256:aa1099b956fb795e686d073568f6dc002a0bb89765ea6d5b055dd7d9bf1b116c", + "https://files.pythonhosted.org/packages/f0/a7/920baf467bfd9bf689f3b318340f37aee4572a71f162bd8db51da55ba4fa/charset_normalizer-3.5.1-cp37-abi3-win_arm64.whl": "sha256:87e4f41d375c0b9be2fb5251aee4b8a689169e134535aed81bf085c3b647451e", + "https://files.pythonhosted.org/packages/f1/5a/0e58b1c04a1596e0256f407274a92d5fb2ee21324409d1fab1da48a65b5b/charset_normalizer-3.5.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl": "sha256:2f06b7eae9dbe77fe1d644ca244dad508de8d302870a43f3c559b521270938a0", + "https://files.pythonhosted.org/packages/f3/46/1d362e1a00d035d66b9869e1281eee115907f7e390a16a07824ab5737360/charset_normalizer-3.5.1-cp314-cp314-win32.whl": "sha256:1f5883d77fd409a261abb5dc8ccbe335720d798b1de4abb3b1d47ccbbc76b53b", + "https://files.pythonhosted.org/packages/f5/28/c2028e7021fb89c6e56868ed0e387b8e9aa811abdd2ab3208d6578d2c930/charset_normalizer-3.5.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:6ba32c4d2abf1d2fe7cf27d280f4cca5664233b0f885549c7761719eb977f486", + "https://files.pythonhosted.org/packages/f5/7b/ade0a122600319dfa0b1000ab0f9731c94a817904cf3c5de408c73a4ede7/charset_normalizer-3.5.1-cp37-abi3-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:b39b69b347e5e47a3b5b8cfc005c68c1ba347474e3960236c4944a8ecd174962", + "https://files.pythonhosted.org/packages/f5/e3/38b975422534a608f98c360e79c2f07c763d66dd4272300d45fb1fee54b0/charset_normalizer-3.5.1-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:366ec70f5547c640d3ce1985722490f23faf4eb5216a7eeba78277490e78dacb", + "https://files.pythonhosted.org/packages/f6/0b/c5292a2462d69b7378ea89793bbb5b2b6fcf6f7dd6d1667f9619094ad553/charset_normalizer-3.5.1-cp312-cp312-musllinux_1_2_aarch64.whl": "sha256:96fef3e886d6a9874b14f27fc193fbdc69d5d8035783d86aa4e1cea594e695f9", + "https://files.pythonhosted.org/packages/f9/d2/d2aad6fe0dbb44b194bf3becb60f5a0ac48446ade999a47fe7bb41eb09a7/charset_normalizer-3.5.1-cp312-cp312-musllinux_1_2_ppc64le.whl": "sha256:aae2ee51122d3ae968a3837d97dc24a0aeebb0dea23694422cd172bd30017cd6", + "https://files.pythonhosted.org/packages/fa/ec/3a616c3806ec3f957337e6bf874ae7d64693185039edfbbf87103b8c8631/charset_normalizer-3.5.1-cp39-cp39-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl": "sha256:a951ad59cad9145664a730d3036b40b844e74d2d3683da40111463cd3a83845d", + "https://files.pythonhosted.org/packages/fb/af/63240b0c0248c075c2535a1f1bd992821d8251b9f173abc13329661d09e4/charset_normalizer-3.5.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl": "sha256:62b55f6722735a6c472f88361cde6640608773d9443cebdbb51abf436a1fcdd3", + "https://files.pythonhosted.org/packages/fd/4c/9044135f42127630b6fa742feb51256353f6ab87a78f2fdd1de3de955a7f/charset_normalizer-3.5.1-cp311-cp311-musllinux_1_2_riscv64.whl": "sha256:f298e218441525d3794428b4c8b8fb8662c6d3ea79925d4807ee6b9a96a3bca5", + "https://files.pythonhosted.org/packages/ff/c1/2adc2800903fb013210349313b710a5376856578d9e33e6b9a1d8b36714a/charset_normalizer-3.5.1-cp315-cp315t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl": "sha256:cc5d36d96478aa9c60654bd932525bf32964c62a7281eafdf16d85003a8d6004" + }, + "cryptography": { + "https://files.pythonhosted.org/packages/08/bd/ed5396be499ffcf8807a585bfe38b71a1fbdd1c342b4f9b6d0ef5162a946/cryptography-50.0.1-cp314-cp314t-manylinux_2_28_aarch64.whl": "sha256:a8f40ea47330e71b594a7e246898f93177c259490c63183dbaf9e571d71ed9a5", + "https://files.pythonhosted.org/packages/0d/5c/13ea642e08e2544d0f5396122055f4820cfacb3203562197b5967125ea97/cryptography-50.0.1-cp39-abi3-manylinux_2_31_armv7l.whl": "sha256:2b34d76a652ea2b6faf777c35df230c5637842cd904e04f16230c3f9f03e4361", + "https://files.pythonhosted.org/packages/13/0e/b1f92e013228111413f2e6743948b80bc24dfd3c1b87ba98ceea16f5df89/cryptography-50.0.1-cp311-abi3-musllinux_1_2_aarch64.whl": "sha256:be224a65493ec5b74a158ff22a5522ce4a5ca1e543c647a3a4730d4a09e5f959", + "https://files.pythonhosted.org/packages/14/9a/6d3a4d7852e22d657438b7bf51f66102c7d71c0e1fafeec652281d0403e5/cryptography-50.0.1-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl": "sha256:5fe939deeb161024a6be98229c953b6591fef1f41214497a78fe793a244c017f", + "https://files.pythonhosted.org/packages/1a/01/0127d11a762b31a9ee0221894f540318761783f3fdc4bc5d057698caebd5/cryptography-50.0.1-cp314-cp314t-manylinux_2_34_x86_64.whl": "sha256:79bf008d1f9af6071c797ad133e39915dfee7614f18f18f4db9072eb715064a3", + "https://files.pythonhosted.org/packages/1d/e0/e786934472e3ac4ecdecc7b129a0ca1a2a40dffdafcf2c3ea9d4397f8def/cryptography-50.0.1-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl": "sha256:d63ae8f6481fec907ac0f588eee8a90aefde112c633131fe540e5711ddbb5a4e", + "https://files.pythonhosted.org/packages/1f/ab/89e2b798d2c3925f82e2bb72d5979f3d2f6da2dd22ef4a8cd8b70d920039/cryptography-50.0.1-cp39-abi3-musllinux_1_2_x86_64.whl": "sha256:2a93d05e34d5f67fba6f891fe85d929999baa7195e853923ea6d7576c9e68c5e", + "https://files.pythonhosted.org/packages/27/3a/3c5f80daa4dcd47323c7af8a2fcb90de27a33564d4fcac69846c0972691a/cryptography-50.0.1-cp39-abi3-manylinux_2_28_aarch64.whl": "sha256:4c4188f7c0cf655be5c06342b817ed0f9595b69ffa2b12026e5353eed29dea88", + "https://files.pythonhosted.org/packages/29/ba/042ca458b8c64348c768284b5d23e69b92ed53d057ab779fee628564676d/cryptography-50.0.1-cp311-abi3-manylinux_2_31_armv7l.whl": "sha256:359e62deae718bce96170e223fdcb6357e4fbd3bb7a3a75f4430763532560e49", + "https://files.pythonhosted.org/packages/2d/fd/60d0ddf4defa12e482c9d5e0f554384d6e8ab25341fd15f060028fd92e6a/cryptography-50.0.1-cp314-cp314t-musllinux_1_2_x86_64.whl": "sha256:42be3bb70596b3abe4ac097b75be223e8b3ab614a0e5de068e3dcc54d71d6149", + "https://files.pythonhosted.org/packages/39/0d/a1e7633e2c744d0f2983320a27e924ef2264c79c56e1a58d5fb0a1cfd413/cryptography-50.0.1-cp314-cp314t-manylinux_2_31_armv7l.whl": "sha256:ac02b07824d4d1001bd4367599f839c19cb171924c796e52c23508ac14c2c0cc", + "https://files.pythonhosted.org/packages/39/3b/e96c1ef71edef71057c7e3c3d982ce8fda554e0c52d0cc19c18845cde3eb/cryptography-50.0.1-cp311-abi3-manylinux_2_34_aarch64.whl": "sha256:e2ca8fd1b6b4b82a1c4cb02841d0837e3c12336c2e24b520ab8ab3b969733d8f", + "https://files.pythonhosted.org/packages/42/8b/cb12b1b60c91b074ca6bf0fdd59aa8f10d8bc5f73af8faece86ef0421b37/cryptography-50.0.1-cp311-abi3-win_amd64.whl": "sha256:aed8db4f6d71c51efb89530e12d9464e7bf2923d46c3205dc794a2a93f8c0648", + "https://files.pythonhosted.org/packages/47/92/b4317e8c32c4f47b062f5398bd79106b220a124546f42be83bf32b761e2a/cryptography-50.0.1-cp314-cp314t-manylinux_2_28_x86_64.whl": "sha256:8df2de9102026855887e4587084f6eabd80ed0f345b8ad8a7ac27ab9bf4723e0", + "https://files.pythonhosted.org/packages/4d/56/bc4f2b209e766c93372cfcd59b781a0b2b59700f62a969580415b699c2b2/cryptography-50.0.1-cp314-cp314t-win_amd64.whl": "sha256:f74455bb086a85d5e81246412602aaa97ed095e504cd40dd261ef50be42205bf", + "https://files.pythonhosted.org/packages/4d/72/3a2711d967977ab5fc80b782837c7e8d1ac7445e764c20c381a265c57ef3/cryptography-50.0.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:a0b1a59e3a089064a0ec309e9428c8e3ae4e161419d20ac33600767e83fc658a", + "https://files.pythonhosted.org/packages/51/cf/5b3f53a0b74d122f023476ede40ba5d3e70d5cf475f73b899740d26a4fb2/cryptography-50.0.1-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl": "sha256:804728ce710890870f3aaa344b2e161172d258d768ac139d02cfd9092d0d94e6", + "https://files.pythonhosted.org/packages/55/32/38c0d344b98c06d34b5df8946565a9c0d6dbf32c8e0730a7f05f0a3c6cab/cryptography-50.0.1-cp311-abi3-manylinux_2_28_ppc64le.whl": "sha256:5fe002589592ed749ce77fe0695fcbd3500dd61d7d6db5858a7544c612fa8e45", + "https://files.pythonhosted.org/packages/57/26/e6d4fc8512a51a5f9ee7bfdbfb853bce1197087df40c9ad993ad370b846f/cryptography-50.0.1-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:ff838d62ec1bfce4f9ba7fa16f4a7b554cd8d0c299e6be37502161a660c84eef", + "https://files.pythonhosted.org/packages/5b/f0/424cb557d99aa86ac55da5e2add02e2882e44047b6264f93ade1b975a993/cryptography-50.0.1-cp314-cp314t-macosx_11_0_arm64.whl": "sha256:30a125032e5642a21ff816e021152bd4e7e94f03eff3f4b7fca41cd22bc3110f", + "https://files.pythonhosted.org/packages/5e/a5/9ec7e81e8526c0d7a387d73386b2daed3f39e10d81a85930bd1b6bfba65c/cryptography-50.0.1-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:05ba322c4da95b262a212c345af888ef2c37c88c0509756ea00a0e6d68850f23", + "https://files.pythonhosted.org/packages/63/8e/f1f955e0921dd2b6d22eae7e8d24a4c4b638d10735ffbf6a71f99eb0fcb8/cryptography-50.0.1-cp39-abi3-musllinux_1_2_aarch64.whl": "sha256:fd3718b960d0b5dd213cdf03f3bcb7000e69dda0de8b956061947ff6bcff5558", + "https://files.pythonhosted.org/packages/6e/2b/214cf0cf93db9628c3c20c896b229f327f6fb1b20e4b3743d8ad3f00af8b/cryptography-50.0.1-cp39-abi3-manylinux_2_28_ppc64le.whl": "sha256:2ebbfb0f1fed745e91796e3e1080a1440423fdae8ece1b995a1d80883a409054", + "https://files.pythonhosted.org/packages/71/44/711e61f7d014be825ef79b285b047292d1bf893732ac1bc030a351fb517f/cryptography-50.0.1-pp311-pypy311_pp73-win_amd64.whl": "sha256:693c99b49bd37d0d096e4334c10232c77248c415b98d35236094cdf96d57258b", + "https://files.pythonhosted.org/packages/73/35/5c3717edf9e68a0550ce04e28eab493fe545eccd81742af03f6a75fe260b/cryptography-50.0.1-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl": "sha256:fb4b9672d389c738b175c4166e78310f8a70358886aacd9173ee03a85ffdc671", + "https://files.pythonhosted.org/packages/7e/22/c3654cccc856e9d682817b04ac3ee79731cb09ca6f95996a95c904de2883/cryptography-50.0.1-cp311-abi3-musllinux_1_2_x86_64.whl": "sha256:9ebcdd5519be9b652a46f507817a74591774fc3d6923ac364e4dfa64e36b291b", + "https://files.pythonhosted.org/packages/7e/3c/0e77bd5ffcf078e9dd27d3074aad6c030d9b10d0bf69329d573c927a188c/cryptography-50.0.1-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:e22dfed744bd4002e909464cb23d2f0b05c6f3113a79ef2e9864a53db737c733", + "https://files.pythonhosted.org/packages/84/a9/ee16a903f13755e914d1eecc482fe64d1f10761c3960e5d8fa6837377aff/cryptography-50.0.1-cp39-abi3-macosx_11_0_arm64.whl": "sha256:ca83d00d9e69cd5eb63f2e69c3a5a59e0cecae5ae14c6ae0b35830fe3b37bad0", + "https://files.pythonhosted.org/packages/84/d5/7d1fe1cb93f91c428093ff234e128c89ba8ea61a6f26aab406081f9b996e/cryptography-50.0.1-cp39-abi3-manylinux_2_34_aarch64.whl": "sha256:01f41478cf33fc605a6a089cd56d28b45c6c0b45a1928b61797f2621a04bac71", + "https://files.pythonhosted.org/packages/85/66/6ccca4722987ddedaa7fc9c3f4708af7431f5535666c174350830888c6b7/cryptography-50.0.1-cp311-abi3-manylinux_2_34_x86_64.whl": "sha256:51afcfceb15597cf2635068e4ac9a56b2abde622edde17f37d85fd7b5306497a", + "https://files.pythonhosted.org/packages/88/dd/b215616f9bab3fc18510c78a4e5c9f362d77838503c363dc747c7d4f5c6f/cryptography-50.0.1-cp314-cp314t-manylinux_2_34_aarch64.whl": "sha256:cbf74a81765ee67413503ca6e26dcc4f6f5a519822436cc0a1b97aab6c1b8a17", + "https://files.pythonhosted.org/packages/8c/eb/5d7124083e8d8cda8f5b348f544b71ad6f707ad63193758ef4d8e569da02/cryptography-50.0.1-cp39-abi3-manylinux_2_34_x86_64.whl": "sha256:9dde0a357190eb3b1da1bb9ab750e9c85cba82ca5977aa0836cbb94e92611239", + "https://files.pythonhosted.org/packages/90/34/9ce9a62ed9dc82ca9fd6a34445b6904af56e5f38b3eae2ed32e49c36053d/cryptography-50.0.1-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl": "sha256:53e279950892dc102c6b4e52af03ae5ea92fac572a1ddab78ca73a997f62b69f", + "https://files.pythonhosted.org/packages/99/89/87ef49ffe383ef4e147d27b7bf2088fb0b54ea409dd87b5a89442e5828a5/cryptography-50.0.1-cp39-abi3-win_amd64.whl": "sha256:55d16b1ef3ee0958d893a977b19777887e546c9954ea81b200c3301a864013f2", + "https://files.pythonhosted.org/packages/9e/b9/e7425ebfb599241a0c1d7000f1b466c3062da66c19d9525031315dff7213/cryptography-50.0.1-cp314-cp314t-musllinux_1_2_aarch64.whl": "sha256:330fbb252391c596f1ae42c5754449dc924e6ad012dca8efe0d703f9f2d12ec6", + "https://files.pythonhosted.org/packages/b1/1b/ec3ebd31741d0e963612c4fe43caa39341b9b1e031e469820e42e4c83918/cryptography-50.0.1-cp314-cp314t-manylinux_2_34_ppc64le.whl": "sha256:16c5ecd954b3330ebfb6605eca4fd952da8bef376551d5cc264534e3770a9ee6", + "https://files.pythonhosted.org/packages/b4/f2/bb1f56e10815b789df0b409a69fa4992ff3d3fef9c72747f4a6b26fed38e/cryptography-50.0.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl": "sha256:8921d58f426793c5f1b47f0b59575780de9a095214958d0eb37d909593db8367", + "https://files.pythonhosted.org/packages/ba/19/797e2aaac9df6a66f1550f49979dc1b1e39ecd2077501c30efa81e8d5d67/cryptography-50.0.1-cp311-abi3-macosx_11_0_arm64.whl": "sha256:b8f852c65863251b9e3a1b8c150ce21e59b522dbb6a7d4bc80e680d38388e986", + "https://files.pythonhosted.org/packages/bb/ad/5d6702db60b1e40b41ef513b6967ff5848f307d50f8449baf1634f5908f1/cryptography-50.0.1.tar.gz": "sha256:5dd9bda1c12b4162f6ff568eeb5e0ff956c28d14406e875cfe8a63a2d414ff20", + "https://files.pythonhosted.org/packages/c7/27/8d207af749c453ee17ea087340b3f2b4adef75aadd1d277b1b129bdda84e/cryptography-50.0.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl": "sha256:9cb3cb952cf5a8abd50c782a98a89d71699715e802fe349704b47f2425b42a94", + "https://files.pythonhosted.org/packages/d6/51/3f9701867a46b6c1740c9b52fc4d3bed6cbdcfedcc9b6e64305c07f39cff/cryptography-50.0.1-cp39-abi3-manylinux_2_28_x86_64.whl": "sha256:407fe2b6db00939c05c0e945e9914238f2f0a430974839429dafc82b1ee6bee5", + "https://files.pythonhosted.org/packages/dd/04/557fc5ead96a829e0bc812a3b9dc4a52a2f27e4f7f5950da7ff27653a805/cryptography-50.0.1-cp39-abi3-manylinux_2_34_ppc64le.whl": "sha256:fc3ed7ebd2a8c96f5b166de0ab9b624996bef3b07bbeb19364dfb78222c22c80", + "https://files.pythonhosted.org/packages/e1/1b/82f0f0d8858d4432be1af790477edf62aef90324041aa07c57e57bef1af7/cryptography-50.0.1-cp311-abi3-manylinux_2_28_x86_64.whl": "sha256:51593d180cf6d179bde5c5d065bed81386b1f381656ae7d042b7ffc87a9895ad", + "https://files.pythonhosted.org/packages/e3/38/45abd72ef63f2e7d0754a6cacf97bd8b69512ace7f6130d24c39ece65da2/cryptography-50.0.1-cp311-abi3-manylinux_2_34_ppc64le.whl": "sha256:76de83fbd91ac49c0feaaa983d0748fd7a53176afac5fb3bf7478d244f0eb527", + "https://files.pythonhosted.org/packages/e6/de/d3cdc2815697aae84126cbd6a030ca7b6b452e28a88b501b836bd3aa7a86/cryptography-50.0.1-cp311-abi3-manylinux_2_28_aarch64.whl": "sha256:e74591e283fe6eb956416c929eb58262a719fe0311fd9054c62c3350ed8760d8", + "https://files.pythonhosted.org/packages/f6/6e/1cf405c5c8e8df7545378048e954792f00b7f2367af8863ce8b8f3e10607/cryptography-50.0.1-cp314-cp314t-manylinux_2_28_ppc64le.whl": "sha256:a255449073358275b64b67d3f595f268bbef70e72b6edb65e0c70c735bf739c9" + }, + "docutils": { + "https://files.pythonhosted.org/packages/32/91/30151a39f7570f448ed84529390628a651d7f27c87d73c9b887f8189695e/docutils-0.23-py3-none-any.whl": "sha256:25d013af9bf23bc1c7b2b093dff4208166c53a94786c9e447808335ef1185fea", + "https://files.pythonhosted.org/packages/39/a4/5180d9afc57e8fca05601dd652bdff19604c218814037fe90ffc7625a50a/docutils-0.23.tar.gz": "sha256:746f5060322511280a1e50eb76846ed6bf2342984b2ac04dc42caa1a8d78799e" + }, + "id": { + "https://files.pythonhosted.org/packages/42/77/de194443bf38daed9452139e960c632b0ef9f9a5dd9ce605fdf18ca9f1b1/id-1.6.1-py3-none-any.whl": "sha256:f5ec41ed2629a508f5d0988eda142e190c9c6da971100612c4de9ad9f9b237ca", + "https://files.pythonhosted.org/packages/6d/04/c2156091427636080787aac190019dc64096e56a23b7364d3c1764ee3a06/id-1.6.1.tar.gz": "sha256:d0732d624fb46fd4e7bc4e5152f00214450953b9e772c182c1c22964def1a069" + }, + "idna": { + "https://files.pythonhosted.org/packages/57/b0/0e52c878c53f245edd3a11020f20979b3f490f245af532c7cae3027754b5/idna-3.19-py3-none-any.whl": "sha256:815e7be7a7806d54abb586dc943addc79e8b2ee16915059658cbeff4b1b43bf4", + "https://files.pythonhosted.org/packages/5f/f7/abb373e5757eaec4b922b92f97ec8d6d7e057cf06778247604fbc4e7c3f3/idna-3.19.tar.gz": "sha256:5e0811a4383b21dc5838069f801c4fb62113b7447663d2530d2bd6e77b49bf15" + }, + "importlib-metadata": { + "https://files.pythonhosted.org/packages/6f/7e/1e7e8dc30634b93ebb3d58a3dea569ad146e656218d3960ab04f62047b29/importlib_metadata-9.0.1.tar.gz": "sha256:ab830580bc0ef3db61ce8fae716389e5462b67e033018bab6d8f80ef17172f99", + "https://files.pythonhosted.org/packages/b3/55/ecca97ae19075f1fac62def77731e7f535e6c1fb8f92ff08160c5e6dade8/importlib_metadata-9.0.1-py3-none-any.whl": "sha256:bba5600596a7e21f3eef53281cf28d6a5195634d2f2b78ff9501a3272c6eaab0" + }, + "jaraco-classes": { + "https://files.pythonhosted.org/packages/06/c0/ed4a27bc5571b99e3cff68f8a9fa5b56ff7df1c2251cc715a652ddd26402/jaraco.classes-3.4.0.tar.gz": "sha256:47a024b51d0239c0dd8c8540c6c7f484be3b8fcf0b2d85c13825780d3b3f3acd", + "https://files.pythonhosted.org/packages/7f/66/b15ce62552d84bbfcec9a4873ab79d993a1dd4edb922cbfccae192bd5b5f/jaraco.classes-3.4.0-py3-none-any.whl": "sha256:f662826b6bed8cace05e7ff873ce0f9283b5c924470fe664fff1c2f00f581790" + }, + "jaraco-context": { + "https://files.pythonhosted.org/packages/af/50/4763cd07e722bb6285316d390a164bc7e479db9d90daa769f22578f698b4/jaraco_context-6.1.2.tar.gz": "sha256:f1a6c9d391e661cc5b8d39861ff077a7dc24dc23833ccee564b234b81c82dfe3", + "https://files.pythonhosted.org/packages/f2/58/bc8954bda5fcda97bd7c19be11b85f91973d67a706ed4a3aec33e7de22db/jaraco_context-6.1.2-py3-none-any.whl": "sha256:bf8150b79a2d5d91ae48629d8b427a8f7ba0e1097dd6202a9059f29a36379535" + }, + "jaraco-functools": { + "https://files.pythonhosted.org/packages/02/36/ecc85bc96c273dc8a11273ed4782272975e6338d4a3e9228621175edf0e3/jaraco_functools-4.6.0-py3-none-any.whl": "sha256:99e3dc0060c5cbe8fcd1cdb36258e2a65ca40f1566b2033b12abb1bb44dd3c30", + "https://files.pythonhosted.org/packages/6c/1f/c23395957d41ccf27c4e535c3d334c4051e5395b3752057ba4cbaec35c56/jaraco_functools-4.6.0.tar.gz": "sha256:880c577ec9720b3a052d5bc611fb9f2269b3d87902ef42440df443b88e443280" + }, + "jeepney": { + "https://files.pythonhosted.org/packages/7b/6f/357efd7602486741aa73ffc0617fb310a29b588ed0fd69c2399acbb85b0c/jeepney-0.9.0.tar.gz": "sha256:cf0e9e845622b81e4a28df94c40345400256ec608d0e55bb8a3feaa9163f5732", + "https://files.pythonhosted.org/packages/b2/a3/e137168c9c44d18eff0376253da9f1e9234d0239e0ee230d2fee6cea8e55/jeepney-0.9.0-py3-none-any.whl": "sha256:97e5714520c16fc0a45695e5365a2e11b81ea79bba796e26f9f1d178cb182683" + }, + "keyring": { + "https://files.pythonhosted.org/packages/43/4b/674af6ef2f97d56f0ab5153bf0bfa28ccb6c3ed4d1babf4305449668807b/keyring-25.7.0.tar.gz": "sha256:fe01bd85eb3f8fb3dd0405defdeac9a5b4f6f0439edbb3149577f244a2e8245b", + "https://files.pythonhosted.org/packages/81/db/e655086b7f3a705df045bf0933bdd9c2f79bb3c97bfef1384598bb79a217/keyring-25.7.0-py3-none-any.whl": "sha256:be4a0b195f149690c166e850609a477c532ddbfbaed96a404d4e43f8d5e2689f" + }, + "markdown-it-py": { + "https://files.pythonhosted.org/packages/06/ff/7841249c247aa650a76b9ee4bbaeae59370dc8bfd2f6c01f3630c35eb134/markdown_it_py-4.2.0.tar.gz": "sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49", + "https://files.pythonhosted.org/packages/b3/81/4da04ced5a082363ecfa159c010d200ecbd959ae410c10c0264a38cac0f5/markdown_it_py-4.2.0-py3-none-any.whl": "sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a" + }, + "mdurl": { + "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl": "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", + "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz": "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba" + }, + "more-itertools": { + "https://files.pythonhosted.org/packages/de/1d/f4da6f02cdffe04d6362210b807146a26044c88d839208aec273bb0d9184/more_itertools-11.1.0.tar.gz": "sha256:48e8f4d9e7e5878571ecf6f2b4e57634f93cd474cc8cfbd2376f2d11b396e30d", + "https://files.pythonhosted.org/packages/e8/3d/1087453384dbde46a8c7f9356eead2c58be8a7bf156bca40243377c85715/more_itertools-11.1.0-py3-none-any.whl": "sha256:4b65538ae22f6fed0ce4874efd317463a7489796a0939fa66824dd542125a192" + }, + "nh3": { + "https://files.pythonhosted.org/packages/00/0c/1a8985fd43fea5530c0ac890b6f0b423770ee72f111b70b7a77f2dec243a/nh3-0.3.7-cp38-abi3-musllinux_1_2_aarch64.whl": "sha256:d56e76bd3cadb09b6b0cef364850811663734b348a25f5f587a2819c495367bd", + "https://files.pythonhosted.org/packages/04/5c/aa1468e3e281e78d2b3b7d762ccba59f681af355e971dbd255d5903f7b86/nh3-0.3.7-cp314-cp314t-musllinux_1_2_armv7l.whl": "sha256:94fd6e59553fbb9ffd8ba71bbd5a54e3126ba01799a097ae30d5341d750bc6ac", + "https://files.pythonhosted.org/packages/07/42/a687e7091928806e514f89fa2666f25ec9bfe0a902fc4402b25e51ce408b/nh3-0.3.7-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl": "sha256:f266d3f1b3647449923a8e406524632220dd5d8b647078dfe45b885d33d10479", + "https://files.pythonhosted.org/packages/17/40/2a0921d45b20828708bcb56887e47dcf8cae13818de5bf9a01308d348712/nh3-0.3.7-cp38-abi3-manylinux_2_17_ppc64.manylinux2014_ppc64.whl": "sha256:19f288c938ec6eef1f5d2c6cab47838e71fef8097e1c1233802be5a6230ba086", + "https://files.pythonhosted.org/packages/18/2f/022b27146d52d24b1b353b003359134788ecbcd6fcdf6283adbd57c0fbc8/nh3-0.3.7.tar.gz": "sha256:71860d01c16f4d8c72e334e0674beb2b0899dbd0bf760de18932ef4390303848", + "https://files.pythonhosted.org/packages/1d/18/3ab564595cb88196f50d26e163ed0fd2acc731ab26ac615df91981885887/nh3-0.3.7-cp314-cp314t-win_arm64.whl": "sha256:157ec1eb7a62f3d9a7badb8d82d89aa810e3e24e097eedfa481a25d0c8a99877", + "https://files.pythonhosted.org/packages/1e/60/847a21339f095c4d4c655af31fa2d18b174585bcc210709facacc7ce205c/nh3-0.3.7-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl": "sha256:eae64328e46a25785535afcb6885b6f182ecaf5ee8c88f8c075422db8aacc65b", + "https://files.pythonhosted.org/packages/20/64/9e36594efad6c290de4240d02cb2bd80c339a4ab1c4de66e599ffa6d9d81/nh3-0.3.7-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.whl": "sha256:bc42bb1193c1e28a1e74c2cabaca178e118a7103e8832699fef8a2b3e2496493", + "https://files.pythonhosted.org/packages/26/a4/c3423351e8d864ad756e85e15f0c01433361f14d34e4ed156482c0518f2a/nh3-0.3.7-cp38-abi3-musllinux_1_2_x86_64.whl": "sha256:6698a822132beedab80f131c08d8d0ac5a178ddeb488d02ca4b67716ecfac7af", + "https://files.pythonhosted.org/packages/42/e5/ae8c0782fce74fb6fcf7234bb3d4017f37ce181b4f9d29369eab21c50a04/nh3-0.3.7-cp38-abi3-musllinux_1_2_i686.whl": "sha256:15f5fbf090f5c88d61c820e1fc1fceecb6520cca9fe85649c06b57ef9dc9ff62", + "https://files.pythonhosted.org/packages/4b/6a/478f153f1d7c0baaa3d1e8bb5fdcee3a6235f90fe44ea969a9d4e2b8c47a/nh3-0.3.7-cp38-abi3-win32.whl": "sha256:6e4280115d44c3b278eef712a86748c1a723105cd79feec46952383117ab4e59", + "https://files.pythonhosted.org/packages/6a/9f/57d186d9d3dd38905dc12dddb3484406cdf6aa0b1ce33639a2d277d4ee1c/nh3-0.3.7-cp314-cp314t-musllinux_1_2_i686.whl": "sha256:18f4278ecd157d43cb35acd5aae9f35cfa79f546b4922bd86536adc0f6312102", + "https://files.pythonhosted.org/packages/6b/53/097a5ad0b34b15d67a472ef849165a54209fa5fbd3e639801c6fe439ba28/nh3-0.3.7-cp314-cp314t-musllinux_1_2_x86_64.whl": "sha256:808def0c8c07843e6e50dc84f532457bfa2cfd17417b219a5d9e7c773709331a", + "https://files.pythonhosted.org/packages/7b/7f/1a103e00aaf5e59f2dee4c2709aac609bb2d4bb74fddaf0dcfade11ed87b/nh3-0.3.7-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl": "sha256:4968fe8d2db97c6f047659bf46a449fd8ec377f44ebf3e0a1b96c0d3a333ae32", + "https://files.pythonhosted.org/packages/7b/e3/3212c1a5b5745245d7f18885207bbddb34c56075f34dd682bd539aad55cc/nh3-0.3.7-cp38-abi3-manylinux_2_31_riscv64.whl": "sha256:5ffdfcb9a686ffb12765376bcfb6b5b55728516d3c0ee317d29982381ded3df8", + "https://files.pythonhosted.org/packages/85/05/b0e6bef633549a23347d5462aa288fcc42381e7918482062ca3cb456242a/nh3-0.3.7-cp38-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl": "sha256:e8fd1ab205258b29254f72db377d99e2c96aa7653ef3b015ccab0420b094b506", + "https://files.pythonhosted.org/packages/93/a7/02dd159d4e71f98607d8d4249cddb7561e77be1a8e4dec77d76e1b68fc99/nh3-0.3.7-cp38-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl": "sha256:9b7279d43323a25225df23576af6594a16693f61431170848b8b2ac21ad4f174", + "https://files.pythonhosted.org/packages/94/0d/c257754bf57f829f307aa226bbe136d3a1356b5a0d08324c7b6bd2a8aacd/nh3-0.3.7-cp38-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl": "sha256:6c3aa50eb26e9228238271db9f983cbc3b006dfbfeca2d4dc34c33ddc6ac5ea5", + "https://files.pythonhosted.org/packages/9a/a7/c57a2c70534418310889a65ccfac3525e62f0bc0a8613225903403755ce7/nh3-0.3.7-cp314-cp314t-win32.whl": "sha256:874b7d67a067bd29a59223f6270fc30da4edd8e6d87fd219fc93bcbaa662c946", + "https://files.pythonhosted.org/packages/a6/ed/c5510c615dce55b6fcc364aa1838142f938beed64f5e4927490dfcaf4405/nh3-0.3.7-cp38-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl": "sha256:70f5ac8626e899a4bab0ef74ca2f5bd602f49c7b739e6e5026b4afc6d63dac42", + "https://files.pythonhosted.org/packages/b2/5d/891e533b716cf00df76ad0ba6485dcfd14d59a6430a3cc99057c4c04004e/nh3-0.3.7-cp38-abi3-musllinux_1_2_armv7l.whl": "sha256:fd4a70efb45d5372174f718878eb7a35c12677626a63b2f103b23b833457dcac", + "https://files.pythonhosted.org/packages/b4/b9/34433ccb1f0fe6968dabbb7d4bf5721c6221878ef07832748c06655a6a80/nh3-0.3.7-cp38-abi3-win_amd64.whl": "sha256:618e3059caf41ccdf5dcccb3fa9df4cf6e4efe23d1382a8bbfca272a8a4f8bfc", + "https://files.pythonhosted.org/packages/ce/88/b594f0e86856b37e182fb663283da419eea6424972506e640e890885467f/nh3-0.3.7-cp314-cp314t-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl": "sha256:91a4dab4e94d9fc54b9f67b1adfb23e81fab7ab43f33c3b8c97be9aa38f789ba", + "https://files.pythonhosted.org/packages/d8/4a/e9c436089a0c80b928011ead0efd156aa7639a19b6064ef58dcedcab8369/nh3-0.3.7-cp314-cp314t-musllinux_1_2_aarch64.whl": "sha256:be53a4825585f701955cb9baf49f478f56eb81e20294329fe4bc689dd5dd81fa", + "https://files.pythonhosted.org/packages/e4/d1/9d70e0e418a48280ec0ddc6c1b08b4b1136ebcc31a1625e57ff5c665fa51/nh3-0.3.7-cp38-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl": "sha256:de2b2aab32ea303405debefdcfc58043d3e635fa3f67b9eb140d2b0e0c0d2563", + "https://files.pythonhosted.org/packages/e6/b7/efda1d0a611d940bdfde6893bde1ea6b7b7d48c31273aea48e35b822fd58/nh3-0.3.7-cp314-cp314t-win_amd64.whl": "sha256:614dac4a4c36ad084e78447d16fe898dedd762e354a7ab9cda2984e82f67883d", + "https://files.pythonhosted.org/packages/f9/70/e140dffff6e808dc6343598df76e7e2407fd0f581de3524c75fba2e0cf24/nh3-0.3.7-cp38-abi3-win_arm64.whl": "sha256:f04b7d333b27f13ca439da3cf1c75c2fba34f104969f6ce4ac8e7079699c2f4a" + }, + "packaging": { + "https://files.pythonhosted.org/packages/63/34/ba1c580383c9eada3711951fef0795c80b829a078d72188184bcab9dd527/packaging-26.3-py3-none-any.whl": "sha256:d7193f7c8e4e93f444fde0262bf90af30e16fa0ad0ad44cb553c87339b23cd1c", + "https://files.pythonhosted.org/packages/7d/fa/3944b40b07da9ce895c0e6303a5ab7d53da063554f534556b134a54d6093/packaging-26.3.tar.gz": "sha256:94edc256424af38762eb31306eed28beb9f0efc50a8837492c9d6fd6004aed79" + }, + "pycparser": { + "https://files.pythonhosted.org/packages/0c/c3/44f3fbbfa403ea2a7c779186dc20772604442dde72947e7d01069cbe98e3/pycparser-3.0-py3-none-any.whl": "sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992", + "https://files.pythonhosted.org/packages/1b/7d/92392ff7815c21062bea51aa7b87d45576f649f16458d78b7cf94b9ab2e6/pycparser-3.0.tar.gz": "sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29" + }, + "pygments": { + "https://files.pythonhosted.org/packages/49/2e/ced460408999b33da6b31b0021b0f37d329e202d4169aeb164493778f25b/pygments-2.21.0.tar.gz": "sha256:610ca751c9bc2492b38eb9a38a7fbc93edbbb2d7182edaf34e66ae493dee5c8c", + "https://files.pythonhosted.org/packages/71/46/17f022dd3e953bf20a04a028a21ec746d942f8d2af30fa0f124fa0e6a684/pygments-2.21.0-py3-none-any.whl": "sha256:2363c69b61c4a97c838da3b130dcd6468f4848992b21a82f2a63ec34377137d9" + }, + "pywin32-ctypes": { + "https://files.pythonhosted.org/packages/85/9f/01a1a99704853cb63f253eea009390c88e7131c67e66a0a02099a8c917cb/pywin32-ctypes-0.2.3.tar.gz": "sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755", + "https://files.pythonhosted.org/packages/de/3d/8161f7711c017e01ac9f008dfddd9410dff3674334c233bde66e7ba65bbf/pywin32_ctypes-0.2.3-py3-none-any.whl": "sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8" + }, + "readme-renderer": { + "https://files.pythonhosted.org/packages/25/d7/9309494fad74ee831d4546f69325b5519f37c6dfb2d9ba495db8c6d4f4ca/readme_renderer-46.0.tar.gz": "sha256:af3e964914f6310a33ff67b72a4bdd940bed8d7c3bdecd2d14f40edf284bfe90", + "https://files.pythonhosted.org/packages/4b/72/ac5ca81fe9121fcaa9d828d21017cba00a16a98e4ea5fb60c878f93dda4f/readme_renderer-46.0-py3-none-any.whl": "sha256:d0dae1f74bb273b534770cb4cccb6bb78735540afdb03c2146f4e19dcd412560" + }, + "requests": { + "https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl": "sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0", + "https://files.pythonhosted.org/packages/ac/c3/e2a2b89f2d3e2179abd6d00ebd70bff6273f37fb3e0cc209f48b39d00cbf/requests-2.34.2.tar.gz": "sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed" + }, + "requests-toolbelt": { + "https://files.pythonhosted.org/packages/3f/51/d4db610ef29373b879047326cbf6fa98b6c1969d6f6dc423279de2b1be2c/requests_toolbelt-1.0.0-py2.py3-none-any.whl": "sha256:cccfdd665f0a24fcf4726e690f65639d272bb0637b9b92dfd91a5568ccf6bd06", + "https://files.pythonhosted.org/packages/f3/61/d7545dafb7ac2230c70d38d31cbfe4cc64f7144dc41f6e4e4b78ecd9f5bb/requests-toolbelt-1.0.0.tar.gz": "sha256:7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6" + }, + "rfc3986": { + "https://files.pythonhosted.org/packages/85/40/1520d68bfa07ab5a6f065a186815fb6610c86fe957bc065754e47f7b0840/rfc3986-2.0.0.tar.gz": "sha256:97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c", + "https://files.pythonhosted.org/packages/ff/9a/9afaade874b2fa6c752c36f1548f718b5b83af81ed9b76628329dab81c1b/rfc3986-2.0.0-py2.py3-none-any.whl": "sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd" + }, + "rich": { + "https://files.pythonhosted.org/packages/82/3b/64d4899d73f91ba49a8c18a8ff3f0ea8f1c1d75481760df8c68ef5235bf5/rich-15.0.0-py3-none-any.whl": "sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb", + "https://files.pythonhosted.org/packages/c0/8f/0722ca900cc807c13a6a0c696dacf35430f72e0ec571c4275d2371fca3e9/rich-15.0.0.tar.gz": "sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36" + }, + "secretstorage": { + "https://files.pythonhosted.org/packages/1c/03/e834bcd866f2f8a49a85eaff47340affa3bfa391ee9912a952a1faa68c7b/secretstorage-3.5.0.tar.gz": "sha256:f04b8e4689cbce351744d5537bf6b1329c6fc68f91fa666f60a380edddcd11be", + "https://files.pythonhosted.org/packages/b7/46/f5af3402b579fd5e11573ce652019a67074317e18c1935cc0b4ba9b35552/secretstorage-3.5.0-py3-none-any.whl": "sha256:0ce65888c0725fcb2c5bc0fdb8e5438eece02c523557ea40ce0703c266248137" + }, + "twine": { + "https://files.pythonhosted.org/packages/92/3c/58f808a359700f39a967dffede33efeac809262c03303fa3eec6afff8f49/twine-7.0.0.tar.gz": "sha256:85cdb29c518efef867360ae4acd4b0dfd61c8654a22fca08e6f8539f05022177", + "https://files.pythonhosted.org/packages/96/08/ddcdc06225eaad6de0e48e1002b06d919dbde20582d0662c7af51308e5d6/twine-7.0.0-py3-none-any.whl": "sha256:b854164df26db268af05f49aa5c0344b10e27a494343ff05b1e0bad3b135f5a7" + }, + "urllib3": { + "https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz": "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c", + "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl": "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897" + }, + "zipp": { + "https://files.pythonhosted.org/packages/3a/13/547360d81e6d88d58492968ffda9f9542854f11310ee556fef14260cc886/zipp-4.1.0-py3-none-any.whl": "sha256:25ad4e16390cd314347dd8f1de67a2ac538ae658ed4ab9db16029c07c188e97f", + "https://files.pythonhosted.org/packages/b9/d8/eab98a517c14134c0b2eb4e2387bc5f457334293ec5d2dd3857ec2966802/zipp-4.1.0.tar.gz": "sha256:4cb57381f544315db7688e976e922a2b18cdb513d21cc194eb42232ba2a3e602" + } + } + }, + "fact_version": "v2" + }, "@@rules_rs+//rs:extensions.bzl%crate": { "Inflector_0.11.4": "{\"dependencies\":[{\"name\":\"lazy_static\",\"optional\":true,\"req\":\"^1.2.0\"},{\"name\":\"regex\",\"optional\":true,\"req\":\"^1.1\"}],\"features\":{\"default\":[\"heavyweight\"],\"heavyweight\":[\"regex\",\"lazy_static\"],\"unstable\":[]}}", "addr2line_0.25.1": "{\"dependencies\":[{\"name\":\"alloc\",\"optional\":true,\"package\":\"rustc-std-workspace-alloc\",\"req\":\"^1.0.0\"},{\"kind\":\"dev\",\"name\":\"backtrace\",\"req\":\"^0.3.13\"},{\"features\":[\"wrap_help\"],\"name\":\"clap\",\"optional\":true,\"req\":\"^4.3.21\"},{\"name\":\"core\",\"optional\":true,\"package\":\"rustc-std-workspace-core\",\"req\":\"^1.0.0\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"cpp_demangle\",\"optional\":true,\"req\":\"^0.4\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.7.0\"},{\"default_features\":false,\"name\":\"fallible-iterator\",\"optional\":true,\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"findshlibs\",\"req\":\"^0.10\"},{\"default_features\":false,\"features\":[\"read\"],\"name\":\"gimli\",\"req\":\"^0.32.0\"},{\"kind\":\"dev\",\"name\":\"libtest-mimic\",\"req\":\"^0.8.1\"},{\"name\":\"memmap2\",\"optional\":true,\"req\":\"^0.9.4\"},{\"default_features\":false,\"features\":[\"read\",\"compression\"],\"name\":\"object\",\"optional\":true,\"req\":\"^0.37.0\"},{\"name\":\"rustc-demangle\",\"optional\":true,\"req\":\"^0.1\"},{\"default_features\":false,\"name\":\"smallvec\",\"optional\":true,\"req\":\"^1\"},{\"name\":\"typed-arena\",\"optional\":true,\"req\":\"^2\"}],\"features\":{\"all\":[\"bin\",\"wasm\"],\"bin\":[\"loader\",\"rustc-demangle\",\"cpp_demangle\",\"fallible-iterator\",\"smallvec\",\"dep:clap\"],\"cargo-all\":[],\"default\":[\"rustc-demangle\",\"cpp_demangle\",\"loader\",\"fallible-iterator\",\"smallvec\"],\"loader\":[\"std\",\"dep:object\",\"dep:memmap2\",\"dep:typed-arena\"],\"rustc-dep-of-std\":[\"core\",\"alloc\",\"gimli/rustc-dep-of-std\"],\"std\":[\"gimli/std\"],\"wasm\":[\"object/wasm\"]}}", From 12fd621f6278f3ca97451718578c29385a884fe4 Mon Sep 17 00:00:00 2001 From: Anthony Tafoya Date: Wed, 14 Oct 2026 20:46:36 +0000 Subject: [PATCH 070/155] Preserve specific MCP failure codes in metrics and spans (#54094) ## Why MCP request failures and tool errors reported only through `codex/telemetry` metadata previously received an `unknown` error code, obscuring the failure category. ## What changed - Classify typed request failures into bounded codes such as `request_timeout`, `transport_closed`, and `protocol_error`, and carry them into MCP call metrics and spans before errors become strings. - Preserve typed timeouts when a prepared tool call exhausts its deadline during trusted access lookup. - Accept allowlisted `error_code` values from `codex/telemetry` as a fallback after structured content and connector authentication metadata. Keep model output unchanged and ignore unrecognized metadata codes. ## Testing Add coverage for typed errors wrapped in context, prepared-call timeout classification, metadata precedence and rejection, unchanged model output, and exported span error attributes. GitOrigin-RevId: d7a440a6c9119b8a07a7f1fad697eb25af506f00 --- codex-rs/codex-mcp/src/binding.rs | 6 +- .../codex-mcp/src/connection_manager_tests.rs | 4 + codex-rs/core/src/mcp_tool_call.rs | 19 ++- codex-rs/core/src/mcp_tool_call/telemetry.rs | 50 +++++++- .../core/src/mcp_tool_call/telemetry_tests.rs | 113 +++++++++++++++++- codex-rs/core/src/mcp_tool_call_tests.rs | 84 ++++++++++--- codex-rs/rmcp-client/src/lib.rs | 2 + codex-rs/rmcp-client/src/service_error.rs | 33 +++++ .../rmcp-client/src/service_error_tests.rs | 24 ++++ 9 files changed, 299 insertions(+), 36 deletions(-) create mode 100644 codex-rs/rmcp-client/src/service_error_tests.rs diff --git a/codex-rs/codex-mcp/src/binding.rs b/codex-rs/codex-mcp/src/binding.rs index a20d1a8e35..e19001d8af 100644 --- a/codex-rs/codex-mcp/src/binding.rs +++ b/codex-rs/codex-mcp/src/binding.rs @@ -410,7 +410,7 @@ impl PreparedMcpCall { tokio::time::timeout_at(deadline, add_trusted_access_context) .await .map_err(|_| { - anyhow::anyhow!("timed out awaiting tools/call after {timeout:.0?}") + codex_rmcp_client::request_timeout_error("tools/call", timeout) })? } None => add_trusted_access_context.await, @@ -419,9 +419,7 @@ impl PreparedMcpCall { Some((timeout, deadline)) => { let remaining = deadline.saturating_duration_since(tokio::time::Instant::now()); if remaining.is_zero() { - return Err(anyhow::anyhow!( - "timed out awaiting tools/call after {timeout:.0?}" - )); + return Err(codex_rmcp_client::request_timeout_error("tools/call", timeout)); } Some(remaining) } diff --git a/codex-rs/codex-mcp/src/connection_manager_tests.rs b/codex-rs/codex-mcp/src/connection_manager_tests.rs index 4e427d3a21..4bed4eebb0 100644 --- a/codex-rs/codex-mcp/src/connection_manager_tests.rs +++ b/codex-rs/codex-mcp/src/connection_manager_tests.rs @@ -548,6 +548,10 @@ async fn prepared_call_timeout_includes_trusted_access_lookup() { assert_eq!(started.elapsed(), Duration::from_secs(1)); assert!(format!("{error:#}").contains("timed out awaiting tools/call after 1s")); + assert_eq!( + codex_rmcp_client::request_error_code(&error), + Some("request_timeout") + ); } pub(crate) async fn create_ready_async_managed_client(tools: Vec) -> AsyncManagedClient { diff --git a/codex-rs/core/src/mcp_tool_call.rs b/codex-rs/core/src/mcp_tool_call.rs index 0cc6b1fc4a..c161ede8da 100644 --- a/codex-rs/core/src/mcp_tool_call.rs +++ b/codex-rs/core/src/mcp_tool_call.rs @@ -469,6 +469,7 @@ async fn handle_approved_mcp_tool_call( .clone() .unwrap_or_else(|| JsonValue::Object(serde_json::Map::new())); let mut elicitation_type = None; + let mut request_error_code = None; let result = async { let result = async { let mut result = prepared_call @@ -551,7 +552,10 @@ async fn handle_approved_mcp_tool_call( )) }) .await - .map_err(|error| format!("tool call error: {error:?}"))?; + .map_err(|error| { + request_error_code = codex_rmcp_client::request_error_code(&error); + format!("tool call error: {error:?}") + })?; crate::tools::record_confirmed_code_mode_send( sess, &turn_context.sub_id, @@ -592,7 +596,7 @@ async fn handle_approved_mcp_tool_call( .await) } .await; - record_mcp_result_span_telemetry(&Span::current(), &result); + record_mcp_result_span_telemetry(&Span::current(), &result, request_error_code); result } .instrument(mcp_tool_call_span( @@ -642,7 +646,7 @@ async fn handle_approved_mcp_tool_call( .await; maybe_track_codex_app_used(sess, step_context, &server, &metadata, elicitation_type).await; - let outcome = mcp_call_metric_outcome(&result); + let outcome = mcp_call_metric_outcome(&result).with_request_error_code(request_error_code); emit_mcp_call_metrics( &step_context.session_telemetry, &outcome, @@ -720,8 +724,13 @@ fn record_server_fields(span: &Span, url: Option<&str>) { } } -fn record_mcp_result_span_telemetry(span: &Span, result: &Result) { - record_mcp_call_outcome_span_telemetry(span, result); +fn record_mcp_result_span_telemetry( + span: &Span, + result: &Result, + request_error_code: Option<&str>, +) { + let outcome = mcp_call_metric_outcome(result).with_request_error_code(request_error_code); + record_mcp_call_outcome_span_telemetry(span, &outcome); let Some(span_telemetry) = result .as_ref() diff --git a/codex-rs/core/src/mcp_tool_call/telemetry.rs b/codex-rs/core/src/mcp_tool_call/telemetry.rs index 76aadd4ef6..dfa6feb095 100644 --- a/codex-rs/core/src/mcp_tool_call/telemetry.rs +++ b/codex-rs/core/src/mcp_tool_call/telemetry.rs @@ -31,6 +31,15 @@ pub(super) struct McpCallMetricOutcome { } impl McpCallMetricOutcome { + pub(super) fn with_request_error_code(mut self, code: Option<&str>) -> Self { + if self.error_type == Some(MCP_CALL_ERROR_TYPE_MCP_REQUEST) + && let Some(code) = code + { + self.error_code = Some(code.to_string()); + } + self + } + pub(super) fn from_status(status: &'static str) -> Self { Self { status, @@ -149,6 +158,15 @@ pub(super) fn mcp_call_metric_outcome( .and_then(|auth_failure| auth_failure.get("error_code")) .and_then(JsonValue::as_str) .filter(|error_code| !error_code.is_empty()) + }) + .or_else(|| { + result + .meta + .as_ref() + .and_then(|meta| meta.get(super::MCP_RESULT_TELEMETRY_META_KEY)) + .and_then(|telemetry| telemetry.get("error_code")) + .and_then(JsonValue::as_str) + .and_then(allowlisted_codex_telemetry_error_code) }); let error_code: String = error_code .unwrap_or(MCP_CALL_ERROR_CODE_UNKNOWN) @@ -172,12 +190,32 @@ pub(super) fn mcp_call_metric_outcome( } } -pub(super) fn record_mcp_call_outcome_span_telemetry( - span: &Span, - result: &Result, -) { - let outcome = mcp_call_metric_outcome(result); - let (Some(error_type), Some(error_code)) = (outcome.error_type, outcome.error_code) else { +fn allowlisted_codex_telemetry_error_code(code: &str) -> Option<&str> { + matches!( + code, + "kernel_start_failed" + | "kernel_exited" + | "kernel_io_error" + | "execution_timeout" + | "execution_cancelled" + | "execution_error" + | "execution_rejected" + | "execution_reset" + | "import_error" + | "syntax_error" + | "reference_error" + | "type_error" + | "uncaught_exception" + | "unhandled_rejection" + | "locator_timeout" + | "guardian_denied" + ) + .then_some(code) +} + +pub(super) fn record_mcp_call_outcome_span_telemetry(span: &Span, outcome: &McpCallMetricOutcome) { + let (Some(error_type), Some(error_code)) = (outcome.error_type, outcome.error_code.as_deref()) + else { return; }; span.record(MCP_CALL_ERROR_TYPE_SPAN_ATTR, error_type); diff --git a/codex-rs/core/src/mcp_tool_call/telemetry_tests.rs b/codex-rs/core/src/mcp_tool_call/telemetry_tests.rs index 80b67e167d..d34085fc79 100644 --- a/codex-rs/core/src/mcp_tool_call/telemetry_tests.rs +++ b/codex-rs/core/src/mcp_tool_call/telemetry_tests.rs @@ -114,16 +114,101 @@ fn mcp_call_metric_outcome_reads_auth_error_code_from_meta() { ); } +#[test] +fn mcp_call_metric_outcome_reads_telemetry_without_changing_model_output() { + let mut result = CallToolResult { + content: vec![ + serde_json::json!({"type": "text", "text": "browser failed"}), + serde_json::json!({"type": "text", "text": "captured output"}), + ], + structured_content: None, + is_error: Some(true), + meta: None, + }; + let original_output = result.as_function_call_output_payload(); + result.meta = Some(serde_json::json!({ + "codex/telemetry": {"error_code": "locator_timeout"}, + })); + + assert_eq!(result.as_function_call_output_payload(), original_output); + assert_eq!( + mcp_call_metric_outcome(&Ok(result)), + McpCallMetricOutcome { + status: "error", + error_type: Some(MCP_CALL_ERROR_TYPE_TOOL_RESULT), + error_code: Some("locator_timeout".to_string()), + approval_source: None, + } + ); +} + +#[test] +fn mcp_call_metric_outcome_preserves_existing_error_code_precedence() { + let mut result = metric_call_tool_result( + /*is_error*/ true, + Some(serde_json::json!({"error_code": "RATE_LIMITED"})), + ); + result.meta = Some(serde_json::json!({ + "codex/telemetry": {"error_code": "locator_timeout"}, + MCP_TOOL_CODEX_APPS_META_KEY: { + "connector_auth_failure": { + "is_auth_failure": true, + "error_code": "UNAUTHORIZED", + }, + }, + })); + for (structured_content, expected_code) in [ + (result.structured_content.clone(), "RATE_LIMITED"), + (None, "UNAUTHORIZED"), + ] { + result.structured_content = structured_content; + assert_eq!( + mcp_call_metric_outcome(&Ok(result.clone())), + McpCallMetricOutcome { + status: "error", + error_type: Some(MCP_CALL_ERROR_TYPE_TOOL_RESULT), + error_code: Some(expected_code.to_string()), + approval_source: None, + } + ); + } +} + +#[test] +fn mcp_call_metric_outcome_ignores_invalid_telemetry_codes() { + for metadata in [ + serde_json::json!({"codex/telemetry": "invalid"}), + serde_json::json!({"codex/telemetry": {"error_code": 42}}), + serde_json::json!({"codex/telemetry": {"error_code": "Bearer credential-sentinel"}}), + serde_json::json!({"codex/telemetry": {"error_code": "locator_timeout:secret-sentinel"}}), + ] { + let mut result = metric_call_tool_result( + /*is_error*/ true, + Some(serde_json::json!({"error_code": ""})), + ); + result.meta = Some(metadata); + assert_eq!( + mcp_call_metric_outcome(&Ok(result)), + McpCallMetricOutcome { + status: "error", + error_type: Some(MCP_CALL_ERROR_TYPE_TOOL_RESULT), + error_code: Some(MCP_CALL_ERROR_CODE_UNKNOWN.to_string()), + approval_source: None, + } + ); + } +} + #[test] fn mcp_call_metric_outcome_bounds_and_sanitizes_error_code() { let raw_error_code = format!("BAD CODE {}", "x".repeat(300)); - let result = Ok(metric_call_tool_result( + let result = metric_call_tool_result( /*is_error*/ true, Some(serde_json::json!({"error_code": raw_error_code})), - )); + ); assert_eq!( - mcp_call_metric_outcome(&result), + mcp_call_metric_outcome(&Ok(result)), McpCallMetricOutcome { status: "error", error_type: Some(MCP_CALL_ERROR_TYPE_TOOL_RESULT), @@ -132,3 +217,25 @@ fn mcp_call_metric_outcome_bounds_and_sanitizes_error_code() { } ); } + +#[test] +fn caller_error_code_only_applies_to_request_failures() { + assert_eq!( + mcp_call_metric_outcome(&Err("deadline".to_string())) + .with_request_error_code(Some("request_timeout")), + McpCallMetricOutcome { + status: "error", + error_type: Some(MCP_CALL_ERROR_TYPE_MCP_REQUEST), + error_code: Some("request_timeout".to_string()), + approval_source: None, + } + ); + let result = Ok(metric_call_tool_result( + /*is_error*/ true, + Some(serde_json::json!({"error_code": "locator_timeout"})), + )); + assert_eq!( + mcp_call_metric_outcome(&result).with_request_error_code(Some("request_timeout")), + mcp_call_metric_outcome(&result) + ); +} diff --git a/codex-rs/core/src/mcp_tool_call_tests.rs b/codex-rs/core/src/mcp_tool_call_tests.rs index e4b9dbfe73..b4145fee25 100644 --- a/codex-rs/core/src/mcp_tool_call_tests.rs +++ b/codex-rs/core/src/mcp_tool_call_tests.rs @@ -50,6 +50,9 @@ use core_test_support::responses::ev_response_created; use core_test_support::responses::mount_sse_once; use core_test_support::responses::sse; use core_test_support::responses::start_mock_server; +use opentelemetry::trace::TracerProvider; +use opentelemetry_sdk::trace::InMemorySpanExporter; +use opentelemetry_sdk::trace::SdkTracerProvider; use pretty_assertions::assert_eq; use serde::Deserialize; use std::collections::HashMap; @@ -58,6 +61,7 @@ use tempfile::tempdir; use tracing::Instrument; use tracing::Level; use tracing_subscriber::fmt::format::FmtSpan; +use tracing_subscriber::prelude::*; use tracing_test::internal::MockWriter; fn annotations( @@ -500,26 +504,40 @@ async fn mcp_tool_call_span_records_expected_fields() { ); } +#[test_case::test_case(Some("RATE_LIMITED"), None, None, "RATE_LIMITED"; "structured error")] +#[test_case::test_case(None, Some("credential-sentinel"), None, "unknown"; "sensitive metadata")] +#[test_case::test_case(None, None, Some("transport_closed"), "transport_closed"; "closed transport")] #[tokio::test] -async fn mcp_tool_call_span_records_error_type_and_error_code() { - let buffer: &'static std::sync::Mutex> = - Box::leak(Box::new(std::sync::Mutex::new(Vec::new()))); - let subscriber = tracing_subscriber::fmt() - .with_level(true) - .with_ansi(false) - .with_max_level(Level::TRACE) - .with_span_events(FmtSpan::FULL) - .with_writer(MockWriter::new(buffer)) - .finish(); +async fn mcp_tool_call_span_records_error_type_and_error_code( + structured_code: Option<&str>, + metadata_code: Option<&str>, + request_error_code: Option<&str>, + expected_code: &str, +) { + let exporter = InMemorySpanExporter::default(); + let provider = SdkTracerProvider::builder() + .with_simple_exporter(exporter.clone()) + .build(); + let subscriber = tracing_subscriber::registry() + .with(tracing_opentelemetry::layer().with_tracer(provider.tracer("mcp-error-test"))); let _guard = tracing::subscriber::set_default(subscriber); let (session, turn_context) = make_session_and_context().await; let result = Ok(CallToolResult { content: Vec::new(), - structured_content: Some(serde_json::json!({"error_code": "RATE_LIMITED"})), + structured_content: structured_code.map(|code| serde_json::json!({"error_code": code})), is_error: Some(true), - meta: None, + meta: metadata_code.map(|code| { + serde_json::json!({ + "codex/telemetry": {"error_code": code}, + }) + }), }); + let result = if request_error_code.is_some() { + Err("request failed".to_string()) + } else { + result + }; let span = mcp_tool_call_span( &session, &turn_context, @@ -534,16 +552,42 @@ async fn mcp_tool_call_span_records_error_type_and_error_code() { ); async { - record_mcp_result_span_telemetry(&Span::current(), &result); + record_mcp_result_span_telemetry(&Span::current(), &result, request_error_code); } .instrument(span) .await; - let logs = String::from_utf8(buffer.lock().expect("buffer lock").clone()).expect("utf8 logs"); + provider.force_flush().expect("flush spans"); + let spans = exporter.get_finished_spans().expect("exported spans"); + let span = spans + .iter() + .find(|span| span.name == "mcp.tools.call") + .expect("MCP tool span"); + let error_codes = span + .attributes + .iter() + .filter(|attribute| attribute.key.as_str() == "codex.mcp.error.code") + .map(|attribute| attribute.value.to_string()) + .collect::>(); + assert_eq!(error_codes, vec![expected_code.to_string()]); + let error_types = span + .attributes + .iter() + .filter(|attribute| attribute.key.as_str() == "error.type") + .map(|attribute| attribute.value.to_string()) + .collect::>(); + assert_eq!( + error_types, + vec![if request_error_code.is_some() { + "mcp_request".to_string() + } else { + "tool_result".to_string() + }] + ); assert!( - logs.contains("error.type=\"tool_result\"") - && logs.contains("codex.mcp.error.code=\"RATE_LIMITED\""), - "missing MCP tool error span fields\nlogs:\n{logs}" + span.attributes + .iter() + .all(|attribute| !attribute.value.to_string().contains("credential-sentinel")) ); } @@ -582,7 +626,11 @@ async fn mcp_result_telemetry_span_logs(meta: Option) -> Stri ); async { - record_mcp_result_span_telemetry(&Span::current(), &result); + record_mcp_result_span_telemetry( + &Span::current(), + &result, + /*request_error_code*/ None, + ); } .instrument(span) .await; diff --git a/codex-rs/rmcp-client/src/lib.rs b/codex-rs/rmcp-client/src/lib.rs index a2f501171a..54b46ef07c 100644 --- a/codex-rs/rmcp-client/src/lib.rs +++ b/codex-rs/rmcp-client/src/lib.rs @@ -97,6 +97,8 @@ pub use rmcp_client::SendElicitation; pub use rmcp_client::StreamableHttpBearerToken; pub use rmcp_client::ToolWithConnectorId; pub use service_error::mcp_error; +pub use service_error::request_error_code; +pub use service_error::request_timeout_error; pub use startup_error::is_authentication_required_error; pub use stdio_server_launcher::ExecutorStdioServerLauncher; pub use stdio_server_launcher::LocalStdioServerLauncher; diff --git a/codex-rs/rmcp-client/src/service_error.rs b/codex-rs/rmcp-client/src/service_error.rs index 65da799f14..60dd3d2990 100644 --- a/codex-rs/rmcp-client/src/service_error.rs +++ b/codex-rs/rmcp-client/src/service_error.rs @@ -3,6 +3,7 @@ use anyhow::Error; use rmcp::ErrorData; use rmcp::service::ServiceError; +use std::time::Duration; use crate::rmcp_client::ClientOperationError; @@ -13,3 +14,35 @@ pub fn mcp_error(error: &Error) -> Option<&ErrorData> { }; Some(error) } + +/// Preserves a request deadline as a typed error for caller-side telemetry. +pub fn request_timeout_error(label: &str, duration: Duration) -> Error { + ClientOperationError::Timeout { + label: label.to_string(), + duration, + } + .into() +} + +/// Returns a bounded caller-side failure category without parsing error text. +pub fn request_error_code(error: &Error) -> Option<&'static str> { + let error = error.downcast_ref::()?; + Some(match error { + ClientOperationError::Timeout { .. } => "request_timeout", + ClientOperationError::Service(error) => match error { + ServiceError::Timeout { .. } => "request_timeout", + ServiceError::TransportClosed => "transport_closed", + ServiceError::TransportSend(_) => "transport_error", + ServiceError::McpError(_) => "protocol_error", + ServiceError::UnexpectedResponse => "unexpected_response", + ServiceError::Cancelled { .. } => "cancelled", + ServiceError::SubscriptionLagged { .. } => "subscription_lagged", + ServiceError::InputRequiredRoundsExceeded { .. } => "input_required_rounds_exceeded", + _ => return None, + }, + }) +} + +#[cfg(test)] +#[path = "service_error_tests.rs"] +mod tests; diff --git a/codex-rs/rmcp-client/src/service_error_tests.rs b/codex-rs/rmcp-client/src/service_error_tests.rs new file mode 100644 index 0000000000..692f070da1 --- /dev/null +++ b/codex-rs/rmcp-client/src/service_error_tests.rs @@ -0,0 +1,24 @@ +//! Verify caller error classification preserves typed causes through context. + +use super::*; +use pretty_assertions::assert_eq; + +#[test] +fn request_error_codes_preserve_typed_causes_through_context() { + for (error, expected) in [ + ( + request_timeout_error("tools/call", Duration::from_secs(1)), + Some("request_timeout"), + ), + ( + anyhow::Error::from(ClientOperationError::Service(ServiceError::TransportClosed)), + Some("transport_closed"), + ), + (anyhow::anyhow!("timed out awaiting tools/call"), None), + ] { + assert_eq!( + request_error_code(&error.context("tool call failed")), + expected + ); + } +} From bc13ff239cefb986e74d7b87b038c857c6137964 Mon Sep 17 00:00:00 2001 From: Dmitriy Kovalenko Date: Wed, 14 Oct 2026 20:52:20 +0000 Subject: [PATCH 071/155] Add Bazel targets for on-demand schemas and Python SDK generation (#54096) ## What changed - Add `//bazel/schema:app-server` to generate stable and experimental schemas from Rust sources without depending on committed precomputed bundles. - Add `//sdk/python:generated` to generate Python SDK models, the notification registry, and API methods from the stable schema in scratch space, using dependencies from `uv.lock`. - Add `generate-types --no-format` to skip formatters for build outputs while preserving formatting by default. ## Testing Extend contract generation tests to regenerate in a temporary SDK copy, checking byte equality for formatted output and AST equality for unformatted output. GitOrigin-RevId: 9ca7daa8ac0a33c4106a9e95c2f48bbded07df21 --- MODULE.bazel | 17 +++++ bazel/rules/schema_bundle.bzl | 75 +++++++++++++++++++- bazel/schema/BUILD.bazel | 15 ++++ bazel/schema/tools/BUILD.bazel | 16 +++++ bazel/schema/tools/python_codegen.py | 51 +++++++++++++ codex-rs/app-server-protocol/BUILD.bazel | 47 +++++++++++- sdk/python/BUILD.bazel | 21 ++++++ sdk/python/scripts/update_sdk_artifacts.py | 46 +++++++----- sdk/python/tests/test_contract_generation.py | 37 ++++++++-- 9 files changed, 298 insertions(+), 27 deletions(-) create mode 100644 bazel/schema/tools/BUILD.bazel create mode 100644 bazel/schema/tools/python_codegen.py create mode 100644 sdk/python/BUILD.bazel diff --git a/MODULE.bazel b/MODULE.bazel index ab81530b0b..1906a03473 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -182,6 +182,23 @@ voice_python.defaults(python_version = "3.11") voice_python.toolchain(python_version = "3.12") use_repo(voice_python, "python_3_12") +pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") +pip.parse( + download_only = True, + hub_name = "schema_python", + python_version = "3.12", + target_platforms = [ + "linux_aarch64", + "linux_x86_64", + "osx_aarch64", + "osx_x86_64", + "windows_aarch64", + "windows_x86_64", + ], + uv_lock = "//sdk/python:uv.lock", +) +use_repo(pip, "schema_python") + # Use the existing pinned Make build for foreign_cc consumers, including the # native voice pkg-config bootstrap, instead of a PATH-provided Make. register_toolchains("@rules_foreign_cc//toolchains:built_make_toolchain") diff --git a/bazel/rules/schema_bundle.bzl b/bazel/rules/schema_bundle.bzl index 5f8e2eae01..4a9e559042 100644 --- a/bazel/rules/schema_bundle.bzl +++ b/bazel/rules/schema_bundle.bzl @@ -1,4 +1,4 @@ -"""Cache schema generation from the filtered public Rust test executable.""" +"""Generate API artifacts with the existing Rust and Python exporters.""" def _schema_bundle_impl(ctx): outputs = [] @@ -27,7 +27,10 @@ def _schema_bundle_impl(ctx): # can normalize the JSON without a separate `bazel run` invocation. zstd = ctx.actions.declare_file(ctx.label.name + ".zstd") ctx.actions.symlink(output = zstd, target_file = ctx.executable.zstd, is_executable = True) - return [DefaultInfo(files = depset(outputs + [zstd]))] + return [ + DefaultInfo(files = depset(outputs + [zstd])), + OutputGroupInfo(stable = depset([outputs[0]]), experimental = depset([outputs[1]])), + ] schema_bundle = rule( implementation = _schema_bundle_impl, @@ -37,3 +40,71 @@ schema_bundle = rule( }, doc = "Generates both schema modes as cacheable actions with explicit tool dependencies.", ) + +def _schema_generator_sources_impl(ctx): + sources = [] + crate_root = None + prefix = ctx.label.package + "/" + for source in ctx.files.srcs: + if not source.short_path.startswith(prefix): + fail("Schema generator sources must belong to " + ctx.label.package) + relative = source.short_path[len(prefix):] + output = ctx.actions.declare_file(ctx.label.name + "/" + relative) + ctx.actions.symlink(output = output, target_file = source) + sources.append(output) + if relative == "src/lib.rs": + crate_root = output + if crate_root == None: + fail("Schema generator sources must include src/lib.rs") + + # The ignored generation function derives schemas from Rust. These embedded + # bundles are unused on that path, so do not read the committed artifacts. + precomputed = [ + ctx.actions.declare_file(ctx.label.name + "/schema/precomputed/app-server-exports-" + mode + ".json.zst") + for mode in ["stable", "experimental"] + ] + for output in precomputed: + ctx.actions.write(output, "") + return [ + DefaultInfo(files = depset(sources)), + OutputGroupInfo(crate_root = depset([crate_root]), precomputed = depset(precomputed)), + ] + +schema_generator_sources = rule( + implementation = _schema_generator_sources_impl, + attrs = {"srcs": attr.label_list(allow_files = [".rs"])}, +) + +def _python_sdk_exports_impl(ctx): + output = ctx.actions.declare_directory(ctx.label.name) + manifest = ctx.actions.declare_file(ctx.label.name + ".json") + prefix = ctx.label.package + "/" + files = [] + for source in ctx.files.srcs: + if not source.short_path.startswith(prefix): + fail("Python SDK generator inputs must belong to " + ctx.label.package) + files.append([source.path, source.short_path[len(prefix):]]) + ctx.actions.write(manifest, json.encode(files)) + ctx.actions.run( + executable = ctx.executable._generator, + arguments = [manifest.path, ctx.file.schema.path + "/json", output.path], + inputs = ctx.files.srcs + [ctx.file.schema, manifest], + tools = [ctx.attr._generator[DefaultInfo].files_to_run], + outputs = [output], + env = {"PYTHONDONTWRITEBYTECODE": "1", "PYTHONUTF8": "1"}, + mnemonic = "PythonSdkExports", + ) + return [DefaultInfo(files = depset([output]))] + +python_sdk_exports = rule( + implementation = _python_sdk_exports_impl, + attrs = { + "srcs": attr.label_list(allow_files = True), + "schema": attr.label(mandatory = True, allow_single_file = True), + "_generator": attr.label( + default = "//bazel/schema/tools:python-codegen", + executable = True, + cfg = "exec", + ), + }, +) diff --git a/bazel/schema/BUILD.bazel b/bazel/schema/BUILD.bazel index 401d30b00f..c7dbbc93bf 100644 --- a/bazel/schema/BUILD.bazel +++ b/bazel/schema/BUILD.bazel @@ -6,3 +6,18 @@ schema_bundle( generator = "//codex-rs/app-server-protocol:schema-generator", tags = ["manual"], ) + +schema_bundle( + name = "app-server", + generator = "//codex-rs/app-server-protocol:schema-generator-on-demand", + tags = ["manual"], + visibility = ["//visibility:public"], +) + +filegroup( + name = "stable", + srcs = [":app-server"], + output_group = "stable", + tags = ["manual"], + visibility = ["//visibility:public"], +) diff --git a/bazel/schema/tools/BUILD.bazel b/bazel/schema/tools/BUILD.bazel new file mode 100644 index 0000000000..b2ffe5478d --- /dev/null +++ b/bazel/schema/tools/BUILD.bazel @@ -0,0 +1,16 @@ +load("@rules_python//python:defs.bzl", "py_binary") +load("@schema_python//:requirements.bzl", "requirement") + +package(default_visibility = ["//visibility:public"]) + +py_binary( + name = "python-codegen", + srcs = ["python_codegen.py"], + main = "python_codegen.py", + python_version = "3.12", + tags = ["manual"], + deps = [ + requirement("datamodel-code-generator"), + requirement("packaging"), + ], +) diff --git a/bazel/schema/tools/python_codegen.py b/bazel/schema/tools/python_codegen.py new file mode 100644 index 0000000000..ff3ad00fc3 --- /dev/null +++ b/bazel/schema/tools/python_codegen.py @@ -0,0 +1,51 @@ +"""Generate SDK build outputs in scratch space without formatting.""" + +import json +import os +import shutil +import subprocess +import sys +import tempfile +from pathlib import Path + + +def main() -> None: + files = json.loads(Path(sys.argv[1]).read_text()) + schema = Path(sys.argv[2]).resolve() + output = Path(sys.argv[3]).resolve() + with tempfile.TemporaryDirectory() as temporary: + sdk = Path(temporary) / "sdk/python" + for source, relative in files: + destination = sdk / relative + destination.parent.mkdir(parents=True, exist_ok=True) + shutil.copyfile(source, destination) + + environment = { + **os.environ, + "PYTHONPATH": os.pathsep.join(sys.path), + } + subprocess.run( + [ + sys.executable, + str(sdk / "scripts/update_sdk_artifacts.py"), + "generate-types", + "--no-format", + "--schema-dir", + str(schema), + ], + cwd=sdk, + env=environment, + check=True, + ) + for relative in ( + "src/openai_codex/api.py", + "src/openai_codex/generated/v2_all.py", + "src/openai_codex/generated/notification_registry.py", + ): + destination = output / relative + destination.parent.mkdir(parents=True, exist_ok=True) + shutil.copyfile(sdk / relative, destination) + + +if __name__ == "__main__": + main() diff --git a/codex-rs/app-server-protocol/BUILD.bazel b/codex-rs/app-server-protocol/BUILD.bazel index 4ecf754479..32ae594c77 100644 --- a/codex-rs/app-server-protocol/BUILD.bazel +++ b/codex-rs/app-server-protocol/BUILD.bazel @@ -1,4 +1,7 @@ -load("//:defs.bzl", "codex_rust_crate") +load("@crates//:defs.bzl", "all_crate_deps") +load("@rules_rust//rust:defs.bzl", "rust_binary") +load("//:defs.bzl", "WINDOWS_RUSTC_LINK_FLAGS", "codex_rust_crate") +load("//bazel/rules:schema_bundle.bzl", "schema_generator_sources") codex_rust_crate( name = "app-server-protocol", @@ -17,3 +20,45 @@ alias( tags = ["manual"], visibility = ["//bazel/schema:__pkg__"], ) + +schema_generator_sources( + name = "schema-generator-sources", + srcs = glob(["src/**/*.rs"]), + tags = ["manual"], +) + +filegroup( + name = "schema-generator-root", + srcs = [":schema-generator-sources"], + output_group = "crate_root", + tags = ["manual"], +) + +filegroup( + name = "schema-generator-placeholders", + srcs = [":schema-generator-sources"], + output_group = "precomputed", + tags = ["manual"], +) + +# Compile the crate's test harness, including its unit tests. +# Each schema action runs only write_schema_fixtures_from_env via --exact --ignored. +rust_binary( + name = "schema-generator-on-demand", + srcs = [":schema-generator-sources"], + compile_data = [":schema-generator-placeholders"], + crate_name = "codex_app_server_protocol", + crate_root = ":schema-generator-root", + edition = "2024", + rustc_env = { + "BAZEL_PACKAGE": "codex-rs/app-server-protocol", + "CARGO_PKG_NAME": "codex-app-server-protocol", + }, + rustc_flags = ["--test"] + WINDOWS_RUSTC_LINK_FLAGS, + tags = ["manual"], + visibility = ["//bazel/schema:__pkg__"], + deps = all_crate_deps( + normal = True, + normal_dev = True, + ), +) diff --git a/sdk/python/BUILD.bazel b/sdk/python/BUILD.bazel new file mode 100644 index 0000000000..002e8094db --- /dev/null +++ b/sdk/python/BUILD.bazel @@ -0,0 +1,21 @@ +load("//bazel/rules:schema_bundle.bzl", "python_sdk_exports") + +exports_files(["uv.lock"]) + +python_sdk_exports( + name = "generated", + srcs = [ + "pyproject.toml", + "release_version.py", + "scripts/update_sdk_artifacts.py", + ] + glob( + ["src/**/*.py"], + exclude = [ + "src/openai_codex/generated/notification_registry.py", + "src/openai_codex/generated/v2_all.py", + ], + ), + schema = "//bazel/schema:stable", + tags = ["manual"], + visibility = ["//visibility:public"], +) diff --git a/sdk/python/scripts/update_sdk_artifacts.py b/sdk/python/scripts/update_sdk_artifacts.py index 9451aebc20..d6663c65ab 100755 --- a/sdk/python/scripts/update_sdk_artifacts.py +++ b/sdk/python/scripts/update_sdk_artifacts.py @@ -14,6 +14,7 @@ import tempfile import types import typing from dataclasses import dataclass +from functools import partial from pathlib import Path from typing import Any, Callable, Sequence, get_args, get_origin @@ -545,7 +546,7 @@ def _normalized_schema_bundle_text(schema_dir: Path) -> str: return json.dumps(schema, indent=2, sort_keys=True) + "\n" -def generate_v2_all(schema_dir: Path) -> None: +def generate_v2_all(schema_dir: Path, *, format_output: bool = True) -> None: """Regenerate the Pydantic v2 protocol model module from app-server schemas.""" out_path = sdk_root() / "src" / "openai_codex" / "generated" / "v2_all.py" out_dir = out_path.parent @@ -556,6 +557,9 @@ def generate_v2_all(schema_dir: Path) -> None: with tempfile.TemporaryDirectory() as td: normalized_bundle = Path(td) / schema_bundle_path(schema_dir).name normalized_bundle.write_text(_normalized_schema_bundle_text(schema_dir)) + if not format_output: + # The pinned generator accepts an empty formatter list through TOML. + (Path(td) / "pyproject.toml").write_text("[tool.datamodel-codegen]\nformatters = []\n") run_python_module( "datamodel_code_generator", [ @@ -582,18 +586,13 @@ def generate_v2_all(schema_dir: Path) -> None: "--use-annotated", "--use-union-operator", "--disable-timestamp", - # Keep the generated file formatted deterministically so the - # checked-in artifact only changes when the schema does. - "--formatters", - "ruff-format", - ], - cwd=sdk_root(), + ] + + (["--formatters", "ruff-format"] if format_output else []), + cwd=sdk_root() if format_output else Path(td), ) _preserve_inline_image_class_names(out_path) _require_nullable_field(out_path, "ChatgptAccount", r"email: str \| None") - _require_nullable_field( - out_path, "McpResourceReadTarget", r"link_id: Annotated\[\n(?: .*\n)+ \]" - ) + _require_nullable_field(out_path, "McpResourceReadTarget", r"link_id: Annotated\[[\s\S]*?\]") _preserve_open_enum(out_path, "CodexErrorInfoValue", allow_empty=True) _preserve_reasoning_effort_enum(out_path) _preserve_thread_source_enum(out_path) @@ -1351,7 +1350,7 @@ def _render_thread_block(turn_fields: list[PublicFieldSpec], *, is_async: bool = return "\n".join(lines) -def generate_public_api_flat_methods() -> None: +def generate_public_api_flat_methods(*, format_output: bool = True) -> None: """Regenerate the public convenience methods from generated protocol models.""" src_dir = sdk_root() / "src" public_api_path = src_dir / "openai_codex" / "api.py" @@ -1400,15 +1399,16 @@ def generate_public_api_flat_methods() -> None: _render_thread_block(turn_start_fields, is_async=True), ) public_api_path.write_text(source) - run_python_module("ruff", ["format", str(public_api_path)], cwd=sdk_root()) + if format_output: + run_python_module("ruff", ["format", str(public_api_path)], cwd=sdk_root()) -def generate_types_from_schema_dir(schema_dir: Path) -> None: +def generate_types_from_schema_dir(schema_dir: Path, *, format_output: bool = True) -> None: """Regenerate every SDK artifact derived from an existing schema directory.""" # v2_all is the authoritative generated surface. - generate_v2_all(schema_dir) + generate_v2_all(schema_dir, format_output=format_output) generate_notification_registry(schema_dir) - generate_public_api_flat_methods() + generate_public_api_flat_methods(format_output=format_output) def build_parser() -> argparse.ArgumentParser: @@ -1423,6 +1423,12 @@ def build_parser() -> argparse.ArgumentParser: type=Path, help="App-server JSON schema directory (defaults to tool.codex.codegen.schema-dir)", ) + generate_types_parser.add_argument( + "--no-format", + dest="format_output", + action="store_false", + help="Generate build outputs without running formatters", + ) stage_sdk_parser = subparsers.add_parser( "stage-sdk", @@ -1483,9 +1489,13 @@ def parse_args(argv: Sequence[str] | None = None) -> argparse.Namespace: return build_parser().parse_args(list(argv) if argv is not None else None) -def default_cli_ops() -> CliOps: +def default_cli_ops(*, format_output: bool = True) -> CliOps: return CliOps( - generate_types=generate_types_from_schema_dir, + generate_types=( + generate_types_from_schema_dir + if format_output + else partial(generate_types_from_schema_dir, format_output=False) + ), stage_python_sdk_package=stage_python_sdk_package, stage_python_runtime_package=stage_python_runtime_package, ) @@ -1520,7 +1530,7 @@ def run_command(args: argparse.Namespace, ops: CliOps) -> None: def main(argv: Sequence[str] | None = None, ops: CliOps | None = None) -> None: args = parse_args(argv) - run_command(args, ops or default_cli_ops()) + run_command(args, ops or default_cli_ops(format_output=getattr(args, "format_output", True))) print("Done.") diff --git a/sdk/python/tests/test_contract_generation.py b/sdk/python/tests/test_contract_generation.py index 2b610c46bd..11acc14205 100644 --- a/sdk/python/tests/test_contract_generation.py +++ b/sdk/python/tests/test_contract_generation.py @@ -1,7 +1,9 @@ from __future__ import annotations +import ast import os import runpy +import shutil import subprocess import sys from pathlib import Path @@ -36,23 +38,46 @@ def _snapshot_targets(root: Path) -> dict[str, dict[str, bytes] | bytes | None]: return {str(rel_path): _snapshot_target(root, rel_path) for rel_path in GENERATED_TARGETS} -def test_generated_files_are_up_to_date(): - """Regenerating from repository schemas should leave reviewed artifacts unchanged.""" +@pytest.mark.parametrize("format_output", [True, False]) +def test_generated_files_are_up_to_date(tmp_path, format_output): + """Both generation modes preserve the reviewed API, with optional formatting.""" before = _snapshot_targets(ROOT) + sdk = tmp_path / "sdk" / "python" + sdk.mkdir(parents=True) + for directory in ("src", "scripts"): + shutil.copytree( + ROOT / directory, sdk / directory, ignore=shutil.ignore_patterns("__pycache__") + ) + for name in ("pyproject.toml", "release_version.py"): + shutil.copyfile(ROOT / name, sdk / name) env = os.environ.copy() python_bin = str(Path(sys.executable).parent) env["PATH"] = f"{python_bin}{os.pathsep}{env.get('PATH', '')}" + command = [ + sys.executable, + "scripts/update_sdk_artifacts.py", + "generate-types", + "--schema-dir", + str(ROOT.parents[1] / "codex-rs/app-server-protocol/schema/json"), + ] + if not format_output: + command.append("--no-format") subprocess.run( - [sys.executable, "scripts/update_sdk_artifacts.py", "generate-types"], - cwd=ROOT, + command, + cwd=sdk, check=True, env=env, ) - after = _snapshot_targets(ROOT) - assert before == after, "Generated files drifted after regeneration" + after = _snapshot_targets(sdk) + if format_output: + assert before == after, "Generated files drifted after regeneration" + else: + assert [ast.dump(ast.parse((ROOT / path).read_bytes())) for path in GENERATED_TARGETS] == [ + ast.dump(ast.parse((sdk / path).read_bytes())) for path in GENERATED_TARGETS + ] @pytest.mark.parametrize("mode", ["repository", "scratch", "experimental"]) From f10ec115b73ef7d153deb986b347f6ab4a170241 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Wed, 14 Oct 2026 20:55:24 +0000 Subject: [PATCH 072/155] Show Daybreak notices after the session header (#54097) ## What changed Emit the Daybreak notice after replacing or removing the placeholder session header so the notice follows the configured header. ## Testing Extend the resumed-history snapshot test to start with a placeholder header and verify the full transcript order: session header, Daybreak notice, and replayed user and assistant messages. GitOrigin-RevId: 536f717b2859d2fe319756f52123b4cd0407cb66 --- codex-rs/tui/src/chatwidget/session_flow.rs | 7 ++-- .../src/chatwidget/tests/history_replay.rs | 40 +++++++++---------- ...story_replay__resumed_daybreak_banner.snap | 13 +++++- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/codex-rs/tui/src/chatwidget/session_flow.rs b/codex-rs/tui/src/chatwidget/session_flow.rs index 2d39a08d0c..3c83e2b951 100644 --- a/codex-rs/tui/src/chatwidget/session_flow.rs +++ b/codex-rs/tui/src/chatwidget/session_flow.rs @@ -118,9 +118,6 @@ impl ChatWidget { self.config.cwd = session.cwd.clone(); self.config.model_provider_id = session.model_provider_id.clone(); self.set_daybreak_enabled(self.daybreak_enabled); - if self.daybreak_enabled && previous_thread_id != self.thread_id { - self.add_info_message("Daybreak is on for new turns.".into(), /*hint*/ None); - } if connector_scope_changed { self.invalidate_connector_scope(); } @@ -235,6 +232,10 @@ impl ChatWidget { self.transcript.active_cell = None; self.bump_active_cell_revision(); } + // Emit notices after replacing or removing the placeholder header. + if self.daybreak_enabled && previous_thread_id != self.thread_id { + self.add_info_message("Daybreak is on for new turns.".into(), /*hint*/ None); + } self.transcript.saw_copy_source_this_turn = false; self.refresh_skills_for_current_cwd(/*force_reload*/ true); self.refresh_connector_mentions(/*force_refresh*/ false); diff --git a/codex-rs/tui/src/chatwidget/tests/history_replay.rs b/codex-rs/tui/src/chatwidget/tests/history_replay.rs index 9655f96ff6..e1b6cc0f22 100644 --- a/codex-rs/tui/src/chatwidget/tests/history_replay.rs +++ b/codex-rs/tui/src/chatwidget/tests/history_replay.rs @@ -70,7 +70,12 @@ async fn resumed_initial_messages_render_history() { ); // Session hydration can precede the account update on ChatGPT sign-in. - chat.status_account_display = None; + let (mut chat, mut rx, _ops) = make_chatwidget_manual(/*model_override*/ None).await; + chat.set_feature_enabled(Feature::CliDaybreak, /*enabled*/ true); + chat.show_welcome_banner = false; + chat.local_settings.tui.show_tooltips = false; + chat.config.cwd = configured.cwd.clone(); + chat.transcript.active_cell = Some(ChatWidget::placeholder_session_header_cell(&chat.config)); configured.thread_id = ThreadId::new(); chat.handle_thread_session(configured); assert!(chat.daybreak_enabled); @@ -92,27 +97,18 @@ async fn resumed_initial_messages_render_history() { ReplayKind::ResumeInitialMessages, ); - let cells = drain_insert_history(&mut rx); - let mut merged_lines = Vec::new(); - for lines in cells { - let text = lines - .iter() - .flat_map(|line| line.spans.iter()) - .map(|span| span.content.clone()) - .collect::(); - merged_lines.push(text); - } - - let text_blob = merged_lines.join("\n"); - assert!( - text_blob.contains("hello from user"), - "expected replayed user message", - ); - assert!( - text_blob.contains("assistant reply"), - "expected replayed agent message", - ); - insta::assert_snapshot!("resumed_daybreak_banner", merged_lines[0]); + let history = drain_insert_history(&mut rx) + .iter() + .flatten() + .map(ToString::to_string) + .collect::>() + .join("\n") + .replace(CODEX_CLI_VERSION, "") + .replace( + &test_path_display("/home/user/project"), + "/home/user/project", + ); + insta::assert_snapshot!("resumed_daybreak_banner", history); } #[tokio::test] diff --git a/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__history_replay__resumed_daybreak_banner.snap b/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__history_replay__resumed_daybreak_banner.snap index c20749ddd6..5e78664e4a 100644 --- a/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__history_replay__resumed_daybreak_banner.snap +++ b/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__history_replay__resumed_daybreak_banner.snap @@ -1,5 +1,16 @@ --- source: tui/src/chatwidget/tests/history_replay.rs -expression: "merged_lines[0]" +assertion_line: 111 +expression: history --- + + >_ OpenAI Codex (v) + /home/user/project + • Daybreak is on for new turns. + + +› hello from user + + +• assistant reply From 0c5720ea0fd2af84d7b6743a6686750fb8570ab7 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim Date: Wed, 14 Oct 2026 20:59:36 +0000 Subject: [PATCH 073/155] Keep environment tools stable across readiness changes (#54098) ## Why Environment tool availability and selectors should remain stable as selected environments become ready. ## What changed - Keep configured environment tools advertised even when no execution environment is ready, and derive `environment_id` selectors from all selected environments. - Return guidance to wait when an environment is unavailable, while preserving errors for unknown environment IDs. Require a usable primary environment for `write_stdin`. - Always include `shell` and `login` in the `exec_command` schema and mark `stable_environment_tools` as removed. ## Testing Update integration tests to expect environment tools with empty or starting environments, and remove explicit feature opt-ins from affected scenarios. GitOrigin-RevId: 1590c1b5be16a39e4a370663c552b881602545b5 --- .../core/src/tools/handlers/apply_patch.rs | 3 +- codex-rs/core/src/tools/handlers/mod.rs | 30 +++++-------- .../src/tools/handlers/request_permissions.rs | 3 +- .../core/src/tools/handlers/shell_spec.rs | 33 ++++++--------- .../src/tools/handlers/shell_spec_tests.rs | 1 - .../handlers/unified_exec/exec_command.rs | 9 +--- .../handlers/unified_exec/write_stdin.rs | 15 +------ .../core/src/tools/handlers/view_image.rs | 7 +--- codex-rs/core/src/tools/spec_plan.rs | 42 ++++--------------- codex-rs/core/tests/suite/remote_env.rs | 14 ++----- codex-rs/core/tests/suite/scenarios.rs | 11 ++--- codex-rs/core/tests/suite/skills_extension.rs | 4 -- ...catalog_dedup__dedup_before_budgeting.snap | 4 +- codex-rs/core/tests/suite/tools.rs | 31 +++----------- codex-rs/features/src/lib.rs | 2 +- 15 files changed, 52 insertions(+), 157 deletions(-) diff --git a/codex-rs/core/src/tools/handlers/apply_patch.rs b/codex-rs/core/src/tools/handlers/apply_patch.rs index dbc0fa0d31..41db894b59 100644 --- a/codex-rs/core/src/tools/handlers/apply_patch.rs +++ b/codex-rs/core/src/tools/handlers/apply_patch.rs @@ -332,9 +332,8 @@ impl ApplyPatchHandler { // Verify the parsed patch against the selected environment filesystem. let turn_environment = resolve_tool_environment( - &step_context, + &step_context.environments, selected_environment_id.as_deref(), - "apply_patch is unavailable in this session", )?; let fs = turn_environment.environment.get_filesystem(); let sandbox = turn_environment.sandbox_context(/*additional_permissions*/ None); diff --git a/codex-rs/core/src/tools/handlers/mod.rs b/codex-rs/core/src/tools/handlers/mod.rs index 710c089b8a..a4d92223c3 100644 --- a/codex-rs/core/src/tools/handlers/mod.rs +++ b/codex-rs/core/src/tools/handlers/mod.rs @@ -36,7 +36,6 @@ mod view_image; pub(crate) mod view_image_spec; mod wait_for_environment; -use codex_features::Feature; use codex_file_system::FileSystemSandboxContext; use codex_sandboxing::policy_transforms::materialize_additional_permissions_with_context; use codex_sandboxing::policy_transforms::merge_permission_profiles; @@ -48,6 +47,7 @@ use serde::Deserialize; use serde_json::Map; use serde_json::Value; +use crate::environment_selection::TurnEnvironmentSnapshot; use crate::function_tool::FunctionCallError; use crate::sandboxing::SandboxPermissions; use crate::session::step_context::StepContext; @@ -158,17 +158,9 @@ where } fn resolve_tool_environment<'a>( - step_context: &'a StepContext, + environments: &'a TurnEnvironmentSnapshot, environment_id: Option<&str>, - legacy_unavailable_message: &'static str, ) -> Result<&'a TurnEnvironment, FunctionCallError> { - let environments = &step_context.environments; - let stable_environment_tools = step_context - .turn - .config - .features - .get() - .enabled(Feature::StableEnvironmentTools); environment_id.map_or_else( || environments.primary(), |environment_id| { @@ -178,21 +170,19 @@ fn resolve_tool_environment<'a>( }, ).ok_or_else(|| { if let Some(environment_id) = environment_id - && (!stable_environment_tools - || !environments - .all_selections() - .iter() - .any(|selection| selection.environment_id == environment_id)) + && !environments + .all_selections() + .iter() + .any(|selection| selection.environment_id == environment_id) { return FunctionCallError::RespondToModel(format!( "unknown turn environment id `{environment_id}`" )); } - FunctionCallError::RespondToModel(if stable_environment_tools { - "No usable execution environment is available. Wait for an environment to become available before using this tool.".to_string() - } else { - legacy_unavailable_message.to_string() - }) + FunctionCallError::RespondToModel( + "No usable execution environment is available. Wait for an environment to become available before using this tool." + .to_string(), + ) }) } diff --git a/codex-rs/core/src/tools/handlers/request_permissions.rs b/codex-rs/core/src/tools/handlers/request_permissions.rs index 1c776a2546..b393766fb1 100644 --- a/codex-rs/core/src/tools/handlers/request_permissions.rs +++ b/codex-rs/core/src/tools/handlers/request_permissions.rs @@ -69,9 +69,8 @@ impl RequestPermissionsHandler { let environment_args: RequestPermissionsEnvironmentArgs = parse_arguments(&arguments)?; let turn_environment = resolve_tool_environment( - &step_context, + &step_context.environments, environment_args.environment_id.as_deref(), - "request_permissions requires a primary environment", )?; let sandbox_context = turn_environment.sandbox_context(/*additional_permissions*/ None); diff --git a/codex-rs/core/src/tools/handlers/shell_spec.rs b/codex-rs/core/src/tools/handlers/shell_spec.rs index ac3dcf9926..ca48b21220 100644 --- a/codex-rs/core/src/tools/handlers/shell_spec.rs +++ b/codex-rs/core/src/tools/handlers/shell_spec.rs @@ -7,7 +7,6 @@ use std::collections::BTreeMap; #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct CommandToolOptions { - pub include_login_parameter: bool, pub exec_permission_approvals_enabled: bool, } @@ -16,7 +15,6 @@ pub fn create_exec_command_tool(options: CommandToolOptions) -> ToolSpec { create_exec_command_tool_with_environment_id( options, /*include_environment_id*/ false, - /*include_shell_parameter*/ true, /*include_windows_shell_guidance*/ cfg!(windows), ) } @@ -24,7 +22,6 @@ pub fn create_exec_command_tool(options: CommandToolOptions) -> ToolSpec { pub(crate) fn create_exec_command_tool_with_environment_id( options: CommandToolOptions, include_environment_id: bool, - include_shell_parameter: bool, include_windows_shell_guidance: bool, ) -> ToolSpec { let yield_time_ms_description = if cfg!(windows) { @@ -62,23 +59,19 @@ pub(crate) fn create_exec_command_tool_with_environment_id( )), ), ]); - if include_shell_parameter { - properties.insert( - "shell".to_string(), - JsonSchema::string(Some( - "Shell binary to launch. Defaults to the user's default shell.".to_string(), - )), - ); - } - if options.include_login_parameter { - properties.insert( - "login".to_string(), - JsonSchema::boolean(Some( - "True runs the shell with -l/-i semantics; false disables them. Defaults to true." - .to_string(), - )), - ); - } + properties.insert( + "shell".to_string(), + JsonSchema::string(Some( + "Shell binary to launch. Defaults to the user's default shell.".to_string(), + )), + ); + properties.insert( + "login".to_string(), + JsonSchema::boolean(Some( + "True runs the shell with -l/-i semantics; false disables them. Defaults to true." + .to_string(), + )), + ); if include_environment_id { properties.insert( "environment_id".to_string(), diff --git a/codex-rs/core/src/tools/handlers/shell_spec_tests.rs b/codex-rs/core/src/tools/handlers/shell_spec_tests.rs index c3d1afffff..7f8007b17f 100644 --- a/codex-rs/core/src/tools/handlers/shell_spec_tests.rs +++ b/codex-rs/core/src/tools/handlers/shell_spec_tests.rs @@ -9,7 +9,6 @@ fn windows_shell_guidance_description() -> String { #[test] fn exec_command_tool_matches_expected_spec() { let tool = create_exec_command_tool(CommandToolOptions { - include_login_parameter: true, exec_permission_approvals_enabled: false, }); diff --git a/codex-rs/core/src/tools/handlers/unified_exec/exec_command.rs b/codex-rs/core/src/tools/handlers/unified_exec/exec_command.rs index 502848230d..ba75b1ed98 100644 --- a/codex-rs/core/src/tools/handlers/unified_exec/exec_command.rs +++ b/codex-rs/core/src/tools/handlers/unified_exec/exec_command.rs @@ -57,8 +57,6 @@ const EXEC_COMMAND_REJECTION_MAX_BYTES: usize = 900; #[derive(Clone, Copy)] pub(crate) struct ExecCommandHandlerOptions { - pub(crate) include_login_parameter: bool, - pub(crate) include_shell_parameter: bool, pub(crate) allow_tty: bool, pub(crate) exec_permission_approvals_enabled: bool, pub(crate) include_environment_id: bool, @@ -81,8 +79,6 @@ impl Default for ExecCommandHandler { Self { lifetime: ExecCommandLifetime::Interactive, options: ExecCommandHandlerOptions { - include_login_parameter: false, - include_shell_parameter: true, allow_tty: true, exec_permission_approvals_enabled: false, include_environment_id: false, @@ -116,11 +112,9 @@ impl ToolExecutor for ExecCommandHandler { fn spec(&self) -> ToolSpec { let spec = create_exec_command_tool_with_environment_id( CommandToolOptions { - include_login_parameter: self.options.include_login_parameter, exec_permission_approvals_enabled: self.options.exec_permission_approvals_enabled, }, self.options.include_environment_id, - self.options.include_shell_parameter, self.options.include_windows_shell_guidance, ); let mut spec = match self.lifetime { @@ -184,9 +178,8 @@ impl ExecCommandHandler { ); let environment_args: ExecCommandEnvironmentArgs = parse_arguments(&arguments)?; let turn_environment = resolve_tool_environment( - &step_context, + &step_context.environments, environment_args.environment_id.as_deref(), - "unified exec is unavailable in this session", )?; let native_environment_cwd = turn_environment.cwd().clone(); let cwd = environment_args diff --git a/codex-rs/core/src/tools/handlers/unified_exec/write_stdin.rs b/codex-rs/core/src/tools/handlers/unified_exec/write_stdin.rs index 3a6aa8d96f..1fecb98b04 100644 --- a/codex-rs/core/src/tools/handlers/unified_exec/write_stdin.rs +++ b/codex-rs/core/src/tools/handlers/unified_exec/write_stdin.rs @@ -1,6 +1,4 @@ use crate::function_tool::FunctionCallError; -use codex_features::Feature; - use crate::tools::context::ToolInvocation; use crate::tools::context::ToolPayload; use crate::tools::context::boxed_tool_output; @@ -82,18 +80,7 @@ impl WriteStdinHandler { }; let args: WriteStdinArgs = parse_arguments(&arguments)?; - if turn - .config - .features - .get() - .enabled(Feature::StableEnvironmentTools) - { - resolve_tool_environment( - &step_context, - /*environment_id*/ None, - "unified exec is unavailable in this session", - )?; - } + resolve_tool_environment(&step_context.environments, /*environment_id*/ None)?; let context = UnifiedExecContext::new(session.clone(), step_context, cancellation_token, call_id); let response = session diff --git a/codex-rs/core/src/tools/handlers/view_image.rs b/codex-rs/core/src/tools/handlers/view_image.rs index 25468f3749..903df019f9 100644 --- a/codex-rs/core/src/tools/handlers/view_image.rs +++ b/codex-rs/core/src/tools/handlers/view_image.rs @@ -142,11 +142,8 @@ impl ViewImageHandler { } }; - let turn_environment = resolve_tool_environment( - &step_context, - environment_id.as_deref(), - "view_image is unavailable in this session", - )?; + let turn_environment = + resolve_tool_environment(&step_context.environments, environment_id.as_deref())?; let path_uri = turn_environment.cwd().join(&path).map_err(|err| { FunctionCallError::RespondToModel(format!( "unable to resolve image path `{path}` against environment cwd `{}`: {err}", diff --git a/codex-rs/core/src/tools/spec_plan.rs b/codex-rs/core/src/tools/spec_plan.rs index fd5b5e14ee..1b86b579e3 100644 --- a/codex-rs/core/src/tools/spec_plan.rs +++ b/codex-rs/core/src/tools/spec_plan.rs @@ -1206,20 +1206,9 @@ fn standalone_web_search_enabled(turn_context: &TurnContext, model_info: &ModelI .enabled(Feature::StandaloneWebSearch)) } -fn tool_environment_mode(context: &CoreToolPlanContext<'_>) -> ToolEnvironmentMode { - let count = if context - .turn_context - .config - .features - .get() - .enabled(Feature::StableEnvironmentTools) - { - // Keep selectors stable as selected attachments change readiness. - context.environments.environments.len() - } else { - context.environments.turn_environments().count() - }; - ToolEnvironmentMode::from_count(count) +fn tool_environment_mode(environments: &TurnEnvironmentSnapshot) -> ToolEnvironmentMode { + // Keep environment selectors stable as selected attachments change readiness. + ToolEnvironmentMode::from_count(environments.environments.len()) } fn should_include_windows_shell_guidance(environments: &TurnEnvironmentSnapshot) -> bool { @@ -1245,12 +1234,8 @@ fn should_include_windows_shell_guidance(environments: &TurnEnvironmentSnapshot) fn add_shell_tools(context: &CoreToolPlanContext<'_>, registry: &mut ToolRegistry) { let turn_context = context.turn_context; let features = turn_context.config.features.get(); - let environment_mode = tool_environment_mode(context); - let stable_environment_tools = features.enabled(Feature::StableEnvironmentTools); - let advertise_environment_tools = - stable_environment_tools || environment_mode.has_environment(); - if !advertise_environment_tools - || !features.enabled(Feature::ShellTool) + let environment_mode = tool_environment_mode(context.environments); + if !features.enabled(Feature::ShellTool) || matches!(context.model_info.shell_type, ConfigShellToolType::Disabled) { return; @@ -1263,12 +1248,6 @@ fn add_shell_tools(context: &CoreToolPlanContext<'_>, registry: &mut ToolRegistr && context.tool_policy.expose_additional_permissions; let include_environment_id = matches!(environment_mode, ToolEnvironmentMode::Multiple); let options = ExecCommandHandlerOptions { - include_login_parameter: stable_environment_tools - || context - .environments - .turn_environments() - .any(|environment| environment.config().allow_login_shell), - include_shell_parameter: true, allow_tty: features.enabled(Feature::UnifiedExecTty), exec_permission_approvals_enabled, include_environment_id, @@ -1307,10 +1286,7 @@ fn add_mcp_resource_tools(context: &CoreToolPlanContext<'_>, registry: &mut Tool fn add_core_utility_tools(context: &CoreToolPlanContext<'_>, registry: &mut ToolRegistry) { let turn_context = context.turn_context; let features = turn_context.config.features.get(); - let environment_mode = tool_environment_mode(context); - let stable_environment_tools = features.enabled(Feature::StableEnvironmentTools); - let advertise_environment_tools = - stable_environment_tools || environment_mode.has_environment(); + let environment_mode = tool_environment_mode(context.environments); if turn_context.config.update_plan_enabled { registry.add(PlanHandler); @@ -1376,7 +1352,7 @@ fn add_core_utility_tools(context: &CoreToolPlanContext<'_>, registry: &mut Tool registry.add_with_exposure(SendMessageToUserAsyncHandler, ToolExposure::DirectModelOnly); } - if advertise_environment_tools && features.enabled(Feature::RequestPermissionsTool) { + if features.enabled(Feature::RequestPermissionsTool) { registry.add(RequestPermissionsHandler); } @@ -1429,7 +1405,7 @@ fn add_core_utility_tools(context: &CoreToolPlanContext<'_>, registry: &mut Tool )); } - if advertise_environment_tools && context.model_info.apply_patch_tool_type.is_some() { + if context.model_info.apply_patch_tool_type.is_some() { let include_environment_id = matches!(environment_mode, ToolEnvironmentMode::Multiple); registry.add(ApplyPatchHandler::new(include_environment_id)); } @@ -1443,7 +1419,7 @@ fn add_core_utility_tools(context: &CoreToolPlanContext<'_>, registry: &mut Tool registry.add(TestSyncHandler); } - if advertise_environment_tools && features.enabled(Feature::ViewImage) { + if features.enabled(Feature::ViewImage) { let include_environment_id = matches!(environment_mode, ToolEnvironmentMode::Multiple); registry.add(ViewImageHandler::new(ViewImageToolOptions { can_request_original_image_detail: can_request_original_image_detail( diff --git a/codex-rs/core/tests/suite/remote_env.rs b/codex-rs/core/tests/suite/remote_env.rs index 23acf8c18d..a8d7d8efa7 100644 --- a/codex-rs/core/tests/suite/remote_env.rs +++ b/codex-rs/core/tests/suite/remote_env.rs @@ -1911,10 +1911,6 @@ async fn pending_attachment_installs_configuration_before_waiting_turn_resumes() let mut builder = test_codex() .with_extensions(Arc::new(extensions.build())) .with_config(|config| { - config - .features - .enable(Feature::StableEnvironmentTools) - .expect("enable stable environment tools"); assert!(config.features.enable(Feature::DeferredExecutor).is_ok()); assert!( config @@ -2860,6 +2856,7 @@ async fn ready_before_selection_resolves_resumed_thread_capability_root_after_wa // The first request may legally see either Starting or Ready; the wait makes step two ready. let first_tools = tool_names(&requests[0].body_json()); assert!(first_tools.contains(&"wait_for_environment".to_string())); + assert!(first_tools.contains(&"exec_command".to_string())); let first_user_context = requests[0].message_input_texts("user"); let first_environment_context = first_user_context .iter() @@ -2868,13 +2865,8 @@ async fn ready_before_selection_resolves_resumed_thread_capability_root_after_wa let first_has_ready_root = first_user_context .iter() .any(|text| text.contains("ready-first-root")); - let first_is_starting = first_environment_context.contains("starting"); - assert_eq!( - first_tools.contains(&"exec_command".to_string()), - !first_is_starting, - "without stable_environment_tools, commands require a ready transport" - ); - if first_is_starting { + // Tool availability no longer distinguishes Starting from Ready. + if first_environment_context.contains("starting") { assert!(!first_has_ready_root); } else { assert!(first_environment_context.contains("")); diff --git a/codex-rs/core/tests/suite/scenarios.rs b/codex-rs/core/tests/suite/scenarios.rs index 2f55a0c935..6211559f76 100644 --- a/codex-rs/core/tests/suite/scenarios.rs +++ b/codex-rs/core/tests/suite/scenarios.rs @@ -1959,14 +1959,9 @@ async fn subagent_waits_for_its_inherited_environment_configuration() -> Result< use super::remote_env::spawn_tests::PendingSpawnCase; use super::remote_env::spawn_tests::pending_subagent_scenario; - let requests = pending_subagent_scenario(PendingSpawnCase::TurnSettings, |config| { - configure_scenario_catalog(config); - config - .features - .enable(Feature::StableEnvironmentTools) - .expect("enable stable environment tools"); - }) - .await?; + let requests = + pending_subagent_scenario(PendingSpawnCase::TurnSettings, configure_scenario_catalog) + .await?; let labels = [ "parent delegates while the environment is starting", "parent waits for the worker", diff --git a/codex-rs/core/tests/suite/skills_extension.rs b/codex-rs/core/tests/suite/skills_extension.rs index d3ca22f43a..be8d77f167 100644 --- a/codex-rs/core/tests/suite/skills_extension.rs +++ b/codex-rs/core/tests/suite/skills_extension.rs @@ -3062,10 +3062,6 @@ async fn production_turn_keeps_rebalanced_catalogs_stable_after_compaction_and_r model_info.max_context_window = None; }) .with_config(|config| { - config - .features - .enable(Feature::StableEnvironmentTools) - .expect("enable stable environment tools"); configure_catalog_test(config); config.cloud_skill_enabled = true; config.model_provider.name = "Skills compaction test".to_string(); diff --git a/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__skill_catalog_dedup__dedup_before_budgeting.snap b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__skill_catalog_dedup__dedup_before_budgeting.snap index 3dcc2d2c8a..b5ec344fc9 100644 --- a/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__skill_catalog_dedup__dedup_before_budgeting.snap +++ b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__skill_catalog_dedup__dedup_before_budgeting.snap @@ -16,8 +16,8 @@ Settings: text: {"verbosity":"low"} tool_choice: "auto" -- request 1 (turn) -- -00:additional_tools/developer (3; hash=e80da11342c6e6dd): - - namespace/functions; hash=bd9e182b4235cdc1 +00:additional_tools/developer (3; hash=5e8370540461db70): + - namespace/functions; hash=7d26e086c1dbba28 - custom/exec - function/wait - function/request_user_input diff --git a/codex-rs/core/tests/suite/tools.rs b/codex-rs/core/tests/suite/tools.rs index e371db1e3f..b183492c15 100644 --- a/codex-rs/core/tests/suite/tools.rs +++ b/codex-rs/core/tests/suite/tools.rs @@ -244,12 +244,8 @@ async fn strict_tool_collisions_do_not_duplicate_unrelated_compaction_errors() - Ok(()) } -#[test_case::test_case(false; "default_off")] -#[test_case::test_case(true; "opted_in")] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn empty_turn_environments_gate_environment_backed_tools( - stable_environment_tools: bool, -) -> Result<()> { +async fn empty_turn_environments_keeps_environment_backed_tools() -> Result<()> { skip_if_no_network!(Ok(())); let server = start_mock_server().await; @@ -263,17 +259,7 @@ async fn empty_turn_environments_gate_environment_backed_tools( ) .await; - let mut builder = test_codex().with_config(move |config| { - if stable_environment_tools { - config - .features - .enable(Feature::StableEnvironmentTools) - .expect("enable stable environment tools"); - } - config - .features - .enable(Feature::RequestPermissionsTool) - .expect("enable permissions tool"); + let mut builder = test_codex().with_config(|config| { config.update_plan_enabled = true; config .features @@ -290,17 +276,10 @@ async fn empty_turn_environments_gate_environment_backed_tools( tools.contains(&"update_plan".to_string()), "non-environment tool should remain available; got {tools:?}" ); - for environment_tool in [ - "exec_command", - "write_stdin", - "apply_patch", - "view_image", - "request_permissions", - ] { - assert_eq!( + for environment_tool in ["exec_command", "write_stdin", "apply_patch", "view_image"] { + assert!( tools.contains(&environment_tool.to_string()), - stable_environment_tools, - "unexpected {environment_tool} availability for empty environments; got {tools:?}" + "{environment_tool} should remain available for explicit empty turn environments; got {tools:?}" ); } diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs index 0928655c33..5a3cc5f627 100644 --- a/codex-rs/features/src/lib.rs +++ b/codex-rs/features/src/lib.rs @@ -1155,7 +1155,7 @@ pub const FEATURES: &[FeatureSpec] = &[ FeatureSpec { id: Feature::StableEnvironmentTools, key: "stable_environment_tools", - stage: Stage::UnderDevelopment, + stage: Stage::Removed, default_enabled: false, }, FeatureSpec { From 1ffa95ee8a02ec68f6ccd758998bcb7d4b32bcdb Mon Sep 17 00:00:00 2001 From: felixxia-oai Date: Wed, 14 Oct 2026 21:00:03 +0000 Subject: [PATCH 074/155] Wait for readiness in the SIGTERM cancellation test (#54099) ## What changed Wait for the subprocess readiness marker before cancelling in `process_exec_tool_call_cancellation_allows_sigterm_cleanup`, removing the one-second polling cutoff. Poll readiness alongside execution under the existing five-second timeout, then cancel and await execution if that timeout expires so cleanup completes before the test fails. GitOrigin-RevId: ba47dad9ba87fb5dc3bd087380811655387f825a --- codex-rs/core/src/exec_tests.rs | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/codex-rs/core/src/exec_tests.rs b/codex-rs/core/src/exec_tests.rs index f86df094b8..87d730a56a 100644 --- a/codex-rs/core/src/exec_tests.rs +++ b/codex-rs/core/src/exec_tests.rs @@ -1526,16 +1526,12 @@ while :; do sleep 1; done"# ); let cancel_token = CancellationToken::new(); let cancel_tx = cancel_token.clone(); - tokio::spawn(async move { - for _ in 0..50 { - if ready_marker.exists() { - cancel_tx.cancel(); - return; - } + let cancel_when_ready = async { + while !ready_marker.exists() { tokio::time::sleep(Duration::from_millis(20)).await; } cancel_tx.cancel(); - }); + }; let params = ExecParams { command, cwd: cwd.clone(), @@ -1550,8 +1546,7 @@ while :; do sleep 1; done"# arg0: None, }; - let result = timeout( - Duration::from_secs(5), + let execution = async { process_exec_tool_call( params, &PermissionProfile::Disabled, @@ -1561,10 +1556,22 @@ while :; do sleep 1; done"# /*codex_self_exe*/ &None, /*use_legacy_landlock*/ false, /*stdout_stream*/ None, - ), - ) - .await - .expect("cancellation should stop the process promptly"); + ) + .await + }; + tokio::pin!(execution); + let result = timeout(Duration::from_secs(5), async { + tokio::select! { + result = &mut execution => result, + () = cancel_when_ready => (&mut execution).await, + } + }) + .await; + if result.is_err() { + cancel_tx.cancel(); + let _ = execution.await; + } + let result = result.expect("cancellation should stop the process promptly"); let output = result.expect("cancellation should return a non-timeout exec result"); assert!(!output.timed_out); assert_eq!( From e1e2257e29724a54b84f58145597fd5ebea2ff70 Mon Sep 17 00:00:00 2001 From: Dmitriy Kovalenko Date: Wed, 14 Oct 2026 21:36:01 +0000 Subject: [PATCH 075/155] Embed generated app-server schema bundles in Bazel builds (#54113) ## What changed Use the stable and experimental bundles generated by `//bazel/schema:app-server` as compile-time inputs for `app-server-protocol` instead of the checked-in bundles. Generalize `schema_generator_sources` to `schema_sources` so it can stage Rust sources alongside generated bundles. Keep empty bundle placeholders for the on-demand schema generator, which derives its output from Rust sources. GitOrigin-RevId: a976c420a3698d631f3ea7c698b15b82391158e5 --- bazel/rules/schema_bundle.bzl | 26 ++++++++++++++++-------- codex-rs/app-server-protocol/BUILD.bazel | 19 ++++++++++++++--- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/bazel/rules/schema_bundle.bzl b/bazel/rules/schema_bundle.bzl index 4a9e559042..38574924da 100644 --- a/bazel/rules/schema_bundle.bzl +++ b/bazel/rules/schema_bundle.bzl @@ -1,5 +1,7 @@ """Generate API artifacts with the existing Rust and Python exporters.""" +load("@bazel_lib//lib:copy_file.bzl", "COPY_FILE_TOOLCHAINS", "copy_file_action") + def _schema_bundle_impl(ctx): outputs = [] for mode in ["stable", "experimental"]: @@ -41,7 +43,7 @@ schema_bundle = rule( doc = "Generates both schema modes as cacheable actions with explicit tool dependencies.", ) -def _schema_generator_sources_impl(ctx): +def _schema_sources_impl(ctx): sources = [] crate_root = None prefix = ctx.label.package + "/" @@ -57,22 +59,30 @@ def _schema_generator_sources_impl(ctx): if crate_root == None: fail("Schema generator sources must include src/lib.rs") - # The ignored generation function derives schemas from Rust. These embedded - # bundles are unused on that path, so do not read the committed artifacts. + # Runtime builds embed generated bundles. The generator needs only empty + # placeholders because its selected test derives the bundles from Rust. precomputed = [ ctx.actions.declare_file(ctx.label.name + "/schema/precomputed/app-server-exports-" + mode + ".json.zst") for mode in ["stable", "experimental"] ] - for output in precomputed: - ctx.actions.write(output, "") + for mode, output in zip(["stable", "experimental"], precomputed): + if ctx.attr.schema: + directory = getattr(ctx.attr.schema[OutputGroupInfo], mode).to_list()[0] + copy_file_action(ctx, directory, output, dir_path = "precomputed/" + output.basename) + else: + ctx.actions.write(output, "") return [ DefaultInfo(files = depset(sources)), OutputGroupInfo(crate_root = depset([crate_root]), precomputed = depset(precomputed)), ] -schema_generator_sources = rule( - implementation = _schema_generator_sources_impl, - attrs = {"srcs": attr.label_list(allow_files = [".rs"])}, +schema_sources = rule( + implementation = _schema_sources_impl, + attrs = { + "srcs": attr.label_list(allow_files = [".rs"]), + "schema": attr.label(providers = [OutputGroupInfo]), + }, + toolchains = COPY_FILE_TOOLCHAINS, ) def _python_sdk_exports_impl(ctx): diff --git a/codex-rs/app-server-protocol/BUILD.bazel b/codex-rs/app-server-protocol/BUILD.bazel index 32ae594c77..ff23432505 100644 --- a/codex-rs/app-server-protocol/BUILD.bazel +++ b/codex-rs/app-server-protocol/BUILD.bazel @@ -1,12 +1,25 @@ load("@crates//:defs.bzl", "all_crate_deps") load("@rules_rust//rust:defs.bzl", "rust_binary") load("//:defs.bzl", "WINDOWS_RUSTC_LINK_FLAGS", "codex_rust_crate") -load("//bazel/rules:schema_bundle.bzl", "schema_generator_sources") +load("//bazel/rules:schema_bundle.bzl", "schema_sources") + +schema_sources( + name = "schema-sources", + srcs = glob(["src/**/*.rs"]), + schema = "//bazel/schema:app-server", +) + +filegroup( + name = "schema-precomputed", + srcs = [":schema-sources"], + output_group = "precomputed", +) codex_rust_crate( name = "app-server-protocol", - compile_data = glob(["schema/precomputed/**"]), + compile_data = [":schema-precomputed"], crate_name = "codex_app_server_protocol", + crate_srcs = [":schema-sources"], test_data_extra = glob( ["schema/**"], allow_empty = True, @@ -21,7 +34,7 @@ alias( visibility = ["//bazel/schema:__pkg__"], ) -schema_generator_sources( +schema_sources( name = "schema-generator-sources", srcs = glob(["src/**/*.rs"]), tags = ["manual"], From dec54912f9dbd307ebbe8beeb3509a6da30dbf96 Mon Sep 17 00:00:00 2001 From: Channing Conger Date: Wed, 14 Oct 2026 22:50:11 +0000 Subject: [PATCH 076/155] Report terminal completion states and blocking reasons (#54114) ## Why Terminal status previously collapsed completed and failed turns into `idle` and reported blocking prompts without a reason. Blocking detection also depended on terminal title settings. ## What changed - Emit `done` and `error` through OSC 7501 for live turn results, retaining them until deliberate keyboard, paste, or mouse input acknowledges them. Mouse movement does not acknowledge results. - Classify blocking requests with `kind=permission`, `kind=question`, or `kind=auth`, including requests hidden behind another view or delayed while typing, independently of terminal title settings. - Keep pending follow-up work and active goals `working`. Treat interrupted turns and replayed results as `idle` rather than new results. - Preserve the existing iTerm2 OSC 21337 labels and indicators, mapping `done` and `error` to `Idle`. ## Testing Add lifecycle and input-acknowledgment tests covering approvals, completion, failure, interruption, replay, pending follow-ups, and active goals. Extend blocking-request assertions and terminal protocol snapshots for the new states and reasons. GitOrigin-RevId: 90bad1d54d8b3b9e3cec66fbd3bf3df0c42b995b --- codex-rs/tui/src/app.rs | 6 ++ codex-rs/tui/src/app/tests.rs | 58 ++++++++++ codex-rs/tui/src/bottom_pane/app_link_view.rs | 16 +++ .../tui/src/bottom_pane/approval_overlay.rs | 20 ++++ .../tui/src/bottom_pane/bottom_pane_view.rs | 8 ++ .../src/bottom_pane/mcp_server_elicitation.rs | 16 +++ codex-rs/tui/src/bottom_pane/mod.rs | 34 ++++++ .../src/bottom_pane/request_user_input/mod.rs | 6 ++ .../tui/src/bottom_pane/user_verification.rs | 6 ++ codex-rs/tui/src/chatwidget/input_restore.rs | 5 + codex-rs/tui/src/chatwidget/status_state.rs | 5 + .../tui/src/chatwidget/status_surfaces.rs | 30 +++++- codex-rs/tui/src/chatwidget/tests.rs | 2 + .../src/chatwidget/tests/program_status.rs | 101 ++++++++++++++++++ .../src/chatwidget/tests/status_and_layout.rs | 31 ++++++ .../tests/terminal_program_status.rs | 13 ++- codex-rs/tui/src/chatwidget/turn_runtime.rs | 13 +++ .../tui/src/iterm_session_status_tests.rs | 44 ++++---- ...s__tests__iterm_session_status_fields.snap | 8 +- codex-rs/tui/src/terminal_program_status.rs | 77 ++++++++----- 20 files changed, 441 insertions(+), 58 deletions(-) create mode 100644 codex-rs/tui/src/chatwidget/tests/program_status.rs diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs index c8b40454cd..127651bd28 100644 --- a/codex-rs/tui/src/app.rs +++ b/codex-rs/tui/src/app.rs @@ -877,6 +877,12 @@ impl App { self.discard_startup_modal_input(tui)?; return Ok(AppRunControl::Continue); } + if matches!(&event, TuiEvent::Key(key) if key.kind != KeyEventKind::Release) + || matches!(&event, TuiEvent::Paste(text) if !text.is_empty()) + || matches!(&event, TuiEvent::Mouse(mouse) if mouse.kind != crossterm::event::MouseEventKind::Moved) + { + self.chat_widget.acknowledge_program_status(); + } let idle_draw = matches!(event, TuiEvent::Draw); if self.handle_rendered_selection_event(tui, &event)? { return Ok(AppRunControl::Continue); diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs index 6ffec87971..6c8b9a4965 100644 --- a/codex-rs/tui/src/app/tests.rs +++ b/codex-rs/tui/src/app/tests.rs @@ -275,6 +275,64 @@ async fn pasted_text_normalizes_mixed_line_endings_at_app_boundary() -> Result<( Ok(()) } +#[tokio::test] +async fn program_status_acknowledges_deliberate_mouse_events() -> Result<()> { + use crate::terminal_program_status::ProgramStatus; + use crossterm::event::MouseButton; + use crossterm::event::MouseEvent; + use crossterm::event::MouseEventKind; + + let mut app = make_test_app().await; + let mut app_server = start_config_write_test_app_server(&app).await?; + let mut tui = crate::tui::test_support::make_test_tui()?; + let thread_id = ThreadId::new(); + for (turn_status, expected) in [ + (TurnStatus::Completed, ProgramStatus::Done), + (TurnStatus::Failed, ProgramStatus::Error), + ] { + for kind in [ + MouseEventKind::Down(MouseButton::Left), + MouseEventKind::Drag(MouseButton::Left), + MouseEventKind::Up(MouseButton::Left), + MouseEventKind::ScrollUp, + MouseEventKind::ScrollDown, + ] { + app.chat_widget.handle_server_notification( + turn_started_notification(thread_id, "result"), + /*replay_kind*/ None, + ); + app.chat_widget.handle_server_notification( + turn_completed_notification(thread_id, "result", turn_status.clone()), + /*replay_kind*/ None, + ); + let before = app.chat_widget.desired_program_status(); + let mut mouse = MouseEvent { + kind: MouseEventKind::Moved, + column: 1, + row: 1, + modifiers: KeyModifiers::NONE, + }; + app.handle_tui_event(&mut tui, &mut app_server, TuiEvent::Mouse(mouse)) + .await?; + let after_hover = app.chat_widget.desired_program_status(); + mouse.kind = kind; + app.handle_tui_event(&mut tui, &mut app_server, TuiEvent::Mouse(mouse)) + .await?; + assert_eq!( + [ + before, + after_hover, + app.chat_widget.desired_program_status() + ], + [expected, expected, ProgramStatus::Idle], + "after {turn_status:?}, {kind:?}", + ); + } + } + app_server.shutdown().await?; + Ok(()) +} + #[tokio::test] async fn duplicate_named_resume_renders_error_without_replacing_current_session() -> Result<()> { let (mut app, mut app_event_rx, _op_rx) = make_test_app_with_channels().await; diff --git a/codex-rs/tui/src/bottom_pane/app_link_view.rs b/codex-rs/tui/src/bottom_pane/app_link_view.rs index dcfdf6a9fa..e78b2ff249 100644 --- a/codex-rs/tui/src/bottom_pane/app_link_view.rs +++ b/codex-rs/tui/src/bottom_pane/app_link_view.rs @@ -813,6 +813,22 @@ impl BottomPaneView for AppLinkView { fn terminal_title_requires_action(&self) -> bool { self.is_tool_suggestion() } + + fn program_status_blocked_kind( + &self, + ) -> Option { + use crate::terminal_program_status::ProgramStatusKind; + if !self.is_tool_suggestion() { + return None; + } + Some(match self.suggestion_type { + Some(AppLinkSuggestionType::Auth) => ProgramStatusKind::Auth, + Some(AppLinkSuggestionType::Install | AppLinkSuggestionType::Enable) => { + ProgramStatusKind::Permission + } + Some(AppLinkSuggestionType::ExternalAction) | None => ProgramStatusKind::Question, + }) + } } impl crate::render::renderable::Renderable for AppLinkView { diff --git a/codex-rs/tui/src/bottom_pane/approval_overlay.rs b/codex-rs/tui/src/bottom_pane/approval_overlay.rs index 6ab14d1f68..0fee868894 100644 --- a/codex-rs/tui/src/bottom_pane/approval_overlay.rs +++ b/codex-rs/tui/src/bottom_pane/approval_overlay.rs @@ -122,6 +122,18 @@ pub(crate) struct McpElicitationApprovalRequest { } impl ApprovalRequest { + pub(super) fn program_status_blocked_kind( + &self, + ) -> crate::terminal_program_status::ProgramStatusKind { + use crate::terminal_program_status::ProgramStatusKind; + match self { + Self::Exec(_) | Self::Permissions(_) | Self::ApplyPatch(_) => { + ProgramStatusKind::Permission + } + Self::McpElicitation(_) => ProgramStatusKind::Question, + } + } + pub(super) fn thread_id(&self) -> ThreadId { match self { ApprovalRequest::Exec(request) => request.thread_id, @@ -620,6 +632,14 @@ impl BottomPaneView for ApprovalOverlay { fn terminal_title_requires_action(&self) -> bool { true } + + fn program_status_blocked_kind( + &self, + ) -> Option { + self.current_request + .as_ref() + .map(ApprovalRequest::program_status_blocked_kind) + } } impl Renderable for ApprovalOverlay { diff --git a/codex-rs/tui/src/bottom_pane/bottom_pane_view.rs b/codex-rs/tui/src/bottom_pane/bottom_pane_view.rs index 6e3726352a..57a66255c5 100644 --- a/codex-rs/tui/src/bottom_pane/bottom_pane_view.rs +++ b/codex-rs/tui/src/bottom_pane/bottom_pane_view.rs @@ -4,6 +4,7 @@ use crate::bottom_pane::McpServerElicitationFormRequest; use crate::key_hint::KeyBinding; use crate::keymap::KeymapContextSet; use crate::render::renderable::Renderable; +use crate::terminal_program_status::ProgramStatusKind; use codex_app_server_protocol::ToolRequestUserInputParams; use crossterm::event::KeyEvent; use std::time::Instant; @@ -229,6 +230,13 @@ pub(crate) trait BottomPaneView: Renderable { false } + /// Classify interactive requests that prevent the agent from continuing. + /// + /// Ordinary settings and navigation views do not block a running agent. + fn program_status_blocked_kind(&self) -> Option { + None + } + /// Return the next time-based redraw this view needs while it is active. fn next_frame_delay(&self) -> Option { None diff --git a/codex-rs/tui/src/bottom_pane/mcp_server_elicitation.rs b/codex-rs/tui/src/bottom_pane/mcp_server_elicitation.rs index 39488bca1f..78f7dcf0fa 100644 --- a/codex-rs/tui/src/bottom_pane/mcp_server_elicitation.rs +++ b/codex-rs/tui/src/bottom_pane/mcp_server_elicitation.rs @@ -56,6 +56,7 @@ use crate::keymap::ListAction; use crate::keymap::ListKeymap; use crate::keymap::RuntimeKeymap; use crate::render::renderable::Renderable; +use crate::terminal_program_status::ProgramStatusKind; use crate::text_formatting::format_json_compact; use crate::text_formatting::truncate_text; @@ -1656,6 +1657,13 @@ impl BottomPaneView for McpServerElicitationOverlay { true } + fn program_status_blocked_kind(&self) -> Option { + Some(match self.request.response_mode { + McpServerElicitationResponseMode::FormContent => ProgramStatusKind::Question, + McpServerElicitationResponseMode::ApprovalAction => ProgramStatusKind::Permission, + }) + } + fn on_ctrl_c(&mut self) -> CancellationEvent { if !self.current_field_is_select() && !self.composer.current_text_with_pending().is_empty() { @@ -2681,6 +2689,10 @@ mod tests { /*disable_paste_burst*/ false, ); + assert_eq!( + overlay.program_status_blocked_kind(), + Some(ProgramStatusKind::Question) + ); insta::assert_snapshot!( "mcp_server_elicitation_boolean_form", render_snapshot(&overlay, Rect::new(0, 0, 120, 16)) @@ -2708,6 +2720,10 @@ mod tests { /*disable_paste_burst*/ false, ); + assert_eq!( + overlay.program_status_blocked_kind(), + Some(ProgramStatusKind::Permission) + ); insta::assert_snapshot!( "mcp_server_elicitation_approval_form_without_schema", render_snapshot(&overlay, Rect::new(0, 0, 120, 16)) diff --git a/codex-rs/tui/src/bottom_pane/mod.rs b/codex-rs/tui/src/bottom_pane/mod.rs index 3544f57a4e..3a930b9a55 100644 --- a/codex-rs/tui/src/bottom_pane/mod.rs +++ b/codex-rs/tui/src/bottom_pane/mod.rs @@ -47,6 +47,7 @@ use crate::render::renderable::FlexRenderable; use crate::render::renderable::Renderable; use crate::render::renderable::RenderableItem; use crate::terminal_palette::effective_stdout_color_level; +use crate::terminal_program_status::ProgramStatusKind; use crate::tui::FrameRequester; pub(crate) use bottom_pane_view::BottomPaneView; pub(crate) use bottom_pane_view::ViewCompletion; @@ -1823,6 +1824,29 @@ impl BottomPane { .is_some_and(bottom_pane_view::BottomPaneView::terminal_title_requires_action) } + /// Include requests behind a picker or delayed while the user is typing. + /// Async questions only block once the agent is no longer running. + pub(crate) fn program_status_blocked_kind(&self) -> Option { + self.view_stack + .iter() + .rev() + .filter(|view| !view.is_complete()) + .find_map(|view| view.program_status_blocked_kind()) + .or_else(|| { + self.delayed_approval_requests + .front() + .map(|delayed| delayed.request.program_status_blocked_kind()) + }) + .or_else(|| { + (!self.is_task_running() + && self + .questions + .as_ref() + .is_some_and(|questions| questions.unanswered_count() > 0)) + .then_some(ProgramStatusKind::Question) + }) + } + pub(crate) fn has_centered_view(&self) -> bool { self.active_view() .is_some_and(|view| view.presentation() == ViewPresentation::Centered) @@ -3023,7 +3047,12 @@ mod tests { skills: Some(Vec::new()), }); pane.push_approval_request(exec_request(), &features); + assert_eq!( + pane.program_status_blocked_kind(), + Some(ProgramStatusKind::Permission) + ); assert_eq!(CancellationEvent::Handled, pane.on_ctrl_c()); + assert_eq!(pane.program_status_blocked_kind(), None); assert!(!pane.quit_shortcut_hint_visible()); assert_eq!(CancellationEvent::NotHandled, pane.on_ctrl_c()); } @@ -3266,6 +3295,10 @@ mod tests { let request = exec_request(); let thread_id = request.thread_id(); pane.push_approval_request(request, &features); + assert_eq!( + pane.program_status_blocked_kind(), + Some(ProgramStatusKind::Permission) + ); assert!( pane.dismiss_app_server_request(&ResolvedAppServerRequest::ExecApproval { @@ -3274,6 +3307,7 @@ mod tests { }) ); assert!(pane.delayed_approval_requests.is_empty()); + assert_eq!(pane.program_status_blocked_kind(), None); pane.pre_draw_tick_at(now + APPROVAL_PROMPT_TYPING_IDLE_DELAY); assert!(pane.view_stack.is_empty()); diff --git a/codex-rs/tui/src/bottom_pane/request_user_input/mod.rs b/codex-rs/tui/src/bottom_pane/request_user_input/mod.rs index 51dab27b64..957d0c089b 100644 --- a/codex-rs/tui/src/bottom_pane/request_user_input/mod.rs +++ b/codex-rs/tui/src/bottom_pane/request_user_input/mod.rs @@ -1460,6 +1460,12 @@ impl BottomPaneView for RequestUserInputOverlay { true } + fn program_status_blocked_kind( + &self, + ) -> Option { + Some(crate::terminal_program_status::ProgramStatusKind::Question) + } + fn on_ctrl_c(&mut self) -> CancellationEvent { if self.confirm_unanswered_active() { self.close_unanswered_confirmation(); diff --git a/codex-rs/tui/src/bottom_pane/user_verification.rs b/codex-rs/tui/src/bottom_pane/user_verification.rs index 612e1c4b4f..8edae9bf61 100644 --- a/codex-rs/tui/src/bottom_pane/user_verification.rs +++ b/codex-rs/tui/src/bottom_pane/user_verification.rs @@ -218,6 +218,12 @@ impl BottomPaneView for UserVerificationView { fn terminal_title_requires_action(&self) -> bool { !self.is_complete() } + + fn program_status_blocked_kind( + &self, + ) -> Option { + (!self.is_complete()).then_some(crate::terminal_program_status::ProgramStatusKind::Auth) + } } impl Renderable for UserVerificationView { diff --git a/codex-rs/tui/src/chatwidget/input_restore.rs b/codex-rs/tui/src/chatwidget/input_restore.rs index e1a798b522..086aa4ac1e 100644 --- a/codex-rs/tui/src/chatwidget/input_restore.rs +++ b/codex-rs/tui/src/chatwidget/input_restore.rs @@ -313,6 +313,11 @@ impl ChatWidget { self.requeue_image_submission(); // Finalize, log a gentle prompt, and clear running state. self.finalize_turn(); + // Cancellation means idle in the program-status protocol, not a failed task. + if reason == TurnAbortReason::Interrupted { + self.status_state.program_status_after_turn = + crate::terminal_program_status::ProgramStatus::Idle; + } let send_pending_steers_immediately = self.input_queue.submit_pending_steers_after_interrupt; self.input_queue.submit_pending_steers_after_interrupt = false; diff --git a/codex-rs/tui/src/chatwidget/status_state.rs b/codex-rs/tui/src/chatwidget/status_state.rs index 5fe1eba3da..3eeb65d464 100644 --- a/codex-rs/tui/src/chatwidget/status_state.rs +++ b/codex-rs/tui/src/chatwidget/status_state.rs @@ -1,6 +1,7 @@ //! Status indicator and terminal-title state for `ChatWidget`. use crate::status_indicator_widget::STATUS_DETAILS_DEFAULT_MAX_LINES; +use crate::terminal_program_status::ProgramStatus; #[derive(Clone, Debug, PartialEq, Eq)] pub(super) struct StatusIndicatorState { @@ -120,6 +121,9 @@ pub(super) struct StatusState { pub(super) current_status: StatusIndicatorState, pub(super) pending_guardian_review_status: PendingGuardianReviewStatus, pub(super) terminal_title_status_kind: TerminalTitleStatusKind, + /// Result of the latest live turn until the user interacts again. Active + /// work and blocking prompts take precedence over this value. + pub(super) program_status_after_turn: ProgramStatus, pub(super) retry_status_header: Option, pub(super) pending_status_indicator_restore: bool, pub(super) thread_title_generation_pending: bool, @@ -135,6 +139,7 @@ impl Default for StatusState { current_status: StatusIndicatorState::working(), pending_guardian_review_status: PendingGuardianReviewStatus::default(), terminal_title_status_kind: TerminalTitleStatusKind::Working, + program_status_after_turn: ProgramStatus::Idle, retry_status_header: None, pending_status_indicator_restore: false, thread_title_generation_pending: false, diff --git a/codex-rs/tui/src/chatwidget/status_surfaces.rs b/codex-rs/tui/src/chatwidget/status_surfaces.rs index a3946abd13..d7a5c3bb64 100644 --- a/codex-rs/tui/src/chatwidget/status_surfaces.rs +++ b/codex-rs/tui/src/chatwidget/status_surfaces.rs @@ -322,13 +322,33 @@ impl ChatWidget { self.bottom_pane.terminal_title_requires_action() } - pub(super) fn desired_program_status(&self) -> ProgramStatus { - if self.terminal_title_requires_action() { - ProgramStatus::Blocked - } else if self.bottom_pane.is_task_running() || !self.unified_exec_processes.is_empty() { + /// Reports the displayed thread's actual state independently of terminal + /// title/notification settings. Replays never produce an unseen result. + pub(crate) fn desired_program_status(&self) -> ProgramStatus { + if let Some(kind) = self.bottom_pane.program_status_blocked_kind() { + ProgramStatus::Blocked(kind) + } else if self.bottom_pane.is_task_running() + || self.is_user_turn_pending_or_running() + || !self.unified_exec_processes.is_empty() + || (self.status_state.program_status_after_turn == ProgramStatus::Done + && self + .current_goal_status + .as_ref() + .is_some_and(GoalStatusState::is_active)) + { ProgramStatus::Working } else { - ProgramStatus::Idle + self.status_state.program_status_after_turn + } + } + + pub(crate) fn acknowledge_program_status(&mut self) { + if matches!( + self.desired_program_status(), + ProgramStatus::Done | ProgramStatus::Error + ) { + self.status_state.program_status_after_turn = ProgramStatus::Idle; + self.request_redraw(); } } diff --git a/codex-rs/tui/src/chatwidget/tests.rs b/codex-rs/tui/src/chatwidget/tests.rs index 8534d753f6..ee79aeffb4 100644 --- a/codex-rs/tui/src/chatwidget/tests.rs +++ b/codex-rs/tui/src/chatwidget/tests.rs @@ -275,6 +275,8 @@ mod plan_mode; #[path = "tests/plugin_catalog_tests.rs"] mod plugin_catalog; mod popups_and_settings; +#[path = "tests/program_status.rs"] +mod program_status; #[path = "tests/rate_limit_recovery_tests.rs"] mod rate_limit_recovery_tests; #[path = "tests/reasoning_status_tests.rs"] diff --git a/codex-rs/tui/src/chatwidget/tests/program_status.rs b/codex-rs/tui/src/chatwidget/tests/program_status.rs new file mode 100644 index 0000000000..a79994155c --- /dev/null +++ b/codex-rs/tui/src/chatwidget/tests/program_status.rs @@ -0,0 +1,101 @@ +//! Exercises terminal status across live, interrupted, and replayed turns. +//! Replayed results and work already underway must never appear as new completions. + +use super::*; +use crate::terminal_program_status::ProgramStatus; +use crate::terminal_program_status::ProgramStatusKind; +use pretty_assertions::assert_eq; + +#[tokio::test] +async fn program_status_tracks_live_results_and_resolved_approvals() { + let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + let mut statuses = vec![chat.desired_program_status()]; + handle_turn_started(&mut chat, "status-turn"); + statuses.push(chat.desired_program_status()); + handle_exec_approval_request( + &mut chat, + "status-approval", + ExecApprovalRequestEvent { + kind: Default::default(), + call_id: "status-call".to_string(), + approval_id: Some("status-call".to_string()), + turn_id: "status-turn".to_string(), + environment_id: None, + command: vec!["echo".to_string(), "hello".to_string()], + cwd: AbsolutePathBuf::current_dir().expect("current dir"), + reason: Some("need confirmation".to_string()), + network_approval_context: None, + proposed_execpolicy_amendment: None, + proposed_network_policy_amendments: None, + additional_permissions: None, + available_decisions: None, + }, + ); + statuses.push(chat.desired_program_status()); + chat.handle_key_event(KeyEvent::new(KeyCode::Char('y'), KeyModifiers::NONE)); + statuses.push(chat.desired_program_status()); + handle_turn_completed(&mut chat, "status-turn", /*duration_ms*/ None); + statuses.push(chat.desired_program_status()); + chat.pre_draw_tick(); + statuses.push(chat.desired_program_status()); + chat.acknowledge_program_status(); + statuses.push(chat.desired_program_status()); + handle_turn_started(&mut chat, "cancelled-turn"); + handle_turn_interrupted(&mut chat, "cancelled-turn"); + statuses.push(chat.desired_program_status()); + handle_turn_started(&mut chat, "failed-turn"); + chat.handle_server_notification( + ServerNotification::TurnCompleted(TurnCompletedNotification { + thread_id: String::new(), + turn: app_server_turn( + "failed-turn", + AppServerTurnStatus::Failed, + /*duration_ms*/ None, + /*error*/ None, + ), + }), + /*replay_kind*/ None, + ); + statuses.push(chat.desired_program_status()); + chat.acknowledge_program_status(); + statuses.push(chat.desired_program_status()); + assert_eq!( + statuses, + [ + ProgramStatus::Idle, + ProgramStatus::Working, + ProgramStatus::Blocked(ProgramStatusKind::Permission), + ProgramStatus::Working, + ProgramStatus::Done, + ProgramStatus::Done, + ProgramStatus::Idle, + ProgramStatus::Idle, + ProgramStatus::Error, + ProgramStatus::Idle, + ] + ); +} + +#[tokio::test] +async fn program_status_does_not_treat_replayed_results_as_new_or_hide_follow_up_work() { + let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + handle_turn_started(&mut chat, "old-turn"); + chat.on_task_complete( + /*last_agent_message*/ None, /*completion*/ None, /*from_replay*/ true, + ); + let replayed = chat.desired_program_status(); + handle_turn_started(&mut chat, "live-turn"); + handle_turn_completed(&mut chat, "live-turn", /*duration_ms*/ None); + let completed = chat.desired_program_status(); + // A queued follow-up is already submitted, before its TurnStarted notification arrives. + chat.input_queue.user_turn_pending_start = true; + let pending = chat.desired_program_status(); + assert_eq!( + [replayed, completed, pending], + [ + ProgramStatus::Idle, + ProgramStatus::Done, + ProgramStatus::Working + ] + ); +} diff --git a/codex-rs/tui/src/chatwidget/tests/status_and_layout.rs b/codex-rs/tui/src/chatwidget/tests/status_and_layout.rs index 301b55c2cc..760f72edc7 100644 --- a/codex-rs/tui/src/chatwidget/tests/status_and_layout.rs +++ b/codex-rs/tui/src/chatwidget/tests/status_and_layout.rs @@ -2263,6 +2263,37 @@ async fn ctrl_c_interrupt_pauses_active_goal_turn() { assert_goal_paused_event(&mut rx, thread_id); } +#[tokio::test] +async fn program_status_stays_working_when_input_acknowledges_an_active_goal() { + use crate::terminal_program_status::ProgramStatus; + + let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + let thread_id = start_active_goal_turn(&mut chat); + let mut statuses = vec![chat.desired_program_status()]; + chat.on_task_complete( + /*last_agent_message*/ None, /*completion*/ None, /*from_replay*/ false, + ); + statuses.push(chat.desired_program_status()); + // App acknowledges input before the composer handles a non-interrupting key. + chat.acknowledge_program_status(); + chat.handle_key_event(KeyEvent::new(KeyCode::Char('x'), KeyModifiers::NONE)); + statuses.push(chat.desired_program_status()); + update_thread_goal(&mut chat, thread_id, AppThreadGoalStatus::Complete); + statuses.push(chat.desired_program_status()); + chat.acknowledge_program_status(); + statuses.push(chat.desired_program_status()); + assert_eq!( + statuses, + [ + ProgramStatus::Working, + ProgramStatus::Working, + ProgramStatus::Working, + ProgramStatus::Done, + ProgramStatus::Idle, + ] + ); +} + #[tokio::test] async fn esc_interrupt_pauses_active_goal_turn() { let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; diff --git a/codex-rs/tui/src/chatwidget/tests/terminal_program_status.rs b/codex-rs/tui/src/chatwidget/tests/terminal_program_status.rs index 3911129ba3..2a2df10cc0 100644 --- a/codex-rs/tui/src/chatwidget/tests/terminal_program_status.rs +++ b/codex-rs/tui/src/chatwidget/tests/terminal_program_status.rs @@ -4,6 +4,7 @@ use pretty_assertions::assert_eq; use crate::terminal_program_status::ProgramStatus::Blocked; use crate::terminal_program_status::ProgramStatus::Idle; use crate::terminal_program_status::ProgramStatus::Working; +use crate::terminal_program_status::ProgramStatusKind; #[tokio::test] async fn session_status_follows_existing_lifecycle_state() { @@ -52,7 +53,15 @@ async fn session_status_follows_existing_lifecycle_state() { assert_eq!( states, - [Idle, Working, Blocked, Working, Idle, Working, Idle] + [ + Idle, + Working, + Blocked(ProgramStatusKind::Permission), + Working, + Idle, + Working, + Idle + ] ); } @@ -66,7 +75,7 @@ async fn session_status_detail_uses_only_foreground_activity() { let generic = detail(&chat, Working); chat.set_status_header("Reading source".to_string()); let working = detail(&chat, Working); - let waiting = detail(&chat, Blocked); + let waiting = detail(&chat, Blocked(ProgramStatusKind::Question)); chat.bottom_pane.set_task_running(/*running*/ false); let idle = detail(&chat, Idle); let background = detail(&chat, Working); diff --git a/codex-rs/tui/src/chatwidget/turn_runtime.rs b/codex-rs/tui/src/chatwidget/turn_runtime.rs index 2b394230f8..d9726d2fc4 100644 --- a/codex-rs/tui/src/chatwidget/turn_runtime.rs +++ b/codex-rs/tui/src/chatwidget/turn_runtime.rs @@ -75,6 +75,8 @@ impl ChatWidget { // Raw reasoning uses the same flow as summarized reasoning pub(super) fn on_task_started(&mut self) { + self.status_state.program_status_after_turn = + crate::terminal_program_status::ProgramStatus::Idle; self.bottom_pane.dismiss_composer_sparkle(); self.clear_context_compaction(); self.input_queue.user_turn_pending_start = false; @@ -187,6 +189,11 @@ impl ChatWidget { self.clear_active_hook_cell(); self.clear_guardian_review_status(); self.turn_lifecycle.finish(); + self.status_state.program_status_after_turn = if from_replay { + crate::terminal_program_status::ProgramStatus::Idle + } else { + crate::terminal_program_status::ProgramStatus::Done + }; self.clear_safety_buffering(); self.update_task_running_state(); self.running_commands.clear(); @@ -347,6 +354,12 @@ impl ChatWidget { self.input_queue.user_turn_pending_start = false; self.clear_guardian_review_status(); self.turn_lifecycle.finish(); + self.status_state.program_status_after_turn = if self.thread_usage.replaying_turn_completion + { + crate::terminal_program_status::ProgramStatus::Idle + } else { + crate::terminal_program_status::ProgramStatus::Error + }; self.update_task_running_state(); self.running_commands.clear(); self.suppressed_exec_calls.clear(); diff --git a/codex-rs/tui/src/iterm_session_status_tests.rs b/codex-rs/tui/src/iterm_session_status_tests.rs index 12f35136f6..7612916829 100644 --- a/codex-rs/tui/src/iterm_session_status_tests.rs +++ b/codex-rs/tui/src/iterm_session_status_tests.rs @@ -6,9 +6,10 @@ use codex_terminal_detection::TerminalName; use crossterm::Command; use pretty_assertions::assert_eq; +use super::CachedStatus; use super::ClearTerminalProgramStatus; -use super::NO_EMITTED_STATUS; use super::ProgramStatus; +use super::ProgramStatusKind; use super::SessionStatusState; use super::SetTerminalProgramStatus; use super::TerminalProgramStatusSupport; @@ -21,7 +22,11 @@ fn encodes_iterm_session_status_fields() { for (status, detail) in [ (ProgramStatus::Idle, ""), (ProgramStatus::Working, "Reading source"), - (ProgramStatus::Blocked, ""), + (ProgramStatus::Blocked(ProgramStatusKind::Permission), ""), + (ProgramStatus::Blocked(ProgramStatusKind::Question), ""), + (ProgramStatus::Blocked(ProgramStatusKind::Auth), ""), + (ProgramStatus::Done, ""), + (ProgramStatus::Error, ""), ] { let mut value = String::new(); SetTerminalProgramStatus { @@ -94,53 +99,48 @@ fn clear_empties_every_owned_field() { fn cache_changes_only_after_a_successful_write() { let state = SessionStatusState::new(); let mut emitted = Vec::new(); + let working = CachedStatus::Reported(ProgramStatus::Working); state - .update(ProgramStatus::Working as u8, "Thinking", || { + .update(working, "Thinking", || { Err(io::Error::other("write failed")) }) .expect_err("failed write should be returned"); state - .update(ProgramStatus::Working as u8, "Thinking", || { - emitted.push(ProgramStatus::Working as u8); + .update(working, "Thinking", || { + emitted.push(working); Ok(()) }) .expect("retry status write"); state - .update(ProgramStatus::Working as u8, "Thinking", || { - emitted.push(ProgramStatus::Blocked as u8); + .update(working, "Thinking", || { + emitted.push(CachedStatus::Reported(ProgramStatus::Blocked( + ProgramStatusKind::Question, + ))); Ok(()) }) .expect("deduplicate status write"); state - .update(ProgramStatus::Working as u8, "Reading", || { - emitted.push(ProgramStatus::Working as u8); + .update(working, "Reading", || { + emitted.push(working); Ok(()) }) .expect("emit changed detail"); state.invalidate(); state - .update(ProgramStatus::Working as u8, "Thinking", || { - emitted.push(ProgramStatus::Working as u8); + .update(working, "Thinking", || { + emitted.push(working); Ok(()) }) .expect("re-emit status after terminal handoff"); state - .update(NO_EMITTED_STATUS, "", || { - emitted.push(NO_EMITTED_STATUS); + .update(CachedStatus::Cleared, "", || { + emitted.push(CachedStatus::Cleared); Ok(()) }) .expect("clear status"); - assert_eq!( - emitted, - [ - ProgramStatus::Working as u8, - ProgramStatus::Working as u8, - ProgramStatus::Working as u8, - NO_EMITTED_STATUS, - ] - ); + assert_eq!(emitted, [working, working, working, CachedStatus::Cleared,]); } #[test] diff --git a/codex-rs/tui/src/snapshots/codex_tui__terminal_program_status__tests__iterm_session_status_fields.snap b/codex-rs/tui/src/snapshots/codex_tui__terminal_program_status__tests__iterm_session_status_fields.snap index 07001e76a5..f8b331d1ef 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__terminal_program_status__tests__iterm_session_status_fields.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__terminal_program_status__tests__iterm_session_status_fields.snap @@ -1,8 +1,12 @@ --- source: tui/src/iterm_session_status_tests.rs -assertion_line: 42 +assertion_line: 47 expression: snapshot --- \u{1b}]21337;status=Idle;indicator=#00d75f;status-color=;detail=\u{7}\u{1b}]7501;state=idle:app=codex\u{1b}\\ \u{1b}]21337;status=Working;indicator=#ff9500;status-color=;detail=Reading source\u{7}\u{1b}]7501;state=working:app=codex\u{1b}\\ -\u{1b}]21337;status=Waiting;indicator=#5f87ff;status-color=;detail=\u{7}\u{1b}]7501;state=blocked:app=codex\u{1b}\\ +\u{1b}]21337;status=Waiting;indicator=#5f87ff;status-color=;detail=\u{7}\u{1b}]7501;state=blocked:app=codex:kind=permission\u{1b}\\ +\u{1b}]21337;status=Waiting;indicator=#5f87ff;status-color=;detail=\u{7}\u{1b}]7501;state=blocked:app=codex:kind=question\u{1b}\\ +\u{1b}]21337;status=Waiting;indicator=#5f87ff;status-color=;detail=\u{7}\u{1b}]7501;state=blocked:app=codex:kind=auth\u{1b}\\ +\u{1b}]21337;status=Idle;indicator=#00d75f;status-color=;detail=\u{7}\u{1b}]7501;state=done:app=codex\u{1b}\\ +\u{1b}]21337;status=Idle;indicator=#00d75f;status-color=;detail=\u{7}\u{1b}]7501;state=error:app=codex\u{1b}\\ diff --git a/codex-rs/tui/src/terminal_program_status.rs b/codex-rs/tui/src/terminal_program_status.rs index 9379f960a6..427b47d81d 100644 --- a/codex-rs/tui/src/terminal_program_status.rs +++ b/codex-rs/tui/src/terminal_program_status.rs @@ -1,10 +1,9 @@ -//! Emits coarse Codex lifecycle state through terminal status protocols. +//! Emits Codex lifecycle state through terminal status protocols. //! -//! OSC 7501 is safe to send to any terminal and reports only the lifecycle -//! state and app name. Direct iTerm2 sessions also receive the existing OSC -//! 21337 status, including bounded activity text. A process-wide cache matches -//! the terminal session's ownership and prevents stale state when the active -//! chat changes. +//! OSC 7501 reports lifecycle state and blocking reasons to terminal sessions. +//! Direct iTerm2 sessions also receive OSC 21337 status, including bounded +//! activity text. The process-wide cache is used for exit, panic, and terminal +//! handoff cleanup. use std::fmt; use std::io; @@ -19,8 +18,6 @@ use codex_terminal_detection::terminal_info; use crossterm::Command; use ratatui::crossterm::execute; -const NO_EMITTED_STATUS: u8 = 0; -const INVALIDATED_EMITTED_STATUS: u8 = u8::MAX; static SESSION_STATUS_STATE: SessionStatusState = SessionStatusState::new(); static TERMINAL_PROGRAM_STATUS_SUPPORT: OnceLock = OnceLock::new(); @@ -29,15 +26,22 @@ struct SessionStatusState { } struct EmittedSessionStatus { - status: u8, + status: CachedStatus, detail: String, } +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +enum CachedStatus { + Cleared, + Reported(ProgramStatus), + Invalidated, +} + impl SessionStatusState { const fn new() -> Self { Self { last_emitted: Mutex::new(EmittedSessionStatus { - status: NO_EMITTED_STATUS, + status: CachedStatus::Cleared, detail: String::new(), }), } @@ -45,7 +49,7 @@ impl SessionStatusState { fn update( &self, - status: u8, + status: CachedStatus, detail: &str, emit: impl FnOnce() -> io::Result<()>, ) -> io::Result<()> { @@ -69,8 +73,8 @@ impl SessionStatusState { .last_emitted .lock() .unwrap_or_else(std::sync::PoisonError::into_inner); - if last_emitted.status != NO_EMITTED_STATUS { - last_emitted.status = INVALIDATED_EMITTED_STATUS; + if last_emitted.status != CachedStatus::Cleared { + last_emitted.status = CachedStatus::Invalidated; } } } @@ -82,27 +86,35 @@ struct TerminalProgramStatusSupport { } #[derive(Clone, Copy, Debug, Eq, PartialEq)] -#[repr(u8)] pub(crate) enum ProgramStatus { - Idle = 1, - Working = 2, - Blocked = 3, + Idle, + Working, + Blocked(ProgramStatusKind), + Done, + Error, +} + +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +pub(crate) enum ProgramStatusKind { + Permission, + Question, + Auth, } impl ProgramStatus { fn iterm_label(self) -> &'static str { match self { - Self::Idle => "Idle", + Self::Idle | Self::Done | Self::Error => "Idle", Self::Working => "Working", - Self::Blocked => "Waiting", + Self::Blocked(_) => "Waiting", } } fn iterm_indicator(self) -> &'static str { match self { - Self::Idle => "#00d75f", + Self::Idle | Self::Done | Self::Error => "#00d75f", Self::Working => "#ff9500", - Self::Blocked => "#5f87ff", + Self::Blocked(_) => "#5f87ff", } } @@ -110,7 +122,9 @@ impl ProgramStatus { match self { Self::Idle => "idle", Self::Working => "working", - Self::Blocked => "blocked", + Self::Blocked(_) => "blocked", + Self::Done => "done", + Self::Error => "error", } } } @@ -133,7 +147,7 @@ pub(crate) fn set_terminal_program_status( } else { String::new() }; - SESSION_STATUS_STATE.update(status as u8, &detail, || { + SESSION_STATUS_STATE.update(CachedStatus::Reported(status), &detail, || { execute!( stdout(), SetTerminalProgramStatus { @@ -155,7 +169,7 @@ pub(crate) fn clear_terminal_program_status() -> io::Result<()> { return Ok(()); } - SESSION_STATUS_STATE.update(NO_EMITTED_STATUS, "", || { + SESSION_STATUS_STATE.update(CachedStatus::Cleared, "", || { execute!( stdout(), ClearTerminalProgramStatus { @@ -233,9 +247,18 @@ impl Command for SetTerminalProgramStatus<'_> { } write!( f, - "\x1b]7501;state={}:app=codex\x1b\\", - self.status.protocol_state(), - ) + "\x1b]7501;state={}:app=codex", + self.status.protocol_state() + )?; + if let ProgramStatus::Blocked(kind) = self.status { + let kind = match kind { + ProgramStatusKind::Permission => "permission", + ProgramStatusKind::Question => "question", + ProgramStatusKind::Auth => "auth", + }; + write!(f, ":kind={kind}")?; + } + write!(f, "\x1b\\") } #[cfg(windows)] From d292f721242ef355ce5a38da90e0e33edc4790e6 Mon Sep 17 00:00:00 2001 From: Oliver Tepman Date: Wed, 14 Oct 2026 22:51:53 +0000 Subject: [PATCH 077/155] Allow stdin review under active grants with sandbox prompts disabled (#54119) ## Why With granular sandbox approvals disabled, `write_stdin` rejected input to terminals retaining additional permissions even when those permissions were still granted. ## What changed Let input reach approval review when the terminal's retained permissions match active grants for its environment. Require identical filesystem grants, including entry order, and an active network grant when retained permissions enable network access. Each input still requires review. Keep rejecting input when retained authority is no longer covered or the approval policy changes to `Never`. ## Testing Add regression coverage for user and Guardian review, turn grant expiry, session grants, and switching to `Never`. Cover filesystem restrictions, protected metadata, symlinks, and ordered denials, and verify that rejected input never reaches the terminal. GitOrigin-RevId: 9abf7da8d03b1526d26ca2a718e36349a255330b --- codex-rs/core/src/tools/approvals.rs | 13 +- .../core/src/unified_exec/stdin_approval.rs | 35 ++ .../suite/unified_exec_stdin_approval.rs | 353 ++++++++++++++++++ 3 files changed, 397 insertions(+), 4 deletions(-) diff --git a/codex-rs/core/src/tools/approvals.rs b/codex-rs/core/src/tools/approvals.rs index 2052f5948c..7840013fe3 100644 --- a/codex-rs/core/src/tools/approvals.rs +++ b/codex-rs/core/src/tools/approvals.rs @@ -86,6 +86,8 @@ pub(crate) enum ApprovalAction { tty: bool, sandbox_permissions: SandboxPermissions, additional_permissions: Option, + #[serde(skip)] + additional_permissions_preapproved: bool, }, ApplyPatch { id: String, @@ -167,6 +169,7 @@ impl ApprovalAction { tty, sandbox_permissions, additional_permissions, + additional_permissions_preapproved: _, } => PermissionRequestPayload { tool_name: HookToolName::new("write_stdin"), tool_input: serde_json::json!({ @@ -299,6 +302,7 @@ impl ApprovalAction { tty, sandbox_permissions, additional_permissions, + additional_permissions_preapproved: _, } => crate::guardian::GuardianApprovalRequest::WriteStdin { id, approval_id, @@ -449,11 +453,12 @@ impl Session { action: ApprovalAction, ctx: ApprovalContext, ) -> ApprovalResult { - // Stdin that exceeds current permissions needs a fresh sandbox approval. - // Strict review of ordinary input follows the same routing as ordinary exec. + // Retained authority outside current grants needs a new sandbox approval. + // Current grants permit review of the input; they never approve the input itself. let policy = ctx.review_context.turn().approval_policy(); - if matches!(&action, ApprovalAction::WriteStdin { sandbox_permissions, .. } - if sandbox_permissions.requests_sandbox_override()) + if matches!(&action, ApprovalAction::WriteStdin { sandbox_permissions, additional_permissions_preapproved, .. } + if sandbox_permissions.requests_sandbox_override() + && (!additional_permissions_preapproved || matches!(policy, AskForApproval::Never))) && !(ctx.strict_auto_review && matches!(policy, AskForApproval::Never)) && let Some(reason) = prompt_is_rejected_by_policy(policy, /*prompt_is_rule*/ false) diff --git a/codex-rs/core/src/unified_exec/stdin_approval.rs b/codex-rs/core/src/unified_exec/stdin_approval.rs index 646ea8ec9b..35d3e363d2 100644 --- a/codex-rs/core/src/unified_exec/stdin_approval.rs +++ b/codex-rs/core/src/unified_exec/stdin_approval.rs @@ -20,6 +20,7 @@ use codex_protocol::models::AdditionalPermissionProfile; use codex_protocol::models::PermissionProfile; use codex_protocol::models::SandboxPermissions; use codex_protocol::permissions::NetworkSandboxPolicy; +use codex_protocol::protocol::AskForApproval; use codex_sandboxing::policy_transforms::effective_permission_profile; use codex_sandboxing::policy_transforms::merge_permission_profiles; @@ -237,6 +238,39 @@ impl ProcessEntry { let reason = permissions .approval_reason(sandbox_permissions) .map_err(approval_error)?; + // A scoped grant can authorize retained authority without permitting new + // sandbox escalations. Still review every input, and only recognize grants + // that remain active for this terminal's environment with the same policy. + let additional_permissions_preapproved = matches!( + context.step_context.turn.approval_policy(), + AskForApproval::Granular(policy) if !policy.sandbox_approval + ) && sandbox_permissions + == SandboxPermissions::WithAdditionalPermissions + && permissions + .additional_permissions + .as_ref() + .zip( + context + .step_context + .turn + .granted_permissions(&self.environment_id), + ) + .is_some_and(|(retained, current_grants)| { + // Root containment does not prove filesystem coverage: child + // restrictions, protected metadata, and symlinks can differ. + // Require the original filesystem grants, including their order. + retained.file_system == current_grants.file_system + && (retained + .network + .as_ref() + .and_then(|network| network.enabled) + != Some(true) + || current_grants + .network + .as_ref() + .and_then(|network| network.enabled) + == Some(true)) + }); let action = ApprovalAction::WriteStdin { id: self.call_id.clone(), approval_id: context.call_id.clone(), @@ -247,6 +281,7 @@ impl ProcessEntry { tty: self.tty, sandbox_permissions, additional_permissions: permissions.additional_permissions.clone(), + additional_permissions_preapproved, }; Ok(Some((action, reason))) } diff --git a/codex-rs/core/tests/suite/unified_exec_stdin_approval.rs b/codex-rs/core/tests/suite/unified_exec_stdin_approval.rs index 705eccf35e..ad945521e2 100644 --- a/codex-rs/core/tests/suite/unified_exec_stdin_approval.rs +++ b/codex-rs/core/tests/suite/unified_exec_stdin_approval.rs @@ -8,6 +8,7 @@ use codex_extension_api::ExtensionRegistryBuilder; use codex_features::Feature; use codex_protocol::approvals::ExecApprovalKind; use codex_protocol::models::AdditionalPermissionProfile; +use codex_protocol::models::FileSystemPermissions; use codex_protocol::models::PermissionProfile; use codex_protocol::permissions::FileSystemAccessMode; use codex_protocol::permissions::FileSystemPath; @@ -22,6 +23,7 @@ use codex_protocol::protocol::ThreadSettingsOverrides; use codex_protocol::request_permissions::PermissionGrantScope; use codex_protocol::request_permissions::RequestPermissionsResponse; use codex_protocol::user_input::UserInput; +use core_test_support::create_directory_symlink; use core_test_support::responses::ev_assistant_message; use core_test_support::responses::ev_completed; use core_test_support::responses::ev_function_call; @@ -30,6 +32,7 @@ use core_test_support::responses::mount_sse_once; use core_test_support::responses::mount_sse_sequence; use core_test_support::responses::sse; use core_test_support::skip_if_no_network; +use core_test_support::skip_if_remote; use core_test_support::skip_if_sandbox; use core_test_support::skip_if_target_windows; use core_test_support::test_codex::TestCodexBuilder; @@ -428,3 +431,353 @@ async fn strict_stdin_review_reaches_guardian_with_sandbox_prompts_disabled() -> assert!(output.to_string().contains("STDIN_REVIEW_OK"), "{output}"); Ok(()) } + +#[derive(Clone, Copy)] +enum StdinReviewer { + User, + Guardian, +} + +#[derive(Clone, Copy)] +enum GrantChange { + Unchanged, + ReadOnlyChildExpires, + MetadataWriteExpires, + SymlinkWriteExpires, + UnchangedOrderedDenies, +} + +#[derive(Clone, Copy)] +enum LaterApprovalPolicy { + Inherit, + Never, +} + +/// A grant active at launch permits later input to reach review without enabling +/// sandbox escalation, including grants with interleaved denials. Expired authority +/// beneath parent grants and Never policy must block input without delivery. +#[test_case::test_case(PermissionGrantScope::Turn, StdinReviewer::User, GrantChange::Unchanged, LaterApprovalPolicy::Inherit; "turn_grant_user_review")] +#[test_case::test_case(PermissionGrantScope::Turn, StdinReviewer::Guardian, GrantChange::Unchanged, LaterApprovalPolicy::Inherit; "turn_grant_strict_review")] +#[test_case::test_case(PermissionGrantScope::Session, StdinReviewer::User, GrantChange::Unchanged, LaterApprovalPolicy::Never; "session_grant_never_policy")] +#[test_case::test_case(PermissionGrantScope::Session, StdinReviewer::User, GrantChange::ReadOnlyChildExpires, LaterApprovalPolicy::Inherit; "read_only_child_grant_expiry")] +#[test_case::test_case(PermissionGrantScope::Session, StdinReviewer::User, GrantChange::MetadataWriteExpires, LaterApprovalPolicy::Inherit; "explicit_metadata_grant_expiry")] +#[test_case::test_case(PermissionGrantScope::Session, StdinReviewer::User, GrantChange::SymlinkWriteExpires, LaterApprovalPolicy::Inherit; "symlink_grant_expiry")] +#[test_case::test_case(PermissionGrantScope::Session, StdinReviewer::User, GrantChange::UnchangedOrderedDenies, LaterApprovalPolicy::Inherit; "unchanged_interleaved_denials")] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn stdin_reviews_current_grants_with_sandbox_prompts_disabled( + scope: PermissionGrantScope, + reviewer: StdinReviewer, + grant_change: GrantChange, + later_policy: LaterApprovalPolicy, +) -> Result<()> { + skip_if_target_windows!(Ok(()), "uses a POSIX interactive shell"); + skip_if_no_network!(Ok(())); + skip_if_sandbox!(Ok(())); + if matches!(grant_change, GrantChange::SymlinkWriteExpires) { + skip_if_remote!(Ok(()), "creates a symlink on the local executor filesystem"); + if !cfg!(target_os = "linux") { + eprintln!("Skipping Linux symlink grant regression on another host OS"); + return Ok(()); + } + } + let harness = harness(test_codex()).await?; + let test = harness.test(); + harness.create_dir_all("allowed").await?; + let allowed = test.workspace_path_uri("allowed")?.to_abs_path()?; + let mut permission_profile = PermissionProfile::read_only(); + let mut grants = vec![(json!({"network":{"enabled":true}}), scope)]; + match grant_change { + GrantChange::ReadOnlyChildExpires + | GrantChange::MetadataWriteExpires + | GrantChange::SymlinkWriteExpires => { + let child = if matches!(grant_change, GrantChange::MetadataWriteExpires) { + "allowed/.git" + } else if matches!(grant_change, GrantChange::SymlinkWriteExpires) { + "allowed/link" + } else { + "allowed/child" + }; + if matches!(grant_change, GrantChange::SymlinkWriteExpires) { + harness.create_dir_all("outside").await?; + create_directory_symlink(&harness.path("outside"), &harness.path(child)); + } else { + harness.create_dir_all(child).await?; + } + let child = test.workspace_path_uri(child)?.to_abs_path()?; + if matches!(grant_change, GrantChange::ReadOnlyChildExpires) { + let mut file_system = permission_profile.file_system_sandbox_policy(); + file_system.entries.push(FileSystemSandboxEntry::new( + child.clone().into(), + FileSystemAccessMode::Read, + )); + permission_profile = PermissionProfile::from_runtime_permissions( + &file_system, + NetworkSandboxPolicy::Restricted, + ); + } + grants = vec![ + (json!({"file_system":{"write":[allowed]}}), scope), + ( + json!({"file_system":{"write":[child]}}), + PermissionGrantScope::Turn, + ), + ]; + } + GrantChange::UnchangedOrderedDenies => { + harness + .write_file("allowed/a/private/secret", "secret") + .await?; + harness.create_dir_all("allowed/b").await?; + let write_a = + FileSystemSandboxEntry::new(allowed.join("a").into(), FileSystemAccessMode::Write); + let deny_a = FileSystemSandboxEntry::new( + allowed.join("a/private").into(), + FileSystemAccessMode::Deny, + ); + let write_b = + FileSystemSandboxEntry::new(allowed.join("b").into(), FileSystemAccessMode::Write); + let retained = FileSystemPermissions { + entries: vec![write_a, deny_a], + glob_scan_max_depth: None, + }; + let extra = FileSystemPermissions { + entries: vec![write_b], + glob_scan_max_depth: None, + }; + grants = vec![ + (json!({"file_system":retained}), scope), + (json!({"file_system":extra}), scope), + ]; + } + GrantChange::Unchanged => {} + } + let turn_grant_expires = matches!( + grant_change, + GrantChange::ReadOnlyChildExpires + | GrantChange::MetadataWriteExpires + | GrantChange::SymlinkWriteExpires + ); + let decision = |outcome: &str| { + sse(vec![ + ev_assistant_message(outcome, &json!({"risk_level":"low", "user_authorization":"high", "outcome":outcome, "rationale":"stdin grant test"}).to_string()), + ev_completed(outcome), + ]) + }; + let mut responses = Vec::new(); + for (id, (permissions, _)) in ["grant", "extra_grant"].into_iter().zip(&grants) { + responses.push(tool_response( + id, + "request_permissions", + json!({"reason":"allow terminal access", "permissions":permissions}), + )); + } + responses.push(tool_response( + "open", + "exec_command", + json!({"cmd":"/bin/bash --noprofile --norc", "tty":true, "yield_time_ms":200}), + )); + if matches!(reviewer, StdinReviewer::Guardian) { + responses.push(decision("allow")); + } + let grant_probe = match grant_change { + GrantChange::ReadOnlyChildExpires => "printf launch > allowed/child/launched && ", + GrantChange::MetadataWriteExpires => "printf launch > allowed/.git/launched && ", + GrantChange::SymlinkWriteExpires => "printf launch > allowed/link/launched && ", + GrantChange::UnchangedOrderedDenies => { + "printf launch > allowed/a/launched && printf launch > allowed/b/launched && ! cat allowed/a/private/secret && " + } + GrantChange::Unchanged => "", + }; + responses.push(tool_response("allowed", "write_stdin", json!({"session_id":1000, "chars":format!("{grant_probe}printf 'CURRENT_%s_OK\\n' GRANT\n")}))); + if matches!(reviewer, StdinReviewer::Guardian) { + responses.push(decision("allow")); + } + responses.push(sse(vec![ev_completed("done")])); + let writes = mount_sse_sequence(harness.server(), responses).await; + test.codex + .start_or_steer_turn( + TurnInputRequest::user_input(vec![UserInput::Text { + text: "grant permission, open a terminal, and send reviewed input".into(), + text_elements: Vec::new(), + }]) + .with_thread_settings(ThreadSettingsOverrides { + permission_profile: Some(permission_profile), + approval_policy: Some(AskForApproval::Granular(GranularApprovalConfig { + sandbox_approval: false, + rules: false, + skill_approval: true, + request_permissions: true, + mcp_elicitations: false, + })), + ..Default::default() + }), + ) + .await?; + let mut grant_scopes = grants.into_iter().map(|(_, scope)| scope); + let mut approvals = 0; + loop { + match wait_for_event(&test.codex, |_| true).await { + EventMsg::RequestPermissions(request) => { + test.codex + .submit(Op::RequestPermissionsResponse { + id: request.call_id, + response: RequestPermissionsResponse { + permissions: request.permissions, + scope: grant_scopes.next().expect("requested grant"), + strict_auto_review: matches!(reviewer, StdinReviewer::Guardian), + }, + }) + .await?; + } + EventMsg::ExecApprovalRequest(request) => { + assert!(matches!(reviewer, StdinReviewer::User)); + assert_eq!( + (request.kind, request.effective_approval_id()), + (ExecApprovalKind::WriteStdin, "allowed".to_string()) + ); + approvals += 1; + test.codex + .submit(Op::ExecApproval { + id: request.effective_approval_id(), + turn_id: Some(request.turn_id), + decision: ReviewDecision::Approved, + }) + .await?; + } + EventMsg::TurnComplete(_) => break, + _ => {} + } + } + assert_eq!(grant_scopes.next(), None); + assert_eq!( + approvals, + usize::from(matches!(reviewer, StdinReviewer::User)) + ); + let output = writes + .function_call_output_text("allowed") + .expect("stdin output"); + assert!(output.contains("CURRENT_GRANT_OK"), "{output}"); + if matches!(reviewer, StdinReviewer::Guardian) { + assert_eq!( + writes + .requests() + .iter() + .filter(|request| request.body_contains_text("Planned action JSON:")) + .count(), + 2 + ); + return Ok(()); + } + + let later = mount_function_call_agent_response( + harness.server(), + "later", + &json!({"session_id":1000, "chars":"LATER=1; printf 'LATER_%s_OK\\n' GRANT\n"}).to_string(), + "write_stdin", + ) + .await; + test.codex + .start_or_steer_turn( + TurnInputRequest::user_input(vec![UserInput::Text { + text: "send input in a later turn".into(), + text_elements: Vec::new(), + }]) + .with_thread_settings(ThreadSettingsOverrides { + approval_policy: match later_policy { + LaterApprovalPolicy::Inherit => None, + LaterApprovalPolicy::Never => Some(AskForApproval::Never), + }, + ..Default::default() + }), + ) + .await?; + let later_input_allowed = matches!(scope, PermissionGrantScope::Session) + && !turn_grant_expires + && matches!(later_policy, LaterApprovalPolicy::Inherit); + let mut later_approvals = 0; + loop { + match wait_for_event(&test.codex, |_| true).await { + EventMsg::ExecApprovalRequest(request) => { + assert!(later_input_allowed, "unexpected stdin review: {request:?}"); + assert_eq!( + (request.kind, request.effective_approval_id()), + (ExecApprovalKind::WriteStdin, "later".to_string()) + ); + later_approvals += 1; + test.codex + .submit(Op::ExecApproval { + id: request.effective_approval_id(), + turn_id: Some(request.turn_id), + decision: ReviewDecision::Approved, + }) + .await?; + } + EventMsg::TurnComplete(_) => break, + _ => {} + } + } + assert_eq!(later_approvals, usize::from(later_input_allowed)); + let output = later + .completion + .function_call_output_text("later") + .expect("later stdin output"); + if matches!(later_policy, LaterApprovalPolicy::Never) { + assert!( + output.contains("AskForApproval is set to Never"), + "{output}" + ); + } else if later_input_allowed { + assert!(output.contains("LATER_GRANT_OK"), "{output}"); + } else { + assert!( + output.contains("AskForApproval::Granular.sandbox_approval is false"), + "{output}" + ); + } + if !later_input_allowed { + let probe = mount_function_call_agent_response( + harness.server(), + "probe", + &json!({"session_id":1000, "chars":"test -z \"${LATER-}\" && printf 'REJECTED_%s_OK\\n' INPUT; exit\n"}).to_string(), + "write_stdin", + ) + .await; + test.codex + .start_or_steer_turn( + TurnInputRequest::user_input(vec![UserInput::Text { + text: "verify rejected input was not delivered".into(), + text_elements: Vec::new(), + }]) + .with_thread_settings(ThreadSettingsOverrides { + approval_policy: Some(AskForApproval::OnRequest), + ..Default::default() + }), + ) + .await?; + loop { + match wait_for_event(&test.codex, |_| true).await { + EventMsg::ExecApprovalRequest(request) => { + assert_eq!( + (request.kind, request.effective_approval_id()), + (ExecApprovalKind::WriteStdin, "probe".to_string()) + ); + test.codex + .submit(Op::ExecApproval { + id: request.effective_approval_id(), + turn_id: Some(request.turn_id), + decision: ReviewDecision::Approved, + }) + .await?; + } + EventMsg::TurnComplete(_) => break, + _ => {} + } + } + let output = probe + .completion + .function_call_output_text("probe") + .expect("probe output"); + assert!(output.contains("REJECTED_INPUT_OK"), "{output}"); + } + Ok(()) +} From 348ef773eec1a42d6b3cede64a50aeb3e0448e71 Mon Sep 17 00:00:00 2001 From: Alex Kira Date: Wed, 14 Oct 2026 23:44:36 +0000 Subject: [PATCH 078/155] Record per-tool incremental update and description size metrics (#54133) ## What changed Tag `codex.tools.incremental_updates` counters with the qualified tool name alongside the action. Continue excluding initial catalogs and namespace headers, while counting each removed namespace member. Add `codex.tools.spec_description_bytes` to measure UTF-8 description bytes when an existing tool definition is replaced. Skip definitions without descriptions and use logarithmic histogram boundaries up to 1 MiB. ## Testing Extend namespace transition tests to check per-tool counts and description sizes. Add scenario assertions for replacement metrics with incremental tool updates and their absence on the non-incremental request path. GitOrigin-RevId: e20e6d81f21a867b285df1f0da005c2806dd03c6 --- .../context/world_state/top_level_tools.rs | 100 ++++++++++-------- .../world_state/top_level_tools_tests.rs | 54 ++++++++-- .../suite/scenarios_incremental_tools.rs | 95 ++++++++++++++++- codex-rs/otel/src/metrics/names.rs | 8 +- 4 files changed, 201 insertions(+), 56 deletions(-) diff --git a/codex-rs/core/src/context/world_state/top_level_tools.rs b/codex-rs/core/src/context/world_state/top_level_tools.rs index 89881fca9f..7c5a1580e5 100644 --- a/codex-rs/core/src/context/world_state/top_level_tools.rs +++ b/codex-rs/core/src/context/world_state/top_level_tools.rs @@ -2,7 +2,7 @@ //! Missing state starts a fresh catalog; this section does not migrate legacy history. //! One developer notice precedes each incremental namespace batch; catalog hashes are unchanged. //! Whole namespace removals subsume their members in the removal notice. -//! Metrics count rendered tool redefinitions, excluding namespace headers and initial catalogs. +//! Metrics count rendered tool deltas and measure replacement description bytes. use super::PreviousSectionState; use super::SectionTransition; @@ -13,6 +13,8 @@ use crate::context::ContextualUserFragment; use crate::context::DeveloperInstructions; use codex_extension_api::ExtensionMetrics; use codex_otel::TOOL_INCREMENTAL_UPDATES_METRIC; +use codex_otel::TOOL_SPEC_DESCRIPTION_BYTES_METRIC; +use codex_otel::TOOL_SPEC_DESCRIPTION_BYTES_METRIC_BUCKETS; use codex_prompts::ResolvedIncrementalToolMessages; use codex_protocol::error::CodexErrorDetails; use codex_protocol::error::Result; @@ -89,47 +91,37 @@ fn definition_name(definition: &Value) -> &str { .unwrap_or_else(|| definition["type"].as_str().expect("serialized tool type")) } -/// Accumulates callable changes during rendering without retaining tool definitions. -#[derive(Default)] -struct ToolUpdateMetrics { - count_added: usize, - count_removed: usize, - count_schema_changed: usize, -} +fn record_changed_tool_metrics( + name: &str, + definition: &Value, + previous: Option<&BTreeMap>, + metrics: Option<&dyn ExtensionMetrics>, +) { + const ACTION_TAG: &str = "action"; + const TOOL_TAG: &str = "tool"; -impl ToolUpdateMetrics { - fn count_changed_tool( - &mut self, - name: &str, - previous: Option<&BTreeMap>, - ) { - if let Some(previous) = previous { - if previous.contains_key(name) { - // The existing hash covers the entire definition, including descriptions. - self.count_schema_changed += 1; - } else { - self.count_added += 1; - } - } - } - - fn record(self, metrics: Option<&dyn ExtensionMetrics>) { - let Some(metrics) = metrics else { - return; - }; - for (action, count) in [ - (ACTION_ADDED, self.count_added), - (ACTION_REMOVED, self.count_removed), - (ACTION_SCHEMA_CHANGED, self.count_schema_changed), - ] { - if count > 0 { - metrics.counter( - TOOL_INCREMENTAL_UPDATES_METRIC, - i64::try_from(count).unwrap_or(i64::MAX), - &[("action", action)], - ); - } - } + let (Some(previous), Some(metrics)) = (previous, metrics) else { + return; + }; + let action = if previous.contains_key(name) { + ACTION_SCHEMA_CHANGED + } else { + ACTION_ADDED + }; + metrics.counter( + TOOL_INCREMENTAL_UPDATES_METRIC, + /*inc*/ 1, + &[(ACTION_TAG, action), (TOOL_TAG, name)], + ); + if action == ACTION_SCHEMA_CHANGED + && let Some(description) = definition["description"].as_str() + { + metrics.histogram_with_boundaries( + TOOL_SPEC_DESCRIPTION_BYTES_METRIC, + i64::try_from(description.len()).unwrap_or(i64::MAX), + TOOL_SPEC_DESCRIPTION_BYTES_METRIC_BUCKETS.as_slice(), + &[(TOOL_TAG, name)], + ); } } @@ -147,14 +139,18 @@ impl WorldStateSection for TopLevelToolsState { }; let changed = |name: &str| previous.and_then(|previous| previous.get(name)) != self.hashes.get(name); - let mut counts = ToolUpdateMetrics::default(); let mut namespace_updates = Vec::new(); let mut tools = Vec::new(); for definition in &self.definitions { let name = definition_name(definition); let Some(members) = definition["tools"].as_array() else { if changed(name) { - counts.count_changed_tool(name, previous); + record_changed_tool_metrics( + name, + definition, + previous, + self.metrics.as_deref(), + ); tools.push(definition.clone()); } continue; @@ -163,7 +159,12 @@ impl WorldStateSection for TopLevelToolsState { for tool in members { let tool_name = format!("{name}.{}", definition_name(tool)); if changed(&tool_name) { - counts.count_changed_tool(&tool_name, previous); + record_changed_tool_metrics( + &tool_name, + tool, + previous, + self.metrics.as_deref(), + ); changed_members.push(tool.clone()); } } @@ -229,9 +230,15 @@ impl WorldStateSection for TopLevelToolsState { .keys() .filter(|key| !self.hashes.contains_key(*key)) .filter(|key| !namespaces.contains(key.as_str())) - .inspect(|_| { + .inspect(|name| { // Count members even when the notice collapses their removed namespace. - counts.count_removed += 1; + if let Some(metrics) = self.metrics.as_deref() { + metrics.counter( + TOOL_INCREMENTAL_UPDATES_METRIC, + /*inc*/ 1, + &[("action", ACTION_REMOVED), ("tool", name.as_str())], + ); + } }) .filter(|key| { !key.split_once('.') @@ -250,7 +257,6 @@ impl WorldStateSection for TopLevelToolsState { ); } } - counts.record(self.metrics.as_deref()); // Persist the empty map too: it is a known empty catalog, not missing state. (Some(self.hashes.clone()), updates) } diff --git a/codex-rs/core/src/context/world_state/top_level_tools_tests.rs b/codex-rs/core/src/context/world_state/top_level_tools_tests.rs index 210abce3c9..e3e7fb8c4f 100644 --- a/codex-rs/core/src/context/world_state/top_level_tools_tests.rs +++ b/codex-rs/core/src/context/world_state/top_level_tools_tests.rs @@ -198,19 +198,59 @@ async fn snapshots_namespace_transitions() { .attributes() .map(|attribute| (attribute.key.as_str(), attribute.value.as_str().to_string())) .collect::>(); - assert_eq!(tags.len(), 1); - (tags["action"].clone(), point.value()) + assert_eq!(tags.len(), 2); + ( + (tags["action"].clone(), tags["tool"].clone()), + point.value(), + ) }) .collect::>(); // Initial/full snapshots and unchanged catalogs contribute nothing; namespace // headers do not count, and removing a whole namespace counts each member. assert_eq!( counts, - BTreeMap::from([ - ("added".to_string(), 6), - ("removed".to_string(), 11), - ("schema_changed".to_string(), 1), - ]) + [ + ("added", "functions.added", 1), + ("added", "functions.changed", 1), + ("added", "functions.removed", 1), + ("added", "functions.restored", 1), + ("added", "functions.unchanged", 2), + ("removed", "functions.added", 3), + ("removed", "functions.changed", 3), + ("removed", "functions.removed", 1), + ("removed", "functions.unchanged", 2), + ("removed", "other.lookup", 2), + ("schema_changed", "functions.changed", 1), + ] + .into_iter() + .map(|(action, tool, count)| ((action.to_string(), tool.to_string()), count)) + .collect() + ); + let histogram = snapshot + .scope_metrics() + .flat_map(ScopeMetrics::metrics) + .find(|metric| metric.name() == TOOL_SPEC_DESCRIPTION_BYTES_METRIC) + .expect("tool description byte histogram"); + let AggregatedMetrics::F64(MetricData::Histogram(histogram)) = histogram.data() else { + panic!("tool description bytes must be a histogram"); + }; + assert_eq!( + histogram + .data_points() + .map(|point| ( + point + .attributes() + .map(|tag| (tag.key.as_str(), tag.value.to_string())) + .collect::>(), + point.count(), + point.sum(), + )) + .collect::>(), + vec![( + vec![("tool", "functions.changed".to_string())], + 1, + "Look up a value.".len() as f64 + )], ); metrics.shutdown().unwrap(); } diff --git a/codex-rs/core/tests/suite/scenarios_incremental_tools.rs b/codex-rs/core/tests/suite/scenarios_incremental_tools.rs index b434a16845..347f2d9ac2 100644 --- a/codex-rs/core/tests/suite/scenarios_incremental_tools.rs +++ b/codex-rs/core/tests/suite/scenarios_incremental_tools.rs @@ -2,6 +2,10 @@ use anyhow::Result; use codex_features::Feature; +use codex_otel::MetricsClient; +use codex_otel::MetricsConfig; +use codex_otel::TOOL_INCREMENTAL_UPDATES_METRIC; +use codex_otel::TOOL_SPEC_DESCRIPTION_BYTES_METRIC; use codex_protocol::openai_models::CodeModeToolMessages; use codex_protocol::openai_models::IncrementalToolMessages; use codex_protocol::openai_models::ToolMessage; @@ -17,8 +21,13 @@ use core_test_support::skip_if_wine_exec; use core_test_support::test_codex::test_codex; use core_test_support::wait_for_event; use core_test_support::wait_for_mcp_server; +use opentelemetry_sdk::metrics::InMemoryMetricExporter; +use opentelemetry_sdk::metrics::data::AggregatedMetrics; +use opentelemetry_sdk::metrics::data::MetricData; +use opentelemetry_sdk::metrics::data::ScopeMetrics; use pretty_assertions::assert_eq; use serde_json::json; +use std::collections::BTreeMap; use test_case::test_case; use super::super::rmcp_client::remote_aware_environment_id; @@ -52,7 +61,16 @@ async fn incremental_tools_append_changed_catalog_without_rewriting_history( .collect(), ) .await; - let test = test_codex() + let metrics = MetricsClient::new( + MetricsConfig::in_memory( + "test", + "codex-core", + env!("CARGO_PKG_VERSION"), + InMemoryMetricExporter::default(), + ) + .with_runtime_reader(), + )?; + let mut test = test_codex() .with_model_info_override("gpt-5.4", move |model| { model.use_responses_lite = use_responses_lite; model.tool_mode = Some(ToolMode::CodeMode); @@ -106,6 +124,12 @@ async fn incremental_tools_append_changed_catalog_without_rewriting_history( }) .build_with_auto_env(&server) .await?; + let mut options = test.start_thread_options().await; + options.thread_extension_init.insert(metrics.clone()); + let thread = test.thread_manager.start_thread(options).await?; + test.codex.shutdown_and_wait().await?; + test.codex = thread.thread; + test.session_configured = thread.session_configured; test.submit_turn("Begin work.").await?; test.submit_turn("Continue with the same tools.").await?; core_test_support::submit_thread_settings( @@ -130,6 +154,74 @@ async fn incremental_tools_append_changed_catalog_without_rewriting_history( } let requests = mock.requests(); + assert_eq!(requests.len(), if use_responses_lite { 6 } else { 4 }); + let snapshot = metrics.snapshot()?; + let mut counts = BTreeMap::<_, u64>::new(); + let mut bytes = BTreeMap::new(); + for metric in snapshot.scope_metrics().flat_map(ScopeMetrics::metrics) { + match metric.name() { + TOOL_INCREMENTAL_UPDATES_METRIC => { + let AggregatedMetrics::U64(MetricData::Sum(sum)) = metric.data() else { + panic!("tool updates must be a counter"); + }; + for point in sum.data_points() { + let tags = point + .attributes() + .map(|tag| (tag.key.as_str(), tag.value.to_string())) + .collect::>(); + *counts + .entry((tags["action"].clone(), tags["tool"].clone())) + .or_default() += point.value(); + } + } + TOOL_SPEC_DESCRIPTION_BYTES_METRIC => { + let AggregatedMetrics::F64(MetricData::Histogram(histogram)) = metric.data() else { + panic!("tool description bytes must be a histogram"); + }; + for point in histogram.data_points() { + let tool = point + .attributes() + .find(|tag| tag.key.as_str() == "tool") + .expect("tool tag") + .value + .to_string(); + let sample = bytes.entry(tool).or_insert((0, 0.0)); + sample.0 += point.count(); + sample.1 += point.sum(); + } + } + _ => {} + } + } + if use_responses_lite { + let body = requests[2].body_json(); + let exec = body["input"] + .as_array() + .expect("request input") + .iter() + .rev() + .filter(|item| item["type"] == "additional_tools") + .find_map(|item| responses::namespace_child_tool(item, "functions", "exec")) + .expect("changed exec definition"); + let description_bytes = exec["description"] + .as_str() + .expect("exec description") + .len() as f64; + assert_eq!( + counts, + BTreeMap::from([( + ("schema_changed".to_string(), "functions.exec".to_string()), + 1 + )]) + ); + assert_eq!( + bytes, + BTreeMap::from([("functions.exec".to_string(), (1, description_bytes))]) + ); + } else { + assert_eq!(counts, BTreeMap::new()); + assert_eq!(bytes, BTreeMap::new()); + } if use_responses_lite { for request in &requests[..5] { assert_eq!( @@ -161,6 +253,7 @@ async fn incremental_tools_append_changed_catalog_without_rewriting_history( .include_request_settings(), ) ); + metrics.shutdown()?; Ok(()) } diff --git a/codex-rs/otel/src/metrics/names.rs b/codex-rs/otel/src/metrics/names.rs index f7c6242ee9..ba35b516f1 100644 --- a/codex-rs/otel/src/metrics/names.rs +++ b/codex-rs/otel/src/metrics/names.rs @@ -90,10 +90,16 @@ pub const TOOL_REGISTRATIONS_METRIC_BUCKETS: &[f64] = &[ pub static THREAD_TOOLS_METRIC_BUCKETS: LazyLock<[f64; 511]> = LazyLock::new(|| context_log_buckets(/*max_exponent*/ 15.0)); -/// Rendered incremental tool deltas, tagged by action; excludes initial catalogs. +/// Rendered incremental tool deltas by action and qualified tool; excludes initial catalogs. /// schema_changed includes any definition change, such as description edits. pub const TOOL_INCREMENTAL_UPDATES_METRIC: &str = "codex.tools.incremental_updates"; +/// UTF-8 description bytes on replacement by qualified tool; skips missing descriptions. +pub const TOOL_SPEC_DESCRIPTION_BYTES_METRIC: &str = "codex.tools.spec_description_bytes"; +/// Logarithmic boundaries up to 1 MiB. +pub static TOOL_SPEC_DESCRIPTION_BYTES_METRIC_BUCKETS: LazyLock<[f64; 511]> = + LazyLock::new(|| context_log_buckets(/*max_exponent*/ 20.0)); + pub static THREAD_SKILLS_COUNT_METRIC_BUCKETS: LazyLock<[f64; 513]> = LazyLock::new(|| std::array::from_fn(|index| index as f64)); From 4ca84a10696623fcd7c200db3df9c41671d3bad0 Mon Sep 17 00:00:00 2001 From: ostepanian Date: Wed, 14 Oct 2026 23:53:14 +0000 Subject: [PATCH 079/155] Allow large file writes over direct exec-server WebSockets (#54135) ## Why Direct mode serves executor requests but applied the client's 8 KiB inbound request limit, causing larger `fs/writeFile` requests to disconnect the executor. ## What changed Use a dedicated direct WebSocket connection constructor that omits the client inbound request limit while retaining WebSocket message and frame limits. ## Testing Add a regression test that runs the direct environment and verifies successful file writes above the client request limit using both text and binary WebSocket messages. GitOrigin-RevId: e8e77a5e8581ab9eb98446e23b77a6da41d64868 --- codex-rs/exec-server/src/connection.rs | 16 +++ codex-rs/exec-server/src/remote/direct.rs | 2 +- .../exec-server/src/remote/direct_tests.rs | 97 +++++++++++++++++++ 3 files changed, 114 insertions(+), 1 deletion(-) diff --git a/codex-rs/exec-server/src/connection.rs b/codex-rs/exec-server/src/connection.rs index e18faffd1e..62f98dfcc3 100644 --- a/codex-rs/exec-server/src/connection.rs +++ b/codex-rs/exec-server/src/connection.rs @@ -481,6 +481,22 @@ impl JsonRpcConnection { ) } + /// Direct mode dials the WebSocket but serves executor requests from the + /// harness. Do not apply the harness client's inbound request limit here; + /// the WebSocket transport still enforces its message and frame limits. + pub(crate) fn from_direct_websocket(stream: T, connection_label: String) -> Self + where + T: Sink + Stream> + Unpin + Send + 'static, + E: std::fmt::Display + Send + 'static, + { + Self::from_websocket_stream( + stream, + connection_label, + /*ping_interval*/ None, + /*max_inbound_request_len*/ None, + ) + } + pub(crate) fn from_axum_websocket(stream: AxumWebSocket, connection_label: String) -> Self { Self::from_websocket_stream( stream, diff --git a/codex-rs/exec-server/src/remote/direct.rs b/codex-rs/exec-server/src/remote/direct.rs index a1446a9ec4..a99454e177 100644 --- a/codex-rs/exec-server/src/remote/direct.rs +++ b/codex-rs/exec-server/src/remote/direct.rs @@ -167,7 +167,7 @@ pub(super) async fn run_direct_environment( ); processor .run_connection( - JsonRpcConnection::from_websocket( + JsonRpcConnection::from_direct_websocket( websocket, format!( "direct exec-server websocket {}", diff --git a/codex-rs/exec-server/src/remote/direct_tests.rs b/codex-rs/exec-server/src/remote/direct_tests.rs index 73e9345b9b..ae40fa5db6 100644 --- a/codex-rs/exec-server/src/remote/direct_tests.rs +++ b/codex-rs/exec-server/src/remote/direct_tests.rs @@ -5,11 +5,14 @@ use std::time::Duration; use std::time::Instant; use anyhow::Result; +use base64::Engine; use codex_api::AuthProvider; use codex_http_client::DestinationPolicy; use codex_http_client::HttpClientFactory; use codex_http_client::NetworkPolicyController; use codex_http_client::OutboundProxyPolicy; +use futures::SinkExt; +use futures::StreamExt; use http::HeaderMap; use http::HeaderValue; use pretty_assertions::assert_eq; @@ -18,6 +21,7 @@ use tokio::io::AsyncWriteExt; use tokio::net::TcpListener; use tokio::time::timeout; use tokio_tungstenite::accept_hdr_async; +use tokio_tungstenite::tungstenite::Message; use tokio_tungstenite::tungstenite::handshake::server::Request as HandshakeRequest; use tokio_tungstenite::tungstenite::handshake::server::Response as HandshakeResponse; use wiremock::Mock; @@ -61,6 +65,99 @@ impl AuthProvider for StaticAuthProvider { #[derive(Debug)] struct QueryAuthProvider; +#[tokio::test] +async fn direct_environment_accepts_large_file_writes() -> Result<()> { + let listener = TcpListener::bind("127.0.0.1:0").await?; + let registry = MockServer::start().await; + Mock::given(method("POST")) + .and(path( + "/cloud/environment/environment-requested/direct/register", + )) + .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({ + "environment_id": "environment-requested", + "transport": DIRECT_TRANSPORT, + "registration_id": "registration-1", + "url": format!("ws://{}", listener.local_addr()?), + }))) + .expect(1) + .mount(®istry) + .await; + let config = RemoteEnvironmentConfig::new_with_transport( + registry.uri(), + "environment-requested".to_string(), + RemoteEnvironmentTransport::Direct, + Arc::new(StaticAuthProvider), + HttpClientFactory::new(OutboundProxyPolicy::ReqwestDefault), + )?; + let runtime_paths = ExecServerRuntimeOptions::new( + std::env::current_exe()?, + /*codex_linux_sandbox_exe*/ None, + )?; + let task = tokio_util::task::AbortOnDropHandle::new(tokio::spawn( + crate::run_remote_environment(config, runtime_paths), + )); + let (socket, _) = timeout(Duration::from_secs(5), listener.accept()).await??; + let mut websocket = tokio_tungstenite::accept_async(socket).await?; + websocket + .send(Message::Text( + serde_json::json!({ + "id": 1, "method": "initialize", "params": {"clientName": "direct-test"}, + }) + .to_string() + .into(), + )) + .await?; + let response = timeout(Duration::from_secs(5), websocket.next()) + .await? + .expect("initialize response")?; + let response: serde_json::Value = serde_json::from_slice(&response.into_data())?; + assert_eq!(response["id"], 1); + assert!(response.get("result").is_some(), "{response}"); + websocket + .send(Message::Text( + serde_json::json!({ + "method": "initialized", "params": {}, + }) + .to_string() + .into(), + )) + .await?; + + let directory = tempfile::tempdir()?; + let output = directory.path().join("report.txt"); + let path = codex_utils_path_uri::PathUri::from_host_native_path(&output)?; + let data = "report contents\n".repeat(1024); + // Exercise both JSON-RPC WebSocket encodings on the production direct runner. + for binary in [false, true] { + let request = serde_json::json!({ + "id": 2, "method": "fs/writeFile", "params": { + "path": path, + "dataBase64": base64::engine::general_purpose::STANDARD.encode(&data), + }, + }) + .to_string(); + assert!( + request.len() > crate::client_inbound_request_limit::MAX_CLIENT_INBOUND_REQUEST_LEN + ); + let frame = if binary { + Message::Binary(request.into_bytes().into()) + } else { + Message::Text(request.into()) + }; + websocket.send(frame).await?; + let response = timeout(Duration::from_secs(5), websocket.next()) + .await? + .expect("large write must not disconnect the executor")?; + let response: serde_json::Value = serde_json::from_slice(&response.into_data())?; + assert_eq!(response["id"], 2); + assert_eq!(response["result"], serde_json::json!({}), "{response}"); + assert_eq!(tokio::fs::read(&output).await?, data.as_bytes()); + } + registry.verify().await; + task.abort(); + Ok(()) +} + impl AuthProvider for QueryAuthProvider { fn add_auth_headers(&self, _headers: &mut HeaderMap) {} From ac9db7d8b556c7c34a73793aed34b1f980a4fe39 Mon Sep 17 00:00:00 2001 From: Benjamin Carlsson Date: Thu, 15 Oct 2026 01:29:34 +0000 Subject: [PATCH 080/155] Generate keymap descriptors and binding accessors from one catalog (#54151) ## Why The `/keymap` action catalog and root-config binding lookup duplicated the same action inventory, requiring both to be maintained together. ## What changed Use `define_keymap_actions!` to generate `KEYMAP_ACTIONS` and `binding_slot` from a single declaration grouped by context. Preserve the existing action order, descriptions, feature gates, and binding mappings. GitOrigin-RevId: 182e937d9642a8b5a4aa787691da793712f29010 --- codex-rs/tui/src/keymap_setup/actions.rs | 612 +++++++++-------------- 1 file changed, 246 insertions(+), 366 deletions(-) diff --git a/codex-rs/tui/src/keymap_setup/actions.rs b/codex-rs/tui/src/keymap_setup/actions.rs index 3f9efbd357..0e9de1220a 100644 --- a/codex-rs/tui/src/keymap_setup/actions.rs +++ b/codex-rs/tui/src/keymap_setup/actions.rs @@ -1,13 +1,13 @@ //! Catalog and accessors for keymap actions shown by `/keymap`. //! -//! The descriptor table is the single UI-facing inventory of configurable -//! actions. Each descriptor ties together the config path segment, user-facing -//! context label, stable action name, and short description used by the picker -//! and action menu. +//! The catalog declaration generates both the UI-facing descriptors and the +//! matching root-config accessors. Each entry ties together the config path, +//! user-facing context label, stable action name, short description, and +//! optional feature gate used by the picker and action menu. //! -//! Root-config accessors mirror the descriptor table, while runtime lookups -//! reuse the inventory owned by [`crate::keymap`]. A catalog action must remain -//! both writable in `TuiKeymap` and readable from the shared runtime inventory. +//! Runtime lookups reuse the inventory owned by [`crate::keymap`]. A catalog +//! action must remain both writable in `TuiKeymap` and readable from the shared +//! runtime inventory. use std::collections::BTreeSet; @@ -32,37 +32,6 @@ pub(super) struct KeymapActionDescriptor { required_feature: Option, } -const fn action( - context: &'static str, - context_label: &'static str, - action: &'static str, - description: &'static str, -) -> KeymapActionDescriptor { - KeymapActionDescriptor { - context, - context_label, - action, - description, - required_feature: None, - } -} - -const fn gated_action( - context: &'static str, - context_label: &'static str, - action: &'static str, - description: &'static str, - required_feature: KeymapActionFeature, -) -> KeymapActionDescriptor { - KeymapActionDescriptor { - context, - context_label, - action, - description, - required_feature: Some(required_feature), - } -} - #[derive(Clone, Copy, Debug)] enum KeymapActionFeature { FastMode, @@ -82,164 +51,245 @@ impl KeymapActionDescriptor { } } -#[rustfmt::skip] -pub(super) const KEYMAP_ACTIONS: &[KeymapActionDescriptor] = &[ - action("global", "Global", "open_agents", "Open the shared agent-session overview."), - action("global", "Global", "open_transcript", "Open the transcript overlay."), - action("global", "Global", "find_transcript", "Find text in the full transcript."), - // Keep the new warnings action out of shared-config writes until older strict readers - // accept it. Its built-in shortcuts remain available. - action("global", "Global", "focus_activity", "Focus transcript activity groups to expand or collapse their details."), - action("global", "Global", "open_external_editor", "Open the current draft in an external editor."), - action("global", "Global", "copy", "Copy the last agent response to the clipboard."), - action("global", "Global", "clear_terminal", "Clear the terminal UI."), - action("global", "Global", "toggle_vim_mode", "Turn Vim composer mode on or off."), - gated_action("global", "Global", "toggle_fast_mode", "Turn Fast mode on or off.", KeymapActionFeature::FastMode), - action("global", "Global", "toggle_raw_output", "Toggle raw scrollback mode."), - action("global", "Global", "toggle_side_conversation", "Switch between a side conversation and its parent."), - action("global", "Global", "leader", "Set the prefix used by shared leader shortcuts."), - action("chat", "Chat", "interrupt_turn", "Interrupt the active turn."), - action("chat", "Chat", "decrease_reasoning_effort", "Decrease reasoning effort."), - action("chat", "Chat", "increase_reasoning_effort", "Increase reasoning effort."), - action("chat", "Chat", "previous_permission_mode", "Switch to the previous available permission mode."), - action("chat", "Chat", "next_permission_mode", "Switch to the next available permission mode."), - action("chat", "Chat", "edit_queued_message", "Move forward through questions, then edit the last queued message."), - action("chat", "Chat", "prompt_stack_back", "Move back through questions toward the composer."), - action("chat", "Chat", "skip_question", "Skip the focused question."), - action("chat", "Chat", "toggle_voice", "Start or stop a voice conversation."), - action("chat", "Chat", "toggle_voice_mute", "Mute or unmute the voice microphone."), - action("composer", "Composer", "submit", "Submit the current composer draft."), - action("composer", "Composer", "queue", "Queue the draft while a task is running."), - action("composer", "Composer", "toggle_shortcuts", "Show or hide the composer shortcut overlay."), - action("composer", "Composer", "history_search_previous", "Open history search or move to the previous match."), - action("composer", "Composer", "history_search_next", "Move to the next history search match."), - action("editor", "Editor", "insert_newline", "Insert a newline in the editor."), - action("editor", "Editor", "move_left", "Move the cursor left."), - action("editor", "Editor", "move_right", "Move the cursor right."), - action("editor", "Editor", "move_up", "Move the cursor up."), - action("editor", "Editor", "move_down", "Move the cursor down."), - action("editor", "Editor", "move_word_left", "Move to the beginning of the previous word."), - action("editor", "Editor", "move_word_right", "Move to the end of the next word."), - action("editor", "Editor", "move_line_start", "Move to the beginning of the line."), - action("editor", "Editor", "move_line_end", "Move to the end of the line."), - action("editor", "Editor", "delete_backward", "Delete one grapheme to the left."), - action("editor", "Editor", "delete_forward", "Delete one grapheme to the right."), - action("editor", "Editor", "delete_backward_word", "Delete the previous word."), - action("editor", "Editor", "delete_forward_word", "Delete the next word."), - action("editor", "Editor", "kill_line_start", "Delete from cursor to line start."), - action("editor", "Editor", "kill_whole_line", "Delete the current line."), - action("editor", "Editor", "kill_line_end", "Delete from cursor to line end."), - action("editor", "Editor", "yank", "Paste the kill buffer."), - action("vim_normal", "Vim normal", "enter_insert", "Enter insert mode at the cursor."), - action("vim_normal", "Vim normal", "append_after_cursor", "Enter insert mode after the cursor."), - action("vim_normal", "Vim normal", "append_line_end", "Enter insert mode at end of line."), - action("vim_normal", "Vim normal", "insert_line_start", "Enter insert mode at the first non-blank character."), - action("vim_normal", "Vim normal", "open_line_below", "Open a new line below and enter insert mode."), - action("vim_normal", "Vim normal", "open_line_above", "Open a new line above and enter insert mode."), - action("vim_normal", "Vim normal", "enter_replace_mode", "Enter replace mode and overwrite characters."), - action("vim_normal", "Vim normal", "move_left", "Move left in Vim normal mode."), - action("vim_normal", "Vim normal", "move_right", "Move right in Vim normal mode."), - action("vim_normal", "Vim normal", "move_up", "Move up or recall older history in Vim normal mode."), - action("vim_normal", "Vim normal", "move_down", "Move down or recall newer history in Vim normal mode."), - action("vim_normal", "Vim normal", "move_word_forward", "Move to the start of the next word."), - action("vim_normal", "Vim normal", "move_word_backward", "Move to the start of the previous word."), - action("vim_normal", "Vim normal", "move_word_end", "Move to the end of the current or next word."), - action("vim_normal", "Vim normal", "move_line_start", "Move to the start of the line."), - action("vim_normal", "Vim normal", "move_line_end", "Move to the end of the line."), - action("vim_normal", "Vim normal", "find_forward", "Find the next character on the current line."), - action("vim_normal", "Vim normal", "find_backward", "Find the previous character on the current line."), - action("vim_normal", "Vim normal", "till_forward", "Stop before the next character on the current line."), - action("vim_normal", "Vim normal", "till_backward", "Stop after the previous character on the current line."), - action("vim_normal", "Vim normal", "jump_top", "Jump to the first buffer line."), - action("vim_normal", "Vim normal", "jump_bottom", "Jump to the last buffer line."), - action("vim_normal", "Vim normal", "delete_char", "Delete the character under the cursor."), - action("vim_normal", "Vim normal", "replace_char", "Replace the character under the cursor."), - action("vim_normal", "Vim normal", "repeat_last_change", "Repeat the last complete edit."), - action("vim_normal", "Vim normal", "substitute_char", "Delete the character under the cursor and enter insert mode."), - action("vim_normal", "Vim normal", "delete_to_line_end", "Delete from cursor to end of line."), - action("vim_normal", "Vim normal", "change_to_line_end", "Change from cursor to end of line and enter insert mode."), - action("vim_normal", "Vim normal", "yank_line", "Yank the entire line."), - action("vim_normal", "Vim normal", "paste_after", "Paste after the cursor."), - action("vim_normal", "Vim normal", "start_delete_operator", "Begin a delete operator and wait for a motion."), - action("vim_normal", "Vim normal", "start_yank_operator", "Begin a yank operator and wait for a motion."), - action("vim_normal", "Vim normal", "start_change_operator", "Begin a change operator and wait for a motion or text object."), - action("vim_normal", "Vim normal", "undo", "Undo the last complete edit."), - action("vim_normal", "Vim normal", "redo", "Redo the last undone edit."), - action("vim_normal", "Vim normal", "cancel_operator", "Cancel a pending Vim operator."), - action("vim_search", "Vim search", "forward", "Search forward in the active buffer."), - action("vim_search", "Vim search", "backward", "Search backward in the active buffer."), - action("vim_search", "Vim search", "next", "Repeat the accepted search."), - action("vim_search", "Vim search", "previous", "Repeat the search in the opposite direction."), - action("vim_operator", "Vim operator", "delete_line", "Repeat delete operator to delete the whole line."), - action("vim_operator", "Vim operator", "yank_line", "Repeat yank operator to yank the whole line."), - action("vim_operator", "Vim operator", "motion_left", "Operator motion left."), - action("vim_operator", "Vim operator", "motion_right", "Operator motion right."), - action("vim_operator", "Vim operator", "motion_up", "Operator motion up."), - action("vim_operator", "Vim operator", "motion_down", "Operator motion down."), - action("vim_operator", "Vim operator", "motion_word_forward", "Operator motion to start of next word."), - action("vim_operator", "Vim operator", "motion_word_backward", "Operator motion to start of previous word."), - action("vim_operator", "Vim operator", "motion_word_end", "Operator motion to end of word."), - action("vim_operator", "Vim operator", "motion_line_start", "Operator motion to line start."), - action("vim_operator", "Vim operator", "motion_line_end", "Operator motion to line end."), - action("vim_operator", "Vim operator", "motion_find_forward", "Operator motion to the next character on the current line."), - action("vim_operator", "Vim operator", "motion_find_backward", "Operator motion to the previous character on the current line."), - action("vim_operator", "Vim operator", "motion_till_forward", "Stop before the next character on the current line."), - action("vim_operator", "Vim operator", "motion_till_backward", "Stop after the previous character on the current line."), - action("vim_operator", "Vim operator", "motion_jump_top", "Operator motion to the first buffer line."), - action("vim_operator", "Vim operator", "motion_jump_bottom", "Operator motion to the last buffer line."), - action("vim_operator", "Vim operator", "select_inner_text_object", "Select an inner text object."), - action("vim_operator", "Vim operator", "select_around_text_object", "Select an around text object."), - action("vim_operator", "Vim operator", "cancel", "Cancel the pending operator."), - action("vim_text_object", "Vim text object", "word", "Target the current word."), - action("vim_text_object", "Vim text object", "big_word", "Target the current WORD."), - action("vim_text_object", "Vim text object", "parentheses", "Target enclosing parentheses."), - action("vim_text_object", "Vim text object", "brackets", "Target enclosing brackets."), - action("vim_text_object", "Vim text object", "braces", "Target enclosing braces."), - action("vim_text_object", "Vim text object", "double_quote", "Target enclosing double quotes."), - action("vim_text_object", "Vim text object", "single_quote", "Target enclosing single quotes."), - action("vim_text_object", "Vim text object", "backtick", "Target enclosing backticks."), - action("vim_text_object", "Vim text object", "cancel", "Cancel the pending text object."), - action("pager", "Pager", "scroll_up", "Scroll up by one row."), - action("pager", "Pager", "scroll_down", "Scroll down by one row."), - action("pager", "Pager", "page_up", "Scroll up by one page."), - action("pager", "Pager", "page_down", "Scroll down by one page."), - action("pager", "Pager", "half_page_up", "Scroll up by half a page."), - action("pager", "Pager", "half_page_down", "Scroll down by half a page."), - action("pager", "Pager", "jump_top", "Jump to the beginning."), - action("pager", "Pager", "jump_bottom", "Jump to the end."), - action("pager", "Pager", "close", "Close the pager overlay."), - action("pager", "Pager", "close_transcript", "Close the transcript overlay."), - action("pager", "Pager", "find", "Find text in a transcript pager."), - action("list", "List", "move_up", "Move list selection up."), - action("list", "List", "move_down", "Move list selection down."), - action("list", "List", "move_left", "Move horizontally left in list pickers."), - action("list", "List", "move_right", "Move horizontally right in list pickers."), - action("list", "List", "page_up", "Move list selection up by one page."), - action("list", "List", "page_down", "Move list selection down by one page."), - action("list", "List", "jump_top", "Jump to the first list item."), - action("list", "List", "jump_bottom", "Jump to the last list item."), - action("list", "List", "accept", "Accept the current list selection."), - action("list", "List", "cancel", "Cancel and close selection views."), - action("agents", "Agents", "resume", "Open the session resume picker."), - action("agents", "Agents", "search", "Search the available agent tasks."), - action("agents", "Agents", "new_task", "Open a new session in the selected checkout."), - action("agents", "Agents", "new_worktree", "Open a new session in a worktree from the project default branch."), - action("agents", "Agents", "fork", "Fork the selected conversation and open the new session."), - action("agents", "Agents", "rename", "Rename the selected task."), - action("agents", "Agents", "stop", "Stop the selected running task."), - action("agents", "Agents", "archive", "Archive the selected task and its child agents."), - action("agents", "Agents", "delete", "Permanently delete the selected task and its child agents."), - action("agents", "Agents", "hide", "Hide the selected task until explicitly resumed."), - action("agents", "Agents", "toggle_grouping", "Cycle task grouping by project, status, or model."), - action("approval", "Approval", "open_fullscreen", "Open approval details fullscreen."), - action("approval", "Approval", "open_thread", "Open the approval source thread when available."), - action("approval", "Approval", "approve", "Approve the primary option."), - action("approval", "Approval", "approve_for_session", "Approve for the session when available."), - action("approval", "Approval", "approve_for_prefix", "Approve with an exec-policy prefix when available."), - action("approval", "Approval", "deny", "Choose the explicit deny option when available."), - action("approval", "Approval", "decline", "Decline and provide corrective guidance."), - action("approval", "Approval", "cancel", "Cancel an elicitation request."), -]; +macro_rules! required_feature { + () => { + None + }; + ($feature:ident) => { + Some(KeymapActionFeature::$feature) + }; +} + +macro_rules! define_keymap_actions { + ( + $( + $context:ident $context_label:literal { + $( + $action:ident $( [$required_feature:ident] )? => $description:literal, + )* + } + )* + ) => { + pub(super) const KEYMAP_ACTIONS: &[KeymapActionDescriptor] = &[ + $( + $( + KeymapActionDescriptor { + context: stringify!($context), + context_label: $context_label, + action: stringify!($action), + description: $description, + required_feature: required_feature!($($required_feature)?), + }, + )* + )* + ]; + + /// Return the mutable root-config binding slot for one catalog action. + /// + /// The returned `Option` distinguishes three states that the + /// editor must preserve: absent means use fallback/default resolution, `Some` + /// with one or more keys is a custom binding, and `Some(Many([]))` is an + /// explicit unbind. + pub(super) fn binding_slot<'a>( + keymap: &'a mut TuiKeymap, + context: &str, + action: &str, + ) -> Option<&'a mut Option> { + match (context, action) { + $( + $( + (stringify!($context), stringify!($action)) => { + Some(&mut keymap.$context.$action) + } + )* + )* + _ => None, + } + } + }; +} + +define_keymap_actions! { + global "Global" { + open_agents => "Open the shared agent-session overview.", + open_transcript => "Open the transcript overlay.", + find_transcript => "Find text in the full transcript.", + // Keep the new warnings action out of shared-config writes until older strict readers + // accept it. Its built-in shortcuts remain available. + focus_activity => "Focus transcript activity groups to expand or collapse their details.", + open_external_editor => "Open the current draft in an external editor.", + copy => "Copy the last agent response to the clipboard.", + clear_terminal => "Clear the terminal UI.", + toggle_vim_mode => "Turn Vim composer mode on or off.", + toggle_fast_mode [FastMode] => "Turn Fast mode on or off.", + toggle_raw_output => "Toggle raw scrollback mode.", + toggle_side_conversation => "Switch between a side conversation and its parent.", + leader => "Set the prefix used by shared leader shortcuts.", + } + chat "Chat" { + interrupt_turn => "Interrupt the active turn.", + decrease_reasoning_effort => "Decrease reasoning effort.", + increase_reasoning_effort => "Increase reasoning effort.", + previous_permission_mode => "Switch to the previous available permission mode.", + next_permission_mode => "Switch to the next available permission mode.", + edit_queued_message => "Move forward through questions, then edit the last queued message.", + prompt_stack_back => "Move back through questions toward the composer.", + skip_question => "Skip the focused question.", + toggle_voice => "Start or stop a voice conversation.", + toggle_voice_mute => "Mute or unmute the voice microphone.", + } + composer "Composer" { + submit => "Submit the current composer draft.", + queue => "Queue the draft while a task is running.", + toggle_shortcuts => "Show or hide the composer shortcut overlay.", + history_search_previous => "Open history search or move to the previous match.", + history_search_next => "Move to the next history search match.", + } + editor "Editor" { + insert_newline => "Insert a newline in the editor.", + move_left => "Move the cursor left.", + move_right => "Move the cursor right.", + move_up => "Move the cursor up.", + move_down => "Move the cursor down.", + move_word_left => "Move to the beginning of the previous word.", + move_word_right => "Move to the end of the next word.", + move_line_start => "Move to the beginning of the line.", + move_line_end => "Move to the end of the line.", + delete_backward => "Delete one grapheme to the left.", + delete_forward => "Delete one grapheme to the right.", + delete_backward_word => "Delete the previous word.", + delete_forward_word => "Delete the next word.", + kill_line_start => "Delete from cursor to line start.", + kill_whole_line => "Delete the current line.", + kill_line_end => "Delete from cursor to line end.", + yank => "Paste the kill buffer.", + } + vim_normal "Vim normal" { + enter_insert => "Enter insert mode at the cursor.", + append_after_cursor => "Enter insert mode after the cursor.", + append_line_end => "Enter insert mode at end of line.", + insert_line_start => "Enter insert mode at the first non-blank character.", + open_line_below => "Open a new line below and enter insert mode.", + open_line_above => "Open a new line above and enter insert mode.", + enter_replace_mode => "Enter replace mode and overwrite characters.", + move_left => "Move left in Vim normal mode.", + move_right => "Move right in Vim normal mode.", + move_up => "Move up or recall older history in Vim normal mode.", + move_down => "Move down or recall newer history in Vim normal mode.", + move_word_forward => "Move to the start of the next word.", + move_word_backward => "Move to the start of the previous word.", + move_word_end => "Move to the end of the current or next word.", + move_line_start => "Move to the start of the line.", + move_line_end => "Move to the end of the line.", + find_forward => "Find the next character on the current line.", + find_backward => "Find the previous character on the current line.", + till_forward => "Stop before the next character on the current line.", + till_backward => "Stop after the previous character on the current line.", + jump_top => "Jump to the first buffer line.", + jump_bottom => "Jump to the last buffer line.", + delete_char => "Delete the character under the cursor.", + replace_char => "Replace the character under the cursor.", + repeat_last_change => "Repeat the last complete edit.", + substitute_char => "Delete the character under the cursor and enter insert mode.", + delete_to_line_end => "Delete from cursor to end of line.", + change_to_line_end => "Change from cursor to end of line and enter insert mode.", + yank_line => "Yank the entire line.", + paste_after => "Paste after the cursor.", + start_delete_operator => "Begin a delete operator and wait for a motion.", + start_yank_operator => "Begin a yank operator and wait for a motion.", + start_change_operator => "Begin a change operator and wait for a motion or text object.", + undo => "Undo the last complete edit.", + redo => "Redo the last undone edit.", + cancel_operator => "Cancel a pending Vim operator.", + } + vim_search "Vim search" { + forward => "Search forward in the active buffer.", + backward => "Search backward in the active buffer.", + next => "Repeat the accepted search.", + previous => "Repeat the search in the opposite direction.", + } + vim_operator "Vim operator" { + delete_line => "Repeat delete operator to delete the whole line.", + yank_line => "Repeat yank operator to yank the whole line.", + motion_left => "Operator motion left.", + motion_right => "Operator motion right.", + motion_up => "Operator motion up.", + motion_down => "Operator motion down.", + motion_word_forward => "Operator motion to start of next word.", + motion_word_backward => "Operator motion to start of previous word.", + motion_word_end => "Operator motion to end of word.", + motion_line_start => "Operator motion to line start.", + motion_line_end => "Operator motion to line end.", + motion_find_forward => "Operator motion to the next character on the current line.", + motion_find_backward => "Operator motion to the previous character on the current line.", + motion_till_forward => "Stop before the next character on the current line.", + motion_till_backward => "Stop after the previous character on the current line.", + motion_jump_top => "Operator motion to the first buffer line.", + motion_jump_bottom => "Operator motion to the last buffer line.", + select_inner_text_object => "Select an inner text object.", + select_around_text_object => "Select an around text object.", + cancel => "Cancel the pending operator.", + } + vim_text_object "Vim text object" { + word => "Target the current word.", + big_word => "Target the current WORD.", + parentheses => "Target enclosing parentheses.", + brackets => "Target enclosing brackets.", + braces => "Target enclosing braces.", + double_quote => "Target enclosing double quotes.", + single_quote => "Target enclosing single quotes.", + backtick => "Target enclosing backticks.", + cancel => "Cancel the pending text object.", + } + pager "Pager" { + scroll_up => "Scroll up by one row.", + scroll_down => "Scroll down by one row.", + page_up => "Scroll up by one page.", + page_down => "Scroll down by one page.", + half_page_up => "Scroll up by half a page.", + half_page_down => "Scroll down by half a page.", + jump_top => "Jump to the beginning.", + jump_bottom => "Jump to the end.", + close => "Close the pager overlay.", + close_transcript => "Close the transcript overlay.", + find => "Find text in a transcript pager.", + } + list "List" { + move_up => "Move list selection up.", + move_down => "Move list selection down.", + move_left => "Move horizontally left in list pickers.", + move_right => "Move horizontally right in list pickers.", + page_up => "Move list selection up by one page.", + page_down => "Move list selection down by one page.", + jump_top => "Jump to the first list item.", + jump_bottom => "Jump to the last list item.", + accept => "Accept the current list selection.", + cancel => "Cancel and close selection views.", + } + agents "Agents" { + resume => "Open the session resume picker.", + search => "Search the available agent tasks.", + new_task => "Open a new session in the selected checkout.", + new_worktree => "Open a new session in a worktree from the project default branch.", + fork => "Fork the selected conversation and open the new session.", + rename => "Rename the selected task.", + stop => "Stop the selected running task.", + archive => "Archive the selected task and its child agents.", + delete => "Permanently delete the selected task and its child agents.", + hide => "Hide the selected task until explicitly resumed.", + toggle_grouping => "Cycle task grouping by project, status, or model.", + } + approval "Approval" { + open_fullscreen => "Open approval details fullscreen.", + open_thread => "Open the approval source thread when available.", + approve => "Approve the primary option.", + approve_for_session => "Approve for the session when available.", + approve_for_prefix => "Approve with an exec-policy prefix when available.", + deny => "Choose the explicit deny option when available.", + decline => "Decline and provide corrective guidance.", + cancel => "Cancel an elicitation request.", + } +} /// Convert a stable action identifier into a display label. /// @@ -260,176 +310,6 @@ pub(super) fn action_label(action: &str) -> String { .join(" ") } -#[rustfmt::skip] -/// Return the mutable root-config binding slot for one catalog action. -/// -/// The returned `Option` distinguishes three states that the -/// editor must preserve: absent means use fallback/default resolution, `Some` -/// with one or more keys is a custom binding, and `Some(Many([]))` is an -/// explicit unbind. -pub(super) fn binding_slot<'a>( - keymap: &'a mut TuiKeymap, - context: &str, - action: &str, -) -> Option<&'a mut Option> { - match (context, action) { - ("global", "leader") => Some(&mut keymap.global.leader), - ("global", "open_agents") => Some(&mut keymap.global.open_agents), - ("global", "open_transcript") => Some(&mut keymap.global.open_transcript), - ("global", "find_transcript") => Some(&mut keymap.global.find_transcript), - ("global", "focus_activity") => Some(&mut keymap.global.focus_activity), - ("global", "open_external_editor") => Some(&mut keymap.global.open_external_editor), - ("global", "copy") => Some(&mut keymap.global.copy), - ("global", "clear_terminal") => Some(&mut keymap.global.clear_terminal), - ("global", "toggle_vim_mode") => Some(&mut keymap.global.toggle_vim_mode), - ("global", "toggle_fast_mode") => Some(&mut keymap.global.toggle_fast_mode), - ("global", "toggle_raw_output") => Some(&mut keymap.global.toggle_raw_output), - ("global", "toggle_side_conversation") => Some(&mut keymap.global.toggle_side_conversation), - ("chat", "interrupt_turn") => Some(&mut keymap.chat.interrupt_turn), - ("chat", "decrease_reasoning_effort") => Some(&mut keymap.chat.decrease_reasoning_effort), - ("chat", "increase_reasoning_effort") => Some(&mut keymap.chat.increase_reasoning_effort), - ("chat", "previous_permission_mode") => Some(&mut keymap.chat.previous_permission_mode), - ("chat", "next_permission_mode") => Some(&mut keymap.chat.next_permission_mode), - ("chat", "edit_queued_message") => Some(&mut keymap.chat.edit_queued_message), - ("chat", "prompt_stack_back") => Some(&mut keymap.chat.prompt_stack_back), - ("chat", "skip_question") => Some(&mut keymap.chat.skip_question), - ("chat", "toggle_voice") => Some(&mut keymap.chat.toggle_voice), - ("chat", "toggle_voice_mute") => Some(&mut keymap.chat.toggle_voice_mute), - ("composer", "submit") => Some(&mut keymap.composer.submit), - ("composer", "queue") => Some(&mut keymap.composer.queue), - ("composer", "toggle_shortcuts") => Some(&mut keymap.composer.toggle_shortcuts), - ("composer", "history_search_previous") => Some(&mut keymap.composer.history_search_previous), - ("composer", "history_search_next") => Some(&mut keymap.composer.history_search_next), - ("editor", "insert_newline") => Some(&mut keymap.editor.insert_newline), - ("editor", "move_left") => Some(&mut keymap.editor.move_left), - ("editor", "move_right") => Some(&mut keymap.editor.move_right), - ("editor", "move_up") => Some(&mut keymap.editor.move_up), - ("editor", "move_down") => Some(&mut keymap.editor.move_down), - ("editor", "move_word_left") => Some(&mut keymap.editor.move_word_left), - ("editor", "move_word_right") => Some(&mut keymap.editor.move_word_right), - ("editor", "move_line_start") => Some(&mut keymap.editor.move_line_start), - ("editor", "move_line_end") => Some(&mut keymap.editor.move_line_end), - ("editor", "delete_backward") => Some(&mut keymap.editor.delete_backward), - ("editor", "delete_forward") => Some(&mut keymap.editor.delete_forward), - ("editor", "delete_backward_word") => Some(&mut keymap.editor.delete_backward_word), - ("editor", "delete_forward_word") => Some(&mut keymap.editor.delete_forward_word), - ("editor", "kill_line_start") => Some(&mut keymap.editor.kill_line_start), - ("editor", "kill_whole_line") => Some(&mut keymap.editor.kill_whole_line), - ("editor", "kill_line_end") => Some(&mut keymap.editor.kill_line_end), - ("editor", "yank") => Some(&mut keymap.editor.yank), - ("vim_normal", "enter_insert") => Some(&mut keymap.vim_normal.enter_insert), - ("vim_normal", "append_after_cursor") => Some(&mut keymap.vim_normal.append_after_cursor), - ("vim_normal", "append_line_end") => Some(&mut keymap.vim_normal.append_line_end), - ("vim_normal", "insert_line_start") => Some(&mut keymap.vim_normal.insert_line_start), - ("vim_normal", "open_line_below") => Some(&mut keymap.vim_normal.open_line_below), - ("vim_normal", "open_line_above") => Some(&mut keymap.vim_normal.open_line_above), - ("vim_normal", "enter_replace_mode") => Some(&mut keymap.vim_normal.enter_replace_mode), - ("vim_normal", "move_left") => Some(&mut keymap.vim_normal.move_left), - ("vim_normal", "move_right") => Some(&mut keymap.vim_normal.move_right), - ("vim_normal", "move_up") => Some(&mut keymap.vim_normal.move_up), - ("vim_normal", "move_down") => Some(&mut keymap.vim_normal.move_down), - ("vim_normal", "move_word_forward") => Some(&mut keymap.vim_normal.move_word_forward), - ("vim_normal", "move_word_backward") => Some(&mut keymap.vim_normal.move_word_backward), - ("vim_normal", "move_word_end") => Some(&mut keymap.vim_normal.move_word_end), - ("vim_normal", "move_line_start") => Some(&mut keymap.vim_normal.move_line_start), - ("vim_normal", "move_line_end") => Some(&mut keymap.vim_normal.move_line_end), - ("vim_normal", "find_forward") => Some(&mut keymap.vim_normal.find_forward), - ("vim_normal", "find_backward") => Some(&mut keymap.vim_normal.find_backward), - ("vim_normal", "till_forward") => Some(&mut keymap.vim_normal.till_forward), - ("vim_normal", "till_backward") => Some(&mut keymap.vim_normal.till_backward), - ("vim_normal", "jump_top") => Some(&mut keymap.vim_normal.jump_top), - ("vim_normal", "jump_bottom") => Some(&mut keymap.vim_normal.jump_bottom), - ("vim_normal", "delete_char") => Some(&mut keymap.vim_normal.delete_char), - ("vim_normal", "replace_char") => Some(&mut keymap.vim_normal.replace_char), - ("vim_normal", "repeat_last_change") => Some(&mut keymap.vim_normal.repeat_last_change), - ("vim_normal", "substitute_char") => Some(&mut keymap.vim_normal.substitute_char), - ("vim_normal", "delete_to_line_end") => Some(&mut keymap.vim_normal.delete_to_line_end), - ("vim_normal", "change_to_line_end") => Some(&mut keymap.vim_normal.change_to_line_end), - ("vim_normal", "yank_line") => Some(&mut keymap.vim_normal.yank_line), - ("vim_normal", "paste_after") => Some(&mut keymap.vim_normal.paste_after), - ("vim_normal", "start_delete_operator") => Some(&mut keymap.vim_normal.start_delete_operator), - ("vim_normal", "start_yank_operator") => Some(&mut keymap.vim_normal.start_yank_operator), - ("vim_normal", "start_change_operator") => Some(&mut keymap.vim_normal.start_change_operator), - ("vim_normal", "undo") => Some(&mut keymap.vim_normal.undo), - ("vim_normal", "redo") => Some(&mut keymap.vim_normal.redo), - ("vim_normal", "cancel_operator") => Some(&mut keymap.vim_normal.cancel_operator), - ("vim_search", "forward") => Some(&mut keymap.vim_search.forward), - ("vim_search", "backward") => Some(&mut keymap.vim_search.backward), - ("vim_search", "next") => Some(&mut keymap.vim_search.next), - ("vim_search", "previous") => Some(&mut keymap.vim_search.previous), - ("vim_operator", "delete_line") => Some(&mut keymap.vim_operator.delete_line), - ("vim_operator", "yank_line") => Some(&mut keymap.vim_operator.yank_line), - ("vim_operator", "motion_left") => Some(&mut keymap.vim_operator.motion_left), - ("vim_operator", "motion_right") => Some(&mut keymap.vim_operator.motion_right), - ("vim_operator", "motion_up") => Some(&mut keymap.vim_operator.motion_up), - ("vim_operator", "motion_down") => Some(&mut keymap.vim_operator.motion_down), - ("vim_operator", "motion_word_forward") => Some(&mut keymap.vim_operator.motion_word_forward), - ("vim_operator", "motion_word_backward") => Some(&mut keymap.vim_operator.motion_word_backward), - ("vim_operator", "motion_word_end") => Some(&mut keymap.vim_operator.motion_word_end), - ("vim_operator", "motion_line_start") => Some(&mut keymap.vim_operator.motion_line_start), - ("vim_operator", "motion_line_end") => Some(&mut keymap.vim_operator.motion_line_end), - ("vim_operator", "motion_find_forward") => Some(&mut keymap.vim_operator.motion_find_forward), - ("vim_operator", "motion_find_backward") => Some(&mut keymap.vim_operator.motion_find_backward), - ("vim_operator", "motion_till_forward") => Some(&mut keymap.vim_operator.motion_till_forward), - ("vim_operator", "motion_till_backward") => Some(&mut keymap.vim_operator.motion_till_backward), - ("vim_operator", "motion_jump_top") => Some(&mut keymap.vim_operator.motion_jump_top), - ("vim_operator", "motion_jump_bottom") => Some(&mut keymap.vim_operator.motion_jump_bottom), - ("vim_operator", "select_inner_text_object") => Some(&mut keymap.vim_operator.select_inner_text_object), - ("vim_operator", "select_around_text_object") => Some(&mut keymap.vim_operator.select_around_text_object), - ("vim_operator", "cancel") => Some(&mut keymap.vim_operator.cancel), - ("vim_text_object", "word") => Some(&mut keymap.vim_text_object.word), - ("vim_text_object", "big_word") => Some(&mut keymap.vim_text_object.big_word), - ("vim_text_object", "parentheses") => Some(&mut keymap.vim_text_object.parentheses), - ("vim_text_object", "brackets") => Some(&mut keymap.vim_text_object.brackets), - ("vim_text_object", "braces") => Some(&mut keymap.vim_text_object.braces), - ("vim_text_object", "double_quote") => Some(&mut keymap.vim_text_object.double_quote), - ("vim_text_object", "single_quote") => Some(&mut keymap.vim_text_object.single_quote), - ("vim_text_object", "backtick") => Some(&mut keymap.vim_text_object.backtick), - ("vim_text_object", "cancel") => Some(&mut keymap.vim_text_object.cancel), - ("pager", "scroll_up") => Some(&mut keymap.pager.scroll_up), - ("pager", "scroll_down") => Some(&mut keymap.pager.scroll_down), - ("pager", "page_up") => Some(&mut keymap.pager.page_up), - ("pager", "page_down") => Some(&mut keymap.pager.page_down), - ("pager", "half_page_up") => Some(&mut keymap.pager.half_page_up), - ("pager", "half_page_down") => Some(&mut keymap.pager.half_page_down), - ("pager", "jump_top") => Some(&mut keymap.pager.jump_top), - ("pager", "jump_bottom") => Some(&mut keymap.pager.jump_bottom), - ("pager", "close") => Some(&mut keymap.pager.close), - ("pager", "close_transcript") => Some(&mut keymap.pager.close_transcript), - ("pager", "find") => Some(&mut keymap.pager.find), - ("list", "move_up") => Some(&mut keymap.list.move_up), - ("list", "move_down") => Some(&mut keymap.list.move_down), - ("list", "move_left") => Some(&mut keymap.list.move_left), - ("list", "move_right") => Some(&mut keymap.list.move_right), - ("list", "page_up") => Some(&mut keymap.list.page_up), - ("list", "page_down") => Some(&mut keymap.list.page_down), - ("list", "jump_top") => Some(&mut keymap.list.jump_top), - ("list", "jump_bottom") => Some(&mut keymap.list.jump_bottom), - ("list", "accept") => Some(&mut keymap.list.accept), - ("list", "cancel") => Some(&mut keymap.list.cancel), - ("agents", "resume") => Some(&mut keymap.agents.resume), - ("agents", "search") => Some(&mut keymap.agents.search), - ("agents", "new_task") => Some(&mut keymap.agents.new_task), - ("agents", "new_worktree") => Some(&mut keymap.agents.new_worktree), - ("agents", "fork") => Some(&mut keymap.agents.fork), - ("agents", "rename") => Some(&mut keymap.agents.rename), - ("agents", "stop") => Some(&mut keymap.agents.stop), - ("agents", "archive") => Some(&mut keymap.agents.archive), - ("agents", "delete") => Some(&mut keymap.agents.delete), - ("agents", "hide") => Some(&mut keymap.agents.hide), - ("agents", "toggle_grouping") => Some(&mut keymap.agents.toggle_grouping), - ("approval", "open_fullscreen") => Some(&mut keymap.approval.open_fullscreen), - ("approval", "open_thread") => Some(&mut keymap.approval.open_thread), - ("approval", "approve") => Some(&mut keymap.approval.approve), - ("approval", "approve_for_session") => Some(&mut keymap.approval.approve_for_session), - ("approval", "approve_for_prefix") => Some(&mut keymap.approval.approve_for_prefix), - ("approval", "deny") => Some(&mut keymap.approval.deny), - ("approval", "decline") => Some(&mut keymap.approval.decline), - ("approval", "cancel") => Some(&mut keymap.approval.cancel), - _ => None, - } -} - /// Format an action's active single-key and chord alternatives in config order. /// /// Duplicate runtime variants that normalize to the same config spec are shown From 7943713993c2220b7616b5fc71f2de0e503282e8 Mon Sep 17 00:00:00 2001 From: smurching-oai Date: Thu, 15 Oct 2026 01:43:04 +0000 Subject: [PATCH 081/155] Reload the model catalog after account changes (#54169) ## Why The app server retained its startup model provider for catalog requests, so signing in or out could leave `model/list` using stale provider settings or requiring a restart after managed provider requirements changed. ## What changed - Invalidate the catalog after successful login and logout, then reload the effective configuration on the next model list or background refresh. Rebuild the models manager when the provider or catalog changes, while preserving existing threads' routes. - Retain the original project context and the TUI's `--oss` provider selection across reloads. Retry configuration loading after falling back to defaults so temporary failures do not pin the fallback catalog. - Keep provider policy checks for cached catalogs and apply runtime `api_key_model_discovery` toggles to the active catalog manager. ## Testing Add and extend tests for provider selection and definition changes after login, catalog reloads after logout, OAuth gateway transitions, fallback recovery, project context, and runtime model discovery toggles. GitOrigin-RevId: bce2e23ff567e1a52eac2b6ad736a6e63ff61e2b --- codex-rs/app-server/src/config_manager.rs | 18 +- .../src/config_manager_provider_tests.rs | 23 ++ codex-rs/app-server/src/in_process.rs | 4 + .../app-server/src/in_process_bootstrap.rs | 6 +- codex-rs/app-server/src/lib.rs | 6 +- codex-rs/app-server/src/message_processor.rs | 7 + .../src/message_processor_tracing_tests.rs | 1 + ...ssage_processor_workspace_routing_tests.rs | 1 + codex-rs/app-server/src/model_catalog.rs | 96 +++++++- .../src/models_refresh_worker_tests.rs | 184 ++++++++++++-- .../request_processors/account_processor.rs | 17 ++ .../workspace_routing_tests.rs | 8 + .../request_processors/catalog_processor.rs | 25 +- .../request_processors/config_processor.rs | 9 + .../src/user_verification_test_support.rs | 1 + codex-rs/app-server/tests/suite/v2/account.rs | 57 ++++- .../tests/suite/v2/gateway_oauth_tests.rs | 36 +++ .../app-server/tests/suite/v2/model_list.rs | 25 ++ .../suite/v2/model_list_requirements_tests.rs | 230 +++++++++++------- codex-rs/tui/src/startup_orchestration.rs | 11 +- 20 files changed, 637 insertions(+), 128 deletions(-) diff --git a/codex-rs/app-server/src/config_manager.rs b/codex-rs/app-server/src/config_manager.rs index d5f2c2b89a..d2c2db7481 100644 --- a/codex-rs/app-server/src/config_manager.rs +++ b/codex-rs/app-server/src/config_manager.rs @@ -56,6 +56,12 @@ pub(crate) struct ConfigManager { network_policy_snapshot: Arc>>>, } +/// Startup configuration, including whether loading had to fall back to defaults. +pub(crate) struct StartupConfig { + pub(crate) config: Config, + pub(crate) used_defaults: bool, +} + /// Configuration and policy must finish loading against the same account and cloud snapshot. pub(crate) struct ApplicationPolicyLoad { cloud_config: CloudConfigBundleLoader, @@ -336,9 +342,12 @@ impl ConfigManager { pub(crate) async fn load_startup_config( &self, fallback_cwd: Option, - ) -> std::io::Result { + ) -> std::io::Result { match self.load_latest_config(fallback_cwd).await { - Ok(config) => Ok(config), + Ok(config) => Ok(StartupConfig { + config, + used_defaults: false, + }), Err(error) if self.strict_config || crate::is_unsupported_untrusted_approval_policy_error(&error) => @@ -347,7 +356,10 @@ impl ConfigManager { } Err(error) => { warn!(%error, "configuration is unavailable; using default settings"); - self.load_default_config().await + Ok(StartupConfig { + config: self.load_default_config().await?, + used_defaults: true, + }) } } } diff --git a/codex-rs/app-server/src/config_manager_provider_tests.rs b/codex-rs/app-server/src/config_manager_provider_tests.rs index 20fbfb4989..86ee457514 100644 --- a/codex-rs/app-server/src/config_manager_provider_tests.rs +++ b/codex-rs/app-server/src/config_manager_provider_tests.rs @@ -210,3 +210,26 @@ async fn provider_requirement_load_errors_reject_input() -> Result<()> { } Ok(()) } + +/// A managed startup selection must disappear when its policy is removed. +#[tokio::test] +async fn catalog_reload_uses_latest_model_provider() -> Result<()> { + let home = tempdir()?; + let manager = ConfigManager::new_for_tests( + home.path().to_path_buf(), + Vec::new(), + LoaderOverrides::without_managed_config_for_tests(), + CloudConfigBundleFixture::loader_with_enterprise_requirement( + "model_provider = 'gateway'\n[model_providers.gateway]\nname = 'Gateway'\nbase_url = 'https://example.test'", + ), + ); + let startup = manager.load_non_project_config().await?; + assert_eq!(startup.model_provider_id, "gateway"); + manager.clear_cloud_config_bundle_loader(); + let refreshed = manager + .load_startup_config(/*fallback_cwd*/ None) + .await? + .config; + assert_eq!(refreshed.model_provider_id, "openai"); + Ok(()) +} diff --git a/codex-rs/app-server/src/in_process.rs b/codex-rs/app-server/src/in_process.rs index 9673442d38..64d37f14df 100644 --- a/codex-rs/app-server/src/in_process.rs +++ b/codex-rs/app-server/src/in_process.rs @@ -435,6 +435,9 @@ async fn start_uninitialized(mut args: InProcessStartArgs) -> IoResult IoResult IoResult> { let bootstrap_config = config_manager .load_startup_config(Some(config.cwd.to_path_buf())) - .await?; + .await? + .config; let caller_auth = config.auth_config(); let bootstrap_auth = codex_login::AuthConfig { chatgpt_base_url: Some(bootstrap_config.chatgpt_base_url.clone()), @@ -132,7 +133,8 @@ pub(super) async fn configure( ); let policy_config = config_manager .load_startup_config(Some(config.cwd.to_path_buf())) - .await?; + .await? + .config; config.validate_windows_mxc_requirement_from(&policy_config)?; let auth_config = codex_login::AuthConfig { chatgpt_base_url: Some(policy_config.chatgpt_base_url.clone()), diff --git a/codex-rs/app-server/src/lib.rs b/codex-rs/app-server/src/lib.rs index 70e8519ab8..9ef1b73a82 100644 --- a/codex-rs/app-server/src/lib.rs +++ b/codex-rs/app-server/src/lib.rs @@ -546,7 +546,8 @@ pub async fn run_main_with_transport_options( ); let bootstrap_config = config_manager .load_startup_config(startup_cwd.clone()) - .await?; + .await? + .config; let bootstrap_auth = AuthManager::shared_from_config(&bootstrap_config, /*enable_codex_api_key_env*/ false) .await @@ -558,7 +559,7 @@ pub async fn run_main_with_transport_options( ); let mut config_warnings = Vec::new(); let mut plugin_startup_config = PluginStartupConfig::Current; - let config = match config_manager.load_latest_config(startup_cwd).await { + let config = match config_manager.load_latest_config(startup_cwd.clone()).await { Ok(config) => config, Err(err) if is_unsupported_untrusted_approval_policy_error(&err) => { return Err(err); @@ -988,6 +989,7 @@ pub async fn run_main_with_transport_options( analytics_events_client, arg0_paths, config: Arc::new(config), + startup_cwd, config_manager, environment_manager, feedback: feedback.clone(), diff --git a/codex-rs/app-server/src/message_processor.rs b/codex-rs/app-server/src/message_processor.rs index c9858cd9d5..767c600e07 100644 --- a/codex-rs/app-server/src/message_processor.rs +++ b/codex-rs/app-server/src/message_processor.rs @@ -252,6 +252,8 @@ pub(crate) struct MessageProcessorArgs { pub(crate) analytics_events_client: AnalyticsEventsClient, pub(crate) arg0_paths: Arg0DispatchPaths, pub(crate) config: Arc, + /// Original project context, retained even when startup falls back to defaults. + pub(crate) startup_cwd: Option, pub(crate) config_manager: ConfigManager, pub(crate) environment_manager: Arc, pub(crate) feedback: CodexFeedback, @@ -278,6 +280,7 @@ impl MessageProcessor { analytics_events_client, arg0_paths, config, + startup_cwd, config_manager, environment_manager, feedback, @@ -380,8 +383,10 @@ impl MessageProcessor { }); let model_catalog = Arc::new(crate::model_catalog::ModelCatalog::new( config_manager.clone(), + startup_cwd, Arc::clone(&config), thread_manager.get_models_manager(), + Arc::clone(&auth_manager), )); let models_refresh_worker = crate::models_refresh_worker::spawn(&model_catalog); let turn_cost_worker = @@ -405,6 +410,7 @@ impl MessageProcessor { outgoing.clone(), config_manager.clone(), thread_manager.clone(), + Arc::clone(&model_catalog), analytics_events_client.clone(), ); let on_effective_plugins_changed = @@ -421,6 +427,7 @@ impl MessageProcessor { outgoing.clone(), Arc::clone(&config), config_manager.clone(), + Arc::clone(&model_catalog), ); let apps_processor = AppsRequestProcessor::new( auth_manager.clone(), diff --git a/codex-rs/app-server/src/message_processor_tracing_tests.rs b/codex-rs/app-server/src/message_processor_tracing_tests.rs index ca4aeeda37..f9b1c8cea6 100644 --- a/codex-rs/app-server/src/message_processor_tracing_tests.rs +++ b/codex-rs/app-server/src/message_processor_tracing_tests.rs @@ -264,6 +264,7 @@ pub(super) async fn build_test_processor( outgoing, analytics_events_client, arg0_paths: Arg0DispatchPaths::default(), + startup_cwd: Some(config.cwd.to_path_buf()), config, config_manager, environment_manager: Arc::new(EnvironmentManager::default_for_tests()), diff --git a/codex-rs/app-server/src/message_processor_workspace_routing_tests.rs b/codex-rs/app-server/src/message_processor_workspace_routing_tests.rs index db478a9960..e1d4c4a4da 100644 --- a/codex-rs/app-server/src/message_processor_workspace_routing_tests.rs +++ b/codex-rs/app-server/src/message_processor_workspace_routing_tests.rs @@ -67,6 +67,7 @@ async fn background_routing_call_sites_skip_config(api_key: Option<&str>) -> any outgoing, analytics_events_client, arg0_paths: Arg0DispatchPaths::default(), + startup_cwd: Some(config.cwd.to_path_buf()), config, config_manager, environment_manager: Arc::new(EnvironmentManager::default_for_tests()), diff --git a/codex-rs/app-server/src/model_catalog.rs b/codex-rs/app-server/src/model_catalog.rs index 54d7ff8501..ff9704fa30 100644 --- a/codex-rs/app-server/src/model_catalog.rs +++ b/codex-rs/app-server/src/model_catalog.rs @@ -1,17 +1,29 @@ -//! Gates access to the retained startup model catalog on current managed provider requirements. +//! Loads the model catalog for the current effective provider configuration. +use std::path::PathBuf; use std::sync::Arc; use codex_core::config::Config; +use codex_features::Feature; +use codex_login::AuthManager; use codex_models_manager::manager::RefreshStrategy; use codex_models_manager::manager::SharedModelsManager; use codex_protocol::openai_models::ModelPreset; +use tokio::sync::Mutex; use crate::config_manager::ConfigManager; +use crate::config_manager::StartupConfig; -/// Checks the retained catalog route before model/list and background refreshes. +/// Refreshes catalog routing without changing the routes retained by existing threads. pub(crate) struct ModelCatalog { config_manager: ConfigManager, + auth_manager: Arc, + startup_cwd: Option, + state: Mutex, +} + +struct CatalogState { + needs_reload: bool, config: Arc, models_manager: SharedModelsManager, } @@ -19,28 +31,92 @@ pub(crate) struct ModelCatalog { impl ModelCatalog { pub(crate) fn new( config_manager: ConfigManager, + startup_cwd: Option, config: Arc, models_manager: SharedModelsManager, + auth_manager: Arc, ) -> Self { Self { config_manager, - config, - models_manager, + auth_manager, + startup_cwd, + state: Mutex::new(CatalogState { + needs_reload: false, + config, + models_manager, + }), } } + /// Marks catalog configuration stale after an account transition. + pub(crate) async fn invalidate(&self) { + self.state.lock().await.needs_reload = true; + } + + pub(crate) async fn set_api_key_model_discovery_enabled(&self, enabled: bool) { + self.state + .lock() + .await + .models_manager + .set_api_key_model_discovery_enabled(enabled); + } + + #[expect( + clippy::await_holding_invalid_type, + reason = "catalog reloads are serialized with account invalidation; model fetching holds no lock" + )] + pub(crate) async fn current(&self) -> std::io::Result<(Arc, SharedModelsManager)> { + let mut state = self.state.lock().await; + if state.needs_reload { + // Keep the large config-loading future off callers' stacks. + let config = Box::pin( + self.config_manager + .load_startup_config(self.startup_cwd.clone()), + ) + .await?; + let StartupConfig { + config, + used_defaults, + } = config; + if config.model_provider_id != state.config.model_provider_id + || config.model_provider != state.config.model_provider + || config.model_catalog != state.config.model_catalog + { + state.models_manager = + codex_core::build_models_manager(&config, Arc::clone(&self.auth_manager)); + } + state.models_manager.set_api_key_model_discovery_enabled( + config.features.enabled(Feature::ApiKeyModelDiscovery), + ); + state.config = Arc::new(config); + // Try again on the next access so a temporary fallback cannot pin the provider. + state.needs_reload = used_defaults; + } + Ok((Arc::clone(&state.config), Arc::clone(&state.models_manager))) + } + pub(crate) async fn list_models( &self, refresh_strategy: RefreshStrategy, ) -> std::io::Result> { - // Check before consulting even a warm cache, just as turn admission checks - // the retained session route before using it. + let (config, models_manager) = self.current().await?; + self.list_models_from_snapshot(config, models_manager, refresh_strategy) + .await + } + + pub(crate) async fn list_models_from_snapshot( + &self, + config: Arc, + models_manager: SharedModelsManager, + refresh_strategy: RefreshStrategy, + ) -> std::io::Result> { + // Keep the existing policy check even for a warm catalog. A policy + // edit alone must not make the retained provider silently permissible. self.config_manager - .check_thread_model_provider(&self.config) + .check_thread_model_provider(&config) .await?; - Ok(self - .models_manager - .list_models(refresh_strategy, self.config.http_client_factory()) + Ok(models_manager + .list_models(refresh_strategy, config.http_client_factory()) .await) } } diff --git a/codex-rs/app-server/src/models_refresh_worker_tests.rs b/codex-rs/app-server/src/models_refresh_worker_tests.rs index 5356eb2af3..12b1c0834c 100644 --- a/codex-rs/app-server/src/models_refresh_worker_tests.rs +++ b/codex-rs/app-server/src/models_refresh_worker_tests.rs @@ -18,6 +18,7 @@ use codex_models_manager::manager::OpenAiModelsManager; use codex_models_manager::manager::SharedModelsManager; use codex_protocol::error::CodexErr; use codex_protocol::error::Result as CoreResult; +use codex_utils_absolute_path::AbsolutePathBuf; use pretty_assertions::assert_eq; use tempfile::tempdir; use tokio::sync::Notify; @@ -98,13 +99,13 @@ async fn refreshes_immediately_periodically_and_stops_when_dropped() { std::fs::write(&requirements_path, "model_provider = 'ollama'").unwrap(); let config_manager = crate::config_manager::ConfigManager::new_for_tests( codex_home.path().to_path_buf(), - Vec::new(), + vec![("model_provider".to_string(), "ollama".into())], LoaderOverrides::with_managed_config_path_for_tests( codex_home.path().join("managed_config.toml"), ), CloudConfigBundleLoader::default(), ); - // --oss selects the provider through typed overrides, outside ConfigManager's raw -c flags. + // The TUI forwards its typed --oss selection through the raw CLI overrides too. let config = Arc::new( ConfigBuilder::default() .codex_home(codex_home.path().to_path_buf()) @@ -122,7 +123,19 @@ async fn refreshes_immediately_periodically_and_stops_when_dropped() { endpoint.clone(), /*auth_manager*/ None, )); - let catalog = Arc::new(ModelCatalog::new(config_manager, config, models_manager)); + let auth_manager = codex_login::AuthManager::shared_from_config( + config.as_ref(), + /*enable_codex_api_key_env*/ false, + ) + .await + .expect("test auth manager"); + let catalog = Arc::new(ModelCatalog::new( + config_manager, + Some(config.cwd.to_path_buf()), + config, + Arc::clone(&models_manager), + auth_manager, + )); let worker = spawn_with_interval(&catalog, Duration::from_millis(/*millis*/ 10)); endpoint.wait_for_fetch_count(/*expected*/ 2).await; @@ -132,26 +145,37 @@ async fn refreshes_immediately_periodically_and_stops_when_dropped() { assert_eq!(endpoint.fetch_count.load(Ordering::SeqCst), 2); - // Reloading config would select the newly required provider. The catalog must - // keep validating the typed startup selection, even when only reading its cache. + // Reloading after login preserves an embedded caller's typed --oss override. + catalog.invalidate().await; + assert_eq!( + catalog.current().await.unwrap().0.model_provider_id, + "ollama" + ); + + assert!(Arc::ptr_eq( + &catalog.current().await.unwrap().1, + &models_manager + )); + + // The catalog follows a new managed route without reusing the old endpoint. std::fs::write(&requirements_path, "model_provider = 'openai'").unwrap(); - let error = catalog - .list_models(RefreshStrategy::Offline) - .await - .unwrap_err(); - assert_eq!(error.kind(), std::io::ErrorKind::PermissionDenied); - assert!( - error - .get_ref() - .unwrap() - .is::() + catalog.invalidate().await; + catalog.list_models(RefreshStrategy::Offline).await.unwrap(); + assert_eq!( + catalog.current().await.unwrap().0.model_provider_id, + "openai" + ); + std::fs::remove_file(&requirements_path).unwrap(); + catalog.invalidate().await; + assert_eq!( + catalog.current().await.unwrap().0.model_provider_id, + "ollama" ); assert_eq!(endpoint.fetch_count.load(Ordering::SeqCst), 2); } #[tokio::test] -async fn background_refresh_blocks_changed_and_invalid_requirements_then_recovers() --> anyhow::Result<()> { +async fn background_refresh_blocks_invalid_requirements_then_recovers() -> anyhow::Result<()> { let home = tempdir()?; let config = Arc::new( crate::config_manager::ConfigManager::without_managed_config_for_tests( @@ -180,7 +204,19 @@ async fn background_refresh_blocks_changed_and_invalid_requirements_then_recover endpoint.clone(), /*auth_manager*/ None, )); - let catalog = Arc::new(ModelCatalog::new(config_manager, config, models_manager)); + let auth_manager = codex_login::AuthManager::shared_from_config( + config.as_ref(), + /*enable_codex_api_key_env*/ false, + ) + .await + .expect("test auth manager"); + let catalog = Arc::new(ModelCatalog::new( + config_manager, + Some(config.cwd.to_path_buf()), + config, + models_manager, + auth_manager, + )); let feedback = CodexFeedback::new(); // This test uses Tokio's current-thread runtime, so spawned refreshes share the subscriber. let _subscriber_guard = tracing::subscriber::set_default( @@ -224,8 +260,118 @@ async fn background_refresh_blocks_changed_and_invalid_requirements_then_recover .buffer, )?; assert!(logs.contains("model catalog refresh blocked by provider requirements")); - assert!(logs.contains("error_kind=PermissionDenied")); assert!(logs.contains("error_kind=InvalidData")); assert!(!logs.contains("private-provider-token-marker")); Ok(()) } + +/// A transient cloud failure must not pin the fallback catalog after policy recovers. +#[tokio::test] +async fn catalog_reload_recovers_after_cloud_failure() -> anyhow::Result<()> { + let home = tempdir()?; + let failed = Arc::new(std::sync::atomic::AtomicBool::new(false)); + let loader_failed = Arc::clone(&failed); + let loader = CloudConfigBundleLoader::from_getter(move || { + let failed = Arc::clone(&loader_failed); + async move { + if failed.load(Ordering::SeqCst) { + Err(codex_config::CloudConfigBundleLoadError::new( + codex_config::CloudConfigBundleLoadErrorCode::RequestFailed, + /*status_code*/ None, + "test cloud timeout", + )) + } else { + Ok(Some( + CloudConfigBundleFixture::enterprise_requirement("model_provider = 'ollama'") + .into_bundle(), + )) + } + } + }); + let manager = crate::config_manager::ConfigManager::new_for_tests( + home.path().to_path_buf(), + Vec::new(), + LoaderOverrides::without_managed_config_for_tests(), + loader, + ); + let config = Arc::new(manager.load_non_project_config().await?); + let auth = codex_login::AuthManager::shared_from_config( + config.as_ref(), + /*enable_codex_api_key_env*/ false, + ) + .await?; + let models = codex_core::build_models_manager(&config, Arc::clone(&auth)); + let catalog = Arc::new(ModelCatalog::new( + manager, /*startup_cwd*/ None, config, models, auth, + )); + failed.store(true, Ordering::SeqCst); + catalog.invalidate().await; + assert_eq!(catalog.current().await?.0.model_provider_id, "openai"); + assert!(catalog.list_models(RefreshStrategy::Offline).await.is_err()); + failed.store(false, Ordering::SeqCst); + // Exercise the same online request used by the periodic background worker. + catalog.list_models(RefreshStrategy::Online).await?; + assert_eq!(catalog.current().await?.0.model_provider_id, "ollama"); + assert!( + !catalog + .list_models(RefreshStrategy::Offline) + .await? + .is_empty() + ); + Ok(()) +} + +/// Repairing a project config after fallback must restore that project's local model catalog. +#[tokio::test] +async fn catalog_reload_recovers_original_project_after_startup_fallback() -> anyhow::Result<()> { + let home = tempdir()?; + let project = tempdir()?; + let project_path = AbsolutePathBuf::from_absolute_path(project.path())? + .canonicalize()? + .to_path_buf(); + std::fs::create_dir(project_path.join(".codex"))?; + std::fs::write( + home.path().join("config.toml"), + toml::to_string(&serde_json::json!({ + "projects": {project_path.to_string_lossy(): {"trust_level": "trusted"}} + }))?, + )?; + let project_config = project_path.join(".codex/config.toml"); + std::fs::write(&project_config, "model_catalog_json = [")?; + let manager = crate::config_manager::ConfigManager::without_managed_config_for_tests( + home.path().to_path_buf(), + ); + let startup = manager + .load_startup_config(Some(project_path.clone())) + .await?; + assert!(startup.used_defaults); + let config = Arc::new(startup.config); + let auth = codex_login::AuthManager::shared_from_config( + config.as_ref(), + /*enable_codex_api_key_env*/ false, + ) + .await?; + let models = codex_core::build_models_manager(&config, Arc::clone(&auth)); + let catalog = ModelCatalog::new(manager, Some(project_path.clone()), config, models, auth); + let mut model = codex_models_manager::bundled_models_response()? + .models + .remove(0); + model.slug = "project-model".into(); + std::fs::write( + project_path.join(".codex/catalog.json"), + serde_json::to_vec(&serde_json::json!({"models": [model]}))?, + )?; + std::fs::write(&project_config, "model_catalog_json = 'catalog.json'")?; + catalog.invalidate().await; + let (config, _) = catalog.current().await?; + assert_eq!(config.cwd.as_path(), project_path); + let models = catalog.list_models(RefreshStrategy::Offline).await?; + assert_eq!( + models + .iter() + .map(|model| model.id.as_str()) + .collect::>(), + vec!["project-model"] + ); + Ok(()) +} diff --git a/codex-rs/app-server/src/request_processors/account_processor.rs b/codex-rs/app-server/src/request_processors/account_processor.rs index b8d56053b1..5fc3c75ac3 100644 --- a/codex-rs/app-server/src/request_processors/account_processor.rs +++ b/codex-rs/app-server/src/request_processors/account_processor.rs @@ -5,6 +5,7 @@ use super::bedrock_auth::ensure_user_model_provider_can_be_bedrock; use super::*; use crate::auth_mode::auth_mode_to_api; use crate::external_auth::ExternalAuthBridge; +use crate::model_catalog::ModelCatalog; use crate::outgoing_message::AccountNotification; use chrono::DateTime; use codex_app_server_protocol::DesktopOnboardingEntrypoint; @@ -101,6 +102,7 @@ pub(crate) struct AccountRequestProcessor { outgoing: Arc, config: Arc, config_manager: ConfigManager, + model_catalog: Arc, active_login: Arc>>, workspace_routing: Arc>>, workspace_routing_fetches: Arc>, @@ -118,6 +120,7 @@ impl AccountRequestProcessor { outgoing: Arc, config: Arc, config_manager: ConfigManager, + model_catalog: Arc, ) -> Arc { let gateway_notifications = crate::gateway_oauth_notifications::spawn( Arc::clone(&auth_manager), @@ -136,6 +139,7 @@ impl AccountRequestProcessor { outgoing, config, config_manager, + model_catalog, active_login: Arc::new(Mutex::new(None)), gateway_login: Arc::new(std::sync::Mutex::new(/*t*/ None)), gateway_client: Arc::new(std::sync::Mutex::new(/*t*/ None)), @@ -485,6 +489,9 @@ impl AccountRequestProcessor { .await .map(|()| LoginAccountResponse::ApiKey {}); let logged_in = result.is_ok(); + if logged_in { + self.model_catalog.invalidate().await; + } self.outgoing.send_result(request_id, result).await; if logged_in { @@ -573,6 +580,9 @@ impl AccountRequestProcessor { } .await; let logged_in = result.is_ok(); + if logged_in { + self.model_catalog.invalidate().await; + } self.outgoing.send_result(request_id, result).await; if logged_in { @@ -845,6 +855,9 @@ impl AccountRequestProcessor { .login_chatgpt_auth_tokens_response(access_token, chatgpt_account_id, chatgpt_plan_type) .await; let logged_in = result.is_ok(); + if logged_in { + self.model_catalog.invalidate().await; + } self.outgoing.send_result(request_id, result).await; if logged_in { @@ -986,6 +999,9 @@ impl AccountRequestProcessor { payload_v2.error = Some("account changed before sign-in completed".into()); } } + if payload_v2.success { + self.model_catalog.invalidate().await; + } self.send_account_login_notifications(payload_v2).await; } @@ -1059,6 +1075,7 @@ impl AccountRequestProcessor { clear_user_model_provider_if_bedrock(&self.config_manager, &config).await?; } + self.model_catalog.invalidate().await; *self.workspace_routing.lock().await = None; Self::maybe_refresh_plugin_caches_for_current_config( diff --git a/codex-rs/app-server/src/request_processors/account_processor/workspace_routing_tests.rs b/codex-rs/app-server/src/request_processors/account_processor/workspace_routing_tests.rs index 7ae5fff4da..dafe4e8e98 100644 --- a/codex-rs/app-server/src/request_processors/account_processor/workspace_routing_tests.rs +++ b/codex-rs/app-server/src/request_processors/account_processor/workspace_routing_tests.rs @@ -98,12 +98,20 @@ async fn background_routing_skips_config_until_chatgpt_sign_in( sender, codex_analytics::AnalyticsEventsClient::disabled(), )); + let model_catalog = Arc::new(crate::model_catalog::ModelCatalog::new( + manager.clone(), + Some(config.cwd.to_path_buf()), + Arc::clone(&config), + threads.get_models_manager(), + Arc::clone(&auth_manager), + )); let processor = AccountRequestProcessor::new( Arc::clone(&auth_manager), threads, outgoing, config, manager, + model_catalog, ); let initial_loads = loads.load(Ordering::SeqCst); for _ in 0..3 { diff --git a/codex-rs/app-server/src/request_processors/catalog_processor.rs b/codex-rs/app-server/src/request_processors/catalog_processor.rs index e8ea00fd47..efbed26c5c 100644 --- a/codex-rs/app-server/src/request_processors/catalog_processor.rs +++ b/codex-rs/app-server/src/request_processors/catalog_processor.rs @@ -178,10 +178,15 @@ impl CatalogRequestProcessor { &self, params: ModelListParams, ) -> Result, JSONRPCErrorError> { + let (config, models_manager) = self + .model_catalog + .current() + .await + .map_err(|err| config_load_error(&err))?; // Gate the same provider used by the catalog, including when its model cache is warm. // Resolving credentials may refresh them, but explicit host policy prevents browser login. if let Some(gateway) = codex_model_provider::create_model_provider( - self.config.model_provider.clone(), + config.model_provider.clone(), Some(self.thread_manager.auth_manager()), ) .gateway_auth_manager() @@ -189,7 +194,7 @@ impl CatalogRequestProcessor { { // Refreshing credentials can contact the gateway before the catalog's own check. self.config_manager - .check_thread_model_provider(&self.config) + .check_thread_model_provider(&config) .await .map_err(|err| config_load_error(&err))?; if gateway.resolve_access_token().await.is_err() { @@ -198,9 +203,9 @@ impl CatalogRequestProcessor { .load_latest_config(/*fallback_cwd*/ None) .await .map_err(|err| config_load_error(&err))?; - // Login RPCs use current config, while the catalog retains its startup provider. - if current.model_provider_id != self.config.model_provider_id - || current.model_provider != self.config.model_provider + // Configuration edits without an account transition still require a restart to refresh the model catalog. + if current.model_provider_id != config.model_provider_id + || current.model_provider != config.model_provider { return Err(invalid_request( "Model provider settings changed. Restart Codex to apply them, then retry fetching the model list", @@ -211,7 +216,7 @@ impl CatalogRequestProcessor { )); } } - self.list_models(params) + self.list_models(params, config, models_manager) .await .map(|response| Some(response.into())) } @@ -280,6 +285,8 @@ impl CatalogRequestProcessor { async fn list_models( &self, params: ModelListParams, + config: Arc, + models_manager: codex_models_manager::manager::SharedModelsManager, ) -> Result { let ModelListParams { limit, @@ -288,7 +295,11 @@ impl CatalogRequestProcessor { } = params; let presets = self .model_catalog - .list_models(codex_models_manager::manager::RefreshStrategy::OnlineIfUncached) + .list_models_from_snapshot( + config, + models_manager, + codex_models_manager::manager::RefreshStrategy::OnlineIfUncached, + ) .await .map_err(|err| config_load_error(&err))?; let models = supported_models(presets, include_hidden.unwrap_or(false)); diff --git a/codex-rs/app-server/src/request_processors/config_processor.rs b/codex-rs/app-server/src/request_processors/config_processor.rs index 1343329ae1..d903a6fce2 100644 --- a/codex-rs/app-server/src/request_processors/config_processor.rs +++ b/codex-rs/app-server/src/request_processors/config_processor.rs @@ -4,6 +4,7 @@ use crate::config_manager::ConfigManager; use crate::config_manager_service::ConfigManagerError; use crate::error_code::internal_error; use crate::error_code::invalid_request; +use crate::model_catalog::ModelCatalog; use crate::outgoing_message::ConnectionRequestId; use crate::outgoing_message::OutgoingMessageSender; use codex_analytics::AnalyticsEventsClient; @@ -83,6 +84,7 @@ pub(crate) struct ConfigRequestProcessor { outgoing: Arc, config_manager: ConfigManager, thread_manager: Arc, + model_catalog: Arc, analytics_events_client: AnalyticsEventsClient, } @@ -91,12 +93,14 @@ impl ConfigRequestProcessor { outgoing: Arc, config_manager: ConfigManager, thread_manager: Arc, + model_catalog: Arc, analytics_events_client: AnalyticsEventsClient, ) -> Self { Self { outgoing, config_manager, thread_manager, + model_catalog, analytics_events_client, } } @@ -328,6 +332,11 @@ impl ConfigRequestProcessor { .set_api_key_model_discovery_enabled( config.features.enabled(Feature::ApiKeyModelDiscovery), ); + self.model_catalog + .set_api_key_model_discovery_enabled( + config.features.enabled(Feature::ApiKeyModelDiscovery), + ) + .await; if should_start_background_rollout_migration && config.features.enabled(feature) { self.thread_manager.start_background_rollout_migration(); } diff --git a/codex-rs/app-server/src/user_verification_test_support.rs b/codex-rs/app-server/src/user_verification_test_support.rs index d2096bc1f1..6367af1bd7 100644 --- a/codex-rs/app-server/src/user_verification_test_support.rs +++ b/codex-rs/app-server/src/user_verification_test_support.rs @@ -157,6 +157,7 @@ impl Harness { outgoing: Arc::clone(&outgoing), analytics_events_client: AnalyticsEventsClient::disabled(), arg0_paths: Arg0DispatchPaths::default(), + startup_cwd: Some(config.cwd.to_path_buf()), config, config_manager, environment_manager: Arc::new(EnvironmentManager::default_for_tests()), diff --git a/codex-rs/app-server/tests/suite/v2/account.rs b/codex-rs/app-server/tests/suite/v2/account.rs index 94a3eb2e45..fa6159d6bd 100644 --- a/codex-rs/app-server/tests/suite/v2/account.rs +++ b/codex-rs/app-server/tests/suite/v2/account.rs @@ -2687,12 +2687,44 @@ async fn login_account_chatgpt_start_can_be_cancelled() -> Result<()> { #[serial(login_port)] async fn login_account_chatgpt_uses_oauth_overrides() -> Result<()> { let codex_home = TempDir::new()?; - create_config_toml(codex_home.path(), CreateConfigTomlParams::default())?; let mock_server = MockServer::start().await; + create_config_toml( + codex_home.path(), + CreateConfigTomlParams { + chatgpt_base_url: Some(format!("{}/backend-api", mock_server.uri())), + ..Default::default() + }, + )?; + app_test_support::mount_workspace_routing(&mock_server).await; + let requirements = format!( + "model_provider = 'gateway'\n[model_providers.gateway]\nname = 'Gateway'\nrequires_openai_auth = true\nbase_url = '{0}/v1'\nmodel_catalog_url = '{0}/v1/models'", + mock_server.uri(), + ); + Mock::given(method("GET")) + .and(path("/backend-api/wham/config/bundle")) + .respond_with(ResponseTemplate::new(200).set_body_json(json!({ + "requirements_toml": {"enterprise_managed": [{ + "id": "gateway", "name": "Gateway", "contents": requirements, + }]} + }))) + .mount(&mock_server) + .await; + let mut model = codex_models_manager::bundled_models_response()? + .models + .remove(0); + model.slug = "workspace-gateway-model".into(); + model.visibility = codex_protocol::openai_models::ModelVisibility::List; + Mock::given(method("GET")) + .and(path("/v1/models")) + .and(header("authorization", "Bearer access-token-123")) + .respond_with(ResponseTemplate::new(200).set_body_json(json!({"models": [model]}))) + .expect(1..) + .mount(&mock_server) + .await; let id_token = encode_id_token( &ChatGptIdTokenClaims::new() .email("staging@example.com") - .plan_type("pro") + .plan_type("enterprise") .chatgpt_account_id(WORKSPACE_ID_EMBEDDED), )?; mock_oauth_token(&mock_server, &id_token).await; @@ -2711,6 +2743,15 @@ async fn login_account_chatgpt_uses_oauth_overrides() -> Result<()> { .build_initialized_with_timeout(DEFAULT_READ_TIMEOUT) .await?; + let request = mcp.send_list_models_request(Default::default()).await?; + let initial: codex_app_server_protocol::ModelListResponse = mcp.read_response(request).await?; + assert!( + !initial + .data + .iter() + .any(|model| model.id == "workspace-gateway-model") + ); + let request_id = mcp.send_login_account_chatgpt_request().await?; let login: LoginAccountResponse = timeout(DEFAULT_READ_TIMEOUT, mcp.read_response(request_id)).await??; @@ -2789,6 +2830,18 @@ async fn login_account_chatgpt_uses_oauth_overrides() -> Result<()> { onboarding_entrypoint: None, } ); + // Listing immediately after asynchronous login completion must use the new cloud provider. + let request = mcp.send_list_models_request(Default::default()).await?; + let models: codex_app_server_protocol::ModelListResponse = mcp.read_response(request).await?; + assert_eq!( + models + .data + .iter() + .map(|model| model.id.as_str()) + .collect::>(), + vec!["workspace-gateway-model"] + ); + mock_server.verify().await; Ok(()) } diff --git a/codex-rs/app-server/tests/suite/v2/gateway_oauth_tests.rs b/codex-rs/app-server/tests/suite/v2/gateway_oauth_tests.rs index d28243b7ad..1b9de1cd96 100644 --- a/codex-rs/app-server/tests/suite/v2/gateway_oauth_tests.rs +++ b/codex-rs/app-server/tests/suite/v2/gateway_oauth_tests.rs @@ -136,6 +136,42 @@ async fn model_list_requests_restart_after_gateway_provider_changes() -> Result< Ok(()) } +/// Account changes reload the catalog before validating a retained OAuth gateway. +#[tokio::test] +async fn model_list_leaves_oauth_gateway_after_account_change() -> Result<()> { + let oauth = MockServer::start().await; + let home = TempDir::new()?; + std::fs::write(home.path().join("config.toml"), gateway_config(&oauth))?; + let mut server = gateway_server(home.path()).await?; + std::fs::write(home.path().join("config.toml"), "")?; + std::fs::write( + home.path().join("requirements.toml"), + "model_provider = 'openai'", + )?; + let id = server + .send_login_account_api_key_request("sk-catalog-test") + .await?; + let _: codex_app_server_protocol::LoginAccountResponse = server.read_response(id).await?; + server + .read_stream_until_notification_message("account/updated") + .await?; + let models: codex_app_server_protocol::ModelListResponse = server + .request(|request_id| ClientRequest::ModelList { + request_id, + params: codex_app_server_protocol::ModelListParams::default(), + }) + .await?; + assert!(!models.data.is_empty()); + assert!( + oauth + .received_requests() + .await + .expect("gateway requests") + .is_empty() + ); + Ok(()) +} + #[tokio::test] async fn token_exchange_failure_completes_login_and_updates_readiness() -> Result<()> { let home = TempDir::new()?; diff --git a/codex-rs/app-server/tests/suite/v2/model_list.rs b/codex-rs/app-server/tests/suite/v2/model_list.rs index 9a78ca5e34..c9604f1b09 100644 --- a/codex-rs/app-server/tests/suite/v2/model_list.rs +++ b/codex-rs/app-server/tests/suite/v2/model_list.rs @@ -102,6 +102,31 @@ requires_openai_auth = true .with_env_overrides(&[("OPENAI_API_KEY", None), ("CODEX_API_KEY", None)]) .build_initialized() .await?; + // Exercise runtime toggles after login has replaced the startup catalog manager. + if let Some(enabled) = app_enablement { + let _: ExperimentalFeatureEnablementSetResponse = mcp + .request( + |request_id| ClientRequest::ExperimentalFeatureEnablementSet { + request_id, + params: ExperimentalFeatureEnablementSetParams { + enablement: [("api_key_model_discovery".to_string(), !enabled)].into(), + }, + }, + ) + .await?; + } + let config_path = codex_home.path().join("config.toml"); + let config = std::fs::read_to_string(&config_path)? + .replace("name = \"OpenAI\"", "name = \"After login\""); + std::fs::write(config_path, config)?; + let login = mcp.send_login_account_api_key_request("test-key").await?; + let _: codex_app_server_protocol::LoginAccountResponse = mcp.read_response(login).await?; + let _: ModelListResponse = mcp + .request(|request_id| ClientRequest::ModelList { + request_id, + params: ModelListParams::default(), + }) + .await?; let mut bundled = codex_models_manager::bundled_models_response()?.models; bundled.sort_by_key(|model| model.priority); let mut bundled = ModelPreset::filter_by_auth( diff --git a/codex-rs/app-server/tests/suite/v2/model_list_requirements_tests.rs b/codex-rs/app-server/tests/suite/v2/model_list_requirements_tests.rs index 77964124dd..6c2f24724d 100644 --- a/codex-rs/app-server/tests/suite/v2/model_list_requirements_tests.rs +++ b/codex-rs/app-server/tests/suite/v2/model_list_requirements_tests.rs @@ -1,23 +1,26 @@ //! Exercises live catalog routing through the public model/list RPC. use anyhow::Result; -use app_test_support::ChatGptAuthFixture; use app_test_support::TestAppServer; -use app_test_support::write_chatgpt_auth; use codex_app_server_protocol::ClientRequest; +use codex_app_server_protocol::LoginAccountResponse; +use codex_app_server_protocol::LogoutAccountResponse; use codex_app_server_protocol::ModelListParams; use codex_app_server_protocol::ModelListResponse; use codex_app_server_protocol::RequestId; use codex_config::types::AuthCredentialsStoreMode; use codex_protocol::openai_models::ModelInfo; use codex_protocol::openai_models::ModelsResponse; -use core_test_support::responses::mount_models_once; use pretty_assertions::assert_eq; use serde_json::json; use std::time::Duration; use tempfile::TempDir; use test_case::test_case; +use wiremock::Mock; use wiremock::MockServer; +use wiremock::ResponseTemplate; +use wiremock::matchers::method; +use wiremock::matchers::path_regex; fn catalog(slug: &str) -> Result { Ok(ModelsResponse { @@ -45,39 +48,61 @@ async fn list_models(server: &mut TestAppServer) -> Result { .await } +async fn sign_in(server: &mut TestAppServer) -> Result<()> { + let id = server + .send_login_account_api_key_request("sk-catalog-test") + .await?; + let _: LoginAccountResponse = server.read_response(id).await?; + Ok(()) +} + #[test_case("other"; "selection_changes")] #[test_case("gateway"; "definition_changes")] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn model_list_blocks_noncompliant_cached_provider_until_requirements_allow_it( +/// Switching managed provider selection or definition refreshes the catalog in +/// the same server, while invalid requirements still block catalog access. +async fn model_list_follows_changed_provider_without_restart( required_selection: &str, ) -> Result<()> { let gateway = MockServer::start().await; let other = MockServer::start().await; - mount_models_once(&gateway, catalog("gateway-model")?).await; - mount_models_once(&other, catalog("other-model")?).await; + for (server, slug) in [(&gateway, "gateway-model"), (&other, "other-model")] { + Mock::given(method("GET")) + .and(path_regex(".*/models$")) + .respond_with(ResponseTemplate::new(200).set_body_json(catalog(slug)?)) + .mount(server) + .await; + } let home = TempDir::new()?; let providers = format!( r#" [model_providers.gateway] name = "Gateway" base_url = "{}/v1" +model_catalog_url = "{}/v1/models" requires_openai_auth = true [model_providers.other] name = "Other" base_url = "{}/v1" +model_catalog_url = "{}/v1/models" requires_openai_auth = true "#, gateway.uri(), + gateway.uri(), + other.uri(), other.uri(), ); std::fs::write( home.path().join("config.toml"), - format!("model_provider = 'gateway'\n{providers}"), + format!( + "model_provider = 'gateway'\n[features]\napi_key_model_discovery = true\n{providers}" + ), )?; - write_chatgpt_auth( + codex_login::login_with_api_key( home.path(), - ChatGptAuthFixture::new("chatgpt-access-token").plan_type("pro"), + "sk-initial-catalog-test", AuthCredentialsStoreMode::File, + codex_login::AuthKeyringBackendKind::default(), )?; let requirements_path = home.path().join("requirements.toml"); std::fs::write( @@ -85,25 +110,12 @@ requires_openai_auth = true format!("model_provider = 'gateway'\n{providers}"), )?; let mut server = TestAppServer::builder() + .with_mock_chatgpt_backend() .with_codex_home(home.path()) .with_env_overrides(&[("OPENAI_API_KEY", None)]) - .build_initialized() + .build_initialized_with_timeout(Duration::from_secs(/*secs*/ 60)) .await?; - // Let the startup refresh populate the cache before exercising cached RPCs. - tokio::time::timeout(Duration::from_secs(/*secs*/ 10), async { - loop { - if let Ok(bytes) = tokio::fs::read(home.path().join("models_cache.json")).await - && let Ok(cache) = serde_json::from_slice::(&bytes) - && cache["models"][0]["slug"] == "gateway-model" - { - break; - } - tokio::time::sleep(Duration::from_millis(/*millis*/ 10)).await; - } - }) - .await?; - let initial = list_models(&mut server).await?; assert_eq!( initial @@ -113,23 +125,6 @@ requires_openai_auth = true .collect::>(), vec!["gateway-model"] ); - assert_eq!(list_models(&mut server).await?, initial); - assert_eq!( - gateway - .received_requests() - .await - .expect("request recording enabled") - .len(), - 1 - ); - assert!( - other - .received_requests() - .await - .expect("request recording enabled") - .is_empty() - ); - let updated_providers = if required_selection == "gateway" { providers.replace(&gateway.uri(), &other.uri()) } else { @@ -137,34 +132,29 @@ requires_openai_auth = true }; let updated = format!("model_provider = '{required_selection}'\n{updated_providers}"); std::fs::write(&requirements_path, &updated)?; - let id = server - .send_raw_request("model/list", Some(json!({}))) - .await?; - let error = server - .read_stream_until_error_message(RequestId::Integer(id)) - .await?; - assert_eq!(error.error, codex_app_server_protocol::JSONRPCErrorError { - code: -32600, - message: "failed to load configuration: Your organization's required model provider settings changed. Restart Codex to apply them; this request was not sent".to_string(), - data: None, - }); + sign_in(&mut server).await?; + let switched = list_models(&mut server).await?; assert_eq!( + switched + .data + .iter() + .map(|model| model.id.as_str()) + .collect::>(), + vec!["other-model"] + ); + let requests_before = [ gateway .received_requests() .await - .expect("request recording enabled") + .expect("recorded provider requests") .len(), - 1 - ); - assert!( other .received_requests() .await - .expect("request recording enabled") - .is_empty() - ); - - // A warm catalog must not hide a policy load failure or make any stale request. + .expect("recorded provider requests") + .len(), + ]; + // A warm catalog must not hide a policy load failure or send to either provider. std::fs::write(&requirements_path, "model_provider = []")?; let id = server .send_raw_request("model/list", Some(json!({}))) @@ -175,31 +165,107 @@ requires_openai_auth = true assert_eq!(error.error.code, -32600); assert!(error.error.message.contains("failed to load configuration")); assert_eq!( - gateway - .received_requests() - .await - .expect("request recording enabled") - .len(), - 1 + [ + gateway + .received_requests() + .await + .expect("recorded provider requests") + .len(), + other + .received_requests() + .await + .expect("recorded provider requests") + .len(), + ], + requests_before, ); - assert!( - other - .received_requests() - .await - .expect("request recording enabled") - .is_empty() - ); - - // Removing the requirement makes the retained provider permissible again. + // Removing the requirement restores the user-configured provider in this process. std::fs::remove_file(requirements_path)?; + sign_in(&mut server).await?; assert_eq!(list_models(&mut server).await?, initial); + Ok(()) +} + +/// Warm lists reuse their configuration; a completed login reloads the catalog once. +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn model_list_reuses_catalog_until_account_change() -> Result<()> { + let home = TempDir::new()?; + let catalog_path = home.path().join("catalog.json"); + std::fs::write(&catalog_path, serde_json::to_vec(&catalog("first-model")?)?)?; + let mut config = toml::map::Map::new(); + config.insert( + "model_catalog_json".to_string(), + toml::Value::String(catalog_path.to_string_lossy().into_owned()), + ); + std::fs::write(home.path().join("config.toml"), toml::to_string(&config)?)?; + let mut server = TestAppServer::builder() + .with_mock_chatgpt_backend() + .with_codex_home(home.path()) + .with_env_overrides(&[("OPENAI_API_KEY", None)]) + .build_initialized() + .await?; + let initial = list_models(&mut server).await?; assert_eq!( - gateway - .received_requests() - .await - .expect("request recording enabled") - .len(), - 1 + initial + .data + .iter() + .map(|model| model.id.as_str()) + .collect::>(), + vec!["first-model"] + ); + // A full config reload would try to parse this invalid catalog. + std::fs::write(&catalog_path, "not JSON")?; + assert_eq!(list_models(&mut server).await?, initial); + std::fs::write( + &catalog_path, + serde_json::to_vec(&catalog("second-model")?)?, + )?; + assert_eq!(list_models(&mut server).await?, initial); + sign_in(&mut server).await?; + let changed = list_models(&mut server).await?; + assert_eq!( + changed + .data + .iter() + .map(|model| model.id.as_str()) + .collect::>(), + vec!["second-model"] + ); + std::fs::write( + &catalog_path, + serde_json::to_vec(&catalog("logged-out-model")?)?, + )?; + let id = server.send_logout_account_request().await?; + let _: LogoutAccountResponse = server.read_response(id).await?; + assert_eq!( + list_models(&mut server) + .await? + .data + .iter() + .map(|model| model.id.as_str()) + .collect::>(), + vec!["logged-out-model"] ); Ok(()) } + +/// Account transitions preserve the non-strict startup fallback for malformed user config. +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn model_list_preserves_invalid_startup_config_fallback() -> Result<()> { + let home = TempDir::new()?; + std::fs::write(home.path().join("config.toml"), "model = [")?; + let mut server = TestAppServer::builder() + .with_mock_chatgpt_backend() + .with_codex_home(home.path()) + .with_env_overrides(&[("OPENAI_API_KEY", None)]) + .build_initialized_with_timeout(Duration::from_secs(/*secs*/ 60)) + .await?; + let initial = list_models(&mut server).await?; + assert!(!initial.data.is_empty()); + sign_in(&mut server).await?; + assert!(!list_models(&mut server).await?.data.is_empty()); + let id = server.send_logout_account_request().await?; + let _: LogoutAccountResponse = server.read_response(id).await?; + assert!(!list_models(&mut server).await?.data.is_empty()); + Ok(()) +} diff --git a/codex-rs/tui/src/startup_orchestration.rs b/codex-rs/tui/src/startup_orchestration.rs index a96e25bbfd..ca871087c4 100644 --- a/codex-rs/tui/src/startup_orchestration.rs +++ b/codex-rs/tui/src/startup_orchestration.rs @@ -76,7 +76,7 @@ pub(super) async fn run_main_inner( let raw_overrides = cli.config_overrides.raw_overrides.clone(); // `oss` model provider. let overrides_cli = codex_utils_cli::CliConfigOverrides { raw_overrides }; - let cli_kv_overrides = match overrides_cli.parse_overrides() { + let mut cli_kv_overrides = match overrides_cli.parse_overrides() { // Parse `-c` overrides from the CLI. Ok(v) => v, #[allow(clippy::print_stderr)] @@ -421,6 +421,15 @@ pub(super) async fn run_main_inner( None }; + // Pass the --oss provider to the embedded app-server so catalog reloads keep + // the launch choice after workspace requirements are removed. + if let Some(provider) = &model_provider_override { + cli_kv_overrides.push(( + "model_provider".to_string(), + toml::Value::String(provider.clone()), + )); + } + // When using `--oss`, let the bootstrapper pick the model based on selected provider let model = if let Some(model) = &cli.model { Some(model.clone()) From 160b2b1ef62114eeb41e41e5e3be0000d944b713 Mon Sep 17 00:00:00 2001 From: lsingh-oai Date: Thu, 15 Oct 2026 02:59:54 +0000 Subject: [PATCH 082/155] Preserve ChatGPT authentication for Gov MCP servers (#54170) ## Why MCP servers at `https://gov.chatgpt.com` were treated as untrusted for ChatGPT authentication and switched to OAuth, preventing local Gov Apps from retaining the ChatGPT auth provider. ## What changed Trust the `https://gov.chatgpt.com` origin alongside the existing ChatGPT origin when resolving MCP server authentication. Origin matching preserves scheme, host, and port restrictions. ## Testing Add regression coverage for Gov Apps URL construction, trusted origin normalization, rejection of lookalike hosts and nonstandard schemes or ports, and retention of the local ChatGPT auth provider. Verify that explicit OAuth servers and servers in remote environments do not receive the host provider. GitOrigin-RevId: 7ceaf7c524d963005d9f23204489bbde269f0dd5 --- .../codex-mcp/src/connection_manager_tests.rs | 57 ++++++++++++++++ codex-rs/codex-mcp/src/mcp/mod.rs | 7 +- codex-rs/codex-mcp/src/mcp/mod_tests.rs | 67 ++++++++++++++++--- 3 files changed, 119 insertions(+), 12 deletions(-) diff --git a/codex-rs/codex-mcp/src/connection_manager_tests.rs b/codex-rs/codex-mcp/src/connection_manager_tests.rs index 4bed4eebb0..482f346557 100644 --- a/codex-rs/codex-mcp/src/connection_manager_tests.rs +++ b/codex-rs/codex-mcp/src/connection_manager_tests.rs @@ -4488,6 +4488,63 @@ fn hosted_actor_credentials_are_only_available_to_host_owned_mcp_servers() { ); } +#[test] +fn gov_codex_apps_retain_local_chatgpt_auth_provider() -> anyhow::Result<()> { + let codex_home = tempdir()?; + let auth = CodexAuth::create_dummy_chatgpt_auth_for_testing(); + let provider = codex_model_provider::auth_provider_from_auth(&auth); + let mut config = crate::mcp::tests::test_mcp_config(codex_home.path().to_path_buf()); + config.chatgpt_base_url = "https://gov.chatgpt.com/backend-api/".to_string(); + config.apps_enabled = true; + + let local_config = crate::codex_apps_mcp_server_config( + &config.chatgpt_base_url, + /*apps_mcp_product_sku*/ None, + /*originator*/ None, + ); + let mut remote_config = local_config.clone(); + remote_config.environment_id = "customer-executor".to_string(); + let mut custom_oauth = local_config.clone(); + custom_oauth.auth = McpServerAuth::OAuth; + + let mut catalog = crate::ResolvedMcpCatalog::builder(); + catalog.register(crate::McpServerRegistration::from_hosted_apps( + "test-host", + /*contribution_order*/ 0, + local_config, + )); + catalog.register(crate::McpServerRegistration::from_config( + "custom-oauth".to_string(), + custom_oauth, + )); + catalog.register(crate::McpServerRegistration::from_config( + "remote-gov".to_string(), + remote_config, + )); + config.mcp_server_catalog = catalog.build(); + + let servers = crate::effective_mcp_servers(&config, Some(&auth)); + let local = &servers[CODEX_APPS_MCP_SERVER_NAME]; + assert_eq!(local.config().auth, McpServerAuth::ChatGpt); + let retained = chatgpt_auth_provider_for_server(local, Some(Arc::clone(&provider))) + .expect("local Gov Apps must retain ChatGPT authentication"); + assert!( + Arc::ptr_eq(&provider, &retained), + "server selection must preserve the supplied provider" + ); + + assert_eq!(servers["custom-oauth"].config().auth, McpServerAuth::OAuth); + assert_eq!(servers["remote-gov"].config().auth, McpServerAuth::ChatGpt); + for name in ["custom-oauth", "remote-gov"] { + assert!( + chatgpt_auth_provider_for_server(&servers[name], Some(Arc::clone(&provider))).is_none(), + "{name} must not receive the host ChatGPT provider" + ); + } + + Ok(()) +} + #[tokio::test] async fn executor_owned_chatgpt_mcp_accepts_only_safe_explicit_authorization() -> anyhow::Result<()> { diff --git a/codex-rs/codex-mcp/src/mcp/mod.rs b/codex-rs/codex-mcp/src/mcp/mod.rs index c41c66e062..137f1bff04 100644 --- a/codex-rs/codex-mcp/src/mcp/mod.rs +++ b/codex-rs/codex-mcp/src/mcp/mod.rs @@ -374,9 +374,10 @@ fn is_trusted_chatgpt_mcp_server( return false; } - if url::Url::parse(CHATGPT_CODEX_BASE_URL) - .ok() - .is_some_and(|chatgpt_url| server_url.origin() == chatgpt_url.origin()) + if [CHATGPT_CODEX_BASE_URL, "https://gov.chatgpt.com"] + .into_iter() + .filter_map(|base_url| url::Url::parse(base_url).ok()) + .any(|trusted_url| server_url.origin() == trusted_url.origin()) { return true; } diff --git a/codex-rs/codex-mcp/src/mcp/mod_tests.rs b/codex-rs/codex-mcp/src/mcp/mod_tests.rs index 248e0956e5..8332b18048 100644 --- a/codex-rs/codex-mcp/src/mcp/mod_tests.rs +++ b/codex-rs/codex-mcp/src/mcp/mod_tests.rs @@ -437,6 +437,10 @@ fn codex_apps_mcp_url_for_base_url_uses_plugin_service_paths() { codex_apps_mcp_url_for_base_url("https://chat.openai.com"), "https://chat.openai.com/backend-api/ps/mcp" ); + assert_eq!( + codex_apps_mcp_url_for_base_url("https://gov.chatgpt.com/backend-api/"), + "https://gov.chatgpt.com/backend-api/ps/mcp" + ); assert_eq!( codex_apps_mcp_url_for_base_url("http://localhost:8080/api/codex"), "http://localhost:8080/api/codex/ps/mcp" @@ -595,10 +599,52 @@ fn effective_mcp_servers_require_catalog_registration() { } #[test] -fn effective_mcp_servers_preserve_chatgpt_auth_for_staging() { +fn effective_mcp_servers_preserve_chatgpt_auth_for_trusted_origins() { + for (base_url, server_url) in [ + ("https://chatgpt-staging.com", "https://chatgpt-staging.com"), + ( + "https://preview.chatgpt-staging.com", + "https://preview.chatgpt-staging.com", + ), + ("https://gov.chatgpt.com", "https://chatgpt.com"), + ( + "https://chatgpt.com", + "https://gov.chatgpt.com/backend-api/", + ), + ("https://chatgpt.com", "https://GOV.CHATGPT.COM:443"), + ] { + let mut config = test_mcp_config(PathBuf::new()); + config.chatgpt_base_url = base_url.to_string(); + let server = codex_apps_mcp_server_config( + server_url, /*apps_mcp_product_sku*/ None, /*originator*/ None, + ); + let mut catalog = ResolvedMcpCatalog::builder(); + catalog.register(McpServerRegistration::from_config( + "trusted".to_string(), + server, + )); + config.mcp_server_catalog = catalog.build(); + + let effective = effective_mcp_servers(&config, /*auth*/ None); + + assert_eq!( + effective["trusted"].config().auth, + McpServerAuth::ChatGpt, + "backend {base_url}, server {server_url}", + ); + } +} + +#[test] +fn effective_mcp_servers_reject_untrusted_origins_for_chatgpt_auth() { for url in [ - "https://chatgpt-staging.com", - "https://preview.chatgpt-staging.com", + "http://gov.chatgpt.com", + "https://gov.chatgpt.com:8443", + "https://gov.chatgpt.com.evil.example", + "https://sub.gov.chatgpt.com", + "https://gov.chatgpt.com.", + "https://gov.chatgpt.com@evil.example", + "https://example.com", ] { let mut config = test_mcp_config(PathBuf::new()); config.chatgpt_base_url = url.to_string(); @@ -607,15 +653,18 @@ fn effective_mcp_servers_preserve_chatgpt_auth_for_staging() { ); let mut catalog = ResolvedMcpCatalog::builder(); catalog.register(McpServerRegistration::from_config( - "staging".to_string(), - server.clone(), + "untrusted".to_string(), + server, )); config.mcp_server_catalog = catalog.build(); - let configured = HashMap::from([("staging".to_string(), server)]); - let effective = - effective_mcp_servers_from_configured(configured, &config, /*auth*/ None); - assert_eq!(effective["staging"].config().auth, McpServerAuth::ChatGpt); + let effective = effective_mcp_servers(&config, /*auth*/ None); + + assert_eq!( + effective["untrusted"].config().auth, + McpServerAuth::OAuth, + "server {url}", + ); } } From bb64b894fd67158be0f874872e6d7bfe717e7368 Mon Sep 17 00:00:00 2001 From: Benjamin Carlsson Date: Thu, 15 Oct 2026 03:42:31 +0000 Subject: [PATCH 083/155] Retire worktree and voice feature flags (#54175) ## What changed - Remove feature-flag checks from managed worktree creation and repository-aware session discovery, while retaining local workspace and trust checks. - Make TUI voice availability follow platform support instead of `features.realtime_conversation`. - Ignore `features.worktrees` and `features.realtime_conversation` configuration overrides, warn when managed requirements reference them, and hide both flags from `/experimental`, including catalogs from older servers. ## Testing Add coverage for ignored configuration overrides and managed requirements, and update session filtering, worktree grouping, and experimental feature discovery tests for the retired flags. GitOrigin-RevId: 1d64e890e6e2f8a78926a9ea163126c0890b068e --- codex-rs/core/src/config/config_tests.rs | 9 ++ codex-rs/core/src/config/managed_features.rs | 9 ++ codex-rs/exec/src/lib.rs | 5 - codex-rs/exec/tests/suite/worktree.rs | 42 ++---- codex-rs/features/src/lib.rs | 10 +- codex-rs/features/src/tests.rs | 19 +++ codex-rs/tui/src/app/agent_center_tests.rs | 4 +- codex-rs/tui/src/app/agents_overview.rs | 9 +- codex-rs/tui/src/app/agents_overview_new.rs | 10 +- codex-rs/tui/src/app/agents_overview_tests.rs | 51 +++---- .../tui/src/app/managed_worktree_creation.rs | 7 +- ...mmand_center__live_center_custom_help.snap | 14 +- .../tests/background_task_defaults_tests.rs | 3 - .../app/tests/session_lifecycle_requests.rs | 1 - codex-rs/tui/src/app/tests/turn_submission.rs | 33 ----- codex-rs/tui/src/app_server_session.rs | 5 +- .../bottom_pane/experimental_features_view.rs | 7 +- .../experimental_features_view_tests.rs | 26 +--- ..._view__tests__voice_runtime_available.snap | 14 -- codex-rs/tui/src/chatwidget/realtime.rs | 6 - .../src/chatwidget/realtime_settings_tests.rs | 4 - .../chatwidget/realtime_tests/lifecycle.rs | 24 ---- codex-rs/tui/src/chatwidget/session_flow.rs | 3 +- codex-rs/tui/src/chatwidget/settings.rs | 23 +--- codex-rs/tui/src/chatwidget/slash_dispatch.rs | 3 +- .../chatwidget/tests/popups_and_settings.rs | 2 +- .../src/chatwidget/tests/slash_commands.rs | 1 - .../chatwidget/tests/worktree_picker_tests.rs | 14 +- .../tui/src/chatwidget/worktree_picker.rs | 12 +- codex-rs/tui/src/daemon_startup.rs | 3 +- codex-rs/tui/src/lib.rs | 47 +------ .../tui/src/managed_worktree_tools_tests.rs | 3 +- codex-rs/tui/src/resume_picker.rs | 125 +++++++----------- .../tui/src/resume_picker/page_loading.rs | 4 +- .../src/resume_picker/page_loading_tests.rs | 5 - ...ps__tests__experimental_voice_tooltip.snap | 6 - codex-rs/tui/src/tooltips.rs | 59 +-------- codex-rs/tui/src/worktree_startup.rs | 5 - 38 files changed, 166 insertions(+), 461 deletions(-) delete mode 100644 codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__voice_runtime_available.snap delete mode 100644 codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__experimental_voice_tooltip.snap diff --git a/codex-rs/core/src/config/config_tests.rs b/codex-rs/core/src/config/config_tests.rs index aaf2165a6b..5826e93c01 100644 --- a/codex-rs/core/src/config/config_tests.rs +++ b/codex-rs/core/src/config/config_tests.rs @@ -11909,6 +11909,8 @@ shell_tool = false #[test_case::test_case(Feature::Personality; "personality")] #[test_case::test_case(Feature::GuardianThreadContext; "guardian thread context")] +#[test_case::test_case(Feature::Worktrees; "worktrees")] +#[test_case::test_case(Feature::RealtimeConversation; "realtime conversation")] #[test_case::test_case(Feature::ShellZshFork; "shell zsh fork")] #[test_case::test_case(Feature::UnifiedExecZshFork; "unified exec zsh fork")] fn retired_feature_requirements_do_not_pin_configured_values( @@ -11960,6 +11962,13 @@ fn retired_feature_requirements_do_not_pin_configured_values( usize::from(feature != Feature::Personality), ), ); + if matches!(feature, Feature::Worktrees | Feature::RealtimeConversation) { + assert!( + warnings[0].contains(&format!("Ignoring removed `features` requirement `{key}`")) + ); + assert!(warnings[0].contains("enterprise")); + assert!(warnings[0].contains("availability no longer depends on this feature flag")); + } } Ok(()) diff --git a/codex-rs/core/src/config/managed_features.rs b/codex-rs/core/src/config/managed_features.rs index a6519b2a44..dc57ca9216 100644 --- a/codex-rs/core/src/config/managed_features.rs +++ b/codex-rs/core/src/config/managed_features.rs @@ -243,6 +243,15 @@ fn parse_feature_requirements( if key == Feature::Personality.key() { continue; } + if key == Feature::Worktrees.key() || key == Feature::RealtimeConversation.key() { + push_feature_requirement_warning( + &mut startup_warnings, + format!( + "Ignoring removed `features` requirement `{key}` from {source}; availability no longer depends on this feature flag." + ), + ); + continue; + } if matches!(key.as_str(), "shell_zsh_fork" | "unified_exec_zsh_fork") { push_feature_requirement_warning( &mut startup_warnings, diff --git a/codex-rs/exec/src/lib.rs b/codex-rs/exec/src/lib.rs index 4ce2d52855..8d3fcd8861 100644 --- a/codex-rs/exec/src/lib.rs +++ b/codex-rs/exec/src/lib.rs @@ -421,11 +421,6 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result .cloud_config_bundle(gate_cloud_config.clone()) .build() .await?; - if !gate_config.features.enabled(Feature::Worktrees) { - anyhow::bail!( - "--worktree requires the worktrees feature; enable it with --enable worktrees" - ); - } if let Some(ExecCommand::Fork(args)) = command.as_mut() { let saved_cwd = worktree::fork_source( args, diff --git a/codex-rs/exec/tests/suite/worktree.rs b/codex-rs/exec/tests/suite/worktree.rs index d2c7afd5d9..94b8492089 100644 --- a/codex-rs/exec/tests/suite/worktree.rs +++ b/codex-rs/exec/tests/suite/worktree.rs @@ -407,35 +407,17 @@ fn worktree_rejects_remote_defaults_before_allocation() -> anyhow::Result<()> { } #[test] -fn worktree_rejects_disabled_features_and_ignored_config_before_allocation() -> anyhow::Result<()> { - for (config, args, expected) in [ - ( - "", - vec!["--ignore-user-config", "prompt"], - "--worktree cannot be combined with --ignore-user-config", - ), - ( - "features.worktrees = false", - vec!["prompt"], - "--enable worktrees", - ), - ( - "features.worktrees = false", - vec!["fork", "missing"], - "--enable worktrees", - ), - ( - "features.worktrees = true", - vec!["-c", "features.worktrees=false", "prompt"], - "--enable worktrees", - ), - ] { - let test = test_codex_exec(); - fs::write(test.home_path().join("config.toml"), config)?; - let output = test.cmd().arg("--worktree").args(args).output()?; - assert!(!output.status.success()); - assert!(String::from_utf8_lossy(&output.stderr).contains(expected)); - assert!(!test.home_path().join("worktrees").exists()); - } +fn worktree_rejects_ignored_config_before_allocation() -> anyhow::Result<()> { + let test = test_codex_exec(); + let output = test + .cmd() + .args(["--worktree", "--ignore-user-config", "prompt"]) + .output()?; + assert!(!output.status.success()); + assert!( + String::from_utf8_lossy(&output.stderr) + .contains("--worktree cannot be combined with --ignore-user-config") + ); + assert!(!test.home_path().join("worktrees").exists()); Ok(()) } diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs index 5a3cc5f627..4030e8e4a6 100644 --- a/codex-rs/features/src/lib.rs +++ b/codex-rs/features/src/lib.rs @@ -214,7 +214,7 @@ pub enum Feature { NetworkProxy, /// Mask credentials and inject them through an already enabled network proxy. CredentialMasking, - /// Enable managed worktree creation and repository-aware sessions. + /// Removed compatibility flag. Managed worktrees and repository-aware sessions are always available. Worktrees, /// Respect host system proxy settings for Codex-owned network clients. RespectSystemProxy, @@ -416,7 +416,7 @@ pub enum Feature { UltrafastMode, /// Enable explicitly requested model changes for later step captures. StepModelSwitching, - /// Enable voice conversations in the TUI. + /// Removed compatibility flag. TUI voice availability follows platform support. RealtimeConversation, /// Prevent idle system sleep while a turn is actively running. PreventIdleSleep, @@ -667,7 +667,7 @@ impl Features { self.record_legacy_usage_force("features.transcript_v2", Feature::TranscriptV2); continue; } - "tui_app_server" => { + "tui_app_server" | "worktrees" | "realtime_conversation" => { continue; } "undo" => { @@ -1453,7 +1453,7 @@ pub const FEATURES: &[FeatureSpec] = &[ FeatureSpec { id: Feature::Worktrees, key: "worktrees", - stage: Stage::Stable, + stage: Stage::Removed, default_enabled: true, }, FeatureSpec { @@ -1999,7 +1999,7 @@ pub const FEATURES: &[FeatureSpec] = &[ FeatureSpec { id: Feature::RealtimeConversation, key: "realtime_conversation", - stage: Stage::Stable, + stage: Stage::Removed, default_enabled: true, }, FeatureSpec { diff --git a/codex-rs/features/src/tests.rs b/codex-rs/features/src/tests.rs index a8a8fca058..0fdfebc50a 100644 --- a/codex-rs/features/src/tests.rs +++ b/codex-rs/features/src/tests.rs @@ -901,3 +901,22 @@ code_mode = true message ); } + +#[test] +fn retired_worktree_and_voice_config_overrides_are_ignored() { + for enabled in [false, true] { + let features_toml = FeaturesToml::from(BTreeMap::from([ + ("worktrees".to_string(), enabled), + ("realtime_conversation".to_string(), enabled), + ])); + let features = Features::from_sources( + FeatureConfigSource { + features: Some(&features_toml), + ..Default::default() + }, + FeatureConfigSource::default(), + FeatureOverrides::default(), + ); + assert_eq!(features, Features::with_defaults()); + } +} diff --git a/codex-rs/tui/src/app/agent_center_tests.rs b/codex-rs/tui/src/app/agent_center_tests.rs index e8c3022b84..952a4d687d 100644 --- a/codex-rs/tui/src/app/agent_center_tests.rs +++ b/codex-rs/tui/src/app/agent_center_tests.rs @@ -513,8 +513,7 @@ async fn live_center_rename_retains_target_when_status_leaves_filter() -> Result #[tokio::test] async fn live_center_navigation_and_complete_hints() { - let mut app = make_test_app().await; - app.config.features.enable(Feature::Worktrees).unwrap(); + let app = make_test_app().await; let ready = ThreadId::from_u128(/*value*/ 42); let needs_you = ThreadId::from_u128(/*value*/ 43); let unloaded = ThreadId::from_u128(/*value*/ 44); @@ -665,7 +664,6 @@ async fn live_center_fixed_shortcuts_yield_to_configured_actions() { #[tokio::test] async fn live_center_hints_follow_configured_bindings() { let mut app = make_test_app().await; - app.config.features.disable(Feature::Worktrees).unwrap(); let config: TuiKeymap = toml::from_str( r#" [list] diff --git a/codex-rs/tui/src/app/agents_overview.rs b/codex-rs/tui/src/app/agents_overview.rs index 00f0633861..8701235d2f 100644 --- a/codex-rs/tui/src/app/agents_overview.rs +++ b/codex-rs/tui/src/app/agents_overview.rs @@ -406,11 +406,10 @@ impl App { let mut view = AgentsOverviewView::new( rows, selected_thread_id, - self.config.features.enabled(Feature::Worktrees) - && !crate::uses_remote_workspace_or_environment( - &self.app_server_target, - self.environment_manager.as_ref(), - ), + !crate::uses_remote_workspace_or_environment( + &self.app_server_target, + self.environment_manager.as_ref(), + ), self.local_settings.tui.status_line_use_colors, self.app_event_tx.clone(), self.keymap.clone(), diff --git a/codex-rs/tui/src/app/agents_overview_new.rs b/codex-rs/tui/src/app/agents_overview_new.rs index 0072408f42..1b96018362 100644 --- a/codex-rs/tui/src/app/agents_overview_new.rs +++ b/codex-rs/tui/src/app/agents_overview_new.rs @@ -260,12 +260,10 @@ impl App { { return; } - if !self.config.features.enabled(Feature::Worktrees) - || crate::uses_remote_workspace_or_environment( - &self.app_server_target, - self.environment_manager.as_ref(), - ) - { + if crate::uses_remote_workspace_or_environment( + &self.app_server_target, + self.environment_manager.as_ref(), + ) { self.add_agents_overview_error( "Managed worktrees require local worktree support.".to_string(), ); diff --git a/codex-rs/tui/src/app/agents_overview_tests.rs b/codex-rs/tui/src/app/agents_overview_tests.rs index b28efb8d17..76f5a2e433 100644 --- a/codex-rs/tui/src/app/agents_overview_tests.rs +++ b/codex-rs/tui/src/app/agents_overview_tests.rs @@ -1132,7 +1132,7 @@ async fn agents_overview_reasoning_uses_existing_events_and_expires_with_attachm } #[tokio::test] -async fn worktrees_overview_grouping_requires_feature() { +async fn worktrees_overview_groups_linked_checkouts() { let mut app = make_test_app().await; let root = tempfile::tempdir().unwrap(); let primary = root.path().join("primary"); @@ -1177,32 +1177,24 @@ async fn worktrees_overview_grouping_requires_feature() { let display_heading = &headings[0]; let grouped_heading = format!("{display_heading} 2"); let width = 160; - for enabled in [false, true] { - app.config - .features - .set_enabled(Feature::Worktrees, enabled) - .unwrap(); - let view = app.agents_overview_view(threads.clone(), /*selected_thread_id*/ None); - app.chat_widget.show_bottom_pane_view(Box::new(view)); - let popup = render_bottom_popup(&app.chat_widget, width); - assert_eq!(popup.contains(&grouped_heading), enabled, "{popup}"); - if enabled { - let grouping = popup - .lines() - .map(|line| line.split('│').next().unwrap_or(line).trim_end()) - .collect::>() - .join("\n") - .replace(&headings[1], "/tmp/worktree-root/primary/subdir/child") - .replace(display_heading, "/tmp/worktree-root/primary") - .replace('\\', "/"); - insta::with_settings!({snapshot_path => "../snapshots"}, { - insta::assert_snapshot!( - "agents_overview_worktree_grouping", - normalize_agent_center_snapshot(grouping) - ); - }); - } - } + let view = app.agents_overview_view(threads, /*selected_thread_id*/ None); + app.chat_widget.show_bottom_pane_view(Box::new(view)); + let popup = render_bottom_popup(&app.chat_widget, width); + assert!(popup.contains(&grouped_heading), "{popup}"); + let grouping = popup + .lines() + .map(|line| line.split('│').next().unwrap_or(line).trim_end()) + .collect::>() + .join("\n") + .replace(&headings[1], "/tmp/worktree-root/primary/subdir/child") + .replace(display_heading, "/tmp/worktree-root/primary") + .replace('\\', "/"); + insta::with_settings!({snapshot_path => "../snapshots"}, { + insta::assert_snapshot!( + "agents_overview_worktree_grouping", + normalize_agent_center_snapshot(grouping) + ); + }); } #[tokio::test] @@ -3024,7 +3016,6 @@ async fn overview_grouping_persists_across_config_reloads() -> Result<()> { #[tokio::test] async fn command_center_new_actions_use_selection_and_leave_metadata_text_alone() { let mut app = make_test_app().await; - app.config.features.enable(Feature::Worktrees).unwrap(); let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel(); app.app_event_tx = AppEventSender::new(tx); let id = ThreadId::new(); @@ -3077,8 +3068,4 @@ async fn command_center_new_actions_use_selection_and_leave_metadata_text_alone( rx.try_recv(), Ok(AppEvent::NewAgentsOverviewSession { cwd: None }) )); - app.config.features.disable(Feature::Worktrees).unwrap(); - let mut disabled = app.agents_overview_view(vec![target], Some(id)); - disabled.handle_key_event(KeyCode::Char('w').into()); - assert!(rx.try_recv().is_err()); } diff --git a/codex-rs/tui/src/app/managed_worktree_creation.rs b/codex-rs/tui/src/app/managed_worktree_creation.rs index 3fd35cdf7b..7b53366557 100644 --- a/codex-rs/tui/src/app/managed_worktree_creation.rs +++ b/codex-rs/tui/src/app/managed_worktree_creation.rs @@ -64,11 +64,7 @@ impl App { mode: crate::app_event::ManagedWorktreeMode, name: Option, ) { - if !self.config.features.enabled(Feature::Worktrees) { - self.chat_widget.add_error_message( - "Enable worktrees in your Codex configuration to create a worktree.".to_string(), - ); - } else if self.config.active_project.is_untrusted() { + if self.config.active_project.is_untrusted() { self.chat_widget.add_error_message( "Cannot create a worktree from an explicitly untrusted source.".to_string(), ); @@ -230,7 +226,6 @@ impl App { }; let can_continue = !self.reconnect.offline && !self.chat_widget.has_misalignment_policy_violation() - && self.config.features.enabled(Feature::Worktrees) && !crate::uses_remote_workspace_or_environment( &self.app_server_target, self.environment_manager.as_ref(), diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_custom_help.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_custom_help.snap index ff08930897..63aae63f5f 100644 --- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_custom_help.snap +++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_custom_help.snap @@ -7,12 +7,13 @@ expression: "screen(&view, 100, 24)" ──────────────────────────────────────────────────────────────────────────────────────────────── Task shortcuts - Navigate Tasks View - k Up n New tab/⇧tab Filter - j Down o Resume f3 Search - enter Open f Fork g Group - pgdn Page down z r Rename - ⌃c Quit x Stop + Navigate Tasks View + k Up n New tab/⇧tab Filter + j Down w New worktree f3 Search + enter Open o Resume g Group + pgdn Page down f Fork + ⌃c Quit z r Rename + x Stop h Hide backspace Delete z p Pin/unpin @@ -24,5 +25,4 @@ expression: "screen(&view, 100, 24)" - esc back diff --git a/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs b/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs index 438ce7605e..72e79e241a 100644 --- a/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs +++ b/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs @@ -1166,9 +1166,6 @@ async fn command_center_new_checkout_and_worktree_preserve_source_and_default_br app.config.cwd = selected.cwd.clone().abs(); app.chat_widget.windows_sandbox_local_server = cfg!(target_os = "windows"); app.harness_overrides.cwd = Some(selected.cwd.clone()); - app.cli_kv_overrides - .push(("features.worktrees".into(), TomlValue::Boolean(true))); - app.config.features.enable(Feature::Worktrees)?; trust_launch_folder(&mut app); let (mut server, requests, proxy) = start_recording_app_server_with_history( &app.config, diff --git a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs index 5f5d4615ad..9e6984c521 100644 --- a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs +++ b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs @@ -1473,7 +1473,6 @@ async fn local_daemon_registers_approval_gated_mcp_tools_for_both_start_paths_sc -> Result<()> { let (mut app, events, _ops) = Box::pin(make_test_app_with_channels()).await; // Invalid optional worktree settings must preserve both daemon start paths. - app.config.features.enable(Feature::Worktrees)?; let codex_home = tempdir()?; app.config.codex_home = codex_home.path().to_path_buf().abs(); app.config.sqlite = SqliteConfig::new_for_testing(codex_home.path().abs()); diff --git a/codex-rs/tui/src/app/tests/turn_submission.rs b/codex-rs/tui/src/app/tests/turn_submission.rs index 15030ebae3..e04fc3da5d 100644 --- a/codex-rs/tui/src/app/tests/turn_submission.rs +++ b/codex-rs/tui/src/app/tests/turn_submission.rs @@ -11,43 +11,11 @@ use codex_protocol::permissions::FileSystemSpecialPath; use codex_protocol::permissions::NetworkSandboxPolicy; use pretty_assertions::assert_eq; -#[tokio::test] -async fn worktree_creation_event_requires_feature() -> Result<()> { - let (mut app, mut events, _op_rx) = make_test_app_with_channels().await; - app.config.features.disable(Feature::Worktrees)?; - let mut tui = crate::tui::test_support::make_test_tui()?; - let mut app_server = Box::pin(crate::start_embedded_app_server_for_picker(&app.config)).await?; - while events.try_recv().is_ok() {} - app.handle_event( - &mut tui, - &mut app_server, - AppEvent::StartManagedWorktree { - mode: crate::app_event::ManagedWorktreeMode::New, - name: None, - }, - ) - .await?; - drain_managed_worktree_start(&mut app, &mut app_server).await; - let message = std::iter::from_fn(|| events.try_recv().ok()) - .find_map(|event| match event { - AppEvent::InsertHistoryCell(cell) => { - Some(lines_to_single_string(&cell.display_lines(/*width*/ 100))) - } - _ => None, - }) - .expect("disabled feature message"); - insta::assert_snapshot!(message, @"■ Enable worktrees in your Codex configuration to create a worktree."); - assert!(!app.config.codex_home.join("worktrees").exists()); - app_server.shutdown().await?; - Ok(()) -} - #[tokio::test] async fn worktree_creation_rejects_untrusted_source_before_allocation() -> Result<()> { use crate::app_event::ManagedWorktreeMode; let (mut app, mut events, _op_rx) = make_test_app_with_channels().await; - app.config.features.enable(Feature::Worktrees)?; app.config.active_project.trust_level = Some(codex_protocol::config_types::TrustLevel::Untrusted); let thread_id = ThreadId::new(); @@ -97,7 +65,6 @@ async fn worktree_creation_rejects_running_agent_before_allocation() -> Result<( let (mut app, mut events, _op_rx) = make_test_app_with_channels().await; let home = tempfile::tempdir()?; app.config.codex_home = home.path().to_path_buf().abs(); - app.config.features.enable(Feature::Worktrees)?; app.config.active_project.trust_level = Some(codex_protocol::config_types::TrustLevel::Trusted); let primary = ThreadId::new(); app.primary_thread_id = Some(primary); diff --git a/codex-rs/tui/src/app_server_session.rs b/codex-rs/tui/src/app_server_session.rs index ccf3767182..ba449c46f4 100644 --- a/codex-rs/tui/src/app_server_session.rs +++ b/codex-rs/tui/src/app_server_session.rs @@ -457,10 +457,7 @@ impl AppServerSession { app_event_tx: AppEventSender, status_updates: tokio::sync::broadcast::Sender, ) -> std::io::Result<()> { - let worktrees = if !self.uses_remote_workspace() - && !config.active_project.is_untrusted() - && config.features.enabled(codex_features::Feature::Worktrees) - { + let worktrees = if !self.uses_remote_workspace() && !config.active_project.is_untrusted() { // Listing a fresh, nonexistent thread is read-only and returns an empty page // on supported stores. Probe before advertising tools or allocating a checkout. let support = self diff --git a/codex-rs/tui/src/bottom_pane/experimental_features_view.rs b/codex-rs/tui/src/bottom_pane/experimental_features_view.rs index 805e3eff38..681698d984 100644 --- a/codex-rs/tui/src/bottom_pane/experimental_features_view.rs +++ b/codex-rs/tui/src/bottom_pane/experimental_features_view.rs @@ -1,6 +1,6 @@ //! Experimental controls with popup-owned discovery and configured enablement. //! Failed saves retain intent for explicit retry; cancellation remains available. -//! Server voice discovery is gated by the client package's native runtime. +//! Retired stable features stay hidden even if an older server reports them as beta. use crate::experimental_features::FeatureWriteResult; use codex_app_server_protocol::ExperimentalFeature; @@ -54,7 +54,6 @@ pub(crate) struct ExperimentalFeatureItem { pub(crate) struct ExperimentalFeaturesView { features: Vec, - voice_supported: bool, initial_enabled: Vec, unconfirmed: Vec, catalog_rx: Option, String>>>, @@ -84,7 +83,6 @@ impl ExperimentalFeaturesView { } .to_string(), thread_id, - voice_supported: codex_realtime_webrtc::RealtimeWebrtcSession::is_supported(), write_rx: None, catalog_rx, unconfirmed: Vec::new(), @@ -284,8 +282,7 @@ impl BottomPaneView for ExperimentalFeaturesView { let mut count = 0; for feature in features { if feature.stage != ExperimentalFeatureStage::Beta - || (feature.name == Feature::RealtimeConversation.key() - && !self.voice_supported) + || matches!(feature.name.as_str(), "worktrees" | "realtime_conversation") { continue; } diff --git a/codex-rs/tui/src/bottom_pane/experimental_features_view_tests.rs b/codex-rs/tui/src/bottom_pane/experimental_features_view_tests.rs index 8b8f8a9a31..25a2351fb9 100644 --- a/codex-rs/tui/src/bottom_pane/experimental_features_view_tests.rs +++ b/codex-rs/tui/src/bottom_pane/experimental_features_view_tests.rs @@ -103,6 +103,8 @@ fn experimental_features_discovery_preserves_server_order_and_accepts_new_keys() .send(Ok(vec![ server_feature("network_proxy"), server_feature("future_feature"), + server_feature("worktrees"), + server_feature("realtime_conversation"), stable, server_feature("prevent_idle_sleep"), ])) @@ -279,27 +281,3 @@ fn snapshot_view(name: &str, view: &ExperimentalFeaturesView) { view.render(area, &mut buffer); insta::assert_snapshot!(name, buffer_text(&buffer)); } - -#[test] -fn voice_discovery_requires_the_client_runtime() { - for supported in [false, true] { - let (app_tx, _app_rx) = tokio::sync::mpsc::unbounded_channel(); - let (catalog_tx, catalog_rx) = oneshot::channel(); - let mut view = ExperimentalFeaturesView::new( - Vec::new(), - ThreadId::new(), - Some(catalog_rx), - AppEventSender::new(app_tx), - crate::keymap::RuntimeKeymap::defaults().list, - ); - view.voice_supported = supported; - catalog_tx - .send(Ok(vec![server_feature("realtime_conversation")])) - .unwrap(); - assert!(view.pre_draw_tick(Instant::now())); - assert_eq!(view.features.len(), usize::from(supported)); - if supported { - snapshot_view("voice_runtime_available", &view); - } - } -} diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__voice_runtime_available.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__voice_runtime_available.snap deleted file mode 100644 index 34de22d1e4..0000000000 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__voice_runtime_available.snap +++ /dev/null @@ -1,14 +0,0 @@ ---- -source: tui/src/bottom_pane/experimental_features_view_tests.rs -expression: buffer_text(&buffer) ---- - - Experimental features - Checked features are configured on. Some experimental features take effect - only in new tasks or after restarting the Codex server. - - -› [x] Server realtime_conversation Description supplied by the server. - - - space toggle · enter save · esc save/close diff --git a/codex-rs/tui/src/chatwidget/realtime.rs b/codex-rs/tui/src/chatwidget/realtime.rs index bb2a48e527..513f40276d 100644 --- a/codex-rs/tui/src/chatwidget/realtime.rs +++ b/codex-rs/tui/src/chatwidget/realtime.rs @@ -23,7 +23,6 @@ use crate::history_cell; use crate::motion::MotionMode; use codex_app_server_protocol::ThreadItem; use codex_app_server_protocol::UserInput; -use codex_features::Feature; use codex_protocol::ThreadId; use codex_protocol::models::MessagePhase; use codex_realtime_webrtc::RealtimeWebrtcSession; @@ -293,11 +292,6 @@ impl ChatWidget { return; } - if !self.config.features.enabled(Feature::RealtimeConversation) { - self.add_error_message("Voice conversations are not enabled.".to_string()); - return; - } - if !RealtimeWebrtcSession::is_supported() { self.add_error_message( "Voice requires macOS, an MSVC-based Windows build, or a glibc-based Linux build." diff --git a/codex-rs/tui/src/chatwidget/realtime_settings_tests.rs b/codex-rs/tui/src/chatwidget/realtime_settings_tests.rs index 2f2f5fed19..e9bcc6d5e6 100644 --- a/codex-rs/tui/src/chatwidget/realtime_settings_tests.rs +++ b/codex-rs/tui/src/chatwidget/realtime_settings_tests.rs @@ -11,10 +11,6 @@ use pretty_assertions::assert_eq; #[tokio::test] async fn voice_settings_selects_a_voice_without_starting_audio() { let (mut chat, _sender, mut events, mut ops) = make_chatwidget_manual_with_sender().await; - chat.config - .features - .enable(Feature::RealtimeConversation) - .unwrap(); chat.config.realtime.voice = Some(RealtimeVoice::Maple); chat.dispatch_command_with_args(SlashCommand::Voice, "settings".to_string(), Vec::new()); assert!( diff --git a/codex-rs/tui/src/chatwidget/realtime_tests/lifecycle.rs b/codex-rs/tui/src/chatwidget/realtime_tests/lifecycle.rs index bbeb21683c..a0bf879b70 100644 --- a/codex-rs/tui/src/chatwidget/realtime_tests/lifecycle.rs +++ b/codex-rs/tui/src/chatwidget/realtime_tests/lifecycle.rs @@ -4,30 +4,6 @@ use super::*; use crate::app_event::RealtimeWebrtcStartupFailure; use pretty_assertions::assert_eq; -#[tokio::test] -async fn enabling_voice_on_an_open_thread_snapshots_the_new_thread_notice() { - let (mut chat, _sender, mut events, _ops) = make_chatwidget_manual_with_sender().await; - chat.set_feature_enabled( - codex_features::Feature::RealtimeConversation, - /*enabled*/ true, - ); - commit_realtime_history_events(&mut chat, &mut events); - let rendered = std::iter::from_fn(|| events.try_recv().ok()) - .filter_map(|event| match event { - AppEvent::InsertHistoryCell(cell) => Some( - cell.display_lines(/*width*/ 80) - .into_iter() - .map(|line| line.to_string()) - .collect::>() - .join("\n"), - ), - _ => None, - }) - .collect::>() - .join("\n"); - insta::assert_snapshot!(rendered, @"• Voice conversations will be available in new threads."); -} - #[tokio::test] async fn voice_cannot_start_in_a_side_conversation() { let (mut chat, _sender, mut events, mut ops) = make_chatwidget_manual_with_sender().await; diff --git a/codex-rs/tui/src/chatwidget/session_flow.rs b/codex-rs/tui/src/chatwidget/session_flow.rs index 3c83e2b951..f34f76ebed 100644 --- a/codex-rs/tui/src/chatwidget/session_flow.rs +++ b/codex-rs/tui/src/chatwidget/session_flow.rs @@ -87,8 +87,7 @@ impl ChatWidget { }); } self.realtime_conversation_available_for_thread = - self.config.features.enabled(Feature::RealtimeConversation) - && codex_realtime_webrtc::RealtimeWebrtcSession::is_supported(); + codex_realtime_webrtc::RealtimeWebrtcSession::is_supported(); self.bottom_pane .set_voice_command_enabled(self.realtime_conversation_available_for_thread); self.bottom_pane diff --git a/codex-rs/tui/src/chatwidget/settings.rs b/codex-rs/tui/src/chatwidget/settings.rs index b0b9674c6a..767548773f 100644 --- a/codex-rs/tui/src/chatwidget/settings.rs +++ b/codex-rs/tui/src/chatwidget/settings.rs @@ -133,9 +133,6 @@ impl ChatWidget { self.refresh_effective_service_tier(); self.sync_service_tier_commands(); } - if feature == Feature::Worktrees { - self.sync_worktrees_enabled(); - } if feature == Feature::Plugins { self.sync_plugins_command_enabled(); self.refresh_plugin_mentions(); @@ -150,21 +147,6 @@ impl ChatWidget { self.update_collaboration_mode_indicator(); } } - if feature == Feature::RealtimeConversation && !enabled { - self.realtime_conversation_available_for_thread = false; - self.bottom_pane - .set_voice_command_enabled(/*enabled*/ false); - self.stop_realtime_conversation(); - } - if feature == Feature::RealtimeConversation - && enabled - && !self.realtime_conversation_available_for_thread - { - self.add_info_message( - "Voice conversations will be available in new threads.".into(), - /*hint*/ None, - ); - } if feature == Feature::MentionsV2 { self.sync_mentions_v2_enabled(); } @@ -353,9 +335,8 @@ impl ChatWidget { } pub(super) fn sync_worktrees_enabled(&mut self) { - self.bottom_pane.set_worktrees_enabled( - self.config.features.enabled(Feature::Worktrees) && self.local_worktree_operations, - ); + self.bottom_pane + .set_worktrees_enabled(self.local_worktree_operations); } pub(super) fn sync_plugins_command_enabled(&mut self) { diff --git a/codex-rs/tui/src/chatwidget/slash_dispatch.rs b/codex-rs/tui/src/chatwidget/slash_dispatch.rs index 5327f805cf..79601b9a28 100644 --- a/codex-rs/tui/src/chatwidget/slash_dispatch.rs +++ b/codex-rs/tui/src/chatwidget/slash_dispatch.rs @@ -1247,8 +1247,7 @@ impl ChatWidget { service_tier_commands_enabled: !self.current_model_service_tier_commands().is_empty(), daybreak_command_description: self.daybreak_command_description(), voice_command_enabled: self.realtime_conversation_available_for_thread, - worktrees_enabled: self.config.features.enabled(Feature::Worktrees) - && self.local_worktree_operations, + worktrees_enabled: self.local_worktree_operations, allow_elevate_sandbox, side_conversation_active: self.active_side_conversation, } diff --git a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs index d64fecc640..c7a0223ed7 100644 --- a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs +++ b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs @@ -3106,7 +3106,7 @@ async fn experimental_features_popup_snapshot() { enabled: true, }, ExperimentalFeatureItem { - key: Feature::RealtimeConversation.key().to_string(), + key: "voice_conversations".to_string(), writable: true, name: "Voice conversations".to_string(), description: "Talk with Codex using /voice.".to_string(), diff --git a/codex-rs/tui/src/chatwidget/tests/slash_commands.rs b/codex-rs/tui/src/chatwidget/tests/slash_commands.rs index f867a24d5c..49601e3ccd 100644 --- a/codex-rs/tui/src/chatwidget/tests/slash_commands.rs +++ b/codex-rs/tui/src/chatwidget/tests/slash_commands.rs @@ -680,7 +680,6 @@ async fn queued_unknown_slash_reports_error_when_dequeued() { ); assert!(chat.input_queue.queued_user_messages.is_empty()); - chat.set_feature_enabled(Feature::Worktrees, /*enabled*/ true); chat.set_local_worktree_operations(/*enabled*/ false); let drain = chat.submit_queued_slash_prompt(UserMessage::from("/worktree extra").into()); assert_matches!(drain, QueueDrain::Continue); diff --git a/codex-rs/tui/src/chatwidget/tests/worktree_picker_tests.rs b/codex-rs/tui/src/chatwidget/tests/worktree_picker_tests.rs index 916fb1e8fd..5c7daae9a2 100644 --- a/codex-rs/tui/src/chatwidget/tests/worktree_picker_tests.rs +++ b/codex-rs/tui/src/chatwidget/tests/worktree_picker_tests.rs @@ -8,7 +8,7 @@ use pretty_assertions::assert_eq; #[tokio::test] async fn slash_new_and_fork_offer_checkout_choices_inside_local_git_repository() { let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; - chat.set_feature_enabled(Feature::Worktrees, /*enabled*/ false); + chat.set_local_worktree_operations(/*enabled*/ false); let checkout = tempdir().expect("temporary checkout"); std::fs::create_dir(checkout.path().join(".git")).expect("git directory"); std::fs::write(checkout.path().join(".git/HEAD"), "ref: refs/heads/main\n").expect("git HEAD"); @@ -23,7 +23,7 @@ async fn slash_new_and_fork_offer_checkout_choices_inside_local_git_repository() chat.dispatch_command(SlashCommand::New); assert_matches!(rx.try_recv(), Ok(AppEvent::NewSession { name: None })); - chat.set_feature_enabled(Feature::Worktrees, /*enabled*/ true); + chat.set_local_worktree_operations(/*enabled*/ true); chat.dispatch_command(SlashCommand::Fork); let popup = render_bottom_popup(&chat, /*width*/ 80); @@ -63,7 +63,7 @@ async fn slash_new_and_fork_offer_checkout_choices_inside_local_git_repository() (false, "worktrees_command_remote"), (true, "worktrees_command_local"), ] { - chat.set_feature_enabled(Feature::Worktrees, /*enabled*/ true); + chat.set_local_worktree_operations(/*enabled*/ true); chat.set_local_worktree_operations(available); chat.bottom_pane .set_composer_text("/work".into(), Vec::new(), Vec::new()); @@ -82,7 +82,7 @@ async fn slash_worktree_offers_current_or_new_conversation() { chat.config.cwd = AbsolutePathBuf::from_absolute_path(checkout.path()).expect("absolute checkout"); - chat.set_feature_enabled(Feature::Worktrees, /*enabled*/ true); + chat.set_local_worktree_operations(/*enabled*/ true); chat.dispatch_command(SlashCommand::Worktree); let popup = render_bottom_popup(&chat, /*width*/ 80); @@ -105,7 +105,7 @@ async fn worktree_browser_actions_and_stale_results() { std::fs::create_dir(checkout.path().join(".git")).unwrap(); std::fs::write(checkout.path().join(".git/HEAD"), "ref: refs/heads/main\n").unwrap(); chat.config.cwd = AbsolutePathBuf::from_absolute_path(checkout.path()).unwrap(); - chat.set_feature_enabled(Feature::Worktrees, /*enabled*/ true); + chat.set_local_worktree_operations(/*enabled*/ true); let request = chat.request_managed_worktrees().unwrap(); assert_chatwidget_snapshot!( "worktree_browser_loading", @@ -212,7 +212,7 @@ async fn worktree_browser_names_archived_and_missing_owners() { std::fs::create_dir(checkout.path().join(".git")).unwrap(); std::fs::write(checkout.path().join(".git/HEAD"), "ref: refs/heads/main\n").unwrap(); chat.config.cwd = AbsolutePathBuf::from_absolute_path(checkout.path()).unwrap(); - chat.set_feature_enabled(Feature::Worktrees, /*enabled*/ true); + chat.set_local_worktree_operations(/*enabled*/ true); let request = chat.request_managed_worktrees().unwrap(); let owner = ThreadId::from_string("00000000-0000-0000-0000-000000000002").unwrap(); chat.on_managed_worktrees_loaded( @@ -268,7 +268,7 @@ async fn worktree_picker_custom_keys_preserve_draft_and_protect_current_checkout std::fs::create_dir(checkout.path().join(".git")).unwrap(); std::fs::write(checkout.path().join(".git/HEAD"), "ref: refs/heads/main\n").unwrap(); chat.config.cwd = AbsolutePathBuf::from_absolute_path(checkout.path()).unwrap(); - chat.set_feature_enabled(Feature::Worktrees, /*enabled*/ true); + chat.set_local_worktree_operations(/*enabled*/ true); let mut keymap = crate::keymap::RuntimeKeymap::defaults(); keymap.list.accept = vec![key_hint::plain(KeyCode::F(/*n*/ 3))]; keymap.list.cancel = vec![key_hint::plain(KeyCode::F(/*n*/ 2))]; diff --git a/codex-rs/tui/src/chatwidget/worktree_picker.rs b/codex-rs/tui/src/chatwidget/worktree_picker.rs index 6ca63f0d8c..d40d2a8406 100644 --- a/codex-rs/tui/src/chatwidget/worktree_picker.rs +++ b/codex-rs/tui/src/chatwidget/worktree_picker.rs @@ -1,4 +1,4 @@ -//! Worktree choices for local, feature-enabled session commands. +//! Worktree choices for local session commands. //! //! Shared picker presentation preserves request identity and action safety checks. @@ -14,9 +14,7 @@ const BROWSER_VIEW_ID: &str = "managed-worktrees"; impl ChatWidget { pub(super) fn managed_worktree_available(&self) -> bool { - self.config.features.enabled(Feature::Worktrees) - && self.local_worktree_operations - && get_git_repo_root(self.config.cwd.as_path()).is_some() + self.local_worktree_operations && get_git_repo_root(self.config.cwd.as_path()).is_some() } pub(super) fn show_session_checkout_picker( @@ -85,12 +83,6 @@ impl ChatWidget { } pub(super) fn show_managed_worktree_picker(&mut self) { - if !self.config.features.enabled(Feature::Worktrees) { - self.add_error_message( - "Enable worktrees in your Codex configuration to create a worktree.".to_string(), - ); - return; - } if !self.managed_worktree_available() { self.add_error_message("Managed worktrees require a local Git repository.".to_string()); return; diff --git a/codex-rs/tui/src/daemon_startup.rs b/codex-rs/tui/src/daemon_startup.rs index 91c38d7837..9e25c09904 100644 --- a/codex-rs/tui/src/daemon_startup.rs +++ b/codex-rs/tui/src/daemon_startup.rs @@ -132,11 +132,12 @@ fn allowed_feature(name: &str) -> bool { matches!( name, // Client gates and per-thread settings already forwarded in thread requests. - "daemon_auto_start" | "worktrees" | "transcript_v2" | "realtime_conversation" | "standalone_web_search" + "daemon_auto_start" | "transcript_v2" | "standalone_web_search" // Shared services and threadless MCP operations need daemon compatibility checks. | "api_key_model_discovery" | "code_mode_host" | "auth_elicitation" | "mcp_oauth_refresh_coordination" // Removed flags still passed by older launch scripts. + | "worktrees" | "realtime_conversation" | "remote_models" | "request_rule" | "responses_websockets_v2" | "workspace_owner_usage_nudge" | "tool_search_always_defer_mcp_tools" | "remote_compaction_v2" | "multi_agent_mode" diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs index 7aa9aa80f0..e4ab86c347 100644 --- a/codex-rs/tui/src/lib.rs +++ b/codex-rs/tui/src/lib.rs @@ -850,7 +850,6 @@ async fn lookup_latest_session_target_with_app_server( .thread_list(latest_session_lookup_params( uses_remote_filesystem, model_provider.clone(), - config, cwd_filter, include_non_interactive, lookup_mode, @@ -886,7 +885,6 @@ enum LatestSessionLookupMode { fn latest_session_lookup_params( uses_remote_filesystem: bool, model_provider: Option, - config: &Config, cwd_filter: Option<&Path>, include_non_interactive: bool, lookup_mode: LatestSessionLookupMode, @@ -905,13 +903,8 @@ fn latest_session_lookup_params( project_id: None, parent_thread_id: None, ancestor_thread_id: None, - cwd: cwd_filter.map(|cwd| { - resume_picker::repository_cwd_filter( - cwd, - uses_remote_filesystem, - config.features.enabled(codex_features::Feature::Worktrees), - ) - }), + cwd: cwd_filter + .map(|cwd| resume_picker::repository_cwd_filter(cwd, uses_remote_filesystem)), use_state_db_only: match lookup_mode { LatestSessionLookupMode::StateDbOnly => true, LatestSessionLookupMode::ScanAndRepair => false, @@ -3334,13 +3327,11 @@ requires_openai_auth = {requires_openai_auth} async fn latest_session_lookup_params_keep_local_filters_for_embedded_sessions() -> std::io::Result<()> { let temp_dir = TempDir::new()?; - let config = build_config(&temp_dir).await?; let cwd = temp_dir.path().join("project"); let params = latest_session_lookup_params( /*uses_remote_filesystem*/ false, /*model_provider*/ None, - &config, Some(cwd.as_path()), /*include_non_interactive*/ false, LatestSessionLookupMode::StateDbOnly, @@ -3356,7 +3347,6 @@ requires_openai_auth = {requires_openai_auth} let scan_params = latest_session_lookup_params( /*uses_remote_filesystem*/ false, /*model_provider*/ None, - &config, Some(cwd.as_path()), /*include_non_interactive*/ false, LatestSessionLookupMode::ScanAndRepair, @@ -3368,12 +3358,10 @@ requires_openai_auth = {requires_openai_auth} #[tokio::test] async fn latest_session_lookup_params_honor_explicit_provider() -> color_eyre::Result<()> { let temp_dir = TempDir::new()?; - let config = build_config(&temp_dir).await?; let cwd = temp_dir.path().join("project"); let params = latest_session_lookup_params( /*uses_remote_filesystem*/ false, Some("selected-provider".to_string()), - &config, Some(cwd.as_path()), /*include_non_interactive*/ false, LatestSessionLookupMode::StateDbOnly, @@ -3393,13 +3381,9 @@ requires_openai_auth = {requires_openai_auth} #[tokio::test] async fn latest_session_lookup_params_omit_local_filters_for_remote_sessions() -> std::io::Result<()> { - let temp_dir = TempDir::new()?; - let config = build_config(&temp_dir).await?; - let params = latest_session_lookup_params( /*uses_remote_filesystem*/ true, /*model_provider*/ None, - &config, /*cwd_filter*/ None, /*include_non_interactive*/ false, LatestSessionLookupMode::StateDbOnly, @@ -3413,13 +3397,9 @@ requires_openai_auth = {requires_openai_auth} #[tokio::test] async fn latest_session_lookup_params_can_include_non_interactive_sources() -> std::io::Result<()> { - let temp_dir = TempDir::new()?; - let config = build_config(&temp_dir).await?; - let params = latest_session_lookup_params( /*uses_remote_filesystem*/ true, /*model_provider*/ None, - &config, /*cwd_filter*/ None, /*include_non_interactive*/ true, LatestSessionLookupMode::StateDbOnly, @@ -3440,14 +3420,11 @@ requires_openai_auth = {requires_openai_auth} #[tokio::test] async fn latest_session_lookup_params_keep_explicit_cwd_filter_for_remote_sessions() -> std::io::Result<()> { - let temp_dir = TempDir::new()?; - let config = build_config(&temp_dir).await?; let cwd = Path::new("repo/on/server"); let params = latest_session_lookup_params( /*uses_remote_filesystem*/ true, /*model_provider*/ None, - &config, Some(cwd), /*include_non_interactive*/ false, LatestSessionLookupMode::StateDbOnly, @@ -3517,9 +3494,6 @@ requires_openai_auth = {requires_openai_auth} }) .build() .await?; - config - .features - .set_enabled(codex_features::Feature::Worktrees, /*enabled*/ false)?; config .features .enable(codex_features::Feature::LocalThreadStoreCompression)?; @@ -3577,22 +3551,6 @@ requires_openai_auth = {requires_openai_auth} /*uses_remote_workspace*/ false, /*remote_cwd_override*/ None, &config, /*show_all*/ false, ); - let disabled_target = lookup_latest_session_target_with_app_server( - /*uses_remote_filesystem*/ false, - &mut app_server, - &config, - filter_cwd, - /*include_non_interactive*/ false, - ) - .await? - .expect("expected current-checkout target with worktrees disabled"); - config - .features - .set_enabled(codex_features::Feature::Worktrees, /*enabled*/ true)?; - let filter_cwd = latest_session_cwd_filter( - /*uses_remote_workspace*/ false, /*remote_cwd_override*/ None, &config, - /*show_all*/ false, - ); let scoped_target = lookup_latest_session_target_with_app_server( /*uses_remote_filesystem*/ false, &mut app_server, @@ -3617,7 +3575,6 @@ requires_openai_auth = {requires_openai_auth} .expect("expected global fork --last target"); app_server.shutdown().await?; - assert_eq!(disabled_target.thread_id, project_thread_id); assert_eq!(scoped_target.thread_id, linked_thread_id); assert_eq!(show_all_target.thread_id, other_thread_id); Ok(()) diff --git a/codex-rs/tui/src/managed_worktree_tools_tests.rs b/codex-rs/tui/src/managed_worktree_tools_tests.rs index 27904dc9f6..ab59305251 100644 --- a/codex-rs/tui/src/managed_worktree_tools_tests.rs +++ b/codex-rs/tui/src/managed_worktree_tools_tests.rs @@ -106,7 +106,7 @@ async fn creation_attaches_to_original_task_and_survives_service_restart_scenari git(&repository, &["add", "."]); git(&repository, &["commit", "-m", "base"]); fs::write(repository.join("tracked.txt"), "source edits\n")?; - let mut config = ConfigBuilder::default() + let config = ConfigBuilder::default() .codex_home(home.path().to_path_buf()) .harness_overrides(ConfigOverrides { cwd: Some(home.path().to_path_buf()), @@ -115,7 +115,6 @@ async fn creation_attaches_to_original_task_and_survives_service_restart_scenari .loader_overrides(LoaderOverrides::without_managed_config_for_tests()) .build() .await?; - config.features.enable(codex_features::Feature::Worktrees)?; let mut server = Box::pin(start_server(&config)).await?; let mut conflicting = config.clone(); let raw: codex_config::RawMcpServerConfig = diff --git a/codex-rs/tui/src/resume_picker.rs b/codex-rs/tui/src/resume_picker.rs index 7424757fe3..6d1381d20f 100644 --- a/codex-rs/tui/src/resume_picker.rs +++ b/codex-rs/tui/src/resume_picker.rs @@ -345,7 +345,6 @@ struct SessionPickerRunOptions { show_all: bool, filter_cwd: Option, local_filter_cwd: Option, - worktrees_enabled: bool, action: SessionPickerAction, launch_context: SessionPickerLaunchContext, provider_filter: ProviderFilter, @@ -458,7 +457,6 @@ async fn run_resume_picker_with_launch_context( show_all, filter_cwd: cwd_filter, local_filter_cwd, - worktrees_enabled: config.features.enabled(codex_features::Feature::Worktrees), action: SessionPickerAction::Resume, launch_context, provider_filter, @@ -520,7 +518,6 @@ pub async fn run_fork_picker_with_app_server( show_all, filter_cwd: cwd_filter, local_filter_cwd, - worktrees_enabled: config.features.enabled(codex_features::Feature::Worktrees), action: SessionPickerAction::Fork, launch_context: SessionPickerLaunchContext::Startup, provider_filter, @@ -574,7 +571,6 @@ async fn run_session_picker_with_loader( state.copy_on_select = options.copy_on_select; state.copy_on_select_clear_selection = options.copy_on_select_clear_selection; state.mouse_scroll_speed = options.mouse_scroll_speed; - state.worktrees_enabled = options.worktrees_enabled; state.density = options.initial_density; state.view_persistence = options.view_persistence; state.keymap = options.keymap; @@ -726,9 +722,6 @@ fn spawn_app_server_page_loader( request.cursor.as_ref(), request.cwd_filter.as_deref(), uses_remote_filesystem, - config.as_ref().is_some_and(|config| { - config.features.enabled(codex_features::Feature::Worktrees) - }), ); let cursor = request.cursor.map(|PageCursor::AppServer(cursor)| cursor); let params = thread_list_params( @@ -879,7 +872,6 @@ struct PickerState { status: SessionStatus, filter_cwd: Option, local_filter_cwd: Option, - worktrees_enabled: bool, toolbar_focus: ToolbarControl, density: SessionListDensity, launch_context: SessionPickerLaunchContext, @@ -1080,7 +1072,6 @@ impl PickerState { status: SessionStatus::Active, local_filter_cwd: filter_cwd.clone(), local_cwd_matches: HashMap::new(), - worktrees_enabled: false, filter_cwd, toolbar_focus: ToolbarControl::Filter, density: SessionListDensity::Comfortable, @@ -1706,13 +1697,11 @@ impl PickerState { return false; }; paths_match(row_cwd, filter_cwd) - || (self.worktrees_enabled - && codex_git_utils::repository_identity(row_cwd) - .zip(codex_git_utils::repository_identity(filter_cwd)) - .is_some_and(|(row, filter)| { - row.common_dir == filter.common_dir - && row.relative_cwd == filter.relative_cwd - })) + || codex_git_utils::repository_identity(row_cwd) + .zip(codex_git_utils::repository_identity(filter_cwd)) + .is_some_and(|(row, filter)| { + row.common_dir == filter.common_dir && row.relative_cwd == filter.relative_cwd + }) } fn set_query(&mut self, new_query: String) { @@ -2130,10 +2119,8 @@ fn thread_list_params( pub(crate) fn repository_cwd_filter( cwd: &Path, uses_remote_filesystem: bool, - worktrees_enabled: bool, ) -> ThreadListCwdFilter { - if worktrees_enabled - && !uses_remote_filesystem + if !uses_remote_filesystem && let Some(cwds) = codex_git_utils::linked_worktree_cwds(cwd) && cwds.len() > 1 { @@ -2895,12 +2882,11 @@ fn render_comfortable_session_lines( .as_ref() .map(|path| format_directory_display(path, /*max_width*/ None)); let show_cwd = state.filter_mode == SessionFilterMode::All - || (state.worktrees_enabled - && row - .cwd - .as_deref() - .zip(state.local_filter_cwd.as_deref()) - .is_some_and(|(row_cwd, filter_cwd)| !paths_match(row_cwd, filter_cwd))); + || row + .cwd + .as_deref() + .zip(state.local_filter_cwd.as_deref()) + .is_some_and(|(row_cwd, filter_cwd)| !paths_match(row_cwd, filter_cwd)); let footer_lines = render_footer_lines( state.sort_key, &created, @@ -3767,7 +3753,7 @@ mod tests { } #[tokio::test] - async fn worktrees_filtering_requires_feature() { + async fn linked_worktree_sessions_are_included_for_local_repositories() { let root = tempfile::tempdir().expect("temporary repository"); let primary = root.path().join("primary"); let linked = root.path().join("linked"); @@ -3795,60 +3781,44 @@ mod tests { let mut row = make_row("session.jsonl", "2025-01-01T00:00:00Z", "Linked session"); row.cwd = Some(linked.clone()); let single = ThreadListCwdFilter::One(primary.display().to_string()); - for enabled in [false, true] { - state.worktrees_enabled = enabled; - state.start_initial_load(); - state.ingest_page(page( - vec![row.clone()], - /*next_cursor*/ None, - /*num_scanned_files*/ 1, - /*reached_scan_cap*/ false, - )); - assert_eq!( - state.filtered_rows, - if enabled { vec![row.clone()] } else { vec![] } - ); - if enabled { - state - .pagination - .finish_load(state.next_request_token - 1) - .expect("initial page completed"); - state.relative_time_reference = - Some(parse_timestamp_str("2025-01-02T00:00:00Z").expect("fixed time")); - // The retained row was filtered using its real checkout path; use a stable - // display path so the snapshot is independent of the temporary directory. - state.filtered_rows[0].cwd = Some(PathBuf::from("/repo/linked")); - state.update_viewport(/*rows*/ 12, /*width*/ 100); - assert_snapshot!( - "resume_picker_linked_worktree", - render_picker_list(&state, /*width*/ 100, /*height*/ 12) - ); - } - assert_eq!( - repository_cwd_filter(&primary, /*uses_remote_filesystem*/ false, enabled), - if enabled { - ThreadListCwdFilter::Many(vec![ - primary.display().to_string(), - linked.display().to_string(), - ]) - } else { - single.clone() - } - ); - assert_eq!( - repository_cwd_filter(&primary, /*uses_remote_filesystem*/ true, enabled), - single - ); - } - let mut config = crate::legacy_core::config::ConfigBuilder::default() + state.start_initial_load(); + state.ingest_page(page( + vec![row.clone()], + /*next_cursor*/ None, + /*num_scanned_files*/ 1, + /*reached_scan_cap*/ false, + )); + assert_eq!(state.filtered_rows, vec![row.clone()]); + state + .pagination + .finish_load(state.next_request_token - 1) + .expect("initial page completed"); + state.relative_time_reference = + Some(parse_timestamp_str("2025-01-02T00:00:00Z").expect("fixed time")); + // The retained row was filtered using its real checkout path; use a stable + // display path so the snapshot is independent of the temporary directory. + state.filtered_rows[0].cwd = Some(PathBuf::from("/repo/linked")); + state.update_viewport(/*rows*/ 12, /*width*/ 100); + assert_snapshot!( + "resume_picker_linked_worktree", + render_picker_list(&state, /*width*/ 100, /*height*/ 12) + ); + assert_eq!( + repository_cwd_filter(&primary, /*uses_remote_filesystem*/ false), + ThreadListCwdFilter::Many(vec![ + primary.display().to_string(), + linked.display().to_string(), + ]) + ); + assert_eq!( + repository_cwd_filter(&primary, /*uses_remote_filesystem*/ true), + single + ); + let config = crate::legacy_core::config::ConfigBuilder::default() .codex_home(root.path().to_path_buf()) .build() .await .unwrap(); - config - .features - .set_enabled(codex_features::Feature::Worktrees, /*enabled*/ true) - .unwrap(); for (filename_ts, timestamp, cwd) in [ ("2025-01-02T10-00-00", "2025-01-02T10:00:00Z", &primary), ("2025-01-02T11-00-00", "2025-01-02T11:00:00Z", &linked), @@ -3886,7 +3856,6 @@ mod tests { SessionPickerAction::Resume, ); live_picker.local_filter_cwd = Some(primary.clone()); - live_picker.worktrees_enabled = true; live_picker.start_initial_load(); let event = tokio::time::timeout(std::time::Duration::from_secs(10), bg_rx.recv()) .await @@ -3918,7 +3887,6 @@ mod tests { let mut local = crate::latest_session_lookup_params( /*uses_remote_filesystem*/ false, /*model_provider*/ None, - &config, Some(&primary), /*include_non_interactive*/ false, crate::LatestSessionLookupMode::StateDbOnly, @@ -3929,7 +3897,6 @@ mod tests { crate::latest_session_lookup_params( /*uses_remote_filesystem*/ true, /*model_provider*/ None, - &config, Some(&primary), /*include_non_interactive*/ false, crate::LatestSessionLookupMode::StateDbOnly, diff --git a/codex-rs/tui/src/resume_picker/page_loading.rs b/codex-rs/tui/src/resume_picker/page_loading.rs index 1a6da3d5e8..da2e132db6 100644 --- a/codex-rs/tui/src/resume_picker/page_loading.rs +++ b/codex-rs/tui/src/resume_picker/page_loading.rs @@ -18,11 +18,9 @@ impl PageCwdFilter { cursor: Option<&PageCursor>, cwd: Option<&Path>, uses_remote_filesystem: bool, - worktrees_enabled: bool, ) -> Option { if cursor.is_none() { - self.current = cwd - .map(|cwd| repository_cwd_filter(cwd, uses_remote_filesystem, worktrees_enabled)); + self.current = cwd.map(|cwd| repository_cwd_filter(cwd, uses_remote_filesystem)); } self.current.clone() } diff --git a/codex-rs/tui/src/resume_picker/page_loading_tests.rs b/codex-rs/tui/src/resume_picker/page_loading_tests.rs index 92c07de0b4..b85fa18cb3 100644 --- a/codex-rs/tui/src/resume_picker/page_loading_tests.rs +++ b/codex-rs/tui/src/resume_picker/page_loading_tests.rs @@ -21,7 +21,6 @@ fn linked_checkout_changes_only_affect_the_next_listing_cycle() { /*cursor*/ None, Some(&primary), /*uses_remote_filesystem*/ false, - /*worktrees_enabled*/ true, ), single ); @@ -43,7 +42,6 @@ fn linked_checkout_changes_only_affect_the_next_listing_cycle() { Some(&cursor), Some(&primary), /*uses_remote_filesystem*/ false, - /*worktrees_enabled*/ true, ), single ); @@ -56,7 +54,6 @@ fn linked_checkout_changes_only_affect_the_next_listing_cycle() { /*cursor*/ None, Some(&primary), /*uses_remote_filesystem*/ false, - /*worktrees_enabled*/ true, ), both ); @@ -66,7 +63,6 @@ fn linked_checkout_changes_only_affect_the_next_listing_cycle() { Some(&cursor), Some(&primary), /*uses_remote_filesystem*/ false, - /*worktrees_enabled*/ true, ), both ); @@ -75,7 +71,6 @@ fn linked_checkout_changes_only_affect_the_next_listing_cycle() { /*cursor*/ None, Some(&primary), /*uses_remote_filesystem*/ false, - /*worktrees_enabled*/ true, ), single ); diff --git a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__experimental_voice_tooltip.snap b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__experimental_voice_tooltip.snap deleted file mode 100644 index c9a8edd901..0000000000 --- a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__experimental_voice_tooltip.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tui/src/tooltips.rs -assertion_line: 382 -expression: "available.into_iter().filter(|tip| *tip ==\nvoice_tip).collect::>().join(\"\\n\")" ---- -NEW: Voice conversations can now be enabled from /experimental. Restart Codex after enabling, then use /voice. diff --git a/codex-rs/tui/src/tooltips.rs b/codex-rs/tui/src/tooltips.rs index 5f3b31887b..4319a0988c 100644 --- a/codex-rs/tui/src/tooltips.rs +++ b/codex-rs/tui/src/tooltips.rs @@ -3,8 +3,6 @@ use crate::keymap::keymap_action_id; use crate::terminal_hyperlinks::HyperlinkLine; use codex_config::types::TuiKeymap; use codex_features::FEATURES; -use codex_features::Feature; -use codex_features::FeatureSpec; use codex_protocol::account::PlanType; use lazy_static::lazy_static; use rand::Rng; @@ -38,25 +36,15 @@ lazy_static! { static ref ALL_TOOLTIPS: Vec<&'static str> = { let mut tips = Vec::new(); tips.extend(TOOLTIPS.iter().copied()); - tips.extend(experimental_tooltips( - FEATURES, - codex_realtime_webrtc::RealtimeWebrtcSession::is_supported, - )); + tips.extend( + FEATURES + .iter() + .filter_map(|spec| spec.stage.experimental_announcement()), + ); tips }; } -fn experimental_tooltips( - features: &[FeatureSpec], - voice_supported: impl Fn() -> bool, -) -> Vec<&'static str> { - features - .iter() - .filter(|spec| spec.id != Feature::RealtimeConversation || voice_supported()) - .filter_map(|spec| spec.stage.experimental_announcement()) - .collect() -} - /// Pick a random tooltip to show to the user when starting Codex. pub(crate) fn get_tooltip(plan: Option, keymap: &TuiKeymap) -> Option { let mut rng = rand::rng(); @@ -386,43 +374,6 @@ mod tests { use rand::SeedableRng; use rand::rngs::StdRng; - #[test] - fn experimental_voice_tooltip_requires_runtime_support() { - let mut features = FEATURES.to_vec(); - features - .iter_mut() - .find(|spec| spec.id == Feature::RealtimeConversation) - .unwrap() - .stage = codex_features::Stage::Experimental { - name: "Voice conversations", - menu_description: "Talk with Codex using /voice.", - announcement: "NEW: Voice conversations can now be enabled from /experimental. Restart Codex after enabling, then use /voice.", - }; - let unavailable = experimental_tooltips(&features, || false); - let available = experimental_tooltips(&features, || true); - let voice_tip = features - .iter() - .find(|spec| spec.id == Feature::RealtimeConversation) - .and_then(|spec| spec.stage.experimental_announcement()) - .expect("voice has an experimental announcement"); - assert_eq!( - unavailable, - available - .iter() - .copied() - .filter(|tip| *tip != voice_tip) - .collect::>() - ); - insta::assert_snapshot!( - "experimental_voice_tooltip", - available - .into_iter() - .filter(|tip| *tip == voice_tip) - .collect::>() - .join("\n") - ); - } - #[test] fn random_tooltip_returns_some_tip_when_available() { let mut rng = StdRng::seed_from_u64(42); diff --git a/codex-rs/tui/src/worktree_startup.rs b/codex-rs/tui/src/worktree_startup.rs index c1d1ca31ca..afe8047d78 100644 --- a/codex-rs/tui/src/worktree_startup.rs +++ b/codex-rs/tui/src/worktree_startup.rs @@ -214,11 +214,6 @@ pub(super) async fn prepare( .await; } } - if !source.features.enabled(codex_features::Feature::Worktrees) { - color_eyre::eyre::bail!( - "`--worktree` requires the worktrees feature; enable it with `--enable worktrees`" - ); - } if source.active_project.is_untrusted() { color_eyre::eyre::bail!( "`--worktree` cannot create a checkout from an explicitly untrusted source" From dffa0deb69268ed4ac31578794c9ea897b336ae3 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Thu, 15 Oct 2026 06:53:44 +0000 Subject: [PATCH 084/155] Show image previews in the fullscreen transcript (#54216) ## What changed Render local viewed images and generated image artifacts as bounded thumbnails in the rich fullscreen transcript using Kitty or Sixel graphics. Viewed images appear when their activity is expanded or the detailed presentation is active; generated images appear alongside their saved-path entry. Keep previews clipped to the viewport, retain graphics across unrelated redraws, and remove them when overlays open. Bound image decoding and cache memory, and preserve text-only entries for remote workspaces, unsupported terminals, missing files, and oversized images. Image rows do not enter searchable or selectable text. ## Testing Add layout and snapshot coverage for disclosure, viewport clipping, rewrapping, raw-mode fallback, deleted files, and oversized rasters. Add terminal coverage for retained Kitty graphics, repainting after a clear, local-file transport, and overlay cleanup. GitOrigin-RevId: fb2ec146331acfcfc82b2b283616671c9ee93757 --- codex-rs/tui/src/app/owned_transcript.rs | 7 + .../tui/src/app/owned_transcript_tests.rs | 1 + codex-rs/tui/src/chatwidget/pets.rs | 2 +- .../tui/src/chatwidget/rendering_tests.rs | 4 +- codex-rs/tui/src/chatwidget/replay.rs | 4 +- codex-rs/tui/src/chatwidget/tool_lifecycle.rs | 4 +- codex-rs/tui/src/custom_terminal.rs | 128 ++++++++++++- codex-rs/tui/src/history_cell/mod.rs | 5 + codex-rs/tui/src/history_cell/patches.rs | 44 ++++- .../tui/src/history_cell/patches_tests.rs | 10 +- codex-rs/tui/src/lib.rs | 1 + codex-rs/tui/src/pets/image_protocol.rs | 9 +- codex-rs/tui/src/pets/mod.rs | 7 +- .../tui/src/thread_transcript/other_items.rs | 4 +- codex-rs/tui/src/transcript_image.rs | 169 ++++++++++++++++++ codex-rs/tui/src/transcript_view.rs | 33 ++++ codex-rs/tui/src/transcript_view/layout.rs | 40 +++-- .../tui/src/transcript_view/layout_tests.rs | 133 ++++++++++++++ ..._keeps_controls_without_passive_hints.snap | 5 +- ...tests__fullscreen_image_artifact_rows.snap | 28 +++ ...arch__tests__find_selective_expansion.snap | 5 +- codex-rs/tui/src/transcript_view/text.rs | 25 +++ codex-rs/tui/src/tui.rs | 8 +- codex-rs/tui/src/tui/size_monitor_tests.rs | 2 +- 24 files changed, 631 insertions(+), 47 deletions(-) create mode 100644 codex-rs/tui/src/transcript_image.rs create mode 100644 codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__layout__tests__fullscreen_image_artifact_rows.snap diff --git a/codex-rs/tui/src/app/owned_transcript.rs b/codex-rs/tui/src/app/owned_transcript.rs index 23993b29cd..7c43e1799b 100644 --- a/codex-rs/tui/src/app/owned_transcript.rs +++ b/codex-rs/tui/src/app/owned_transcript.rs @@ -80,6 +80,10 @@ impl App { let chat_widget = &self.chat_widget; let transcript_width = chat_widget.history_wrap_width(width); let view = &mut self.transcript_view; + view.image_protocol = chat_widget.pet_image_support().protocol().filter(|_| { + !self.app_server_target.uses_remote_workspace() + && crate::projectless::has_only_local_environments(&self.environment_manager) + }); view.mouse_scroll_speed = self.local_settings.tui.mouse_scroll_speed.unwrap_or(1.0); view.primary_selection = self.right_click_paste_environment.primary; view.copy_on_select = self @@ -358,6 +362,9 @@ impl App { frame.set_cursor_style(foreground.cursor_style(foreground_area)); frame.set_cursor_position(position); } + if chat_widget.no_modal_or_popup_active() { + frame.transcript_images = view.image_placements(); + } })?; if let Some((surface, tip)) = &turn_tip && tip.rendered.get().is_some() diff --git a/codex-rs/tui/src/app/owned_transcript_tests.rs b/codex-rs/tui/src/app/owned_transcript_tests.rs index ff6e0201bb..1ca9ddc35a 100644 --- a/codex-rs/tui/src/app/owned_transcript_tests.rs +++ b/codex-rs/tui/src/app/owned_transcript_tests.rs @@ -353,6 +353,7 @@ async fn owned_transcript_reserves_a_row_above_the_composer() -> Result<()> { app.chat_widget.apply_external_edit(draft.to_string()); if label == "Detailed" { app.transcript_cells = vec![Arc::new(crate::history_cell::new_view_image_tool_call( + "detail-image".to_string(), codex_utils_path_uri::LegacyAppPathString::from_string("assets/detail-image.png"), ))]; app.open_transcript_overlay(&mut tui); diff --git a/codex-rs/tui/src/chatwidget/pets.rs b/codex-rs/tui/src/chatwidget/pets.rs index 90be6317da..aec83e79e9 100644 --- a/codex-rs/tui/src/chatwidget/pets.rs +++ b/codex-rs/tui/src/chatwidget/pets.rs @@ -210,7 +210,7 @@ impl ChatWidget { true } - fn pet_image_support(&self) -> crate::pets::PetImageSupport { + pub(crate) fn pet_image_support(&self) -> crate::pets::PetImageSupport { #[cfg(test)] if let Some(support) = self.pet_image_support_override { return support; diff --git a/codex-rs/tui/src/chatwidget/rendering_tests.rs b/codex-rs/tui/src/chatwidget/rendering_tests.rs index 6a95ec466b..4129eca7be 100644 --- a/codex-rs/tui/src/chatwidget/rendering_tests.rs +++ b/codex-rs/tui/src/chatwidget/rendering_tests.rs @@ -367,7 +367,9 @@ fn active_transcript_preserves_clipped_markdown_hyperlinks() { size.height, )); terminal - .draw_with_size(size, |frame| renderable.render(area, frame.buffer_mut())) + .draw_with_size(size, &mut Vec::new(), |frame| { + renderable.render(area, frame.buffer_mut()) + }) .expect("render terminal frame"); let output = String::from_utf8(terminal.backend().writer().clone()).expect("UTF-8 output"); assert!(output.contains("\x1b]8;;https://example.com/\x07OSC8 label\x1b]8;;\x07")); diff --git a/codex-rs/tui/src/chatwidget/replay.rs b/codex-rs/tui/src/chatwidget/replay.rs index 8f573351ca..6c8a7fb7fb 100644 --- a/codex-rs/tui/src/chatwidget/replay.rs +++ b/codex-rs/tui/src/chatwidget/replay.rs @@ -413,8 +413,8 @@ impl ChatWidget { .unwrap_or(codex_app_server_protocol::WebSearchAction::Other), ); } - ThreadItem::ImageView { id: _, path } => { - self.on_view_image_tool_call(path); + ThreadItem::ImageView { id, path } => { + self.on_view_image_tool_call(id, path); } ThreadItem::ImageGeneration(item) => { self.on_image_generation_end( diff --git a/codex-rs/tui/src/chatwidget/tool_lifecycle.rs b/codex-rs/tui/src/chatwidget/tool_lifecycle.rs index 135aabca87..60617254f6 100644 --- a/codex-rs/tui/src/chatwidget/tool_lifecycle.rs +++ b/codex-rs/tui/src/chatwidget/tool_lifecycle.rs @@ -12,9 +12,9 @@ impl ChatWidget { self.add_to_history(history_cell::new_patch_event(changes, &self.config.cwd)); } - pub(super) fn on_view_image_tool_call(&mut self, path: LegacyAppPathString) { + pub(super) fn on_view_image_tool_call(&mut self, id: String, path: LegacyAppPathString) { self.flush_answer_stream_with_separator(); - self.add_to_history(history_cell::new_view_image_tool_call(path)); + self.add_to_history(history_cell::new_view_image_tool_call(id, path)); self.request_redraw(); } diff --git a/codex-rs/tui/src/custom_terminal.rs b/codex-rs/tui/src/custom_terminal.rs index c2a6f05895..0607a8ca6a 100644 --- a/codex-rs/tui/src/custom_terminal.rs +++ b/codex-rs/tui/src/custom_terminal.rs @@ -81,6 +81,9 @@ pub struct Frame<'a> { /// The buffer that is used to draw the current frame pub(crate) buffer: &'a mut Buffer, + + /// Fullscreen graphics to send after text, before the synchronized frame is committed. + pub(crate) transcript_images: Vec, } impl Frame<'_> { @@ -254,6 +257,7 @@ where /// Get a Frame object which provides a consistent view into the terminal state for rendering. pub fn get_frame(&mut self) -> Frame<'_> { Frame { + transcript_images: Vec::new(), cursor_position: None, cursor_style: SetCursorStyle::DefaultUserShape, viewport_area: self.viewport_area, @@ -346,13 +350,14 @@ where F: FnOnce(&mut Frame), { let screen_size = self.size()?; - self.draw_with_size(screen_size, render_callback) + self.draw_with_size(screen_size, &mut Vec::new(), render_callback) } /// Draws a single frame using a screen size already obtained by the caller. pub(crate) fn draw_with_size( &mut self, screen_size: Size, + retained_images: &mut Vec, render_callback: F, ) -> io::Result<()> where @@ -370,14 +375,52 @@ where // Buffer. Thus, we're taking the important data out of the Frame and dropping it. let cursor_position = frame.cursor_position; let cursor_style = frame.cursor_style; + let images = std::mem::take(&mut frame.transcript_images); + let changed = *retained_images != images; + if changed { + // Remove old graphics before text painting, including when switching to overlays. + for (index, placement) in retained_images.iter().enumerate() { + match placement.image.protocol { + crate::pets::ImageProtocol::Kitty + | crate::pets::ImageProtocol::KittyLocalFile => { + let id = crate::transcript_image::FIRST_IMAGE_ID + index as u32; + self.backend + .write_all(crate::pets::kitty_delete_image(id).as_bytes())?; + } + crate::pets::ImageProtocol::Sixel => self.invalidate_viewport(), + } + } + } // Not every terminal or multiplexer hides intermediate cursor moves inside a // synchronized update, especially when the frame spans multiple writes. let updates = diff_buffers(self.previous_buffer(), self.current_buffer()); + // A text clear, focus highlight, or full repaint may erase an otherwise stable image. + let repaint_images = changed + || updates.iter().any(|update| { + images.iter().any(|placement| match update { + DrawCommand::Put { x, y, .. } => placement.area.contains((*x, *y).into()), + DrawCommand::ClearToEnd { x, y, .. } => { + *y >= placement.area.y + && *y < placement.area.bottom() + && *x < placement.area.right() + } + }) + }); if !updates.is_empty() && !self.hidden_cursor { self.hide_cursor()?; } self.flush_updates(updates)?; + if repaint_images { + *retained_images = images; + for (index, placement) in retained_images.iter_mut().enumerate() { + let id = crate::transcript_image::FIRST_IMAGE_ID + index as u32; + placement.file = placement + .image + .draw(&mut self.backend, placement.area, placement.first_row, id) + .map_err(io::Error::other)?; + } + } match cursor_position { None if !self.hidden_cursor => self.hide_cursor()?, @@ -451,7 +494,7 @@ where self.backend.set_cursor_position(position)?; self.backend.clear_region(ClearType::AfterCursor)?; // Reset the back buffer to make sure the next update will redraw everything. - self.previous_buffer_mut().reset(); + self.invalidate_viewport(); Ok(()) } @@ -478,7 +521,7 @@ where self.set_cursor_position(home)?; std::io::Write::flush(&mut self.backend)?; self.visible_history_rows = 0; - self.previous_buffer_mut().reset(); + self.invalidate_viewport(); Ok(()) } @@ -497,7 +540,7 @@ where std::io::Write::flush(&mut self.backend)?; self.last_known_cursor_pos = Position { x: 0, y: 0 }; self.visible_history_rows = 0; - self.previous_buffer_mut().reset(); + self.invalidate_viewport(); Ok(()) } @@ -849,6 +892,77 @@ mod tests { } } + #[test] + fn transcript_images_survive_unrelated_redraws_and_are_removed_for_overlays() { + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("viewed.png"); + image::RgbaImage::from_pixel(32, 32, image::Rgba([10, 110, 200, 255])) + .save(&path) + .unwrap(); + for protocol in [ + crate::pets::ImageProtocol::Kitty, + crate::pets::ImageProtocol::KittyLocalFile, + ] { + let image = std::sync::Arc::new( + crate::transcript_image::TranscriptImage::load(&path, /*width*/ 40, protocol) + .unwrap(), + ); + let mut terminal = + Terminal::with_options(CaptureBackend::new(/*width*/ 40, /*height*/ 12)).unwrap(); + let size = terminal.last_known_screen_size; + terminal.set_viewport_area(Rect::new( + /*x*/ 0, + /*y*/ 0, + size.width, + size.height, + )); + let mut retained = Vec::new(); + for (index, text) in ["", "a", "ab", "ab"].into_iter().enumerate() { + if index == 3 { + assert_eq!(terminal.backend().output().matches("_Ga=T").count(), 1); + terminal.clear().unwrap(); + } + terminal + .draw_with_size(size, &mut retained, |frame| { + Line::from(text).render( + Rect::new( + /*x*/ 0, /*y*/ 10, /*width*/ 40, /*height*/ 1, + ), + frame.buffer_mut(), + ); + frame + .transcript_images + .push(crate::transcript_image::ImagePlacement { + image: std::sync::Arc::clone(&image), + area: Rect::new( + /*x*/ 2, + /*y*/ 2, + image.columns, + image.rows, + ), + first_row: 0, + file: None, + }); + }) + .unwrap(); + } + let output = terminal.backend().output(); + assert_eq!(output.matches("_Ga=T").count(), 2); + assert_eq!(output.matches("_Ga=d").count(), 0); + if protocol == crate::pets::ImageProtocol::KittyLocalFile { + assert!(output.contains("t=f") && output.contains("C=1")); + assert!(retained[0].file.as_ref().unwrap().path().exists()); + } else { + assert!(retained[0].file.is_none()); + } + terminal + .draw_with_size(size, &mut retained, |_| {}) + .unwrap(); + assert_eq!(terminal.backend().output().matches("_Ga=d").count(), 1); + assert!(retained.is_empty()); + } + } + impl Backend for CaptureBackend { type Error = io::Error; @@ -1047,7 +1161,9 @@ mod tests { let screen_size = terminal.last_known_screen_size; for _ in 0..3 { - terminal.draw_with_size(screen_size, |_| {}).expect("draw"); + terminal + .draw_with_size(screen_size, &mut Vec::new(), |_| {}) + .expect("draw"); } terminal.set_viewport_area(Rect::new( @@ -1071,7 +1187,7 @@ mod tests { let area = Rect::new(/*x*/ 0, /*y*/ 0, size.width, size.height); terminal.set_viewport_area(area); terminal - .draw_with_size(size, |frame| { + .draw_with_size(size, &mut Vec::new(), |frame| { Paragraph::new("alpha beta") .wrap(Wrap { trim: false }) .render(area, frame.buffer_mut()); diff --git a/codex-rs/tui/src/history_cell/mod.rs b/codex-rs/tui/src/history_cell/mod.rs index ac39aef420..5b14559f63 100644 --- a/codex-rs/tui/src/history_cell/mod.rs +++ b/codex-rs/tui/src/history_cell/mod.rs @@ -224,6 +224,11 @@ pub(crate) trait HistoryCell: std::fmt::Debug + Send + Sync + Any { /// Returns copy-friendly plain logical lines for raw scrollback mode. fn raw_lines(&self) -> Vec>; + /// A local artifact the owned fullscreen viewport may preview. Text surfaces ignore it. + fn image_path(&self) -> Option { + None + } + /// Raw live presentation may omit transcript-only diagnostics without losing their source. fn live_raw_lines(&self) -> Vec> { self.raw_lines() diff --git a/codex-rs/tui/src/history_cell/patches.rs b/codex-rs/tui/src/history_cell/patches.rs index 3569c7c9ab..49191948f0 100644 --- a/codex-rs/tui/src/history_cell/patches.rs +++ b/codex-rs/tui/src/history_cell/patches.rs @@ -159,11 +159,20 @@ impl HistoryCell for PatchFailureCell { #[derive(Debug)] pub(crate) struct ViewImageHistoryCell { + activity_id: String, filename: String, path_label: String, } impl HistoryCell for ViewImageHistoryCell { + fn activity_ids(&self) -> Vec { + vec![self.activity_id.clone()] + } + + fn image_path(&self) -> Option { + LegacyAppPathString::from_string(self.path_label.clone()).to_inferred_abs_path() + } + fn display_lines(&self, width: u16) -> Vec> { let line = vec![ "• ".dim(), @@ -191,12 +200,16 @@ impl HistoryCell for ViewImageHistoryCell { } } -pub(crate) fn new_view_image_tool_call(path: LegacyAppPathString) -> ViewImageHistoryCell { +pub(crate) fn new_view_image_tool_call( + id: String, + path: LegacyAppPathString, +) -> ViewImageHistoryCell { let filename = path .to_inferred_path_uri() .and_then(|path| path.basename()) .unwrap_or_else(|| path.render_for_ui()); ViewImageHistoryCell { + activity_id: format!("image-view:{id}"), filename, path_label: path.into_string(), } @@ -207,7 +220,7 @@ pub(crate) fn new_image_generation_call( status: &str, revised_prompt: Option, saved_path: Option, -) -> PlainHistoryCell { +) -> ImageGenerationHistoryCell { let detail = revised_prompt.unwrap_or(call_id); let heading = if status == "failed" { vec!["✗ ".red().bold(), "Image generation failed".bold()].into() @@ -215,12 +228,35 @@ pub(crate) fn new_image_generation_call( vec!["• ".dim(), "Generated Image:".bold()].into() }; let mut lines: Vec> = vec![heading, vec![" └ ".dim(), detail.dim()].into()]; - if let Some(saved_path) = saved_path { + if let Some(saved_path) = &saved_path { let saved_path = Url::from_file_path(saved_path.as_path()) .map(|url| url.to_string()) .unwrap_or_else(|_| saved_path.display().to_string()); lines.push(vec![" └ ".dim(), "Saved to: ".dim(), saved_path.into()].into()); } - PlainHistoryCell { lines } + ImageGenerationHistoryCell { + lines, + saved_path: saved_path.filter(|_| status != "failed"), + } +} + +#[derive(Debug)] +pub(crate) struct ImageGenerationHistoryCell { + lines: Vec>, + saved_path: Option, +} + +impl HistoryCell for ImageGenerationHistoryCell { + fn display_lines(&self, _width: u16) -> Vec> { + self.lines.clone() + } + + fn raw_lines(&self) -> Vec> { + plain_lines(self.lines.clone()) + } + + fn image_path(&self) -> Option { + self.saved_path.clone() + } } diff --git a/codex-rs/tui/src/history_cell/patches_tests.rs b/codex-rs/tui/src/history_cell/patches_tests.rs index 9844d9b4ec..9950b4350d 100644 --- a/codex-rs/tui/src/history_cell/patches_tests.rs +++ b/codex-rs/tui/src/history_cell/patches_tests.rs @@ -46,7 +46,8 @@ fn viewed_image_retains_original_path_in_details() { "/workspace/assets/example.png", r"C:\workspace\assets\example.png", ] { - let cell = new_view_image_tool_call(LegacyAppPathString::from_string(path)); + let cell = + new_view_image_tool_call("view".to_string(), LegacyAppPathString::from_string(path)); assert_eq!( cell.display_lines(/*width*/ 80) .iter() @@ -70,9 +71,10 @@ fn viewed_image_retains_original_path_in_details() { #[test] fn viewed_image_narrow_summary() { - let cell = new_view_image_tool_call(LegacyAppPathString::from_string( - "/workspace/very-long-screenshot-name.png", - )); + let cell = new_view_image_tool_call( + "view".to_string(), + LegacyAppPathString::from_string("/workspace/very-long-screenshot-name.png"), + ); insta::assert_snapshot!(cell.display_lines(/*width*/ 32)[0].to_string()); } diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs index e4ab86c347..e586a61fa4 100644 --- a/codex-rs/tui/src/lib.rs +++ b/codex-rs/tui/src/lib.rs @@ -241,6 +241,7 @@ mod thread_transcript; mod token_usage; mod tool_output; mod tooltips; +mod transcript_image; mod transcript_mode; mod transcript_reflow; mod transcript_view; diff --git a/codex-rs/tui/src/pets/image_protocol.rs b/codex-rs/tui/src/pets/image_protocol.rs index 06b6fc77bc..947cedc180 100644 --- a/codex-rs/tui/src/pets/image_protocol.rs +++ b/codex-rs/tui/src/pets/image_protocol.rs @@ -241,7 +241,7 @@ pub fn kitty_transmit_png_with_id( if index == 0 { let image_id = kitty_image_id_arg(image_id); command.push_str(&format!( - "{ESC}_Ga=T,t=d,f=100,c={columns},r={rows},q=2{image_id},m={more_flag};{chunk}{ST}", + "{ESC}_Ga=T,t=d,f=100,c={columns},r={rows},q=2{image_id},m={more_flag},C=1;{chunk}{ST}", )); } else { command.push_str(&format!("{ESC}_Gm={more_flag};{chunk}{ST}")); @@ -262,7 +262,8 @@ pub fn kitty_transmit_png_file_with_id( .with_context(|| format!("canonicalize {}", path.display()))?; let payload = general_purpose::STANDARD.encode(path.to_string_lossy().as_bytes()); let image_id = kitty_image_id_arg(image_id); - let command = format!("{ESC}_Ga=T,t=f,f=100,c={columns},r={rows},q=2{image_id};{payload}{ST}"); + let command = + format!("{ESC}_Ga=T,t=f,f=100,c={columns},r={rows},q=2{image_id},C=1;{payload}{ST}"); Ok(wrap_for_tmux_if_needed(&command)) } @@ -353,7 +354,7 @@ mod tests { ) .unwrap(); - assert!(command.starts_with("\x1b_Ga=T,t=d,f=100,c=4,r=3,q=2,m=0;")); + assert!(command.starts_with("\x1b_Ga=T,t=d,f=100,c=4,r=3,q=2,m=0,C=1;")); assert!(command.contains("cG5n")); assert!(command.ends_with("\x1b\\")); } @@ -691,7 +692,7 @@ mod tests { assert_eq!( command, - format!("\x1b_Ga=T,t=f,f=100,c=4,r=3,q=2,i=7;{payload}\x1b\\") + format!("\x1b_Ga=T,t=f,f=100,c=4,r=3,q=2,i=7,C=1;{payload}\x1b\\") ); } } diff --git a/codex-rs/tui/src/pets/mod.rs b/codex-rs/tui/src/pets/mod.rs index f12313ff4c..1026f62ef4 100644 --- a/codex-rs/tui/src/pets/mod.rs +++ b/codex-rs/tui/src/pets/mod.rs @@ -40,16 +40,19 @@ pub(crate) use ambient::test_ambient_pet; pub(crate) use asset_pack::builtin_spritesheet_path; #[cfg(test)] pub(crate) use asset_pack::write_test_pack; -#[cfg(test)] pub(crate) use image_protocol::ImageProtocol; pub(crate) use image_protocol::PetImageSupport; #[cfg(test)] pub(crate) use image_protocol::PetImageUnsupportedReason; #[cfg(not(test))] pub(crate) use image_protocol::detect_pet_image_support; +pub(crate) use image_protocol::kitty_delete_image; +pub(crate) use image_protocol::kitty_transmit_png_file_with_id; +pub(crate) use image_protocol::kitty_transmit_png_with_id; pub(crate) use picker::PET_PICKER_VIEW_ID; pub(crate) use picker::build_pet_picker_params; pub(crate) use preview::PetPickerPreviewState; +pub(crate) use sixel::encode_rgba; pub(crate) const DEFAULT_PET_ID: &str = "codex"; pub(crate) const DISABLED_PET_ID: &str = "disabled"; @@ -368,7 +371,7 @@ mod tests { let output = String::from_utf8(output).unwrap(); assert!(output.contains("a=d,d=I,i=49374,q=2;")); assert!(output.contains("\x1b[4;3H")); - assert!(output.contains("a=T,t=f,f=100,c=4,r=2,q=2,i=49374;")); + assert!(output.contains("a=T,t=f,f=100,c=4,r=2,q=2,i=49374,C=1;")); assert!(!output.contains("cG5n")); assert!(output.contains("\x1b8")); } diff --git a/codex-rs/tui/src/thread_transcript/other_items.rs b/codex-rs/tui/src/thread_transcript/other_items.rs index 6811613390..3d81922dfa 100644 --- a/codex-rs/tui/src/thread_transcript/other_items.rs +++ b/codex-rs/tui/src/thread_transcript/other_items.rs @@ -55,8 +55,8 @@ pub(super) fn cells(item: ThreadItem, cwd: &AbsolutePathBuf) -> TranscriptCells item.query, item.action.unwrap_or(WebSearchAction::Other), ))), - ThreadItem::ImageView { path, .. } => { - cells.push(Arc::new(history_cell::new_view_image_tool_call(path))) + ThreadItem::ImageView { id, path } => { + cells.push(Arc::new(history_cell::new_view_image_tool_call(id, path))) } ThreadItem::ImageGeneration(item) if !matches!(item.status.as_str(), "completed" | "failed") => diff --git a/codex-rs/tui/src/transcript_image.rs b/codex-rs/tui/src/transcript_image.rs new file mode 100644 index 0000000000..9aa9159603 --- /dev/null +++ b/codex-rs/tui/src/transcript_image.rs @@ -0,0 +1,169 @@ +//! Bounded image previews for the owned fullscreen transcript. +//! +//! Only decoded local image pixels reach the terminal encoders. Previews are never source text; +//! their reserved rows belong to layout. The terminal retains visible placements and any local +//! transport files until those placements change. + +use std::io::Write; +use std::path::Path; +use std::sync::Arc; + +use anyhow::Result; +use crossterm::cursor::MoveTo; +use crossterm::cursor::RestorePosition; +use crossterm::cursor::SavePosition; +use crossterm::queue; +use image::DynamicImage; +use image::ImageFormat; +use image::RgbaImage; +use ratatui::layout::Rect; + +use crate::pets::ImageProtocol; + +// Separate from the two image ids reserved for pets (0xC0DE and 0xC0DF). +pub(crate) const FIRST_IMAGE_ID: u32 = 0xC100; + +pub(crate) struct ImagePlacement { + pub(crate) image: Arc, + pub(crate) area: Rect, + pub(crate) first_row: usize, + pub(crate) file: Option, +} + +impl PartialEq for ImagePlacement { + fn eq(&self, other: &Self) -> bool { + Arc::ptr_eq(&self.image, &other.image) + && self.area == other.area + && self.first_row == other.first_row + } +} + +pub(crate) struct TranscriptImage { + pub(crate) protocol: ImageProtocol, + pub(crate) columns: u16, + pub(crate) rows: u16, + pub(crate) pixels: RgbaImage, + pub(crate) cell_width: u32, + pub(crate) cell_height: u32, +} + +pub(crate) fn terminal_cell_size() -> Option<(u32, u32)> { + crossterm::terminal::window_size() + .ok() + .filter(|size| size.columns > 0 && size.rows > 0 && size.width > 0 && size.height > 0) + .map(|size| { + ( + u32::from(size.width / size.columns).max(1), + u32::from(size.height / size.rows).max(1), + ) + }) +} + +impl TranscriptImage { + pub(crate) fn load(path: &Path, width: u16, protocol: ImageProtocol) -> Option { + let columns = width.saturating_sub(2).min(48); + let metadata = path.metadata().ok()?; + // Bound encoded input as well as the raster: metadata alone can dwarf a tiny image. + if columns == 0 || !metadata.is_file() || metadata.len() > 32 * 1024 * 1024 { + return None; + } + // Sixel paints physical pixels rather than sizing to a Kitty cell rectangle. Guessing + // the cell size could paint beyond the reserved rows and cover the composer. + let (cell_width, cell_height) = match protocol { + ImageProtocol::Sixel => terminal_cell_size()?, + // Kitty scales to cell coordinates itself. Use a stable, typical cell aspect ratio. + ImageProtocol::Kitty | ImageProtocol::KittyLocalFile => (8, 16), + }; + let mut reader = image::ImageReader::open(path) + .ok()? + .with_guessed_format() + .ok()?; + // The reader checks the decoded size before allocating the raster. Keep normal + // screenshots usable, but never allocate hundreds of MB for an optional thumbnail. + let mut limits = image::Limits::default(); + limits.max_alloc = Some(32 * 1024 * 1024); + reader.limits(limits); + let image = reader.decode().ok()?; + // The sprite encoder scans each active color per Sixel band. Bound both its CPU + // work and worst-case output even with large terminal cells or high-entropy images. + let (max_width, max_height) = match protocol { + ImageProtocol::Sixel => (160, 80), + ImageProtocol::Kitty | ImageProtocol::KittyLocalFile => (384, 160), + }; + let pixels = image + .thumbnail( + (u32::from(columns) * cell_width) + .min(image.width()) + .min(max_width), + (6 * cell_height).min(image.height()).min(max_height), + ) + .to_rgba8(); + Some(Self { + protocol, + columns: pixels.width().div_ceil(cell_width) as u16, + rows: pixels.height().div_ceil(cell_height) as u16, + pixels, + cell_width, + cell_height, + }) + } + + /// Draw only the visible vertical slice, never covering the prompt header or composer. + pub(crate) fn draw( + &self, + writer: &mut impl Write, + area: Rect, + first_row: usize, + id: u32, + ) -> Result> { + let (top, bottom) = match self.protocol { + ImageProtocol::Sixel => ( + first_row as u32 * self.cell_height, + (first_row as u32 + u32::from(area.height)) * self.cell_height, + ), + // Kitty scales the entire raster to r=rows; clip at those scaled boundaries. + ImageProtocol::Kitty | ImageProtocol::KittyLocalFile => ( + first_row as u32 * self.pixels.height() / u32::from(self.rows), + (first_row as u32 + u32::from(area.height)) * self.pixels.height() + / u32::from(self.rows), + ), + }; + let top = top.min(self.pixels.height()); + let height = bottom.min(self.pixels.height()) - top; + if height == 0 { + return Ok(None); + } + let cropped = + image::imageops::crop_imm(&self.pixels, 0, top, self.pixels.width(), height).to_image(); + let mut file = None; + // Encoding and temp-file failures must not abort the TUI. Only writes to the actual + // terminal below are fatal; the existing text entry remains usable without its preview. + let payload = (|| -> Result<_> { + Ok(match self.protocol { + ImageProtocol::Kitty | ImageProtocol::KittyLocalFile => { + let mut png = tempfile::Builder::new().suffix(".png").tempfile()?; + DynamicImage::ImageRgba8(cropped).write_to(&mut png, ImageFormat::Png)?; + png.flush()?; + let transmit = if self.protocol == ImageProtocol::KittyLocalFile { + crate::pets::kitty_transmit_png_file_with_id + } else { + crate::pets::kitty_transmit_png_with_id + }; + let command = transmit(png.path(), self.columns, area.height, Some(id))?; + file = (self.protocol == ImageProtocol::KittyLocalFile).then_some(png); + command.into_bytes() + } + ImageProtocol::Sixel => { + crate::pets::encode_rgba(cropped.as_raw(), cropped.width(), cropped.height())? + } + }) + })(); + let Ok(payload) = payload else { + return Ok(None); + }; + queue!(writer, SavePosition, MoveTo(area.x, area.y))?; + writer.write_all(&payload)?; + queue!(writer, RestorePosition)?; + Ok(file) + } +} diff --git a/codex-rs/tui/src/transcript_view.rs b/codex-rs/tui/src/transcript_view.rs index 80b8d67873..0e4fc5ec61 100644 --- a/codex-rs/tui/src/transcript_view.rs +++ b/codex-rs/tui/src/transcript_view.rs @@ -89,6 +89,7 @@ struct VisibleRow { /// Shared scrolling and interaction state for compact and detailed transcript presentations. pub(crate) struct TranscriptView { + pub(crate) image_protocol: Option, pub(crate) mouse_scroll_speed: f64, pending_mouse_scroll: f64, pub(crate) copy_on_select: bool, @@ -128,6 +129,7 @@ pub(crate) struct TranscriptView { impl Default for TranscriptView { fn default() -> Self { Self { + image_protocol: None, mouse_scroll_speed: 1.0, pending_mouse_scroll: 0.0, copy_on_select: false, @@ -305,6 +307,37 @@ impl TranscriptView { self.render_search(buf); } + pub(crate) fn image_placements(&self) -> Vec { + let mut placements = Vec::new(); + let mut y = self.area.y; + for rows in self.visible.chunk_by(|a, b| a.index == b.index) { + let entry_y = y; + y += rows.len() as u16; + let visible = &rows[0]; + let Some(image) = visible.layout.visible_image() else { + continue; + }; + let image_start = visible.layout.text_row_count(); + let skip = image_start.saturating_sub(visible.row); + if skip >= rows.len() { + continue; + } + let area = Rect::new( + self.area.x + self.area.width.saturating_sub(image.columns) / 2, + entry_y + skip as u16, + image.columns, + (rows.len() - skip) as u16, + ); + placements.push(crate::transcript_image::ImagePlacement { + image: Arc::clone(image), + area, + first_row: visible.row.saturating_sub(image_start), + file: None, + }); + } + placements + } + pub(crate) fn sync_live_tail( &mut self, width: u16, diff --git a/codex-rs/tui/src/transcript_view/layout.rs b/codex-rs/tui/src/transcript_view/layout.rs index 5e912a0627..f91e3d0225 100644 --- a/codex-rs/tui/src/transcript_view/layout.rs +++ b/codex-rs/tui/src/transcript_view/layout.rs @@ -11,7 +11,7 @@ use std::sync::Weak; use super::*; const MAX_CACHED_ENTRIES: usize = 64; -const MAX_CACHED_TEXT_BYTES: usize = 8 * 1024 * 1024; +const MAX_CACHED_LAYOUT_BYTES: usize = 8 * 1024 * 1024; /// The selected activity presentation and any live content that follows it. pub(crate) struct ActivityTranscriptLines { @@ -36,7 +36,8 @@ pub(super) fn activity_layout( return layout; } let label = match (expanded, lines.disclosure) { - (true, _) => "− Show less".to_owned(), + (true, Some(ActivityDisclosure::OutputLines(_))) => "− Show less".to_owned(), + (true, Some(ActivityDisclosure::Generic) | None) => "− Hide details".to_owned(), (false, Some(ActivityDisclosure::OutputLines(count))) => { let noun = if count == 1 { "line" } else { "lines" }; let mut label = format!("+ {count} {noun}"); @@ -70,6 +71,7 @@ struct RenderState { foreground: Option<(u8, u8, u8)>, background: Option<(u8, u8, u8)>, color_level: crate::terminal_palette::StdoutColorLevel, + cell_size: Option<(u32, u32)>, } struct CachedLayout { @@ -88,6 +90,7 @@ pub(super) struct CellPresentation { expanded: bool, disclosure: bool, detailed: bool, + image_protocol: Option, } impl TranscriptView { @@ -168,6 +171,7 @@ impl TranscriptView { let ids = cell.activity_ids(); let disclosure = !self.detailed && mode == HistoryRenderMode::Rich && !ids.is_empty(); let manually_expanded = self.disclosure.is_expanded(&ids); + let reveal_image = ids.is_empty() || manually_expanded || self.detailed; let expanded = disclosure && (full_content || manually_expanded); if manually_expanded { self.disclosure.expanded.extend(ids); @@ -179,13 +183,16 @@ impl TranscriptView { expanded, disclosure, detailed: full_content, + image_protocol: self + .image_protocol + .filter(|_| mode == HistoryRenderMode::Rich && reveal_image), }; let shortcut = self .disclosure .keymap .primary_hint(KeymapContext::Global, "open_transcript"); Some(self.cache.get(cell, width, presentation, || { - if disclosure { + let mut layout = if disclosure { activity_layout( ActivityTranscriptLines { activity: if expanded { @@ -210,7 +217,15 @@ impl TranscriptView { ), width, ) + }; + if let Some(protocol) = presentation.image_protocol + && let Some(path) = cell.image_path() + { + layout.image = + crate::transcript_image::TranscriptImage::load(path.as_path(), width, protocol) + .map(Arc::new); } + layout })) } } @@ -223,6 +238,7 @@ impl LayoutCache { foreground: crate::terminal_palette::default_fg(), background: crate::terminal_palette::default_bg(), color_level: crate::terminal_palette::stdout_color_level(), + cell_size: crate::transcript_image::terminal_cell_size(), }; if self.render_state.as_ref() != Some(&state) { self.entries.clear(); @@ -283,16 +299,20 @@ impl LayoutCache { } fn evict(&mut self) { - let mut bytes = self - .entries - .iter() - .map(|entry| entry.layout.text().len()) - .sum::(); + let retained_bytes = |entry: &CachedLayout| { + entry.layout.text().len() + + entry + .layout + .image + .as_ref() + .map_or(0, |image| image.pixels.len()) + }; + let mut bytes = self.entries.iter().map(retained_bytes).sum::(); // Retain a single oversized entry rather than repeatedly laying it out while visible. while self.entries.len() > 1 - && (self.entries.len() > MAX_CACHED_ENTRIES || bytes > MAX_CACHED_TEXT_BYTES) + && (self.entries.len() > MAX_CACHED_ENTRIES || bytes > MAX_CACHED_LAYOUT_BYTES) { - bytes -= self.entries.remove(/*index*/ 0).layout.text().len(); + bytes -= retained_bytes(&self.entries.remove(/*index*/ 0)); } } } diff --git a/codex-rs/tui/src/transcript_view/layout_tests.rs b/codex-rs/tui/src/transcript_view/layout_tests.rs index 486adc4308..366a978f07 100644 --- a/codex-rs/tui/src/transcript_view/layout_tests.rs +++ b/codex-rs/tui/src/transcript_view/layout_tests.rs @@ -51,6 +51,7 @@ fn layouts_refresh_for_width_animation_and_mutable_frames() { expanded: false, disclosure: false, detailed: false, + image_protocol: None, }, || TextLayout::new(history.transcript_hyperlink_lines(width), width), ) @@ -107,6 +108,7 @@ fn recent_entries_are_reused_and_old_entries_are_evicted() { expanded: false, disclosure: false, detailed: false, + image_protocol: None, }, || { TextLayout::new( @@ -127,6 +129,7 @@ fn recent_entries_are_reused_and_old_entries_are_evicted() { expanded: false, disclosure: false, detailed: false, + image_protocol: None, }, || { TextLayout::new( @@ -141,3 +144,133 @@ fn recent_entries_are_reused_and_old_entries_are_evicted() { [1, 1, 2] ); } + +#[test] +fn fullscreen_image_previews_follow_layout_without_entering_text_surfaces() { + use crate::history_cell::new_image_generation_call; + use crate::history_cell::new_view_image_tool_call; + use crate::pets::ImageProtocol; + use codex_utils_absolute_path::AbsolutePathBuf; + use codex_utils_path_uri::LegacyAppPathString; + + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("artifact.png"); + image::RgbaImage::from_pixel(480, 160, image::Rgba([255, 0, 0, 255])) + .save(&path) + .unwrap(); + let cells: Vec> = vec![ + Arc::new(new_view_image_tool_call( + "view-call".to_string(), + LegacyAppPathString::from_string(path.to_string_lossy().into_owned()), + )), + Arc::new(new_image_generation_call( + "image-call".to_string(), + "completed", + Some("A red rectangle".to_string()), + Some(AbsolutePathBuf::try_from(path.clone()).unwrap()), + )), + ]; + let area = Rect::new( + /*x*/ 0, /*y*/ 0, /*width*/ 140, /*height*/ 40, + ); + let frame = |buf: &Buffer| { + let uri = url::Url::from_file_path(&path).unwrap().to_string(); + crate::transcript_view::tests::text(buf) + .replace(&uri, "file:///workspace/artifact.png") + .replace(path.to_str().unwrap(), "/workspace/artifact.png") + .trim_end() + .to_string() + }; + let mut view = TranscriptView::default(); + let mut buf = Buffer::empty(area); + view.render(area, &mut buf, &cells); + let text_only = buf.clone(); + view.image_protocol = Some(ImageProtocol::Kitty); + view.render(area, &mut buf, &cells); + let collapsed = frame(&buf); + let collapsed_areas: Vec<_> = view.image_placements().iter().map(|p| p.area).collect(); + // Find may request full text, but only manual expansion may reveal inspected pixels. + assert!( + view.entry_layout(&cells, /*index*/ 0, /*full_content*/ true) + .unwrap() + .image + .is_none() + ); + + // An inspected image only appears after its existing activity control is expanded. + assert!(view.toggle_disclosure_at(&cells, /*column*/ 4, /*row*/ 1)); + view.image_protocol = None; + view.render(area, &mut buf, &cells); + let text: Vec<_> = (0..cells.len()) + .map(|index| view.layout(&cells, index).unwrap().text().to_string()) + .collect(); + view.image_protocol = Some(ImageProtocol::Kitty); + view.render(area, &mut buf, &cells); + let expanded_areas: Vec<_> = view.image_placements().iter().map(|p| p.area).collect(); + insta::assert_snapshot!( + "fullscreen_image_artifact_rows", + format!( + "Collapsed inspection / generated output\n{collapsed}\nGraphics: {collapsed_areas:?}\n\nExpanded inspection / generated output\n{}\nGraphics: {expanded_areas:?}", + frame(&buf) + ) + ); + for (index, expected) in text.iter().enumerate() { + let layout = view.layout(&cells, index).unwrap(); + assert_eq!(layout.text(), expected); + let pinned_narrow = layout.rewrap(/*width*/ 8); + assert!(pinned_narrow.visible_image().is_none()); + let pinned_restored = pinned_narrow.rewrap(area.width); + assert_eq!(pinned_restored.row_count(), layout.row_count()); + assert!(pinned_restored.visible_image().is_some()); + } + // Short, inset viewports may begin in an image. Its placement stays inside the viewport. + let short = Rect::new( + /*x*/ 7, /*y*/ 5, /*width*/ 16, /*height*/ 3, + ); + view.jump_to_latest(); + view.render(short, &mut Buffer::empty(short), &cells); + let placements = view.image_placements(); + assert!(!placements.is_empty()); + assert!( + placements + .iter() + .all(|placement| short.contains(placement.area.as_position()) + && placement.area.right() <= short.right() + && placement.area.bottom() <= short.bottom()) + ); + + view.render(area, &mut buf, &cells); + let control_row = view + .visible + .iter() + .position(|visible| visible.layout.disclosure_row() == Some(visible.row)) + .unwrap() as u16; + assert!(view.toggle_disclosure_at(&cells, /*column*/ 4, control_row)); + view.render(area, &mut buf, &cells); + + // Raw mode and unsupported terminals reserve no rows, even after rich previews were cached. + view.jump_to_latest(); + view.set_presentation(/*detailed*/ false, HistoryRenderMode::Raw); + view.render(area, &mut buf, &cells); + assert!((0..cells.len()).all(|index| view.layout(&cells, index).unwrap().image.is_none())); + view.set_presentation(/*detailed*/ false, HistoryRenderMode::Rich); + view.image_protocol = None; + view.render(area, &mut buf, &cells); + assert_eq!(buf, text_only); + + // Resumed sessions with a deleted file fall back to the original text entry. + std::fs::remove_file(&path).unwrap(); + view.image_protocol = Some(ImageProtocol::Kitty); + view.render(area, &mut buf, &cells); + assert_eq!(buf, text_only); + assert!(view.image_placements().is_empty()); + + // A tiny compressed file with a large decoded raster must also fall back to text. + image::RgbImage::new(4000, 3000).save(&path).unwrap(); + view.image_protocol = None; + view.render(area, &mut buf, &cells); + view.image_protocol = Some(ImageProtocol::Kitty); + view.render(area, &mut buf, &cells); + assert_eq!(buf, text_only); + assert!(view.image_placements().is_empty()); +} diff --git a/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__footer__tests__activity_focus_keeps_controls_without_passive_hints.snap b/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__footer__tests__activity_focus_keeps_controls_without_passive_hints.snap index dabbfed8a0..5a9b56193b 100644 --- a/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__footer__tests__activity_focus_keeps_controls_without_passive_hints.snap +++ b/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__footer__tests__activity_focus_keeps_controls_without_passive_hints.snap @@ -1,5 +1,6 @@ --- source: tui/src/transcript_view/footer_tests.rs +assertion_line: 515 expression: "hints.join(\"\\n\")" --- collapsed @@ -44,14 +45,14 @@ Buffer { content: [ "Activity summary ", "Hidden details ", - " − Show less ", + " − Hide details ", ], styles: [ x: 0, y: 0, fg: Reset, bg: Reset, underline: Reset, modifier: UNDERLINED, x: 0, y: 1, fg: Reset, bg: Reset, underline: Reset, modifier: NONE, x: 0, y: 2, fg: Reset, bg: Reset, underline: Reset, modifier: DIM, x: 4, y: 2, fg: Reset, bg: Reset, underline: Reset, modifier: BOLD, - x: 15, y: 2, fg: Reset, bg: Reset, underline: Reset, modifier: DIM, + x: 18, y: 2, fg: Reset, bg: Reset, underline: Reset, modifier: DIM, ] } "ctrl-x t": diff --git a/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__layout__tests__fullscreen_image_artifact_rows.snap b/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__layout__tests__fullscreen_image_artifact_rows.snap new file mode 100644 index 0000000000..7827815393 --- /dev/null +++ b/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__layout__tests__fullscreen_image_artifact_rows.snap @@ -0,0 +1,28 @@ +--- +source: tui/src/transcript_view/layout_tests.rs +assertion_line: 210 +expression: "format!(\"Collapsed inspection / generated output\\n{collapsed}\\nGraphics: {collapsed_areas:?}\\n\\nExpanded inspection / generated output\\n{}\\nGraphics: {expanded_areas:?}\",\nframe(&buf))" +--- +Collapsed inspection / generated output +• Viewed image artifact.png + + Show details + +• Generated Image: + └ A red rectangle + └ Saved to: file:///workspace/artifact.png +Graphics: [Rect { x: 52, y: 6, width: 36, height: 6 }] + +Expanded inspection / generated output +• Viewed image /workspace/artifact.png + − Hide details + + + + + + + +• Generated Image: + └ A red rectangle + └ Saved to: file:///workspace/artifact.png +Graphics: [Rect { x: 52, y: 2, width: 36, height: 6 }, Rect { x: 52, y: 12, width: 36, height: 6 }] diff --git a/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__search__tests__find_selective_expansion.snap b/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__search__tests__find_selective_expansion.snap index 0d2d28c15b..fb8773ec73 100644 --- a/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__search__tests__find_selective_expansion.snap +++ b/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__search__tests__find_selective_expansion.snap @@ -1,5 +1,6 @@ --- source: tui/src/transcript_view/search_tests.rs +assertion_line: 989 expression: "crate::transcript_view::tests::text(&buffer)" --- • Running 'echo visible … @@ -12,8 +13,8 @@ expression: "crate::transcript_view::tests::text(&buffer)" $ 'echo visible echo hidden newer needle' - − Show less + − Hide details $ 'echo visible echo hidden manual' - − Show less + − Hide details diff --git a/codex-rs/tui/src/transcript_view/text.rs b/codex-rs/tui/src/transcript_view/text.rs index 4aac01ddda..e2bc38ddd9 100644 --- a/codex-rs/tui/src/transcript_view/text.rs +++ b/codex-rs/tui/src/transcript_view/text.rs @@ -42,6 +42,7 @@ use ratatui::text::Line; /// One cell's logical text and its width-dependent display rows. pub(super) struct TextLayout { + pub(super) image: Option>, logical: Vec, text: String, rows: Vec, @@ -137,6 +138,7 @@ impl TextLayout { layout = layout.with_disclosure_control_at(control.label.clone(), control.source_offset); } + layout.image = self.image.clone(); if self.separated { layout.with_leading_separator() } else { @@ -271,9 +273,28 @@ impl TextLayout { } pub(super) fn row_count(&self) -> usize { + // Images occupy visual space, but have no searchable or selectable text rows. + self.text_row_count() + + self + .visible_image() + .map_or(0, |image| usize::from(image.rows)) + } + + pub(super) fn text_row_count(&self) -> usize { self.rows.len() } + pub(super) fn visible_image( + &self, + ) -> Option<&std::sync::Arc> { + self.image.as_ref().filter(|image| { + image.columns + 2 <= self.width + && (image.protocol != crate::pets::ImageProtocol::Sixel + || crate::transcript_image::terminal_cell_size() + == Some((image.cell_width, image.cell_height))) + }) + } + pub(super) fn disclosure_row(&self) -> Option { self.disclosure_control.as_ref().map(|control| control.row) } @@ -363,6 +384,9 @@ impl TextLayout { /// Find the display row containing a source position, including omitted wrapping whitespace. pub(super) fn row_for_offset(&self, offset: usize) -> usize { + if self.visible_image().is_some() && offset >= self.text.len() { + return self.row_count().saturating_sub(1); + } let before_control = if let Some(control_row) = self.disclosure_row() { let after_control = &self.rows[control_row + 1..]; let matching_rows = after_control.partition_point(|row| row.source.start <= offset); @@ -500,6 +524,7 @@ impl TextLayout { } } Self { + image: None, logical, text, rows, diff --git a/codex-rs/tui/src/tui.rs b/codex-rs/tui/src/tui.rs index 01201ec1a0..2a573f1e97 100644 --- a/codex-rs/tui/src/tui.rs +++ b/codex-rs/tui/src/tui.rs @@ -671,6 +671,7 @@ pub struct Tui { screen_size: ScreenSizePolicy, ambient_pet_image_state: crate::pets::PetImageRenderState, pet_picker_preview_image_state: crate::pets::PetImageRenderState, + pub(crate) transcript_images: Vec, alt_saved_viewport: Option, #[cfg(unix)] suspend_context: SuspendContext, @@ -749,6 +750,7 @@ impl Tui { screen_size: ScreenSizePolicy::default(), ambient_pet_image_state: crate::pets::PetImageRenderState::default(), pet_picker_preview_image_state: crate::pets::PetImageRenderState::default(), + transcript_images: Vec::new(), alt_saved_viewport: None, #[cfg(unix)] suspend_context: SuspendContext::new(), @@ -1367,9 +1369,7 @@ impl Tui { self.suspend_context.set_cursor_y(inline_area_bottom); } - terminal.draw_with_size(screen_size, |frame| { - draw_fn(frame); - }) + terminal.draw_with_size(screen_size, &mut self.transcript_images, draw_fn) })??; Ok(()) } @@ -1505,7 +1505,7 @@ impl Tui { self.suspend_context.set_cursor_y(inline_area_bottom); } - terminal.draw_with_size(screen_size, |frame| { + terminal.draw_with_size(screen_size, &mut self.transcript_images, |frame| { draw_fn(frame); }) })??; diff --git a/codex-rs/tui/src/tui/size_monitor_tests.rs b/codex-rs/tui/src/tui/size_monitor_tests.rs index f15fe04730..1986104da4 100644 --- a/codex-rs/tui/src/tui/size_monitor_tests.rs +++ b/codex-rs/tui/src/tui/size_monitor_tests.rs @@ -141,7 +141,7 @@ async fn missed_resize_recovers_and_slow_query_does_not_block_input() { let area = Rect::new(/*x*/ 0, /*y*/ 0, size.width, size.height); terminal.set_viewport_area(area); terminal - .draw_with_size(size, |frame| { + .draw_with_size(size, &mut Vec::new(), |frame| { Paragraph::new("alpha beta") .wrap(Wrap { trim: false }) .render(area, frame.buffer_mut()); From e89b7c442c0433ad5167e72a5a25bb6d0712766a Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Thu, 15 Oct 2026 06:58:13 +0000 Subject: [PATCH 085/155] Apply syntax theme colors to Markdown prose in the TUI (#54217) ## What changed Use the active syntax theme's markup foregrounds for headings, emphasis, strong text, list markers, links, and blockquotes. Preserve existing bold, italic, and underline modifiers, and retain previous styles when a scope provides no foreground. ## Testing Update rendering snapshots and streaming blockquote assertions for themed colors. Exercise existing fallback expectations with an empty syntax theme. GitOrigin-RevId: b00aa4af30f73f538ff5f888a0f9b4edbdc15893 --- .../tui/src/app/owned_transcript_tests.rs | 4 +- .../tui/src/inline_visualization_tests.rs | 4 +- codex-rs/tui/src/markdown_render.rs | 58 ++++++++++++++----- ...ed_without_coloring_surrounding_prose.snap | 2 +- ...eep_link_style_when_wrapped_in_tables.snap | 4 +- ...y_and_fallback_presentations_snapshot.snap | 18 +++--- .../src/markdown_render/web_links_tests.rs | 23 ++++---- codex-rs/tui/src/markdown_render_tests.rs | 28 +++++++++ codex-rs/tui/src/markdown_stream.rs | 35 +++++++---- ...markers_use_terminal_palette_snapshot.snap | 2 +- ...els_have_a_visible_underline_snapshot.snap | 2 +- ...ooltips__tests__desktop_app_tip_linux.snap | 4 +- ...ooltips__tests__desktop_app_tip_macos.snap | 2 +- ...ltips__tests__desktop_app_tip_windows.snap | 4 +- ...er__tests__incremental_file_citations.snap | 12 ++-- ...remental_render_representative_stream.snap | 10 ++-- ...out_context_use_canonical_full_render.snap | 2 +- ..._shortcut_tips_render_at_narrow_width.snap | 28 ++++----- 18 files changed, 155 insertions(+), 87 deletions(-) diff --git a/codex-rs/tui/src/app/owned_transcript_tests.rs b/codex-rs/tui/src/app/owned_transcript_tests.rs index 1ca9ddc35a..a68938e517 100644 --- a/codex-rs/tui/src/app/owned_transcript_tests.rs +++ b/codex-rs/tui/src/app/owned_transcript_tests.rs @@ -188,11 +188,11 @@ async fn list_spacing_completion_preserves_the_scrolled_reader() -> Result<()> { let mut after = Buffer::empty(area); app.transcript_view .render(area, &mut after, &app.transcript_cells); - assert_eq!(after, before); + assert_eq!(buffer_text(&after), buffer_text(&before)); app.transcript_view.jump_to_latest(); app.transcript_view .render(area, &mut after, &app.transcript_cells); - assert_eq!(after, before); + assert_eq!(buffer_text(&after), buffer_text(&before)); Ok(()) } diff --git a/codex-rs/tui/src/inline_visualization_tests.rs b/codex-rs/tui/src/inline_visualization_tests.rs index 7105d7c40e..de7f18320f 100644 --- a/codex-rs/tui/src/inline_visualization_tests.rs +++ b/codex-rs/tui/src/inline_visualization_tests.rs @@ -346,7 +346,9 @@ fn finalized_agent_cell_replays_visualization_link() { .expect("visualization URL span"); assert_eq!( url_span.style, - Style::new().fg(crate::style::accent_color()).underlined() + crate::render::highlight::foreground_style_for_scopes(&["markup.underline.link"]) + .unwrap() + .underlined() ); let destinations = lines .iter() diff --git a/codex-rs/tui/src/markdown_render.rs b/codex-rs/tui/src/markdown_render.rs index 8d65d0a1c8..7f09494c78 100644 --- a/codex-rs/tui/src/markdown_render.rs +++ b/codex-rs/tui/src/markdown_render.rs @@ -38,6 +38,8 @@ //! body rows, or even 3-char-wide columns cannot fit, body rows render as //! key/value records. //! +//! Markdown prose uses foregrounds from the active syntax theme's markup scopes, +//! retaining its usual modifiers and falling back when a scope has no foreground. //! Inline code and local file paths share the active syntax theme's raw-markup foreground. use crate::markdown_text_merge::DecodedTextMerge; @@ -133,13 +135,20 @@ impl Default for MarkdownStyles { impl MarkdownStyles { fn for_theme(theme: &syntect::highlighting::Theme) -> Self { + let foreground = |scopes: &[&str]| { + foreground_style_for_scopes_with_theme(theme, scopes).unwrap_or_default() + }; Self { - h1: Style::new().bold().underlined(), - h2: Style::new().bold(), - h3: Style::new().bold().italic(), - h4: Style::new().italic(), - h5: Style::new().italic(), - h6: Style::new().italic(), + h1: foreground(&["markup.heading.1.markdown", "markup.heading.markdown"]) + .bold() + .underlined(), + h2: foreground(&["markup.heading.2.markdown", "markup.heading.markdown"]).bold(), + h3: foreground(&["markup.heading.3.markdown", "markup.heading.markdown"]) + .bold() + .italic(), + h4: foreground(&["markup.heading.4.markdown", "markup.heading.markdown"]).italic(), + h5: foreground(&["markup.heading.5.markdown", "markup.heading.markdown"]).italic(), + h6: foreground(&["markup.heading.6.markdown", "markup.heading.markdown"]).italic(), code: foreground_style_for_scopes_with_theme( theme, &[ @@ -148,13 +157,23 @@ impl MarkdownStyles { ], ) .unwrap_or_else(|| Style::new().fg(accent_color())), - emphasis: Style::new().italic(), - strong: Style::new().bold(), + emphasis: foreground(&["markup.italic.markdown"]).italic(), + strong: foreground(&["markup.bold.markdown"]).bold(), strikethrough: Style::new().crossed_out(), - ordered_list_marker: Style::new().light_blue(), - unordered_list_marker: Style::new(), - link: Style::new().fg(accent_color()).underlined(), - blockquote: Style::new().green(), + ordered_list_marker: Style::new() + .light_blue() + .patch(foreground(&["markup.list.numbered.markdown"])), + unordered_list_marker: foreground(&[ + "markup.list.unnumbered.markdown", + "markup.list.bullet.markdown", + ]), + link: Style::new() + .fg(accent_color()) + .patch(foreground(&["markup.underline.link.markdown"])) + .underlined(), + blockquote: Style::new() + .green() + .patch(foreground(&["markup.quote.markdown"])), } } } @@ -2575,7 +2594,6 @@ mod markdown_render_tests { mod tests { use super::*; use pretty_assertions::assert_eq; - use ratatui::style::Stylize; use ratatui::text::Text; fn lines_to_strings(text: &Text<'_>) -> Vec { @@ -2660,9 +2678,17 @@ mod tests { assert_eq!( source.styled_range(0..source.text.len()), Line::from(vec![ - "block quote with ".green(), - "content".green().bold(), - " that should wrap nicely".green(), + Span::styled("block quote with ", MarkdownStyles::default().blockquote), + Span::styled( + "content", + MarkdownStyles::default() + .blockquote + .patch(MarkdownStyles::default().strong) + ), + Span::styled( + " that should wrap nicely", + MarkdownStyles::default().blockquote + ), ]) ); let lines: Vec<_> = rendered.iter().map(|line| line.line.to_string()).collect(); diff --git a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_are_styled_without_coloring_surrounding_prose.snap b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_are_styled_without_coloring_surrounding_prose.snap index da67cbc905..ee1efc0847 100644 --- a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_are_styled_without_coloring_surrounding_prose.snap +++ b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_are_styled_without_coloring_surrounding_prose.snap @@ -3,4 +3,4 @@ source: tui/src/markdown_render/web_links_tests.rs assertion_line: 37 expression: text --- -Text::from(Line::from_iter([Span::from("界 ("), Span::from("https://example.com/a").fg(Color::Reset).underlined(), Span::from("); "), Span::from("https://example.com/b").fg(Color::Reset).underlined(), Span::from("! "), Span::from("https://example.com/c").fg(Color::Reset).bold().underlined()])) +Text::from(Line::from_iter([Span::from("界 ("), Span::from("https://example.com/a").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from("); "), Span::from("https://example.com/b").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from("! "), Span::from("https://example.com/c").fg(Color::Rgb(137, 180, 250)).bold().underlined()])) diff --git a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_keep_link_style_when_wrapped_in_tables.snap b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_keep_link_style_when_wrapped_in_tables.snap index 7e88fd7d36..911cf60682 100644 --- a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_keep_link_style_when_wrapped_in_tables.snap +++ b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_keep_link_style_when_wrapped_in_tables.snap @@ -11,10 +11,10 @@ Text::from_iter([ Line::from(Span::from("━━━━━━━━━━━━━━━━━━━━").dim()), Line::from_iter([ Span::from(" "), - Span::from("https://").fg(Color::Reset).underlined(), + Span::from("https://").fg(Color::Rgb(137, 180, 250)).underlined(), ]), Line::from_iter([ Span::from(" "), - Span::from("example.com/docs").fg(Color::Reset).underlined(), + Span::from("example.com/docs").fg(Color::Rgb(137, 180, 250)).underlined(), ]), ]) diff --git a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__label_only_and_fallback_presentations_snapshot.snap b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__label_only_and_fallback_presentations_snapshot.snap index 2c6a1bce21..6dd37933fa 100644 --- a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__label_only_and_fallback_presentations_snapshot.snap +++ b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__label_only_and_fallback_presentations_snapshot.snap @@ -6,11 +6,11 @@ expression: presentations Text::from_iter([ Line::from_iter([ Span::from("plain "), - Span::from("plain").fg(Color::Reset).underlined(), + Span::from("plain").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), - Span::from("code").fg(Color::Reset).underlined(), + Span::from("code").fg(Color::Rgb(137, 180, 250)).underlined(), ]), Line::default(), Line::from_iter([ @@ -20,23 +20,23 @@ expression: presentations Line::from(Span::from("━━━━━━━━━━").dim()), Line::from_iter([ Span::from(" "), - Span::from("docs").fg(Color::Reset).underlined(), + Span::from("docs").fg(Color::Rgb(137, 180, 250)).underlined(), ]), ]), Text::from_iter([ Line::from_iter([ Span::from("plain "), - Span::from("plain").fg(Color::Reset).underlined(), + Span::from("plain").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), - Span::from("https://example.com").fg(Color::Reset).underlined(), + Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), ]), Line::from_iter([ - Span::from("code").fg(Color::Reset).underlined(), + Span::from("code").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), - Span::from("https://example.com").fg(Color::Reset).underlined(), + Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")"), ]), Line::default(), @@ -47,9 +47,9 @@ expression: presentations Line::from(Span::from("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━").dim()), Line::from_iter([ Span::from(" "), - Span::from("docs").fg(Color::Reset).underlined(), + Span::from("docs").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), - Span::from("https://example.com/docs").fg(Color::Reset).underlined(), + Span::from("https://example.com/docs").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")"), ]), ]), diff --git a/codex-rs/tui/src/markdown_render/web_links_tests.rs b/codex-rs/tui/src/markdown_render/web_links_tests.rs index 38eba10d2e..cf8a08f929 100644 --- a/codex-rs/tui/src/markdown_render/web_links_tests.rs +++ b/codex-rs/tui/src/markdown_render/web_links_tests.rs @@ -1,4 +1,5 @@ use super::WebLinkDisplay; +use crate::markdown_render::MarkdownStyles; use crate::markdown_render::render_markdown_lines_with_width_cwd_and_hidden_link_destinations; use crate::markdown_render::render_streaming_markdown_lines_with_width_and_cwd; use crate::style::accent_color; @@ -13,6 +14,7 @@ use pretty_assertions::assert_eq; use ratatui::style::Style; use ratatui::style::Stylize; use ratatui::text::Line; +use ratatui::text::Span; use ratatui::text::Text; use std::collections::BTreeSet; @@ -27,14 +29,11 @@ fn bare_urls_are_styled_without_coloring_surrounding_prose() { text, Text::from(Line::from(vec![ "界 (".into(), - "https://example.com/a".fg(accent_color()).underlined(), + Span::styled("https://example.com/a", MarkdownStyles::default().link), "); ".into(), - "https://example.com/b".fg(accent_color()).underlined(), + Span::styled("https://example.com/b", MarkdownStyles::default().link), "! ".into(), - "https://example.com/c" - .bold() - .fg(accent_color()) - .underlined(), + Span::styled("https://example.com/c", MarkdownStyles::default().link).bold(), ])), ); assert_debug_snapshot!(text); @@ -103,27 +102,27 @@ fn supporting_terminals_render_only_the_styled_label_and_keep_its_target() { for (markdown, label) in [ ( "[label](https://example.com)", - "label".fg(accent_color()).underlined(), + Span::styled("label", MarkdownStyles::default().link), ), ( "[`label`](https://example.com)", - "label".fg(accent_color()).underlined(), + Span::styled("label", MarkdownStyles::default().link), ), ( "[**label**](https://example.com)", - "label".fg(accent_color()).bold().underlined(), + Span::styled("label", MarkdownStyles::default().link).bold(), ), ( "[*label*](https://example.com)", - "label".fg(accent_color()).italic().underlined(), + Span::styled("label", MarkdownStyles::default().link).italic(), ), ( "[](https://example.com)", - "".fg(accent_color()).underlined(), + Span::styled("", MarkdownStyles::default().link), ), ( "[https://example.com](https://example.com)", - "https://example.com".fg(accent_color()).underlined(), + Span::styled("https://example.com", MarkdownStyles::default().link), ), ] { let label_width = label.width(); diff --git a/codex-rs/tui/src/markdown_render_tests.rs b/codex-rs/tui/src/markdown_render_tests.rs index 94312ca7ec..3230dd8e36 100644 --- a/codex-rs/tui/src/markdown_render_tests.rs +++ b/codex-rs/tui/src/markdown_render_tests.rs @@ -1,4 +1,5 @@ use super::MarkdownStyles; +use crate::render::highlight::set_syntax_theme; use crate::style::accent_color; use pretty_assertions::assert_eq; use ratatui::style::Modifier; @@ -146,6 +147,7 @@ fn paragraph_multiple() { #[test] fn headings() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "# Heading 1\n## Heading 2\n### Heading 3\n#### Heading 4\n##### Heading 5\n###### Heading 6\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -166,6 +168,7 @@ fn headings() { #[test] fn blockquote_single() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text("> Blockquote"); let expected = Text::from(Line::from_iter(["> ", "Blockquote"]).green()); assert_eq!(text, expected); @@ -196,6 +199,7 @@ fn blockquote_soft_break() { #[test] fn blockquote_multiple_with_break() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text("> Blockquote 1\n\n> Blockquote 2\n"); let expected = Text::from_iter([ Line::from_iter(["> ", "Blockquote 1"]).green(), @@ -207,6 +211,7 @@ fn blockquote_multiple_with_break() { #[test] fn blockquote_three_paragraphs_short_lines() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "> one\n>\n> two\n>\n> three\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -221,6 +226,7 @@ fn blockquote_three_paragraphs_short_lines() { #[test] fn blockquote_nested_two_levels() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "> Level 1\n>> Level 2\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -233,6 +239,7 @@ fn blockquote_nested_two_levels() { #[test] fn blockquote_with_list_items() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "> - item 1\n> - item 2\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -244,6 +251,7 @@ fn blockquote_with_list_items() { #[test] fn blockquote_with_ordered_list() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "> 1. first\n> 2. second\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -265,6 +273,7 @@ fn blockquote_with_ordered_list() { #[test] fn blockquote_list_then_nested_blockquote() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "> - parent\n> > child\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -470,6 +479,7 @@ fn blockquote_with_heading_and_paragraph() { #[test] fn blockquote_heading_inherits_heading_style() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text("> # test header\n> in blockquote\n"); assert_eq!( text.lines, @@ -565,6 +575,7 @@ fn nested_blockquote_with_inline_and_fenced_code() { #[test] fn list_unordered_single() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text("- List item 1\n"); let expected = Text::from_iter([Line::from_iter(["• ", "List item 1"])]); assert_eq!(text, expected); @@ -572,6 +583,7 @@ fn list_unordered_single() { #[test] fn list_unordered_multiple() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text("- List item 1\n- List item 2\n"); let expected = Text::from_iter([ Line::from_iter(["• ", "List item 1"]), @@ -599,6 +611,7 @@ fn empty_list_items_keep_their_markers() { #[test] fn list_nested() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text("- List item 1\n - Nested list item 1\n"); let expected = Text::from_iter([ Line::from_iter(["• ", "List item 1"]), @@ -627,6 +640,7 @@ fn list_ordered_custom_start() { #[test] fn nested_unordered_in_ordered() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "1. Outer\n - Inner A\n - Inner B\n2. Next\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -641,6 +655,7 @@ fn nested_unordered_in_ordered() { #[test] fn nested_ordered_in_unordered() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "- Outer\n 1. One\n 2. Two\n- Last\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -669,6 +684,7 @@ fn loose_list_item_multiple_paragraphs() { #[test] fn tight_item_with_soft_break() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "- item line1\n item line2\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -680,6 +696,7 @@ fn tight_item_with_soft_break() { #[test] fn deeply_nested_mixed_three_levels() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "1. A\n - B\n 1. C\n2. D\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -802,6 +819,7 @@ fn inline_code_and_file_paths_follow_syntax_theme() { #[test] fn strong() { + set_syntax_theme(syntect::highlighting::Theme::default()); assert_eq!( render_markdown_text("**Strong**"), Text::from(Line::from("Strong".bold())) @@ -810,6 +828,7 @@ fn strong() { #[test] fn emphasis() { + set_syntax_theme(syntect::highlighting::Theme::default()); assert_eq!( render_markdown_text("*Emphasis*"), Text::from(Line::from("Emphasis".italic())) @@ -826,6 +845,7 @@ fn strikethrough() { #[test] fn strong_emphasis() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text("**Strong *emphasis***"); let expected = Text::from(Line::from_iter([ "Strong ".bold(), @@ -836,6 +856,7 @@ fn strong_emphasis() { #[test] fn link() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text("[Link](https://example.com)"); let expected = Text::from(Line::from_iter([ "Link".fg(accent_color()).underlined(), @@ -848,6 +869,7 @@ fn link() { #[test] fn web_link_labels_use_link_style_and_preserve_inline_formatting() { + set_syntax_theme(syntect::highlighting::Theme::default()); for (label, expected_label) in [ ("plain", "plain".fg(accent_color()).underlined()), ("`code`", "code".fg(accent_color()).underlined()), @@ -875,6 +897,7 @@ fn web_link_labels_use_link_style_and_preserve_inline_formatting() { #[test] fn web_link_labels_keep_link_style_in_wrapped_prose_and_tables() { + set_syntax_theme(syntect::highlighting::Theme::default()); let links = "[plain](https://example.com) [`code`](https://example.com) [](https://example.com)"; for markdown in [ @@ -1210,6 +1233,7 @@ fn file_link_appends_hash_range_when_label_lacks_it() { #[test] fn multiline_file_link_label_after_styled_prefix_does_not_panic() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text_for_cwd( "**bold** plain [foo\nbar](file:///Users/example/code/codex/codex-rs/tui/src/markdown_render.rs#L74C3)", Path::new("/Users/example/code/codex"), @@ -1250,6 +1274,7 @@ fn file_link_uses_target_path_for_hash_range() { #[test] fn url_link_shows_destination() { + set_syntax_theme(syntect::highlighting::Theme::default()); let text = render_markdown_text("[docs](https://example.com/docs)"); let expected = Text::from(Line::from_iter([ "docs".fg(accent_color()).underlined(), @@ -1739,6 +1764,7 @@ fn ordered_item_with_code_block_and_nested_bullet() { #[test] fn nested_five_levels_mixed_lists() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "1. First\n - Second level\n 1. Third level (ordered)\n - Fourth level (bullet)\n - Fifth level to test indent consistency\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -1787,6 +1813,7 @@ fn html_in_tight_ordered_item_soft_breaks_with_space() { #[test] fn html_continuation_paragraph_in_unordered_item_indented() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "- Item\n\n continued\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ @@ -1836,6 +1863,7 @@ fn ordered_item_continuation_paragraph_is_indented() { #[test] fn nested_item_continuation_paragraph_is_indented() { + set_syntax_theme(syntect::highlighting::Theme::default()); let md = "1. A\n - B\n\n Continuation for B\n2. C\n"; let text = render_markdown_text(md); let expected = Text::from_iter([ diff --git a/codex-rs/tui/src/markdown_stream.rs b/codex-rs/tui/src/markdown_stream.rs index 1a52c958bb..d2bcf53ce5 100644 --- a/codex-rs/tui/src/markdown_stream.rs +++ b/codex-rs/tui/src/markdown_stream.rs @@ -225,6 +225,7 @@ pub(crate) fn simulate_stream_markdown_for_tests( #[cfg(test)] mod tests { use super::*; + use crate::render::highlight::foreground_style_for_scopes; use ratatui::style::Color; #[tokio::test] @@ -247,20 +248,20 @@ mod tests { } #[tokio::test] - async fn e2e_stream_blockquote_simple_is_green() { + async fn e2e_stream_blockquote_simple_follows_theme() { let out = super::simulate_stream_markdown_for_tests(&["> Hello\n"], /*finalize*/ true); assert_eq!(out.len(), 1); let l = &out[0]; assert_eq!( l.style.fg, - Some(Color::Green), - "expected blockquote line fg green, got {:?}", + foreground_style_for_scopes(&["markup.quote"]).unwrap().fg, + "expected themed blockquote foreground, got {:?}", l.style.fg ); } #[tokio::test] - async fn e2e_stream_blockquote_nested_is_green() { + async fn e2e_stream_blockquote_nested_follows_theme() { let out = super::simulate_stream_markdown_for_tests( &["> Level 1\n>> Level 2\n"], /*finalize*/ true, @@ -281,19 +282,31 @@ mod tests { }) .collect(); assert_eq!(non_blank.len(), 2); - assert_eq!(non_blank[0].style.fg, Some(Color::Green)); - assert_eq!(non_blank[1].style.fg, Some(Color::Green)); + assert_eq!( + non_blank[0].style.fg, + foreground_style_for_scopes(&["markup.quote"]).unwrap().fg + ); + assert_eq!( + non_blank[1].style.fg, + foreground_style_for_scopes(&["markup.quote"]).unwrap().fg + ); } #[tokio::test] - async fn e2e_stream_blockquote_with_list_items_is_green() { + async fn e2e_stream_blockquote_with_list_items_follows_theme() { let out = super::simulate_stream_markdown_for_tests( &["> - item 1\n> - item 2\n"], /*finalize*/ true, ); assert_eq!(out.len(), 2); - assert_eq!(out[0].style.fg, Some(Color::Green)); - assert_eq!(out[1].style.fg, Some(Color::Green)); + assert_eq!( + out[0].style.fg, + foreground_style_for_scopes(&["markup.quote"]).unwrap().fg + ); + assert_eq!( + out[1].style.fg, + foreground_style_for_scopes(&["markup.quote"]).unwrap().fg + ); } #[tokio::test] @@ -328,7 +341,7 @@ mod tests { } #[tokio::test] - async fn e2e_stream_blockquote_wrap_preserves_green_style() { + async fn e2e_stream_blockquote_wrap_preserves_theme_style() { let long = "> This is a very long quoted line that should wrap across multiple columns to verify style preservation."; let out = super::simulate_stream_markdown_for_tests(&[long, "\n"], /*finalize*/ true); // Wrap to a narrow width to force multiple output lines. @@ -356,7 +369,7 @@ mod tests { for (i, l) in non_blank.iter().enumerate() { assert_eq!( l.spans[0].style.fg, - Some(Color::Green), + foreground_style_for_scopes(&["markup.quote"]).unwrap().fg, "wrapped line {} should preserve green style, got {:?}", i, l.spans[0].style.fg diff --git a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__ordered_list_markers_use_terminal_palette_snapshot.snap b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__ordered_list_markers_use_terminal_palette_snapshot.snap index 1661b027e8..9635df8b75 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__ordered_list_markers_use_terminal_palette_snapshot.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__ordered_list_markers_use_terminal_palette_snapshot.snap @@ -3,4 +3,4 @@ source: tui/src/markdown_render_tests.rs assertion_line: 608 expression: text --- -Text::from(Line::from_iter([Span::from("1. ").light_blue(), Span::from("plain "), Span::from("plain").fg(Color::Reset).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), Span::from("code").fg(Color::Reset).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")")])) +Text::from(Line::from_iter([Span::from("1. ").light_blue(), Span::from("plain "), Span::from("plain").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), Span::from("code").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")")])) diff --git a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__web_link_labels_have_a_visible_underline_snapshot.snap b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__web_link_labels_have_a_visible_underline_snapshot.snap index a0e0732aee..a385a8c188 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__web_link_labels_have_a_visible_underline_snapshot.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__web_link_labels_have_a_visible_underline_snapshot.snap @@ -2,4 +2,4 @@ source: tui/src/markdown_render_tests.rs expression: text --- -Text::from(Line::from_iter([Span::from("plain "), Span::from("plain").fg(Color::Reset).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), Span::from("code").fg(Color::Reset).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")")])) +Text::from(Line::from_iter([Span::from("plain "), Span::from("plain").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), Span::from("code").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")")])) diff --git a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_linux.snap b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_linux.snap index 2a904cd13d..77283c5ec8 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_linux.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_linux.snap @@ -2,7 +2,7 @@ source: tui/src/tooltips.rs expression: rendered --- -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Use the "), Span::from("desktop app").bold(), Span::from(". Install it")]) [] +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use the "), Span::from("desktop app").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(". Install it")]) [] Line::from("from") [] -Line::from(Span::from("https://learn.chatgpt.com/docs/linux/linux-app").fg(Color::Reset).underlined()) [TerminalHyperlink { columns: 0..46, destination: "https://learn.chatgpt.com/docs/linux/linux-app", destination_kind: Web }] +Line::from(Span::from("https://learn.chatgpt.com/docs/linux/linux-app").fg(Color::Rgb(137, 180, 250)).underlined()) [TerminalHyperlink { columns: 0..46, destination: "https://learn.chatgpt.com/docs/linux/linux-app", destination_kind: Web }] Line::from_iter([Span::from("and run "), Span::from("chatgpt").fg(Color::Rgb(166, 227, 161)), Span::from(".")]) [] diff --git a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_macos.snap b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_macos.snap index 2a5ac3cff4..f5e13b5c2f 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_macos.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_macos.snap @@ -2,6 +2,6 @@ source: tui/src/tooltips.rs expression: rendered --- -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Use the "), Span::from("desktop app").bold(), Span::from(". Run "), Span::from("codex app").fg(Color::Rgb(166, 227, 161))]) [] +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use the "), Span::from("desktop app").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(". Run "), Span::from("codex app").fg(Color::Rgb(166, 227, 161))]) [] Line::from("to open it. It installs automatically if") [] Line::from("needed.") [] diff --git a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_windows.snap b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_windows.snap index ed749405d8..629d1bc236 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_windows.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_windows.snap @@ -2,7 +2,7 @@ source: tui/src/tooltips.rs expression: rendered --- -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Use the "), Span::from("desktop app").bold(), Span::from(". Install it")]) [] +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use the "), Span::from("desktop app").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(". Install it")]) [] Line::from("from") [] -Line::from(Span::from("https://chatgpt.com/codex?app-landing-page=true").fg(Color::Reset).underlined()) [TerminalHyperlink { columns: 0..47, destination: "https://chatgpt.com/codex?app-landing-page=true", destination_kind: Web }] +Line::from(Span::from("https://chatgpt.com/codex?app-landing-page=true").fg(Color::Rgb(137, 180, 250)).underlined()) [TerminalHyperlink { columns: 0..47, destination: "https://chatgpt.com/codex?app-landing-page=true", destination_kind: Web }] Line::from_iter([Span::from("and run "), Span::from("codex app").fg(Color::Rgb(166, 227, 161)), Span::from(".")]) [] diff --git a/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__incremental_file_citations.snap b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__incremental_file_citations.snap index 784f1b1f77..8b48d83117 100644 --- a/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__incremental_file_citations.snap +++ b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__incremental_file_citations.snap @@ -6,8 +6,8 @@ expression: rendered_cases [ HyperlinkLine { line: Line::from_iter([ - Span::from("# ").bold().underlined(), - Span::from("Output").bold().underlined(), + Span::from("# ").fg(Color::Rgb(243, 139, 168)).bold().underlined(), + Span::from("Output").fg(Color::Rgb(243, 139, 168)).bold().underlined(), ]), hyperlinks: [], }, @@ -17,7 +17,7 @@ expression: rendered_cases }, HyperlinkLine { line: Line::from_iter([ - Span::from("• "), + Span::from("• ").fg(Color::Rgb(148, 226, 213)), Span::from("Quarterly Report.xlsx").fg(Color::Rgb(166, 227, 161)), ]), hyperlinks: [], @@ -34,8 +34,8 @@ expression: rendered_cases [ HyperlinkLine { line: Line::from_iter([ - Span::from("# ").bold().underlined(), - Span::from("Output").bold().underlined(), + Span::from("# ").fg(Color::Rgb(243, 139, 168)).bold().underlined(), + Span::from("Output").fg(Color::Rgb(243, 139, 168)).bold().underlined(), ]), hyperlinks: [], }, @@ -45,7 +45,7 @@ expression: rendered_cases }, HyperlinkLine { line: Line::from_iter([ - Span::from("• "), + Span::from("• ").fg(Color::Rgb(148, 226, 213)), Span::from("Résumé *final* ✨.xlsx").fg(Color::Rgb(166, 227, 161)), ]), hyperlinks: [], diff --git a/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__incremental_render_representative_stream.snap b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__incremental_render_representative_stream.snap index b95cd9374e..47a962de5d 100644 --- a/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__incremental_render_representative_stream.snap +++ b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__incremental_render_representative_stream.snap @@ -6,8 +6,8 @@ expression: render.lines [ HyperlinkLine { line: Line::from_iter([ - Span::from("# ").bold().underlined(), - Span::from("Heading").bold().underlined(), + Span::from("# ").fg(Color::Rgb(243, 139, 168)).bold().underlined(), + Span::from("Heading").fg(Color::Rgb(243, 139, 168)).bold().underlined(), ]), hyperlinks: [], }, @@ -18,7 +18,7 @@ expression: render.lines HyperlinkLine { line: Line::from_iter([ Span::from("First paragraph with a "), - Span::from("link").fg(Color::Rgb(99, 168, 248)).underlined(), + Span::from("link").fg(Color::Rgb(137, 180, 250)).underlined(), ]), hyperlinks: [ TerminalHyperlink { @@ -31,7 +31,7 @@ expression: render.lines HyperlinkLine { line: Line::from_iter([ Span::from("("), - Span::from("https://example.com").fg(Color::Rgb(99, 168, 248)).underlined(), + Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")"), Span::from("."), ]), @@ -73,7 +73,7 @@ expression: render.lines line: Line::from_iter([ Span::from("> "), Span::from("Quoted paragraph"), - ]).green(), + ]).fg(Color::Rgb(245, 194, 231)), hyperlinks: [], }, HyperlinkLine { diff --git a/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__inline_visualizations_without_context_use_canonical_full_render.snap b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__inline_visualizations_without_context_use_canonical_full_render.snap index 687e703b40..b719e64ee7 100644 --- a/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__inline_visualizations_without_context_use_canonical_full_render.snap +++ b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__inline_visualizations_without_context_use_canonical_full_render.snap @@ -12,7 +12,7 @@ expression: render.lines hyperlinks: [], }, HyperlinkLine { - line: Line::from(Span::from("Visualization unavailable on this device.").italic()), + line: Line::from(Span::from("Visualization unavailable on this device.").fg(Color::Rgb(243, 139, 168)).italic()), hyperlinks: [], }, ] diff --git a/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap b/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap index d91e302745..3862c8feef 100644 --- a/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap +++ b/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap @@ -3,50 +3,50 @@ source: tui/src/tooltips/keybinding_tests.rs expression: "lines.iter().map(|line| format!(\"{line:?}\")).collect::>().join(\"\\n\")" --- Line::from("Default") -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("tab").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message when a")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("tab").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message when a")]) Line::from("task is running; otherwise it sends") Line::from_iter([Span::from("immediately (except "), Span::from("!").fg(Color::Rgb(166, 227, 161)), Span::from(").")]) Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Use "), Span::from("/copy").bold(), Span::from(" or press "), Span::from("⌃o").fg(Color::Rgb(166, 227, 161)), Span::from(" to copy the")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use "), Span::from("/copy").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" or press "), Span::from("⌃o").fg(Color::Rgb(166, 227, 161)), Span::from(" to copy the")]) Line::from("latest agent response as Markdown.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("⌃t").fg(Color::Rgb(166, 227, 161)), Span::from(" to open the full")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃t").fg(Color::Rgb(166, 227, 161)), Span::from(" to open the full")]) Line::from("transcript.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("f3").fg(Color::Rgb(166, 227, 161)), Span::from(" to search this")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("f3").fg(Color::Rgb(166, 227, 161)), Span::from(" to search this")]) Line::from("conversation.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("⌃g").fg(Color::Rgb(166, 227, 161)), Span::from(" to edit your current draft")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃g").fg(Color::Rgb(166, 227, 161)), Span::from(" to edit your current draft")]) Line::from("in an external editor.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("⌃r").fg(Color::Rgb(166, 227, 161)), Span::from(" to search previously")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃r").fg(Color::Rgb(166, 227, 161)), Span::from(" to search previously")]) Line::from("entered prompts.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" For models with adjustable")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" For models with adjustable")]) Line::from_iter([Span::from("reasoning, press "), Span::from("⌥.").fg(Color::Rgb(166, 227, 161)), Span::from(" to increase")]) Line::from_iter([Span::from("reasoning effort or "), Span::from("⌥,").fg(Color::Rgb(166, 227, 161)), Span::from(" to decrease it.")]) Line::default() Line::from("Remapped") -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("⌃x q").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message when")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x q").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message when")]) Line::from("a task is running; otherwise it sends") Line::from_iter([Span::from("immediately (except "), Span::from("!").fg(Color::Rgb(166, 227, 161)), Span::from(").")]) Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Use "), Span::from("/copy").bold(), Span::from(" or press "), Span::from("⌃x `").fg(Color::Rgb(166, 227, 161)), Span::from(" to copy the")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use "), Span::from("/copy").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" or press "), Span::from("⌃x `").fg(Color::Rgb(166, 227, 161)), Span::from(" to copy the")]) Line::from("latest agent response as Markdown.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("⌃x t").fg(Color::Rgb(166, 227, 161)), Span::from(" to open the full")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x t").fg(Color::Rgb(166, 227, 161)), Span::from(" to open the full")]) Line::from("transcript.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("⌃x f").fg(Color::Rgb(166, 227, 161)), Span::from(" to search this")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x f").fg(Color::Rgb(166, 227, 161)), Span::from(" to search this")]) Line::from("conversation.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("⌃x e").fg(Color::Rgb(166, 227, 161)), Span::from(" to edit your current")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x e").fg(Color::Rgb(166, 227, 161)), Span::from(" to edit your current")]) Line::from("draft in an external editor.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("⌃x r").fg(Color::Rgb(166, 227, 161)), Span::from(" to search previously")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x r").fg(Color::Rgb(166, 227, 161)), Span::from(" to search previously")]) Line::from("entered prompts.") Line::default() -Line::from_iter([Span::from("Tip:").bold(), Span::from(" For models with adjustable")]) +Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" For models with adjustable")]) Line::from_iter([Span::from("reasoning, press "), Span::from("⌃x +").fg(Color::Rgb(166, 227, 161)), Span::from(" to increase")]) Line::from_iter([Span::from("reasoning effort or "), Span::from("⌃x -").fg(Color::Rgb(166, 227, 161)), Span::from(" to decrease it.")]) Line::default() From 7c152d468447244583f5013887a4bc1371cf1f4c Mon Sep 17 00:00:00 2001 From: jif Date: Thu, 15 Oct 2026 09:41:59 +0000 Subject: [PATCH 086/155] Add regression tests for case-variant metadata protection (#54250) ## What changed - Verify that freeform `apply_patch` calls and shell-intercepted patches cannot modify `.git/config` through `.GIT/config` when approvals are disabled, while an ordinary workspace file remains writable. - Add macOS Seatbelt coverage for uppercase protected metadata paths, including absent directories, existing directories with either casing, and case variants of the workspace root. Assert that metadata creation and modification are denied while sibling workspace writes succeed. The tests skip filesystems that do not support the case-insensitive aliases they exercise. GitOrigin-RevId: 5cf6b0c36eee348e1ba0db0bc2d3bff072458364 --- .../tests/suite/apply_patch_system_aliases.rs | 75 ++++++++++++++++ codex-rs/sandboxing/src/seatbelt_tests.rs | 85 +++++++++++++++++++ 2 files changed, 160 insertions(+) diff --git a/codex-rs/core/tests/suite/apply_patch_system_aliases.rs b/codex-rs/core/tests/suite/apply_patch_system_aliases.rs index f2144e3084..2ba778a4a8 100644 --- a/codex-rs/core/tests/suite/apply_patch_system_aliases.rs +++ b/codex-rs/core/tests/suite/apply_patch_system_aliases.rs @@ -17,11 +17,86 @@ use core_test_support::responses::sse; use core_test_support::responses::start_mock_server; use core_test_support::skip_if_no_network; use core_test_support::skip_if_remote; +use core_test_support::skip_if_sandbox; use core_test_support::test_codex::test_codex; use core_test_support::wait_for_event; use pretty_assertions::assert_eq; use test_case::test_case; +#[test_case(false; "freeform")] +#[test_case(true; "shell interception")] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn case_variant_metadata_patch_cannot_write_without_approval(shell: bool) -> Result<()> { + skip_if_no_network!(Ok(())); + skip_if_sandbox!(Ok(())); + skip_if_remote!(Ok(()), "exercises native macOS case aliases"); + let server = start_mock_server().await; + let test = test_codex() + .with_config(|config| { + config.workspace_roots = vec![config.cwd.clone()]; + config + .permissions + .set_workspace_roots(config.workspace_roots.clone()); + config.approvals_reviewer = ApprovalsReviewer::User; + config + .permissions + .approval_policy + .set(AskForApproval::Never) + .expect("disable approvals in the regression"); + config + .permissions + .set_permission_profile(PermissionProfile::workspace_write()) + .expect("set workspace permissions"); + }) + .build_with_auto_env(&server) + .await?; + std::fs::create_dir_all(test.cwd_path().join(".git"))?; + std::fs::write(test.cwd_path().join(".git/config"), "# original\n")?; + std::fs::write(test.cwd_path().join("notes.txt"), "# original\n")?; + if !test.cwd_path().join(".GIT/config").exists() { + // The reported alias requires a case-insensitive filesystem. + return Ok(()); + } + let mut events = Vec::new(); + for (call_id, patch) in [ + ( + "control", + "*** Begin Patch\n*** Update File: notes.txt\n@@\n-# original\n+# changed\n*** End Patch", + ), + ( + "protected", + "*** Begin Patch\n*** Update File: .GIT/config\n@@\n-# original\n+# changed\n*** End Patch", + ), + ] { + let call = if shell { + ev_exec_command_call(call_id, &format!("apply_patch <<'PATCH'\n{patch}\nPATCH")) + } else { + ev_apply_patch_custom_tool_call(call_id, patch) + }; + events.push(sse(vec![ + ev_response_created(call_id), + call, + ev_completed(call_id), + ])); + } + events.push(sse(vec![ + ev_assistant_message("done", "done"), + ev_completed("done"), + ])); + let responses = mount_sse_sequence(&server, events).await; + test.submit_text_turn("Apply the patches within workspace permissions.") + .await?; + assert_eq!( + ( + std::fs::read_to_string(test.cwd_path().join("notes.txt"))?, + std::fs::read_to_string(test.cwd_path().join(".git/config"))?, + ), + ("# changed\n".to_string(), "# original\n".to_string()), + ); + assert_eq!(responses.requests().len(), 3); + Ok(()) +} + #[test_case(false; "freeform")] #[test_case(true; "shell interception")] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] diff --git a/codex-rs/sandboxing/src/seatbelt_tests.rs b/codex-rs/sandboxing/src/seatbelt_tests.rs index 9f80838771..b5034bc220 100644 --- a/codex-rs/sandboxing/src/seatbelt_tests.rs +++ b/codex-rs/sandboxing/src/seatbelt_tests.rs @@ -2628,6 +2628,91 @@ fn seatbelt_protects_aws_in_extra_writable_home() { } } +#[cfg(target_os = "macos")] +#[test] +fn seatbelt_protects_case_variants_of_metadata() { + let mut results = Vec::new(); + let mut expected = Vec::new(); + for name in PROTECTED_METADATA_PATH_NAMES { + let uppercase = name.to_ascii_uppercase(); + for existing_name in [None, Some(*name), Some(uppercase.as_str())] { + for root_name in ["workspace", "WORKSPACE"] { + let tmp = TempDir::new().expect("tempdir"); + let workspace = tmp.path().join("workspace"); + let variant = workspace.join(&uppercase); + let probe = workspace.join("probe"); + fs::create_dir(&workspace).expect("create workspace"); + if !tmp.path().join("WORKSPACE").is_dir() { + // The reported aliases require a case-insensitive filesystem. + return; + } + if let Some(existing_name) = existing_name { + let existing = workspace.join(existing_name); + fs::create_dir(&existing).expect("create metadata"); + fs::write(existing.join("config"), "original").expect("write config"); + } + let policy_root = tmp.path().join(root_name); + let policy = restricted_write_policy(&[policy_root.as_path()]); + let command = if existing_name.is_some() { + "printf ran > \"$2\" && printf changed > \"$1/config\"" + } else { + "printf ran > \"$2\" && mkdir -p \"$1\" && printf changed > \"$1/config\"" + }; + let args = create_seatbelt_command_args(CreateSeatbeltCommandArgsParams { + command: vec![ + "/bin/sh".to_string(), + "-c".to_string(), + command.to_string(), + "sh".to_string(), + variant.display().to_string(), + probe.display().to_string(), + ], + file_system_sandbox_policy: &policy, + network_sandbox_policy: NetworkSandboxPolicy::Restricted, + sandbox_policy_cwd: &workspace, + enforce_managed_network: false, + managed_network: None, + environment_id: None, + network: None, + extra_allow_unix_sockets: &[], + }) + .expect("build seatbelt command"); + let output = Command::new(MACOS_PATH_TO_SEATBELT_EXECUTABLE) + .args(args) + .current_dir(&workspace) + .output() + .expect("execute seatbelt command"); + assert_eq!( + fs::read_to_string(&probe).expect("read sibling probe"), + "ran" + ); + results.push(( + *name, + existing_name.map(str::to_owned), + root_name, + output.status.success(), + variant.exists(), + fs::read_to_string( + workspace + .join(existing_name.unwrap_or(&uppercase)) + .join("config"), + ) + .ok(), + )); + expected.push(( + *name, + existing_name.map(str::to_owned), + root_name, + false, + existing_name.is_some(), + existing_name.map(|_| "original".to_string()), + )); + } + } + } + assert_eq!(results, expected); +} + #[cfg(target_os = "macos")] #[test] fn seatbelt_protects_resolved_target_of_symlinked_metadata_directory() { From 2a6ecbb93c42c3eea835126c0c332517968ab2f4 Mon Sep 17 00:00:00 2001 From: jif Date: Thu, 15 Oct 2026 10:38:51 +0000 Subject: [PATCH 087/155] Preserve recent speech when trimming realtime transcripts (#54257) ## Why Trimming interleaved realtime transcripts by utterance order can discard the latest speech from an earlier utterance. Evicting after each delta can also drop one speaker before the other speaker's delta from the same frame arrives, losing recent instructions at handoff. ## What changed Use raw frame recency to trim timed frameless bidirectional transcripts within the 8 KiB budget. Defer eviction until the frame advances or the transcript is consumed, and retain both speakers' suffixes when they share the newest frame. Preserve conversation order and fall back to FIFO eviction when timing is unavailable. Track trimmed prefixes so final transcripts can extend retained speech without making delayed finals appear newer. ## Testing Add regression coverage for frame recency, same-frame event ordering, UTF-8 truncation, delayed finals, and untimed fallback. Add an app-server handoff test verifying that both speakers' recent speech and the latest user instruction survive while live transcript notifications remain unchanged. GitOrigin-RevId: b01b729d8bdd4acb26e0385442ce40819355deac --- .../suite/v2/realtime_transcript_tests.rs | 104 +++++++ .../endpoint/realtime_websocket/methods.rs | 290 ++++++++++++++---- .../realtime_websocket/transcript_tests.rs | 177 ++++++++++- 3 files changed, 511 insertions(+), 60 deletions(-) diff --git a/codex-rs/app-server/tests/suite/v2/realtime_transcript_tests.rs b/codex-rs/app-server/tests/suite/v2/realtime_transcript_tests.rs index fb7d9e1bbc..c8e9e6ea8a 100644 --- a/codex-rs/app-server/tests/suite/v2/realtime_transcript_tests.rs +++ b/codex-rs/app-server/tests/suite/v2/realtime_transcript_tests.rs @@ -113,3 +113,107 @@ async fn websocket_v3_reconciles_handoff_transcripts_without_changing_live_notif harness.shutdown().await; Ok(()) } + +#[tokio::test] +async fn websocket_v3_retains_both_speakers_from_same_frame_at_handoff() -> Result<()> { + skip_if_no_network!(Ok(())); + + let old_user = "u".repeat(4000); + let assistant = "a".repeat(4000); + let newest_user = format!("{}Only update the tests.", "n".repeat(190)); + let assistant_suffix = "b".repeat(211); + let assistant_final = format!("{assistant}{assistant_suffix}"); + let user = format!("{old_user}{newest_user}"); + let mut harness = RealtimeE2eHarness::new( + RealtimeTestVersion::V1, + main_loop_responses(vec![create_final_assistant_message_sse_response("Done.")?]), + realtime_sideband(vec![open_realtime_sideband_connection(vec![vec![ + session_started("bounded-transcript"), + json!({"type": "input_transcript.added", "start_ms": 0, "end_ms": 200, "item": {"text": old_user}}), + json!({"type": "output_transcript.added", "start_ms": 200, "end_ms": 400, "item": {"text": assistant}}), + // Input alone crosses the cap before output receives the same frame age. + json!({"type": "input_transcript.added", "start_ms": 400, "end_ms": 600, "item": {"text": newest_user}}), + json!({"type": "output_transcript.added", "start_ms": 400, "end_ms": 600, "item": {"text": assistant_suffix}}), + json!({"type": "turn.done", "turn": {"role": "assistant", "transcript": assistant_final}}), + json!({ + "type": "delegation.created", + "item": { + "id": "handoff", + "type": "delegation", + "target": "client", + "content": [{"type": "input_text", "text": user}] + } + }), + ]])]), + ).await?; + harness + .start_frameless_bidi_realtime( + /*codex_response_handoff_mode*/ None, + /*codex_response_handoff_channel_prefixes*/ None, /*initial_items*/ None, + ) + .await?; + + for (role, delta) in [ + ("user", &old_user), + ("assistant", &assistant), + ("user", &newest_user), + ("assistant", &assistant_suffix), + ] { + assert_eq!( + harness + .read_notification::( + "thread/realtime/transcript/delta" + ) + .await?, + ThreadRealtimeTranscriptDeltaNotification { + thread_id: harness.thread_id.clone(), + role: role.into(), + delta: delta.clone(), + }, + ); + } + assert_eq!( + harness + .read_notification::( + "thread/realtime/transcript/done" + ) + .await?, + ThreadRealtimeTranscriptDoneNotification { + thread_id: harness.thread_id.clone(), + role: "assistant".into(), + text: assistant_final.clone(), + }, + ); + assert_eq!( + harness + .read_notification::("thread/realtime/itemAdded") + .await?, + ThreadRealtimeItemAddedNotification { + thread_id: harness.thread_id.clone(), + item: json!({ + "type": "handoff_request", + "handoff_id": "handoff", + "item_id": "handoff", + "input_transcript": user, + "active_transcript": [ + {"role": "user", "text": format!("…{}{newest_user}", "u".repeat(3874))}, + {"role": "assistant", "text": format!("…{}{assistant_suffix}", "a".repeat(3870))}, + {"role": "user", "text": user}, + ], + }), + }, + ); + harness + .read_notification::("turn/completed") + .await?; + let requests = harness.main_loop_responses_requests().await?; + assert_eq!(requests.len(), 1); + // The 4 KiB input prefix omits the latest instruction. It must survive the transcript tail, + // even when the preceding assistant entry alone fills that field's 4 KiB cap. + assert!(response_request_contains_text( + &requests[0], + &format!("{newest_user}\n"), + )); + harness.shutdown().await; + Ok(()) +} diff --git a/codex-rs/codex-api/src/endpoint/realtime_websocket/methods.rs b/codex-rs/codex-api/src/endpoint/realtime_websocket/methods.rs index 17ed27f439..29f5d59250 100644 --- a/codex-rs/codex-api/src/endpoint/realtime_websocket/methods.rs +++ b/codex-rs/codex-api/src/endpoint/realtime_websocket/methods.rs @@ -267,11 +267,48 @@ pub struct RealtimeTranscriptState { #[derive(Default)] struct ActiveTranscriptState { - entries: Vec, + entries: Vec, + last_frame: Option, + frame_sequence: u64, + input_last_raw_frame: Option, + output_last_raw_frame: Option, new_input_entry: bool, new_output_entry: bool, } +impl ActiveTranscriptState { + fn take_entries(&mut self) -> Vec { + self.input_last_raw_frame = None; + self.output_last_raw_frame = None; + self.entries + .drain(..) + .map(|entry| entry.transcript) + .collect() + } +} + +struct ActiveTranscriptEntry { + transcript: RealtimeTranscriptEntry, + last_raw_frame: Option, + truncated_prefix_bytes: usize, +} + +impl ActiveTranscriptEntry { + fn retained_text(&self) -> &str { + if self.truncated_prefix_bytes > 0 { + &self.transcript.text[TRUNCATED_TRANSCRIPT_PREFIX.len()..] + } else { + &self.transcript.text + } + } +} + +#[derive(Clone, Copy, PartialEq, Eq, serde::Deserialize)] +struct TranscriptFrame { + start_ms: u64, + end_ms: u64, +} + impl RealtimeWebsocketConnection { pub async fn send_audio_frame(&self, frame: RealtimeAudioFrame) -> Result<(), ApiError> { self.writer.send_audio_frame(frame).await @@ -567,7 +604,17 @@ impl RealtimeWebsocketEvents { Message::Text(text) => { trace!(target: REALTIME_WIRE_LOG_TARGET, "realtime websocket event: {text}"); if let Some(mut event) = parse_realtime_event(&text, self.event_parser) { - self.update_active_transcript(&mut event).await; + let frame = if self.event_parser == RealtimeEventParser::FramelessBidi + && matches!( + event, + RealtimeEvent::InputTranscriptDelta(_) + | RealtimeEvent::OutputTranscriptDelta(_) + ) { + serde_json::from_str::(&text).ok() + } else { + None + }; + self.update_active_transcript(&mut event, frame).await; debug!(?event, "realtime websocket parsed event"); return Ok(Some(event)); } @@ -623,11 +670,26 @@ impl RealtimeWebsocketEvents { } } - async fn update_active_transcript(&self, event: &mut RealtimeEvent) { + async fn update_active_transcript( + &self, + event: &mut RealtimeEvent, + frame: Option, + ) { let mut active_transcript = self.transcript_state.active.lock().await; + let frame_sequence = frame.map(|frame| { + // Both speakers in one frame have equal recency, regardless of wire event order. + // Count observed frames so reconnects do not depend on an absolute timestamp origin. + if active_transcript.last_frame != Some(frame) { + truncate_active_transcript(&mut active_transcript.entries); + active_transcript.frame_sequence += 1; + active_transcript.last_frame = Some(frame); + } + active_transcript.frame_sequence + }); match event { RealtimeEvent::InputAudioSpeechStarted(_) => { active_transcript.new_input_entry = true; + active_transcript.input_last_raw_frame = None; } RealtimeEvent::InputTranscriptDelta(RealtimeTranscriptDelta { delta, .. }) => { let force_new = active_transcript.new_input_entry; @@ -637,9 +699,11 @@ impl RealtimeWebsocketEvents { delta, force_new, self.event_parser, + frame_sequence, ); if !delta.is_empty() || self.event_parser != RealtimeEventParser::FramelessBidi { active_transcript.new_input_entry = false; + active_transcript.input_last_raw_frame = frame_sequence; } } RealtimeEvent::OutputTranscriptDelta(RealtimeTranscriptDelta { delta, .. }) => { @@ -650,43 +714,53 @@ impl RealtimeWebsocketEvents { delta, force_new, self.event_parser, + frame_sequence, ); if !delta.is_empty() || self.event_parser != RealtimeEventParser::FramelessBidi { active_transcript.new_output_entry = false; + active_transcript.output_last_raw_frame = frame_sequence; } } RealtimeEvent::InputTranscriptDone(done) => { let force_new = active_transcript.new_input_entry; + let last_raw_frame = active_transcript.input_last_raw_frame; apply_transcript_done( &mut active_transcript.entries, "user", &done.text, force_new, self.event_parser, + last_raw_frame, ); active_transcript.new_input_entry = self.event_parser == RealtimeEventParser::FramelessBidi; + active_transcript.input_last_raw_frame = None; } RealtimeEvent::OutputTranscriptDone(done) => { let force_new = active_transcript.new_output_entry; + let last_raw_frame = active_transcript.output_last_raw_frame; apply_transcript_done( &mut active_transcript.entries, "assistant", &done.text, force_new, self.event_parser, + last_raw_frame, ); active_transcript.new_output_entry = self.event_parser == RealtimeEventParser::FramelessBidi; + active_transcript.output_last_raw_frame = None; } RealtimeEvent::HandoffRequested(handoff) => { + truncate_active_transcript(&mut active_transcript.entries); append_handoff_input(&mut active_transcript.entries, &handoff.input_transcript); - handoff.active_transcript = std::mem::take(&mut active_transcript.entries); + handoff.active_transcript = active_transcript.take_entries(); active_transcript.new_input_entry = true; active_transcript.new_output_entry = true; } RealtimeEvent::ResponseCreated(_) => { active_transcript.new_output_entry = true; + active_transcript.output_last_raw_frame = None; } RealtimeEvent::SessionUpdated { .. } | RealtimeEvent::AudioOut(_) @@ -700,42 +774,100 @@ impl RealtimeWebsocketEvents { | RealtimeEvent::HistoryTranscriptDelta { .. } | RealtimeEvent::HistoryItemCompleted(_) => {} } - truncate_active_transcript(&mut active_transcript.entries); + if let Some(frame_sequence) = frame_sequence { + // Wait for both speakers before evicting utterances from this frame. Each updated + // utterance is bounded independently, so pending transcript text is at most the previous + // 8 KiB transcript plus 8 KiB per speaker, even if no further event arrives. + for entry in &mut active_transcript.entries { + if entry.last_raw_frame == Some(frame_sequence) { + truncate_transcript_entry(entry, MAX_ACTIVE_TRANSCRIPT_BYTES); + } + } + } else { + truncate_active_transcript(&mut active_transcript.entries); + } } } impl RealtimeTranscriptState { pub async fn take_transcript_tail(&self) -> Vec { - std::mem::take(&mut self.active.lock().await.entries) + let mut active = self.active.lock().await; + truncate_active_transcript(&mut active.entries); + active.take_entries() } } -fn truncate_active_transcript(entries: &mut Vec) { - let mut total_bytes = transcript_entries_bytes(entries); +fn truncate_active_transcript(entries: &mut Vec) { + let mut total_bytes = transcript_entries_bytes(entries.iter().map(|entry| &entry.transcript)); while total_bytes > MAX_ACTIVE_TRANSCRIPT_BYTES && entries.len() > 1 { - total_bytes = total_bytes.saturating_sub(transcript_entry_bytes(&entries[0])); - entries.remove(0); + // An earlier utterance can contain the newest speech. Evict by raw frame recency, + // preserving the legacy FIFO policy without timing. + let oldest = if entries.iter().all(|entry| entry.last_raw_frame.is_some()) { + entries + .iter() + .enumerate() + .min_by_key(|(_, entry)| entry.last_raw_frame) + .map(|(index, _)| index) + .unwrap_or_default() + } else { + 0 + }; + if let Some(frame) = entries[oldest].last_raw_frame + && entries + .iter() + .all(|entry| entry.last_raw_frame == Some(frame)) + { + // Both speakers have equally recent speech. Keep their suffixes in conversation + // order, letting short entries keep their text before dividing the remaining budget. + let mut remaining_bytes = MAX_ACTIVE_TRANSCRIPT_BYTES; + let mut remaining_entries = entries.len(); + let mut by_size: Vec<_> = entries.iter_mut().collect(); + by_size.sort_unstable_by_key(|entry| transcript_entry_bytes(&entry.transcript)); + for entry in by_size { + let entry_budget = remaining_bytes / remaining_entries; + truncate_transcript_entry(entry, entry_budget); + remaining_bytes -= transcript_entry_bytes(&entry.transcript); + remaining_entries -= 1; + } + return; + } + total_bytes -= transcript_entry_bytes(&entries.remove(oldest).transcript); } - let Some(entry) = entries.first_mut() else { - return; - }; - let entry_overhead = entry.role.len() + 3; - let max_text_bytes = MAX_ACTIVE_TRANSCRIPT_BYTES.saturating_sub(entry_overhead); - if entry.text.len() <= max_text_bytes { + if let Some(entry) = entries.first_mut() { + truncate_transcript_entry(entry, MAX_ACTIVE_TRANSCRIPT_BYTES); + } +} + +fn truncate_transcript_entry(entry: &mut ActiveTranscriptEntry, max_bytes: usize) { + let entry_overhead = entry.transcript.role.len() + 3; + let max_text_bytes = max_bytes.saturating_sub(entry_overhead); + if entry.transcript.text.len() <= max_text_bytes { return; } let mut start = entry + .transcript .text .len() .saturating_sub(max_text_bytes.saturating_sub(TRUNCATED_TRANSCRIPT_PREFIX.len())); - while !entry.text.is_char_boundary(start) { + while !entry.transcript.text.is_char_boundary(start) { start += 1; } - entry.text = format!("{TRUNCATED_TRANSCRIPT_PREFIX}{}", &entry.text[start..]); + let previous_marker_bytes = if entry.truncated_prefix_bytes > 0 { + TRUNCATED_TRANSCRIPT_PREFIX.len() + } else { + 0 + }; + entry.truncated_prefix_bytes += start - previous_marker_bytes; + entry.transcript.text = format!( + "{TRUNCATED_TRANSCRIPT_PREFIX}{}", + &entry.transcript.text[start..] + ); } -fn transcript_entries_bytes(entries: &[RealtimeTranscriptEntry]) -> usize { - entries.iter().map(transcript_entry_bytes).sum() +fn transcript_entries_bytes<'a>( + entries: impl IntoIterator, +) -> usize { + entries.into_iter().map(transcript_entry_bytes).sum() } fn transcript_entry_bytes(entry: &RealtimeTranscriptEntry) -> usize { @@ -743,11 +875,12 @@ fn transcript_entry_bytes(entry: &RealtimeTranscriptEntry) -> usize { } fn append_transcript_delta( - entries: &mut Vec, + entries: &mut Vec, role: &str, delta: &str, force_new: bool, event_parser: RealtimeEventParser, + frame_sequence: Option, ) { if delta.is_empty() { return; @@ -756,30 +889,37 @@ fn append_transcript_delta( // V3 interleaves the two speakers' transcripts. Legacy protocols retain // adjacent speaker runs and their existing response lifecycle semantics. let entry = match event_parser { - RealtimeEventParser::FramelessBidi => { - entries.iter_mut().rev().find(|entry| entry.role == role) - } - RealtimeEventParser::V1 | RealtimeEventParser::RealtimeV2 => { - entries.last_mut().filter(|entry| entry.role == role) - } + RealtimeEventParser::FramelessBidi => entries + .iter_mut() + .rev() + .find(|entry| entry.transcript.role == role), + RealtimeEventParser::V1 | RealtimeEventParser::RealtimeV2 => entries + .last_mut() + .filter(|entry| entry.transcript.role == role), }; if !force_new && let Some(last_entry) = entry { - last_entry.text.push_str(delta); + last_entry.transcript.text.push_str(delta); + last_entry.last_raw_frame = frame_sequence; return; } - entries.push(RealtimeTranscriptEntry { - role: role.to_string(), - text: delta.to_string(), + entries.push(ActiveTranscriptEntry { + transcript: RealtimeTranscriptEntry { + role: role.to_string(), + text: delta.to_string(), + }, + last_raw_frame: frame_sequence, + truncated_prefix_bytes: 0, }); } fn apply_transcript_done( - entries: &mut Vec, + entries: &mut Vec, role: &str, text: &str, force_new: bool, event_parser: RealtimeEventParser, + last_raw_frame: Option, ) { if text.is_empty() { return; @@ -788,45 +928,59 @@ fn apply_transcript_done( // V3 interleaves the two speakers' transcripts. Legacy protocols retain // adjacent speaker runs and their existing response lifecycle semantics. let entry = match event_parser { - RealtimeEventParser::FramelessBidi => { - entries.iter_mut().rev().find(|entry| entry.role == role) - } - RealtimeEventParser::V1 | RealtimeEventParser::RealtimeV2 => { - entries.last_mut().filter(|entry| entry.role == role) - } + RealtimeEventParser::FramelessBidi => entries + .iter_mut() + .rev() + .find(|entry| entry.transcript.role == role), + RealtimeEventParser::V1 | RealtimeEventParser::RealtimeV2 => entries + .last_mut() + .filter(|entry| entry.transcript.role == role), }; if !force_new && let Some(last_entry) = entry { // A delayed V3 final can arrive after deltas from the next utterance. // Preserve accumulated speech unless the final extends it. - if event_parser != RealtimeEventParser::FramelessBidi || text.starts_with(&last_entry.text) + if event_parser != RealtimeEventParser::FramelessBidi + || text + .get(last_entry.truncated_prefix_bytes..) + .is_some_and(|text| text.starts_with(last_entry.retained_text())) { - last_entry.text = text.to_string(); + last_entry.transcript.text = text.to_string(); + last_entry.truncated_prefix_bytes = 0; } return; } - entries.push(RealtimeTranscriptEntry { - role: role.to_string(), - text: text.to_string(), + entries.push(ActiveTranscriptEntry { + transcript: RealtimeTranscriptEntry { + role: role.to_string(), + text: text.to_string(), + }, + // A final for an evicted current utterance must not become newer than retained speech. + last_raw_frame: if force_new { None } else { last_raw_frame }, + truncated_prefix_bytes: 0, }); } -fn append_handoff_input(entries: &mut Vec, input: &str) { +fn append_handoff_input(entries: &mut Vec, input: &str) { let input = input.trim(); if input.is_empty() || contains_transcript_entry(entries, "user", input) { return; } - entries.push(RealtimeTranscriptEntry { - role: "user".to_string(), - text: input.to_string(), + entries.push(ActiveTranscriptEntry { + transcript: RealtimeTranscriptEntry { + role: "user".to_string(), + text: input.to_string(), + }, + last_raw_frame: None, + truncated_prefix_bytes: 0, }); } -fn contains_transcript_entry(entries: &[RealtimeTranscriptEntry], role: &str, text: &str) -> bool { +fn contains_transcript_entry(entries: &[ActiveTranscriptEntry], role: &str, text: &str) -> bool { entries .iter() - .any(|entry| entry.role == role && entry.text.trim() == text.trim()) + .any(|entry| entry.transcript.role == role && entry.transcript.text.trim() == text.trim()) } pub struct RealtimeWebsocketClient { @@ -1439,14 +1593,18 @@ mod tests { let mut covered = RealtimeEvent::InputTranscriptDelta(RealtimeTranscriptDelta { delta: "already handed off".to_string(), }); - events.update_active_transcript(&mut covered).await; + events + .update_active_transcript(&mut covered, /*frame*/ None) + .await; let mut handoff = RealtimeEvent::HandoffRequested(RealtimeHandoffRequested { handoff_id: "handoff_1".to_string(), item_id: "item_1".to_string(), input_transcript: "already handed off".to_string(), active_transcript: vec![], }); - events.update_active_transcript(&mut handoff).await; + events + .update_active_transcript(&mut handoff, /*frame*/ None) + .await; assert_eq!( handoff, RealtimeEvent::HandoffRequested(RealtimeHandoffRequested { @@ -1463,7 +1621,9 @@ mod tests { let mut tail = RealtimeEvent::OutputTranscriptDelta(RealtimeTranscriptDelta { delta: "tail".to_string(), }); - events.update_active_transcript(&mut tail).await; + events + .update_active_transcript(&mut tail, /*frame*/ None) + .await; assert_eq!( events.take_transcript_tail().await, vec![RealtimeTranscriptEntry { @@ -1488,7 +1648,9 @@ mod tests { let mut partial = RealtimeEvent::InputTranscriptDelta(RealtimeTranscriptDelta { delta: "hello wor".to_string(), }); - first_events.update_active_transcript(&mut partial).await; + first_events + .update_active_transcript(&mut partial, /*frame*/ None) + .await; let (_second_tx, second_rx) = async_channel::unbounded(); let second_events = RealtimeWebsocketEvents { @@ -1501,7 +1663,9 @@ mod tests { let mut done = RealtimeEvent::InputTranscriptDone(RealtimeTranscriptDone { text: "hello world".to_string(), }); - second_events.update_active_transcript(&mut done).await; + second_events + .update_active_transcript(&mut done, /*frame*/ None) + .await; assert_eq!( second_events.take_transcript_tail().await, @@ -1526,12 +1690,20 @@ mod tests { let mut oversized = RealtimeEvent::InputTranscriptDelta(RealtimeTranscriptDelta { delta: format!("old{}new", "x".repeat(MAX_ACTIVE_TRANSCRIPT_BYTES)), }); - events.update_active_transcript(&mut oversized).await; + for frame in [ + None, + Some(TranscriptFrame { + start_ms: 0, + end_ms: 200, + }), + ] { + events.update_active_transcript(&mut oversized, frame).await; - let tail = events.take_transcript_tail().await; - assert!(transcript_entries_bytes(&tail) <= MAX_ACTIVE_TRANSCRIPT_BYTES); - assert!(tail[0].text.starts_with(TRUNCATED_TRANSCRIPT_PREFIX)); - assert!(tail[0].text.ends_with("new")); + let tail = events.take_transcript_tail().await; + assert!(transcript_entries_bytes(&tail) <= MAX_ACTIVE_TRANSCRIPT_BYTES); + assert!(tail[0].text.starts_with(TRUNCATED_TRANSCRIPT_PREFIX)); + assert!(tail[0].text.ends_with("new")); + } } #[test] diff --git a/codex-rs/codex-api/src/endpoint/realtime_websocket/transcript_tests.rs b/codex-rs/codex-api/src/endpoint/realtime_websocket/transcript_tests.rs index fa89609bb6..28eae40cd7 100644 --- a/codex-rs/codex-api/src/endpoint/realtime_websocket/transcript_tests.rs +++ b/codex-rs/codex-api/src/endpoint/realtime_websocket/transcript_tests.rs @@ -24,7 +24,9 @@ fn entry(role: &str, text: &str) -> RealtimeTranscriptEntry { async fn observe(events: &RealtimeWebsocketEvents, mut event: RealtimeEvent) { let original = event.clone(); - events.update_active_transcript(&mut event).await; + events + .update_active_transcript(&mut event, /*frame*/ None) + .await; assert_eq!( event, original, "live transcript events must pass through unchanged" @@ -129,3 +131,176 @@ async fn completed_utterances_keep_repeated_speech_and_final_only_turns_distinct ); } } + +#[tokio::test] +async fn transcript_budget_uses_frame_recency_without_reordering_speakers() { + use serde_json::json; + + let old_user = "u".repeat(4000); + let assistant = "a".repeat(4000); + let newest_user = "n".repeat(211); + let current_user = "u".repeat(4160); + let same_frame_user = "n".repeat(22); + let unicode_user = "é".repeat(2000); + let oversized_user = "u".repeat(MAX_ACTIVE_TRANSCRIPT_BYTES); + let extended_assistant = format!("{assistant}{newest_user}!"); + for (frames, final_assistant, expected) in [ + ( + vec![ + ("user", old_user.as_str(), Some(0)), + ("assistant", assistant.as_str(), Some(200)), + ("user", newest_user.as_str(), Some(400)), + // Commit eviction before the delayed final arrives. + ("user", "", Some(600)), + ], + // A late final must keep the evicted assistant's old raw-frame age. + Some(assistant.as_str()), + vec![entry("user", &format!("{old_user}{newest_user}"))], + ), + ( + vec![ + ("assistant", assistant.as_str(), Some(0)), + ("user", current_user.as_str(), Some(200)), + // The first event already exceeds the budget, before output updates its age. + ("user", same_frame_user.as_str(), Some(400)), + // Same-frame input is emitted first; output must not become newer. + ("assistant", "bbbbbbbbbbbbbbbbbbbb", Some(400)), + ], + None, + vec![ + entry("assistant", &format!("{assistant}bbbbbbbbbbbbbbbbbbbb")), + entry("user", &format!("…{}{same_frame_user}", "u".repeat(4128))), + ], + ), + ( + vec![ + ("user", old_user.as_str(), Some(0)), + ("assistant", assistant.as_str(), Some(200)), + ("user", newest_user.as_str(), Some(400)), + ("assistant", "b", Some(400)), + ], + None, + vec![ + entry("user", &format!("…{}{newest_user}", "u".repeat(3958))), + entry("assistant", &format!("{assistant}b")), + ], + ), + ( + vec![ + ("user", old_user.as_str(), Some(0)), + ("assistant", assistant.as_str(), Some(200)), + // Reversing the same-frame events must retain the same suffixes. + ("assistant", "b", Some(400)), + ("user", newest_user.as_str(), Some(400)), + // Advancing the frame also commits eviction before the tail is taken. + ("user", "", Some(600)), + ], + None, + vec![ + entry("user", &format!("…{}{newest_user}", "u".repeat(3958))), + entry("assistant", &format!("{assistant}b")), + ], + ), + ( + vec![ + ("user", unicode_user.as_str(), Some(0)), + ("assistant", assistant.as_str(), Some(200)), + ("user", newest_user.as_str(), Some(400)), + ("assistant", newest_user.as_str(), Some(400)), + ], + None, + vec![ + entry("user", &format!("…{}{newest_user}", "é".repeat(1937))), + entry("assistant", &format!("…{}{newest_user}", "a".repeat(3871))), + ], + ), + ( + vec![ + ("user", oversized_user.as_str(), Some(0)), + ("assistant", "b", Some(0)), + ], + None, + vec![ + entry("user", &format!("…{}", "u".repeat(8169))), + entry("assistant", "b"), + ], + ), + ( + vec![ + ("assistant", assistant.as_str(), Some(0)), + ("user", old_user.as_str(), Some(200)), + ("assistant", newest_user.as_str(), Some(400)), + ("user", "b", Some(400)), + // Trim the tied utterances before a final extends the retained suffix. + ("user", "", Some(600)), + ], + Some(extended_assistant.as_str()), + vec![ + entry("assistant", &format!("…{}{newest_user}!", "a".repeat(3957))), + entry("user", &format!("{old_user}b")), + ], + ), + ( + vec![ + ("user", old_user.as_str(), None), + ("assistant", assistant.as_str(), None), + ("user", newest_user.as_str(), None), + ], + None, + vec![entry("assistant", &assistant)], + ), + ( + vec![ + ("assistant", "I will", Some(0)), + ("user", "Stop!", Some(200)), + ("assistant", " do it", Some(200)), + ], + Some("I will do it"), + vec![entry("assistant", "I will do it"), entry("user", "Stop!")], + ), + ] { + let state = RealtimeTranscriptState::default(); + let mut events = events(state.clone()); + let (sender, receiver) = async_channel::unbounded(); + events.rx_message = receiver; + for (role, text, start_ms) in frames { + let event_type = if role == "user" { + "input_transcript.added" + } else { + "output_transcript.added" + }; + let mut payload = json!({"type": event_type, "item": {"text": text}}); + if let Some(start_ms) = start_ms { + payload["start_ms"] = json!(start_ms); + payload["end_ms"] = json!(start_ms + 200); + } + sender + .send(Ok(Message::Text(payload.to_string().into()))) + .await + .unwrap(); + let delta = RealtimeTranscriptDelta { delta: text.into() }; + assert_eq!( + events.next_event().await.unwrap(), + Some(if role == "user" { + RealtimeEvent::InputTranscriptDelta(delta) + } else { + RealtimeEvent::OutputTranscriptDelta(delta) + }), + ); + } + if let Some(text) = final_assistant { + sender.send(Ok(Message::Text(json!({ + "type": "turn.done", + "turn": {"role": "assistant", "transcript": text, "start_ms": 0, "end_ms": 800} + }).to_string().into()))).await.unwrap(); + assert_eq!( + events.next_event().await.unwrap(), + Some(RealtimeEvent::OutputTranscriptDone( + RealtimeTranscriptDone { text: text.into() } + )), + ); + } + assert_eq!(state.take_transcript_tail().await, expected); + assert_eq!(state.take_transcript_tail().await, vec![]); + } +} From 4b9c24f98c6d886134fd2fc237355064708ff21f Mon Sep 17 00:00:00 2001 From: jif Date: Thu, 15 Oct 2026 11:10:24 +0000 Subject: [PATCH 088/155] Require fresh Guardian approval for escalated tool retries (#54263) ## Why Guardian approval covers the permissions of the reviewed action. A retry outside the sandbox needs a fresh review of its broader permissions. ## What changed - Track the initial approval source so Guardian approval does not preapprove an escalated retry, while preserving existing user and hook approval behavior. - For exec retries that can run without the sandbox, set the approval action to `RequireEscalated` and clear `additional_permissions` so review and caching reflect the retry's actual permissions. GitOrigin-RevId: 06f8d53745a7bcfe9fdb5628ff9e85da6060547d --- codex-rs/core/src/tools/orchestrator.rs | 68 +++++++++++++++---------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/codex-rs/core/src/tools/orchestrator.rs b/codex-rs/core/src/tools/orchestrator.rs index 46fd29d030..a1a88e4454 100644 --- a/codex-rs/core/src/tools/orchestrator.rs +++ b/codex-rs/core/src/tools/orchestrator.rs @@ -1,15 +1,13 @@ -/* -Module: orchestrator - -Central place for approvals + sandbox selection + retry semantics. Drives a -simple sequence for any ToolRuntime: approval → select sandbox → attempt → -retry with an escalated sandbox strategy on denial (no re‑approval thanks to -caching). -*/ +//! Coordinates tool approval, sandbox selection, and retries after sandbox denial. +//! Guardian approval applies to the reviewed authority; escalating a sandboxed +//! attempt requires a fresh review of the retry. use crate::config::NetworkProxySpec; use crate::guardian::GuardianReviewContext; use crate::network_policy_decision::network_approval_context_from_payload; +use crate::sandboxing::SandboxPermissions; +use crate::tools::approvals::ApprovalAction; use crate::tools::approvals::ApprovalContext; +use crate::tools::approvals::ApprovalResolutionSource; use crate::tools::flat_tool_name; use crate::tools::network_approval::ActiveNetworkApproval; use crate::tools::network_approval::DeferredNetworkApproval; @@ -140,7 +138,7 @@ impl ToolOrchestrator { let otel_ci = &tool_ctx.call_id; let strict_auto_review = turn_ctx.strict_auto_review_enabled(); // 1) Approval - let mut already_approved = false; + let mut initial_approval_source = None; let environment = tool.turn_environment(req); let sandbox_manager = SandboxManager::new(); @@ -184,12 +182,12 @@ impl ToolOrchestrator { retry_reason: None, network_approval_context: None, }; - tool_ctx + let approval = tool_ctx .session .request_approval(action, approval_ctx) - .await - .result?; - already_approved = true; + .await; + approval.result?; + initial_approval_source = approval.source; } else { otel.tool_decision( &tool_ctx.tool_name, @@ -218,12 +216,12 @@ impl ToolOrchestrator { retry_reason: None, network_approval_context: None, }; - tool_ctx + let approval = tool_ctx .session .request_approval(action, approval_ctx) - .await - .result?; - already_approved = true; + .await; + approval.result?; + initial_approval_source = approval.source; } } @@ -233,7 +231,7 @@ impl ToolOrchestrator { tool.sandbox_permissions(req), &requirement, &file_system_sandbox_policy, - already_approved, + /*already_approved*/ initial_approval_source.is_some(), ); let (escalated_profile, writable_root_metadata) = if sandbox_override == SandboxOverride::EscalatedSandboxWithRestrictions @@ -483,10 +481,14 @@ impl ToolOrchestrator { build_denial_reason_from_output(output.as_ref()) }; - // Strict auto-review approval covers the sandboxed attempt only; - // retrying without the sandbox requires a fresh guardian review. + // Human and policy approvals keep their existing retry scope. A + // Guardian verdict only covers the authority of the reviewed action. + let retry_preapproved = matches!( + initial_approval_source, + Some(ApprovalResolutionSource::User | ApprovalResolutionSource::Hook) + ); let bypass_retry_approval = !strict_auto_review - && tool.should_bypass_approval(approval_policy, already_approved) + && tool.should_bypass_approval(approval_policy, retry_preapproved) && network_approval_context.is_none(); if !bypass_retry_approval { let approval_reason = match &requirement { @@ -494,11 +496,25 @@ impl ToolOrchestrator { ExecApprovalRequirement::Skip { .. } | ExecApprovalRequirement::Forbidden { .. } => None, }; - let action = tool - .approval_action(req, &tool_ctx.call_id) - .map_err(|err| { - ToolError::Rejected(format!("could not prepare approval action: {err}")) - })?; + let mut action = + tool.approval_action(req, &tool_ctx.call_id) + .map_err(|err| { + ToolError::Rejected(format!( + "could not prepare approval action: {err}" + )) + })?; + if unsandboxed_allowed + && let ApprovalAction::ExecCommand { + sandbox_permissions, + additional_permissions, + .. + } = &mut action + { + // Review and cache the authority of the actual retry, not + // the narrower permissions requested for the first attempt. + *sandbox_permissions = SandboxPermissions::RequireEscalated; + *additional_permissions = None; + } let approval_ctx = ApprovalContext { review_context: GuardianReviewContext::from(&tool_ctx.step_context), cancellation_token: Some(tool_ctx.cancellation_token.clone()), From b687844674bdd8c800f342089c0fae2ae2a96447 Mon Sep 17 00:00:00 2001 From: jif Date: Thu, 15 Oct 2026 11:12:00 +0000 Subject: [PATCH 089/155] Track Guardian transcript admission across failed reviews (#54264) ## Why A failed Guardian inference can retain its input in a reusable session. Tracking transcript progress only after successful reviews can admit the same evidence again on retry. ## What changed Advance transcript progress when a failed turn has retained its input and the session remains reusable, without counting it as a completed review or changing the committed fork checkpoint. Leave progress unchanged when failure occurs before input admission. ## Testing Extend regression coverage for encrypted agent messages across review retries, pending evidence after compaction failures, and fork checkpoints after transcript admission without a completed review. GitOrigin-RevId: 36239ec9d47f484bcfe68d65e7c8d8ab8660db0d --- codex-rs/core/src/guardian/review_session.rs | 40 ++++++++++------ codex-rs/core/tests/suite/guardian_retry.rs | 46 ++++++++++++++++--- codex-rs/core/tests/suite/guardian_review.rs | 35 +++++++++++--- .../ext/guardian-reviewer/src/conversation.rs | 12 +++-- .../src/conversation_tests.rs | 14 ++++++ 5 files changed, 117 insertions(+), 30 deletions(-) diff --git a/codex-rs/core/src/guardian/review_session.rs b/codex-rs/core/src/guardian/review_session.rs index 78ce4b6a5b..575c75c0ac 100644 --- a/codex-rs/core/src/guardian/review_session.rs +++ b/codex-rs/core/src/guardian/review_session.rs @@ -804,25 +804,39 @@ async fn run_review_on_session( &mut analytics_result, ) .await; - review_session + // Finalizing input consumes this context; failures before admission leave it pending. + let transcript_admitted = review_session .session .services .thread_extension_data - .remove::(); - if matches!( + .remove::() + .is_none(); + let completed_review = matches!( turn_result.outcome, GuardianReviewSessionOutcome::Completed(_) - ) { - if turn_result.turn_completed - && let Some(total_token_usage) = review_session.session.total_token_usage().await - { - analytics_result.token_usage = Some(token_usage_delta( - &token_usage_at_review_start, - &total_token_usage, - )); - } + ); + if completed_review + && turn_result.turn_completed + && let Some(total_token_usage) = review_session.session.total_token_usage().await + { + analytics_result.token_usage = Some(token_usage_delta( + &token_usage_at_review_start, + &total_token_usage, + )); + } + if completed_review + || (transcript_admitted + && turn_result.turn_completed + && turn_result.disposition == SessionDisposition::Reusable) + { let mut state = review_session.state.lock().await; - state.conversation.complete_review(transcript_cursor); + if completed_review { + state.conversation.complete_review(transcript_cursor); + } else { + // A failed inference still retains its input. Keep admission progress + // in sync without counting the failure as a completed review. + state.conversation.admit_transcript(transcript_cursor); + } state.transcript_history_version = reviewer_history_version; state.transcript_source = Some(transcript_source); } diff --git a/codex-rs/core/tests/suite/guardian_retry.rs b/codex-rs/core/tests/suite/guardian_retry.rs index f6fcb70bf8..6c9064816d 100644 --- a/codex-rs/core/tests/suite/guardian_retry.rs +++ b/codex-rs/core/tests/suite/guardian_retry.rs @@ -4,10 +4,13 @@ use anyhow::Context; use anyhow::Result; use codex_core::config::Constrained; use codex_core::context::UserGoalUpdate; +use codex_protocol::AgentPath; use codex_protocol::approvals::GuardianAssessmentStatus; use codex_protocol::config_types::ApprovalsReviewer; use codex_protocol::protocol::AskForApproval; use codex_protocol::protocol::EventMsg; +use codex_protocol::protocol::InterAgentCommunication; +use codex_protocol::protocol::Op; use codex_protocol::protocol::SandboxPolicy; use core_test_support::responses::*; use core_test_support::skip_if_no_network; @@ -38,6 +41,7 @@ async fn guardian_retry_executes_only_after_a_completed_approval() -> Result<()> }); let test = builder.build_with_auto_env(&server).await?; let responses = vec![ + sse(vec![ev_completed("waiting-for-parent")]), sse(vec![ ev_function_call( "write-marker", @@ -71,13 +75,21 @@ async fn guardian_retry_executes_only_after_a_completed_approval() -> Result<()> sse(vec![ev_completed("parent-done")]), ]; let requests = mount_sse_sequence(&server, responses).await; + test.submit_text_turn("Write the marker once after the parent confirms.") + .await?; + // Deliver encrypted evidence through the real mailbox before the action that + // needs review. A failed reviewer turn must not admit this native item again. test.codex - .start_or_steer_turn(codex_core::TurnInputRequest::user_input(vec![ - codex_protocol::user_input::UserInput::Text { - text: "Write the marker once".into(), - text_elements: vec![], - }, - ])) + .submit(Op::InterAgentCommunication { + communication: InterAgentCommunication::new_encrypted( + AgentPath::root(), + AgentPath::root().join("worker").expect("worker path"), + Vec::new(), + "opaque-parent-approval".into(), + /*trigger_turn*/ true, + ), + start_options: Default::default(), + }) .await?; let mut reviews = Vec::new(); let mut warnings = Vec::new(); @@ -89,7 +101,27 @@ async fn guardian_retry_executes_only_after_a_completed_approval() -> Result<()> _ => {} } } - assert_eq!(requests.requests().len(), 5); + let requests = requests.requests(); + assert_eq!(requests.len(), 6); + let guardian_requests = &requests[2..5]; + let expected_messages = guardian_requests[0].inputs_of_type("agent_message"); + assert_eq!(expected_messages.len(), 1); + assert!(expected_messages[0]["id"].is_string()); + assert_eq!( + expected_messages[0]["id"], + requests[1].inputs_of_type("agent_message")[0]["id"], + ); + let reviewer_thread_id = + guardian_requests[0].body_json()["client_metadata"]["thread_id"].clone(); + assert!(reviewer_thread_id.is_string()); + for request in guardian_requests { + assert_eq!( + request.body_json()["client_metadata"]["thread_id"], + reviewer_thread_id, + "the failed review must reuse its Guardian session", + ); + assert_eq!(request.inputs_of_type("agent_message"), expected_messages); + } assert_eq!( reviews, vec![ diff --git a/codex-rs/core/tests/suite/guardian_review.rs b/codex-rs/core/tests/suite/guardian_review.rs index 77f980f43b..05d64899e8 100644 --- a/codex-rs/core/tests/suite/guardian_review.rs +++ b/codex-rs/core/tests/suite/guardian_review.rs @@ -66,6 +66,7 @@ use core_test_support::responses::ev_response_created; use core_test_support::responses::mount_models_once; use core_test_support::responses::mount_sse_sequence; use core_test_support::responses::sse; +use core_test_support::responses::sse_failed; use core_test_support::responses::start_mock_server; use core_test_support::responses::start_websocket_server; use core_test_support::skip_if_no_network; @@ -500,10 +501,14 @@ for (const phase of ["before", "after"]) { Ok(()) } -#[test_case(false; "without parent checkpoint")] -#[test_case(true; "reuse parent checkpoint and newer authorization")] +#[test_case(false, &[]; "without parent checkpoint")] +#[test_case(true, &[]; "reuse parent checkpoint and newer authorization")] +#[test_case(false, &["rate_limit_exceeded", "rate_limit_exceeded"]; "failed compaction preserves pending evidence")] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn guardian_review_recovers_after_compaction(with_parent_checkpoint: bool) -> Result<()> { +async fn guardian_review_recovers_after_compaction( + with_parent_checkpoint: bool, + compaction_errors: &[&str], +) -> Result<()> { skip_if_no_network!(Ok(())); skip_if_wine_exec!( Ok(()), @@ -571,13 +576,15 @@ async fn guardian_review_recovers_after_compaction(with_parent_checkpoint: bool) "cmd": "true", "sandbox_permissions": "require_escalated", "justification": "Read the internal samples the user authorized.", - }) - .to_string(); + }); + let mut first_command = command.clone(); + first_command["cmd"] = json!("printf POST_REVIEW_DIAGNOSTIC"); + let command = command.to_string(); let approval = r#"{"risk_level":"low","user_authorization":"high","outcome":"allow"}"#; let mut response_events = vec![ sse(vec![ ev_response_created("resp-parent-first"), - ev_function_call("exec-first", "exec_command", &command), + ev_function_call("exec-first", "exec_command", &first_command.to_string()), ev_completed("resp-parent-first"), ]), sse(vec![ @@ -592,6 +599,13 @@ async fn guardian_review_recovers_after_compaction(with_parent_checkpoint: bool) ]), ]; if !with_parent_checkpoint { + for error in compaction_errors { + response_events.push(sse_failed( + "failed-review-compaction", + error, + "temporary compaction failure before input admission", + )); + } response_events.push(sse(vec![ json!({ "type": "response.output_item.done", @@ -660,7 +674,10 @@ async fn guardian_review_recovers_after_compaction(with_parent_checkpoint: bool) .iter() .filter(|request| !request.inputs_of_type("compaction_trigger").is_empty()) .collect::>(); - assert_eq!(compact_requests.len(), usize::from(!with_parent_checkpoint)); + assert_eq!( + compact_requests.len(), + usize::from(!with_parent_checkpoint) + compaction_errors.len(), + ); if let Some(compact_request) = compact_requests.first() { assert!( compact_request @@ -690,6 +707,10 @@ async fn guardian_review_recovers_after_compaction(with_parent_checkpoint: bool) .pop() .expect("second review") .join(""); + assert!( + latest_review.contains("POST_REVIEW_DIAGNOSTIC"), + "recovery must retain evidence not yet admitted to the reviewer" + ); if with_parent_checkpoint { assert!(latest_review.contains(">>> TRANSCRIPT START\n")); assert!( diff --git a/codex-rs/ext/guardian-reviewer/src/conversation.rs b/codex-rs/ext/guardian-reviewer/src/conversation.rs index 69300850c2..6db9301a68 100644 --- a/codex-rs/ext/guardian-reviewer/src/conversation.rs +++ b/codex-rs/ext/guardian-reviewer/src/conversation.rs @@ -1,6 +1,6 @@ -//! Tracks reviewed transcript progress separately from committed conversation history. +//! Tracks admitted transcript progress separately from completed reviews and committed history. //! Hosts serialize reviews and checkpoint commits, and supply opaque completed history. -//! An exclusive continuation can take the history without advancing reviewed progress. +//! An exclusive continuation can take the history without advancing live progress. use codex_guardian_context::TranscriptCursor; @@ -62,9 +62,15 @@ impl ConversationState { self.cursor = None; } + /// Records input retained by the live conversation, even if inference failed. + /// This does not complete a review or change the committed fork checkpoint. + pub fn admit_transcript(&mut self, cursor: TranscriptCursor) { + self.cursor = Some(cursor); + } + /// Advances live progress once the host's review completes. pub fn complete_review(&mut self, cursor: TranscriptCursor) { - self.cursor = Some(cursor); + self.admit_transcript(cursor); self.completed_review_count = self.completed_review_count.saturating_add(1); } diff --git a/codex-rs/ext/guardian-reviewer/src/conversation_tests.rs b/codex-rs/ext/guardian-reviewer/src/conversation_tests.rs index c040b1c058..c493f1ae04 100644 --- a/codex-rs/ext/guardian-reviewer/src/conversation_tests.rs +++ b/codex-rs/ext/guardian-reviewer/src/conversation_tests.rs @@ -16,6 +16,20 @@ fn fork_keeps_committed_history_and_cursor_while_next_review_is_uncommitted() { transcript_entry_count: 4, ..first }; + // A failed review can retain new input without completing or replacing the + // last successful checkpoint used by concurrent forks. + state.admit_transcript(second); + let (fork, history) = ConversationState::fork(state.snapshot().unwrap().clone()); + assert_eq!( + ( + state.cursor(), + state.completed_review_count(), + history, + fork.cursor(), + fork.completed_review_count(), + ), + (Some(second), 1, vec!["first review"], Some(first), 1), + ); state.complete_review(second); let (fork, history) = ConversationState::fork(state.snapshot().unwrap().clone()); From 6fbd7be1518d259e30e6fef48f05f433d2461a20 Mon Sep 17 00:00:00 2001 From: jif Date: Thu, 15 Oct 2026 11:15:52 +0000 Subject: [PATCH 090/155] Add regression coverage for Guardian sandbox retry approvals (#54265) ## What changed Add an integration test that approves a sandboxed `exec_command` attempt, simulates a sandbox denial, and denies the subsequent unsandboxed retry. Verify that Guardian reviews the retry separately with `require_escalated`, that the denied retry never reaches the executor, and that the tool result includes the denial rationale. Use a fake executor to exercise the sandbox denial consistently across hosts. GitOrigin-RevId: cd644255f7a7b7561c9e52a5b6e40f0859b70547 --- .../tests/suite/guardian_sandbox_retry.rs | 209 ++++++++++++++++++ .../suite/unified_exec_process_events.rs | 3 + 2 files changed, 212 insertions(+) create mode 100644 codex-rs/core/tests/suite/guardian_sandbox_retry.rs diff --git a/codex-rs/core/tests/suite/guardian_sandbox_retry.rs b/codex-rs/core/tests/suite/guardian_sandbox_retry.rs new file mode 100644 index 0000000000..7822795b67 --- /dev/null +++ b/codex-rs/core/tests/suite/guardian_sandbox_retry.rs @@ -0,0 +1,209 @@ +//! Exercises approval scope across a sandbox denial reported by a fake executor. + +use super::PushedExecScenario; +use super::accept_initialized_exec_server; +use super::read_exec_server_json; +use super::respond_environment_info; +use super::send_exec_server_json; +use anyhow::Context; +use anyhow::Result; +use codex_core::config::Constrained; +use codex_features::Feature; +use codex_protocol::config_types::ApprovalsReviewer; +use codex_protocol::models::PermissionProfile; +use codex_protocol::protocol::AskForApproval; +use codex_protocol::protocol::GranularApprovalConfig; +use core_test_support::responses::ev_assistant_message; +use core_test_support::responses::ev_completed; +use core_test_support::responses::ev_function_call; +use core_test_support::responses::mount_sse_sequence; +use core_test_support::responses::sse; +use core_test_support::responses::start_mock_server; +use core_test_support::startup::STARTUP_TIMEOUT; +use core_test_support::test_codex::test_codex; +use pretty_assertions::assert_eq; +use serde_json::Value; +use serde_json::json; +use std::fs; +use tokio::net::TcpListener; +use tokio::sync::oneshot; + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn guardian_rechecks_unsandboxed_retry_after_sandboxed_approval() -> Result<()> { + let server = start_mock_server().await; + let listener = TcpListener::bind("127.0.0.1:0").await?; + let exec_server_url = format!("ws://{}", listener.local_addr()?); + let (stop_executor, mut stopped) = oneshot::channel(); + let executor = tokio::spawn(async move { + let mut websocket = accept_initialized_exec_server(listener).await; + let mut starts = Vec::new(); + loop { + let request = tokio::select! { + _ = &mut stopped => return starts, + request = read_exec_server_json(&mut websocket, STARTUP_TIMEOUT) => request, + }; + let result = match request["method"].as_str() { + Some("environment/info") => { + respond_environment_info( + &mut websocket, + &request["id"], + PushedExecScenario::Complete, + ) + .await; + continue; + } + Some("fs/getMetadata" | "fs/readFile" | "fs/readDirectory") => { + send_exec_server_json( + &mut websocket, + json!({ + "id": request["id"], + "error": {"code": -32004, "message": "not found"} + }), + ) + .await; + continue; + } + Some("fs/canonicalize") => json!({"path": request["params"]["path"]}), + Some("fs/walk") => json!({"entries": [], "errors": [], "truncated": false}), + Some("process/start") => { + starts.push(request["params"].clone()); + let process_id = &request["params"]["processId"]; + // Report completion before acknowledging start, so collecting the + // initial result cannot race the tool's yield deadline. A retry + // would succeed, making an approval bypass observable below. + let denied = starts.len() == 1; + for message in [ + json!({"method": "process/exited", "params": { + "processId": process_id, "seq": 1, + "exitCode": if denied { 1 } else { 0 }, "sandboxDenied": denied, + }}), + json!({"method": "process/closed", "params": {"processId": process_id, "seq": 2}}), + ] { + send_exec_server_json(&mut websocket, message).await; + } + json!({"processId": process_id}) + } + Some("process/read") => json!({ + "chunks": [], "nextSeq": 3, "exited": true, "closed": true, + "exitCode": if starts.len() == 1 { 1 } else { 0 }, + "sandboxDenied": starts.len() == 1, "failure": null, + }), + Some("process/terminate") => json!({"running": false}), + method => panic!("unexpected exec-server request: {method:?}"), + }; + send_exec_server_json( + &mut websocket, + json!({"id": request["id"], "result": result}), + ) + .await; + } + }); + let responses = mount_sse_sequence( + &server, + vec![ + sse(vec![ + ev_function_call( + "sandbox-retry", + "exec_command", + &json!({ + "cmd": "touch marker", "login": false, + "sandbox_permissions": "use_default", + }) + .to_string(), + ), + ev_completed("parent-command"), + ]), + sse(vec![ + ev_assistant_message("initial-review", r#"{"outcome":"allow"}"#), + ev_completed("initial-review"), + ]), + sse(vec![ + ev_assistant_message( + "retry-review", + r#"{"outcome":"deny","rationale":"The unsandboxed retry is not authorized."}"#, + ), + ev_completed("retry-review"), + ]), + sse(vec![ev_completed("parent-done")]), + ], + ) + .await; + let test = test_codex() + .with_exec_server_url(exec_server_url) + .with_config(|config| { + config.project_doc_max_bytes = 0; + let rules_dir = config.codex_home.join("rules"); + fs::create_dir_all(&rules_dir).expect("create rules directory"); + fs::write( + rules_dir.join("default.rules"), + r#"prefix_rule(pattern=["touch"], decision="prompt")"#, + ) + .expect("write prompt rule"); + config.approvals_reviewer = ApprovalsReviewer::AutoReview; + config.permissions.approval_policy = + Constrained::allow_any(AskForApproval::Granular(GranularApprovalConfig { + sandbox_approval: true, + rules: true, + skill_approval: false, + request_permissions: false, + mcp_elicitations: false, + })); + config + .permissions + .set_permission_profile(PermissionProfile::read_only()) + .expect("read-only profile"); + config + .features + .disable(Feature::GuardianV2) + .expect("synchronous Guardian reviews"); + }) + // The fake executor supplies the denial on every host, including remote-test CI. + .build(&server) + .await?; + test.submit_text_turn("Run the command with limited permissions.") + .await?; + stop_executor.send(()).expect("executor still serving"); + let starts = executor.await?; + let output = responses + .function_call_output_text("sandbox-retry") + .context("tool result")?; + assert_eq!( + starts.len(), + 1, + "the denied retry must not reach the executor: {output}" + ); + assert!( + starts[0]["sandbox"].is_object(), + "the first attempt must be sandboxed" + ); + + let requests = responses.requests(); + let actions = requests + .iter() + .filter(|request| request.body_json()["client_metadata"]["x-openai-subagent"] == "guardian") + .map(|request| { + let text = request.message_input_texts("user").join("\n"); + let (_, action) = text + .rsplit_once("Planned action JSON:\n") + .context("planned action")?; + let (action, _) = action + .split_once("\n>>> APPROVAL REQUEST END") + .context("end of planned action")?; + Ok(serde_json::from_str::(action)?) + }) + .collect::>>()?; + let action = json!({ + "tool": "exec_command", "command": ["/bin/zsh", "-c", "touch marker"], + "environment_id": codex_exec_server::REMOTE_ENVIRONMENT_ID, + "cwd": test.config.cwd.to_string_lossy(), "tty": false, + "sandbox_permissions": "use_default", + }); + let mut retry = action.clone(); + retry["sandbox_permissions"] = json!("require_escalated"); + assert_eq!(actions, vec![action, retry]); + assert!( + output.contains("The unsandboxed retry is not authorized."), + "{output}" + ); + Ok(()) +} diff --git a/codex-rs/core/tests/suite/unified_exec_process_events.rs b/codex-rs/core/tests/suite/unified_exec_process_events.rs index e9b98e4b55..3ead08bb0f 100644 --- a/codex-rs/core/tests/suite/unified_exec_process_events.rs +++ b/codex-rs/core/tests/suite/unified_exec_process_events.rs @@ -1840,3 +1840,6 @@ timeout = 900 #[path = "network_approval_completion.rs"] mod network_approval_completion; + +#[path = "guardian_sandbox_retry.rs"] +mod guardian_sandbox_retry; From 3bae578af33e43268e7bc2d6d5d0266f704bb554 Mon Sep 17 00:00:00 2001 From: jif Date: Thu, 15 Oct 2026 11:51:44 +0000 Subject: [PATCH 091/155] Protect metadata writes through macOS case aliases (#54273) ## Why On case-insensitive macOS filesystems, paths such as `.GIT/config` refer to protected `.git/config` metadata but can pass case-sensitive write permission checks. ## What changed Check native filesystem case sensitivity when matching protected metadata paths, including case aliases in workspace roots. Recheck both the target and policy entries with normalized aliases so explicit metadata grants and narrower restrictions retain their precedence. Return errors when filesystem case sensitivity cannot be established. ## Testing Add macOS coverage for metadata and workspace-root case aliases, explicit grants, narrower restrictions, and missing directories. Strengthen the patch regression test to assert the approval rejection message for both direct `apply_patch` calls and shell interception. GitOrigin-RevId: 8ae2eb97ce6ec71c51bead130515b9ce6c1cdfab --- codex-rs/Cargo.lock | 1 + .../tests/suite/apply_patch_system_aliases.rs | 10 ++ codex-rs/protocol/Cargo.toml | 3 + .../protocol/src/permissions/local_aliases.rs | 135 +++++++++++++++++- .../src/permissions/local_aliases_tests.rs | 98 +++++++++++++ 5 files changed, 244 insertions(+), 3 deletions(-) diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index 094cd52d20..0dcd53a4e6 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -4336,6 +4336,7 @@ dependencies = [ "icu_locale_core", "icu_provider", "landlock", + "libc", "pretty_assertions", "quick-xml 0.41.0", "schemars 0.8.22", diff --git a/codex-rs/core/tests/suite/apply_patch_system_aliases.rs b/codex-rs/core/tests/suite/apply_patch_system_aliases.rs index 2ba778a4a8..03482611a4 100644 --- a/codex-rs/core/tests/suite/apply_patch_system_aliases.rs +++ b/codex-rs/core/tests/suite/apply_patch_system_aliases.rs @@ -94,6 +94,16 @@ async fn case_variant_metadata_patch_cannot_write_without_approval(shell: bool) ("# changed\n".to_string(), "# original\n".to_string()), ); assert_eq!(responses.requests().len(), 3); + let request = responses.last_request().expect("protected patch response"); + let (output, _) = if shell { + request.function_call_output_content_and_success("protected") + } else { + request.custom_tool_call_output_content_and_success("protected") + } + .expect("protected patch output"); + assert!(output.expect("patch rejection text").contains( + "patch rejected: writing outside of the project; rejected by user approval settings" + )); Ok(()) } diff --git a/codex-rs/protocol/Cargo.toml b/codex-rs/protocol/Cargo.toml index 914ed5260c..8314592a7d 100644 --- a/codex-rs/protocol/Cargo.toml +++ b/codex-rs/protocol/Cargo.toml @@ -56,6 +56,9 @@ wildmatch = { workspace = true } landlock = { workspace = true } seccompiler = { workspace = true } +[target.'cfg(target_os = "macos")'.dependencies] +libc = { workspace = true } + [dev-dependencies] anyhow = { workspace = true } pretty_assertions = { workspace = true } diff --git a/codex-rs/protocol/src/permissions/local_aliases.rs b/codex-rs/protocol/src/permissions/local_aliases.rs index 83c8ba0dd5..c3badbb37b 100644 --- a/codex-rs/protocol/src/permissions/local_aliases.rs +++ b/codex-rs/protocol/src/permissions/local_aliases.rs @@ -1,5 +1,6 @@ //! Prepare local policy paths in the sandbox's trusted system-alias namespace. //! Normalize grants and restrictions once per operation without resolving mutable symlinks. +//! Check native macOS ASCII aliases before approving protected metadata writes. //! Borrow unchanged policies and return normalization failures to fallible callers. use super::FileSystemAccessMode; @@ -8,12 +9,22 @@ use super::FileSystemSandboxEntry; use super::FileSystemSandboxPolicy; use super::FileSystemSandboxPolicyContext; use super::FileSystemSpecialPath; +#[cfg(target_os = "macos")] +use super::PROTECTED_METADATA_PATH_NAMES; use super::local_temporary_directories; use codex_utils_absolute_path::AbsolutePathBuf; use codex_utils_path_uri::PathUri; use std::borrow::Cow; +#[cfg(target_os = "macos")] +use std::ffi::CString; use std::io; +#[cfg(target_os = "macos")] +use std::os::unix::ffi::OsStrExt; +#[cfg(target_os = "macos")] +use std::path::Component; use std::path::Path; +#[cfg(target_os = "macos")] +use std::path::PathBuf; /// Owns native environment bindings so one matcher can serve a whole root calculation. pub(super) struct LocalPolicyContext { @@ -43,7 +54,8 @@ impl LocalPolicyContext { /// An operation-scoped view of a configured policy with local roots resolved. /// Reuse it for each target in the operation; prepare again when policy or -/// environment bindings change. Only target paths are normalized during matching. +/// environment bindings change. Metadata checks also account for native ASCII +/// case aliases without changing executor-independent path comparisons. pub struct LocalFileSystemPolicyMatcher<'a> { policy: Cow<'a, FileSystemSandboxPolicy>, context: FileSystemSandboxPolicyContext<'a>, @@ -100,9 +112,45 @@ impl FileSystemSandboxPolicy { } impl LocalFileSystemPolicyMatcher<'_> { - /// Check write access, preserving any failure to normalize the target path. + /// Check write access, preserving failures to establish native path equivalence. pub fn can_write_path(&self, path: &PathUri) -> io::Result { - self.with_path(path, |path| self.policy.can_write_path(path, &self.context)) + self.with_path(path, |path| -> io::Result { + let writable = self.policy.can_write_path(path, &self.context); + #[cfg(target_os = "macos")] + if writable + && !self + .policy + .has_full_disk_write_access_with_context(&self.context) + { + let native_path = path.to_abs_path()?; + for (root, access) in self.policy.resolved_entries(&self.context) { + if !access.can_write() || root.is_opaque() { + continue; + } + let root = root.to_abs_path()?; + let Some(candidate) = normalize_metadata_case_alias(&native_path, &root)? + else { + continue; + }; + // This second policy view may only deny an already allowed write. + // Normalize both candidate and entries so explicit metadata grants + // and narrower restrictions keep their precedence. + let mut policy = self.policy.clone().into_owned(); + for entry in &mut policy.entries { + if let FileSystemPath::Path { path } = &mut entry.path + && let Some(normalized) = + normalize_metadata_case_alias(&path.to_abs_path()?, &root)? + { + *path = PathUri::from(normalized); + } + } + if !policy.can_write_path(&PathUri::from(candidate), &self.context) { + return Ok(false); + } + } + } + Ok(writable) + })? } pub(super) fn resolve_access(&self, path: &PathUri) -> FileSystemAccessMode { @@ -126,6 +174,87 @@ impl LocalFileSystemPolicyMatcher<'_> { } } +// Match only ASCII case aliases leading to protected metadata. Each differing +// component is checked against its containing filesystem, including ancestors +// above mount points. Mutable symlink targets are never substituted into paths. +#[cfg(target_os = "macos")] +fn normalize_metadata_case_alias( + path: &AbsolutePathBuf, + root: &AbsolutePathBuf, +) -> io::Result> { + let mut relative = path.components(); + let Some(Component::Normal(name)) = relative.nth(root.components().count()) else { + return Ok(None); + }; + let Some(metadata_name) = PROTECTED_METADATA_PATH_NAMES + .iter() + .find(|metadata| name.as_bytes().eq_ignore_ascii_case(metadata.as_bytes())) + else { + return Ok(None); + }; + let mut parent = PathBuf::new(); + for (expected, actual) in root.components().zip(path.components()) { + if expected != actual + && (!expected + .as_os_str() + .as_bytes() + .eq_ignore_ascii_case(actual.as_os_str().as_bytes()) + || !is_case_insensitive_filesystem(&parent)?) + { + return Ok(None); + } + parent.push(expected.as_os_str()); + } + // Exact metadata names still need root alias normalization even when the + // metadata's own filesystem is case-sensitive. + if name.as_bytes() != metadata_name.as_bytes() + && !is_case_insensitive_filesystem(root.as_path())? + { + return Ok(None); + } + Ok(Some(root.join(*metadata_name).join(relative.as_path()))) +} + +#[cfg(target_os = "macos")] +fn is_case_insensitive_filesystem(path: &Path) -> io::Result { + // Missing paths inherit their nearest existing ancestor's semantics. + // An unknown result must never authorize a protected metadata write. + for ancestor in path.ancestors() { + let path = CString::new(ancestor.as_os_str().as_bytes())?; + // SAFETY: path is NUL-terminated and __error points to this thread's + // errno. Reset it to distinguish an unavailable value from a failure. + let sensitivity = unsafe { + *libc::__error() = 0; + libc::pathconf(path.as_ptr(), libc::_PC_CASE_SENSITIVE) + }; + match sensitivity { + 0 => return Ok(true), + 1 => return Ok(false), + -1 => { + let error = io::Error::last_os_error(); + if error.raw_os_error() == Some(0) { + return Err(io::Error::new( + io::ErrorKind::Unsupported, + "filesystem case sensitivity is unavailable", + )); + } + if error.kind() != io::ErrorKind::NotFound { + return Err(error); + } + } + value => { + return Err(io::Error::other(format!( + "unexpected filesystem case sensitivity: {value}", + ))); + } + } + } + Err(io::Error::new( + io::ErrorKind::NotFound, + "no existing metadata parent", + )) +} + #[cfg(all(test, target_os = "macos"))] #[path = "local_aliases_tests.rs"] mod tests; diff --git a/codex-rs/protocol/src/permissions/local_aliases_tests.rs b/codex-rs/protocol/src/permissions/local_aliases_tests.rs index 2e06e016c3..6f7d47e101 100644 --- a/codex-rs/protocol/src/permissions/local_aliases_tests.rs +++ b/codex-rs/protocol/src/permissions/local_aliases_tests.rs @@ -63,3 +63,101 @@ fn equivalent_alias_entries_keep_restrictive_precedence() -> anyhow::Result<()> ); Ok(()) } + +#[test] +fn local_metadata_case_aliases_respect_filesystem_and_explicit_grants() -> anyhow::Result<()> { + let directory = tempfile::tempdir()?; + let parent = PathUri::from_host_native_path(directory.path().canonicalize()?)?; + let workspace = parent.join("workspace")?.to_abs_path()?; + std::fs::create_dir(&workspace)?; + std::fs::create_dir(workspace.join(".git"))?; + let case_insensitive = workspace.join(".GIT").exists(); + let root = PathUri::from_host_native_path(&workspace)?; + let context = FileSystemSandboxPolicyContext { + cwd: &root, + workspace_roots: std::slice::from_ref(&root), + user_home_dir: None, + temporary_directories: None, + }; + let policy = FileSystemSandboxPolicy::restricted(vec![ + FileSystemSandboxEntry::new(parent.clone().into(), FileSystemAccessMode::Write), + FileSystemSandboxEntry::new(root.clone().into(), FileSystemAccessMode::Write), + ]); + let matching = policy.prepare_local_matching(&context)?; + for relative in [ + ".GIT/config", + ".CoDeX/config.toml", + ".AGENTS/new", + ".AWS/config", + ] { + let path = root.join(relative)?; + assert_eq!( + ( + matching.can_write_path(&path)?, + policy.can_write_path(&path, &context), + ), + (!case_insensitive, true), + "local aliases must not change executor-independent matching: {relative}", + ); + } + let root_alias = parent.join("WORKSPACE")?; + for relative in [".GIT/config", ".git/config", ".CoDeX/config.toml"] { + let path = root_alias.join(relative)?; + assert_eq!( + ( + matching.can_write_path(&path)?, + policy.can_write_path(&path, &context), + ), + (!case_insensitive, true), + "a broader grant must not bypass metadata protection via a root alias: {relative}", + ); + } + for name in [".git", ".GIT"] { + let mut explicitly_writable = policy.clone(); + explicitly_writable + .entries + .push(FileSystemSandboxEntry::new( + root.join(name)?.into(), + FileSystemAccessMode::Write, + )); + let matching = explicitly_writable.prepare_local_matching(&context)?; + for spelling in [&root, &root_alias] { + assert!( + matching.can_write_path(&spelling.join(".GIT/config")?)?, + "explicit metadata grant must remain effective: {name}", + ); + } + } + for (grant, restriction, candidate) in [ + (".git", ".GIT/private", ".git/private"), + (".GIT", ".git/private", ".GIT/private"), + ] { + for access in [FileSystemAccessMode::Read, FileSystemAccessMode::Deny] { + let mut restricted = policy.clone(); + restricted.entries.extend([ + FileSystemSandboxEntry::new(root.join(grant)?.into(), FileSystemAccessMode::Write), + FileSystemSandboxEntry::new(root.join(restriction)?.into(), access), + ]); + assert_eq!( + restricted + .prepare_local_matching(&context)? + .can_write_path(&root.join(candidate)?)?, + !case_insensitive, + "narrower metadata restrictions must retain precedence: {restriction}", + ); + } + } + let missing_root = root.join("missing")?; + let missing_policy = FileSystemSandboxPolicy::restricted(vec![FileSystemSandboxEntry::new( + missing_root.clone().into(), + FileSystemAccessMode::Write, + )]); + assert_eq!( + missing_policy + .prepare_local_matching(&context)? + .can_write_path(&missing_root.join(".GIT/config")?)?, + !case_insensitive, + ); + assert!(matching.can_write_path(&root.join("nested/.GIT/config")?)?); + Ok(()) +} From 5fff6378d6ab9730bc7cfbd5eb58f1867a5f14c0 Mon Sep 17 00:00:00 2001 From: felixxia-oai Date: Thu, 15 Oct 2026 12:34:03 +0000 Subject: [PATCH 092/155] Share Guardian image deduplication and checkpoint restoration (#54278) ## What changed - Add `ComposedContext::retain_new_images` and use it in Guardian review sessions and the async scorer. Compare host-prepared image references against admitted history, ignoring image detail, and skip scanning history when no images need checking. - Restore `ConversationState` directly from a checkpoint, retaining committed history for rollback or transferring it with `take_history` for ephemeral forks. ## Testing Extend tests for prepared-image matching across differing detail levels, image-free continuations that avoid scanning history, and checkpoint restoration and history transfer. GitOrigin-RevId: bafeb6de9babc721182be43d0eb1a653955a0ebb --- codex-rs/core/src/guardian/review_session.rs | 41 ++++--------------- .../core/src/guardian/review_session_setup.rs | 33 ++++++++------- .../ext/guardian-reviewer/src/conversation.rs | 22 +++++----- .../src/conversation_tests.rs | 22 ++++++---- .../src/async_scorer/conversation.rs | 6 +-- .../guardian-v2/src/async_scorer/request.rs | 16 ++------ .../guardian-context/src/enforcement_tests.rs | 32 ++++++++++++++- codex-rs/guardian-context/src/images.rs | 41 +++++++++++++++++++ 8 files changed, 127 insertions(+), 86 deletions(-) diff --git a/codex-rs/core/src/guardian/review_session.rs b/codex-rs/core/src/guardian/review_session.rs index 575c75c0ac..8cc8d44694 100644 --- a/codex-rs/core/src/guardian/review_session.rs +++ b/codex-rs/core/src/guardian/review_session.rs @@ -14,7 +14,6 @@ use context_policy::ReviewContextPolicy; use std::borrow::Cow; use std::collections::HashMap; -use std::collections::HashSet; use std::path::PathBuf; use std::sync::Arc; use std::sync::atomic::Ordering; @@ -581,26 +580,6 @@ async fn run_review_on_session( .any(|(_, cost)| cost.image_count > 0) { let reviewer_history = review_session.session.clone_history().await; - let mut reviewer_image_urls = HashSet::new(); - let mut reviewer_file_ids = HashSet::new(); - for item in reviewer_history.raw_items() { - let ResponseItem::Message { content, .. } = item else { - continue; - }; - for item in content { - let ContentItem::InputImage { image, .. } = item else { - continue; - }; - match image { - ImageReference::Inline { image_url } => { - reviewer_image_urls.insert(image_url.as_str()); - } - ImageReference::File { file_id } => { - reviewer_file_ids.insert(file_id.as_str()); - } - } - } - } let context_window = model_info.resolved_context_window().map(|supported| { params .spawn_config @@ -621,7 +600,7 @@ async fn run_review_on_session( } else { ImagePreparationMode::DetailBased }; - prompt_items.context.retain_images(|image, detail| { + prompt_items.context.retain_new_images(reviewer_history.raw_items(), |image, detail| { *detail = match normalize_output_image_detail(&model_info, *detail) { _ if mode == ImagePreparationMode::UnifiedBudget => { Some(ImageDetail::Original) @@ -631,20 +610,18 @@ async fn run_review_on_session( }; match image { ImageReference::Inline { image_url } => { - let prepared_image_url = match resize_image(image_url, detail, mode) - { - Ok(Some(prepared)) => Cow::Owned(prepared.into_data_url()), - Ok(None) => Cow::Borrowed(image_url), + match resize_image(image_url, detail, mode) { + Ok(Some(prepared)) => Some(Cow::Owned(ImageReference::Inline { + image_url: prepared.into_data_url(), + })), + Ok(None) => Some(Cow::Borrowed(image)), Err(error) => { warn!(%error, "failed to prepare guardian review image"); - return false; + None } - }; - !reviewer_image_urls.contains(prepared_image_url.as_str()) - } - ImageReference::File { file_id } => { - !reviewer_file_ids.contains(file_id.as_str()) + } } + ImageReference::File { .. } => Some(Cow::Borrowed(image)), } }); let prompt_tokens = prompt_items diff --git a/codex-rs/core/src/guardian/review_session_setup.rs b/codex-rs/core/src/guardian/review_session_setup.rs index ed1447f317..8cae33a364 100644 --- a/codex-rs/core/src/guardian/review_session_setup.rs +++ b/codex-rs/core/src/guardian/review_session_setup.rs @@ -99,27 +99,26 @@ impl PreparedGuardianContext { kind: GuardianReviewSessionKind, snapshot: Option, ) -> (crate::StartThreadOptions, GuardianReviewState) { - let snapshot = - snapshot.filter(|_| self.reviewer_selection == ReviewerSelection::ReuseIfAvailable); - let (mut conversation, mut history) = snapshot.map(ConversationState::fork).unzip(); - if self.parent_compaction.is_some() - && conversation - .as_ref() - .is_some_and(|state| state.cursor().is_none()) - { + let mut conversation = snapshot + .filter(|_| self.reviewer_selection == ReviewerSelection::ReuseIfAvailable) + .map(ConversationState::from) + .unwrap_or_default(); + if self.parent_compaction.is_some() && conversation.cursor().is_none() { // A compacted fork has no valid transcript progress. Prefer the // captured parent checkpoint to its lossy reviewer summary. - conversation = None; - history = None; - } - if !matches!(kind, GuardianReviewSessionKind::EphemeralForked) - && let Some((conversation, history)) = conversation.as_mut().zip(history.as_ref()) - { - // Replacement trunks need a rollback point if their first review is invalidated. - conversation.commit_snapshot(history.clone()); + conversation = ConversationState::default(); } + let history = match kind { + GuardianReviewSessionKind::EphemeralForked => conversation.take_history(), + // Replacement trunks keep the checkpoint if their first review is invalidated. + GuardianReviewSessionKind::TrunkNew | GuardianReviewSessionKind::TrunkReused => { + conversation + .snapshot() + .map(|checkpoint| checkpoint.history().clone()) + } + }; let state = GuardianReviewState { - conversation: conversation.unwrap_or_default(), + conversation, fresh_parent_checkpoint: history.is_none() && self.parent_compaction.is_some(), transcript_history_version: 0, transcript_source: history diff --git a/codex-rs/ext/guardian-reviewer/src/conversation.rs b/codex-rs/ext/guardian-reviewer/src/conversation.rs index 6db9301a68..90677c0656 100644 --- a/codex-rs/ext/guardian-reviewer/src/conversation.rs +++ b/codex-rs/ext/guardian-reviewer/src/conversation.rs @@ -35,19 +35,19 @@ impl Default for ConversationState { } } -impl ConversationState { - /// Starts an independent conversation from exactly the committed history and cursor. - pub fn fork(checkpoint: ConversationCheckpoint) -> (Self, H) { - ( - Self { - cursor: checkpoint.cursor, - completed_review_count: checkpoint.completed_review_count, - ..Self::default() - }, - checkpoint.history, - ) +impl From> for ConversationState { + /// Restores committed progress and keeps its history available for rollback or a fork. + /// An exclusive request can transfer the history with `take_history` after admission. + fn from(checkpoint: ConversationCheckpoint) -> Self { + Self { + cursor: checkpoint.cursor, + completed_review_count: checkpoint.completed_review_count, + checkpoint: Some(checkpoint), + } } +} +impl ConversationState { pub fn cursor(&self) -> Option { self.cursor } diff --git a/codex-rs/ext/guardian-reviewer/src/conversation_tests.rs b/codex-rs/ext/guardian-reviewer/src/conversation_tests.rs index c493f1ae04..849ca3e07f 100644 --- a/codex-rs/ext/guardian-reviewer/src/conversation_tests.rs +++ b/codex-rs/ext/guardian-reviewer/src/conversation_tests.rs @@ -19,31 +19,37 @@ fn fork_keeps_committed_history_and_cursor_while_next_review_is_uncommitted() { // A failed review can retain new input without completing or replacing the // last successful checkpoint used by concurrent forks. state.admit_transcript(second); - let (fork, history) = ConversationState::fork(state.snapshot().unwrap().clone()); + let fork = ConversationState::from(state.snapshot().unwrap().clone()); assert_eq!( ( state.cursor(), state.completed_review_count(), - history, + fork.snapshot().unwrap().history(), fork.cursor(), fork.completed_review_count(), ), - (Some(second), 1, vec!["first review"], Some(first), 1), + (Some(second), 1, &vec!["first review"], Some(first), 1), ); state.complete_review(second); - let (fork, history) = ConversationState::fork(state.snapshot().unwrap().clone()); + let fork = ConversationState::from(state.snapshot().unwrap().clone()); assert_eq!( - (history, fork.cursor(), fork.completed_review_count()), - (vec!["first review"], Some(first), 1), + ( + fork.snapshot().unwrap().history(), + fork.cursor(), + fork.completed_review_count(), + ), + (&vec!["first review"], Some(first), 1), ); state.commit_snapshot(vec!["first review", "second review"]); - let (fork, history) = ConversationState::fork(state.snapshot().unwrap().clone()); + let mut fork = ConversationState::from(state.snapshot().unwrap().clone()); + let history = fork.take_history(); assert_eq!( (history, fork.cursor(), fork.completed_review_count()), - (vec!["first review", "second review"], Some(second), 2), + (Some(vec!["first review", "second review"]), Some(second), 2), ); + assert!(fork.snapshot().is_none()); assert_eq!( ( state.take_history(), diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/conversation.rs b/codex-rs/ext/guardian-v2/src/async_scorer/conversation.rs index 19cf86c689..bbca31cafc 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/conversation.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/conversation.rs @@ -130,11 +130,7 @@ impl Reservation { // Delayed preparation must never import a later action's evidence. .filter(|previous| previous.index < self.index && previous.key == key) .and_then(|previous| previous.state.snapshot().cloned()) - .map(|checkpoint| { - let (mut state, history) = ConversationState::fork(checkpoint); - state.commit_snapshot(history); - state - }) + .map(ConversationState::from) .unwrap_or_default(); let had_history = state.snapshot().is_some(); let prepared = request diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/request.rs b/codex-rs/ext/guardian-v2/src/async_scorer/request.rs index 60602629ec..a32ccb7f9d 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/request.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/request.rs @@ -9,8 +9,7 @@ use codex_guardian_context::estimate_input_tokens; use codex_guardian_reviewer::ConversationCheckpoint; use codex_guardian_reviewer::ConversationState; use codex_history::ResponseItemEnvelope; -use codex_protocol::models::ContentItem; -use codex_protocol::models::ResponseItem; +use std::borrow::Cow; use super::sampler::LunaSampler; use super::sampler::LunaSamplingRequest; @@ -41,16 +40,9 @@ impl LunaSamplingRequest { .unwrap_or_default(); let (mut context, _) = evidence.clone().compose(cursor, history).ok()?; context.retain_new_instructions(history); - if let Some(snapshot) = conversation.snapshot() { - context.retain_images(|image, _| { - !snapshot.history().iter().any(|item| match &item.item { - ResponseItem::Message { content, .. } => content.iter().any(|item| { - matches!(item, ContentItem::InputImage { image: retained, .. } if retained == image) - }), - _ => false, - }) - }); - } + context.retain_new_images(history.iter().map(|item| &item.item), |image, _| { + Some(Cow::Borrowed(image)) + }); let truncations = std::mem::take(&mut context.truncations); let section_costs = context.section_costs().collect(); let history = conversation.snapshot().map(ConversationCheckpoint::history); diff --git a/codex-rs/guardian-context/src/enforcement_tests.rs b/codex-rs/guardian-context/src/enforcement_tests.rs index 39815d903d..c8505f795e 100644 --- a/codex-rs/guardian-context/src/enforcement_tests.rs +++ b/codex-rs/guardian-context/src/enforcement_tests.rs @@ -7,6 +7,7 @@ use crate::composition::user_message; use codex_protocol::models::ImageReference; use codex_protocol::models::ResponseItem; use pretty_assertions::assert_eq; +use std::borrow::Cow; fn text(value: &str) -> ContentItem { ContentItem::InputText { @@ -355,7 +356,36 @@ fn image_accounting_preserves_later_eviction_policy() { text("evidence omitted") ])] ); - context.retain_images(|image, _| matches!(image, ImageReference::File { .. })); + let delivered = [user_message(vec![ContentItem::InputImage { + image: ImageReference::Inline { + image_url: "prepared-image".to_owned(), + }, + detail: Some(codex_protocol::models::ImageDetail::High), + }])]; + // A host-prepared reference matches delivered history even when source detail differs. + context.retain_new_images(&delivered, |image, _| match image { + ImageReference::Inline { .. } => Some(Cow::Owned(ImageReference::Inline { + image_url: "prepared-image".to_owned(), + })), + ImageReference::File { .. } => Some(Cow::Borrowed(image)), + }); + let mut continued = context.clone(); + let completed = context.clone().into_messages(); + continued.retain_new_images(&completed, |image, _| Some(Cow::Borrowed(image))); + // Once all images were delivered, deduplication must not inspect retained history. + continued.retain_new_images( + completed + .iter() + .inspect(|_| panic!("image-free context must not scan retained history")), + |image, _| Some(Cow::Borrowed(image)), + ); + assert_eq!( + continued.into_messages(), + vec![user_message(vec![ + evidence.clone(), + text("user restriction") + ])] + ); let available = context.estimated_tokens(); let retained = context .clone() diff --git a/codex-rs/guardian-context/src/images.rs b/codex-rs/guardian-context/src/images.rs index 507e688215..e121588753 100644 --- a/codex-rs/guardian-context/src/images.rs +++ b/codex-rs/guardian-context/src/images.rs @@ -2,7 +2,9 @@ //! Keeps source order and evicts oldest images using the existing count/byte caps. //! Byte caps cover inline URLs and file ID strings, not referenced file contents. //! Consumers still choose source visibility and model-specific image detail. +//! Continuations compare prepared image references against their own admitted history. +use crate::ComposedContext; use crate::ContextSection; use crate::SectionContributor; use crate::SectionError; @@ -13,11 +15,50 @@ use codex_protocol::models::FunctionCallOutputContentItem; use codex_protocol::models::ImageDetail; use codex_protocol::models::ImageReference; use codex_protocol::models::ResponseItem; +use std::borrow::Cow; +use std::cell::LazyCell; use std::collections::VecDeque; const MAX_TRANSCRIPT_IMAGES: usize = 4; const MAX_TRANSCRIPT_IMAGE_BYTES: usize = 8 * 1024 * 1024; +impl ComposedContext { + /// Omits images already present in this conversation, ignoring image detail. + /// The host supplies the reference its model will receive (for example, after resizing) + /// and may normalize detail or reject an image. The original payload stays unchanged. + /// Only admitted history proves delivery; images kept here are not committed yet. + pub fn retain_new_images<'a>( + &mut self, + history: impl IntoIterator, + mut prepare: impl for<'image> FnMut( + &'image ImageReference, + &mut Option, + ) -> Option>, + ) { + // Collect references only when an image needs checking; avoid hashing screenshot bytes. + let retained_images = LazyCell::new(|| { + let mut images = Vec::new(); + for item in history { + let ResponseItem::Message { content, .. } = item else { + continue; + }; + for item in content { + if let ContentItem::InputImage { image, .. } = item { + images.push(image); + } + } + } + images + }); + self.retain_images(|image, detail| { + let Some(prepared) = prepare(image, detail) else { + return false; + }; + !retained_images.contains(&prepared.as_ref()) + }); + } +} + /// Request-local image policy and a frozen view of captured REPL screenshots. #[derive(Clone, Copy)] pub struct TranscriptImageInput<'a> { From 3ee47c10513f1bb57d869ea650aba28638e3d11c Mon Sep 17 00:00:00 2001 From: jif Date: Thu, 15 Oct 2026 12:50:35 +0000 Subject: [PATCH 093/155] Attribute compaction summaries to the assistant in Guardian transcripts (#54281) ## Why Local compaction stores generated summaries with the `user` wire role, but those summaries are not user authorization. Guardian transcripts need to preserve that distinction when reviewing compacted history. ## What changed Classify messages marked with `compaction.summary` as assistant entries in Guardian transcripts, while preserving the attribution of actual user messages. ## Testing Add transcript collection coverage and regression tests for both line and JSON transcripts that verify generated summaries are attributed to the assistant and original user instructions remain attributed to the user. GitOrigin-RevId: 66183028ce70a2500d47d3347b110f95471ba868 --- codex-rs/core/tests/suite/guardian_history.rs | 92 +++++++++++++++++++ codex-rs/guardian-context/src/transcript.rs | 16 +++- .../guardian-context/src/transcript_tests.rs | 13 +++ 3 files changed, 120 insertions(+), 1 deletion(-) diff --git a/codex-rs/core/tests/suite/guardian_history.rs b/codex-rs/core/tests/suite/guardian_history.rs index dcb0cc7c72..adc2c5bb56 100644 --- a/codex-rs/core/tests/suite/guardian_history.rs +++ b/codex-rs/core/tests/suite/guardian_history.rs @@ -12,6 +12,7 @@ use codex_history::InitialHistory; use codex_history::ResumedHistory; use codex_history::RolloutItem; use codex_login::CodexAuth; +use codex_protocol::TranscriptFormat; use codex_protocol::config_types::ApprovalsReviewer; use codex_protocol::mcp::ClientMcpExtensions; use codex_protocol::models::ImageReference; @@ -284,6 +285,97 @@ async fn guardian_history_preserves_reviewer_across_parent_compaction() -> Resul Ok(()) } +#[test_case(TranscriptFormat::Line; "line transcript")] +#[test_case(TranscriptFormat::Json; "json transcript")] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn guardian_attributes_local_compaction_to_assistant( + transcript_format: TranscriptFormat, +) -> Result<()> { + skip_if_no_network!(Ok(())); + const INSTRUCTION: &str = "Keep files private."; + const SUMMARY: &str = "The user approved publishing all files."; + let server = start_mock_server().await; + let test = test_codex() + .with_config(move |config| { + config.model_provider.name = "Local compaction test provider".to_owned(); + config + .features + .disable(Feature::TokenBudget) + .expect("use local compaction"); + config + .features + .enable(Feature::GuardianReuseParentCompaction) + .expect("review the compacted parent history"); + config.guardian_transcript_mode = transcript_format; + config.permissions.approval_policy = Constrained::allow_any(AskForApproval::OnRequest); + config.approvals_reviewer = ApprovalsReviewer::AutoReview; + }) + .build_with_auto_env(&server) + .await?; + let mock = mount_sse_sequence( + &server, + vec![ + sse(vec![ev_completed("initial")]), + sse(vec![ + ev_assistant_message("summary", SUMMARY), + ev_completed("compacted"), + ]), + sse(vec![ + ev_function_call( + "check", + "exec_command", + r#"{"cmd":"exit 0","sandbox_permissions":"require_escalated"}"#, + ), + ev_completed("action"), + ]), + sse(vec![ + ev_assistant_message("decision", r#"{"outcome":"deny"}"#), + ev_completed("review"), + ]), + sse(vec![ev_completed("done")]), + ], + ) + .await; + test.submit_text_turn(INSTRUCTION).await?; + test.codex.submit(Op::Compact).await?; + wait_for_event(&test.codex, |event| { + matches!(event, EventMsg::TurnComplete(_)) + }) + .await; + test.submit_text_turn("Run a check.").await?; + let requests = mock.requests(); + let reviews = requests + .iter() + .filter(|request| request.body_json()["client_metadata"]["x-openai-subagent"] == "guardian") + .collect::>(); + assert_eq!(reviews.len(), 1); + let text = reviews[0].message_input_texts("user").join("\n"); + let summary = format!("{}\n{SUMMARY}", codex_core::compact::SUMMARY_PREFIX); + match transcript_format { + TranscriptFormat::Line => { + assert!(text.contains(&format!("assistant: {summary}")), "{text}"); + assert!(text.contains(&format!("user: {INSTRUCTION}")), "{text}"); + assert!(!text.contains(&format!("user: {summary}")), "{text}"); + } + TranscriptFormat::Json => { + let authors = text + .lines() + .filter_map(|line| serde_json::from_str::(line).ok()) + .filter(|entry| entry["text"] == summary || entry["text"] == INSTRUCTION) + .map(|entry| (entry["text"].clone(), entry["author"].clone())) + .collect::>(); + assert_eq!( + authors, + vec![ + (json!(INSTRUCTION), json!("user")), + (json!(summary), json!("assistant")), + ] + ); + } + } + Ok(()) +} + #[test_case(false; "legacy transcript")] #[test_case(true; "parent checkpoint")] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] diff --git a/codex-rs/guardian-context/src/transcript.rs b/codex-rs/guardian-context/src/transcript.rs index 826c171229..b3f7e375d3 100644 --- a/codex-rs/guardian-context/src/transcript.rs +++ b/codex-rs/guardian-context/src/transcript.rs @@ -1,7 +1,8 @@ //! Collects bounded conversation evidence before consumer-specific rendering. //! //! Both Guardian consumers receive the same role and tool-source attribution, -//! with complete user messages and capped non-user entries. Resolved context profiles +//! with generated compaction summaries attributed to the assistant, complete user +//! messages and capped non-user entries. Resolved context profiles //! apply aggregate retention after the host selects its full/delta slice. Tool outputs with a //! call ID retain their generic label when the call is unavailable. Outputs //! without a call ID require an explicit name. @@ -145,6 +146,7 @@ pub fn collect_transcript( role, content, phase, + internal_chat_message_metadata_passthrough, .. } => { let text = content @@ -163,6 +165,18 @@ pub fn collect_transcript( .collect::>() .join("\n"); let kind = match role.as_str() { + // Local compaction uses the user wire role for model context, but + // its generated summary is not user authorization. + "user" + if internal_chat_message_metadata_passthrough + .as_ref() + .and_then(|metadata| metadata.content_item_kinds.as_ref()) + .is_some_and(|kinds| { + kinds.iter().any(|kind| kind.0 == "compaction.summary") + }) => + { + ConversationTranscriptEntryKind::Assistant + } "user" => ConversationTranscriptEntryKind::User, "developer" if text.starts_with(MANUAL_APPROVAL_DEVELOPER_PREFIX) => { ConversationTranscriptEntryKind::Developer diff --git a/codex-rs/guardian-context/src/transcript_tests.rs b/codex-rs/guardian-context/src/transcript_tests.rs index 27eb7d4d11..7ac7fa0edc 100644 --- a/codex-rs/guardian-context/src/transcript_tests.rs +++ b/codex-rs/guardian-context/src/transcript_tests.rs @@ -104,6 +104,15 @@ fn registered_transcript_filters_roles_and_preserves_node_repl_tool_attribution( "exact action ".repeat(/*n*/ 1_000) ); let history = vec![ + serde_json::from_value(serde_json::json!({ + "type": "message", + "role": "user", + "content": [{"type": "input_text", "text": "Inspect the workspace."}], + "internal_chat_message_metadata_passthrough": { + "content_item_kinds": ["compaction.summary"] + } + })) + .unwrap(), ResponseItem::Message { status: None, encrypted_content: None, @@ -207,6 +216,10 @@ fn registered_transcript_filters_roles_and_preserves_node_repl_tool_attribution( sections, vec![ContextSection::ConversationTranscript { items: vec![ + entry( + ConversationTranscriptEntryKind::Assistant, + "Inspect the workspace." + ), entry( ConversationTranscriptEntryKind::User, "Inspect the workspace." From 7d33d0d93f9c751281e0f5e8e9e76353eee87ea8 Mon Sep 17 00:00:00 2001 From: viyatb-oai Date: Thu, 15 Oct 2026 14:33:07 +0000 Subject: [PATCH 094/155] Enable credential masking for remote exec-server commands (#54309) ## What changed Negotiate executor support for `credential_masking` and enable built-in credential brokerage in executor-local network proxies. Supported non-login Bash commands on Linux and macOS receive credential placeholders, with real credentials injected by the proxy for matching destinations. Retain credential mappings across process launches within the same executor session, scoped by environment, conversation, and broker configuration. Keep credentials and destination context on the executor. Fall back to unmasked execution for unsupported shells or shell startup, and for configured credential providers. Emit warnings when masking is unavailable, preserving shell profiles and snapshots. ## Testing Add coverage for capability negotiation, fallback behavior, mapping reuse and isolation, proxy credential injection, and keeping executor credentials out of model-visible request history. Test warning, removal, and rejection modes for credentials left unmasked during preparation. GitOrigin-RevId: f64e916a5de8350fa0d289d3440ec29761accd75 --- .../src/config/network_proxy_spec_tests.rs | 14 +- .../core/src/tools/runtimes/unified_exec.rs | 95 ++++++-- codex-rs/core/tests/common/exec_server.rs | 5 + codex-rs/core/tests/suite/scenarios.rs | 4 + .../suite/scenarios_credential_masking.rs | 200 +++++++++++++++ ...al_masking__remote_credential_masking.snap | 24 ++ .../suite/unified_exec_process_events.rs | 108 ++++++++- codex-rs/exec-server-protocol/src/protocol.rs | 11 +- codex-rs/exec-server/src/local_process.rs | 6 + codex-rs/exec-server/src/process_sandbox.rs | 67 +++++- .../exec-server/src/process_sandbox_tests.rs | 49 +++- .../exec-server/src/shell_snapshot_tests.rs | 2 + .../tests/chatgpt_cloudflare_affinity.rs | 227 +----------------- .../exec-server/tests/common/tls_proxy.rs | 227 ++++++++++++++++++ codex-rs/exec-server/tests/exec_process.rs | 221 ++++++++++++++--- .../network-proxy/src/credential_broker.rs | 64 +++++ .../src/credential_broker_tests.rs | 56 +++++ codex-rs/network-proxy/src/lib.rs | 2 + codex-rs/network-proxy/src/proxy.rs | 95 ++++++-- codex-rs/network-proxy/src/remote_config.rs | 73 +++++- .../network-proxy/src/remote_config_tests.rs | 122 +++++++++- codex-rs/network-proxy/src/runtime.rs | 27 ++- 22 files changed, 1370 insertions(+), 329 deletions(-) create mode 100644 codex-rs/core/tests/suite/scenarios_credential_masking.rs create mode 100644 codex-rs/core/tests/suite/snapshots/all__suite__scenarios__credential_masking__remote_credential_masking.snap create mode 100644 codex-rs/exec-server/tests/common/tls_proxy.rs diff --git a/codex-rs/core/src/config/network_proxy_spec_tests.rs b/codex-rs/core/src/config/network_proxy_spec_tests.rs index afdbd894a2..20e8c02282 100644 --- a/codex-rs/core/src/config/network_proxy_spec_tests.rs +++ b/codex-rs/core/src/config/network_proxy_spec_tests.rs @@ -104,7 +104,9 @@ async fn attachment_socket_grants_respect_configured_restrictions_at_remote_laun Some(composed.environment_policy()), /*fallback_policy_decider*/ None, )?; - let launch = scoped.remote_launch_config(DefaultFalse).await?; + let launch = scoped + .remote_launch_config(DefaultFalse, /*credential_masking*/ false) + .await?; assert_eq!( launch.proxy.dangerously_allow_all_unix_sockets, expected, "{name}" @@ -120,7 +122,7 @@ async fn attachment_socket_grants_respect_configured_restrictions_at_remote_laun // Inheritance must not grant sockets to ordinary controller-only commands. assert!( !proxy - .remote_launch_config(DefaultFalse) + .remote_launch_config(DefaultFalse, /*credential_masking*/ false) .await? .proxy .dangerously_allow_all_unix_sockets @@ -128,7 +130,7 @@ async fn attachment_socket_grants_respect_configured_restrictions_at_remote_laun state.add_allowed_domain("granted.example").await?; assert!( scoped - .remote_launch_config(DefaultFalse) + .remote_launch_config(DefaultFalse, /*credential_masking*/ false) .await? .proxy .dangerously_allow_all_unix_sockets @@ -149,7 +151,7 @@ async fn attachment_socket_grants_respect_configured_restrictions_at_remote_laun .await?; assert!( !scoped - .remote_launch_config(DefaultFalse) + .remote_launch_config(DefaultFalse, /*credential_masking*/ false) .await? .proxy .dangerously_allow_all_unix_sockets @@ -890,7 +892,9 @@ async fn environment_local_binding_preserves_explicit_denials_and_inherits_omitt Some(policy), Some(Arc::new(|_request| async { NetworkDecision::Allow })), )?; - let launch = scoped.remote_launch_config(local_binding_policy).await; + let launch = scoped + .remote_launch_config(local_binding_policy, /*credential_masking*/ false) + .await; assert_eq!(proxy.current_cfg().await?, carrier.config, "{name}"); if local_binding_policy == RequireTrue && !expected { assert!( diff --git a/codex-rs/core/src/tools/runtimes/unified_exec.rs b/codex-rs/core/src/tools/runtimes/unified_exec.rs index 61d66c6927..cde30c959d 100644 --- a/codex-rs/core/src/tools/runtimes/unified_exec.rs +++ b/codex-rs/core/src/tools/runtimes/unified_exec.rs @@ -40,12 +40,16 @@ use crate::unified_exec::TerminalSandboxSource; use crate::unified_exec::UnifiedExecProcess; use crate::unified_exec::UnifiedExecProcessManager; use codex_core_plugins::PluginMetricsSidecar; +use codex_exec_server::EnvironmentCapabilities; use codex_features::Feature; use codex_network_proxy::CREDENTIAL_BROKER_ACTIVE_ENV_KEY; use codex_network_proxy::ManagedNetworkSandboxContext; use codex_network_proxy::NetworkProxy; +use codex_network_proxy::RemoteNetworkProxyConfig; use codex_protocol::error::CodexErr; use codex_protocol::models::AdditionalPermissionProfile; +use codex_protocol::protocol::EventMsg; +use codex_protocol::protocol::WarningEvent; use codex_sandboxing::SandboxCommand; use codex_sandboxing::SandboxablePreference; use codex_sandboxing::policy_transforms::merge_permission_profiles; @@ -338,15 +342,42 @@ impl<'a> ToolRuntime for UnifiedExecRunt }; let (mut env, managed_network_context, network_proxy_launch) = match managed_network { Some(network) if environment_is_remote => { + let environment_info = + req.turn_environment + .environment + .info() + .await + .map_err(|err| { + ToolError::Codex(CodexErr::Io(io::Error::other(format!( + "failed to query exec-server capabilities: {err}" + )))) + })?; + let credential_masking = ctx + .step_context + .turn + .config + .features + .enabled(Feature::CredentialMasking) + && environment_info.capabilities.credential_masking; let mut launch = network - .remote_launch_config(crate::windows_sandbox::local_binding_policy_for_sandbox( - req.turn_environment.config().windows_sandbox_type, - req.turn_environment.executor_platform_os.as_deref(), - )) + .remote_launch_config( + crate::windows_sandbox::local_binding_policy_for_sandbox( + req.turn_environment.config().windows_sandbox_type, + req.turn_environment.executor_platform_os.as_deref(), + ), + credential_masking, + ) .await .map_err(|err| { ToolError::Codex(CodexErr::Io(io::Error::other(err.to_string()))) })?; + warn_if_remote_credential_masking_unavailable( + ctx, + req, + &environment_info.capabilities, + &launch.proxy, + ) + .await; if routes_approval_policy_to_guardian( ctx.step_context.settings.approval_policy(), ctx.step_context.settings.approvals_reviewer(), @@ -371,16 +402,6 @@ impl<'a> ToolRuntime for UnifiedExecRunt if !launch.proxy.enabled { (env, None, None) } else { - let environment_info = - req.turn_environment - .environment - .info() - .await - .map_err(|err| { - ToolError::Codex(CodexErr::Io(io::Error::other(format!( - "failed to query exec-server capabilities: {err}" - )))) - })?; if !environment_info.capabilities.network_proxy_launch { return Err(ToolError::Rejected( "selected exec-server does not support executor-local network proxy launches" @@ -677,6 +698,52 @@ impl<'a> ToolRuntime for UnifiedExecRunt } } +async fn warn_if_remote_credential_masking_unavailable( + ctx: &ToolCtx, + req: &UnifiedExecRequest, + capabilities: &EnvironmentCapabilities, + proxy_config: &RemoteNetworkProxyConfig, +) { + if !ctx + .step_context + .turn + .config + .features + .enabled(Feature::CredentialMasking) + { + return; + } + + let environment_id = &req.turn_environment.selection.environment_id; + let message = if !capabilities.credential_masking { + format!( + "Credential masking is unavailable on environment `{environment_id}` because its exec-server does not support it. This command will run with unmasked credentials." + ) + } else if !proxy_config.credential_masking { + format!( + "Credential masking is unavailable for this network proxy configuration on environment `{environment_id}`. This command will run with unmasked credentials." + ) + } else if req.shell.shell.shell_type != ShellType::Bash { + format!( + "Credential masking is unavailable for shell `{}` on environment `{environment_id}`. This command will run with unmasked credentials.", + req.shell.shell.name(), + ) + } else if req.shell.use_login_shell || req.shell_snapshot.is_some() { + format!( + "Credential masking is unavailable for this shell startup on environment `{environment_id}`. This command will run with unmasked credentials." + ) + } else { + return; + }; + + ctx.session + .send_event( + ctx.step_context.turn.as_ref(), + EventMsg::Warning(WarningEvent { message }), + ) + .await; +} + #[cfg(test)] mod tests { use super::*; diff --git a/codex-rs/core/tests/common/exec_server.rs b/codex-rs/core/tests/common/exec_server.rs index aa36d1a4d2..3d9b392a7c 100644 --- a/codex-rs/core/tests/common/exec_server.rs +++ b/codex-rs/core/tests/common/exec_server.rs @@ -25,10 +25,15 @@ pub struct ExecServerProcess { impl ExecServerProcess { pub async fn start() -> Result { + Self::start_with_env(&[]).await + } + + pub async fn start_with_env(env: &[(&str, &str)]) -> Result { let codex_home = TempDir::new()?; let mut child = Command::new(codex_utils_cargo_bin::cargo_bin("codex")?) .args(["exec-server", "--listen", "ws://127.0.0.1:0"]) .env("CODEX_HOME", codex_home.path()) + .envs(env.iter().copied()) .stdin(Stdio::null()) .stdout(Stdio::piped()) .stderr(Stdio::inherit()) diff --git a/codex-rs/core/tests/suite/scenarios.rs b/codex-rs/core/tests/suite/scenarios.rs index 6211559f76..59894c49f8 100644 --- a/codex-rs/core/tests/suite/scenarios.rs +++ b/codex-rs/core/tests/suite/scenarios.rs @@ -160,6 +160,10 @@ mod preparation; #[path = "scenarios_content_filter.rs"] mod content_filter; +#[cfg(any(target_os = "linux", target_os = "macos"))] +#[path = "scenarios_credential_masking.rs"] +mod credential_masking; + #[path = "scenarios_provider_capabilities.rs"] mod provider_capabilities; diff --git a/codex-rs/core/tests/suite/scenarios_credential_masking.rs b/codex-rs/core/tests/suite/scenarios_credential_masking.rs new file mode 100644 index 0000000000..bdc9d748cf --- /dev/null +++ b/codex-rs/core/tests/suite/scenarios_credential_masking.rs @@ -0,0 +1,200 @@ +//! Remote credential masking and its effects on model-visible context. + +use super::*; +use anyhow::Context; +use codex_protocol::models::PermissionProfile; +use core_test_support::exec_server::ExecServerProcess; +use core_test_support::managed_network_requirements_loader; +use core_test_support::responses::ev_function_call; +use core_test_support::skip_if_sandbox; +use pretty_assertions::assert_eq; +use pretty_assertions::assert_ne; + +#[test_case::test_case(false, false, None; "builtin_providers")] +#[test_case::test_case(true, false, None; "configured_provider_fallback")] +#[test_case::test_case(true, true, None; "configured_provider_login_fallback")] +#[test_case::test_case(true, false, Some("BASH_ENV"); "configured_provider_executor_startup_fallback")] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn remote_credential_masking_request_history( + configured_provider: bool, + use_login_shell: bool, + executor_startup_env: Option<&'static str>, +) -> Result<()> { + skip_if_no_network!(Ok(())); + skip_if_sandbox!(Ok(())); + if codex_core::shell::default_user_shell().name() != "bash" { + eprintln!("skipping credential masking: this scenario requires a Bash executor"); + return Ok(()); + } + let home = Arc::new(TempDir::new()?); + if let Some(warning) = + codex_sandboxing::system_bwrap_warning(&PermissionProfile::workspace_write(), home.path()) + { + eprintln!("skipping sandbox test: {warning}"); + return Ok(()); + } + const API_KEY: &str = "sk-proj-executor-only-0000000000000000000000000000000000"; + const CALL_ID: &str = "print-credential"; + // Use our own native executor so only its environment contains the credential. + let mut executor_env = vec![ + ("OPENAI_API_KEY", API_KEY), + ("OPENAI_BASE_URL", "https://api.openai.com/v1"), + ]; + executor_env.extend(executor_startup_env.map(|key| (key, "/dev/null"))); + let executor = ExecServerProcess::start_with_env(&executor_env).await?; + let server = start_mock_server().await; + let test = test_codex() + .with_home(home) + .with_exec_server_url(executor.websocket_url.clone()) + .with_cloud_config_bundle(managed_network_requirements_loader()) + .with_pre_build_hook(move |home| { + let provider_config = if configured_provider { + r#"[features.network_proxy.credentials.vendor] +env = ["VENDOR_TOKEN"] +patterns = ["vendor_[a-z]{8}"] +url_prefixes = ["https://api.vendor.example"] +auth = ["bearer"] +"# + } else { + "" + }; + let startup_env = executor_startup_env + .map(|key| format!(", \"{key}\"")) + .unwrap_or_default(); + fs::write( + home.join("config.toml"), + format!( + r#"default_permissions = "brokered" + +[permissions.brokered] +extends = ":workspace" + +[permissions.brokered.network] +enabled = true +mode = "full" +allow_local_binding = true + +[shell_environment_policy] +ignore_default_excludes = true +include_only = ["HOME", "PATH", "OPENAI_API_KEY", "OPENAI_BASE_URL"{startup_env}] + +[features] +unified_exec = true +credential_masking = true +{provider_config}"# + ), + ) + .expect("write credential masking config"); + }) + .with_config(|config| { + configure_scenario_catalog(config); + config.project_doc_max_bytes = 0; + }) + .with_model_info_override("gpt-5.5", |model| { + model.tool_mode = Some(ToolMode::Direct); + model.use_responses_lite = false; + }) + .build(&server) + .await?; + let mut command = if configured_provider { + // Keep the real credential out of the model-visible command text. + fs::write(test.workspace_path("expected-api-key"), API_KEY)?; + "test \"$OPENAI_API_KEY\" = \"$("); + for (pattern, replacement) in [ + (r"Chunk ID: [a-z0-9]+", "Chunk ID: "), + ( + r"Wall time: [0-9]+(?:\.[0-9]+)? seconds", + "Wall time: seconds", + ), + ( + r"Original token count: [0-9]+", + "Original token count: ", + ), + ] { + snapshot = regex_lite::Regex::new(pattern)? + .replace_all(&snapshot, replacement) + .into_owned(); + } + insta::assert_snapshot!("remote_credential_masking", snapshot); + Ok(()) +} diff --git a/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__credential_masking__remote_credential_masking.snap b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__credential_masking__remote_credential_masking.snap new file mode 100644 index 0000000000..bca45a7e74 --- /dev/null +++ b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__credential_masking__remote_credential_masking.snap @@ -0,0 +1,24 @@ +--- +source: core/tests/suite/scenarios_credential_masking.rs +expression: snapshot +--- +Scenario: A remote executor masks its credential before the command output reaches the model. + +## Window 1 +-- request 1 (turn) -- +00:message/developer: + +01:message/developer: + +02:message/user: + +03:message/user: + Print OPENAI_API_KEY from the executor environment. +-- request 2 (turn) -- +04:function_call/exec_command:{"cmd":"printf '%s' \\"$OPENAI_API_KEY\\"","environment_id":"remote","login":false,"yield_time_ms":1000} +05:function_call_output:Chunk ID: + Wall time: seconds + Process exited with code 0 + Original token count: + Output: + diff --git a/codex-rs/core/tests/suite/unified_exec_process_events.rs b/codex-rs/core/tests/suite/unified_exec_process_events.rs index 3ead08bb0f..08e50dfcd3 100644 --- a/codex-rs/core/tests/suite/unified_exec_process_events.rs +++ b/codex-rs/core/tests/suite/unified_exec_process_events.rs @@ -75,6 +75,9 @@ const REPLAY_RETAINED_OUTPUT_SEQ: u64 = 800; #[cfg_attr(windows, allow(dead_code))] enum PushedExecScenario { Complete, + CredentialMasking, + CredentialMaskingUnsupportedShell, + CredentialMaskingUnsupported, OutputAfterExit, OutputAfterRecoveredExit, OutputOpenAtDeadline, @@ -191,6 +194,16 @@ async fn respond_environment_info( | PushedExecScenario::RejectedLongWindowsDangerousCommand ) { json!({ "name": "powershell", "path": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" }) + } else if matches!( + scenario, + PushedExecScenario::CredentialMaskingUnsupportedShell + ) { + json!({ "name": "sh", "path": "/bin/sh" }) + } else if matches!( + scenario, + PushedExecScenario::CredentialMasking | PushedExecScenario::CredentialMaskingUnsupported + ) { + json!({ "name": "bash", "path": "/bin/bash" }) } else { json!({ "name": "zsh", "path": "/bin/zsh" }) }; @@ -200,10 +213,20 @@ async fn respond_environment_info( | PushedExecScenario::RejectedLongWindowsDangerousCommand => Some("windows"), PushedExecScenario::DenyOldLinux | PushedExecScenario::DenyOldLinuxWithRoot(_) - | PushedExecScenario::DenyLinux => Some("linux"), + | PushedExecScenario::DenyLinux + | PushedExecScenario::CredentialMasking + | PushedExecScenario::CredentialMaskingUnsupportedShell + | PushedExecScenario::CredentialMaskingUnsupported => Some("linux"), _ => None, }; let mut capabilities = json!({ "networkProxyLaunch": true }); + if matches!( + scenario, + PushedExecScenario::CredentialMasking + | PushedExecScenario::CredentialMaskingUnsupportedShell + ) { + capabilities["credentialMasking"] = json!(true); + } if matches!( scenario, PushedExecScenario::DenyOldLinuxWithRoot(_) | PushedExecScenario::DenyLinux @@ -542,6 +565,9 @@ async fn serve_exec_with_pushed_events( } } PushedExecScenario::Complete + | PushedExecScenario::CredentialMasking + | PushedExecScenario::CredentialMaskingUnsupportedShell + | PushedExecScenario::CredentialMaskingUnsupported | PushedExecScenario::DenyWin | PushedExecScenario::DenyWinUnchanged | PushedExecScenario::DenyOldLinux @@ -695,6 +721,9 @@ async fn serve_exec_with_pushed_events( panic!("unexpected read after the delayed-output sequence") } PushedExecScenario::Complete + | PushedExecScenario::CredentialMasking + | PushedExecScenario::CredentialMaskingUnsupportedShell + | PushedExecScenario::CredentialMaskingUnsupported | PushedExecScenario::CodexPath | PushedExecScenario::CodexPathDefaultFeature | PushedExecScenario::CodexPathDisabledFeature @@ -829,6 +858,9 @@ async fn serve_exec_with_pushed_events( #[test_case(PushedExecScenario::LegacyExit, ManagedNetworkScenario::None, false ; "legacy_exit_metadata")] #[test_case(PushedExecScenario::ReplayGap, ManagedNetworkScenario::None, false ; "truncated_event_replay")] #[test_case(PushedExecScenario::Complete, ManagedNetworkScenario::Enabled { policy_callbacks: true }, false ; "managed_network_uses_executor_proxy_launch")] +#[test_case(PushedExecScenario::CredentialMasking, ManagedNetworkScenario::Enabled { policy_callbacks: true }, false ; "credential_masking_launches_on_supported_executor")] +#[test_case(PushedExecScenario::CredentialMaskingUnsupported, ManagedNetworkScenario::Enabled { policy_callbacks: true }, false ; "credential_masking_warns_and_runs_unsupported_executor")] +#[test_case(PushedExecScenario::CredentialMaskingUnsupportedShell, ManagedNetworkScenario::Enabled { policy_callbacks: true }, false ; "credential_masking_warns_and_runs_unsupported_shell")] #[test_case(PushedExecScenario::Complete, ManagedNetworkScenario::Enabled { policy_callbacks: false }, false ; "strict_managed_allowlist_omits_policy_callbacks")] #[test_case(PushedExecScenario::Complete, ManagedNetworkScenario::Disabled, false ; "disabled_managed_network_omits_executor_proxy_launch")] #[cfg_attr(not(windows), test_case(PushedExecScenario::Complete, ManagedNetworkScenario::Enabled { policy_callbacks: true }, true ; "foreign_windows_managed_network_preserves_approval_registration"))] @@ -869,6 +901,12 @@ async fn exec_command_consumes_pushed_remote_process_events( let terminate_after_exit = terminate_initial_collection || matches!(scenario, PushedExecScenario::OutputOpenWhenTerminated); let explicit_path = "/user/configured/bin:/user/other/bin"; + let credential_masking = matches!( + scenario, + PushedExecScenario::CredentialMasking + | PushedExecScenario::CredentialMaskingUnsupported + | PushedExecScenario::CredentialMaskingUnsupportedShell + ); let managed_network_configured = !matches!(managed_network, ManagedNetworkScenario::None); let managed_network_enabled = matches!(managed_network, ManagedNetworkScenario::Enabled { .. }); let policy_callbacks = matches!( @@ -917,6 +955,11 @@ async fn exec_command_consumes_pushed_remote_process_events( }) .to_string(), ), + PushedExecScenario::CredentialMasking => ev_function_call( + CALL_ID, + "exec_command", + &json!({ "cmd": "pwd", "login": false, "yield_time_ms": 1_000 }).to_string(), + ), _ => ev_function_call( CALL_ID, "exec_command", @@ -1041,10 +1084,11 @@ enabled = false }; builder = builder .with_cloud_config_bundle(cloud_config_bundle) - .with_pre_build_hook(|home| { + .with_pre_build_hook(move |home| { fs::write( home.join("config.toml"), - r#"default_permissions = "workspace" + format!( + r#"default_permissions = "workspace" [permissions.workspace.filesystem] ":minimal" = "read" @@ -1056,6 +1100,7 @@ allow_local_binding = true [features] hooks = true +credential_masking = {credential_masking} [hooks] @@ -1065,7 +1110,8 @@ hooks = true type = "command" command = "unused" timeout = 900 -"#, +"# + ), ) .expect("write managed-network test config"); }); @@ -1698,6 +1744,18 @@ timeout = 900 assert_eq!(params["managedNetwork"], Value::Null); assert_eq!(params["env"]["HTTP_PROXY"], Value::Null); assert_eq!(params["networkProxy"]["proxy"]["enabled"], true); + assert_eq!( + params["networkProxy"]["proxy"]["credentialMasking"], + if matches!( + scenario, + PushedExecScenario::CredentialMasking + | PushedExecScenario::CredentialMaskingUnsupportedShell + ) { + json!(true) + } else { + Value::Null + } + ); assert_eq!(params["networkProxy"]["proxy"]["mode"], "full"); assert_eq!( params["networkProxy"]["policyDecisionTimeoutMs"].as_u64(), @@ -1712,6 +1770,45 @@ timeout = 900 }) .await .context("model should receive the remote exec output")?; + if matches!( + scenario, + PushedExecScenario::CredentialMaskingUnsupportedShell + | PushedExecScenario::CredentialMaskingUnsupported + ) { + let shell = if matches!( + scenario, + PushedExecScenario::CredentialMaskingUnsupportedShell + ) { + "/bin/sh" + } else { + "/bin/bash" + }; + assert_eq!(params["argv"], json!([shell, "-lc", "pwd"])); + let warning = core_test_support::wait_for_event(&test.codex, |event| { + matches!(event, EventMsg::Warning(warning) if warning.message.starts_with("Credential masking is unavailable")) + }) + .await; + let EventMsg::Warning(warning) = warning else { + unreachable!("waited for a credential masking warning") + }; + if matches!( + scenario, + PushedExecScenario::CredentialMaskingUnsupportedShell + ) { + insta::assert_snapshot!(warning.message, @"Credential masking is unavailable for shell `sh` on environment `remote`. This command will run with unmasked credentials."); + } else { + insta::assert_snapshot!(warning.message, @"Credential masking is unavailable on environment `remote` because its exec-server does not support it. This command will run with unmasked credentials."); + } + let request = response_mock + .last_request() + .context("remote exec response")?; + assert!( + request + .function_call_output_text(CALL_ID) + .context("remote exec output")? + .contains(COMPLETE_OUTPUT) + ); + } return Ok(()); } if matches!(managed_network, ManagedNetworkScenario::Disabled) { @@ -1786,6 +1883,9 @@ timeout = 900 ); } PushedExecScenario::Complete + | PushedExecScenario::CredentialMasking + | PushedExecScenario::CredentialMaskingUnsupportedShell + | PushedExecScenario::CredentialMaskingUnsupported | PushedExecScenario::DenyWin | PushedExecScenario::DenyWinUnchanged | PushedExecScenario::DenyOldLinux diff --git a/codex-rs/exec-server-protocol/src/protocol.rs b/codex-rs/exec-server-protocol/src/protocol.rs index c0bb0966ee..b745e4e7a6 100644 --- a/codex-rs/exec-server-protocol/src/protocol.rs +++ b/codex-rs/exec-server-protocol/src/protocol.rs @@ -13,6 +13,7 @@ use codex_protocol::ThreadId; use codex_protocol::capabilities::SelectedCapabilityRoot; use codex_protocol::config_types::ShellEnvironmentPolicyInherit; use codex_shell_command::shell_detect::DetectedShell; +use codex_shell_command::shell_detect::ShellType; use codex_utils_path_uri::PathUri; use serde::Deserialize; use serde::Serialize; @@ -151,6 +152,9 @@ pub struct EnvironmentCapabilities { /// Whether `exec` accepts instructions for launching an executor-local network proxy. #[serde(default)] pub network_proxy_launch: bool, + /// Whether the selected shell can mask executor environment credentials. + #[serde(default, skip_serializing_if = "std::ops::Not::not")] + pub credential_masking: bool, /// Whether capability discovery applies the filesystem sandbox sent with each root. #[serde(default)] pub capability_discovery_sandbox: bool, @@ -260,8 +264,11 @@ impl EnvironmentInfo { }; let temp_dir = normalize_temp_path(std::env::temp_dir().into_os_string()); + let shell = codex_shell_command::shell_detect::default_user_shell(); + let credential_masking = cfg!(any(target_os = "linux", target_os = "macos")) + && shell.shell_type == ShellType::Bash; Self { - shell: codex_shell_command::shell_detect::default_user_shell().into(), + shell: shell.into(), executor_version: unknown_executor_version(), provider_id: None, cwd: cwd.and_then(|cwd| PathUri::from_host_native_path(cwd).ok()), @@ -278,6 +285,7 @@ impl EnvironmentInfo { temp_dir, capabilities: EnvironmentCapabilities { network_proxy_launch: true, + credential_masking, capability_discovery_sandbox: true, capability_discovery_v2: true, environment_config_read: true, @@ -1499,6 +1507,7 @@ mod tests { capabilities, EnvironmentCapabilities { network_proxy_launch: true, + credential_masking: false, capability_discovery_sandbox: true, capability_discovery_v2: false, environment_config_read: false, diff --git a/codex-rs/exec-server/src/local_process.rs b/codex-rs/exec-server/src/local_process.rs index 271f8aaaf0..f3f174e998 100644 --- a/codex-rs/exec-server/src/local_process.rs +++ b/codex-rs/exec-server/src/local_process.rs @@ -161,6 +161,7 @@ struct Inner { notifications: std::sync::RwLock>, requests: Arc>>, processes: Mutex>, + credential_brokers: codex_network_proxy::RemoteCredentialBrokerCache, #[cfg(unix)] shell_snapshots: crate::shell_snapshot::ShellSnapshotCache, telemetry: ExecServerTelemetry, @@ -220,6 +221,7 @@ impl LocalProcess { notifications: std::sync::RwLock::new(Some(notifications)), requests: Arc::new(std::sync::RwLock::new(Some(requests))), processes: Mutex::new(HashMap::new()), + credential_brokers: codex_network_proxy::RemoteCredentialBrokerCache::default(), #[cfg(unix)] shell_snapshots: crate::shell_snapshot::ShellSnapshotCache::default(), telemetry, @@ -368,6 +370,7 @@ impl LocalProcess { self.runtime_paths.as_ref(), network_policy_decider, network_policy_audit_observer, + &self.inner.credential_brokers, &telemetry, ) .await?; @@ -838,6 +841,7 @@ impl ExecBackend for LocalProcess { self.runtime_paths.as_ref(), /*network_policy_decider*/ None, /*network_policy_audit_observer*/ None, + &self.inner.credential_brokers, &ProcessTelemetry::default(), ) .await @@ -1928,6 +1932,8 @@ mod tests { let state = NetworkProxyState::from_remote_launch_config( RemoteNetworkProxyLaunchConfig::new(proxy_config), codex_utils_path_uri::Platform::native(), + &codex_network_proxy::RemoteCredentialBrokerCache::default(), + &HashMap::new(), ) .expect("build network proxy state"); let proxy = NetworkProxy::builder() diff --git a/codex-rs/exec-server/src/process_sandbox.rs b/codex-rs/exec-server/src/process_sandbox.rs index cb7f061961..74efe6c352 100644 --- a/codex-rs/exec-server/src/process_sandbox.rs +++ b/codex-rs/exec-server/src/process_sandbox.rs @@ -1,5 +1,4 @@ use std::collections::HashMap; -#[cfg(windows)] use std::path::Path; use std::sync::Arc; @@ -7,6 +6,7 @@ use crate::process_telemetry::ProcessTelemetry; use codex_exec_server_protocol::JSONRPCErrorError; use codex_file_system::WindowsSandboxSelection; use codex_network_proxy::CUSTOM_CA_ENV_KEYS; +use codex_network_proxy::CredentialMaskingFailureMode; use codex_network_proxy::ManagedNetworkSandboxContext; use codex_network_proxy::ManagedProxyRouting; use codex_network_proxy::NetworkPolicyAuditObserver; @@ -14,7 +14,7 @@ use codex_network_proxy::NetworkPolicyDecider; use codex_network_proxy::NetworkProxy; use codex_network_proxy::NetworkProxyHandle; use codex_network_proxy::NetworkProxyState; -use codex_network_proxy::RemoteNetworkProxyLaunchConfig; +use codex_network_proxy::RemoteCredentialBrokerCache; use codex_network_proxy::is_managed_mitm_ca_trust_bundle_path; #[cfg(target_os = "windows")] use codex_network_proxy::strip_managed_proxy_env; @@ -46,6 +46,9 @@ use crate::rpc::internal_error; use crate::rpc::invalid_params; use crate::sandbox_selection::select_sandbox; +const CREDENTIAL_MASKING_FAILURE_MODE: CredentialMaskingFailureMode = + CredentialMaskingFailureMode::Warn; + pub(crate) struct PreparedExecRequest { pub(crate) command: Vec, pub(crate) cwd: AbsolutePathBuf, @@ -93,8 +96,10 @@ pub(crate) async fn prepare_exec_request_with_telemetry( runtime_paths: Option<&ExecServerRuntimeOptions>, network_policy_decider: Option>, network_policy_audit_observer: Option, + credential_brokers: &RemoteCredentialBrokerCache, telemetry: &ProcessTelemetry, ) -> Result { + let network_proxy = params.network_proxy.clone(); if let Some(sandbox) = params.sandbox.as_ref() && sandbox.windows_sandbox_selection == WindowsSandboxSelection::Mxc { @@ -120,10 +125,19 @@ pub(crate) async fn prepare_exec_request_with_telemetry( } None } else { - params.network_proxy.as_ref() + network_proxy }; - #[cfg(not(target_os = "windows"))] - let network_proxy = params.network_proxy.as_ref(); + let network_proxy = network_proxy + .map(|launch| { + NetworkProxyState::from_remote_launch_config( + launch, + codex_utils_path_uri::Platform::native(), + credential_brokers, + &env, + ) + }) + .transpose() + .map_err(|err| invalid_params(format!("invalid network proxy config: {err}")))?; let (env, managed_network, network_proxy_handle, network_proxy_restricting_sid) = prepare_managed_network( @@ -348,7 +362,7 @@ pub(crate) async fn prepare_exec_request_with_telemetry( async fn prepare_managed_network( params: &ExecParams, - network_proxy: Option<&RemoteNetworkProxyLaunchConfig>, + network_proxy: Option, proxy_private_ips_via_upstream: bool, env: HashMap, network_policy_decider: Option>, @@ -363,9 +377,18 @@ async fn prepare_managed_network( ), JSONRPCErrorError, > { - let Some(network_proxy) = network_proxy.cloned() else { + let Some(mut state) = network_proxy else { return Ok((env, params.managed_network.clone(), None, None)); }; + let credential_masking = state + .current_cfg() + .await + .map_err(|err| { + internal_error(format!( + "failed to read executor network proxy config: {err}" + )) + })? + .credential_broker; let routing = if params.sandbox.as_ref().is_some_and(|sandbox| { sandbox.windows_sandbox_selection == WindowsSandboxSelection::Mxc @@ -374,11 +397,6 @@ async fn prepare_managed_network( } else { ManagedProxyRouting::SharedIngress }; - let mut state = NetworkProxyState::from_remote_launch_config( - network_proxy, - codex_utils_path_uri::Platform::native(), - ) - .map_err(|err| invalid_params(format!("invalid network proxy config: {err}")))?; state.set_proxy_private_ips_via_upstream(proxy_private_ips_via_upstream); if let Some(observer) = network_policy_audit_observer { state.set_policy_audit_observer(observer); @@ -427,11 +445,34 @@ async fn prepare_managed_network( }; #[cfg(not(target_os = "windows"))] let network_proxy_restricting_sid = None; - let prepared = proxy + let supported_shell = matches!(params.argv.as_slice(), [program, flag, _] + if Path::new(program).file_name().is_some_and(|name| name == "bash") && flag == "-c") + && !["BASH_ENV", "ENV", "SSH_CLIENT", "SSH2_CLIENT"] + .iter() + .any(|key| env.contains_key(*key)); + let mut prepared = proxy .prepare_for_optional_environment(env, /*environment_id*/ None) .map_err(|err| { internal_error(format!("failed to prepare executor network proxy: {err}")) })?; + if credential_masking { + if cfg!(any(target_os = "linux", target_os = "macos")) + && supported_shell + && params.arg0.is_none() + && params.shell_snapshot.is_none() + { + proxy + .handle_unmasked_credentials(&mut prepared.env, CREDENTIAL_MASKING_FAILURE_MODE) + .map_err(|err| invalid_params(err.to_string()))?; + } else { + tracing::warn!( + "Credential masking is unavailable for this shell startup; preserving shell profiles and snapshots and running with unmasked credentials." + ); + // Restore this child's environment without disabling translation of placeholders + // issued to earlier commands in the same environment. + proxy.restore_and_disable_brokered_credentials(&mut prepared.env, &mut []); + } + } Ok(( prepared.env, Some(prepared.sandbox_context), diff --git a/codex-rs/exec-server/src/process_sandbox_tests.rs b/codex-rs/exec-server/src/process_sandbox_tests.rs index ef3c1e0f11..1ec954ae32 100644 --- a/codex-rs/exec-server/src/process_sandbox_tests.rs +++ b/codex-rs/exec-server/src/process_sandbox_tests.rs @@ -29,7 +29,6 @@ use codex_utils_path_uri::PathUri; use pretty_assertions::assert_eq; #[cfg(unix)] use tempfile::tempdir; -#[cfg(windows)] use test_case::test_case; use tokio::io::AsyncReadExt; use tokio::io::AsyncWriteExt; @@ -59,6 +58,7 @@ async fn prepare_exec_request( runtime_paths, network_policy_decider, network_policy_audit_observer, + &codex_network_proxy::RemoteCredentialBrokerCache::default(), &ProcessTelemetry::default(), ) .await @@ -502,8 +502,16 @@ async fn native_request_preserves_native_launch_fields() { assert_eq!(prepared.arg0, params.arg0); } +#[test_case(false, None, &["-c", "true"]; "unmasked")] +#[test_case(true, Some("BASH_ENV"), &["-c", "true"]; "masking_with_startup_hook")] +#[test_case(true, Some("SSH_CLIENT"), &["-c", "true"]; "masking_with_remote_shell_startup")] +#[test_case(true, None, &["-c", "-l", "true"]; "masking_with_extra_login_option")] #[tokio::test] -async fn native_request_handles_remote_proxy_config_for_platform() { +async fn native_request_handles_remote_proxy_config_for_platform( + credential_masking: bool, + startup_env: Option<&str>, + shell_args: &[&str], +) { let cwd: AbsolutePathBuf = std::env::current_dir() .expect("current directory") .try_into() @@ -513,12 +521,16 @@ async fn native_request_handles_remote_proxy_config_for_platform() { ..NetworkProxyConfig::default() }; config.set_allowed_domains(vec!["allowed.example".to_string()]); - let proxy_config = RemoteNetworkProxyConfig::from_effective_config(&config) + let mut proxy_config = RemoteNetworkProxyConfig::from_effective_config(&config) .expect("supported remote proxy config"); + proxy_config.credential_masking = credential_masking; let params = ExecParams { metadata: Default::default(), process_id: ProcessId::from("process-remote-proxy"), - argv: vec!["echo".to_string(), "hello".to_string()], + argv: std::iter::once("/bin/bash") + .chain(shell_args.iter().copied()) + .map(str::to_string) + .collect(), cwd: PathUri::from_abs_path(&cwd), shell_snapshot: None, env_policy: None, @@ -535,22 +547,38 @@ async fn native_request_handles_remote_proxy_config_for_platform() { ), }; let stale_proxy = "http://127.0.0.1:9".to_string(); - let env = HashMap::from([ + let mut env = HashMap::from([ ("HTTP_PROXY".to_string(), stale_proxy.clone()), ("TEST_ENV".to_string(), "value".to_string()), + ("PATH".to_string(), "/devbox/bin:/usr/bin:/bin".to_string()), + ( + "OPENAI_API_KEY".to_string(), + "sk-proj-executor-only-0000000000000000000000000000000000".to_string(), + ), ( PROXY_ATTRIBUTION_TOKEN_ENV_KEY.to_string(), "foreign-token".to_string(), ), ]); + if let Some(key) = startup_env { + env.insert(key.to_string(), "startup-hook".to_string()); + } let prepared = prepare_exec_request( - ¶ms, env, /*runtime_paths*/ None, /*network_policy_decider*/ None, + ¶ms, + env.clone(), + /*runtime_paths*/ None, + /*network_policy_decider*/ None, /*network_policy_audit_observer*/ None, ) .await .expect("prepare request with executor-local proxy"); + assert_eq!(prepared.command, params.argv); + for key in ["PATH", "OPENAI_API_KEY"].into_iter().chain(startup_env) { + assert_eq!(prepared.env.get(key), env.get(key), "{key}"); + } + if cfg!(target_os = "windows") { assert_eq!(prepared.env.get("HTTP_PROXY"), None); assert_eq!(prepared.env.get("TEST_ENV"), Some(&"value".to_string())); @@ -596,13 +624,18 @@ async fn disabled_remote_proxy_config_is_rejected_before_exporting_ports() { .expect("current directory") .try_into() .expect("absolute cwd"); - let proxy_config = + let mut proxy_config = RemoteNetworkProxyConfig::from_effective_config(&NetworkProxyConfig::default()) .expect("serializable disabled proxy config"); + proxy_config.credential_masking = true; let params = ExecParams { metadata: Default::default(), process_id: ProcessId::from("process-disabled-remote-proxy"), - argv: vec!["echo".to_string(), "hello".to_string()], + argv: vec![ + "/bin/bash".to_string(), + "-lc".to_string(), + "true".to_string(), + ], cwd: PathUri::from_abs_path(&cwd), shell_snapshot: None, env_policy: None, diff --git a/codex-rs/exec-server/src/shell_snapshot_tests.rs b/codex-rs/exec-server/src/shell_snapshot_tests.rs index 82a34ff739..66dc90e23e 100644 --- a/codex-rs/exec-server/src/shell_snapshot_tests.rs +++ b/codex-rs/exec-server/src/shell_snapshot_tests.rs @@ -101,6 +101,7 @@ async fn snapshot_failure_retries_are_bounded_and_single_flight( /*runtime_paths*/ None, /*network_policy_decider*/ None, /*network_policy_audit_observer*/ None, + &codex_network_proxy::RemoteCredentialBrokerCache::default(), &ProcessTelemetry::default(), ) .await @@ -111,6 +112,7 @@ async fn snapshot_failure_retries_are_bounded_and_single_flight( /*runtime_paths*/ None, /*network_policy_decider*/ None, /*network_policy_audit_observer*/ None, + &codex_network_proxy::RemoteCredentialBrokerCache::default(), &ProcessTelemetry::default(), ) .await diff --git a/codex-rs/exec-server/tests/chatgpt_cloudflare_affinity.rs b/codex-rs/exec-server/tests/chatgpt_cloudflare_affinity.rs index d754fa8c4b..25291910e1 100644 --- a/codex-rs/exec-server/tests/chatgpt_cloudflare_affinity.rs +++ b/codex-rs/exec-server/tests/chatgpt_cloudflare_affinity.rs @@ -1,19 +1,11 @@ #![cfg(unix)] mod common; +#[path = "common/tls_proxy.rs"] +mod tls_proxy; -use std::collections::BTreeMap; use std::ffi::OsString; use std::fs; -use std::io; -use std::io::Read; -use std::io::Write; -use std::net::TcpListener; -use std::net::TcpStream; -use std::sync::Arc; -use std::sync::mpsc; -use std::thread; -use std::time::Duration; use codex_exec_server::HttpRedirectPolicy; use codex_exec_server::HttpRequestParams; @@ -25,45 +17,14 @@ use codex_exec_server_protocol::RequestId; use common::exec_server::ExecServerHarness; use common::exec_server::exec_server_with_env; use pretty_assertions::assert_eq; -use rcgen::BasicConstraints; -use rcgen::CertificateParams; -use rcgen::CertifiedIssuer; -use rcgen::DistinguishedName; -use rcgen::DnType; -use rcgen::ExtendedKeyUsagePurpose; -use rcgen::IsCa; -use rcgen::KeyPair; -use rcgen::KeyUsagePurpose; -use rcgen::PKCS_ECDSA_P256_SHA256; -use rustls::pki_types::CertificateDer; -use rustls::pki_types::PrivateKeyDer; use serde::de::DeserializeOwned; use serde_json::Value; use tempfile::TempDir; +use tls_proxy::TlsInterceptingProxy; const CHATGPT_MCP_URL: &str = "https://chatgpt.com/backend-api/ps/mcp"; const NON_CHATGPT_MCP_URL: &str = "https://api.openai.com/backend-api/ps/mcp"; -#[derive(Debug)] -struct CapturedRequest { - connect_authority: String, - request_line: String, - headers: BTreeMap>, -} - -struct TlsMaterial { - ca_cert_pem: String, - server_cert: CertificateDer<'static>, - server_key: PrivateKeyDer<'static>, -} - -struct TlsInterceptingProxy { - ca_cert_pem: String, - request_rx: mpsc::Receiver>, - thread: thread::JoinHandle>, - url: String, -} - /// Exercises the same `http/request` route used by remotely executed Streamable HTTP MCP calls. /// Each RPC uses the shared route-aware client. The first response sets `__cflb`, and the second response /// replaces it, proving cross-client persistence through the shared cookie store. @@ -156,188 +117,6 @@ async fn exec_server_replays_only_chatgpt_cloudflare_cookies() -> anyhow::Result Ok(()) } -impl TlsInterceptingProxy { - fn start(expected_requests: usize) -> anyhow::Result { - codex_utils_rustls_provider::ensure_rustls_crypto_provider(); - let material = generate_tls_material()?; - let listener = TcpListener::bind(("127.0.0.1", 0))?; - let address = listener.local_addr()?; - let config = Arc::new( - rustls::ServerConfig::builder_with_protocol_versions(&[&rustls::version::TLS13]) - .with_no_client_auth() - .with_single_cert(vec![material.server_cert], material.server_key)?, - ); - let (request_tx, request_rx) = mpsc::channel(); - let thread = thread::spawn(move || { - run_tls_intercepting_proxy(listener, config, request_tx, expected_requests) - .map_err(|error| error.to_string()) - }); - - Ok(Self { - ca_cert_pem: material.ca_cert_pem, - request_rx, - thread, - url: format!("http://{address}"), - }) - } - - fn next_request(&self) -> anyhow::Result { - self.request_rx - .recv_timeout(Duration::from_secs(5)) - .map_err(anyhow::Error::from)? - .map_err(anyhow::Error::msg) - } - - fn finish(self) -> anyhow::Result<()> { - self.thread - .join() - .map_err(|_| anyhow::anyhow!("TLS proxy thread panicked"))? - .map_err(anyhow::Error::msg) - } -} - -fn generate_tls_material() -> anyhow::Result { - let mut ca_params = CertificateParams::default(); - ca_params.is_ca = IsCa::Ca(BasicConstraints::Unconstrained); - ca_params.key_usages = vec![KeyUsagePurpose::KeyCertSign, KeyUsagePurpose::CrlSign]; - let mut ca_distinguished_name = DistinguishedName::new(); - ca_distinguished_name.push(DnType::CommonName, "Codex affinity test CA"); - ca_params.distinguished_name = ca_distinguished_name; - let ca_key_pair = KeyPair::generate_for(&PKCS_ECDSA_P256_SHA256)?; - let ca = CertifiedIssuer::self_signed(ca_params, ca_key_pair)?; - - let mut server_params = CertificateParams::new(vec![ - "chatgpt.com".to_string(), - "api.openai.com".to_string(), - ])?; - server_params.extended_key_usages = vec![ExtendedKeyUsagePurpose::ServerAuth]; - server_params.key_usages = vec![ - KeyUsagePurpose::DigitalSignature, - KeyUsagePurpose::KeyEncipherment, - ]; - let server_key_pair = KeyPair::generate_for(&PKCS_ECDSA_P256_SHA256)?; - let server_cert = server_params.signed_by(&server_key_pair, &ca)?; - - Ok(TlsMaterial { - ca_cert_pem: ca.pem(), - server_cert: server_cert.der().clone(), - server_key: PrivateKeyDer::from(server_key_pair), - }) -} - -fn run_tls_intercepting_proxy( - listener: TcpListener, - config: Arc, - request_tx: mpsc::Sender>, - expected_requests: usize, -) -> io::Result<()> { - for request_index in 0..expected_requests { - let (mut stream, _) = listener.accept()?; - configure_stream(&stream)?; - let connect_head = read_http_head(&mut stream)?; - let connect_authority = connect_head - .lines() - .next() - .and_then(|line| line.split_whitespace().nth(1)) - .ok_or_else(|| io::Error::other("CONNECT request line should include an authority"))? - .to_string(); - stream.write_all(b"HTTP/1.1 200 Connection Established\r\n\r\n")?; - stream.flush()?; - - let connection = - rustls::ServerConnection::new(Arc::clone(&config)).map_err(io::Error::other)?; - let mut tls = rustls::StreamOwned::new(connection, stream); - let request = capture_http_request(&mut tls, connect_authority); - match request { - Ok(request) => request_tx - .send(Ok(request)) - .map_err(|_| io::Error::other("request receiver was dropped"))?, - Err(error) => { - let message = error.to_string(); - let _ = request_tx.send(Err(message)); - return Err(error); - } - } - - let response = match request_index { - 0 => concat!( - "HTTP/1.1 200 OK\r\n", - "content-length: 2\r\n", - "connection: close\r\n", - "set-cookie: __cflb=west; Path=/; Secure; HttpOnly\r\n", - "set-cookie: chatgpt_session=secret; Path=/; Secure; HttpOnly\r\n", - "\r\n", - "ok", - ), - 1 => concat!( - "HTTP/1.1 200 OK\r\n", - "content-length: 2\r\n", - "connection: close\r\n", - "set-cookie: __cflb=central; Path=/; Secure; HttpOnly\r\n", - "set-cookie: chatgpt_session=still-secret; Path=/; Secure; HttpOnly\r\n", - "\r\n", - "ok", - ), - _ => concat!( - "HTTP/1.1 200 OK\r\n", - "content-length: 2\r\n", - "connection: close\r\n", - "\r\n", - "ok", - ), - }; - tls.write_all(response.as_bytes())?; - tls.flush()?; - } - Ok(()) -} - -fn configure_stream(stream: &TcpStream) -> io::Result<()> { - stream.set_read_timeout(Some(Duration::from_secs(5)))?; - stream.set_write_timeout(Some(Duration::from_secs(5))) -} - -fn capture_http_request( - stream: &mut impl Read, - connect_authority: String, -) -> io::Result { - let request_head = read_http_head(stream)?; - let mut lines = request_head.lines(); - let request_line = lines - .next() - .ok_or_else(|| io::Error::other("HTTP request should include a request line"))? - .to_string(); - let mut headers: BTreeMap> = BTreeMap::new(); - for line in lines.filter(|line| !line.is_empty()) { - let (name, value) = line - .split_once(':') - .ok_or_else(|| io::Error::other(format!("invalid HTTP header: {line}")))?; - headers - .entry(name.to_ascii_lowercase()) - .or_default() - .push(value.trim().to_string()); - } - Ok(CapturedRequest { - connect_authority, - request_line, - headers, - }) -} - -fn read_http_head(stream: &mut impl Read) -> io::Result { - const MAX_HEADER_BYTES: usize = 64 * 1024; - let mut bytes = Vec::new(); - while !bytes.ends_with(b"\r\n\r\n") { - if bytes.len() == MAX_HEADER_BYTES { - return Err(io::Error::other("HTTP headers exceeded test limit")); - } - let mut byte = [0]; - stream.read_exact(&mut byte)?; - bytes.push(byte[0]); - } - String::from_utf8(bytes).map_err(io::Error::other) -} - async fn initialize_exec_server(server: &mut ExecServerHarness) -> anyhow::Result<()> { let initialize_id = server .send_request( diff --git a/codex-rs/exec-server/tests/common/tls_proxy.rs b/codex-rs/exec-server/tests/common/tls_proxy.rs new file mode 100644 index 0000000000..9ab5adbaec --- /dev/null +++ b/codex-rs/exec-server/tests/common/tls_proxy.rs @@ -0,0 +1,227 @@ +//! Local TLS CONNECT proxy shared by executor integration tests. + +use std::collections::BTreeMap; +use std::io; +use std::io::Read; +use std::io::Write; +use std::net::TcpListener; +use std::net::TcpStream; +use std::sync::Arc; +use std::sync::mpsc; +use std::thread; +use std::time::Duration; + +use rcgen::BasicConstraints; +use rcgen::CertificateParams; +use rcgen::CertifiedIssuer; +use rcgen::DistinguishedName; +use rcgen::DnType; +use rcgen::ExtendedKeyUsagePurpose; +use rcgen::IsCa; +use rcgen::KeyPair; +use rcgen::KeyUsagePurpose; +use rcgen::PKCS_ECDSA_P256_SHA256; +use rustls::pki_types::CertificateDer; +use rustls::pki_types::PrivateKeyDer; + +#[derive(Debug)] +pub(crate) struct CapturedRequest { + pub(crate) connect_authority: String, + pub(crate) request_line: String, + pub(crate) headers: BTreeMap>, +} + +struct TlsMaterial { + ca_cert_pem: String, + server_cert: CertificateDer<'static>, + server_key: PrivateKeyDer<'static>, +} + +pub(crate) struct TlsInterceptingProxy { + pub(crate) ca_cert_pem: String, + request_rx: mpsc::Receiver>, + thread: thread::JoinHandle>, + pub(crate) url: String, +} + +impl TlsInterceptingProxy { + pub(crate) fn start(expected_requests: usize) -> anyhow::Result { + codex_utils_rustls_provider::ensure_rustls_crypto_provider(); + let material = generate_tls_material()?; + let listener = TcpListener::bind(("127.0.0.1", 0))?; + let address = listener.local_addr()?; + let config = Arc::new( + rustls::ServerConfig::builder_with_protocol_versions(&[&rustls::version::TLS13]) + .with_no_client_auth() + .with_single_cert(vec![material.server_cert], material.server_key)?, + ); + let (request_tx, request_rx) = mpsc::channel(); + let thread = thread::spawn(move || { + run_tls_intercepting_proxy(listener, config, request_tx, expected_requests) + .map_err(|error| error.to_string()) + }); + + Ok(Self { + ca_cert_pem: material.ca_cert_pem, + request_rx, + thread, + url: format!("http://{address}"), + }) + } + + pub(crate) fn next_request(&self) -> anyhow::Result { + self.request_rx + .recv_timeout(Duration::from_secs(5)) + .map_err(anyhow::Error::from)? + .map_err(anyhow::Error::msg) + } + + pub(crate) fn finish(self) -> anyhow::Result<()> { + self.thread + .join() + .map_err(|_| anyhow::anyhow!("TLS proxy thread panicked"))? + .map_err(anyhow::Error::msg) + } +} + +fn generate_tls_material() -> anyhow::Result { + let mut ca_params = CertificateParams::default(); + ca_params.is_ca = IsCa::Ca(BasicConstraints::Unconstrained); + ca_params.key_usages = vec![KeyUsagePurpose::KeyCertSign, KeyUsagePurpose::CrlSign]; + let mut ca_distinguished_name = DistinguishedName::new(); + ca_distinguished_name.push(DnType::CommonName, "Codex affinity test CA"); + ca_params.distinguished_name = ca_distinguished_name; + let ca_key_pair = KeyPair::generate_for(&PKCS_ECDSA_P256_SHA256)?; + let ca = CertifiedIssuer::self_signed(ca_params, ca_key_pair)?; + + let mut server_params = CertificateParams::new(vec![ + "chatgpt.com".to_string(), + "api.openai.com".to_string(), + ])?; + server_params.extended_key_usages = vec![ExtendedKeyUsagePurpose::ServerAuth]; + server_params.key_usages = vec![ + KeyUsagePurpose::DigitalSignature, + KeyUsagePurpose::KeyEncipherment, + ]; + let server_key_pair = KeyPair::generate_for(&PKCS_ECDSA_P256_SHA256)?; + let server_cert = server_params.signed_by(&server_key_pair, &ca)?; + + Ok(TlsMaterial { + ca_cert_pem: ca.pem(), + server_cert: server_cert.der().clone(), + server_key: PrivateKeyDer::from(server_key_pair), + }) +} + +fn run_tls_intercepting_proxy( + listener: TcpListener, + config: Arc, + request_tx: mpsc::Sender>, + expected_requests: usize, +) -> io::Result<()> { + for request_index in 0..expected_requests { + let (mut stream, _) = listener.accept()?; + configure_stream(&stream)?; + let connect_head = read_http_head(&mut stream)?; + let connect_authority = connect_head + .lines() + .next() + .and_then(|line| line.split_whitespace().nth(1)) + .ok_or_else(|| io::Error::other("CONNECT request line should include an authority"))? + .to_string(); + stream.write_all(b"HTTP/1.1 200 Connection Established\r\n\r\n")?; + stream.flush()?; + + let connection = + rustls::ServerConnection::new(Arc::clone(&config)).map_err(io::Error::other)?; + let mut tls = rustls::StreamOwned::new(connection, stream); + let request = capture_http_request(&mut tls, connect_authority); + match request { + Ok(request) => request_tx + .send(Ok(request)) + .map_err(|_| io::Error::other("request receiver was dropped"))?, + Err(error) => { + let message = error.to_string(); + let _ = request_tx.send(Err(message)); + return Err(error); + } + } + + let response = match request_index { + 0 => concat!( + "HTTP/1.1 200 OK\r\n", + "content-length: 2\r\n", + "connection: close\r\n", + "set-cookie: __cflb=west; Path=/; Secure; HttpOnly\r\n", + "set-cookie: chatgpt_session=secret; Path=/; Secure; HttpOnly\r\n", + "\r\n", + "ok", + ), + 1 => concat!( + "HTTP/1.1 200 OK\r\n", + "content-length: 2\r\n", + "connection: close\r\n", + "set-cookie: __cflb=central; Path=/; Secure; HttpOnly\r\n", + "set-cookie: chatgpt_session=still-secret; Path=/; Secure; HttpOnly\r\n", + "\r\n", + "ok", + ), + _ => concat!( + "HTTP/1.1 200 OK\r\n", + "content-length: 2\r\n", + "connection: close\r\n", + "\r\n", + "ok", + ), + }; + tls.write_all(response.as_bytes())?; + tls.flush()?; + } + Ok(()) +} + +fn configure_stream(stream: &TcpStream) -> io::Result<()> { + stream.set_read_timeout(Some(Duration::from_secs(5)))?; + stream.set_write_timeout(Some(Duration::from_secs(5))) +} + +fn capture_http_request( + stream: &mut impl Read, + connect_authority: String, +) -> io::Result { + let request_head = read_http_head(stream)?; + let mut lines = request_head.lines(); + let request_line = lines + .next() + .ok_or_else(|| io::Error::other("HTTP request should include a request line"))? + .to_string(); + let mut headers: BTreeMap> = BTreeMap::new(); + for line in lines.filter(|line| !line.is_empty()) { + let (name, value) = line + .split_once(':') + .ok_or_else(|| io::Error::other(format!("invalid HTTP header: {line}")))?; + headers + .entry(name.to_ascii_lowercase()) + .or_default() + .push(value.trim().to_string()); + } + Ok(CapturedRequest { + connect_authority, + request_line, + headers, + }) +} + +fn read_http_head(stream: &mut impl Read) -> io::Result { + const MAX_HEADER_BYTES: usize = 64 * 1024; + let mut bytes = Vec::new(); + while !bytes.ends_with(b"\r\n\r\n") { + if bytes.len() == MAX_HEADER_BYTES { + return Err(io::Error::other("HTTP headers exceeded test limit")); + } + let mut byte = [0]; + stream.read_exact(&mut byte)?; + bytes.push(byte[0]); + } + String::from_utf8(bytes).map_err(io::Error::other) +} diff --git a/codex-rs/exec-server/tests/exec_process.rs b/codex-rs/exec-server/tests/exec_process.rs index 956873ee56..3c74a7e176 100644 --- a/codex-rs/exec-server/tests/exec_process.rs +++ b/codex-rs/exec-server/tests/exec_process.rs @@ -2,6 +2,9 @@ mod common; #[cfg(unix)] #[path = "exec_process/shell_snapshot.rs"] mod shell_snapshot; +#[cfg(unix)] +#[path = "common/tls_proxy.rs"] +mod tls_proxy; #[path = "exec_process/windows_sandbox.rs"] mod windows_sandbox; @@ -492,19 +495,87 @@ async fn exec_metadata_overrides_policy_and_cached_snapshot( } #[cfg(unix)] +#[test_case(false, "bash", &["-lc", "-lc"]; "unmasked")] +#[cfg_attr(any(target_os = "linux", target_os = "macos"), test_case(true, "bash", &["-c", "-c", "-lc"]; "masked_bash"))] +#[cfg_attr(any(target_os = "linux", target_os = "macos"), test_case(true, "bash", &["-lc", "-lc"]; "bash_profile_fallback"))] +#[cfg_attr(target_os = "macos", test_case(true, "zsh", &["-lc", "-lc"]; "zsh_profile_gateway_fallback"))] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] #[serial_test::serial(remote_exec_server)] -async fn shell_snapshot_v2_remote_managed_proxy_uses_prepared_execution_context() -> Result<()> { - let context = create_process_context(/*use_remote*/ true).await?; +async fn shell_snapshot_v2_remote_managed_proxy_uses_prepared_execution_context( + credential_masking: bool, + shell_name: &str, + shell_args: &[&str], +) -> Result<()> { + const API_KEY: &str = "sk-proj-executor-only-0000000000000000000000000000000000"; + let shell_path = format!("/bin/{shell_name}"); + let api_host = if shell_name == "zsh" { + "chatgpt.com" + } else { + "api.openai.com" + }; let home = TempDir::new()?; + if credential_masking + && let Some(warning) = codex_sandboxing::system_bwrap_warning( + &PermissionProfile::workspace_write(), + home.path(), + ) + { + eprintln!("skipping sandbox test: {warning}"); + return Ok(()); + } + let upstream = credential_masking + .then(|| tls_proxy::TlsInterceptingProxy::start(shell_args.len())) + .transpose()?; + let mut executor_env = vec![("OPENAI_API_KEY", API_KEY.to_string())]; + if let Some(upstream) = &upstream { + let ca_path = home.path().join("upstream-ca.pem"); + std::fs::write(&ca_path, &upstream.ca_cert_pem)?; + executor_env.extend([ + ("AUTH_ALIAS", format!("Bearer {API_KEY}")), + ("OPENAI_BASE_URL", "https://api.openai.com/v1".to_string()), + ("GH_HOST", String::new()), + ( + "GH_ENTERPRISE_TOKEN", + "executor-unbound-enterprise-token".to_string(), + ), + ( + "CODEX_CA_CERTIFICATE", + ca_path.to_string_lossy().into_owned(), + ), + ("CURL_CA_BUNDLE", ca_path.to_string_lossy().into_owned()), + ("HTTPS_PROXY", upstream.url.clone()), + ("https_proxy", upstream.url.clone()), + ("ALL_PROXY", upstream.url.clone()), + ("all_proxy", upstream.url.clone()), + ("NO_PROXY", String::new()), + ("no_proxy", String::new()), + ]); + } + let mut server = common::exec_server::exec_server_with_env(executor_env, &[]).await?; + let environment = Environment::create_for_tests(Some(server.websocket_url().to_string()))?; + let backend = environment.get_exec_backend(); let cwd = PathUri::from_host_native_path(home.path())?; - std::fs::write( - home.path().join(".bashrc"), - "printf '%s\\n' \"$HTTP_PROXY\" >> \"$HOME/captures\"\ntest \"$CODEX_NETWORK_PROXY_ACTIVE\" = 1 || exit 41\nexport PROFILE_ALLOWED=profile\nprofile_helper() { printf helper; }\n", + let profile_bin = home.path().join("profile-bin"); + std::fs::create_dir(&profile_bin)?; + codex_utils_cargo_bin::write_executable( + &profile_bin.join("profile_command"), + "#!/bin/sh\nprintf helper\n", )?; - let policy = ExecEnvPolicy { + let profile = "printf '%s\\n' \"$HTTP_PROXY\" >> \"$HOME/captures\"\ntest \"$CODEX_NETWORK_PROXY_ACTIVE\" = 1 || exit 41\nexport PROFILE_ALLOWED=profile\nprofile_helper() { profile_command; }\n"; + std::fs::write(home.path().join(".bashrc"), profile)?; + std::fs::write( + home.path().join(".bash_profile"), + "export PATH=\"$HOME/profile-bin:$PATH\"\n", + )?; + std::fs::write( + home.path().join(".zshenv"), + format!( + "export PATH=\"$HOME/profile-bin:$PATH\"\nexport OPENAI_BASE_URL=https://{api_host}/v1\n{profile}" + ), + )?; + let mut policy = ExecEnvPolicy { inherit: ShellEnvironmentPolicyInherit::All, - ignore_default_excludes: false, + ignore_default_excludes: true, exclude: Vec::new(), r#set: HashMap::from([( "HOME".to_string(), @@ -514,39 +585,77 @@ async fn shell_snapshot_v2_remote_managed_proxy_uses_prepared_execution_context( "HOME".to_string(), "PATH".to_string(), "PROFILE_*".to_string(), + "OPENAI_API_KEY".to_string(), ], }; - let proxy_config = RemoteNetworkProxyConfig::from_effective_config(&NetworkProxyConfig { + if credential_masking { + policy.include_only.extend( + [ + "AUTH_ALIAS", + "GH_HOST", + "GH_ENTERPRISE_TOKEN", + "CURL_CA_BUNDLE", + ] + .map(str::to_string), + ); + } + let mut proxy_settings = NetworkProxyConfig { enabled: true, ..NetworkProxyConfig::default() - })?; + }; + proxy_settings.set_allowed_domains(vec![api_host.to_string()]); + let mut proxy_config = RemoteNetworkProxyConfig::from_effective_config(&proxy_settings)?; + proxy_config.credential_masking = credential_masking; let mut proxy_addresses = Vec::new(); + let mut saved_api_key = None; - for attempt in 0..2 { - let started = context - .backend + for (attempt, &shell_args) in shell_args.iter().enumerate() { + let use_snapshot = shell_name == "bash" && shell_args == "-lc"; + let expect_masking = credential_masking && shell_name == "bash" && !use_snapshot; + let expect_profile = use_snapshot || shell_name == "zsh"; + let command = if expect_profile { + "profile_helper; printf '|%s|%s|%s' \"$PROFILE_ALLOWED\" \"$CODEX_NETWORK_PROXY_ACTIVE\" \"$HTTP_PROXY\"" + } else { + "printf 'masked|%s|%s' \"$CODEX_NETWORK_PROXY_ACTIVE\" \"$HTTP_PROXY\"" + }; + let command = if credential_masking { + format!( + "{command}; test \"$GH_ENTERPRISE_TOKEN\" = executor-unbound-enterprise-token || exit 45; test \"$AUTH_ALIAS\" = \"Bearer $OPENAI_API_KEY\" || exit 42; printf '|%s' \"$OPENAI_API_KEY\"; curl --silent --show-error --fail --max-time 5 --noproxy '' --config \"$HOME/curl.conf\" \"${{OPENAI_BASE_URL:-https://api.openai.com/v1}}/models\" >/dev/null" + ) + } else { + format!("{command}; test \"$OPENAI_API_KEY\" = '{API_KEY}' || exit 46") + }; + let command = if credential_masking && attempt == 0 { + format!( + "printf 'header = \"Authorization: %s\"\\n' \"$AUTH_ALIAS\" > \"$HOME/curl.conf\" || exit 44; {command}" + ) + } else { + command + }; + let started = backend .start(ExecParams { metadata: Default::default(), process_id: ProcessId::from(format!("managed-snapshot-{attempt}")), - argv: vec![ - "/bin/bash".to_string(), - "-lc".to_string(), - "profile_helper; printf '|%s|%s|%s' \"$PROFILE_ALLOWED\" \"$CODEX_NETWORK_PROXY_ACTIVE\" \"$HTTP_PROXY\"".to_string(), - ], + argv: vec![shell_path.clone(), shell_args.to_string(), command], cwd: cwd.clone(), env_policy: Some(policy.clone()), - shell_snapshot: Some(ShellSnapshotRequest { + shell_snapshot: use_snapshot.then(|| ShellSnapshotRequest { scope_id: "managed-attachment".to_string(), shell: ShellInfo { - name: "bash".to_string(), - path: "/bin/bash".to_string(), + name: shell_name.to_string(), + path: shell_path.clone(), }, }), env: HashMap::new(), tty: false, pipe_stdin: false, arg0: None, - sandbox: None, + sandbox: credential_masking.then(|| { + FileSystemSandboxContext::from_permission_profile( + PermissionProfile::workspace_write(), + cwd.clone(), + ) + }), enforce_managed_network: true, managed_network: None, network_proxy: Some( @@ -559,18 +668,72 @@ async fn shell_snapshot_v2_remote_managed_proxy_uses_prepared_execution_context( .await?; let (stdout, stderr, status, closed) = collect_process_output_from_events(started.process).await?; - let proxy_address = stdout - .strip_prefix("helper|profile|1|") - .context("snapshot should restore profile functions and live proxy state")?; - assert!(proxy_address.starts_with("http://127.0.0.1:")); assert_eq!((stderr, status, closed), (String::new(), Some(0), true)); + let prefix = if expect_profile { + "helper|profile|1|" + } else { + "masked|1|" + }; + let proxy_state = stdout + .strip_prefix(prefix) + .context("command should preserve live proxy state")?; + let proxy_address = if let Some(upstream) = &upstream { + let (proxy_address, child_api_key) = proxy_state + .split_once('|') + .context("command should expose the child API key")?; + if expect_masking { + assert!(child_api_key.starts_with("sk-proj-")); + assert_ne!(child_api_key, API_KEY); + assert!(!stdout.contains(API_KEY)); + } else { + assert_eq!(child_api_key, API_KEY); + } + let saved_api_key = saved_api_key.get_or_insert_with(|| child_api_key.to_string()); + assert_eq!( + std::fs::read_to_string(home.path().join("curl.conf"))?, + format!("header = \"Authorization: Bearer {saved_api_key}\"\n") + ); + let request = upstream.next_request()?; + assert_eq!( + ( + request.connect_authority.as_str(), + request.request_line.as_str(), + request.headers.get("authorization"), + ), + ( + format!("{api_host}:443").as_str(), + "GET /v1/models HTTP/1.1", + Some(&vec![format!("Bearer {API_KEY}")]), + ) + ); + proxy_address + } else { + proxy_state + }; + assert!(proxy_address.starts_with("http://127.0.0.1:")); proxy_addresses.push(proxy_address.to_string()); } - assert_eq!( - std::fs::read_to_string(home.path().join("captures"))?, - format!("{}\n", proxy_addresses[0]) - ); + let expected_captures = if shell_name == "zsh" { + Some(format!("{}\n", proxy_addresses.join("\n"))) + } else { + shell_args + .iter() + .position(|flag| *flag == "-lc") + .map(|attempt| format!("{}\n", proxy_addresses[attempt])) + }; + if let Some(expected_captures) = expected_captures { + assert_eq!( + std::fs::read_to_string(home.path().join("captures"))?, + expected_captures + ); + } else { + assert!(!home.path().join("captures").exists()); + } + if let Some(upstream) = upstream { + upstream.finish()?; + } + server.shutdown().await?; Ok(()) } diff --git a/codex-rs/network-proxy/src/credential_broker.rs b/codex-rs/network-proxy/src/credential_broker.rs index 57805c446d..7e8c019921 100644 --- a/codex-rs/network-proxy/src/credential_broker.rs +++ b/codex-rs/network-proxy/src/credential_broker.rs @@ -45,6 +45,17 @@ pub(crate) const BROKERED_CREDENTIALS_ENV_KEY: &str = "CODEX_NETWORK_PROXY_BROKE const MIN_EMBEDDED_CREDENTIAL_LENGTH: usize = 16; const BROKERED_CREDENTIAL_ALIAS_MARKER_PREFIX: &str = "@alias:"; +/// How to handle recognized credentials left raw in a prepared command environment. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum CredentialMaskingFailureMode { + /// Warn and keep the unmasked values. + Warn, + /// Remove variables containing unmasked values, including copied aliases. + Deny, + /// Reject the command environment. + Error, +} + #[derive(Clone)] pub(crate) struct CredentialBroker { state: Arc>, @@ -1120,6 +1131,59 @@ impl CredentialBroker { matching::virtualize_text(&state, text, env) } + pub(crate) fn handle_unmasked_credentials( + &self, + env: &mut HashMap, + mode: CredentialMaskingFailureMode, + ) -> anyhow::Result<()> { + let state = self.read_state(); + anyhow::ensure!( + state.enabled, + "credential masking requires an enabled credential broker" + ); + let mut unmasked_keys = Vec::new(); + for (key, value) in env.iter() { + let value = value.trim(); + let known = matching::known_credential_matches(&state, value, env); + let contains_real_credential = known + .iter() + .any(|matched| matched.value == matched.real_value); + let remainder = matching::mask_known_credentials(value, &known); + let mut masked = remainder.clone(); + if contains_real_credential + || !matching::virtualize_text(&state, &mut masked, env) + || masked != remainder + { + unmasked_keys.push(key.clone()); + } + } + drop(state); + if unmasked_keys.is_empty() { + return Ok(()); + } + match mode { + CredentialMaskingFailureMode::Warn => { + tracing::warn!( + "Credential masking could not protect some environment credentials; continuing with those values unmasked." + ); + } + CredentialMaskingFailureMode::Deny => { + for key in unmasked_keys { + env.remove(&key); + } + tracing::warn!( + "Credential masking could not protect some environment credentials; removed those variables before execution." + ); + } + CredentialMaskingFailureMode::Error => { + anyhow::bail!( + "credential masking left an unmasked credential in the command environment" + ); + } + } + Ok(()) + } + pub(crate) fn restore_text(&self, text: &mut String) -> bool { let state = self.read_state(); if !state.enabled { diff --git a/codex-rs/network-proxy/src/credential_broker_tests.rs b/codex-rs/network-proxy/src/credential_broker_tests.rs index 43b62632fe..fc7c356725 100644 --- a/codex-rs/network-proxy/src/credential_broker_tests.rs +++ b/codex-rs/network-proxy/src/credential_broker_tests.rs @@ -46,6 +46,62 @@ fn assert_credential_shape(real_value: &str, dummy_value: &str, prefix: &str) { assert!(same_shape); } +#[test] +fn unmasked_credentials_follow_the_selected_failure_mode() { + for (enabled, source, base_url, expected) in [ + (true, "GH_TOKEN", None, true), + (true, "GH_ENTERPRISE_TOKEN", None, false), + ( + true, + "OPENAI_API_KEY", + Some("https://localhost:1234/v1"), + false, + ), + (false, "GH_TOKEN", None, false), + ] { + let broker = CredentialBroker::new(enabled); + broker.configure(&NetworkProxyConfig { + credential_broker: enabled, + allow_local_binding: Some(true), + ..NetworkProxyConfig::default() + }); + let mut env = env_map([ + (source, "opaque-executor-credential"), + ("AUTH_HEADER", "Bearer opaque-executor-credential"), + ]); + if let Some(base_url) = base_url { + env.insert("OPENAI_BASE_URL".to_string(), base_url.to_string()); + } + broker.virtualize_child_env(&mut env); + for alias_only in [false, true] { + let mut input = env.clone(); + if alias_only { + input.remove(source); + } + for mode in [ + CredentialMaskingFailureMode::Warn, + CredentialMaskingFailureMode::Deny, + CredentialMaskingFailureMode::Error, + ] { + let mut output = input.clone(); + assert_eq!( + broker + .handle_unmasked_credentials(&mut output, mode) + .is_ok(), + enabled && (expected || mode != CredentialMaskingFailureMode::Error), + "{source} {mode:?} (alias_only={alias_only})" + ); + let mut expected_env = input.clone(); + if enabled && !expected && mode == CredentialMaskingFailureMode::Deny { + expected_env.remove(source); + expected_env.remove("AUTH_HEADER"); + } + assert_eq!(output, expected_env); + } + } + } +} + #[test] fn virtualize_child_env_replaces_supported_credentials() { let broker = CredentialBroker::new(/*enabled*/ true); diff --git a/codex-rs/network-proxy/src/lib.rs b/codex-rs/network-proxy/src/lib.rs index 451d956da3..eeec200cf0 100644 --- a/codex-rs/network-proxy/src/lib.rs +++ b/codex-rs/network-proxy/src/lib.rs @@ -54,6 +54,7 @@ pub use credential_broker::CREDENTIAL_BROKER_ACTIVE_ENV_KEY; pub use credential_broker::CredentialAuthMethod; pub use credential_broker::CredentialBrokerContext; pub use credential_broker::CredentialBrokerEnvironment; +pub use credential_broker::CredentialMaskingFailureMode; pub use credential_broker::CredentialProviderConfig; pub use credential_broker::brokered_credential_binding_env_keys; pub use credential_broker::brokered_credential_dummy_env_keys; @@ -105,6 +106,7 @@ pub use proxy::has_proxy_url_env_vars; pub use proxy::is_managed_proxy_env_var; pub use proxy::proxy_url_env_value; pub use proxy::strip_managed_proxy_env; +pub use remote_config::RemoteCredentialBrokerCache; pub use remote_config::RemoteNetworkProxyConfig; pub use remote_config::RemoteNetworkProxyLaunchConfig; pub use request_cancellation::NetworkRequestCancellation; diff --git a/codex-rs/network-proxy/src/proxy.rs b/codex-rs/network-proxy/src/proxy.rs index a862bac6d9..ac69847ae4 100644 --- a/codex-rs/network-proxy/src/proxy.rs +++ b/codex-rs/network-proxy/src/proxy.rs @@ -933,13 +933,27 @@ impl NetworkProxy { } /// Captures the static inputs needed to launch a matching executor-local proxy. + /// Credential masking requires an explicit caller opt-in and a capable executor. pub async fn remote_launch_config( &self, local_binding_policy: crate::LocalBindingPolicy, + credential_masking: bool, ) -> Result { let (mut config, brokerage_created_default_allowlist, _) = self.state.current_cfg_with_brokerage_provenance().await?; - // Proxy enablement and credential brokerage remain controller-owned. + // Configured providers are not transported yet, so these commands run unmasked. + let credential_masking = credential_masking + && config.enabled + && config.credential_broker + && config.credential_providers.is_empty(); + anyhow::ensure!( + !credential_masking + || (!config.dangerously_allow_plaintext_credential_injection + && config.mitm_hooks.is_empty() + && config.mitm_ca.is_none()), + "executor credential masking does not support plaintext injection, MITM hooks, or external CAs" + ); + // Legacy controller-only brokerage must not enable a remote proxy by itself. let mut broker_only_config = config::NetworkProxyConfig { enabled: config.enabled, allow_local_binding: config.allow_local_binding.filter(|binding| !binding), @@ -973,7 +987,7 @@ impl NetworkProxy { .as_ref() .and_then(|scope| scope.environment_policy.as_ref()); if config.credential_broker { - config.enabled &= !broker_only; + config.enabled &= !broker_only || credential_masking; config.credential_broker = false; config.dangerously_allow_plaintext_credential_injection = false; if config.mitm && config.mitm_hooks.is_empty() && config.mitm_ca.is_none() { @@ -994,7 +1008,8 @@ impl NetworkProxy { || config.allow_local_binding(), "MXC cannot enforce allow_local_binding=false: native host-loopback access is bidirectional; use true or a different sandbox backend" ); - let proxy = crate::RemoteNetworkProxyConfig::from_effective_config(&config)?; + let mut proxy = crate::RemoteNetworkProxyConfig::from_effective_config(&config)?; + proxy.credential_masking = credential_masking; tracing::debug!(network_config = ?proxy, "resolved remote execution network configuration"); let (environment_id, execution_id) = self .execution_scope @@ -1149,11 +1164,13 @@ impl NetworkProxy { runtime_settings.allow_local_binding, runtime_settings.mitm_ca_trust_bundle.as_ref(), ); - let credential_environment_id = environment_id.or_else(|| { - self.execution_scope - .as_ref() - .map(|scope| scope.environment_id.as_str()) - }); + let credential_environment_id = environment_id + .or_else(|| { + self.execution_scope + .as_ref() + .map(|scope| scope.environment_id.as_str()) + }) + .or(self.state.environment_id()); self.state .virtualize_child_credentials_for_environment(&mut env, credential_environment_id); if let Some(execution_scope) = self.execution_scope.as_ref() { @@ -1288,6 +1305,15 @@ impl NetworkProxy { self.state.virtualize_brokered_text(text, env) } + /// Applies the selected failure mode to recognized credentials left unmasked after preparation. + pub fn handle_unmasked_credentials( + &self, + env: &mut HashMap, + mode: crate::CredentialMaskingFailureMode, + ) -> anyhow::Result<()> { + self.state.handle_unmasked_credentials(env, mode) + } + /// Returns trusted provider metadata and active bindings for a child environment. pub fn credential_broker_environment( &self, @@ -1918,7 +1944,9 @@ mod tests { ); assert_eq!(proxy.current_cfg().await?, config); - let remote = proxy.remote_launch_config(DefaultFalse).await?; + let remote = proxy + .remote_launch_config(DefaultFalse, /*credential_masking*/ false) + .await?; assert_eq!( ( remote.proxy.unix_sockets, @@ -2015,7 +2043,7 @@ mod tests { owner_config.set_denied_domains(vec!["denied.example".to_string()]); assert_eq!( scoped - .remote_launch_config(DefaultFalse) + .remote_launch_config(DefaultFalse, /*credential_masking*/ false) .await? .proxy .domains, @@ -2432,7 +2460,7 @@ mod tests { "GH_HOST".to_string(), "local-github.example".to_string(), )])); - let state = Arc::new(network_proxy_state_for_policy(config)); + let state = Arc::new(network_proxy_state_for_policy(config.clone())); let proxy = match NetworkProxy::builder().state(state).build().await { Ok(proxy) => proxy, Err(err) => { @@ -2453,7 +2481,9 @@ mod tests { /*environment_policy*/ None, /*fallback_policy_decider*/ None, )?; - let launch = scoped.remote_launch_config(RequireTrue).await?; + let launch = scoped + .remote_launch_config(RequireTrue, /*credential_masking*/ false) + .await?; let prepared = scoped.prepare_for_optional_environment( HashMap::from([( PROXY_ATTRIBUTION_TOKEN_ENV_KEY.to_string(), @@ -2465,6 +2495,34 @@ mod tests { assert_eq!(launch.environment_id.as_deref(), Some("remote-env")); assert_eq!(launch.execution_id.as_deref(), Some("execution-1")); assert!(!launch.proxy.enabled); + assert!( + scoped + .remote_launch_config(DefaultFalse, /*credential_masking*/ true) + .await + .is_err() + ); + + config.credential_providers.insert( + "vendor".to_string(), + crate::CredentialProviderConfig { + env: vec!["VENDOR_TOKEN".to_string()], + patterns: vec!["vendor_[a-z]{8}".to_string()], + url_prefixes: vec!["https://api.vendor.example".to_string()], + auth: vec![crate::CredentialAuthMethod::Bearer], + ..crate::CredentialProviderConfig::default() + }, + ); + let custom_provider_proxy = NetworkProxy::builder() + .state(Arc::new(network_proxy_state_for_policy(config))) + .build() + .await?; + assert_eq!( + custom_provider_proxy + .remote_launch_config(DefaultFalse, /*credential_masking*/ true) + .await? + .proxy, + launch.proxy + ); let mut owner_config = NetworkProxyConfig::default(); owner_config.set_allowed_domains(vec!["owner.example".to_string()]); @@ -2480,7 +2538,7 @@ mod tests { )?; assert!( owner_scoped - .remote_launch_config(DefaultFalse) + .remote_launch_config(DefaultFalse, /*credential_masking*/ false) .await .is_err() ); @@ -2512,9 +2570,14 @@ mod tests { .state(Arc::new(network_proxy_state_for_policy(config))) .build() .await?; - let launch = proxy.remote_launch_config(DefaultFalse).await?; - assert!(launch.proxy.enabled); - assert_eq!(launch.proxy.mode, mode); + for credential_masking in [false, true] { + let launch = proxy + .remote_launch_config(DefaultFalse, credential_masking) + .await?; + assert!(launch.proxy.enabled); + assert_eq!(launch.proxy.mode, mode); + assert_eq!(launch.proxy.credential_masking, credential_masking); + } } assert_eq!( prepared diff --git a/codex-rs/network-proxy/src/remote_config.rs b/codex-rs/network-proxy/src/remote_config.rs index acb698e178..5260ef6b00 100644 --- a/codex-rs/network-proxy/src/remote_config.rs +++ b/codex-rs/network-proxy/src/remote_config.rs @@ -2,12 +2,72 @@ use anyhow::Result; use anyhow::ensure; use serde::Deserialize; use serde::Serialize; +use std::sync::Mutex; use crate::NetworkDomainPermissions; use crate::NetworkMode; use crate::NetworkProxyAuditMetadata; use crate::NetworkProxyConfig; use crate::NetworkUnixSocketPermissions; +use crate::credential_broker::CredentialBroker; + +/// Credential mappings retained by one executor session across process launches. +/// Only mappings are shared; proxy listeners, network policy, and approvals remain per command. +#[derive(Default)] +pub struct RemoteCredentialBrokerCache { + brokers: Mutex>, +} + +struct CachedCredentialBroker { + environment_id: Option, + conversation_id: Option, + config: NetworkProxyConfig, + broker: CredentialBroker, +} + +impl RemoteCredentialBrokerCache { + pub(crate) fn broker_if_enabled( + &self, + environment_id: Option<&str>, + conversation_id: Option<&str>, + config: &NetworkProxyConfig, + ) -> Option { + if !config.credential_broker { + return None; + } + // Retain broker configuration and the command's destination context so ordinary + // network-policy changes preserve placeholders, while destination changes cannot + // invalidate another command's mappings. + let config = NetworkProxyConfig { + credential_broker: config.credential_broker, + allow_local_binding: Some(config.allow_local_binding()), + credential_broker_openai_host: config.credential_broker_openai_host.clone(), + credential_broker_context: config.credential_broker_context.clone(), + credential_providers: config.credential_providers.clone(), + ..NetworkProxyConfig::default() + }; + let mut brokers = self + .brokers + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); + if let Some(cached) = brokers.iter().find(|cached| { + cached.environment_id.as_deref() == environment_id + && cached.conversation_id.as_deref() == conversation_id + && cached.config == config + }) { + return Some(cached.broker.clone()); + } + let broker = CredentialBroker::new(config.credential_broker); + broker.configure(&config); + brokers.push(CachedCredentialBroker { + environment_id: environment_id.map(str::to_owned), + conversation_id: conversation_id.map(str::to_owned), + config, + broker: broker.clone(), + }); + Some(broker) + } +} /// Executor-local proxy launch inputs transported with one process start. /// @@ -55,13 +115,15 @@ impl RemoteNetworkProxyLaunchConfig { /// Effective network proxy settings that are safe to send to a remote executor. /// /// Listener addresses are deliberately omitted because the executor chooses its own loopback -/// ports. MITM, credential injection, and hooks are not represented so their configuration cannot -/// cross the exec-server boundary accidentally. +/// ports. Masking carries only built-in broker activation; credentials, destination context, custom +/// providers, CA configuration, and MITM hooks stay on their execution host. #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] #[non_exhaustive] pub struct RemoteNetworkProxyConfig { pub enabled: bool, + #[serde(default, skip_serializing_if = "std::ops::Not::not")] + pub credential_masking: bool, pub enable_socks5: bool, pub enable_socks5_udp: bool, pub allow_upstream_proxy: bool, @@ -85,6 +147,7 @@ impl RemoteNetworkProxyConfig { ); Ok(Self { enabled: config.enabled, + credential_masking: false, enable_socks5: config.enable_socks5, enable_socks5_udp: config.enable_socks5_udp, allow_upstream_proxy: config.allow_upstream_proxy, @@ -99,7 +162,7 @@ impl RemoteNetworkProxyConfig { } pub(crate) fn into_network_proxy_config(self) -> NetworkProxyConfig { - NetworkProxyConfig { + let mut config = NetworkProxyConfig { enabled: self.enabled, enable_socks5: self.enable_socks5, enable_socks5_udp: self.enable_socks5_udp, @@ -110,7 +173,9 @@ impl RemoteNetworkProxyConfig { unix_sockets: self.unix_sockets, allow_local_binding: Some(self.allow_local_binding), ..NetworkProxyConfig::default() - } + }; + config.set_credential_broker_enabled(self.credential_masking); + config } } diff --git a/codex-rs/network-proxy/src/remote_config_tests.rs b/codex-rs/network-proxy/src/remote_config_tests.rs index 9522fe1ecd..e589868be7 100644 --- a/codex-rs/network-proxy/src/remote_config_tests.rs +++ b/codex-rs/network-proxy/src/remote_config_tests.rs @@ -47,11 +47,13 @@ fn optional_socket_policy_preserves_input_and_resolves_at_remote_boundary() { #[tokio::test] async fn round_trip_preserves_supported_effective_settings() { - for (executor_os, socket) in [ - (Platform::Linux, "/var/run/example.sock"), - (Platform::Macos, "/var/run/example.sock"), - (Platform::Windows, r"C:\example.sock"), - (Platform::Unknown, r"C:\example.sock"), + for (executor_os, socket, credential_masking) in [ + (Platform::Linux, "/var/run/example.sock", false), + (Platform::Linux, "/var/run/example.sock", true), + (Platform::Macos, "/var/run/example.sock", false), + (Platform::Macos, "/var/run/example.sock", true), + (Platform::Windows, r"C:\example.sock", false), + (Platform::Unknown, r"C:\example.sock", false), ] { let mut config = NetworkProxyConfig { enabled: true, @@ -67,8 +69,10 @@ async fn round_trip_preserves_supported_effective_settings() { config.set_denied_domains(vec!["blocked.example.com".into()]); config.set_allow_unix_sockets(vec![socket.into()]); - let remote = RemoteNetworkProxyConfig::from_effective_config(&config) + let mut remote = RemoteNetworkProxyConfig::from_effective_config(&config) .expect("supported remote config"); + remote.credential_masking = credential_masking; + config.set_credential_broker_enabled(credential_masking); let round_trip = remote.clone().into_network_proxy_config(); assert_eq!(round_trip, config); @@ -77,6 +81,8 @@ async fn round_trip_preserves_supported_effective_settings() { NetworkProxyState::from_remote_launch_config( RemoteNetworkProxyLaunchConfig::new(remote), executor_os, + &crate::RemoteCredentialBrokerCache::default(), + &std::collections::HashMap::new(), ) .unwrap(), ); @@ -96,7 +102,7 @@ async fn round_trip_preserves_supported_effective_settings() { ); assert_eq!( proxy - .remote_launch_config(DefaultFalse) + .remote_launch_config(DefaultFalse, credential_masking) .await .unwrap() .proxy @@ -210,6 +216,8 @@ fn launch_config_materializes_audit_and_execution_attribution() { policy_decision_timeout_ms: None, }, Platform::native(), + &crate::RemoteCredentialBrokerCache::default(), + &std::collections::HashMap::new(), ) .expect("remote launch state"); @@ -218,6 +226,104 @@ fn launch_config_materializes_audit_and_execution_attribution() { assert_eq!(state.execution_id().as_deref(), Some("execution-1")); } +#[test] +fn remote_credential_mappings_follow_the_environment_and_broker_config() { + const TOKEN: &str = "ghp_abcdefghijklmnopqrstuvwxyz0123456789"; + let brokers = crate::RemoteCredentialBrokerCache::default(); + let launch = |environment_id: &str, + conversation_id: &str, + mode, + allow_local_binding, + env: &std::collections::HashMap| { + let mut proxy = RemoteNetworkProxyConfig::from_effective_config(&NetworkProxyConfig { + enabled: true, + allow_local_binding: Some(allow_local_binding), + mode, + ..NetworkProxyConfig::default() + }) + .unwrap(); + proxy.credential_masking = true; + NetworkProxyState::from_remote_launch_config( + RemoteNetworkProxyLaunchConfig::new(proxy) + .for_execution(environment_id.to_string(), "execution".to_string()) + .with_audit_metadata(NetworkProxyAuditMetadata { + conversation_id: Some(conversation_id.to_string()), + ..NetworkProxyAuditMetadata::default() + }), + Platform::Linux, + &brokers, + env, + ) + .unwrap() + }; + let mut env = std::collections::HashMap::from([ + ("GH_ENTERPRISE_TOKEN".to_string(), TOKEN.to_string()), + ( + "GH_HOST".to_string(), + "github.enterprise.example".to_string(), + ), + ]); + let first = launch( + "remote", + "thread", + NetworkMode::Full, + /*allow_local_binding*/ false, + &env, + ); + first.virtualize_child_credentials(&mut env); + let placeholder = env["GH_ENTERPRISE_TOKEN"].clone(); + assert_ne!(placeholder, TOKEN); + + let mut next_env = std::collections::HashMap::from([ + ("GH_ENTERPRISE_TOKEN".to_string(), TOKEN.to_string()), + ("GH_HOST".to_string(), String::new()), + ]); + let next = launch( + "remote", + "thread", + NetworkMode::Full, + /*allow_local_binding*/ false, + &next_env, + ); + next.virtualize_child_credentials(&mut next_env); + let mut headers = rama_http::HeaderMap::from_iter([( + rama_http::header::AUTHORIZATION, + rama_http::HeaderValue::from_str(&format!("Bearer {placeholder}")).unwrap(), + )]); + first.inject_request_credentials("github.enterprise.example", &mut headers); + assert_eq!( + headers[rama_http::header::AUTHORIZATION].to_str().unwrap(), + format!("Bearer {TOKEN}") + ); + drop(first); + + for (environment_id, conversation_id, allow_local_binding, expected) in [ + ("remote", "thread", false, TOKEN), + ("other", "thread", false, placeholder.as_str()), + ("remote", "other", false, placeholder.as_str()), + ("remote", "thread", true, placeholder.as_str()), + ] { + // A different network mode must not discard mappings for the same scope. + let state = launch( + environment_id, + conversation_id, + NetworkMode::Limited, + allow_local_binding, + &env, + ); + let mut headers = rama_http::HeaderMap::new(); + headers.insert( + rama_http::header::AUTHORIZATION, + rama_http::HeaderValue::from_str(&format!("Bearer {placeholder}")).unwrap(), + ); + state.inject_request_credentials("github.enterprise.example", &mut headers); + assert_eq!( + headers[rama_http::header::AUTHORIZATION].to_str().unwrap(), + format!("Bearer {expected}") + ); + } +} + #[test] fn policy_decision_callback_timeout_round_trips() { let config = RemoteNetworkProxyConfig::from_effective_config(&NetworkProxyConfig::default()) @@ -258,7 +364,7 @@ async fn local_binding_is_resolved_for_each_executor() -> anyhow::Result<()> { .await?; assert_eq!( proxy - .remote_launch_config(policy) + .remote_launch_config(policy, /*credential_masking*/ false) .await .ok() .map(|launch| launch.proxy.allow_local_binding), diff --git a/codex-rs/network-proxy/src/runtime.rs b/codex-rs/network-proxy/src/runtime.rs index c816bc358e..63d50400b7 100644 --- a/codex-rs/network-proxy/src/runtime.rs +++ b/codex-rs/network-proxy/src/runtime.rs @@ -334,6 +334,8 @@ impl NetworkProxyState { pub fn from_remote_launch_config( launch: crate::RemoteNetworkProxyLaunchConfig, executor_os: crate::Platform, + credential_brokers: &crate::RemoteCredentialBrokerCache, + environment: &HashMap, ) -> Result { let crate::RemoteNetworkProxyLaunchConfig { proxy, @@ -346,9 +348,15 @@ impl NetworkProxyState { proxy.enabled, "executor-local network proxy launch requires an enabled proxy" ); - let config = proxy.into_network_proxy_config(); + let mut config = proxy.into_network_proxy_config(); + config.configure_credential_broker_environment(environment); let state = build_config_state(config, NetworkProxyConstraints::default(), executor_os)?; - Ok(Self { + let cached_broker = credential_brokers.broker_if_enabled( + environment_id.as_deref(), + audit_metadata.conversation_id.as_deref(), + &state.config, + ); + let mut proxy_state = Self { environment_id: environment_id.map(Into::into), execution_id: execution_id.map(Into::into), ..Self::with_reloader_and_audit_metadata( @@ -357,7 +365,11 @@ impl NetworkProxyState { audit_metadata, LocalBindingPolicy::DefaultFalse, ) - }) + }; + if let Some(broker) = cached_broker { + proxy_state.credential_broker = broker; + } + Ok(proxy_state) } pub fn with_reloader(state: ConfigState, reloader: Arc) -> Self { @@ -570,6 +582,15 @@ impl NetworkProxyState { self.credential_broker.virtualize_text(text, env) } + pub(crate) fn handle_unmasked_credentials( + &self, + env: &mut HashMap, + mode: crate::CredentialMaskingFailureMode, + ) -> anyhow::Result<()> { + self.credential_broker + .handle_unmasked_credentials(env, mode) + } + pub(crate) fn credential_broker_environment( &self, env: &HashMap, From 86ee40c3801a8c4fbb35b1159c32da1447cf09d9 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 15:02:28 +0000 Subject: [PATCH 095/155] Keep TUI Markdown colors readable against their backgrounds (#54315) ## Why Syntax theme colors can have insufficient contrast against the terminal background or the shaded proposed-plan surface. ## What changed - Adapt themed Markdown foreground colors to the terminal background while preserving inline code colors from the syntax theme. - Adjust proposed-plan foreground colors after applying the plan background, including retained styles used for reflow. Apply the same styling to streamed and completed plans. ## Testing Expand snapshots across syntax themes and light and dark backgrounds, and cover proposed-plan tables and streamed plans with wrapped hyperlinks. Update streaming assertions to expect contrast-adjusted blockquote colors. GitOrigin-RevId: 0e358412562c438af17be5bcded9d058b56212b7 --- codex-rs/tui/src/history_cell/plans.rs | 36 +++- ...osed_plan_cell_renders_markdown_table.snap | 42 ++++ codex-rs/tui/src/history_cell/tests.rs | 38 ++-- .../tui/src/inline_visualization_tests.rs | 10 +- codex-rs/tui/src/markdown_render.rs | 22 +- ...ed_without_coloring_surrounding_prose.snap | 3 +- ...eep_link_style_when_wrapped_in_tables.snap | 5 +- ...y_and_fallback_presentations_snapshot.snap | 18 +- codex-rs/tui/src/markdown_render_tests.rs | 18 +- codex-rs/tui/src/markdown_stream.rs | 59 +++-- ...de_and_file_paths_follow_syntax_theme.snap | 202 +++++++++++++++++- ...markers_use_terminal_palette_snapshot.snap | 3 +- ...els_have_a_visible_underline_snapshot.snap | 2 +- ...ooltips__tests__desktop_app_tip_linux.snap | 4 +- ...ooltips__tests__desktop_app_tip_macos.snap | 2 +- ...ltips__tests__desktop_app_tip_windows.snap | 4 +- codex-rs/tui/src/streaming/controller.rs | 59 ++--- ...ream_preserves_semantic_url_fragments.snap | 129 +++++++++++ ...out_context_use_canonical_full_render.snap | 2 +- ..._shortcut_tips_render_at_narrow_width.snap | 28 +-- 20 files changed, 545 insertions(+), 141 deletions(-) create mode 100644 codex-rs/tui/src/history_cell/snapshots/codex_tui__history_cell__tests__proposed_plan_cell_renders_markdown_table.snap create mode 100644 codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__controller__tests__finalized_plan_stream_preserves_semantic_url_fragments.snap diff --git a/codex-rs/tui/src/history_cell/plans.rs b/codex-rs/tui/src/history_cell/plans.rs index d8d55194fa..3d4ab4b49a 100644 --- a/codex-rs/tui/src/history_cell/plans.rs +++ b/codex-rs/tui/src/history_cell/plans.rs @@ -1,10 +1,38 @@ -//! Proposed-plan and plan-update history cells. +//! Proposed-plan and plan-update history cells, including foreground contrast on the plan fill. use super::markdown_render_cache::MarkdownRenderCache; use super::*; use crate::style::accent_color; use crate::terminal_hyperlinks::lines_with_sources_eq; +/// Apply the plan surface after Markdown layout, keeping retained reflow styles in sync. +pub(crate) fn style_proposed_plan_line( + mut line: HyperlinkLine, + plan_style: Style, +) -> HyperlinkLine { + if plan_style.bg.is_none() { + return line.style(plan_style); + } + let adapt = |mut style: Style, background| { + style.fg = style + .fg + .map(|foreground| crate::style::readable_color_on(foreground, style.bg.or(background))); + style + }; + line.line.style = adapt(line.line.style.patch(plan_style), plan_style.bg); + for span in &mut line.line.spans { + span.style = adapt(span.style, line.line.style.bg); + } + if let Some(source) = &mut line.source { + source.line_style = adapt(source.line_style.patch(plan_style), plan_style.bg); + source.span_style = adapt(source.span_style, source.line_style.bg); + for (_, style) in std::sync::Arc::make_mut(&mut source.styles) { + *style = adapt(*style, source.span_style.bg.or(source.line_style.bg)); + } + } + line +} + /// Transient active-cell representation of the mutable tail of a proposed-plan stream. /// /// The controller prepares the full styled plan lines because plan tails need the same header, @@ -141,7 +169,11 @@ impl ProposedPlanCell { plan_lines.extend(prefix_hyperlink_lines(body, " ".into(), " ".into())); plan_lines.push(HyperlinkLine::new(Line::from(" "))); - lines.extend(plan_lines.into_iter().map(|line| line.style(plan_style))); + lines.extend( + plan_lines + .into_iter() + .map(|line| style_proposed_plan_line(line, plan_style)), + ); lines }) } diff --git a/codex-rs/tui/src/history_cell/snapshots/codex_tui__history_cell__tests__proposed_plan_cell_renders_markdown_table.snap b/codex-rs/tui/src/history_cell/snapshots/codex_tui__history_cell__tests__proposed_plan_cell_renders_markdown_table.snap new file mode 100644 index 0000000000..e47ef09605 --- /dev/null +++ b/codex-rs/tui/src/history_cell/snapshots/codex_tui__history_cell__tests__proposed_plan_cell_renders_markdown_table.snap @@ -0,0 +1,42 @@ +--- +source: tui/src/history_cell/tests.rs +expression: lines +--- +[ + Line::from_iter([ + Span::from("• ").dim(), + Span::from("Proposed Plan").bold(), + ]), + Line::from(" "), + Line::from(" ").bg(Color::Rgb(244, 244, 244)), + Line::from_iter([ + Span::from(" "), + Span::from("## ").fg(Color::Rgb(191, 74, 7)).bold(), + Span::from("Plan").fg(Color::Rgb(191, 74, 7)).bold(), + ]).bg(Color::Rgb(244, 244, 244)), + Line::from(" ").bg(Color::Rgb(244, 244, 244)), + Line::from_iter([ + Span::from(" "), + Span::from(" "), + Span::from("Step"), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from("Owner"), + ]).fg(Color::Rgb(156, 99, 20)).bg(Color::Rgb(244, 244, 244)).bold(), + Line::from_iter([ + Span::from(" "), + Span::from("━━━━━━━━ ━━━━━━━").dim(), + ]).bg(Color::Rgb(244, 244, 244)), + Line::from_iter([ + Span::from(" "), + Span::from(" "), + Span::from("Verify"), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from("Codex"), + ]).bg(Color::Rgb(244, 244, 244)), + Line::from(" ").bg(Color::Rgb(244, 244, 244)), +] diff --git a/codex-rs/tui/src/history_cell/tests.rs b/codex-rs/tui/src/history_cell/tests.rs index f3b62e10dd..1828bf7f37 100644 --- a/codex-rs/tui/src/history_cell/tests.rs +++ b/codex-rs/tui/src/history_cell/tests.rs @@ -356,28 +356,26 @@ fn source_backed_cells_render_raw_source_without_prefix_or_style() { #[test] fn proposed_plan_cell_renders_markdown_table() { - let plan = new_proposed_plan( - "## Plan\n\n| Step | Owner |\n| --- | --- |\n| Verify | Codex |\n".to_string(), - &test_cwd(), - ); + crate::terminal_palette::with_test_default_colors( + crate::terminal_probe::DefaultColors { + fg: (30, 30, 30), + bg: (255, 255, 255), + }, + || { + let plan = new_proposed_plan( + "## Plan\n\n| Step | Owner |\n| --- | --- |\n| Verify | Codex |\n".to_string(), + &test_cwd(), + ); - let rendered = render_lines(&plan.display_lines(/*width*/ 80)); + let lines = plan.display_lines(/*width*/ 80); + insta::assert_debug_snapshot!(lines); - assert!( - rendered.iter().any(|line| line.contains('━')), - "expected separated table in proposed plan output: {rendered:?}" - ); - assert!( - !rendered - .iter() - .any(|line| line.trim() == "| Step | Owner |"), - "did not expect raw table header in rich proposed plan output: {rendered:?}" - ); - - let raw = render_lines(&plan.raw_lines()); - assert!( - raw.iter().any(|line| line == "| Step | Owner |"), - "expected raw mode to preserve table markdown source: {raw:?}" + let raw = render_lines(&plan.raw_lines()); + assert!( + raw.iter().any(|line| line == "| Step | Owner |"), + "expected raw mode to preserve table markdown source: {raw:?}" + ); + }, ); } diff --git a/codex-rs/tui/src/inline_visualization_tests.rs b/codex-rs/tui/src/inline_visualization_tests.rs index de7f18320f..75c9c5215f 100644 --- a/codex-rs/tui/src/inline_visualization_tests.rs +++ b/codex-rs/tui/src/inline_visualization_tests.rs @@ -346,8 +346,14 @@ fn finalized_agent_cell_replays_visualization_link() { .expect("visualization URL span"); assert_eq!( url_span.style, - crate::render::highlight::foreground_style_for_scopes(&["markup.underline.link"]) - .unwrap() + Style::new() + .fg(crate::style::readable_color_on( + crate::render::highlight::foreground_style_for_scopes(&["markup.underline.link"]) + .unwrap() + .fg + .unwrap(), + /*background*/ None, + )) .underlined() ); let destinations = lines diff --git a/codex-rs/tui/src/markdown_render.rs b/codex-rs/tui/src/markdown_render.rs index 7f09494c78..c770a3b541 100644 --- a/codex-rs/tui/src/markdown_render.rs +++ b/codex-rs/tui/src/markdown_render.rs @@ -136,7 +136,12 @@ impl Default for MarkdownStyles { impl MarkdownStyles { fn for_theme(theme: &syntect::highlighting::Theme) -> Self { let foreground = |scopes: &[&str]| { - foreground_style_for_scopes_with_theme(theme, scopes).unwrap_or_default() + let mut style = + foreground_style_for_scopes_with_theme(theme, scopes).unwrap_or_default(); + style.fg = style.fg.map(|foreground| { + crate::style::readable_color_on(foreground, /*background*/ None) + }); + style }; Self { h1: foreground(&["markup.heading.1.markdown", "markup.heading.markdown"]) @@ -2675,20 +2680,13 @@ mod tests { let rendered = render_markdown_lines_with_width_and_cwd(markdown, Some(22), /*cwd*/ None); let source = rendered[0].source.as_ref().expect("blockquote source"); + let styles = MarkdownStyles::default(); assert_eq!( source.styled_range(0..source.text.len()), Line::from(vec![ - Span::styled("block quote with ", MarkdownStyles::default().blockquote), - Span::styled( - "content", - MarkdownStyles::default() - .blockquote - .patch(MarkdownStyles::default().strong) - ), - Span::styled( - " that should wrap nicely", - MarkdownStyles::default().blockquote - ), + Span::styled("block quote with ", styles.blockquote), + Span::styled("content", styles.blockquote.patch(styles.strong)), + Span::styled(" that should wrap nicely", styles.blockquote), ]) ); let lines: Vec<_> = rendered.iter().map(|line| line.line.to_string()).collect(); diff --git a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_are_styled_without_coloring_surrounding_prose.snap b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_are_styled_without_coloring_surrounding_prose.snap index ee1efc0847..d71d1d258c 100644 --- a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_are_styled_without_coloring_surrounding_prose.snap +++ b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_are_styled_without_coloring_surrounding_prose.snap @@ -1,6 +1,5 @@ --- source: tui/src/markdown_render/web_links_tests.rs -assertion_line: 37 expression: text --- -Text::from(Line::from_iter([Span::from("界 ("), Span::from("https://example.com/a").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from("); "), Span::from("https://example.com/b").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from("! "), Span::from("https://example.com/c").fg(Color::Rgb(137, 180, 250)).bold().underlined()])) +Text::from(Line::from_iter([Span::from("界 ("), Span::from("https://example.com/a").fg(Color::Reset).underlined(), Span::from("); "), Span::from("https://example.com/b").fg(Color::Reset).underlined(), Span::from("! "), Span::from("https://example.com/c").fg(Color::Reset).bold().underlined()])) diff --git a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_keep_link_style_when_wrapped_in_tables.snap b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_keep_link_style_when_wrapped_in_tables.snap index 911cf60682..0b1a213121 100644 --- a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_keep_link_style_when_wrapped_in_tables.snap +++ b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__bare_urls_keep_link_style_when_wrapped_in_tables.snap @@ -1,6 +1,5 @@ --- source: tui/src/markdown_render/web_links_tests.rs -assertion_line: 63 expression: text --- Text::from_iter([ @@ -11,10 +10,10 @@ Text::from_iter([ Line::from(Span::from("━━━━━━━━━━━━━━━━━━━━").dim()), Line::from_iter([ Span::from(" "), - Span::from("https://").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("https://").fg(Color::Reset).underlined(), ]), Line::from_iter([ Span::from(" "), - Span::from("example.com/docs").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("example.com/docs").fg(Color::Reset).underlined(), ]), ]) diff --git a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__label_only_and_fallback_presentations_snapshot.snap b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__label_only_and_fallback_presentations_snapshot.snap index 6dd37933fa..2c6a1bce21 100644 --- a/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__label_only_and_fallback_presentations_snapshot.snap +++ b/codex-rs/tui/src/markdown_render/snapshots/codex_tui__markdown_render__web_links__tests__label_only_and_fallback_presentations_snapshot.snap @@ -6,11 +6,11 @@ expression: presentations Text::from_iter([ Line::from_iter([ Span::from("plain "), - Span::from("plain").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("plain").fg(Color::Reset).underlined(), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), - Span::from("code").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("code").fg(Color::Reset).underlined(), ]), Line::default(), Line::from_iter([ @@ -20,23 +20,23 @@ expression: presentations Line::from(Span::from("━━━━━━━━━━").dim()), Line::from_iter([ Span::from(" "), - Span::from("docs").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("docs").fg(Color::Reset).underlined(), ]), ]), Text::from_iter([ Line::from_iter([ Span::from("plain "), - Span::from("plain").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("plain").fg(Color::Reset).underlined(), Span::from(" ("), - Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), ]), Line::from_iter([ - Span::from("code").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("code").fg(Color::Reset).underlined(), Span::from(" ("), - Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")"), ]), Line::default(), @@ -47,9 +47,9 @@ expression: presentations Line::from(Span::from("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━").dim()), Line::from_iter([ Span::from(" "), - Span::from("docs").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("docs").fg(Color::Reset).underlined(), Span::from(" ("), - Span::from("https://example.com/docs").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from("https://example.com/docs").fg(Color::Reset).underlined(), Span::from(")"), ]), ]), diff --git a/codex-rs/tui/src/markdown_render_tests.rs b/codex-rs/tui/src/markdown_render_tests.rs index 3230dd8e36..36a839d4b2 100644 --- a/codex-rs/tui/src/markdown_render_tests.rs +++ b/codex-rs/tui/src/markdown_render_tests.rs @@ -755,13 +755,15 @@ fn inline_code() { #[test] fn inline_code_and_file_paths_follow_syntax_theme() { - let markdown = "Use `src/main.rs` and [](./src/lib.rs)."; + let markdown = "# Heading\n\n**Bold** *Italic* [Link](https://example.com)\n\n> Quote\n\n1. Ordered\n\n- Unordered\n\nUse `src/main.rs` and [](./src/lib.rs)."; let mut rendered = Vec::new(); - for name in [ - "catppuccin-mocha", - "catppuccin-latte", - "ansi", - "no-markup-color", + for (name, background) in [ + ("catppuccin-mocha", "dark"), + ("catppuccin-mocha", "light"), + ("catppuccin-latte", "light"), + ("nord", "dark"), + ("ansi", "dark"), + ("no-markup-color", "dark"), ] { let theme = if name == "no-markup-color" { syntect::highlighting::Theme::default() @@ -769,7 +771,7 @@ fn inline_code_and_file_paths_follow_syntax_theme() { crate::render::highlight::resolve_theme_by_name(name, /*codex_home*/ None) .expect("bundled theme") }; - let colors = if name == "catppuccin-latte" { + let colors = if background == "light" { crate::terminal_probe::DefaultColors { fg: (30, 30, 30), bg: (255, 255, 255), @@ -810,7 +812,7 @@ fn inline_code_and_file_paths_follow_syntax_theme() { if name == "no-markup-color" { assert_eq!(code_style, ratatui::style::Style::new().fg(accent_color())); } else { - rendered.push((name, lines)); + rendered.push((name, background, lines)); } }); } diff --git a/codex-rs/tui/src/markdown_stream.rs b/codex-rs/tui/src/markdown_stream.rs index d2bcf53ce5..9b03f1438f 100644 --- a/codex-rs/tui/src/markdown_stream.rs +++ b/codex-rs/tui/src/markdown_stream.rs @@ -226,6 +226,7 @@ pub(crate) fn simulate_stream_markdown_for_tests( mod tests { use super::*; use crate::render::highlight::foreground_style_for_scopes; + use pretty_assertions::assert_eq; use ratatui::style::Color; #[tokio::test] @@ -254,7 +255,10 @@ mod tests { let l = &out[0]; assert_eq!( l.style.fg, - foreground_style_for_scopes(&["markup.quote"]).unwrap().fg, + foreground_style_for_scopes(&["markup.quote"]) + .unwrap() + .fg + .map(|color| crate::style::readable_color_on(color, /*background*/ None)), "expected themed blockquote foreground, got {:?}", l.style.fg ); @@ -270,25 +274,20 @@ mod tests { let non_blank: Vec<_> = out .into_iter() .filter(|l| { - let s = l - .spans - .iter() - .map(|sp| sp.content.clone()) - .collect::>() - .join(""); + let s = l.to_string(); let t = s.trim(); // Ignore quote-only blank lines like ">" inserted at paragraph boundaries. !(t.is_empty() || t == ">") }) .collect(); assert_eq!(non_blank.len(), 2); + let expected_color = foreground_style_for_scopes(&["markup.quote"]) + .unwrap() + .fg + .map(|color| crate::style::readable_color_on(color, /*background*/ None)); assert_eq!( - non_blank[0].style.fg, - foreground_style_for_scopes(&["markup.quote"]).unwrap().fg - ); - assert_eq!( - non_blank[1].style.fg, - foreground_style_for_scopes(&["markup.quote"]).unwrap().fg + [non_blank[0].style.fg, non_blank[1].style.fg], + [expected_color; 2] ); } @@ -299,14 +298,11 @@ mod tests { /*finalize*/ true, ); assert_eq!(out.len(), 2); - assert_eq!( - out[0].style.fg, - foreground_style_for_scopes(&["markup.quote"]).unwrap().fg - ); - assert_eq!( - out[1].style.fg, - foreground_style_for_scopes(&["markup.quote"]).unwrap().fg - ); + let expected_color = foreground_style_for_scopes(&["markup.quote"]) + .unwrap() + .fg + .map(|color| crate::style::readable_color_on(color, /*background*/ None)); + assert_eq!([out[0].style.fg, out[1].style.fg], [expected_color; 2]); } #[tokio::test] @@ -352,27 +348,20 @@ mod tests { // Filter out purely blank lines let non_blank: Vec<_> = wrapped .into_iter() - .filter(|l| { - let s = l - .spans - .iter() - .map(|sp| sp.content.clone()) - .collect::>() - .join(""); - !s.trim().is_empty() - }) + .filter(|l| !l.to_string().trim().is_empty()) .collect(); assert!( non_blank.len() >= 2, "expected wrapped blockquote to span multiple lines" ); + let expected_color = foreground_style_for_scopes(&["markup.quote"]) + .unwrap() + .fg + .map(|color| crate::style::readable_color_on(color, /*background*/ None)); for (i, l) in non_blank.iter().enumerate() { assert_eq!( - l.spans[0].style.fg, - foreground_style_for_scopes(&["markup.quote"]).unwrap().fg, - "wrapped line {} should preserve green style, got {:?}", - i, - l.spans[0].style.fg + l.spans[0].style.fg, expected_color, + "wrapped line {i} should preserve the adapted quote style" ); } } diff --git a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__inline_code_and_file_paths_follow_syntax_theme.snap b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__inline_code_and_file_paths_follow_syntax_theme.snap index ba3a99050c..9c6fcf778d 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__inline_code_and_file_paths_follow_syntax_theme.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__inline_code_and_file_paths_follow_syntax_theme.snap @@ -5,7 +5,90 @@ expression: rendered [ ( "catppuccin-mocha", + "dark", [ + Line::from_iter([ + Span::from("# ").fg(Color::Rgb(243, 139, 168)).bold().underlined(), + Span::from("Heading").fg(Color::Rgb(243, 139, 168)).bold().underlined(), + ]), + Line::default(), + Line::from_iter([ + Span::from("Bold").fg(Color::Rgb(243, 139, 168)).bold(), + Span::from(" "), + Span::from("Italic").fg(Color::Rgb(243, 139, 168)).italic(), + Span::from(" "), + Span::from("Link").fg(Color::Rgb(137, 180, 250)).underlined(), + ]), + Line::from_iter([ + Span::from("("), + Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), + Span::from(")"), + ]), + Line::default(), + Line::from_iter([ + Span::from("> "), + Span::from("Quote"), + ]).fg(Color::Rgb(245, 194, 231)), + Line::default(), + Line::from_iter([ + Span::from("1. ").light_blue(), + Span::from("Ordered"), + ]), + Line::default(), + Line::from_iter([ + Span::from("• ").fg(Color::Rgb(148, 226, 213)), + Span::from("Unordered"), + ]), + Line::default(), + Line::from_iter([ + Span::from("Use "), + Span::from("src/main.rs").fg(Color::Rgb(166, 227, 161)), + Span::from(" and "), + Span::from("./").fg(Color::Rgb(166, 227, 161)), + ]), + Line::from_iter([ + Span::from("src/lib.rs").fg(Color::Rgb(166, 227, 161)), + Span::from("."), + ]), + ], + ), + ( + "catppuccin-mocha", + "light", + [ + Line::from_iter([ + Span::from("# ").fg(Color::Rgb(169, 97, 117)).bold().underlined(), + Span::from("Heading").fg(Color::Rgb(169, 97, 117)).bold().underlined(), + ]), + Line::default(), + Line::from_iter([ + Span::from("Bold").fg(Color::Rgb(169, 97, 117)).bold(), + Span::from(" "), + Span::from("Italic").fg(Color::Rgb(169, 97, 117)).italic(), + Span::from(" "), + Span::from("Link").fg(Color::Rgb(91, 119, 166)).underlined(), + ]), + Line::from_iter([ + Span::from("("), + Span::from("https://example.com").fg(Color::Rgb(91, 119, 166)).underlined(), + Span::from(")"), + ]), + Line::default(), + Line::from_iter([ + Span::from("> "), + Span::from("Quote"), + ]).fg(Color::Rgb(139, 110, 131)), + Line::default(), + Line::from_iter([ + Span::from("1. ").light_blue(), + Span::from("Ordered"), + ]), + Line::default(), + Line::from_iter([ + Span::from("• ").fg(Color::Rgb(82, 126, 119)), + Span::from("Unordered"), + ]), + Line::default(), Line::from_iter([ Span::from("Use "), Span::from("src/main.rs").fg(Color::Rgb(166, 227, 161)), @@ -20,7 +103,41 @@ expression: rendered ), ( "catppuccin-latte", + "light", [ + Line::from_iter([ + Span::from("# ").fg(Color::Rgb(210, 15, 57)).bold().underlined(), + Span::from("Heading").fg(Color::Rgb(210, 15, 57)).bold().underlined(), + ]), + Line::default(), + Line::from_iter([ + Span::from("Bold").fg(Color::Rgb(210, 15, 57)).bold(), + Span::from(" "), + Span::from("Italic").fg(Color::Rgb(210, 15, 57)).italic(), + Span::from(" "), + Span::from("Link").fg(Color::Rgb(30, 102, 245)).underlined(), + ]), + Line::from_iter([ + Span::from("("), + Span::from("https://example.com").fg(Color::Rgb(30, 102, 245)).underlined(), + Span::from(")"), + ]), + Line::default(), + Line::from_iter([ + Span::from("> "), + Span::from("Quote"), + ]).fg(Color::Rgb(174, 87, 151)), + Line::default(), + Line::from_iter([ + Span::from("1. ").light_blue(), + Span::from("Ordered"), + ]), + Line::default(), + Line::from_iter([ + Span::from("• ").fg(Color::Rgb(20, 131, 138)), + Span::from("Unordered"), + ]), + Line::default(), Line::from_iter([ Span::from("Use "), Span::from("src/main.rs").fg(Color::Rgb(64, 160, 43)), @@ -34,8 +151,91 @@ expression: rendered ], ), ( - "ansi", + "nord", + "dark", [ + Line::from_iter([ + Span::from("# ").fg(Color::Rgb(136, 192, 208)).bold().underlined(), + Span::from("Heading").fg(Color::Rgb(136, 192, 208)).bold().underlined(), + ]), + Line::default(), + Line::from_iter([ + Span::from("Bold").bold(), + Span::from(" "), + Span::from("Italic").italic(), + Span::from(" "), + Span::from("Link").fg(Color::Rgb(99, 168, 248)).underlined(), + ]), + Line::from_iter([ + Span::from("("), + Span::from("https://example.com").fg(Color::Rgb(99, 168, 248)).underlined(), + Span::from(")"), + ]), + Line::default(), + Line::from_iter([ + Span::from("> "), + Span::from("Quote"), + ]).fg(Color::Rgb(114, 126, 149)), + Line::default(), + Line::from_iter([ + Span::from("1. ").fg(Color::Rgb(216, 222, 233)), + Span::from("Ordered"), + ]), + Line::default(), + Line::from_iter([ + Span::from("• ").fg(Color::Rgb(216, 222, 233)), + Span::from("Unordered"), + ]), + Line::default(), + Line::from_iter([ + Span::from("Use "), + Span::from("src/main.rs").fg(Color::Rgb(143, 188, 187)), + Span::from(" and "), + Span::from("./").fg(Color::Rgb(143, 188, 187)), + ]), + Line::from_iter([ + Span::from("src/lib.rs").fg(Color::Rgb(143, 188, 187)), + Span::from("."), + ]), + ], + ), + ( + "ansi", + "dark", + [ + Line::from_iter([ + Span::from("# ").blue().bold().underlined(), + Span::from("Heading").blue().bold().underlined(), + ]), + Line::default(), + Line::from_iter([ + Span::from("Bold").yellow().bold(), + Span::from(" "), + Span::from("Italic").magenta().italic(), + Span::from(" "), + Span::from("Link").fg(Color::Rgb(99, 168, 248)).underlined(), + ]), + Line::from_iter([ + Span::from("("), + Span::from("https://example.com").fg(Color::Rgb(99, 168, 248)).underlined(), + Span::from(")"), + ]), + Line::default(), + Line::from_iter([ + Span::from("> "), + Span::from("Quote"), + ]).yellow(), + Line::default(), + Line::from_iter([ + Span::from("1. ").light_blue(), + Span::from("Ordered"), + ]), + Line::default(), + Line::from_iter([ + Span::from("• "), + Span::from("Unordered"), + ]), + Line::default(), Line::from_iter([ Span::from("Use "), Span::from("src/main.rs").green(), diff --git a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__ordered_list_markers_use_terminal_palette_snapshot.snap b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__ordered_list_markers_use_terminal_palette_snapshot.snap index 9635df8b75..d2881139a9 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__ordered_list_markers_use_terminal_palette_snapshot.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__ordered_list_markers_use_terminal_palette_snapshot.snap @@ -1,6 +1,5 @@ --- source: tui/src/markdown_render_tests.rs -assertion_line: 608 expression: text --- -Text::from(Line::from_iter([Span::from("1. ").light_blue(), Span::from("plain "), Span::from("plain").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), Span::from("code").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")")])) +Text::from(Line::from_iter([Span::from("1. ").light_blue(), Span::from("plain "), Span::from("plain").fg(Color::Reset).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), Span::from("code").fg(Color::Reset).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")")])) diff --git a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__web_link_labels_have_a_visible_underline_snapshot.snap b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__web_link_labels_have_a_visible_underline_snapshot.snap index a385a8c188..a0e0732aee 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__web_link_labels_have_a_visible_underline_snapshot.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__markdown_render__markdown_render_tests__web_link_labels_have_a_visible_underline_snapshot.snap @@ -2,4 +2,4 @@ source: tui/src/markdown_render_tests.rs expression: text --- -Text::from(Line::from_iter([Span::from("plain "), Span::from("plain").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), Span::from("code").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Rgb(137, 180, 250)).underlined(), Span::from(")")])) +Text::from(Line::from_iter([Span::from("plain "), Span::from("plain").fg(Color::Reset).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")"), Span::from(" "), Span::from("code").fg(Color::Rgb(166, 227, 161)), Span::from(" "), Span::from("code").fg(Color::Reset).underlined(), Span::from(" ("), Span::from("https://example.com").fg(Color::Reset).underlined(), Span::from(")")])) diff --git a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_linux.snap b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_linux.snap index 77283c5ec8..506513a581 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_linux.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_linux.snap @@ -2,7 +2,7 @@ source: tui/src/tooltips.rs expression: rendered --- -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use the "), Span::from("desktop app").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(". Install it")]) [] +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Use the "), Span::from("desktop app").fg(Color::Reset).bold(), Span::from(". Install it")]) [] Line::from("from") [] -Line::from(Span::from("https://learn.chatgpt.com/docs/linux/linux-app").fg(Color::Rgb(137, 180, 250)).underlined()) [TerminalHyperlink { columns: 0..46, destination: "https://learn.chatgpt.com/docs/linux/linux-app", destination_kind: Web }] +Line::from(Span::from("https://learn.chatgpt.com/docs/linux/linux-app").fg(Color::Reset).underlined()) [TerminalHyperlink { columns: 0..46, destination: "https://learn.chatgpt.com/docs/linux/linux-app", destination_kind: Web }] Line::from_iter([Span::from("and run "), Span::from("chatgpt").fg(Color::Rgb(166, 227, 161)), Span::from(".")]) [] diff --git a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_macos.snap b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_macos.snap index f5e13b5c2f..401dbfeaf2 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_macos.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_macos.snap @@ -2,6 +2,6 @@ source: tui/src/tooltips.rs expression: rendered --- -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use the "), Span::from("desktop app").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(". Run "), Span::from("codex app").fg(Color::Rgb(166, 227, 161))]) [] +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Use the "), Span::from("desktop app").fg(Color::Reset).bold(), Span::from(". Run "), Span::from("codex app").fg(Color::Rgb(166, 227, 161))]) [] Line::from("to open it. It installs automatically if") [] Line::from("needed.") [] diff --git a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_windows.snap b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_windows.snap index 629d1bc236..5bd73ec2a7 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_windows.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__tooltips__tests__desktop_app_tip_windows.snap @@ -2,7 +2,7 @@ source: tui/src/tooltips.rs expression: rendered --- -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use the "), Span::from("desktop app").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(". Install it")]) [] +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Use the "), Span::from("desktop app").fg(Color::Reset).bold(), Span::from(". Install it")]) [] Line::from("from") [] -Line::from(Span::from("https://chatgpt.com/codex?app-landing-page=true").fg(Color::Rgb(137, 180, 250)).underlined()) [TerminalHyperlink { columns: 0..47, destination: "https://chatgpt.com/codex?app-landing-page=true", destination_kind: Web }] +Line::from(Span::from("https://chatgpt.com/codex?app-landing-page=true").fg(Color::Reset).underlined()) [TerminalHyperlink { columns: 0..47, destination: "https://chatgpt.com/codex?app-landing-page=true", destination_kind: Web }] Line::from_iter([Span::from("and run "), Span::from("codex app").fg(Color::Rgb(166, 227, 161)), Span::from(".")]) [] diff --git a/codex-rs/tui/src/streaming/controller.rs b/codex-rs/tui/src/streaming/controller.rs index 50d9326910..8937b4c096 100644 --- a/codex-rs/tui/src/streaming/controller.rs +++ b/codex-rs/tui/src/streaming/controller.rs @@ -898,7 +898,7 @@ impl PlanStreamController { let plan_style = proposed_plan_style(); let plan_lines = prefix_hyperlink_lines(plan_lines, " ".into(), " ".into()) .into_iter() - .map(|line| line.style(plan_style)) + .map(|line| history_cell::style_proposed_plan_line(line, plan_style)) .collect::>(); out_lines.extend(plan_lines); out_lines @@ -1952,30 +1952,41 @@ mod tests { #[test] fn finalized_plan_stream_preserves_semantic_url_fragments() { - let destination = "https://example.com/a/very/long/path/to/a/table/artifact"; - let source = format!("| Step | URL |\n| --- | --- |\n| Verify | {destination} |\n"); - let mut ctrl = PlanStreamController::new( - /*width*/ Some(32), - &test_cwd(), - HistoryRenderMode::Rich, + crate::terminal_palette::with_test_default_colors( + crate::terminal_probe::DefaultColors { + fg: (30, 30, 30), + bg: (255, 255, 255), + }, + || { + let destination = "https://example.com/a/very/long/path/to/a/table/artifact"; + let source = format!( + "# Plan\n\n> Quote\n\n| Step | URL |\n| --- | --- |\n| Verify | {destination} |\n" + ); + let mut ctrl = PlanStreamController::new( + /*width*/ Some(32), + &test_cwd(), + HistoryRenderMode::Rich, + ); + ctrl.push(&source); + + let (cell, _) = ctrl.finalize(); + let lines = cell + .expect("final plan stream table cell") + .display_hyperlink_lines(/*width*/ 32); + insta::assert_debug_snapshot!(lines); + let linked_rows = lines + .iter() + .filter(|line| !line.hyperlinks.is_empty()) + .collect::>(); + + assert!(linked_rows.len() > 1); + assert!(linked_rows.iter().all(|line| { + line.hyperlinks + .iter() + .all(|link| link.destination == destination) + })); + }, ); - ctrl.push(&source); - - let (cell, _) = ctrl.finalize(); - let lines = cell - .expect("final plan stream table cell") - .display_hyperlink_lines(/*width*/ 32); - let linked_rows = lines - .iter() - .filter(|line| !line.hyperlinks.is_empty()) - .collect::>(); - - assert!(linked_rows.len() > 1); - assert!(linked_rows.iter().all(|line| { - line.hyperlinks - .iter() - .all(|link| link.destination == destination) - })); } #[test] diff --git a/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__controller__tests__finalized_plan_stream_preserves_semantic_url_fragments.snap b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__controller__tests__finalized_plan_stream_preserves_semantic_url_fragments.snap new file mode 100644 index 0000000000..41c738f86f --- /dev/null +++ b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__controller__tests__finalized_plan_stream_preserves_semantic_url_fragments.snap @@ -0,0 +1,129 @@ +--- +source: tui/src/streaming/controller.rs +expression: lines +--- +[ + HyperlinkLine { + line: Line::from_iter([ + Span::from("• ").dim(), + Span::from("Proposed Plan").bold(), + ]), + hyperlinks: [], + }, + HyperlinkLine { + line: Line::from(" "), + hyperlinks: [], + }, + HyperlinkLine { + line: Line::from_iter([ + Span::from(" "), + Span::from(" "), + ]).bg(Color::Rgb(244, 244, 244)), + hyperlinks: [], + }, + HyperlinkLine { + line: Line::from_iter([ + Span::from(" "), + Span::from("# ").fg(Color::Rgb(210, 15, 57)).bold().underlined(), + Span::from("Plan").fg(Color::Rgb(210, 15, 57)).bold().underlined(), + ]).bg(Color::Rgb(244, 244, 244)), + hyperlinks: [], + }, + HyperlinkLine { + line: Line::from(" ").bg(Color::Rgb(244, 244, 244)), + hyperlinks: [], + }, + HyperlinkLine { + line: Line::from_iter([ + Span::from(" "), + Span::from("> "), + Span::from("Quote"), + ]).fg(Color::Rgb(165, 82, 143)).bg(Color::Rgb(244, 244, 244)), + hyperlinks: [], + }, + HyperlinkLine { + line: Line::from(" ").bg(Color::Rgb(244, 244, 244)), + hyperlinks: [], + }, + HyperlinkLine { + line: Line::from_iter([ + Span::from(" "), + Span::from(" "), + Span::from("Step"), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from("URL"), + ]).fg(Color::Rgb(156, 99, 20)).bg(Color::Rgb(244, 244, 244)).bold(), + hyperlinks: [], + }, + HyperlinkLine { + line: Line::from_iter([ + Span::from(" "), + Span::from("━━━━━━━━ ━━━━━━━━━━━━━━━━━━━━━━").dim(), + ]).bg(Color::Rgb(244, 244, 244)), + hyperlinks: [], + }, + HyperlinkLine { + line: Line::from_iter([ + Span::from(" "), + Span::from(" "), + Span::from("Verify"), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from("https://example.com/").fg(Color::Rgb(29, 101, 244)).underlined(), + ]).bg(Color::Rgb(244, 244, 244)), + hyperlinks: [ + TerminalHyperlink { + columns: 13..33, + destination: "https://example.com/a/very/long/path/to/a/table/artifact", + destination_kind: Web, + }, + ], + }, + HyperlinkLine { + line: Line::from_iter([ + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from("a/very/long/path/to/").fg(Color::Rgb(29, 101, 244)).underlined(), + ]).bg(Color::Rgb(244, 244, 244)), + hyperlinks: [ + TerminalHyperlink { + columns: 13..33, + destination: "https://example.com/a/very/long/path/to/a/table/artifact", + destination_kind: Web, + }, + ], + }, + HyperlinkLine { + line: Line::from_iter([ + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from(" "), + Span::from("a/table/artifact").fg(Color::Rgb(29, 101, 244)).underlined(), + ]).bg(Color::Rgb(244, 244, 244)), + hyperlinks: [ + TerminalHyperlink { + columns: 13..29, + destination: "https://example.com/a/very/long/path/to/a/table/artifact", + destination_kind: Web, + }, + ], + }, + HyperlinkLine { + line: Line::from_iter([ + Span::from(" "), + Span::from(" "), + ]).bg(Color::Rgb(244, 244, 244)), + hyperlinks: [], + }, +] diff --git a/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__inline_visualizations_without_context_use_canonical_full_render.snap b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__inline_visualizations_without_context_use_canonical_full_render.snap index b719e64ee7..02dbd77a8f 100644 --- a/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__inline_visualizations_without_context_use_canonical_full_render.snap +++ b/codex-rs/tui/src/streaming/snapshots/codex_tui__streaming__render__tests__inline_visualizations_without_context_use_canonical_full_render.snap @@ -12,7 +12,7 @@ expression: render.lines hyperlinks: [], }, HyperlinkLine { - line: Line::from(Span::from("Visualization unavailable on this device.").fg(Color::Rgb(243, 139, 168)).italic()), + line: Line::from(Span::from("Visualization unavailable on this device.").fg(Color::Reset).italic()), hyperlinks: [], }, ] diff --git a/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap b/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap index 3862c8feef..467be5f32f 100644 --- a/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap +++ b/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap @@ -3,50 +3,50 @@ source: tui/src/tooltips/keybinding_tests.rs expression: "lines.iter().map(|line| format!(\"{line:?}\")).collect::>().join(\"\\n\")" --- Line::from("Default") -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("tab").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message when a")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("tab").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message when a")]) Line::from("task is running; otherwise it sends") Line::from_iter([Span::from("immediately (except "), Span::from("!").fg(Color::Rgb(166, 227, 161)), Span::from(").")]) Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use "), Span::from("/copy").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" or press "), Span::from("⌃o").fg(Color::Rgb(166, 227, 161)), Span::from(" to copy the")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Use "), Span::from("/copy").fg(Color::Reset).bold(), Span::from(" or press "), Span::from("⌃o").fg(Color::Rgb(166, 227, 161)), Span::from(" to copy the")]) Line::from("latest agent response as Markdown.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃t").fg(Color::Rgb(166, 227, 161)), Span::from(" to open the full")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("⌃t").fg(Color::Rgb(166, 227, 161)), Span::from(" to open the full")]) Line::from("transcript.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("f3").fg(Color::Rgb(166, 227, 161)), Span::from(" to search this")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("f3").fg(Color::Rgb(166, 227, 161)), Span::from(" to search this")]) Line::from("conversation.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃g").fg(Color::Rgb(166, 227, 161)), Span::from(" to edit your current draft")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("⌃g").fg(Color::Rgb(166, 227, 161)), Span::from(" to edit your current draft")]) Line::from("in an external editor.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃r").fg(Color::Rgb(166, 227, 161)), Span::from(" to search previously")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("⌃r").fg(Color::Rgb(166, 227, 161)), Span::from(" to search previously")]) Line::from("entered prompts.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" For models with adjustable")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" For models with adjustable")]) Line::from_iter([Span::from("reasoning, press "), Span::from("⌥.").fg(Color::Rgb(166, 227, 161)), Span::from(" to increase")]) Line::from_iter([Span::from("reasoning effort or "), Span::from("⌥,").fg(Color::Rgb(166, 227, 161)), Span::from(" to decrease it.")]) Line::default() Line::from("Remapped") -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x q").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message when")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("⌃x q").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message when")]) Line::from("a task is running; otherwise it sends") Line::from_iter([Span::from("immediately (except "), Span::from("!").fg(Color::Rgb(166, 227, 161)), Span::from(").")]) Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Use "), Span::from("/copy").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" or press "), Span::from("⌃x `").fg(Color::Rgb(166, 227, 161)), Span::from(" to copy the")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Use "), Span::from("/copy").fg(Color::Reset).bold(), Span::from(" or press "), Span::from("⌃x `").fg(Color::Rgb(166, 227, 161)), Span::from(" to copy the")]) Line::from("latest agent response as Markdown.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x t").fg(Color::Rgb(166, 227, 161)), Span::from(" to open the full")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("⌃x t").fg(Color::Rgb(166, 227, 161)), Span::from(" to open the full")]) Line::from("transcript.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x f").fg(Color::Rgb(166, 227, 161)), Span::from(" to search this")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("⌃x f").fg(Color::Rgb(166, 227, 161)), Span::from(" to search this")]) Line::from("conversation.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x e").fg(Color::Rgb(166, 227, 161)), Span::from(" to edit your current")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("⌃x e").fg(Color::Rgb(166, 227, 161)), Span::from(" to edit your current")]) Line::from("draft in an external editor.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" Press "), Span::from("⌃x r").fg(Color::Rgb(166, 227, 161)), Span::from(" to search previously")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("⌃x r").fg(Color::Rgb(166, 227, 161)), Span::from(" to search previously")]) Line::from("entered prompts.") Line::default() -Line::from_iter([Span::from("Tip:").fg(Color::Rgb(243, 139, 168)).bold(), Span::from(" For models with adjustable")]) +Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" For models with adjustable")]) Line::from_iter([Span::from("reasoning, press "), Span::from("⌃x +").fg(Color::Rgb(166, 227, 161)), Span::from(" to increase")]) Line::from_iter([Span::from("reasoning effort or "), Span::from("⌃x -").fg(Color::Rgb(166, 227, 161)), Span::from(" to decrease it.")]) Line::default() From f0c5077c34ec7a76b4ad9134835925e6ae3d72ec Mon Sep 17 00:00:00 2001 From: ioanbudea-OAI Date: Thu, 15 Oct 2026 15:06:57 +0000 Subject: [PATCH 096/155] Centralize context fragment kind constants (#54316) ## What changed Replace duplicated content-kind strings with constants shared by fragment producers and consumers, including authorization checks, forked-history filtering, and memory instructions. Share the compaction summary kind between core and Guardian's transcript filter. ## Testing Add a regression test verifying that Guardian excludes compaction summaries while retaining surrounding user messages, including a user message with identical text. GitOrigin-RevId: 36dbdf0f82c61b52d2571ac1c392fb151c98151b --- codex-rs/context-fragments/src/lib.rs | 3 +++ codex-rs/core/src/agent/control/spawn.rs | 5 ++++- codex-rs/core/src/context/compaction_summary.rs | 4 +++- .../core/src/context/contextual_user_message.rs | 8 +++++--- .../src/context/guardian_approved_action.rs | 4 +++- codex-rs/core/src/context/memory.rs | 7 ++++++- .../core/src/context/multi_agent_usage_hint.rs | 4 +++- codex-rs/core/src/context/unsupported_media.rs | 7 +++++-- codex-rs/core/src/context/user_goal.rs | 5 +++-- codex-rs/core/src/image_preparation.rs | 4 +++- codex-rs/ext/memories/src/extension.rs | 2 +- codex-rs/guardian-context/src/history.rs | 17 ++++++++++++++--- codex-rs/guardian-context/src/history_tests.rs | 17 +++++++++++++++++ .../prompts/src/multi_agent_instructions.rs | 7 ++++++- 14 files changed, 76 insertions(+), 18 deletions(-) diff --git a/codex-rs/context-fragments/src/lib.rs b/codex-rs/context-fragments/src/lib.rs index f141275e00..e8e63c46b7 100644 --- a/codex-rs/context-fragments/src/lib.rs +++ b/codex-rs/context-fragments/src/lib.rs @@ -17,3 +17,6 @@ pub use fragment::ContextualUserFragment; pub use fragment::RenderedFragment; pub use recap_prompt::RecapPrompt; + +/// Shared classification for compaction summaries produced by core and filtered by Guardian. +pub const COMPACTION_SUMMARY_KIND: &str = "compaction.summary"; diff --git a/codex-rs/core/src/agent/control/spawn.rs b/codex-rs/core/src/agent/control/spawn.rs index cc68bfdd3b..21f6963664 100644 --- a/codex-rs/core/src/agent/control/spawn.rs +++ b/codex-rs/core/src/agent/control/spawn.rs @@ -17,6 +17,7 @@ use crate::context::ContextualUserFragment; use crate::context::CurrentTimeReminder; use crate::context::CurrentTimeUnavailable; use crate::context::DeveloperInstructions; +use crate::context::GuardianApprovedAction; use crate::context::ManagedDeveloperInstructions; use crate::context::ModelInstructions; use crate::context::MultiAgentModeInstructions; @@ -141,7 +142,9 @@ fn retain_forked_developer_message(item: &mut ResponseItem, usage_hint_texts: &[ // Persisted role hints can predate the current bundled wording and lack markers. if matches!( content_item.kind().as_str(), - "guardian.approved_action" | "multi_agent.role_instructions" | "multi_agent.usage_hint" + GuardianApprovedAction::KIND + | MultiAgentRoleInstructions::KIND + | MultiAgentUsageHint::KIND ) { return false; } diff --git a/codex-rs/core/src/context/compaction_summary.rs b/codex-rs/core/src/context/compaction_summary.rs index 5c576275f9..dc2c768ea1 100644 --- a/codex-rs/core/src/context/compaction_summary.rs +++ b/codex-rs/core/src/context/compaction_summary.rs @@ -7,6 +7,8 @@ pub(crate) struct CompactionSummary { } impl CompactionSummary { + pub(crate) const KIND: &str = codex_context_fragments::COMPACTION_SUMMARY_KIND; + pub(crate) fn new(summary: impl Into) -> Self { Self { summary: summary.into(), @@ -16,7 +18,7 @@ impl CompactionSummary { impl ContextualUserFragment for CompactionSummary { fn content_kind(&self) -> ContentItemKind { - ContentItemKind("compaction.summary".to_string()) + ContentItemKind(Self::KIND.to_string()) } fn role(&self) -> &'static str { diff --git a/codex-rs/core/src/context/contextual_user_message.rs b/codex-rs/core/src/context/contextual_user_message.rs index a74f10a616..130fe03c56 100644 --- a/codex-rs/core/src/context/contextual_user_message.rs +++ b/codex-rs/core/src/context/contextual_user_message.rs @@ -14,10 +14,12 @@ use super::LegacyUnifiedExecProcessLimitWarning; use super::RecommendedPluginsInstructions; use super::SubagentNotification; use super::TurnAborted; +use super::UnsupportedMedia; use super::UserGoalUpdate; use super::UserInstructions; use super::UserShellCommand; use super::world_state::EnvironmentsState; +use crate::image_preparation::ImagePreparationError; const CONTEXTUAL_USER_FRAGMENT_MATCHERS: &[fn(&str) -> bool] = &[ UserInstructions::matches_text, @@ -73,9 +75,9 @@ pub(crate) fn is_user_authorization_message(item: &ResponseItem) -> bool { kind.0.as_str(), "" | "unknown" // Media preparation can replace real user input. - | "images.preparation_error" - | "images.unsupported" - | "audio.unsupported" + | ImagePreparationError::KIND + | UnsupportedMedia::IMAGE_KIND + | UnsupportedMedia::AUDIO_KIND ) }) }) diff --git a/codex-rs/core/src/context/guardian_approved_action.rs b/codex-rs/core/src/context/guardian_approved_action.rs index b206b058b3..df7f754c08 100644 --- a/codex-rs/core/src/context/guardian_approved_action.rs +++ b/codex-rs/core/src/context/guardian_approved_action.rs @@ -8,6 +8,8 @@ pub(crate) struct GuardianApprovedAction { } impl GuardianApprovedAction { + pub(crate) const KIND: &str = "guardian.approved_action"; + pub(crate) fn new(approved_action_json: String) -> Self { Self { approved_action_json, @@ -17,7 +19,7 @@ impl GuardianApprovedAction { impl ContextualUserFragment for GuardianApprovedAction { fn content_kind(&self) -> ContentItemKind { - ContentItemKind("guardian.approved_action".to_string()) + ContentItemKind(Self::KIND.to_string()) } fn role(&self) -> &'static str { diff --git a/codex-rs/core/src/context/memory.rs b/codex-rs/core/src/context/memory.rs index be4e0f63d5..9e0c9d1ecf 100644 --- a/codex-rs/core/src/context/memory.rs +++ b/codex-rs/core/src/context/memory.rs @@ -11,6 +11,11 @@ pub enum MemoryContextFragment { ExtractionEvidence(String), } +impl MemoryContextFragment { + /// Content classification for memory read-path instructions. + pub const READ_INSTRUCTIONS_KIND: &str = "memories.instructions"; +} + impl ContextualUserFragment for MemoryContextFragment { fn role(&self) -> &'static str { match self { @@ -21,7 +26,7 @@ impl ContextualUserFragment for MemoryContextFragment { fn content_kind(&self) -> ContentItemKind { ContentItemKind( match self { - Self::ReadInstructions(_) => "memories.instructions", + Self::ReadInstructions(_) => Self::READ_INSTRUCTIONS_KIND, Self::ExtractionEvidence(_) => "memories.extraction_evidence", } .to_string(), diff --git a/codex-rs/core/src/context/multi_agent_usage_hint.rs b/codex-rs/core/src/context/multi_agent_usage_hint.rs index f08c3fa657..665b221acf 100644 --- a/codex-rs/core/src/context/multi_agent_usage_hint.rs +++ b/codex-rs/core/src/context/multi_agent_usage_hint.rs @@ -8,6 +8,8 @@ pub(crate) struct MultiAgentUsageHint { } impl MultiAgentUsageHint { + pub(crate) const KIND: &str = "multi_agent.usage_hint"; + pub(crate) fn new(text: &str) -> Self { Self { text: text.to_string(), @@ -17,7 +19,7 @@ impl MultiAgentUsageHint { impl ContextualUserFragment for MultiAgentUsageHint { fn content_kind(&self) -> ContentItemKind { - ContentItemKind("multi_agent.usage_hint".to_string()) + ContentItemKind(Self::KIND.to_string()) } fn role(&self) -> &'static str { diff --git a/codex-rs/core/src/context/unsupported_media.rs b/codex-rs/core/src/context/unsupported_media.rs index 8b225649c0..2b30865b8b 100644 --- a/codex-rs/core/src/context/unsupported_media.rs +++ b/codex-rs/core/src/context/unsupported_media.rs @@ -8,14 +8,17 @@ pub(crate) struct UnsupportedMedia { } impl UnsupportedMedia { + pub(crate) const IMAGE_KIND: &str = "images.unsupported"; + pub(crate) const AUDIO_KIND: &str = "audio.unsupported"; + pub(crate) const IMAGE: Self = Self { text: "image content omitted because you do not support image input", - content_kind: "images.unsupported", + content_kind: Self::IMAGE_KIND, }; pub(crate) const AUDIO: Self = Self { text: "audio content omitted because you do not support audio input", - content_kind: "audio.unsupported", + content_kind: Self::AUDIO_KIND, }; } diff --git a/codex-rs/core/src/context/user_goal.rs b/codex-rs/core/src/context/user_goal.rs index 76d7c1c532..5fbf484663 100644 --- a/codex-rs/core/src/context/user_goal.rs +++ b/codex-rs/core/src/context/user_goal.rs @@ -23,6 +23,7 @@ pub enum UserGoalUpdate { } impl UserGoalUpdate { + pub(crate) const KIND: &str = "user.goal"; pub(crate) const OMITTED_OBJECTIVE_KIND: &str = "user.goal.omitted"; /// Captures accepted goal instructions at a compaction input boundary. @@ -53,7 +54,7 @@ impl UserGoalUpdate { let [ContentItem::InputText { text }] = content.as_slice() else { return None; }; - (role == "user" && matches!(kind.0.as_str(), "user.goal" | Self::OMITTED_OBJECTIVE_KIND)) + (role == "user" && matches!(kind.0.as_str(), Self::KIND | Self::OMITTED_OBJECTIVE_KIND)) .then_some(text) } } @@ -71,7 +72,7 @@ impl ContextualUserFragment for UserGoalUpdate { } if serde_json::json!(objective).to_string().len() > MAX_OBJECTIVE_BYTES => { Self::OMITTED_OBJECTIVE_KIND } - Self::Set { .. } | Self::Clear => "user.goal", + Self::Set { .. } | Self::Clear => Self::KIND, }; ContentItemKind(kind.to_owned()) } diff --git a/codex-rs/core/src/image_preparation.rs b/codex-rs/core/src/image_preparation.rs index ae7e97f9db..3142613b04 100644 --- a/codex-rs/core/src/image_preparation.rs +++ b/codex-rs/core/src/image_preparation.rs @@ -107,6 +107,8 @@ pub(crate) enum ImagePreparationError { } impl ImagePreparationError { + pub(crate) const KIND: &str = "images.preparation_error"; + fn placeholder(&self) -> &'static str { match self { ImagePreparationError::RemoteUrlUnsupported => REMOTE_IMAGE_URL_PLACEHOLDER, @@ -285,7 +287,7 @@ async fn prepare_message_content( warn!(%error, "failed to prepare message image"); *item = AnnotatedContent::text( error.placeholder(), - ContentItemKind("images.preparation_error".to_string()), + ContentItemKind(ImagePreparationError::KIND.to_string()), codex_protocol::models::ContentItemMetadata::harness(), ); } diff --git a/codex-rs/ext/memories/src/extension.rs b/codex-rs/ext/memories/src/extension.rs index 3db27e4984..337e63e11d 100644 --- a/codex-rs/ext/memories/src/extension.rs +++ b/codex-rs/ext/memories/src/extension.rs @@ -94,7 +94,7 @@ impl ContextContributor for MemoriesExtension { .map(|instructions| { PromptFragment::developer_policy( instructions, - ContentItemKind("memories.instructions".to_string()), + ContentItemKind(MemoryContextFragment::READ_INSTRUCTIONS_KIND.to_string()), ) }) .collect() diff --git a/codex-rs/guardian-context/src/history.rs b/codex-rs/guardian-context/src/history.rs index d9aad1bec2..1c0c56146b 100644 --- a/codex-rs/guardian-context/src/history.rs +++ b/codex-rs/guardian-context/src/history.rs @@ -13,7 +13,9 @@ use std::io; use std::io::Write; use std::sync::Arc; +use codex_context_fragments::COMPACTION_SUMMARY_KIND; use codex_protocol::models::ContentItem; +use codex_protocol::models::InternalChatMessageMetadataPassthrough; use codex_protocol::models::ResponseItem; use codex_protocol::models::executed_tool_call_metadata_bytes; @@ -68,9 +70,18 @@ impl TranscriptHistory { | ResponseItem::ContextCompaction { .. } | ResponseItem::CompactionTrigger { .. } ) - || matches!(item, ResponseItem::Message { internal_chat_message_metadata_passthrough: Some(metadata), .. } - if metadata.content_item_kinds.as_ref().is_some_and(|kinds| - kinds.iter().any(|kind| kind.0 == "compaction.summary"))) + || matches!( + item, + ResponseItem::Message { + internal_chat_message_metadata_passthrough: Some( + InternalChatMessageMetadataPassthrough { + content_item_kinds: Some(kinds), + .. + } + ), + .. + } if kinds.iter().any(|kind| kind.as_str() == COMPACTION_SUMMARY_KIND) + ) { return; } diff --git a/codex-rs/guardian-context/src/history_tests.rs b/codex-rs/guardian-context/src/history_tests.rs index 4748ad192e..21fec31483 100644 --- a/codex-rs/guardian-context/src/history_tests.rs +++ b/codex-rs/guardian-context/src/history_tests.rs @@ -20,6 +20,23 @@ fn tool(text: &str) -> ResponseItem { .unwrap() } +#[test] +fn compaction_summary_is_excluded_without_dropping_user_messages() { + let before = message("Earlier user message"); + let summary: ResponseItem = serde_json::from_value(json!({ + "type": "message", "role": "user", + "content": [{"type": "input_text", "text": "Summary text"}], + "internal_chat_message_metadata_passthrough": { + "content_item_kinds": [COMPACTION_SUMMARY_KIND] + } + })) + .unwrap(); + let after = message("Summary text"); + let mut history = TranscriptHistory::default(); + history.reset([before.clone().into(), summary.into(), after.clone().into()].iter()); + assert_eq!(history.items().collect::>(), vec![&before, &after]); +} + #[test] fn rollback_keeps_the_earlier_prefix_or_clears_an_evicted_boundary() { let items = [message("keep"), message("roll back"), tool("later")]; diff --git a/codex-rs/prompts/src/multi_agent_instructions.rs b/codex-rs/prompts/src/multi_agent_instructions.rs index 415f52dd2a..d75b261e0a 100644 --- a/codex-rs/prompts/src/multi_agent_instructions.rs +++ b/codex-rs/prompts/src/multi_agent_instructions.rs @@ -32,9 +32,14 @@ pub enum MultiAgentRoleInstructions { }, } +impl MultiAgentRoleInstructions { + /// Content classification shared by role producers and inherited-history filtering. + pub const KIND: &str = "multi_agent.role_instructions"; +} + impl ContextualUserFragment for MultiAgentRoleInstructions { fn content_kind(&self) -> ContentItemKind { - ContentItemKind("multi_agent.role_instructions".to_string()) + ContentItemKind(Self::KIND.to_string()) } fn role(&self) -> &'static str { From 0003732489a514748e61a0f76a652ac992a5f4f5 Mon Sep 17 00:00:00 2001 From: viyatb-oai Date: Thu, 15 Oct 2026 16:40:58 +0000 Subject: [PATCH 097/155] Add scoped executor credential auth for remote exec-server (#54346) ## What changed - Add `RemoteEnvironmentConfig::with_executor_credential_auth()` for Noise transport, requiring exactly one `Authorization: Bearer ` header without accompanying account credentials. - Require HTTPS registry URLs except on loopback, and bypass system proxies for loopback HTTP requests. - Mark credentials as sensitive, suppress registry diagnostics that could echo them, and reject registration responses containing the credential while preserving recognized retry error codes. - Reject scoped executor credentials for Direct registration and WebSocket connections. Keep legacy authentication as the default. ## Testing Add tests for invalid credential headers, HTTPS and loopback restrictions, proxy bypass, credential echoes in registry responses, and rejection before Direct transport sends requests. GitOrigin-RevId: a427d648a0520d2e187dd40ca63268903a949f94 --- codex-rs/exec-server/src/remote.rs | 565 +++++++++++++++++- codex-rs/exec-server/src/remote/direct.rs | 13 + .../exec-server/src/remote/direct_tests.rs | 52 ++ 3 files changed, 600 insertions(+), 30 deletions(-) diff --git a/codex-rs/exec-server/src/remote.rs b/codex-rs/exec-server/src/remote.rs index d432853ed4..aeb4467000 100644 --- a/codex-rs/exec-server/src/remote.rs +++ b/codex-rs/exec-server/src/remote.rs @@ -13,6 +13,7 @@ use http::HeaderMap; use http::HeaderName; use http::HeaderValue; use http::StatusCode; +use http::header::AUTHORIZATION; use serde::Deserialize; use tokio::time::sleep; use tokio::time::timeout_at; @@ -72,11 +73,19 @@ pub enum RemoteEnvironmentTransport { Direct, } +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +enum RegistryAuthMode { + Legacy, + ExecutorCredential, +} + #[derive(Clone)] struct EnvironmentRegistryClient { base_url: String, auth_provider: SharedAuthProvider, + auth_mode: RegistryAuthMode, http: RouteAwareClientPool, + http_direct: RouteAwareClientPool, connect_timeout: Duration, telemetry: ExecServerTelemetry, } @@ -111,10 +120,16 @@ impl EnvironmentRegistryClient { Ok(Self { base_url, auth_provider, + auth_mode: RegistryAuthMode::Legacy, http: RouteAwareClientPool::new_without_redirects_or_request_logging( - http_client_factory, + http_client_factory.clone(), ClientRouteClass::Api, ), + http_direct: RouteAwareClientPool::new_without_redirects_or_request_logging( + http_client_factory, + ClientRouteClass::Api, + ) + .with_legacy_direct_proxy_and_custom_ca_fallback(), connect_timeout: DEFAULT_REMOTE_EXEC_SERVER_CONNECT_TIMEOUT, telemetry, }) @@ -161,15 +176,18 @@ impl EnvironmentRegistryClient { security_profile: NOISE_RELAY_SECURITY_PROFILE.to_string(), executor_public_key: executor_public_key.clone(), }; - let response = timeout_at(deadline, async { - self.http + let (response, executor_credential) = timeout_at(deadline, async { + let (auth_headers, executor_credential) = self.resolve_auth().await?; + let response = self + .http_for_auth() .post(url) - .headers(self.resolve_auth_headers().await?) + .headers(auth_headers) .headers(current_trace_context_headers()) .json(&body) .send() .await - .map_err(ExecServerError::EnvironmentRegistryRequest) + .map_err(ExecServerError::EnvironmentRegistryRequest)?; + Ok((response, executor_credential)) }) .await .unwrap_or_else(|_| { @@ -179,22 +197,30 @@ impl EnvironmentRegistryClient { })?; let status = response.status(); // Read diagnostics within the same attempt budget, preserving a known error status. - let response: EnvironmentRegistryRegistrationResponse = - timeout_at(deadline, self.parse_json_response(response)) - .await - .unwrap_or_else(|_| { - Err(match status { - StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN => { - environment_registry_auth_error(status, "response body timed out") - } - status if !status.is_success() => { - environment_registry_http_error(status, "response body timed out") - } - _ => ExecServerError::EnvironmentRegistryRequest( - codex_http_client::RouteAwareRequestError::Timeout, - ), - }) - })?; + let response: EnvironmentRegistryRegistrationResponse = timeout_at(deadline, async { + if let Some(credential) = executor_credential + .as_ref() + .and_then(|value| value.to_str().ok()) + { + parse_executor_registration_response(response, credential).await + } else { + self.parse_json_response(response).await + } + }) + .await + .unwrap_or_else(|_| { + Err(match status { + StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN => { + environment_registry_auth_error(status, "response body timed out") + } + status if !status.is_success() => { + environment_registry_http_error(status, "response body timed out") + } + _ => ExecServerError::EnvironmentRegistryRequest( + codex_http_client::RouteAwareRequestError::Timeout, + ), + }) + })?; if response.environment_id != environment_id { return Err(ExecServerError::Protocol( "environment registry returned a different environment id".to_string(), @@ -240,10 +266,11 @@ impl EnvironmentRegistryClient { &format!("/cloud/environment/{environment_id}/connect"), ); let body = EnvironmentRegistryConnectRequest { harness_public_key }; + let (auth_headers, _) = self.resolve_auth().await?; let response = self - .http + .http_for_auth() .post(url) - .headers(self.resolve_auth_headers().await?) + .headers(auth_headers) .headers(current_trace_context_headers()) .json(&body) .timeout(self.connect_timeout) @@ -279,15 +306,59 @@ impl EnvironmentRegistryClient { }) } - async fn resolve_auth_headers(&self) -> Result { - self.auth_provider + async fn resolve_auth(&self) -> Result<(HeaderMap, Option), ExecServerError> { + let mut headers = self + .auth_provider .resolve_auth_headers() .await .map_err(|error| { ExecServerError::EnvironmentRegistryAuth(format!( "failed to resolve environment registry authentication: {error}" )) - }) + })?; + let executor_credential = if self.auth_mode == RegistryAuthMode::ExecutorCredential { + // Scoped mode sends exactly one bearer and never accompanying account credentials. + let token = (headers.len() == 1) + .then(|| headers.get(AUTHORIZATION)) + .flatten() + .and_then(|value| value.to_str().ok()) + .and_then(|value| value.strip_prefix("Bearer ")) + .filter(|token| { + !token.is_empty() + && token.len() <= 16 * 1024 + && token.bytes().all(|byte| byte.is_ascii_graphic()) + }) + .ok_or_else(|| { + ExecServerError::EnvironmentRegistryAuth( + "invalid executor credential authorization".to_string(), + ) + })?; + let mut credential = HeaderValue::from_str(token).map_err(|_| { + ExecServerError::EnvironmentRegistryAuth( + "invalid executor credential authorization".to_string(), + ) + })?; + credential.set_sensitive(true); + if let Some(authorization) = headers.get_mut(AUTHORIZATION) { + authorization.set_sensitive(true); + } + direct::require_tls_or_loopback(&self.base_url, "https")?; + Some(credential) + } else { + None + }; + Ok((headers, executor_credential)) + } + + fn http_for_auth(&self) -> &RouteAwareClientPool { + // A system proxy can otherwise receive a loopback HTTP credential in plaintext. + if self.auth_mode == RegistryAuthMode::ExecutorCredential + && url::Url::parse(&self.base_url).is_ok_and(|url| url.scheme() == "http") + { + &self.http_direct + } else { + &self.http + } } async fn parse_json_response(&self, response: HttpResponse) -> Result @@ -348,11 +419,12 @@ impl HarnessKeyValidator for RegistryHarnessKeyValidator { harness_public_key: harness_public_key.clone(), harness_key_authorization: authorization.to_string(), }; + let (auth_headers, executor_credential) = self.client.resolve_auth().await?; let response = self .client - .http + .http_for_auth() .post(url) - .headers(self.client.resolve_auth_headers().await?) + .headers(auth_headers) .headers(current_trace_context_headers()) .json(&body) .send() @@ -375,7 +447,15 @@ impl HarnessKeyValidator for RegistryHarnessKeyValidator { let response = response .json::() .await - .map_err(ExecServerError::EnvironmentRegistryRequest)?; + .map_err(|error| { + if executor_credential.is_some() { + ExecServerError::Protocol( + "invalid environment registry harness key validation response".to_string(), + ) + } else { + ExecServerError::EnvironmentRegistryRequest(error) + } + })?; if !response.valid { return Err(ExecServerError::Protocol( "environment registry rejected Noise relay harness key".to_string(), @@ -526,6 +606,11 @@ fn static_bearer_auth_provider( } /// Configuration for registering an exec-server for remote use. +/// +/// Scoped mode uses one `Authorization: Bearer ` header with +/// the Noise transport. It requires an HTTPS registry URL, except that HTTP is +/// permitted for loopback. Scoped executor credentials are not supported by +/// the Direct transport. #[derive(Clone)] pub struct RemoteEnvironmentConfig { pub base_url: String, @@ -534,6 +619,7 @@ pub struct RemoteEnvironmentConfig { pub request_dispatch_mode: RequestDispatchMode, transport: RemoteEnvironmentTransport, auth_provider: SharedAuthProvider, + auth_mode: RegistryAuthMode, telemetry: ExecServerTelemetry, http_client_factory: HttpClientFactory, } @@ -547,6 +633,7 @@ impl std::fmt::Debug for RemoteEnvironmentConfig { .field("request_dispatch_mode", &self.request_dispatch_mode) .field("transport", &self.transport) .field("auth_provider", &"") + .field("auth_mode", &self.auth_mode) .finish() } } @@ -584,11 +671,24 @@ impl RemoteEnvironmentConfig { request_dispatch_mode: RequestDispatchMode::Inline, transport, auth_provider, + auth_mode: RegistryAuthMode::Legacy, telemetry: ExecServerTelemetry::default(), http_client_factory, }) } + /// Requires one environment-bound bearer from the auth provider, without account fallback. + pub fn with_executor_credential_auth(mut self) -> Result { + if self.transport == RemoteEnvironmentTransport::Direct { + return Err(ExecServerError::EnvironmentRegistryConfig( + "direct transport does not support scoped executor credentials".to_string(), + )); + } + direct::require_tls_or_loopback(&self.base_url, "https")?; + self.auth_mode = RegistryAuthMode::ExecutorCredential; + Ok(self) + } + pub fn with_telemetry(mut self, telemetry: ExecServerTelemetry) -> Self { self.telemetry = telemetry; self @@ -687,12 +787,13 @@ where T: std::future::Future>, { ensure_rustls_crypto_provider(); - let client = EnvironmentRegistryClient::new_with_telemetry( + let mut client = EnvironmentRegistryClient::new_with_telemetry( config.base_url.clone(), config.auth_provider.clone(), config.telemetry.clone(), config.http_client_factory.clone(), )?; + client.auth_mode = config.auth_mode; let run = run_loop(config, client); tokio::pin!(run, shutdown); tokio::select! { @@ -892,6 +993,63 @@ fn endpoint_url(base_url: &str, path: &str) -> String { format!("{base_url}/{}", path.trim_start_matches('/')) } +async fn parse_executor_registration_response( + response: HttpResponse, + credential: &str, +) -> Result { + const SAFE_ERROR: &str = "invalid environment registry executor registration response"; + let status = response.status(); + if matches!(status, StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN) { + return Err(environment_registry_auth_error( + status, + "response body omitted", + )); + } + let body = response + .text() + .await + .map_err(|_| ExecServerError::Protocol(SAFE_ERROR.to_string()))?; + if !status.is_success() { + // Only these fixed codes affect retry behavior. Registry diagnostics can echo the credential. + let code = serde_json::from_str::(&body) + .ok() + .and_then(RegistryErrorBody::into_error) + .and_then(|error| error.code) + .filter(|code| { + matches!( + code.as_str(), + "registration_conflict" | "authentication_service_unavailable" + ) + }); + return Err(ExecServerError::EnvironmentRegistryHttp { + status, + code, + message: "environment registry executor registration failed".to_string(), + }); + } + let value: serde_json::Value = serde_json::from_str(&body) + .map_err(|_| ExecServerError::Protocol(SAFE_ERROR.to_string()))?; + if body.contains(credential) || json_contains_executor_credential(&value, credential) { + return Err(ExecServerError::Protocol(SAFE_ERROR.to_string())); + } + serde_json::from_value(value).map_err(|_| ExecServerError::Protocol(SAFE_ERROR.to_string())) +} + +fn json_contains_executor_credential(value: &serde_json::Value, credential: &str) -> bool { + match value { + serde_json::Value::String(value) => value.contains(credential), + serde_json::Value::Array(values) => values + .iter() + .any(|value| json_contains_executor_credential(value, credential)), + serde_json::Value::Object(fields) => fields.iter().any(|(key, value)| { + key.contains(credential) || json_contains_executor_credential(value, credential) + }), + serde_json::Value::Null | serde_json::Value::Bool(_) | serde_json::Value::Number(_) => { + false + } + } +} + fn environment_registry_auth_error(status: StatusCode, body: &str) -> ExecServerError { let message = registry_error_message(body).unwrap_or_else(|| "empty error body".to_string()); ExecServerError::EnvironmentRegistryAuth(format!( @@ -994,6 +1152,349 @@ mod tests { Arc::new(StaticRegistryAuthProvider) } + struct ScopedExecutorAuth; + + impl AuthProvider for ScopedExecutorAuth { + fn add_auth_headers(&self, headers: &mut HeaderMap) { + headers.insert( + AUTHORIZATION, + HeaderValue::from_static("Bearer synthetic-scoped-token"), + ); + } + } + + #[tokio::test] + async fn invalid_executor_credential_headers_are_never_sent() { + struct InvalidExecutorAuth(HeaderMap); + + impl AuthProvider for InvalidExecutorAuth { + fn add_auth_headers(&self, headers: &mut HeaderMap) { + headers.extend(self.0.clone()); + } + } + + let server = MockServer::start().await; + let public_key = NoiseChannelIdentity::generate() + .expect("identity") + .public_key(); + for credentials in [ + vec![], + vec![(AUTHORIZATION, HeaderValue::from_static("Bearer "))], + vec![( + AUTHORIZATION, + HeaderValue::from_static("Basic synthetic-secret"), + )], + vec![( + AUTHORIZATION, + HeaderValue::from_bytes(b"Bearer synthetic-\xff-secret").expect("header value"), + )], + vec![ + ( + AUTHORIZATION, + HeaderValue::from_static("Bearer synthetic-first-secret"), + ), + ( + AUTHORIZATION, + HeaderValue::from_static("Bearer synthetic-second-secret"), + ), + ], + vec![ + ( + AUTHORIZATION, + HeaderValue::from_static("Bearer synthetic-secret"), + ), + ( + HeaderName::from_static("chatgpt-account-id"), + HeaderValue::from_static("account-id"), + ), + ], + ] { + let mut headers = HeaderMap::new(); + for (name, value) in credentials { + headers.append(name, value); + } + let mut client = EnvironmentRegistryClient::new( + server.uri(), + Arc::new(InvalidExecutorAuth(headers)), + ) + .expect("registry client"); + client.auth_mode = RegistryAuthMode::ExecutorCredential; + let registration = client + .register_environment("environment-requested", &public_key) + .await + .expect_err("invalid credentials must be rejected"); + assert!(matches!( + registration, + ExecServerError::EnvironmentRegistryAuth(_) + )); + assert!(!format!("{registration:?} {registration}").contains("synthetic")); + + let validator = RegistryHarnessKeyValidator { + client, + environment_id: "environment-requested".to_string(), + executor_registration_id: "registration".to_string(), + }; + let validation = validator + .validate_harness_key(&public_key, "harness-authorization") + .await + .expect_err("invalid credentials must be rejected"); + assert!(matches!( + validation, + ExecServerError::EnvironmentRegistryAuth(_) + )); + assert!(!format!("{validation:?} {validation}").contains("synthetic")); + } + assert!( + server + .received_requests() + .await + .expect("requests") + .is_empty() + ); + } + + #[tokio::test] + async fn executor_credentials_require_https_or_loopback() { + for (url, allowed) in [ + ("https://registry.example", true), + ("http://localhost:8080", true), + ("http://127.0.0.1:8080", true), + ("http://[::1]:8080", true), + ("http://registry.example", false), + ("http://localhost.example", false), + ("not a url", false), + ] { + let mut client = + EnvironmentRegistryClient::new(url.to_string(), Arc::new(ScopedExecutorAuth)) + .expect("registry client"); + client.auth_mode = RegistryAuthMode::ExecutorCredential; + assert_eq!(client.resolve_auth().await.is_ok(), allowed, "{url}"); + } + + let legacy = EnvironmentRegistryClient::new( + "http://registry.example".to_string(), + static_registry_auth_provider(), + ) + .expect("registry client"); + let (headers, credential) = legacy.resolve_auth().await.expect("legacy auth"); + assert_eq!(headers[AUTHORIZATION], "Bearer registry-token"); + assert_eq!(headers["ChatGPT-Account-ID"], "workspace-123"); + assert!(credential.is_none()); + } + + #[tokio::test] + async fn insecure_registry_never_receives_executor_credentials() { + let proxy = MockServer::start().await; + let registry_url = "http://scoped-registry-proxy.invalid"; + for endpoint in ["register", "validate"] { + let request_url = + format!("{registry_url}/cloud/environment/environment-requested/{endpoint}"); + codex_http_client::cache_system_proxy_route_for_test(&request_url, proxy.uri()); + } + let mut client = EnvironmentRegistryClient::new_with_telemetry( + registry_url.to_string(), + Arc::new(ScopedExecutorAuth), + ExecServerTelemetry::default(), + HttpClientFactory::new(OutboundProxyPolicy::RespectSystemProxy), + ) + .expect("registry client"); + client.auth_mode = RegistryAuthMode::ExecutorCredential; + let public_key = NoiseChannelIdentity::generate() + .expect("identity") + .public_key(); + let error = client + .register_environment("environment-requested", &public_key) + .await + .expect_err("registration must reject a non-loopback HTTP registry"); + assert!(matches!( + error, + ExecServerError::EnvironmentRegistryConfig(_) + )); + + let validator = RegistryHarnessKeyValidator { + client, + environment_id: "environment-requested".to_string(), + executor_registration_id: "registration".to_string(), + }; + let error = validator + .validate_harness_key(&public_key, "harness-authorization") + .await + .expect_err("validation must reject a non-loopback HTTP registry"); + assert!(matches!( + error, + ExecServerError::EnvironmentRegistryConfig(_) + )); + assert!( + proxy + .received_requests() + .await + .expect("proxy requests") + .is_empty() + ); + } + + #[tokio::test] + async fn scoped_loopback_registry_bypasses_a_configured_proxy() { + let registry = MockServer::start().await; + let proxy = MockServer::start().await; + let public_key = NoiseChannelIdentity::generate() + .expect("identity") + .public_key(); + for endpoint in ["register", "validate"] { + let request_url = format!( + "{}/cloud/environment/environment-requested/{endpoint}", + registry.uri() + ); + codex_http_client::cache_system_proxy_route_for_test(&request_url, proxy.uri()); + } + Mock::given(method("POST")) + .and(path("/cloud/environment/environment-requested/register")) + .and(header(AUTHORIZATION, "Bearer synthetic-scoped-token")) + .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({ + "environment_id": "environment-requested", + "url": "wss://rendezvous.test/", + "security_profile": NOISE_RELAY_SECURITY_PROFILE, + "executor_registration_id": "registration", + }))) + .expect(1) + .mount(®istry) + .await; + Mock::given(method("POST")) + .and(path("/cloud/environment/environment-requested/validate")) + .and(header(AUTHORIZATION, "Bearer synthetic-scoped-token")) + .respond_with( + ResponseTemplate::new(200).set_body_json(serde_json::json!({"valid": true})), + ) + .expect(1) + .mount(®istry) + .await; + let http_client_factory = HttpClientFactory::new(OutboundProxyPolicy::RespectSystemProxy); + assert!(matches!( + http_client_factory.resolve_proxy_route(&format!( + "{}/cloud/environment/environment-requested/register", + registry.uri() + )), + codex_http_client::OutboundProxyRoute::Proxy { .. } + )); + let mut client = EnvironmentRegistryClient::new_with_telemetry( + registry.uri(), + Arc::new(ScopedExecutorAuth), + ExecServerTelemetry::default(), + http_client_factory, + ) + .expect("registry client"); + client.auth_mode = RegistryAuthMode::ExecutorCredential; + let (headers, credential) = client.resolve_auth().await.expect("scoped auth"); + assert_eq!(headers.len(), 1); + assert_eq!(headers[AUTHORIZATION], "Bearer synthetic-scoped-token"); + assert!(headers[AUTHORIZATION].is_sensitive()); + let credential = credential.expect("raw executor credential"); + assert_eq!(credential, "synthetic-scoped-token"); + assert!(credential.is_sensitive()); + client + .register_environment("environment-requested", &public_key) + .await + .expect("register directly"); + RegistryHarnessKeyValidator { + client, + environment_id: "environment-requested".to_string(), + executor_registration_id: "registration".to_string(), + } + .validate_harness_key(&public_key, "harness-authorization") + .await + .expect("validate directly"); + registry.verify().await; + assert!( + proxy + .received_requests() + .await + .expect("proxy requests") + .is_empty() + ); + } + + #[tokio::test] + async fn executor_credential_is_never_returned_in_registry_diagnostics() { + const TOKEN: &str = "synthetic-scoped-registry-secret"; + struct ExecutorAuth; + impl AuthProvider for ExecutorAuth { + fn add_auth_headers(&self, headers: &mut HeaderMap) { + let mut credential = + HeaderValue::from_str(&format!("Bearer {TOKEN}")).expect("bearer"); + credential.set_sensitive(true); + headers.insert(AUTHORIZATION, credential); + } + } + let encoded_echo = serde_json::json!({ + "environment_id": "environment-requested", + "url": "wss://rendezvous.test/", + "security_profile": NOISE_RELAY_SECURITY_PROFILE, + "executor_registration_id": TOKEN, + }) + .to_string() + .replace("synthetic", "\\u0073ynthetic"); + for (status, body) in [ + (401, format!(r#"{{"error":{{"message":"{TOKEN}"}}}}"#)), + ( + 502, + format!( + r#"{{"detail":{{"code":"authentication_service_unavailable","message":"{TOKEN}"}}}}"# + ), + ), + ( + 500, + format!(r#"{{"error":{{"code":"{TOKEN}","message":"{TOKEN}"}}}}"#), + ), + (200, format!(r#"{{"environment_id":"{TOKEN}"}}"#)), + (200, encoded_echo), + ] { + let server = MockServer::start().await; + Mock::given(method("POST")) + .and(path("/cloud/environment/environment-requested/register")) + .and(header(AUTHORIZATION, format!("Bearer {TOKEN}"))) + .respond_with(ResponseTemplate::new(status).set_body_string(body.clone())) + .mount(&server) + .await; + Mock::given(method("POST")) + .and(path("/cloud/environment/environment-requested/validate")) + .and(header(AUTHORIZATION, format!("Bearer {TOKEN}"))) + .respond_with( + ResponseTemplate::new(status) + .set_body_string(format!(r#"{{"valid":"{TOKEN}"}}"#)), + ) + .mount(&server) + .await; + let mut client = EnvironmentRegistryClient::new(server.uri(), Arc::new(ExecutorAuth)) + .expect("registry client"); + client.auth_mode = RegistryAuthMode::ExecutorCredential; + let public_key = NoiseChannelIdentity::generate() + .expect("identity") + .public_key(); + let registration = client + .register_environment("environment-requested", &public_key) + .await + .expect_err("registry echoes cannot enter diagnostics"); + assert!(!format!("{registration:?} {registration}").contains(TOKEN)); + if status == 502 { + assert!(matches!( + ®istration, + ExecServerError::EnvironmentRegistryHttp { code: Some(code), .. } + if code == "authentication_service_unavailable" + )); + } + let validator = RegistryHarnessKeyValidator { + client, + environment_id: "environment-requested".to_string(), + executor_registration_id: "registration".to_string(), + }; + let validation = validator + .validate_harness_key(&public_key, "harness-authorization") + .await + .expect_err("invalid validation response"); + assert!(!format!("{validation:?} {validation}").contains(TOKEN)); + } + } + #[tokio::test(flavor = "current_thread")] async fn register_environment_posts_with_auth_provider_headers() { let provider = SdkTracerProvider::builder().build(); @@ -1333,6 +1834,10 @@ mod tests { .expect("config"); assert_eq!(config.transport, RemoteEnvironmentTransport::Direct); + assert!(matches!( + config.with_executor_credential_auth(), + Err(ExecServerError::EnvironmentRegistryConfig(_)) + )); } #[test] diff --git a/codex-rs/exec-server/src/remote/direct.rs b/codex-rs/exec-server/src/remote/direct.rs index a99454e177..99b0a2aa78 100644 --- a/codex-rs/exec-server/src/remote/direct.rs +++ b/codex-rs/exec-server/src/remote/direct.rs @@ -17,6 +17,7 @@ use tracing::info; use tracing::warn; use super::EnvironmentRegistryClient; +use super::RegistryAuthMode; use super::RemoteEnvironmentConfig; use crate::ExecServerError; use crate::client::is_retryable_recovery_error; @@ -80,6 +81,11 @@ impl EnvironmentRegistryClient { ) -> Result { let started_at = Instant::now(); let response = async { + if self.auth_mode == RegistryAuthMode::ExecutorCredential { + return Err(ExecServerError::EnvironmentRegistryConfig( + "direct transport does not support scoped executor credentials".to_string(), + )); + } let url = super::endpoint_url( &self.base_url, &format!("/cloud/environment/{environment_id}/direct/register"), @@ -154,6 +160,7 @@ pub(super) async fn run_direct_environment( match connect_direct( ®istration.url, config.auth_provider.as_ref(), + config.auth_mode, &config.http_client_factory, ) .await @@ -252,8 +259,14 @@ fn is_policy_recoverable( async fn connect_direct( url: &str, auth_provider: &dyn AuthProvider, + auth_mode: RegistryAuthMode, http_client_factory: &codex_http_client::HttpClientFactory, ) -> Result { + if auth_mode == RegistryAuthMode::ExecutorCredential { + return Err(ExecServerError::EnvironmentRegistryConfig( + "direct transport does not support scoped executor credentials".to_string(), + )); + } let mut request = url.into_client_request() .map_err(|source| ExecServerError::WebSocketConnect { diff --git a/codex-rs/exec-server/src/remote/direct_tests.rs b/codex-rs/exec-server/src/remote/direct_tests.rs index ae40fa5db6..9c49254824 100644 --- a/codex-rs/exec-server/src/remote/direct_tests.rs +++ b/codex-rs/exec-server/src/remote/direct_tests.rs @@ -175,6 +175,57 @@ impl AuthProvider for QueryAuthProvider { } } +struct ScopedExecutorAuth; + +impl AuthProvider for ScopedExecutorAuth { + fn add_auth_headers(&self, headers: &mut HeaderMap) { + headers.insert( + http::header::AUTHORIZATION, + HeaderValue::from_static("Bearer synthetic-scoped-token"), + ); + } +} + +#[tokio::test] +async fn direct_transport_rejects_scoped_credentials_before_sending() -> Result<()> { + let registry = MockServer::start().await; + let mut client = EnvironmentRegistryClient::new(registry.uri(), Arc::new(ScopedExecutorAuth))?; + client.auth_mode = RegistryAuthMode::ExecutorCredential; + let error = client + .register_direct_environment("environment-requested") + .await + .expect_err("scoped credentials must not be sent on direct registration"); + assert!(matches!( + error, + ExecServerError::EnvironmentRegistryConfig(_) + )); + assert!(registry.received_requests().await.unwrap().is_empty()); + + let listener = TcpListener::bind("127.0.0.1:0").await?; + let url = format!("ws://{}/connect", listener.local_addr()?); + let error = match connect_direct( + &url, + &ScopedExecutorAuth, + RegistryAuthMode::ExecutorCredential, + &HttpClientFactory::new(OutboundProxyPolicy::ReqwestDefault), + ) + .await + { + Err(error) => error, + Ok(_) => panic!("scoped credentials must not be sent to the WebSocket"), + }; + assert!(matches!( + error, + ExecServerError::EnvironmentRegistryConfig(_) + )); + assert!( + timeout(Duration::from_millis(50), listener.accept()) + .await + .is_err() + ); + Ok(()) +} + #[tokio::test] async fn direct_websocket_signs_only_host_and_preserves_handshake_headers() -> Result<()> { let mut request = "wss://executor.example.com/connect".into_client_request()?; @@ -213,6 +264,7 @@ async fn direct_websocket_uses_authenticated_url_query_parameters() -> Result<() let connection = connect_direct( &url, &QueryAuthProvider, + RegistryAuthMode::Legacy, &HttpClientFactory::new(OutboundProxyPolicy::ReqwestDefault), ) .await?; From 922510f4d7570b42838e015787ed53abfa8761a1 Mon Sep 17 00:00:00 2001 From: ben zhang Date: Thu, 15 Oct 2026 16:52:54 +0000 Subject: [PATCH 098/155] Use the turn index for turn-scoped item pagination (#54351) ## Why A thread-wide index can scan earlier turns when a turn's final item page is underfilled. ## What changed Force `idx_thread_items_by_turn_page` for turn-scoped item queries when neither `item_ids` nor `after_updated_at_ordinal` is set. GitOrigin-RevId: 63c86fafa08446351a5d9828b479c497c76a8555 --- .../src/local/thread_history/segment_paging.rs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/codex-rs/thread-store/src/local/thread_history/segment_paging.rs b/codex-rs/thread-store/src/local/thread_history/segment_paging.rs index 7c647c4dcb..24a23e64c4 100644 --- a/codex-rs/thread-store/src/local/thread_history/segment_paging.rs +++ b/codex-rs/thread-store/src/local/thread_history/segment_paging.rs @@ -292,11 +292,18 @@ pub(super) async fn page_item_rows( let mut query = QueryBuilder::::new( r#" SELECT turn_id, item_id, rollout_ordinal, updated_at_ordinal, created_at_ms, started_at_ms, completed_at_ms, item_json -FROM thread_items -WHERE thread_id = - "#, +FROM thread_items"#, ); - query.push_bind(segment.rollout_id().to_string()); + if params.turn_id.is_some() + && params.item_ids.is_none() + && params.after_updated_at_ordinal.is_none() + { + // A thread-wide index can scan earlier turns when a turn's final page is underfilled. + query.push(" INDEXED BY idx_thread_items_by_turn_page"); + } + query + .push(" WHERE thread_id = ") + .push_bind(segment.rollout_id().to_string()); push_segment_range(&mut query, segment)?; if let Some(after_updated_at_ordinal) = params.after_updated_at_ordinal { query From 3df96b085c666b33d3775aa4e77219ec1ed828a0 Mon Sep 17 00:00:00 2001 From: iceweasel-oai Date: Thu, 15 Oct 2026 17:31:19 +0000 Subject: [PATCH 099/155] Filter uninspectable network roots from implicit MXC read grants (#54363) ## What changed On Windows, omit network roots whose filesystem identity cannot be inspected when expanding implicit `:root` read access. Retain inspectable shares and roots containing the policy or command working directory, and apply the same filtering during policy inspection and command launch. Keep explicit grants unchanged and continue expanding `:root` write and deny rules across all executor volumes. ## Testing Extend policy tests to cover filtered read roots, explicit grant precedence, and approved-command write access across all volumes. GitOrigin-RevId: c4d7c8ce2c9138cdb4518385e2cd05f66518628e --- codex-rs/mxc-sandbox/Cargo.toml | 1 + codex-rs/mxc-sandbox/src/lib.rs | 10 ++++++-- codex-rs/mxc-sandbox/src/policy.rs | 29 +++++++++++++++------ codex-rs/mxc-sandbox/src/policy_tests.rs | 21 ++++++++++------ codex-rs/mxc-sandbox/src/windows.rs | 32 ++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 17 deletions(-) diff --git a/codex-rs/mxc-sandbox/Cargo.toml b/codex-rs/mxc-sandbox/Cargo.toml index 49b5c16e66..7c81efc845 100644 --- a/codex-rs/mxc-sandbox/Cargo.toml +++ b/codex-rs/mxc-sandbox/Cargo.toml @@ -36,6 +36,7 @@ windows-sys = { workspace = true, features = [ "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_SystemInformation", + "Win32_System_WindowsProgramming", "Win32_UI_Shell", ] } diff --git a/codex-rs/mxc-sandbox/src/lib.rs b/codex-rs/mxc-sandbox/src/lib.rs index 5dc92bdeb4..678ceb8ea2 100644 --- a/codex-rs/mxc-sandbox/src/lib.rs +++ b/codex-rs/mxc-sandbox/src/lib.rs @@ -135,11 +135,17 @@ pub fn prepare_file_system_policy( if policy.has_full_disk_write_access() { return Ok(policy); } - let volumes = windows::volume_roots(policy_cwd.as_path(), command_cwd)? + let volumes = windows::volume_roots(policy_cwd.as_path(), command_cwd)?; + let read_volumes = windows::implicit_read_roots(&volumes, policy_cwd.as_path(), command_cwd)?; + let volumes = volumes .into_iter() .map(PathUri::from_host_native_path) .collect::>>()?; - Ok(policy::materialize_volume_roots(policy, &volumes)?) + Ok(policy::materialize_volume_roots( + policy, + &volumes, + &read_volumes, + )?) } /// Entry point dispatched before ordinary Codex CLI parsing. diff --git a/codex-rs/mxc-sandbox/src/policy.rs b/codex-rs/mxc-sandbox/src/policy.rs index 6fcaaceb06..1bb5486303 100644 --- a/codex-rs/mxc-sandbox/src/policy.rs +++ b/codex-rs/mxc-sandbox/src/policy.rs @@ -6,6 +6,7 @@ use std::collections::HashSet; use std::path::Path; use std::path::PathBuf; +use codex_protocol::protocol::FileSystemAccessMode; use codex_protocol::protocol::FileSystemPath; use codex_protocol::protocol::FileSystemSandboxPolicy; use codex_protocol::protocol::FileSystemSpecialPath; @@ -138,7 +139,11 @@ pub(super) fn build_request( .iter() .map(PathUri::from_host_native_path) .collect::>>()?; - let fs = materialize_volume_roots(policy.clone(), &volumes)?; + #[cfg(windows)] + let read_volumes = crate::windows::implicit_read_roots(volume_roots, cwd, command_cwd)?; + #[cfg(not(windows))] + let read_volumes = volumes.clone(); + let fs = materialize_volume_roots(policy.clone(), &volumes, &read_volumes)?; let roots = if full_disk_write { Vec::new() } else { @@ -342,22 +347,30 @@ fn prune_unavailable_volume_roots(paths: &mut NativePaths, volume_roots: &HashSe }); } -// Bind :root to every executor volume before canonical precedence and carveout -// resolution. This is purely lexical; native volume enumeration happens later. +// Bind :root before canonical precedence and carveout resolution. Only implicit +// reads use the filtered volumes; writes and denies retain every executor volume. pub(super) fn materialize_volume_roots( mut fs: FileSystemSandboxPolicy, volume_roots: &[PathUri], + implicit_read_roots: &[PathUri], ) -> Result { let mut entries = Vec::new(); for entry in fs.entries { match &entry.path { FileSystemPath::Special { value: FileSystemSpecialPath::Root, - } => entries.extend(volume_roots.iter().map(|path| { - let mut entry = entry.clone(); - entry.path = path.clone().into(); - entry - })), + } => { + let roots = if entry.access == FileSystemAccessMode::Read { + implicit_read_roots + } else { + volume_roots + }; + entries.extend(roots.iter().map(|path| { + let mut entry = entry.clone(); + entry.path = path.clone().into(); + entry + })); + } FileSystemPath::Special { value: FileSystemSpecialPath::ProjectRoots { .. } diff --git a/codex-rs/mxc-sandbox/src/policy_tests.rs b/codex-rs/mxc-sandbox/src/policy_tests.rs index df4934b2b8..90a030dc04 100644 --- a/codex-rs/mxc-sandbox/src/policy_tests.rs +++ b/codex-rs/mxc-sandbox/src/policy_tests.rs @@ -40,9 +40,10 @@ fn symbolic_root_precedence_is_independent_of_drive_and_cwd() -> Result<()> { let volumes = [ PathUri::parse("file:///C:/")?, PathUri::parse("file:///D:/")?, + PathUri::parse("file:///R:/")?, ]; - let readonly = PathUri::parse("file:///D:/foobar")?; - let writable = PathUri::parse("file:///D:/writable")?; + let readonly = PathUri::parse("file:///R:/foobar")?; + let writable = PathUri::parse("file:///R:/writable")?; let mut fs = FileSystemSandboxPolicy::read_only(); fs.entries.extend([ FileSystemSandboxEntry::new(volumes[1].clone().into(), Read), @@ -52,7 +53,7 @@ fn symbolic_root_precedence_is_independent_of_drive_and_cwd() -> Result<()> { ]); for access in [Read, Write, Deny] { fs.entries[0].access = access; - let resolved = materialize_volume_roots(fs.clone(), &volumes)?; + let resolved = materialize_volume_roots(fs.clone(), &volumes, &volumes[..2])?; for volume in &volumes { let cwd = volume.join("work")?; let context = FileSystemSandboxPolicyContext { @@ -62,9 +63,15 @@ fn symbolic_root_precedence_is_independent_of_drive_and_cwd() -> Result<()> { temporary_directories: None, }; assert_eq!( - [&volumes[0], &volumes[1], &readonly, &writable] + [&volumes[0], &volumes[1], &volumes[2], &readonly, &writable] .map(|path| resolved.resolve_access(path, &context)), - [access, access, Read, Write] + [ + access, + access, + if access == Read { Deny } else { access }, + Read, + Write + ] ); } } @@ -76,7 +83,7 @@ fn symbolic_root_precedence_is_independent_of_drive_and_cwd() -> Result<()> { Read, )); assert!(matches!( - materialize_volume_roots(fs, &volumes), + materialize_volume_roots(fs, &volumes, &volumes), Err(PolicyError::UnsupportedSymbolicPath) )); Ok(()) @@ -114,7 +121,7 @@ fn approved_command_expands_volume_roots_without_retaining_original_grants() -> ]); let approved = policy.for_approved_command(&context); assert_eq!(approved.resolve_access(&formerly_readonly, &context), Deny); - let translated = materialize_volume_roots(approved, &volumes)?; + let translated = materialize_volume_roots(approved, &volumes, &volumes[..1])?; assert_eq!( [ &volumes[0], diff --git a/codex-rs/mxc-sandbox/src/windows.rs b/codex-rs/mxc-sandbox/src/windows.rs index 56af7bbbb3..70c38b6185 100644 --- a/codex-rs/mxc-sandbox/src/windows.rs +++ b/codex-rs/mxc-sandbox/src/windows.rs @@ -1,21 +1,28 @@ //! Resolve executor-local state and launch the decoded MXC helper request. use std::collections::HashMap; +use std::os::windows::ffi::OsStrExt; +use std::path::Path; use std::path::PathBuf; use anyhow::Result; use anyhow::ensure; +use codex_utils_path_uri::PathUri; use windows_sys::Win32::Foundation::RPC_E_CHANGED_MODE; +use windows_sys::Win32::Storage::FileSystem::GetDriveTypeW; use windows_sys::Win32::Storage::FileSystem::GetLogicalDrives; use windows_sys::Win32::System::Com::COINIT_MULTITHREADED; use windows_sys::Win32::System::Com::CoInitializeEx; use windows_sys::Win32::System::Com::CoTaskMemFree; use windows_sys::Win32::System::Com::CoUninitialize; use windows_sys::Win32::System::SystemInformation::GetWindowsDirectoryW; +use windows_sys::Win32::System::WindowsProgramming::DRIVE_REMOTE; use windows_sys::Win32::UI::Shell::FOLDERID_ProgramData; use windows_sys::Win32::UI::Shell::FOLDERID_ProgramFiles; use windows_sys::Win32::UI::Shell::FOLDERID_ProgramFilesX86; use windows_sys::Win32::UI::Shell::SHGetKnownFolderPath; +use wxc_common::filesystem_object::ExistingObjectComparison; +use wxc_common::filesystem_object::compare_existing_filesystem_objects; struct ComUninitializeGuard; @@ -85,6 +92,31 @@ pub(super) fn volume_roots( Ok(volumes) } +// Omit only implicit network roots whose object identity MXC cannot inspect. +// Keep healthy shares and cwd volumes; explicit grants follow the normal path. +pub(super) fn implicit_read_roots( + volume_roots: &[PathBuf], + policy_cwd: &Path, + command_cwd: &Path, +) -> std::io::Result> { + volume_roots + .iter() + .filter(|root| { + let wide = root + .as_os_str() + .encode_wide() + .chain([0]) + .collect::>(); + let drive_type = unsafe { GetDriveTypeW(wide.as_ptr()) }; + drive_type != DRIVE_REMOTE + || policy_cwd.starts_with(root) + || command_cwd.starts_with(root) + || compare_existing_filesystem_objects(root, root) == ExistingObjectComparison::Same + }) + .map(PathUri::from_host_native_path) + .collect() +} + fn platform_read_roots() -> Result> { use std::os::windows::ffi::OsStringExt; From c313eb75fd932f9a3b05461a2a227d7a7f7f06f0 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 17:52:45 +0000 Subject: [PATCH 100/155] Prevent duplicate assistant messages around interleaved commands (#54365) ## Why When a command starts before an assistant message completes, the TUI can flush the streamed text and then render it again when the completion arrives. This duplicates the preamble in both live output and replay. ## What changed Track the turn ID, item ID, and source text of the flushed message. Skip rendering its completion again when the identity and text match, allowing for the trailing newline added during stream finalization. Continue rendering completions whose identity or text differs. ## Testing Add an end-to-end test that delays message completion until a command starts and checks that live and replayed transcripts contain the preamble once. Add regression coverage for completions with different text or item IDs. GitOrigin-RevId: 59af0198a99f26ba8ba2a47644ba662301c30011 --- codex-rs/tui/src/app/tests.rs | 2 + .../src/app/tests/streaming_interleave_e2e.rs | 247 ++++++++++++++++++ codex-rs/tui/src/chatwidget/protocol.rs | 2 + codex-rs/tui/src/chatwidget/streaming.rs | 34 ++- .../tui/src/chatwidget/tests/app_server.rs | 41 +++ codex-rs/tui/src/chatwidget/transcript.rs | 6 + 6 files changed, 330 insertions(+), 2 deletions(-) create mode 100644 codex-rs/tui/src/app/tests/streaming_interleave_e2e.rs diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs index 6c8b9a4965..ea58190284 100644 --- a/codex-rs/tui/src/app/tests.rs +++ b/codex-rs/tui/src/app/tests.rs @@ -97,6 +97,8 @@ mod startup_frame_tests; mod startup_warnings_tests; #[path = "tests/stream_animation_tests.rs"] mod stream_animation_tests; +#[path = "tests/streaming_interleave_e2e.rs"] +mod streaming_interleave_e2e; #[path = "tests/thread_usage.rs"] mod thread_usage; #[path = "tests/transcript_composer.rs"] diff --git a/codex-rs/tui/src/app/tests/streaming_interleave_e2e.rs b/codex-rs/tui/src/app/tests/streaming_interleave_e2e.rs new file mode 100644 index 0000000000..f763f65e72 --- /dev/null +++ b/codex-rs/tui/src/app/tests/streaming_interleave_e2e.rs @@ -0,0 +1,247 @@ +//! Real Responses-to-app-server-to-TUI coverage for interleaved assistant output and commands. + +use super::*; +use crate::chatwidget::tests::helpers::normalize_completion_timestamps; +use app_test_support::MockResponsesConfig; +use codex_app_server_client::AppServerEvent; +use codex_app_server_protocol::CommandExecutionStatus; +use codex_model_provider_info::ModelProviderInfo; +use core_test_support::responses; +use core_test_support::streaming_sse::StreamingSseChunk; +use core_test_support::streaming_sse::start_streaming_sse_server; +use pretty_assertions::assert_eq; +use std::time::Duration; +use tokio::sync::oneshot; +use tokio::time::timeout; + +const PREAMBLE: &str = "I’ll inspect the relevant streaming path first."; + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn command_start_before_message_completion_does_not_duplicate_preamble() -> Result<()> { + core_test_support::skip_if_no_network!(Ok(())); + + let (release_completion, completion_gate) = oneshot::channel(); + let (model_server, _completions) = start_streaming_sse_server(vec![ + vec![ + StreamingSseChunk { + gate: None, + body: responses::sse(vec![ + responses::ev_response_created("response-1"), + responses::ev_message_item_added("message-1", ""), + responses::ev_output_text_delta(PREAMBLE), + responses::ev_function_call( + "command-1", + "exec_command", + r#"{"cmd":"echo fixture-output","login":false}"#, + ), + ]), + }, + StreamingSseChunk { + gate: Some(completion_gate), + body: responses::sse(vec![responses::ev_assistant_message("message-1", PREAMBLE)]), + }, + StreamingSseChunk { + gate: None, + body: responses::sse(vec![responses::ev_completed("response-1")]), + }, + ], + vec![StreamingSseChunk { + gate: None, + body: responses::sse(vec![ + responses::ev_response_created("response-2"), + responses::ev_assistant_message("message-2", "Finished."), + responses::ev_completed("response-2"), + ]), + }], + ]) + .await; + + let (mut app, mut app_events, _ops) = make_test_app_with_channels().await; + let codex_home = tempdir()?; + MockResponsesConfig::new(model_server.uri()) + .with_sandbox_mode("danger-full-access") + .write(codex_home.path())?; + app.config.codex_home = codex_home.path().to_path_buf().abs(); + app.config.cwd = codex_home.path().abs(); + app.config.sqlite = codex_state::SqliteConfig::new_for_testing(codex_home.path().abs()); + app.config + .permissions + .approval_policy + .set(codex_protocol::protocol::AskForApproval::Never)?; + app.config + .permissions + .set_permission_profile(codex_protocol::models::PermissionProfile::Disabled)?; + app.config.model = Some("mock-model".to_string()); + app.config.model_provider_id = "mock_provider".to_string(); + app.config.model_provider = ModelProviderInfo { + name: "Mock provider for test".to_string(), + base_url: Some(format!("{}/v1", model_server.uri())), + request_max_retries: Some(0), + stream_max_retries: Some(0), + ..ModelProviderInfo::default() + }; + + let mut tui = crate::tui::test_support::make_test_tui()?; + let mut app_server = Box::pin(crate::start_embedded_app_server_for_picker(&app.config)).await?; + let started = app_server.start_thread(&app.config).await?; + let thread_id = started.session.thread_id; + app.replace_chat_widget_with_app_server_thread( + &mut tui, + started, + super::super::session_lifecycle::ThreadAttachPresentation::Fresh, + /*initial_user_message*/ None, + ) + .await?; + while app_events.try_recv().is_ok() {} + + app.chat_widget + .restore_user_message_to_composer("inspect the stream".into()); + app.chat_widget + .handle_key_event(crossterm::event::KeyEvent::new( + crossterm::event::KeyCode::Enter, + crossterm::event::KeyModifiers::NONE, + )); + let turn = std::iter::from_fn(|| app_events.try_recv().ok()) + .find_map(|event| match event { + AppEvent::CodexOp(turn @ Op::UserTurn { .. }) => Some(turn), + _ => None, + }) + .expect("composer submission should emit a user turn"); + app.submit_thread_op(&mut app_server, thread_id, turn) + .await?; + + let mut release_completion = Some(release_completion); + let mut completed_command = None; + let mut observed_order = Vec::new(); + timeout(Duration::from_secs(/*secs*/ 15), async { + loop { + tokio::select! { + event = app_server.next_event() => { + let event = event.expect("embedded app-server should stay connected"); + let turn_completed = matches!(&event, AppServerEvent::ServerNotification(notification) + if matches!(notification.as_ref(), ServerNotification::TurnCompleted(_))); + if let AppServerEvent::ServerNotification(notification) = &event { + match notification.as_ref() { + ServerNotification::AgentMessageDelta(delta) if delta.delta == PREAMBLE => { + observed_order.push("agent delta"); + } + ServerNotification::ItemStarted(started) + if matches!(&started.item, ThreadItem::CommandExecution { .. }) => + { + observed_order.push("command started"); + release_completion.take().expect("first command start").send(()).expect("completion gate should remain open"); + } + ServerNotification::ItemCompleted(completed) + if matches!(&completed.item, ThreadItem::AgentMessage { text, .. } if text == PREAMBLE) => + { + observed_order.push("agent completed"); + } + ServerNotification::ItemCompleted(completed) => { + if let ThreadItem::CommandExecution { + status, + aggregated_output, + exit_code, + .. + } = &completed.item + { + completed_command = Some(( + status.clone(), + *exit_code, + aggregated_output + .as_deref() + .map(str::trim) + .map(str::to_owned), + )); + } + } + _ => {} + } + } + app.handle_app_server_event(&app_server, event).await; + app.drain_active_thread_events(&mut tui).await?; + if turn_completed { + break Ok::<_, color_eyre::Report>(()); + } + } + event = app_events.recv() => { + let event = event.expect("TUI event stream should stay open"); + app.handle_event(&mut tui, &mut app_server, event).await?; + } + } + } + }) + .await??; + while let Ok(event) = app_events.try_recv() { + app.handle_event(&mut tui, &mut app_server, event).await?; + } + + assert_eq!( + observed_order, + vec!["agent delta", "command started", "agent completed"] + ); + assert_eq!( + completed_command, + Some(( + CommandExecutionStatus::Completed, + Some(0), + Some("fixture-output".to_string()), + )) + ); + for replay in [false, true] { + if replay { + app.store_active_thread_receiver().await; + let (receiver, snapshot) = app + .activate_thread_for_replay(thread_id) + .await + .expect("thread should retain its buffered notifications"); + app.active_thread_rx = Some(receiver); + app.render_thread_snapshot( + &mut tui, + &app_server, + thread_id, + snapshot, + /*resume_restored_queue*/ false, + )?; + while let Ok(event) = app_events.try_recv() { + app.handle_event(&mut tui, &mut app_server, event).await?; + } + } + let transcript_snapshot = app + .transcript_cells + .iter() + // Replay also restores the session header and submitted user prompt. + .filter(|cell| { + !cell.as_any().is::() + && !cell.as_any().is::() + }) + .map(|cell| { + let lines = cell.display_lines(/*width*/ 80); + if cell.as_any().is::() { + lines.first().map(ToString::to_string).unwrap_or_default() + } else { + normalize_completion_timestamps( + cell.as_ref(), + lines + .into_iter() + .map(|line| line.to_string()) + .collect::>() + .join("\n"), + ) + } + }) + .collect::>() + .join("\n"); + insta::allow_duplicates! { + insta::assert_snapshot!(transcript_snapshot, @r" + • I’ll inspect the relevant streaming path first. + • Ran echo fixture-output + • Finished. + Worked for [duration] • [completion time] + "); + } + } + + app_server.shutdown().await?; + model_server.shutdown().await; + Ok(()) +} diff --git a/codex-rs/tui/src/chatwidget/protocol.rs b/codex-rs/tui/src/chatwidget/protocol.rs index b68e13a2dd..5bd2254d86 100644 --- a/codex-rs/tui/src/chatwidget/protocol.rs +++ b/codex-rs/tui/src/chatwidget/protocol.rs @@ -128,6 +128,8 @@ impl ChatWidget { ¬ification.item_id, )) { + self.transcript.active_streamed_agent_message = + Some((notification.turn_id, notification.item_id)); self.on_agent_message_delta(notification.delta); } } diff --git a/codex-rs/tui/src/chatwidget/streaming.rs b/codex-rs/tui/src/chatwidget/streaming.rs index 1957cc4b37..7dee87c171 100644 --- a/codex-rs/tui/src/chatwidget/streaming.rs +++ b/codex-rs/tui/src/chatwidget/streaming.rs @@ -6,6 +6,10 @@ use super::*; use crate::markdown_render::ListSpacing; +fn streamed_message_matches_completed(streamed: &str, completed: &str) -> bool { + streamed == completed || streamed.strip_suffix('\n') == Some(completed) +} + fn latest_summary_line(text: &str) -> Option { text.lines().rev().find_map(|line| { let line = line.trim(); @@ -97,7 +101,7 @@ impl ChatWidget { return true; }; // Stream finalization supplies one trailing newline when the last delta omitted it. - streamed != completed && streamed.strip_suffix('\n') != Some(completed) + !streamed_message_matches_completed(streamed, completed) }); let scrollback_reflow = if needs_scrollback_reflow || completed_message_differs { crate::app_event::ConsolidationScrollbackReflow::Required @@ -120,6 +124,13 @@ impl ChatWidget { }; // Consolidate the run of streaming AgentMessageCells into a single AgentMarkdownCell // that can re-render from source on resize. + if completed_message.is_none() { + self.transcript.last_flushed_agent_message = self + .transcript + .active_streamed_agent_message + .take() + .zip(streamed_source.clone()); + } let copy_source = completed_message.map(str::to_owned).or(streamed_source); let source = copy_source.as_deref().map(|source| { parse_assistant_markdown(source, self.config.cwd.as_path()).visible_markdown @@ -149,6 +160,10 @@ impl ChatWidget { if had_stream_controller { self.request_pending_usage_output_insertion_after_stream_shutdown(); } + if completed_message.is_some() { + self.transcript.active_streamed_agent_message = None; + self.transcript.last_flushed_agent_message = None; + } } pub(super) fn stream_controllers_idle(&self) -> bool { @@ -187,10 +202,21 @@ impl ChatWidget { self.status_state.pending_status_indicator_restore = false; } + fn completed_agent_message_was_flushed(&self, message: &str) -> bool { + self.transcript + .last_completed_agent_message + .as_ref() + .zip(self.transcript.last_flushed_agent_message.as_ref()) + .is_some_and(|(completed, (flushed, streamed))| { + completed == flushed && streamed_message_matches_completed(streamed, message) + }) + } + pub(super) fn finalize_completed_assistant_message(&mut self, message: Option<&str>) { if self.stream_controller.is_none() && let Some(message) = message && !message.is_empty() + && !self.completed_agent_message_was_flushed(message) { let displayed = parse_assistant_markdown(message, self.config.cwd.as_path()).visible_markdown; @@ -429,7 +455,11 @@ impl ChatWidget { } } let parsed = parse_assistant_markdown(&message, self.config.cwd.as_path()); - if from_replay && self.stream_controller.is_none() && !parsed.visible_markdown.is_empty() { + if from_replay + && self.stream_controller.is_none() + && !parsed.visible_markdown.is_empty() + && !self.completed_agent_message_was_flushed(&message) + { self.prepare_assistant_message(); self.mark_safety_buffering_agent_message_started(); self.bottom_pane.hide_status_indicator(); diff --git a/codex-rs/tui/src/chatwidget/tests/app_server.rs b/codex-rs/tui/src/chatwidget/tests/app_server.rs index 8e83ad083a..7017aca6c1 100644 --- a/codex-rs/tui/src/chatwidget/tests/app_server.rs +++ b/codex-rs/tui/src/chatwidget/tests/app_server.rs @@ -1748,6 +1748,47 @@ async fn live_app_server_turn_completion_repairs_dropped_message_deltas() { )); } +#[tokio::test] +async fn live_app_server_interleaved_flush_repairs_mismatched_completion() { + for (completed_item_id, completed) in [ + ("msg-1", "The transport kept this.\nAnd dropped this."), + ("msg-2", "The transport kept this."), + ] { + let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + + handle_turn_started(&mut chat, "turn-1"); + while rx.try_recv().is_ok() {} + handle_agent_message_delta(&mut chat, "The transport kept this."); + chat.flush_answer_stream_with_separator(); + while rx.try_recv().is_ok() {} + + complete_assistant_message( + &mut chat, + completed_item_id, + completed, + Some(MessagePhase::FinalAnswer), + ); + + let consolidations = std::iter::from_fn(|| rx.try_recv().ok()) + .filter_map(|event| match event { + AppEvent::ConsolidateAgentMessage { + source, + scrollback_reflow, + .. + } => Some((source, scrollback_reflow)), + _ => None, + }) + .collect::>(); + assert_eq!( + consolidations, + vec![( + completed.to_string(), + crate::app_event::ConsolidationScrollbackReflow::IfResizeReflowRan, + )] + ); + } +} + #[tokio::test] async fn live_app_server_stream_recovery_restores_previous_status_header() { let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; diff --git a/codex-rs/tui/src/chatwidget/transcript.rs b/codex-rs/tui/src/chatwidget/transcript.rs index f055cd1b7b..ef2aba3bd0 100644 --- a/codex-rs/tui/src/chatwidget/transcript.rs +++ b/codex-rs/tui/src/chatwidget/transcript.rs @@ -48,6 +48,10 @@ pub(super) struct TranscriptState { /// Latest `/status` card and fields, retained across copying until a later turn or command. pub(super) last_status_copy_targets: Option, pub(super) last_completed_agent_message: Option<(String, String)>, + /// Turn and item IDs for the agent message currently supplying streamed deltas. + pub(super) active_streamed_agent_message: Option<(String, String)>, + /// Turn/item identity and raw source of the latest interleaved stream flush. + pub(super) last_flushed_agent_message: Option<((String, String), String)>, /// Raw markdown of the most recently completed proposed plan. pub(super) latest_proposed_plan_markdown: Option, /// Whether this turn already produced a copyable response. @@ -107,6 +111,8 @@ impl TranscriptState { pub(super) fn reset_turn_flags(&mut self) { self.saw_copy_source_this_turn = false; self.last_completed_agent_message = None; + self.active_streamed_agent_message = None; + self.last_flushed_agent_message = None; self.saw_plan_update_this_turn = false; self.saw_plan_item_this_turn = false; self.latest_proposed_plan_markdown = None; From 7ae831991792744434027c431dfbc7e81dd5c12c Mon Sep 17 00:00:00 2001 From: willwang-openai Date: Thu, 15 Oct 2026 17:55:14 +0000 Subject: [PATCH 101/155] Retry SQLite operations on transient writer contention (#54369) ## Why Competing SQLite writers can cause database opening and writes to fail with `SQLITE_BUSY`. Deferred write transactions can also encounter contention after taking a read snapshot. ## What changed - Add up to two retries with 100 ms and 200 ms delays for SQLite busy errors during pool opening, writer admission, and standalone writes. - Use a shared `BEGIN IMMEDIATE` helper across state, thread history, and agent message board writes to acquire the writer slot before reading. - Preserve bound arguments when retrying standalone writes, and commit writes using `RETURNING` before exposing their results. Retry transaction admission without replaying an already-started transaction. ## Testing Add tests using real SQLite writer contention to verify recovery after a competing writer releases its lock. Queue tests cover enqueue, update, and delete, checking preserved payloads, single revision increments, and no duplicate messages or unintended deletions. GitOrigin-RevId: ac5bd31a87c67cc47fb385bf3fa5435a54ff70f0 --- .../src/local/lifecycle.rs | 12 +- .../ext/agent-message-board/src/local/pool.rs | 6 +- codex-rs/state/src/lib.rs | 1 + codex-rs/state/src/migrations.rs | 3 +- codex-rs/state/src/runtime.rs | 3 +- codex-rs/state/src/runtime/backfill.rs | 9 +- .../runtime/external_agent_config_imports.rs | 3 +- codex-rs/state/src/runtime/goals.rs | 27 +- codex-rs/state/src/runtime/memories.rs | 35 ++- codex-rs/state/src/runtime/projects.rs | 11 +- codex-rs/state/src/runtime/queued_items.rs | 12 +- codex-rs/state/src/runtime/remote_control.rs | 7 +- .../state/src/runtime/rollout_migration.rs | 7 +- .../state/src/runtime/thread_attachments.rs | 7 +- .../state/src/runtime/thread_section_order.rs | 3 +- codex-rs/state/src/runtime/thread_sections.rs | 8 +- codex-rs/state/src/runtime/threads.rs | 36 +-- codex-rs/state/src/sqlite.rs | 9 +- codex-rs/state/src/sqlite/busy_retry.rs | 191 +++++++++++++ codex-rs/state/src/sqlite/retry_tests.rs | 267 ++++++++++++++++++ .../thread-store/src/local/thread_history.rs | 8 +- 21 files changed, 572 insertions(+), 93 deletions(-) create mode 100644 codex-rs/state/src/sqlite/busy_retry.rs create mode 100644 codex-rs/state/src/sqlite/retry_tests.rs diff --git a/codex-rs/ext/agent-message-board/src/local/lifecycle.rs b/codex-rs/ext/agent-message-board/src/local/lifecycle.rs index 8b3daa3196..12e30dda61 100644 --- a/codex-rs/ext/agent-message-board/src/local/lifecycle.rs +++ b/codex-rs/ext/agent-message-board/src/local/lifecycle.rs @@ -13,6 +13,7 @@ use super::storage_error; use codex_protocol::SessionId; use codex_protocol::error::Result; use codex_state::SqliteConfig; +use codex_state::SqlitePoolWriteExt; use sqlx::Sqlite; use sqlx::Transaction; use std::sync::Weak; @@ -62,10 +63,7 @@ impl LocalAgentMessageBoard { .execute(&pool) .await .map_err(storage_error)?; - let mut tx = pool - .begin_with("BEGIN IMMEDIATE") - .await - .map_err(storage_error)?; + let mut tx = pool.begin_immediate().await.map_err(storage_error)?; for root in roots { sqlx::query("INSERT OR IGNORE INTO deleted_boards (board) VALUES (?)") .bind(root.to_string()) @@ -92,11 +90,7 @@ impl LocalAgentMessageBoard { } pub(super) async fn begin_write(&self) -> Result> { - let mut tx = self - .pool - .begin_with("BEGIN IMMEDIATE") - .await - .map_err(storage_error)?; + let mut tx = self.pool.begin_immediate().await.map_err(storage_error)?; let deleted: bool = sqlx::query_scalar("SELECT EXISTS(SELECT 1 FROM deleted_boards WHERE board=?)") .bind(self.identity.to_string()) diff --git a/codex-rs/ext/agent-message-board/src/local/pool.rs b/codex-rs/ext/agent-message-board/src/local/pool.rs index b27417ca74..c39b48d5ea 100644 --- a/codex-rs/ext/agent-message-board/src/local/pool.rs +++ b/codex-rs/ext/agent-message-board/src/local/pool.rs @@ -4,6 +4,7 @@ use super::storage_error; use codex_protocol::error::Result; use codex_state::SqliteConfig; +use codex_state::SqlitePoolWriteExt; use sqlx::SqlitePool; use std::collections::HashMap; use std::path::PathBuf; @@ -70,10 +71,7 @@ pub(super) async fn open(sqlite: &SqliteConfig) -> Result> { .open_read_write_pool(&path) .await .map_err(storage_error)?; - let mut tx = pool - .begin_with("BEGIN IMMEDIATE") - .await - .map_err(storage_error)?; + let mut tx = pool.begin_immediate().await.map_err(storage_error)?; sqlx::raw_sql(SCHEMA) .execute(&mut *tx) .await diff --git a/codex-rs/state/src/lib.rs b/codex-rs/state/src/lib.rs index d1de678a86..78aea77025 100644 --- a/codex-rs/state/src/lib.rs +++ b/codex-rs/state/src/lib.rs @@ -41,6 +41,7 @@ pub use runtime::MAX_GUARDIAN_REVIEW_RECORDS_PER_THREAD; /// Preferred entrypoint: owns configuration and metrics. pub use runtime::StateRuntime; pub use sqlite::SqliteConfig; +pub use sqlite::SqlitePoolWriteExt; pub use audit::ThreadStateAuditRow; pub use audit::read_thread_state_audit_rows; diff --git a/codex-rs/state/src/migrations.rs b/codex-rs/state/src/migrations.rs index efbb76cc09..33eed1bb96 100644 --- a/codex-rs/state/src/migrations.rs +++ b/codex-rs/state/src/migrations.rs @@ -1,5 +1,6 @@ use std::borrow::Cow; +use crate::sqlite::SqliteWriteQueryExt; use sqlx::migrate::Migrator; use sqlx_sqlite::SqlitePool; @@ -112,7 +113,7 @@ WHERE version = ? .bind(38_i64) .bind(recency_migration.checksum.as_ref()) .bind(recency_migration.version) - .execute(pool) + .execute_with_busy_retry(pool) .await?; Ok(()) } diff --git a/codex-rs/state/src/runtime.rs b/codex-rs/state/src/runtime.rs index 244f219cd5..58dd668469 100644 --- a/codex-rs/state/src/runtime.rs +++ b/codex-rs/state/src/runtime.rs @@ -19,6 +19,7 @@ use crate::model::datetime_to_epoch_millis; use crate::model::datetime_to_epoch_seconds; use crate::model::epoch_millis_to_datetime; use crate::paths::file_modified_time_utc; +use crate::sqlite::SqliteWriteQueryExt; use crate::telemetry::DbKind; use crate::telemetry::DbTelemetry; use chrono::DateTime; @@ -391,7 +392,7 @@ ON CONFLICT(id) DO NOTHING .bind(1_i64) .bind(crate::BackfillStatus::Pending.as_str()) .bind(Utc::now().timestamp()) - .execute(pool) + .execute_with_busy_retry(pool) .await?; Ok(()) } diff --git a/codex-rs/state/src/runtime/backfill.rs b/codex-rs/state/src/runtime/backfill.rs index 1acbf01274..1ef89e54ee 100644 --- a/codex-rs/state/src/runtime/backfill.rs +++ b/codex-rs/state/src/runtime/backfill.rs @@ -1,4 +1,5 @@ use super::*; +use crate::sqlite::SqliteWriteQueryExt; impl StateRuntime { pub async fn get_backfill_state(&self) -> anyhow::Result { @@ -38,7 +39,7 @@ WHERE id = 1 .bind(crate::BackfillStatus::Complete.as_str()) .bind(crate::BackfillStatus::Running.as_str()) .bind(lease_cutoff) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() == 1) } @@ -55,7 +56,7 @@ WHERE id = 1 ) .bind(crate::BackfillStatus::Running.as_str()) .bind(Utc::now().timestamp()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } @@ -73,7 +74,7 @@ WHERE id = 1 .bind(crate::BackfillStatus::Running.as_str()) .bind(watermark) .bind(Utc::now().timestamp()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } @@ -97,7 +98,7 @@ WHERE id = 1 .bind(last_watermark) .bind(now) .bind(now) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } diff --git a/codex-rs/state/src/runtime/external_agent_config_imports.rs b/codex-rs/state/src/runtime/external_agent_config_imports.rs index 6a6c2edf6d..7b2ea28f39 100644 --- a/codex-rs/state/src/runtime/external_agent_config_imports.rs +++ b/codex-rs/state/src/runtime/external_agent_config_imports.rs @@ -1,5 +1,6 @@ use super::StateRuntime; use crate::model::datetime_to_epoch_millis; +use crate::sqlite::SqliteWriteQueryExt; use chrono::Utc; use serde::Deserialize; use serde::Serialize; @@ -72,7 +73,7 @@ ON CONFLICT(import_id) DO UPDATE SET .bind(datetime_to_epoch_millis(Utc::now())) .bind(serde_json::to_string(successes)?) .bind(serde_json::to_string(failures)?) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) diff --git a/codex-rs/state/src/runtime/goals.rs b/codex-rs/state/src/runtime/goals.rs index ed616e16b7..9f58554314 100644 --- a/codex-rs/state/src/runtime/goals.rs +++ b/codex-rs/state/src/runtime/goals.rs @@ -1,5 +1,7 @@ use super::*; use crate::model::ThreadGoalRow; +use crate::sqlite::SqlitePoolWriteExt; +use crate::sqlite::SqliteWriteQueryExt; use uuid::Uuid; #[derive(Clone)] @@ -69,7 +71,7 @@ WHERE thread_id = ? &self, goal: &crate::ThreadGoal, ) -> anyhow::Result<()> { - let mut transaction = self.pool.begin().await?; + let mut transaction = self.pool.begin_immediate().await?; sqlx::query( r#" INSERT INTO thread_goals ( @@ -147,7 +149,7 @@ SELECT EXISTS( ) -> anyhow::Result<()> { sqlx::query("DELETE FROM thread_goal_continuation_deferrals WHERE thread_id = ?") .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) @@ -204,7 +206,7 @@ RETURNING .bind(token_budget) .bind(now_ms) .bind(now_ms) - .fetch_one(self.pool.as_ref()) + .fetch_one_write(self.pool.as_ref()) .await?; thread_goal_from_row(&row) @@ -262,7 +264,7 @@ RETURNING .bind(token_budget) .bind(now_ms) .bind(now_ms) - .fetch_optional(self.pool.as_ref()) + .fetch_optional_write(self.pool.as_ref()) .await?; row.map(|row| thread_goal_from_row(&row)).transpose() @@ -315,7 +317,7 @@ WHERE thread_id = ? .bind(thread_id.to_string()) .bind(expected_goal_id) .bind(expected_goal_id) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? } (Some(status), None) => { @@ -346,7 +348,7 @@ WHERE thread_id = ? .bind(thread_id.to_string()) .bind(expected_goal_id) .bind(expected_goal_id) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? } (None, Some(token_budget)) => { @@ -374,7 +376,7 @@ WHERE thread_id = ? .bind(thread_id.to_string()) .bind(expected_goal_id) .bind(expected_goal_id) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? } (None, None) => { @@ -394,7 +396,7 @@ WHERE thread_id = ? .bind(thread_id.to_string()) .bind(expected_goal_id) .bind(expected_goal_id) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? } else { let goal = self.get_thread_goal(thread_id).await?; @@ -459,7 +461,7 @@ WHERE thread_id = ? .bind(now_ms) .bind(thread_id.to_string()) .bind(status.as_str()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; if result.rows_affected() == 0 { @@ -490,7 +492,7 @@ RETURNING "#, ) .bind(thread_id.to_string()) - .fetch_optional(self.pool.as_ref()) + .fetch_optional_write(self.pool.as_ref()) .await?; row.map(|row| thread_goal_from_row(&row)).transpose() @@ -598,7 +600,10 @@ RETURNING "#, ); - let row = builder.build().fetch_optional(self.pool.as_ref()).await?; + let row = builder + .build() + .fetch_optional_write(self.pool.as_ref()) + .await?; let Some(row) = row else { return Ok(GoalAccountingOutcome::Unchanged( diff --git a/codex-rs/state/src/runtime/memories.rs b/codex-rs/state/src/runtime/memories.rs index 2cb66d1f8c..f11a779fb6 100644 --- a/codex-rs/state/src/runtime/memories.rs +++ b/codex-rs/state/src/runtime/memories.rs @@ -11,6 +11,8 @@ use crate::model::Stage1JobClaimOutcome; use crate::model::Stage1Output; use crate::model::Stage1StartupClaimParams; use crate::model::ThreadRow; +use crate::sqlite::SqlitePoolWriteExt; +use crate::sqlite::SqliteWriteQueryExt; use chrono::DateTime; use chrono::Duration; use sqlx::Executor; @@ -64,7 +66,7 @@ impl MemoryStore { } let now = Utc::now().timestamp(); - let mut tx = self.pool.begin().await?; + let mut tx = self.pool.begin_immediate().await?; let mut updated_rows = 0; for thread_id in thread_ids { @@ -299,7 +301,7 @@ FROM threads pub(super) async fn delete_thread_memory(&self, thread_id: ThreadId) -> anyhow::Result<()> { let now = Utc::now().timestamp(); let thread_id = thread_id.to_string(); - let mut tx = self.pool.begin().await?; + let mut tx = self.pool.begin_immediate().await?; let existing_output = sqlx::query( r#" @@ -428,7 +430,7 @@ WHERE thread_id IN ( ) .bind(cutoff) .bind(limit as i64) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? .rows_affected(); @@ -652,7 +654,7 @@ WHERE id = ? AND memory_mode != 'polluted' "#, ) .bind(thread_id.as_str()) - .execute(self.state_pool.as_ref()) + .execute_with_busy_retry(self.state_pool.as_ref()) .await? .rows_affected(); @@ -694,7 +696,7 @@ WHERE id = ? AND memory_mode != 'polluted' let thread_id = thread_id.to_string(); let worker_id = worker_id.to_string(); - let mut tx = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut tx = self.pool.begin_immediate().await?; let existing_output = sqlx::query( r#" @@ -878,7 +880,7 @@ WHERE kind = ? AND job_key = ? let now = Utc::now().timestamp(); let thread_id = thread_id.to_string(); - let mut tx = self.pool.begin().await?; + let mut tx = self.pool.begin_immediate().await?; let rows_affected = sqlx::query( r#" UPDATE jobs @@ -955,7 +957,7 @@ WHERE excluded.source_updated_at >= stage1_outputs.source_updated_at let now = Utc::now().timestamp(); let thread_id = thread_id.to_string(); - let mut tx = self.pool.begin().await?; + let mut tx = self.pool.begin_immediate().await?; let rows_affected = sqlx::query( r#" UPDATE jobs @@ -1053,7 +1055,7 @@ WHERE kind = ? AND job_key = ? .bind(JOB_KIND_MEMORY_STAGE1) .bind(thread_id.as_str()) .bind(ownership_token) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? .rows_affected(); @@ -1068,7 +1070,10 @@ WHERE kind = ? AND job_key = ? /// Phase 2 does not use this watermark as a dirty check; git workspace diffing /// decides whether consolidation work exists after the lock is claimed. pub async fn enqueue_global_consolidation(&self, input_watermark: i64) -> anyhow::Result<()> { - enqueue_global_consolidation_with_executor(self.pool.as_ref(), input_watermark).await + crate::sqlite::retry_on_busy(|| { + enqueue_global_consolidation_with_executor(self.pool.as_ref(), input_watermark) + }) + .await } /// Attempts to claim the global phase-2 consolidation lock. @@ -1095,7 +1100,7 @@ WHERE kind = ? AND job_key = ? let ownership_token = Uuid::new_v4().to_string(); let worker_id = worker_id.to_string(); - let mut tx = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut tx = self.pool.begin_immediate().await?; let existing_job = sqlx::query( r#" @@ -1240,7 +1245,7 @@ WHERE kind = ? AND job_key = ? .bind(JOB_KIND_MEMORY_CONSOLIDATE_GLOBAL) .bind(MEMORY_CONSOLIDATION_JOB_KEY) .bind(ownership_token) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? .rows_affected(); @@ -1263,7 +1268,7 @@ WHERE kind = ? AND job_key = ? completed_watermark: i64, selected_outputs: &[Stage1Output], ) -> anyhow::Result { - let mut tx = self.pool.begin().await?; + let mut tx = self.pool.begin_immediate().await?; let rows_affected = mark_global_phase2_job_succeeded_row(&mut *tx, ownership_token, completed_watermark) .await?; @@ -1347,7 +1352,7 @@ WHERE kind = ? AND job_key = ? .bind(JOB_KIND_MEMORY_CONSOLIDATE_GLOBAL) .bind(MEMORY_CONSOLIDATION_JOB_KEY) .bind(ownership_token) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? .rows_affected(); @@ -1389,7 +1394,7 @@ WHERE kind = ? AND job_key = ? .bind(JOB_KIND_MEMORY_CONSOLIDATE_GLOBAL) .bind(MEMORY_CONSOLIDATION_JOB_KEY) .bind(ownership_token) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? .rows_affected(); @@ -1432,7 +1437,7 @@ WHERE kind = ? AND job_key = ? } pub(super) async fn clear_memory_data_in_pool(pool: &SqlitePool) -> anyhow::Result<()> { - let mut tx = pool.begin().await?; + let mut tx = pool.begin_immediate().await?; sqlx::query("UPDATE consolidation_progress SET max_thread_count = 0") .execute(&mut *tx) .await?; diff --git a/codex-rs/state/src/runtime/projects.rs b/codex-rs/state/src/runtime/projects.rs index 8a94d2e9f0..b21ce3397d 100644 --- a/codex-rs/state/src/runtime/projects.rs +++ b/codex-rs/state/src/runtime/projects.rs @@ -15,6 +15,7 @@ use crate::ProjectRoot; use crate::ProjectSortKey; use crate::ProjectsPage; use crate::SortDirection; +use crate::sqlite::SqlitePoolWriteExt; const PROJECT_SELECT: &str = "SELECT projects.*, (SELECT MAX(recency_at_ms) FROM threads @@ -27,7 +28,7 @@ impl StateRuntime { thread_id: &str, project_id: Option<&str>, ) -> anyhow::Result>> { - let mut tx = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut tx = self.pool.begin_immediate().await?; if let Some(project_id) = project_id { let exists = sqlx::query_scalar::<_, i64>("SELECT COUNT(*) FROM projects WHERE id = ?") .bind(project_id) @@ -143,7 +144,7 @@ impl StateRuntime { thread_ids: &[String], idempotency_key: &str, ) -> anyhow::Result { - let mut tx = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut tx = self.pool.begin_immediate().await?; let existing_project_id = sqlx::query_scalar::<_, String>( "SELECT project_id FROM project_idempotency_keys WHERE key = ?", ) @@ -234,7 +235,7 @@ impl StateRuntime { roots: Option>, metadata: Option>, ) -> anyhow::Result> { - let mut tx = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut tx = self.pool.begin_immediate().await?; let row = QueryBuilder::::new(PROJECT_SELECT) .push(" WHERE id = ") .push_bind(id) @@ -291,7 +292,7 @@ impl StateRuntime { project_id: &str, before_project_id: Option<&str>, ) -> anyhow::Result> { - let mut tx = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut tx = self.pool.begin_immediate().await?; let mut project_ids = sqlx::query_scalar::<_, String>( "SELECT id FROM projects ORDER BY position ASC, id ASC", ) @@ -340,7 +341,7 @@ impl StateRuntime { &self, id: &str, ) -> anyhow::Result, Vec)>> { - let mut tx = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut tx = self.pool.begin_immediate().await?; let exists = sqlx::query_scalar::<_, i64>("SELECT COUNT(*) FROM projects WHERE id = ?") .bind(id) .fetch_one(&mut *tx) diff --git a/codex-rs/state/src/runtime/queued_items.rs b/codex-rs/state/src/runtime/queued_items.rs index 3cbf32b6ee..9a6b387522 100644 --- a/codex-rs/state/src/runtime/queued_items.rs +++ b/codex-rs/state/src/runtime/queued_items.rs @@ -1,6 +1,8 @@ use super::*; use crate::MAX_QUEUE_ITEMS; use crate::QueuedUserSubmissionRecord; +use crate::sqlite::SqlitePoolWriteExt; +use crate::sqlite::SqliteWriteQueryExt; use sqlx::Connection; use tokio::sync::Mutex; use uuid::Uuid; @@ -99,7 +101,7 @@ impl SqliteQueueStore { .bind(now_ms) .bind(thread_id.to_string()) .bind(i64::try_from(MAX_QUEUE_ITEMS)?) - .fetch_one(self.pool.as_ref()) + .fetch_one_write(self.pool.as_ref()) .await?; QueuedUserSubmissionRecord::try_from_row(&row) } @@ -142,7 +144,7 @@ impl SqliteQueueStore { .bind(datetime_to_epoch_millis(Utc::now())) .bind(thread_id.to_string()) .bind(item_id) - .fetch_optional(self.pool.as_ref()) + .fetch_optional_write(self.pool.as_ref()) .await?; row.as_ref() .map(QueuedUserSubmissionRecord::try_from_row) @@ -154,7 +156,7 @@ impl SqliteQueueStore { sqlx::query("DELETE FROM queued_items WHERE thread_id = ? AND id = ?") .bind(thread_id.to_string()) .bind(item_id) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? .rows_affected() > 0, @@ -162,7 +164,7 @@ impl SqliteQueueStore { } pub async fn reorder(&self, thread_id: ThreadId, ordered_ids: &[String]) -> anyhow::Result<()> { - let mut transaction = self.pool.begin().await?; + let mut transaction = self.pool.begin_immediate().await?; let rows: Vec<(String, i64)> = sqlx::query_as( "SELECT id, queue_order FROM queued_items WHERE thread_id = ? ORDER BY queue_order", @@ -203,7 +205,7 @@ impl SqliteQueueStore { pub(crate) async fn delete_thread_queue(&self, thread_id: ThreadId) -> anyhow::Result { Ok(sqlx::query("DELETE FROM queued_items WHERE thread_id = ?") .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await? .rows_affected() > 0) diff --git a/codex-rs/state/src/runtime/remote_control.rs b/codex-rs/state/src/runtime/remote_control.rs index f09bb015d3..0ab312d895 100644 --- a/codex-rs/state/src/runtime/remote_control.rs +++ b/codex-rs/state/src/runtime/remote_control.rs @@ -1,4 +1,5 @@ use super::*; +use crate::sqlite::SqliteWriteQueryExt; const REMOTE_CONTROL_APP_SERVER_CLIENT_NAME_NONE: &str = ""; @@ -97,7 +98,7 @@ ON CONFLICT(websocket_url, account_id, app_server_client_name) DO UPDATE SET .bind(&enrollment.server_name) .bind(enrollment.remote_control_enabled) .bind(Utc::now().timestamp()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } @@ -123,7 +124,7 @@ WHERE websocket_url = ? AND account_id = ? AND app_server_client_name = ? .bind(remote_control_app_server_client_name_key( app_server_client_name, )) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected()) } @@ -145,7 +146,7 @@ WHERE websocket_url = ? AND account_id = ? AND app_server_client_name = ? .bind(remote_control_app_server_client_name_key( app_server_client_name, )) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected()) } diff --git a/codex-rs/state/src/runtime/rollout_migration.rs b/codex-rs/state/src/runtime/rollout_migration.rs index bc1c55720e..8c26474c7e 100644 --- a/codex-rs/state/src/runtime/rollout_migration.rs +++ b/codex-rs/state/src/runtime/rollout_migration.rs @@ -5,6 +5,7 @@ //! old rollouts on every startup while still retrying skipped files that later change. use super::*; +use crate::sqlite::SqliteWriteQueryExt; impl StateRuntime { pub async fn get_rollout_migration_state( @@ -70,7 +71,7 @@ WHERE excluded.last_checked_thread_created_at IS NOT NULL .bind(thread_created_at) .bind(thread_id) .bind(now) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } @@ -124,7 +125,7 @@ ON CONFLICT(migration_id, rollout_path) DO UPDATE SET .bind(skipped_rollout.rollout_modified_at_ns) .bind(skipped_rollout.skip_reason.as_str()) .bind(now) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } @@ -142,7 +143,7 @@ WHERE migration_id = ? AND rollout_path = ? ) .bind(migration_id) .bind(rollout_path) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } diff --git a/codex-rs/state/src/runtime/thread_attachments.rs b/codex-rs/state/src/runtime/thread_attachments.rs index e776015469..9dc8f67d59 100644 --- a/codex-rs/state/src/runtime/thread_attachments.rs +++ b/codex-rs/state/src/runtime/thread_attachments.rs @@ -13,6 +13,7 @@ use crate::ThreadAttachmentArchiveFilter; use crate::ThreadAttachmentOwner; use crate::ThreadAttachmentOwnerPage; use crate::ThreadAttachmentPage; +use crate::sqlite::SqlitePoolWriteExt; use anyhow::Context; use chrono::Utc; use codex_protocol::ThreadId; @@ -32,7 +33,7 @@ impl StateRuntime { source_thread_id: ThreadId, destination_thread_id: ThreadId, ) -> anyhow::Result<()> { - let mut transaction = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut transaction = self.pool.begin_immediate().await?; let destination = destination_thread_id.to_string(); let exists = sqlx::query_scalar::<_, i64>("SELECT 1 FROM threads WHERE id = ?") .bind(&destination) @@ -84,7 +85,7 @@ impl StateRuntime { ); } - let mut transaction = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut transaction = self.pool.begin_immediate().await?; let thread_id_string = thread_id.to_string(); let thread_exists = sqlx::query_scalar::<_, i64>("SELECT 1 FROM threads WHERE id = ?") .bind(&thread_id_string) @@ -152,7 +153,7 @@ impl StateRuntime { identity_key: &str, ) -> anyhow::Result { validate_attachment_identity(attachment_type, identity_key)?; - let mut transaction = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut transaction = self.pool.begin_immediate().await?; let thread_id_string = thread_id.to_string(); let thread_exists = sqlx::query_scalar::<_, i64>("SELECT 1 FROM threads WHERE id = ?") .bind(&thread_id_string) diff --git a/codex-rs/state/src/runtime/thread_section_order.rs b/codex-rs/state/src/runtime/thread_section_order.rs index f5b919847f..b5aa3ee625 100644 --- a/codex-rs/state/src/runtime/thread_section_order.rs +++ b/codex-rs/state/src/runtime/thread_section_order.rs @@ -1,4 +1,5 @@ use super::StateRuntime; +use crate::sqlite::SqlitePoolWriteExt; use chrono::DateTime; use chrono::Utc; use codex_protocol::ThreadId; @@ -113,7 +114,7 @@ LIMIT ? )); } - let mut tx = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut tx = self.pool.begin_immediate().await?; let thread_id = thread_id.to_string(); let current_section = sqlx::query_scalar::<_, Option>( "SELECT thread_section_id FROM threads WHERE id = ?", diff --git a/codex-rs/state/src/runtime/thread_sections.rs b/codex-rs/state/src/runtime/thread_sections.rs index f8c6f02378..71bb203107 100644 --- a/codex-rs/state/src/runtime/thread_sections.rs +++ b/codex-rs/state/src/runtime/thread_sections.rs @@ -2,6 +2,8 @@ use super::StateRuntime; use crate::PINNED_THREAD_SECTION_ID; use crate::ThreadSection; use crate::ThreadSectionAppearance; +use crate::sqlite::SqlitePoolWriteExt; +use crate::sqlite::SqliteWriteQueryExt; use uuid::Uuid; impl StateRuntime { @@ -27,7 +29,7 @@ impl StateRuntime { .map(serde_json::to_string) .transpose()?, ) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(section) @@ -56,7 +58,7 @@ impl StateRuntime { .bind(replace_appearance) .bind(appearance) .bind(id) - .fetch_optional(self.pool.as_ref()) + .fetch_optional_write(self.pool.as_ref()) .await?; section.map(ThreadSection::from_row).transpose() @@ -68,7 +70,7 @@ impl StateRuntime { anyhow::bail!("built-in pinned thread section cannot be deleted"); } - let mut tx = self.pool.begin_with("BEGIN IMMEDIATE").await?; + let mut tx = self.pool.begin_immediate().await?; sqlx::query( "UPDATE threads SET section_position = NULL, section_entered_at_ms = NULL WHERE thread_section_id = ?", ) diff --git a/codex-rs/state/src/runtime/threads.rs b/codex-rs/state/src/runtime/threads.rs index 1179126f62..96704dfa08 100644 --- a/codex-rs/state/src/runtime/threads.rs +++ b/codex-rs/state/src/runtime/threads.rs @@ -1,5 +1,7 @@ use super::*; use crate::SortDirection; +use crate::sqlite::SqlitePoolWriteExt; +use crate::sqlite::SqliteWriteQueryExt; use codex_protocol::SanitizedGitUrl; use codex_protocol::protocol::SessionSource; use std::sync::atomic::AtomicI64; @@ -94,7 +96,7 @@ WHERE id = ? .bind(crate::GUARDIAN_THREAD_TITLE) .bind(legacy_name) .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() > 0) } @@ -124,7 +126,7 @@ WHERE id = ? AND preview = '' ) .bind(preview) .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() > 0) } @@ -151,7 +153,7 @@ ON CONFLICT(child_thread_id) DO UPDATE SET .bind(parent_thread_id.to_string()) .bind(child_thread_id.to_string()) .bind(status.as_ref()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } @@ -165,7 +167,7 @@ ON CONFLICT(child_thread_id) DO UPDATE SET sqlx::query("UPDATE thread_spawn_edges SET status = ? WHERE child_thread_id = ?") .bind(status.as_ref()) .bind(child_thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } @@ -362,7 +364,7 @@ ON CONFLICT(child_thread_id) DO NOTHING .bind(parent_thread_id.to_string()) .bind(child_thread_id.to_string()) .bind(crate::DirectionalThreadSpawnEdgeStatus::Open.as_ref()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(()) } @@ -418,7 +420,7 @@ ON CONFLICT(child_thread_id) DO NOTHING .bind(replacement.display().to_string()) .bind(id.to_string()) .bind(expected.display().to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() == 1) } @@ -716,7 +718,7 @@ ON CONFLICT(id) DO NOTHING .bind("enabled") .bind(metadata.project_id.as_deref()) .bind(metadata.daybreak_enabled) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; self.insert_thread_spawn_edge_from_source_if_absent(metadata.id, metadata.source.as_str()) .await?; @@ -732,7 +734,7 @@ ON CONFLICT(id) DO NOTHING let result = sqlx::query("UPDATE threads SET daybreak_enabled = ? WHERE id = ?") .bind(daybreak_enabled) .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() > 0) } @@ -745,7 +747,7 @@ ON CONFLICT(id) DO NOTHING let result = sqlx::query("UPDATE threads SET memory_mode = ? WHERE id = ?") .bind(memory_mode) .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() > 0) } @@ -758,7 +760,7 @@ ON CONFLICT(id) DO NOTHING let result = sqlx::query("UPDATE threads SET title = ? WHERE id = ?") .bind(title) .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() > 0) } @@ -771,7 +773,7 @@ ON CONFLICT(id) DO NOTHING let result = sqlx::query("UPDATE threads SET name = ? WHERE id = ?") .bind(name) .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() > 0) } @@ -787,7 +789,7 @@ ON CONFLICT(id) DO NOTHING .bind(datetime_to_epoch_seconds(updated_at)) .bind(datetime_to_epoch_millis(updated_at)) .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() > 0) } @@ -813,7 +815,7 @@ WHERE id = ? .bind(recency_at_millis) .bind(recency_at_millis) .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() > 0) } @@ -902,7 +904,7 @@ WHERE id = ? .bind(git_origin_url.is_some()) .bind(git_origin_url.flatten().map(SanitizedGitUrl::as_str)) .bind(thread_id.to_string()) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; Ok(result.rows_affected() > 0) } @@ -1052,7 +1054,7 @@ ON CONFLICT(id) DO UPDATE SET .bind(creation_memory_mode.unwrap_or("enabled")) .bind(metadata.project_id.as_deref()) .bind(metadata.daybreak_enabled) - .execute(self.pool.as_ref()) + .execute_with_busy_retry(self.pool.as_ref()) .await?; self.insert_thread_spawn_edge_from_source_if_absent(metadata.id, metadata.source.as_str()) .await?; @@ -1173,14 +1175,14 @@ ON CONFLICT(id) DO UPDATE SET for (thread_id, thread_id_string) in thread_ids.iter().zip(&thread_id_strings) { sqlx::query("DELETE FROM logs WHERE thread_id = ?") .bind(thread_id_string) - .execute(self.logs_pool.as_ref()) + .execute_with_busy_retry(self.logs_pool.as_ref()) .await?; self.thread_queue.delete_thread_queue(*thread_id).await?; self.delete_versioned_thread_memory(*thread_id).await?; self.thread_goals.delete_thread_goal(*thread_id).await?; } - let mut tx = self.pool.begin().await?; + let mut tx = self.pool.begin_immediate().await?; for thread_id_string in &thread_id_strings { sqlx::query("DELETE FROM thread_dynamic_tools WHERE thread_id = ?") .bind(thread_id_string) diff --git a/codex-rs/state/src/sqlite.rs b/codex-rs/state/src/sqlite.rs index e35a074d68..d8c72c6031 100644 --- a/codex-rs/state/src/sqlite.rs +++ b/codex-rs/state/src/sqlite.rs @@ -1,5 +1,6 @@ //! Shared SQLite connection configuration. //! Writable pools preserve existing vacuum modes and report initialization errors to callers. +//! External lock contention while opening gets a bounded retry before the original error surfaces. #![expect( clippy::disallowed_methods, @@ -25,8 +26,12 @@ use std::path::PathBuf; use std::time::Duration; use std::time::Instant; +mod busy_retry; mod validation; +pub use busy_retry::SqlitePoolWriteExt; +pub(crate) use busy_retry::SqliteWriteQueryExt; +pub(crate) use busy_retry::retry_on_busy; use validation::SqliteQuickCheckManager; const DEFAULT_BUSY_TIMEOUT: Duration = Duration::from_secs(5); @@ -409,7 +414,7 @@ impl SqliteConfig { result = pool_options.connect_with(options.clone()) => result, } }; - let pool = connect().await?; + let pool = retry_on_busy(|| async { Ok(connect().await?) }).await?; let validation_result = self .quick_check_manager .quick_check_once( @@ -439,7 +444,7 @@ impl SqliteConfig { ); } - return connect().await.map_err(anyhow::Error::from); + return retry_on_busy(|| async { Ok(connect().await?) }).await; } } diff --git a/codex-rs/state/src/sqlite/busy_retry.rs b/codex-rs/state/src/sqlite/busy_retry.rs new file mode 100644 index 0000000000..9ed22a7b4e --- /dev/null +++ b/codex-rs/state/src/sqlite/busy_retry.rs @@ -0,0 +1,191 @@ +//! Bounded retries for SQLite operations that can safely restart on external contention. +//! Callers must complete one atomic transaction (or only open a connection) per attempt. +//! Never retry cancellation: a commit whose result was not received may have succeeded. + +use std::error::Error as StdError; +use std::future::Future; +use std::time::Duration; + +use sqlx::Execute; +use sqlx::Executor; +use sqlx::FromRow; +use sqlx::Sqlite; +use sqlx::SqlitePool; +use sqlx::Transaction; +use sqlx::error::DatabaseError; +use sqlx::query::Query; +use sqlx::query::QueryAs; +use sqlx::sqlite::SqliteArguments; +use sqlx::sqlite::SqliteError; +use sqlx::sqlite::SqliteQueryResult; +use sqlx::sqlite::SqliteRow; + +/// SQLite writer admission for pools shared by the state and thread stores. +/// Implementations must acquire the writer slot before any read snapshot and +/// retry only admission, never an already-started transaction or external effects. +pub trait SqlitePoolWriteExt { + fn begin_immediate( + &self, + ) -> impl Future, sqlx::Error>> + Send; +} + +impl SqlitePoolWriteExt for SqlitePool { + async fn begin_immediate(&self) -> Result, sqlx::Error> { + retry_when( + || self.begin_with("BEGIN IMMEDIATE"), + |error| is_busy(error), + ) + .await + } +} + +/// Safe retry boundaries for single prepared SQLite writes, including RETURNING. +/// Implementations decode their row before committing, just as SQLx does in an +/// explicit transaction. Never use this for multiple statements or existing +/// transactions; those must keep using their transaction's connection. +pub(crate) trait SqliteWriteQueryExt<'q>: Execute<'q, Sqlite> + 'q { + type Output: Send; + + fn decode_returning_row(row: SqliteRow) -> Result; + + /// Retry a standalone autocommit write with exactly the same bound inputs. + fn execute_with_busy_retry<'e>( + mut self, + pool: &'e SqlitePool, + ) -> impl Future> + Send + 'e + where + 'q: 'e, + { + async move { + let persistent = Execute::persistent(&self); + let arguments = self + .take_arguments() + .map_err(sqlx::Error::Encode)? + .unwrap_or_default(); + let sql = self.sql(); + retry_when( + || { + sqlx::query_with(sql.clone(), arguments.clone()) + .persistent(persistent) + .execute(pool) + }, + |error| is_busy(error), + ) + .await + } + } + + /// Reserve the writer slot for a RETURNING write; expose its row only after commit. + fn fetch_one_write<'e>( + self, + pool: &'e SqlitePool, + ) -> impl Future> + Send + 'e + where + 'q: 'e, + { + async move { + let mut tx = pool.begin_immediate().await?; + let row = (&mut *tx).fetch_one(self).await?; + let output = Self::decode_returning_row(row)?; + tx.commit().await?; + Ok(output) + } + } + + /// As with fetch_one_write, but commit a write that returns no row too. + fn fetch_optional_write<'e>( + self, + pool: &'e SqlitePool, + ) -> impl Future, sqlx::Error>> + Send + 'e + where + 'q: 'e, + { + async move { + let mut tx = pool.begin_immediate().await?; + let row = (&mut *tx).fetch_optional(self).await?; + let output = row.map(Self::decode_returning_row).transpose()?; + tx.commit().await?; + Ok(output) + } + } +} + +impl<'q> SqliteWriteQueryExt<'q> for Query<'q, Sqlite, SqliteArguments> { + type Output = SqliteRow; + + fn decode_returning_row(row: SqliteRow) -> Result { + Ok(row) + } +} + +impl<'q, O> SqliteWriteQueryExt<'q> for QueryAs<'q, Sqlite, O, SqliteArguments> +where + O: Send + Unpin + for<'r> FromRow<'r, SqliteRow> + 'q, +{ + type Output = O; + + fn decode_returning_row(row: SqliteRow) -> Result { + O::from_row(&row) + } +} + +/// Retries only received SQLite BUSY errors. Each operation must drop or roll back +/// its transaction before returning an error so even BUSY_SNAPSHOT starts fresh. +/// SQLite already waits up to five seconds per lock; allow two more attempts. +pub(crate) async fn retry_on_busy(operation: F) -> anyhow::Result +where + F: FnMut() -> Fut, + Fut: Future>, +{ + retry_when(operation, |error| error.chain().any(is_busy)).await +} + +async fn retry_when( + mut operation: F, + is_retryable: impl Fn(&E) -> bool, +) -> Result +where + F: FnMut() -> Fut, + Fut: Future>, +{ + let mut delays = [Duration::from_millis(100), Duration::from_millis(200)].into_iter(); + loop { + match operation().await { + Ok(value) => return Ok(value), + Err(error) => { + if is_retryable(&error) + && let Some(delay) = delays.next() + { + tokio::time::sleep(delay).await; + continue; + } + return Err(error); + } + } + } +} + +fn is_busy(source: &(dyn StdError + 'static)) -> bool { + let Some(sqlite_error) = source + .downcast_ref::() + .and_then(sqlx::Error::as_database_error) + .and_then(|database_error| database_error.try_downcast_ref::()) + else { + return false; + }; + matches!( + sqlite_error + .code() + .and_then(|code| code.parse::().ok()), + Some( + libsqlite3_sys::SQLITE_BUSY + | libsqlite3_sys::SQLITE_BUSY_RECOVERY + | libsqlite3_sys::SQLITE_BUSY_SNAPSHOT + | libsqlite3_sys::SQLITE_BUSY_TIMEOUT + ) + ) +} + +#[cfg(test)] +#[path = "retry_tests.rs"] +mod tests; diff --git a/codex-rs/state/src/sqlite/retry_tests.rs b/codex-rs/state/src/sqlite/retry_tests.rs new file mode 100644 index 0000000000..e597f83e21 --- /dev/null +++ b/codex-rs/state/src/sqlite/retry_tests.rs @@ -0,0 +1,267 @@ +//! Tests safe retries against real SQLite writer contention. + +use super::retry_on_busy; +use crate::SqliteConfig; +use crate::SqliteQueueStore; +use crate::migrations::runtime_logs_migrator; +use crate::migrations::runtime_queue_migrator; +use crate::runtime::test_support::unique_temp_dir; +use anyhow::Context; +use codex_protocol::ThreadId; +use codex_utils_absolute_path::test_support::PathExt; +use pretty_assertions::assert_eq; +use sqlx::sqlite::SqlitePoolOptions; +use std::sync::Arc; +use std::time::Duration; +use tokio::sync::Mutex; +use tokio::sync::mpsc; + +#[tokio::test] +#[expect( + clippy::await_holding_invalid_type, + reason = "Only this sequential retry closure owns these connections. The guards keep the real competing SQLite lock alive across attempts; no other task takes either guard." +)] +async fn retries_after_a_competing_writer_releases_its_lock() -> anyhow::Result<()> { + let sqlite_home = unique_temp_dir(); + tokio::fs::create_dir_all(&sqlite_home).await?; + let _cleanup = scopeguard::guard(sqlite_home.clone(), |sqlite_home| { + let _ = std::fs::remove_dir_all(sqlite_home); + }); + let sqlite = SqliteConfig::new_for_testing(sqlite_home.as_path().abs()); + let pool = sqlite + .open_logs_db(&runtime_logs_migrator(), /*telemetry_override*/ None) + .await?; + let mut competing_writer = pool.acquire().await?; + let mut writer = pool.acquire().await?; + sqlx::query("PRAGMA busy_timeout=0") + .execute(&mut *writer) + .await?; + sqlx::query("BEGIN IMMEDIATE") + .execute(&mut *competing_writer) + .await?; + let competing_writer = Mutex::new(competing_writer); + let writer = Mutex::new(writer); + + retry_on_busy(|| async { + let mut writer = writer.lock().await; + let result = sqlx::query( + "INSERT INTO logs (ts, ts_nanos, level, target, feedback_log_body) \ + VALUES (1, 0, 'INFO', 'retry-test', 'saved once')", + ) + .execute(&mut **writer) + .await; + // Release the competing transaction only after SQLite actually rejected + // the write. This cannot pass by racing the first attempt's busy wait. + if result.is_err() { + let mut competing_writer = competing_writer.lock().await; + sqlx::query("ROLLBACK") + .execute(&mut **competing_writer) + .await?; + } + result.map_err(anyhow::Error::from) + }) + .await?; + + let rows = sqlx::query_scalar::<_, String>("SELECT feedback_log_body FROM logs ORDER BY id") + .fetch_all(&pool) + .await?; + assert_eq!(rows, vec!["saved once".to_string()]); + drop(writer); + drop(competing_writer); + pool.close().await; + Ok(()) +} + +#[tokio::test] +async fn queue_enqueue_survives_received_busy_without_duplicating_the_message() -> anyhow::Result<()> +{ + let sqlite_home = unique_temp_dir(); + tokio::fs::create_dir_all(&sqlite_home).await?; + let _cleanup = scopeguard::guard(sqlite_home.clone(), |sqlite_home| { + let _ = std::fs::remove_dir_all(sqlite_home); + }); + let sqlite = SqliteConfig::new_for_testing(sqlite_home.as_path().abs()); + let pool = sqlite + .open_queue_db(&runtime_queue_migrator(), /*telemetry_override*/ None) + .await?; + let (attempt_finished, mut finished) = mpsc::unbounded_channel(); + // No connection is opened or released until enqueue's first attempt. + // SQLite must have returned BUSY before after_release can run: the other + // writer is still holding the lock, and this connection never waits for it. + let writer_pool = SqlitePoolOptions::new() + .max_connections(/*max*/ 1) + .after_release(move |_, _| { + let _ = attempt_finished.send(()); + Box::pin(async { Ok(true) }) + }) + .connect_lazy_with( + (*pool.connect_options()) + .clone() + .busy_timeout(Duration::ZERO), + ); + let queue = SqliteQueueStore::new(Arc::new(writer_pool)); + let observer = SqliteQueueStore::new(Arc::new(pool.clone())); + let thread_id = ThreadId::new(); + let mut competing_writer = pool.acquire().await?; + sqlx::query("BEGIN IMMEDIATE") + .execute(&mut *competing_writer) + .await?; + let (item, ()) = tokio::try_join!( + queue.enqueue(thread_id, r#"{"text":"save this bound value"}"#), + async { + finished + .recv() + .await + .context("no completed writer attempt")?; + sqlx::query("ROLLBACK") + .execute(&mut *competing_writer) + .await?; + Ok::<(), anyhow::Error>(()) + } + )?; + assert_eq!( + (thread_id, r#"{"text":"save this bound value"}"#), + (item.thread_id, item.payload.as_str()) + ); + assert_eq!( + vec![item], + observer + .list_page(thread_id, /*offset*/ 0, /*limit*/ 10) + .await? + ); + drop(competing_writer); + queue.close().await; + pool.close().await; + Ok(()) +} + +#[tokio::test] +async fn queue_update_survives_received_busy_and_commits_once() -> anyhow::Result<()> { + let sqlite_home = unique_temp_dir(); + tokio::fs::create_dir_all(&sqlite_home).await?; + let _cleanup = scopeguard::guard(sqlite_home.clone(), |sqlite_home| { + let _ = std::fs::remove_dir_all(sqlite_home); + }); + let sqlite = SqliteConfig::new_for_testing(sqlite_home.as_path().abs()); + let pool = sqlite + .open_queue_db(&runtime_queue_migrator(), /*telemetry_override*/ None) + .await?; + let observer = SqliteQueueStore::new(Arc::new(pool.clone())); + let thread_id = ThreadId::new(); + let mut expected = observer + .enqueue(thread_id, r#"{"text":"original"}"#) + .await?; + let revision_before = observer.changes_since(/*revision*/ 0, &[thread_id]).await?[0].1; + expected.payload = r#"{"text":"edited bound value"}"#.to_string(); + let (attempt_finished, mut finished) = mpsc::unbounded_channel(); + let writer_pool = SqlitePoolOptions::new() + .max_connections(/*max*/ 1) + .after_release(move |_, _| { + let _ = attempt_finished.send(()); + Box::pin(async { Ok(true) }) + }) + .connect_lazy_with( + (*pool.connect_options()) + .clone() + .busy_timeout(Duration::ZERO), + ); + let queue = SqliteQueueStore::new(Arc::new(writer_pool)); + let mut competing_writer = pool.acquire().await?; + sqlx::query("BEGIN IMMEDIATE") + .execute(&mut *competing_writer) + .await?; + let (updated, ()) = tokio::try_join!( + queue.update(thread_id, &expected.id, &expected.payload), + async { + // Release only after update actually failed admission, not while + // SQLite's busy handler could still turn the first attempt into success. + finished + .recv() + .await + .context("no completed writer attempt")?; + sqlx::query("ROLLBACK") + .execute(&mut *competing_writer) + .await?; + Ok::<(), anyhow::Error>(()) + } + )?; + assert_eq!(Some(expected.clone()), updated); + assert_eq!( + (vec![expected], vec![(thread_id, revision_before + 1)]), + ( + observer + .list_page(thread_id, /*offset*/ 0, /*limit*/ 10) + .await?, + observer + .changes_since(revision_before, &[thread_id]) + .await? + ) + ); + drop(competing_writer); + queue.close().await; + pool.close().await; + Ok(()) +} + +#[tokio::test] +async fn queue_delete_survives_received_busy_and_preserves_other_messages() -> anyhow::Result<()> { + let sqlite_home = unique_temp_dir(); + tokio::fs::create_dir_all(&sqlite_home).await?; + let _cleanup = scopeguard::guard(sqlite_home.clone(), |sqlite_home| { + let _ = std::fs::remove_dir_all(sqlite_home); + }); + let sqlite = SqliteConfig::new_for_testing(sqlite_home.as_path().abs()); + let pool = sqlite + .open_queue_db(&runtime_queue_migrator(), /*telemetry_override*/ None) + .await?; + let observer = SqliteQueueStore::new(Arc::new(pool.clone())); + let thread_id = ThreadId::new(); + let target = observer.enqueue(thread_id, r#"{"text":"remove"}"#).await?; + let survivor = observer.enqueue(thread_id, r#"{"text":"keep"}"#).await?; + let revision_before = observer.changes_since(/*revision*/ 0, &[thread_id]).await?[0].1; + let (attempt_finished, mut finished) = mpsc::unbounded_channel(); + let writer_pool = SqlitePoolOptions::new() + .max_connections(/*max*/ 1) + .after_release(move |_, _| { + let _ = attempt_finished.send(()); + Box::pin(async { Ok(true) }) + }) + .connect_lazy_with( + (*pool.connect_options()) + .clone() + .busy_timeout(Duration::ZERO), + ); + let queue = SqliteQueueStore::new(Arc::new(writer_pool)); + let mut competing_writer = pool.acquire().await?; + sqlx::query("BEGIN IMMEDIATE") + .execute(&mut *competing_writer) + .await?; + let (deleted, ()) = tokio::try_join!(queue.delete(thread_id, &target.id), async { + // The first autocommit DELETE has returned BUSY and released its + // connection. Its bound thread and item IDs must survive the retry. + finished + .recv() + .await + .context("no completed writer attempt")?; + sqlx::query("ROLLBACK") + .execute(&mut *competing_writer) + .await?; + Ok::<(), anyhow::Error>(()) + })?; + assert!(deleted); + assert_eq!( + (vec![survivor], vec![(thread_id, revision_before + 1)]), + ( + observer + .list_page(thread_id, /*offset*/ 0, /*limit*/ 10) + .await?, + observer + .changes_since(revision_before, &[thread_id]) + .await? + ) + ); + drop(competing_writer); + queue.close().await; + pool.close().await; + Ok(()) +} diff --git a/codex-rs/thread-store/src/local/thread_history.rs b/codex-rs/thread-store/src/local/thread_history.rs index ee59619a13..7be33d6720 100644 --- a/codex-rs/thread-store/src/local/thread_history.rs +++ b/codex-rs/thread-store/src/local/thread_history.rs @@ -4,6 +4,7 @@ use codex_app_server_protocol::TurnStatus; use codex_protocol::ThreadId; use codex_protocol::models::MessagePhase; use codex_protocol::realtime::RealtimeItem; +use codex_state::SqlitePoolWriteExt; use super::LocalThreadStore; use crate::ThreadStoreError; @@ -112,10 +113,7 @@ pub(super) async fn apply_projection( // Write the projected rows and advance the JSONL offset and ordinal in one transaction. If // SQLite fails, it stays behind the durable rollout instead of claiming data it did not // materialize. - let mut transaction = pool - .begin_with("BEGIN IMMEDIATE") - .await - .map_err(thread_history_error)?; + let mut transaction = pool.begin_immediate().await.map_err(thread_history_error)?; let thread_id = thread_id.to_string(); let projection_state = sqlx::query_as::<_, (i64, i64)>( r#" @@ -255,7 +253,7 @@ pub(super) async fn delete_thread( let pool = store.thread_history_db().await?; let mut transaction = pool - .begin_with("BEGIN IMMEDIATE") + .begin_immediate() .await .map_err(thread_history_delete_error)?; let thread_id = thread_id.to_string(); From 0884c8047af8b02df31da8c622110a724c6b3cbc Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 18:51:20 +0000 Subject: [PATCH 102/155] Support inline model, reasoning, and speed selection in `/model` (#54378) ## What changed Allow `/model [model] --reasoning --speed ` to update the current session without changing saved defaults. Both space-separated and `=` flag values are supported; omitting the model applies settings to the current model. Bare `/model` still opens the picker. Validate model availability, supported reasoning levels, and speed tiers before applying changes. Reject unknown flags, duplicate settings, and missing values. Apply model, reasoning, and speed together after server acceptance. Restore each thread's speed when switching threads, and use destination configuration defaults for new sessions instead of carrying over the active session's speed. ## Testing Extend regression coverage for inline commands, invalid arguments, unchanged saved defaults, settings-only updates to hidden current models, destination speed defaults, and speed restoration on the next turn after switching threads. GitOrigin-RevId: ad9cecbdb3554e34a6518367364978a37fb68439 --- codex-rs/tui/src/app/agents_overview.rs | 4 - codex-rs/tui/src/app/event_dispatch.rs | 4 +- codex-rs/tui/src/app/model_defaults.rs | 74 ++++-- codex-rs/tui/src/app/new_session.rs | 11 +- codex-rs/tui/src/app/tests.rs | 1 + .../src/app/tests/advanced_reasoning_tests.rs | 48 ++++ .../tests/background_task_defaults_tests.rs | 8 +- .../app/tests/local_command_scroll_tests.rs | 1 + .../tui/src/app/tests/model_defaults_tests.rs | 62 ++++-- ...ults__session_only_model_confirmation.snap | 11 +- codex-rs/tui/src/app/thread_settings.rs | 9 + codex-rs/tui/src/app/working_directory.rs | 4 +- codex-rs/tui/src/app_event.rs | 5 +- codex-rs/tui/src/app_server_session.rs | 2 +- .../bottom_pane/chat_composer/slash_input.rs | 6 +- .../chat_composer/sparkle_tests.rs | 2 +- codex-rs/tui/src/chatwidget.rs | 1 + codex-rs/tui/src/chatwidget/model_command.rs | 210 ++++++++++++++++++ codex-rs/tui/src/chatwidget/session_flow.rs | 1 + .../src/chatwidget/session_model_selection.rs | 13 +- codex-rs/tui/src/chatwidget/slash_dispatch.rs | 4 + .../tests/session_model_selection_tests.rs | 31 ++- codex-rs/tui/src/slash_command.rs | 1 + 23 files changed, 455 insertions(+), 58 deletions(-) create mode 100644 codex-rs/tui/src/chatwidget/model_command.rs diff --git a/codex-rs/tui/src/app/agents_overview.rs b/codex-rs/tui/src/app/agents_overview.rs index 8701235d2f..fc6d46921a 100644 --- a/codex-rs/tui/src/app/agents_overview.rs +++ b/codex-rs/tui/src/app/agents_overview.rs @@ -947,7 +947,6 @@ impl App { .as_ref() .filter(|_| remote) .map(AbsolutePathBuf::to_path_buf); - let preserve_service_tier = remote || cwd.is_none(); let local_cwd = if remote { self.config.cwd.to_path_buf() } else { @@ -969,9 +968,6 @@ impl App { return None; } }; - if preserve_service_tier { - config.service_tier = self.chat_widget.configured_service_tier(); - } let trust_cwd = config.cwd.to_path_buf(); if self .confirm_directory_trust( diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs index b7f6a94f51..8efc33bdbc 100644 --- a/codex-rs/tui/src/app/event_dispatch.rs +++ b/codex-rs/tui/src/app/event_dispatch.rs @@ -2536,9 +2536,9 @@ impl App { AppEvent::PersistDaybreakSelection { thread_id, enabled } => { self.persist_daybreak_selection(app_server, thread_id, enabled).await; } - AppEvent::SelectSessionModel { model, effort } => { + AppEvent::SelectSessionModel { model, effort, service_tier } => { self.app_event_tx.send(AppEvent::FollowTranscript); - self.select_session_model(app_server, model, effort).await; + self.select_session_model(app_server, model, effort, service_tier).await; } AppEvent::CyberModelAutoReviewNotice => { self.chat_widget.add_warning_message( diff --git a/codex-rs/tui/src/app/model_defaults.rs b/codex-rs/tui/src/app/model_defaults.rs index dca0c9da55..21373a1489 100644 --- a/codex-rs/tui/src/app/model_defaults.rs +++ b/codex-rs/tui/src/app/model_defaults.rs @@ -1,14 +1,17 @@ -//! Apply session model choices separately from saved model defaults. +//! Apply complete session model choices after server acceptance, separately from saved defaults. //! //! A successful config write can still be overridden. Report that distinction without //! replacing the active task's explicit selection with launch-time configuration. use super::App; use crate::app_server_session::AppServerSession; +use crate::service_tier_resolution; use codex_app_server_client::AppServerRequestHandle; use codex_app_server_protocol::ConfigEdit; use codex_app_server_protocol::WriteStatus; use codex_protocol::config_types::ModeKind; +use codex_protocol::config_types::SERVICE_TIER_DEFAULT_REQUEST_VALUE; +use codex_protocol::config_types::ServiceTier; use codex_protocol::openai_models::ReasoningEffort; use color_eyre::eyre::Result; @@ -18,16 +21,50 @@ impl App { app_server: &mut AppServerSession, model: String, effort: Option, + service_tier: Option, ) { let model_changed = self.chat_widget.current_model() != model || self.chat_widget.current_collaboration_mode().model() != model; - if model_changed - && self - .active_thread_model_setting_update_params(model.clone()) - .is_some_and(|params| params.permissions.is_some()) - && self.reject_pending_permission_change() - { - return; + let params = if model_changed { + self.active_thread_model_setting_update_params(model.clone()) + } else { + self.active_thread_reasoning_setting_update_params(effort.clone()) + }; + if let Some(mut params) = params { + if params.permissions.is_some() && self.reject_pending_permission_change() { + return; + } + params.effort = effort.clone(); + params.collaboration_mode = Some( + self.chat_widget + .effective_collaboration_mode() + .with_updates( + Some(model.clone()), + Some(effort.clone()), + /*developer_instructions*/ None, + ), + ); + params.service_tier = match service_tier.as_ref() { + Some(tier) => Some(Some(tier.clone())), + None => service_tier_resolution::service_tier_update_for_core( + self.chat_widget.config_ref(), + &self.local_settings.notices, + &model, + &self.model_catalog.models, + ), + }; + if !self.send_model_settings_update(app_server, params).await { + if app_server.thread_settings_update_supported { + return; + } + if service_tier.is_some() { + self.chat_widget.add_error_message( + "Model selection requires an app server with thread/settings/update support." + .into(), + ); + return; + } + } } let in_plan_mode = self.chat_widget.effective_collaboration_mode().mode == ModeKind::Plan; let ultra = effort == Some(ReasoningEffort::Ultra); @@ -48,14 +85,9 @@ impl App { self.chat_widget .set_plan_mode_reasoning_effort(effort.clone()); } - if model_changed { - self.sync_active_thread_model_setting(app_server, model.clone(), effort.clone()) - .await; - } else if let Some(mut params) = - self.active_thread_reasoning_setting_update_params(effort.clone()) - { - params.collaboration_mode = Some(self.chat_widget.effective_collaboration_mode()); - self.send_thread_settings_update(app_server, params).await; + if let Some(service_tier) = service_tier.as_ref() { + self.chat_widget + .set_service_tier(Some(service_tier.clone())); } self.sync_active_thread_service_tier_to_cached_session() .await; @@ -64,6 +96,16 @@ impl App { message.push(' '); message.push_str(&label); } + if let Some(service_tier) = service_tier { + message.push(' '); + message.push_str(if service_tier == SERVICE_TIER_DEFAULT_REQUEST_VALUE { + "standard" + } else if service_tier == ServiceTier::Fast.request_value() { + "fast" + } else { + &service_tier + }); + } message.push_str(" for this session only"); self.chat_widget.add_info_message(message, /*hint*/ None); } diff --git a/codex-rs/tui/src/app/new_session.rs b/codex-rs/tui/src/app/new_session.rs index ffc00b9754..73ce337a25 100644 --- a/codex-rs/tui/src/app/new_session.rs +++ b/codex-rs/tui/src/app/new_session.rs @@ -4,6 +4,7 @@ use super::*; use codex_config::ConfigLayerSource; +use codex_protocol::config_types::ServiceTier; pub(crate) fn has_launch_setting( config: &Config, @@ -40,6 +41,15 @@ pub(super) fn overlay_new_session_defaults( if !has_launch_setting(config, cli_kv_overrides, "model_reasoning_effort") { config.model_reasoning_effort = defaults.model_reasoning_effort.clone(); } + if harness_overrides.service_tier.is_none() + && !has_launch_setting(config, cli_kv_overrides, "service_tier") + { + config.service_tier = defaults.service_tier.as_deref().map(|service_tier| { + ServiceTier::from_request_value(service_tier) + .map(|tier| tier.request_value().to_string()) + .unwrap_or_else(|| service_tier.to_string()) + }); + } if !has_launch_setting(config, cli_kv_overrides, "daybreak") { config.daybreak_enabled = defaults .additional @@ -87,7 +97,6 @@ impl App { ); } self.apply_runtime_policy_overrides(&mut config, RuntimePolicyOverrideScope::ExplicitOnly)?; - config.service_tier = self.chat_widget.configured_service_tier(); if let Some(defaults) = defaults.as_ref() { overlay_new_session_defaults( &mut config, diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs index ea58190284..5d85e384e5 100644 --- a/codex-rs/tui/src/app/tests.rs +++ b/codex-rs/tui/src/app/tests.rs @@ -9729,6 +9729,7 @@ async fn changing_cyber_model_reasoning_preserves_selected_permissions() { AppEvent::SelectSessionModel { model: model_name.clone(), effort: Some(effort.clone()), + service_tier: None, }, ) .await diff --git a/codex-rs/tui/src/app/tests/advanced_reasoning_tests.rs b/codex-rs/tui/src/app/tests/advanced_reasoning_tests.rs index 4bdfa6aa81..6b1551c61a 100644 --- a/codex-rs/tui/src/app/tests/advanced_reasoning_tests.rs +++ b/codex-rs/tui/src/app/tests/advanced_reasoning_tests.rs @@ -1,5 +1,6 @@ use super::*; use app_test_support::create_fake_rollout; +use codex_protocol::config_types::SERVICE_TIER_DEFAULT_REQUEST_VALUE; use codex_utils_absolute_path::test_support::PathExt; use pretty_assertions::assert_eq; @@ -111,3 +112,50 @@ async fn switching_from_ultra_thread_restores_configured_plan_effort() { Some(ReasoningEffortConfig::High) ); } + +#[tokio::test] +async fn switching_threads_restores_session_speed_for_the_next_turn() { + let (mut app, _events, mut ops) = make_test_app_with_channels().await; + app.config.service_tier = Some("flex".into()); + app.chat_widget.set_service_tier(Some("flex".into())); + let standard_thread = ThreadId::new(); + let flex_thread = ThreadId::new(); + let session = |thread_id, service_tier: &str| ThreadSessionState { + model: "gpt-5.5".into(), + service_tier: Some(service_tier.into()), + ..test_thread_session(thread_id, test_path_buf("/tmp/project")) + }; + let snapshot = |session| ThreadEventSnapshot { + delegated_turns: Vec::new(), + session: Some(session), + turns: Vec::new(), + events: Vec::new(), + active_reasoning_item: None, + input_state: None, + }; + + app.replay_thread_snapshot( + snapshot(session(standard_thread, SERVICE_TIER_DEFAULT_REQUEST_VALUE)), + /*resume_restored_queue*/ false, + ); + app.replay_thread_snapshot( + snapshot(session(flex_thread, "flex")), + /*resume_restored_queue*/ false, + ); + assert_eq!( + app.chat_widget.configured_service_tier().as_deref(), + Some("flex") + ); + app.replay_thread_snapshot( + snapshot(session(standard_thread, SERVICE_TIER_DEFAULT_REQUEST_VALUE)), + /*resume_restored_queue*/ false, + ); + app.chat_widget + .apply_external_edit("Check this task".into()); + app.chat_widget.handle_key_event(KeyCode::Esc.into()); + app.chat_widget.handle_key_event(KeyCode::Enter.into()); + + assert_matches!(next_user_turn_op(&mut ops), Op::UserTurn { service_tier, .. } + if service_tier == Some(Some(SERVICE_TIER_DEFAULT_REQUEST_VALUE.into()))); + assert_eq!(app.config.service_tier.as_deref(), Some("flex")); +} diff --git a/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs b/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs index 72e79e241a..dd727a879f 100644 --- a/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs +++ b/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs @@ -245,7 +245,7 @@ async fn command_center_new_reads_server_defaults_for_actual_destination() -> Re std::fs::write( server_home.path().join("config.toml"), format!( - "{}model_reasoning_effort = \"high\"\n{}", + "{}model_reasoning_effort = \"high\"\nservice_tier = \"fast\"\n{}", if mode == "remote-null-fast" { "" } else { @@ -398,11 +398,7 @@ async fn command_center_new_reads_server_defaults_for_actual_destination() -> Re serde_json::Value::Null }, &serde_json::json!("high"), - &serde_json::json!(if mode == "local" && explicit_cwd { - "flex" - } else { - "priority" - }), + &serde_json::json!(if explicit_cwd { "flex" } else { "priority" }), ), "{mode} {expected_cwd}" ); diff --git a/codex-rs/tui/src/app/tests/local_command_scroll_tests.rs b/codex-rs/tui/src/app/tests/local_command_scroll_tests.rs index b4b41fbdd3..504a26b4fd 100644 --- a/codex-rs/tui/src/app/tests/local_command_scroll_tests.rs +++ b/codex-rs/tui/src/app/tests/local_command_scroll_tests.rs @@ -233,6 +233,7 @@ async fn settings_confirmations_reveal_their_history_output() -> Result<()> { AppEvent::SelectSessionModel { model: "gpt-5.5".into(), effort: Some(ReasoningEffortConfig::High), + service_tier: None, }, "Failed to update thread settings", ), diff --git a/codex-rs/tui/src/app/tests/model_defaults_tests.rs b/codex-rs/tui/src/app/tests/model_defaults_tests.rs index 12a0785507..5841fd45bf 100644 --- a/codex-rs/tui/src/app/tests/model_defaults_tests.rs +++ b/codex-rs/tui/src/app/tests/model_defaults_tests.rs @@ -2,6 +2,7 @@ use super::*; use crate::collaboration_modes; use codex_app_server_client::AppServerClient; use codex_config::LoaderOverrides; +use crossterm::event::KeyCode; use pretty_assertions::assert_eq; #[tokio::test] @@ -32,28 +33,59 @@ async fn session_model_selection_preserves_defaults_and_updates_active_thread() ReasoningEffortConfig::Max, ] { while events.try_recv().is_ok() {} - Box::pin(app.handle_event( - &mut tui, - &mut server, - AppEvent::SelectSessionModel { - model: "gpt-5.6-terra".into(), - effort: Some(effort.clone()), - }, - )) - .await?; + let command = match effort { + ReasoningEffortConfig::High => { + "/model gpt-5.6-terra --reasoning high --speed=standard".into() + } + ReasoningEffortConfig::Ultra => "/model --reasoning=ultra".into(), + ReasoningEffortConfig::Max => "/model --reasoning max".into(), + _ => unreachable!(), + }; + app.chat_widget.apply_external_edit(command); + app.chat_widget.handle_key_event(KeyCode::Esc.into()); + app.chat_widget.handle_key_event(KeyCode::Enter.into()); + let mut messages = Vec::new(); + while let Ok(event) = events.try_recv() { + if let AppEvent::InsertHistoryCell(cell) = &event { + messages.push(lines_to_single_string(&cell.transcript_lines(/*width*/ 80))); + } + Box::pin(app.handle_event(&mut tui, &mut server, event)).await?; + } let settings = next_thread_settings_updated(&mut server, thread_id).await; assert_eq!( ( settings.thread_settings.model.as_str(), - settings.thread_settings.effort.clone() + settings.thread_settings.effort.clone(), + settings.thread_settings.service_tier.as_deref(), ), - ("gpt-5.6-terra", Some(effort.clone())) + ("gpt-5.6-terra", Some(effort.clone()), Some("default")) ); if mode == ModeKind::Default && effort == ReasoningEffortConfig::High { - insta::assert_snapshot!( - "session_only_model_confirmation", - next_history_message(&mut events) - ); + for command in [ + "/model gpt-5.6-terra fast", + "/model gpt-5.6-terra --speeed=fast", + "/model gpt-5.6-terra --reasoning=invalid", + "/model --speed", + "/model --reasoning=", + "/model --reasoning --speed=standard", + "/model --speed=fast --speed standard", + ] { + app.chat_widget.apply_external_edit(command.into()); + app.chat_widget.handle_key_event(KeyCode::Esc.into()); + app.chat_widget.handle_key_event(KeyCode::Enter.into()); + } + while let Ok(event) = events.try_recv() { + assert!(!matches!( + event, + AppEvent::SelectSessionModel { .. } + | AppEvent::AstraSelectedFromModelPicker { .. } + )); + if let AppEvent::InsertHistoryCell(cell) = &event { + messages.push(lines_to_single_string(&cell.transcript_lines(/*width*/ 80))); + } + Box::pin(app.handle_event(&mut tui, &mut server, event)).await?; + } + insta::assert_snapshot!("session_only_model_confirmation", messages.join("\n")); } app.enqueue_thread_notification( thread_id, diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__session_only_model_confirmation.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__session_only_model_confirmation.snap index 297c047e9c..e1960ed79f 100644 --- a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__session_only_model_confirmation.snap +++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__session_only_model_confirmation.snap @@ -1,5 +1,12 @@ --- source: tui/src/app/tests/model_defaults_tests.rs -expression: next_history_message(&mut events) +expression: "messages.join(\"\\n\")" --- -• Model changed to gpt-5.6-terra high for this session only +• Model changed to gpt-5.6-terra high standard for this session only +■ Unexpected argument 'fast'. Use '--reasoning=' or '--speed='. +■ Unknown model setting '--speeed'. Expected '--reasoning=' or '--speed='. +■ Reasoning level 'invalid' is unavailable for gpt-5.6-terra. Available: low, medium, high, xhigh, max, ultra. +■ Model setting '--speed' requires a value. +■ Model setting '--reasoning' requires a value. +■ Model setting '--reasoning' requires a value. +■ Model setting '--speed' was provided more than once. diff --git a/codex-rs/tui/src/app/thread_settings.rs b/codex-rs/tui/src/app/thread_settings.rs index 8aee623649..6ad9d672b5 100644 --- a/codex-rs/tui/src/app/thread_settings.rs +++ b/codex-rs/tui/src/app/thread_settings.rs @@ -29,6 +29,14 @@ impl App { return; }; params.effort = effort; + self.send_model_settings_update(app_server, params).await; + } + + pub(super) async fn send_model_settings_update( + &mut self, + app_server: &mut AppServerSession, + params: ThreadSettingsUpdateParams, + ) -> bool { let defaulted_to_auto_review = params.approvals_reviewer == Some(AppServerApprovalsReviewer::AutoReview) && (self.chat_widget.config_ref().approvals_reviewer != ApprovalsReviewer::AutoReview @@ -61,6 +69,7 @@ impl App { if defaulted_to_auto_review && settings_updated { self.app_event_tx.send(AppEvent::CyberModelAutoReviewNotice); } + settings_updated } pub(super) fn active_thread_model_setting_update_params( diff --git a/codex-rs/tui/src/app/working_directory.rs b/codex-rs/tui/src/app/working_directory.rs index db28e72c92..b15fb9af8a 100644 --- a/codex-rs/tui/src/app/working_directory.rs +++ b/codex-rs/tui/src/app/working_directory.rs @@ -395,7 +395,9 @@ impl App { Ok(keymap) => keymap, Err(error) => return self.chat_widget.add_error_message(error), }; - config.service_tier = self.chat_widget.configured_service_tier(); + if !is_new_worktree { + config.service_tier = self.chat_widget.configured_service_tier(); + } if is_new_worktree { apply_managed_new_thread_defaults( &mut config, diff --git a/codex-rs/tui/src/app_event.rs b/codex-rs/tui/src/app_event.rs index a20193149e..613178d0c1 100644 --- a/codex-rs/tui/src/app_event.rs +++ b/codex-rs/tui/src/app_event.rs @@ -1231,7 +1231,7 @@ pub(crate) enum AppEvent { /// Update the current model slug in the running app and widget. UpdateModel(String), - /// Apply a final Astra picker action and offer the flourish only if it changed the model on + /// Apply an explicit Astra selection and offer the flourish only if it changed the model on /// its original task. Automatic model updates do not use this event. AstraSelectedFromModelPicker { thread_id: ThreadId, @@ -1269,10 +1269,11 @@ pub(crate) enum AppEvent { effort: Option, }, - /// Apply a model and effort only to the active session, preserving saved defaults. + /// Apply a model, effort, and optional speed only to the active session, preserving saved defaults. SelectSessionModel { model: String, effort: Option, + service_tier: Option, }, /// Show the cyber auto-review notice after the model selection confirmation. diff --git a/codex-rs/tui/src/app_server_session.rs b/codex-rs/tui/src/app_server_session.rs index ba449c46f4..67e06d5041 100644 --- a/codex-rs/tui/src/app_server_session.rs +++ b/codex-rs/tui/src/app_server_session.rs @@ -333,7 +333,7 @@ pub(crate) struct AppServerSession { /// Explicit CLI provider selection, distinct from resolved configuration defaults. pub(crate) model_provider_override: Option, history_support: ThreadHistorySupport, - thread_settings_update_supported: bool, + pub(crate) thread_settings_update_supported: bool, default_model: Option, available_models: Vec, daybreak_api_key_compat: Arc, diff --git a/codex-rs/tui/src/bottom_pane/chat_composer/slash_input.rs b/codex-rs/tui/src/bottom_pane/chat_composer/slash_input.rs index 7b3c6e7342..0bd9c4d1cb 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer/slash_input.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer/slash_input.rs @@ -751,13 +751,13 @@ mod tests { #[test] fn slash_completion_does_not_preserve_existing_draft_tail_for_other_commands() { let mut composer = composer_with_draft_tail( - "/mo", + "/sta", "preserve this draft only for opted-in slash commands", ); assert_eq!(press(&mut composer, KeyCode::Tab), InputResult::None); - assert_eq!(composer.draft.textarea.text(), "/model "); - assert_eq!(composer.draft.textarea.cursor(), "/model ".len()); + assert_eq!(composer.draft.textarea.text(), "/status "); + assert_eq!(composer.draft.textarea.cursor(), "/status ".len()); } #[test] diff --git a/codex-rs/tui/src/bottom_pane/chat_composer/sparkle_tests.rs b/codex-rs/tui/src/bottom_pane/chat_composer/sparkle_tests.rs index 4cce5d8c7d..b39da3eda7 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer/sparkle_tests.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer/sparkle_tests.rs @@ -831,7 +831,7 @@ fn arbitrary_commands_preserve_a_never_used_fresh_opportunity() { pane.select_sparkle_model("gpt-6-astra", &enabled()); assert!(!dots(&draw(&pane.composer, /*width*/ 80, now).0).is_empty()); } - for input in ["hello", "/model extra", "/other", "漢", "/tmp/file"] { + for input in ["hello", "/status extra", "/other", "漢", "/tmp/file"] { let mut pane = pane(); pane.mark_fresh_task_for_sparkle("gpt-5.5", &enabled()); type_text(&mut pane, input); diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index fccd6e2c20..ab13bba827 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -322,6 +322,7 @@ use self::plugins::PluginListFetchState; use self::plugins::PluginsCacheState; mod plan_implementation; use self::plan_implementation::PLAN_IMPLEMENTATION_TITLE; +mod model_command; mod model_popup_state; mod model_popups; mod notifications; diff --git a/codex-rs/tui/src/chatwidget/model_command.rs b/codex-rs/tui/src/chatwidget/model_command.rs new file mode 100644 index 0000000000..9fa29504c0 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/model_command.rs @@ -0,0 +1,210 @@ +//! Validate inline model choices before applying them through session-only model selection. + +use super::ChatWidget; +use super::session_model_selection::AstraModelPickerAction; +use codex_protocol::config_types::SERVICE_TIER_DEFAULT_REQUEST_VALUE; +use codex_protocol::openai_models::ModelPreset; +use codex_protocol::openai_models::ReasoningEffort; + +#[derive(Default)] +struct ModelCommandArgs<'a> { + model: Option<&'a str>, + effort: Option<&'a str>, + speed: Option<&'a str>, +} + +struct ModelCommand { + model: String, + effort: ReasoningEffort, + service_tier: Option, +} + +fn parse_model_command_args(args: &str) -> Result, String> { + let mut parsed = ModelCommandArgs::default(); + let mut words = args.split_whitespace().peekable(); + while let Some(word) = words.next() { + let (setting, inline_value) = word + .split_once('=') + .map_or((word, None), |(setting, value)| (setting, Some(value))); + match setting { + "--reasoning" => { + set_model_setting(&mut parsed.effort, setting, inline_value, &mut words)?; + } + "--speed" => { + set_model_setting(&mut parsed.speed, setting, inline_value, &mut words)?; + } + _ if word.starts_with("--") => { + return Err(format!( + "Unknown model setting '{setting}'. Expected '--reasoning=' or '--speed='." + )); + } + _ if parsed.model.replace(word).is_some() => { + return Err(format!( + "Unexpected argument '{word}'. Use '--reasoning=' or '--speed='." + )); + } + _ => {} + } + } + Ok(parsed) +} + +fn set_model_setting<'a>( + target: &mut Option<&'a str>, + setting: &str, + inline_value: Option<&'a str>, + words: &mut std::iter::Peekable>, +) -> Result<(), String> { + let value = match inline_value { + Some("") => None, + Some(value) => Some(value), + None => words.next_if(|word| !word.starts_with("--")), + } + .ok_or_else(|| format!("Model setting '{setting}' requires a value."))?; + if target.replace(value).is_some() { + return Err(format!( + "Model setting '{setting}' was provided more than once." + )); + } + Ok(()) +} + +fn resolve_reasoning_effort( + chat: &ChatWidget, + args: &ModelCommandArgs<'_>, + model: &ModelPreset, +) -> Result { + let Some(effort) = args.effort else { + return Ok(if args.model.is_none() { + chat.current_reasoning_effort() + .unwrap_or_else(|| model.default_reasoning_effort.clone()) + } else { + model.default_reasoning_effort.clone() + }); + }; + let supported = if model.supported_reasoning_efforts.is_empty() { + (model.default_reasoning_effort.as_str() == effort) + .then_some(&model.default_reasoning_effort) + } else { + model + .supported_reasoning_efforts + .iter() + .find(|option| option.effort.as_str() == effort) + .map(|option| &option.effort) + }; + supported.cloned().ok_or_else(|| { + let available = if model.supported_reasoning_efforts.is_empty() { + model.default_reasoning_effort.to_string() + } else { + model + .supported_reasoning_efforts + .iter() + .map(|option| option.effort.to_string()) + .collect::>() + .join(", ") + }; + format!( + "Reasoning level '{effort}' is unavailable for {}. Available: {available}.", + model.model + ) + }) +} + +fn resolve_service_tier( + chat: &ChatWidget, + speed: Option<&str>, + model: &ModelPreset, +) -> Result, String> { + let Some(speed) = speed else { + return Ok(None); + }; + if speed == "standard" { + return Ok(Some(SERVICE_TIER_DEFAULT_REQUEST_VALUE.to_string())); + } + if speed == "flex" { + return Ok(Some("flex".to_string())); + } + let tier = model + .service_tiers + .iter() + .find(|tier| tier.id == speed || tier.name.eq_ignore_ascii_case(speed)) + .filter(|tier| chat.config.features.service_tier_enabled(&tier.id)); + tier.map(|tier| Some(tier.id.clone())).ok_or_else(|| { + let available = std::iter::once("standard".to_string()) + .chain(std::iter::once("flex".to_string())) + .chain( + model + .service_tiers + .iter() + .filter(|tier| chat.config.features.service_tier_enabled(&tier.id)) + .map(|tier| tier.id.clone()), + ) + .collect::>() + .join(", "); + format!( + "Speed '{speed}' is unavailable for {}. Available: {available}.", + model.model + ) + }) +} + +fn resolve_model_command(chat: &ChatWidget, args: &str) -> Result { + let args = parse_model_command_args(args)?; + if chat.thread_id().is_none() { + return Err("Session is still starting; try /model again in a moment.".into()); + } + if chat.restrict_model_picker_to_luna_reserve() { + return Err( + "Model arguments are unavailable while using Reserve. Use /model to adjust effort." + .into(), + ); + } + let model_name = args + .model + .map(str::to_owned) + .unwrap_or_else(|| chat.current_model().to_owned()); + let Some(model) = + chat.model_catalog.models.iter().find(|model| { + model.model == model_name && (args.model.is_none() || model.show_in_picker) + }) + else { + return Err(format!( + "Model '{model_name}' is unavailable. Use /model to see available models." + )); + }; + Ok(ModelCommand { + model: model.model.clone(), + effort: resolve_reasoning_effort(chat, &args, model)?, + service_tier: resolve_service_tier(chat, args.speed, model)?, + }) +} + +impl ChatWidget { + pub(super) fn handle_model_command_args(&mut self, args: &str) { + let command = match resolve_model_command(self, args) { + Ok(command) => command, + Err(error) => { + self.add_error_message(error); + return; + } + }; + let ModelCommand { + model, + effort, + service_tier, + } = command; + let warning = self.ultra_reasoning_concurrency_warning(&effort); + let thread_id = self.sparkle_thread_for_picker_action(&model); + self.set_queue_autosend_suppressed(/*suppressed*/ true); + self.app_event_tx.send( + AstraModelPickerAction::SelectSessionModel { + effort: Some(effort), + service_tier, + } + .into_picker_event(thread_id, model), + ); + if let Some(warning) = warning { + self.add_warning_message(warning); + } + } +} diff --git a/codex-rs/tui/src/chatwidget/session_flow.rs b/codex-rs/tui/src/chatwidget/session_flow.rs index f34f76ebed..15f6a354cd 100644 --- a/codex-rs/tui/src/chatwidget/session_flow.rs +++ b/codex-rs/tui/src/chatwidget/session_flow.rs @@ -125,6 +125,7 @@ impl ChatWidget { self.config .permissions .set_workspace_roots(runtime_workspace_roots); + self.config.service_tier = session.service_tier.clone(); self.effective_service_tier = session.service_tier.clone(); if let Err(err) = self .config diff --git a/codex-rs/tui/src/chatwidget/session_model_selection.rs b/codex-rs/tui/src/chatwidget/session_model_selection.rs index ac9b5c8e66..3e9e3db760 100644 --- a/codex-rs/tui/src/chatwidget/session_model_selection.rs +++ b/codex-rs/tui/src/chatwidget/session_model_selection.rs @@ -1,4 +1,4 @@ -//! Session-only model picker actions leave durable defaults untouched. Astra picker actions retain +//! Session-only model selections leave durable defaults untouched. Explicit Astra selections retain //! their originating task and are checked against its effective model when the app applies them. use super::*; @@ -15,6 +15,7 @@ pub(crate) enum AstraModelPickerAction { }, SelectSessionModel { effort: Option, + service_tier: Option, }, } @@ -36,7 +37,14 @@ impl AstraModelPickerAction { Self::ApplyAdvancedReasoning { effort } => { AppEvent::ApplyAdvancedReasoning { model, effort } } - Self::SelectSessionModel { effort } => AppEvent::SelectSessionModel { model, effort }, + Self::SelectSessionModel { + effort, + service_tier, + } => AppEvent::SelectSessionModel { + model, + effort, + service_tier, + }, } } } @@ -77,6 +85,7 @@ impl ChatWidget { tx.send( AstraModelPickerAction::SelectSessionModel { effort: effort.clone(), + service_tier: None, } .into_picker_event(sparkle_thread, model.clone()), ); diff --git a/codex-rs/tui/src/chatwidget/slash_dispatch.rs b/codex-rs/tui/src/chatwidget/slash_dispatch.rs index 79601b9a28..1664e493eb 100644 --- a/codex-rs/tui/src/chatwidget/slash_dispatch.rs +++ b/codex-rs/tui/src/chatwidget/slash_dispatch.rs @@ -804,6 +804,10 @@ impl ChatWidget { } = prepared; let trimmed = args.trim(); match cmd { + SlashCommand::Model if !trimmed.is_empty() => { + self.handle_model_command_args(trimmed); + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + } SlashCommand::Export if trimmed.is_empty() => self.show_transcript_export_popup(), SlashCommand::Export => { self.set_queue_autosend_suppressed(/*suppressed*/ true); diff --git a/codex-rs/tui/src/chatwidget/tests/session_model_selection_tests.rs b/codex-rs/tui/src/chatwidget/tests/session_model_selection_tests.rs index 23faa7150a..9db819d0ff 100644 --- a/codex-rs/tui/src/chatwidget/tests/session_model_selection_tests.rs +++ b/codex-rs/tui/src/chatwidget/tests/session_model_selection_tests.rs @@ -49,7 +49,7 @@ async fn session_model_selection_accepts_final_choices_without_saving() { while rx.try_recv().is_ok() {} chat.handle_key_event(KeyEvent::from(KeyCode::Char('s'))); let selected = rx.try_recv().expect("session-only selection"); - assert_matches!(selected, AppEvent::SelectSessionModel { model, effort: selected_effort } + assert_matches!(selected, AppEvent::SelectSessionModel { model, effort: selected_effort, service_tier: None } if model == expected_model && selected_effort.as_ref() == Some(&effort)); assert!(chat.bottom_pane.no_modal_or_popup_active(), "{picker}"); assert!( @@ -100,7 +100,7 @@ async fn session_model_selection_notifies_the_original_task_after_each_final_ast assert_matches!(events.try_recv(), Ok(AppEvent::AstraSelectedFromModelPicker { thread_id: selected_thread, model, - action: AstraModelPickerAction::SelectSessionModel { effort: selected_effort }, + action: AstraModelPickerAction::SelectSessionModel { effort: selected_effort, service_tier: None }, }) if selected_thread == thread_id && model == "gpt-6-astra" && selected_effort == Some(effort)); assert!( std::iter::from_fn(|| events.try_recv().ok()).all(|event| matches!( @@ -112,6 +112,33 @@ async fn session_model_selection_notifies_the_original_task_after_each_final_ast } } +#[tokio::test] +async fn model_settings_only_command_accepts_the_current_hidden_model() { + let (mut chat, mut events, _ops) = + make_chatwidget_manual(/*model_override*/ Some("gpt-5.5")).await; + chat.thread_id = Some(ThreadId::new()); + let mut preset = get_available_model(&chat, "gpt-5.5"); + preset.show_in_picker = false; + chat.model_catalog = std::sync::Arc::new(ModelCatalog::new(vec![preset])); + + chat.handle_model_command_args("--reasoning high --speed standard"); + + assert_matches!(events.try_recv(), Ok(AppEvent::SelectSessionModel { + model, + effort: Some(ReasoningEffortConfig::High), + service_tier: Some(service_tier), + }) if model == "gpt-5.5" && service_tier == SERVICE_TIER_DEFAULT_REQUEST_VALUE); + + while events.try_recv().is_ok() {} + chat.handle_model_command_args("gpt-5.5 --reasoning=high"); + assert!( + std::iter::from_fn(|| events.try_recv().ok()).all(|event| !matches!( + event, + AppEvent::SelectSessionModel { .. } | AppEvent::AstraSelectedFromModelPicker { .. } + )) + ); +} + #[tokio::test] async fn session_model_selection_hides_conflicting_shortcut() { let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.5")).await; diff --git a/codex-rs/tui/src/slash_command.rs b/codex-rs/tui/src/slash_command.rs index afb372bb7b..65d7965236 100644 --- a/codex-rs/tui/src/slash_command.rs +++ b/codex-rs/tui/src/slash_command.rs @@ -171,6 +171,7 @@ impl SlashCommand { matches!( self, SlashCommand::Review + | SlashCommand::Model | SlashCommand::Rename | SlashCommand::New | SlashCommand::Clear From 1544ffc79d60d29d492ca432fc0a5b2f3745ddce Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 18:51:21 +0000 Subject: [PATCH 103/155] Add configuration support for TUI input presets (#54379) ## What changed Add `tui.presets` entries keyed by a single digit from `0` to `9`, each with an `input` prompt or slash command and an optional `label`. Expose presets in the configuration schema, load them into runtime configuration, and preserve them in TUI local settings. Reject invalid slots, blank inputs, shell commands beginning with `!` after leading whitespace, and inputs exceeding 8,000 UTF-8 bytes. ## Testing Extend the runtime configuration test to verify loading both a slash command with a label and a prompt without one. GitOrigin-RevId: d2911e540bc50f05b4a5224abf17ce4ef5a18ea3 --- codex-rs/config/src/types.rs | 30 ++++++++++++++++++++++ codex-rs/core/config.schema.json | 26 +++++++++++++++++++ codex-rs/core/src/config/config_tests.rs | 29 +++++++++++++++++++++ codex-rs/core/src/config/mod.rs | 23 +++++++++++++++++ codex-rs/thread-manager-sample/src/main.rs | 1 + codex-rs/tui/src/local_settings.rs | 1 + 6 files changed, 110 insertions(+) diff --git a/codex-rs/config/src/types.rs b/codex-rs/config/src/types.rs index 45871f151d..55326030f0 100644 --- a/codex-rs/config/src/types.rs +++ b/codex-rs/config/src/types.rs @@ -822,6 +822,32 @@ pub struct ModelAvailabilityNuxConfig { /// Fallback resize-reflow row cap when Codex cannot identify a terminal-specific scrollback size. pub const DEFAULT_TERMINAL_RESIZE_REFLOW_FALLBACK_MAX_ROWS: usize = 1_000; +/// One reusable prompt or slash command submitted through the TUI composer. +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema)] +#[schemars(deny_unknown_fields, rename = "Preset")] +pub struct QuickDial { + /// Plain-text input, limited to 8,000 UTF-8 bytes. + pub input: String, + /// Optional short name for the picker and shortcut hints. + pub label: Option, +} + +impl QuickDial { + /// Keep stored inputs nonempty and below the context-item limit even with byte tokenization. + pub fn validate(&self) -> Result<(), &'static str> { + if self.input.trim().is_empty() { + return Err("Preset input cannot be empty."); + } + if self.input.trim_start().starts_with('!') { + return Err("Presets support prompts and slash commands, not shell commands."); + } + if self.input.len() > 8_000 { + return Err("Preset input cannot exceed 8,000 UTF-8 bytes."); + } + Ok(()) + } +} + /// Collection of settings that are specific to the TUI. #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, JsonSchema)] #[schemars(deny_unknown_fields)] @@ -978,6 +1004,10 @@ pub struct Tui { #[serde(default)] pub keymap: TuiKeymap, + /// Saved inputs keyed by a single digit (`0` through `9`). + #[serde(default, rename = "presets")] + pub quick_dials: BTreeMap, + /// Startup tooltip availability NUX state persisted by the TUI. #[serde(default)] pub model_availability_nux: ModelAvailabilityNuxConfig, diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.json index 7c6da97d0f..82f03f6f7d 100644 --- a/codex-rs/core/config.schema.json +++ b/codex-rs/core/config.schema.json @@ -3767,6 +3767,24 @@ }, "type": "object" }, + "Preset": { + "additionalProperties": false, + "description": "One reusable prompt or slash command submitted through the TUI composer.", + "properties": { + "input": { + "description": "Plain-text input, limited to 8,000 UTF-8 bytes.", + "type": "string" + }, + "label": { + "description": "Optional short name for the picker and shortcut hints.", + "type": "string" + } + }, + "required": [ + "input" + ], + "type": "object" + }, "ProfileTui": { "additionalProperties": false, "description": "TUI settings supported inside a named profile.", @@ -4963,6 +4981,14 @@ "default": "composer", "description": "Where the terminal pet should anchor vertically.\n\nDefaults to `composer`, which follows the current TUI composer viewport." }, + "presets": { + "additionalProperties": { + "$ref": "#/definitions/Preset" + }, + "default": {}, + "description": "Saved inputs keyed by a single digit (`0` through `9`).", + "type": "object" + }, "question_esc_back": { "default": true, "description": "Escape returns from async questions to the composer, preserving the answer draft.", diff --git a/codex-rs/core/src/config/config_tests.rs b/codex-rs/core/src/config/config_tests.rs index 5826e93c01..1799330505 100644 --- a/codex-rs/core/src/config/config_tests.rs +++ b/codex-rs/core/src/config/config_tests.rs @@ -1284,6 +1284,7 @@ fn config_toml_deserializes_model_availability_nux() { agents_overview_grouping: Default::default(), resume_cwd: None, keymap: TuiKeymap::default(), + quick_dials: BTreeMap::new(), model_availability_nux: ModelAvailabilityNuxConfig { shown_count: HashMap::from([ ("gpt-bar".to_string(), 4), @@ -1364,6 +1365,13 @@ async fn runtime_config_uses_tui_raw_output_mode() { let toml = r#" [tui] raw_output_mode = true + + [tui.presets.1] + input = "/model gpt-5.6-sol high fast" + label = "fast coding" + + [tui.presets.2] + input = "Review the current changes" "#; let cfg_toml: ConfigToml = toml::from_str(toml).expect("deserialize raw_output_mode=true"); let cfg = Config::load_from_base_config_with_overrides( @@ -1375,6 +1383,26 @@ async fn runtime_config_uses_tui_raw_output_mode() { .expect("load config"); assert!(cfg.tui_raw_output_mode); + assert_eq!( + cfg.tui_quick_dials, + [ + ( + "1".into(), + QuickDial { + input: "/model gpt-5.6-sol high fast".into(), + label: Some("fast coding".into()), + }, + ), + ( + "2".into(), + QuickDial { + input: "Review the current changes".into(), + label: None, + }, + ), + ] + .into(), + ); } #[tokio::test] @@ -4496,6 +4524,7 @@ fn tui_config_missing_notifications_field_defaults_to_enabled() { agents_overview_grouping: Default::default(), resume_cwd: None, keymap: TuiKeymap::default(), + quick_dials: BTreeMap::new(), model_availability_nux: ModelAvailabilityNuxConfig::default(), terminal_resize_reflow_max_rows: None, } diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rs index b21aa349a7..20939cf80b 100644 --- a/codex-rs/core/src/config/mod.rs +++ b/codex-rs/core/src/config/mod.rs @@ -48,6 +48,7 @@ use codex_config::types::MemoriesConfig; use codex_config::types::ModelAvailabilityNuxConfig; use codex_config::types::Notice; use codex_config::types::OAuthCredentialsStoreMode; +use codex_config::types::QuickDial; use codex_config::types::ResumeCwdMode; use codex_config::types::SessionPickerViewMode; use codex_config::types::ToolSuggestConfig; @@ -892,6 +893,9 @@ pub struct Config { /// 3. built-in defaults pub tui_keymap: TuiKeymap, + /// Saved TUI inputs keyed by a single digit (`0` through `9`). + pub tui_quick_dials: BTreeMap, + /// The absolute directory that should be treated as the current working /// directory for the session. All relative paths inside the business-logic /// layer are resolved against this path. @@ -3307,6 +3311,20 @@ impl Config { validate_model_providers(&cfg.model_providers) .map_err(|message| std::io::Error::new(std::io::ErrorKind::InvalidInput, message))?; + for (slot, dial) in cfg.tui.iter().flat_map(|tui| &tui.quick_dials) { + if !matches!(slot.as_bytes(), [b'0'..=b'9']) { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidInput, + format!("tui.presets.{slot}: slot must be a single digit from 0 to 9"), + )); + } + dial.validate().map_err(|reason| { + std::io::Error::new( + std::io::ErrorKind::InvalidInput, + format!("tui.presets.{slot}: {reason}"), + ) + })?; + } if cfg.model_post_turn_compact_threshold_percent.is_some_and(|percent| percent > 100) { return Err(std::io::Error::new( std::io::ErrorKind::InvalidInput, @@ -4705,6 +4723,11 @@ impl Config { .as_ref() .map(|t| t.keymap.clone()) .unwrap_or_default(), + tui_quick_dials: cfg + .tui + .as_ref() + .map(|t| t.quick_dials.clone()) + .unwrap_or_default(), otel, }; if let Some(message) = config.credential_masking_warning(config.permissions.permission_profile()) { diff --git a/codex-rs/thread-manager-sample/src/main.rs b/codex-rs/thread-manager-sample/src/main.rs index 0d53be0050..af50bd5f44 100644 --- a/codex-rs/thread-manager-sample/src/main.rs +++ b/codex-rs/thread-manager-sample/src/main.rs @@ -308,6 +308,7 @@ async fn new_config( tui_pet_anchor: TuiPetAnchor::Composer, terminal_resize_reflow: TerminalResizeReflowConfig::default(), tui_keymap: TuiKeymap::default(), + tui_quick_dials: BTreeMap::new(), tui_session_picker_view: SessionPickerViewMode::Dense, tui_agents_overview_grouping: Default::default(), tui_resume_cwd: None, diff --git a/codex-rs/tui/src/local_settings.rs b/codex-rs/tui/src/local_settings.rs index a9bed99796..1d0d7eb84b 100644 --- a/codex-rs/tui/src/local_settings.rs +++ b/codex-rs/tui/src/local_settings.rs @@ -84,6 +84,7 @@ impl LocalSettings { agents_overview_grouping: config.tui_agents_overview_grouping, resume_cwd: config.tui_resume_cwd, keymap: config.tui_keymap.clone(), + quick_dials: config.tui_quick_dials.clone(), model_availability_nux: config.model_availability_nux.clone(), terminal_resize_reflow_max_rows: match config.terminal_resize_reflow.max_rows { TerminalResizeReflowMaxRows::Auto => None, From dcd9e954598cd5e9f80570204896d779c60c1ecd Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 18:51:21 +0000 Subject: [PATCH 104/155] Add `/presets` for reusable prompts and slash commands (#54380) ## What changed - Add a TUI picker with ten numbered preset slots, an editor, and confirmation before replacement or deletion. - Create presets from composer text or current model, reasoning effort, and speed settings. Run saved inputs through the normal queued submission path while preserving the composer draft. - Persist presets under `tui.presets` in the active user configuration, respecting configuration layer ownership and leaving in-memory settings unchanged when writes fail. - Preserve permissions when changing effort or speed for the effective model, keep default collaboration settings intact in Plan mode, and allow standard-speed selection with older app servers. ## Testing Add persistence tests for save, replace, delete, configuration ownership, and write failures; picker and confirmation snapshots; and regression coverage for model permissions and standard-speed fallback. GitOrigin-RevId: 5f11699112cd404cc8e954872d53495c6edd0c0a --- codex-rs/tui/src/app.rs | 1 + codex-rs/tui/src/app/event_dispatch.rs | 20 + codex-rs/tui/src/app/model_defaults.rs | 18 +- codex-rs/tui/src/app/quick_dials.rs | 101 ++++ codex-rs/tui/src/app/tests.rs | 16 + .../tui/src/app/tests/model_defaults_tests.rs | 39 ++ .../tui/src/app/tests/quick_dials_tests.rs | 195 ++++++++ codex-rs/tui/src/app_event.rs | 20 + .../tui/src/bottom_pane/custom_prompt_view.rs | 36 +- .../bottom_pane/custom_prompt_view/picker.rs | 2 +- .../src/bottom_pane/list_selection_view.rs | 24 +- ...mposer__tests__vim_empty_normal_slash.snap | 5 +- codex-rs/tui/src/chatwidget.rs | 1 + codex-rs/tui/src/chatwidget/input_flow.rs | 1 + codex-rs/tui/src/chatwidget/quick_dials.rs | 458 ++++++++++++++++++ codex-rs/tui/src/chatwidget/slash_dispatch.rs | 4 + ..._custom_model_display_name_all_models.snap | 1 - ...ustom_model_display_name_quick_picker.snap | 1 - ...s__model_picker_refreshes_auto_models.snap | 1 - ...twidget__tests__model_selection_popup.snap | 2 +- ...idget__tests__saved_quick_dials_clear.snap | 19 + ...sts__saved_quick_dials_confirm_delete.snap | 11 + ...ts__saved_quick_dials_confirm_replace.snap | 13 + ...tests__saved_quick_dials_confirm_save.snap | 12 + ...dget__tests__saved_quick_dials_editor.snap | 10 + ...dget__tests__saved_quick_dials_recall.snap | 23 + ...widget__tests__saved_quick_dials_save.snap | 20 + codex-rs/tui/src/chatwidget/tests.rs | 3 + .../src/chatwidget/tests/quick_dials_tests.rs | 155 ++++++ codex-rs/tui/src/slash_command.rs | 3 + 30 files changed, 1194 insertions(+), 21 deletions(-) create mode 100644 codex-rs/tui/src/app/quick_dials.rs create mode 100644 codex-rs/tui/src/app/tests/quick_dials_tests.rs create mode 100644 codex-rs/tui/src/chatwidget/quick_dials.rs create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_clear.snap create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_delete.snap create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_replace.snap create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_save.snap create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_editor.snap create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_recall.snap create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_save.snap create mode 100644 codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs index 127651bd28..258944b15c 100644 --- a/codex-rs/tui/src/app.rs +++ b/codex-rs/tui/src/app.rs @@ -237,6 +237,7 @@ mod managed_worktree_creation; mod misalignment_policy; mod model_defaults; mod new_session; +mod quick_dials; mod turn_tips; pub(crate) use new_session::has_launch_setting; mod clipboard; diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs index 8efc33bdbc..ac4cff843a 100644 --- a/codex-rs/tui/src/app/event_dispatch.rs +++ b/codex-rs/tui/src/app/event_dispatch.rs @@ -2540,6 +2540,26 @@ impl App { self.app_event_tx.send(AppEvent::FollowTranscript); self.select_session_model(app_server, model, effort, service_tier).await; } + AppEvent::OpenQuickDials(mode) => self.chat_widget.open_quick_dials_picker(mode), + AppEvent::OpenQuickDialEditor { target, dial } => { + self.chat_widget.open_quick_dial_editor(target, dial); + } + AppEvent::OpenQuickDialPrefills(target) => { + self.chat_widget.open_quick_dial_prefills(target); + } + AppEvent::OpenQuickDialSavePicker(dial) => { + self.chat_widget.open_quick_dial_save_picker(dial); + } + AppEvent::ConfirmQuickDial { slot, dial } => self.chat_widget.confirm_quick_dial(slot, dial), + AppEvent::SaveQuickDial { slot, dial } => { + self.app_event_tx.send(AppEvent::FollowTranscript); + self.save_quick_dial(slot, dial).await; + } + AppEvent::RecallQuickDial { slot, thread_id } => { + if self.chat_widget.thread_id() == thread_id { + self.chat_widget.recall_quick_dial(slot); + } + } AppEvent::CyberModelAutoReviewNotice => { self.chat_widget.add_warning_message( "Cyber models default to \"Approve for me\" for safety reasons.".to_string(), diff --git a/codex-rs/tui/src/app/model_defaults.rs b/codex-rs/tui/src/app/model_defaults.rs index 21373a1489..c384559a89 100644 --- a/codex-rs/tui/src/app/model_defaults.rs +++ b/codex-rs/tui/src/app/model_defaults.rs @@ -23,8 +23,8 @@ impl App { effort: Option, service_tier: Option, ) { - let model_changed = self.chat_widget.current_model() != model - || self.chat_widget.current_collaboration_mode().model() != model; + // Changing effort or speed for the effective model must preserve permissions. + let model_changed = self.chat_widget.current_model() != model; let params = if model_changed { self.active_thread_model_setting_update_params(model.clone()) } else { @@ -57,7 +57,10 @@ impl App { if app_server.thread_settings_update_supported { return; } - if service_tier.is_some() { + if service_tier + .as_deref() + .is_some_and(|tier| tier != SERVICE_TIER_DEFAULT_REQUEST_VALUE) + { self.chat_widget.add_error_message( "Model selection requires an app server with thread/settings/update support." .into(), @@ -77,8 +80,13 @@ impl App { let clear_plan_ultra = self.chat_widget.config_ref().plan_mode_reasoning_effort == Some(ReasoningEffort::Ultra) && self.config.plan_mode_reasoning_effort != Some(ReasoningEffort::Ultra); - self.chat_widget.set_model(&model); - if !in_plan_mode || ultra || clear_default_ultra { + if model_changed { + self.chat_widget.set_model(&model); + } + if !in_plan_mode + || (self.chat_widget.current_collaboration_mode().model() == model + && (ultra || clear_default_ultra)) + { self.chat_widget.set_reasoning_effort(effort.clone()); } if in_plan_mode || ultra || clear_plan_ultra { diff --git a/codex-rs/tui/src/app/quick_dials.rs b/codex-rs/tui/src/app/quick_dials.rs new file mode 100644 index 0000000000..41414d5e69 --- /dev/null +++ b/codex-rs/tui/src/app/quick_dials.rs @@ -0,0 +1,101 @@ +//! Persist numbered prompts and slash commands in the active user configuration. +//! Replace slots owned by the active user config. Clearing must not reveal a +//! shadowed slot from another configuration layer. + +use super::App; +use crate::chatwidget::quick_dials::QuickDialEditorTarget; +use crate::config_update::format_config_error; +use crate::legacy_core::config::edit::ConfigEdit; +use crate::legacy_core::config::edit::ConfigEditsBuilder; +use codex_config::ConfigLayerSource; +use codex_config::types::QuickDial; + +impl App { + pub(super) async fn save_quick_dial(&mut self, slot: u8, dial: Option) { + let key = slot.to_string(); + let read_only = { + let mut slot_sources = self + .config + .config_layer_stack + .layers_high_to_low() + .filter(|layer| { + layer + .config + .get("tui") + .and_then(|tui| tui.get("presets")) + .and_then(|dials| dials.get(&key)) + .is_some() + }) + .map(|layer| &layer.name); + let outside_user_config = |source: &ConfigLayerSource| { + !matches!(source, ConfigLayerSource::User { file, .. } + if file == &self.local_settings.user_config_path) + }; + if dial.is_some() { + slot_sources.next().is_some_and(outside_user_config) + } else { + slot_sources.any(outside_user_config) + } + }; + if read_only { + self.chat_widget.add_error_message(format!( + "Preset {slot} is defined outside your user config. Edit its source configuration instead." + )); + self.restore_quick_dial_editor(slot, &dial); + return; + } + let segments = vec!["tui".into(), "presets".into(), key.clone()]; + let edit = match &dial { + Some(candidate) => { + if let Err(reason) = candidate.validate() { + self.chat_widget.add_error_message(reason.into()); + self.restore_quick_dial_editor(slot, &dial); + return; + } + let mut table = toml_edit::Table::new(); + table["input"] = toml_edit::value(&candidate.input); + // An explicit empty label masks labels inherited from lower layers. + table["label"] = toml_edit::value(candidate.label.as_deref().unwrap_or_default()); + ConfigEdit::SetPath { + segments, + value: toml_edit::Item::Table(table), + } + } + None => ConfigEdit::ClearPath { segments }, + }; + if let Err(error) = + ConfigEditsBuilder::for_config_path(self.local_settings.user_config_path.as_path()) + .with_edits([edit]) + .apply() + .await + { + self.chat_widget.add_error_message(format!( + "Failed to update preset {slot}: {}", + format_config_error(&error) + )); + self.restore_quick_dial_editor(slot, &dial); + return; + } + let message = match dial { + Some(mut dial) => { + dial.label.get_or_insert_default(); + self.local_settings.tui.quick_dials.insert(key, dial); + format!("Saved preset {slot}.") + } + None => { + self.local_settings.tui.quick_dials.remove(&key); + format!("Deleted preset {slot}.") + } + }; + self.chat_widget.local_settings.tui.quick_dials = + self.local_settings.tui.quick_dials.clone(); + self.chat_widget.add_info_message(message, /*hint*/ None); + } + + fn restore_quick_dial_editor(&mut self, slot: u8, dial: &Option) { + if let Some(dial) = dial { + self.chat_widget + .open_quick_dial_editor(QuickDialEditorTarget::Slot(slot), Some(dial.clone())); + } + } +} diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs index 5d85e384e5..1c9f52cd85 100644 --- a/codex-rs/tui/src/app/tests.rs +++ b/codex-rs/tui/src/app/tests.rs @@ -66,6 +66,8 @@ mod patch_approval_tests; mod permission_selection_tests; #[path = "tests/projectless_tests.rs"] mod projectless_tests; +#[path = "tests/quick_dials_tests.rs"] +mod quick_dials_tests; #[path = "tests/unavailable_commands_tests.rs"] mod unavailable_commands; @@ -9722,7 +9724,20 @@ async fn changing_cyber_model_reasoning_preserves_selected_permissions() { (ReasoningEffortConfig::High, true), (ReasoningEffortConfig::Ultra, true), ] { + app.chat_widget.set_model(&model_name); if session_only { + app.chat_widget.set_model("different-base-model"); + let default_mode = app.chat_widget.current_collaboration_mode().clone(); + app.chat_widget + .set_feature_enabled(Feature::CollaborationModes, /*enabled*/ true); + app.chat_widget + .set_collaboration_mask(CollaborationModeMask { + name: "Plan".to_string(), + mode: Some(ModeKind::Plan), + model: Some(model_name.clone()), + reasoning_effort: Some(Some(effort.clone())), + developer_instructions: None, + }); app.handle_event( &mut tui, &mut app_server, @@ -9734,6 +9749,7 @@ async fn changing_cyber_model_reasoning_preserves_selected_permissions() { ) .await .expect("session-only reasoning selection should succeed"); + assert_eq!(app.chat_widget.current_collaboration_mode(), &default_mode); } else if effort == ReasoningEffortConfig::Ultra { app.chat_widget .set_feature_enabled(Feature::CollaborationModes, /*enabled*/ true); diff --git a/codex-rs/tui/src/app/tests/model_defaults_tests.rs b/codex-rs/tui/src/app/tests/model_defaults_tests.rs index 5841fd45bf..cdd5ac657b 100644 --- a/codex-rs/tui/src/app/tests/model_defaults_tests.rs +++ b/codex-rs/tui/src/app/tests/model_defaults_tests.rs @@ -2,6 +2,7 @@ use super::*; use crate::collaboration_modes; use codex_app_server_client::AppServerClient; use codex_config::LoaderOverrides; +use codex_protocol::config_types::SERVICE_TIER_DEFAULT_REQUEST_VALUE; use crossterm::event::KeyCode; use pretty_assertions::assert_eq; @@ -115,6 +116,44 @@ async fn session_model_selection_preserves_defaults_and_updates_active_thread() Ok(()) } +#[tokio::test] +async fn standard_speed_selection_falls_back_for_older_app_servers() -> Result<()> { + let (mut app, mut events, mut ops) = make_test_app_with_channels().await; + app.config.service_tier = Some("flex".into()); + let mut server = Box::pin(crate::start_embedded_app_server_for_picker(&app.config)).await?; + let started = server.start_thread(&app.config).await?; + app.enqueue_primary_thread_session(started.session, started.turns) + .await?; + app.chat_widget.set_service_tier(Some("flex".into())); + server.thread_settings_update_supported = false; + while events.try_recv().is_ok() {} + while ops.try_recv().is_ok() {} + + app.select_session_model( + &mut server, + "gpt-5.6-terra".into(), + Some(ReasoningEffortConfig::High), + Some(SERVICE_TIER_DEFAULT_REQUEST_VALUE.into()), + ) + .await; + + assert_eq!( + app.chat_widget.current_service_tier(), + Some(SERVICE_TIER_DEFAULT_REQUEST_VALUE) + ); + assert_eq!(app.config.service_tier.as_deref(), Some("flex")); + app.chat_widget.apply_external_edit("continue".into()); + app.chat_widget.handle_key_event(KeyCode::Esc.into()); + app.chat_widget.handle_key_event(KeyCode::Enter.into()); + assert_matches!( + next_user_turn_op(&mut ops), + Op::UserTurn { service_tier, .. } + if service_tier == Some(Some(SERVICE_TIER_DEFAULT_REQUEST_VALUE.into())) + ); + server.shutdown().await?; + Ok(()) +} + #[tokio::test] async fn model_default_saves_report_server_outcomes_and_target_server_profile() -> Result<()> { for outcome in ["saved", "overridden", "rejected"] { diff --git a/codex-rs/tui/src/app/tests/quick_dials_tests.rs b/codex-rs/tui/src/app/tests/quick_dials_tests.rs new file mode 100644 index 0000000000..c18e16e858 --- /dev/null +++ b/codex-rs/tui/src/app/tests/quick_dials_tests.rs @@ -0,0 +1,195 @@ +//! Preset persistence tests for file writes, layer ownership, and failure atomicity. + +use super::*; +use codex_config::LoaderOverrides; +use codex_config::types::QuickDial; +use pretty_assertions::assert_eq; + +#[tokio::test] +async fn quick_dials_persist_save_replace_and_delete() -> Result<()> { + let (mut app, _events, _ops) = make_test_app_with_channels().await; + let config_path = app.local_settings.user_config_path.clone(); + std::fs::write( + config_path.as_path(), + "# Keep this setting.\n[tui]\nshow_tooltips = false\n", + )?; + + let first = QuickDial { + input: "Review the current changes".into(), + label: None, + }; + app.save_quick_dial(/*slot*/ 3, Some(first)).await; + let saved = QuickDial { + input: "Review the current changes".into(), + label: Some(String::new()), + }; + assert_eq!( + ( + app.local_settings.tui.quick_dials.get("3"), + app.chat_widget.local_settings.tui.quick_dials.get("3"), + ), + (Some(&saved), Some(&saved)) + ); + + let replacement = QuickDial { + input: "/model gpt-5.6-terra --reasoning=high --speed=fast".into(), + label: Some("deep review".into()), + }; + app.save_quick_dial(/*slot*/ 3, Some(replacement.clone())) + .await; + let reloaded = ConfigBuilder::default() + .codex_home(app.config.codex_home.to_path_buf()) + .loader_overrides(LoaderOverrides::without_managed_config_for_tests()) + .build() + .await?; + assert_eq!(reloaded.tui_quick_dials, [("3".into(), replacement)].into()); + assert!(!reloaded.show_tooltips); + + app.save_quick_dial(/*slot*/ 3, /*dial*/ None).await; + let reloaded = ConfigBuilder::default() + .codex_home(app.config.codex_home.to_path_buf()) + .loader_overrides(LoaderOverrides::without_managed_config_for_tests()) + .build() + .await?; + assert!(reloaded.tui_quick_dials.is_empty()); + assert!(app.local_settings.tui.quick_dials.is_empty()); + assert!(app.chat_widget.local_settings.tui.quick_dials.is_empty()); + assert!(!reloaded.show_tooltips); + Ok(()) +} + +#[tokio::test] +async fn quick_dials_respect_profile_and_external_ownership() -> Result<()> { + let (mut app, mut events, _ops) = make_test_app_with_channels().await; + let codex_home = app.config.codex_home.to_path_buf(); + let base_path = app.local_settings.user_config_path.clone(); + let profile_path = AbsolutePathBuf::from_absolute_path(codex_home.join("work.config.toml"))?; + std::fs::write( + base_path.as_path(), + "[tui.presets.1]\ninput = 'base prompt'\nlabel = 'base label'\n", + )?; + std::fs::write( + profile_path.as_path(), + "[tui.presets.1]\ninput = 'profile prompt'\n", + )?; + let mut loader_overrides = LoaderOverrides::without_managed_config_for_tests(); + loader_overrides.user_config_path = Some(profile_path.clone()); + loader_overrides.user_config_profile = Some("work".parse()?); + let external = + toml::from_str::("input = 'externally managed prompt'\nlabel = 'external'\n")?; + let config = ConfigBuilder::default() + .codex_home(codex_home) + .loader_overrides(loader_overrides) + .cli_overrides(vec![("tui.presets.2".into(), external)]) + .build() + .await?; + app.config.config_layer_stack = config.config_layer_stack.clone(); + app.local_settings = crate::local_settings::LocalSettings::from(&config); + app.chat_widget.local_settings = app.local_settings.clone(); + + let replacement = QuickDial { + input: "replacement prompt".into(), + label: None, + }; + app.save_quick_dial(/*slot*/ 1, Some(replacement.clone())) + .await; + assert_eq!( + toml::from_str::(&std::fs::read_to_string(profile_path.as_path())?)?, + toml::from_str::( + "[tui.presets.1]\ninput = 'replacement prompt'\nlabel = ''\n" + )? + ); + assert_eq!( + std::fs::read_to_string(base_path.as_path())?, + "[tui.presets.1]\ninput = 'base prompt'\nlabel = 'base label'\n" + ); + + while events.try_recv().is_ok() {} + let profile_before_rejections = std::fs::read(profile_path.as_path())?; + let dials_before_rejections = app.local_settings.tui.quick_dials.clone(); + app.save_quick_dial(/*slot*/ 1, /*dial*/ None).await; + app.save_quick_dial( + /*slot*/ 2, + Some(QuickDial { + input: "local replacement".into(), + label: None, + }), + ) + .await; + assert_eq!( + ( + std::fs::read(profile_path.as_path())?, + &app.local_settings.tui.quick_dials, + &app.chat_widget.local_settings.tui.quick_dials, + ), + ( + profile_before_rejections, + &dials_before_rejections, + &dials_before_rejections, + ) + ); + let errors = std::iter::from_fn(|| events.try_recv().ok()) + .filter_map(|event| match event { + AppEvent::InsertHistoryCell(cell) => { + Some(lines_to_single_string( + &cell.transcript_lines(/*width*/ 200), + )) + } + _ => None, + }) + .filter(|message| message.contains("defined outside your user config")) + .count(); + assert_eq!(errors, 2); + Ok(()) +} + +#[tokio::test] +async fn quick_dial_write_failure_leaves_file_and_memory_unchanged() -> Result<()> { + let (mut app, mut events, _ops) = make_test_app_with_channels().await; + let config_path = app.local_settings.user_config_path.clone(); + let existing = QuickDial { + input: "existing prompt".into(), + label: Some("existing".into()), + }; + app.local_settings + .tui + .quick_dials + .insert("4".into(), existing); + app.chat_widget.local_settings = app.local_settings.clone(); + std::fs::write(config_path.as_path(), "[broken")?; + let file_before = std::fs::read(config_path.as_path())?; + let dials_before = app.local_settings.tui.quick_dials.clone(); + while events.try_recv().is_ok() {} + + app.save_quick_dial( + /*slot*/ 4, + Some(QuickDial { + input: "replacement prompt".into(), + label: None, + }), + ) + .await; + + assert_eq!( + ( + std::fs::read(config_path.as_path())?, + &app.local_settings.tui.quick_dials, + &app.chat_widget.local_settings.tui.quick_dials, + ), + (file_before, &dials_before, &dials_before) + ); + let messages = std::iter::from_fn(|| events.try_recv().ok()) + .filter_map(|event| match event { + AppEvent::InsertHistoryCell(cell) => { + Some(lines_to_single_string( + &cell.transcript_lines(/*width*/ 200), + )) + } + _ => None, + }) + .collect::>() + .join("\n"); + assert!(messages.contains("Failed to update preset 4")); + assert!(!messages.contains("Saved preset 4")); + Ok(()) +} diff --git a/codex-rs/tui/src/app_event.rs b/codex-rs/tui/src/app_event.rs index 613178d0c1..04af70635f 100644 --- a/codex-rs/tui/src/app_event.rs +++ b/codex-rs/tui/src/app_event.rs @@ -1276,6 +1276,26 @@ pub(crate) enum AppEvent { service_tier: Option, }, + OpenQuickDials(crate::chatwidget::quick_dials::QuickDialPickerMode), + OpenQuickDialEditor { + target: crate::chatwidget::quick_dials::QuickDialEditorTarget, + dial: Option, + }, + OpenQuickDialPrefills(crate::chatwidget::quick_dials::QuickDialEditorTarget), + OpenQuickDialSavePicker(codex_config::types::QuickDial), + ConfirmQuickDial { + slot: u8, + dial: Option, + }, + SaveQuickDial { + slot: u8, + dial: Option, + }, + RecallQuickDial { + slot: u8, + thread_id: Option, + }, + /// Show the cyber auto-review notice after the model selection confirmation. CyberModelAutoReviewNotice, diff --git a/codex-rs/tui/src/bottom_pane/custom_prompt_view.rs b/codex-rs/tui/src/bottom_pane/custom_prompt_view.rs index 061fec4ff4..4c53bb2481 100644 --- a/codex-rs/tui/src/bottom_pane/custom_prompt_view.rs +++ b/codex-rs/tui/src/bottom_pane/custom_prompt_view.rs @@ -49,6 +49,9 @@ pub(crate) struct CustomPromptView { placeholder: String, context_label: Option, on_submit: PromptSubmitted, + submit_label: &'static str, + preserve_whitespace: bool, + dismiss_after_child_accept: bool, // UI state textarea: TextArea, @@ -78,6 +81,9 @@ impl CustomPromptView { placeholder, context_label, on_submit, + submit_label: "submit", + preserve_whitespace: false, + dismiss_after_child_accept: false, textarea, textarea_state: RefCell::new(TextAreaState::default()), paste_burst: PasteBurst::default(), @@ -87,6 +93,19 @@ impl CustomPromptView { } } + /// Keep the prompt open while its submission opens a child view. + pub(crate) fn with_child_flow(mut self, submit_label: &'static str) -> Self { + self.submit_label = submit_label; + self.dismiss_after_child_accept = true; + self + } + + /// Submit the editor contents without trimming their surrounding whitespace. + pub(crate) fn preserve_whitespace(mut self) -> Self { + self.preserve_whitespace = true; + self + } + /// Apply the same editor and Vim bindings used by the main composer. pub(crate) fn set_keymap_bindings(&mut self, keymap: &RuntimeKeymap) { self.textarea.set_keymap_bindings(keymap); @@ -151,10 +170,17 @@ impl CustomPromptView { return; } if modifiers == KeyModifiers::NONE { - let text = self.textarea.text().trim().to_string(); - if !text.is_empty() { + let text = self.textarea.text(); + if !text.trim().is_empty() { + let text = if self.preserve_whitespace { + text.to_string() + } else { + text.trim().to_string() + }; (self.on_submit)(text); - self.completion = Some(ViewCompletion::Accepted); + if !self.dismiss_after_child_accept { + self.completion = Some(ViewCompletion::Accepted); + } } } else { self.textarea.input(key_event); @@ -219,6 +245,10 @@ impl BottomPaneView for CustomPromptView { self.completion } + fn dismiss_after_child_accept(&self) -> bool { + self.dismiss_after_child_accept + } + fn handle_paste(&mut self, pasted: String) -> bool { if pasted.is_empty() { return false; diff --git a/codex-rs/tui/src/bottom_pane/custom_prompt_view/picker.rs b/codex-rs/tui/src/bottom_pane/custom_prompt_view/picker.rs index 947e864d58..5d5f734b14 100644 --- a/codex-rs/tui/src/bottom_pane/custom_prompt_view/picker.rs +++ b/codex-rs/tui/src/bottom_pane/custom_prompt_view/picker.rs @@ -100,7 +100,7 @@ impl CustomPromptView { }; let hint = Line::from(vec![ key_hint::plain(KeyCode::Enter).into(), - " submit · ".dim(), + format!(" {} · ", self.submit_label).dim(), key_hint::plain(KeyCode::Esc).into(), cancel_label.dim(), ]); diff --git a/codex-rs/tui/src/bottom_pane/list_selection_view.rs b/codex-rs/tui/src/bottom_pane/list_selection_view.rs index 19f365028c..a5f5458ed3 100644 --- a/codex-rs/tui/src/bottom_pane/list_selection_view.rs +++ b/codex-rs/tui/src/bottom_pane/list_selection_view.rs @@ -235,6 +235,8 @@ pub(crate) struct SelectionViewParams { /// Optional non-text key that can toggle a row while printable keys edit the search query. pub search_toggle_key: Option, pub search_mode: SearchMode, + /// Use ordinal digits in the gutter; when false, use only each row's explicit shortcut. + pub auto_number_shortcuts: bool, pub search_placeholder: Option, pub col_width_mode: ColumnWidthMode, pub row_display: SelectionRowDisplay, @@ -301,6 +303,7 @@ impl Default for SelectionViewParams { is_searchable: false, search_toggle_key: None, search_mode: SearchMode::default(), + auto_number_shortcuts: true, search_placeholder: None, col_width_mode: ColumnWidthMode::AutoVisible, row_display: SelectionRowDisplay::Wrapped, @@ -358,6 +361,7 @@ pub(crate) struct ListSelectionView { search_toggle_key: Option, search_mode: SearchMode, search_active: bool, + auto_number_shortcuts: bool, search_query: String, search_placeholder: Option, col_width_mode: ColumnWidthMode, @@ -515,6 +519,7 @@ impl ListSelectionView { search_mode: params.search_mode, search_active, search_query, + auto_number_shortcuts: params.auto_number_shortcuts, search_placeholder: if params.is_searchable { params.search_placeholder } else { @@ -764,6 +769,11 @@ impl ListSelectionView { // The number keys don't work when search is enabled (since we let the // numbers be used for the search query). format!("{prefix} ") + } else if !self.auto_number_shortcuts { + item.display_shortcut.map_or_else( + || format!("{prefix} "), + |shortcut| format!("{prefix} {}. ", shortcut.display_label()), + ) } else if is_disabled { if let Some(disabled_gutter_marker) = item.disabled_gutter_marker { let marker_width = UnicodeWidthStr::width(disabled_gutter_marker); @@ -798,7 +808,10 @@ impl ListSelectionView { selection_style: row_selection_style, name: name_with_marker, name_prefix_spans, - display_shortcut: item.display_shortcut, + display_shortcut: self + .auto_number_shortcuts + .then_some(item.display_shortcut) + .flatten(), match_indices: None, description, wrap_indent, @@ -1419,10 +1432,11 @@ impl BottomPaneView for ListSelectionView { self.select_shortcut(idx); return; } - if let Some(idx) = c - .to_digit(10) - .map(|d| d as usize) - .and_then(|number| self.actual_idx_for_enabled_number(number)) + if self.auto_number_shortcuts + && let Some(idx) = c + .to_digit(/*radix*/ 10) + .map(|d| d as usize) + .and_then(|number| self.actual_idx_for_enabled_number(number)) { self.select_shortcut(idx); } diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__vim_empty_normal_slash.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__vim_empty_normal_slash.snap index d7125e250d..2ad183893b 100644 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__vim_empty_normal_slash.snap +++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__vim_empty_normal_slash.snap @@ -1,13 +1,12 @@ --- source: tui/src/bottom_pane/chat_composer.rs -assertion_line: 5217 expression: terminal.backend() --- "› /model choose what model and reasoning effort to " " use " +" /presets run or save reusable prompts and slash " +" commands " " /ide include current selection, open files, and" -" other context from your IDE " -" /permissions choose what Codex is allowed to do " " " "› / " " " diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index ab13bba827..06aa1abc66 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -326,6 +326,7 @@ mod model_command; mod model_popup_state; mod model_popups; mod notifications; +pub(crate) mod quick_dials; mod session_model_selection; use self::notifications::Notification; pub(crate) use self::session_model_selection::AstraModelPickerAction; diff --git a/codex-rs/tui/src/chatwidget/input_flow.rs b/codex-rs/tui/src/chatwidget/input_flow.rs index 5b44cac1b0..6a089a0039 100644 --- a/codex-rs/tui/src/chatwidget/input_flow.rs +++ b/codex-rs/tui/src/chatwidget/input_flow.rs @@ -28,6 +28,7 @@ impl ChatWidget { // Inline commands still follow so their output (including usage errors) is visible. InputResult::Command( SlashCommand::Model + | SlashCommand::Presets | SlashCommand::Keymap | SlashCommand::Memories | SlashCommand::Config diff --git a/codex-rs/tui/src/chatwidget/quick_dials.rs b/codex-rs/tui/src/chatwidget/quick_dials.rs new file mode 100644 index 0000000000..e731623a50 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/quick_dials.rs @@ -0,0 +1,458 @@ +//! Numbered reusable inputs using the existing picker and queued submission path. +//! Saving leaves the draft untouched; recall preserves drafts and obeys normal command gates. + +use super::*; +use crate::wrapping::word_wrap_lines; +use codex_config::types::QuickDial; +use codex_protocol::config_types::SERVICE_TIER_DEFAULT_REQUEST_VALUE; + +struct QuickDialConfirmationHeader(Vec>); + +impl Renderable for QuickDialConfirmationHeader { + fn render(&self, area: Rect, buf: &mut Buffer) { + Renderable::render( + &Paragraph::new(word_wrap_lines(&self.0, usize::from(area.width))), + area, + buf, + ); + } + fn desired_height(&self, width: u16) -> u16 { + word_wrap_lines(&self.0, usize::from(width)).len() as u16 + } +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub(crate) enum QuickDialPickerMode { + Recall, + Save, + Edit, + Clear, +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub(crate) enum QuickDialEditorTarget { + PickSlot, + Slot(u8), +} + +#[derive(Clone, Copy)] +enum QuickDialMenuAction { + New, + Edit, + Prefill, + Clear, +} + +fn quick_dial_label(dial: &QuickDial) -> String { + dial.label + .as_deref() + .filter(|label| !label.trim().is_empty()) + .unwrap_or(&dial.input) + .trim_start() + .lines() + .next() + .unwrap_or_default() + .to_string() +} + +impl ChatWidget { + fn composer_quick_dial_text(&mut self) -> String { + if !self.bottom_pane.composer_local_images().is_empty() + || !self.bottom_pane.remote_image_urls().is_empty() + { + self.add_info_message( + "Images cannot be copied into a preset. Starting with empty text.".into(), + /*hint*/ None, + ); + return String::new(); + } + if !self + .bottom_pane + .composer_draft_snapshot() + .mention_bindings + .is_empty() + { + self.add_info_message( + "Linked mentions cannot be copied into a preset. Starting with empty text.".into(), + /*hint*/ None, + ); + return String::new(); + } + self.bottom_pane.composer_text_with_pending() + } + + pub(super) fn current_model_quick_dial(&self) -> Result { + let Some(model) = self + .model_catalog + .models + .iter() + .find(|model| model.model == self.current_model() && model.show_in_picker) + .filter(|_| !self.restrict_model_picker_to_luna_reserve()) + else { + return Err("The current model cannot be recalled with /model."); + }; + let mut input = format!("/model {}", self.current_model()); + if let Some(effort) = self.current_reasoning_effort() { + let supported = if model.supported_reasoning_efforts.is_empty() { + effort == model.default_reasoning_effort + } else { + model + .supported_reasoning_efforts + .iter() + .any(|option| option.effort == effort) + }; + if !supported { + return Err("Choose an available reasoning effort with /model before saving."); + } + input.push_str(&format!(" --reasoning={effort}")); + } + let speed = self + .current_service_tier() + .filter(|tier| *tier != SERVICE_TIER_DEFAULT_REQUEST_VALUE) + .unwrap_or("standard"); + if !matches!(speed, "standard" | "flex") + && !model + .service_tiers + .iter() + .any(|tier| tier.id == speed && self.config.features.service_tier_enabled(&tier.id)) + { + return Err("Choose an available speed with /model before saving."); + } + input.push_str(&format!(" --speed={speed}")); + let dial = QuickDial { input, label: None }; + dial.validate()?; + Ok(dial) + } + + fn quick_dials_available(&mut self) -> bool { + if self.blocks_direct_input + || self.active_side_conversation + || !self.bottom_pane.composer_input_enabled() + { + self.add_error_message("Presets are unavailable in this conversation.".into()); + return false; + } + if !self.is_session_configured() { + self.add_info_message( + "Presets are available after startup completes.".into(), + /*hint*/ None, + ); + return false; + } + true + } + + pub(crate) fn recall_quick_dial(&mut self, slot: u8) { + if !self.quick_dials_available() { + return; + } + let Some(dial) = self + .local_settings + .tui + .quick_dials + .get(&slot.to_string()) + .cloned() + else { + return; + }; + if let Err(reason) = dial.validate() { + self.add_error_message(format!("Preset {slot}: {reason}")); + return; + } + self.app_event_tx.send(AppEvent::FollowTranscript); + self.queue_user_message_with_options( + dial.input.into(), + QueuedInputAction::ParseSlash, + Vec::new(), + ); + } + + pub(crate) fn open_quick_dials_picker(&mut self, mode: QuickDialPickerMode) { + if !self.quick_dials_available() { + return; + } + self.show_quick_dials_picker(mode, /*current*/ None); + } + + pub(crate) fn open_quick_dial_save_picker(&mut self, dial: QuickDial) { + if let Err(reason) = dial.validate() { + self.add_error_message(reason.into()); + return; + } + self.show_quick_dials_picker(QuickDialPickerMode::Save, Some(dial)); + } + + fn show_quick_dials_picker(&mut self, mode: QuickDialPickerMode, current: Option) { + let thread_id = self.thread_id(); + let mut items = Vec::new(); + for slot in (1..=9).chain(std::iter::once(/*value*/ 0)) { + let saved = self.local_settings.tui.quick_dials.get(&slot.to_string()); + if mode == QuickDialPickerMode::Edit && saved.is_none() { + continue; + } + let dial = current.clone(); + let saved_for_edit = saved.cloned(); + let has_saved = saved.is_some(); + let (is_disabled, dismiss_on_select, dismiss_parent_on_child_accept) = match mode { + QuickDialPickerMode::Recall => (!has_saved, true, false), + QuickDialPickerMode::Save => (dial.is_none(), !has_saved, has_saved), + QuickDialPickerMode::Edit => (false, false, true), + QuickDialPickerMode::Clear => (!has_saved, false, true), + }; + items.push(SelectionItem { + name: saved.map(quick_dial_label).unwrap_or_default(), + name_prefix_spans: if saved.is_none() { + vec!["empty".dim()] + } else { + Vec::new() + }, + description: saved + .filter(|dial| { + dial.label + .as_deref() + .is_some_and(|label| !label.trim().is_empty()) + }) + .map(|dial| dial.input.clone()), + display_shortcut: Some( + key_hint::plain(KeyCode::Char(char::from(b'0' + slot))).into(), + ), + is_disabled, + actions: vec![Box::new(move |tx| { + let event = match mode { + QuickDialPickerMode::Recall => { + AppEvent::RecallQuickDial { slot, thread_id } + } + QuickDialPickerMode::Save if has_saved => AppEvent::ConfirmQuickDial { + slot, + dial: dial.clone(), + }, + QuickDialPickerMode::Save => AppEvent::SaveQuickDial { + slot, + dial: dial.clone(), + }, + QuickDialPickerMode::Edit => AppEvent::OpenQuickDialEditor { + target: QuickDialEditorTarget::Slot(slot), + dial: saved_for_edit.clone(), + }, + QuickDialPickerMode::Clear => { + AppEvent::ConfirmQuickDial { slot, dial: None } + } + }; + tx.send(event); + })], + dismiss_on_select, + dismiss_parent_on_child_accept, + ..Default::default() + }); + } + if mode == QuickDialPickerMode::Recall { + for (key, name, action) in [ + (Some('s'), "New preset…", QuickDialMenuAction::New), + (Some('e'), "Edit a preset…", QuickDialMenuAction::Edit), + ( + None, + "Start from current settings…", + QuickDialMenuAction::Prefill, + ), + (Some('d'), "Delete a preset…", QuickDialMenuAction::Clear), + ] { + let is_disabled = matches!( + action, + QuickDialMenuAction::Edit | QuickDialMenuAction::Clear + ) && self.local_settings.tui.quick_dials.is_empty(); + items.push(SelectionItem { + name: name.into(), + display_shortcut: key.map(|key| key_hint::plain(KeyCode::Char(key)).into()), + actions: vec![Box::new(move |tx| { + tx.send(match action { + QuickDialMenuAction::New => AppEvent::OpenQuickDialEditor { + target: QuickDialEditorTarget::PickSlot, + dial: None, + }, + QuickDialMenuAction::Edit => { + AppEvent::OpenQuickDials(QuickDialPickerMode::Edit) + } + QuickDialMenuAction::Prefill => { + AppEvent::OpenQuickDialPrefills(QuickDialEditorTarget::PickSlot) + } + QuickDialMenuAction::Clear => { + AppEvent::OpenQuickDials(QuickDialPickerMode::Clear) + } + }) + })], + is_disabled, + dismiss_parent_on_child_accept: true, + ..Default::default() + }); + } + } + let title = match mode { + QuickDialPickerMode::Recall => "Presets", + QuickDialPickerMode::Save => "Save preset to slot", + QuickDialPickerMode::Edit => "Edit a preset", + QuickDialPickerMode::Clear => "Delete a preset", + }; + let initial_selected_idx = (mode == QuickDialPickerMode::Save).then(|| { + (1..=9) + .chain(std::iter::once(/*value*/ 0)) + .position(|slot| { + !self + .local_settings + .tui + .quick_dials + .contains_key(&slot.to_string()) + }) + .unwrap_or(/*default*/ 0) + }); + self.bottom_pane.show_selection_view(SelectionViewParams { + view_id: Some("quick-dials"), + auto_number_shortcuts: false, + initial_selected_idx, + max_visible_rows: 14, + title: Some(title.into()), + subtitle: (mode == QuickDialPickerMode::Save) + .then(|| current.as_ref().map(quick_dial_label)) + .flatten(), + items, + ..SelectionViewParams::picker() + }); + self.defer_input_until_settings_applied(); + } + + pub(crate) fn open_quick_dial_editor( + &mut self, + target: QuickDialEditorTarget, + dial: Option, + ) { + if !self.quick_dials_available() { + return; + } + let slot = match target { + QuickDialEditorTarget::PickSlot => None, + QuickDialEditorTarget::Slot(slot) => Some(slot), + }; + let dial = dial.unwrap_or_else(|| QuickDial { + input: self.composer_quick_dial_text(), + label: None, + }); + let title = slot + .filter(|slot| { + self.local_settings + .tui + .quick_dials + .contains_key(&slot.to_string()) + }) + .map_or_else( + || "New preset".to_string(), + |slot| format!("Edit preset {slot}"), + ); + let submit_label = if slot.is_some() { + "review changes" + } else { + "choose slot" + }; + let tx = self.app_event_tx.clone(); + let label = dial.label; + let view = CustomPromptView::new( + title, + "Write a prompt or slash command".to_string(), + dial.input, + /*context_label*/ None, + Box::new(move |input| { + let dial = QuickDial { + input, + label: label.clone(), + }; + tx.send(match target { + QuickDialEditorTarget::PickSlot => AppEvent::OpenQuickDialSavePicker(dial), + QuickDialEditorTarget::Slot(slot) => AppEvent::ConfirmQuickDial { + slot, + dial: Some(dial), + }, + }); + }), + ) + .with_child_flow(submit_label) + .preserve_whitespace(); + self.bottom_pane.show_text_prompt(view); + self.defer_input_until_settings_applied(); + } + + pub(crate) fn open_quick_dial_prefills(&mut self, target: QuickDialEditorTarget) { + if !self.quick_dials_available() { + return; + } + let model = self.current_model_quick_dial(); + let (description, is_disabled, actions) = match model { + Ok(dial) => { + let description = Some(dial.input.clone()); + let actions = vec![Box::new(move |tx: &AppEventSender| { + tx.send(AppEvent::OpenQuickDialEditor { + target, + dial: Some(dial.clone()), + }) + }) as SelectionAction]; + (description, false, actions) + } + Err(reason) => (Some(reason.into()), true, Vec::new()), + }; + self.bottom_pane.show_selection_view(SelectionViewParams { + view_id: Some("quick-dial-prefills"), + max_visible_rows: 1, + title: Some("Start preset from current settings".into()), + items: vec![SelectionItem { + name: "Current model".into(), + description, + is_disabled, + actions, + dismiss_parent_on_child_accept: true, + ..Default::default() + }], + ..SelectionViewParams::picker() + }); + self.defer_input_until_settings_applied(); + } + + pub(crate) fn confirm_quick_dial(&mut self, slot: u8, dial: Option) { + if let Some(dial) = &dial + && let Err(reason) = dial.validate() + { + self.add_error_message(reason.into()); + return; + } + let saved = self.local_settings.tui.quick_dials.get(&slot.to_string()); + let (action, description) = match (saved, &dial) { + (Some(old), Some(new)) => ( + "Replace", + format!("{}\n→ {}", old.input.trim(), new.input.trim()), + ), + (Some(old), None) => ("Delete", quick_dial_label(old)), + (None, Some(new)) => ("Save", new.input.trim().to_string()), + (None, None) => return, + }; + self.bottom_pane.show_selection_view(SelectionViewParams { + header: Box::new(QuickDialConfirmationHeader( + std::iter::once(Line::from(format!("{action} preset {slot}?").bold())) + .chain( + description + .lines() + .map(|line| Line::from(line.to_string().dim())), + ) + .collect(), + )), + items: vec![SelectionItem { + name: format!("{action} preset {slot}"), + require_explicit_confirmation: true, + actions: vec![Box::new(move |tx| { + tx.send(AppEvent::SaveQuickDial { + slot, + dial: dial.clone(), + }) + })], + dismiss_on_select: true, + ..Default::default() + }], + ..SelectionViewParams::picker() + }); + } +} diff --git a/codex-rs/tui/src/chatwidget/slash_dispatch.rs b/codex-rs/tui/src/chatwidget/slash_dispatch.rs index 1664e493eb..46fe775d17 100644 --- a/codex-rs/tui/src/chatwidget/slash_dispatch.rs +++ b/codex-rs/tui/src/chatwidget/slash_dispatch.rs @@ -378,6 +378,9 @@ impl ChatWidget { self.open_model_popup(); self.defer_input_until_settings_applied(); } + SlashCommand::Presets => { + self.open_quick_dials_picker(quick_dials::QuickDialPickerMode::Recall); + } SlashCommand::Plan => { self.apply_plan_slash_command(); } @@ -1318,6 +1321,7 @@ impl ChatWidget { | SlashCommand::Compact | SlashCommand::Review | SlashCommand::Model + | SlashCommand::Presets | SlashCommand::Plan | SlashCommand::Goal | SlashCommand::Side diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__custom_model_display_name_all_models.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__custom_model_display_name_all_models.snap index 509a75dd8a..dfe817667c 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__custom_model_display_name_all_models.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__custom_model_display_name_all_models.snap @@ -1,6 +1,5 @@ --- source: tui/src/chatwidget/tests/model_display_name_tests.rs -assertion_line: 40 expression: "render_bottom_popup(&chat, 80)" --- Select Model and Effort diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__custom_model_display_name_quick_picker.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__custom_model_display_name_quick_picker.snap index 8ae33f16b5..0b466ec609 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__custom_model_display_name_quick_picker.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__custom_model_display_name_quick_picker.snap @@ -1,6 +1,5 @@ --- source: tui/src/chatwidget/tests/model_display_name_tests.rs -assertion_line: 33 expression: "render_bottom_popup(&chat, 80)" --- Select Model diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__model_picker_refreshes_auto_models.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__model_picker_refreshes_auto_models.snap index 31485205ed..a090ec159f 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__model_picker_refreshes_auto_models.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__model_picker_refreshes_auto_models.snap @@ -1,6 +1,5 @@ --- source: tui/src/chatwidget/tests/popups_and_settings.rs -assertion_line: 3393 expression: "render_bottom_popup(&chat, 80)" --- Select Model diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__model_selection_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__model_selection_popup.snap index 3f9740b88f..e048e7ff70 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__model_selection_popup.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__model_selection_popup.snap @@ -1,6 +1,6 @@ --- source: tui/src/chatwidget/tests/popups_and_settings.rs -expression: popup +expression: "render_bottom_popup(&chat, 80)" --- Select Model and Effort diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_clear.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_clear.snap new file mode 100644 index 0000000000..7b0955a079 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_clear.snap @@ -0,0 +1,19 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 80)" +--- + Delete a preset + + +› 1. coding /model gpt-5.5 --reasoning=high --speed=fast + 2. empty + 3. empty + 4. empty + 5. empty + 6. empty + 7. empty + 8. empty + 9. empty + 0. empty + + enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_delete.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_delete.snap new file mode 100644 index 0000000000..109c5f561d --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_delete.snap @@ -0,0 +1,11 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 80)" +--- + Delete preset 1? + coding + + +› 1. Delete preset 1 + + enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_replace.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_replace.snap new file mode 100644 index 0000000000..9f5b01af0f --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_replace.snap @@ -0,0 +1,13 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 52)" +--- + Replace preset 1? + /model gpt-5.5 --reasoning=high --speed=fast + → /model gpt-5.6-terra --reasoning=high + --speed=fast + + +› 1. Replace preset 1 + + enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_save.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_save.snap new file mode 100644 index 0000000000..a7615426b7 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_confirm_save.snap @@ -0,0 +1,12 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 52)" +--- + Save preset 2? + /model gpt-5.6-terra --reasoning=high + --speed=fast + + +› 1. Save preset 2 + + enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_editor.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_editor.snap new file mode 100644 index 0000000000..3b9dc66e66 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_editor.snap @@ -0,0 +1,10 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: editor.clone() +--- + New preset + +› Review the current changes + for safety + + enter choose slot · esc back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_recall.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_recall.snap new file mode 100644 index 0000000000..0a02e68f47 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_recall.snap @@ -0,0 +1,23 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 80)" +--- + Presets + + +› 1. coding /model gpt-5.5 --reasoning=high --speed=fast + 2. empty + 3. empty + 4. empty + 5. empty + 6. empty + 7. empty + 8. empty + 9. empty + 0. empty + s. New preset… + e. Edit a preset… + Start from current settings… + d. Delete a preset… + + enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_save.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_save.snap new file mode 100644 index 0000000000..eb3b518d9b --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_save.snap @@ -0,0 +1,20 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 80)" +--- + Save preset to slot + Review the current changes + + + 1. coding /model gpt-5.5 --reasoning=high --speed=fast +› 2. empty + 3. empty + 4. empty + 5. empty + 6. empty + 7. empty + 8. empty + 9. empty + 0. empty + + enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/tests.rs b/codex-rs/tui/src/chatwidget/tests.rs index ee79aeffb4..1e5dade887 100644 --- a/codex-rs/tui/src/chatwidget/tests.rs +++ b/codex-rs/tui/src/chatwidget/tests.rs @@ -328,3 +328,6 @@ mod question_notifications_tests; #[path = "tests/security_setup_tests.rs"] mod security_setup_tests; + +#[path = "tests/quick_dials_tests.rs"] +mod quick_dials_tests; diff --git a/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs b/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs new file mode 100644 index 0000000000..649580621a --- /dev/null +++ b/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs @@ -0,0 +1,155 @@ +//! Save, Clear, and confirmation layouts keep destructive preset actions explicit. + +use super::*; +use crate::chatwidget::quick_dials::QuickDialEditorTarget; +use crate::chatwidget::quick_dials::QuickDialPickerMode; +use codex_config::types::QuickDial; + +#[tokio::test] +async fn saved_quick_dials_save_and_clear_picker_snapshots() { + const DRAFT: &str = "Review the current changes\nfor safety "; + let (mut chat, mut events, _ops) = + make_chatwidget_manual(/*model_override*/ Some("gpt-5.5")).await; + chat.thread_id = Some(ThreadId::new()); + chat.local_settings.tui.quick_dials = [( + "1".into(), + QuickDial { + input: "/model gpt-5.5 --reasoning=high --speed=fast".into(), + label: Some("coding".into()), + }, + )] + .into(); + chat.bottom_pane.apply_external_edit(DRAFT.into()); + chat.dispatch_command(SlashCommand::Presets); + assert_chatwidget_snapshot!( + "saved_quick_dials_recall", + render_bottom_popup(&chat, /*width*/ 80) + ); + chat.handle_key_event(KeyCode::Esc.into()); + while events.try_recv().is_ok() {} + chat.open_quick_dial_editor(QuickDialEditorTarget::PickSlot, /*dial*/ None); + let editor = render_bottom_popup(&chat, /*width*/ 80); + assert_chatwidget_snapshot!("saved_quick_dials_editor", editor.clone()); + chat.handle_key_event(KeyCode::Enter.into()); + let edited = std::iter::from_fn(|| events.try_recv().ok()) + .find_map(|event| match event { + AppEvent::OpenQuickDialSavePicker(dial) => Some(dial), + _ => None, + }) + .expect("editor submits a preset draft"); + assert_eq!( + edited, + QuickDial { + input: DRAFT.into(), + label: None, + } + ); + chat.open_quick_dial_save_picker(edited); + assert_chatwidget_snapshot!( + "saved_quick_dials_save", + render_bottom_popup(&chat, /*width*/ 80) + ); + chat.handle_key_event(KeyCode::Esc.into()); + assert_eq!(render_bottom_popup(&chat, /*width*/ 80), editor); + chat.handle_key_event(KeyCode::Esc.into()); + + let saved = chat.local_settings.tui.quick_dials["1"].clone(); + chat.open_quick_dial_editor(QuickDialEditorTarget::Slot(/*slot*/ 1), Some(saved.clone())); + chat.handle_key_event(KeyCode::Enter.into()); + assert_matches!( + std::iter::from_fn(|| events.try_recv().ok()) + .find(|event| matches!(event, AppEvent::ConfirmQuickDial { .. })), + Some(AppEvent::ConfirmQuickDial { + slot: 1, + dial: Some(actual), + }) if actual == saved + ); + chat.handle_key_event(KeyCode::Esc.into()); + + chat.open_quick_dials_picker(QuickDialPickerMode::Clear); + assert_chatwidget_snapshot!( + "saved_quick_dials_clear", + render_bottom_popup(&chat, /*width*/ 80) + ); + chat.handle_key_event(KeyCode::Esc.into()); + while events.try_recv().is_ok() {} + let replacement = QuickDial { + input: "/model gpt-5.6-terra --reasoning=high --speed=fast".into(), + label: None, + }; + chat.confirm_quick_dial(/*slot*/ 2, Some(replacement.clone())); + assert_chatwidget_snapshot!( + "saved_quick_dials_confirm_save", + render_bottom_popup(&chat, /*width*/ 52) + ); + chat.handle_key_event(KeyCode::Esc.into()); + assert!( + !std::iter::from_fn(|| events.try_recv().ok()) + .any(|event| matches!(event, AppEvent::SaveQuickDial { .. })) + ); + + chat.confirm_quick_dial(/*slot*/ 1, Some(replacement.clone())); + assert_chatwidget_snapshot!( + "saved_quick_dials_confirm_replace", + render_bottom_popup(&chat, /*width*/ 52) + ); + chat.handle_key_event(KeyCode::Enter.into()); + assert_matches!( + events.try_recv(), + Ok(AppEvent::SaveQuickDial { + slot: 1, + dial: Some(actual), + }) if actual == replacement + ); + + chat.confirm_quick_dial(/*slot*/ 1, /*dial*/ None); + assert_chatwidget_snapshot!( + "saved_quick_dials_confirm_delete", + render_bottom_popup(&chat, /*width*/ 80) + ); + chat.handle_key_event(KeyCode::Esc.into()); + assert!( + !std::iter::from_fn(|| events.try_recv().ok()) + .any(|event| matches!(event, AppEvent::SaveQuickDial { .. })) + ); + + chat.recall_quick_dial(/*slot*/ 1); + assert_eq!(chat.bottom_pane.composer_text(), DRAFT); + assert_eq!( + chat.queued_user_message_texts(), + ["/model gpt-5.5 --reasoning=high --speed=fast"] + ); + + chat.set_reasoning_effort(Some(ReasoningEffortConfig::High)); + chat.effective_service_tier = Some(SERVICE_TIER_DEFAULT_REQUEST_VALUE.into()); + assert_eq!( + chat.current_model_quick_dial(), + Ok(QuickDial { + input: "/model gpt-5.5 --reasoning=high --speed=standard".into(), + label: None, + }) + ); + let expected_model = chat.current_model_quick_dial().expect("model command"); + chat.open_quick_dial_prefills(QuickDialEditorTarget::PickSlot); + chat.handle_key_event(KeyCode::Enter.into()); + assert_matches!( + std::iter::from_fn(|| events.try_recv().ok()) + .find(|event| matches!(event, AppEvent::OpenQuickDialEditor { .. })), + Some(AppEvent::OpenQuickDialEditor { + target: QuickDialEditorTarget::PickSlot, + dial: Some(actual), + }) if actual == expected_model + ); + chat.handle_key_event(KeyCode::Esc.into()); + chat.set_reasoning_effort(Some(ReasoningEffortConfig::Custom("removed-effort".into()))); + assert_eq!( + chat.current_model_quick_dial(), + Err("Choose an available reasoning effort with /model before saving.") + ); + chat.set_reasoning_effort(/*effort*/ None); + chat.effective_service_tier = Some("removed-speed".into()); + assert_eq!( + chat.current_model_quick_dial(), + Err("Choose an available speed with /model before saving.") + ); +} diff --git a/codex-rs/tui/src/slash_command.rs b/codex-rs/tui/src/slash_command.rs index 65d7965236..d7b0e99d06 100644 --- a/codex-rs/tui/src/slash_command.rs +++ b/codex-rs/tui/src/slash_command.rs @@ -13,6 +13,7 @@ pub enum SlashCommand { // DO NOT ALPHA-SORT! Enum order is presentation order in the popup, so // more frequently used commands should be listed first. Model, + Presets, Daybreak, Ide, Permissions, @@ -132,6 +133,7 @@ impl SlashCommand { SlashCommand::MemoryDrop => "DO NOT USE", SlashCommand::MemoryUpdate => "DO NOT USE", SlashCommand::Model => "choose what model and reasoning effort to use", + SlashCommand::Presets => "run or save reusable prompts and slash commands", SlashCommand::Daybreak => "turn Daybreak on or off", SlashCommand::Ide => { "include current selection, open files, and other context from your IDE" @@ -269,6 +271,7 @@ impl SlashCommand { | SlashCommand::Archive | SlashCommand::Resume | SlashCommand::Model + | SlashCommand::Presets | SlashCommand::Daybreak | SlashCommand::Permissions | SlashCommand::Copy From 111362a6a0a92d08885b1ae62d3760714907ad94 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 18:51:22 +0000 Subject: [PATCH 105/155] Add a keyboard shortcut menu for presets (#54381) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What changed Replace the `/presets` recall picker with a responsive menu above the composer. Press `0`–`9` to run a saved preset or create one in an empty slot; use `n`, `s`, `e`, and `d` to create, start from current settings, edit, and delete presets. Add `tui.keymap.chat.open_presets` with an implicit `leader p` shortcut that yields to existing bindings and explicit configuration. Show the action in `/keymap` and add a shortcut tooltip. Preserve the composer draft, respect popup ownership, and consume held-key repeats after menu actions. ## Testing Add snapshots for empty, populated, and narrow preset menus, plus coverage for draft preservation, cancellation, held-key handling, transcript search precedence, and default shortcut conflicts. GitOrigin-RevId: f438c7015dbd416c90cdeb479d2a15d9d6d24954 --- codex-rs/config/src/tui_keymap.rs | 2 + codex-rs/core/config.schema.json | 10 + codex-rs/tui/assets/tooltips.txt | 1 + codex-rs/tui/src/app/event_dispatch.rs | 4 - codex-rs/tui/src/app/input.rs | 4 + codex-rs/tui/src/app/tests/key_chords.rs | 29 +++ codex-rs/tui/src/app_event.rs | 2 - codex-rs/tui/src/bottom_pane/chat_composer.rs | 2 + codex-rs/tui/src/bottom_pane/mod.rs | 7 + codex-rs/tui/src/bottom_pane/shortcut_hud.rs | 160 ++++++++++++++ codex-rs/tui/src/chatwidget.rs | 4 + codex-rs/tui/src/chatwidget/constructor.rs | 2 + codex-rs/tui/src/chatwidget/interaction.rs | 13 ++ codex-rs/tui/src/chatwidget/quick_dials.rs | 203 ++++++++++++------ codex-rs/tui/src/chatwidget/rendering.rs | 12 +- codex-rs/tui/src/chatwidget/slash_dispatch.rs | 2 +- ...atwidget__tests__quick_dial_shortcuts.snap | 18 ++ ...et__tests__quick_dial_shortcuts_empty.snap | 12 ++ ...t__tests__quick_dial_shortcuts_narrow.snap | 22 ++ ...idget__tests__saved_quick_dials_clear.snap | 9 - ...dget__tests__saved_quick_dials_recall.snap | 23 -- .../src/chatwidget/tests/quick_dials_tests.rs | 66 +++++- codex-rs/tui/src/keymap.rs | 42 +++- codex-rs/tui/src/keymap/bindings.rs | 25 ++- codex-rs/tui/src/keymap/chords.rs | 17 +- .../src/keymap/chords/quick_dial_defaults.rs | 68 ++++++ codex-rs/tui/src/keymap_setup.rs | 47 ++-- codex-rs/tui/src/keymap_setup/actions.rs | 1 + ...ap_setup__tests__keymap_picker_custom.snap | 4 +- ...ests__keymap_picker_fast_mode_enabled.snap | 4 +- ...p__tests__keymap_picker_first_actions.snap | 4 +- ...up__tests__keymap_picker_global_chord.snap | 6 +- ...ap_setup__tests__keymap_picker_narrow.snap | 4 +- ...ymap_setup__tests__keymap_picker_wide.snap | 4 +- codex-rs/tui/src/tooltips/keybinding_tests.rs | 1 + ..._shortcut_tips_render_at_narrow_width.snap | 6 + 36 files changed, 688 insertions(+), 152 deletions(-) create mode 100644 codex-rs/tui/src/bottom_pane/shortcut_hud.rs create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts.snap create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts_empty.snap create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts_narrow.snap delete mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_recall.snap create mode 100644 codex-rs/tui/src/keymap/chords/quick_dial_defaults.rs diff --git a/codex-rs/config/src/tui_keymap.rs b/codex-rs/config/src/tui_keymap.rs index f0e5b13f0d..c59b79e292 100644 --- a/codex-rs/config/src/tui_keymap.rs +++ b/codex-rs/config/src/tui_keymap.rs @@ -171,6 +171,8 @@ pub struct TuiGlobalKeymap { #[serde(deny_unknown_fields)] #[schemars(deny_unknown_fields)] pub struct TuiChatKeymap { + /// Open saved prompts and slash commands. + pub open_presets: Option, /// Start or stop a voice conversation. pub toggle_voice: Option, /// Toggle the microphone in an active voice conversation. diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.json index 82f03f6f7d..2a31fc816f 100644 --- a/codex-rs/core/config.schema.json +++ b/codex-rs/core/config.schema.json @@ -4770,6 +4770,7 @@ "increase_reasoning_effort": null, "interrupt_turn": null, "next_permission_mode": null, + "open_presets": null, "previous_permission_mode": null, "prompt_stack_back": null, "skip_question": null, @@ -5313,6 +5314,14 @@ ], "description": "Switch to the next available permission mode." }, + "open_presets": { + "allOf": [ + { + "$ref": "#/definitions/KeybindingsSpec" + } + ], + "description": "Open saved prompts and slash commands." + }, "previous_permission_mode": { "allOf": [ { @@ -5764,6 +5773,7 @@ "increase_reasoning_effort": null, "interrupt_turn": null, "next_permission_mode": null, + "open_presets": null, "previous_permission_mode": null, "prompt_stack_back": null, "skip_question": null, diff --git a/codex-rs/tui/assets/tooltips.txt b/codex-rs/tui/assets/tooltips.txt index d36ae196e8..3475bde95f 100644 --- a/codex-rs/tui/assets/tooltips.txt +++ b/codex-rs/tui/assets/tooltips.txt @@ -44,3 +44,4 @@ Press {key:global.find_transcript} to search this conversation. Press {key:global.open_external_editor} to edit your current draft in an external editor. Press {key:composer.history_search_previous} to search previously entered prompts. For models with adjustable reasoning, press {key:chat.increase_reasoning_effort} to increase reasoning effort or {key:chat.decrease_reasoning_effort} to decrease it. +Use {key:chat.open_presets}, then 0–9 to run a preset; Enter browses, s saves, and d deletes. diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs index ac4cff843a..f1fad3d863 100644 --- a/codex-rs/tui/src/app/event_dispatch.rs +++ b/codex-rs/tui/src/app/event_dispatch.rs @@ -2540,13 +2540,9 @@ impl App { self.app_event_tx.send(AppEvent::FollowTranscript); self.select_session_model(app_server, model, effort, service_tier).await; } - AppEvent::OpenQuickDials(mode) => self.chat_widget.open_quick_dials_picker(mode), AppEvent::OpenQuickDialEditor { target, dial } => { self.chat_widget.open_quick_dial_editor(target, dial); } - AppEvent::OpenQuickDialPrefills(target) => { - self.chat_widget.open_quick_dial_prefills(target); - } AppEvent::OpenQuickDialSavePicker(dial) => { self.chat_widget.open_quick_dial_save_picker(dial); } diff --git a/codex-rs/tui/src/app/input.rs b/codex-rs/tui/src/app/input.rs index f1c6dec705..773eb1d1a1 100644 --- a/codex-rs/tui/src/app/input.rs +++ b/codex-rs/tui/src/app/input.rs @@ -87,6 +87,9 @@ impl App { if let Some(Overlay::Transcript(overlay)) = &mut self.overlay { overlay.set_keymap_bindings(&self.keymap); } + if self.overlay.is_none() && self.chat_widget.handle_quick_dial_menu(key_event) { + return None; + } if matches!(&self.overlay, Some(Overlay::Transcript(overlay)) if overlay.owns_interaction_key(key_event)) || (tui.is_owned_screen() && self.overlay.is_none() @@ -200,6 +203,7 @@ impl App { } pub(super) fn cancel_pending_key_chord(&mut self) { + self.chat_widget.cancel_quick_dial_menu(); if self.key_chord_matcher.cancel() { self.set_key_chord_hint_override(/*items*/ None); } diff --git a/codex-rs/tui/src/app/tests/key_chords.rs b/codex-rs/tui/src/app/tests/key_chords.rs index 6c1321ad52..7151dafd25 100644 --- a/codex-rs/tui/src/app/tests/key_chords.rs +++ b/codex-rs/tui/src/app/tests/key_chords.rs @@ -2,10 +2,12 @@ use super::App; use super::AppServerSession; use super::Result; use super::RuntimeKeymap; +use super::ThreadId; use super::TuiEvent; use super::make_test_app; use super::make_test_app_with_channels; use super::start_config_write_test_app_server; +use super::test_thread_session; use crate::bottom_pane::SelectionItem; use crate::bottom_pane::SelectionViewParams; use crate::chatwidget::tests::helpers::render_bottom_popup; @@ -835,6 +837,33 @@ async fn command_center_chords_do_not_capture_search_text() -> Result<()> { Ok(()) } +#[tokio::test] +async fn preset_menu_keys_take_precedence_over_transcript_find() -> Result<()> { + let mut app = make_test_app().await; + let mut tui = crate::tui::test_support::make_test_tui()?; + app.chat_widget.handle_thread_session(test_thread_session( + ThreadId::new(), + app.config.cwd.to_path_buf(), + )); + app.transcript_view.begin_search(); + + app.chat_widget.open_quick_dial_menu(); + assert_eq!( + app.route_key_chord_event(&mut tui, KeyCode::Esc.into()), + None + ); + assert!(app.transcript_view.is_search_editing()); + + app.chat_widget.open_quick_dial_menu(); + assert_eq!( + app.route_key_chord_event(&mut tui, KeyCode::Char('n').into()), + None + ); + assert!(app.transcript_view.is_search_editing()); + assert!(render_bottom_popup(&app.chat_widget, /*width*/ 80).contains("New preset")); + Ok(()) +} + #[tokio::test] async fn transcript_fixed_keys_take_precedence_over_pager_chord_prefixes() -> Result<()> { let (mut app, mut tui, mut app_server) = chord_app().await?; diff --git a/codex-rs/tui/src/app_event.rs b/codex-rs/tui/src/app_event.rs index 04af70635f..c19c77f3c6 100644 --- a/codex-rs/tui/src/app_event.rs +++ b/codex-rs/tui/src/app_event.rs @@ -1276,12 +1276,10 @@ pub(crate) enum AppEvent { service_tier: Option, }, - OpenQuickDials(crate::chatwidget::quick_dials::QuickDialPickerMode), OpenQuickDialEditor { target: crate::chatwidget::quick_dials::QuickDialEditorTarget, dial: Option, }, - OpenQuickDialPrefills(crate::chatwidget::quick_dials::QuickDialEditorTarget), OpenQuickDialSavePicker(codex_config::types::QuickDial), ConfirmQuickDial { slot: u8, diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs index 715af4eb6f..970234f5be 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs @@ -18,6 +18,8 @@ //! Transcript interactions borrow the hint footer through `ComposerRenderOptions`; //! its resolved presentation drives height, painting, and the focused cursor together. //! +//! Preset submenu hints borrow slots and reflow with the composer. +//! //! The plain-text preset keeps command prefixes literal, including `!`, so Enter and Tab //! submit ordinary text without enabling shell mode. //! diff --git a/codex-rs/tui/src/bottom_pane/mod.rs b/codex-rs/tui/src/bottom_pane/mod.rs index 3a930b9a55..90ed97e811 100644 --- a/codex-rs/tui/src/bottom_pane/mod.rs +++ b/codex-rs/tui/src/bottom_pane/mod.rs @@ -158,9 +158,11 @@ mod mentions_v2; mod picker_presets; mod picker_rows; mod picker_style; +mod shortcut_hud; mod shortcut_overlay; pub(crate) use picker_style::active_tab_style; pub(crate) use picker_style::selection_style; +pub(crate) use shortcut_hud::ShortcutHud; pub(crate) mod prompt_args; mod selection_picker_layout; mod skill_popup; @@ -1232,6 +1234,11 @@ impl BottomPane { self.composer.current_text_with_pending() } + /// Include buffered typing before a shortcut takes ownership of composer input. + pub(crate) fn flush_pending_composer_input(&mut self) { + self.composer.flush_pending_input(); + } + /// Returns whether the composer currently accepts interactive draft edits. pub(crate) fn composer_input_enabled(&self) -> bool { self.composer.input_enabled() diff --git a/codex-rs/tui/src/bottom_pane/shortcut_hud.rs b/codex-rs/tui/src/bottom_pane/shortcut_hud.rs new file mode 100644 index 0000000000..ff2e66d01d --- /dev/null +++ b/codex-rs/tui/src/bottom_pane/shortcut_hud.rs @@ -0,0 +1,160 @@ +//! Passive shortcut hints arranged in responsive columns above the composer. + +use super::selection_popup_common::menu_surface_inset; +use super::selection_popup_common::menu_surface_padding_height; +use super::selection_popup_common::render_menu_surface; +use crate::line_truncation::line_width; +use crate::line_truncation::truncate_line_with_ellipsis_if_overflow; +use crate::render::renderable::Renderable; +use crate::style::accent_color; +use crate::style::secondary_text_style; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::Styled; +use ratatui::style::Stylize; +use ratatui::text::Line; +use ratatui::text::Span; +use ratatui::widgets::Paragraph; +use ratatui::widgets::Widget; + +const COLUMN_GAP: usize = 2; +const MIN_COLUMN_WIDTH: usize = 32; +const COMMAND_SEPARATOR: &str = " "; +const SINGLE_COLUMN_ENTRY_LIMIT: usize = 5; + +pub(crate) struct ShortcutHud { + title: String, + entries: Vec>, + commands: Vec>, +} + +impl ShortcutHud { + pub(crate) fn new( + title: impl Into, + entries: Vec>, + commands: Vec>, + ) -> Self { + Self { + title: title.into(), + entries, + commands, + } + } + + pub(crate) fn item(key: impl Into, label: Span<'static>) -> Line<'static> { + vec![ + key.into().fg(accent_color()), + " · ".set_style(secondary_text_style()), + label, + ] + .into() + } + + fn body_lines(&self, width: u16) -> Vec> { + let mut lines = vec![self.title.clone().bold().into(), Line::default()]; + let max_columns = if self.entries.len() > SINGLE_COLUMN_ENTRY_LIMIT { + 2 + } else { + 1 + }; + lines.extend(grid_lines(&self.entries, width, max_columns)); + lines + } + + fn command_lines(&self, width: u16) -> Vec> { + crate::footer_hint::wrap_hint_rows( + self.commands.iter().cloned(), + width, + COMMAND_SEPARATOR.len(), + Line::width, + ) + .into_iter() + .map(|row| { + let mut spans = Vec::new(); + for (index, command) in row.into_iter().enumerate() { + if index > 0 { + spans.push(COMMAND_SEPARATOR.into()); + } + spans.extend(command.spans); + } + spans.into() + }) + .collect() + } +} + +impl Renderable for ShortcutHud { + fn render(&self, area: Rect, buf: &mut Buffer) { + let content = render_menu_surface(area, buf); + let commands = self.command_lines(content.width); + let command_height = u16::try_from(commands.len()) + .unwrap_or(u16::MAX) + .min(content.height); + let gap = content + .height + .saturating_sub(command_height) + .min(/*other*/ 1); + let body = Rect { + height: content.height.saturating_sub(command_height + gap), + ..content + }; + let command_area = Rect { + y: content.bottom().saturating_sub(command_height), + height: command_height, + ..content + }; + render_clipped(self.body_lines(content.width), body, buf); + Paragraph::new(commands).render(command_area, buf); + } + + fn desired_height(&self, width: u16) -> u16 { + let content_width = menu_surface_inset(Rect::new( + /*x*/ 0, + /*y*/ 0, + width, + /*height*/ u16::MAX, + )) + .width; + let body_height = self.body_lines(content_width).len(); + let command_height = self.command_lines(content_width).len(); + u16::try_from(body_height + 1 + command_height) + .unwrap_or(u16::MAX) + .saturating_add(menu_surface_padding_height()) + } +} + +fn grid_lines(items: &[Line<'static>], width: u16, max_columns: usize) -> Vec> { + let width = usize::from(width); + let columns = ((width + COLUMN_GAP) / (MIN_COLUMN_WIDTH + COLUMN_GAP)) + .clamp(/*min*/ 1, max_columns) + .min(items.len().max(/*other*/ 1)); + let rows = items.len().div_ceil(columns); + let cell_width = width.saturating_sub(COLUMN_GAP * (columns - 1)) / columns; + (0..rows) + .map(|row| { + let mut line = Line::default(); + for column in 0..columns { + let item = items.get(column * rows + row).cloned().unwrap_or_default(); + let item = truncate_line_with_ellipsis_if_overflow(item, cell_width); + let padding = cell_width.saturating_sub(line_width(&item)) + COLUMN_GAP; + line.extend(item.spans); + if column + 1 < columns { + line.push_span(" ".repeat(padding)); + } + } + line + }) + .collect() +} + +fn render_clipped(mut lines: Vec>, area: Rect, buf: &mut Buffer) { + if area.is_empty() { + return; + } + let height = usize::from(area.height); + if lines.len() > height { + lines.truncate(height); + lines[height - 1] = "… resize to see all".dim().into(); + } + Paragraph::new(lines).render(area, buf); +} diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index 06aa1abc66..d28be65c8f 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -701,6 +701,10 @@ pub(crate) struct ChatWidget { safety_buffering_source: UserMessageSource, /// Main chat-surface bindings resolved from `tui.keymap.chat`. chat_keymap: ChatKeymap, + /// Whether the preset submenu owns the next key. + quick_dial_menu: bool, + /// Ignore a held key after it dismisses the preset submenu. + quick_dial_menu_key_guard: Option, permission_shortcut_pending: bool, // Pending notification to show when unfocused on next Draw pub(crate) pending_notification: Option, diff --git a/codex-rs/tui/src/chatwidget/constructor.rs b/codex-rs/tui/src/chatwidget/constructor.rs index 05dde949ed..185a10ae2a 100644 --- a/codex-rs/tui/src/chatwidget/constructor.rs +++ b/codex-rs/tui/src/chatwidget/constructor.rs @@ -253,6 +253,8 @@ impl ChatWidget { suppress_initial_user_message_submit: false, pending_notification: None, quit_shortcut_expires_at: None, + quick_dial_menu: false, + quick_dial_menu_key_guard: None, quit_shortcut_key: None, turn_runtime_metrics: RuntimeMetricsSummary::default(), last_rendered_width: std::cell::Cell::new(None), diff --git a/codex-rs/tui/src/chatwidget/interaction.rs b/codex-rs/tui/src/chatwidget/interaction.rs index 549a5623a2..8a0d75ad25 100644 --- a/codex-rs/tui/src/chatwidget/interaction.rs +++ b/codex-rs/tui/src/chatwidget/interaction.rs @@ -96,6 +96,9 @@ impl ChatWidget { key_event: KeyEvent, activation_key: Option, ) -> KeyEventAction { + if self.handle_quick_dial_menu(key_event) { + return KeyEventAction::None; + } if self.handle_startup_submission_key(key_event) { return KeyEventAction::None; } @@ -136,6 +139,14 @@ impl ChatWidget { return KeyEventAction::None; } + if key_event.kind == KeyEventKind::Press + && self.chat_keymap.open_presets.is_pressed(key_event) + && self.bottom_pane.no_modal_or_popup_active() + { + self.open_quick_dial_menu(); + return KeyEventAction::None; + } + if (self.chat_keymap.interrupt_turn.is_pressed(key_event) || key_hint::ctrl(KeyCode::Char('c')).is_press(key_event)) && self.bottom_pane.no_modal_or_popup_active() @@ -353,6 +364,7 @@ impl ChatWidget { } pub(crate) fn set_footer_hint_override(&mut self, items: Option>) { + self.quick_dial_menu = false; if items.is_some() { // Active input instructions supersede transient feedback from a previous action. self.bottom_pane @@ -529,6 +541,7 @@ impl ChatWidget { } pub(crate) fn handle_paste(&mut self, text: String) { + self.cancel_quick_dial_menu(); if self.external_writer_view && !self.bottom_pane.has_active_view() { return; } diff --git a/codex-rs/tui/src/chatwidget/quick_dials.rs b/codex-rs/tui/src/chatwidget/quick_dials.rs index e731623a50..68bf5e1b2d 100644 --- a/codex-rs/tui/src/chatwidget/quick_dials.rs +++ b/codex-rs/tui/src/chatwidget/quick_dials.rs @@ -1,7 +1,9 @@ -//! Numbered reusable inputs using the existing picker and queued submission path. +//! Numbered reusable inputs with one HUD and pickers for editing, saving, and deleting. //! Saving leaves the draft untouched; recall preserves drafts and obeys normal command gates. +//! The shared-leader submenu respects popup ownership, cancellation, and held-key repeats. use super::*; +use crate::bottom_pane::ShortcutHud; use crate::wrapping::word_wrap_lines; use codex_config::types::QuickDial; use codex_protocol::config_types::SERVICE_TIER_DEFAULT_REQUEST_VALUE; @@ -22,8 +24,7 @@ impl Renderable for QuickDialConfirmationHeader { } #[derive(Clone, Copy, Debug, PartialEq, Eq)] -pub(crate) enum QuickDialPickerMode { - Recall, +enum QuickDialPickerMode { Save, Edit, Clear, @@ -35,14 +36,6 @@ pub(crate) enum QuickDialEditorTarget { Slot(u8), } -#[derive(Clone, Copy)] -enum QuickDialMenuAction { - New, - Edit, - Prefill, - Clear, -} - fn quick_dial_label(dial: &QuickDial) -> String { dial.label .as_deref() @@ -56,6 +49,34 @@ fn quick_dial_label(dial: &QuickDial) -> String { } impl ChatWidget { + pub(super) fn quick_dial_hud(&self) -> ShortcutHud { + let mut entries: Vec<_> = (1..=9) + .chain(std::iter::once(/*value*/ 0)) + .filter_map(|slot| { + let key = slot.to_string(); + self.local_settings + .tui + .quick_dials + .get(&key) + .map(|dial| ShortcutHud::item(key, quick_dial_label(dial).into())) + }) + .collect(); + if entries.is_empty() { + entries.push("No presets saved. Press n to create one.".dim().into()); + } + let commands = [ + ("n", "new"), + ("s", "from settings"), + ("e", "edit"), + ("d", "delete"), + ("esc", "close"), + ] + .into_iter() + .map(|(key, label)| ShortcutHud::item(key, label.into())) + .collect(); + ShortcutHud::new("Presets", entries, commands) + } + fn composer_quick_dial_text(&mut self) -> String { if !self.bottom_pane.composer_local_images().is_empty() || !self.bottom_pane.remote_image_urls().is_empty() @@ -167,7 +188,7 @@ impl ChatWidget { ); } - pub(crate) fn open_quick_dials_picker(&mut self, mode: QuickDialPickerMode) { + fn open_quick_dials_picker(&mut self, mode: QuickDialPickerMode) { if !self.quick_dials_available() { return; } @@ -183,21 +204,18 @@ impl ChatWidget { } fn show_quick_dials_picker(&mut self, mode: QuickDialPickerMode, current: Option) { - let thread_id = self.thread_id(); let mut items = Vec::new(); for slot in (1..=9).chain(std::iter::once(/*value*/ 0)) { let saved = self.local_settings.tui.quick_dials.get(&slot.to_string()); - if mode == QuickDialPickerMode::Edit && saved.is_none() { + if mode != QuickDialPickerMode::Save && saved.is_none() { continue; } let dial = current.clone(); let saved_for_edit = saved.cloned(); let has_saved = saved.is_some(); let (is_disabled, dismiss_on_select, dismiss_parent_on_child_accept) = match mode { - QuickDialPickerMode::Recall => (!has_saved, true, false), QuickDialPickerMode::Save => (dial.is_none(), !has_saved, has_saved), - QuickDialPickerMode::Edit => (false, false, true), - QuickDialPickerMode::Clear => (!has_saved, false, true), + QuickDialPickerMode::Edit | QuickDialPickerMode::Clear => (false, false, true), }; items.push(SelectionItem { name: saved.map(quick_dial_label).unwrap_or_default(), @@ -219,9 +237,6 @@ impl ChatWidget { is_disabled, actions: vec![Box::new(move |tx| { let event = match mode { - QuickDialPickerMode::Recall => { - AppEvent::RecallQuickDial { slot, thread_id } - } QuickDialPickerMode::Save if has_saved => AppEvent::ConfirmQuickDial { slot, dial: dial.clone(), @@ -245,49 +260,7 @@ impl ChatWidget { ..Default::default() }); } - if mode == QuickDialPickerMode::Recall { - for (key, name, action) in [ - (Some('s'), "New preset…", QuickDialMenuAction::New), - (Some('e'), "Edit a preset…", QuickDialMenuAction::Edit), - ( - None, - "Start from current settings…", - QuickDialMenuAction::Prefill, - ), - (Some('d'), "Delete a preset…", QuickDialMenuAction::Clear), - ] { - let is_disabled = matches!( - action, - QuickDialMenuAction::Edit | QuickDialMenuAction::Clear - ) && self.local_settings.tui.quick_dials.is_empty(); - items.push(SelectionItem { - name: name.into(), - display_shortcut: key.map(|key| key_hint::plain(KeyCode::Char(key)).into()), - actions: vec![Box::new(move |tx| { - tx.send(match action { - QuickDialMenuAction::New => AppEvent::OpenQuickDialEditor { - target: QuickDialEditorTarget::PickSlot, - dial: None, - }, - QuickDialMenuAction::Edit => { - AppEvent::OpenQuickDials(QuickDialPickerMode::Edit) - } - QuickDialMenuAction::Prefill => { - AppEvent::OpenQuickDialPrefills(QuickDialEditorTarget::PickSlot) - } - QuickDialMenuAction::Clear => { - AppEvent::OpenQuickDials(QuickDialPickerMode::Clear) - } - }) - })], - is_disabled, - dismiss_parent_on_child_accept: true, - ..Default::default() - }); - } - } let title = match mode { - QuickDialPickerMode::Recall => "Presets", QuickDialPickerMode::Save => "Save preset to slot", QuickDialPickerMode::Edit => "Edit a preset", QuickDialPickerMode::Clear => "Delete a preset", @@ -308,7 +281,7 @@ impl ChatWidget { view_id: Some("quick-dials"), auto_number_shortcuts: false, initial_selected_idx, - max_visible_rows: 14, + max_visible_rows: 10, title: Some(title.into()), subtitle: (mode == QuickDialPickerMode::Save) .then(|| current.as_ref().map(quick_dial_label)) @@ -378,7 +351,7 @@ impl ChatWidget { self.defer_input_until_settings_applied(); } - pub(crate) fn open_quick_dial_prefills(&mut self, target: QuickDialEditorTarget) { + fn open_quick_dial_prefills(&mut self) { if !self.quick_dials_available() { return; } @@ -388,7 +361,7 @@ impl ChatWidget { let description = Some(dial.input.clone()); let actions = vec![Box::new(move |tx: &AppEventSender| { tx.send(AppEvent::OpenQuickDialEditor { - target, + target: QuickDialEditorTarget::PickSlot, dial: Some(dial.clone()), }) }) as SelectionAction]; @@ -455,4 +428,104 @@ impl ChatWidget { ..SelectionViewParams::picker() }); } + + pub(crate) fn cancel_quick_dial_menu(&mut self) { + if self.quick_dial_menu { + self.set_footer_hint_override(/*items*/ None); + } + } + + pub(crate) fn open_quick_dial_menu(&mut self) { + if self.quick_dials_available() { + self.bottom_pane.flush_pending_composer_input(); + if !self.bottom_pane.no_modal_or_popup_active() { + return; + } + self.set_footer_hint_override(Some(Vec::new())); + self.quick_dial_menu = true; + } + } + + pub(crate) fn handle_quick_dial_menu(&mut self, key: KeyEvent) -> bool { + if let Some(guard) = self.quick_dial_menu_key_guard.as_mut() { + if guard.consume(KeyBinding::from_event(key), key.kind) { + return true; + } + if !guard.is_active() { + self.quick_dial_menu_key_guard = None; + } + } + if !self.quick_dial_menu { + return false; + } + if !self.bottom_pane.no_modal_or_popup_active() { + self.cancel_quick_dial_menu(); + return false; + } + if key.kind != KeyEventKind::Press || key.code == KeyCode::Enter { + return true; + } + self.cancel_quick_dial_menu(); + if self.chat_keymap.chord_hints.leader.is_pressed(key) + || self.chat_keymap.open_presets.is_pressed(key) + { + return true; + } + if key.modifiers != KeyModifiers::NONE { + return false; + } + let consumed = match key.code { + KeyCode::Esc => true, + KeyCode::Char('n') => { + self.open_quick_dial_editor(QuickDialEditorTarget::PickSlot, /*dial*/ None); + true + } + KeyCode::Char('s') => { + self.open_quick_dial_prefills(); + true + } + KeyCode::Char('e') => { + self.open_quick_dials_picker(QuickDialPickerMode::Edit); + true + } + KeyCode::Char('d') => { + self.open_quick_dials_picker(QuickDialPickerMode::Clear); + true + } + KeyCode::Char(c @ '0'..='9') => { + if self.quick_dials_available() { + let slot = c as u8 - b'0'; + if self + .local_settings + .tui + .quick_dials + .contains_key(&slot.to_string()) + { + self.input_queue.suppress_queue_autosend = true; + self.app_event_tx.send(AppEvent::RecallQuickDial { + slot, + thread_id: self.thread_id(), + }); + self.on_modal_or_popup_closed(); + } else { + self.open_quick_dial_editor( + QuickDialEditorTarget::Slot(slot), + /*dial*/ None, + ); + } + } + true + } + _ => false, + }; + if consumed { + self.quick_dial_menu_key_guard = + Some(crate::activation_key_guard::ActivationKeyGuard::new_at( + KeyBinding::from_event(key), + Instant::now(), + /*key_releases_reported*/ false, + )); + } + consumed + } } diff --git a/codex-rs/tui/src/chatwidget/rendering.rs b/codex-rs/tui/src/chatwidget/rendering.rs index eee242df2e..15bbdad9d8 100644 --- a/codex-rs/tui/src/chatwidget/rendering.rs +++ b/codex-rs/tui/src/chatwidget/rendering.rs @@ -257,7 +257,17 @@ impl ChatWidget { options.textarea_right_reserve = right_reserve; options.separate_status_line = options.command_popup_placement != crate::bottom_pane::CommandPopupPlacement::AboveComposer; - self.bottom_pane.backdrop_with_options(options) + let bottom_pane = self.bottom_pane.backdrop_with_options(options); + if !self.quick_dial_menu { + return bottom_pane; + } + let mut column = FlexRenderable::new(); + column.push( + /*flex*/ 1, + RenderableItem::Owned(Box::new(self.quick_dial_hud())), + ); + column.push(/*flex*/ 0, bottom_pane); + RenderableItem::Owned(Box::new(column)) } } diff --git a/codex-rs/tui/src/chatwidget/slash_dispatch.rs b/codex-rs/tui/src/chatwidget/slash_dispatch.rs index 46fe775d17..d6f9ee55e3 100644 --- a/codex-rs/tui/src/chatwidget/slash_dispatch.rs +++ b/codex-rs/tui/src/chatwidget/slash_dispatch.rs @@ -379,7 +379,7 @@ impl ChatWidget { self.defer_input_until_settings_applied(); } SlashCommand::Presets => { - self.open_quick_dials_picker(quick_dials::QuickDialPickerMode::Recall); + self.open_quick_dial_menu(); } SlashCommand::Plan => { self.apply_plan_slash_command(); diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts.snap new file mode 100644 index 0000000000..e1f10e1f9c --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts.snap @@ -0,0 +1,18 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 100)" +--- + Presets + + 1 · coding 5 · /skills simplify-code + 2 · /permissions workspace-write 7 · Plan the requested change + 3 · Review the current changes and explain eve… 0 · /status + + n · new s · from settings e · edit d · delete esc · close + +• Queued follow-up inputs + ↳ /model gpt-5.5 --reasoning=high --speed=fast + ⇧← edit last queued message + +› Review the current changes + for safety diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts_empty.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts_empty.snap new file mode 100644 index 0000000000..72c8899875 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts_empty.snap @@ -0,0 +1,12 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 100)" +--- + Presets + + No presets saved. Press n to create one. + + n · new s · from settings e · edit d · delete esc · close + + +› Ask Codex to do anything diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts_narrow.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts_narrow.snap new file mode 100644 index 0000000000..fc6b4be116 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__quick_dial_shortcuts_narrow.snap @@ -0,0 +1,22 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 48)" +--- + Presets + + 1 · coding + 2 · /permissions workspace-write + 3 · Review the current changes and explain … + 5 · /skills simplify-code + 7 · Plan the requested change + 0 · /status + + n · new s · from settings e · edit + d · delete esc · close + +• Queued follow-up inputs + ↳ /model gpt-5.5 --reasoning=high --speed=fast + ⇧← edit last queued message + +› Review the current changes + for safety diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_clear.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_clear.snap index 7b0955a079..20c5f2a46b 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_clear.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_clear.snap @@ -6,14 +6,5 @@ expression: "render_bottom_popup(&chat, 80)" › 1. coding /model gpt-5.5 --reasoning=high --speed=fast - 2. empty - 3. empty - 4. empty - 5. empty - 6. empty - 7. empty - 8. empty - 9. empty - 0. empty enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_recall.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_recall.snap deleted file mode 100644 index 0a02e68f47..0000000000 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_recall.snap +++ /dev/null @@ -1,23 +0,0 @@ ---- -source: tui/src/chatwidget/tests/quick_dials_tests.rs -expression: "render_bottom_popup(&chat, 80)" ---- - Presets - - -› 1. coding /model gpt-5.5 --reasoning=high --speed=fast - 2. empty - 3. empty - 4. empty - 5. empty - 6. empty - 7. empty - 8. empty - 9. empty - 0. empty - s. New preset… - e. Edit a preset… - Start from current settings… - d. Delete a preset… - - enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs b/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs index 649580621a..014e2c0ee1 100644 --- a/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs +++ b/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs @@ -1,8 +1,7 @@ -//! Save, Clear, and confirmation layouts keep destructive preset actions explicit. +//! Preset HUD, editor, and save/delete flows preserve drafts and explicit confirmation. use super::*; use crate::chatwidget::quick_dials::QuickDialEditorTarget; -use crate::chatwidget::quick_dials::QuickDialPickerMode; use codex_config::types::QuickDial; #[tokio::test] @@ -11,6 +10,19 @@ async fn saved_quick_dials_save_and_clear_picker_snapshots() { let (mut chat, mut events, _ops) = make_chatwidget_manual(/*model_override*/ Some("gpt-5.5")).await; chat.thread_id = Some(ThreadId::new()); + chat.open_quick_dial_menu(); + assert_chatwidget_snapshot!( + "quick_dial_shortcuts_empty", + render_bottom_popup(&chat, /*width*/ 100) + ); + let escape = KeyCode::Esc.into(); + assert!(chat.handle_quick_dial_menu(escape)); + assert!(chat.handle_quick_dial_menu(escape)); + assert!(chat.handle_quick_dial_menu(KeyEvent::new_with_kind( + KeyCode::Esc, + KeyModifiers::NONE, + crossterm::event::KeyEventKind::Release, + ))); chat.local_settings.tui.quick_dials = [( "1".into(), QuickDial { @@ -21,10 +33,14 @@ async fn saved_quick_dials_save_and_clear_picker_snapshots() { .into(); chat.bottom_pane.apply_external_edit(DRAFT.into()); chat.dispatch_command(SlashCommand::Presets); - assert_chatwidget_snapshot!( - "saved_quick_dials_recall", - render_bottom_popup(&chat, /*width*/ 80) - ); + let hud = render_bottom_popup(&chat, /*width*/ 80); + chat.handle_key_event(KeyCode::Enter.into()); + assert_eq!(render_bottom_popup(&chat, /*width*/ 80), hud); + assert_eq!(chat.bottom_pane.composer_text(), DRAFT); + assert!(chat.queued_user_message_texts().is_empty()); + chat.cancel_quick_dial_menu(); + chat.open_quick_dial_menu(); + assert_eq!(render_bottom_popup(&chat, /*width*/ 80), hud); chat.handle_key_event(KeyCode::Esc.into()); while events.try_recv().is_ok() {} chat.open_quick_dial_editor(QuickDialEditorTarget::PickSlot, /*dial*/ None); @@ -66,7 +82,8 @@ async fn saved_quick_dials_save_and_clear_picker_snapshots() { ); chat.handle_key_event(KeyCode::Esc.into()); - chat.open_quick_dials_picker(QuickDialPickerMode::Clear); + chat.open_quick_dial_menu(); + chat.handle_key_event(KeyCode::Char('d').into()); assert_chatwidget_snapshot!( "saved_quick_dials_clear", render_bottom_popup(&chat, /*width*/ 80) @@ -120,6 +137,38 @@ async fn saved_quick_dials_save_and_clear_picker_snapshots() { ["/model gpt-5.5 --reasoning=high --speed=fast"] ); + chat.local_settings.tui.quick_dials.extend( + [ + ("2", "/permissions workspace-write"), + ( + "3", + "Review the current changes and explain every important behavior change", + ), + ("5", "/skills simplify-code"), + ("7", "Plan the requested change"), + ("0", "/status"), + ] + .map(|(slot, input)| { + ( + slot.into(), + QuickDial { + input: input.into(), + label: None, + }, + ) + }), + ); + chat.open_quick_dial_menu(); + assert_chatwidget_snapshot!( + "quick_dial_shortcuts", + render_bottom_popup(&chat, /*width*/ 100) + ); + assert_chatwidget_snapshot!( + "quick_dial_shortcuts_narrow", + render_bottom_popup(&chat, /*width*/ 48) + ); + chat.handle_key_event(KeyCode::Esc.into()); + chat.set_reasoning_effort(Some(ReasoningEffortConfig::High)); chat.effective_service_tier = Some(SERVICE_TIER_DEFAULT_REQUEST_VALUE.into()); assert_eq!( @@ -130,7 +179,8 @@ async fn saved_quick_dials_save_and_clear_picker_snapshots() { }) ); let expected_model = chat.current_model_quick_dial().expect("model command"); - chat.open_quick_dial_prefills(QuickDialEditorTarget::PickSlot); + chat.open_quick_dial_menu(); + chat.handle_key_event(KeyCode::Char('s').into()); chat.handle_key_event(KeyCode::Enter.into()); assert_matches!( std::iter::from_fn(|| events.try_recv().ok()) diff --git a/codex-rs/tui/src/keymap.rs b/codex-rs/tui/src/keymap.rs index 5a8f3aa93d..c185f40f02 100644 --- a/codex-rs/tui/src/keymap.rs +++ b/codex-rs/tui/src/keymap.rs @@ -62,6 +62,7 @@ pub(crate) use chords::KeyChordMatch; pub(crate) use chords::KeyChordMatcher; pub(crate) use chords::KeymapContextSet; pub(crate) use chords::RuntimeChordKeymap; +pub(crate) use chords::is_dispatch_token; pub(crate) use chords::is_dispatch_token_event; /// Runtime keymap used by TUI input handlers. @@ -129,11 +130,13 @@ pub(crate) struct AppKeymap { /// handler code, not here. #[derive(Clone, Debug)] pub(crate) struct ChatKeymap { + /// Open the preset submenu. + pub(crate) open_presets: Vec, /// Start or stop a voice conversation. pub(crate) toggle_voice: Vec, /// Toggle capture in the active voice session. pub(crate) toggle_voice_mute: Vec, - chord_hints: Arc, + pub(crate) chord_hints: Arc, /// Interrupt the active turn. pub(crate) interrupt_turn: Vec, /// Decrease the active reasoning effort. @@ -777,6 +780,7 @@ impl RuntimeKeymap { })); let mut chat = ChatKeymap { + open_presets: resolve_local!(keymap, defaults, chat, open_presets), toggle_voice: if voice_toggle_default_is_shadowed { Vec::new() } else { @@ -1643,6 +1647,7 @@ impl RuntimeKeymap { } } resolved.configure_search(keymap)?; + chords::quick_dial_defaults::register(keymap, &mut resolved); resolved.validate_conflicts()?; chords::validate_chord_conflicts(&resolved)?; chords::install_dispatch_bindings(&mut resolved)?; @@ -1683,6 +1688,7 @@ impl RuntimeKeymap { }, chords: Arc::default(), chat: ChatKeymap { + open_presets: Vec::new(), toggle_voice: default_bindings![plain(KeyCode::F(8))], toggle_voice_mute: default_bindings![plain(KeyCode::F(9))], chord_hints: Arc::default(), @@ -1992,6 +1998,7 @@ impl RuntimeKeymap { /// backtracking, intentionally stay outside this configurable keymap. fn validate_conflicts(&self) -> Result<(), String> { for (action, bindings) in [ + ("open_presets", &self.chat.open_presets), ("toggle_voice", &self.chat.toggle_voice), ( "previous_permission_mode", @@ -2014,6 +2021,7 @@ impl RuntimeKeymap { #[cfg(unix)] for (action, bindings) in [ ("global.open_agents", &self.app.open_agents), + ("chat.open_presets", &self.chat.open_presets), ("chat.toggle_voice", &self.chat.toggle_voice), ] { if bindings.contains(&key_hint::ctrl(KeyCode::Char('z'))) { @@ -2056,6 +2064,7 @@ impl RuntimeKeymap { ("toggle_fast_mode", self.app.toggle_fast_mode.as_slice()), ("toggle_raw_output", self.app.toggle_raw_output.as_slice()), ("toggle_side_conversation", side_toggle_bindings.as_slice()), + ("chat.open_presets", self.chat.open_presets.as_slice()), ("chat.toggle_voice", self.chat.toggle_voice.as_slice()), ( "chat.toggle_voice_mute", @@ -2217,6 +2226,7 @@ impl RuntimeKeymap { ), ("copy", self.app.copy.as_slice()), ("clear_terminal", self.app.clear_terminal.as_slice()), + ("chat.open_presets", self.chat.open_presets.as_slice()), ("chat.toggle_voice", self.chat.toggle_voice.as_slice()), ( "chat.toggle_voice_mute", @@ -4122,5 +4132,35 @@ mod tests { RuntimeKeymap::defaults() .validate_conflicts() .expect("default keymap should be conflict free"); + + let mut keymap = TuiKeymap::default(); + keymap.global.leader = Some(one("ctrl-r")); + let runtime = RuntimeKeymap::from_config(&keymap) + .expect("an unused leader must preserve single-key shortcuts"); + assert_eq!( + ( + runtime.composer.history_search_previous, + runtime.chat.open_presets + ), + (vec![key_hint::ctrl(KeyCode::Char('r'))], Vec::new()) + ); + let defaults = RuntimeKeymap::defaults(); + for leader in ["page-up", "page-down"] { + keymap.global.leader = Some(one(leader)); + let runtime = RuntimeKeymap::from_config(&keymap) + .expect("an unused leader must preserve transcript paging"); + assert_eq!( + ( + runtime.pager.page_up, + runtime.pager.page_down, + runtime.chat.open_presets + ), + ( + defaults.pager.page_up.clone(), + defaults.pager.page_down.clone(), + Vec::new() + ) + ); + } } } diff --git a/codex-rs/tui/src/keymap/bindings.rs b/codex-rs/tui/src/keymap/bindings.rs index 08c7b0930b..ac7447af53 100644 --- a/codex-rs/tui/src/keymap/bindings.rs +++ b/codex-rs/tui/src/keymap/bindings.rs @@ -103,15 +103,23 @@ pub(crate) struct KeymapActionId { } impl KeymapActionId { - /// Activity focus and Find remain active while transcript groups use list navigation. + /// Whether two actions can be active together, including list-specific exceptions. pub(super) fn overlaps(self, other: Self) -> bool { - self.context.overlaps(other.context) - || (self.context == KeymapContext::Global - && matches!(self.action, "focus_activity" | "find_transcript") - && other.context == KeymapContext::List) - || (other.context == KeymapContext::Global - && matches!(other.action, "focus_activity" | "find_transcript") - && self.context == KeymapContext::List) + use KeymapContext::Chat; + use KeymapContext::Global; + use KeymapContext::List; + + match (self.context, other.context) { + // Presets cannot open while a list owns input. + (Chat, List) => self.action != "open_presets", + (List, Chat) => other.action != "open_presets", + + // Activity focus and Find remain available during list navigation. + (Global, List) => matches!(self.action, "focus_activity" | "find_transcript"), + (List, Global) => matches!(other.action, "focus_activity" | "find_transcript"), + + _ => self.context.overlaps(other.context), + } } pub(crate) fn config_path(self) -> String { @@ -284,6 +292,7 @@ define_runtime_action_bindings! { toggle_side_conversation, ], "chat" => Chat, chat, chat [ + open_presets, toggle_voice, interrupt_turn, decrease_reasoning_effort, diff --git a/codex-rs/tui/src/keymap/chords.rs b/codex-rs/tui/src/keymap/chords.rs index 4c32e26127..865dffcc7b 100644 --- a/codex-rs/tui/src/keymap/chords.rs +++ b/codex-rs/tui/src/keymap/chords.rs @@ -33,6 +33,8 @@ pub(crate) const KEY_CHORD_TIMEOUT: Duration = Duration::from_secs(/*secs*/ 1); const FIRST_DISPATCH_FUNCTION_KEY: u8 = codex_config::types::MAX_FUNCTION_KEY + 1; const LAST_DISPATCH_FUNCTION_KEY: u8 = u8::MAX; const MAX_LEADER_CHORD_BINDINGS: usize = 1024; + +pub(super) mod quick_dial_defaults; const LIST_RESERVED_BINDINGS: &[(&str, KeyBinding)] = &[ ("cancel", ctrl(KeyCode::Char('c'))), ("resume_picker.toggle_transcript", ctrl(KeyCode::Char('t'))), @@ -140,6 +142,11 @@ impl KeymapContextSet { /// Whether this input path can dispatch the action, including focus-specific exclusions. pub(crate) fn contains_action(self, action: KeymapActionId) -> bool { + if action.context == KeymapContext::Chat && action.action == "open_presets" { + return self.contains(KeymapContext::Chat) + && self.contains(KeymapContext::Global) + && !self.contains(KeymapContext::List); + } if action.context == KeymapContext::Chat && action.action == "toggle_voice" { return self.0 & VOICE_TOGGLE_BLOCKED == 0 && (self.0 & VOICE_TOGGLE != 0 || self.contains(KeymapContext::Chat)); @@ -199,7 +206,7 @@ pub(crate) struct KeyChord { pub(crate) struct RuntimeChordBinding { pub(crate) action: KeymapActionId, pub(crate) chord: KeyChord, - spec: String, + pub(crate) spec: String, } impl RuntimeChordBinding { @@ -325,11 +332,10 @@ or a two-stroke chord such as `ctrl-x ctrl-t`.", }); } super::leader::resolve(keymap, &mut keymap_chords)?; - if leader_bindings + let explicit_count = leader_bindings .len() - .saturating_mul(keymap_chords.leader.len()) - > MAX_LEADER_CHORD_BINDINGS - { + .saturating_mul(keymap_chords.leader.len()); + if explicit_count > MAX_LEADER_CHORD_BINDINGS { return Err(format!( "Too many leader shortcut combinations (maximum {MAX_LEADER_CHORD_BINDINGS}). \ Reduce `tui.keymap.global.leader` alternatives or `leader ...` bindings." @@ -486,6 +492,7 @@ impl KeyChordMatcher { .take(/*n*/ 6) { let label = match binding.action.action { + "open_presets" if pending.started_at.is_none() => "presets", "focus_activity" => "activity", "find_transcript" => "find", "open_warnings" => "warnings", diff --git a/codex-rs/tui/src/keymap/chords/quick_dial_defaults.rs b/codex-rs/tui/src/keymap/chords/quick_dial_defaults.rs new file mode 100644 index 0000000000..b1849f7ab1 --- /dev/null +++ b/codex-rs/tui/src/keymap/chords/quick_dial_defaults.rs @@ -0,0 +1,68 @@ +//! Install the implicit preset shortcut only for free leader chords. +//! Explicit bindings, including an explicit unbind, always take priority. +//! Implicit chords fit within the shared leader expansion limit. + +use super::KeyChord; +use super::KeymapActionId; +use super::KeymapContext; +use super::MAX_LEADER_CHORD_BINDINGS; +use super::RuntimeChordBinding; +use super::RuntimeKeymap; +use super::normalize_chord_binding; +use super::runtime_action_bindings; +use codex_config::types::TuiKeymap; +use crossterm::event::KeyCode; + +pub(in crate::keymap) fn register(keymap: &TuiKeymap, resolved: &mut RuntimeKeymap) { + let mut remaining = MAX_LEADER_CHORD_BINDINGS.saturating_sub( + resolved + .chords + .bindings + .iter() + .filter(|binding| binding.is_leader()) + .count(), + ); + if keymap.chat.open_presets.is_some() || remaining == 0 { + return; + } + let action = KeymapActionId { + context: KeymapContext::Chat, + action: "open_presets", + }; + for prefix in resolved.chords.leader.clone() { + let binding = RuntimeChordBinding { + action, + chord: KeyChord { + prefix, + completion: crate::key_hint::plain(KeyCode::Char('p')), + }, + spec: "leader p".into(), + }; + if !resolved + .chords + .bindings + .iter() + .any(|existing| binding.overlaps(existing.action) && existing.chord == binding.chord) + && !runtime_action_bindings(resolved) + // Owned transcript navigation also runs beside the composer. + .filter(|single| { + binding.overlaps(single.id) || single.id.context == KeymapContext::Pager + }) + .any(|single| { + single + .bindings + .iter() + .any(|key| normalize_chord_binding(*key) == prefix) + }) + { + std::sync::Arc::make_mut(&mut resolved.chords) + .bindings + .push(binding); + remaining -= 1; + if remaining == 0 { + break; + } + } + } + resolved.chat.chord_hints = std::sync::Arc::clone(&resolved.chords); +} diff --git a/codex-rs/tui/src/keymap_setup.rs b/codex-rs/tui/src/keymap_setup.rs index 7d8faa0b6e..ae9c92ce36 100644 --- a/codex-rs/tui/src/keymap_setup.rs +++ b/codex-rs/tui/src/keymap_setup.rs @@ -601,20 +601,43 @@ pub(crate) fn active_binding_specs( let bindings = bindings_for_action(runtime_keymap, context, action).ok_or_else(|| { format!("Unknown keymap action `{context}.{action}`. Reopen /keymap and choose an action.") })?; - if let Some(action_id) = action_id - && let Some(crate::key_hint::ShortcutHint::Chord { prefix, completion }) = - runtime_keymap.chords.primary_hint(action_id, bindings) - { - return Ok(vec![format!( - "{} {}", - binding_to_config_key_spec(prefix)?, - binding_to_config_key_spec(completion)? - )]); - } - bindings + let mut specs = bindings .iter() + .filter(|binding| !crate::keymap::is_dispatch_token(**binding)) .map(|binding| binding_to_config_key_spec(*binding)) - .collect() + .collect::, _>>()?; + if let Some(action_id) = action_id { + let chords: Vec<_> = runtime_keymap + .chords + .bindings + .iter() + .filter(|binding| binding.action == action_id) + .collect(); + let available: std::collections::HashSet<_> = chords + .iter() + .map(|binding| (binding.chord.prefix, binding.chord.completion)) + .collect(); + for binding in &chords { + // An implicit default can yield to a different action on some leader aliases. + // Only persist the symbolic form when all aliases remain available. + let partial_leader = binding.spec.starts_with("leader ") + && runtime_keymap + .chords + .leader + .iter() + .any(|prefix| !available.contains(&(*prefix, binding.chord.completion))); + specs.push(if partial_leader { + format!( + "{} {}", + binding_to_config_key_spec(binding.chord.prefix)?, + binding_to_config_key_spec(binding.chord.completion)? + ) + } else { + binding.spec.clone() + }); + } + } + Ok(dedup_bindings(specs)) } fn dedup_bindings(bindings: Vec) -> Vec { diff --git a/codex-rs/tui/src/keymap_setup/actions.rs b/codex-rs/tui/src/keymap_setup/actions.rs index 0e9de1220a..de7668b248 100644 --- a/codex-rs/tui/src/keymap_setup/actions.rs +++ b/codex-rs/tui/src/keymap_setup/actions.rs @@ -136,6 +136,7 @@ define_keymap_actions! { prompt_stack_back => "Move back through questions toward the composer.", skip_question => "Skip the focused question.", toggle_voice => "Start or stop a voice conversation.", + open_presets => "Run or save reusable inputs.", toggle_voice_mute => "Mute or unmute the voice microphone.", } composer "Composer" { diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_custom.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_custom.snap index ab1c5ac979..bec1df2c81 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_custom.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_custom.snap @@ -5,7 +5,7 @@ expression: "render_picker(params, 120)" Keymap All configurable shortcuts. - 152 actions, 1 customized, 5 unbound. + 153 actions, 1 customized, 5 unbound. All Common Customized (1) Unbound (5) App Composer Editor Vim Navigation Agents Approval › @@ -31,9 +31,9 @@ expression: "render_picker(params, 120)" Chat Prompt Stack Back shift-right, alt-down Chat Skip Question ctrl-] Chat Toggle Voice f8 + Chat Open Presets leader p (ctrl-x p) Chat Toggle Voice Mute f9 Composer * Submit ctrl-enter Composer Queue tab - Composer Toggle Shortcuts ?, shift-? ↓ left/right group · enter edit shortcut · * custom · - unbound · esc close diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_fast_mode_enabled.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_fast_mode_enabled.snap index 87197e2c21..ae034dbccf 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_fast_mode_enabled.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_fast_mode_enabled.snap @@ -5,7 +5,7 @@ expression: "render_picker(params, 120)" Keymap All configurable shortcuts. - 153 actions, 0 customized, 6 unbound. + 154 actions, 0 customized, 6 unbound. All Common Customized (0) Unbound (6) App Composer Editor Vim Navigation Agents Approval › @@ -32,8 +32,8 @@ expression: "render_picker(params, 120)" Chat Prompt Stack Back shift-right, alt-down Chat Skip Question ctrl-] Chat Toggle Voice f8 + Chat Open Presets leader p (ctrl-x p) Chat Toggle Voice Mute f9 Composer Submit enter - Composer Queue tab ↓ left/right group · enter edit shortcut · * custom · - unbound · esc close diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_first_actions.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_first_actions.snap index f539bb578e..cc5ba997ed 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_first_actions.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_first_actions.snap @@ -2,11 +2,11 @@ source: tui/src/keymap_setup.rs expression: snapshot --- -tab: All (152 selectable) +tab: All (153 selectable) tab: Common (20 selectable) tab: Customized (0) (0 selectable) tab: Unbound (5) (5 selectable) -tab: App (21 selectable) +tab: App (22 selectable) tab: Composer (5 selectable) tab: Editor (17 selectable) tab: Vim (69 selectable) diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_global_chord.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_global_chord.snap index e517985cb8..401b5edfa5 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_global_chord.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_global_chord.snap @@ -5,9 +5,9 @@ expression: "render_picker(params, 120)" Keymap All configurable shortcuts. - 152 actions, 1 customized, 6 unbound. + 153 actions, 1 customized, 7 unbound. - All Common Customized (1) Unbound (6) App Composer Editor Vim Navigation Agents Approval › + All Common Customized (1) Unbound (7) App Composer Editor Vim Navigation Agents Approval › Type to search shortcuts @@ -31,9 +31,9 @@ expression: "render_picker(params, 120)" Chat Prompt Stack Back shift-right, alt-down Chat Skip Question ctrl-] Chat Toggle Voice f8 + Chat - Open Presets unbound Chat Toggle Voice Mute f9 Composer Submit enter Composer Queue tab - Composer Toggle Shortcuts ?, shift-? ↓ left/right group · enter edit shortcut · * custom · - unbound · esc close diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_narrow.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_narrow.snap index 0d353cc83b..959a54cb0a 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_narrow.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_narrow.snap @@ -5,7 +5,7 @@ expression: "render_picker(params, 78)" Keymap All configurable shortcuts. - 152 actions, 0 customized, 5 unbound. + 153 actions, 0 customized, 5 unbound. All Common Customized (0) Unbound (5) App Composer Editor › @@ -31,9 +31,9 @@ expression: "render_picker(params, 78)" Chat Prompt Stack Back shift-right, alt-down Chat Skip Question ctrl-] Chat Toggle Voice f8 + Chat Open Presets leader p (ctrl-x p) Chat Toggle Voice Mute f9 Composer Submit enter Composer Queue tab - Composer Toggle Shortcuts ?, shift-? ↓ left/right group · enter edit shortcut · * custom · - unbound · esc close diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_wide.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_wide.snap index a7e7335399..edf78a1c92 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_wide.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_wide.snap @@ -5,7 +5,7 @@ expression: "render_picker(params, 120)" Keymap All configurable shortcuts. - 152 actions, 0 customized, 5 unbound. + 153 actions, 0 customized, 5 unbound. All Common Customized (0) Unbound (5) App Composer Editor Vim Navigation Agents Approval › @@ -31,9 +31,9 @@ expression: "render_picker(params, 120)" Chat Prompt Stack Back shift-right, alt-down Chat Skip Question ctrl-] Chat Toggle Voice f8 + Chat Open Presets leader p (ctrl-x p) Chat Toggle Voice Mute f9 Composer Submit enter Composer Queue tab - Composer Toggle Shortcuts ?, shift-? ↓ left/right group · enter edit shortcut · * custom · - unbound · esc close diff --git a/codex-rs/tui/src/tooltips/keybinding_tests.rs b/codex-rs/tui/src/tooltips/keybinding_tests.rs index 7811f83a9d..5b8a549f56 100644 --- a/codex-rs/tui/src/tooltips/keybinding_tests.rs +++ b/codex-rs/tui/src/tooltips/keybinding_tests.rs @@ -19,6 +19,7 @@ fn configured_shortcut_tips_render_at_narrow_width() { "queue": "ctrl-x q" }, "chat": { + "open_presets": "ctrl-x p", "increase_reasoning_effort": "ctrl-x +", "decrease_reasoning_effort": "ctrl-x minus" } diff --git a/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap b/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap index 467be5f32f..1bcfccadd7 100644 --- a/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap +++ b/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap @@ -26,6 +26,9 @@ Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" For mo Line::from_iter([Span::from("reasoning, press "), Span::from("⌥.").fg(Color::Rgb(166, 227, 161)), Span::from(" to increase")]) Line::from_iter([Span::from("reasoning effort or "), Span::from("⌥,").fg(Color::Rgb(166, 227, 161)), Span::from(" to decrease it.")]) Line::default() +Line::from_iter([Span::from("Tip:").bold(), Span::from(" Use "), Span::from("⌃x p").fg(Color::Rgb(166, 227, 161)), Span::from(", then 0–9 to run a preset;")]) +Line::from("Enter browses, s saves, and d deletes.") +Line::default() Line::from("Remapped") Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" Press "), Span::from("⌃x q").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message when")]) Line::from("a task is running; otherwise it sends") @@ -50,3 +53,6 @@ Line::from_iter([Span::from("Tip:").fg(Color::Reset).bold(), Span::from(" For mo Line::from_iter([Span::from("reasoning, press "), Span::from("⌃x +").fg(Color::Rgb(166, 227, 161)), Span::from(" to increase")]) Line::from_iter([Span::from("reasoning effort or "), Span::from("⌃x -").fg(Color::Rgb(166, 227, 161)), Span::from(" to decrease it.")]) Line::default() +Line::from_iter([Span::from("Tip:").bold(), Span::from(" Use "), Span::from("⌃x p").fg(Color::Rgb(166, 227, 161)), Span::from(", then 0–9 to run a preset;")]) +Line::from("Enter browses, s saves, and d deletes.") +Line::default() From b095b2ef236d8f45f85a9d5526bfbf2618ab2d63 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 18:51:22 +0000 Subject: [PATCH 106/155] Support inline permission profile selection with `/permissions` (#54383) ## What changed Allow `/permissions ` to select a built-in or custom permission profile, for example `/permissions :read-only`. Support `:ask-for-approval` and `:approve-for-me` aliases while preserving feature gates, profile requirements, full-access confirmation, and Windows sandbox setup. Hold queued input until the selection is confirmed, and retain it on cancellation or failure. Reload custom profile definitions on re-selection without leaving unchanged requests pending. ## Testing Add coverage for unknown and disabled profiles, approval aliases, confirmation and cancellation, discovery retries, Windows sandbox setup, and queued prompts waiting for server confirmation. GitOrigin-RevId: ada38d3cfc6d6ac4e84ce5645fe33432c55d63cc --- codex-rs/tui/src/app/app_server_events.rs | 16 +- codex-rs/tui/src/app/config_persistence.rs | 25 +- codex-rs/tui/src/app/event_dispatch.rs | 89 +++++- .../app/tests/permission_selection_tests.rs | 133 ++++++++- codex-rs/tui/src/app/tests/startup.rs | 42 ++- codex-rs/tui/src/app/thread_routing.rs | 19 +- codex-rs/tui/src/app_event.rs | 5 + codex-rs/tui/src/chatwidget.rs | 2 + codex-rs/tui/src/chatwidget/constructor.rs | 1 + codex-rs/tui/src/chatwidget/input_flow.rs | 6 + .../src/chatwidget/permission_discovery.rs | 116 +++++++- .../tui/src/chatwidget/permissions_menu.rs | 84 ++++++ codex-rs/tui/src/chatwidget/slash_dispatch.rs | 16 +- .../tui/src/chatwidget/tests/permissions.rs | 271 ++++++++++++++++-- .../src/chatwidget/tests/slash_commands.rs | 2 +- ..._permissions_command_disabled_profile.snap | 6 + ...__permissions_command_unknown_profile.snap | 5 + codex-rs/tui/src/slash_command.rs | 1 + 18 files changed, 770 insertions(+), 69 deletions(-) create mode 100644 codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__permissions__permissions_command_disabled_profile.snap create mode 100644 codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__permissions__permissions_command_unknown_profile.snap diff --git a/codex-rs/tui/src/app/app_server_events.rs b/codex-rs/tui/src/app/app_server_events.rs index 2821d6d242..69ba044fb4 100644 --- a/codex-rs/tui/src/app/app_server_events.rs +++ b/codex-rs/tui/src/app/app_server_events.rs @@ -537,7 +537,8 @@ impl App { #[cfg(any(target_os = "windows", test))] if let ServerNotification::WindowsSandboxSetupCompleted(result) = notification { - let Some((mode, preset, profile_selection)) = self.windows_sandbox.pending_setup.take() + let Some((mode, preset, profile_selection)) = + self.windows_sandbox.pending_setup.clone() else { return; }; @@ -550,7 +551,6 @@ impl App { } }; if result.mode != expected_mode { - self.windows_sandbox.pending_setup = Some((mode, preset, profile_selection)); return; } if result.success { @@ -567,10 +567,18 @@ impl App { profile_selection, }); } else { + self.windows_sandbox.pending_setup = None; self.chat_widget.clear_windows_sandbox_setup_status(); self.windows_sandbox.setup_started_at = None; - self.chat_widget - .retain_input_after_failed_permission_selection(); + if self + .chat_widget + .recover_inline_permission_profile_selection() + { + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + } else { + self.chat_widget + .retain_input_after_failed_permission_selection(); + } self.chat_widget.add_error_message(format!( "Windows sandbox setup failed: {}", result.error.unwrap_or_else(|| "unknown error".to_string()) diff --git a/codex-rs/tui/src/app/config_persistence.rs b/codex-rs/tui/src/app/config_persistence.rs index 76d0111f4a..4b5d22f8f6 100644 --- a/codex-rs/tui/src/app/config_persistence.rs +++ b/codex-rs/tui/src/app/config_persistence.rs @@ -271,6 +271,8 @@ impl App { mut selection: PermissionProfileSelection, ) { if self.reject_pending_permission_change() { + self.chat_widget + .retain_input_after_failed_permission_selection(); return; } let Some(thread_id) = self.chat_widget.thread_id() else { @@ -282,22 +284,21 @@ impl App { return; }; let config = self.chat_widget.config_ref(); - if !self + let already_selected = !self .agents_overview .requested_permission_profiles .contains_key(&thread_id) - && selection.profile_id.starts_with(':') && config .permissions .active_permission_profile() .is_some_and(|profile| profile.id == selection.profile_id) - && selection - .approval_policy - .is_none_or(|policy| config.permissions.approval_policy.value() == policy.to_core()) + && selection.approval_policy.is_none_or(|policy| { + config.permissions.approval_policy.value() == policy.to_core() + }) && selection .approvals_reviewer - .is_none_or(|reviewer| config.approvals_reviewer == reviewer) - { + .is_none_or(|reviewer| config.approvals_reviewer == reviewer); + if already_selected && selection.profile_id.starts_with(':') { self.agents_overview .selected_permission_profiles .insert(thread_id, selection.profile_id); @@ -330,9 +331,13 @@ impl App { self.agents_overview .selected_permission_profiles .insert(thread_id, selection.profile_id.clone()); - self.agents_overview - .requested_permission_profiles - .insert(thread_id, selection.clone()); + // Custom profiles still go to the server so edited definitions are reloaded. + // An unchanged selection may not emit a settings notification. + if !already_selected { + self.agents_overview + .requested_permission_profiles + .insert(thread_id, selection.clone()); + } self.chat_widget.add_info_message( format!( "Permission selection requested: {}", diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs index f1fad3d863..b5a5acf0db 100644 --- a/codex-rs/tui/src/app/event_dispatch.rs +++ b/codex-rs/tui/src/app/event_dispatch.rs @@ -109,6 +109,10 @@ impl App { AppEvent::OpenWindowsSandboxFallbackPrompt { .. } | AppEvent::EnableWindowsSandboxForAgentMode { .. } ) { + #[cfg(any(target_os = "windows", test))] + { + self.windows_sandbox.pending_setup = None; + } self.chat_widget.clear_windows_sandbox_setup_status(); } self.chat_widget.add_info_message( @@ -2186,14 +2190,52 @@ impl App { } } AppEvent::SettingsSelectionClosed => { + #[cfg(any(target_os = "windows", test))] + let windows_sandbox_setup_pending = + self.windows_sandbox.pending_setup.is_some(); + #[cfg(not(any(target_os = "windows", test)))] + let windows_sandbox_setup_pending = false; + if self.chat_widget.no_modal_or_popup_active() + && !windows_sandbox_setup_pending + { + self.chat_widget + .recover_inline_permission_profile_selection(); + } self.app_event_tx.send(AppEvent::SettingsSelectionSettled); } AppEvent::SettingsSelectionSettled => { if self.chat_widget.no_modal_or_popup_active() + && !self + .chat_widget + .inline_permission_profile_selection_pending() && !self .chat_widget .thread_id() - .is_some_and(|thread_id| self.pending_server_profiles.contains_key(&thread_id)) + .is_some_and(|thread_id| { + self.pending_server_profiles.contains_key(&thread_id) + || self + .agents_overview + .requested_permission_profiles + .get(&thread_id) + .is_some_and(|selection| { + let config = self.chat_widget.config_ref(); + config + .permissions + .active_permission_profile() + .is_none_or(|active| { + active.id != selection.profile_id + }) + || selection.approval_policy.is_some_and(|policy| { + config.permissions.approval_policy.value() + != policy.to_core() + }) + || selection + .approvals_reviewer + .is_some_and(|reviewer| { + config.approvals_reviewer != reviewer + }) + }) + }) { let config = self.chat_widget.config_ref(); let permissions_override = Self::turn_permissions_override_from_config( @@ -2381,6 +2423,10 @@ impl App { preset, profile_selection, } => { + #[cfg(any(target_os = "windows", test))] + { + self.windows_sandbox.pending_setup = None; + } self.session_telemetry.counter( "codex.windows_sandbox.fallback_prompt_shown", /*inc*/ 1, @@ -2432,6 +2478,10 @@ impl App { mode, profile_selection, } => { + #[cfg(any(target_os = "windows", test))] + { + self.windows_sandbox.pending_setup = None; + } #[cfg(target_os = "windows")] { self.chat_widget.clear_windows_sandbox_setup_status(); @@ -2456,7 +2506,11 @@ impl App { self.chat_widget.windows_sandbox_elevated_setup_complete = elevated_enabled; if let Some(selection) = profile_selection { + let inline = self.chat_widget.complete_inline_permission_profile_selection(); self.select_permission_profile(app_server, selection).await; + if inline { + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + } } else { self.app_event_tx.send(AppEvent::CodexOp( AppCommand::override_turn_context( @@ -2488,8 +2542,14 @@ impl App { .dark_gray(), ]), ]); + } else if self + .chat_widget + .recover_inline_permission_profile_selection() + { + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); } else { - self.chat_widget.retain_input_after_failed_permission_selection(); + self.chat_widget + .retain_input_after_failed_permission_selection(); } } #[cfg(not(target_os = "windows"))] @@ -2704,7 +2764,13 @@ impl App { self.chat_widget.submit_initial_user_message_if_pending(); } AppEvent::SelectPermissionProfile(selection) => { + let inline_selection = self + .chat_widget + .complete_inline_permission_profile_selection(); self.select_permission_profile(app_server, selection).await; + if inline_selection { + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + } } AppEvent::UpdateApprovalsReviewer(policy) => { if self.reject_pending_permission_change() { @@ -3153,6 +3219,25 @@ impl App { self.chat_widget.add_error_message(err); } } + AppEvent::ResolvePermissionProfile { profile_id } => { + if self.reject_pending_permission_change() { + self.chat_widget + .retain_input_after_failed_permission_selection(); + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + return Ok(AppRunControl::Continue); + } + #[cfg(any(target_os = "windows", test))] + if self.chat_widget.windows_sandbox_local_server + && self.windows_sandbox_host() != WindowsSandboxHost::Remote + && self.chat_widget.windows_sandbox_config.requirements.is_none() + && !self.refresh_windows_sandbox_config(app_server).await + { + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + return Ok(AppRunControl::Continue); + } + self.chat_widget + .select_permission_profile_by_id(&profile_id); + } AppEvent::OpenPermissionsPopup | AppEvent::OpenApprovalsPopup => { if self.reject_pending_permission_change() { return Ok(AppRunControl::Continue); diff --git a/codex-rs/tui/src/app/tests/permission_selection_tests.rs b/codex-rs/tui/src/app/tests/permission_selection_tests.rs index d24946fa30..79bf0cf638 100644 --- a/codex-rs/tui/src/app/tests/permission_selection_tests.rs +++ b/codex-rs/tui/src/app/tests/permission_selection_tests.rs @@ -134,6 +134,91 @@ async fn matching_builtin_permission_selection_submits_pending_prompt() -> Resul Ok(()) } +#[tokio::test] +async fn inline_server_permission_selection_holds_queued_prompt_until_confirmation() -> Result<()> { + let (mut app, mut events, mut ops) = make_test_app_with_channels().await; + let home = tempdir()?; + std::fs::write( + home.path().join("config.toml"), + "default_permissions = \":workspace\"\n[permissions.server-only]\nextends = \":read-only\"\n", + )?; + let server_config = ConfigBuilder::default() + .codex_home(home.path().into()) + .build() + .await?; + let mut server = crate::start_embedded_app_server_for_picker(&server_config).await?; + let started = server.start_thread(&app.config).await?; + let thread_id = started.session.thread_id; + app.enqueue_primary_thread_session(started.session, started.turns) + .await?; + while events.try_recv().is_ok() {} + while ops.try_recv().is_ok() {} + + app.chat_widget + .select_permission_profile_by_id("server-only"); + assert!(app.chat_widget.queue_user_message_with_options( + crate::chatwidget::UserMessage::from("use the selected profile"), + crate::bottom_pane::QueuedInputAction::Plain, + Vec::new(), + )); + let mut tui = crate::tui::test_support::make_test_tui()?; + let mut settings_settled = false; + for _ in 0..20 { + if app + .agents_overview + .requested_permission_profiles + .contains_key(&thread_id) + { + break; + } + let event = tokio::time::timeout(std::time::Duration::from_secs(/*secs*/ 2), events.recv()) + .await? + .expect("app event channel should remain open"); + app.handle_event(&mut tui, &mut server, event).await?; + } + assert!( + app.agents_overview + .requested_permission_profiles + .contains_key(&thread_id) + ); + while let Ok(event) = events.try_recv() { + app.handle_event(&mut tui, &mut server, event).await?; + } + assert!(ops.try_recv().is_err()); + + let settings = next_thread_settings_updated(&mut server, thread_id).await; + app.enqueue_thread_notification( + thread_id, + ServerNotification::ThreadSettingsUpdated(settings), + ) + .await?; + for _ in 0..20 { + let event = tokio::time::timeout(std::time::Duration::from_secs(/*secs*/ 2), events.recv()) + .await? + .expect("app event channel should remain open"); + let settled = matches!(event, AppEvent::SettingsSelectionSettled); + app.handle_event(&mut tui, &mut server, event).await?; + if settled { + settings_settled = true; + break; + } + } + assert!(settings_settled); + + let Op::UserTurn { items, .. } = next_user_turn_op(&mut ops) else { + panic!("expected queued user turn"); + }; + assert_eq!( + items, + vec![AppServerUserInput::Text { + text: "use the selected profile".to_string(), + text_elements: Vec::new(), + }] + ); + server.shutdown().await?; + Ok(()) +} + #[tokio::test] async fn custom_permission_selection_uses_server_definition_and_preserves_state_on_rejection() -> Result<()> { @@ -212,7 +297,7 @@ async fn custom_permission_selection_uses_server_definition_and_preserves_state_ ); std::fs::write( home.path().join("config.toml"), - "default_permissions = \":workspace\"\n[permissions.shared]\nextends = \":read-only\"\n", + "default_permissions = \":workspace\"\n[permissions.shared]\nextends = \":read-only\"\n[permissions.other]\nextends = \":read-only\"\n", )?; app.select_permission_profile( &mut server, @@ -240,6 +325,42 @@ async fn custom_permission_selection_uses_server_definition_and_preserves_state_ app.select_permission_profile(&mut server, selection.clone()) .await; assert!(!app.reject_pending_permission_change()); + assert!(app.agents_overview.requested_permission_profiles.is_empty()); + // Another client's policy change must not leave a no-op request's old policy behind. + server + .thread_settings_update(ThreadSettingsUpdateParams { + thread_id: thread_id.to_string(), + approval_policy: Some(AskForApproval::OnRequest), + ..Default::default() + }) + .await?; + let settings = next_thread_settings_updated(&mut server, thread_id).await; + app.enqueue_thread_notification( + thread_id, + ServerNotification::ThreadSettingsUpdated(settings), + ) + .await?; + app.select_permission_profile( + &mut server, + PermissionProfileSelection { + profile_id: "other".into(), + approval_policy: None, + approvals_reviewer: None, + display_label: "other".into(), + }, + ) + .await; + assert_eq!( + app.agents_overview.requested_permission_profiles[&thread_id].approval_policy, + Some(AskForApproval::OnRequest) + ); + let settings = next_thread_settings_updated(&mut server, thread_id).await; + app.enqueue_thread_notification( + thread_id, + ServerNotification::ThreadSettingsUpdated(settings), + ) + .await?; + assert!(app.agents_overview.requested_permission_profiles.is_empty()); let confirmed = RuntimePermissionProfileOverride::from_config(app.chat_widget.config_ref()); let confirmed_config = app.config.clone(); app.select_permission_profile( @@ -261,7 +382,7 @@ async fn custom_permission_selection_uses_server_definition_and_preserves_state_ .selected_permission_profiles .get(&thread_id) .map(String::as_str), - Some("shared") + Some("other") ); // Materialize the task so /fork exercises persisted history with the confirmed profile. server.thread_inject_items(thread_id, vec![serde_json::from_value(serde_json::json!({ @@ -269,10 +390,6 @@ async fn custom_permission_selection_uses_server_definition_and_preserves_state_ }))?]).await?; let mut tui = crate::tui::test_support::make_test_tui()?; while events.try_recv().is_ok() {} - app.change_working_directory(&mut tui, &mut server, client_home.path().abs()) - .await; - assert_eq!(app.chat_widget.thread_id(), Some(thread_id)); - insta::assert_snapshot!(next_history_message(&mut events), @"■ Changing directories with an unconfirmed named profile is not supported."); let side = server .fork_side_thread( &app.local_settings, @@ -288,10 +405,10 @@ async fn custom_permission_selection_uses_server_definition_and_preserves_state_ side.session.permission_profile, side.session.approval_policy ), - (PermissionProfile::read_only(), AskForApproval::Never) + (PermissionProfile::read_only(), AskForApproval::OnRequest) ); app.cli_kv_overrides.push(( - "permissions.shared.extends".into(), + "permissions.other.extends".into(), TomlValue::String(":danger-full-access".into()), )); // Both the accepted request and its confirmed descendant remain server-owned. diff --git a/codex-rs/tui/src/app/tests/startup.rs b/codex-rs/tui/src/app/tests/startup.rs index 196ff1ab16..a4c5a256a1 100644 --- a/codex-rs/tui/src/app/tests/startup.rs +++ b/codex-rs/tui/src/app/tests/startup.rs @@ -140,7 +140,7 @@ async fn windows_sandbox_setup_completion_requires_matching_pending_mode() -> Re let (mut app, mut events, _ops) = make_test_app_with_channels().await; app.chat_widget.windows_sandbox_local_server = true; while events.try_recv().is_ok() {} - let app_server = + let mut app_server = crate::start_embedded_app_server_for_picker(app.chat_widget.config_ref()).await?; let preset = builtin_approval_presets() .into_iter() @@ -148,6 +148,19 @@ async fn windows_sandbox_setup_completion_requires_matching_pending_mode() -> Re .expect("auto preset"); app.windows_sandbox.pending_setup = Some((WindowsSandboxEnableMode::Elevated, preset, None)); app.windows_sandbox.setup_started_at = Some(Instant::now()); + app.chat_widget + .select_permission_profile_by_id(":workspace"); + let AppEvent::FetchPermissionProfiles { request_id, .. } = events.try_recv()? else { + panic!("expected profile discovery"); + }; + app.chat_widget.on_permission_profiles_loaded( + request_id, + Ok(crate::permission_discovery::PermissionDiscovery::local( + app.chat_widget.config_ref(), + )), + ); + while events.try_recv().is_ok() {} + let mut tui = crate::tui::test_support::make_test_tui()?; for mode in [ WindowsSandboxSetupMode::Unelevated, @@ -166,10 +179,7 @@ async fn windows_sandbox_setup_completion_requires_matching_pending_mode() -> Re )), ) .await; - assert_eq!( - app.windows_sandbox.pending_setup.is_some(), - mode == WindowsSandboxSetupMode::Unelevated - ); + assert!(app.windows_sandbox.pending_setup.is_some()); } assert!(!app.chat_widget.windows_sandbox_elevated_setup_complete); assert!(app.windows_sandbox_blocks_thread_switch()); @@ -182,6 +192,14 @@ async fn windows_sandbox_setup_completion_requires_matching_pending_mode() -> Re )); assert!(events.try_recv().is_err()); + // Completion can overtake this close event; selection still belongs to the queued handler. + app.handle_event(&mut tui, &mut app_server, AppEvent::SettingsSelectionClosed) + .await?; + assert!( + app.chat_widget + .inline_permission_profile_selection_pending() + ); + app_server.shutdown().await?; Ok(()) } @@ -1932,9 +1950,21 @@ async fn windows_sandbox_config_refresh_uses_connected_server() -> Result<()> { let mut tui = crate::tui::test_support::make_test_tui()?; app.chat_widget.windows_sandbox_local_server = true; app.chat_widget.windows_sandbox_host = WindowsSandboxHost::Local; - Box::pin(app.handle_event(&mut tui, &mut recovered, AppEvent::OpenPermissionsPopup)).await?; + while events.try_recv().is_ok() {} + Box::pin(app.handle_event( + &mut tui, + &mut recovered, + AppEvent::ResolvePermissionProfile { + profile_id: codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_READ_ONLY.to_string(), + }, + )) + .await?; assert_eq!(app.chat_widget.windows_sandbox_config, loaded_config); assert!(app.chat_widget.has_active_view()); + assert!(matches!( + events.try_recv(), + Ok(AppEvent::FetchPermissionProfiles { .. }) + )); recovered.shutdown().await?; server.shutdown().await?; Ok(()) diff --git a/codex-rs/tui/src/app/thread_routing.rs b/codex-rs/tui/src/app/thread_routing.rs index cb2d4e6387..2ace03d211 100644 --- a/codex-rs/tui/src/app/thread_routing.rs +++ b/codex-rs/tui/src/app/thread_routing.rs @@ -1144,12 +1144,25 @@ impl App { { self.chat_widget .on_thread_settings_updated(settings.clone()); + if confirmed_profile.is_some() + || settings + .thread_settings + .active_permission_profile + .as_ref() + .is_some_and(|profile| { + self.agents_overview + .selected_permission_profiles + .get(&thread_id) + == Some(&profile.id) + }) + { + // Also adopt changed custom definitions and settings from another client + // after a no-op re-selection that needed no pending request. + self.adopt_server_permissions(); + } notification = None; } if confirmed_profile.is_some() { - if self.chat_widget.thread_id() == Some(thread_id) { - self.adopt_server_permissions(); - } self.app_event_tx.send(AppEvent::SettingsSelectionSettled); } diff --git a/codex-rs/tui/src/app_event.rs b/codex-rs/tui/src/app_event.rs index c19c77f3c6..e2b86c9c1e 100644 --- a/codex-rs/tui/src/app_event.rs +++ b/codex-rs/tui/src/app_event.rs @@ -1560,6 +1560,11 @@ pub(crate) enum AppEvent { /// Re-open the permissions presets popup. OpenPermissionsPopup, + /// Resolve an inline permission profile after any app-owned platform preflight. + ResolvePermissionProfile { + profile_id: String, + }, + /// Open the branch picker option from the review popup. OpenReviewBranchPicker(PathBuf), diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index d28be65c8f..f6d4c16260 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -544,6 +544,8 @@ pub(crate) struct ChatWidget { model_popup_request_id: Option, permission_popup_request_id: Option, permission_discovery: Option, + inline_permission_profile_selection: + Option, worktree_popup_request_id: Option, permission_profiles_menu_opened: bool, model_popup_model_ids: Vec, diff --git a/codex-rs/tui/src/chatwidget/constructor.rs b/codex-rs/tui/src/chatwidget/constructor.rs index 185a10ae2a..b0a12a3d26 100644 --- a/codex-rs/tui/src/chatwidget/constructor.rs +++ b/codex-rs/tui/src/chatwidget/constructor.rs @@ -130,6 +130,7 @@ impl ChatWidget { model_popup_request_id: None, permission_popup_request_id: None, permission_discovery: None, + inline_permission_profile_selection: None, worktree_popup_request_id: None, permission_profiles_menu_opened: false, model_popup_model_ids: Vec::new(), diff --git a/codex-rs/tui/src/chatwidget/input_flow.rs b/codex-rs/tui/src/chatwidget/input_flow.rs index 6a089a0039..ce5da8c93b 100644 --- a/codex-rs/tui/src/chatwidget/input_flow.rs +++ b/codex-rs/tui/src/chatwidget/input_flow.rs @@ -125,6 +125,12 @@ impl ChatWidget { } pub(super) fn on_modal_or_popup_closed(&mut self) { + if self.apply_pending_permission_profile() { + return; + } + if self.cancel_pending_permission_profile_selection() { + return; + } if self.input_queue.suppress_queue_autosend { self.app_event_tx.send(AppEvent::SettingsSelectionClosed); } else { diff --git a/codex-rs/tui/src/chatwidget/permission_discovery.rs b/codex-rs/tui/src/chatwidget/permission_discovery.rs index 9fa0b2a6a2..4d6f8c9e10 100644 --- a/codex-rs/tui/src/chatwidget/permission_discovery.rs +++ b/codex-rs/tui/src/chatwidget/permission_discovery.rs @@ -5,7 +5,22 @@ use crate::permission_discovery::PermissionDiscovery; pub(super) const VIEW_ID: &str = "permission-profiles"; +pub(super) enum InlinePermissionProfileSelection { + Discovering(String), + Applying, +} + impl ChatWidget { + pub(crate) fn select_permission_profile_by_id(&mut self, profile_id: &str) { + self.set_queue_autosend_suppressed(/*suppressed*/ true); + self.inline_permission_profile_selection = Some( + InlinePermissionProfileSelection::Discovering(profile_id.to_string()), + ); + if !self.apply_pending_permission_profile() { + self.request_permission_profiles(); + } + } + pub(crate) fn retain_input_after_failed_permission_selection(&mut self) { self.input_queue.recovered_queue |= self.input_queue.has_queued_follow_up_messages() || !self.input_queue.pending_steers.is_empty(); @@ -13,6 +28,54 @@ impl ChatWidget { self.restore_user_message_to_composer(message); } } + + pub(super) fn apply_pending_permission_profile(&mut self) -> bool { + let Some(discovery) = self.permission_discovery.clone() else { + return false; + }; + let Some(profile_id) = self.pending_permission_profile_id().map(str::to_owned) else { + return false; + }; + self.inline_permission_profile_selection = Some(InlinePermissionProfileSelection::Applying); + if !self.try_select_permission_profile_by_id(&discovery, &profile_id) { + self.recover_inline_permission_profile_selection(); + } + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + true + } + + pub(super) fn cancel_pending_permission_profile_selection(&mut self) -> bool { + if self.pending_permission_profile_id().is_none() { + return false; + } + self.recover_inline_permission_profile_selection(); + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + true + } + + pub(crate) fn complete_inline_permission_profile_selection(&mut self) -> bool { + self.inline_permission_profile_selection.take().is_some() + } + + pub(crate) fn recover_inline_permission_profile_selection(&mut self) -> bool { + if !self.complete_inline_permission_profile_selection() { + return false; + } + self.retain_input_after_failed_permission_selection(); + true + } + + pub(crate) fn inline_permission_profile_selection_pending(&self) -> bool { + self.inline_permission_profile_selection.is_some() + } + + fn pending_permission_profile_id(&self) -> Option<&str> { + match self.inline_permission_profile_selection.as_ref() { + Some(InlinePermissionProfileSelection::Discovering(profile_id)) => Some(profile_id), + Some(InlinePermissionProfileSelection::Applying) | None => None, + } + } + pub(crate) fn request_permission_profiles(&mut self) { self.bottom_pane.dismiss_view_by_id(VIEW_ID); if let Some(discovery) = self.permission_discovery.clone() { @@ -44,6 +107,9 @@ impl ChatWidget { pub(super) fn invalidate_permission_discovery(&mut self) { self.permission_popup_request_id = None; self.bottom_pane.dismiss_view_by_id(VIEW_ID); + if self.recover_inline_permission_profile_selection() { + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + } } pub(crate) fn permission_popup_request_is_current(&self, request_id: uuid::Uuid) -> bool { @@ -63,26 +129,46 @@ impl ChatWidget { self.permission_discovery = Some(discovery.clone()); } if !self.bottom_pane.dismiss_active_view_if_id(VIEW_ID) { - self.bottom_pane.dismiss_view_by_id(VIEW_ID); + let was_covered = self.bottom_pane.dismiss_view_by_id(VIEW_ID); + if was_covered && result.is_ok() { + return; + } + if let Err(message) = result + && self.pending_permission_profile_id().is_some() + { + self.add_error_message(message); + } + self.cancel_pending_permission_profile_selection(); return; } match result { Ok(discovery) => { - self.permission_profiles_menu_opened = true; - self.open_permission_profiles_popup(discovery); + if !self.apply_pending_permission_profile() { + self.permission_profiles_menu_opened = true; + self.open_permission_profiles_popup(discovery); + } + } + Err(message) => { + let retry_profile_id = self.pending_permission_profile_id().map(str::to_owned); + self.bottom_pane.show_selection_view(SelectionViewParams { + view_id: Some(VIEW_ID), + title: Some("Update Model Permissions".to_string()), + subtitle: Some(message), + items: vec![SelectionItem { + name: "Retry".to_string(), + actions: vec![Box::new(move |tx| { + if let Some(profile_id) = retry_profile_id.clone() { + tx.send(AppEvent::ResolvePermissionProfile { profile_id }); + } else { + tx.send(AppEvent::OpenPermissionsPopup); + } + })], + dismiss_on_select: false, + ..Default::default() + }], + ..SelectionViewParams::picker() + }); } - Err(message) => self.bottom_pane.show_selection_view(SelectionViewParams { - view_id: Some(VIEW_ID), - title: Some("Update Model Permissions".to_string()), - subtitle: Some(message), - items: vec![SelectionItem { - name: "Retry".to_string(), - actions: vec![Box::new(|tx| tx.send(AppEvent::OpenPermissionsPopup))], - dismiss_on_select: true, - ..Default::default() - }], - ..SelectionViewParams::picker() - }), } } } diff --git a/codex-rs/tui/src/chatwidget/permissions_menu.rs b/codex-rs/tui/src/chatwidget/permissions_menu.rs index 4e2fcb6b38..eac72ab9fa 100644 --- a/codex-rs/tui/src/chatwidget/permissions_menu.rs +++ b/codex-rs/tui/src/chatwidget/permissions_menu.rs @@ -3,6 +3,7 @@ use super::*; use crate::permission_discovery::PermissionDiscovery; use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS; +use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_WORKSPACE; pub(super) fn permission_preset_description(preset: &ApprovalPreset) -> &'static str { match preset.id { @@ -49,6 +50,89 @@ pub(crate) fn cyber_model_approval_reviewer(config: &Config) -> Option bool { + let reviewer = match profile_id { + ":approve-for-me" if !self.config.features.enabled(Feature::GuardianApproval) => { + self.add_error_message( + "Approve for me is unavailable. Run `/permissions` to see available profiles." + .into(), + ); + return false; + } + ":approve-for-me" => ApprovalsReviewer::AutoReview, + _ => ApprovalsReviewer::User, + }; + let profile_id = match profile_id { + ":ask-for-approval" | ":approve-for-me" => BUILT_IN_PERMISSION_PROFILE_WORKSPACE, + id => id, + }; + let Some(profile) = discovery + .profiles + .iter() + .find(|profile| profile.id == profile_id) + else { + self.add_error_message(format!( + "Unknown permission profile `{profile_id}`. Run `/permissions` to see available profiles." + )); + return false; + }; + let preset = builtin_approval_presets() + .into_iter() + .find(|preset| preset.active_permission_profile.id == profile_id); + let approval_policy = preset + .as_ref() + .map(|preset| AskForApproval::from(preset.approval)); + let approvals_reviewer = preset.as_ref().map(|_| reviewer); + if let Some(reason) = discovery.disabled_reason( + profile_id, + approval_policy, + approvals_reviewer.map(Into::into), + ) { + self.add_error_message(format!( + "Permission profile `{profile_id}` is unavailable: {reason}." + )); + return false; + } + let display_label = + preset + .as_ref() + .map_or(profile.id.as_str(), |preset| match (preset.id, reviewer) { + ("auto", ApprovalsReviewer::AutoReview) => APPROVE_FOR_ME_LABEL, + ("auto", ApprovalsReviewer::User) => ASK_FOR_APPROVAL_LABEL, + _ => preset.label, + }); + let selection = PermissionProfileSelection { + profile_id: profile_id.to_string(), + approval_policy, + approvals_reviewer, + display_label: display_label.to_string(), + }; + if let Some(preset) = preset { + let Some(action) = self + .permission_mode_actions( + &preset, + display_label.to_string(), + reviewer, + /*profile_selection*/ Some(selection), + /*return_to_permissions*/ true, + ) + .into_iter() + .next() + else { + return false; + }; + action(&self.app_event_tx); + return true; + } + self.app_event_tx + .send(AppEvent::SelectPermissionProfile(selection)); + true + } + pub(super) fn open_permission_profiles_popup(&mut self, discovery: PermissionDiscovery) { let active_profile_id = self .config diff --git a/codex-rs/tui/src/chatwidget/slash_dispatch.rs b/codex-rs/tui/src/chatwidget/slash_dispatch.rs index d6f9ee55e3..1ec8e08fa4 100644 --- a/codex-rs/tui/src/chatwidget/slash_dispatch.rs +++ b/codex-rs/tui/src/chatwidget/slash_dispatch.rs @@ -806,12 +806,26 @@ impl ChatWidget { source, } = prepared; let trimmed = args.trim(); + if trimmed.is_empty() { + self.dispatch_command_from_source(cmd, source); + return; + } match cmd { SlashCommand::Model if !trimmed.is_empty() => { self.handle_model_command_args(trimmed); self.app_event_tx.send(AppEvent::SettingsSelectionClosed); } - SlashCommand::Export if trimmed.is_empty() => self.show_transcript_export_popup(), + SlashCommand::Permissions + if self.windows_sandbox_local_server + && self.windows_sandbox_host != WindowsSandboxHost::Remote + && self.windows_sandbox_config.requirements.is_none() => + { + self.set_queue_autosend_suppressed(/*suppressed*/ true); + self.app_event_tx.send(AppEvent::ResolvePermissionProfile { + profile_id: trimmed.to_string(), + }); + } + SlashCommand::Permissions => self.select_permission_profile_by_id(trimmed), SlashCommand::Export => { self.set_queue_autosend_suppressed(/*suppressed*/ true); self.app_event_tx.send(AppEvent::ExportTranscript { diff --git a/codex-rs/tui/src/chatwidget/tests/permissions.rs b/codex-rs/tui/src/chatwidget/tests/permissions.rs index a08388f58d..221c58e3cb 100644 --- a/codex-rs/tui/src/chatwidget/tests/permissions.rs +++ b/codex-rs/tui/src/chatwidget/tests/permissions.rs @@ -3,6 +3,7 @@ use crate::legacy_core::config::PermissionProfileCatalogEntry; use crate::permission_discovery::PermissionDiscovery as Discovery; use codex_protocol::models::ActivePermissionProfile; use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS; +use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_READ_ONLY; use codex_protocol::models::ManagedFileSystemPermissions; use codex_protocol::permissions::FileSystemAccessMode; use codex_protocol::permissions::FileSystemPath; @@ -87,6 +88,208 @@ async fn permission_discovery_uses_server_catalog_for_remote_custom_selection() )); } +#[tokio::test] +async fn permissions_command_waits_for_covering_modal_before_selecting_profile() { + let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + chat.thread_id = Some(ThreadId::new()); + chat.select_permission_profile_by_id(BUILT_IN_PERMISSION_PROFILE_READ_ONLY); + let request_id = assert_matches!( + events.try_recv(), + Ok(AppEvent::FetchPermissionProfiles { request_id, .. }) => request_id + ); + chat.bottom_pane.show_selection_view(SelectionViewParams { + view_id: Some("other-modal"), + title: Some("Other modal".to_string()), + ..Default::default() + }); + + chat.on_permission_profiles_loaded(request_id, Ok(Discovery::local(&chat.config))); + + assert_eq!(chat.bottom_pane.active_view_id(), Some("other-modal")); + assert!(events.try_recv().is_err()); + + chat.handle_key_event(KeyEvent::from(KeyCode::Esc)); + + assert_matches!( + events.try_recv(), + Ok(AppEvent::SelectPermissionProfile(PermissionProfileSelection { profile_id, .. })) + if profile_id == BUILT_IN_PERMISSION_PROFILE_READ_ONLY + ); + assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); +} + +#[tokio::test] +async fn cancelled_permissions_command_does_not_apply_after_later_modal() { + let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + chat.thread_id = Some(ThreadId::new()); + chat.input_queue + .queued_user_messages + .push_back(UserMessage::from("follow-up").into()); + chat.select_permission_profile_by_id(BUILT_IN_PERMISSION_PROFILE_READ_ONLY); + let request_id = assert_matches!( + events.try_recv(), + Ok(AppEvent::FetchPermissionProfiles { request_id, .. }) => request_id + ); + chat.handle_key_event(KeyEvent::from(KeyCode::Esc)); + assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); + assert!(chat.input_queue.recovered_queue); + + chat.on_permission_profiles_loaded(request_id, Ok(Discovery::local(&chat.config))); + chat.bottom_pane.show_selection_view(SelectionViewParams { + view_id: Some("other-modal"), + title: Some("Other modal".to_string()), + ..Default::default() + }); + chat.handle_key_event(KeyEvent::from(KeyCode::Esc)); + + assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); + assert!( + events.try_recv().is_err(), + "cancelled profile must not apply" + ); +} + +#[tokio::test] +async fn permissions_command_preserves_full_access_confirmation() { + let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + chat.thread_id = Some(ThreadId::new()); + chat.permission_discovery = Some(Discovery::local(&chat.config)); + chat.input_queue + .queued_user_messages + .push_back(UserMessage::from("follow-up").into()); + + chat.dispatch_command_with_args( + SlashCommand::Permissions, + BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS.to_string(), + Vec::new(), + ); + + let (preset, return_to_permissions, profile_selection) = assert_matches!( + events.try_recv(), + Ok(AppEvent::OpenFullAccessConfirmation { + preset, + return_to_permissions, + profile_selection: Some(profile_selection), + }) if preset.id == "full-access" + && profile_selection.profile_id == BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS + => (preset, return_to_permissions, Some(profile_selection)) + ); + assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); + chat.open_full_access_confirmation(preset, return_to_permissions, profile_selection); + + // Cancel returns to the picker; closing that picker must still recover the queue. + chat.handle_key_event(KeyEvent::from(KeyCode::Down)); + chat.handle_key_event(KeyEvent::from(KeyCode::Enter)); + assert_matches!(events.try_recv(), Ok(AppEvent::OpenPermissionsPopup)); + chat.open_permissions_popup(); + assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); + assert!(chat.inline_permission_profile_selection_pending()); + chat.handle_key_event(KeyEvent::from(KeyCode::Esc)); + + assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); + assert!(chat.inline_permission_profile_selection_pending()); + assert!(chat.recover_inline_permission_profile_selection()); + assert!(chat.input_queue.recovered_queue); + assert!(events.try_recv().is_err()); +} + +#[tokio::test] +async fn permissions_command_rejects_disabled_profile() { + let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + let mut discovery = Discovery::local(&chat.config); + discovery.requirements = Some( + serde_json::from_value(serde_json::json!({ + "allowedPermissionProfiles": {BUILT_IN_PERMISSION_PROFILE_READ_ONLY: false} + })) + .unwrap(), + ); + chat.permission_discovery = Some(discovery); + chat.input_queue + .queued_user_messages + .push_back(UserMessage::from("follow-up").into()); + + chat.dispatch_command_with_args( + SlashCommand::Permissions, + BUILT_IN_PERMISSION_PROFILE_READ_ONLY.to_string(), + Vec::new(), + ); + + let cell = assert_matches!(events.try_recv(), Ok(AppEvent::InsertHistoryCell(cell)) => cell); + insta::assert_snapshot!( + "permissions_command_disabled_profile", + lines_to_single_string(&cell.display_lines(/*width*/ 80)) + ); + assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); + assert!(chat.input_queue.recovered_queue); +} + +#[tokio::test] +async fn permissions_command_rejects_unknown_profile() { + let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + chat.permission_discovery = Some(Discovery::local(&chat.config)); + + chat.dispatch_command_with_args( + SlashCommand::Permissions, + "unknown-profile".to_string(), + Vec::new(), + ); + + let cell = assert_matches!(events.try_recv(), Ok(AppEvent::InsertHistoryCell(cell)) => cell); + insta::assert_snapshot!( + "permissions_command_unknown_profile", + lines_to_single_string(&cell.display_lines(/*width*/ 80)) + ); + assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); +} + +#[tokio::test] +async fn invalidating_inline_permission_discovery_recovers_queued_input() { + let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + chat.thread_id = Some(ThreadId::new()); + chat.input_queue + .queued_user_messages + .push_back(UserMessage::from("follow-up").into()); + chat.select_permission_profile_by_id(BUILT_IN_PERMISSION_PROFILE_READ_ONLY); + let request_id = assert_matches!( + events.try_recv(), + Ok(AppEvent::FetchPermissionProfiles { request_id, .. }) => request_id + ); + + chat.invalidate_permission_discovery(); + + assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); + assert!(chat.input_queue.recovered_queue); + chat.on_permission_profiles_loaded(request_id, Ok(Discovery::local(&chat.config))); + assert!(events.try_recv().is_err()); +} + +#[tokio::test] +async fn inline_permission_discovery_retry_preserves_profile_id() { + let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + chat.thread_id = Some(ThreadId::new()); + chat.select_permission_profile_by_id("server-only"); + let request_id = assert_matches!( + events.try_recv(), + Ok(AppEvent::FetchPermissionProfiles { request_id, .. }) => request_id + ); + chat.on_permission_profiles_loaded( + request_id, + Err("Failed to load permissions: disconnected".to_string()), + ); + + chat.handle_key_event(KeyEvent::from(KeyCode::Enter)); + + assert_matches!( + events.try_recv(), + Ok(AppEvent::ResolvePermissionProfile { profile_id }) if profile_id == "server-only" + ); + assert_eq!( + chat.bottom_pane.active_view_id(), + Some("permission-profiles") + ); + assert!(events.try_recv().is_err()); +} + #[tokio::test] async fn permission_discovery_discards_stale_results_and_preserves_covering_modal() { let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; @@ -331,15 +534,26 @@ async fn profile_permissions_selection_emits_named_profile_event_only() { let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::>(); assert_eq!(events.len(), 1); - assert!(matches!( - &events[0], - AppEvent::SelectPermissionProfile(PermissionProfileSelection { - profile_id, - approval_policy: Some(AskForApproval::OnRequest), - approvals_reviewer: Some(ApprovalsReviewer::User), - display_label, - }) if profile_id == ":workspace" && display_label == "Ask for approval" - )); + assert!( + chat.try_select_permission_profile_by_id( + &Discovery::local(&chat.config), + ":ask-for-approval", + ) + ); + for event in events + .into_iter() + .chain(std::iter::from_fn(|| rx.try_recv().ok())) + { + assert!(matches!( + event, + AppEvent::SelectPermissionProfile(PermissionProfileSelection { + profile_id, + approval_policy: Some(AskForApproval::OnRequest), + approvals_reviewer: Some(ApprovalsReviewer::User), + display_label, + }) if profile_id == ":workspace" && display_label == "Ask for approval" + )); + } } #[tokio::test] @@ -397,15 +611,26 @@ async fn profile_permissions_selection_emits_auto_review_mode_event() { let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::>(); assert_eq!(events.len(), 1); - assert!(matches!( - &events[0], - AppEvent::SelectPermissionProfile(PermissionProfileSelection { - profile_id, - approval_policy: Some(AskForApproval::OnRequest), - approvals_reviewer: Some(ApprovalsReviewer::AutoReview), - display_label, - }) if profile_id == ":workspace" && display_label == "Approve for me" - )); + assert!( + chat.try_select_permission_profile_by_id( + &Discovery::local(&chat.config), + ":approve-for-me", + ) + ); + for event in events + .into_iter() + .chain(std::iter::from_fn(|| rx.try_recv().ok())) + { + assert!(matches!( + event, + AppEvent::SelectPermissionProfile(PermissionProfileSelection { + profile_id, + approval_policy: Some(AskForApproval::OnRequest), + approvals_reviewer: Some(ApprovalsReviewer::AutoReview), + display_label, + }) if profile_id == ":workspace" && display_label == "Approve for me" + )); + } } #[tokio::test] @@ -1199,7 +1424,7 @@ async fn permissions_selection_emits_history_cell_when_current_is_selected() { #[tokio::test] async fn permissions_selection_hides_auto_review_when_feature_disabled() { - let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; #[cfg(target_os = "windows")] { chat.set_windows_sandbox_mode(Some(WindowsSandboxSetupMode::Unelevated)); @@ -1212,6 +1437,14 @@ async fn permissions_selection_hides_auto_review_when_feature_disabled() { !popup.contains("Approve for me"), "expected Approve for me to stay hidden until the feature is enabled: {popup}" ); + assert!( + !chat.try_select_permission_profile_by_id( + &Discovery::local(&chat.config), + ":approve-for-me", + ) + ); + let cell = assert_matches!(rx.try_recv(), Ok(AppEvent::InsertHistoryCell(cell)) => cell); + insta::assert_snapshot!(lines_to_single_string(&cell.display_lines(/*width*/ 120)), @"■ Approve for me is unavailable. Run `/permissions` to see available profiles."); } #[tokio::test] diff --git a/codex-rs/tui/src/chatwidget/tests/slash_commands.rs b/codex-rs/tui/src/chatwidget/tests/slash_commands.rs index 49601e3ccd..38716fdeb9 100644 --- a/codex-rs/tui/src/chatwidget/tests/slash_commands.rs +++ b/codex-rs/tui/src/chatwidget/tests/slash_commands.rs @@ -456,7 +456,7 @@ async fn queued_slash_menu_cancel_drains_next_input() { ) .await; assert_cancelled_queued_menu_drains_next_input( - "/permissions", + "/permissions ", "Update Model Permissions", KeyEvent::new(KeyCode::Char('c'), KeyModifiers::CONTROL), ) diff --git a/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__permissions__permissions_command_disabled_profile.snap b/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__permissions__permissions_command_disabled_profile.snap new file mode 100644 index 0000000000..22e4146b3a --- /dev/null +++ b/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__permissions__permissions_command_disabled_profile.snap @@ -0,0 +1,6 @@ +--- +source: tui/src/chatwidget/tests/permissions.rs +assertion_line: 168 +expression: lines_to_single_string(&cell.display_lines(80)) +--- +■ Permission profile `:read-only` is unavailable: Disabled by requirements. diff --git a/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__permissions__permissions_command_unknown_profile.snap b/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__permissions__permissions_command_unknown_profile.snap new file mode 100644 index 0000000000..1835b5d3e9 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__permissions__permissions_command_unknown_profile.snap @@ -0,0 +1,5 @@ +--- +source: tui/src/chatwidget/tests/permissions.rs +expression: lines_to_single_string(&cell.display_lines(80)) +--- +■ Unknown permission profile `unknown-profile`. Run `/permissions` to see available profiles. diff --git a/codex-rs/tui/src/slash_command.rs b/codex-rs/tui/src/slash_command.rs index d7b0e99d06..223bd3048b 100644 --- a/codex-rs/tui/src/slash_command.rs +++ b/codex-rs/tui/src/slash_command.rs @@ -174,6 +174,7 @@ impl SlashCommand { self, SlashCommand::Review | SlashCommand::Model + | SlashCommand::Permissions | SlashCommand::Rename | SlashCommand::New | SlashCommand::Clear From 36803b180a50e611331b75ff2b4c475c02846b53 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 18:51:22 +0000 Subject: [PATCH 107/155] Allow saving current permission settings as presets (#54385) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Why Creating a preset from current settings only offered the model. Permission presets need to preserve the profile, approval policy, and reviewer to restore the same settings. ## What changed - Add a “Current permissions” option alongside “Current model” when creating a preset from settings. - Extend `/permissions` with `--approval-policy` and `--reviewer`, including granular policies and quoted profile names. - Share argument parsing between `/model` and `/permissions`, supporting quoted arguments and both `--setting=value` and `--setting value` forms. - Keep full-access confirmation for every reviewer and reject automatic review when unavailable. ## Testing Add parser tests, preset picker snapshots, and permission-selection tests covering complete settings restoration, invalid arguments, unavailable automatic review, and full-access confirmation. GitOrigin-RevId: f4c9c3f6e264ee8ea4c5244c79f39f2deb15b771 --- codex-rs/tui/src/app/event_dispatch.rs | 2 +- .../app/tests/permission_selection_tests.rs | 3 +- ...ults__session_only_model_confirmation.snap | 10 +- codex-rs/tui/src/app/tests/startup.rs | 3 +- codex-rs/tui/src/chatwidget.rs | 1 + codex-rs/tui/src/chatwidget/model_command.rs | 71 +++----- .../src/chatwidget/permission_discovery.rs | 84 ++++++++-- .../tui/src/chatwidget/permission_popups.rs | 3 +- .../tui/src/chatwidget/permissions_menu.rs | 40 +++-- codex-rs/tui/src/chatwidget/quick_dials.rs | 81 +++++++--- .../tui/src/chatwidget/slash_command_args.rs | 95 +++++++++++ .../chatwidget/slash_command_args_tests.rs | 62 +++++++ codex-rs/tui/src/chatwidget/slash_dispatch.rs | 2 +- ...dget__tests__saved_quick_dials_source.snap | 12 ++ ..._quick_dials_source_unavailable_model.snap | 13 ++ .../tui/src/chatwidget/tests/permissions.rs | 151 +++++++++++++++--- .../src/chatwidget/tests/quick_dials_tests.rs | 77 +++++++++ codex-rs/tui/src/tooltips/keybinding_tests.rs | 8 + 18 files changed, 583 insertions(+), 135 deletions(-) create mode 100644 codex-rs/tui/src/chatwidget/slash_command_args.rs create mode 100644 codex-rs/tui/src/chatwidget/slash_command_args_tests.rs create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source.snap create mode 100644 codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source_unavailable_model.snap diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs index b5a5acf0db..81b7718dfa 100644 --- a/codex-rs/tui/src/app/event_dispatch.rs +++ b/codex-rs/tui/src/app/event_dispatch.rs @@ -3236,7 +3236,7 @@ impl App { return Ok(AppRunControl::Continue); } self.chat_widget - .select_permission_profile_by_id(&profile_id); + .select_permission_profile(&profile_id); } AppEvent::OpenPermissionsPopup | AppEvent::OpenApprovalsPopup => { if self.reject_pending_permission_change() { diff --git a/codex-rs/tui/src/app/tests/permission_selection_tests.rs b/codex-rs/tui/src/app/tests/permission_selection_tests.rs index 79bf0cf638..077624d923 100644 --- a/codex-rs/tui/src/app/tests/permission_selection_tests.rs +++ b/codex-rs/tui/src/app/tests/permission_selection_tests.rs @@ -154,8 +154,7 @@ async fn inline_server_permission_selection_holds_queued_prompt_until_confirmati while events.try_recv().is_ok() {} while ops.try_recv().is_ok() {} - app.chat_widget - .select_permission_profile_by_id("server-only"); + app.chat_widget.select_permission_profile("server-only"); assert!(app.chat_widget.queue_user_message_with_options( crate::chatwidget::UserMessage::from("use the selected profile"), crate::bottom_pane::QueuedInputAction::Plain, diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__session_only_model_confirmation.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__session_only_model_confirmation.snap index e1960ed79f..bf2ac9d591 100644 --- a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__session_only_model_confirmation.snap +++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__session_only_model_confirmation.snap @@ -4,9 +4,9 @@ expression: "messages.join(\"\\n\")" --- • Model changed to gpt-5.6-terra high standard for this session only ■ Unexpected argument 'fast'. Use '--reasoning=' or '--speed='. -■ Unknown model setting '--speeed'. Expected '--reasoning=' or '--speed='. +■ Unknown command setting `--speeed`. ■ Reasoning level 'invalid' is unavailable for gpt-5.6-terra. Available: low, medium, high, xhigh, max, ultra. -■ Model setting '--speed' requires a value. -■ Model setting '--reasoning' requires a value. -■ Model setting '--reasoning' requires a value. -■ Model setting '--speed' was provided more than once. +■ Command setting `--speed` requires a value. +■ Command setting `--reasoning` requires a value. +■ Command setting `--reasoning` requires a value. +■ Command setting `--speed` was provided more than once. diff --git a/codex-rs/tui/src/app/tests/startup.rs b/codex-rs/tui/src/app/tests/startup.rs index a4c5a256a1..2cc4776903 100644 --- a/codex-rs/tui/src/app/tests/startup.rs +++ b/codex-rs/tui/src/app/tests/startup.rs @@ -148,8 +148,7 @@ async fn windows_sandbox_setup_completion_requires_matching_pending_mode() -> Re .expect("auto preset"); app.windows_sandbox.pending_setup = Some((WindowsSandboxEnableMode::Elevated, preset, None)); app.windows_sandbox.setup_started_at = Some(Instant::now()); - app.chat_widget - .select_permission_profile_by_id(":workspace"); + app.chat_widget.select_permission_profile(":workspace"); let AppEvent::FetchPermissionProfiles { request_id, .. } = events.try_recv()? else { panic!("expected profile discovery"); }; diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index f6d4c16260..0652fbd4f2 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -309,6 +309,7 @@ mod hooks; mod interaction; pub(crate) use interaction::KeyEventAction; mod skills; +mod slash_command_args; mod slash_dispatch; mod worktree_picker; use self::skills::collect_tool_mentions; diff --git a/codex-rs/tui/src/chatwidget/model_command.rs b/codex-rs/tui/src/chatwidget/model_command.rs index 9fa29504c0..0c7992b229 100644 --- a/codex-rs/tui/src/chatwidget/model_command.rs +++ b/codex-rs/tui/src/chatwidget/model_command.rs @@ -2,15 +2,16 @@ use super::ChatWidget; use super::session_model_selection::AstraModelPickerAction; +use super::slash_command_args; use codex_protocol::config_types::SERVICE_TIER_DEFAULT_REQUEST_VALUE; use codex_protocol::openai_models::ModelPreset; use codex_protocol::openai_models::ReasoningEffort; #[derive(Default)] -struct ModelCommandArgs<'a> { - model: Option<&'a str>, - effort: Option<&'a str>, - speed: Option<&'a str>, +struct ModelCommandArgs { + model: Option, + effort: Option, + speed: Option, } struct ModelCommand { @@ -19,62 +20,26 @@ struct ModelCommand { service_tier: Option, } -fn parse_model_command_args(args: &str) -> Result, String> { - let mut parsed = ModelCommandArgs::default(); - let mut words = args.split_whitespace().peekable(); - while let Some(word) = words.next() { - let (setting, inline_value) = word - .split_once('=') - .map_or((word, None), |(setting, value)| (setting, Some(value))); - match setting { - "--reasoning" => { - set_model_setting(&mut parsed.effort, setting, inline_value, &mut words)?; - } - "--speed" => { - set_model_setting(&mut parsed.speed, setting, inline_value, &mut words)?; - } - _ if word.starts_with("--") => { - return Err(format!( - "Unknown model setting '{setting}'. Expected '--reasoning=' or '--speed='." - )); - } - _ if parsed.model.replace(word).is_some() => { - return Err(format!( - "Unexpected argument '{word}'. Use '--reasoning=' or '--speed='." - )); - } - _ => {} - } - } - Ok(parsed) -} - -fn set_model_setting<'a>( - target: &mut Option<&'a str>, - setting: &str, - inline_value: Option<&'a str>, - words: &mut std::iter::Peekable>, -) -> Result<(), String> { - let value = match inline_value { - Some("") => None, - Some(value) => Some(value), - None => words.next_if(|word| !word.starts_with("--")), - } - .ok_or_else(|| format!("Model setting '{setting}' requires a value."))?; - if target.replace(value).is_some() { +fn parse_model_command_args(args: &str) -> Result { + let parsed = slash_command_args::parse(args, &["--reasoning", "--speed"], &[])?; + if let Some(unexpected) = parsed.positionals.get(1) { return Err(format!( - "Model setting '{setting}' was provided more than once." + "Unexpected argument '{unexpected}'. Use '--reasoning=' or '--speed='." )); } - Ok(()) + Ok(ModelCommandArgs { + model: parsed.positionals.first().cloned(), + effort: parsed.value("--reasoning").map(str::to_owned), + speed: parsed.value("--speed").map(str::to_owned), + }) } fn resolve_reasoning_effort( chat: &ChatWidget, - args: &ModelCommandArgs<'_>, + args: &ModelCommandArgs, model: &ModelPreset, ) -> Result { - let Some(effort) = args.effort else { + let Some(effort) = args.effort.as_deref() else { return Ok(if args.model.is_none() { chat.current_reasoning_effort() .unwrap_or_else(|| model.default_reasoning_effort.clone()) @@ -161,7 +126,7 @@ fn resolve_model_command(chat: &ChatWidget, args: &str) -> Result Result, + reviewer: Option, +} + +fn parse_approval_policy(value: &str) -> Result { + match value { + "untrusted" => Ok(AskForApproval::UnlessTrusted), + "on-request" => Ok(AskForApproval::OnRequest), + "never" => Ok(AskForApproval::Never), + value => serde_json::from_str(value).map_err(|_| { + format!( + "Unknown approval policy `{value}`. Expected `untrusted`, `on-request`, `never`, or a granular policy." + ) + }), + } +} + +fn parse_reviewer(value: &str) -> Result { + match value { + "user" => Ok(ApprovalsReviewer::User), + "auto_review" => Ok(ApprovalsReviewer::AutoReview), + value => Err(format!( + "Unknown permission reviewer `{value}`. Expected `user` or `auto_review`." + )), + } +} + +fn parse_permission_profile_args(args: &str) -> Result { + let parsed = slash_command_args::parse(args, &["--approval-policy", "--reviewer"], &[])?; + let profile_id = parsed.positionals.first().cloned().ok_or_else(|| { + "Usage: /permissions [--approval-policy=] [--reviewer=user|auto_review]" + .to_string() + })?; + if let Some(argument) = parsed.positionals.get(1) { + return Err(format!("Unexpected permission argument `{argument}`.")); + } + Ok(PermissionProfileArgs { + profile_id, + approval_policy: parsed + .value("--approval-policy") + .map(parse_approval_policy) + .transpose()?, + reviewer: parsed.value("--reviewer").map(parse_reviewer).transpose()?, + }) +} + impl ChatWidget { - pub(crate) fn select_permission_profile_by_id(&mut self, profile_id: &str) { + pub(crate) fn select_permission_profile(&mut self, args: &str) { + if let Err(message) = parse_permission_profile_args(args) { + self.add_error_message(message); + self.retain_input_after_failed_permission_selection(); + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + return; + } self.set_queue_autosend_suppressed(/*suppressed*/ true); self.inline_permission_profile_selection = Some( - InlinePermissionProfileSelection::Discovering(profile_id.to_string()), + InlinePermissionProfileSelection::Discovering(args.to_string()), ); if !self.apply_pending_permission_profile() { self.request_permission_profiles(); @@ -33,11 +88,20 @@ impl ChatWidget { let Some(discovery) = self.permission_discovery.clone() else { return false; }; - let Some(profile_id) = self.pending_permission_profile_id().map(str::to_owned) else { + let Some(args) = self.pending_permission_profile_args().map(str::to_owned) else { return false; }; + let Ok(args) = parse_permission_profile_args(&args) else { + self.recover_inline_permission_profile_selection(); + return true; + }; self.inline_permission_profile_selection = Some(InlinePermissionProfileSelection::Applying); - if !self.try_select_permission_profile_by_id(&discovery, &profile_id) { + if !self.try_select_permission_profile( + &discovery, + &args.profile_id, + args.approval_policy, + args.reviewer, + ) { self.recover_inline_permission_profile_selection(); } self.app_event_tx.send(AppEvent::SettingsSelectionClosed); @@ -45,7 +109,7 @@ impl ChatWidget { } pub(super) fn cancel_pending_permission_profile_selection(&mut self) -> bool { - if self.pending_permission_profile_id().is_none() { + if self.pending_permission_profile_args().is_none() { return false; } self.recover_inline_permission_profile_selection(); @@ -69,7 +133,7 @@ impl ChatWidget { self.inline_permission_profile_selection.is_some() } - fn pending_permission_profile_id(&self) -> Option<&str> { + fn pending_permission_profile_args(&self) -> Option<&str> { match self.inline_permission_profile_selection.as_ref() { Some(InlinePermissionProfileSelection::Discovering(profile_id)) => Some(profile_id), Some(InlinePermissionProfileSelection::Applying) | None => None, @@ -134,7 +198,7 @@ impl ChatWidget { return; } if let Err(message) = result - && self.pending_permission_profile_id().is_some() + && self.pending_permission_profile_args().is_some() { self.add_error_message(message); } @@ -149,7 +213,7 @@ impl ChatWidget { } } Err(message) => { - let retry_profile_id = self.pending_permission_profile_id().map(str::to_owned); + let retry_args = self.pending_permission_profile_args().map(str::to_owned); self.bottom_pane.show_selection_view(SelectionViewParams { view_id: Some(VIEW_ID), title: Some("Update Model Permissions".to_string()), @@ -157,8 +221,8 @@ impl ChatWidget { items: vec![SelectionItem { name: "Retry".to_string(), actions: vec![Box::new(move |tx| { - if let Some(profile_id) = retry_profile_id.clone() { - tx.send(AppEvent::ResolvePermissionProfile { profile_id }); + if let Some(args) = retry_args.clone() { + tx.send(AppEvent::ResolvePermissionProfile { profile_id: args }); } else { tx.send(AppEvent::OpenPermissionsPopup); } diff --git a/codex-rs/tui/src/chatwidget/permission_popups.rs b/codex-rs/tui/src/chatwidget/permission_popups.rs index 62877cfdf8..a91e85ce9f 100644 --- a/codex-rs/tui/src/chatwidget/permission_popups.rs +++ b/codex-rs/tui/src/chatwidget/permission_popups.rs @@ -337,8 +337,7 @@ impl ChatWidget { Self::permission_profile_selection_actions, ) }; - let requires_confirmation = - approvals_reviewer == ApprovalsReviewer::User && preset.id == "full-access"; + let requires_confirmation = preset.id == "full-access"; #[cfg(target_os = "windows")] if preset.id == "auto" && matches!( diff --git a/codex-rs/tui/src/chatwidget/permissions_menu.rs b/codex-rs/tui/src/chatwidget/permissions_menu.rs index eac72ab9fa..b6614dc81e 100644 --- a/codex-rs/tui/src/chatwidget/permissions_menu.rs +++ b/codex-rs/tui/src/chatwidget/permissions_menu.rs @@ -50,10 +50,12 @@ pub(crate) fn cyber_model_approval_reviewer(config: &Config) -> Option, + requested_reviewer: Option, ) -> bool { let reviewer = match profile_id { ":approve-for-me" if !self.config.features.enabled(Feature::GuardianApproval) => { @@ -83,10 +85,21 @@ impl ChatWidget { let preset = builtin_approval_presets() .into_iter() .find(|preset| preset.active_permission_profile.id == profile_id); - let approval_policy = preset - .as_ref() - .map(|preset| AskForApproval::from(preset.approval)); - let approvals_reviewer = preset.as_ref().map(|_| reviewer); + let approval_policy = requested_approval_policy.or_else(|| { + preset + .as_ref() + .map(|preset| AskForApproval::from(preset.approval)) + }); + let approvals_reviewer = requested_reviewer.or_else(|| preset.as_ref().map(|_| reviewer)); + if approvals_reviewer == Some(ApprovalsReviewer::AutoReview) + && !self.config.features.enabled(Feature::GuardianApproval) + { + self.add_error_message( + "Approve for me is unavailable. Run `/permissions` to see available profiles." + .into(), + ); + return false; + } if let Some(reason) = discovery.disabled_reason( profile_id, approval_policy, @@ -97,14 +110,13 @@ impl ChatWidget { )); return false; } - let display_label = - preset - .as_ref() - .map_or(profile.id.as_str(), |preset| match (preset.id, reviewer) { - ("auto", ApprovalsReviewer::AutoReview) => APPROVE_FOR_ME_LABEL, - ("auto", ApprovalsReviewer::User) => ASK_FOR_APPROVAL_LABEL, - _ => preset.label, - }); + let display_label = preset.as_ref().map_or(profile.id.as_str(), |preset| { + match (preset.id, approvals_reviewer) { + ("auto", Some(ApprovalsReviewer::AutoReview)) => APPROVE_FOR_ME_LABEL, + ("auto", _) => ASK_FOR_APPROVAL_LABEL, + _ => preset.label, + } + }); let selection = PermissionProfileSelection { profile_id: profile_id.to_string(), approval_policy, @@ -116,7 +128,7 @@ impl ChatWidget { .permission_mode_actions( &preset, display_label.to_string(), - reviewer, + approvals_reviewer.unwrap_or(reviewer), /*profile_selection*/ Some(selection), /*return_to_permissions*/ true, ) diff --git a/codex-rs/tui/src/chatwidget/quick_dials.rs b/codex-rs/tui/src/chatwidget/quick_dials.rs index 68bf5e1b2d..0414299f7d 100644 --- a/codex-rs/tui/src/chatwidget/quick_dials.rs +++ b/codex-rs/tui/src/chatwidget/quick_dials.rs @@ -351,36 +351,73 @@ impl ChatWidget { self.defer_input_until_settings_applied(); } - fn open_quick_dial_prefills(&mut self) { + pub(super) fn open_quick_dial_prefills(&mut self) { if !self.quick_dials_available() { return; } - let model = self.current_model_quick_dial(); - let (description, is_disabled, actions) = match model { - Ok(dial) => { - let description = Some(dial.input.clone()); - let actions = vec![Box::new(move |tx: &AppEventSender| { - tx.send(AppEvent::OpenQuickDialEditor { - target: QuickDialEditorTarget::PickSlot, - dial: Some(dial.clone()), - }) - }) as SelectionAction]; - (description, false, actions) - } - Err(reason) => (Some(reason.into()), true, Vec::new()), - }; - self.bottom_pane.show_selection_view(SelectionViewParams { - view_id: Some("quick-dial-prefills"), - max_visible_rows: 1, - title: Some("Start preset from current settings".into()), - items: vec![SelectionItem { - name: "Current model".into(), + let permissions = self + .config + .permissions + .active_permission_profile() + .map(|profile| -> Result { + let approval_policy = + AskForApproval::from(self.config.permissions.approval_policy.value()); + let approval_policy = match approval_policy { + AskForApproval::UnlessTrusted => "untrusted".to_string(), + AskForApproval::OnRequest => "on-request".to_string(), + AskForApproval::Never => "never".to_string(), + granular @ AskForApproval::Granular { .. } => serde_json::to_string(&granular) + .map_err(|_| "The approval policy cannot be recalled.")?, + }; + let profile_id = shlex::try_quote(&profile.id) + .map_err(|_| "The permission profile name cannot be recalled.")?; + let approval_policy = shlex::try_quote(&approval_policy) + .map_err(|_| "The approval policy cannot be recalled.")?; + let input = format!( + "/permissions {profile_id} --approval-policy={approval_policy} --reviewer={}", + self.config.approvals_reviewer + ); + let dial = QuickDial { input, label: None }; + dial.validate()?; + Ok(dial) + }) + .unwrap_or(Err( + "Select a named permission profile with /permissions first.", + )); + let items = [ + ("Current model", self.current_model_quick_dial()), + ("Current permissions", permissions), + ] + .into_iter() + .map(|(name, dial)| { + let (description, is_disabled, actions) = match dial { + Ok(dial) => { + let description = Some(dial.input.clone()); + let actions = vec![Box::new(move |tx: &AppEventSender| { + tx.send(AppEvent::OpenQuickDialEditor { + target: QuickDialEditorTarget::PickSlot, + dial: Some(dial.clone()), + }) + }) as SelectionAction]; + (description, false, actions) + } + Err(reason) => (Some(reason.into()), true, Vec::new()), + }; + SelectionItem { + name: name.into(), description, is_disabled, actions, dismiss_parent_on_child_accept: true, ..Default::default() - }], + } + }) + .collect(); + self.bottom_pane.show_selection_view(SelectionViewParams { + view_id: Some("quick-dial-prefills"), + max_visible_rows: 2, + title: Some("Start preset from current settings".into()), + items, ..SelectionViewParams::picker() }); self.defer_input_until_settings_applied(); diff --git a/codex-rs/tui/src/chatwidget/slash_command_args.rs b/codex-rs/tui/src/chatwidget/slash_command_args.rs new file mode 100644 index 0000000000..fa4ac26df6 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/slash_command_args.rs @@ -0,0 +1,95 @@ +//! Shared tokenization for slash commands with positional arguments and named settings. +//! +//! Values may follow their setting or use `=`, while switches never consume a value. A bare `--` +//! leaves all remaining tokens positional. + +#[derive(Debug, Default, PartialEq, Eq)] +pub(super) struct ParsedCommandArgs { + pub(super) positionals: Vec, + named: Vec, +} + +#[derive(Debug, PartialEq, Eq)] +struct NamedArgument { + name: String, + value: Option, +} + +impl ParsedCommandArgs { + pub(super) fn value(&self, name: &str) -> Option<&str> { + self.named + .iter() + .find(|argument| argument.name == name) + .and_then(|argument| argument.value.as_deref()) + } +} + +pub(super) fn parse( + args: &str, + value_settings: &[&str], + switches: &[&str], +) -> Result { + let mut words = shlex::split(args) + .ok_or_else(|| "Invalid command arguments. Check the quoting.".to_string())? + .into_iter() + .peekable(); + let mut parsed = ParsedCommandArgs::default(); + let mut parse_settings = true; + while let Some(word) = words.next() { + if parse_settings && word == "--" { + parse_settings = false; + } else if parse_settings && word.starts_with("--") { + let argument = parse_named_argument(&word, &mut words, value_settings, switches)?; + if parsed + .named + .iter() + .any(|existing| existing.name == argument.name) + { + return Err(format!( + "Command setting `{}` was provided more than once.", + argument.name + )); + } + parsed.named.push(argument); + } else { + parsed.positionals.push(word); + } + } + Ok(parsed) +} + +fn parse_named_argument( + word: &str, + words: &mut std::iter::Peekable>, + value_settings: &[&str], + switches: &[&str], +) -> Result { + let (name, inline_value) = word + .split_once('=') + .map_or((word, None), |(name, value)| (name, Some(value))); + if value_settings.contains(&name) { + let value = inline_value + .filter(|value| !value.is_empty()) + .map(str::to_owned) + .or_else(|| words.next_if(|value| !value.starts_with("--"))) + .ok_or_else(|| format!("Command setting `{name}` requires a value."))?; + return Ok(NamedArgument { + name: name.to_string(), + value: Some(value), + }); + } + if switches.contains(&name) { + if inline_value.is_some() { + return Err(format!("Command setting `{name}` does not take a value.")); + } + return Ok(NamedArgument { + name: name.to_string(), + value: None, + }); + } + Err(format!("Unknown command setting `{name}`.")) +} + +#[cfg(test)] +#[path = "slash_command_args_tests.rs"] +mod tests; diff --git a/codex-rs/tui/src/chatwidget/slash_command_args_tests.rs b/codex-rs/tui/src/chatwidget/slash_command_args_tests.rs new file mode 100644 index 0000000000..f413bba636 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/slash_command_args_tests.rs @@ -0,0 +1,62 @@ +use super::*; +use pretty_assertions::assert_eq; + +#[test] +fn parses_positional_values_switches_and_quoted_arguments() { + let parsed = parse( + "'team review' item --reviewer user --speed=fast --clear -- --literal", + &["--reviewer", "--speed"], + &["--clear"], + ) + .expect("valid command arguments"); + + assert_eq!( + parsed, + ParsedCommandArgs { + positionals: vec!["team review".into(), "item".into(), "--literal".into()], + named: vec![ + NamedArgument { + name: "--reviewer".into(), + value: Some("user".into()), + }, + NamedArgument { + name: "--speed".into(), + value: Some("fast".into()), + }, + NamedArgument { + name: "--clear".into(), + value: None, + }, + ], + } + ); + assert_eq!(parsed.value("--reviewer"), Some("user")); +} + +#[test] +fn rejects_invalid_named_arguments() { + for (args, expected) in [ + ( + "--reviewer", + "Command setting `--reviewer` requires a value.", + ), + ( + "--clear=yes", + "Command setting `--clear` does not take a value.", + ), + ( + "--clear --clear", + "Command setting `--clear` was provided more than once.", + ), + ("--unknown", "Unknown command setting `--unknown`."), + ( + "'unfinished", + "Invalid command arguments. Check the quoting.", + ), + ] { + assert_eq!( + parse(args, &["--reviewer"], &["--clear"]), + Err(expected.to_string()) + ); + } +} diff --git a/codex-rs/tui/src/chatwidget/slash_dispatch.rs b/codex-rs/tui/src/chatwidget/slash_dispatch.rs index 1ec8e08fa4..8977c41642 100644 --- a/codex-rs/tui/src/chatwidget/slash_dispatch.rs +++ b/codex-rs/tui/src/chatwidget/slash_dispatch.rs @@ -825,7 +825,7 @@ impl ChatWidget { profile_id: trimmed.to_string(), }); } - SlashCommand::Permissions => self.select_permission_profile_by_id(trimmed), + SlashCommand::Permissions => self.select_permission_profile(trimmed), SlashCommand::Export => { self.set_queue_autosend_suppressed(/*suppressed*/ true); self.app_event_tx.send(AppEvent::ExportTranscript { diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source.snap new file mode 100644 index 0000000000..c07269a2f4 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source.snap @@ -0,0 +1,12 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 80)" +--- + Start preset from current settings + + +› 1. Current model /model gpt-5.5 --speed=standard + 2. Current permissions /permissions :workspace --approval-policy=on-request + --reviewer=user + + enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source_unavailable_model.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source_unavailable_model.snap new file mode 100644 index 0000000000..5e0df09238 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source_unavailable_model.snap @@ -0,0 +1,13 @@ +--- +source: tui/src/chatwidget/tests/quick_dials_tests.rs +expression: "render_bottom_popup(&chat, 80)" +--- + Start preset from current settings + + + Current model Choose an available reasoning effort with /model + before saving. +› 1. Current permissions /permissions :workspace --approval-policy=on-request + --reviewer=auto_review + + enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/tests/permissions.rs b/codex-rs/tui/src/chatwidget/tests/permissions.rs index 221c58e3cb..edc6565840 100644 --- a/codex-rs/tui/src/chatwidget/tests/permissions.rs +++ b/codex-rs/tui/src/chatwidget/tests/permissions.rs @@ -92,7 +92,7 @@ async fn permission_discovery_uses_server_catalog_for_remote_custom_selection() async fn permissions_command_waits_for_covering_modal_before_selecting_profile() { let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; chat.thread_id = Some(ThreadId::new()); - chat.select_permission_profile_by_id(BUILT_IN_PERMISSION_PROFILE_READ_ONLY); + chat.select_permission_profile(BUILT_IN_PERMISSION_PROFILE_READ_ONLY); let request_id = assert_matches!( events.try_recv(), Ok(AppEvent::FetchPermissionProfiles { request_id, .. }) => request_id @@ -125,7 +125,7 @@ async fn cancelled_permissions_command_does_not_apply_after_later_modal() { chat.input_queue .queued_user_messages .push_back(UserMessage::from("follow-up").into()); - chat.select_permission_profile_by_id(BUILT_IN_PERMISSION_PROFILE_READ_ONLY); + chat.select_permission_profile(BUILT_IN_PERMISSION_PROFILE_READ_ONLY); let request_id = assert_matches!( events.try_recv(), Ok(AppEvent::FetchPermissionProfiles { request_id, .. }) => request_id @@ -153,6 +153,7 @@ async fn cancelled_permissions_command_does_not_apply_after_later_modal() { async fn permissions_command_preserves_full_access_confirmation() { let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; chat.thread_id = Some(ThreadId::new()); + chat.set_feature_enabled(Feature::GuardianApproval, /*enabled*/ true); chat.permission_discovery = Some(Discovery::local(&chat.config)); chat.input_queue .queued_user_messages @@ -160,7 +161,7 @@ async fn permissions_command_preserves_full_access_confirmation() { chat.dispatch_command_with_args( SlashCommand::Permissions, - BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS.to_string(), + format!("{BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS} --reviewer=auto_review"), Vec::new(), ); @@ -172,6 +173,7 @@ async fn permissions_command_preserves_full_access_confirmation() { profile_selection: Some(profile_selection), }) if preset.id == "full-access" && profile_selection.profile_id == BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS + && profile_selection.approvals_reviewer == Some(ApprovalsReviewer::AutoReview) => (preset, return_to_permissions, Some(profile_selection)) ); assert_matches!(events.try_recv(), Ok(AppEvent::SettingsSelectionClosed)); @@ -249,7 +251,7 @@ async fn invalidating_inline_permission_discovery_recovers_queued_input() { chat.input_queue .queued_user_messages .push_back(UserMessage::from("follow-up").into()); - chat.select_permission_profile_by_id(BUILT_IN_PERMISSION_PROFILE_READ_ONLY); + chat.select_permission_profile(BUILT_IN_PERMISSION_PROFILE_READ_ONLY); let request_id = assert_matches!( events.try_recv(), Ok(AppEvent::FetchPermissionProfiles { request_id, .. }) => request_id @@ -267,7 +269,7 @@ async fn invalidating_inline_permission_discovery_recovers_queued_input() { async fn inline_permission_discovery_retry_preserves_profile_id() { let (mut chat, mut events, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; chat.thread_id = Some(ThreadId::new()); - chat.select_permission_profile_by_id("server-only"); + chat.select_permission_profile("server-only"); let request_id = assert_matches!( events.try_recv(), Ok(AppEvent::FetchPermissionProfiles { request_id, .. }) => request_id @@ -534,12 +536,12 @@ async fn profile_permissions_selection_emits_named_profile_event_only() { let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::>(); assert_eq!(events.len(), 1); - assert!( - chat.try_select_permission_profile_by_id( - &Discovery::local(&chat.config), - ":ask-for-approval", - ) - ); + assert!(chat.try_select_permission_profile( + &Discovery::local(&chat.config), + ":ask-for-approval", + /*requested_approval_policy*/ None, + /*requested_reviewer*/ None, + )); for event in events .into_iter() .chain(std::iter::from_fn(|| rx.try_recv().ok())) @@ -611,12 +613,12 @@ async fn profile_permissions_selection_emits_auto_review_mode_event() { let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::>(); assert_eq!(events.len(), 1); - assert!( - chat.try_select_permission_profile_by_id( - &Discovery::local(&chat.config), - ":approve-for-me", - ) - ); + assert!(chat.try_select_permission_profile( + &Discovery::local(&chat.config), + ":approve-for-me", + /*requested_approval_policy*/ None, + /*requested_reviewer*/ None, + )); for event in events .into_iter() .chain(std::iter::from_fn(|| rx.try_recv().ok())) @@ -633,6 +635,109 @@ async fn profile_permissions_selection_emits_auto_review_mode_event() { } } +#[tokio::test] +async fn permissions_command_selects_auto_review_mode() { + let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + #[cfg(target_os = "windows")] + { + chat.set_windows_sandbox_mode(Some(WindowsSandboxSetupMode::Unelevated)); + } + chat.config.explicit_permission_profile_mode = true; + chat.set_feature_enabled(Feature::GuardianApproval, /*enabled*/ true); + chat.permission_discovery = Some(Discovery::local(&chat.config)); + + chat.select_permission_profile( + ":workspace --approval-policy on-request --reviewer auto_review", + ); + + assert_matches!( + rx.try_recv(), + Ok(AppEvent::SelectPermissionProfile(PermissionProfileSelection { + profile_id, + approval_policy: Some(AskForApproval::OnRequest), + approvals_reviewer: Some(ApprovalsReviewer::AutoReview), + display_label, + })) if profile_id == ":workspace" && display_label == "Approve for me" + ); +} + +#[tokio::test] +async fn permissions_command_restores_quoted_profile_and_complete_settings() { + let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + let granular = AskForApproval::Granular { + sandbox_approval: false, + rules: true, + skill_approval: false, + request_permissions: true, + mcp_elicitations: false, + }; + chat.config.custom_permission_profiles = vec![PermissionProfileCatalogEntry { + id: "team review".to_string(), + description: None, + allowed: true, + }]; + chat.permission_discovery = Some(Discovery::local(&chat.config)); + let policy = serde_json::to_string(&granular).expect("granular policy serializes"); + + chat.select_permission_profile(&format!( + "'team review' --approval-policy='{policy}' --reviewer user" + )); + + assert_matches!( + rx.try_recv(), + Ok(AppEvent::SelectPermissionProfile(PermissionProfileSelection { + profile_id, + approval_policy: Some(actual_policy), + approvals_reviewer: Some(ApprovalsReviewer::User), + display_label, + })) if profile_id == "team review" + && display_label == "team review" + && actual_policy == granular + ); +} + +#[tokio::test] +async fn permissions_command_rejects_unavailable_auto_review_and_settles_input() { + let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + chat.set_feature_enabled(Feature::GuardianApproval, /*enabled*/ false); + chat.permission_discovery = Some(Discovery::local(&chat.config)); + chat.input_queue + .queued_user_messages + .push_back(UserMessage::from("follow-up").into()); + + chat.select_permission_profile(":workspace --reviewer=auto_review"); + + let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::>(); + assert!( + events + .iter() + .all(|event| !matches!(event, AppEvent::SelectPermissionProfile(_))) + ); + assert!( + events + .iter() + .any(|event| matches!(event, AppEvent::SettingsSelectionClosed)) + ); + assert!(chat.input_queue.recovered_queue); +} + +#[tokio::test] +async fn invalid_permissions_arguments_settle_suppressed_input() { + let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; + chat.input_queue + .queued_user_messages + .push_back(UserMessage::from("follow-up").into()); + chat.set_queue_autosend_suppressed(/*suppressed*/ true); + + chat.select_permission_profile(":workspace --reviewer=bogus"); + + assert!(chat.input_queue.recovered_queue); + assert!( + std::iter::from_fn(|| rx.try_recv().ok()) + .any(|event| matches!(event, AppEvent::SettingsSelectionClosed)) + ); +} + #[tokio::test] async fn profile_permissions_full_access_always_opens_confirmation() { let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; @@ -1437,12 +1542,12 @@ async fn permissions_selection_hides_auto_review_when_feature_disabled() { !popup.contains("Approve for me"), "expected Approve for me to stay hidden until the feature is enabled: {popup}" ); - assert!( - !chat.try_select_permission_profile_by_id( - &Discovery::local(&chat.config), - ":approve-for-me", - ) - ); + assert!(!chat.try_select_permission_profile( + &Discovery::local(&chat.config), + ":approve-for-me", + /*requested_approval_policy*/ None, + /*requested_reviewer*/ None, + )); let cell = assert_matches!(rx.try_recv(), Ok(AppEvent::InsertHistoryCell(cell)) => cell); insta::assert_snapshot!(lines_to_single_string(&cell.display_lines(/*width*/ 120)), @"■ Approve for me is unavailable. Run `/permissions` to see available profiles."); } diff --git a/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs b/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs index 014e2c0ee1..23e278edbf 100644 --- a/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs +++ b/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs @@ -4,6 +4,83 @@ use super::*; use crate::chatwidget::quick_dials::QuickDialEditorTarget; use codex_config::types::QuickDial; +#[tokio::test] +async fn current_settings_offer_model_and_permissions() { + let (mut chat, mut events, _ops) = + make_chatwidget_manual(/*model_override*/ Some("gpt-5.5")).await; + chat.thread_id = Some(ThreadId::new()); + chat.set_permission_profile_from_session_snapshot(PermissionProfileSnapshot::active( + PermissionProfile::workspace_write(), + ActivePermissionProfile::new(":workspace"), + )) + .unwrap(); + + chat.open_quick_dial_prefills(); + + assert_chatwidget_snapshot!( + "saved_quick_dials_source", + render_bottom_popup(&chat, /*width*/ 80) + ); + chat.handle_key_event(KeyCode::Down.into()); + chat.handle_key_event(KeyCode::Enter.into()); + assert_matches!( + events.try_recv(), + Ok(AppEvent::OpenQuickDialEditor { + target: QuickDialEditorTarget::PickSlot, + dial: Some(QuickDial { input, label: None }), + }) if input == "/permissions :workspace --approval-policy=on-request --reviewer=user" + ); + + chat.set_reasoning_effort(Some(ReasoningEffortConfig::Custom("removed-effort".into()))); + chat.config.approvals_reviewer = ApprovalsReviewer::AutoReview; + chat.open_quick_dial_prefills(); + assert_chatwidget_snapshot!( + "saved_quick_dials_source_unavailable_model", + render_bottom_popup(&chat, /*width*/ 80) + ); + chat.handle_key_event(KeyCode::Down.into()); + chat.handle_key_event(KeyCode::Enter.into()); + assert_matches!( + events.try_recv(), + Ok(AppEvent::OpenQuickDialEditor { + target: QuickDialEditorTarget::PickSlot, + dial: Some(QuickDial { input, label: None }), + }) if input == "/permissions :workspace --approval-policy=on-request --reviewer=auto_review" + ); + + let granular = AskForApproval::Granular { + sandbox_approval: false, + rules: true, + skill_approval: false, + request_permissions: true, + mcp_elicitations: false, + }; + chat.config + .permissions + .approval_policy + .set(granular.to_core()) + .expect("set granular approval policy"); + chat.config.approvals_reviewer = ApprovalsReviewer::User; + chat.set_permission_profile_from_session_snapshot(PermissionProfileSnapshot::active( + PermissionProfile::workspace_write(), + ActivePermissionProfile::new("team review"), + )) + .expect("set named permission profile"); + chat.open_quick_dial_prefills(); + chat.handle_key_event(KeyCode::Down.into()); + chat.handle_key_event(KeyCode::Enter.into()); + let policy = serde_json::to_string(&granular).expect("granular policy serializes"); + assert_matches!( + events.try_recv(), + Ok(AppEvent::OpenQuickDialEditor { + target: QuickDialEditorTarget::PickSlot, + dial: Some(QuickDial { input, label: None }), + }) if input == format!( + "/permissions 'team review' --approval-policy='{policy}' --reviewer=user" + ) + ); +} + #[tokio::test] async fn saved_quick_dials_save_and_clear_picker_snapshots() { const DRAFT: &str = "Review the current changes\nfor safety "; diff --git a/codex-rs/tui/src/tooltips/keybinding_tests.rs b/codex-rs/tui/src/tooltips/keybinding_tests.rs index 5b8a549f56..c77371bfed 100644 --- a/codex-rs/tui/src/tooltips/keybinding_tests.rs +++ b/codex-rs/tui/src/tooltips/keybinding_tests.rs @@ -40,6 +40,14 @@ fn configured_shortcut_tips_render_at_narrow_width() { lines.push("".into()); } } + // This snapshot owns the preset hint's content and layout; Markdown tests own the + // terminal-default foreground applied to the shared "Tip:" prefix. + for line in lines + .iter_mut() + .filter(|line| line.to_string().contains("then 0–9")) + { + line.spans[0].style.fg = None; + } insta::assert_snapshot!( lines .iter() From 141bf7680d7721ba8271b91473323fb6b58ebdd0 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 18:51:23 +0000 Subject: [PATCH 108/155] Add session-only arguments to `/title` and `/statusline` (#54387) ## What changed Allow inline item selection, such as `/title model reasoning` and `/statusline current-dir --no-colors`, without changing saved defaults. Support `--clear` for both commands and `--colors` or `--no-colors` for `/statusline`, including color-only updates that preserve the current items. Carry overrides with per-thread input state across navigation and reconnects, and allow these local commands in parent-owned subagent threads. Reject invalid or conflicting arguments before applying changes. Saved editor selections supersede the corresponding overrides. ## Testing Add coverage for argument parsing, atomic updates, rate-limit item aliases and ambiguity, thread-state restoration, saved-setting interactions, and local command submission in parent-owned threads. GitOrigin-RevId: 909cc2ede026fbf5c7f9cd52c8cf2ae835084f14 --- codex-rs/tui/src/bottom_pane/chat_composer.rs | 11 +- .../chat_composer/agents_navigation_tests.rs | 17 +- codex-rs/tui/src/chatwidget.rs | 4 + codex-rs/tui/src/chatwidget/config_panel.rs | 4 +- codex-rs/tui/src/chatwidget/constructor.rs | 1 + codex-rs/tui/src/chatwidget/input_restore.rs | 2 + codex-rs/tui/src/chatwidget/model_command.rs | 2 +- .../src/chatwidget/permission_discovery.rs | 2 +- .../tui/src/chatwidget/slash_command_args.rs | 79 +++++- .../chatwidget/slash_command_args_tests.rs | 21 +- codex-rs/tui/src/chatwidget/slash_dispatch.rs | 8 + .../tui/src/chatwidget/status_controls.rs | 3 + .../src/chatwidget/status_surface_commands.rs | 160 ++++++++++++ codex-rs/tui/src/chatwidget/tests.rs | 2 + .../chatwidget/tests/composer_submission.rs | 1 + .../tui/src/chatwidget/tests/review_mode.rs | 1 + .../tests/status_surface_command_tests.rs | 227 ++++++++++++++++++ .../tests/status_surface_previews.rs | 2 +- codex-rs/tui/src/chatwidget/user_messages.rs | 2 + codex-rs/tui/src/slash_command.rs | 2 + 20 files changed, 527 insertions(+), 24 deletions(-) create mode 100644 codex-rs/tui/src/chatwidget/status_surface_commands.rs create mode 100644 codex-rs/tui/src/chatwidget/tests/status_surface_command_tests.rs diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs index 970234f5be..49b13b5360 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs @@ -157,8 +157,8 @@ //! Parent-owned subagent threads keep the draft editable while blocking agent-directed submission. //! On the `Enter` and `Tab` submission paths, normal prompts, disallowed slash commands, and `!` //! shell commands return `ParentOwnedInputBlocked` without clearing the draft. Bare local and -//! navigation slash commands remain available so users can leave or manage the view. Transcript -//! exports also remain available, including an explicit destination filename. +//! navigation slash commands remain available so users can leave or manage the view. +//! Exports and local display commands (`/title` and `/statusline`) also accept arguments. //! //! During reconnection, `handle_restricted_key` edits the draft directly without popup dispatch, //! composer shortcuts, or submission; `?` becomes literal input. Enter and Tab leave the draft @@ -489,7 +489,10 @@ pub enum InputResult { } fn parent_owned_command_is_allowed(command: SlashCommand, args: &str) -> bool { - if command == SlashCommand::Export { + if matches!( + command, + SlashCommand::Export | SlashCommand::Title | SlashCommand::Statusline + ) { return true; } @@ -527,8 +530,6 @@ fn parent_owned_command_is_allowed(command: SlashCommand, args: &str) -> bool { | SlashCommand::Usage | SlashCommand::Ide | SlashCommand::DebugConfig - | SlashCommand::Title - | SlashCommand::Statusline | SlashCommand::Theme | SlashCommand::Pets | SlashCommand::Ps diff --git a/codex-rs/tui/src/bottom_pane/chat_composer/agents_navigation_tests.rs b/codex-rs/tui/src/bottom_pane/chat_composer/agents_navigation_tests.rs index b96020995a..83c68ab9f2 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer/agents_navigation_tests.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer/agents_navigation_tests.rs @@ -6,7 +6,7 @@ use assert_matches::assert_matches; use pretty_assertions::assert_eq; #[test] -fn parent_owned_thread_allows_bare_navigation_commands() { +fn parent_owned_thread_allows_local_commands() { for (command, expected) in [ ("/agents", SlashCommand::Agents), ("/subagents", SlashCommand::MultiAgents), @@ -25,6 +25,21 @@ fn parent_owned_thread_allows_bare_navigation_commands() { InputResult::Command(expected) ); } + + for (command, args) in [ + (SlashCommand::Title, "model"), + (SlashCommand::Statusline, "model --no-colors"), + ] { + let (mut composer, _rx) = new_test_composer(); + composer.set_parent_owned_thread(); + let name = command.command(); + composer.set_text_content(format!("/{name} {args}"), Vec::new(), Vec::new()); + + assert_eq!( + composer.handle_key_event(KeyCode::Enter.into()).0, + InputResult::CommandWithArgs(command, args.into(), Vec::new()) + ); + } } #[test] diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index 0652fbd4f2..da3d310f27 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -390,7 +390,9 @@ use self::status_state::StatusIndicatorState; use self::status_state::StatusState; use self::status_state::TerminalTitleStatusKind; mod status_controls; +mod status_surface_commands; mod status_surfaces; +use self::status_surface_commands::StatusSurfaceOverrides; mod streaming; use self::status_surfaces::CachedProjectRootName; mod thread_title_status; @@ -750,6 +752,8 @@ pub(crate) struct ChatWidget { // On cancel or persist-failure the inner value is restored to config; // on confirm the outer is set to `None` to end the session. terminal_title_setup_original_items: Option>>, + // Explicit per-thread layout choices made through `/title` and `/statusline`. + status_surface_overrides: StatusSurfaceOverrides, // Baseline instant used to animate spinner-prefixed title statuses. terminal_title_animation_origin: Instant, // The foreground loop refreshes the title at this deadline without drawing a frame. diff --git a/codex-rs/tui/src/chatwidget/config_panel.rs b/codex-rs/tui/src/chatwidget/config_panel.rs index ea8cd8c7a5..444b2a7106 100644 --- a/codex-rs/tui/src/chatwidget/config_panel.rs +++ b/codex-rs/tui/src/chatwidget/config_panel.rs @@ -99,11 +99,13 @@ impl ChatWidget { ConfigToggle::PasteDetection => self.bottom_pane.set_disable_paste_burst( /*disabled*/ tui.disable_paste_burst.unwrap_or(/*default*/ false), ), + ConfigToggle::StatusLineColors => { + self.status_surface_overrides.status_line_use_colors = None; + } ConfigToggle::AutomaticRecaps | ConfigToggle::CopyOnSelectClearSelection | ConfigToggle::Notifications | ConfigToggle::StartInVimMode - | ConfigToggle::StatusLineColors | ConfigToggle::Tips => {} } if setting == ConfigToggle::Animations diff --git a/codex-rs/tui/src/chatwidget/constructor.rs b/codex-rs/tui/src/chatwidget/constructor.rs index b0a12a3d26..8ef50403dd 100644 --- a/codex-rs/tui/src/chatwidget/constructor.rs +++ b/codex-rs/tui/src/chatwidget/constructor.rs @@ -270,6 +270,7 @@ impl ChatWidget { last_terminal_title: None, last_terminal_title_requires_action: false, terminal_title_setup_original_items: None, + status_surface_overrides: StatusSurfaceOverrides::default(), terminal_title_animation_origin: Instant::now(), terminal_title_next_refresh: None, status_line_project_root_name_cache: None, diff --git a/codex-rs/tui/src/chatwidget/input_restore.rs b/codex-rs/tui/src/chatwidget/input_restore.rs index 086aa4ac1e..1f21ca9a7a 100644 --- a/codex-rs/tui/src/chatwidget/input_restore.rs +++ b/codex-rs/tui/src/chatwidget/input_restore.rs @@ -598,6 +598,7 @@ impl ChatWidget { current_collaboration_mode: self.current_collaboration_mode.clone(), active_collaboration_mask: self.active_collaboration_mask.clone(), plan_mode_reasoning_effort: self.config.plan_mode_reasoning_effort.clone(), + status_surface_overrides: self.status_surface_overrides.clone(), task_running: self.bottom_pane.is_task_running(), agent_turn_running: self.turn_lifecycle.agent_turn_running, }) @@ -617,6 +618,7 @@ impl ChatWidget { self.current_collaboration_mode = input_state.current_collaboration_mode; self.active_collaboration_mask = input_state.active_collaboration_mask; self.config.plan_mode_reasoning_effort = input_state.plan_mode_reasoning_effort; + self.restore_status_surface_overrides(input_state.status_surface_overrides); self.safety_buffering_prompt = input_state.safety_buffering_prompt; self.safety_buffering_source = input_state.safety_buffering_source; self.turn_lifecycle.restore_running( diff --git a/codex-rs/tui/src/chatwidget/model_command.rs b/codex-rs/tui/src/chatwidget/model_command.rs index 0c7992b229..bde9ce72ee 100644 --- a/codex-rs/tui/src/chatwidget/model_command.rs +++ b/codex-rs/tui/src/chatwidget/model_command.rs @@ -21,7 +21,7 @@ struct ModelCommand { } fn parse_model_command_args(args: &str) -> Result { - let parsed = slash_command_args::parse(args, &["--reasoning", "--speed"], &[])?; + let parsed = slash_command_args::parse(args, &["--reasoning", "--speed"], &[], &[])?; if let Some(unexpected) = parsed.positionals.get(1) { return Err(format!( "Unexpected argument '{unexpected}'. Use '--reasoning=' or '--speed='." diff --git a/codex-rs/tui/src/chatwidget/permission_discovery.rs b/codex-rs/tui/src/chatwidget/permission_discovery.rs index 01e964e7fb..343186d0af 100644 --- a/codex-rs/tui/src/chatwidget/permission_discovery.rs +++ b/codex-rs/tui/src/chatwidget/permission_discovery.rs @@ -41,7 +41,7 @@ fn parse_reviewer(value: &str) -> Result { } fn parse_permission_profile_args(args: &str) -> Result { - let parsed = slash_command_args::parse(args, &["--approval-policy", "--reviewer"], &[])?; + let parsed = slash_command_args::parse(args, &["--approval-policy", "--reviewer"], &[], &[])?; let profile_id = parsed.positionals.first().cloned().ok_or_else(|| { "Usage: /permissions [--approval-policy=] [--reviewer=user|auto_review]" .to_string() diff --git a/codex-rs/tui/src/chatwidget/slash_command_args.rs b/codex-rs/tui/src/chatwidget/slash_command_args.rs index fa4ac26df6..e73048d92c 100644 --- a/codex-rs/tui/src/chatwidget/slash_command_args.rs +++ b/codex-rs/tui/src/chatwidget/slash_command_args.rs @@ -1,7 +1,8 @@ //! Shared tokenization for slash commands with positional arguments and named settings. //! -//! Values may follow their setting or use `=`, while switches never consume a value. A bare `--` -//! leaves all remaining tokens positional. +//! Values may follow their setting or use `=`, switches never consume a value, and boolean +//! settings accept both `--name` and `--no-name`. A bare `--` leaves all remaining tokens +//! positional. #[derive(Debug, Default, PartialEq, Eq)] pub(super) struct ParsedCommandArgs { @@ -12,7 +13,14 @@ pub(super) struct ParsedCommandArgs { #[derive(Debug, PartialEq, Eq)] struct NamedArgument { name: String, - value: Option, + value: NamedArgumentValue, +} + +#[derive(Debug, PartialEq, Eq)] +enum NamedArgumentValue { + Value(String), + Switch, + Boolean { value: bool }, } impl ParsedCommandArgs { @@ -20,7 +28,26 @@ impl ParsedCommandArgs { self.named .iter() .find(|argument| argument.name == name) - .and_then(|argument| argument.value.as_deref()) + .and_then(|argument| match &argument.value { + NamedArgumentValue::Value(value) => Some(value.as_str()), + NamedArgumentValue::Switch | NamedArgumentValue::Boolean { .. } => None, + }) + } + pub(super) fn has_switch(&self, name: &str) -> bool { + self.named + .iter() + .any(|argument| argument.name == name && argument.value == NamedArgumentValue::Switch) + } + + pub(super) fn boolean(&self, name: &str) -> Option { + let name = format!("--{name}"); + self.named + .iter() + .find(|argument| argument.name == name) + .and_then(|argument| match &argument.value { + NamedArgumentValue::Boolean { value } => Some(*value), + NamedArgumentValue::Value(_) | NamedArgumentValue::Switch => None, + }) } } @@ -28,6 +55,7 @@ pub(super) fn parse( args: &str, value_settings: &[&str], switches: &[&str], + boolean_settings: &[&str], ) -> Result { let mut words = shlex::split(args) .ok_or_else(|| "Invalid command arguments. Check the quoting.".to_string())? @@ -39,12 +67,29 @@ pub(super) fn parse( if parse_settings && word == "--" { parse_settings = false; } else if parse_settings && word.starts_with("--") { - let argument = parse_named_argument(&word, &mut words, value_settings, switches)?; - if parsed + let argument = parse_named_argument( + &word, + &mut words, + value_settings, + switches, + boolean_settings, + )?; + if let Some(existing) = parsed .named .iter() - .any(|existing| existing.name == argument.name) + .find(|existing| existing.name == argument.name) { + if let ( + NamedArgumentValue::Boolean { + value: existing_value, + }, + NamedArgumentValue::Boolean { value }, + ) = (&existing.value, &argument.value) + && existing_value != value + { + let name = argument.name.trim_start_matches("--"); + return Err(format!("Specify only one of --{name} or --no-{name}.")); + } return Err(format!( "Command setting `{}` was provided more than once.", argument.name @@ -63,6 +108,7 @@ fn parse_named_argument( words: &mut std::iter::Peekable>, value_settings: &[&str], switches: &[&str], + boolean_settings: &[&str], ) -> Result { let (name, inline_value) = word .split_once('=') @@ -75,7 +121,7 @@ fn parse_named_argument( .ok_or_else(|| format!("Command setting `{name}` requires a value."))?; return Ok(NamedArgument { name: name.to_string(), - value: Some(value), + value: NamedArgumentValue::Value(value), }); } if switches.contains(&name) { @@ -84,9 +130,24 @@ fn parse_named_argument( } return Ok(NamedArgument { name: name.to_string(), - value: None, + value: NamedArgumentValue::Switch, }); } + for setting in boolean_settings { + let positive = format!("--{setting}"); + let negative = format!("--no-{setting}"); + if name == positive || name == negative { + if inline_value.is_some() { + return Err(format!("Command setting `{name}` does not take a value.")); + } + return Ok(NamedArgument { + name: positive, + value: NamedArgumentValue::Boolean { + value: name != negative, + }, + }); + } + } Err(format!("Unknown command setting `{name}`.")) } diff --git a/codex-rs/tui/src/chatwidget/slash_command_args_tests.rs b/codex-rs/tui/src/chatwidget/slash_command_args_tests.rs index f413bba636..f856d5b83a 100644 --- a/codex-rs/tui/src/chatwidget/slash_command_args_tests.rs +++ b/codex-rs/tui/src/chatwidget/slash_command_args_tests.rs @@ -4,9 +4,10 @@ use pretty_assertions::assert_eq; #[test] fn parses_positional_values_switches_and_quoted_arguments() { let parsed = parse( - "'team review' item --reviewer user --speed=fast --clear -- --literal", + "'team review' item --reviewer user --speed=fast --clear --no-colors -- --literal", &["--reviewer", "--speed"], &["--clear"], + &["colors"], ) .expect("valid command arguments"); @@ -17,20 +18,26 @@ fn parses_positional_values_switches_and_quoted_arguments() { named: vec![ NamedArgument { name: "--reviewer".into(), - value: Some("user".into()), + value: NamedArgumentValue::Value("user".into()), }, NamedArgument { name: "--speed".into(), - value: Some("fast".into()), + value: NamedArgumentValue::Value("fast".into()), }, NamedArgument { name: "--clear".into(), - value: None, + value: NamedArgumentValue::Switch, + }, + NamedArgument { + name: "--colors".into(), + value: NamedArgumentValue::Boolean { value: false }, }, ], } ); assert_eq!(parsed.value("--reviewer"), Some("user")); + assert!(parsed.has_switch("--clear")); + assert_eq!(parsed.boolean("colors"), Some(false)); } #[test] @@ -48,6 +55,10 @@ fn rejects_invalid_named_arguments() { "--clear --clear", "Command setting `--clear` was provided more than once.", ), + ( + "--colors --no-colors", + "Specify only one of --colors or --no-colors.", + ), ("--unknown", "Unknown command setting `--unknown`."), ( "'unfinished", @@ -55,7 +66,7 @@ fn rejects_invalid_named_arguments() { ), ] { assert_eq!( - parse(args, &["--reviewer"], &["--clear"]), + parse(args, &["--reviewer"], &["--clear"], &["colors"]), Err(expected.to_string()) ); } diff --git a/codex-rs/tui/src/chatwidget/slash_dispatch.rs b/codex-rs/tui/src/chatwidget/slash_dispatch.rs index 8977c41642..fd56394f6b 100644 --- a/codex-rs/tui/src/chatwidget/slash_dispatch.rs +++ b/codex-rs/tui/src/chatwidget/slash_dispatch.rs @@ -815,6 +815,14 @@ impl ChatWidget { self.handle_model_command_args(trimmed); self.app_event_tx.send(AppEvent::SettingsSelectionClosed); } + SlashCommand::Title => { + self.handle_terminal_title_command_args(trimmed); + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + } + SlashCommand::Statusline => { + self.handle_status_line_command_args(trimmed); + self.app_event_tx.send(AppEvent::SettingsSelectionClosed); + } SlashCommand::Permissions if self.windows_sandbox_local_server && self.windows_sandbox_host != WindowsSandboxHost::Remote diff --git a/codex-rs/tui/src/chatwidget/status_controls.rs b/codex-rs/tui/src/chatwidget/status_controls.rs index 692eba105a..a5d020c749 100644 --- a/codex-rs/tui/src/chatwidget/status_controls.rs +++ b/codex-rs/tui/src/chatwidget/status_controls.rs @@ -133,6 +133,8 @@ impl ChatWidget { self.config_panel_tui.status_line_use_colors = use_theme_colors; self.local_settings.tui.status_line = Some(ids); self.local_settings.tui.status_line_use_colors = use_theme_colors; + self.status_surface_overrides.status_line = None; + self.status_surface_overrides.status_line_use_colors = None; self.refresh_status_line(); } @@ -175,6 +177,7 @@ impl ChatWidget { self.terminal_title_setup_original_items = None; self.config_panel_tui.terminal_title = Some(ids.clone()); self.local_settings.tui.terminal_title = Some(ids); + self.status_surface_overrides.terminal_title = None; self.refresh_terminal_title(); } diff --git a/codex-rs/tui/src/chatwidget/status_surface_commands.rs b/codex-rs/tui/src/chatwidget/status_surface_commands.rs new file mode 100644 index 0000000000..caf0ab1cb2 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/status_surface_commands.rs @@ -0,0 +1,160 @@ +//! Session-only `/title` and `/statusline` command handling. +//! +//! The command handlers update the live widget without changing saved defaults. Explicit +//! overrides are carried with the existing per-thread input state so navigation and reconnects +//! retain the selected layout. + +use super::slash_command_args; +use super::*; + +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub(super) struct StatusSurfaceOverrides { + pub(super) terminal_title: Option>, + pub(super) status_line: Option>, + pub(super) status_line_use_colors: Option, +} + +#[derive(Debug, PartialEq, Eq)] +struct StatusLineCommand { + items: Option>, + use_theme_colors: Option, +} + +impl ChatWidget { + pub(super) fn handle_terminal_title_command_args(&mut self, args: &str) { + let preview_data = self.terminal_title_preview_data(); + match parse_terminal_title_command(args, &preview_data) { + Ok(items) => { + let ids = items.iter().map(ToString::to_string).collect::>(); + self.status_surface_overrides.terminal_title = Some(ids.clone()); + self.local_settings.tui.terminal_title = Some(ids); + self.refresh_terminal_title(); + self.request_redraw(); + } + Err(error) => self.add_error_message(error), + } + } + + pub(super) fn handle_status_line_command_args(&mut self, args: &str) { + let preview_data = self.status_surface_preview_data(); + match parse_status_line_command(args, &preview_data) { + Ok(command) => { + if let Some(items) = command.items { + let ids = items.iter().map(ToString::to_string).collect::>(); + self.status_surface_overrides.status_line = Some(ids.clone()); + self.local_settings.tui.status_line = Some(ids); + } + if let Some(use_theme_colors) = command.use_theme_colors { + self.status_surface_overrides.status_line_use_colors = Some(use_theme_colors); + self.local_settings.tui.status_line_use_colors = use_theme_colors; + } + self.refresh_status_line(); + self.request_redraw(); + } + Err(error) => self.add_error_message(error), + } + } + + pub(super) fn restore_status_surface_overrides(&mut self, overrides: StatusSurfaceOverrides) { + if let Some(items) = &overrides.terminal_title { + self.local_settings.tui.terminal_title = Some(items.clone()); + } + if let Some(items) = &overrides.status_line { + self.local_settings.tui.status_line = Some(items.clone()); + } + if let Some(use_theme_colors) = overrides.status_line_use_colors { + self.local_settings.tui.status_line_use_colors = use_theme_colors; + } + self.status_surface_overrides = overrides; + self.refresh_status_surfaces(); + } +} + +fn parse_terminal_title_command( + args: &str, + preview_data: &StatusSurfacePreviewData, +) -> Result, String> { + let args = slash_command_args::parse(args, &[], &["--clear"], &[])?; + let items = args + .positionals + .iter() + .map(|item| parse_item(item, "terminal-title", "/title", preview_data)) + .collect::, _>>()?; + let clear = args.has_switch("--clear"); + if clear && !items.is_empty() { + return Err("Cannot combine --clear with terminal-title items.".into()); + } + Ok(if clear { Vec::new() } else { items }) +} + +fn parse_status_line_command( + args: &str, + preview_data: &StatusSurfacePreviewData, +) -> Result { + let args = slash_command_args::parse(args, &[], &["--clear"], &["colors"])?; + let items = args + .positionals + .iter() + .map(|item| parse_item(item, "status-line", "/statusline", preview_data)) + .collect::, _>>()?; + Ok(StatusLineCommand { + items: status_line_items(items, args.has_switch("--clear"))?, + use_theme_colors: args.boolean("colors"), + }) +} + +fn status_line_items( + items: Vec, + clear: bool, +) -> Result>, String> { + if clear && !items.is_empty() { + return Err("Cannot combine --clear with status-line items.".into()); + } + Ok(if clear { + Some(Vec::new()) + } else if items.is_empty() { + None + } else { + Some(items) + }) +} + +fn parse_item( + token: &str, + surface: &str, + command: &str, + preview_data: &StatusSurfacePreviewData, +) -> Result +where + T: std::str::FromStr, +{ + if let Ok(item) = token.parse() { + return Ok(item); + } + + let five_hour_id = "five-hour-limit"; + let weekly_id = "weekly-limit"; + let five_hour_matches = preview_data + .rate_limit_item_name(StatusSurfacePreviewItem::FiveHourLimit, five_hour_id) + == token; + let weekly_matches = preview_data + .rate_limit_item_name(StatusSurfacePreviewItem::WeeklyLimit, weekly_id) + == token; + let id = match (five_hour_matches, weekly_matches) { + (true, false) => five_hour_id, + (false, true) => weekly_id, + (true, true) => { + return Err(format!( + "Ambiguous {surface} item '{token}'. Use '{five_hour_id}' or '{weekly_id}'." + )); + } + (false, false) => { + return Err(format!( + "Unknown {surface} item '{token}'. Use {command} to see available items." + )); + } + }; + id.parse().map_err(|_| { + format!("Unknown {surface} item '{token}'. Use {command} to see available items.") + }) +} diff --git a/codex-rs/tui/src/chatwidget/tests.rs b/codex-rs/tui/src/chatwidget/tests.rs index 1e5dade887..1cc51a1646 100644 --- a/codex-rs/tui/src/chatwidget/tests.rs +++ b/codex-rs/tui/src/chatwidget/tests.rs @@ -296,6 +296,8 @@ mod sparkle_submission_tests; mod startup_submission_tests; mod status_and_layout; mod status_command_tests; +#[path = "tests/status_surface_command_tests.rs"] +mod status_surface_command_tests; mod status_surface_previews; #[path = "tests/subagent_activity_tests.rs"] mod subagent_activity; diff --git a/codex-rs/tui/src/chatwidget/tests/composer_submission.rs b/codex-rs/tui/src/chatwidget/tests/composer_submission.rs index 6ef2db01fb..5443074228 100644 --- a/codex-rs/tui/src/chatwidget/tests/composer_submission.rs +++ b/codex-rs/tui/src/chatwidget/tests/composer_submission.rs @@ -1895,6 +1895,7 @@ async fn restore_thread_input_state_applies_running_state_policy() { current_collaboration_mode: chat.current_collaboration_mode.clone(), active_collaboration_mask: chat.active_collaboration_mask.clone(), plan_mode_reasoning_effort: chat.config.plan_mode_reasoning_effort.clone(), + status_surface_overrides: StatusSurfaceOverrides::default(), task_running: true, agent_turn_running: true, }; diff --git a/codex-rs/tui/src/chatwidget/tests/review_mode.rs b/codex-rs/tui/src/chatwidget/tests/review_mode.rs index dd8214d013..c996f604a9 100644 --- a/codex-rs/tui/src/chatwidget/tests/review_mode.rs +++ b/codex-rs/tui/src/chatwidget/tests/review_mode.rs @@ -435,6 +435,7 @@ async fn restore_thread_input_state_restores_pending_steers_without_downgrading_ current_collaboration_mode: chat.current_collaboration_mode.clone(), active_collaboration_mask: chat.active_collaboration_mask.clone(), plan_mode_reasoning_effort: chat.config.plan_mode_reasoning_effort.clone(), + status_surface_overrides: StatusSurfaceOverrides::default(), task_running: false, agent_turn_running: false, }), diff --git a/codex-rs/tui/src/chatwidget/tests/status_surface_command_tests.rs b/codex-rs/tui/src/chatwidget/tests/status_surface_command_tests.rs new file mode 100644 index 0000000000..8574c4fe39 --- /dev/null +++ b/codex-rs/tui/src/chatwidget/tests/status_surface_command_tests.rs @@ -0,0 +1,227 @@ +use super::*; +use crate::config_panel::ConfigPreference; +use crate::config_panel::ConfigToggle; +use pretty_assertions::assert_eq; + +fn dispatch_inline( + chat: &mut ChatWidget, + events: &mut tokio::sync::mpsc::UnboundedReceiver, + command: SlashCommand, + args: &str, +) -> Vec { + chat.dispatch_command_with_args(command, args.to_string(), Vec::new()); + std::iter::from_fn(|| events.try_recv().ok()).collect() +} + +fn rendered_history(events: Vec) -> String { + events + .into_iter() + .filter_map(|event| match event { + AppEvent::InsertHistoryCell(cell) => { + Some(lines_to_single_string(&cell.display_lines(/*width*/ 80))) + } + _ => None, + }) + .collect() +} + +#[tokio::test] +async fn inline_status_surface_commands_are_session_only_and_atomic() { + let (mut chat, mut events, _ops) = make_chatwidget_manual(Some("gpt-5.5")).await; + let saved_tui = chat.config_panel_tui.clone(); + super::status_surface_previews::cache_rate_limit_snapshot(&mut chat); + + let title_events = dispatch_inline( + &mut chat, + &mut events, + SlashCommand::Title, + "model-name monthly-limit", + ); + assert_eq!( + chat.local_settings.tui.terminal_title, + Some(vec!["model".into(), "five-hour-limit".into()]) + ); + assert!(matches!( + title_events.as_slice(), + [AppEvent::SettingsSelectionClosed] + )); + + let status_events = dispatch_inline( + &mut chat, + &mut events, + SlashCommand::Statusline, + "monthly-limit weekly-limit --no-colors", + ); + assert_eq!( + ( + chat.local_settings.tui.status_line.clone(), + chat.local_settings.tui.status_line_use_colors, + ), + ( + Some(vec!["five-hour-limit".into(), "weekly-limit".into()]), + false, + ) + ); + assert!(matches!( + status_events.as_slice(), + [AppEvent::SettingsSelectionClosed] + )); + assert_eq!(chat.config_panel_tui, saved_tui); + + chat.rate_limit_snapshots_by_limit_id + .get_mut("codex") + .and_then(|snapshot| snapshot.secondary.as_mut()) + .expect("secondary usage limit") + .window_minutes = Some(30 * 24 * 60); + let before_ambiguous = chat.status_surface_overrides.clone(); + let ambiguous_events = dispatch_inline( + &mut chat, + &mut events, + SlashCommand::Statusline, + "monthly-limit", + ); + assert_eq!(chat.status_surface_overrides, before_ambiguous); + let rendered = rendered_history(ambiguous_events); + insta::assert_snapshot!(rendered, @"■ Ambiguous status-line item 'monthly-limit'. Use 'five-hour-limit' or 'weekly-limit'.\n"); + + dispatch_inline( + &mut chat, + &mut events, + SlashCommand::Statusline, + "model reasoning", + ); + assert!(!chat.local_settings.tui.status_line_use_colors); + + let before_invalid = chat.status_surface_overrides.clone(); + let invalid_events = dispatch_inline( + &mut chat, + &mut events, + SlashCommand::Statusline, + "current-dir --colors --no-colors", + ); + assert_eq!(chat.status_surface_overrides, before_invalid); + assert!( + invalid_events + .iter() + .any(|event| matches!(event, AppEvent::SettingsSelectionClosed)) + ); + let rendered = rendered_history(invalid_events); + insta::assert_snapshot!(rendered, @"■ Specify only one of --colors or --no-colors.\n"); + + dispatch_inline(&mut chat, &mut events, SlashCommand::Statusline, "--colors"); + assert_eq!( + ( + chat.local_settings.tui.status_line.clone(), + chat.local_settings.tui.status_line_use_colors, + ), + (Some(vec!["model".into(), "reasoning".into()]), true) + ); + dispatch_inline(&mut chat, &mut events, SlashCommand::Title, "--clear"); + dispatch_inline( + &mut chat, + &mut events, + SlashCommand::Statusline, + "--clear --no-colors", + ); + assert_eq!( + ( + chat.local_settings.tui.terminal_title.clone(), + chat.local_settings.tui.status_line.clone(), + chat.local_settings.tui.status_line_use_colors, + ), + (Some(Vec::new()), Some(Vec::new()), false) + ); +} + +#[tokio::test] +async fn session_status_surface_overrides_follow_thread_state_and_editor_saves() { + let (mut chat, mut events, _ops) = make_chatwidget_manual(Some("gpt-5.5")).await; + dispatch_inline( + &mut chat, + &mut events, + SlashCommand::Title, + "model reasoning", + ); + dispatch_inline( + &mut chat, + &mut events, + SlashCommand::Statusline, + "current-dir --no-colors", + ); + chat.preview_terminal_title(vec![TerminalTitleItem::AppName]); + let state = chat + .capture_thread_input_state() + .expect("thread input state"); + + chat.cancel_terminal_title_setup(); + assert_eq!( + chat.local_settings.tui.terminal_title, + Some(vec!["model".into(), "reasoning".into()]) + ); + + let (mut restored, mut restored_events, _ops) = make_chatwidget_manual(Some("gpt-5.5")).await; + restored.local_settings.tui.terminal_title = Some(vec!["app-name".into()]); + restored.local_settings.tui.status_line = Some(vec!["codex-version".into()]); + restored.restore_thread_input_state( + Some(state), + ThreadInputStateRestoreMode { + preserve_in_flight_turn: false, + }, + ); + assert_eq!( + ( + restored.local_settings.tui.terminal_title.clone(), + restored.local_settings.tui.status_line.clone(), + restored.local_settings.tui.status_line_use_colors, + ), + ( + Some(vec!["model".into(), "reasoning".into()]), + Some(vec!["current-dir".into()]), + false, + ) + ); + + restored.restore_thread_input_state( + /*input_state*/ None, + ThreadInputStateRestoreMode { + preserve_in_flight_turn: false, + }, + ); + assert_eq!( + restored.local_settings.tui.terminal_title, + Some(vec!["model".into(), "reasoning".into()]) + ); + + restored.setup_terminal_title(vec![TerminalTitleItem::Project]); + restored.setup_status_line( + vec![StatusLineItem::ModelName], + /*use_theme_colors*/ true, + ); + assert_eq!( + restored.status_surface_overrides, + StatusSurfaceOverrides::default() + ); + + dispatch_inline( + &mut restored, + &mut restored_events, + SlashCommand::Statusline, + "reasoning --no-colors", + ); + let mut saved_tui = restored.local_settings.tui.clone(); + saved_tui.status_line_use_colors = true; + restored.apply_config_preference( + ConfigPreference::Toggle { + setting: ConfigToggle::StatusLineColors, + enabled: true, + }, + &saved_tui, + ); + assert_eq!( + restored.status_surface_overrides, + StatusSurfaceOverrides { + status_line: Some(vec!["reasoning".into()]), + ..Default::default() + } + ); +} diff --git a/codex-rs/tui/src/chatwidget/tests/status_surface_previews.rs b/codex-rs/tui/src/chatwidget/tests/status_surface_previews.rs index 085d51619e..de9eaaab56 100644 --- a/codex-rs/tui/src/chatwidget/tests/status_surface_previews.rs +++ b/codex-rs/tui/src/chatwidget/tests/status_surface_previews.rs @@ -100,7 +100,7 @@ fn cache_project_root(chat: &mut ChatWidget, root_name: &str) { }); } -fn cache_rate_limit_snapshot(chat: &mut ChatWidget) { +pub(super) fn cache_rate_limit_snapshot(chat: &mut ChatWidget) { chat.on_rate_limit_snapshot(Some(RateLimitSnapshot { limit_id: None, limit_name: None, diff --git a/codex-rs/tui/src/chatwidget/user_messages.rs b/codex-rs/tui/src/chatwidget/user_messages.rs index ed997253bc..a05f041bac 100644 --- a/codex-rs/tui/src/chatwidget/user_messages.rs +++ b/codex-rs/tui/src/chatwidget/user_messages.rs @@ -27,6 +27,7 @@ use codex_utils_plugins::mention_syntax::PLUGIN_TEXT_MENTION_SIGIL; use codex_utils_plugins::mention_syntax::TOOL_MENTION_SIGIL; use super::ChatWidget; +use super::StatusSurfaceOverrides; #[derive(Debug, Clone, PartialEq)] pub(crate) struct UserMessage { @@ -162,6 +163,7 @@ pub(crate) struct ThreadInputState { pub(super) current_collaboration_mode: CollaborationMode, pub(super) active_collaboration_mask: Option, pub(super) plan_mode_reasoning_effort: Option, + pub(super) status_surface_overrides: StatusSurfaceOverrides, pub(super) task_running: bool, pub(super) agent_turn_running: bool, } diff --git a/codex-rs/tui/src/slash_command.rs b/codex-rs/tui/src/slash_command.rs index 223bd3048b..dfd05384f7 100644 --- a/codex-rs/tui/src/slash_command.rs +++ b/codex-rs/tui/src/slash_command.rs @@ -175,6 +175,8 @@ impl SlashCommand { SlashCommand::Review | SlashCommand::Model | SlashCommand::Permissions + | SlashCommand::Title + | SlashCommand::Statusline | SlashCommand::Rename | SlashCommand::New | SlashCommand::Clear From f847a4bd3c6ca3d8474a6e0dace1ed39f7ec0067 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Thu, 15 Oct 2026 18:51:23 +0000 Subject: [PATCH 109/155] Add quick dial presets for terminal title and status line layouts (#54388) ## What changed Add current terminal title and status line options to the preset picker. Generate `/title` and `/statusline` commands that preserve item order and duplicates, normalize item aliases, and retain the status line color setting. Use `--clear` for empty layouts and disable options containing unavailable items. ## Testing Extend picker tests and snapshots to cover the new options, generated commands, empty layouts, and unavailable terminal title items. GitOrigin-RevId: b836b15e87c03249cf479b1c3baf0bd71931a6be --- codex-rs/tui/src/chatwidget/quick_dials.rs | 64 ++++++++++++++++++- ...dget__tests__saved_quick_dials_source.snap | 8 ++- ..._quick_dials_source_unavailable_model.snap | 11 ++-- .../src/chatwidget/tests/quick_dials_tests.rs | 62 +++++++++++++++++- 4 files changed, 134 insertions(+), 11 deletions(-) diff --git a/codex-rs/tui/src/chatwidget/quick_dials.rs b/codex-rs/tui/src/chatwidget/quick_dials.rs index 0414299f7d..cf702a39d2 100644 --- a/codex-rs/tui/src/chatwidget/quick_dials.rs +++ b/codex-rs/tui/src/chatwidget/quick_dials.rs @@ -145,6 +145,29 @@ impl ChatWidget { Ok(dial) } + pub(super) fn current_terminal_title_quick_dial(&self) -> Result { + status_surface_quick_dial::( + "/title", + self.configured_terminal_title_items(), + /*suffix*/ None, + "Choose available terminal-title items with /title before saving.", + ) + } + + pub(super) fn current_status_line_quick_dial(&self) -> Result { + let colors = if self.local_settings.tui.status_line_use_colors { + "--colors" + } else { + "--no-colors" + }; + status_surface_quick_dial::( + "/statusline", + self.configured_status_line_items(), + /*suffix*/ Some(colors), + "Choose available status-line items with /statusline before saving.", + ) + } + fn quick_dials_available(&mut self) -> bool { if self.blocks_direct_input || self.active_side_conversation @@ -384,9 +407,13 @@ impl ChatWidget { .unwrap_or(Err( "Select a named permission profile with /permissions first.", )); + let terminal_title = self.current_terminal_title_quick_dial(); + let status_line = self.current_status_line_quick_dial(); let items = [ ("Current model", self.current_model_quick_dial()), ("Current permissions", permissions), + ("Current terminal title", terminal_title), + ("Current status line", status_line), ] .into_iter() .map(|(name, dial)| { @@ -415,7 +442,7 @@ impl ChatWidget { .collect(); self.bottom_pane.show_selection_view(SelectionViewParams { view_id: Some("quick-dial-prefills"), - max_visible_rows: 2, + max_visible_rows: 4, title: Some("Start preset from current settings".into()), items, ..SelectionViewParams::picker() @@ -566,3 +593,38 @@ impl ChatWidget { consumed } } + +fn status_surface_quick_dial( + command: &str, + item_ids: Vec, + suffix: Option<&str>, + invalid_items_error: &'static str, +) -> Result +where + T: std::str::FromStr + ToString, +{ + let items = item_ids + .into_iter() + .map(|id| { + id.parse::() + .map(|item| item.to_string()) + .map_err(|_| invalid_items_error) + }) + .collect::, _>>()?; + let mut input = command.to_string(); + if items.is_empty() { + input.push_str(" --clear"); + } else { + for item in items { + input.push(' '); + input.push_str(&item); + } + } + if let Some(suffix) = suffix { + input.push(' '); + input.push_str(suffix); + } + let dial = QuickDial { input, label: None }; + dial.validate()?; + Ok(dial) +} diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source.snap index c07269a2f4..e07988ea75 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source.snap @@ -5,8 +5,10 @@ expression: "render_bottom_popup(&chat, 80)" Start preset from current settings -› 1. Current model /model gpt-5.5 --speed=standard - 2. Current permissions /permissions :workspace --approval-policy=on-request - --reviewer=user +› 1. Current model /model gpt-5.5 --speed=standard + 2. Current permissions /permissions :workspace --approval-policy=on- + request --reviewer=user + 3. Current terminal title /title model project-name model + 4. Current status line /statusline model project-name model --no-colors enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source_unavailable_model.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source_unavailable_model.snap index 5e0df09238..638c80dd59 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source_unavailable_model.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__saved_quick_dials_source_unavailable_model.snap @@ -5,9 +5,12 @@ expression: "render_bottom_popup(&chat, 80)" Start preset from current settings - Current model Choose an available reasoning effort with /model - before saving. -› 1. Current permissions /permissions :workspace --approval-policy=on-request - --reviewer=auto_review + Current model Choose an available reasoning effort with /model + before saving. +› 1. Current permissions /permissions :workspace --approval-policy=on- + request --reviewer=auto_review + Current terminal title Choose available terminal-title items with /title + before saving. + 2. Current status line /statusline model --colors enter select · esc back diff --git a/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs b/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs index 23e278edbf..c53b1f5075 100644 --- a/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs +++ b/codex-rs/tui/src/chatwidget/tests/quick_dials_tests.rs @@ -5,10 +5,21 @@ use crate::chatwidget::quick_dials::QuickDialEditorTarget; use codex_config::types::QuickDial; #[tokio::test] -async fn current_settings_offer_model_and_permissions() { +async fn current_settings_offer_model_permissions_and_status_layouts() { let (mut chat, mut events, _ops) = make_chatwidget_manual(/*model_override*/ Some("gpt-5.5")).await; chat.thread_id = Some(ThreadId::new()); + chat.local_settings.tui.terminal_title = Some(vec![ + "model-name".into(), + "project".into(), + "model-name".into(), + ]); + chat.local_settings.tui.status_line = Some(vec![ + "model-name".into(), + "project-root".into(), + "model-name".into(), + ]); + chat.local_settings.tui.status_line_use_colors = false; chat.set_permission_profile_from_session_snapshot(PermissionProfileSnapshot::active( PermissionProfile::workspace_write(), ActivePermissionProfile::new(":workspace"), @@ -31,14 +42,60 @@ async fn current_settings_offer_model_and_permissions() { }) if input == "/permissions :workspace --approval-policy=on-request --reviewer=user" ); + chat.open_quick_dial_prefills(); + chat.handle_key_event(KeyCode::Down.into()); + chat.handle_key_event(KeyCode::Down.into()); + chat.handle_key_event(KeyCode::Enter.into()); + assert_matches!( + events.try_recv(), + Ok(AppEvent::OpenQuickDialEditor { + target: QuickDialEditorTarget::PickSlot, + dial: Some(QuickDial { input, label: None }), + }) if input == "/title model project-name model" + ); + + chat.open_quick_dial_prefills(); + chat.handle_key_event(KeyCode::Down.into()); + chat.handle_key_event(KeyCode::Down.into()); + chat.handle_key_event(KeyCode::Down.into()); + chat.handle_key_event(KeyCode::Enter.into()); + assert_matches!( + events.try_recv(), + Ok(AppEvent::OpenQuickDialEditor { + target: QuickDialEditorTarget::PickSlot, + dial: Some(QuickDial { input, label: None }), + }) if input == "/statusline model project-name model --no-colors" + ); + + chat.local_settings.tui.terminal_title = Some(Vec::new()); + chat.local_settings.tui.status_line = Some(Vec::new()); + chat.local_settings.tui.status_line_use_colors = true; + assert_eq!( + chat.current_terminal_title_quick_dial(), + Ok(QuickDial { + input: "/title --clear".into(), + label: None, + }) + ); + assert_eq!( + chat.current_status_line_quick_dial(), + Ok(QuickDial { + input: "/statusline --clear --colors".into(), + label: None, + }) + ); + chat.set_reasoning_effort(Some(ReasoningEffortConfig::Custom("removed-effort".into()))); + chat.terminal_title_invalid_items_warned + .store(true, std::sync::atomic::Ordering::Relaxed); + chat.local_settings.tui.terminal_title = Some(vec!["removed-title-item".into()]); + chat.local_settings.tui.status_line = Some(vec!["model".into()]); chat.config.approvals_reviewer = ApprovalsReviewer::AutoReview; chat.open_quick_dial_prefills(); assert_chatwidget_snapshot!( "saved_quick_dials_source_unavailable_model", render_bottom_popup(&chat, /*width*/ 80) ); - chat.handle_key_event(KeyCode::Down.into()); chat.handle_key_event(KeyCode::Enter.into()); assert_matches!( events.try_recv(), @@ -67,7 +124,6 @@ async fn current_settings_offer_model_and_permissions() { )) .expect("set named permission profile"); chat.open_quick_dial_prefills(); - chat.handle_key_event(KeyCode::Down.into()); chat.handle_key_event(KeyCode::Enter.into()); let policy = serde_json::to_string(&granular).expect("granular policy serializes"); assert_matches!( From 1ef30bcbe784f1006548adc1542985be32b05109 Mon Sep 17 00:00:00 2001 From: Dmitriy Kovalenko Date: Thu, 15 Oct 2026 19:07:28 +0000 Subject: [PATCH 110/155] Preserve existing SQLite journal modes on startup (#54389) ## Why Opening an initialized database in `DELETE` journal mode previously attempted to convert it to `WAL`, which could fail while another connection held a write lock. ## What changed - Initialize `WAL` and incremental auto-vacuum only for databases without a schema, including files left by interrupted initialization. - Preserve journal and vacuum modes for initialized databases, use `synchronous = EXTRA` for `DELETE` connections, and retain `NORMAL` for `WAL`. - Close failed initialization pools before retrying and restrict background page reclamation to `WAL` databases. ## Testing Extend SQLite tests to cover interrupted initialization, opening `DELETE` databases under a write lock across all pool connections, persistence after reopening, and lock release after failed initialization. GitOrigin-RevId: 23acecfe472618dde8545815e9a1058a51591235 --- codex-rs/state/src/runtime/reclamation.rs | 9 +- codex-rs/state/src/sqlite.rs | 144 +++++++++++++-------- codex-rs/state/src/sqlite_tests.rs | 150 +++++++++++++++++----- 3 files changed, 216 insertions(+), 87 deletions(-) diff --git a/codex-rs/state/src/runtime/reclamation.rs b/codex-rs/state/src/runtime/reclamation.rs index 29c46e4fb1..27f89d612a 100644 --- a/codex-rs/state/src/runtime/reclamation.rs +++ b/codex-rs/state/src/runtime/reclamation.rs @@ -291,15 +291,16 @@ async fn reclaim_pages( .is_none_or(|deadline| Instant::now() < deadline) }); - let (mode, page_size, pages, free): (i64, i64, i64, i64) = sqlx::query_as( - "SELECT auto_vacuum, page_size, page_count, freelist_count \ - FROM pragma_auto_vacuum, pragma_page_size, pragma_page_count, pragma_freelist_count", + let (journal, mode, page_size, pages, free): (String, i64, i64, i64, i64) = sqlx::query_as( + "SELECT journal_mode, auto_vacuum, page_size, page_count, freelist_count \ + FROM pragma_journal_mode, pragma_auto_vacuum, pragma_page_size, pragma_page_count, pragma_freelist_count", ) .fetch_one(&mut *connection) .await?; + // This worker's checkpoint and contention rules apply only to WAL mode. // Require incremental auto-vacuum and at least 64 MiB and 25% free space. - if mode != 2 || free * page_size < MIN_FREE_BYTES || free < pages / 4 { + if journal != "wal" || mode != 2 || free * page_size < MIN_FREE_BYTES || free < pages / 4 { outcome = PassOutcome::Idle; return Ok(()); } diff --git a/codex-rs/state/src/sqlite.rs b/codex-rs/state/src/sqlite.rs index d8c72c6031..b082f2622d 100644 --- a/codex-rs/state/src/sqlite.rs +++ b/codex-rs/state/src/sqlite.rs @@ -1,6 +1,6 @@ //! Shared SQLite connection configuration. -//! Writable pools preserve existing vacuum modes and report initialization errors to callers. -//! External lock contention while opening gets a bounded retry before the original error surfaces. +//! Writable pools preserve the journal and vacuum modes of initialized databases. +//! Startup retries SQLITE_BUSY and reports other errors to callers. #![expect( clippy::disallowed_methods, @@ -364,57 +364,9 @@ impl SqliteConfig { .synchronous(SqliteSynchronous::Normal) .busy_timeout(DEFAULT_BUSY_TIMEOUT) .log_statements(LevelFilter::Off); - let connect = || async { - // SQLx retries after_connect errors, eventually replacing them with PoolTimedOut. - // Return the first initialization error directly while opening this pool. - let (init_error_tx, mut init_error_rx) = tokio::sync::mpsc::channel(/*buffer*/ 1); - let pool_options = SqlitePoolOptions::new().max_connections(5).after_connect( - move |connection, _metadata| { - let init_error_tx = init_error_tx.clone(); - Box::pin(async move { - let result = async { - let mode: i64 = sqlx::query_scalar("PRAGMA auto_vacuum") - .fetch_one(&mut *connection) - .await?; - // The setter takes the writer lock even when the mode is unchanged. - // Initialize before WAL creates the first database page; preserve - // existing modes, including FULL, without taking the writer lock. - let empty = if mode == 0 { - sqlx::query_scalar::<_, bool>( - "SELECT NOT EXISTS (SELECT 1 FROM sqlite_schema)", - ) - .fetch_one(&mut *connection) - .await? - } else { - false - }; - if empty { - sqlx::query("PRAGMA auto_vacuum = INCREMENTAL") - .execute(&mut *connection) - .await?; - } - sqlx::query("PRAGMA journal_mode = WAL") - .execute(connection) - .await?; - Ok(()) - } - .await; - result.map_err(|error| match init_error_tx.try_send(error) { - // The opener owns the original error and cancels connection retries. - Ok(()) => Error::PoolClosed, - // After opening, lazy connections retain SQLx's normal error handling. - Err(error) => error.into_inner(), - }) - }) - }, - ); - tokio::select! { - biased; - Some(error) = init_error_rx.recv() => Err(error), - result = pool_options.connect_with(options.clone()) => result, - } - }; - let pool = retry_on_busy(|| async { Ok(connect().await?) }).await?; + // Each failed attempt closes its pool before initialization is retried. + let connect = || async { connect_once(&options).await.map_err(anyhow::Error::from) }; + let pool = retry_on_busy(connect).await?; let validation_result = self .quick_check_manager .quick_check_once( @@ -444,7 +396,7 @@ impl SqliteConfig { ); } - return retry_on_busy(|| async { Ok(connect().await?) }).await; + return retry_on_busy(connect).await; } } @@ -472,6 +424,90 @@ impl SqliteConfig { } } +async fn connect_once(options: &SqliteConnectOptions) -> Result { + // SQLx retries after_connect errors, eventually replacing them with PoolTimedOut. + // Return the first initialization error directly while opening this pool. + let (init_error_tx, mut init_error_rx) = tokio::sync::mpsc::channel(/*buffer*/ 1); + let pool_options = + SqlitePoolOptions::new() + .max_connections(5) + .after_connect(move |connection, _metadata| { + let init_error_tx = init_error_tx.clone(); + Box::pin(async move { + let result = async { + let journal: String = sqlx::query_scalar("PRAGMA journal_mode") + .fetch_one(&mut *connection) + .await?; + if journal == "delete" { + // If the filesystem honors sync requests, EXTRA syncs the directory + // after SQLite deletes a rollback journal. + sqlx::query("PRAGMA synchronous = EXTRA") + .execute(connection) + .await?; + } + Ok(()) + } + .await; + result.map_err(|error| match init_error_tx.try_send(error) { + // The opener owns the original error and cancels connection retries. + Ok(()) => Error::PoolClosed, + // After opening, lazy connections retain SQLx's normal error handling. + Err(error) => error.into_inner(), + }) + }) + }); + let pool = tokio::select! { + biased; + Some(error) = init_error_rx.recv() => Err(error), + result = pool_options.connect_with(options.clone()) => result, + }?; + // Database settings persist on disk. + // Initialize these settings once before callers can use the pool. + // Connections that open later need only settings that apply to each connection. + let initialized: Result<(), Error> = async { + let mut connection = pool.acquire().await?; + // Auto-vacuum alone can write a header to disk. + // If creation stops before the schema exists, startup must initialize the file. + let empty = + sqlx::query_scalar::<_, bool>("SELECT NOT EXISTS (SELECT 1 FROM sqlite_schema)") + .fetch_one(&mut *connection) + .await?; + if empty { + let mode: i64 = sqlx::query_scalar("PRAGMA auto_vacuum") + .fetch_one(&mut *connection) + .await?; + if mode == 0 { + sqlx::query("PRAGMA auto_vacuum = INCREMENTAL") + .execute(&mut *connection) + .await?; + } + sqlx::query("PRAGMA journal_mode = WAL") + .execute(&mut *connection) + .await?; + } + // Another process can initialize WAL after this connection selects EXTRA. + // Apply NORMAL to WAL even if that process already created the schema. + let journal: String = sqlx::query_scalar("PRAGMA journal_mode") + .fetch_one(&mut *connection) + .await?; + if journal == "wal" { + sqlx::query("PRAGMA synchronous = NORMAL") + .execute(&mut *connection) + .await?; + } + // Wait for the connection to return to the pool before startup requests it again. + // An asynchronous drop can otherwise cause the pool to open a second connection. + connection.return_to_pool().await; + Ok(()) + } + .await; + if let Err(error) = initialized { + pool.close().await; + return Err(error); + } + Ok(pool) +} + #[cfg(test)] #[path = "sqlite_tests.rs"] mod tests; diff --git a/codex-rs/state/src/sqlite_tests.rs b/codex-rs/state/src/sqlite_tests.rs index 327031b909..5ebbab9cab 100644 --- a/codex-rs/state/src/sqlite_tests.rs +++ b/codex-rs/state/src/sqlite_tests.rs @@ -10,26 +10,45 @@ use sqlx::sqlite::SqlitePoolOptions; #[tokio::test] async fn open_read_write_pool_initializes_fresh_database_settings() -> anyhow::Result<()> { - let sqlite_home = crate::runtime::test_support::unique_temp_dir(); - tokio::fs::create_dir_all(&sqlite_home).await?; - let _cleanup = scopeguard::guard(sqlite_home.clone(), |sqlite_home| { - let _ = std::fs::remove_dir_all(sqlite_home); - }); - let sqlite = SqliteConfig::new_for_testing(sqlite_home.as_path().abs()); - let pool = sqlite.open_read_write_pool(&sqlite.logs_db_path()).await?; - - let journal_mode = sqlx::query_scalar::<_, String>("PRAGMA journal_mode") - .fetch_one(&pool) - .await?; - let auto_vacuum = sqlx::query_scalar::<_, i64>("PRAGMA auto_vacuum") - .fetch_one(&pool) - .await?; - - assert_eq!( - (journal_mode, auto_vacuum), - ("wal".to_string(), SqliteAutoVacuum::Incremental as i64) - ); - pool.close().await; + for interrupted in [false, true] { + let sqlite_home = crate::runtime::test_support::unique_temp_dir(); + tokio::fs::create_dir_all(&sqlite_home).await?; + let _cleanup = scopeguard::guard(sqlite_home.clone(), |sqlite_home| { + let _ = std::fs::remove_dir_all(sqlite_home); + }); + let sqlite = SqliteConfig::new_for_testing(sqlite_home.as_path().abs()); + let path = sqlite.logs_db_path(); + if interrupted { + // Auto-vacuum writes a header before WAL setup. + // Startup must initialize the database even if the file is not empty. + let partial = SqlitePoolOptions::new() + .max_connections(/*max*/ 1) + .connect_with( + SqliteConnectOptions::new() + .filename(&path) + .create_if_missing(/*create*/ true) + .auto_vacuum(SqliteAutoVacuum::Incremental), + ) + .await?; + partial.close().await; + assert!(tokio::fs::metadata(&path).await?.len() > 0); + } + let pool = sqlite.open_read_write_pool(&path).await?; + let journal_mode = sqlx::query_scalar::<_, String>("PRAGMA journal_mode") + .fetch_one(&pool) + .await?; + let auto_vacuum = sqlx::query_scalar::<_, i64>("PRAGMA auto_vacuum") + .fetch_one(&pool) + .await?; + let synchronous = sqlx::query_scalar::<_, i64>("PRAGMA synchronous") + .fetch_one(&pool) + .await?; + assert_eq!( + (journal_mode, auto_vacuum, synchronous), + ("wal".to_string(), SqliteAutoVacuum::Incremental as i64, 1) + ); + pool.close().await; + } Ok(()) } @@ -75,7 +94,7 @@ async fn open_read_write_pool_preserves_existing_settings_under_write_lock() -> } #[tokio::test] -async fn open_read_write_pool_preserves_wal_conversion_lock_error() -> anyhow::Result<()> { +async fn open_read_write_pool_preserves_delete_under_write_lock() -> anyhow::Result<()> { let sqlite_home = crate::runtime::test_support::unique_temp_dir(); tokio::fs::create_dir_all(&sqlite_home).await?; let _cleanup = scopeguard::guard(sqlite_home.clone(), |sqlite_home| { @@ -100,12 +119,72 @@ async fn open_read_write_pool_preserves_wal_conversion_lock_error() -> anyhow::R .execute(&mut *lock_holder) .await?; - let result = sqlite.open_read_write_pool(&database_path).await; + let pool = sqlite.open_read_write_pool(&database_path).await?; + // Keep each acquired connection open to test connections that the pool initializes later. + let mut connections = Vec::new(); + let mut settings = Vec::new(); + for _ in 0..5 { + let mut connection = pool.acquire().await?; + let journal: String = sqlx::query_scalar("PRAGMA journal_mode") + .fetch_one(&mut *connection) + .await?; + let synchronous: i64 = sqlx::query_scalar("PRAGMA synchronous") + .fetch_one(&mut *connection) + .await?; + settings.push((journal, synchronous)); + connections.push(connection); + } + assert_eq!(settings, vec![("delete".to_string(), 3); 5]); + drop(connections); sqlx::query("ROLLBACK").execute(&mut *lock_holder).await?; drop(lock_holder); existing_pool.close().await; - let error = result.expect_err("WAL conversion requires the writer lock"); + sqlx::query("INSERT INTO existing VALUES(42)") + .execute(&pool) + .await?; + pool.close().await; + let reopened = sqlite.open_read_write_pool(&database_path).await?; + let journal: String = sqlx::query_scalar("PRAGMA journal_mode") + .fetch_one(&reopened) + .await?; + let rows: Vec = sqlx::query_scalar("SELECT id FROM existing") + .fetch_all(&reopened) + .await?; + assert_eq!((journal, rows), ("delete".into(), vec![42])); + reopened.close().await; + Ok(()) +} + +#[tokio::test] +async fn open_read_write_pool_preserves_empty_database_lock_error() -> anyhow::Result<()> { + let sqlite_home = crate::runtime::test_support::unique_temp_dir(); + tokio::fs::create_dir_all(&sqlite_home).await?; + let _cleanup = scopeguard::guard(sqlite_home.clone(), |sqlite_home| { + let _ = std::fs::remove_dir_all(sqlite_home); + }); + let sqlite = SqliteConfig::new_for_testing(sqlite_home.as_path().abs()); + let database_path = sqlite.logs_db_path(); + let existing_pool = SqlitePoolOptions::new() + .max_connections(/*max*/ 1) + .connect_with( + SqliteConnectOptions::new() + .filename(&database_path) + .create_if_missing(/*create*/ true) + .auto_vacuum(SqliteAutoVacuum::Incremental) + .journal_mode(SqliteJournalMode::Delete), + ) + .await?; + // Leave the schema empty so startup must initialize WAL. + let mut lock_holder = existing_pool.acquire().await?; + sqlx::query("BEGIN IMMEDIATE") + .execute(&mut *lock_holder) + .await?; + + let error = sqlite + .open_read_write_pool(&database_path) + .await + .expect_err("WAL setup must fail while another connection holds the writer lock"); assert_eq!( error .downcast_ref::() @@ -114,11 +193,24 @@ async fn open_read_write_pool_preserves_wal_conversion_lock_error() -> anyhow::R Some("5".into()) ); assert!(crate::sqlite_error_detail_is_lock(&error.to_string())); - // Failure must release the connection so a later startup can succeed. - sqlite - .open_read_write_pool(&database_path) - .await? - .close() - .await; + + sqlx::query("ROLLBACK").execute(&mut *lock_holder).await?; + // A failed opener must release its locks before another writer can proceed. + sqlx::query("BEGIN EXCLUSIVE") + .execute(&mut *lock_holder) + .await?; + sqlx::query("ROLLBACK").execute(&mut *lock_holder).await?; + drop(lock_holder); + existing_pool.close().await; + + let pool = sqlite.open_read_write_pool(&database_path).await?; + sqlx::query("CREATE TABLE initialized (id INTEGER PRIMARY KEY)") + .execute(&pool) + .await?; + let journal: String = sqlx::query_scalar("PRAGMA journal_mode") + .fetch_one(&pool) + .await?; + assert_eq!(journal, "wal"); + pool.close().await; Ok(()) } From aabf13307a044706d4da0b73dfdffcfe136528a5 Mon Sep 17 00:00:00 2001 From: Krish Chainani Date: Thu, 15 Oct 2026 19:32:41 +0000 Subject: [PATCH 111/155] Store generated image items as attachment references (#54398) ## What changed - Upload generated images to the attachment store and expose `fileId` in image-generation items when available, with inline `result` fallback on upload or decoding failure. - Preserve file references through legacy events, persisted rollouts, thread history, and task output summaries. Keep model-facing image preparation separate. - Add attachment request tags and mark generated-image uploads with `usage=image_gen`, preserving the thread's ephemeral setting. - Update public schemas and SDK types to accept either image representation, retain the Python `ImageGenerationThreadItem` alias, and prefer `fileId` when reading records containing both fields. ## Testing Add coverage for file-backed generation and rollout persistence, legacy history replay, inline and transitional serialization, task output visibility, and Python SDK alias compatibility. GitOrigin-RevId: f7a2bb5707e2f277348a547a988bc33c8e96d891 --- codex-rs/Cargo.lock | 4 + .../analytics/src/tests/suite/tools_tests.rs | 5 +- .../src/tests/suite/turns/events_tests.rs | 5 +- .../schema/json/ServerNotification.json | 31 +++- .../codex_app_server_protocol.schemas.json | 31 +++- .../codex_app_server_protocol.v2.schemas.json | 31 +++- .../json/v2/ItemCompletedNotification.json | 31 +++- .../json/v2/ItemStartedNotification.json | 31 +++- .../schema/json/v2/ReviewStartResponse.json | 31 +++- .../schema/json/v2/ThreadForkResponse.json | 31 +++- .../json/v2/ThreadItemsListResponse.json | 31 +++- .../schema/json/v2/ThreadListResponse.json | 31 +++- .../json/v2/ThreadMetadataUpdateResponse.json | 31 +++- .../schema/json/v2/ThreadReadResponse.json | 31 +++- .../schema/json/v2/ThreadResumeResponse.json | 31 +++- .../schema/json/v2/ThreadRevertResponse.json | 31 +++- .../schema/json/v2/ThreadStartResponse.json | 31 +++- .../json/v2/ThreadStartedNotification.json | 31 +++- .../json/v2/ThreadTurnsListResponse.json | 31 +++- .../json/v2/ThreadUnarchiveResponse.json | 31 +++- .../json/v2/TurnCompletedNotification.json | 31 +++- .../schema/json/v2/TurnStartResponse.json | 31 +++- .../json/v2/TurnStartedNotification.json | 31 +++- .../app-server-exports-experimental.json.zst | Bin 165261 -> 165463 bytes .../app-server-exports-stable.json.zst | Bin 159413 -> 159737 bytes .../schema/typescript/ImageGenerationItem.ts | 2 +- .../src/protocol/thread_history.rs | 25 ++- .../src/protocol/v2/item.rs | 5 +- codex-rs/app-server/src/notification_media.rs | 7 +- .../thread_resume_redaction.rs | 6 +- .../tests/suite/v2/imagegen_extension.rs | 23 ++- .../tests/suite/v2/thread_resume.rs | 11 +- codex-rs/attachment-store/src/lib.rs | 8 +- codex-rs/attachment-store/src/lib_tests.rs | 5 +- codex-rs/core/src/image_preparation.rs | 3 + .../src/tools/handlers/extension_tools.rs | 15 +- .../core/tests/suite/extension_sandbox.rs | 155 ++++++++++++++++++ codex-rs/ext/agent-message-board/Cargo.toml | 1 + .../agent-message-board/tests/local_board.rs | 2 + .../ext/goal/tests/goal_extension_backend.rs | 2 + .../tests/history_notes_extension.rs | 2 + codex-rs/ext/image-generation/Cargo.toml | 1 + codex-rs/ext/image-generation/src/tool.rs | 50 +++++- codex-rs/ext/items/src/image_generation.rs | 21 ++- codex-rs/ext/items/src/tests.rs | 79 ++++++++- codex-rs/ext/memories/src/tests.rs | 12 ++ codex-rs/ext/skills/Cargo.toml | 1 + codex-rs/ext/skills/tests/skills_extension.rs | 5 + .../presentation_dedup_tests.rs | 2 + codex-rs/protocol/src/legacy_events.rs | 5 +- codex-rs/protocol/src/protocol.rs | 11 +- codex-rs/rollout/src/policy.rs | 4 + codex-rs/rollout/src/policy_tests.rs | 115 +++++++++++++ .../local/rollout_migration/legacy_event.rs | 2 +- .../src/local/rollout_migration_tests.rs | 7 +- codex-rs/tools/Cargo.toml | 1 + codex-rs/tools/src/tool_call.rs | 5 + codex-rs/tui/src/chatwidget/tests/helpers.rs | 5 +- codex-rs/tui/src/dynamic_tools.rs | 10 +- codex-rs/tui/src/dynamic_tools_tests.rs | 39 +++++ .../thread_transcript/other_items_tests.rs | 5 +- sdk/python/scripts/update_sdk_artifacts.py | 17 ++ .../src/openai_codex/generated/v2_all.py | 27 ++- .../test_artifact_workflow_and_binaries.py | 24 +++ 64 files changed, 1229 insertions(+), 125 deletions(-) create mode 100644 codex-rs/rollout/src/policy_tests.rs diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index 0dcd53a4e6..ac8dd51de8 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -1970,6 +1970,7 @@ dependencies = [ "base64 0.22.1", "caseless", "chrono", + "codex-attachment-store", "codex-extension-api", "codex-protocol", "codex-state", @@ -3757,6 +3758,7 @@ version = "0.0.0" dependencies = [ "base64 0.22.1", "codex-api", + "codex-attachment-store", "codex-core", "codex-exec-server", "codex-extension-api", @@ -4618,6 +4620,7 @@ dependencies = [ "assert_matches", "blake3", "codex-analytics", + "codex-attachment-store", "codex-config", "codex-exec-server", "codex-extension-api", @@ -4771,6 +4774,7 @@ name = "codex-tools" version = "0.0.0" dependencies = [ "bitflags 2.13.1", + "codex-attachment-store", "codex-code-mode", "codex-connectors", "codex-extension-items", diff --git a/codex-rs/analytics/src/tests/suite/tools_tests.rs b/codex-rs/analytics/src/tests/suite/tools_tests.rs index 472cd83b9d..f43d0c88ba 100644 --- a/codex-rs/analytics/src/tests/suite/tools_tests.rs +++ b/codex-rs/analytics/src/tests/suite/tools_tests.rs @@ -40,6 +40,7 @@ use codex_app_server_protocol::CollabAgentToolCallStatus; use codex_app_server_protocol::CommandAction; use codex_app_server_protocol::CommandExecutionSource; use codex_app_server_protocol::CommandExecutionStatus; +use codex_app_server_protocol::GeneratedImageRef; use codex_app_server_protocol::ImageGenerationItem; use codex_app_server_protocol::ItemCompletedNotification; use codex_app_server_protocol::ItemStartedNotification; @@ -875,7 +876,9 @@ async fn image_generation_events_preserve_transparent_background_metadata() { id: "image-1".to_string(), status: status.to_string(), revised_prompt: None, - result: "ok".to_string(), + image: GeneratedImageRef::Inline { + result: "ok".to_string(), + }, transparent_background, failure: None, saved_path: None, diff --git a/codex-rs/analytics/src/tests/suite/turns/events_tests.rs b/codex-rs/analytics/src/tests/suite/turns/events_tests.rs index 5d7bf5d0b4..bfcf6c7b32 100644 --- a/codex-rs/analytics/src/tests/suite/turns/events_tests.rs +++ b/codex-rs/analytics/src/tests/suite/turns/events_tests.rs @@ -25,6 +25,7 @@ use codex_app_server_protocol::CollabAgentTool; use codex_app_server_protocol::CollabAgentToolCallStatus; use codex_app_server_protocol::CommandExecutionStatus; use codex_app_server_protocol::DynamicToolCallStatus; +use codex_app_server_protocol::GeneratedImageRef; use codex_app_server_protocol::ImageGenerationItem; use codex_app_server_protocol::ItemCompletedNotification; use codex_app_server_protocol::ItemStartedNotification; @@ -550,7 +551,9 @@ async fn turn_event_counts_completed_tool_items() { id: "image-1".to_string(), status: "completed".to_string(), revised_prompt: None, - result: "ok".to_string(), + image: GeneratedImageRef::Inline { + result: "ok".to_string(), + }, transparent_background: None, failure: None, saved_path: None, diff --git a/codex-rs/app-server-protocol/schema/json/ServerNotification.json b/codex-rs/app-server-protocol/schema/json/ServerNotification.json index ed40f2f769..1bda7da8a6 100644 --- a/codex-rs/app-server-protocol/schema/json/ServerNotification.json +++ b/codex-rs/app-server-protocol/schema/json/ServerNotification.json @@ -5364,6 +5364,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -5379,9 +5406,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -5418,7 +5442,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 b96da22504..37dfc25506 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 @@ -22840,6 +22840,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -22855,9 +22882,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -22894,7 +22918,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 6d7bfd8937..be25aa9d0a 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 @@ -20554,6 +20554,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -20569,9 +20596,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -20608,7 +20632,6 @@ }, "required": [ "id", - "result", "status", "type" ], diff --git a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json index 31e915e4e8..0daf5a7733 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json @@ -1523,6 +1523,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -1538,9 +1565,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -1577,7 +1601,6 @@ }, "required": [ "id", - "result", "status", "type" ], diff --git a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json index 0ea615c48c..b9dda6f5f5 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json @@ -1523,6 +1523,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -1538,9 +1565,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -1577,7 +1601,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 f1f9c0dcb8..6675cce9d1 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json @@ -1726,6 +1726,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -1741,9 +1768,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -1780,7 +1804,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 b1aff21738..a754510467 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json @@ -2340,6 +2340,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -2355,9 +2382,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -2394,7 +2418,6 @@ }, "required": [ "id", - "result", "status", "type" ], diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadItemsListResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadItemsListResponse.json index 5bb7c64b97..c6c0b0987e 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadItemsListResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadItemsListResponse.json @@ -1523,6 +1523,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -1538,9 +1565,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -1577,7 +1601,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 bbf8ed7d34..e297f3a3cf 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json @@ -2131,6 +2131,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -2146,9 +2173,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -2185,7 +2209,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 fe79128b0a..19e039653c 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json @@ -2131,6 +2131,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -2146,9 +2173,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -2185,7 +2209,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 9c4975d2ba..cb116237c8 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json @@ -2131,6 +2131,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -2146,9 +2173,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -2185,7 +2209,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 b7e1f4cbfa..6886c4dee2 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json @@ -2392,6 +2392,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -2407,9 +2434,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -2446,7 +2470,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 7a8a97b9d9..e2b4e9b859 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json @@ -2131,6 +2131,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -2146,9 +2173,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -2185,7 +2209,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 00d698b329..26c772ce40 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json @@ -2340,6 +2340,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -2355,9 +2382,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -2394,7 +2418,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 b0cee0b30a..d1453d23f9 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json @@ -2131,6 +2131,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -2146,9 +2173,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -2185,7 +2209,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 ea56799c41..03167f2455 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json @@ -1726,6 +1726,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -1741,9 +1768,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -1780,7 +1804,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 e2039c8c32..3f287eea16 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json @@ -2131,6 +2131,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -2146,9 +2173,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -2185,7 +2209,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 a0c543c01f..ac2f9e2a8e 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json @@ -1726,6 +1726,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -1741,9 +1768,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -1780,7 +1804,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 f2f5c903f3..3919455d5a 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json @@ -1726,6 +1726,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -1741,9 +1768,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -1780,7 +1804,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 6f5969c8e9..c85c9ff41b 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json @@ -1726,6 +1726,33 @@ "type": "object" }, { + "anyOf": [ + { + "properties": { + "fileId": { + "type": "string" + } + }, + "required": [ + "fileId" + ], + "title": "FileIdThreadItem", + "type": "object" + }, + { + "properties": { + "result": { + "type": "string" + } + }, + "required": [ + "result" + ], + "title": "ResultThreadItem", + "type": "object" + } + ], + "description": "Either inline generated-image data or its durable attachment-store identity.\n\n`File` must remain first so rollouts written during the migration, which contain both an empty `result` and a `fileId`, retain the file reference when deserialized.", "properties": { "failure": { "anyOf": [ @@ -1741,9 +1768,6 @@ "id": { "type": "string" }, - "result": { - "type": "string" - }, "revisedPrompt": { "type": [ "string", @@ -1780,7 +1804,6 @@ }, "required": [ "id", - "result", "status", "type" ], 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 f632cc10f6f86a543d990dc1d70e2a9d8464a0b1..a966e2d0b036ac017ee6cf2fb229429b2030917f 100644 GIT binary patch delta 164179 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%0DV-X_~(V_Qq+;d7gW{z#(* zQZ2RtNfMf5ysRNt$1iW0ku9gpi4x$)1-=)+byc><)B>J90sn2Z8hg>B;pMK3IxaUn zH~_C)I94euE5g)8sQPSQUm(JV(x@AYvJCL?>x!DK`@J=D>vwKuw7e`k)3uk~iIeLDrxT**FCmSAUXam~`u1ucSf-?30u7{y{x2u#>%5H<2$_kmkV z4c6uf#3izIQM>Mq(}^&;nOyNXB$)2e$%cUw6r5V`@E&&5i|$=Q#kq^lT)r=MGZpqs z>w1yHG`0MQGA4fu>V1j##zm{0ZN(wknFZ4WH?q~@zZ?pQi$xJ}!~IZiW|1fkSf22p*y*dHKF!0(~M9xKGYZ z`S@M))bzO}%v1VJdn&qQCBg%ePikW@vs2M0DsJOT7sgX`Wb9VE%sIq6j1}L||HE}+ zc)HdBYlVN>o=wxnbexpF-e2|15J0INw{S9-2U^CISoXes8;W+Sd6 zA(Pi#ZV;QhMu|>Ge8D7ZypJZgK7x1mb(ha?_gm!)qCi zwEJQ^H*_$#84~5>5(o(lWG}x?ecX122T-x}c zhSYdj|2xrDinYNj|k`dtusWFcRlv6^)#D)sR zlHZHN;bY1&p-?#b7>6xz+q1vmcCCs6um)&@03Zssf8t%h7hO}2O1jQyJPTxGglvCk zx(>1vivbZ9lF3&|Ysiwf;83dgS&USqOfW+tb4A%>RX;9@m8j?oqYWa41Hi<`c%Dx+ zo_YC^D~0a_;5qyEwoF7AseC}Udxv5?oFH>Li%-I~-<^Eo--JOc1AAsY-_W!pVkcnY zJ;DdtM4I-H$nueBEW^3uR~@fM^%Z|?naFqm$d+JSQcV$)V8}t_!NY0N!D>2xKKObVP8*2~P8kXCH3nfb7uqF^Wgoa#>D?)}eJlJwQwpINRI3$W46u=%5~#{oi}vQ=;xt<;U`o(l zV}++oVjUKGz5R2r;3Mvzp@AN-dIHI}U^_xO7U2T~1hc3|X%Moa`ltYeHbp4D7@}VT zp1hm?4ZM1APn#b!BJOQI9WZ~NNTRC&45}mnu;t52EoxXn+rSSoJQrjvIuN<@PfY9u zM50gMdRce(Jd3l}4bH%)l~iW}sE?yws9fzYRmv~UWB-#LgDcD(7m z{d;g%qHab8kpQz#cF7D*$&*Fr9cs9C@w~Ih+YSgj2uM$K+pUGN6}W#m(Q_gWf$9{k z9RyPCaM25Yrs}6U04WWhrtdN{dr|42JIU-bN-;FjFlj(AhAKk7Gr2pyq$tAcvG`awqib!Q1Dbu z9CVm23UT1sonebwDD;0LG^hIvN)#Od^;dii$rHUW&$*g0cNV zX{SDecgl=f0J|C}VU++^K&ZdWwlhxh%-Gduwef)R}8`Qmmrbw16)4oT}Dl9^+~te zs;b(Eo7A{dCsP`KFkWmS$%Jxnbh|?Tgs3johsnc8Hsg;WYr74}R7IA>QUpdF`_e9THX?_OZXw9rRT*rii z)Kia;SA8BC7n@X+4^CmuMh2lUFa8~~u#wf*d|Ly98Z^qg&T4T7OiixC@ zrL9(71G32o)bQfhEHkCi)vZ{10RwuQY_Dn{vdm|k!dFCvr%9i-7Km71dBCnd*m zx`O(v*nwPX?ScnMET#(LVy=zoc{~$Q$DWga(i4m;{cqEU-bRDaR~DPqgkH$~TpYy? zXXV;jX23~UQG~fzS$ZTR;}mBqmj#GQjOcP&Y=c8KJalF1&(%~pjE2ai@CL#$@QJJO z9AAY5(-KGkBzVDH5p~LSyy?ZUs4lOM3B%qwRsyJX-dk(x6+by1f;8?cl#cYn+S)vS zTF#ZyYC2|U+Pr&_U4}s@+X_$o>>2DCDp;@Opa3a-D?+q_9pbl@*xVDzdfF#}m0Q3y z%?FAOEOI_oPH5#jTX5>b&-o3w8pV&>AdRN3!HUhl&I14zb~L7x$-UP+ZBM0Ua00SQ0`O<$JmwsPZ%Oj@xN-_ z&HXzi*7ae2u=2{JTdp0C+i&9wm<{U0CayED5?(AI7xei=*nGO-!-TMFW+EWJYx0%& z(!4;cN8nbMPl(v0!%=XEJ(6S|<3cQgk0O8#7~L^SwY2BwaUqr;JNY?U5>W1cd&S5E zPXmZ1an>ixu#X|m+yWU^L{K@6VQB>O!IqF{fi*{M1uW;B=s_)-NlC9?`$W6U=~r=0 zDVQe(BquO3m{aZN&=ZxJ4)M&*uY;yjow&8Up>Y-VLAWSiH&7#2_@k9PJ9)ELM=y+(9p}pftj<{m95(IYEIZ$RZ4Y_RZjpo7$m!S zb}JdyxpZY=<5q$MxlGohXL}dC3ZK9VR$Ki8UiY*2)vCol6KA0pSu8?Eu=84{tHa%a zA=(6m4cyZpiH90VrFRO1pZ24~Q$NDiC!o3DRm_ODP%%C` z{6FE z(^I#8O-mHL4f!Uflnc_UFOoGDD;Cjf`#uUF!y*j=svyC&6Qs|s5Re90PP7aw_wQoqH|51=#n0+ySb=~yxVGnj|g(iG6 zcA)bB;Tv=1VP2#yXD6_^j6C@?(~I+|S)Qw;$>YXKQS)JD_Q*oQKf4CL_z1%Y@-#;l zMhI8(x2Tyh3+@$7kI*dPPY?=6!9dZNhNbpB96`mQAYpg`i)ZIy3oyQ`yC0fQDCzfsb>B+i&&O7R z^c1wx{?o0egZOlF3>f3bc}`Chu&d7)Czx&_(=WoM3tn7*4PCc+*t|_~dj$o-9&3Zq zW8i{UOAaCdBU(moW|Fd~U{#ofq30lCf^o!g=?L)C8+iCXxeY>Xu&q1VJfSpX2xEl`N<6Czv+I*r7&IAL3 zjp9!K5qK~v+^MJc?b`U(N z^kwxQ;Y})N?${ILt0I0$nw47l>I)b^sx`G-Oxx(9z^9qTjtpd=PxS?8)$n3B9`s|U z8;G$K%y%iVcKdqC7w}XFF=Bf3u(E0#osC0=ntd=vGggtcemkZ|2NmCsJfP3ZL6FgKA1^l>+Uhu_?ZMrNvvHwu2iO)5;%U z$O~*l#SyCPxo5yQ<~;PAl*E^v!=?)n_4pfZd});|zog9YgG^T7xtF1cZ2GB8xJG zZ{zR*jio*V932)jmvLm@(RJ;O-UBCIf>`$KLr@wCDC6>0EmxLqy6}nyz(J*4Na^QF z2V87;{ds}bk!UI7D3kZ;W>Knr`dx*QXSbC0=&A9{!=ycfDrrx5l4i=FUY9cH8HPrG z)HA$M!zq$xQJa$;%+9QT*8^b6y$C;ZLUY~H>Az^>a=y1aIqLB%PCpsCh#9hdAa05xswz>?A^MT^qdC1P=%{k96u}*8_nfG9=H%+V2dM zogwQ=E)Olv5M_am9_D6YAwX5gHf_6D*aIw)lCd0#L&lijB=DDBdJ6yx(G@p;28D&L z^NBF&LKa2+gZstz>*T9?Kd3G;lzqLU0;EfTc^2Bz2lo))x;y-CVI>jo`dL8(B5BhS zyM53^Pzv&41^7c|Pa6pz+x*n$tRymmd5l>v%;!6aud8G8d#*kg|GHV%_vjOOY5@aa zO=!hGJfWa`U^p-!3yGDzZ+~-tGvYTLFQ9xxs2#}zQ?!(rX zb9t#JJI86mJ&%t0;gldPrIcqoP11=p{M56HUN{+V8H9SV)2S~R4n!({IHp3+iHQ{6 zNC)>xn&y)rqtF9zZe>t2yoX=LI*m9}H&Fic^0++rLV2|H!~4(nWFYo6fgyouNSDWp zb%oogT(*8~N9Q6Ox>V%dD2FX{6m*50o|nx%%t%p#e1UZW)*aEoUCH^FE;|(0{G>-CxxDh;gb$_td zf$BhmfrcY=z|KVE=@REy&Hr~;J@$Vr*cqB_Sg7f%DApG6GONDO_3B&dI%W&J>NtJ| zYO(l_oZWQXFJ;Yt7hDkO)4b<-RjNJFP#wb0FSEuFj7Nml4BI`kYe?nl>8^N|wNYz| z?pvtJZ(hGGW!3dRupE|(C-S6;IW4fTaBvp?bOk4y!dY2Fi+xmbofgDUyM1poVzG-S5U z;)}LanI;?p!e_=_JzyRdP}q6tj1gd<->)M}>?Ft~_47qK#!1#eM?r9*%QrY4x9+xe zwKpiPei)K}a4#+@-H`r%!Fwui2L2@JmHd*O_TX_dI);j-XC_iaG1 zvi*hTgbnGHT{GnwzVWbXoO6NC=$=4}snIQ?Wy`asvQSwM-(!uo8sqN2GaK5=L3-80 zqO*1_7p&PsoNyRmI!GkCOz!Uf)nhWnmu{ zzBx}tRyupAczsuSk)E`gj=GOPW>tHC5R)7CDKTc~!IXSy^t|X;R_lcpAOdEMn$h=v z(6u?g$vtzT(D7$?dV!ZAd!W8}bQr$r3;>93CmmopgQ~Rr@q9RZAlQTrvRl2;ii!`F zd=xE9pr4Fi3w^zYN~LV=2tKjJ3Hnb=+qjA7>)s|nx?F=W$b@86cHj2z! zI5?DtUCJ#*ZoD8xf2}}?Yzp-G-mHW(!0QAjDFvT_B*QEvg3BW{awDLB&LQZU!%Cda zF!&#@Dt2Ur0L%3AP+9jK>}?vAHy;A;?7PTvUanb$xH#yuOn(wwLaIUMXv`z!ZHp4G;Yd;E48agtGsS0^e1;!;_2e7LE**w zL}Msyqv&!=bjvo7Yt<%yh?P?g!ll{gUE7GHt+Lz6;0>IfMj!zqFhg_xT$%IT8Q(~p z#M7=>(73=lBa*ONT#GM`C=H0O_YJz1Tau3z%phWt+1O}uCuX^^zZlz~YdK*9hpZ}@R4A>X z3x4P;O>bU>TaGLa0}4ibbFU^yWf8XkuF_0_T5NHa^1Gd}s^!np@J{`aNt&9zRy}$i zt7=Y8uia%$ImmT?Y))=zy7Gkq9R;=|Kbjsc0}xAjKKwq*dbP$|ehqOLg&{aXEE1#M zjfI5;Z+qSiMG+9+I_1~78@!lG$;8Q{r}2~;H(>Pjw?-`~EQ7T;FGR%yLG{4A{&~+H z=~25!$WW5OqmAIXI2nq?p=>PEb{0s6MU01yKNdf+AYwm%3$Eq^8^AJLW-`&*&@U@J zNu`jaFMlIS?AxCnGl6)sIqE+(T)UJc7e5}BtaN)t#T?k`0H+A!LM$hXnn>Lfm4qo? z{lYlqn0~r7T<}*MWy9ha-{qo;I>mp$baPn{(4#sQASNfZ13-b&NO~+|p5~Oa51NIy z;tvdBxq2agHDZxNAVKYdl39;5^z`xO9#`K_7Xe&4&^PYQc7n+#6`i$)ja)fLZ5y$I z0)vgAQPjgzV?wGnh>tH21b6#P401G`HZb;rKMwPJLo=n3Myf~s@%m19Po6%L_)e8L zWg{El5LSv;bQ%ADswsTlURq`}#i7Yo9^JlSP2kcocV@EYW>i7u z+dp4_2SF`a(W@eGU(r({GhC*5D{Eiej#%MbDH;~BoyoOE+b!4SHZoB)D3jzxSMQ?^ z=nugLDIxhOX#sCkR|zA8t;hw=qt3?XTm_dq;qV^~)thfJCcGoUNyBqJ zTO_1>fW0y=t0!_)#t|G*yo&E;q~3Cmkd}vkwgIwQ6BMtxs~146>g!)qLNAf7mPil5 zpX+O1=iaL+eIx&^4BmYfT$F8=hzKf0>|Pi|#E#6CUPLq}DC777J;h^DSV#JZB2+oF z;tk%+P4_&B@fY2Dg?mOrxl|=1d78FsZUU7ghB2=65kVDSLqh03~`7WFYh+dR` ziIdkxg0-dzbc1-=WJa5?)ONiH9WnP<*H|&c)fhw*1khWu`W(_)HQVT~h zlrbw62WPX}CR*R*P}oKA>;#6MVHw4L5*{adI9fcBHQE?=gt}(bzGfxf7qV>UGIBu6 zCP?h9!$S7jM)^b>bT=(b_m4>IyHBzpqv{-!U`kMwtPbQAT!{i5KG`|83IRwpt6w7BAu`D6Vulz4+Df%MeZNDM=}% zo6yyd<-Cw3ln&_QF;y^9=1vF_b+XQvF4VeXXj-Hav(k=BUIwsKAnUq-Nh8*Q0?&UCw{4!^Ia zr0T+bl}i#DdT{be0_ti8Ksvn^>9h(N9G4NTvr^cR5PEr5Ukm1;lo}>N14nv$%WYdu zlp{z-*t@2xcL4OjSU|htqx6N9{5TySvehUtaou+#22&SGtb_Oj&_X#3_q#y7pTu;Z zG=9FBNP*0-8$t8UGcA{YK-jd03G)Z}?aj{L)F#jv)j0>WOi6#ynH#=iU`?_voYsYZlQK871=7y|Gv0zNj26P7+NTh|(YxTll;8 zA6j*`CNw(yxjkF6ZF6$b!f*OA&b8*qR}0TI$0PQj_a!r41kdKSAc9cQe@v23)^|2= z;!EbnnOo(*;i1)kgvY@u{a5yGTW{{9&|*@tj~c`m%4hMZE0dpGW}}@->*7yit<)6G zgu>sD6owI)j#{ldk(QQ$uY8e=-u!*p)}qlN^4~NZSPh}DnzM4r!|`$vJueyomZ04_ zK%TtPI7{i^uw{KH#J{%K>d=WdHT0w7iOe5s65^USBaHxmguZf1majnt3?ClDF$k$` zl6=tXJ*m`}Rcd^}7Bi+*in0_zKRRAD{GI17@og;EH>?9F#K?gmiZxrN0(jH3n61TG zF%vgOErNvoU~mB!AscN*!TVIDhaF8N=7cjO>j#}ANB1q3ao4=z=}O;;2?8zxjX(6c z;jyPAgMKo9YKE*3yoO(TppsdASK{%=#2COB&{-88+i*2PoOpJj*|<^2g05~?FOU$Z zy?h?QVOcdc&)c7-C_X;CW@iQ{aB#f7J_r=4sklg|4`X|r z6WpI+Bbay%lWoA^lKpX2z71$j@m)MQk!=*{wkubE|Gp_Ha*7eu{!aXc(LMv(F$^Uf zSw~*hYklyT$R1pnf$`T1FS9}kuhWthuZd>lQ0Y>20XI1SQeW=6KcYZP)k*jJpV%dEOrh)%0Z%Tj+v zaz@juIn&Z~#?1mEy)q4@n=0J*OxWj12{|K=MW4+yqUfJ2{FrF~fS>FLK^z9Sd6{`c z47VFRTA&1AiI%oyArKGU76OJIjm)qe#N6F~xFlxS63}ro^_I+kF#(#_NZReyckMJ= zn@$%dtLwtm#)|2?xoa;qcq#ulhr~1*5<=a}N8$fY%1>E0HUNY(%-Z zgUW2l0h-y8NWEZhIss!(k@_x?Ly4s&uwI!*U;mLlR-pD5J#%?eqQDzlIdtN9YCy9z z3f7=(hn7!s|2X#u6q z+Gc!7*8m>XKCtMbT`p8-H9?%w6iH8YGU`WOIx8NR2)xl4aCUtDQW)Sr97+=jIzm8O z10Wj)B-L%bG)b+h0JY^*S+FMcsV7m~K)onCGl=*H66^AdMPd3_3f#JJtI1c)z{w8` z3=!|*zOp4+>e$XzGHUpHa|~5~{(`JK6|~+2tqR<%7(!8Tqaxkb#eStmJeG9f%lMVV zlt`~2?6ueIZU4&91vBG6NJ ze&_M|g3!?j%Zna8$}ntxNWv))DaItI!|=Si3ZNtLvQnO~BmoG25+o<;t`Q4)garlv zNt?x8hb&9Mp9^_ut1q3%OOgvYB3RrHVnqGQm*b{XX+)Jv8oQ7j$`7@vc{nN{R2wx$ zkfAWZSldIDlX6cz!aWRsYm8H&hJ4Y~5@G_V6$cf;npNiIX;6bvgaqg#+@>IVB-LOz zY*dZ$V3gvz0oNSPRONuPwUrSE#g@oxi6p)?_O>B5su)qB2Kx|MdFd#$5E_}qnsFwM zI<%s5xj|)gleVy$R~*IFRK+dU65|C*QgR|X>gt2sE^_zRI&h$W0faFFMMF<1p$I4= zH6^>n0M4=gFy@wx&tHu(N5#_|#~klyOot2tJPVKX0dvVFg%AXv0G8}s6OZ})Q&LB+ zFUwFGi$ecE007+;?(lMp_&%h=Pm!a%IYPx#&Ohz8UVe<+I;0b)n7_*EF| zhnsxE-eU*mbbw5M`C$V^CfCD(MMc$diP7pLYHAU9zJLN4n?$5>gqs0K`1bAeqRXS% zoC~$7Axd1O=`i>}$F>qdJGzxAE^3h`Ii<+=5ZbYTh%pk#U%(H)QT{rGXma?eJx|fJ z=6+lyy^lF#K{1p}2B=g$9AZ6yrpJ9sGusm9a9&DBE3poLeo&lNCo>H62+kaXP0Dd< zTUOMtz)J26$%m1H@F}6jgoY|b0N{7nI(@`lmIG%2kn#@o1_wyyl{lcXNSHTMnK?lr zx%@Xp#_Y7pN$f>N1&qSXlz~@F03~58#*SyI9HB-cRBs_LAj8$6UUb|)u88mwfT#n_ zrAkZbTl89LF7n1ldQZW7WzrIE8|W4X=2S^xPC% zU!2=;$Xk(qf(_|BpfS&0W8 zrmBi|uIujxlk%sH)#w!Y=H}lZYu;E~MtfRF@@*j53dmTsLC@Vx%?w#^csYeX7q{Z& zd485F7HU(hg*%L;$`N}hK&y|>vhw;PrUmmk1S`94L_F<00wtvMj|3L%DQnQ$)-cEa ztO5srl#TVfYDhSY`VhGixtE>__Rz^&$qr}11Ea-Sp~cZtDDRAzjG+#MvTO=7w0H2r z_Tt@1B{O)ZalAkHX9CNwtEH)MV*cC}5J80MU<#FRnxsf$a9*6@0?=BeB|>6uN;X5y z08l%d8A22=00?N^{_JBbZuAvzPTAnR__ex!zT}|k?LG^qx+LI?m~W0im(8M7YRH0I z9h4=XTVv;PIxC@)O`t$(Dhzl|d_M$I#ff*1gByEXTRTt;f|G6`MC~HL3Jy_BHiW(a zsHug9F@)KB;9}G4u6Ur=rw4*5TVyYZvRaKLBasFH4810F3BiMnuKkO(tvEm9OnfRHKRh7K=%fpQ-8^uo!z7^#RjOAY zRisLyI&QfzwBssdkZUcGn2m8kj*! zGax?;p9qO#0Rw?5xU;tAEhd3I0K1#cvt)`akPSrPK{d(2Cwruj+hSvnTqBHs1_`XP zAnFMb?o)`2e?uf;SIVk|ljEQ&%Ag)51cd?lmck;P8a$gftOpngG}1yfD=B>GPhlK= z&YgvUf)s?%RE66m!^ZdPwVaU^Oh*f$6u4lND1=&6#pAUn)TeGBE;3YtW3GhB2?}yt zjKFer&-7lOnJ|P%Ghq^&@(F!^n65W8~L63j0lFdzZ=C8Qa9PT8eT zf#OUmDaYu}))GSO^zcj|UE!>6m>(FDWt<92I_4@0hm5ek44=RjZd!hS?1ZLSg$>OT zzTThphBh4WrLcza3H<#Ue-qDU@Y@fP4r+?G&A$?tKlXVZ1QTtTJDf5NT(DGv~Pj>@eMflw5W- z4u$?m&E6FELo!1T56&?;<~g@)YK|dRXX4*!n7^BvdBcZt3D!R4`?MhN_icZ{)&f}@ zX-jPs5WA69Gx`mzK3GVfo~Tf0WISH>;4*_HG(f#QTivRWys&jGxl;>S zLAb6RD5n$Ao$5ur<$_owK{WyhU9!IFd$NF`By(EKuQ4H%iF|oL!OUBmfk1C+Cew~V zlML_}wE6;Fh&UX6@a2hh@aD^EkX`y*LnuA5Urt;O8+vqq7|C!q1{3T7jZh0kL_U1= ztE-?8C3`xYEK5N_8A2rZnVJqfr)po1XaK^Xn)CmfpZ`rO@I5qmD5@{!9E-?m(5Z*%|4xSNIkOqw)h`5v!iY$JLr4JFepY08{d#=Seu*H`0GJYV zz7!#@{F8&%;uc6Khl&NJtQf1WrLrL9a1x%{rwFs%6DhY8N1pQ6CIdK(@3pZ@CWgwn zIb`b^q_`A!FrbXY z8_Hp42bU?|S3IPIk0;I>`-`xf&4IC~GmLUFC}}lYr}3BR49bAh8cw zwDwImfewUuh=uy)5X0BG!?C3&S6{k$Q|Tc$>0nh?dKou)zey-qw_*=@()nj7(t+x!XH#Cj`uyZW4I<5hH(Wcet>k z(LL#tQx?3ruwqnjjQwlTG$sN`=1(|YMP*>Dgw!C?#?}R*!ca4MPH>PUTiyGAh!mnZ z^f*Fs#PnYQKP~X%XL!cHFH$x+B!*Hl8YuxNvq0EOiI$l(0D=v9QXoc>4FE22=vC)gj>9M!*`9 zUrqKR+Bi;PrW1N5M0a{90Gs?7y}FQj$XZIIi1{rJ2}HxR1F=p>4PnC=LLp`v3E;0h zpK>^|3e>ojZDz)C3s=9#b?Wzi7*%7t6=#tIfqz?zGUrpmGTY@|v4`1;rEBJSoYk0+(Nb z8hKFR!^QIA0?2P-N6xMfa!mzv7i_K2a&fFKPe+my2XJmQx|Zuh>nd}}*!B6gVUW{$J{N|{tq-#T~^Ud}MO@~SUW4Iwe4 z9wQ#9FdXRyl$!vuiX$38*8_H)0&O>@vfx#PY=$r~iZXAjS`|g$0{XWW=2>Uf`YX0S z@t!Y;i&-zn_mNy#L=CL?qyM^57)ZkL?N^pPk|trRXB2Q43Ll?C#1+W4Ug!7a8DISN zzg}~v?Ytkvcjvr0uHprDNvW{C9;UUfPZ!ef- z5Qf>48TKoG7zqXffgk`v5QGO&2v9*##yYD9uiP1tfgS!^07VHhfP5a#e~`m!hCZZ^ z(T7b38xPS{YR6AazlVc3CE`OMxan`;8b*r-F$nHxVnRou%@^(Rd2AQZ&(5~FHec~y zOjND#6-?=XE7|iWlR&ZA_wv`@ZrRA)Gz1}WL*rcFtK-!(Fl%qi~3RqvE+5NQ(#aV`} zUK|^LS_mhzjB!_%;bQMZW5O_mTN#GacK@o|uv|7W*-by=G2;USB@o$Rrp=$CKwtAb2;P(Aw6H=_-lJ(QSCDWpe_a7}mfyctjAWOOn zCK<*PqJDlQK}3FJh?ev!Xzn%>MAA2FOox#tTM}$b#5K3oAoo5c?BMeHQSpa>{VOVe zMGy`SU+)p^BYbjOXpb<82EDano9rxe$`e$E><)PXN&AnFx0konBc8Y1w&NRJ%a@U8 zc|dlS=yzvHTRWt>V@X;ZtF)*kU@M+WiS9N!roWO3zRmVO3#K`V+$HWpdJV4_Y_Wlecp40(;h*2CI8Xkq8EVU8gFJ zzjlc`+;)kx2D3L$Hf+!eNPx%?0kl0Nnud(*2<9iIr*2^LYR{W6-KQXPd4(}~2HKND zpOZxLgk1ewmgmyRq^Kwf#@ya$)?72># z*XVtxLQ9nC{ZFsuhP&YkQI1i6H#v?d?za<1KPkU!iU#n-sW4Not}93eC0o55WHhL+ zI+P!=!+ssVg;}Ly4dslKGY1BPUDD{{d`RV`sjtUL9Uh ziCRTyEIPGiU{wDs>r${rz(}G-wmUt`JI2`@IfG_8aALK{vY^}(j$f9U&U{>}>x-Zc zP0D|To_G=n}MWuTp z?6`#~5qg%d(9`f6JJbOLO9Y3o4-`&a*_~X{XNeebrQ%&@ofzt_*%II0h|T$nywaCEYQj z<23)s!355e4!YuCB{c2KWc-^7$&!4PIb%-qY!&FK%)_vO$Qp|I+DisiIppd8&rx@N z1ojfQ12MIcGX~y&72J?+4EW*JDnQA!*}Xg|T>q?|n2=6aF}opZ_Yb17?*%Bgq^}=_g$8Wt?=2e0n0*;LPnibjglTP03}H z@_ryNRXmq<`E%x2q(D%x#7H5b)bowjCnc=1vUdg<=P-M5_(LuZV6@Xn}u`ZBhCN&)&Y%&^i z&S#p1{M7S{3sH4yM$U)<)88@KArOv=ernJqvcMtEffqP`%txa-$KX|+aJI3?wW5k7 zQzmu@btkDy#Dc)>753*W>41*Wt8*z+Kcz5#-l3Lc)#2l&uR#72jlgA9b)9%F9ZUJp zD-9$VF~;lBnhQXq2XlpoQJ@#kj&_0)YnL8TME*iwy3Uvswi2(u^;=J6kn&9$q{2-A zC6+^7wjmW`N1H;~QKX+1RjdYsKJX`2W^nX#qzVej-WV() zDji3At3m{K7xfPO=9Vfd1rxZ~(ntdc5I-+LY30M0xG^?rg)bkqx;|2Cb4slFtf5*f zi{E$BPN@ z(>VPkY{*ZaP6@iupr=b#wy;}ZzSugP%s|Llt$P+x#X;Phf()1~s}YHrx#69E`g!%C zc%n7FZI=M&&#c%o}>K0SXn(HdFiY^O!4WdcL^%}U_ z*G%l#YqVDyu_pk^j1Q-1E%Q5*LG~C!Ee|_}T!cH_T`~;c=?c5N_^Fy^rUGTUfe>+V znQlG_VminOBJHH6~F^R#chYXA8*_8mKYOVWnyb%;P!p#ZJHjueJNx&H^AtBzD3qA3Dljs zCK$)pgwfhaS=NQyTYqlPHXykYC1g}w|2D z+i&*(kKvZ1Tw)cs6~&HTyvJ;t#%-_Nd7eLVL4>;#>i2}z`8PIKGJESf(B2}G+S_50 zHRH9nw%GO-RI)PH0?sLa=3P3hJEc8$;S_g7u!u}bYNUkecL~_r0pdM(6R#2&>>Fee znWDJzT%(11h%EKO*(Y$rK~f7{@H@E1Q>=gxpl54JO>bPDQtpL%-AD)6(aNRan)>F6 z9z}TFi57EJ0U?uR^Q-U(iOJkwl$Szvxu87)QZ0t;ay(YqT{C-sx!#x4Auf~5DL$)> zvT7b8bF5$E?zKP{&)bOgb@!O9_m+f6?o*hEPTJ|Y?fI_$;Q<=FQz6YQgaLXJ2ca2x0pB}VMm(~nua{f$3rJQ z(;vY4V8c)>57H<$=h_f*&NygFucP`$kjFfQgMRofO2w^wI8-yaSD&=KuoycEuyiwr zh4iPi-$!iB7V(Ci_hT#whe0pkK#ZS^W0=w|z!$9C*ma11f5*7|3K~6 z7is<81BYQEQwKKeg?92-L~FZ_px0*EL#?+r%uewQ!=a;o8fLZw2j_;{X9!LjGA|^` z1ThXu0H>^1)rhB3^3t4*(v6&8%IxMdBa;&RX^%lc94#EpT1s;0-N9kFj)^t%;>pWZ z^-)1of(kr;+HiLpK!!>yhugZj-0gT859OUQp^oBxDRxS7$m}XS_=lx&iF7<>94JXh z>vU?79tI|+hjSD80Nhm_){2T%W9-a_`I5PmdgEJ--91pcr8D~aR(J6H3msw2I|f4v z)9&Pa&R_B0JO(2>^Knw0qWO!(o|v&%j2nwhxMQ(@4?h+g&5ucA(a6)P;@ew~B?Yjq zz(<`^nn)q-8{Nu~h0)qVK6DB9Dwx*86ZjF^^Gqa8hO&ek_f}hq=E$Rh=ChZmE)oKe;UCAfK{~sm vSZIV8U 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≥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

5Nu`A!oRf2YaT}T$!mxZdQWvQ#>ONUzpvX^1($2 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

9!t!vOq0-YJ>}U$_tfYvNZV2^mYn>^97vX9mhN zUo-G2e^Fjk*fdbXk|Er5u!RD~QA8BpKs-e2+6X8yata*;@soZ|64M@Ul7e|kKJz|Y zw+TQoxM$Lo$;YC9>YmKPJ+)) zeaY3o?OfbpHLkg-EMpKj*_fWIBHgff+@;ppf5i-nwA%w8w=={XI6Yhy*SDBN)m06e+JyR zI-6%znq;U|X)Gq4#x(ER@*mRjPb(mq+rwjt41^zDTM-mMy6gp=Hw9=@Fs=-aDiUvG zf25@vSvi~$^`Pz90jD_tJ8*WX0T^{!v`=k4{ZI^Q=Z9&OE5Zzib5CM=xEUUX=J6B5 zo&g4mp}C+Ymw%4D=ugxCO50k58+5Vp><%SqUmJ&!UABAZJq4$6zuXutuUf?MX&{2B z(ovYnWi)xRJC41FR5~RNd^!UHRKDZ!f7k7C{NipYQRZ0Kd>Nmvx$a`-_vsN$ur2j; z4$B0M%Y?s8ZA0J`nlgk>&N#tR7a&t@sT`HVyNMyOE~I@Lfd(@HdD89 z_QsTL`i0QnTHhFX^jTuI8K%g#45hUwZpinbgxj-=A@4M8pA>R_CDGLh{yAhEf66`# zkW=i4{wTy)LXx^yT#!;>#CpK?6*?N|4AVYXjg4V$VlwgQZb!eiFO2ANk!ZiDDbqZ# zoa`JXF)gpzf8a%%EyfG8)#e5!j0bWwIZI7Jc~5{A=YNxm(_E5SgRs5`z&&msjO9ME zTSh`kHD>?y@S*9SOMz%0Nzn+Bf0#&3S_0>6WeV_%B>-QG13c3CsP`* zlg<_RtBHpX)Yn^EfakZ8>dKtpU{P6E*8U3!U=)K^4J|SXd@M>LifdXz*bWusWC0 z5o4JsJqL^i$yqsR*Bv3A_Xx&A347NGIkz8Q&1FcL(Ym43klV*Jr2N_0<4<&rhODDt zpi>o(?;*!=694P1p&w_Qe+icUOs8wb?hvnJnS>CshBK^mI3Uz^0taAb~xH&1qEm4QuhilHQ}YCw=r$guzi%_0Z>A!?J!4w%!W4Q&QI-M`J_dpcgfG znJk0F&EQX1tqC-|@xMPDt5c8`X>e8EIA{3Ih#`;q!t_AsphbT+e;wL}Fs^4)%Y4|f z;^L5URn}PJ`hn78nTz*!-c+-qGbE{?&K(D1)Zo{Jy{;&R+_2rZcl}v^zWbVT>ii${;^Ou zxh&ja-r4j#AHKE=e|)ZLRHie*MYo5efhC}Tm^q0dbSGI%`LW{MwD0o;n@j$!edI1~ z><;x-@Rp7T*|s4Lwx+k^X7xQlN>ptWXt>e3F<%!Y9ID~qP6K}sgY+}^p`3hm*k>ON zSo41fj5XK)zexg(xjm$F>cY!_)BNt>J=cur>HAh#m@asLe;xwdm&PhH?#&R;s{Oea z3v$Io^B+a17+|h6-fI)ca<9~kfF1Y%q0Yrf=Ft7>c`#LQDfe7y6Yk`G5;s#2+Tu6Lh#jF!}NUDk)$`SsMmr zf**uy*cQNluAP(zf@0J{w-$AD;6m{lo6wzdY#ropf4)%(n!$=L6ii@!DsmH^bIO=$VfmTbuRO;`)knuB z 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
1~JWB7+V>@aNL1uE_dL5?K{$* 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