diff --git a/codex-rs/ext/history-notes/src/extension.rs b/codex-rs/ext/history-notes/src/extension.rs index 13a7520357..8f4efcdeb8 100644 --- a/codex-rs/ext/history-notes/src/extension.rs +++ b/codex-rs/ext/history-notes/src/extension.rs @@ -1,3 +1,5 @@ +//! Installs the HTTP-backed history and notes contributor. + use std::sync::Arc; use codex_analytics::AnalyticsEventsClient; @@ -14,18 +16,15 @@ use codex_extension_api::PromptFragment; use codex_extension_api::PromptSlot; use codex_extension_api::ThreadLifecycleContributor; use codex_extension_api::ThreadStartInput; -use codex_extension_api::ToolCall; use codex_extension_api::ToolContributor; -use codex_extension_api::ToolExecutor; use codex_login::AuthManager; use codex_protocol::AgentPath; -use codex_protocol::openai_models::HistoryToolMessages; -use codex_protocol::openai_models::NotesToolMessages; use codex_utils_output_truncation::TruncationPolicy; use serde_json::json; use crate::backend::HttpBackend; use crate::backend::HttpContext; +use crate::tools::Executor; use crate::tools::history_notes_tools; // Bound model context even when note paths are unusually long. @@ -148,53 +147,36 @@ impl ContextContributor for HistoryNotesExtension { } impl ToolContributor for HistoryNotesExtension { - fn tools( - &self, - _session_store: &ExtensionData, - thread_store: &ExtensionData, - ) -> Vec ToolExecutor>>> { - self.tools_with_messages( - thread_store, - /*history_messages*/ None, - /*notes_messages*/ None, - ) + fn tools(&self, _session: &ExtensionData, thread: &ExtensionData) -> Vec { + history_notes_tools(thread.get::().as_deref(), /*step*/ None) } fn tools_for_step( &self, - _session_store: &ExtensionData, - thread_store: &ExtensionData, - step_store: &ExtensionData, - ) -> Vec ToolExecutor>>> { - let history_messages = step_store.get::(); - let notes_messages = step_store.get::(); - self.tools_with_messages( - thread_store, - history_messages.as_deref(), - notes_messages.as_deref(), - ) - } -} - -impl HistoryNotesExtension { - fn tools_with_messages( - &self, - thread_store: &ExtensionData, - history_messages: Option<&HistoryToolMessages>, - notes_messages: Option<&NotesToolMessages>, - ) -> Vec ToolExecutor>>> { - let Some(backend) = thread_store.get::() else { - return Vec::new(); - }; - history_notes_tools((*backend).clone(), history_messages, notes_messages) + _session: &ExtensionData, + thread: &ExtensionData, + step: &ExtensionData, + ) -> Vec { + history_notes_tools(thread.get::().as_deref(), Some(step)) } } /// Installs the standalone history and notes tools. pub fn install(registry: &mut ExtensionRegistryBuilder, auth_manager: Arc) { - let extension = Arc::new(HistoryNotesExtension { auth_manager }); - registry.thread_lifecycle_contributor(extension.clone()); - registry.config_contributor(extension.clone()); - registry.prompt_contributor(extension.clone()); - registry.tool_contributor(extension); + register(registry, HistoryNotesExtension { auth_manager }); +} + +pub(crate) fn register(registry: &mut ExtensionRegistryBuilder, contributor: C) +where + C: ThreadLifecycleContributor + + ConfigContributor + + ContextContributor + + ToolContributor + + 'static, +{ + let contributor = Arc::new(contributor); + registry.thread_lifecycle_contributor(contributor.clone()); + registry.config_contributor(contributor.clone()); + registry.prompt_contributor(contributor.clone()); + registry.tool_contributor(contributor); } diff --git a/codex-rs/ext/history-notes/src/tools.rs b/codex-rs/ext/history-notes/src/tools.rs index aea231104c..4c301cb836 100644 --- a/codex-rs/ext/history-notes/src/tools.rs +++ b/codex-rs/ext/history-notes/src/tools.rs @@ -14,6 +14,7 @@ use crate::requests::NotesListFilesByPrefix; use crate::requests::NotesReadFile; use crate::requests::NotesSearchContents; use crate::requests::NotesWriteFile; +use codex_extension_api::ExtensionData; use codex_extension_api::FunctionCallError; use codex_extension_api::ResponsesApiTool; use codex_extension_api::ToolCall; @@ -47,11 +48,11 @@ use serde_json::json; use std::marker::PhantomData; use std::sync::Arc; -type Executor = Arc ToolExecutor>>; +pub(crate) type Executor = Arc ToolExecutor>>; // Keep the catalog key, tool name, request type and HTTP route in one registration. macro_rules! register_tools { - ($( $catalog:ident: $messages:ty => $namespace:ident { + ($( $catalog:ident: $register:ident($messages:ty) => $namespace:ident { $( $name:ident: $request:ty $( [parallel = $parallel:literal] )? ),+ $(,)? } ),+ $(,)?) => { $($(impl Request for $request { @@ -60,33 +61,44 @@ macro_rules! register_tools { $(const PARALLEL: bool = $parallel;)? })+)+ + $(pub(crate) fn $register(backend: Option<&B>, step: Option<&ExtensionData>) -> Vec + where + $(B: Handle<$request>,)+ + { + let Some(backend) = backend else { return Vec::new() }; + let $catalog = step.and_then(ExtensionData::get::<$messages>); + vec![$(Arc::new(HistoryNotesTool::<$request, B> { + request: PhantomData, + backend: backend.clone(), + spec: tool_spec::<$request, >::Output>( + $catalog.as_deref().and_then(|messages| messages.namespace_description.as_deref()), + $catalog.as_deref().and_then(|messages| messages.$name.as_ref()), + ), + }) as Executor,)+] + })+ + pub(crate) fn history_notes_tools( - backend: B, - $($catalog: Option<&$messages>,)+ + backend: Option<&B>, + step: Option<&ExtensionData>, ) -> Vec where $($(B: Handle<$request>,)+)+ { - vec![$($(Arc::new(HistoryNotesTool::<$request, B> { - request: PhantomData, - backend: backend.clone(), - spec: tool_spec::<$request, >::Output>( - $catalog.and_then(|messages| messages.namespace_description.as_deref()), - $catalog.and_then(|messages| messages.$name.as_ref()), - ), - }) as Executor,)+)+] + let mut tools = Vec::new(); + $(tools.extend($register(backend, step));)+ + tools } }; } register_tools! { - history: HistoryToolMessages => HISTORY { + history: history_tools(HistoryToolMessages) => HISTORY { list_windows: HistoryListWindows, list_items: HistoryListItems, read_item: HistoryReadItem, search_contents: HistorySearchContents, }, - notes: NotesToolMessages => NOTES { + notes: notes_tools(NotesToolMessages) => NOTES { list_files_by_prefix: NotesListFilesByPrefix, read_file: NotesReadFile, search_contents: NotesSearchContents, diff --git a/codex-rs/ext/history-notes/src/tools_tests.rs b/codex-rs/ext/history-notes/src/tools_tests.rs index 9a409a73a9..f10d4aa09b 100644 --- a/codex-rs/ext/history-notes/src/tools_tests.rs +++ b/codex-rs/ext/history-notes/src/tools_tests.rs @@ -204,7 +204,7 @@ fn bundled_tool_contracts() { current_agent_name: "/root".to_owned(), }), ); - let specs: Vec<_> = history_notes_tools(backend, /*history*/ None, /*notes*/ None) + let specs: Vec<_> = history_notes_tools(Some(&backend), /*step*/ None) .iter() .map(|tool| tool.spec()) .collect();