@saber2pr/ai-agent 0.0.46 → 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/tools/filesystem/index.js

@@ -10,6 +10,16 @@ const path_1 = __importDefault(require("path"));
 const zod_1 = require("zod");
 const createTool_1 = require("../../utils/createTool");
 const lib_1 = require("./lib");
+const DEFAULT_IGNORE = [
+    'node_modules/**',
+    '.git/**',
+    'dist/**',
+    'build/**',
+    '.next/**',
+    'out/**',
+    '*.log',
+    '.DS_Store'
+];
 // Schema definitions
 const ReadTextFileArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
@@ -215,6 +225,8 @@ const getFilesystemTools = (targetDir) => {
             '默认仅展示 2 层深度以节省 Token。如果需要看更深层级，请调大 depth 参数。',
         parameters: DirectoryTreeArgsSchema,
         handler: async (args) => {
+            // 在 directory_tree 的 handler 内部
+            const combinedExcludes = [...DEFAULT_IGNORE, ...(args.excludePatterns || [])];
             const rootPath = args.path;
             async function buildTree(currentPath, currentDepth, maxDepth, excludePatterns = []) {
                 if (currentDepth > maxDepth)
@@ -239,7 +251,7 @@ const getFilesystemTools = (targetDir) => {
                 }
                 return result;
             }
-            const treeData = await buildTree(rootPath, 1, args.depth, args.excludePatterns);
+            const treeData = await buildTree(rootPath, 1, args.depth, combinedExcludes);
             return JSON.stringify(treeData, null, 2);
         },
     });
@@ -265,9 +277,10 @@ const getFilesystemTools = (targetDir) => {
             'Used only for filename search',
         parameters: SearchFilesArgsSchema,
         handler: async (args) => {
+            const combinedExcludes = [...DEFAULT_IGNORE, ...(args.excludePatterns || [])];
             const validPath = await (0, lib_1.validatePath)(targetDir, args.path);
             const results = await (0, lib_1.searchFilesWithValidation)(targetDir, validPath, args.pattern, [targetDir], {
-                excludePatterns: ['node_modules', ...((args === null || args === void 0 ? void 0 : args.excludePatterns) || [])],
+                excludePatterns: combinedExcludes,
             });
             const text = results.length > 0 ? results.join('\n') : 'No matches found';
             return text;
@@ -315,6 +328,9 @@ const getFilesystemTools = (targetDir) => {
                         const stats = await promises_1.default.stat(filePath);
                         if (!stats.isFile())
                             return;
+                        // 在 grep_search 扫描文件时增加判断
+                        if ((0, lib_1.isBinaryOrIrrelevant)(path_1.default.extname(filePath)))
+                            return;
                         const content = await (0, lib_1.readFileContent)(filePath);
                         if (content.includes(args.query)) {
                             const relativePath = path_1.default.relative(targetDir, filePath);

package/lib/tools/filesystem/lib.d.ts

@@ -31,4 +31,5 @@ export declare function applyFileEdits(filePath: string, edits: FileEdit[], dryR
 export declare function tailFile(filePath: string, numLines: number): Promise<string>;
 export declare function headFile(filePath: string, numLines: number): Promise<string>;
 export declare function searchFilesWithValidation(cwd: string, rootPath: string, pattern: string, allowedDirectories: string[], options?: SearchOptions): Promise<string[]>;
+export declare const isBinaryOrIrrelevant: (filePath: string) => boolean;
 export {};

package/lib/tools/filesystem/lib.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBinaryOrIrrelevant = void 0;
 exports.setAllowedDirectories = setAllowedDirectories;
 exports.getAllowedDirectories = getAllowedDirectories;
 exports.formatSize = formatSize;
@@ -115,7 +116,7 @@ async function writeFileContent(filePath, content) {
     try {
         // Security: 'wx' flag ensures exclusive creation - fails if file/symlink exists,
         // preventing writes through pre-existing symlinks
-        await promises_1.default.writeFile(filePath, content, { encoding: "utf-8", flag: 'wx' });
+        await promises_1.default.writeFile(filePath, content, { encoding: 'utf-8', flag: 'wx' });
     }
     catch (error) {
         if (error.code === 'EEXIST') {
@@ -230,7 +231,7 @@ async function tailFile(filePath, numLines) {
     try {
         const lines = [];
         let position = fileSize;
-        let chunk = Buffer.alloc(CHUNK_SIZE);
+        const chunk = Buffer.alloc(CHUNK_SIZE);
         let linesFound = 0;
         let remainingText = '';
         // Read chunks from the end of the file until we have enough lines
@@ -328,3 +329,34 @@ async function searchFilesWithValidation(cwd, rootPath, pattern, allowedDirector
     await search(rootPath);
     return results;
 }
+const isBinaryOrIrrelevant = (filePath) => {
+    const ext = path_1.default.extname(filePath).toLowerCase();
+    // 1. 常见的二进制媒体/资源格式
+    const binaryExtensions = new Set([
+        // 图片
+        '.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.ico', '.tiff',
+        // 字体
+        '.ttf', '.otf', '.woff', '.woff2', '.eot',
+        // 压缩包
+        '.zip', '.tar', '.gz', '.7z', '.rar',
+        // 编译产物/执行文件
+        '.exe', '.dll', '.so', '.dylib', '.bin', '.obj', '.pyc', '.pyo', '.class',
+        // 音视频
+        '.mp3', '.mp4', '.mov', '.wav', '.flv', '.wmv',
+        // 文档 (虽然是文档，但通常是二进制格式)
+        '.pdf', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx'
+    ]);
+    if (binaryExtensions.has(ext))
+        return true;
+    // 2. 干扰性极强的非二进制文件 (Source Maps 等)
+    const noiseExtensions = new Set([
+        '.map', // 源代码映射文件，极长且无意义
+        '.lock', // package-lock.json, yarn.lock 等锁定文件 (可选，如果 AI 不需要分析版本)
+        '.pyc',
+        '.DS_Store'
+    ]);
+    if (noiseExtensions.has(ext))
+        return true;
+    return false;
+};
+exports.isBinaryOrIrrelevant = isBinaryOrIrrelevant;

package/lib/tools/filesystem/path-utils.js

@@ -45,13 +45,13 @@ function normalizePath(p) {
     // Check if this is a Unix path that should not be converted
     // WSL paths (/mnt/) should ALWAYS be preserved as they work correctly in WSL with Node.js fs
     // Regular Unix paths should also be preserved
-    const isUnixPath = p.startsWith('/') && (
-    // Always preserve WSL paths (/mnt/c/, /mnt/d/, etc.)
-    p.match(/^\/mnt\/[a-z]\//i) ||
-        // On non-Windows platforms, treat all absolute paths as Unix paths
-        (process.platform !== 'win32') ||
-        // On Windows, preserve Unix paths that aren't Unix-style Windows paths (/c/, /d/, etc.)
-        (process.platform === 'win32' && !p.match(/^\/[a-zA-Z]\//)));
+    const isUnixPath = p.startsWith('/') &&
+        // Always preserve WSL paths (/mnt/c/, /mnt/d/, etc.)
+        (p.match(/^\/mnt\/[a-z]\//i) ||
+            // On non-Windows platforms, treat all absolute paths as Unix paths
+            process.platform !== 'win32' ||
+            // On Windows, preserve Unix paths that aren't Unix-style Windows paths (/c/, /d/, etc.)
+            (process.platform === 'win32' && !p.match(/^\/[a-zA-Z]\//)));
     if (isUnixPath) {
         // For Unix paths, just normalize without converting to Windows format
         // Replace double slashes with single slashes and remove trailing slashes

package/lib/tools/filesystem/path-validation.js

@@ -74,7 +74,7 @@ function isPathWithinAllowedDirectories(absolutePath, allowedDirectories) {
             // Ensure both paths are on the same drive
             const dirDrive = normalizedDir.charAt(0).toLowerCase();
             const pathDrive = normalizedPath.charAt(0).toLowerCase();
-            return pathDrive === dirDrive && normalizedPath.startsWith(normalizedDir.replace(/\\?$/, '\\'));
+            return (pathDrive === dirDrive && normalizedPath.startsWith(normalizedDir.replace(/\\?$/, '\\')));
         }
         return normalizedPath.startsWith(normalizedDir + path_1.default.sep);
     });

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.46",
+  "version": "0.0.49",
   "description": "AI Assistant CLI.",
   "author": "saber2pr",
   "license": "ISC",