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:
+11
-4
@@ -8,6 +8,7 @@ const { loadConfig } = require('./config');
|
||||
const { initDb } = require('./db');
|
||||
const { createBus } = require('./sse');
|
||||
const engine = require('./engine');
|
||||
const mcp = require('./mcp');
|
||||
|
||||
const cfg = loadConfig(process.env.AGENT_CONFIG);
|
||||
const db = initDb(cfg.db_path);
|
||||
@@ -45,8 +46,14 @@ app.get('/api/models', (req, res) => {
|
||||
app.get('/api/health', (req, res) => res.json({ ok: true, time: Date.now() }));
|
||||
|
||||
const PORT = process.env.PORT || cfg.port;
|
||||
server.listen(PORT, () => {
|
||||
console.log('Agent server listening on ' + PORT);
|
||||
console.log(' workspace_root=' + cfg.workspace_root);
|
||||
console.log(' models=' + cfg.models.map(m => m.id + '@' + m.url).join(', '));
|
||||
|
||||
// 启动时先发现各 MCP 服务的工具(单个服务失败只警告,不阻止启动),发现完成后再开始监听。
|
||||
mcp.init(cfg).then(() => {
|
||||
server.listen(PORT, () => {
|
||||
console.log('Agent server listening on ' + PORT);
|
||||
console.log(' workspace_root=' + cfg.workspace_root);
|
||||
console.log(' models=' + cfg.models.map(m => m.id + '@' + m.url).join(', '));
|
||||
const mcpList = (cfg.mcp_servers || []).map(s => s.name + '@' + s.url).join(', ');
|
||||
console.log(' mcp_servers=' + (mcpList || '(none)'));
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user