Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into mcp-codex

Browse source
This commit is contained in:
Agus Zubiaga 2025-07-22 19:24:10 -03:00
commit 1e5625c4b4
97 changed files with 3234 additions and 1599 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/agent_servers/src/claude/tools.rs
View file

@ -434,10 +434,6 @@ pub struct EditToolParams {
pub new_text: String,
}
#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
pub struct EditToolResponse;
#[derive(Deserialize, JsonSchema, Debug)]
pub struct ReadToolParams {
/// The absolute path to the file to read.
@ -450,12 +446,6 @@ pub struct ReadToolParams {
pub limit: Option<u32>,
}
#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
pub struct ReadToolResponse {
pub content: String,
}
#[derive(Deserialize, JsonSchema, Debug)]
pub struct WriteToolParams {
/// Absolute path for new file

30
crates/agent_servers/src/mcp_server.rs
View file

@ -14,11 +14,7 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use util::debug_panic;
// todo! use shared tool inference?
use crate::{
claude::tools::{ClaudeTool, EditToolParams, ReadToolParams},
tools::{EditToolResponse, ReadToolResponse},
};
use crate::claude::tools::{ClaudeTool, EditToolParams, ReadToolParams};
pub struct ZedMcpServer {
server: context_server::listener::McpServer,
@ -196,11 +192,9 @@ impl ZedMcpServer {
let input =
serde_json::from_value(request.arguments.context("Arguments required")?)?;
let result = Self::handle_read_tool_call(input, delegate, cx).await?;
let content = Self::handle_read_tool_call(input, delegate, cx).await?;
Ok(CallToolResponse {
content: vec![ToolResponseContent::Text {
text: serde_json::to_string(&result)?,
}],
content,
is_error: None,
meta: None,
})
@ -208,11 +202,9 @@ impl ZedMcpServer {
let input =
serde_json::from_value(request.arguments.context("Arguments required")?)?;
let result = Self::handle_edit_tool_call(input, delegate, cx).await?;
Self::handle_edit_tool_call(input, delegate, cx).await?;
Ok(CallToolResponse {
content: vec![ToolResponseContent::Text {
text: serde_json::to_string(&result)?,
}],
content: vec![],
is_error: None,
meta: None,
})
@ -226,7 +218,7 @@ impl ZedMcpServer {
params: ReadToolParams,
delegate: AcpClientDelegate,
cx: &AsyncApp,
) -> Task<Result<ReadToolResponse>> {
) -> Task<Result<Vec<ToolResponseContent>>> {
cx.foreground_executor().spawn(async move {
let response = delegate
.read_text_file(ReadTextFileParams {
@ -236,9 +228,9 @@ impl ZedMcpServer {
})
.await?;
Ok(ReadToolResponse {
content: response.content,
})
Ok(vec![ToolResponseContent::Text {
text: response.content,
}])
})
}
@ -246,7 +238,7 @@ impl ZedMcpServer {
params: EditToolParams,
delegate: AcpClientDelegate,
cx: &AsyncApp,
) -> Task<Result<EditToolResponse>> {
) -> Task<Result<()>> {
cx.foreground_executor().spawn(async move {
let response = delegate
.read_text_file_reusing_snapshot(ReadTextFileParams {
@ -268,7 +260,7 @@ impl ZedMcpServer {
})
.await?;
Ok(EditToolResponse)
Ok(())
})
}