mirror of
https://github.com/openai/codex.git
synced 2026-10-22 17:58:46 +00:00
acrognale-oai
57232f111c
## What changed - Add `application.storage.default_project_parent` and `application.storage.projectless_workspace_root` requirements for new Desktop workspaces. Require absolute paths and reject unknown storage keys. - Apply managed paths to `desktop.defaultProjectParent` and `desktop.projectlessWorkspaceRoot`, overriding local preferences and rejecting writes to managed settings or their containing table while preserving unrelated Desktop settings. - Expose storage requirements through `config/requirements/read` and update generated JSON schemas, TypeScript types, and Python models. ## Testing Add coverage for storage validation, per-setting layer precedence, config overrides, write protection, and requirements API responses. Adjust daemon shutdown test deadlines and TUI test synchronization, paste handling, and future allocation. GitOrigin-RevId: 44b93fe69e6a471c3f485cbf5f9c9ebd34ac3234
245 lines
11 KiB
Rust
245 lines
11 KiB
Rust
mod application_requirements;
|
|
mod application_storage_requirements;
|
|
mod auth_policy;
|
|
mod browser_computer_use_requirements;
|
|
mod browser_use;
|
|
mod cloud_config_bundle;
|
|
mod cloud_config_layers;
|
|
#[cfg(target_os = "macos")]
|
|
mod codex_home_symlink;
|
|
mod computer_use;
|
|
mod config_layer_source;
|
|
mod config_requirements;
|
|
pub mod config_toml;
|
|
mod constraint;
|
|
mod diagnostics;
|
|
mod filesystem_constraints;
|
|
mod fingerprint;
|
|
mod guardian;
|
|
mod hook_config;
|
|
mod host_name;
|
|
mod in_app_browser_requirements;
|
|
mod key_aliases;
|
|
pub mod loader;
|
|
mod marketplace_edit;
|
|
mod mcp_edit;
|
|
mod mcp_ema;
|
|
mod mcp_ema_cancellation;
|
|
pub use mcp_ema_cancellation::McpEmaCancellation;
|
|
mod mcp_requirements;
|
|
mod mcp_types;
|
|
mod merge;
|
|
mod model_provider_requirements;
|
|
mod overrides;
|
|
mod path_context;
|
|
pub mod permissions_toml;
|
|
mod plugin_edit;
|
|
pub mod profile_toml;
|
|
mod project_root_markers;
|
|
mod project_trust;
|
|
mod requirements_exec_policy;
|
|
mod requirements_layers;
|
|
pub mod schema;
|
|
mod shell_environment_policy;
|
|
mod skills_config;
|
|
mod state;
|
|
mod strict_config;
|
|
pub mod test_support;
|
|
mod thread_config;
|
|
mod tui_effects;
|
|
mod tui_keymap;
|
|
mod tui_mouse_scroll;
|
|
mod tui_rendering;
|
|
pub mod types;
|
|
|
|
pub const CONFIG_TOML_FILE: &str = "config.toml";
|
|
|
|
pub use application_requirements::ApplicationNetworkRequirementsToml;
|
|
pub use application_requirements::ApplicationRequirementsToml;
|
|
pub use application_storage_requirements::ApplicationStorageRequirementsToml;
|
|
pub use auth_policy::ManagedAuthPolicy;
|
|
pub use browser_computer_use_requirements::AllowDenyRequirementToml;
|
|
pub use browser_computer_use_requirements::BrowserUseAccessApprovalLifetimeToml;
|
|
pub use browser_computer_use_requirements::BrowserUseExtensionRequirementsToml;
|
|
pub use browser_computer_use_requirements::BrowserUseOriginPolicyToml;
|
|
pub use browser_computer_use_requirements::BrowserUseRequirementsToml;
|
|
pub use browser_computer_use_requirements::ComputerUseMacosRequirementsToml;
|
|
pub use browser_computer_use_requirements::ComputerUseRequirementsToml;
|
|
pub use browser_computer_use_requirements::ComputerUseWindowsExeRequirementToml;
|
|
pub use browser_computer_use_requirements::ComputerUseWindowsRequirementsToml;
|
|
pub use browser_computer_use_requirements::RequestHeaderToml;
|
|
pub use browser_use::BrowserUseConfigToml;
|
|
pub use browser_use::BrowserUseOriginPolicyConfigToml;
|
|
pub use cloud_config_bundle::CloudConfigBundle;
|
|
pub use cloud_config_bundle::CloudConfigBundleBinding;
|
|
pub use cloud_config_bundle::CloudConfigBundleBindingGuard;
|
|
pub use cloud_config_bundle::CloudConfigBundleBindingStatus;
|
|
pub use cloud_config_bundle::CloudConfigBundleLayers;
|
|
pub use cloud_config_bundle::CloudConfigBundleLoadError;
|
|
pub use cloud_config_bundle::CloudConfigBundleLoadErrorCode;
|
|
pub use cloud_config_bundle::CloudConfigBundleLoader;
|
|
pub use cloud_config_bundle::CloudConfigBundlePolicy;
|
|
pub use cloud_config_bundle::CloudConfigBundlePolicyChanges;
|
|
pub use cloud_config_bundle::CloudConfigBundlePolicyRevision;
|
|
pub use cloud_config_bundle::CloudConfigBundleSnapshot;
|
|
pub use cloud_config_bundle::CloudConfigTomlBundle;
|
|
pub use cloud_config_bundle::CloudRequirementsFragment;
|
|
pub use cloud_config_bundle::CloudRequirementsTomlBundle;
|
|
pub use cloud_config_layers::CloudConfigFragment;
|
|
pub use cloud_config_layers::CloudConfigFragmentSource;
|
|
pub use cloud_config_layers::CloudConfigLayerError;
|
|
pub use cloud_config_layers::cloud_config_layers_from_fragments;
|
|
pub use codex_execpolicy::RequirementsExecPolicy;
|
|
#[cfg(target_os = "macos")]
|
|
pub use codex_home_symlink::allowed_symlinked_codex_home;
|
|
pub use codex_protocol::config_types::ProfileV2Name;
|
|
pub use codex_protocol::config_types::ProfileV2NameParseError;
|
|
pub use codex_protocol::config_types::ToolExposureSurface;
|
|
pub use codex_protocol::mcp_policy::McpServerCommandMatcher;
|
|
pub use codex_protocol::mcp_policy::McpServerIdentity;
|
|
pub use codex_protocol::mcp_policy::McpServerRequirement;
|
|
pub use codex_protocol::mcp_policy::McpServerValueMatcher;
|
|
pub use codex_protocol::mcp_policy::PluginMcpRequirements as PluginRequirementsToml;
|
|
pub use codex_utils_absolute_path::AbsolutePathBuf;
|
|
pub use codex_utils_absolute_path::AbsolutePathBufGuard;
|
|
pub use computer_use::ComputerUseConfigToml;
|
|
pub use computer_use::ComputerUseMacosConfigToml;
|
|
pub use computer_use::ComputerUseWindowsConfigToml;
|
|
pub use computer_use::ComputerUseWindowsExeConfigToml;
|
|
pub use config_layer_source::ConfigLayer;
|
|
pub use config_layer_source::ConfigLayerMetadata;
|
|
pub use config_layer_source::ConfigLayerSource;
|
|
pub use config_layer_source::format_config_layer_source;
|
|
pub use config_requirements::AppRequirementToml;
|
|
pub use config_requirements::AppToolRequirementToml;
|
|
pub use config_requirements::AppToolResultSourceFormat;
|
|
pub use config_requirements::AppToolResultSourceRequirementToml;
|
|
pub use config_requirements::AppToolsRequirementsToml;
|
|
pub use config_requirements::AppsRequirementsToml;
|
|
pub use config_requirements::AutoReviewRequirementsToml;
|
|
pub use config_requirements::ConfigRequirements;
|
|
pub use config_requirements::ConfigRequirementsToml;
|
|
pub use config_requirements::ConfigRequirementsWithSources;
|
|
pub use config_requirements::ConstrainedWithSource;
|
|
pub use config_requirements::FeatureRequirementsToml;
|
|
pub use config_requirements::FilesystemConstraints;
|
|
pub use config_requirements::FilesystemDenyReadPattern;
|
|
pub use config_requirements::MarketplaceAllowedSourceKind;
|
|
pub use config_requirements::MarketplaceAllowedSourceToml;
|
|
pub use config_requirements::MarketplaceRequirementsToml;
|
|
pub use config_requirements::ModelsRequirementsToml;
|
|
pub use config_requirements::NetworkConstraints;
|
|
pub use config_requirements::NetworkDomainPermissionToml;
|
|
pub use config_requirements::NetworkDomainPermissionsToml;
|
|
pub use config_requirements::NetworkHeaderInjectionToml;
|
|
pub use config_requirements::NetworkRequirementsToml;
|
|
pub use config_requirements::NetworkUnixSocketPermissionToml;
|
|
pub use config_requirements::NetworkUnixSocketPermissionsToml;
|
|
pub use config_requirements::NewThreadModelDefaultsToml;
|
|
pub use config_requirements::RemoteSandboxConfigToml;
|
|
pub use config_requirements::RequirementSource;
|
|
pub use config_requirements::ResidencyRequirement;
|
|
pub use config_requirements::SandboxModeRequirement;
|
|
pub use config_requirements::Sourced;
|
|
pub use config_requirements::WebSearchModeRequirement;
|
|
pub use config_requirements::WindowsRequirementsToml;
|
|
pub use config_requirements::WindowsSandboxImplementationToml;
|
|
pub use config_requirements::sandbox_mode_requirement_for_permission_profile;
|
|
pub use config_toml::effective_sandbox_mode;
|
|
pub use constraint::Constrained;
|
|
pub use constraint::ConstraintError;
|
|
pub use constraint::ConstraintResult;
|
|
pub use diagnostics::ConfigError;
|
|
pub use diagnostics::ConfigLoadError;
|
|
pub use diagnostics::TextPosition;
|
|
pub use diagnostics::TextRange;
|
|
pub use diagnostics::config_error_from_toml;
|
|
pub use diagnostics::config_error_from_typed_toml;
|
|
pub use diagnostics::first_layer_config_error;
|
|
pub use diagnostics::first_layer_config_error_from_entries;
|
|
pub use diagnostics::format_config_error;
|
|
pub use diagnostics::format_config_error_with_source;
|
|
pub use diagnostics::io_error_from_config_error;
|
|
pub use fingerprint::version_for_toml;
|
|
pub use guardian::GuardianPolicyLoader;
|
|
pub use hook_config::HookEventsToml;
|
|
pub use hook_config::HookHandlerConfig;
|
|
pub use hook_config::HookStateToml;
|
|
pub use hook_config::HooksFile;
|
|
pub use hook_config::HooksToml;
|
|
pub use hook_config::ManagedHooksRequirementsToml;
|
|
pub use hook_config::MatcherGroup;
|
|
pub use host_name::host_name;
|
|
pub use host_name::os_host_name;
|
|
pub use in_app_browser_requirements::InAppBrowserRequirementsToml;
|
|
pub use marketplace_edit::MarketplaceConfigUpdate;
|
|
pub use marketplace_edit::RemoveMarketplaceConfigOutcome;
|
|
pub use marketplace_edit::record_user_marketplace;
|
|
pub use marketplace_edit::remove_user_marketplace;
|
|
pub use marketplace_edit::remove_user_marketplace_config;
|
|
pub use mcp_edit::load_global_mcp_servers;
|
|
pub use mcp_ema::McpEmaAuthScope;
|
|
pub use mcp_ema::McpEmaRegistration;
|
|
pub use mcp_ema::McpEnterpriseManagedAuthConfig;
|
|
pub use mcp_ema::McpServerIdpOAuthConfig;
|
|
pub use mcp_types::AppToolApproval;
|
|
pub use mcp_types::DEFAULT_MCP_SERVER_ENVIRONMENT_ID;
|
|
pub use mcp_types::McpServerAuth;
|
|
pub use mcp_types::McpServerConfig;
|
|
pub use mcp_types::McpServerDisabledReason;
|
|
pub use mcp_types::McpServerEnvVar;
|
|
pub use mcp_types::McpServerOAuthConfig;
|
|
pub use mcp_types::McpServerToolConfig;
|
|
pub use mcp_types::McpServerTransportConfig;
|
|
pub use mcp_types::McpStartupReadiness;
|
|
pub use mcp_types::RawMcpServerConfig;
|
|
pub use merge::ShellEnvironmentPolicyFilterRepresentation;
|
|
pub use merge::is_structured_feature_path;
|
|
pub use merge::merge_toml_values;
|
|
pub use merge::shell_environment_filter_entry;
|
|
pub use overrides::build_cli_overrides_layer;
|
|
pub use path_context::ConfigPathContext;
|
|
pub use plugin_edit::PluginConfigEdit;
|
|
pub use plugin_edit::apply_user_plugin_config_edits;
|
|
pub use plugin_edit::clear_user_plugin;
|
|
pub use plugin_edit::set_user_plugin_enabled;
|
|
pub use project_root_markers::default_project_root_markers;
|
|
pub use project_root_markers::project_root_markers_from_config;
|
|
pub use project_trust::ProjectTrustLookup;
|
|
pub use project_trust::ProjectTrustPath;
|
|
pub use requirements_exec_policy::RequirementsExecPolicyDecisionToml;
|
|
pub use requirements_exec_policy::RequirementsExecPolicyParseError;
|
|
pub use requirements_exec_policy::RequirementsExecPolicyPatternTokenToml;
|
|
pub use requirements_exec_policy::RequirementsExecPolicyPrefixRuleToml;
|
|
pub use requirements_exec_policy::RequirementsExecPolicyToml;
|
|
pub use requirements_layers::RequirementsLayerEntry;
|
|
pub use requirements_layers::compose_requirements;
|
|
pub use requirements_layers::compose_requirements_for_hostname;
|
|
pub use shell_environment_policy::validate_shell_environment_policy_filter_config;
|
|
pub use skills_config::BundledSkillsConfig;
|
|
pub use skills_config::ScopedSkillsConfig;
|
|
pub use skills_config::SkillConfig;
|
|
pub use skills_config::SkillConfigRule;
|
|
pub use skills_config::SkillConfigRuleSelector;
|
|
pub use skills_config::SkillConfigRules;
|
|
pub use skills_config::SkillsConfig;
|
|
pub use skills_config::bundled_skills_enabled_from_stack;
|
|
pub use skills_config::skill_config_rules_from_stack;
|
|
pub use state::ConfigLayerEntry;
|
|
pub use state::ConfigLayerStack;
|
|
pub use state::ConfigLoadOptions;
|
|
pub use state::LoaderOverrides;
|
|
pub use strict_config::config_error_from_ignored_toml_fields;
|
|
pub use thread_config::NoopThreadConfigLoader;
|
|
pub use thread_config::RemoteThreadConfigLoader;
|
|
pub use thread_config::SessionThreadConfig;
|
|
pub use thread_config::StaticThreadConfigLoader;
|
|
pub use thread_config::ThreadConfigContext;
|
|
pub use thread_config::ThreadConfigLoadError;
|
|
pub use thread_config::ThreadConfigLoadErrorCode;
|
|
pub use thread_config::ThreadConfigLoader;
|
|
pub use thread_config::ThreadConfigLoaderFuture;
|
|
pub use thread_config::ThreadConfigSource;
|
|
pub use thread_config::UserThreadConfig;
|
|
pub use toml::Value as TomlValue;
|