openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-05 20:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move agent message board cleanup into the app server (#59167)

Browse Source 
## What changed

Move permanent agent message board deletion from `codex-core` into the app server's thread-store cleanup callback. Keep board cleanup active when the board feature is disabled, and run it before optional Guardian evidence-board cleanup.

Remove the message board extension dependency from `codex-core` and retain `codex-message-board` only as a development dependency. Update the core test harness to install the app server's cleanup callback.

GitOrigin-RevId: 61813bbdcd8b57073b8c249e1f771e3fb0ea061e
This commit is contained in:
jif
2026-11-03 14:15:56 +00:00
committed by copyberry
parent bfdbf01bfa
commit f7167ac895
7 changed files with 60 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/thread_store_builder.rs
+5 -28
View File
@@ -1,26 +1,23 @@
//! Configured thread-store construction and permanent-deletion cleanup.
//! Host cleanup runs after agent-board cleanup under the store's existing deletion locks.
//! Configured thread-store construction and host-owned permanent-deletion cleanup.
//! Host cleanup runs under the store's existing deletion locks.
use crate::config::Config;
use crate::config::ThreadStoreConfig;
use codex_agent_message_board_extension::local_board_options;
use codex_features::Feature;
use codex_message_board::LocalAgentMessageBoard;
use codex_protocol::ThreadId;
use codex_rollout::state_db::StateDbHandle;
use codex_thread_store::InMemoryThreadStore;
use codex_thread_store::LocalThreadStore;
use codex_thread_store::LocalThreadStoreConfig;
use codex_thread_store::ThreadStore;
use codex_thread_store::ThreadStoreError;
use codex_thread_store::ThreadStoreFuture;
use std::sync::Arc;
use tracing::warn;
type AdditionalCleanup = dyn Fn(Vec<ThreadId>) -> ThreadStoreFuture<'static, ()> + Send + Sync;
/// Builds the configured thread store with its existing agent-board cleanup.
/// Hosts can supply additional cleanup before the store is shared with callers.
/// Builds the configured thread store with optional host-owned data cleanup.
/// Hosts install cleanup for their services before sharing the store with callers.
pub struct ThreadStoreBuilder<'config> {
config: &'config Config,
state_db: Option<StateDbHandle>,
@@ -37,7 +34,7 @@ impl<'config> ThreadStoreBuilder<'config> {
}
/// Sets host-owned cleanup for permanent deletion in local stores.
/// Runs after successful agent-board cleanup and before deleting rollouts, under the same locks.
/// Runs before deleting rollouts, under the store's existing deletion locks.
/// Cleanup must be idempotent because later deletion steps can fail and be retried.
///
/// Cleanup must not call, or await work that calls, thread-store operations that reacquire
@@ -69,31 +66,11 @@ impl<'config> ThreadStoreBuilder<'config> {
.features
.enabled(Feature::BackgroundPaginatedRolloutMigration);
let has_state_db = state_db.is_some();
let sqlite = config.sqlite_config().clone();
let store = Arc::new(
LocalThreadStore::new(LocalThreadStoreConfig::from_config(config), state_db)
.with_thread_data_cleanup(move |thread_ids| {
let sqlite = sqlite.clone();
let additional_cleanup = additional_cleanup.clone();
Box::pin(async move {
let boards = thread_ids
.iter()
.copied()
.map(Into::into)
.collect::<Vec<_>>();
LocalAgentMessageBoard::delete_boards(
&sqlite,
&local_board_options(),
&boards,
)
.await
.map_err(|err| {
ThreadStoreError::Internal {
message: format!(
"failed to delete agent message boards: {err}"
),
}
})?;
if let Some(cleanup) = additional_cleanup {
cleanup(thread_ids).await?;
}