mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
Honor per-thread unload delays in app-server (#55270)
## Why Thread unload timing used the server-wide delay, ignoring per-thread configuration overrides. Clients need to control how long individual idle, unsubscribed threads remain loaded. ## What changed - Resolve unload timing from each loaded thread's `thread_unload_delay_secs` configuration. Setting it to `0` allows immediate unloading once the thread has no subscribers or activity. - Allow this runtime retention override in `experimentalPredictionMode` forks while continuing to reject other configuration overrides. Reject negative values and delays too large to schedule. - Replace the source-specific immediate-unload behavior with explicit configuration. ## Testing Extend integration coverage for per-thread delays, unloading after active turns finish, fork overrides, and invalid prediction-fork delays. Verify that immediate unloading preserves persistent history and that cold resumes and ordinary nested forks use their default delay instead of retaining the previous runtime's override. GitOrigin-RevId: fcb82bd73a101260c51e2a8476f94320c23ac929
This commit is contained in:
@@ -15,7 +15,6 @@ pub(super) struct ListenerTaskContext {
|
||||
pub(super) pending_thread_unloads: PendingThreadUnloads,
|
||||
pub(super) thread_watch_manager: ThreadWatchManager,
|
||||
pub(super) codex_home: PathBuf,
|
||||
pub(super) thread_unload_delay: Duration,
|
||||
pub(super) skills_watcher: Arc<SkillsWatcher>,
|
||||
pub(super) turn_cost_worker: Option<crate::turn_cost_worker::TurnCostWorkerHandle>,
|
||||
}
|
||||
@@ -238,25 +237,18 @@ pub(super) async fn ensure_listener_task_running(
|
||||
) -> Result<(), JSONRPCErrorError> {
|
||||
let (cancel_tx, mut cancel_rx) = oneshot::channel();
|
||||
let config_snapshot = conversation.config_snapshot().await;
|
||||
let thread_unload_delay = if config_snapshot.ephemeral
|
||||
&& config_snapshot
|
||||
.thread_source
|
||||
.as_ref()
|
||||
.is_some_and(|source| source.as_str() == "composer_predictions")
|
||||
&& !matches!(config_snapshot.session_source, SessionSource::SubAgent(_))
|
||||
{
|
||||
Duration::ZERO
|
||||
} else {
|
||||
listener_task_context.thread_unload_delay
|
||||
};
|
||||
let Some(mut unloading_state) =
|
||||
UnloadingState::new(&listener_task_context, conversation_id, thread_unload_delay).await
|
||||
let config = conversation.config().await;
|
||||
let Some(mut unloading_state) = UnloadingState::new(
|
||||
&listener_task_context,
|
||||
conversation_id,
|
||||
config.thread_unload_delay,
|
||||
)
|
||||
.await
|
||||
else {
|
||||
return Err(invalid_request(format!(
|
||||
"thread {conversation_id} is closing; retry after the thread is closed"
|
||||
)));
|
||||
};
|
||||
let config = conversation.config().await;
|
||||
let environments = conversation.environment_selections().await;
|
||||
let watch_registration = listener_task_context
|
||||
.skills_watcher
|
||||
|
||||
Reference in New Issue
Block a user