@saber2pr/ai-agent 0.0.23 → 0.0.24

package/lib/core/agent-graph.js

@@ -23,6 +23,7 @@ const AgentState = langgraph_1.Annotation.Root({
         default: () => [],
     }),
     auditedFiles: (0, langgraph_1.Annotation)({
+        // 确保列表是累加且去重的
         reducer: (x, y) => Array.from(new Set([...x, ...y])),
         default: () => [],
     }),
@@ -39,15 +40,15 @@ class McpGraphAgent {
     constructor(options = {}) {
         this.checkpointer = new langgraph_1.MemorySaver();
         this.langchainTools = [];
-        // ✅ 用于存储清理 loading 的函数
+        // ✅ 存储清理 loading 的函数
         this.stopLoadingFunc = null;
         this.options = options;
         this.targetDir = options.targetDir || process.cwd();
         process.setMaxListeners(100);
-        // ✅ 退出清理
+        // ✅ 全局退出处理：清理动画并恢复光标
         const cleanup = () => {
             this.stopLoading();
-            process.stdout.write('\u001B[?25h'); // 显示光标
+            process.stdout.write('\u001B[?25h');
             process.exit(0);
         };
         process.on("SIGINT", cleanup);
@@ -56,11 +57,11 @@ class McpGraphAgent {
         this.langchainTools = [...builtinToolInfos, ...(options.tools || [])].map((t) => (0, convertToLangChainTool_1.convertToLangChainTool)(t));
         this.toolNode = new prebuilt_1.ToolNode(this.langchainTools);
     }
-    // ✅ 1. 复现你提供的 showLoading 效果
+    // ✅ 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}`);
@@ -68,11 +69,10 @@ class McpGraphAgent {
         }, 80);
         return () => {
             clearInterval(timer);
-            process.stdout.write('\r\x1b[K'); // 清除这一行
+            process.stdout.write('\r\x1b[K'); // 清行
             process.stdout.write('\u001B[?25h'); // 恢复光标
         };
     }
-    // ✅ 2. 封装内部调用方法
     startLoading(text) {
         this.stopLoading();
         this.stopLoadingFunc = this.showLoading(text);
@@ -96,6 +96,7 @@ class McpGraphAgent {
                 temperature: 0,
             });
         }
+        // 绑定工具，使模型具备调用能力
         this.model = modelInstance.bindTools(this.langchainTools);
         return this.model;
     }
@@ -110,6 +111,7 @@ 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";
@@ -128,6 +130,7 @@ class McpGraphAgent {
         }, { configurable: { thread_id: "auto_worker" }, recursionLimit: 100 });
         for await (const output of stream)
             this.renderOutput(output);
+        console.log("\n✅ 审计任务已完成。");
     }
     async start() {
         await this.getModel();
@@ -139,6 +142,7 @@ 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") {
@@ -155,7 +159,8 @@ class McpGraphAgent {
     }
     renderOutput(output) {
         var _a, _b;
-        this.stopLoading(); // 收到任何输出前，先关掉转圈圈
+        this.stopLoading(); // 收到输出的第一时间关掉 Loading
+        // 1. 处理 Agent 节点的输出
         const agentNode = output.agent;
         if (agentNode) {
             const msg = agentNode.messages[0];
@@ -171,18 +176,29 @@ class McpGraphAgent {
                 });
             }
         }
+        // 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}。
-当前模式：{mode}。进度：{doneCount}/{targetCount}。
+当前模式：{mode}
+进度：{doneCount}/{targetCount}
 已审计文件：{auditedList}
 
+# 指令
+1. 优先通过 directory_tree 了解结构。
+2. 发现问题后，先用 apply_fix 修复，再用 generate_review 提交。
+3. 严禁反复执行同一个失败的操作。
 {extraPrompt}`],
             new prompts_1.MessagesPlaceholder("messages"),
         ]);
-        // ✅ 调用 AI 前开启转圈圈
-        this.startLoading("AI 正在分析并思考中...");
+        this.startLoading("AI 正在分析并思考中");
         try {
             const chain = prompt.pipe(this.model);
             const response = await chain.invoke({
@@ -190,7 +206,7 @@ class McpGraphAgent {
                 mode: state.mode,
                 targetCount: state.targetCount,
                 doneCount: state.auditedFiles.length,
-                auditedList: state.auditedFiles.join(", "),
+                auditedList: auditedListStr,
                 extraPrompt: this.options.extraSystemPrompt || "",
             });
             this.stopLoading();
@@ -204,15 +220,18 @@ class McpGraphAgent {
     async trackProgress(state) {
         var _a;
         const lastAiMsg = state.messages[state.messages.length - 1];
-        const newFiles = [];
+        const currentAudited = [...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;
-                if (file && typeof file === 'string')
-                    newFiles.push(file);
+                if (file && typeof file === 'string') {
+                    currentAudited.push(file);
+                }
             }
         }
-        return { auditedFiles: newFiles };
+        // 注意：这里的 reducer 会自动帮我们处理去重
+        return { auditedFiles: currentAudited };
     }
     async createGraph() {
         const workflow = new langgraph_1.StateGraph(AgentState)
@@ -223,14 +242,23 @@ class McpGraphAgent {
             .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)
                 return "tools";
-            if (state.mode === "auto" && state.auditedFiles.length < state.targetCount)
-                return "agent";
+            // 2. 自动模式下，如果审计文件数未达标，继续循环
+            if (state.mode === "auto") {
+                if (state.auditedFiles.length < state.targetCount)
+                    return "agent";
+            }
+            // 3. 默认结束（对话模式或任务已达标）
             return langgraph_1.END;
+        }, {
+            tools: "tools",
+            agent: "agent",
+            [langgraph_1.END]: langgraph_1.END,
         })
             .addEdge("tools", "progress")
-            .addEdge("progress", "agent");
+            .addEdge("progress", "agent"); // 闭环回到 agent 进行下一轮决策
         return workflow.compile({ checkpointer: this.checkpointer });
     }
 }

package/package.json

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