@saber2pr/ai-agent 0.0.11 → 0.0.13

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

@@ -11,6 +11,7 @@ export default class McpChainAgent {
     private apiModel?;
     private targetDir;
     private verbose;
+    private runningTokenCounter;
     constructor(options?: AgentOptions);
     /**
      * 工具处理器包装逻辑：增加日志打印和 Token 监控

package/lib/core/agent-chain.js

@@ -52,6 +52,7 @@ class McpChainAgent {
         this.messages = [];
         this.encoder = (0, js_tiktoken_1.getEncoding)("cl100k_base");
         this.extraTools = [];
+        this.runningTokenCounter = 0; // 新增：用于追踪当前 Task 的动态消耗
         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;
@@ -89,8 +90,15 @@ class McpChainAgent {
             const result = await handler(args);
             const content = typeof result === "string" ? result : JSON.stringify(result);
             // 3. 统计 Token 消耗
-            const tokens = this.encoder.encode(content).length;
-            console.log(`   [输出长度]: ${tokens} tokens`);
+            const outputTokens = this.encoder.encode(content).length;
+            console.log(`   [输出长度]: ${outputTokens} tokens`);
+            // 2. 更新动态计数器：
+            // 这里的逻辑是：当前基础 Context + 本次工具调用的输出
+            // 随着迭代增加，这个值会一直累加，直到任务结束存入 messages
+            const baseTokens = this.calculateTokens();
+            this.runningTokenCounter = baseTokens + outputTokens;
+            // 3. 打印正确且递增的状态
+            console.log(`   📊 状态: Context ${this.runningTokenCounter} / Limit ${this.maxTokens} tokens`);
             return content;
         };
     }

package/lib/core/agent.d.ts

@@ -16,10 +16,6 @@ export default class McpAgent {
      */
     private calculateTokens;
     private initTools;
-    /**
-     * 核心功能：内置代码分析工具（基于 engine/targetDir，可被外部通过 createDefaultBuiltinTools 替代）
-     */
-    private registerBuiltinTools;
     private ensureApiConfig;
     private loadMcpConfigs;
     init(): Promise<void>;

package/lib/core/agent.js

@@ -145,14 +145,6 @@ class McpAgent {
             this.allTools.push(...allTools);
         }
     }
-    /**
-     * 核心功能：内置代码分析工具（基于 engine/targetDir，可被外部通过 createDefaultBuiltinTools 替代）
-     */
-    registerBuiltinTools(options) {
-        this.allTools.push(...(0, builtin_1.createDefaultBuiltinTools)({
-            options,
-        }));
-    }
     // --- 初始化与环境准备 (API Config & MCP Servers) ---
     async ensureApiConfig() {
         if (this.apiConfig)

package/lib/utils/jsonSchemaToZod.d.ts

@@ -1,2 +1,2 @@
 import { z } from "zod";
-export declare function jsonSchemaToZod(parameters: any): z.ZodObject<{}, z.core.$loose>;
+export declare function jsonSchemaToZod(parameters: any): z.ZodObject<any>;

package/lib/utils/jsonSchemaToZod.js

@@ -2,16 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonSchemaToZod = jsonSchemaToZod;
 const zod_1 = require("zod");
-// 将 JSON Schema 转换为 Zod Schema 的简易转换器
 function jsonSchemaToZod(parameters) {
     var _a;
-    if (!parameters || !parameters.properties) {
-        return zod_1.z.object({}).loose();
+    if (!parameters || typeof parameters !== 'object') {
+        return zod_1.z.object({}).passthrough();
     }
-    const obj = {};
-    const properties = parameters.properties;
-    for (const key in properties) {
-        const prop = properties[key];
+    // 辅助函数：递归转换单个属性
+    function convertProp(prop) {
         let schema = zod_1.z.any();
         if (prop.type === "string") {
             schema = zod_1.z.string();
@@ -22,12 +19,39 @@ function jsonSchemaToZod(parameters) {
         else if (prop.type === "boolean") {
             schema = zod_1.z.boolean();
         }
+        else if (prop.type === "array") {
+            // 递归处理数组项
+            if (prop.items) {
+                schema = zod_1.z.array(convertProp(prop.items));
+            }
+            else {
+                schema = zod_1.z.array(zod_1.z.any());
+            }
+        }
+        else if (prop.type === "object") {
+            // 递归处理嵌套对象
+            const nestedObj = {};
+            if (prop.properties) {
+                for (const key in prop.properties) {
+                    nestedObj[key] = convertProp(prop.properties[key]);
+                }
+            }
+            schema = zod_1.z.object(nestedObj).passthrough();
+        }
         if (prop.description) {
             schema = schema.describe(prop.description);
         }
-        // 默认都设为 optional 以防 Agent 报错，除非在 JSON Schema 的 required 数组中
+        return schema;
+    }
+    const obj = {};
+    const properties = parameters.properties || {};
+    for (const key in properties) {
+        const prop = properties[key];
+        let schema = convertProp(prop);
+        // 处理必填项
         const isRequired = (_a = parameters.required) === null || _a === void 0 ? void 0 : _a.includes(key);
         obj[key] = isRequired ? schema : schema.optional();
     }
-    return zod_1.z.object(obj).loose();
+    // 使用 passthrough 或 loose 以增加容错性
+    return zod_1.z.object(obj).passthrough();
 }

package/package.json

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