mirror of
https://github.com/openai/codex.git
synced 2026-10-23 18:08:45 +00:00
Michael Bolin
d6748f741a
## Why `shell_zsh_fork` and unified exec need to remain independently controllable for enterprise rollouts, but we also need a third mode that composes them. That composed mode is intended to preserve unified exec command lifecycle support while letting the zsh fork provide more accurate `execv(2)` interception. Enabling `unified_exec_zsh_fork` by itself is intentionally not sufficient. It is a composition gate, not a dependency-enabling shortcut: - `unified_exec` selects the PTY-backed unified exec tool. - `shell_zsh_fork` opts into the zsh fork backend. - `unified_exec_zsh_fork` only allows those two already-enabled modes to be composed so local zsh unified exec commands can launch through the zsh fork. This separation is deliberate. Enterprises and staged rollouts must be able to enable or disable unified exec and zsh-fork independently. If `unified_exec_zsh_fork` implied either dependency, then enabling one under-development composition flag would silently activate a shell backend that the configured feature set left disabled. This PR introduces only the configuration and planning gate for that composition. Existing `shell_zsh_fork` behavior continues to use the standalone shell tool unless the new composition feature is explicitly enabled alongside both dependencies. ## What Changed - Added the under-development feature flag `unified_exec_zsh_fork`. - Added `UnifiedExecFeatureMode` so the three input feature flags collapse into `Disabled`, `Direct`, or `ZshFork` mode before tool planning. - Updated tool selection so zsh-fork composition requires `unified_exec`, `shell_zsh_fork`, and `unified_exec_zsh_fork`. - Kept the existing standalone zsh-fork shell tool behavior when only `shell_zsh_fork` is enabled. - Updated config schema output for the new feature flag. ## Verification - Added feature and tool-config coverage for the new gate. - Added planner coverage proving `shell_zsh_fork` remains standalone until composition is explicitly enabled. - Ran focused tests for `codex-features`, `codex-tools`, and the affected `codex-core` planner case. --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/24979). * #24982 * #24981 * #24980 * __->__ #24979
104 lines
4.5 KiB
Rust
104 lines
4.5 KiB
Rust
//! Shared tool definitions and Responses API tool primitives that can live
|
|
//! outside `codex-core`.
|
|
|
|
mod code_mode;
|
|
mod dynamic_tool;
|
|
mod function_call_error;
|
|
mod image_detail;
|
|
mod json_schema;
|
|
mod mcp_tool;
|
|
mod request_plugin_install;
|
|
mod response_history;
|
|
mod responses_api;
|
|
mod tool_call;
|
|
mod tool_config;
|
|
mod tool_definition;
|
|
mod tool_discovery;
|
|
mod tool_executor;
|
|
mod tool_output;
|
|
mod tool_payload;
|
|
mod tool_spec;
|
|
|
|
pub use code_mode::augment_tool_spec_for_code_mode;
|
|
pub use code_mode::code_mode_name_for_tool_name;
|
|
pub use code_mode::collect_code_mode_exec_prompt_tool_definitions;
|
|
pub use code_mode::collect_code_mode_tool_definitions;
|
|
pub use code_mode::tool_spec_to_code_mode_tool_definition;
|
|
pub use codex_protocol::ToolName;
|
|
pub use dynamic_tool::parse_dynamic_tool;
|
|
pub use function_call_error::FunctionCallError;
|
|
pub use image_detail::can_request_original_image_detail;
|
|
pub use image_detail::normalize_output_image_detail;
|
|
pub use image_detail::sanitize_original_image_detail;
|
|
pub use json_schema::AdditionalProperties;
|
|
pub use json_schema::JsonSchema;
|
|
pub use json_schema::JsonSchemaPrimitiveType;
|
|
pub use json_schema::JsonSchemaType;
|
|
pub use json_schema::parse_tool_input_schema;
|
|
pub use json_schema::parse_tool_input_schema_without_compaction;
|
|
pub use mcp_tool::mcp_call_tool_result_output_schema;
|
|
pub use mcp_tool::parse_mcp_tool;
|
|
pub use request_plugin_install::REQUEST_PLUGIN_INSTALL_APPROVAL_KIND_VALUE;
|
|
pub use request_plugin_install::REQUEST_PLUGIN_INSTALL_PERSIST_ALWAYS_VALUE;
|
|
pub use request_plugin_install::REQUEST_PLUGIN_INSTALL_PERSIST_KEY;
|
|
pub use request_plugin_install::RequestPluginInstallArgs;
|
|
pub use request_plugin_install::RequestPluginInstallMeta;
|
|
pub use request_plugin_install::RequestPluginInstallResult;
|
|
pub use request_plugin_install::all_requested_connectors_picked_up;
|
|
pub use request_plugin_install::build_request_plugin_install_elicitation_request;
|
|
pub use request_plugin_install::verified_connector_install_completed;
|
|
pub use response_history::retain_tail_from_last_n_user_messages;
|
|
pub use response_history::truncate_assistant_output_text_to_token_budget;
|
|
pub use responses_api::FreeformTool;
|
|
pub use responses_api::FreeformToolFormat;
|
|
pub use responses_api::LoadableToolSpec;
|
|
pub use responses_api::ResponsesApiNamespace;
|
|
pub use responses_api::ResponsesApiNamespaceTool;
|
|
pub use responses_api::ResponsesApiTool;
|
|
pub use responses_api::coalesce_loadable_tool_specs;
|
|
pub use responses_api::default_namespace_description;
|
|
pub use responses_api::dynamic_tool_to_responses_api_tool;
|
|
pub use responses_api::mcp_tool_to_deferred_responses_api_tool;
|
|
pub use responses_api::mcp_tool_to_responses_api_tool;
|
|
pub use responses_api::tool_definition_to_responses_api_tool;
|
|
pub use tool_call::ConversationHistory;
|
|
pub use tool_call::ExtensionTurnItem;
|
|
pub use tool_call::ImageGenerationCompletionFuture;
|
|
pub use tool_call::NoopTurnItemEmitter;
|
|
pub use tool_call::ToolCall;
|
|
pub use tool_call::TurnItemEmissionFuture;
|
|
pub use tool_call::TurnItemEmitter;
|
|
pub use tool_config::ShellCommandBackendConfig;
|
|
pub use tool_config::ToolEnvironmentMode;
|
|
pub use tool_config::ToolUserShellType;
|
|
pub use tool_config::UnifiedExecFeatureMode;
|
|
pub use tool_config::UnifiedExecShellMode;
|
|
pub use tool_config::ZshForkConfig;
|
|
pub use tool_config::request_user_input_available_modes;
|
|
pub use tool_config::shell_command_backend_for_features;
|
|
pub use tool_config::shell_type_for_model_and_features;
|
|
pub use tool_config::unified_exec_feature_mode_for_features;
|
|
pub use tool_definition::ToolDefinition;
|
|
pub use tool_discovery::DiscoverablePluginInfo;
|
|
pub use tool_discovery::DiscoverableTool;
|
|
pub use tool_discovery::DiscoverableToolAction;
|
|
pub use tool_discovery::DiscoverableToolType;
|
|
pub use tool_discovery::LIST_AVAILABLE_PLUGINS_TO_INSTALL_TOOL_NAME;
|
|
pub use tool_discovery::ListAvailablePluginsToInstallResult;
|
|
pub use tool_discovery::REQUEST_PLUGIN_INSTALL_TOOL_NAME;
|
|
pub use tool_discovery::RequestPluginInstallEntry;
|
|
pub use tool_discovery::TOOL_SEARCH_DEFAULT_LIMIT;
|
|
pub use tool_discovery::TOOL_SEARCH_TOOL_NAME;
|
|
pub use tool_discovery::ToolSearchSourceInfo;
|
|
pub use tool_discovery::collect_request_plugin_install_entries;
|
|
pub use tool_discovery::filter_request_plugin_install_discoverable_tools_for_client;
|
|
pub use tool_executor::ToolExecutor;
|
|
pub use tool_executor::ToolExposure;
|
|
pub use tool_output::JsonToolOutput;
|
|
pub use tool_output::ToolOutput;
|
|
pub use tool_payload::ToolPayload;
|
|
pub use tool_spec::ResponsesApiWebSearchFilters;
|
|
pub use tool_spec::ResponsesApiWebSearchUserLocation;
|
|
pub use tool_spec::ToolSpec;
|
|
pub use tool_spec::create_tools_json_for_responses_api;
|