@saber2pr/ai-agent 0.0.67 → 0.0.69

package/lib/tools/loader/batch_run_tools.js

@@ -4,10 +4,44 @@ exports.batchRunTools = void 0;
 const zod_1 = require("zod");
 const createTool_1 = require("../../utils/createTool");
 const kit_1 = require("../../utils/kit");
+const formatOutput = (output) => {
+    // 1. 处理空值
+    if (output === null || output === undefined)
+        return String(output);
+    // 2. 处理数组 (MCP 常见返回格式)
+    if (Array.isArray(output)) {
+        // 尝试提取所有 text 类型的 content 并合并，如果不是 MCP 格式则递归处理
+        const isMcpStyle = output.every(item => item && typeof item === 'object' && 'type' in item);
+        if (isMcpStyle) {
+            return output
+                .map(item => {
+                if (item.type === 'text')
+                    return item.text;
+                if (item.type === 'resource')
+                    return `[Resource: ${item.resource?.uri}]`;
+                return JSON.stringify(item); // 无法识别的 MCP 类型（如 image）保持 JSON
+            })
+                .join('\n');
+        }
+        // 普通数组递归处理
+        return output.map(item => formatOutput(item)).join('\n');
+    }
+    // 3. 处理单个对象
+    if (typeof output === 'object') {
+        // 处理单个 MCP 文本对象
+        if (output.type === 'text' && typeof output.text === 'string') {
+            return output.text;
+        }
+        // 其他对象转为格式化 JSON
+        return JSON.stringify(output, null, 2);
+    }
+    // 4. 基本类型直接转 String
+    return String(output);
+};
 exports.batchRunTools = (0, createTool_1.createTool)({
     name: 'batch_run_tools',
     // 使用更具指令性的英文描述
-    description: `Execute multiple tools in parallel. Use this for independent tasks such as reading multiple files, applying unrelated edits to different files, or fetching diagnostics simultaneously. CRITICAL: DO NOT apply multiple edits to the same file within a single batch to avoid write conflicts.`,
+    description: `Execute multiple read-only tools in parallel. Such as reading multiple files or fetching diagnostics simultaneously.`,
     parameters: zod_1.z.object({
         actions: zod_1.z.array(zod_1.z.object({
             // 字段名和描述对齐 AI 习惯
@@ -18,6 +52,11 @@ exports.batchRunTools = (0, createTool_1.createTool)({
     handler: async ({ actions }, context) => {
         // 1. 获取所有可用工具的映射
         const toolMap = (0, kit_1.getArray)(context?.allTools).reduce((acc, tool) => ({ ...acc, [tool.function.name]: tool }), {});
+        // 2. 预检：拦截并发写入行为
+        const writeTools = actions.filter(action => /edit|write|replace|delete/i.test(action.tool_name));
+        if (writeTools.length > 0) {
+            return `Error: Parallel write operations detected (${writeTools.map(t => t.tool_name).join(', ')}). Batching is ONLY allowed for READ-ONLY operations.`;
+        }
         if (Object.keys(toolMap).length === 0) {
             return 'Error: Failed to retrieve tool execution context.';
         }
@@ -49,8 +88,6 @@ exports.batchRunTools = (0, createTool_1.createTool)({
                 };
             }
         }));
-        // 3. 格式化输出结果
-        // 虽然参数改成了英文，但返回给 AI 的结果标题可以保留清晰的结构
-        return results.map(res => `### Tool: ${res.tool_name} (${res.status})\n${res.output}\n---`).join('\n');
+        return results.map(res => `### Tool: ${res.tool_name} (${res.status})\n${formatOutput(res.output)}\n---`).join('\n');
     }
 });

package/lib/utils/getSystemPromptTemplate.js

@@ -1,8 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSystemPromptTemplate = void 0;
+const os_1 = __importDefault(require("os"));
 const getSystemPromptTemplate = (targetDir) => {
-    return `You are an expert software engineer. Working directory: ${targetDir}.
+    const osPlatform = os_1.default.platform();
+    return `You are an expert software engineer. 
+Working directory: ${targetDir}
+Operating System: ${osPlatform}
 
 # Mandatory Thinking Process
 Before providing any output or calling a tool, you **MUST** conduct a deep logical analysis. Wrap your thought process within <think> tags.
@@ -21,6 +28,14 @@ Before providing any output or calling a tool, you **MUST** conduct a deep logic
   2.3 **Analyze**: Conduct a deep analysis of the parameter structures, implementation logic, invocation patterns, and error-handling strategies.
 3. **Code Consistency**: When implementing code, you must strictly replicate the established best practices and patterns found within the project.
 
+- ** grep_search rules **：
+  - CRITICAL: Start with a broad set of queries that capture keywords based on the USER's request and provided context.
+  - MANDATORY: Run multiple Grep searches in parallel with different patterns and variations; exact matches often miss related code.
+  - Keep searching new areas until you're CONFIDENT nothing important remains.
+  - When you have found some relevant code, narrow your search and read the most likely important files.
+  - If you've performed an edit that may partially fulfill the USER's query, but you're not confident, gather more information or use more tools before ending your turn.
+  Bias towards not asking the user for help if you can find the answer yourself.
+
 # Core Instructions
 1. **Termination Criterion**: Once you have read the requested files, answered the questions, or completed the code implementation, you must provide the final response immediately.
 2. **Response Format**: Upon task completion, start your summary with "Final Answer:". No further tool calls should be made after this point.

package/package.json

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