diff options
Diffstat (limited to 'misc/codex/files')
11 files changed, 42 insertions, 96 deletions
diff --git a/misc/codex/files/patch-codex-rs_core_Cargo.toml b/misc/codex/files/patch-codex-rs_core_Cargo.toml new file mode 100644 index 000000000000..2cf9853774d1 --- /dev/null +++ b/misc/codex/files/patch-codex-rs_core_Cargo.toml @@ -0,0 +1,13 @@ +--- codex-rs/core/Cargo.toml.orig 2025-11-13 17:39:01 UTC ++++ codex-rs/core/Cargo.toml +@@ -43,8 +43,9 @@ keyring = { workspace = true, features = [ + keyring = { workspace = true, features = [ + "apple-native", + "crypto-rust", +- "linux-native-async-persistent", ++ "linux-native", + "windows-native", ++ "async-secret-service", + ] } + libc = { workspace = true } + mcp-types = { workspace = true } diff --git a/misc/codex/files/patch-codex-rs_core_src_exec__command_exec__command__params.rs b/misc/codex/files/patch-codex-rs_core_src_exec__command_exec__command__params.rs deleted file mode 100644 index 60eb99d35251..000000000000 --- a/misc/codex/files/patch-codex-rs_core_src_exec__command_exec__command__params.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- codex-rs/core/src/exec_command/exec_command_params.rs.orig 2025-09-27 09:00:51 UTC -+++ codex-rs/core/src/exec_command/exec_command_params.rs -@@ -33,7 +33,7 @@ fn default_shell() -> String { - } - - fn default_shell() -> String { -- "/bin/bash".to_string() -+ "/bin/sh".to_string() - } - - #[derive(Debug, Deserialize, Serialize)] diff --git a/misc/codex/files/patch-codex-rs_core_src_exec__command_responses__api.rs b/misc/codex/files/patch-codex-rs_core_src_exec__command_responses__api.rs deleted file mode 100644 index b900e89ad10f..000000000000 --- a/misc/codex/files/patch-codex-rs_core_src_exec__command_responses__api.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- codex-rs/core/src/exec_command/responses_api.rs.orig 2025-09-27 09:01:29 UTC -+++ codex-rs/core/src/exec_command/responses_api.rs -@@ -29,7 +29,7 @@ pub fn create_exec_command_tool_for_responses_api() -> - properties.insert( - "shell".to_string(), - JsonSchema::String { -- description: Some("The shell to use. Defaults to \"/bin/bash\".".to_string()), -+ description: Some("The shell to use. Defaults to \"/bin/sh\".".to_string()), - }, - ); - properties.insert( diff --git a/misc/codex/files/patch-codex-rs_core_src_exec__command_session__manager.rs b/misc/codex/files/patch-codex-rs_core_src_exec__command_session__manager.rs deleted file mode 100644 index a5db5d4efccb..000000000000 --- a/misc/codex/files/patch-codex-rs_core_src_exec__command_session__manager.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- codex-rs/core/src/exec_command/session_manager.rs.orig 2025-09-27 09:02:31 UTC -+++ codex-rs/core/src/exec_command/session_manager.rs -@@ -376,7 +376,7 @@ PY"# - cmd, - yield_time_ms: 3_000, - max_output_tokens: 1_000, // large enough to avoid truncation here -- shell: "/bin/bash".to_string(), -+ shell: "/bin/sh".to_string(), - login: false, - }; - let initial_output = match session_manager diff --git a/misc/codex/files/patch-codex-rs_core_src_unified__exec_mod.rs b/misc/codex/files/patch-codex-rs_core_src_unified__exec_mod.rs deleted file mode 100644 index 77088343e65d..000000000000 --- a/misc/codex/files/patch-codex-rs_core_src_unified__exec_mod.rs +++ /dev/null @@ -1,38 +0,0 @@ ---- codex-rs/core/src/unified_exec/mod.rs.orig 2025-09-27 09:05:00 UTC -+++ codex-rs/core/src/unified_exec/mod.rs -@@ -434,7 +434,7 @@ mod tests { - let open_shell = manager - .handle_request(UnifiedExecRequest { - session_id: None, -- input_chunks: &["bash".to_string(), "-i".to_string()], -+ input_chunks: &["sh".to_string(), "-i".to_string()], - timeout_ms: Some(2_500), - }) - .await?; -@@ -473,7 +473,7 @@ mod tests { - let shell_a = manager - .handle_request(UnifiedExecRequest { - session_id: None, -- input_chunks: &["/bin/bash".to_string(), "-i".to_string()], -+ input_chunks: &["/bin/sh".to_string(), "-i".to_string()], - timeout_ms: Some(2_500), - }) - .await?; -@@ -521,7 +521,7 @@ mod tests { - let open_shell = manager - .handle_request(UnifiedExecRequest { - session_id: None, -- input_chunks: &["bash".to_string(), "-i".to_string()], -+ input_chunks: &["sh".to_string(), "-i".to_string()], - timeout_ms: Some(2_500), - }) - .await?; -@@ -616,7 +616,7 @@ mod tests { - let open_shell = manager - .handle_request(UnifiedExecRequest { - session_id: None, -- input_chunks: &["/bin/bash".to_string(), "-i".to_string()], -+ input_chunks: &["/bin/sh".to_string(), "-i".to_string()], - timeout_ms: Some(2_500), - }) - .await?; diff --git a/misc/codex/files/patch-codex-rs_core_tests_suite_exec.rs b/misc/codex/files/patch-codex-rs_core_tests_suite_exec.rs deleted file mode 100644 index 3b232ec4c752..000000000000 --- a/misc/codex/files/patch-codex-rs_core_tests_suite_exec.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- codex-rs/core/tests/suite/exec.rs.orig 2025-09-27 09:06:53 UTC -+++ codex-rs/core/tests/suite/exec.rs -@@ -104,7 +104,7 @@ async fn exit_command_not_found_is_ok() { - } - - let tmp = TempDir::new().expect("should be able to create temp dir"); -- let cmd = vec!["/bin/bash", "-c", "nonexistent_command_12345"]; -+ let cmd = vec!["/bin/sh", "-c", "nonexistent_command_12345"]; - run_test_cmd(tmp, cmd).await.unwrap(); - } - diff --git a/misc/codex/files/patch-codex-rs_core_tests_suite_shell__serialization.rs b/misc/codex/files/patch-codex-rs_core_tests_suite_shell__serialization.rs new file mode 100644 index 000000000000..9ec48d377f72 --- /dev/null +++ b/misc/codex/files/patch-codex-rs_core_tests_suite_shell__serialization.rs @@ -0,0 +1,12 @@ +--- codex-rs/core/tests/suite/shell_serialization.rs.orig 2025-11-04 20:00:53 UTC ++++ codex-rs/core/tests/suite/shell_serialization.rs +@@ -398,6 +398,9 @@ async fn shell_output_for_freeform_tool_records_durati + #[cfg(target_os = "linux")] + let sleep_cmd = vec!["/bin/bash", "-c", "sleep 1"]; + ++ #[cfg(target_os = "freebsd")] ++ let sleep_cmd = vec!["/bin/bash", "-c", "sleep 1"]; ++ + #[cfg(target_os = "macos")] + let sleep_cmd = vec!["/bin/bash", "-c", "sleep 1"]; + diff --git a/misc/codex/files/patch-codex-rs_core_tests_suite_user__notification.rs b/misc/codex/files/patch-codex-rs_core_tests_suite_user__notification.rs deleted file mode 100644 index 85e58a77a1ae..000000000000 --- a/misc/codex/files/patch-codex-rs_core_tests_suite_user__notification.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- codex-rs/core/tests/suite/user_notification.rs.orig 2025-09-27 09:08:21 UTC -+++ codex-rs/core/tests/suite/user_notification.rs -@@ -35,7 +35,7 @@ async fn summarize_context_three_requests_and_instruct - let notify_script = notify_dir.path().join("notify.sh"); - std::fs::write( - ¬ify_script, -- r#"#!/bin/bash -+ r#"#!/bin/sh - set -e - echo -n "${@: -1}" > $(dirname "${0}")/notify.txt"#, - )?; diff --git a/misc/codex/files/patch-codex-rs_exec_tests_suite_mod.rs b/misc/codex/files/patch-codex-rs_exec_tests_suite_mod.rs index e327dc0a115a..dc82a744793b 100644 --- a/misc/codex/files/patch-codex-rs_exec_tests_suite_mod.rs +++ b/misc/codex/files/patch-codex-rs_exec_tests_suite_mod.rs @@ -1,4 +1,4 @@ ---- codex-rs/exec/tests/suite/mod.rs.orig 2025-10-09 01:48:45 UTC +--- codex-rs/exec/tests/suite/mod.rs.orig 2025-10-25 21:16:34 UTC +++ codex-rs/exec/tests/suite/mod.rs @@ -4,5 +4,6 @@ mod resume; mod originator; diff --git a/misc/codex/files/patch-codex-rs_keyring-store_Cargo.toml b/misc/codex/files/patch-codex-rs_keyring-store_Cargo.toml new file mode 100644 index 000000000000..73145a2243ad --- /dev/null +++ b/misc/codex/files/patch-codex-rs_keyring-store_Cargo.toml @@ -0,0 +1,12 @@ +--- codex-rs/keyring-store/Cargo.toml.orig 2025-10-31 00:56:28 UTC ++++ codex-rs/keyring-store/Cargo.toml +@@ -10,7 +10,8 @@ keyring = { workspace = true, features = [ + keyring = { workspace = true, features = [ + "apple-native", + "crypto-rust", +- "linux-native-async-persistent", ++ "linux-native", + "windows-native", ++ "async-secret-service", + ] } + tracing = { workspace = true } diff --git a/misc/codex/files/patch-codex-rs_rmcp-client_Cargo.toml b/misc/codex/files/patch-codex-rs_rmcp-client_Cargo.toml index c2e28d88334d..4008647d9da1 100644 --- a/misc/codex/files/patch-codex-rs_rmcp-client_Cargo.toml +++ b/misc/codex/files/patch-codex-rs_rmcp-client_Cargo.toml @@ -1,11 +1,13 @@ ---- codex-rs/rmcp-client/Cargo.toml.orig 2025-10-09 07:52:04 UTC +--- codex-rs/rmcp-client/Cargo.toml.orig 2025-10-31 00:56:28 UTC +++ codex-rs/rmcp-client/Cargo.toml -@@ -16,7 +16,7 @@ keyring = { workspace = true, features = [ +@@ -19,8 +19,9 @@ keyring = { workspace = true, features = [ keyring = { workspace = true, features = [ "apple-native", "crypto-rust", - "linux-native-async-persistent", + "linux-native", "windows-native", ++ "async-secret-service", ] } mcp-types = { path = "../mcp-types" } + oauth2 = "5" |