mirror of
https://github.com/openai/codex.git
synced 2026-11-21 22:50:37 +00:00
Add an opt-in indexed web search default (#62894)
## What changed Add `features.web_search_indexed_default` to let restricted turns use `indexed` search in place of the implicit `cached` default when the provider and managed requirements allow it. Full-access turns still prefer `live` search when allowed, and an explicit `indexed` selection retains its existing precedence. Forward the flag through the TUI and keep the default implicit when launch overrides disable legacy search flags. ## Testing Cover mode selection across permission profiles, explicit settings, and managed requirements. Verify that the first model request advertises indexed search and that permission changes take effect on the next turn. GitOrigin-RevId: 08a6279c447c517c50b9e6a544ecdf681b81bf50
This commit is contained in:
@@ -7065,11 +7065,18 @@ async fn feedback_enabled_defaults_to_true() -> std::io::Result<()> {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn web_search_mode_defaults_to_none_if_unset() {
|
||||
fn web_search_mode_defaults_to_cached_if_unset() {
|
||||
let cfg = ConfigToml::default();
|
||||
let features = Features::with_defaults();
|
||||
|
||||
assert_eq!(resolve_web_search_mode(&cfg, &features), None);
|
||||
assert_eq!(
|
||||
resolve_web_search_mode(
|
||||
&cfg,
|
||||
&features,
|
||||
&Constrained::allow_any(WebSearchMode::Cached),
|
||||
),
|
||||
WebSearchMode::Cached,
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -7082,8 +7089,12 @@ fn web_search_mode_prefers_config_over_legacy_flags() {
|
||||
features.enable(Feature::WebSearchCached);
|
||||
|
||||
assert_eq!(
|
||||
resolve_web_search_mode(&cfg, &features),
|
||||
Some(WebSearchMode::Live)
|
||||
resolve_web_search_mode(
|
||||
&cfg,
|
||||
&features,
|
||||
&Constrained::allow_any(WebSearchMode::Cached),
|
||||
),
|
||||
WebSearchMode::Live
|
||||
);
|
||||
}
|
||||
|
||||
@@ -7097,8 +7108,12 @@ fn web_search_mode_disabled_overrides_legacy_request() {
|
||||
features.enable(Feature::WebSearchRequest);
|
||||
|
||||
assert_eq!(
|
||||
resolve_web_search_mode(&cfg, &features),
|
||||
Some(WebSearchMode::Disabled)
|
||||
resolve_web_search_mode(
|
||||
&cfg,
|
||||
&features,
|
||||
&Constrained::allow_any(WebSearchMode::Cached),
|
||||
),
|
||||
WebSearchMode::Disabled
|
||||
);
|
||||
}
|
||||
|
||||
@@ -7107,6 +7122,7 @@ fn web_search_mode_for_turn_preserves_indexed_for_disabled_permissions() {
|
||||
let web_search_mode = Constrained::allow_any(WebSearchMode::Indexed);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
/*web_search_mode_was_explicit*/ true,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
@@ -7120,6 +7136,7 @@ fn web_search_mode_for_turn_uses_preference_for_read_only() {
|
||||
let permission_profile = PermissionProfile::read_only();
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
/*web_search_mode_was_explicit*/ true,
|
||||
&permission_profile,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
@@ -7132,6 +7149,7 @@ fn web_search_mode_for_turn_prefers_live_for_disabled_permissions() {
|
||||
let web_search_mode = Constrained::allow_any(WebSearchMode::Cached);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
/*web_search_mode_was_explicit*/ true,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
@@ -7145,6 +7163,7 @@ fn web_search_mode_for_turn_falls_back_when_provider_disallows_external_web_acce
|
||||
let web_search_mode = Constrained::allow_any(preferred);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
/*web_search_mode_was_explicit*/ true,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities {
|
||||
external_web_access: false,
|
||||
@@ -7179,6 +7198,7 @@ fn web_search_mode_for_turn_disables_when_external_access_and_cached_are_disallo
|
||||
})?;
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
/*web_search_mode_was_explicit*/ true,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities {
|
||||
external_web_access: false,
|
||||
@@ -7196,6 +7216,7 @@ fn web_search_mode_for_turn_respects_disabled_for_disabled_permissions() {
|
||||
let web_search_mode = Constrained::allow_any(WebSearchMode::Disabled);
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
/*web_search_mode_was_explicit*/ true,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
@@ -7220,6 +7241,7 @@ fn web_search_mode_for_turn_falls_back_when_live_is_disallowed() -> anyhow::Resu
|
||||
})?;
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
/*web_search_mode_was_explicit*/ true,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
@@ -7249,6 +7271,7 @@ fn web_search_mode_for_turn_does_not_implicitly_select_indexed() -> anyhow::Resu
|
||||
})?;
|
||||
let mode = resolve_web_search_mode_for_turn(
|
||||
&web_search_mode,
|
||||
/*web_search_mode_was_explicit*/ true,
|
||||
&PermissionProfile::Disabled,
|
||||
ProviderCapabilities::default(),
|
||||
);
|
||||
@@ -12305,6 +12328,7 @@ async fn requirements_web_search_mode_overrides_danger_full_access_default() ->
|
||||
assert_eq!(
|
||||
resolve_web_search_mode_for_turn(
|
||||
&config.web_search_mode,
|
||||
config.web_search_mode_was_explicit,
|
||||
&config.permissions.effective_permission_profile(),
|
||||
ProviderCapabilities::default(),
|
||||
),
|
||||
|
||||
@@ -2904,18 +2904,30 @@ pub fn resolve_oss_provider(
|
||||
}
|
||||
}
|
||||
|
||||
/// Resolve the web search mode from explicit config and feature flags.
|
||||
fn resolve_web_search_mode(config_toml: &ConfigToml, features: &Features) -> Option<WebSearchMode> {
|
||||
/// Resolve the configured preference, or select an allowed implicit default.
|
||||
fn resolve_web_search_mode(
|
||||
config_toml: &ConfigToml,
|
||||
features: &Features,
|
||||
constrained_default: &Constrained<WebSearchMode>,
|
||||
) -> WebSearchMode {
|
||||
if let Some(mode) = config_toml.web_search {
|
||||
return Some(mode);
|
||||
return mode;
|
||||
}
|
||||
if features.enabled(Feature::WebSearchCached) {
|
||||
return Some(WebSearchMode::Cached);
|
||||
return WebSearchMode::Cached;
|
||||
}
|
||||
if features.enabled(Feature::WebSearchRequest) {
|
||||
return Some(WebSearchMode::Live);
|
||||
return WebSearchMode::Live;
|
||||
}
|
||||
let default_mode = constrained_default.value();
|
||||
if default_mode == WebSearchMode::Cached
|
||||
&& features.enabled(Feature::WebSearchIndexedDefault)
|
||||
&& constrained_default.can_set(&WebSearchMode::Indexed).is_ok()
|
||||
{
|
||||
WebSearchMode::Indexed
|
||||
} else {
|
||||
default_mode
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn resolve_web_search_config(config_toml: &ConfigToml) -> Option<WebSearchConfig> {
|
||||
@@ -3385,6 +3397,7 @@ pub fn resolve_bootstrap_http_client_factory(
|
||||
|
||||
pub(crate) fn resolve_web_search_mode_for_turn(
|
||||
web_search_mode: &Constrained<WebSearchMode>,
|
||||
web_search_mode_was_explicit: bool,
|
||||
permission_profile: &PermissionProfile,
|
||||
provider_capabilities: ProviderCapabilities,
|
||||
) -> WebSearchMode {
|
||||
@@ -3400,30 +3413,28 @@ pub(crate) fn resolve_web_search_mode_for_turn(
|
||||
provider_supports_mode && web_search_mode.can_set(&mode).is_ok()
|
||||
};
|
||||
|
||||
if matches!(permission_profile, PermissionProfile::Disabled)
|
||||
&& !matches!(preferred, WebSearchMode::Disabled | WebSearchMode::Indexed)
|
||||
{
|
||||
for mode in [
|
||||
WebSearchMode::Live,
|
||||
WebSearchMode::Cached,
|
||||
WebSearchMode::Disabled,
|
||||
] {
|
||||
if is_allowed(mode) {
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if is_allowed(preferred) {
|
||||
return preferred;
|
||||
}
|
||||
for mode in [
|
||||
WebSearchMode::Cached,
|
||||
WebSearchMode::Live,
|
||||
WebSearchMode::Disabled,
|
||||
] {
|
||||
if is_allowed(mode) {
|
||||
return mode;
|
||||
let full_access_promotes_to_live = matches!(permission_profile, PermissionProfile::Disabled)
|
||||
&& match preferred {
|
||||
WebSearchMode::Cached | WebSearchMode::Live => true,
|
||||
WebSearchMode::Indexed => {
|
||||
!web_search_mode_was_explicit
|
||||
&& web_search_mode.can_set(&WebSearchMode::Cached).is_ok()
|
||||
}
|
||||
WebSearchMode::Disabled => false,
|
||||
};
|
||||
if full_access_promotes_to_live && is_allowed(WebSearchMode::Live) {
|
||||
return WebSearchMode::Live;
|
||||
}
|
||||
if is_allowed(preferred) {
|
||||
return preferred;
|
||||
}
|
||||
for mode in [
|
||||
WebSearchMode::Cached,
|
||||
WebSearchMode::Live,
|
||||
WebSearchMode::Disabled,
|
||||
] {
|
||||
if is_allowed(mode) {
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4221,8 +4232,7 @@ impl Config {
|
||||
);
|
||||
approvals_reviewer = constrained_approvals_reviewer.value();
|
||||
}
|
||||
let web_search_mode =
|
||||
resolve_web_search_mode(&cfg, &features).unwrap_or(WebSearchMode::Cached);
|
||||
let web_search_mode = resolve_web_search_mode(&cfg, &features, &constrained_web_search_mode);
|
||||
let web_search_config = resolve_web_search_config(&cfg);
|
||||
let experimental_request_user_input_enabled =
|
||||
resolve_experimental_request_user_input_enabled(&cfg);
|
||||
|
||||
@@ -269,7 +269,7 @@ impl Session {
|
||||
.refresh(&next_config.features);
|
||||
}
|
||||
let previous_config = notify_contributors
|
||||
.then(|| self.build_effective_session_config(&state.session_configuration));
|
||||
.then(|| Self::build_effective_session_config(&state.session_configuration));
|
||||
if config.mcp_enterprise_managed_auth.is_none() {
|
||||
config.config_layer_stack.mcp_ema_cancellation().cancel();
|
||||
}
|
||||
@@ -293,7 +293,7 @@ impl Session {
|
||||
RuntimeConfigRefresh::UserFiles => McpRefreshReason::UserConfigFilesReloaded,
|
||||
});
|
||||
let new_config = notify_contributors
|
||||
.then(|| self.build_effective_session_config(&state.session_configuration));
|
||||
.then(|| Self::build_effective_session_config(&state.session_configuration));
|
||||
(previous_config, new_config)
|
||||
};
|
||||
if config
|
||||
|
||||
@@ -84,7 +84,7 @@ impl Session {
|
||||
)
|
||||
};
|
||||
let config =
|
||||
self.build_per_turn_config(&session_configuration, environments.local_selection());
|
||||
Self::build_per_turn_config(&session_configuration, environments.local_selection());
|
||||
let local_process_cwd = config.cwd.to_path_buf();
|
||||
|
||||
McpDesiredState {
|
||||
@@ -106,7 +106,7 @@ impl Session {
|
||||
mcp_projection: McpRuntimeProjection,
|
||||
resolved_environments: &TurnEnvironmentSnapshot,
|
||||
) -> anyhow::Result<()> {
|
||||
let config = self.build_per_turn_config(
|
||||
let config = Self::build_per_turn_config(
|
||||
session_configuration,
|
||||
resolved_environments.local_selection(),
|
||||
);
|
||||
|
||||
@@ -2253,7 +2253,7 @@ impl Session {
|
||||
)
|
||||
});
|
||||
let previous_config = notify_config_contributors
|
||||
.then(|| self.build_effective_session_config(&state.session_configuration));
|
||||
.then(|| Self::build_effective_session_config(&state.session_configuration));
|
||||
let current = &state.session_configuration;
|
||||
let refresh_network_proxy = current.permission_profile()
|
||||
!= updated.permission_profile()
|
||||
@@ -2306,7 +2306,7 @@ impl Session {
|
||||
None
|
||||
};
|
||||
let new_config = notify_config_contributors
|
||||
.then(|| self.build_effective_session_config(&state.session_configuration));
|
||||
.then(|| Self::build_effective_session_config(&state.session_configuration));
|
||||
let commit = SessionSettingsCommit {
|
||||
configuration: state.session_configuration.clone(),
|
||||
snapshot: state
|
||||
@@ -2499,7 +2499,7 @@ impl Session {
|
||||
state.reasoning_effort_pin.clone(),
|
||||
)
|
||||
};
|
||||
let config = self.build_effective_session_config(&configuration);
|
||||
let config = Self::build_effective_session_config(&configuration);
|
||||
if !config.features.enabled(Feature::ReasoningEffortOverride) {
|
||||
let model = configuration
|
||||
.step_settings
|
||||
|
||||
@@ -6830,7 +6830,7 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) {
|
||||
forked_from_ordinal_exclusive: None,
|
||||
next_internal_sub_id: AtomicU64::new(0),
|
||||
};
|
||||
let per_turn_config = session.build_per_turn_config(
|
||||
let per_turn_config = Session::build_per_turn_config(
|
||||
&session_configuration,
|
||||
resolved_turn_environments.local_selection(),
|
||||
);
|
||||
@@ -9195,7 +9195,7 @@ where
|
||||
forked_from_ordinal_exclusive: None,
|
||||
next_internal_sub_id: AtomicU64::new(0),
|
||||
});
|
||||
let per_turn_config = session.build_per_turn_config(
|
||||
let per_turn_config = Session::build_per_turn_config(
|
||||
&session_configuration,
|
||||
resolved_turn_environments.local_selection(),
|
||||
);
|
||||
|
||||
@@ -993,7 +993,6 @@ fn local_time_context() -> (String, String) {
|
||||
impl Session {
|
||||
/// Don't expand the number of mutated arguments on config. We are in the process of getting rid of it.
|
||||
pub(crate) fn build_per_turn_config(
|
||||
&self,
|
||||
session_configuration: &SessionConfiguration,
|
||||
local_environment: Option<&TurnEnvironmentSelection>,
|
||||
) -> Config {
|
||||
@@ -1032,17 +1031,25 @@ impl Session {
|
||||
per_turn_config.approvals_reviewer = session_configuration.step_settings.approvals_reviewer;
|
||||
session_configuration
|
||||
.apply_permission_profile_to_permissions(&mut per_turn_config.permissions);
|
||||
let permission_profile = session_configuration.permission_profile();
|
||||
Self::apply_effective_web_search_mode(session_configuration, &mut per_turn_config);
|
||||
per_turn_config.features = config.features.clone();
|
||||
per_turn_config
|
||||
}
|
||||
|
||||
pub(super) fn apply_effective_web_search_mode(
|
||||
session_configuration: &SessionConfiguration,
|
||||
config: &mut Config,
|
||||
) {
|
||||
let resolved_web_search_mode = resolve_web_search_mode_for_turn(
|
||||
&per_turn_config.web_search_mode,
|
||||
&permission_profile,
|
||||
&config.web_search_mode,
|
||||
config.web_search_mode_was_explicit,
|
||||
session_configuration
|
||||
.permission_profile_state
|
||||
.permission_profile(),
|
||||
session_configuration.provider.capabilities(),
|
||||
);
|
||||
if let Err(err) = per_turn_config
|
||||
.web_search_mode
|
||||
.set(resolved_web_search_mode)
|
||||
{
|
||||
let fallback_value = per_turn_config.web_search_mode.value();
|
||||
if let Err(err) = config.web_search_mode.set(resolved_web_search_mode) {
|
||||
let fallback_value = config.web_search_mode.value();
|
||||
tracing::warn!(
|
||||
error = %err,
|
||||
?resolved_web_search_mode,
|
||||
@@ -1050,15 +1057,12 @@ impl Session {
|
||||
"resolved web_search_mode is disallowed by requirements; keeping constrained value"
|
||||
);
|
||||
}
|
||||
per_turn_config.features = config.features.clone();
|
||||
per_turn_config
|
||||
}
|
||||
|
||||
pub(crate) fn build_effective_session_config(
|
||||
&self,
|
||||
session_configuration: &SessionConfiguration,
|
||||
) -> Config {
|
||||
let mut config = self.build_per_turn_config(
|
||||
let mut config = Self::build_per_turn_config(
|
||||
session_configuration,
|
||||
session_configuration
|
||||
.environments
|
||||
@@ -1238,10 +1242,8 @@ impl Session {
|
||||
let refresh_client = {
|
||||
let state = self.state.lock().await;
|
||||
let configuration = &state.session_configuration;
|
||||
(!crate::guardian::is_basic_session_source(&configuration.session_source)).then(|| {
|
||||
self.build_effective_session_config(configuration)
|
||||
.http_client_factory()
|
||||
})
|
||||
(!crate::guardian::is_basic_session_source(&configuration.session_source))
|
||||
.then(|| Self::build_effective_session_config(configuration).http_client_factory())
|
||||
};
|
||||
// An auth refresh may change allowed settings; finish it before capturing this turn.
|
||||
if let Some(http_client_factory) = refresh_client {
|
||||
@@ -1333,8 +1335,10 @@ impl Session {
|
||||
git_enrichment_policy: GitEnrichmentPolicy,
|
||||
) -> Arc<TurnContext> {
|
||||
let primary_turn_environment = turn_environments.primary();
|
||||
let mut per_turn_config =
|
||||
self.build_per_turn_config(&session_configuration, turn_environments.local_selection());
|
||||
let mut per_turn_config = Self::build_per_turn_config(
|
||||
&session_configuration,
|
||||
turn_environments.local_selection(),
|
||||
);
|
||||
let overridden_direct_only_tool_namespaces =
|
||||
options.direct_only_tool_namespaces.map(|namespaces| {
|
||||
std::mem::replace(
|
||||
|
||||
@@ -3444,6 +3444,7 @@ async fn hosted_web_search_and_standalone_image_generation_follow_runtime_gates(
|
||||
standalone_web_search.assert_visible_lacks(&["web_search"]);
|
||||
|
||||
let bedrock_cached_web_search = probe(|turn| {
|
||||
set_web_search_mode(turn, WebSearchMode::Cached);
|
||||
use_bedrock_provider(turn);
|
||||
update_turn_settings_for_test(turn, |settings| {
|
||||
Arc::make_mut(&mut settings.model_info).web_search_tool_type = WebSearchToolType::Text;
|
||||
|
||||
Reference in New Issue
Block a user