mirror of
https://github.com/openai/codex.git
synced 2026-10-20 17:38:45 +00:00
Charlie Marsh
f3803587c9
## Why MCP tool parsing eagerly cloned structured output schemas and built full call-result envelopes. Cloning tool definitions also copied their output-schema JSON, even before a consumer needed it. ## What changed - Introduce `ToolOutputSchema` with immutable `Arc` storage so tool definitions share output schemas when cloned. - Retain MCP structured output schemas and materialize the call-result envelope only when JSON is requested. - Update code-mode consumers and schema mutation sites to materialize JSON explicitly, reusing uniquely owned storage when possible. - Move structured content into the MCP envelope without an extra clone, preserving property order. ## Testing Add tests for JSON preservation, mutation isolation, equality between lazy and materialized schemas, reuse of uniquely owned storage, and equivalent code-mode definitions. GitOrigin-RevId: e98ba4c2f0efedc99f7cbc7bba206cc63a3bd8f4
31 lines
691 B
Rust
31 lines
691 B
Rust
use crate::JsonSchema;
|
|
use crate::ToolOutputSchema;
|
|
|
|
/// Tool metadata and schemas that downstream crates can adapt into higher-level
|
|
/// tool specs.
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct ToolDefinition {
|
|
pub name: String,
|
|
pub description: String,
|
|
pub input_schema: JsonSchema,
|
|
pub output_schema: Option<ToolOutputSchema>,
|
|
pub defer_loading: bool,
|
|
}
|
|
|
|
impl ToolDefinition {
|
|
pub fn renamed(mut self, name: String) -> Self {
|
|
self.name = name;
|
|
self
|
|
}
|
|
|
|
pub fn into_deferred(mut self) -> Self {
|
|
self.output_schema = None;
|
|
self.defer_loading = true;
|
|
self
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "tool_definition_tests.rs"]
|
|
mod tests;
|