mirror of
https://github.com/openai/codex.git
synced 2026-05-29 23:40:29 +00:00
6f1a01fbdd
## Why The tool runtime path still had a typed output associated type on `ToolExecutor`, plus a core-only `RegisteredTool` adapter and extension-only executor aliases. That made every new shared tool runtime carry extra adapter plumbing before it could participate in core dispatch, extension tools, hook payloads, telemetry, and model-visible spec generation. This PR moves output erasure to the shared executor boundary so core and extension tools can use the same execution contract directly. ## What Changed - Changed `codex_tools::ToolExecutor` to return `Box<dyn ToolOutput>` instead of an associated `Output` type. - Removed the extension-specific `ExtensionToolExecutor` / `ExtensionToolOutput` aliases and exposed `ToolExecutor<ToolCall>` plus `ToolOutput` through `codex-extension-api`. - Reworked core tool registration around `CoreToolRuntime` and `ToolRegistry::from_tools`, removing the extra `RegisteredTool` / `ToolRegistryBuilder` layer. - Consolidated model-visible spec planning and registry construction in `core/src/tools/spec_plan.rs`, including deferred tool search and code-mode-only filtering. - Added `ToolOutput` helpers for post-tool-use hook ids and inputs so MCP, unified exec, extension, and other boxed outputs preserve the same hook payload behavior. - Updated core handlers, memories tools, and the related registry/spec/router tests to use the simplified contract. ## Test Coverage - Updated coverage for tool spec planning, registry lookup, deferred tool search registration, extension tool routing, post-tool-use hook payloads, dispatch tracing, guardian output extraction, and memories extension tool execution.
71 lines
2.0 KiB
Rust
71 lines
2.0 KiB
Rust
use codex_extension_api::JsonToolOutput;
|
|
use codex_extension_api::ToolCall;
|
|
use codex_extension_api::ToolExecutor;
|
|
use codex_extension_api::ToolName;
|
|
use codex_extension_api::ToolSpec;
|
|
use schemars::JsonSchema;
|
|
use serde::Deserialize;
|
|
use serde_json::json;
|
|
|
|
use crate::DEFAULT_READ_MAX_TOKENS;
|
|
use crate::READ_TOOL_NAME;
|
|
use crate::backend::MemoriesBackend;
|
|
use crate::backend::ReadMemoryRequest;
|
|
use crate::backend::ReadMemoryResponse;
|
|
|
|
use super::backend_error_to_function_call;
|
|
use super::memory_function_tool;
|
|
use super::memory_tool_name;
|
|
use super::parse_args;
|
|
|
|
#[derive(Deserialize, JsonSchema)]
|
|
#[serde(deny_unknown_fields)]
|
|
struct ReadArgs {
|
|
path: String,
|
|
#[schemars(range(min = 1))]
|
|
line_offset: Option<usize>,
|
|
#[schemars(range(min = 1))]
|
|
max_lines: Option<usize>,
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub(super) struct ReadTool<B> {
|
|
pub(super) backend: B,
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl<B> ToolExecutor<ToolCall> for ReadTool<B>
|
|
where
|
|
B: MemoriesBackend,
|
|
{
|
|
fn tool_name(&self) -> ToolName {
|
|
memory_tool_name(READ_TOOL_NAME)
|
|
}
|
|
|
|
fn spec(&self) -> Option<ToolSpec> {
|
|
Some(memory_function_tool::<ReadArgs, ReadMemoryResponse>(
|
|
READ_TOOL_NAME,
|
|
"Read a Codex memory file by relative path, optionally starting at a 1-indexed line offset and limiting the number of lines returned.",
|
|
))
|
|
}
|
|
|
|
async fn handle(
|
|
&self,
|
|
call: ToolCall,
|
|
) -> Result<Box<dyn codex_extension_api::ToolOutput>, codex_extension_api::FunctionCallError>
|
|
{
|
|
let backend = self.backend.clone();
|
|
let args: ReadArgs = parse_args(&call)?;
|
|
let response = backend
|
|
.read(ReadMemoryRequest {
|
|
path: args.path,
|
|
line_offset: args.line_offset.unwrap_or(1),
|
|
max_lines: args.max_lines,
|
|
max_tokens: DEFAULT_READ_MAX_TOKENS,
|
|
})
|
|
.await
|
|
.map_err(backend_error_to_function_call)?;
|
|
Ok(Box::new(JsonToolOutput::new(json!(response))))
|
|
}
|
|
}
|