andrewgu-oai cbfa321ecd Wait for parent idle before rollback in guardian fork tests (#43842) ...

## Why

`TurnComplete` precedes active-turn cleanup, so waiting for it alone can race with rollback in the guardian retained-context fork test.

## What changed

Wait for a thread-scoped idle notification after each parent turn, including optional compaction, before checking rollback boundaries. Consume notifications separately so earlier turns or child completion cannot satisfy the wait. Fail immediately on rollback errors to expose the failure directly.

GitOrigin-RevId: 3caabee45e4e6eb6b2618d84ab68dff7de2a1196

2026-09-08 15:56:58 +00:00

..

snapshots

Gate unified exec TTY support behind a feature flag (#42718)

2026-09-04 10:22:43 +00:00

abort_tasks.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

additional_context.rs

Update tests for default-enabled update_plan (#41630)

2026-08-30 07:40:36 +00:00

agent_execution.rs

Honor environment-resolved workspace roots (#40912)

2026-08-26 16:28:35 +00:00

agent_websocket.rs

Make the update_plan tool opt-in (#41744)

2026-08-31 00:53:30 +00:00

agents_md.rs

Allow trusted symlinks beneath CODEX_HOME on macOS (#42716)

2026-09-04 10:12:03 +00:00

apply_patch_cli.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

apply_patch_serialization.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

approvals.rs

Add credential brokering to network proxy feature config (#40466)

2026-08-24 19:52:27 +00:00

audio_truncation.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

auto_review.rs

Route approvals through the extension decision API (#43432)

2026-09-07 11:07:28 +00:00

catalog_permission_messages.rs

Source async user message descriptions from the model catalog (#41461)

2026-08-29 03:44:01 +00:00

cli_stream.rs

Sanitize credentials from Git remote metadata (#40713)

2026-08-25 21:34:05 +00:00

client_websockets.rs

Preserve raw response usage metadata (#41980)

2026-09-01 05:17:11 +00:00

client.rs

Add an injectable attachment store to ThreadManager (#42634)

2026-09-03 23:20:54 +00:00

cloud_config.rs

Preserve target-native paths in command approvals (#42577)

2026-09-03 16:21:10 +00:00

code_mode_elicitation.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

code_mode.rs

Discount an approval's own code-mode wrapper from Guardian score lag (#43527)

2026-09-07 17:35:23 +00:00

codex_delegate.rs

Preserve MCP tool output as content items (#40737)

2026-08-25 23:42:50 +00:00

collaboration_instructions.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

compact_remote_parity.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

compact_remote.rs

Establish root turn identity for independent tasks and memory requests (#42900)

2026-09-05 01:04:12 +00:00

compact_resume_fork.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

compact.rs

Preserve reasoning effort through compaction and reset it on success (#43796)

2026-09-08 10:46:07 +00:00

context_annotations.rs

Route approvals through the extension decision API (#43432)

2026-09-07 11:07:28 +00:00

current_time_reminder.rs

Add configurable gating for the sleep tool (#41243)

2026-08-28 02:09:07 +00:00

cyber_access_program.rs

Add per-turn cyber access program selection (#40687)

2026-08-25 19:54:52 +00:00

cyber_exec_policy.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

daybreak_access.rs

Attach verified access context to eligible plugin MCP calls (#41005)

2026-08-27 00:02:26 +00:00

deprecation_notice.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

exec_policy.rs

Honor environment-resolved workspace roots (#40912)

2026-08-26 16:28:35 +00:00

exec.rs

…

extension_sandbox.rs

Expand extension permission regression coverage (#41946)

2026-09-01 00:42:19 +00:00

external_auth.rs

Surface model provider authentication recovery progress (#41239)

2026-08-28 01:14:02 +00:00

fork_thread.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

git_enrichment.rs

Establish root turn identity for independent tasks and memory requests (#42900)

2026-09-05 01:04:12 +00:00

guardian_authorization.rs

Keep Guardian review evidence consistent and reject stale approvals (#43442)

2026-09-07 11:51:20 +00:00

guardian_history.rs

Batch non-user history eviction to preserve Guardian transcript deltas (#43798)

2026-09-08 11:03:44 +00:00

guardian_mcp_elicitation.rs

Route MCP elicitations through the shared approval decision path (#43447)

2026-09-07 12:04:27 +00:00

guardian_retained_context.rs

Wait for parent idle before rollback in guardian fork tests (#43842)

2026-09-08 15:56:58 +00:00

guardian_review_cancellation.rs

Cancel Guardian reviews with their tool calls (#40021)

2026-08-21 21:51:12 +00:00

guardian_review.rs

Move Guardian permission context into the shared section registry (#43538)

2026-09-07 18:10:05 +00:00

guardian_subagent_authorization.rs

Retain inherited Guardian instructions in standalone forks (#43478)

2026-09-07 13:58:57 +00:00

hooks_executor.rs

Support app targets in executor plugin hooks (#41456)

2026-08-29 03:14:35 +00:00

hooks_mcp.rs

Set working directories for environment MCP tests (#41683)

2026-08-30 14:04:06 +00:00

hooks.rs

Retain user instructions in Guardian context (#42844)

2026-09-04 20:27:18 +00:00

image_rollout.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

injected_models_cache.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

interrupt_hooks.rs

Add hooks for interrupted turns (#40511)

2026-08-25 01:27:18 +00:00

items.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

json_result.rs

Remove redundant test coverage (#42069)

2026-09-01 15:04:11 +00:00

live_cli.rs

…

mcp_auth_elicitation.rs

Preserve MCP tool output as content items (#40737)

2026-08-25 23:42:50 +00:00

mcp_auth_refresh.rs

Attach verified access context to eligible plugin MCP calls (#41005)

2026-08-27 00:02:26 +00:00

mcp_oauth_refresh_tests.rs

Preserve MCP authentication challenges on tool calls (#42552)

2026-09-03 15:12:02 +00:00

mcp_optional_startup_grace.rs

Make the optional MCP startup grace configurable (#41199)

2026-08-27 20:31:40 +00:00

mcp_refresh_cleanup.rs

Negotiate MCP extensions per app-server session (#36910)

2026-08-04 15:23:43 +00:00

mcp_startup_refresh_http_proxy.rs

Honor environment-resolved workspace roots (#40912)

2026-08-26 16:28:35 +00:00

mcp_tool_cache.rs

Set working directories for environment MCP tests (#41683)

2026-08-30 14:04:06 +00:00

mcp_tool_exposure.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

mcp_turn_metadata.rs

Expose the Codex version to commands and turn metadata (#42395)

2026-09-03 00:17:19 +00:00

mcp_user_verification.rs

Restrict MCP user verification and add workspace-scoped identity (#43524)

2026-09-07 17:26:10 +00:00

mod.rs

Add live WebRTC voice conversations to the TUI (#43581)

2026-09-07 20:25:30 +00:00

model_overrides.rs

…

model_runtime_selectors.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

model_switching.rs

Wait for thread idle before rollback in model-switching tests (#43456)

2026-09-07 12:36:57 +00:00

model_visible_layout.rs

Update tests for default-enabled update_plan (#41630)

2026-08-30 07:40:36 +00:00

models_cache_ttl.rs

Gate experimental context by model capability at session startup (#43147)

2026-09-06 02:28:38 +00:00

models_etag_responses.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

multi_agent_mode.rs

Source proactive multi-agent instructions from the model catalog (#41457)

2026-08-29 03:28:19 +00:00

multi_agent_resume.rs

Include unloaded children in multi-agent v2 environment context (#43491)

2026-09-07 15:10:37 +00:00

multi_exec_server_sandbox.rs

Attach verified access context to eligible plugin MCP calls (#41005)

2026-08-27 00:02:26 +00:00

network_approval_completion.rs

Handle pending network reviews after process completion (#42746)

2026-09-04 12:08:02 +00:00

network_approval.rs

Require approval for input to escalated terminals (#40978)

2026-08-26 21:39:05 +00:00

openai_file_mcp.rs

Preserve MCP tool output as content items (#40737)

2026-08-25 23:42:50 +00:00

otel.rs

Remove selected core test cases (#42066)

2026-09-01 14:43:27 +00:00

override_updates.rs

…

pending_input.rs

Establish root turn identity for independent tasks and memory requests (#42900)

2026-09-05 01:04:12 +00:00

permissions_messages.rs

Source async user message descriptions from the model catalog (#41461)

2026-08-29 03:44:01 +00:00

personality.rs

Gate experimental context by model capability at session startup (#43147)

2026-09-06 02:28:38 +00:00

plugins.rs

Prefer remote Sites over the bundled plugin (#42100)

2026-09-01 16:58:54 +00:00

prompt_cache_key.rs

…

prompt_caching.rs

Make the update_plan tool opt-in (#41744)

2026-08-31 00:53:30 +00:00

prompt_debug_tests.rs

Enable git attribution across Codex entry points (#34819)

2026-07-22 20:23:35 +00:00

quota_exceeded.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

realtime_conversation.rs

Record realtime conversation history in Core (#41924)

2026-08-31 22:38:23 +00:00

realtime_initial_items.rs

Add a realtime delegation acknowledgement control (#36413)

2026-08-01 01:17:26 +00:00

realtime_misalignment.rs

Add live WebRTC voice conversations to the TUI (#43581)

2026-09-07 20:25:30 +00:00

realtime_sideband_endpoint.rs

Allow per-call sideband endpoints for existing realtime calls (#41923)

2026-08-31 22:29:40 +00:00

reasoning_effort_override.rs

Preserve reasoning effort through compaction and reset it on success (#43796)

2026-09-08 10:46:07 +00:00

remote_env.rs

Preserve target-native paths in command approvals (#42577)

2026-09-03 16:21:10 +00:00

remote_models.rs

Gate experimental context by model capability at session startup (#43147)

2026-09-06 02:28:38 +00:00

request_compression.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

request_permissions_tool.rs

Make permission transforms aware of executor path context (#41909)

2026-08-31 20:50:44 +00:00

request_permissions.rs

Make permission transforms aware of executor path context (#41909)

2026-08-31 20:50:44 +00:00

request_plugin_install.rs

Set working directories for environment MCP tests (#41683)

2026-08-30 14:04:06 +00:00

request_user_input_async.rs

Add free-form asynchronous user messages (#42354)

2026-09-02 20:41:14 +00:00

request_user_input.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

responses_api_proxy_headers.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

responses_lite.rs

Give Responses Lite prefix items stable IDs (#40962)

2026-08-26 19:44:12 +00:00

responses_system_proxy.rs

Migrate login HTTP construction to HttpClient (#34643)

2026-07-22 00:50:28 +00:00

resume_warning.rs

Persist response token usage in rollout history (#41912)

2026-08-31 21:15:38 +00:00

resume.rs

Use turn environment settings for sandbox execution (#40771)

2026-08-26 03:28:57 +00:00

retry_after.rs

Decouple HTTP retry backoff from overload integration testing (#41313)

2026-08-28 10:39:10 +00:00

review.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

rmcp_client.rs

Gate experimental context by model capability at session startup (#43147)

2026-09-06 02:28:38 +00:00

rollout_budget.rs

Annotate user input and contextual fragments with content kinds (#40196)

2026-08-23 06:10:44 +00:00

rollout_compression.rs

Include shared histories in rollout compression (#42039)

2026-09-01 12:23:20 +00:00

rollout_list_find.rs

Honor the configured SQLite home across state consumers (#34994)

2026-07-23 19:19:35 +00:00

safety_buffering.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

safety_check_downgrade.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

search_tool.rs

Set working directories for environment MCP tests (#41683)

2026-08-30 14:04:06 +00:00

settings_commits.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

settings_constraints.rs

Validate step settings against proposed permissions (#40647)

2026-08-25 17:27:04 +00:00

shell_snapshot.rs

Prewarm shell snapshots for eligible turns (#42137)

2026-09-01 21:16:12 +00:00

skill_approval.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

skills_extension.rs

Expand extension permission regression coverage (#41946)

2026-09-01 00:42:19 +00:00

skills.rs

Reduce skill catalog prompts with path aliases (#41011)

2026-08-27 01:22:23 +00:00

spawn_agent_description.rs

Gate experimental context by model capability at session startup (#43147)

2026-09-06 02:28:38 +00:00

sqlite_state.rs

Track window and fork positions in turn metadata (#40987)

2026-08-26 22:37:59 +00:00

step_settings_snapshots.rs

Snapshot resolved settings for each model step (#40651)

2026-08-25 17:41:22 +00:00

step_settings.rs

Add structured asynchronous user input requests (#42178)

2026-09-02 02:09:35 +00:00

stream_error_allows_next_turn.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

stream_no_completed.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

subagent_notifications.rs

Update tests for default-enabled update_plan (#41630)

2026-08-30 07:40:36 +00:00

subagent_service_tier.rs

Make subagents follow the root service tier (#41308)

2026-08-28 09:48:13 +00:00

token_budget.rs

Gate experimental context by model capability at session startup (#43147)

2026-09-06 02:28:38 +00:00

token_usage_rollout.rs

Route rollout reads through the canonical JSON decoder (#42378)

2026-09-02 22:45:19 +00:00

tool_harness.rs

Update tests for default-enabled update_plan (#41630)

2026-08-30 07:40:36 +00:00

tool_lifecycle.rs

Set working directories for environment MCP tests (#41683)

2026-08-30 14:04:06 +00:00

tool_parallelism.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

tools.rs

Update tests for default-enabled update_plan (#41630)

2026-08-30 07:40:36 +00:00

truncation.rs

Set working directories for environment MCP tests (#41683)

2026-08-30 14:04:06 +00:00

turn_input_submission.rs

Add per-turn cyber access program selection (#40687)

2026-08-25 19:54:52 +00:00

turn_state.rs

Preserve Markdown formatting when copying TUI responses (#42847)

2026-09-04 20:38:08 +00:00

unified_exec_process_events.rs

Handle pending network reviews after process completion (#42746)

2026-09-04 12:08:02 +00:00

unified_exec_stdin_approval.rs

Discount an approval's own code-mode wrapper from Guardian score lag (#43527)

2026-09-07 17:35:23 +00:00

unified_exec_stdin_review_size.rs

Reject NUL bytes in reviewed terminal input (#41354)

2026-08-28 15:44:48 +00:00

unified_exec_zsh_fork_approvals.rs

Discount an approval's own code-mode wrapper from Guardian score lag (#43527)

2026-09-07 17:35:23 +00:00

unified_exec.rs

Gate unified exec TTY support behind a feature flag (#42718)

2026-09-04 10:22:43 +00:00

unstable_features_warning.rs

Extract persisted history types into a dedicated crate (#37871)

2026-08-10 19:26:52 +00:00

user_notification.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

user_shell_cmd.rs

Support configurable timeouts for thread shell commands (#41384)

2026-08-28 18:07:40 +00:00

view_image.rs

Gate experimental context by model capability at session startup (#43147)

2026-09-06 02:28:38 +00:00

web_search.rs

Add an Amazon Bedrock Runtime provider (#38470)

2026-08-14 01:23:59 +00:00

websocket_fallback.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

window_headers.rs

Track window and fork positions in turn metadata (#40987)

2026-08-26 22:37:59 +00:00

windows_sandbox.rs

Preserve Windows managed deny reads in the sandbox CLI (#42835)

2026-09-04 19:40:01 +00:00

workspace_roots.rs

Authorize apply_patch in the executor path context (#42391)

2026-09-02 23:58:24 +00:00

worktree_trust.rs

Validate linked worktrees before inheriting project trust (#39616)

2026-08-20 06:29:32 +00:00