mirror of
https://github.com/openai/codex.git
synced 2026-11-17 14:58:36 +00:00
Consolidate Guardian reviewer lifecycle ownership (#45672)
## What changed - Use cancellation guards to tie reusable reviewers and temporary forks to their lifetimes, including when a review future is dropped. Replace cancelled reusable reviewers before reuse. - Share `ReviewerTasks` between the pool and `ThreadManager`, and wait for tracked cleanup during pool shutdown. Remove the separate session shutdown protocol. - Move denial cleanup from core task handling into Guardian's turn start, stop, and abort hooks. Expose `install_reviewer` to register both thread and turn lifecycle contributors together. ## Testing Add an integration test that exercises stale denial cleanup at turn start, completion, and interruption, including starting another turn after interruption. GitOrigin-RevId: 85badb235309c1e1576547d1746f7ee9fc66d545
This commit is contained in:
1 parent
4415f985dc
commit
a113f3e063
15 files changed
+231
-315
No files matched your search
@@ -35,12 +35,15 @@ pub(crate) fn install(session: &Session, config: &Config) {
|
||||
/*attestation_provider*/ None,
|
||||
/*external_time_provider*/ None,
|
||||
));
|
||||
let runtime = Arc::new(codex_guardian_reviewer::ReviewerTasks::default());
|
||||
session
|
||||
.services
|
||||
.thread_extension_data
|
||||
.insert(GuardianReviewSessionManager::new(
|
||||
Arc::clone(&runtime),
|
||||
move |context, key, kind, snapshot, cancel| {
|
||||
let manager = Arc::clone(&manager);
|
||||
let runtime = Arc::clone(&runtime);
|
||||
Box::pin(async move {
|
||||
let history_reset = context.history_reset.clone();
|
||||
let (mut options, state) = context.thread_options(snapshot).await;
|
||||
@@ -67,7 +70,7 @@ pub(crate) fn install(session: &Session, config: &Config) {
|
||||
}
|
||||
};
|
||||
let spawned = manager
|
||||
.start_thread_until(options, until, &tokio_util::task::TaskTracker::new())
|
||||
.start_thread_until(options, until, &runtime.tasks)
|
||||
.await?;
|
||||
Ok(context
|
||||
.bind_thread(&spawned.thread, key, state, session_cancel)
|
||||
|
||||
Reference in new issue
Block a user