Skip to content

feat: feature flag #4948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Oct 14, 2025
Merged

feat: feature flag #4948

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b383d1d
feat: feature flag
jif-oai Oct 8, 2025
f3b3ad5
Adapt tests
jif-oai Oct 8, 2025
3ea7409
Legacy
jif-oai Oct 8, 2025
0f9492a
Drop design
jif-oai Oct 8, 2025
ba951de
Migrate more tests
jif-oai Oct 8, 2025
a947348
Override for profile
jif-oai Oct 8, 2025
3b180a1
Merge remote-tracking branch 'origin/main' into jif/feature-flags
jif-oai Oct 10, 2025
81a2254
Fix merge
jif-oai Oct 10, 2025
2928ee2
NIT
jif-oai Oct 10, 2025
fdd99db
NIT 2
jif-oai Oct 10, 2025
9c1b1b9
Merge branch 'main' into jif/feature-flags
jif-oai Oct 10, 2025
2d85fc1
Merge branch 'main' into jif/feature-flags
jif-oai Oct 14, 2025
e9a8698
C1
jif-oai Oct 14, 2025
4609e7b
C2
jif-oai Oct 14, 2025
7e3154f
C3
jif-oai Oct 14, 2025
c5a3a4f
C4
jif-oai Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 9 additions & 69 deletions codex-rs/core/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use crate::config_types::UriBasedFileOpener;
use crate::features::Feature;
use crate::features::Features;
use crate::features::FeaturesToml;
use crate::features::LegacyFeatureToggles;
use crate::git_info::resolve_root_git_project_for_trust;
use crate::model_family::ModelFamily;
use crate::model_family::derive_default_model_family;
Expand Down Expand Up @@ -1015,6 +1014,15 @@ impl Config {
None => ConfigProfile::default(),
};

let features = Features::from_config(
&cfg,
&config_profile,
include_plan_tool_override,
include_apply_patch_tool_override,
include_view_image_tool_override,
override_tools_web_search_request,
);

let sandbox_policy = cfg.derive_sandbox_policy(sandbox_mode);

let mut model_providers = built_in_model_providers();
Expand Down Expand Up @@ -1060,74 +1068,6 @@ impl Config {

let history = cfg.history.unwrap_or_default();

// ===== Features aggregation =====
let mut features = Features::with_defaults();

// Legacy booleans (pre-[features]) keep working but log a migration hint.
let base_legacy = LegacyFeatureToggles {
experimental_use_freeform_apply_patch: cfg.experimental_use_freeform_apply_patch,
experimental_use_exec_command_tool: cfg.experimental_use_exec_command_tool,
experimental_use_unified_exec_tool: cfg.experimental_use_unified_exec_tool,
experimental_use_rmcp_client: cfg.experimental_use_rmcp_client,
tools_web_search: cfg.tools.as_ref().and_then(|t| t.web_search),
tools_view_image: cfg.tools.as_ref().and_then(|t| t.view_image),
..Default::default()
};
base_legacy.apply(&mut features);

// 1) Base config features table overrides legacy toggles.
if let Some(base_features) = cfg.features.as_ref() {
features.apply_map(&base_features.entries);
}

// 2) Profile-level features override the base config.
let profile_legacy = LegacyFeatureToggles {
include_plan_tool: config_profile.include_plan_tool,
include_apply_patch_tool: config_profile.include_apply_patch_tool,
include_view_image_tool: config_profile.include_view_image_tool,
experimental_use_freeform_apply_patch: config_profile
.experimental_use_freeform_apply_patch,
experimental_use_exec_command_tool: config_profile.experimental_use_exec_command_tool,
experimental_use_unified_exec_tool: config_profile.experimental_use_unified_exec_tool,
experimental_use_rmcp_client: config_profile.experimental_use_rmcp_client,
tools_web_search: config_profile.tools_web_search,
tools_view_image: config_profile.tools_view_image,
};
profile_legacy.apply(&mut features);
if let Some(profile_features) = config_profile.features.as_ref() {
features.apply_map(&profile_features.entries);
}

// 3) CLI-style overrides (mapped from ConfigOverrides fields when present).
if let Some(v) = include_plan_tool_override {
if v {
features.enable(Feature::PlanTool);
} else {
features.disable(Feature::PlanTool);
}
}
if let Some(v) = include_apply_patch_tool_override {
if v {
features.enable(Feature::ApplyPatchFreeform);
} else {
features.disable(Feature::ApplyPatchFreeform);
}
}
if let Some(v) = include_view_image_tool_override {
if v {
features.enable(Feature::ViewImageTool);
} else {
features.disable(Feature::ViewImageTool);
}
}
if let Some(v) = override_tools_web_search_request {
if v {
features.enable(Feature::WebSearchRequest);
} else {
features.disable(Feature::WebSearchRequest);
}
}

let include_plan_tool_flag = features.enabled(Feature::PlanTool);
let include_apply_patch_tool_flag = features.enabled(Feature::ApplyPatchFreeform);
let include_view_image_tool_flag = features.enabled(Feature::ViewImageTool);
Expand Down
77 changes: 77 additions & 0 deletions codex-rs/core/src/features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
//! booleans through multiple types, call sites consult a single `Features`
//! container attached to `Config`.

use crate::config::ConfigToml;
use crate::config_profile::ConfigProfile;
use serde::Deserialize;
use std::collections::BTreeMap;
use std::collections::BTreeSet;
Expand Down Expand Up @@ -109,6 +111,81 @@ impl Features {
}
}
}

#[allow(clippy::too_many_arguments)]
pub fn from_config(
cfg: &ConfigToml,
config_profile: &ConfigProfile,
include_plan_tool_override: Option<bool>,
include_apply_patch_tool_override: Option<bool>,
include_view_image_tool_override: Option<bool>,
override_tools_web_search_request: Option<bool>,
) -> Self {
let mut features = Features::with_defaults();

let base_legacy = LegacyFeatureToggles {
experimental_use_freeform_apply_patch: cfg.experimental_use_freeform_apply_patch,
experimental_use_exec_command_tool: cfg.experimental_use_exec_command_tool,
experimental_use_unified_exec_tool: cfg.experimental_use_unified_exec_tool,
experimental_use_rmcp_client: cfg.experimental_use_rmcp_client,
tools_web_search: cfg.tools.as_ref().and_then(|t| t.web_search),
tools_view_image: cfg.tools.as_ref().and_then(|t| t.view_image),
..Default::default()
};
base_legacy.apply(&mut features);

if let Some(base_features) = cfg.features.as_ref() {
features.apply_map(&base_features.entries);
}

let profile_legacy = LegacyFeatureToggles {
include_plan_tool: config_profile.include_plan_tool,
include_apply_patch_tool: config_profile.include_apply_patch_tool,
include_view_image_tool: config_profile.include_view_image_tool,
experimental_use_freeform_apply_patch: config_profile
.experimental_use_freeform_apply_patch,
experimental_use_exec_command_tool: config_profile.experimental_use_exec_command_tool,
experimental_use_unified_exec_tool: config_profile.experimental_use_unified_exec_tool,
experimental_use_rmcp_client: config_profile.experimental_use_rmcp_client,
tools_web_search: config_profile.tools_web_search,
tools_view_image: config_profile.tools_view_image,
};
profile_legacy.apply(&mut features);
if let Some(profile_features) = config_profile.features.as_ref() {
features.apply_map(&profile_features.entries);
}

if let Some(v) = include_plan_tool_override {
if v {
features.enable(Feature::PlanTool);
} else {
features.disable(Feature::PlanTool);
}
}
if let Some(v) = include_apply_patch_tool_override {
if v {
features.enable(Feature::ApplyPatchFreeform);
} else {
features.disable(Feature::ApplyPatchFreeform);
}
}
if let Some(v) = include_view_image_tool_override {
if v {
features.enable(Feature::ViewImageTool);
} else {
features.disable(Feature::ViewImageTool);
}
}
if let Some(v) = override_tools_web_search_request {
if v {
features.enable(Feature::WebSearchRequest);
} else {
features.disable(Feature::WebSearchRequest);
}
}

features
}
}

/// Keys accepted in `[features]` tables.
Expand Down
Loading