mirror of
https://github.com/openai/codex.git
synced 2026-10-23 18:08:45 +00:00
Adam Perry @ OpenAI
c769a05340
## Why Codex and SQLite data can use separate home directories, but state consumers could reconstruct database paths from the Codex home instead of consistently using the resolved SQLite configuration. ## What changed - Pass `SqliteConfig` through the core, rollout, state runtime, and thread store instead of passing a directory and rebuilding the configuration downstream. - Use that shared configuration for state, logs, memories, goals, and paginated thread-history database access, including integrity checks and cleanup. - Reject state database handles whose SQLite configuration does not match the requesting store. ## Testing Add coverage with separate Codex and SQLite homes that verifies startup backfill, thread listing, and paginated history all use the configured SQLite directory. GitOrigin-RevId: 1de1cdd1d6ff1d70bbb6c360c8352e6543fb8ebf
102 lines
2.3 KiB
Rust
102 lines
2.3 KiB
Rust
use codex_state::SqliteConfig;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
|
|
pub trait RolloutConfigView {
|
|
fn codex_home(&self) -> &Path;
|
|
fn sqlite_config(&self) -> &SqliteConfig;
|
|
fn cwd(&self) -> &Path;
|
|
fn model_provider_id(&self) -> &str;
|
|
fn generate_memories(&self) -> bool;
|
|
}
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub struct RolloutConfig {
|
|
pub codex_home: PathBuf,
|
|
pub sqlite: SqliteConfig,
|
|
pub cwd: PathBuf,
|
|
pub model_provider_id: String,
|
|
pub generate_memories: bool,
|
|
}
|
|
|
|
pub type Config = RolloutConfig;
|
|
|
|
impl RolloutConfig {
|
|
pub fn from_view(view: &impl RolloutConfigView) -> Self {
|
|
Self {
|
|
codex_home: view.codex_home().to_path_buf(),
|
|
sqlite: view.sqlite_config().clone(),
|
|
cwd: view.cwd().to_path_buf(),
|
|
model_provider_id: view.model_provider_id().to_string(),
|
|
generate_memories: view.generate_memories(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl RolloutConfigView for RolloutConfig {
|
|
fn codex_home(&self) -> &Path {
|
|
self.codex_home.as_path()
|
|
}
|
|
|
|
fn sqlite_config(&self) -> &SqliteConfig {
|
|
&self.sqlite
|
|
}
|
|
|
|
fn cwd(&self) -> &Path {
|
|
self.cwd.as_path()
|
|
}
|
|
|
|
fn model_provider_id(&self) -> &str {
|
|
self.model_provider_id.as_str()
|
|
}
|
|
|
|
fn generate_memories(&self) -> bool {
|
|
self.generate_memories
|
|
}
|
|
}
|
|
|
|
impl<T: RolloutConfigView + ?Sized> RolloutConfigView for &T {
|
|
fn codex_home(&self) -> &Path {
|
|
(*self).codex_home()
|
|
}
|
|
|
|
fn sqlite_config(&self) -> &SqliteConfig {
|
|
(*self).sqlite_config()
|
|
}
|
|
|
|
fn cwd(&self) -> &Path {
|
|
(*self).cwd()
|
|
}
|
|
|
|
fn model_provider_id(&self) -> &str {
|
|
(*self).model_provider_id()
|
|
}
|
|
|
|
fn generate_memories(&self) -> bool {
|
|
(*self).generate_memories()
|
|
}
|
|
}
|
|
|
|
impl<T: RolloutConfigView + ?Sized> RolloutConfigView for Arc<T> {
|
|
fn codex_home(&self) -> &Path {
|
|
self.as_ref().codex_home()
|
|
}
|
|
|
|
fn sqlite_config(&self) -> &SqliteConfig {
|
|
self.as_ref().sqlite_config()
|
|
}
|
|
|
|
fn cwd(&self) -> &Path {
|
|
self.as_ref().cwd()
|
|
}
|
|
|
|
fn model_provider_id(&self) -> &str {
|
|
self.as_ref().model_provider_id()
|
|
}
|
|
|
|
fn generate_memories(&self) -> bool {
|
|
self.as_ref().generate_memories()
|
|
}
|
|
}
|