openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-05 15:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TUI argument comment lint

Browse Source
This commit is contained in:
Chris Bookholt
2026-07-03 02:01:44 -07:00
parent 8c9c1ea9fe
commit 627ece5383
3 changed files with 127 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
codex-rs/tui/src/app/app_server_requests.rs
View File

@@ -852,7 +852,12 @@ mod tests {
#[test]
fn resolves_exec_approval_through_app_server_request_id() {
let mut pending = PendingAppServerRequests::default();
let request = exec_request(THREAD_1, 41, "call-1", Some("approval-1"));
let request = exec_request(
THREAD_1,
/*request_id*/ 41,
"call-1",
Some("approval-1"),
);
assert_eq!(pending.note_server_request(&request), None);
@@ -878,12 +883,22 @@ mod tests {
let mut pending = PendingAppServerRequests::default();
assert_eq!(
pending.note_server_request(&exec_request(THREAD_1, 41, "call-1", Some("approval-1"),)),
pending.note_server_request(&exec_request(
THREAD_1,
/*request_id*/ 41,
"call-1",
Some("approval-1"),
)),
None
);
assert!(
pending
.note_server_request(&exec_request(THREAD_1, 42, "call-2", Some("approval-1"),))
.note_server_request(&exec_request(
THREAD_1,
/*request_id*/ 42,
"call-2",
Some("approval-1"),
))
.is_some()
);
@@ -1097,7 +1112,7 @@ mod tests {
let mut pending = PendingAppServerRequests::default();
assert_eq!(
pending.note_server_request(&mcp_request(THREAD_1, 12)),
pending.note_server_request(&mcp_request(THREAD_1, /*request_id*/ 12)),
None
);
@@ -1171,7 +1186,9 @@ mod tests {
fn resolves_patch_approval_through_app_server_request_id() {
let mut pending = PendingAppServerRequests::default();
assert_eq!(
pending.note_server_request(&file_change_request(THREAD_1, 13, "patch-1")),
pending.note_server_request(&file_change_request(
THREAD_1, /*request_id*/ 13, "patch-1",
)),
None
);
@@ -1195,7 +1212,12 @@ mod tests {
fn resolve_notification_returns_resolved_exec_request() {
let mut pending = PendingAppServerRequests::default();
assert_eq!(
pending.note_server_request(&exec_request(THREAD_1, 41, "call-1", Some("approval-1"),)),
pending.note_server_request(&exec_request(
THREAD_1,
/*request_id*/ 41,
"call-1",
Some("approval-1"),
)),
None
);
@@ -1217,7 +1239,7 @@ mod tests {
fn resolve_notification_returns_resolved_mcp_request() {
let mut pending = PendingAppServerRequests::default();
assert_eq!(
pending.note_server_request(&mcp_request(THREAD_1, 12)),
pending.note_server_request(&mcp_request(THREAD_1, /*request_id*/ 12)),
None
);
@@ -1234,7 +1256,9 @@ mod tests {
#[test]
fn resolve_notification_returns_resolved_user_input_item_id() {
let mut pending = PendingAppServerRequests::default();
pending.note_server_request(&user_input_request(THREAD_1, 8, "turn-1", "tool-1"));
pending.note_server_request(&user_input_request(
THREAD_1, /*request_id*/ 8, "turn-1", "tool-1",
));
assert_eq!(
pending.resolve_notification(thread_id(THREAD_1), &AppServerRequestId::Integer(8)),
@@ -1290,16 +1314,36 @@ mod tests {
let mut pending = PendingAppServerRequests::default();
for request in [
exec_request(THREAD_1, 1, "implicit-exec", /*approval_id*/ None),
exec_request(THREAD_2, 2, "implicit-exec", /*approval_id*/ None),
exec_request(THREAD_1, 3, "exec-1", Some("explicit-exec")),
exec_request(THREAD_2, 4, "exec-2", Some("explicit-exec")),
file_change_request(THREAD_1, 5, "patch"),
file_change_request(THREAD_2, 6, "patch"),
permissions_request(THREAD_1, 7, "permissions"),
permissions_request(THREAD_2, 8, "permissions"),
user_input_request(THREAD_1, 9, "turn", "input"),
user_input_request(THREAD_2, 10, "turn", "input"),
exec_request(
THREAD_1,
/*request_id*/ 1,
"implicit-exec",
/*approval_id*/ None,
),
exec_request(
THREAD_2,
/*request_id*/ 2,
"implicit-exec",
/*approval_id*/ None,
),
exec_request(
THREAD_1,
/*request_id*/ 3,
"exec-1",
Some("explicit-exec"),
),
exec_request(
THREAD_2,
/*request_id*/ 4,
"exec-2",
Some("explicit-exec"),
),
file_change_request(THREAD_1, /*request_id*/ 5, "patch"),
file_change_request(THREAD_2, /*request_id*/ 6, "patch"),
permissions_request(THREAD_1, /*request_id*/ 7, "permissions"),
permissions_request(THREAD_2, /*request_id*/ 8, "permissions"),
user_input_request(THREAD_1, /*request_id*/ 9, "turn", "input"),
user_input_request(THREAD_2, /*request_id*/ 10, "turn", "input"),
] {
assert_eq!(pending.note_server_request(&request), None);
}
@@ -1349,11 +1393,21 @@ mod tests {
let mut pending = PendingAppServerRequests::default();
let request_id = AppServerRequestId::Integer(41);
assert_eq!(
pending.note_server_request(&exec_request(THREAD_1, 41, "call", Some("approval"),)),
pending.note_server_request(&exec_request(
THREAD_1,
/*request_id*/ 41,
"call",
Some("approval"),
)),
None
);
assert_eq!(
pending.note_server_request(&exec_request(THREAD_2, 41, "call", Some("approval"),)),
pending.note_server_request(&exec_request(
THREAD_2,
/*request_id*/ 41,
"call",
Some("approval"),
)),
None
);
@@ -1376,12 +1430,12 @@ mod tests {
let mut pending = PendingAppServerRequests::default();
let cases = [
(
file_change_request(THREAD_1, 1, "patch"),
file_change_request(THREAD_1, 2, "patch"),
file_change_request(THREAD_1, /*request_id*/ 1, "patch"),
file_change_request(THREAD_1, /*request_id*/ 2, "patch"),
),
(
permissions_request(THREAD_1, 3, "permissions"),
permissions_request(THREAD_1, 4, "permissions"),
permissions_request(THREAD_1, /*request_id*/ 3, "permissions"),
permissions_request(THREAD_1, /*request_id*/ 4, "permissions"),
),
];
for (original, duplicate) in cases {
@@ -1395,10 +1449,10 @@ mod tests {
#[test]
fn duplicate_user_input_item_is_rejected_within_thread_and_turn_only() {
let mut pending = PendingAppServerRequests::default();
let original = user_input_request(THREAD_1, 1, "turn-1", "input");
let duplicate = user_input_request(THREAD_1, 2, "turn-1", "input");
let other_turn = user_input_request(THREAD_1, 3, "turn-2", "input");
let other_thread = user_input_request(THREAD_2, 4, "turn-1", "input");
let original = user_input_request(THREAD_1, /*request_id*/ 1, "turn-1", "input");
let duplicate = user_input_request(THREAD_1, /*request_id*/ 2, "turn-1", "input");
let other_turn = user_input_request(THREAD_1, /*request_id*/ 3, "turn-2", "input");
let other_thread = user_input_request(THREAD_2, /*request_id*/ 4, "turn-1", "input");
assert_eq!(pending.note_server_request(&original), None);
assert!(pending.note_server_request(&duplicate).is_some());
@@ -1426,8 +1480,18 @@ mod tests {
let cases = [
(
"implicit exec approval",
exec_request(THREAD_1, 1, "implicit-exec", /* approval_id */ None),
exec_request(THREAD_1, 2, "implicit-exec", /* approval_id */ None),
exec_request(
THREAD_1,
/*request_id*/ 1,
"implicit-exec",
/*approval_id*/ None,
),
exec_request(
THREAD_1,
/*request_id*/ 2,
"implicit-exec",
/*approval_id*/ None,
),
Op::ExecApproval {
id: "implicit-exec".to_string(),
turn_id: None,
@@ -1436,8 +1500,18 @@ mod tests {
),
(
"explicit exec approval",
exec_request(THREAD_1, 1, "exec-a", Some("explicit-exec")),
exec_request(THREAD_1, 2, "exec-b", Some("explicit-exec")),
exec_request(
THREAD_1,
/*request_id*/ 1,
"exec-a",
Some("explicit-exec"),
),
exec_request(
THREAD_1,
/*request_id*/ 2,
"exec-b",
Some("explicit-exec"),
),
Op::ExecApproval {
id: "explicit-exec".to_string(),
turn_id: None,
@@ -1446,8 +1520,8 @@ mod tests {
),
(
"file change approval",
file_change_request(THREAD_1, 1, "patch"),
file_change_request(THREAD_1, 2, "patch"),
file_change_request(THREAD_1, /*request_id*/ 1, "patch"),
file_change_request(THREAD_1, /*request_id*/ 2, "patch"),
Op::PatchApproval {
id: "patch".to_string(),
decision: FileChangeApprovalDecision::Accept,
@@ -1455,8 +1529,8 @@ mod tests {
),
(
"permissions approval",
permissions_request(THREAD_1, 1, "permissions"),
permissions_request(THREAD_1, 2, "permissions"),
permissions_request(THREAD_1, /*request_id*/ 1, "permissions"),
permissions_request(THREAD_1, /*request_id*/ 2, "permissions"),
Op::RequestPermissionsResponse {
id: "permissions".to_string(),
response: permissions_response(),
@@ -1464,8 +1538,8 @@ mod tests {
),
(
"user input",
user_input_request(THREAD_1, 1, "turn", "input"),
user_input_request(THREAD_1, 2, "turn", "input"),
user_input_request(THREAD_1, /*request_id*/ 1, "turn", "input"),
user_input_request(THREAD_1, /*request_id*/ 2, "turn", "input"),
Op::UserInputAnswer {
id: "turn".to_string(),
response: empty_user_input_response(),
@@ -1591,8 +1665,8 @@ mod tests {
#[test]
fn equal_user_input_item_ids_across_turns_resolve_independently() {
let mut pending = PendingAppServerRequests::default();
let first = user_input_request(THREAD_1, 8, "turn-1", "input");
let second = user_input_request(THREAD_1, 9, "turn-2", "input");
let first = user_input_request(THREAD_1, /*request_id*/ 8, "turn-1", "input");
let second = user_input_request(THREAD_1, /*request_id*/ 9, "turn-2", "input");
assert_eq!(pending.note_server_request(&first), None);
assert_eq!(pending.note_server_request(&second), None);
@@ -1618,8 +1692,13 @@ mod tests {
#[test]
fn invalid_thread_id_is_rejected_before_pending_state_changes() {
let mut pending = PendingAppServerRequests::default();
let invalid = exec_request("not-a-thread-id", 1, "call", Some("approval"));
let valid = exec_request(THREAD_1, 2, "call", Some("approval"));
let invalid = exec_request(
"not-a-thread-id",
/*request_id*/ 1,
"call",
Some("approval"),
);
let valid = exec_request(THREAD_1, /*request_id*/ 2, "call", Some("approval"));
let unsupported = pending
.note_server_request(&invalid)

2
codex-rs/tui/src/app_event_sender.rs
View File

@@ -221,7 +221,7 @@ mod tests {
sender.exec_approval(
thread_id(),
None,
/*request_id*/ None,
"approval".to_string(),
CommandExecutionApprovalDecision::Accept,
);

10
codex-rs/tui/src/bottom_pane/request_user_input/mod.rs
View File

@@ -1813,11 +1813,11 @@ mod tests {
);
overlay.try_consume_user_input_request(
request_event("turn-2", vec![question_with_options("q2", "Second")]),
None,
/*identity*/ None,
);
overlay.try_consume_user_input_request(
request_event("turn-3", vec![question_with_options("q3", "Third")]),
None,
/*identity*/ None,
);
overlay.submit_answers();
@@ -1908,7 +1908,7 @@ mod tests {
questions: vec![question_with_options("q2", "Second")],
auto_resolution_ms: None,
},
None,
/*identity*/ None,
);
overlay.try_consume_user_input_request(
ToolRequestUserInputParams {
@@ -1918,7 +1918,7 @@ mod tests {
questions: vec![question_with_options("q3", "Third")],
auto_resolution_ms: None,
},
None,
/*identity*/ None,
);
overlay.handle_key_event(KeyEvent::from(KeyCode::Esc));
@@ -2150,7 +2150,7 @@ mod tests {
"turn-2",
vec![question_with_options("q2", "Second")],
),
None,
/*identity*/ None,
);
let now = Instant::now();
let total_timeout = AUTO_RESOLUTION_HIDDEN_GRACE + AUTO_RESOLUTION_VISIBLE_COUNTDOWN;