diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index 31d8384ce4..27b66293e1 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -1913,7 +1913,7 @@ dependencies = [ "codex-arg0", "codex-backend-client", "codex-chatgpt", - "codex-cloud-requirements", + "codex-cloud-config", "codex-config", "codex-core", "codex-core-plugins", @@ -2344,7 +2344,7 @@ dependencies = [ ] [[package]] -name = "codex-cloud-requirements" +name = "codex-cloud-config" version = "0.0.0" dependencies = [ "async-trait", @@ -2729,7 +2729,7 @@ dependencies = [ "codex-app-server-protocol", "codex-apply-patch", "codex-arg0", - "codex-cloud-requirements", + "codex-cloud-config", "codex-config", "codex-core", "codex-feedback", @@ -3841,7 +3841,7 @@ dependencies = [ "codex-app-server-protocol", "codex-arg0", "codex-cli", - "codex-cloud-requirements", + "codex-cloud-config", "codex-config", "codex-connectors", "codex-core-plugins", diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml index f0c9b601f9..cc20f8a3a8 100644 --- a/codex-rs/Cargo.toml +++ b/codex-rs/Cargo.toml @@ -21,7 +21,7 @@ members = [ "install-context", "codex-backend-openapi-models", "code-mode", - "cloud-requirements", + "cloud-config", "cloud-tasks", "cloud-tasks-client", "cloud-tasks-mock-client", @@ -149,7 +149,7 @@ codex-chatgpt = { path = "chatgpt" } codex-cli = { path = "cli" } codex-client = { path = "codex-client" } codex-collaboration-mode-templates = { path = "collaboration-mode-templates" } -codex-cloud-requirements = { path = "cloud-requirements" } +codex-cloud-config = { path = "cloud-config" } codex-cloud-tasks-client = { path = "cloud-tasks-client" } codex-cloud-tasks-mock-client = { path = "cloud-tasks-mock-client" } codex-code-mode = { path = "code-mode" } diff --git a/codex-rs/app-server/Cargo.toml b/codex-rs/app-server/Cargo.toml index d1a69783ad..37cdf219bf 100644 --- a/codex-rs/app-server/Cargo.toml +++ b/codex-rs/app-server/Cargo.toml @@ -32,7 +32,7 @@ axum = { workspace = true, default-features = false, features = [ ] } codex-analytics = { workspace = true } codex-arg0 = { workspace = true } -codex-cloud-requirements = { workspace = true } +codex-cloud-config = { workspace = true } codex-config = { workspace = true } codex-core = { workspace = true } codex-core-plugins = { workspace = true } diff --git a/codex-rs/app-server/src/config_manager.rs b/codex-rs/app-server/src/config_manager.rs index 2cfd53b130..11633342b3 100644 --- a/codex-rs/app-server/src/config_manager.rs +++ b/codex-rs/app-server/src/config_manager.rs @@ -1,5 +1,5 @@ use codex_arg0::Arg0DispatchPaths; -use codex_cloud_requirements::cloud_requirements_loader; +use codex_cloud_config::cloud_requirements_loader; use codex_config::CloudRequirementsLoader; use codex_config::ConfigLayerStack; use codex_config::LoaderOverrides; diff --git a/codex-rs/cloud-config/BUILD.bazel b/codex-rs/cloud-config/BUILD.bazel new file mode 100644 index 0000000000..b11ed2ca49 --- /dev/null +++ b/codex-rs/cloud-config/BUILD.bazel @@ -0,0 +1,6 @@ +load("//:defs.bzl", "codex_rust_crate") + +codex_rust_crate( + name = "cloud-config", + crate_name = "codex_cloud_config", +) diff --git a/codex-rs/cloud-requirements/Cargo.toml b/codex-rs/cloud-config/Cargo.toml similarity index 96% rename from codex-rs/cloud-requirements/Cargo.toml rename to codex-rs/cloud-config/Cargo.toml index f4b2d2dbcb..aeba70a489 100644 --- a/codex-rs/cloud-requirements/Cargo.toml +++ b/codex-rs/cloud-config/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "codex-cloud-requirements" +name = "codex-cloud-config" version.workspace = true edition.workspace = true license.workspace = true diff --git a/codex-rs/cloud-requirements/src/lib.rs b/codex-rs/cloud-config/src/lib.rs similarity index 100% rename from codex-rs/cloud-requirements/src/lib.rs rename to codex-rs/cloud-config/src/lib.rs diff --git a/codex-rs/cloud-requirements/BUILD.bazel b/codex-rs/cloud-requirements/BUILD.bazel deleted file mode 100644 index 88243aff90..0000000000 --- a/codex-rs/cloud-requirements/BUILD.bazel +++ /dev/null @@ -1,6 +0,0 @@ -load("//:defs.bzl", "codex_rust_crate") - -codex_rust_crate( - name = "cloud-requirements", - crate_name = "codex_cloud_requirements", -) diff --git a/codex-rs/exec/Cargo.toml b/codex-rs/exec/Cargo.toml index 37a577e2c8..cdfc569b68 100644 --- a/codex-rs/exec/Cargo.toml +++ b/codex-rs/exec/Cargo.toml @@ -27,7 +27,7 @@ clap = { workspace = true, features = ["derive"] } codex-arg0 = { workspace = true } codex-app-server-client = { workspace = true } codex-app-server-protocol = { workspace = true } -codex-cloud-requirements = { workspace = true } +codex-cloud-config = { workspace = true } codex-config = { workspace = true } codex-core = { workspace = true } codex-feedback = { workspace = true } diff --git a/codex-rs/exec/src/lib.rs b/codex-rs/exec/src/lib.rs index d66efe8742..e857f358c9 100644 --- a/codex-rs/exec/src/lib.rs +++ b/codex-rs/exec/src/lib.rs @@ -51,7 +51,7 @@ use codex_app_server_protocol::TurnStartParams; use codex_app_server_protocol::TurnStartResponse; use codex_app_server_protocol::TurnStartedNotification; use codex_arg0::Arg0DispatchPaths; -use codex_cloud_requirements::cloud_requirements_loader_for_storage; +use codex_cloud_config::cloud_requirements_loader_for_storage; use codex_config::ConfigLoadError; use codex_config::ConfigLoadOptions; use codex_config::LoaderOverrides; diff --git a/codex-rs/tui/Cargo.toml b/codex-rs/tui/Cargo.toml index ffc5c5a942..581f67bf94 100644 --- a/codex-rs/tui/Cargo.toml +++ b/codex-rs/tui/Cargo.toml @@ -31,7 +31,7 @@ codex-app-server-client = { workspace = true } codex-app-server-protocol = { workspace = true } codex-arg0 = { workspace = true } codex-install-context = { workspace = true } -codex-cloud-requirements = { workspace = true } +codex-cloud-config = { workspace = true } codex-config = { workspace = true } codex-connectors = { workspace = true } codex-core-plugins = { workspace = true } diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs index 508977fb53..e9cc88dca1 100644 --- a/codex-rs/tui/src/lib.rs +++ b/codex-rs/tui/src/lib.rs @@ -38,7 +38,7 @@ use codex_app_server_protocol::ThreadListCwdFilter; use codex_app_server_protocol::ThreadListParams; use codex_app_server_protocol::ThreadSortKey as AppServerThreadSortKey; use codex_app_server_protocol::ThreadSourceKind; -use codex_cloud_requirements::cloud_requirements_loader_for_storage; +use codex_cloud_config::cloud_requirements_loader_for_storage; use codex_config::CloudRequirementsLoader; use codex_config::ConfigLoadError; use codex_config::LoaderOverrides; diff --git a/codex-rs/tui/src/onboarding/auth.rs b/codex-rs/tui/src/onboarding/auth.rs index 3dfe492801..fa3561a7fa 100644 --- a/codex-rs/tui/src/onboarding/auth.rs +++ b/codex-rs/tui/src/onboarding/auth.rs @@ -1012,7 +1012,7 @@ mod tests { use codex_app_server_client::InProcessAppServerClient; use codex_app_server_client::InProcessClientStartArgs; use codex_arg0::Arg0DispatchPaths; - use codex_cloud_requirements::cloud_requirements_loader_for_storage; + use codex_cloud_config::cloud_requirements_loader_for_storage; use codex_config::types::AuthCredentialsStoreMode; use pretty_assertions::assert_eq; diff --git a/codex-rs/tui/src/session_archive_commands.rs b/codex-rs/tui/src/session_archive_commands.rs index 0b50a4409b..40d33eb2f6 100644 --- a/codex-rs/tui/src/session_archive_commands.rs +++ b/codex-rs/tui/src/session_archive_commands.rs @@ -16,7 +16,7 @@ use codex_app_server_protocol::Thread as AppServerThread; use codex_app_server_protocol::ThreadListParams; use codex_app_server_protocol::ThreadSortKey; use codex_arg0::Arg0DispatchPaths; -use codex_cloud_requirements::cloud_requirements_loader_for_storage; +use codex_cloud_config::cloud_requirements_loader_for_storage; use codex_config::ConfigLoadOptions; use codex_config::LoaderOverrides; use codex_exec_server::EnvironmentManager;