@saber2pr/ai-agent 0.0.35 → 0.0.38

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

@@ -1,5 +1,6 @@
 import { BaseMessage } from '@langchain/core/messages';
 import { GraphAgentOptions } from '../types/type';
+import { AgentGraphModel } from '../model/AgentGraphModel';
 export declare const CONFIG_FILE: string;
 interface TokenUsage {
     total: number;
@@ -12,7 +13,7 @@ declare const AgentState: import("@langchain/langgraph").AnnotationRoot<{
     tokenUsage: import("@langchain/langgraph").BinaryOperatorAggregate<TokenUsage, TokenUsage>;
     totalDuration: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
 }>;
-export default class McpGraphAgent {
+export default class McpGraphAgent<T extends AgentGraphModel = any> {
     private model;
     private toolNode;
     private targetDir;
@@ -27,7 +28,7 @@ export default class McpGraphAgent {
     private maxTargetCount;
     private maxTokens;
     private mcpClients;
-    constructor(options?: GraphAgentOptions);
+    constructor(options?: GraphAgentOptions<T>);
     private printLoadedTools;
     private loadMcpConfigs;
     private initMcpTools;
@@ -37,13 +38,13 @@ export default class McpGraphAgent {
     private showLoading;
     private startLoading;
     private stopLoading;
-    private getModel;
+    getModel(): Promise<T>;
     private askForConfig;
     chat(query?: string): Promise<void>;
     start(): Promise<void>;
     private renderOutput;
     callModel(state: typeof AgentState.State): Promise<{
-        messages: any[];
+        messages: import("@langchain/core/messages").AIMessageChunk[];
         tokenUsage: {
             total: number;
         };

package/lib/model/AgentGraphModel.js

@@ -4,6 +4,7 @@ exports.AgentGraphModel = void 0;
 const chat_models_1 = require("@langchain/core/language_models/chat_models");
 const messages_1 = require("@langchain/core/messages");
 const function_calling_1 = require("@langchain/core/utils/function_calling");
+const cleanToolDefinition_1 = require("../utils/cleanToolDefinition");
 class AgentGraphModel extends chat_models_1.BaseChatModel {
     constructor(fields) {
         super(fields || {});
@@ -15,36 +16,38 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
     async _generate(messages) {
         const fullPrompt = this.serializeMessages(messages);
         const response = await this.callApi(fullPrompt);
-        let { text, reasoning, token, duration } = response;
+        let { text, reasoning } = response;
         // 1. 处理思考内容
-        if (!reasoning && text.includes("<think>")) {
+        if (!reasoning && text.includes('<think>')) {
             const match = text.match(/<think>([\s\S]*?)<\/think>/);
             if (match) {
                 reasoning = match[1].trim();
-                text = text.replace(/<think>[\s\S]*?<\/think>/, "").trim();
+                text = text.replace(/<think>[\s\S]*?<\/think>/, '').trim();
             }
         }
         // 2. 解析工具调用
         const toolCalls = this.parseToolCalls(text);
         // AgentGraphModel.ts 的 _generate 方法内
         return {
-            generations: [{
+            generations: [
+                {
                     text,
                     message: new messages_1.AIMessage({
                         content: text,
                         tool_calls: toolCalls,
                         additional_kwargs: {
-                            reasoning: reasoning || "",
+                            reasoning: reasoning || '',
                             token: response.token, // 👈 必须
                             duration: response.duration, // 👈 必须
                         },
                         response_metadata: {
-                            reasoning: reasoning || "",
+                            reasoning: reasoning || '',
                             token: response.token, // 👈 McpGraphAgent 读取路径
                             duration: response.duration,
-                        }
-                    })
-                }]
+                        },
+                    }),
+                },
+            ],
         };
     }
     parseToolCalls(text) {
@@ -80,12 +83,14 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
             }
         }
         // ✅ 此时返回的 args 必须是 object 类型
-        return [{
+        return [
+            {
                 name: actionMatch[1],
                 args: typeof args === 'object' ? args : {},
                 id: `call_${Date.now()}_${Math.random().toString(36).slice(2, 6)}`,
-                type: "tool_call",
-            }];
+                type: 'tool_call',
+            },
+        ];
     }
     serializeMessages(messages) {
         const systemMsg = messages.find(m => m._getType() === 'system');
@@ -94,7 +99,9 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
             const content = typeof m.content === 'string' ? m.content : JSON.stringify(m.content, null, 2);
             return `${m._getType().toUpperCase()}: ${content}`;
         };
-        const toolsContext = this.boundTools ? `\n[Tools]\n${JSON.stringify(this.boundTools, null, 2)}` : "";
+        const toolsContext = this.boundTools
+            ? `\n[Tools]\n${JSON.stringify(this.boundTools.map(cleanToolDefinition_1.cleanToolDefinition), null, 2)}`
+            : '';
         return `
 ${format(systemMsg)}
 ${toolsContext}
@@ -106,6 +113,8 @@ ${format(lastMsg)}
 3. Arguments: {JSON}
 `.trim();
     }
-    _llmType() { return "agent_graph_model"; }
+    _llmType() {
+        return 'agent_graph_model';
+    }
 }
 exports.AgentGraphModel = AgentGraphModel;

package/lib/types/type.d.ts

@@ -34,8 +34,8 @@ export interface AgentOptions {
     verbose?: boolean;
     apiConfig?: ApiConfig;
 }
-export interface GraphAgentOptions extends AgentOptions {
-    apiModel?: AgentGraphModel;
+export interface GraphAgentOptions<T extends AgentGraphModel = any> extends AgentOptions {
+    apiModel?: T;
     alwaysSystem?: boolean;
     recursionLimit?: number;
     maxTargetCount?: number;

package/lib/utils/cleanToolDefinition.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 清理工具定义：剔除外层包装和 parameters 内部的冗余元数据字段
+ */
+export declare function cleanToolDefinition(tool: any): {
+    name: any;
+    description: any;
+    parameters: {
+        type: any;
+        properties: any;
+        required: any;
+    };
+};

package/lib/utils/cleanToolDefinition.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanToolDefinition = cleanToolDefinition;
+/**
+ * 清理工具定义：剔除外层包装和 parameters 内部的冗余元数据字段
+ */
+function cleanToolDefinition(tool) {
+    // 1. 提取核心 function 对象
+    const fn = tool.function || tool;
+    // 2. 解构 parameters，剔除不需要的 schema 描述字段
+    const { $schema, additionalProperties, ...cleanParameters } = fn.parameters || {};
+    // 3. 返回精简后的结构
+    return {
+        name: fn.name,
+        description: fn.description,
+        parameters: {
+            type: cleanParameters.type || "object",
+            properties: cleanParameters.properties || {},
+            required: cleanParameters.required || []
+        }
+    };
+}

package/package.json

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