clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-02 18:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert #16964

Browse Source
This commit is contained in:
Dylan Hurd
2026-04-07 14:52:32 -07:00
parent e9702411ab
commit f47566b39d
37 changed files with 101 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
codex-rs/protocol/src/protocol.rs
View File

@@ -2320,7 +2320,7 @@ impl InitialHistory {
}
}
pub fn get_base_instructions(&self) -> Option<Option<BaseInstructions>> {
pub fn get_base_instructions(&self) -> Option<BaseInstructions> {
// TODO: SessionMeta should (in theory) always be first in the history, so we can probably only check the first item?
match self {
InitialHistory::New => None,
@@ -2548,13 +2548,7 @@ pub struct SessionMeta {
/// base_instructions for the session. This *should* always be present when creating a new session,
/// but may be missing for older sessions. If not present, fall back to rendering the base_instructions
/// from ModelsManager.
#[serde(
default,
deserialize_with = "deserialize_double_option",
serialize_with = "serialize_double_option",
skip_serializing_if = "Option::is_none"
)]
pub base_instructions: Option<Option<BaseInstructions>>,
pub base_instructions: Option<BaseInstructions>,
#[serde(
default,
deserialize_with = "deserialize_double_option",