@saber2pr/ai-agent 0.0.21 → 0.0.23

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

@@ -14,10 +14,13 @@ export default class McpGraphAgent {
     private options;
     private checkpointer;
     private langchainTools;
-    private spinner;
+    private stopLoadingFunc;
     constructor(options?: AgentOptions);
-    private askForConfig;
+    private showLoading;
+    private startLoading;
+    private stopLoading;
     private getModel;
+    private askForConfig;
     chat(query?: string): Promise<void>;
     start(): Promise<void>;
     private renderOutput;

package/lib/core/agent-graph.js

@@ -13,7 +13,6 @@ 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 ora_1 = __importDefault(require("ora")); // 用于显示 Loading 动画
 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");
@@ -40,15 +39,66 @@ class McpGraphAgent {
     constructor(options = {}) {
         this.checkpointer = new langgraph_1.MemorySaver();
         this.langchainTools = [];
-        this.spinner = (0, ora_1.default)({ color: "cyan" });
+        // ✅ 用于存储清理 loading 的函数
+        this.stopLoadingFunc = null;
         this.options = options;
         this.targetDir = options.targetDir || process.cwd();
-        process.setMaxListeners(50); // 防止 AbortSignal 监听器过多的警告
+        process.setMaxListeners(100);
+        // ✅ 退出清理
+        const cleanup = () => {
+            this.stopLoading();
+            process.stdout.write('\u001B[?25h'); // 显示光标
+            process.exit(0);
+        };
+        process.on("SIGINT", cleanup);
+        process.on("SIGTERM", cleanup);
         const builtinToolInfos = (0, builtin_1.createDefaultBuiltinTools)({ options });
-        const externalToolInfos = options.tools || [];
-        this.langchainTools = [...builtinToolInfos, ...externalToolInfos].map((t) => (0, convertToLangChainTool_1.convertToLangChainTool)(t));
+        this.langchainTools = [...builtinToolInfos, ...(options.tools || [])].map((t) => (0, convertToLangChainTool_1.convertToLangChainTool)(t));
         this.toolNode = new prebuilt_1.ToolNode(this.langchainTools);
     }
+    // ✅ 1. 复现你提供的 showLoading 效果
+    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}`);
+            i = (i + 1) % chars.length;
+        }, 80);
+        return () => {
+            clearInterval(timer);
+            process.stdout.write('\r\x1b[K'); // 清除这一行
+            process.stdout.write('\u001B[?25h'); // 恢复光标
+        };
+    }
+    // ✅ 2. 封装内部调用方法
+    startLoading(text) {
+        this.stopLoading();
+        this.stopLoadingFunc = this.showLoading(text);
+    }
+    stopLoading() {
+        if (this.stopLoadingFunc) {
+            this.stopLoadingFunc();
+            this.stopLoadingFunc = null;
+        }
+    }
+    async getModel() {
+        if (this.model)
+            return this.model;
+        let modelInstance = this.options.apiModel;
+        if (!modelInstance) {
+            const config = await this.askForConfig();
+            modelInstance = new openai_1.ChatOpenAI({
+                openAIApiKey: config.apiKey,
+                configuration: { baseURL: config.baseURL },
+                modelName: config.model,
+                temperature: 0,
+            });
+        }
+        this.model = modelInstance.bindTools(this.langchainTools);
+        return this.model;
+    }
     async askForConfig() {
         let config = {};
         if (fs_1.default.existsSync(exports.CONFIG_FILE)) {
@@ -60,7 +110,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";
@@ -69,22 +118,6 @@ class McpGraphAgent {
         }
         return config;
     }
-    async getModel() {
-        if (this.model)
-            return this.model;
-        let modelInstance = this.options.apiModel;
-        if (!modelInstance) {
-            const config = await this.askForConfig();
-            modelInstance = new openai_1.ChatOpenAI({
-                openAIApiKey: config.apiKey,
-                configuration: { baseURL: config.baseURL },
-                modelName: config.model,
-                temperature: 0,
-            });
-        }
-        this.model = modelInstance.bindTools(this.langchainTools);
-        return this.model;
-    }
     async chat(query = "开始代码审计") {
         await this.getModel();
         const app = await this.createGraph();
@@ -95,21 +128,24 @@ class McpGraphAgent {
         }, { configurable: { thread_id: "auto_worker" }, recursionLimit: 100 });
         for await (const output of stream)
             this.renderOutput(output);
-        console.log("✅ 任务执行完毕。");
     }
     async start() {
         await this.getModel();
         const app = await this.createGraph();
         const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
-        const threadId = `session_${Date.now()}`;
-        console.log(`\n💬 已进入交互审计模式 (Thread: ${threadId})`);
+        rl.on("SIGINT", () => {
+            this.stopLoading();
+            rl.close();
+            process.stdout.write('\u001B[?25h');
+            process.exit(0);
+        });
         const ask = () => {
             rl.question("> ", async (input) => {
                 if (input.toLowerCase() === "exit") {
                     rl.close();
                     return;
                 }
-                const stream = await app.stream({ messages: [new messages_1.HumanMessage(input)], mode: "chat" }, { configurable: { thread_id: threadId }, recursionLimit: 50 });
+                const stream = await app.stream({ messages: [new messages_1.HumanMessage(input)], mode: "chat" }, { configurable: { thread_id: "session" }, recursionLimit: 50 });
                 for await (const output of stream)
                     this.renderOutput(output);
                 ask();
@@ -119,21 +155,16 @@ class McpGraphAgent {
     }
     renderOutput(output) {
         var _a, _b;
-        // 每次渲染输出前，确保停止 Spinner
-        if (this.spinner.isSpinning)
-            this.spinner.stop();
+        this.stopLoading(); // 收到任何输出前，先关掉转圈圈
         const agentNode = output.agent;
         if (agentNode) {
             const msg = agentNode.messages[0];
-            // 1. 打印思考过程
             const reasoning = (_a = msg.additional_kwargs) === null || _a === void 0 ? void 0 : _a.reasoning;
             if (reasoning) {
-                console.log("\n🧠 [思考过程]:\n" + "─".repeat(50) + "\n" + reasoning + "\n" + "─".repeat(50) + "\n");
+                console.log("\n🧠 [思考过程]:\n" + "─".repeat(50) + "\n" + reasoning + "\n" + "─".repeat(50));
             }
-            // 2. 打印正式回答
             if (msg.content)
                 console.log("🤖 [AI]:", msg.content);
-            // 3. 打印工具调用
             if ((_b = msg.tool_calls) === null || _b === void 0 ? void 0 : _b.length) {
                 msg.tool_calls.forEach((call) => {
                     console.log(`🛠️ [调用工具]: ${call.name} 📦 参数: ${JSON.stringify(call.args)}`);
@@ -141,39 +172,17 @@ class McpGraphAgent {
             }
         }
     }
-    // --- 节点逻辑 ---
     async callModel(state) {
-        // 处理变量序列化，防止 [object Object]
-        const auditedListStr = state.auditedFiles.length > 0
-            ? state.auditedFiles.map(f => `\n  - ${f}`).join("")
-            : "暂无";
-        const extraPromptStr = typeof this.options.extraSystemPrompt === 'object'
-            ? JSON.stringify(this.options.extraSystemPrompt, null, 2)
-            : (this.options.extraSystemPrompt || "");
-        // 使用变量占位符 {extraPrompt} 避免内容中的 {} 引发模板解析错误
         const prompt = prompts_1.ChatPromptTemplate.fromMessages([
             ["system", `你是一个代码专家。工作目录：${this.targetDir}。
+当前模式：{mode}。进度：{doneCount}/{targetCount}。
+已审计文件：{auditedList}
 
-# 当前进度状态
-- 审计模式: {mode}
-- 目标任务数: {targetCount}
-- 已完成数量: {doneCount}
-- 已审计文件列表: {auditedList}
-
-# 核心任务准则
-1. 目标导向：如果 {doneCount} >= {targetCount}，说明任务已达标。请直接输出总结，不要再调用任何工具。
-2. 避免死循环：不要反复尝试审计同一个文件或调用同样的工具。如果你发现某个文件修复失败，请尝试审计其他文件。
-3. 严格格式：
-    - 必须先在 <think> 标签内进行推理。
-    - 工具调用必须严格按照 Action: 名称 和 Arguments: {{JSON}} 的格式。
-    - 【重要】Arguments 中的 JSON 字符串，所有的换行符必须转义为 \\n，严禁出现物理换行符。
-
-# 附加指令
 {extraPrompt}`],
             new prompts_1.MessagesPlaceholder("messages"),
         ]);
-        // ✅ 显示 Loading
-        this.spinner.start("AI 正在思考并分析代码...");
+        // ✅ 调用 AI 前开启转圈圈
+        this.startLoading("AI 正在分析并思考中...");
         try {
             const chain = prompt.pipe(this.model);
             const response = await chain.invoke({
@@ -181,34 +190,28 @@ class McpGraphAgent {
                 mode: state.mode,
                 targetCount: state.targetCount,
                 doneCount: state.auditedFiles.length,
-                auditedList: auditedListStr,
-                extraPrompt: extraPromptStr, // 变量方式传入更安全
+                auditedList: state.auditedFiles.join(", "),
+                extraPrompt: this.options.extraSystemPrompt || "",
             });
-            this.spinner.stop(); // 得到响应即停止
+            this.stopLoading();
             return { messages: [response] };
         }
         catch (error) {
-            this.spinner.fail("AI 响应异常");
+            this.stopLoading();
             throw error;
         }
     }
-    // agent-graph.ts 中的 trackProgress 节点
     async trackProgress(state) {
         var _a;
-        // 获取最后一条 AI 消息（即发起工具调用的那条）
         const lastAiMsg = state.messages[state.messages.length - 1];
         const newFiles = [];
         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) {
-                // 这里的逻辑要宽容：只要 AI 尝试处理了这些文件，就计入进度
                 const file = tc.args.path || tc.args.filePath || tc.args.file;
-                if (file && typeof file === 'string') {
+                if (file && typeof file === 'string')
                     newFiles.push(file);
-                }
             }
         }
-        // 如果这一轮没有任何新文件被处理，且 AI 也没给最终回复，
-        // 我们需要防止它在下一轮条件判断中陷入死循环
         return { auditedFiles: newFiles };
     }
     async createGraph() {
@@ -220,22 +223,11 @@ class McpGraphAgent {
             .addConditionalEdges("agent", (state) => {
             var _a;
             const lastMsg = state.messages[state.messages.length - 1];
-            // 1. 如果 AI 想要调用工具，去 tools 节点
             if ((_a = lastMsg.tool_calls) === null || _a === void 0 ? void 0 : _a.length)
                 return "tools";
-            // 2. 如果是自动模式且未达标
-            if (state.mode === "auto") {
-                const isDone = state.auditedFiles.length >= state.targetCount;
-                // 如果还没达标，继续让 agent 思考下一步
-                if (!isDone)
-                    return "agent";
-            }
-            // 3. 其他情况（达标了，或者对话模式 AI 给出了回复）一律结束
+            if (state.mode === "auto" && state.auditedFiles.length < state.targetCount)
+                return "agent";
             return langgraph_1.END;
-        }, {
-            tools: "tools",
-            agent: "agent",
-            [langgraph_1.END]: langgraph_1.END,
         })
             .addEdge("tools", "progress")
             .addEdge("progress", "agent");

package/lib/utils/convertToLangChainTool.d.ts

@@ -1,3 +1,7 @@
 import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-export declare function convertToLangChainTool(info: any): DynamicStructuredTool<z.ZodRecord<z.ZodString, z.ZodAny>>;
+import { ToolInfo } from "../types/type";
+export declare function convertToLangChainTool(info: ToolInfo): DynamicStructuredTool<import("zod").ZodObject<any, import("zod").UnknownKeysParam, import("zod").ZodTypeAny, {
+    [x: string]: any;
+}, {
+    [x: string]: any;
+}>>;

package/lib/utils/convertToLangChainTool.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saber2pr/ai-agent",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "AI Assistant CLI.",
   "author": "saber2pr",
   "license": "ISC",
@@ -34,7 +34,6 @@
     "langchain": "0.3.15",
     "minimatch": "^10.0.1",
     "openai": "^6.16.0",
-    "ora": "^9.3.0",
     "zod": "3.23.8",
     "zod-to-json-schema": "3.23.2"
   },