@saber2pr/ai-agent 0.0.28 → 0.0.30

package/lib/core/agent-graph.js

@@ -14,10 +14,10 @@ const prompts_1 = require("@langchain/core/prompts");
 const langgraph_1 = require("@langchain/langgraph");
 const prebuilt_1 = require("@langchain/langgraph/prebuilt");
 const openai_1 = require("@langchain/openai");
-const builtin_1 = require("../tools/builtin");
-const convertToLangChainTool_1 = require("../utils/convertToLangChainTool");
 const index_js_1 = require("@modelcontextprotocol/sdk/client/index.js");
 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");
 exports.CONFIG_FILE = path_1.default.join(os_1.default.homedir(), ".saber2pr-agent.json");
 // ✅ 全局设置：修复 AbortSignal 监听器数量警告

package/lib/core/agent.js

@@ -42,11 +42,11 @@ const openai_1 = __importDefault(require("openai"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const readline = __importStar(require("readline"));
+const zod_to_json_schema_1 = require("zod-to-json-schema");
 const index_js_1 = require("@modelcontextprotocol/sdk/client/index.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/client/stdio.js");
 const config_1 = require("../config/config");
 const builtin_1 = require("../tools/builtin");
-const zod_to_json_schema_1 = require("zod-to-json-schema");
 const jsonSchemaToZod_1 = require("../utils/jsonSchemaToZod");
 class McpAgent {
     constructor(options) {

package/lib/tools/ts-lsp/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTsLspTools = void 0;
+const zod_1 = require("zod");
 const ts_context_mcp_1 = require("@saber2pr/ts-context-mcp");
 const createTool_1 = require("../../utils/createTool");
-const zod_1 = require("zod");
 const getTsLspTools = (targetDir) => {
     const engine = new ts_context_mcp_1.PromptEngine(targetDir);
     return [

package/lib/types/type.d.ts

@@ -1,5 +1,5 @@
-import { Client } from '@modelcontextprotocol/sdk/client/index';
 import { z } from 'zod';
+import { Client } from '@modelcontextprotocol/sdk/client/index';
 import { AgentGraphModel } from '../model/AgentGraphModel';
 export interface ApiConfig {
     baseURL: string;

package/lib/utils/convertToLangChainTool.d.ts

@@ -1,5 +1,5 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { ToolInfo } from "../types/type";
+import { DynamicStructuredTool } from '@langchain/core/tools';
+import { ToolInfo } from '../types/type';
 export declare function convertToLangChainTool(info: ToolInfo): DynamicStructuredTool<import("zod").ZodObject<any, import("zod").UnknownKeysParam, import("zod").ZodTypeAny, {
     [x: string]: any;
 }, {

package/lib/utils/createTool.d.ts

@@ -1,5 +1,5 @@
-import { ToolInfo } from '../types/type';
 import { z } from 'zod';
+import { ToolInfo } from '../types/type';
 export interface CreateToolOptions {
     name: string;
     description: string;

package/lib/utils/jsonSchemaToZod.js

@@ -1,65 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonSchemaToZod = jsonSchemaToZod;
-const zod_1 = require("zod");
+const zod_from_json_schema_1 = require("zod-from-json-schema");
 function jsonSchemaToZod(parameters) {
-    var _a;
-    // ✅ 跨版本/跨实例的特征检测
-    const isZod = parameters && (typeof parameters.safeParse === 'function' || // 所有 Zod 类型都有
-        !!parameters._def || // Zod 内部定义属性
-        !!parameters.shape // 专门针对 ZodObject 的特征
-    );
-    if (isZod) {
-        return parameters;
-    }
-    if (!parameters || typeof parameters !== 'object') {
-        return zod_1.z.object({}).passthrough();
-    }
-    // 辅助函数：递归转换单个属性
-    function convertProp(prop) {
-        let schema = zod_1.z.any();
-        if (prop.type === "string") {
-            schema = zod_1.z.string();
-        }
-        else if (prop.type === "number") {
-            schema = zod_1.z.number();
-        }
-        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);
-        }
-        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.nullable();
-    }
-    // 使用 passthrough 或 loose 以增加容错性
-    return zod_1.z.object(obj);
+    return (0, zod_from_json_schema_1.convertJsonSchemaToZod)(parameters);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saber2pr/ai-agent",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "AI Assistant CLI.",
   "author": "saber2pr",
   "license": "ISC",
@@ -35,6 +35,7 @@
     "minimatch": "^10.0.1",
     "openai": "^6.16.0",
     "zod": "3.25",
+    "zod-from-json-schema": "^0.1.0",
     "zod-to-json-schema": "3.23.2"
   },
   "resolutions": {