GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

fix(tools): Update .mcp.json discovery to prioritize local ./work over /opt/gbo/data

Browse source
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-02-20 00:19:59 -03:00
parent de017241f2
commit c07aee708f
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/basic/keywords/use_tool.rs
View file

@ -199,16 +199,12 @@ fn associate_tool_with_session(
) -> Result<String, String> {
use crate::core::shared::models::schema::session_tool_associations;
// Check if tool's .mcp.json file exists in work directory
let home_dir = std::env::var("HOME").unwrap_or_else(|_| ".".to_string());
let gb_dir = format!("{}/gb", home_dir);
// Get bot name to construct the path
let bot_name = get_bot_name_from_id(state, &user.bot_id)?;
let work_path = Path::new(&gb_dir)
.join("work")
.join(format!("{}.gbai/{}.gbdialog", bot_name, bot_name));
let mcp_path = work_path.join(format!("{}.mcp.json", tool_name));
let bot_subpath = format!("{}.gbai/{}.gbdialog", bot_name, bot_name);
let tool_file = format!("{}.mcp.json", tool_name);
let mcp_path = Path::new("./work").join(&bot_subpath).join(&tool_file);
trace!("Checking for tool .mcp.json at: {:?}", mcp_path);

12
src/core/bot/tool_context.rs
View file

@ -36,18 +36,18 @@ pub fn get_session_tools(
}
// Build path to work/{bot_name}.gbai/{bot_name}.gbdialog directory
let home_dir = std::env::var("HOME").unwrap_or_else(|_| ".".to_string());
let gb_dir = format!("{}/gb", home_dir);
let work_path = Path::new(&gb_dir).join("work").join(format!("{}.gbai/{}.gbdialog", bot_name, bot_name));
let bot_subpath = format!("{}.gbai/{}.gbdialog", bot_name, bot_name);
let work_path = Path::new("./work").join(&bot_subpath);
info!("Loading {} tools for session {} from {:?}", tool_names.len(), session_id, work_path);
info!("Loading {} tools for session {}", tool_names.len(), session_id);
let mut tools = Vec::new();
for tool_name in &tool_names {
// Find the .mcp.json file for this tool
let mcp_path = work_path.join(format!("{}.mcp.json", tool_name));
let tool_file = format!("{}.mcp.json", tool_name);
let mcp_path = work_path.join(&tool_file);
if !mcp_path.exists() {
warn!("Tool JSON file not found: {:?}", mcp_path);
continue;

2
src/llm/glm.rs
View file

@ -340,7 +340,7 @@ impl LLMProvider for GLMClient {
}
// Keep unprocessed data in buffer
if let Some(last_newline) = data.rfind('\n') {
if let Some(last_newline) = buffer.iter().rposition(|&b| b == b'\n') {
buffer = buffer[last_newline + 1..].to_vec();
}
}