@saber2pr/ai-agent 0.0.39 → 0.0.41

package/lib/core/agent.d.ts

@@ -24,9 +24,9 @@ export default class McpAgent {
     private getToolsForOpenAIAPI;
     private processChat;
     /**
-   * 裁剪上下文消息列表
-   * 保留第一条 System 消息，并移除中间的旧消息直到低于阈值
-   */
+     * 裁剪上下文消息列表
+     * 保留第一条 System 消息，并移除中间的旧消息直到低于阈值
+     */
     private pruneMessages;
     /**
      * 简易 Loading 动画辅助函数

package/lib/core/agent.js

@@ -37,7 +37,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const js_tiktoken_1 = require("js-tiktoken");
 const openai_1 = __importDefault(require("openai"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -45,15 +44,15 @@ const readline = __importStar(require("readline"));
 const zod_to_json_schema_1 = require("zod-to-json-schema");
 const index_js_1 = require("@modelcontextprotocol/sdk/client/index.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/client/stdio.js");
+const tiktoken_1 = require("@langchain/core/utils/tiktoken");
 const config_1 = require("../config/config");
 const builtin_1 = require("../tools/builtin");
 const jsonSchemaToZod_1 = require("../utils/jsonSchemaToZod");
 class McpAgent {
     constructor(options) {
-        this.modelName = "";
+        this.modelName = '';
         this.allTools = [];
         this.messages = [];
-        this.encoder = (0, js_tiktoken_1.getEncoding)("cl100k_base");
         this.extraTools = [];
         this.mcpClients = [];
         this.targetDir = (options === null || options === void 0 ? void 0 : options.targetDir) || process.cwd();
@@ -82,7 +81,7 @@ class McpAgent {
             baseSystemPrompt += `\n\n[额外执行指令]:\n${extra}`;
         }
         this.messages.push({
-            role: "system",
+            role: 'system',
             content: baseSystemPrompt,
         });
         this.initTools(options); // 注入外部工具
@@ -101,20 +100,23 @@ class McpAgent {
      * 计算当前消息列表的总 Token 消耗
      * 兼容多模态内容 (Content Parts) 和 工具调用 (Tool Calls)
      */
-    calculateTokens() {
+    async calculateTokens() {
+        if (!this.encoder) {
+            this.encoder = await (0, tiktoken_1.getEncoding)('cl100k_base');
+        }
         let total = 0;
         for (const msg of this.messages) {
             // 1. 处理消息内容 (Content)
             if (msg.content) {
-                if (typeof msg.content === "string") {
+                if (typeof msg.content === 'string') {
                     // 普通文本消息
                     total += this.encoder.encode(msg.content).length;
                 }
                 else if (Array.isArray(msg.content)) {
                     // 多模态/复合内容消息 (ChatCompletionContentPart[])
                     for (const part of msg.content) {
-                        if (part.type === "text" && "text" in part) {
-                            total += this.encoder.encode(part.text || "").length;
+                        if (part.type === 'text' && 'text' in part) {
+                            total += this.encoder.encode(part.text || '').length;
                         }
                         // 注意：图片 (image_url) 的 Token 计算通常基于分辨率，tiktoken 无法计算
                     }
@@ -122,9 +124,9 @@ class McpAgent {
             }
             // 2. 处理助手角色发出的工具调用请求 (Assistant Tool Calls)
             // 这是为了统计 AI 发出的指令所占用的 Token
-            if (msg.role === "assistant" && msg.tool_calls) {
+            if (msg.role === 'assistant' && msg.tool_calls) {
                 for (const call of msg.tool_calls) {
-                    if (call.type === "function") {
+                    if (call.type === 'function') {
                         // 统计函数名和参数字符串
                         total += this.encoder.encode(call.function.name).length;
                         total += this.encoder.encode(call.function.arguments).length;
@@ -133,7 +135,7 @@ class McpAgent {
             }
             // 3. 处理工具返回的结果 (Tool Role)
             // 在 processChat 中，我们确保了工具返回的 result 最终被转为了 string
-            if (msg.role === "tool" && typeof msg.content === "string") {
+            if (msg.role === 'tool' && typeof msg.content === 'string') {
                 total += this.encoder.encode(msg.content).length;
             }
         }
@@ -145,10 +147,10 @@ class McpAgent {
             ...(0, builtin_1.createDefaultBuiltinTools)({
                 options: {
                     ...options,
-                    ...this
-                }
+                    ...this,
+                },
             }),
-            ...this.extraTools
+            ...this.extraTools,
         ];
         if (allTools === null || allTools === void 0 ? void 0 : allTools.length) {
             this.allTools.push(...allTools);
@@ -159,18 +161,18 @@ class McpAgent {
         if (this.apiConfig)
             return this.apiConfig;
         if (fs_1.default.existsSync(config_1.CONFIG_FILE)) {
-            return JSON.parse(fs_1.default.readFileSync(config_1.CONFIG_FILE, "utf-8"));
+            return JSON.parse(fs_1.default.readFileSync(config_1.CONFIG_FILE, 'utf-8'));
         }
         const rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,
         });
-        const question = (q) => new Promise((res) => rl.question(q, res));
-        console.log("\n🔑 配置 API 凭据:");
+        const question = (q) => new Promise(res => rl.question(q, res));
+        console.log('\n🔑 配置 API 凭据:');
         const config = {
-            baseURL: await question("? API Base URL (如 https://api.openai.com/v1): "),
-            apiKey: await question("? API Key: "),
-            model: await question("? Model Name (如 gpt-4o): "),
+            baseURL: await question('? API Base URL (如 https://api.openai.com/v1): '),
+            apiKey: await question('? API Key: '),
+            model: await question('? Model Name (如 gpt-4o): '),
         };
         fs_1.default.writeFileSync(config_1.CONFIG_FILE, JSON.stringify(config, null, 2));
         rl.close();
@@ -179,12 +181,12 @@ class McpAgent {
     loadMcpConfigs() {
         const combined = { mcpServers: {} };
         const paths = [
-            path_1.default.join(os_1.default.homedir(), ".cursor", "mcp.json"),
-            path_1.default.join(os_1.default.homedir(), ".vscode", "mcp.json"),
+            path_1.default.join(os_1.default.homedir(), '.cursor', 'mcp.json'),
+            path_1.default.join(os_1.default.homedir(), '.vscode', 'mcp.json'),
         ];
-        paths.forEach((p) => {
+        paths.forEach(p => {
             if (fs_1.default.existsSync(p)) {
-                const content = JSON.parse(fs_1.default.readFileSync(p, "utf-8"));
+                const content = JSON.parse(fs_1.default.readFileSync(p, 'utf-8'));
                 Object.assign(combined.mcpServers, content.mcpServers);
             }
         });
@@ -206,12 +208,12 @@ class McpAgent {
                     args: server.args || [],
                     env: { ...process.env, ...server.env },
                 });
-                const client = new index_js_1.Client({ name, version: "1.0.0" }, { capabilities: {} });
+                const client = new index_js_1.Client({ name, version: '1.0.0' }, { capabilities: {} });
                 await client.connect(transport);
                 this.mcpClients.push(client);
                 const { tools } = await client.listTools();
                 this.allTools.push(...tools.map((t) => ({
-                    type: "function",
+                    type: 'function',
                     function: {
                         name: `${name}__${t.name}`,
                         description: t.description,
@@ -228,12 +230,14 @@ class McpAgent {
         }
     }
     getToolsForOpenAIAPI() {
-        return this.allTools.map((tool) => {
+        return this.allTools.map(tool => {
             const { _handler, _client, _originalName, ...rest } = tool;
             let parameters = rest.function.parameters;
             // 💡 核心逻辑：判断是否为 Zod 实例并转换
             // Zod 对象通常包含 _def 属性，或者你可以用 instanceof z.ZodType
-            if (parameters && typeof parameters === 'object' && ('_def' in parameters || parameters.safeParse)) {
+            if (parameters &&
+                typeof parameters === 'object' &&
+                ('_def' in parameters || parameters.safeParse)) {
                 // 使用 zod-to-json-schema 转换为标准 JSON Schema
                 parameters = (0, zod_to_json_schema_1.zodToJsonSchema)(parameters);
             }
@@ -251,31 +255,31 @@ class McpAgent {
         this.messages.push({ role: 'user', content: userInput });
         while (true) {
             // --- 新增：发送请求前先检查并裁剪 ---
-            this.pruneMessages();
+            await this.pruneMessages();
             // 打印当前上下文的累计 Token
-            const currentInputTokens = this.calculateTokens();
+            const currentInputTokens = await this.calculateTokens();
             console.log(`\n📊 当前上下文累计: ${currentInputTokens} tokens`);
             // 如果接近上限（如 80%），在消息队列中插入一条隐含的系统指令
             if (currentInputTokens > this.maxTokens * 0.8 && currentInputTokens <= this.maxTokens) {
                 this.messages.push({
-                    role: "system",
-                    content: "注意：上下文即将耗尽。请停止读取新文件，优先处理现有信息并尽快输出结果。"
+                    role: 'system',
+                    content: '注意：上下文即将耗尽。请停止读取新文件，优先处理现有信息并尽快输出结果。',
                 });
             }
-            const stopLoading = this.showLoading("🤖 Agent 正在思考...");
+            const stopLoading = this.showLoading('🤖 Agent 正在思考...');
             let response;
             try {
                 response = await this.openai.chat.completions.create({
                     model: this.modelName,
                     messages: this.messages,
                     tools: this.getToolsForOpenAIAPI(),
-                    tool_choice: 'auto'
+                    tool_choice: 'auto',
                 });
             }
             finally {
                 stopLoading();
             }
-            const message = response.choices[0].message;
+            const { message } = response.choices[0];
             this.messages.push(message);
             // 计算本次 AI 回复生成的 Token
             const completionTokens = ((_a = response.usage) === null || _a === void 0 ? void 0 : _a.completion_tokens) ||
@@ -303,35 +307,35 @@ class McpAgent {
                 else if ((tool === null || tool === void 0 ? void 0 : tool._client) && tool._originalName) {
                     const mcpRes = await tool._client.callTool({
                         name: tool._originalName,
-                        arguments: args
+                        arguments: args,
                     });
                     result = mcpRes.content;
                 }
-                const resultContent = typeof result === "string" ? result : JSON.stringify(result);
+                const resultContent = typeof result === 'string' ? result : JSON.stringify(result);
                 // 打印工具返回结果的 Token 消耗
                 const toolResultTokens = this.encoder.encode(resultContent).length;
                 console.log(`   📝 工具输出: ${toolResultTokens} tokens`);
                 this.messages.push({
                     role: 'tool',
                     tool_call_id: call.id,
-                    content: resultContent
+                    content: resultContent,
                 });
                 console.log(`   ✅ 完成: ${call.function.name}`);
             }
         }
     }
     /**
-   * 裁剪上下文消息列表
-   * 保留第一条 System 消息，并移除中间的旧消息直到低于阈值
-   */
-    pruneMessages() {
-        const currentTokens = this.calculateTokens();
+     * 裁剪上下文消息列表
+     * 保留第一条 System 消息，并移除中间的旧消息直到低于阈值
+     */
+    async pruneMessages() {
+        const currentTokens = await this.calculateTokens();
         if (currentTokens <= this.maxTokens)
             return;
         console.log(`\n⚠️ 上下文达到限制 (${currentTokens} tokens)，正在自动裁剪...`);
         // 策略：保留索引 0 (System)，从索引 1 开始删除
         // 每次删除一对 (通常是助理请求 + 工具回复，或者用户提问 + 助理回答)
-        while (this.calculateTokens() > this.maxTokens && this.messages.length > 2) {
+        while (await this.calculateTokens() > this.maxTokens && this.messages.length > 2) {
             // 始终保留系统提示词 (index 0) 和最后一条消息 (保持对话连贯)
             // 删除索引为 1 的消息
             this.messages.splice(1, 1);
@@ -371,7 +375,7 @@ class McpAgent {
             return lastMsg.role === 'assistant' ? lastMsg.content : '';
         }
         catch (error) {
-            console.error("\n❌ 系统错误:", error.message);
+            console.error('\n❌ 系统错误:', error.message);
             return '';
         }
         finally {
@@ -389,15 +393,15 @@ class McpAgent {
         });
         console.log(`\n🚀 代码助手已启动 (目标目录: ${this.targetDir})`);
         const chatLoop = () => {
-            rl.question("\n👤 你: ", async (input) => {
-                if (input.toLowerCase() === "exit")
+            rl.question('\n👤 你: ', async (input) => {
+                if (input.toLowerCase() === 'exit')
                     process.exit(0);
                 try {
                     // 这里统一调用 chat 或核心逻辑
                     await this.chat(input);
                 }
                 catch (err) {
-                    console.error("\n❌ 系统错误:", err.message);
+                    console.error('\n❌ 系统错误:', err.message);
                 }
                 chatLoop();
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saber2pr/ai-agent",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "AI Assistant CLI.",
   "author": "saber2pr",
   "license": "ISC",
@@ -30,7 +30,6 @@
     "@saber2pr/ts-context-mcp": "^0.0.9",
     "diff": "^8.0.3",
     "glob": "^10.5.0",
-    "js-tiktoken": "^1.0.21",
     "minimatch": "^10.0.1",
     "openai": "^6.16.0",
     "typescript": "^5.9.3",