mirror of
https://github.com/openai/codex.git
synced 2026-11-09 00:39:32 +00:00
## Why MCP configuration can change while a thread is still starting, before it appears in the thread manager's loaded-thread list. In that window, invalidation could miss the new thread and leave it with a stale MCP runtime. ## What changed - Centralize MCP runtime invalidation in `ThreadManager` so it refreshes loaded threads and marks in-progress thread startups for refresh after publication. - Use the centralized invalidation path for account and plugin changes. - Invalidate MCP runtimes after successful server and plugin OAuth logins. ## Testing - Add a regression test that pauses thread startup, invalidates MCP runtimes, and verifies that the newly published thread refreshes its MCP projection. GitOrigin-RevId: 8944f5a21816a1405e038a0d4c08b66362ea9368
76 lines
2.4 KiB
Rust
76 lines
2.4 KiB
Rust
//! Best-effort MCP prewarming.
|
|
//!
|
|
//! A bounded channel coalesces refresh requests. The worker only prepares the
|
|
//! newest thread state; exact model steps remain the correctness path.
|
|
|
|
use super::*;
|
|
|
|
impl Session {
|
|
pub(crate) fn request_mcp_runtime_refresh(&self) {
|
|
self.mark_mcp_runtime_dirty();
|
|
self.schedule_mcp_prewarm();
|
|
}
|
|
|
|
pub(super) fn start_mcp_prewarm_worker(
|
|
self: &Arc<Self>,
|
|
requests: async_channel::Receiver<()>,
|
|
mut auth_changes: tokio::sync::watch::Receiver<u64>,
|
|
) {
|
|
let session = Arc::downgrade(self);
|
|
let shutdown = self.mcp_prewarm_shutdown.clone();
|
|
let worker = self.services.runtime_handle.spawn(async move {
|
|
loop {
|
|
let auth_changed = tokio::select! {
|
|
biased;
|
|
_ = shutdown.cancelled() => break,
|
|
request = requests.recv() => {
|
|
if request.is_err() {
|
|
break;
|
|
}
|
|
false
|
|
},
|
|
auth_change = auth_changes.changed() => {
|
|
if auth_change.is_err() {
|
|
break;
|
|
}
|
|
true
|
|
},
|
|
};
|
|
let Some(session) = session.upgrade() else {
|
|
break;
|
|
};
|
|
if auth_changed {
|
|
session.mark_mcp_runtime_dirty();
|
|
}
|
|
tokio::select! {
|
|
biased;
|
|
_ = shutdown.cancelled() => break,
|
|
_ = session.refresh_mcp_if_dirty() => {},
|
|
}
|
|
}
|
|
});
|
|
*self
|
|
.mcp_prewarm_task
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner) = Some(worker);
|
|
}
|
|
|
|
pub(super) fn schedule_mcp_prewarm(&self) {
|
|
let _ = self.mcp_prewarm_tx.try_send(());
|
|
}
|
|
|
|
pub(super) async fn stop_mcp_prewarm_worker(&self) {
|
|
self.mcp_prewarm_shutdown.cancel();
|
|
let worker = self
|
|
.mcp_prewarm_task
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner)
|
|
.take();
|
|
if let Some(worker) = worker
|
|
&& let Err(error) = worker.await
|
|
{
|
|
warn!(%error, "MCP prewarm worker stopped unexpectedly");
|
|
}
|
|
}
|
|
}
|