@saber2pr/ai-agent 0.0.47 → 0.0.49

package/lib/core/agent-graph.d.ts

@@ -43,12 +43,12 @@ export default class McpGraphAgent<T extends AgentGraphModel = any> {
     private loadMcpConfigs;
     private initMcpTools;
     private prepareTools;
-    ensureInitialized(): Promise<void>;
+    ensureInitialized(): Promise<T>;
     private closeMcpClients;
     private showLoading;
     private startLoading;
     private stopLoading;
-    getModel(): Promise<T>;
+    private getModel;
     private askForConfig;
     chat(query?: string): Promise<void>;
     /**

package/lib/core/agent-graph.js

@@ -180,17 +180,29 @@ class McpGraphAgent {
         const allToolInfos = [...builtinToolInfos, ...(this.options.tools || []), ...mcpToolInfos];
         this.langchainTools = allToolInfos.map(t => (0, convertToLangChainTool_1.convertToLangChainTool)(t));
         this.toolNode = new prebuilt_1.ToolNode(this.langchainTools);
+        return {
+            builtinToolInfos,
+            mcpToolInfos,
+            tools: this.options.tools,
+            langchainTools: this.langchainTools,
+        };
     }
     // ✅ 修改：初始化逻辑
     async ensureInitialized() {
-        if (this.model && this.langchainTools.length > 0)
-            return;
+        if (this.model && this.langchainTools.length > 0) {
+            return this.getModel();
+        }
+        ;
         // 1. 加载所有工具（含 MCP）
-        await this.prepareTools();
+        const toolsInfo = await this.prepareTools();
         // 2. 初始化模型
-        await this.getModel();
+        const apiModel = await this.getModel();
+        if (toolsInfo.mcpToolInfos && apiModel.setMcpTools) {
+            apiModel.setMcpTools(toolsInfo.mcpToolInfos);
+        }
         // 3. 打印工具状态
         this.printLoadedTools();
+        return apiModel;
     }
     // ✅ 新增：关闭连接
     async closeMcpClients() {
@@ -268,7 +280,6 @@ class McpGraphAgent {
     async chat(query = '开始代码审计') {
         try {
             await this.ensureInitialized();
-            await this.getModel();
             const app = await this.createGraph();
             const graphStream = await app.stream({
                 messages: [new messages_1.HumanMessage(query)],
@@ -298,7 +309,6 @@ class McpGraphAgent {
         this.streamEnabled = true;
         try {
             await this.ensureInitialized();
-            await this.getModel();
             const app = await this.createGraph();
             const graphStream = await app.stream({
                 messages: [new messages_1.HumanMessage(query)],
@@ -322,7 +332,6 @@ class McpGraphAgent {
     }
     async start() {
         await this.ensureInitialized();
-        await this.getModel();
         const app = await this.createGraph();
         const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
         rl.on('SIGINT', () => {

package/lib/model/AgentGraphModel.d.ts

@@ -11,9 +11,16 @@ export interface AgentGraphLLMResponse {
 export type StreamChunkCallback = (chunk: string) => void;
 export declare abstract class AgentGraphModel extends BaseChatModel {
     protected boundTools?: any[];
+    private mcpEnabled?;
+    private mcpTools?;
+    setMcpTools(tools: any[]): void;
+    setMcpEnabled(enabled?: boolean): void;
+    getMcpEnabled(): boolean;
+    getMcpTools(): any[];
+    private isMcpTool;
     constructor(fields?: BaseChatModelParams);
     bindTools(tools: any[]): any;
-    abstract callApi(prompt: string): Promise<AgentGraphLLMResponse>;
+    abstract callApi(prompt: string, lastMsg: BaseMessage): Promise<AgentGraphLLMResponse>;
     /**
      * 流式调用 API，子类可覆盖以实现真正的 SSE 流式传输。
      * 默认回退到 callApi 非流式调用。
@@ -21,7 +28,7 @@ export declare abstract class AgentGraphModel extends BaseChatModel {
      * @param onChunk 每收到一段文本时的回调
      * @returns 完整的响应结果
      */
-    callApiStream(prompt: string, onChunk: StreamChunkCallback): Promise<AgentGraphLLMResponse>;
+    callApiStream(prompt: string, lastMsg: BaseMessage, onChunk: StreamChunkCallback): Promise<AgentGraphLLMResponse>;
     _generate(messages: BaseMessage[]): Promise<ChatResult>;
     private parseToolCalls;
     /**

package/lib/model/AgentGraphModel.js

@@ -5,9 +5,28 @@ const chat_models_1 = require("@langchain/core/language_models/chat_models");
 const messages_1 = require("@langchain/core/messages");
 const function_calling_1 = require("@langchain/core/utils/function_calling");
 const cleanToolDefinition_1 = require("../utils/cleanToolDefinition");
+const kit_1 = require("../utils/kit");
 class AgentGraphModel extends chat_models_1.BaseChatModel {
+    setMcpTools(tools) {
+        this.mcpTools = tools;
+    }
+    setMcpEnabled(enabled = true) {
+        this.mcpEnabled = enabled;
+    }
+    getMcpEnabled() {
+        return this.mcpEnabled;
+    }
+    getMcpTools() {
+        return this.mcpTools;
+    }
+    isMcpTool(tool) {
+        const mcpTools = (0, kit_1.getArray)(this.mcpTools);
+        return mcpTools.some(t => { var _a, _b; return ((_a = t === null || t === void 0 ? void 0 : t.function) === null || _a === void 0 ? void 0 : _a.name) === ((_b = tool === null || tool === void 0 ? void 0 : tool.function) === null || _b === void 0 ? void 0 : _b.name); });
+    }
     constructor(fields) {
         super(fields || {});
+        this.mcpEnabled = true;
+        this.mcpTools = [];
     }
     bindTools(tools) {
         this.boundTools = tools.map(t => (0, function_calling_1.convertToOpenAITool)(t));
@@ -20,14 +39,15 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
      * @param onChunk 每收到一段文本时的回调
      * @returns 完整的响应结果
      */
-    async callApiStream(prompt, onChunk) {
-        const result = await this.callApi(prompt);
+    async callApiStream(prompt, lastMsg, onChunk) {
+        const result = await this.callApi(prompt, lastMsg);
         onChunk(result.text);
         return result;
     }
     async _generate(messages) {
         const fullPrompt = this.serializeMessages(messages);
-        const response = await this.callApi(fullPrompt);
+        const lastMsg = messages[messages.length - 1];
+        const response = await this.callApi(fullPrompt, lastMsg);
         let { text, reasoning } = response;
         // 1. 处理思考内容
         if (!reasoning && text.includes('<think>')) {
@@ -111,7 +131,8 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
      */
     async streamGenerate(messages, onChunk) {
         const fullPrompt = this.serializeMessages(messages);
-        const response = await this.callApiStream(fullPrompt, onChunk);
+        const lastMsg = messages[messages.length - 1];
+        const response = await this.callApiStream(fullPrompt, lastMsg, onChunk);
         let { text, reasoning } = response;
         // 1. 处理思考内容
         if (!reasoning && text.includes('<think>')) {
@@ -152,8 +173,9 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
             const content = typeof m.content === 'string' ? m.content : JSON.stringify(m.content, null, 2);
             return `${m._getType().toUpperCase()}: ${content}`;
         };
-        const toolsContext = this.boundTools
-            ? `\n[Tools]\n${JSON.stringify(this.boundTools.map(cleanToolDefinition_1.cleanToolDefinition), null, 2)}`
+        const tools = this.getMcpEnabled() ? (0, kit_1.getArray)(this.boundTools) : (0, kit_1.getArray)(this.boundTools).filter(tool => !this.isMcpTool(tool));
+        const toolsContext = tools.length
+            ? `\n[Tools]\n${JSON.stringify(tools.map(cleanToolDefinition_1.cleanToolDefinition), null, 2)}`
             : '';
         return `
 ${format(systemMsg)}

package/lib/utils/kit.d.ts

@@ -0,0 +1 @@
+export declare const getArray: <T = any>(array: T[]) => T[];

package/lib/utils/kit.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getArray = void 0;
+const getArray = (array) => (Array.isArray(array) ? array : []);
+exports.getArray = getArray;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saber2pr/ai-agent",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "description": "AI Assistant CLI.",
   "author": "saber2pr",
   "license": "ISC",