agent/codex
2
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: clean up argument-comment lint and roll out all-target CI on macOS (#16054)

Browse Source 
## Why

`argument-comment-lint` was green in CI even though the repo still had
many uncommented literal arguments. The main gap was target coverage:
the repo wrapper did not force Cargo to inspect test-only call sites, so
examples like the `latest_session_lookup_params(true, ...)` tests in
`codex-rs/tui_app_server/src/lib.rs` never entered the blocking CI path.

This change cleans up the existing backlog, makes the default repo lint
path cover all Cargo targets, and starts rolling that stricter CI
enforcement out on the platform where it is currently validated.

## What changed

- mechanically fixed existing `argument-comment-lint` violations across
the `codex-rs` workspace, including tests, examples, and benches
- updated `tools/argument-comment-lint/run-prebuilt-linter.sh` and
`tools/argument-comment-lint/run.sh` so non-`--fix` runs default to
`--all-targets` unless the caller explicitly narrows the target set
- fixed both wrappers so forwarded cargo arguments after `--` are
preserved with a single separator
- documented the new default behavior in
`tools/argument-comment-lint/README.md`
- updated `rust-ci` so the macOS lint lane keeps the plain wrapper
invocation and therefore enforces `--all-targets`, while Linux and
Windows temporarily pass `-- --lib --bins`

That temporary CI split keeps the stricter all-targets check where it is
already cleaned up, while leaving room to finish the remaining Linux-
and Windows-specific target-gated cleanup before enabling
`--all-targets` on those runners. The Linux and Windows failures on the
intermediate revision were caused by the wrapper forwarding bug, not by
additional lint findings in those lanes.

## Validation

- `bash -n tools/argument-comment-lint/run.sh`
- `bash -n tools/argument-comment-lint/run-prebuilt-linter.sh`
- shell-level wrapper forwarding check for `-- --lib --bins`
- shell-level wrapper forwarding check for `-- --tests`
- `just argument-comment-lint`
- `cargo test` in `tools/argument-comment-lint`
- `cargo test -p codex-terminal-detection`

## Follow-up

- Clean up remaining Linux-only target-gated callsites, then switch the
Linux lint lane back to the plain wrapper invocation.
- Clean up remaining Windows-only target-gated callsites, then switch
the Windows lint lane back to the plain wrapper invocation.
This commit is contained in:
Michael Bolin
2026-03-27 19:00:44 -07:00
committed by GitHub
parent ed977b42ac
commit 61dfe0b86c
307 changed files with 7724 additions and 4710 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/rollout/src/metadata_tests.rs
+3 -3
View File
@@ -186,14 +186,14 @@ async fn backfill_sessions_resumes_from_watermark_and_marks_complete() {
"2026-01-27T12-34-56",
"2026-01-27T12:34:56Z",
first_uuid,
None,
/*git*/ None,
);
let second_path = write_rollout_in_sessions(
codex_home.as_path(),
"2026-01-27T12-35-56",
"2026-01-27T12:35:56Z",
second_uuid,
None,
/*git*/ None,
);
let runtime = codex_state::StateRuntime::init(codex_home.clone(), "test-provider".to_string())
@@ -306,7 +306,7 @@ async fn backfill_sessions_normalizes_cwd_before_upsert() {
"2026-01-27T12:34:56Z",
thread_uuid,
session_cwd.clone(),
None,
/*git*/ None,
);
let runtime = codex_state::StateRuntime::init(codex_home.clone(), "test-provider".to_string())
codex-rs/rollout/src/recorder_tests.rs
+24 -24
View File
@@ -71,14 +71,14 @@ async fn recorder_materializes_only_after_explicit_persist() -> std::io::Result<
&config,
RolloutRecorderParams::new(
thread_id,
None,
/*forked_from_id*/ None,
SessionSource::Exec,
BaseInstructions::default(),
Vec::new(),
EventPersistenceMode::Limited,
),
None,
None,
/*state_db_ctx*/ None,
/*state_builder*/ None,
)
.await?;
@@ -155,7 +155,7 @@ async fn metadata_irrelevant_events_touch_state_db_updated_at() -> std::io::Resu
.await
.expect("state db should initialize");
state_db
.mark_backfill_complete(None)
.mark_backfill_complete(/*last_watermark*/ None)
.await
.expect("backfill should be complete");
@@ -164,14 +164,14 @@ async fn metadata_irrelevant_events_touch_state_db_updated_at() -> std::io::Resu
&config,
RolloutRecorderParams::new(
thread_id,
None,
/*forked_from_id*/ None,
SessionSource::Cli,
BaseInstructions::default(),
Vec::new(),
EventPersistenceMode::Limited,
),
Some(state_db.clone()),
None,
/*state_builder*/ None,
)
.await?;
@@ -257,7 +257,7 @@ async fn metadata_irrelevant_events_fall_back_to_upsert_when_thread_missing() ->
Some(&builder),
items.as_slice(),
config.model_provider_id.as_str(),
None,
/*new_thread_memory_mode*/ None,
)
.await;
@@ -283,13 +283,13 @@ async fn list_threads_db_disabled_does_not_skip_paginated_items() -> std::io::Re
let default_provider = config.model_provider_id.clone();
let page1 = RolloutRecorder::list_threads(
&config,
1,
None,
/*page_size*/ 1,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
&[],
None,
/*model_providers*/ None,
default_provider.as_str(),
None,
/*search_term*/ None,
)
.await?;
assert_eq!(page1.items.len(), 1);
@@ -298,13 +298,13 @@ async fn list_threads_db_disabled_does_not_skip_paginated_items() -> std::io::Re
let page2 = RolloutRecorder::list_threads(
&config,
1,
/*page_size*/ 1,
Some(&cursor),
ThreadSortKey::CreatedAt,
&[],
None,
/*model_providers*/ None,
default_provider.as_str(),
None,
/*search_term*/ None,
)
.await?;
assert_eq!(page2.items.len(), 1);
@@ -330,7 +330,7 @@ async fn list_threads_db_enabled_drops_missing_rollout_paths() -> std::io::Resul
.await
.expect("state db should initialize");
runtime
.mark_backfill_complete(None)
.mark_backfill_complete(/*last_watermark*/ None)
.await
.expect("backfill should be complete");
let created_at = chrono::Utc
@@ -355,13 +355,13 @@ async fn list_threads_db_enabled_drops_missing_rollout_paths() -> std::io::Resul
let default_provider = config.model_provider_id.clone();
let page = RolloutRecorder::list_threads(
&config,
10,
None,
/*page_size*/ 10,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
&[],
None,
/*model_providers*/ None,
default_provider.as_str(),
None,
/*search_term*/ None,
)
.await?;
assert_eq!(page.items.len(), 0);
@@ -392,7 +392,7 @@ async fn list_threads_db_enabled_repairs_stale_rollout_paths() -> std::io::Resul
.await
.expect("state db should initialize");
runtime
.mark_backfill_complete(None)
.mark_backfill_complete(/*last_watermark*/ None)
.await
.expect("backfill should be complete");
let created_at = chrono::Utc
@@ -417,13 +417,13 @@ async fn list_threads_db_enabled_repairs_stale_rollout_paths() -> std::io::Resul
let default_provider = config.model_provider_id.clone();
let page = RolloutRecorder::list_threads(
&config,
1,
None,
/*page_size*/ 1,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
&[],
None,
/*model_providers*/ None,
default_provider.as_str(),
None,
/*search_term*/ None,
)
.await?;
assert_eq!(page.items.len(), 1);
codex-rs/rollout/src/tests.rs
+116 -60
View File
@@ -63,7 +63,7 @@ async fn insert_state_db_thread(
.await
.expect("state db should initialize");
runtime
.mark_backfill_complete(None)
.mark_backfill_complete(/*last_watermark*/ None)
.await
.expect("backfill should be complete");
let created_at = chrono::Utc
@@ -223,13 +223,26 @@ async fn find_thread_path_falls_back_when_db_path_is_stale() {
let uuid = Uuid::from_u128(302);
let thread_id = ThreadId::from_string(&uuid.to_string()).expect("valid thread id");
let ts = "2025-01-03T13-00-00";
write_session_file(home, ts, uuid, 1, Some(SessionSource::Cli)).unwrap();
write_session_file(
home,
ts,
uuid,
/*num_records*/ 1,
Some(SessionSource::Cli),
)
.unwrap();
let fs_rollout_path = home.join(format!("sessions/2025/01/03/rollout-{ts}-{uuid}.jsonl"));
let stale_db_path = home.join(format!(
"sessions/2099/01/01/rollout-2099-01-01T00-00-00-{uuid}.jsonl"
));
insert_state_db_thread(home, thread_id, stale_db_path.as_path(), false).await;
insert_state_db_thread(
home,
thread_id,
stale_db_path.as_path(),
/*archived*/ false,
)
.await;
let found = find_thread_path_by_id_str(home, &uuid.to_string())
.await
@@ -245,7 +258,14 @@ async fn find_thread_path_repairs_missing_db_row_after_filesystem_fallback() {
let uuid = Uuid::from_u128(303);
let thread_id = ThreadId::from_string(&uuid.to_string()).expect("valid thread id");
let ts = "2025-01-03T13-00-00";
write_session_file(home, ts, uuid, 1, Some(SessionSource::Cli)).unwrap();
write_session_file(
home,
ts,
uuid,
/*num_records*/ 1,
Some(SessionSource::Cli),
)
.unwrap();
let fs_rollout_path = home.join(format!("sessions/2025/01/03/rollout-{ts}-{uuid}.jsonl"));
// Create an empty state DB so lookup takes the DB-first path and then falls back to files.
@@ -253,7 +273,7 @@ async fn find_thread_path_repairs_missing_db_row_after_filesystem_fallback() {
.await
.expect("state db should initialize");
_runtime
.mark_backfill_complete(None)
.mark_backfill_complete(/*last_watermark*/ None)
.await
.expect("backfill should be complete");
@@ -491,7 +511,7 @@ async fn test_list_conversations_latest_first() {
home,
"2025-01-01T12-00-00",
u1,
3,
/*num_records*/ 3,
Some(SessionSource::VSCode),
)
.unwrap();
@@ -499,7 +519,7 @@ async fn test_list_conversations_latest_first() {
home,
"2025-01-02T12-00-00",
u2,
3,
/*num_records*/ 3,
Some(SessionSource::VSCode),
)
.unwrap();
@@ -507,7 +527,7 @@ async fn test_list_conversations_latest_first() {
home,
"2025-01-03T12-00-00",
u3,
3,
/*num_records*/ 3,
Some(SessionSource::VSCode),
)
.unwrap();
@@ -515,8 +535,8 @@ async fn test_list_conversations_latest_first() {
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let page = get_threads(
home,
10,
None,
/*page_size*/ 10,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -624,7 +644,7 @@ async fn test_pagination_cursor() {
home,
"2025-03-01T09-00-00",
u1,
1,
/*num_records*/ 1,
Some(SessionSource::VSCode),
)
.unwrap();
@@ -632,7 +652,7 @@ async fn test_pagination_cursor() {
home,
"2025-03-02T09-00-00",
u2,
1,
/*num_records*/ 1,
Some(SessionSource::VSCode),
)
.unwrap();
@@ -640,7 +660,7 @@ async fn test_pagination_cursor() {
home,
"2025-03-03T09-00-00",
u3,
1,
/*num_records*/ 1,
Some(SessionSource::VSCode),
)
.unwrap();
@@ -648,7 +668,7 @@ async fn test_pagination_cursor() {
home,
"2025-03-04T09-00-00",
u4,
1,
/*num_records*/ 1,
Some(SessionSource::VSCode),
)
.unwrap();
@@ -656,7 +676,7 @@ async fn test_pagination_cursor() {
home,
"2025-03-05T09-00-00",
u5,
1,
/*num_records*/ 1,
Some(SessionSource::VSCode),
)
.unwrap();
@@ -664,8 +684,8 @@ async fn test_pagination_cursor() {
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let page1 = get_threads(
home,
2,
None,
/*page_size*/ 2,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -732,7 +752,7 @@ async fn test_pagination_cursor() {
let page2 = get_threads(
home,
2,
/*page_size*/ 2,
page1.next_cursor.as_ref(),
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
@@ -800,7 +820,7 @@ async fn test_pagination_cursor() {
let page3 = get_threads(
home,
2,
/*page_size*/ 2,
page2.next_cursor.as_ref(),
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
@@ -848,13 +868,14 @@ async fn test_list_threads_scans_past_head_for_user_event() {
let uuid = Uuid::from_u128(99);
let ts = "2025-05-01T10-30-00";
write_session_file_with_delayed_user_event(home, ts, uuid, 12).unwrap();
write_session_file_with_delayed_user_event(home, ts, uuid, /*meta_lines_before_user*/ 12)
.unwrap();
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let page = get_threads(
home,
10,
None,
/*page_size*/ 10,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -874,13 +895,20 @@ async fn test_get_thread_contents() {
let uuid = Uuid::new_v4();
let ts = "2025-04-01T10-30-00";
write_session_file(home, ts, uuid, 2, Some(SessionSource::VSCode)).unwrap();
write_session_file(
home,
ts,
uuid,
/*num_records*/ 2,
Some(SessionSource::VSCode),
)
.unwrap();
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let page = get_threads(
home,
1,
None,
/*page_size*/ 1,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -969,8 +997,8 @@ async fn test_base_instructions_missing_in_meta_defaults_to_null() {
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let page = get_threads(
home,
1,
None,
/*page_size*/ 1,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -1012,8 +1040,8 @@ async fn test_base_instructions_present_in_meta_is_preserved() {
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let page = get_threads(
home,
1,
None,
/*page_size*/ 1,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -1040,7 +1068,14 @@ async fn test_created_at_sort_uses_file_mtime_for_updated_at() -> Result<()> {
let ts = "2025-06-01T08-00-00";
let uuid = Uuid::from_u128(43);
write_session_file(home, ts, uuid, 0, Some(SessionSource::VSCode)).unwrap();
write_session_file(
home,
ts,
uuid,
/*num_records*/ 0,
Some(SessionSource::VSCode),
)
.unwrap();
let created = PrimitiveDateTime::parse(
ts,
@@ -1063,8 +1098,8 @@ async fn test_created_at_sort_uses_file_mtime_for_updated_at() -> Result<()> {
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let page = get_threads(
home,
1,
None,
/*page_size*/ 1,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -1148,8 +1183,8 @@ async fn test_updated_at_uses_file_mtime() -> Result<()> {
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let page = get_threads(
home,
1,
None,
/*page_size*/ 1,
/*cursor*/ None,
ThreadSortKey::UpdatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -1181,15 +1216,36 @@ async fn test_stable_ordering_same_second_pagination() {
let u2 = Uuid::from_u128(2);
let u3 = Uuid::from_u128(3);
write_session_file(home, ts, u1, 0, Some(SessionSource::VSCode)).unwrap();
write_session_file(home, ts, u2, 0, Some(SessionSource::VSCode)).unwrap();
write_session_file(home, ts, u3, 0, Some(SessionSource::VSCode)).unwrap();
write_session_file(
home,
ts,
u1,
/*num_records*/ 0,
Some(SessionSource::VSCode),
)
.unwrap();
write_session_file(
home,
ts,
u2,
/*num_records*/ 0,
Some(SessionSource::VSCode),
)
.unwrap();
write_session_file(
home,
ts,
u3,
/*num_records*/ 0,
Some(SessionSource::VSCode),
)
.unwrap();
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let page1 = get_threads(
home,
2,
None,
/*page_size*/ 2,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -1256,7 +1312,7 @@ async fn test_stable_ordering_same_second_pagination() {
let page2 = get_threads(
home,
2,
/*page_size*/ 2,
page1.next_cursor.as_ref(),
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
@@ -1309,7 +1365,7 @@ async fn test_source_filter_excludes_non_matching_sessions() {
home,
"2025-08-02T10-00-00",
interactive_id,
2,
/*num_records*/ 2,
Some(SessionSource::Cli),
)
.unwrap();
@@ -1317,7 +1373,7 @@ async fn test_source_filter_excludes_non_matching_sessions() {
home,
"2025-08-01T10-00-00",
non_interactive_id,
2,
/*num_records*/ 2,
Some(SessionSource::Exec),
)
.unwrap();
@@ -1325,8 +1381,8 @@ async fn test_source_filter_excludes_non_matching_sessions() {
let provider_filter = provider_vec(&[TEST_PROVIDER]);
let interactive_only = get_threads(
home,
10,
None,
/*page_size*/ 10,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
INTERACTIVE_SESSION_SOURCES.as_slice(),
Some(provider_filter.as_slice()),
@@ -1347,11 +1403,11 @@ async fn test_source_filter_excludes_non_matching_sessions() {
let all_sessions = get_threads(
home,
10,
None,
/*page_size*/ 10,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
NO_SOURCE_FILTER,
None,
/*model_providers*/ None,
TEST_PROVIDER,
)
.await
@@ -1383,7 +1439,7 @@ async fn test_model_provider_filter_selects_only_matching_sessions() -> Result<(
home,
"2025-09-01T12-00-00",
openai_id,
1,
/*num_records*/ 1,
Some(SessionSource::VSCode),
Some("openai"),
)?;
@@ -1391,7 +1447,7 @@ async fn test_model_provider_filter_selects_only_matching_sessions() -> Result<(
home,
"2025-09-01T11-00-00",
beta_id,
1,
/*num_records*/ 1,
Some(SessionSource::VSCode),
Some("beta"),
)?;
@@ -1399,9 +1455,9 @@ async fn test_model_provider_filter_selects_only_matching_sessions() -> Result<(
home,
"2025-09-01T10-00-00",
none_id,
1,
/*num_records*/ 1,
Some(SessionSource::VSCode),
None,
/*model_provider*/ None,
)?;
let openai_id_str = openai_id.to_string();
@@ -1409,8 +1465,8 @@ async fn test_model_provider_filter_selects_only_matching_sessions() -> Result<(
let openai_filter = provider_vec(&["openai"]);
let openai_sessions = get_threads(
home,
10,
None,
/*page_size*/ 10,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
NO_SOURCE_FILTER,
Some(openai_filter.as_slice()),
@@ -1429,8 +1485,8 @@ async fn test_model_provider_filter_selects_only_matching_sessions() -> Result<(
let beta_filter = provider_vec(&["beta"]);
let beta_sessions = get_threads(
home,
10,
None,
/*page_size*/ 10,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
NO_SOURCE_FILTER,
Some(beta_filter.as_slice()),
@@ -1448,8 +1504,8 @@ async fn test_model_provider_filter_selects_only_matching_sessions() -> Result<(
let unknown_filter = provider_vec(&["unknown"]);
let unknown_sessions = get_threads(
home,
10,
None,
/*page_size*/ 10,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
NO_SOURCE_FILTER,
Some(unknown_filter.as_slice()),
@@ -1460,11 +1516,11 @@ async fn test_model_provider_filter_selects_only_matching_sessions() -> Result<(
let all_sessions = get_threads(
home,
10,
None,
/*page_size*/ 10,
/*cursor*/ None,
ThreadSortKey::CreatedAt,
NO_SOURCE_FILTER,
None,
/*model_providers*/ None,
"openai",
)
.await?;