This commit is contained in:
Liang-Ting Jiang
2026-04-15 20:17:30 -07:00
parent 6717d23c57
commit 27db0443d2
12 changed files with 228 additions and 1671 deletions
@@ -1,14 +1,3 @@
use std::collections::HashSet;
use std::sync::Arc;
use rmcp::model::Tool;
use rmcp::model::ToolAnnotations;
use serde_json::Map;
use serde_json::Value as JsonValue;
use crate::mcp::CODEX_APPS_MCP_SERVER_NAME;
use crate::mcp_connection_manager::ToolInfo;
pub const SEARCH_LIBRARY_FILES_TOOL_NAME: &str = "search_library_files";
pub const LIST_LIBRARY_DIRECTORY_NODES_TOOL_NAME: &str = "list_library_directory_nodes";
pub const DOWNLOAD_LIBRARY_FILE_TOOL_NAME: &str = "download_library_file";
@@ -25,214 +14,3 @@ pub fn is_codex_apps_library_tool(tool_name: &str) -> bool {
| WRITEBACK_LIBRARY_FILE_TOOL_NAME
)
}
pub(crate) fn append_builtin_codex_apps_library_tools(
mut tools: Vec<ToolInfo>,
server_instructions: Option<&str>,
) -> Vec<ToolInfo> {
let existing_names = tools
.iter()
.filter(|tool| tool.server_name == CODEX_APPS_MCP_SERVER_NAME)
.map(|tool| tool.tool.name.to_string())
.collect::<HashSet<_>>();
for tool in builtin_codex_apps_library_tools(server_instructions) {
if existing_names.contains(tool.tool.name.as_ref()) {
continue;
}
tools.push(tool);
}
tools
}
fn builtin_codex_apps_library_tools(server_instructions: Option<&str>) -> Vec<ToolInfo> {
vec![
library_tool(
SEARCH_LIBRARY_FILES_TOOL_NAME,
"Search or list recent library files through the ChatGPT File API. Use this for library discovery instead of local path walking. Optional arguments: q, limit, cursor, category, state.",
serde_json::json!({
"type": "object",
"properties": {
"q": {
"type": "string",
"description": "Optional filename substring query. Omit to list recent files."
},
"limit": {
"type": "integer",
"minimum": 1,
"maximum": 200,
"description": "Maximum number of results to return. Defaults to 10."
},
"cursor": {
"type": "string",
"description": "Optional pagination cursor from a previous response."
},
"category": {
"type": "string",
"description": "Optional library file category filter."
},
"state": {
"type": "string",
"description": "Optional library file state filter."
}
},
"additionalProperties": false
}),
ToolAnnotations {
destructive_hint: Some(false),
idempotent_hint: Some(true),
open_world_hint: Some(false),
read_only_hint: Some(true),
title: None,
},
server_instructions,
),
library_tool(
LIST_LIBRARY_DIRECTORY_NODES_TOOL_NAME,
"List the immediate child folders and files for a library directory through the ChatGPT File API. Use parent_directory_id omitted for the synthetic root.",
serde_json::json!({
"type": "object",
"properties": {
"parent_directory_id": {
"type": "string",
"description": "Optional parent directory id. Omit to list the synthetic library root."
},
"cursor": {
"type": "string",
"description": "Optional pagination cursor from a previous response."
}
},
"additionalProperties": false
}),
ToolAnnotations {
destructive_hint: Some(false),
idempotent_hint: Some(true),
open_world_hint: Some(false),
read_only_hint: Some(true),
title: None,
},
server_instructions,
),
library_tool(
DOWNLOAD_LIBRARY_FILE_TOOL_NAME,
"Download a library file into a managed per-thread local cache and return the hydrated local filesystem path. Use this when a task needs normal local file access.",
serde_json::json!({
"type": "object",
"properties": {
"file_id": {
"type": "string",
"minLength": 1,
"description": "Backing storage file_id for the library file."
},
"file_name": {
"type": "string",
"minLength": 1,
"description": "Filename to use for the hydrated local copy."
},
"library_file_id": {
"type": "string",
"description": "Optional library object id for sidecar metadata."
}
},
"required": ["file_id", "file_name"],
"additionalProperties": false
}),
ToolAnnotations {
destructive_hint: Some(false),
idempotent_hint: Some(true),
open_world_hint: Some(false),
read_only_hint: Some(true),
title: None,
},
server_instructions,
),
library_tool(
CREATE_LIBRARY_FILE_TOOL_NAME,
"Create a new text file in the user's library through the ChatGPT File API. V1 is create-new-only: do not use this to update, replace, or delete an existing library file.",
serde_json::json!({
"type": "object",
"properties": {
"file_name": {
"type": "string",
"minLength": 1,
"description": "Name for the new library file, including extension."
},
"content": {
"type": "string",
"description": "UTF-8 text content for the new file. Maximum size is 500 MB."
}
},
"required": ["file_name", "content"],
"additionalProperties": false
}),
ToolAnnotations {
destructive_hint: Some(false),
idempotent_hint: Some(false),
open_world_hint: Some(false),
read_only_hint: Some(false),
title: None,
},
server_instructions,
),
library_tool(
WRITEBACK_LIBRARY_FILE_TOOL_NAME,
"Write back a hydrated local library file by creating a new library file only if the local copy changed. V1 never updates, replaces, or deletes the source file.",
serde_json::json!({
"type": "object",
"properties": {
"local_path": {
"type": "string",
"minLength": 1,
"description": "Absolute local path returned by download_library_file for the hydrated copy."
},
"file_name": {
"type": "string",
"minLength": 1,
"description": "Optional name for the new library file. Defaults to the hydrated source filename."
}
},
"required": ["local_path"],
"additionalProperties": false
}),
ToolAnnotations {
destructive_hint: Some(false),
idempotent_hint: Some(false),
open_world_hint: Some(false),
read_only_hint: Some(false),
title: None,
},
server_instructions,
),
]
}
fn library_tool(
name: &str,
description: &str,
input_schema: JsonValue,
annotations: ToolAnnotations,
server_instructions: Option<&str>,
) -> ToolInfo {
ToolInfo {
server_name: CODEX_APPS_MCP_SERVER_NAME.to_string(),
callable_name: name.to_string(),
callable_namespace: "mcp__codex_apps__".to_string(),
server_instructions: server_instructions.map(str::to_string),
tool: Tool {
name: name.to_string().into(),
title: None,
description: Some(description.to_string().into()),
input_schema: Arc::new(input_schema.as_object().cloned().unwrap_or_else(Map::new)),
output_schema: None,
annotations: Some(annotations),
execution: None,
icons: None,
meta: None,
},
connector_id: None,
connector_name: None,
plugin_display_names: Vec::new(),
connector_description: None,
}
}
@@ -20,7 +20,6 @@ use std::time::Duration;
use std::time::Instant;
use crate::McpAuthStatusEntry;
use crate::codex_apps_library_tools::append_builtin_codex_apps_library_tools;
use crate::mcp::CODEX_APPS_MCP_SERVER_NAME;
use crate::mcp::McpConfig;
use crate::mcp::ToolPluginProvenance;
@@ -565,8 +564,7 @@ impl AsyncManagedClient {
async fn listed_tools(&self) -> Option<Vec<ToolInfo>> {
let annotate_tools = |tools: Vec<ToolInfo>| {
let mut tools =
append_builtin_codex_apps_library_tools(tools, /*server_instructions*/ None);
let mut tools = tools;
for tool in &mut tools {
if tool.server_name == CODEX_APPS_MCP_SERVER_NAME {
tool.tool = tool_with_model_visible_input_schema(&tool.tool);
@@ -1687,11 +1685,6 @@ async fn list_tools_for_client_uncached(
}
})
.collect();
let tools = if server_name == CODEX_APPS_MCP_SERVER_NAME {
append_builtin_codex_apps_library_tools(tools, server_instructions)
} else {
tools
};
if server_name == CODEX_APPS_MCP_SERVER_NAME {
return Ok(filter_disallowed_codex_apps_tools(tools));
}
@@ -728,8 +728,8 @@ async fn list_all_tools_does_not_block_when_startup_snapshot_cache_hit_is_empty(
tokio::time::timeout(Duration::from_millis(10), manager.list_all_tools()).await;
let tools = timeout_result.expect("cache-hit startup snapshot should not block");
assert!(
tools.contains_key("mcp__codex_apps__search_library_files"),
"builtin codex apps library tools should still be available from an empty startup snapshot"
tools.is_empty(),
"empty startup snapshots should not synthesize codex apps tools"
);
}