mirror of
https://github.com/openai/codex.git
synced 2026-05-27 22:44:23 +00:00
4eda4dd772
This changes how instantiating `Config` works and also adds `approval_policy` and `sandbox_policy` as fields. The idea is: * All fields of `Config` have appropriate default values. * `Config` is initially loaded from `~/.codex/config.toml`, so values in `config.toml` will override those defaults. * Clients must instantiate `Config` via `Config::load_with_overrides(ConfigOverrides)` where `ConfigOverrides` has optional overrides that are expected to be settable based on CLI flags. The `Config` should be defined early in the program and then passed down. Now functions like `init_codex()` take fewer individual parameters because they can just take a `Config`. Also, `Config::load()` used to fail silently if `~/.codex/config.toml` had a parse error and fell back to the default config. This seemed really bad because it wasn't clear why the values in my `config.toml` weren't getting picked up. I changed things so that `load_with_overrides()` returns `Result<Config>` and verified that the various CLIs print a reasonable error if `config.toml` is malformed. Finally, I also updated the TUI to show which **sandbox** value is being used, as we do for other key values like **model** and **approval**. This was also a reminder that the various values of `--sandbox` are honored on Linux but not macOS today, so I added some TODOs about fixing that.
81 lines
2.3 KiB
Rust
81 lines
2.3 KiB
Rust
use std::sync::atomic::AtomicU64;
|
|
use std::sync::Arc;
|
|
|
|
use crate::config::Config;
|
|
use crate::protocol::Event;
|
|
use crate::protocol::EventMsg;
|
|
use crate::protocol::Op;
|
|
use crate::protocol::Submission;
|
|
use crate::util::notify_on_sigint;
|
|
use crate::Codex;
|
|
use tokio::sync::Notify;
|
|
|
|
/// Spawn a new [`Codex`] and initialise the session.
|
|
///
|
|
/// Returns the wrapped [`Codex`] **and** the `SessionInitialized` event that
|
|
/// is received as a response to the initial `ConfigureSession` submission so
|
|
/// that callers can surface the information to the UI.
|
|
pub async fn init_codex(
|
|
config: Config,
|
|
disable_response_storage: bool,
|
|
) -> anyhow::Result<(CodexWrapper, Event, Arc<Notify>)> {
|
|
let ctrl_c = notify_on_sigint();
|
|
let codex = CodexWrapper::new(Codex::spawn(ctrl_c.clone())?);
|
|
let init_id = codex
|
|
.submit(Op::ConfigureSession {
|
|
model: config.model.clone(),
|
|
instructions: config.instructions.clone(),
|
|
approval_policy: config.approval_policy,
|
|
sandbox_policy: config.sandbox_policy,
|
|
disable_response_storage,
|
|
})
|
|
.await?;
|
|
|
|
// The first event must be `SessionInitialized`. Validate and forward it to
|
|
// the caller so that they can display it in the conversation history.
|
|
let event = codex.next_event().await?;
|
|
if event.id != init_id
|
|
|| !matches!(
|
|
&event,
|
|
Event {
|
|
id: _id,
|
|
msg: EventMsg::SessionConfigured { .. },
|
|
}
|
|
)
|
|
{
|
|
return Err(anyhow::anyhow!(
|
|
"expected SessionInitialized but got {event:?}"
|
|
));
|
|
}
|
|
|
|
Ok((codex, event, ctrl_c))
|
|
}
|
|
|
|
pub struct CodexWrapper {
|
|
next_id: AtomicU64,
|
|
codex: Codex,
|
|
}
|
|
|
|
impl CodexWrapper {
|
|
fn new(codex: Codex) -> Self {
|
|
Self {
|
|
next_id: AtomicU64::new(0),
|
|
codex,
|
|
}
|
|
}
|
|
|
|
/// Returns the id of the Submission.
|
|
pub async fn submit(&self, op: Op) -> crate::error::Result<String> {
|
|
let id = self
|
|
.next_id
|
|
.fetch_add(1, std::sync::atomic::Ordering::SeqCst)
|
|
.to_string();
|
|
self.codex.submit(Submission { id: id.clone(), op }).await?;
|
|
Ok(id)
|
|
}
|
|
|
|
pub async fn next_event(&self) -> crate::error::Result<Event> {
|
|
self.codex.next_event().await
|
|
}
|
|
}
|