feat(core): enable default-mode user questions

This commit is contained in:
Felipe Coury
2026-05-26 13:41:31 -03:00
parent c4e53d103c
commit 816e48ccca
12 changed files with 78 additions and 89 deletions
@@ -11,6 +11,7 @@ use crate::tools::handlers::request_user_input_spec::request_user_input_tool_des
use crate::tools::handlers::request_user_input_spec::request_user_input_unavailable_message;
use crate::tools::registry::CoreToolRuntime;
use crate::tools::registry::ToolExecutor;
use crate::tools::registry::ToolExposure;
use codex_protocol::config_types::ModeKind;
use codex_protocol::request_user_input::RequestUserInputArgs;
use codex_tools::ToolName;
@@ -30,6 +31,10 @@ impl ToolExecutor<ToolInvocation> for RequestUserInputHandler {
create_request_user_input_tool(request_user_input_tool_description(&self.available_modes))
}
fn exposure(&self) -> ToolExposure {
ToolExposure::DirectModelOnly
}
async fn handle(
&self,
invocation: ToolInvocation,
@@ -1,20 +1,12 @@
use super::*;
use codex_features::Feature;
use codex_features::Features;
use codex_protocol::config_types::ModeKind;
use codex_tools::JsonSchema;
use codex_tools::request_user_input_available_modes;
use pretty_assertions::assert_eq;
use std::collections::BTreeMap;
fn default_mode_enabled_available_modes() -> Vec<ModeKind> {
let mut features = Features::with_defaults();
features.enable(Feature::DefaultModeRequestUserInput);
request_user_input_available_modes(&features)
}
fn default_available_modes() -> Vec<ModeKind> {
request_user_input_available_modes(&Features::with_defaults())
fn available_modes() -> Vec<ModeKind> {
request_user_input_available_modes()
}
#[test]
@@ -103,31 +95,21 @@ fn request_user_input_tool_includes_questions_schema() {
}
#[test]
fn request_user_input_unavailable_messages_respect_default_mode_feature_flag() {
fn request_user_input_unavailable_messages_respect_supported_modes() {
assert_eq!(
request_user_input_unavailable_message(ModeKind::Plan, &default_available_modes()),
request_user_input_unavailable_message(ModeKind::Plan, &available_modes()),
None
);
assert_eq!(
request_user_input_unavailable_message(ModeKind::Default, &default_available_modes()),
Some("request_user_input is unavailable in Default mode".to_string())
);
assert_eq!(
request_user_input_unavailable_message(
ModeKind::Default,
&default_mode_enabled_available_modes()
),
request_user_input_unavailable_message(ModeKind::Default, &available_modes()),
None
);
assert_eq!(
request_user_input_unavailable_message(ModeKind::Execute, &default_available_modes()),
request_user_input_unavailable_message(ModeKind::Execute, &available_modes()),
Some("request_user_input is unavailable in Execute mode".to_string())
);
assert_eq!(
request_user_input_unavailable_message(
ModeKind::PairProgramming,
&default_available_modes()
),
request_user_input_unavailable_message(ModeKind::PairProgramming, &available_modes()),
Some("request_user_input is unavailable in Pair Programming mode".to_string())
);
}
@@ -135,11 +117,7 @@ fn request_user_input_unavailable_messages_respect_default_mode_feature_flag() {
#[test]
fn request_user_input_tool_description_mentions_available_modes() {
assert_eq!(
request_user_input_tool_description(&default_available_modes()),
"Request user input for one to three short questions and wait for the response. This tool is only available in Plan mode.".to_string()
);
assert_eq!(
request_user_input_tool_description(&default_mode_enabled_available_modes()),
request_user_input_tool_description(&available_modes()),
"Request user input for one to three short questions and wait for the response. This tool is only available in Default or Plan mode.".to_string()
);
}
+1 -1
View File
@@ -569,7 +569,7 @@ fn add_core_utility_tools(context: &CoreToolPlanContext<'_>, planned_tools: &mut
}
planned_tools.add(RequestUserInputHandler {
available_modes: request_user_input_available_modes(features),
available_modes: request_user_input_available_modes(),
});
if features.enabled(Feature::RequestPermissionsTool) {
+19 -1
View File
@@ -697,6 +697,21 @@ async fn code_mode_only_exposes_code_executor_and_hides_nested_tools() {
);
}
#[tokio::test]
async fn code_mode_only_keeps_request_user_input_as_a_direct_modal_tool() {
let plan = probe(|turn| {
set_features(turn, &[Feature::CodeMode, Feature::CodeModeOnly]);
})
.await;
// Modal prompts must not be routed through a yielded exec cell.
plan.assert_visible_contains(&["request_user_input"]);
assert_eq!(
plan.exposure("request_user_input"),
ToolExposure::DirectModelOnly
);
}
#[tokio::test]
async fn multi_agent_feature_selects_one_agent_tool_family() {
let v1 = probe(|turn| {
@@ -897,7 +912,10 @@ async fn code_mode_only_can_expose_namespaced_multi_agent_v2_as_normal_tools() {
})
.await;
assert_eq!(plan.visible_names, vec!["exec", "wait", "agents"]);
assert_eq!(
plan.visible_names,
vec!["exec", "wait", "request_user_input", "agents"]
);
for tool_name in [
"spawn_agent",
"send_message",