@saber2pr/ai-agent 0.0.30 → 0.0.32

package/lib/core/agent-graph.js

@@ -19,6 +19,7 @@ const stdio_js_1 = require("@modelcontextprotocol/sdk/client/stdio.js");
 const builtin_1 = require("../tools/builtin");
 const convertToLangChainTool_1 = require("../utils/convertToLangChainTool");
 const jsonSchemaToZod_1 = require("../utils/jsonSchemaToZod");
+const formatSchema_1 = require("../utils/formatSchema");
 exports.CONFIG_FILE = path_1.default.join(os_1.default.homedir(), ".saber2pr-agent.json");
 // ✅ 全局设置：修复 AbortSignal 监听器数量警告
 // LangChain 的 HTTP 客户端会创建多个 AbortSignal，需要增加默认限制
@@ -91,8 +92,7 @@ class McpGraphAgent {
             const schema = tool.schema;
             if (schema && schema.shape) {
                 // 如果是 ZodObject，打印其内部 key
-                const keys = Object.keys(schema.shape);
-                console.log(`   参数结构: [ ${keys.join(", ")} ]`);
+                console.log(`   参数结构:\n${(0, formatSchema_1.formatSchema)(schema)}`);
             }
             else if (schema && schema._def) {
                 // 兼容其他 Zod 类型
@@ -365,13 +365,19 @@ class McpGraphAgent {
 进度：{doneCount}/{targetCount}
 已审计文件：{auditedList}
 
-# 格式要求
+# 🛠️ 工具调用规范
 1. Arguments 必须是纯粹的 JSON 对象，严禁将其作为字符串放入引号中。
 2. 严禁对 JSON 内容进行二次转义。
+3. **禁止空操作**：如果你认为任务已完成或不需要调用工具，请不要输出任何 Action 结构。严禁使用 "None"、"null" 或空字符串作为工具名称。
 
-# 指令
-1. 避免陷入在同一个文件上的无限循环尝试。
-2. 不要重复调用相同的工具和参数，如果工具已经返回结果，请基于结果继续工作而不是再次调用。{recentToolCalls}
+# 🎯 核心指令
+1. **任务终结判定**：当你已经读取了用户要求的文件、回答了问题或完成了审计目标时，必须立即提供最终回复。
+2. **回复格式**：任务完成时，请以 "Final Answer:" 开头进行总结，此时不再调用任何工具。
+3. **避免重复**：不要重复调用相同的工具和参数。如果工具返回错误，请分析原因（如参数 Schema 错误）而不是盲目重试。{recentToolCalls}
+
+# 📝 审计任务专项
+1. 避免在同一个文件上陷入无限循环尝试。
+2. 优先通过 \`list_directory\` 了解全局，再深入具体文件。
 {extraPrompt}`;
         // 2. 核心逻辑：处理消息上下文
         let inputMessages;

package/lib/tools/filesystem/index.js

@@ -13,8 +13,8 @@ const lib_1 = require("./lib");
 // Schema definitions
 const ReadTextFileArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
-    tail: zod_1.z.number().nullable().describe('If provided, returns only the last N lines of the file'),
-    head: zod_1.z.number().nullable().describe('If provided, returns only the first N lines of the file')
+    tail: zod_1.z.number().optional().describe('If provided, returns only the last N lines of the file'),
+    head: zod_1.z.number().optional().describe('If provided, returns only the first N lines of the file')
 });
 const ReadMultipleFilesArgsSchema = zod_1.z.object({
     paths: zod_1.z
@@ -33,7 +33,7 @@ const EditOperation = zod_1.z.object({
 const EditFileArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
     edits: zod_1.z.array(EditOperation),
-    dryRun: zod_1.z.boolean().nullable().default(false).describe('Preview changes using git-style diff format')
+    dryRun: zod_1.z.boolean().optional().default(false).describe('Preview changes using git-style diff format')
 });
 const CreateDirectoryArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
@@ -43,11 +43,11 @@ const ListDirectoryArgsSchema = zod_1.z.object({
 });
 const ListDirectoryWithSizesArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
-    sortBy: zod_1.z.enum(['name', 'size']).nullable().default('name').describe('Sort entries by name or size'),
+    sortBy: zod_1.z.enum(['name', 'size']).optional().default('name').describe('Sort entries by name or size'),
 });
 const DirectoryTreeArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
-    excludePatterns: zod_1.z.array(zod_1.z.string()).nullable().default([])
+    excludePatterns: zod_1.z.array(zod_1.z.string()).optional().default([])
 });
 const MoveFileArgsSchema = zod_1.z.object({
     source: zod_1.z.string(),
@@ -56,7 +56,7 @@ const MoveFileArgsSchema = zod_1.z.object({
 const SearchFilesArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),
     pattern: zod_1.z.string(),
-    excludePatterns: zod_1.z.array(zod_1.z.string()).nullable().default([])
+    excludePatterns: zod_1.z.array(zod_1.z.string()).optional().default([])
 });
 const GetFileInfoArgsSchema = zod_1.z.object({
     path: zod_1.z.string(),

package/lib/utils/formatSchema.d.ts

@@ -0,0 +1,2 @@
+import { z } from 'zod';
+export declare function formatSchema(schema: z.ZodObject<any>): string;

package/lib/utils/formatSchema.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatSchema = formatSchema;
+const zod_to_json_schema_1 = __importDefault(require("zod-to-json-schema"));
+function formatSchema(schema) {
+    const res = (0, zod_to_json_schema_1.default)(schema);
+    if (typeof res.properties === 'object') {
+        const requiredKeys = res.required || [];
+        const lines = [];
+        for (const key in res.properties) {
+            lines.push(`     - ${key}: ${res.properties[key].type}${requiredKeys.includes(key) ? " (required)" : ""}`);
+        }
+        if (lines.length > 0) {
+            return lines.join("\n");
+        }
+        return "No parameters";
+    }
+    const keys = Object.keys(schema.shape);
+    return keys.join(", ");
+}

package/package.json

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