@saber2pr/ai-agent 0.0.69 → 0.0.70

package/lib/model/AgentGraphModel.d.ts

@@ -36,6 +36,8 @@ export declare abstract class AgentGraphModel extends BaseChatModel {
     callApiStream(prompt: string, lastMsg: BaseMessage, onChunk: StreamChunkCallback): Promise<AgentGraphLLMResponse>;
     _generate(messages: BaseMessage[]): Promise<ChatResult>;
     private parseToolCalls;
+    /** 从 text[start] 开始，按括号配对提取完整的 JSON 对象字符串 */
+    private extractBalancedJson;
     /**
      * 流式生成：调用 callApiStream 进行流式输出，完成后构建完整的 ChatResult。
      * @param messages LangChain 消息列表

package/lib/model/AgentGraphModel.js

@@ -96,37 +96,38 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
     }
     parseToolCalls(text) {
         const actionMatch = text.match(/Action:\s*(\w+)/);
-        const argsMatch = text.match(/Arguments:\s*({[\s\S]*?})(?=\n|$)/);
         if (!actionMatch)
             return [];
         let args = {};
-        if (argsMatch) {
-            try {
-                let raw = argsMatch[1].trim();
-                // ✅ 关键修复：递归解析，直到它变成真正的对象
-                // 这能处理 "\"{\\\"path\\\":...}\"" 这种套娃字符串
-                let safetyDepth = 0;
-                while (typeof raw === 'string' && safetyDepth < 5) {
-                    try {
-                        const parsed = JSON.parse(raw);
-                        if (typeof parsed === 'object' && parsed !== null) {
+        const argsIdx = text.search(/Arguments:\s*\{/);
+        if (argsIdx !== -1) {
+            const jsonStart = text.indexOf('{', argsIdx);
+            const jsonStr = this.extractBalancedJson(text, jsonStart);
+            if (jsonStr) {
+                try {
+                    let raw = jsonStr;
+                    let safetyDepth = 0;
+                    while (typeof raw === 'string' && safetyDepth < 5) {
+                        try {
+                            const parsed = JSON.parse(raw);
+                            if (typeof parsed === 'object' && parsed !== null) {
+                                raw = parsed;
+                                break;
+                            }
                             raw = parsed;
+                        }
+                        catch {
                             break;
                         }
-                        raw = parsed; // 如果解析后还是 string，继续剥
-                    }
-                    catch {
-                        break; // 解析不动了，跳出
+                        safetyDepth++;
                     }
-                    safetyDepth++;
+                    args = raw;
+                }
+                catch {
+                    args = {};
                 }
-                args = raw;
-            }
-            catch (e) {
-                args = {};
             }
         }
-        // ✅ 此时返回的 args 必须是 object 类型
         return [
             {
                 name: actionMatch[1],
@@ -136,6 +137,39 @@ class AgentGraphModel extends chat_models_1.BaseChatModel {
             },
         ];
     }
+    /** 从 text[start] 开始，按括号配对提取完整的 JSON 对象字符串 */
+    extractBalancedJson(text, start) {
+        if (start < 0 || start >= text.length || text[start] !== '{')
+            return null;
+        let depth = 0;
+        let inString = false;
+        let escape = false;
+        for (let i = start; i < text.length; i++) {
+            const ch = text[i];
+            if (escape) {
+                escape = false;
+                continue;
+            }
+            if (ch === '\\' && inString) {
+                escape = true;
+                continue;
+            }
+            if (ch === '"') {
+                inString = !inString;
+                continue;
+            }
+            if (inString)
+                continue;
+            if (ch === '{')
+                depth++;
+            else if (ch === '}') {
+                depth--;
+                if (depth === 0)
+                    return text.substring(start, i + 1);
+            }
+        }
+        return null;
+    }
     /**
      * 流式生成：调用 callApiStream 进行流式输出，完成后构建完整的 ChatResult。
      * @param messages LangChain 消息列表
@@ -211,8 +245,8 @@ ${systemContext}
 ${format(lastMsg)}
 # Output Requirement
 1. Reasoning in <think> tags.
-2. Action: Name
-3. Arguments: {JSON}
+2. Action: ToolName
+3. Arguments: {"key": "value"} (MUST be a single-line compact JSON, no newlines inside)
 `.trim();
     }
     _llmType() {

package/lib/utils/getSystemPromptTemplate.js

@@ -15,7 +15,7 @@ Operating System: ${osPlatform}
 Before providing any output or calling a tool, you **MUST** conduct a deep logical analysis. Wrap your thought process within <think> tags.
 
 # Tool Call Specifications
-1. **Pure JSON Arguments**: Arguments must be a valid JSON object. NEVER wrap the entire JSON object in a string or quotes.
+1. **Pure JSON Arguments**: Arguments MUST be a single-line compact JSON object (no newlines, no pretty-printing). NEVER wrap the entire JSON object in a string or quotes. Example: Arguments: {"path": "/foo", "content": "bar"}
 2. **No Double Escaping**: Do not double-escape characters within the JSON.
 3. **No Idle Operations**: If the task is complete or no tool is needed, DO NOT output any "Action" structure. Never use "None", "null", or empty strings as a tool name.
 4. **Important Note**: For optimal efficiency, when performing multiple operations, use batch_run_tools to invoke all relevant tools in parallel, rather than sequentially. Prioritize parallel tool invocation whenever possible. For example, when reading three files, run three tool invocations in parallel to read all three files into the context simultaneously. When running multiple read-only commands (such as read_file_range, grep_search, or read_text_file), always run all commands in parallel. Use parallel tool invocations whenever possible, rather than running too many tools sequentially.

package/package.json

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