web_search 从内置工具改为 MCP 服务:新增 server/mcp.js 极简 MCP 客户端(JSON-RPC over HTTP,SSE 帧容错解析),config.yml 新增 mcp_servers(可多个,每项 name?/url/headers,authorization 即普通 header),启动时 tools/list 发现工具转 OpenAI function 格式,随 system prompt 与内置工具一起发给模型(内置 definitions.json 移除 web_search,剩 12 个);executeTool 未命中内置时按注册表经 tools/call 转发,工具重名加服务名前缀;旧 web_search.{url,authorization} 配置自动迁移为一条 mcp_servers;单服务发现失败仅告警不阻塞启动;README/example 配置同步
This commit is contained in:
+27
-5
@@ -15,11 +15,9 @@ const DEFAULTS = {
|
||||
model_hold: { idle_release_ms: 180000, active_max_ms: 1800000, sweep_ms: 10000 },
|
||||
models: [],
|
||||
auth: null, // { user, password },为空则不启用内置 basic auth(可交给 nginx-proxy)
|
||||
// web_search 工具:内网 MCP 服务(JSON-RPC over HTTP,无状态)
|
||||
web_search: {
|
||||
url: 'https://web-search.ai.foresh.com/',
|
||||
authorization: 'Basic a2ljZXI6USF3MmUzcjQ=',
|
||||
},
|
||||
// MCP 服务列表:每项 {name?, url, headers?};启动时发现其工具并追加到内置工具之后。
|
||||
// 注意与内置工具(definitions.json)严格分离:这里只配外部 MCP 服务。
|
||||
mcp_servers: [],
|
||||
};
|
||||
|
||||
function deepMerge(base, extra) {
|
||||
@@ -56,6 +54,30 @@ function loadConfig(configPath) {
|
||||
|
||||
cfg.workspace_root = path.resolve(cfg.workspace_root);
|
||||
if (!cfg.db_path) cfg.db_path = path.join(cfg.workspace_root, '.agent.db');
|
||||
|
||||
// 兼容旧配置:顶层 web_search.{url,authorization} 自动转为一条 mcp_servers(authorization 即一条 header)
|
||||
if (raw.web_search && raw.web_search.url && !raw.mcp_servers) {
|
||||
const ws = raw.web_search;
|
||||
cfg.mcp_servers = [{
|
||||
name: 'web-search',
|
||||
url: ws.url,
|
||||
headers: ws.authorization ? { Authorization: ws.authorization } : {},
|
||||
}];
|
||||
console.log('[config] 检测到旧配置 web_search.*,已自动转为一条 mcp_servers;建议更新 config.yml 为 mcp_servers 格式');
|
||||
}
|
||||
|
||||
// MCP 服务规范化:url 必填;name 缺省取主机名首段;headers 为普通键值对象(如 Authorization)
|
||||
if (!Array.isArray(cfg.mcp_servers)) cfg.mcp_servers = [];
|
||||
for (const s of cfg.mcp_servers) {
|
||||
if (!s || !s.url) throw new Error('mcp_servers 每项必须有 url(MCP 服务的 JSON-RPC 端点)');
|
||||
if (!s.name) {
|
||||
try { s.name = String(new URL(s.url).hostname.split('.')[0]); } catch (_) { s.name = 'mcp'; }
|
||||
}
|
||||
const headers = {};
|
||||
for (const [k, v] of Object.entries(s.headers || {})) headers[k] = String(v);
|
||||
s.headers = headers;
|
||||
}
|
||||
|
||||
cfg.config_path = p;
|
||||
return cfg;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user