mirror of
https://github.com/openai/codex.git
synced 2026-05-24 04:54:52 +00:00
## Why This is the next narrow step toward moving concrete tool families out of core. After #22138 introduced `codex-tool-api`, we still needed a real end-to-end seam that lets an extension own an executable tool definition once and have core install it without the temporary `extension-api` wrapper or a dependency on `codex-tools`. `codex-tool-api` is the small extension-facing execution contract, while `codex-tools` still has a different job: host-side shared tool metadata and planning logic that is not “run this contributed tool”, like spec shaping, namespaces, discovery, code-mode augmentation, and MCP/dynamic-to-Responses API conversion ## What changed - Moved the shared leaf tool-spec and JSON Schema types into `codex-tool-api`, so the executable contract now lives with [`ToolBundle`](c538758095/codex-rs/tool-api/src/bundle.rs (L19-L70)). - Replaced the temporary extension-side tool wrapper with direct `ToolBundle` use in `codex-extension-api`. - Taught core to collect contributed bundles, include them in spec planning, register them through [`ToolRegistryBuilder::register_tool_bundle`](c538758095/codex-rs/core/src/tools/registry.rs (L653-L667)), and dispatch them through the existing router/runtime path. - Added focused coverage for contributed tools becoming model-visible and dispatchable, plus spec-planning coverage for contributed function and freeform tools. ## Verification - Added `extension_tool_bundles_are_model_visible_and_dispatchable` in `core/src/tools/router_tests.rs`. - Added spec-plan coverage in `core/src/tools/spec_plan_tests.rs` for contributed extension bundles. ## Related - Follow-up to #22138
88 lines
2.3 KiB
Rust
88 lines
2.3 KiB
Rust
use std::future::Future;
|
|
use std::pin::Pin;
|
|
use std::sync::Arc;
|
|
|
|
use serde_json::Value;
|
|
|
|
use crate::FunctionToolSpec;
|
|
use crate::ToolCall;
|
|
use crate::ToolError;
|
|
|
|
/// Future returned by one contributed function-tool invocation.
|
|
pub type ToolFuture<'a> = Pin<Box<dyn Future<Output = Result<Value, ToolError>> + Send + 'a>>;
|
|
|
|
/// Model-visible definition plus executable implementation for one contributed
|
|
/// function tool.
|
|
#[derive(Clone)]
|
|
pub struct ToolBundle {
|
|
spec: FunctionToolSpec,
|
|
executor: Arc<dyn ToolExecutor>,
|
|
}
|
|
|
|
impl ToolBundle {
|
|
/// Creates one contributed function-tool bundle.
|
|
pub fn new(spec: FunctionToolSpec, executor: Arc<dyn ToolExecutor>) -> Self {
|
|
Self { spec, executor }
|
|
}
|
|
|
|
/// Returns the contributed function-tool spec.
|
|
pub fn spec(&self) -> &FunctionToolSpec {
|
|
&self.spec
|
|
}
|
|
|
|
/// Returns the contributed function-tool name.
|
|
pub fn tool_name(&self) -> &str {
|
|
self.spec.name.as_str()
|
|
}
|
|
|
|
/// Returns the executable implementation.
|
|
pub fn executor(&self) -> Arc<dyn ToolExecutor> {
|
|
Arc::clone(&self.executor)
|
|
}
|
|
}
|
|
|
|
/// Executable behavior for one contributed function tool.
|
|
///
|
|
/// Implementations receive the model-supplied call id and JSON arguments and
|
|
/// return the JSON value that should be exposed to the model.
|
|
pub trait ToolExecutor: Send + Sync {
|
|
fn execute<'a>(&'a self, call: ToolCall) -> ToolFuture<'a>;
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::sync::Arc;
|
|
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::json;
|
|
|
|
use super::ToolBundle;
|
|
use super::ToolExecutor;
|
|
use super::ToolFuture;
|
|
use crate::FunctionToolSpec;
|
|
use crate::ToolCall;
|
|
|
|
struct StubExecutor;
|
|
|
|
impl ToolExecutor for StubExecutor {
|
|
fn execute<'a>(&'a self, _call: ToolCall) -> ToolFuture<'a> {
|
|
Box::pin(async { Ok(json!({ "ok": true })) })
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn bundle_derives_name_from_function_spec() {
|
|
let bundle = ToolBundle::new(
|
|
FunctionToolSpec {
|
|
name: "echo".to_string(),
|
|
description: "Echo arguments.".to_string(),
|
|
strict: false,
|
|
parameters: json!({ "type": "object" }),
|
|
},
|
|
Arc::new(StubExecutor),
|
|
);
|
|
|
|
assert_eq!(bundle.tool_name(), "echo");
|
|
}
|
|
}
|