@saber2pr/ai-agent 0.0.9 → 0.0.11

package/README.md

@@ -19,6 +19,14 @@ A high-performance AI Agent toolkit designed for automated code auditing, reposi
 ## 🛠️ Installation
 
 ```bash
+sudo npm i -g @saber2pr/ai-agent
+
+# call openapi
+sagent
+
+# call third api
+sagent-chain
+
 # Clone the repository
 git clone https://github.com/saber2pr/ai-agent.git
 cd ai-agent
@@ -103,7 +111,7 @@ class MyPrivateLLM extends BaseChatModel {
 | ----------------- | ------------------------------------------------------------------------ |
 | `generate_review` | Finalizes the process by submitting a structured violation report.       |
 | `get_repo_map`    | Generates a high-level map of the project files and exports.             |
-| `read_full_code`  | Reads file content with line numbers for precise auditing.               |
+| `read_text_file`  | Reads file content with line numbers for precise auditing.               |
 | `read_skeleton`   | Extracts class/function signatures without full logic (Token efficient). |
 
 ---

package/lib/cli-chain.js

@@ -4,6 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const agent_chain_1 = __importDefault(require("./agent-chain"));
-const manager = new agent_chain_1.default();
-manager.start();
+const agent_chain_1 = __importDefault(require("./core/agent-chain"));
+const agent = new agent_chain_1.default();
+agent.start();

package/lib/cli.js

@@ -4,6 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const agent_1 = __importDefault(require("./agent"));
-const manager = new agent_1.default();
-manager.start();
+const agent_1 = __importDefault(require("./core/agent"));
+const agent = new agent_1.default();
+agent.start();

package/lib/config/config.d.ts

@@ -0,0 +1 @@
+export declare const CONFIG_FILE: string;

package/lib/config/config.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CONFIG_FILE = void 0;
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+exports.CONFIG_FILE = path_1.default.join(os_1.default.homedir(), ".saber2pr-agent.json");

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

@@ -0,0 +1,27 @@
+import { AgentOptions } from '../types/type';
+export default class McpChainAgent {
+    private allTools;
+    private messages;
+    private encoder;
+    private extraTools;
+    private maxTokens;
+    private executor?;
+    private apiConfig;
+    private maxIterations;
+    private apiModel?;
+    private targetDir;
+    private verbose;
+    constructor(options?: AgentOptions);
+    /**
+     * 工具处理器包装逻辑：增加日志打印和 Token 监控
+     */
+    private wrapHandler;
+    private initTools;
+    private calculateTokens;
+    private pruneMessages;
+    init(): Promise<void>;
+    chat(input: string): Promise<string>;
+    private showLoading;
+    start(): Promise<void>;
+    private ensureApiConfig;
+}

package/lib/{agent-chain.js → core/agent-chain.js}

@@ -37,35 +37,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-const readline = __importStar(require("readline"));
-const ts_context_mcp_1 = require("@saber2pr/ts-context-mcp");
 const js_tiktoken_1 = require("js-tiktoken");
-const openai_1 = require("@langchain/openai");
-const tools_1 = require("@langchain/core/tools");
 const agents_1 = require("langchain/agents");
+const readline = __importStar(require("readline"));
 const prompts_1 = require("@langchain/core/prompts");
-const CONFIG_FILE = path_1.default.join(os_1.default.homedir(), ".saber2pr-agent.json");
+const tools_1 = require("@langchain/core/tools");
+const openai_1 = require("@langchain/openai");
+const config_1 = require("../config/config");
+const jsonSchemaToZod_1 = require("../utils/jsonSchemaToZod");
+const builtin_1 = require("../tools/builtin");
 class McpChainAgent {
     constructor(options) {
         this.allTools = [];
         this.messages = [];
         this.encoder = (0, js_tiktoken_1.getEncoding)("cl100k_base");
         this.extraTools = [];
-        this.engine = new ts_context_mcp_1.PromptEngine((options === null || options === void 0 ? void 0 : options.targetDir) || process.cwd());
         this.extraTools = (options === null || options === void 0 ? void 0 : options.tools) || [];
         this.maxTokens = (options === null || options === void 0 ? void 0 : options.maxTokens) || 100000;
         this.apiConfig = options === null || options === void 0 ? void 0 : options.apiConfig;
         this.maxIterations = (options === null || options === void 0 ? void 0 : options.maxIterations) || 20;
         this.apiModel = options === null || options === void 0 ? void 0 : options.apiModel;
+        this.targetDir = (options === null || options === void 0 ? void 0 : options.targetDir) || process.cwd();
+        this.verbose = (options === null || options === void 0 ? void 0 : options.verbose) || false;
         const baseSystemPrompt = `你是一个专业的 AI 代码架构师，具备深度的源码分析与工程化处理能力。
     
 ### 核心操作规范：
 1. **全局扫描（强制首选）**：在开始任何分析任务前，你【必须】首先调用 'get_repo_map'。这是理解项目结构、技术栈及模块关系的唯一来源。
 2. **循序渐进的分析路径**：
    - 优先使用 'read_skeleton' 提取接口和函数签名。
-   - 仅在需要分析具体逻辑或准备修复代码时，才使用 'read_full_code'。
+   - 仅在需要分析具体逻辑或准备修复代码时，才使用 'read_text_file'。
 3. **真实性原则**：所有的代码分析必须基于工具返回的真实内容，严禁虚假猜测。`;
         this.messages.push({
             role: "system",
@@ -73,8 +73,7 @@ class McpChainAgent {
                 ? `${baseSystemPrompt}\n\n[额外指令]:\n${JSON.stringify(options.extraSystemPrompt)}`
                 : baseSystemPrompt,
         });
-        this.registerBuiltinTools();
-        this.injectCustomTools();
+        this.initTools(options);
     }
     /**
      * 工具处理器包装逻辑：增加日志打印和 Token 监控
@@ -95,72 +94,23 @@ class McpChainAgent {
             return content;
         };
     }
-    registerBuiltinTools() {
-        const builtinTools = [
-            {
-                type: "function",
-                function: { name: "get_repo_map", description: "获取项目全局结构图和导出清单", parameters: { type: "object" } },
-                _handler: this.wrapHandler("get_repo_map", async () => {
-                    this.engine.refresh();
-                    return this.engine.getRepoMap();
-                }),
-            },
-            {
-                type: "function",
-                function: {
-                    name: "read_skeleton",
-                    description: "读取代码骨架（接口、类定义等），非常节省 Token",
-                    parameters: { type: "object", properties: { filePath: { type: "string" } } },
-                },
-                _handler: this.wrapHandler("read_skeleton", async ({ filePath }) => this.engine.getSkeleton(filePath)),
-            },
-            {
-                type: "function",
-                function: {
-                    name: "read_full_code",
-                    description: "读取完整源码。注意：仅在需要具体行号或精细逻辑时使用",
-                    parameters: { type: "object", properties: { filePath: { type: "string" } } },
-                },
-                _handler: this.wrapHandler("read_full_code", async ({ filePath }) => {
-                    // --- 新增：Token 守卫 ---
-                    const currentTokens = this.calculateTokens();
-                    if (currentTokens > this.maxTokens) {
-                        return `[SYSTEM WARNING]: 当前上下文已达到 ${currentTokens} tokens (上限 ${this.maxTokens})。为了保证系统稳定，已拦截 read_full_code。请立即根据已知信息进行总结或停止阅读更多代码。`;
-                    }
-                    try {
-                        if (typeof filePath !== 'string' || !filePath) {
-                            return "Error: filePath 不能为空";
-                        }
-                        // 拼合绝对路径
-                        const fullPath = path_1.default.resolve(this.engine.getRootDir(), filePath);
-                        // 安全检查：防止 AI 尝试读取项目外的敏感文件
-                        if (!fullPath.startsWith(this.engine.getRootDir())) {
-                            return "Error: 权限拒绝，禁止访问项目目录外的文件。";
-                        }
-                        if (!fs_1.default.existsSync(fullPath)) {
-                            return `Error: 文件不存在: ${filePath}`;
-                        }
-                        const content = fs_1.default.readFileSync(fullPath, "utf-8");
-                        // 加上行号，AI 就能在 generate_review 里给出准确的 line 参数
-                        return content.split('\n')
-                            .map((line, i) => `${i + 1} | ${line}`)
-                            .join('\n');
-                    }
-                    catch (err) {
-                        return `Error: 读取文件失败: ${err.message}`;
-                    }
-                }),
-            }
+    initTools(options) {
+        const allTools = [
+            // 注册内置工具
+            ...(0, builtin_1.createDefaultBuiltinTools)({
+                options: {
+                    ...options,
+                    ...this
+                }
+            }),
+            ...this.extraTools
         ];
-        this.allTools.push(...builtinTools);
-    }
-    injectCustomTools() {
-        for (const tool of this.extraTools) {
-            this.allTools.push({
-                type: "function",
-                function: { name: tool.name, description: tool.description, parameters: tool.parameters },
-                _handler: this.wrapHandler(tool.name, tool.handler),
-            });
+        if (allTools === null || allTools === void 0 ? void 0 : allTools.length) {
+            this.allTools.push(...allTools.map((t) => ({
+                type: t.type,
+                function: t.function,
+                _handler: this.wrapHandler(t.function.name, t._handler),
+            })));
         }
     }
     calculateTokens() {
@@ -196,11 +146,20 @@ class McpChainAgent {
                 streaming: false
             });
         }
-        const langchainTools = this.allTools.map(t => new tools_1.DynamicTool({
-            name: t.function.name,
-            description: t.function.description || "",
-            func: t._handler
-        }));
+        const langchainTools = this.allTools.map(t => {
+            return new tools_1.DynamicStructuredTool({
+                name: t.function.name,
+                description: t.function.description || "",
+                // 定义 schema 告诉 LangChain 这是一个对象输入
+                // passthrough() 允许接收未在 schema 中显式定义的其他字段
+                schema: (0, jsonSchemaToZod_1.jsonSchemaToZod)(t.function.parameters),
+                func: async (args) => {
+                    // 这里的 args 已经被 LangChain 自动解析为对象
+                    return await t._handler(args);
+                },
+            });
+        });
+        // src/core/agent-chain.ts 中的 prompt 修改
         const prompt = prompts_1.PromptTemplate.fromTemplate(`
 {system_prompt}
 
@@ -208,39 +167,32 @@ class McpChainAgent {
 --------------------
 {tools}
 
+工具名称列表: [{tool_names}]
+
 ### 📝 交互协议格式 (PROTOCOL)
 --------------------
-为了确保任务成功，你必须【严格】遵守以下 ReAct 交互格式：
+你必须严格遵守以下回复格式：
 
-1. **思考与行动阶段 (Thought & Action)**:
-    Thought: 我需要执行什么操作？
-    Action: 工具名称 (必须是 [{tool_names}] 之一)
-    Action Input: 工具的 JSON 参数 (例如: {{"filePath": "src/index.ts"}})
-    
-    【⚠️ 极其重要】：当你输出 "Action Input" 后，必须【立即停止】输出，静静等待 Observation（工具返回结果）。严禁在此阶段输出 "Final Answer"。
-
-2. **反馈阶段 (Observation)**:
-    Observation: 工具返回的真实数据。
-
-3. **最终结论阶段 (Final Answer)**:
-    当且仅当你已经从工具中获得了足够信息并完成所有审计任务时：
-    Thought: 我已经完成了所有分析，可以生成最终报告。
-    Final Answer: 任务总结陈述。
+Thought: 首先，我会[此处用中文简述你的分析思路和下一步目标]。
+\`\`\`json
+{{
+  "action": "工具名称",
+  "action_input": {{ "参数名": "参数值" }}
+}}
+\`\`\`
 
-### 🚫 强制禁止行为 (STRICT PROHIBITIONS)
---------------------
-- **严禁虚构**：禁止使用 'path/to/file' 等占位符，必须使用 'get_repo_map' 返回的真实路径。
-- **严禁冲突**：严禁在同一次回复中同时出现 "Action" 和 "Final Answer"。
-- **严禁对话**：不要向用户提问或进行闲聊，你的唯一目标是完成审计并调用 'generate_review'。
+注意：
+- 严禁直接输出 JSON，必须先写 Thought。
+- Thought 必须包含具体的分析意图，不少于 10 个字。
 
 Begin!
 Question: {input}
 Thought: {agent_scratchpad}`);
-        const agent = await (0, agents_1.createReactAgent)({ llm: model, tools: langchainTools, prompt });
+        const agent = await (0, agents_1.createStructuredChatAgent)({ llm: model, tools: langchainTools, prompt });
         this.executor = new agents_1.AgentExecutor({
             agent,
             tools: langchainTools,
-            verbose: false, // 我们已经有了 wrapHandler 日志，关闭原生 verbose 以保持整洁
+            verbose: this.verbose, // 我们已经有了 wrapHandler 日志，关闭原生 verbose 以保持整洁
             handleParsingErrors: true,
             maxIterations: this.maxIterations
         });
@@ -261,17 +213,34 @@ Thought: {agent_scratchpad}`);
                 // --- 新增：使用回调函数捕获 Thought ---
                 callbacks: [{
                         handleAgentAction: (action, runId) => {
-                            // 在 ReAct Agent 中，thought 通常包含在 log 字段中，且在 Action 之前
                             if (action.log) {
-                                const thought = action.log.split('Action:')[0].trim();
-                                if (thought) {
-                                    console.log(`\n💭 [思考]: ${thought.replace('Thought:', '').trim()}`);
+                                const log = action.log.trim();
+                                // 1. 提取 Thought 部分：取 Thought: 之后，直到遇到 ```json 或 { 之前的内容
+                                const thoughtMatch = log.match(/Thought:\s*([\s\S]*?)(?=(?:```json|\{|Action:|$))/i);
+                                let thought = "";
+                                if (thoughtMatch && thoughtMatch[1]) {
+                                    thought = thoughtMatch[1].trim();
+                                }
+                                else {
+                                    // 备选方案：如果没有 Thought 标签，直接截取 JSON 之前的文本
+                                    thought = log.split(/```json|\{/)[0].replace(/Thought:/i, "").trim();
+                                }
+                                // 2. 只有当 thought 真的有文字内容（且不是 JSON）时才打印
+                                if (thought && thought.length > 0 && !thought.startsWith('{')) {
+                                    // 进一步清洗：如果 thought 包含多行，只取非空的第一行，避免打印太长
+                                    const displayThought = thought.split('\n').find(line => line.trim().length > 0);
+                                    if (displayThought) {
+                                        console.log(`\n💭 [思考]: ${displayThought}`);
+                                    }
                                 }
                             }
                         }
                     }]
             });
-            let output = response.output;
+            // 修复点：确保 output 是字符串
+            let output = typeof response.output === 'string'
+                ? response.output
+                : JSON.stringify(response.output);
             // 清洗 ReAct 冗余标签
             if (output.includes("Final Answer:")) {
                 output = ((_a = output.split("Final Answer:").pop()) === null || _a === void 0 ? void 0 : _a.trim()) || output;
@@ -299,7 +268,7 @@ Thought: {agent_scratchpad}`);
         await this.init();
         const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
         console.log(`\n🚀 AI 助手启动 (LangChain 核心)`);
-        console.log(`📂 目标目录: ${this.engine.getRootDir()}`);
+        console.log(`📂 目标目录: ${this.targetDir}`);
         const chatLoop = () => {
             rl.question("\n👤 你: ", async (input) => {
                 if (!input.trim())
@@ -321,8 +290,8 @@ Thought: {agent_scratchpad}`);
     async ensureApiConfig() {
         if (this.apiConfig)
             return this.apiConfig;
-        if (fs_1.default.existsSync(CONFIG_FILE)) {
-            return JSON.parse(fs_1.default.readFileSync(CONFIG_FILE, "utf-8"));
+        if (fs_1.default.existsSync(config_1.CONFIG_FILE)) {
+            return JSON.parse(fs_1.default.readFileSync(config_1.CONFIG_FILE, "utf-8"));
         }
         const rl = readline.createInterface({
             input: process.stdin,
@@ -335,7 +304,7 @@ Thought: {agent_scratchpad}`);
             apiKey: await question("? API Key: "),
             model: await question("? Model Name (如 gpt-4o): "),
         };
-        fs_1.default.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+        fs_1.default.writeFileSync(config_1.CONFIG_FILE, JSON.stringify(config, null, 2));
         rl.close();
         return config;
     }

package/lib/{agent.d.ts → core/agent.d.ts}

@@ -1,44 +1,23 @@
-interface ApiConfig {
-    baseURL: string;
-    apiKey: string;
-    model: string;
-}
-export interface CustomTool {
-    name: string;
-    description: string;
-    parameters: any;
-    handler: (args: any) => Promise<any>;
-}
-export interface AgentOptions {
-    targetDir?: string;
-    /** 自定义工具扩展 */
-    tools?: any[];
-    /** 注入到 System Prompt 中的额外指令/规则/上下文 */
-    extraSystemPrompt?: any;
-    maxTokens?: number;
-    apiConfig?: ApiConfig;
-}
+import { AgentOptions } from '../types/type';
 export default class McpAgent {
     private openai;
     private modelName;
-    private clients;
     private allTools;
     private messages;
-    private engine;
     private encoder;
     private extraTools;
     private maxTokens;
     private apiConfig;
+    private targetDir;
     constructor(options?: AgentOptions);
     /**
      * 计算当前消息列表的总 Token 消耗
      * 兼容多模态内容 (Content Parts) 和 工具调用 (Tool Calls)
      */
     private calculateTokens;
-    private injectCustomTools;
+    private initTools;
     /**
-     * 核心功能：内置代码分析工具
-     * 这里的逻辑直接调用 PromptEngine，不走网络请求，效率极高
+     * 核心功能：内置代码分析工具（基于 engine/targetDir，可被外部通过 createDefaultBuiltinTools 替代）
      */
     private registerBuiltinTools;
     private ensureApiConfig;
@@ -62,4 +41,3 @@ export default class McpAgent {
     chat(input: string): Promise<string>;
     start(): Promise<void>;
 }
-export {};