@saber2pr/ai-agent 0.0.24 → 0.0.25

package/lib/core/agent-chain.js

@@ -46,7 +46,6 @@ const tools_1 = require("@langchain/core/tools");
 const openai_1 = require("@langchain/openai");
 const config_1 = require("../config/config");
 const builtin_1 = require("../tools/builtin");
-const jsonSchemaToZod_1 = require("../utils/jsonSchemaToZod");
 class McpChainAgent {
     constructor(options) {
         this.allTools = [];
@@ -125,7 +124,7 @@ class McpChainAgent {
         const langchainTools = this.allTools.map(t => new tools_1.DynamicStructuredTool({
             name: t.function.name,
             description: t.function.description || "",
-            schema: (0, jsonSchemaToZod_1.jsonSchemaToZod)(t.function.parameters),
+            schema: (t.function.parameters),
             func: async (args) => await t._handler(args),
         }));
         const prompt = prompts_1.PromptTemplate.fromTemplate(`{system_prompt}

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

@@ -1,11 +1,16 @@
 import { BaseMessage } from "@langchain/core/messages";
 import { AgentOptions } from "../types/type";
 export declare const CONFIG_FILE: string;
+interface TokenUsage {
+    total: number;
+}
 declare const AgentState: import("@langchain/langgraph").AnnotationRoot<{
     messages: import("@langchain/langgraph").BinaryOperatorAggregate<BaseMessage[], BaseMessage[]>;
     auditedFiles: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
     targetCount: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
     mode: import("@langchain/langgraph").BinaryOperatorAggregate<"chat" | "auto", "chat" | "auto">;
+    tokenUsage: import("@langchain/langgraph").BinaryOperatorAggregate<TokenUsage, TokenUsage>;
+    totalDuration: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
 }>;
 export default class McpGraphAgent {
     private model;
@@ -15,6 +20,8 @@ export default class McpGraphAgent {
     private checkpointer;
     private langchainTools;
     private stopLoadingFunc;
+    private verbose;
+    private alwaysSystem;
     constructor(options?: AgentOptions);
     private showLoading;
     private startLoading;
@@ -26,30 +33,44 @@ export default class McpGraphAgent {
     private renderOutput;
     callModel(state: typeof AgentState.State): Promise<{
         messages: unknown[];
+        tokenUsage: {
+            total: number;
+        };
+        totalDuration: number;
     }>;
+    private getRecentToolCalls;
     trackProgress(state: typeof AgentState.State): Promise<{
         auditedFiles: string[];
     }>;
+    private printFinalSummary;
     createGraph(): Promise<import("@langchain/langgraph").CompiledStateGraph<import("@langchain/langgraph").StateType<{
         messages: import("@langchain/langgraph").BinaryOperatorAggregate<BaseMessage[], BaseMessage[]>;
         auditedFiles: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
         targetCount: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         mode: import("@langchain/langgraph").BinaryOperatorAggregate<"chat" | "auto", "chat" | "auto">;
+        tokenUsage: import("@langchain/langgraph").BinaryOperatorAggregate<TokenUsage, TokenUsage>;
+        totalDuration: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
     }>, import("@langchain/langgraph").UpdateType<{
         messages: import("@langchain/langgraph").BinaryOperatorAggregate<BaseMessage[], BaseMessage[]>;
         auditedFiles: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
         targetCount: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         mode: import("@langchain/langgraph").BinaryOperatorAggregate<"chat" | "auto", "chat" | "auto">;
+        tokenUsage: import("@langchain/langgraph").BinaryOperatorAggregate<TokenUsage, TokenUsage>;
+        totalDuration: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
     }>, "tools" | "agent" | "__start__" | "progress", {
         messages: import("@langchain/langgraph").BinaryOperatorAggregate<BaseMessage[], BaseMessage[]>;
         auditedFiles: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
         targetCount: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         mode: import("@langchain/langgraph").BinaryOperatorAggregate<"chat" | "auto", "chat" | "auto">;
+        tokenUsage: import("@langchain/langgraph").BinaryOperatorAggregate<TokenUsage, TokenUsage>;
+        totalDuration: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
     }, {
         messages: import("@langchain/langgraph").BinaryOperatorAggregate<BaseMessage[], BaseMessage[]>;
         auditedFiles: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
         targetCount: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         mode: import("@langchain/langgraph").BinaryOperatorAggregate<"chat" | "auto", "chat" | "auto">;
+        tokenUsage: import("@langchain/langgraph").BinaryOperatorAggregate<TokenUsage, TokenUsage>;
+        totalDuration: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
     }, import("@langchain/langgraph").StateDefinition>>;
 }
 export {};

package/lib/core/agent-graph.js

@@ -13,17 +13,20 @@ const readline_1 = __importDefault(require("readline"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
+const events_1 = require("events");
 const builtin_1 = require("../tools/builtin");
 const convertToLangChainTool_1 = require("../utils/convertToLangChainTool");
 exports.CONFIG_FILE = path_1.default.join(os_1.default.homedir(), ".saber2pr-agent.json");
-// --- 1. 定义状态 (State) ---
+// ✅ 全局设置：修复 AbortSignal 监听器数量警告
+// LangChain 的 HTTP 客户端会创建多个 AbortSignal，需要增加默认限制
+events_1.EventEmitter.defaultMaxListeners = 100;
+// --- 2. 定义状态 (State) ---
 const AgentState = langgraph_1.Annotation.Root({
     messages: (0, langgraph_1.Annotation)({
         reducer: (x, y) => x.concat(y),
         default: () => [],
     }),
     auditedFiles: (0, langgraph_1.Annotation)({
-        // 确保列表是累加且去重的
         reducer: (x, y) => Array.from(new Set([...x, ...y])),
         default: () => [],
     }),
@@ -35,17 +38,33 @@ const AgentState = langgraph_1.Annotation.Root({
         reducer: (x, y) => y !== null && y !== void 0 ? y : x,
         default: () => "chat",
     }),
+    // ✅ Token 累加器
+    tokenUsage: (0, langgraph_1.Annotation)({
+        reducer: (x, y) => ({
+            total: ((x === null || x === void 0 ? void 0 : x.total) || 0) + ((y === null || y === void 0 ? void 0 : y.total) || 0),
+        }),
+        default: () => ({ total: 0 }),
+    }),
+    // ✅ 耗时累加器
+    totalDuration: (0, langgraph_1.Annotation)({
+        reducer: (x, y) => (x || 0) + (y || 0),
+        default: () => 0,
+    }),
 });
 class McpGraphAgent {
     constructor(options = {}) {
         this.checkpointer = new langgraph_1.MemorySaver();
         this.langchainTools = [];
-        // ✅ 存储清理 loading 的函数
         this.stopLoadingFunc = null;
         this.options = options;
+        this.verbose = options.verbose || false;
+        this.alwaysSystem = options.alwaysSystem || true;
         this.targetDir = options.targetDir || process.cwd();
         process.setMaxListeners(100);
-        // ✅ 全局退出处理：清理动画并恢复光标
+        // ✅ 修复 AbortSignal 监听器数量警告
+        // LangChain 的 HTTP 客户端会创建多个 AbortSignal，需要增加默认限制
+        // 设置 EventEmitter 的默认 maxListeners，这会影响所有事件发射器（包括 AbortSignal）
+        events_1.EventEmitter.defaultMaxListeners = 100;
         const cleanup = () => {
             this.stopLoading();
             process.stdout.write('\u001B[?25h');
@@ -53,15 +72,14 @@ class McpGraphAgent {
         };
         process.on("SIGINT", cleanup);
         process.on("SIGTERM", cleanup);
+        // ✅ 初始化内置工具
         const builtinToolInfos = (0, builtin_1.createDefaultBuiltinTools)({ options });
         this.langchainTools = [...builtinToolInfos, ...(options.tools || [])].map((t) => (0, convertToLangChainTool_1.convertToLangChainTool)(t));
         this.toolNode = new prebuilt_1.ToolNode(this.langchainTools);
     }
-    // ✅ 1. 核心 Loading 动画效果
     showLoading(text) {
         const chars = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
         let i = 0;
-        // 隐藏光标
         process.stdout.write('\u001B[?25l');
         const timer = setInterval(() => {
             process.stdout.write(`\r\x1b[36m${chars[i]}\x1b[0m ${text}`);
@@ -69,8 +87,8 @@ class McpGraphAgent {
         }, 80);
         return () => {
             clearInterval(timer);
-            process.stdout.write('\r\x1b[K'); // 清行
-            process.stdout.write('\u001B[?25h'); // 恢复光标
+            process.stdout.write('\r\x1b[K');
+            process.stdout.write('\u001B[?25h');
         };
     }
     startLoading(text) {
@@ -111,7 +129,6 @@ class McpGraphAgent {
         if (!config.baseURL || !config.apiKey) {
             const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
             const question = (q) => new Promise((res) => rl.question(q, res));
-            console.log(`💡 首次运行请配置信息：`);
             config.baseURL = config.baseURL || await question(`? API Base URL: `);
             config.apiKey = config.apiKey || await question(`? API Key: `);
             config.model = config.model || await question(`? Model Name: `) || "gpt-4o";
@@ -126,11 +143,10 @@ class McpGraphAgent {
         const stream = await app.stream({
             messages: [new messages_1.HumanMessage(query)],
             mode: "auto",
-            targetCount: 4
-        }, { configurable: { thread_id: "auto_worker" }, recursionLimit: 100 });
+            targetCount: 4,
+        }, { configurable: { thread_id: "auto_worker" }, recursionLimit: 100, debug: this.verbose });
         for await (const output of stream)
             this.renderOutput(output);
-        console.log("\n✅ 审计任务已完成。");
     }
     async start() {
         await this.getModel();
@@ -142,7 +158,6 @@ class McpGraphAgent {
             process.stdout.write('\u001B[?25h');
             process.exit(0);
         });
-        console.log(`\n💬 已进入交互审计模式 (Thread: session)`);
         const ask = () => {
             rl.question("> ", async (input) => {
                 if (input.toLowerCase() === "exit") {
@@ -158,80 +173,173 @@ class McpGraphAgent {
         ask();
     }
     renderOutput(output) {
-        var _a, _b;
-        this.stopLoading(); // 收到输出的第一时间关掉 Loading
-        // 1. 处理 Agent 节点的输出
+        var _a, _b, _c;
+        this.stopLoading(); // 停止加载动画
         const agentNode = output.agent;
+        // ✅ 打印工具执行结果（tools 节点的输出）
+        const toolsNode = output.tools;
+        if (toolsNode && toolsNode.messages) {
+            const toolMessages = Array.isArray(toolsNode.messages) ? toolsNode.messages : [];
+            // 获取最近的 AI 消息以匹配 tool_call_id
+            const lastAiMsg = (_a = agentNode === null || agentNode === void 0 ? void 0 : agentNode.messages) === null || _a === void 0 ? void 0 : _a[agentNode.messages.length - 1];
+            const toolCallMap = new Map();
+            if (lastAiMsg === null || lastAiMsg === void 0 ? void 0 : lastAiMsg.tool_calls) {
+                lastAiMsg.tool_calls.forEach((tc) => {
+                    if (tc.id)
+                        toolCallMap.set(tc.id, tc.name);
+                });
+            }
+            toolMessages.forEach((msg) => {
+                // ToolMessage 有 tool_call_id 字段
+                const toolCallId = msg.tool_call_id || msg.id;
+                if (toolCallId) {
+                    const toolName = toolCallMap.get(toolCallId) || msg.name || 'unknown';
+                    const content = typeof msg.content === 'string'
+                        ? msg.content
+                        : JSON.stringify(msg.content);
+                    // 如果内容太长，截断显示
+                    const displayContent = content.length > 500
+                        ? content.substring(0, 500) + '...'
+                        : content;
+                    console.log(`✅ [工具结果] ${toolName}: ${displayContent}`);
+                }
+            });
+        }
         if (agentNode) {
-            const msg = agentNode.messages[0];
-            const reasoning = (_a = msg.additional_kwargs) === null || _a === void 0 ? void 0 : _a.reasoning;
+            const msg = agentNode.messages[agentNode.messages.length - 1];
+            // 1. 打印思考过程（如果有）
+            const reasoning = (_b = msg.additional_kwargs) === null || _b === void 0 ? void 0 : _b.reasoning;
             if (reasoning) {
-                console.log("\n🧠 [思考过程]:\n" + "─".repeat(50) + "\n" + reasoning + "\n" + "─".repeat(50));
+                console.log(`\n🧠 [思考]: ${reasoning}`);
+            }
+            // 2. 打印 AI 回复内容
+            if (msg.content) {
+                console.log(`🤖 [AI]: ${msg.content}`);
+            }
+            // ✅ 3. 实时打印当次统计信息
+            // 这里的 meta 数据是从 AgentGraphModel 的 _generate 中塞进去的
+            const meta = msg.response_metadata || {};
+            const token = meta.token || 0;
+            const duration = meta.duration || 0;
+            if (token > 0 || duration > 0) {
+                process.stdout.write(`📊 \x1b[2m[实时统计] 消耗: ${token} tokens | 耗时: ${duration}ms\x1b[0m\n`);
             }
-            if (msg.content)
-                console.log("🤖 [AI]:", msg.content);
-            if ((_b = msg.tool_calls) === null || _b === void 0 ? void 0 : _b.length) {
+            // 4. 打印工具调用情况
+            if ((_c = msg.tool_calls) === null || _c === void 0 ? void 0 : _c.length) {
                 msg.tool_calls.forEach((call) => {
                     console.log(`🛠️ [调用工具]: ${call.name} 📦 参数: ${JSON.stringify(call.args)}`);
                 });
             }
         }
-        // 2. 处理工具节点的简要反馈（防止大数据量锁死终端）
-        if (output.tools) {
-            console.log(`✅ [工具执行完毕]`);
-        }
     }
     async callModel(state) {
         const auditedListStr = state.auditedFiles.length > 0
             ? state.auditedFiles.map(f => `\n  - ${f}`).join("")
             : "暂无";
-        const prompt = prompts_1.ChatPromptTemplate.fromMessages([
-            ["system", `你是一个代码专家。工作目录：${this.targetDir}。
+        const recentToolCalls = this.getRecentToolCalls(state.messages);
+        const recentToolCallsStr = recentToolCalls.length > 0
+            ? `\n\n⚠️ 最近调用的工具（避免重复调用相同工具和参数）：\n${recentToolCalls.map(tc => `  - ${tc.name}(${JSON.stringify(tc.args)})`).join("\n")}`
+            : "";
+        // 1. 构建当前的系统提示词模板
+        const systemPromptTemplate = `你是一个代码专家。工作目录：${this.targetDir}。
 当前模式：{mode}
 进度：{doneCount}/{targetCount}
 已审计文件：{auditedList}
 
+# 格式要求
+1. Arguments 必须是纯粹的 JSON 对象，严禁将其作为字符串放入引号中。
+2. 严禁对 JSON 内容进行二次转义。
+
 # 指令
-1. 优先通过 directory_tree 了解结构。
-2. 发现问题后，先用 apply_fix 修复，再用 generate_review 提交。
-3. 严禁反复执行同一个失败的操作。
-{extraPrompt}`],
+1. 一旦完成对一个文件的修改（apply_fix），请立即调用 generate_review 总结该文件的变动。
+2. 避免陷入在同一个文件上的无限循环尝试。
+3. 不要重复调用相同的工具和参数，如果工具已经返回结果，请基于结果继续工作而不是再次调用。{recentToolCalls}
+{extraPrompt}`;
+        // 2. 核心逻辑：处理消息上下文
+        let inputMessages;
+        // ✅ 检查 options 中的 alwaysSystem 参数 (默认为 true 或根据你的需求设置)
+        // 如果不希望每次都携带（即只在首轮携带），则过滤掉历史消息里的 SystemMessage
+        if (this.options.alwaysSystem === false) {
+            inputMessages = state.messages.filter(msg => msg._getType() !== "system");
+        }
+        else {
+            // 默认模式：保持干净，由 PromptTemplate 重新生成最新的 System 状态
+            inputMessages = state.messages.filter(msg => msg._getType() !== "system");
+        }
+        const prompt = prompts_1.ChatPromptTemplate.fromMessages([
+            ["system", systemPromptTemplate],
             new prompts_1.MessagesPlaceholder("messages"),
         ]);
         this.startLoading("AI 正在分析并思考中");
         try {
             const chain = prompt.pipe(this.model);
             const response = await chain.invoke({
-                messages: state.messages,
+                messages: inputMessages, // ✅ 使用处理后的消息列表
                 mode: state.mode,
                 targetCount: state.targetCount,
                 doneCount: state.auditedFiles.length,
                 auditedList: auditedListStr,
+                recentToolCalls: recentToolCallsStr,
                 extraPrompt: this.options.extraSystemPrompt || "",
             });
             this.stopLoading();
-            return { messages: [response] };
+            const meta = response.response_metadata || {};
+            const currentToken = Number(meta.token) || 0;
+            const currentDuration = Number(meta.duration) || 0;
+            return {
+                messages: [response],
+                tokenUsage: { total: currentToken },
+                totalDuration: currentDuration
+            };
         }
         catch (error) {
             this.stopLoading();
             throw error;
         }
     }
+    getRecentToolCalls(messages, limit = 5) {
+        var _a;
+        const toolCalls = [];
+        // 从后往前遍历消息，收集最近的工具调用
+        for (let i = messages.length - 1; i >= 0 && toolCalls.length < limit; i--) {
+            const msg = messages[i];
+            if ((_a = msg.tool_calls) === null || _a === void 0 ? void 0 : _a.length) {
+                for (const tc of msg.tool_calls) {
+                    toolCalls.push({ name: tc.name, args: tc.args });
+                    if (toolCalls.length >= limit)
+                        break;
+                }
+            }
+        }
+        return toolCalls;
+    }
     async trackProgress(state) {
         var _a;
         const lastAiMsg = state.messages[state.messages.length - 1];
-        const currentAudited = [...state.auditedFiles];
+        const currentAudited = new Set(state.auditedFiles);
         if ((_a = lastAiMsg === null || lastAiMsg === void 0 ? void 0 : lastAiMsg.tool_calls) === null || _a === void 0 ? void 0 : _a.length) {
             for (const tc of lastAiMsg.tool_calls) {
-                // 兼容不同的参数命名习惯
-                const file = tc.args.path || tc.args.filePath || tc.args.file;
+                // 兼容所有可能的路径参数字段
+                const file = tc.args.path || tc.args.filePath || tc.args.file || tc.args.file_path;
                 if (file && typeof file === 'string') {
-                    currentAudited.push(file);
+                    currentAudited.add(file);
                 }
             }
         }
-        // 注意：这里的 reducer 会自动帮我们处理去重
-        return { auditedFiles: currentAudited };
+        return { auditedFiles: Array.from(currentAudited) };
+    }
+    printFinalSummary(state) {
+        var _a;
+        const totalTokens = ((_a = state.tokenUsage) === null || _a === void 0 ? void 0 : _a.total) || 0;
+        const totalMs = state.totalDuration || 0;
+        if (totalTokens > 0 || totalMs > 0) {
+            console.log("\n" + "═".repeat(50));
+            console.log(`🏁 \x1b[32;1m[审计任务全量结算]\x1b[0m`);
+            console.log(`   - 累计消耗总额: \x1b[33m${totalTokens}\x1b[0m Tokens`);
+            console.log(`   - 累计执行耗时: \x1b[36m${(totalMs / 1000).toFixed(2)}\x1b[0m s`);
+            console.log(`   - 审计文件总数: ${state.auditedFiles.length} 个`);
+            console.log("═".repeat(50) + "\n");
+        }
     }
     async createGraph() {
         const workflow = new langgraph_1.StateGraph(AgentState)
@@ -240,25 +348,29 @@ class McpGraphAgent {
             .addNode("progress", (state) => this.trackProgress(state))
             .addEdge(langgraph_1.START, "agent")
             .addConditionalEdges("agent", (state) => {
-            var _a;
-            const lastMsg = state.messages[state.messages.length - 1];
-            // 1. 有工具调用，必须去 tools
-            if ((_a = lastMsg.tool_calls) === null || _a === void 0 ? void 0 : _a.length)
+            const messages = state.messages;
+            const lastMsg = messages[messages.length - 1];
+            const content = lastMsg.content || "";
+            // 1. 如果 AI 想要调用工具，去 tools 节点
+            if (lastMsg.tool_calls && lastMsg.tool_calls.length > 0) {
                 return "tools";
-            // 2. 自动模式下，如果审计文件数未达标，继续循环
-            if (state.mode === "auto") {
-                if (state.auditedFiles.length < state.targetCount)
-                    return "agent";
             }
-            // 3. 默认结束（对话模式或任务已达标）
+            // 2. 判定结束的条件：
+            // - 模式是 auto 且审计完成
+            // - 或者 AI 明确输出了结束语
+            // - 或者 AI 输出了普通内容且没有工具调用（针对问答模式）
+            const isAutoFinished = state.mode === "auto" && state.auditedFiles.length >= state.targetCount;
+            const isFinalAnswer = content.includes("Final Answer");
+            // ✅ 修复核心：如果 AI 只是在聊天（没有工具调用），直接结束，不要跳回 agent
+            if (isAutoFinished || isFinalAnswer || state.mode === "chat") {
+                this.printFinalSummary(state);
+                return langgraph_1.END;
+            }
+            // 兜底：如果是在 auto 模式且还没干完活，才跳回 agent（通常不会走到这里）
             return langgraph_1.END;
-        }, {
-            tools: "tools",
-            agent: "agent",
-            [langgraph_1.END]: langgraph_1.END,
         })
             .addEdge("tools", "progress")
-            .addEdge("progress", "agent"); // 闭环回到 agent 进行下一轮决策
+            .addEdge("progress", "agent");
         return workflow.compile({ checkpointer: this.checkpointer });
     }
 }

package/lib/core/agent.js

@@ -46,6 +46,7 @@ const index_js_1 = require("@modelcontextprotocol/sdk/client/index.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/client/stdio.js");
 const config_1 = require("../config/config");
 const builtin_1 = require("../tools/builtin");
+const jsonSchemaToZod_1 = require("../utils/jsonSchemaToZod");
 class McpAgent {
     constructor(options) {
         this.modelName = "";
@@ -202,7 +203,7 @@ class McpAgent {
                     function: {
                         name: `${name}__${t.name}`,
                         description: t.description,
-                        parameters: t.inputSchema,
+                        parameters: (0, jsonSchemaToZod_1.jsonSchemaToZod)(t.inputSchema),
                     },
                     _originalName: t.name,
                     _client: client,

package/lib/model/AgentGraphModel.d.ts

@@ -4,18 +4,16 @@ import { ChatResult } from '@langchain/core/outputs';
 export interface AgentGraphLLMResponse {
     text: string;
     reasoning?: string;
-    chatId?: string;
+    token?: number;
+    duration?: number;
 }
 export declare abstract class AgentGraphModel extends BaseChatModel {
     protected boundTools?: any[];
-    protected chatId?: string;
-    constructor(fields?: BaseChatModelParams & {
-        chatId?: string;
-    });
+    constructor(fields?: BaseChatModelParams);
     bindTools(tools: any[]): any;
-    abstract callApi(prompt: string, chatId?: string): Promise<AgentGraphLLMResponse>;
+    abstract callApi(prompt: string): Promise<AgentGraphLLMResponse>;
     _generate(messages: BaseMessage[]): Promise<ChatResult>;
-    private serializeMessages;
     private parseToolCalls;
+    private serializeMessages;
     _llmType(): string;
 }

package/lib/model/AgentGraphModel.js

@@ -7,7 +7,6 @@ const function_calling_1 = require("@langchain/core/utils/function_calling");
 class AgentGraphModel extends chat_models_1.BaseChatModel {
     constructor(fields) {
         super(fields || {});
-        this.chatId = fields === null || fields === void 0 ? void 0 : fields.chatId;
     }
     bindTools(tools) {
         this.boundTools = tools.map(t => (0, function_calling_1.convertToOpenAITool)(t));
@@ -15,11 +14,9 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
     }
     async _generate(messages) {
         const fullPrompt = this.serializeMessages(messages);
-        const response = await this.callApi(fullPrompt, this.chatId);
-        if (response.chatId)
-            this.chatId = response.chatId;
-        let { text, reasoning } = response;
-        // ✅ 通用逻辑：解析 <think> 标签
+        const response = await this.callApi(fullPrompt);
+        let { text, reasoning, token, duration } = response;
+        // 1. 处理思考内容
         if (!reasoning && text.includes("<think>")) {
             const match = text.match(/<think>([\s\S]*?)<\/think>/);
             if (match) {
@@ -27,18 +24,69 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
                 text = text.replace(/<think>[\s\S]*?<\/think>/, "").trim();
             }
         }
+        // 2. 解析工具调用
         const toolCalls = this.parseToolCalls(text);
+        // AgentGraphModel.ts 的 _generate 方法内
         return {
             generations: [{
                     text,
                     message: new messages_1.AIMessage({
                         content: text,
                         tool_calls: toolCalls,
-                        additional_kwargs: { reasoning: reasoning || "" }
+                        additional_kwargs: {
+                            reasoning: reasoning || "",
+                            token: response.token, // 👈 必须
+                            duration: response.duration, // 👈 必须
+                        },
+                        response_metadata: {
+                            reasoning: reasoning || "",
+                            token: response.token, // 👈 McpGraphAgent 读取路径
+                            duration: response.duration,
+                        }
                     })
                 }]
         };
     }
+    parseToolCalls(text) {
+        const actionMatch = text.match(/Action:\s*(\w+)/);
+        const argsMatch = text.match(/Arguments:\s*({[\s\S]*?})(?=\n|$)/);
+        if (!actionMatch)
+            return [];
+        let args = {};
+        if (argsMatch) {
+            try {
+                let raw = argsMatch[1].trim();
+                // ✅ 关键修复：递归解析，直到它变成真正的对象
+                // 这能处理 "\"{\\\"path\\\":...}\"" 这种套娃字符串
+                let safetyDepth = 0;
+                while (typeof raw === 'string' && safetyDepth < 5) {
+                    try {
+                        const parsed = JSON.parse(raw);
+                        if (typeof parsed === 'object' && parsed !== null) {
+                            raw = parsed;
+                            break;
+                        }
+                        raw = parsed; // 如果解析后还是 string，继续剥
+                    }
+                    catch {
+                        break; // 解析不动了，跳出
+                    }
+                    safetyDepth++;
+                }
+                args = raw;
+            }
+            catch (e) {
+                args = {};
+            }
+        }
+        // ✅ 此时返回的 args 必须是 object 类型
+        return [{
+                name: actionMatch[1],
+                args: typeof args === 'object' ? args : {},
+                id: `call_${Date.now()}_${Math.random().toString(36).slice(2, 6)}`,
+                type: "tool_call",
+            }];
+    }
     serializeMessages(messages) {
         const systemMsg = messages.find(m => m._getType() === 'system');
         const lastMsg = messages[messages.length - 1];
@@ -58,39 +106,6 @@ ${format(lastMsg)}
 3. Arguments: {JSON}
 `.trim();
     }
-    parseToolCalls(text) {
-        const actionMatch = text.match(/Action:\s*(\w+)/);
-        const argsMatch = text.match(/Arguments:\s*({[\s\S]*})/);
-        if (!actionMatch)
-            return [];
-        let args = {};
-        if (argsMatch) {
-            try {
-                // 强力解析逻辑，处理物理换行
-                const rawArgs = argsMatch[1].trim().replace(/\n/g, "\\n");
-                args = JSON.parse(rawArgs);
-                // 参数映射
-                const anyArgs = args;
-                if (anyArgs.file_path && !anyArgs.path)
-                    anyArgs.path = anyArgs.file_path;
-                if (anyArgs.filePath && !anyArgs.path)
-                    anyArgs.path = anyArgs.filePath;
-                if (anyArgs.path && !anyArgs.filePath)
-                    anyArgs.filePath = anyArgs.path;
-                if (anyArgs.file && !anyArgs.filePath)
-                    anyArgs.filePath = anyArgs.file;
-            }
-            catch (e) {
-                console.warn("JSON Parse Error", e);
-            }
-        }
-        return [{
-                name: actionMatch[1],
-                args,
-                id: `call_${Date.now()}`,
-                type: "tool_call",
-            }];
-    }
     _llmType() { return "agent_graph_model"; }
 }
 exports.AgentGraphModel = AgentGraphModel;

package/lib/tools/filesystem/index.js

@@ -9,13 +9,12 @@ const minimatch_1 = require("minimatch");
 const path_1 = __importDefault(require("path"));
 const zod_1 = require("zod");
 const createTool_1 = require("../../utils/createTool");
-const jsonSchemaToZod_1 = require("../../utils/jsonSchemaToZod");
 const lib_1 = require("./lib");
 // Schema definitions
 const ReadTextFileArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
-    tail: zod_1.z.number().optional().describe('If provided, returns only the last N lines of the file'),
-    head: zod_1.z.number().optional().describe('If provided, returns only the first N lines of the file')
+    tail: zod_1.z.number().nullable().describe('If provided, returns only the last N lines of the file'),
+    head: zod_1.z.number().nullable().describe('If provided, returns only the first N lines of the file')
 });
 const ReadMultipleFilesArgsSchema = zod_1.z.object({
     paths: zod_1.z
@@ -34,7 +33,7 @@ const EditOperation = zod_1.z.object({
 const EditFileArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
     edits: zod_1.z.array(EditOperation),
-    dryRun: zod_1.z.boolean().default(false).describe('Preview changes using git-style diff format')
+    dryRun: zod_1.z.boolean().nullable().default(false).describe('Preview changes using git-style diff format')
 });
 const CreateDirectoryArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
@@ -44,11 +43,11 @@ const ListDirectoryArgsSchema = zod_1.z.object({
 });
 const ListDirectoryWithSizesArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
-    sortBy: zod_1.z.enum(['name', 'size']).optional().default('name').describe('Sort entries by name or size'),
+    sortBy: zod_1.z.enum(['name', 'size']).nullable().default('name').describe('Sort entries by name or size'),
 });
 const DirectoryTreeArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
-    excludePatterns: zod_1.z.array(zod_1.z.string()).optional().default([])
+    excludePatterns: zod_1.z.array(zod_1.z.string()).nullable().default([])
 });
 const MoveFileArgsSchema = zod_1.z.object({
     source: zod_1.z.string(),
@@ -57,7 +56,7 @@ const MoveFileArgsSchema = zod_1.z.object({
 const SearchFilesArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
     pattern: zod_1.z.string(),
-    excludePatterns: zod_1.z.array(zod_1.z.string()).optional().default([])
+    excludePatterns: zod_1.z.array(zod_1.z.string()).nullable().default([])
 });
 const GetFileInfoArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
@@ -90,8 +89,7 @@ const getFilesystemTools = (targetDir) => {
             "the contents of a single file. Use the 'head' parameter to read only " +
             "the first N lines of a file, or the 'tail' parameter to read only " +
             "the last N lines of a file. Operates on the file as text regardless of extension.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(ReadTextFileArgsSchema, 'ReadTextFileArgsSchema'),
-        validateParams: ["path"],
+        parameters: ReadTextFileArgsSchema,
         handler: readTextFileHandler
     });
     const readMultipleFilesTool = (0, createTool_1.createTool)({
@@ -101,8 +99,7 @@ const getFilesystemTools = (targetDir) => {
             "or compare multiple files. Each file's content is returned with its " +
             "path as a reference. Failed reads for individual files won't stop " +
             "the entire operation. Only works within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(ReadMultipleFilesArgsSchema, 'ReadMultipleFilesArgsSchema'),
-        validateParams: ["paths"],
+        parameters: ReadMultipleFilesArgsSchema,
         handler: async (args) => {
             const results = await Promise.all(args.paths.map(async (filePath) => {
                 try {
@@ -124,8 +121,7 @@ const getFilesystemTools = (targetDir) => {
         description: "Create a new file or completely overwrite an existing file with new content. " +
             "Use with caution as it will overwrite existing files without warning. " +
             "Handles text content with proper encoding. Only works within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(WriteFileArgsSchema, 'WriteFileArgsSchema'),
-        validateParams: ["path", "content"],
+        parameters: WriteFileArgsSchema,
         handler: async (args) => {
             const validPath = await (0, lib_1.validatePath)(targetDir, args.path);
             await (0, lib_1.writeFileContent)(validPath, args.content);
@@ -138,8 +134,7 @@ const getFilesystemTools = (targetDir) => {
         description: "Make line-based edits to a text file. Each edit replaces exact line sequences " +
             "with new content. Returns a git-style diff showing the changes made. " +
             "Only works within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(EditFileArgsSchema, 'EditFileArgsSchema'),
-        validateParams: ["path", "edits"],
+        parameters: EditFileArgsSchema,
         handler: async (args) => {
             const validPath = await (0, lib_1.validatePath)(targetDir, args.path);
             const result = await (0, lib_1.applyFileEdits)(validPath, args.edits, args.dryRun);
@@ -152,8 +147,7 @@ const getFilesystemTools = (targetDir) => {
             "nested directories in one operation. If the directory already exists, " +
             "this operation will succeed silently. Perfect for setting up directory " +
             "structures for projects or ensuring required paths exist. Only works within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(CreateDirectoryArgsSchema, 'CreateDirectoryArgsSchema'),
-        validateParams: ["path"],
+        parameters: CreateDirectoryArgsSchema,
         handler: async (args) => {
             const validPath = await (0, lib_1.validatePath)(targetDir, args.path);
             await promises_1.default.mkdir(validPath, { recursive: true });
@@ -167,8 +161,7 @@ const getFilesystemTools = (targetDir) => {
             "Results clearly distinguish between files and directories with [FILE] and [DIR] " +
             "prefixes. This tool is essential for understanding directory structure and " +
             "finding specific files within a directory. Only works within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(ListDirectoryArgsSchema, 'ListDirectoryArgsSchema'),
-        validateParams: ["path"],
+        parameters: ListDirectoryArgsSchema,
         handler: async (args) => {
             const validPath = await (0, lib_1.validatePath)(targetDir, args.path);
             const entries = await promises_1.default.readdir(validPath, { withFileTypes: true });
@@ -184,8 +177,7 @@ const getFilesystemTools = (targetDir) => {
             "Results clearly distinguish between files and directories with [FILE] and [DIR] " +
             "prefixes. This tool is useful for understanding directory structure and " +
             "finding specific files within a directory. Only works within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(ListDirectoryWithSizesArgsSchema, 'ListDirectoryWithSizesArgsSchema'),
-        validateParams: ["path"],
+        parameters: ListDirectoryWithSizesArgsSchema,
         handler: async (args) => {
             const validPath = await (0, lib_1.validatePath)(targetDir, args.path);
             const entries = await promises_1.default.readdir(validPath, { withFileTypes: true });
@@ -239,8 +231,7 @@ const getFilesystemTools = (targetDir) => {
             "Each entry includes 'name', 'type' (file/directory), and 'children' for directories. " +
             "Files have no children array, while directories always have a children array (which may be empty). " +
             "The output is formatted with 2-space indentation for readability. Only works within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(DirectoryTreeArgsSchema, 'DirectoryTreeArgsSchema'),
-        validateParams: ["path"],
+        parameters: DirectoryTreeArgsSchema,
         handler: async (args) => {
             const rootPath = args.path;
             async function buildTree(currentPath, excludePatterns = []) {
@@ -284,8 +275,7 @@ const getFilesystemTools = (targetDir) => {
             "and rename them in a single operation. If the destination exists, the " +
             "operation will fail. Works across different directories and can be used " +
             "for simple renaming within the same directory. Both source and destination must be within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(MoveFileArgsSchema, 'MoveFileArgsSchema'),
-        validateParams: ["source", "destination"],
+        parameters: MoveFileArgsSchema,
         handler: async (args) => {
             const validSourcePath = await (0, lib_1.validatePath)(targetDir, args.source);
             const validDestPath = await (0, lib_1.validatePath)(targetDir, args.destination);
@@ -298,8 +288,7 @@ const getFilesystemTools = (targetDir) => {
         name: "search_files",
         description: "Search for files matching a specific pattern in a specified path. " +
             "Returns a list of files that match the pattern. Only works within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(SearchFilesArgsSchema, 'SearchFilesArgsSchema'),
-        validateParams: ["path", "pattern"],
+        parameters: SearchFilesArgsSchema,
         handler: async (args) => {
             const validPath = await (0, lib_1.validatePath)(targetDir, args.path);
             const results = await (0, lib_1.searchFilesWithValidation)(targetDir, validPath, args.pattern, [], { excludePatterns: args.excludePatterns });
@@ -311,8 +300,7 @@ const getFilesystemTools = (targetDir) => {
         name: "get_file_info",
         description: "Get detailed information about a file, including its size, last modified time, and type. " +
             "Only works within allowed directories.",
-        parameters: (0, jsonSchemaToZod_1.zodObjectToJsonSchema)(GetFileInfoArgsSchema, 'GetFileInfoArgsSchema'),
-        validateParams: ["path"],
+        parameters: GetFileInfoArgsSchema,
         handler: async (args) => {
             const validPath = await (0, lib_1.validatePath)(targetDir, args.path);
             const info = await (0, lib_1.getFileStats)(validPath);

package/lib/tools/ts-lsp/index.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTsLspTools = void 0;
 const ts_context_mcp_1 = require("@saber2pr/ts-context-mcp");
 const createTool_1 = require("../../utils/createTool");
+const zod_1 = require("zod");
 const getTsLspTools = (targetDir) => {
     const engine = new ts_context_mcp_1.PromptEngine(targetDir);
     return [
         (0, createTool_1.createTool)({
             name: "get_repo_map",
             description: "获取项目全局文件结构及导出清单，用于快速定位代码",
-            parameters: { type: "object", properties: {} },
+            parameters: zod_1.z.object({}),
             handler: async () => {
                 engine.refresh();
                 return engine.getRepoMap();
@@ -18,15 +19,13 @@ const getTsLspTools = (targetDir) => {
         (0, createTool_1.createTool)({
             name: "analyze_deps",
             description: "分析指定文件的依赖关系，支持 tsconfig 路径别名解析",
-            parameters: { type: "object", properties: { filePath: { type: "string", description: "文件相对路径" } } },
-            validateParams: ["filePath"],
+            parameters: zod_1.z.object({ filePath: zod_1.z.string().describe("文件相对路径") }),
             handler: async ({ filePath }) => engine.getDeps(filePath),
         }),
         (0, createTool_1.createTool)({
             name: "read_skeleton",
             description: "提取文件的结构定义（接口、类、方法签名），忽略具体实现以节省 Token",
-            parameters: { type: "object", properties: { filePath: { type: "string", description: "文件相对路径" } } },
-            validateParams: ["filePath"],
+            parameters: zod_1.z.object({ filePath: zod_1.z.string().describe("文件相对路径") }),
             handler: async (args) => {
                 const pathArg = args === null || args === void 0 ? void 0 : args.filePath;
                 if (typeof pathArg !== "string" || pathArg.trim() === "") {
@@ -45,8 +44,7 @@ const getTsLspTools = (targetDir) => {
         (0, createTool_1.createTool)({
             name: "get_method_body",
             description: "获取指定文件内某个方法或函数的完整实现代码",
-            parameters: { type: "object", properties: { filePath: { type: "string", description: "文件相对路径" }, methodName: { type: "string", description: "方法名或函数名" } } },
-            validateParams: ["filePath", 'methodName'],
+            parameters: zod_1.z.object({ filePath: zod_1.z.string().describe("文件相对路径"), methodName: zod_1.z.string().describe("方法名或函数名") }),
             handler: async ({ filePath, methodName }) => {
                 return engine.getMethodImplementation(filePath, methodName);
             },

package/lib/types/type.d.ts

@@ -1,4 +1,5 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index';
+import { z } from 'zod';
 export interface ApiConfig {
     baseURL: string;
     apiKey: string;
@@ -9,7 +10,7 @@ export interface ToolInfo {
     function: {
         name: string;
         description?: string;
-        parameters: any;
+        parameters: z.ZodObject<any>;
     };
     _handler?: (args: any) => Promise<any>;
     _client?: Client;
@@ -58,4 +59,8 @@ export interface AgentOptions {
      * only for graph agent
      */
     modelName?: string;
+    /**
+     * only for graph agent
+     */
+    alwaysSystem?: boolean;
 }

package/lib/utils/convertToLangChainTool.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToLangChainTool = convertToLangChainTool;
 const tools_1 = require("@langchain/core/tools");
-const jsonSchemaToZod_1 = require("./jsonSchemaToZod");
 function convertToLangChainTool(info) {
     return new tools_1.DynamicStructuredTool({
         name: info.function.name,
         description: info.function.description || "",
-        schema: (0, jsonSchemaToZod_1.jsonSchemaToZod)(info.function.parameters),
+        schema: info.function.parameters,
         func: async (args) => {
             if (info._handler)
                 return await info._handler(args);

package/lib/utils/createTool.d.ts

@@ -1,9 +1,12 @@
 import { ToolInfo } from '../types/type';
+import { z } from 'zod';
 export interface CreateToolOptions {
     name: string;
     description: string;
-    parameters: any;
+    /**
+     * zod@3.23.8
+     */
+    parameters: z.ZodObject<any>;
     handler: (args: any) => Promise<string>;
-    validateParams?: string[];
 }
 export declare function createTool(options: CreateToolOptions): ToolInfo;

package/lib/utils/createTool.js

@@ -10,7 +10,6 @@ function createTool(options) {
             parameters: options.parameters,
         },
         _handler: async (input) => {
-            var _a;
             // 兼容处理：如果 input 是字符串，尝试解析为 JSON 对象
             let args = input;
             if (typeof input === 'string') {
@@ -21,15 +20,6 @@ function createTool(options) {
                     args = input;
                 }
             }
-            if (((_a = options.validateParams) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                for (const arg in args) {
-                    if (options.validateParams.includes(arg)) {
-                        if (typeof args[arg] === 'undefined') {
-                            return `Error: 参数 '${arg}' 缺失`;
-                        }
-                    }
-                }
-            }
             return options.handler(args);
         },
     };

package/lib/utils/jsonSchemaToZod.d.ts

@@ -1,12 +1,2 @@
 import { z } from 'zod';
-export declare const zodObjectToJsonSchema: (zodObject: z.ZodObject<any>, name: string) => z.ZodObject<any, z.UnknownKeysParam, z.ZodTypeAny, {
-    [x: string]: any;
-}, {
-    [x: string]: any;
-}> | {
-    title?: string;
-    default?: any;
-    description?: string;
-    markdownDescription?: string;
-};
 export declare function jsonSchemaToZod(parameters: any): z.ZodObject<any>;

package/lib/utils/jsonSchemaToZod.js

@@ -1,14 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zodObjectToJsonSchema = void 0;
 exports.jsonSchemaToZod = jsonSchemaToZod;
 const zod_1 = require("zod");
-const zod_to_json_schema_1 = require("zod-to-json-schema");
-const zodObjectToJsonSchema = (zodObject, name) => {
-    var _a, _b;
-    return ((_b = (_a = (0, zod_to_json_schema_1.zodToJsonSchema)(zodObject, name)) === null || _a === void 0 ? void 0 : _a.definitions) === null || _b === void 0 ? void 0 : _b[name]) || zodObject;
-};
-exports.zodObjectToJsonSchema = zodObjectToJsonSchema;
 function jsonSchemaToZod(parameters) {
     var _a;
     if (!parameters || typeof parameters !== 'object') {
@@ -57,8 +50,8 @@ function jsonSchemaToZod(parameters) {
         let schema = convertProp(prop);
         // 处理必填项
         const isRequired = (_a = parameters.required) === null || _a === void 0 ? void 0 : _a.includes(key);
-        obj[key] = isRequired ? schema : schema.optional();
+        obj[key] = isRequired ? schema : schema.nullable();
     }
     // 使用 passthrough 或 loose 以增加容错性
-    return zod_1.z.object(obj).passthrough();
+    return zod_1.z.object(obj);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saber2pr/ai-agent",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "description": "AI Assistant CLI.",
   "author": "saber2pr",
   "license": "ISC",
@@ -34,8 +34,7 @@
     "langchain": "0.3.15",
     "minimatch": "^10.0.1",
     "openai": "^6.16.0",
-    "zod": "3.23.8",
-    "zod-to-json-schema": "3.23.2"
+    "zod": "3.23.8"
   },
   "resolutions": {
     "@langchain/core": "0.3.39"