mirror of
https://github.com/openai/codex.git
synced 2026-10-27 18:48:37 +00:00
## Why Paginated forks can retain a `history_base` pointer to another rollout. Deleting or compressing either side of that relationship can leave the fork without the rollout history it references. ## What changed - Add a rollout reference index that scans active, archived, and compressed rollout metadata. - Reject deletion when a rollout is still referenced by a fork outside the requested deletion set. - Delete spawned thread subtrees as one store operation so internal references do not block deleting the complete subtree, while external references preflight the request before any files are removed. - Skip referenced rollouts, fork-pointer rollouts, and rollouts with unreadable metadata during background compression. ## Testing - Cover reference indexing across active, archived, compressed, duplicate, and self-referencing rollouts. - Verify deletion rejects external references without partially deleting a subtree and permits batch deletion of internally referenced threads. - Verify compression preserves fork pointer chains and continues past unreadable metadata. GitOrigin-RevId: a8672727f8706e743d7fb3ca895a1d9ceac98a3c
161 lines
5.1 KiB
Rust
161 lines
5.1 KiB
Rust
//! Indexes direct fork references found in local rollout files.
|
|
|
|
use std::collections::HashMap;
|
|
use std::collections::HashSet;
|
|
use std::io;
|
|
use std::path::Path;
|
|
use std::time::Duration;
|
|
use std::time::Instant;
|
|
|
|
use codex_protocol::ThreadId;
|
|
use codex_protocol::protocol::HistoryPosition;
|
|
|
|
use crate::ARCHIVED_SESSIONS_SUBDIR;
|
|
use crate::SESSIONS_SUBDIR;
|
|
use crate::compression::RolloutFile;
|
|
|
|
/// Direct history-base edges discovered from local rollout metadata.
|
|
///
|
|
/// This is a physical-rollout index, not a logical lineage resolver. Callers use it to answer
|
|
/// cheap inverse-reference questions without each reimplementing rollout discovery.
|
|
#[derive(Debug, Default)]
|
|
pub struct RolloutReferenceIndex {
|
|
history_base_by_thread: HashMap<ThreadId, HistoryPosition>,
|
|
reference_counts_by_thread: HashMap<ThreadId, usize>,
|
|
}
|
|
|
|
impl RolloutReferenceIndex {
|
|
/// Scans active and archived local rollout metadata without a deadline.
|
|
pub async fn scan(codex_home: &Path) -> io::Result<Self> {
|
|
let Some(index) = Self::scan_with_deadline(codex_home, ScanDeadline::Unlimited).await?
|
|
else {
|
|
return Err(io::Error::other(
|
|
"unlimited rollout reference scan exceeded a deadline",
|
|
));
|
|
};
|
|
Ok(index)
|
|
}
|
|
|
|
/// Scans active and archived local rollout metadata until the worker deadline expires.
|
|
///
|
|
/// Returns None instead of a partial index when the deadline expires.
|
|
pub(crate) async fn scan_until(
|
|
codex_home: &Path,
|
|
started_at: Instant,
|
|
max_runtime: Duration,
|
|
) -> io::Result<Option<Self>> {
|
|
Self::scan_with_deadline(
|
|
codex_home,
|
|
ScanDeadline::Until {
|
|
started_at,
|
|
max_runtime,
|
|
},
|
|
)
|
|
.await
|
|
}
|
|
|
|
/// Returns how many other discovered rollouts directly reference thread_id.
|
|
pub fn reference_count(&self, thread_id: ThreadId) -> usize {
|
|
self.reference_counts_by_thread
|
|
.get(&thread_id)
|
|
.copied()
|
|
.unwrap_or_default()
|
|
}
|
|
|
|
/// Returns the direct history-base edge for thread_id, if one was discovered.
|
|
pub fn history_base(&self, thread_id: ThreadId) -> Option<&HistoryPosition> {
|
|
self.history_base_by_thread.get(&thread_id)
|
|
}
|
|
|
|
async fn scan_with_deadline(
|
|
codex_home: &Path,
|
|
deadline: ScanDeadline,
|
|
) -> io::Result<Option<Self>> {
|
|
let mut history_base_by_thread = HashMap::new();
|
|
let mut seen_thread_ids = HashSet::new();
|
|
let mut stack = vec![
|
|
codex_home.join(ARCHIVED_SESSIONS_SUBDIR),
|
|
codex_home.join(SESSIONS_SUBDIR),
|
|
];
|
|
while let Some(directory) = stack.pop() {
|
|
if deadline.expired() {
|
|
return Ok(None);
|
|
}
|
|
let mut entries = match tokio::fs::read_dir(directory.as_path()).await {
|
|
Ok(entries) => entries,
|
|
Err(err) if err.kind() == io::ErrorKind::NotFound => continue,
|
|
Err(err) => return Err(err),
|
|
};
|
|
loop {
|
|
if deadline.expired() {
|
|
return Ok(None);
|
|
}
|
|
let Some(entry) = entries.next_entry().await? else {
|
|
break;
|
|
};
|
|
let path = entry.path();
|
|
let file_type = entry.file_type().await?;
|
|
if file_type.is_dir() {
|
|
stack.push(path);
|
|
continue;
|
|
}
|
|
if !file_type.is_file() {
|
|
continue;
|
|
}
|
|
let Some(rollout_file) = RolloutFile::from_path(path) else {
|
|
continue;
|
|
};
|
|
let Ok(meta) = crate::read_session_meta_line(rollout_file.path()).await else {
|
|
continue;
|
|
};
|
|
let thread_id = meta.meta.id;
|
|
if !seen_thread_ids.insert(thread_id) {
|
|
continue;
|
|
}
|
|
if let Some(history_base) = meta.meta.history_base {
|
|
history_base_by_thread.insert(thread_id, history_base);
|
|
}
|
|
}
|
|
}
|
|
|
|
let mut reference_counts_by_thread = HashMap::new();
|
|
for (thread_id, history_base) in &history_base_by_thread {
|
|
if history_base.thread_id == *thread_id {
|
|
continue;
|
|
}
|
|
*reference_counts_by_thread
|
|
.entry(history_base.thread_id)
|
|
.or_default() += 1;
|
|
}
|
|
Ok(Some(Self {
|
|
history_base_by_thread,
|
|
reference_counts_by_thread,
|
|
}))
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy)]
|
|
enum ScanDeadline {
|
|
Unlimited,
|
|
Until {
|
|
started_at: Instant,
|
|
max_runtime: Duration,
|
|
},
|
|
}
|
|
|
|
impl ScanDeadline {
|
|
fn expired(self) -> bool {
|
|
match self {
|
|
Self::Unlimited => false,
|
|
Self::Until {
|
|
started_at,
|
|
max_runtime,
|
|
} => started_at.elapsed() >= max_runtime,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "rollout_reference_index_tests.rs"]
|
|
mod tests;
|