mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
Add configurable memory versions with isolated storage (#43797)
## What changed - Add `memories.version` with `v1` as the default and `v2` as an opt-in selection. - Route memory generation, summaries, and retrieval tools through the selected version. Store `v2` artifacts in `memories_v2` and lazily create a separate SQLite database, keeping jobs and outputs isolated while sharing the thread catalog. - Preserve the initial memory version across extension config updates so summaries and retrieval tools use the same namespace. - Clear both versions on memory reset and remove thread memory from both stores on thread deletion. Recognize both artifact roots in shell usage telemetry. ## Testing Add regression coverage for version defaults and validation, independent job claims and outputs, deletion and reset across versions, and shell usage classification for both memory roots. GitOrigin-RevId: aa799bf87ab6ec10c8f5668213931e57547d080b
This commit is contained in:
@@ -17,6 +17,7 @@ codex-core = { workspace = true }
|
||||
codex-extension-api = { workspace = true }
|
||||
codex-features = { workspace = true }
|
||||
codex-otel = { workspace = true }
|
||||
codex-protocol = { workspace = true }
|
||||
codex-tools = { workspace = true }
|
||||
codex-utils-absolute-path = { workspace = true }
|
||||
codex-utils-output-truncation = { workspace = true }
|
||||
|
||||
@@ -13,6 +13,7 @@ use codex_extension_api::ThreadStartInput;
|
||||
use codex_extension_api::ToolContributor;
|
||||
use codex_features::Feature;
|
||||
use codex_otel::MetricsClient;
|
||||
use codex_protocol::MemoryVersion;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
|
||||
use crate::local::LocalMemoriesBackend;
|
||||
@@ -36,6 +37,7 @@ pub(crate) struct MemoriesExtensionConfig {
|
||||
pub(crate) enabled: bool,
|
||||
pub(crate) dedicated_tools: bool,
|
||||
pub(crate) codex_home: AbsolutePathBuf,
|
||||
pub(crate) version: MemoryVersion,
|
||||
}
|
||||
|
||||
impl MemoriesExtensionConfig {
|
||||
@@ -44,6 +46,7 @@ impl MemoriesExtensionConfig {
|
||||
enabled: config.features.enabled(Feature::MemoryTool) && config.memories.use_memories,
|
||||
dedicated_tools: config.memories.dedicated_tools,
|
||||
codex_home: config.codex_home.clone(),
|
||||
version: config.memories.version,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -62,7 +65,7 @@ impl ContextContributor for MemoriesExtension {
|
||||
return Vec::new();
|
||||
}
|
||||
|
||||
build_memory_tool_developer_instructions(&config.codex_home)
|
||||
build_memory_tool_developer_instructions(&config.codex_home, config.version)
|
||||
.await
|
||||
.map(|instructions| {
|
||||
PromptFragment::developer_policy(
|
||||
@@ -97,7 +100,12 @@ impl ConfigContributor<Config> for MemoriesExtension {
|
||||
_previous_config: &Config,
|
||||
new_config: &Config,
|
||||
) {
|
||||
thread_store.insert(MemoriesExtensionConfig::from_config(new_config));
|
||||
let mut config = MemoriesExtensionConfig::from_config(new_config);
|
||||
if let Some(previous) = thread_store.get::<MemoriesExtensionConfig>() {
|
||||
// The initial summary and retrieval tools must use the same namespace.
|
||||
config.version = previous.version;
|
||||
}
|
||||
thread_store.insert(config);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -117,7 +125,12 @@ impl ToolContributor for MemoriesExtension {
|
||||
}
|
||||
|
||||
tools::memory_tools(
|
||||
LocalMemoriesBackend::from_codex_home(&config.codex_home),
|
||||
LocalMemoriesBackend::from_memory_root(
|
||||
config
|
||||
.codex_home
|
||||
.join(config.version.directory_name())
|
||||
.to_path_buf(),
|
||||
),
|
||||
self.metrics_client.clone(),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2,8 +2,6 @@ use std::path::Component;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
|
||||
use crate::backend::AddAdHocMemoryNoteRequest;
|
||||
use crate::backend::AddAdHocMemoryNoteResponse;
|
||||
use crate::backend::ListMemoriesRequest;
|
||||
@@ -27,10 +25,6 @@ pub(crate) struct LocalMemoriesBackend {
|
||||
}
|
||||
|
||||
impl LocalMemoriesBackend {
|
||||
pub(crate) fn from_codex_home(codex_home: &AbsolutePathBuf) -> Self {
|
||||
Self::from_memory_root(codex_home.join("memories").to_path_buf())
|
||||
}
|
||||
|
||||
pub(crate) fn from_memory_root(root: impl Into<PathBuf>) -> Self {
|
||||
Self { root: root.into() }
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use crate::MEMORY_TOOL_DEVELOPER_INSTRUCTIONS_SUMMARY_TOKEN_LIMIT;
|
||||
use codex_protocol::MemoryVersion;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use codex_utils_output_truncation::TruncationPolicy;
|
||||
use codex_utils_output_truncation::truncate_text;
|
||||
@@ -26,8 +27,9 @@ fn parse_embedded_template(source: &'static str, template_name: &str) -> Templat
|
||||
/// [MEMORY_TOOL_DEVELOPER_INSTRUCTIONS_SUMMARY_TOKEN_LIMIT].
|
||||
pub(crate) async fn build_memory_tool_developer_instructions(
|
||||
codex_home: &AbsolutePathBuf,
|
||||
version: MemoryVersion,
|
||||
) -> Option<String> {
|
||||
let base_path = codex_home.join("memories");
|
||||
let base_path = codex_home.join(version.directory_name());
|
||||
let memory_summary_path = base_path.join("memory_summary.md");
|
||||
let memory_summary = fs::read_to_string(&memory_summary_path)
|
||||
.await
|
||||
|
||||
@@ -17,7 +17,7 @@ async fn build_memory_tool_developer_instructions_renders_embedded_template() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let instructions = build_memory_tool_developer_instructions(&codex_home)
|
||||
let instructions = build_memory_tool_developer_instructions(&codex_home, MemoryVersion::V1)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
|
||||
@@ -60,6 +60,7 @@ fn tools_are_not_contributed_when_disabled() {
|
||||
let extension = MemoriesExtension::default();
|
||||
let thread_store = ExtensionData::new("thread");
|
||||
thread_store.insert(MemoriesExtensionConfig {
|
||||
version: codex_protocol::MemoryVersion::V1,
|
||||
enabled: false,
|
||||
dedicated_tools: true,
|
||||
codex_home: test_path_buf("/tmp/codex-home").abs(),
|
||||
@@ -77,6 +78,7 @@ fn tools_are_not_contributed_when_dedicated_tools_disabled() {
|
||||
let extension = MemoriesExtension::default();
|
||||
let thread_store = ExtensionData::new("thread");
|
||||
thread_store.insert(MemoriesExtensionConfig {
|
||||
version: codex_protocol::MemoryVersion::V1,
|
||||
enabled: true,
|
||||
dedicated_tools: false,
|
||||
codex_home: test_path_buf("/tmp/codex-home").abs(),
|
||||
@@ -94,6 +96,7 @@ fn tools_are_contributed_when_enabled_with_dedicated_tools() {
|
||||
let extension = MemoriesExtension::default();
|
||||
let thread_store = ExtensionData::new("thread");
|
||||
thread_store.insert(MemoriesExtensionConfig {
|
||||
version: codex_protocol::MemoryVersion::V1,
|
||||
enabled: true,
|
||||
dedicated_tools: true,
|
||||
codex_home: test_path_buf("/tmp/codex-home").abs(),
|
||||
@@ -123,6 +126,7 @@ fn install_registers_dedicated_tool_contributor() {
|
||||
let registry = builder.build();
|
||||
let thread_store = ExtensionData::new("thread");
|
||||
thread_store.insert(MemoriesExtensionConfig {
|
||||
version: codex_protocol::MemoryVersion::V1,
|
||||
enabled: true,
|
||||
dedicated_tools: true,
|
||||
codex_home: test_path_buf("/tmp/codex-home").abs(),
|
||||
@@ -183,6 +187,7 @@ async fn prompt_contribution_uses_memory_summary_when_enabled() {
|
||||
let extension = MemoriesExtension::default();
|
||||
let thread_store = ExtensionData::new("thread");
|
||||
thread_store.insert(MemoriesExtensionConfig {
|
||||
version: codex_protocol::MemoryVersion::V1,
|
||||
enabled: true,
|
||||
dedicated_tools: false,
|
||||
codex_home: tempdir.path().abs(),
|
||||
|
||||
Reference in New Issue
Block a user