@nickyzj2023/ai 1.3.0 → 1.3.1

package/dist/cli.mjs

@@ -1,11 +1,9 @@
-import { a as defineTool, i as defineModel, n as get_weather_default, o as runAgent, r as get_time_default } from "./src-Dm0rwYe2.mjs";
-import { extractErrorMessage, isObject, omit } from "@nickyzj2023/utils";
+import { a as get_time_default, c as runAgent, i as get_weather_default, o as defineModel, r as loadMCPTools } from "./src-DEDOOez9.mjs";
+import { extractErrorMessage } from "@nickyzj2023/utils";
 import readline from "node:readline";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { Client } from "@modelcontextprotocol/sdk/client";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 //#region src/utils/config.ts
 /**
 * 获取全局配置文件路径（Windows/macOS/Linux通用）
@@ -178,61 +176,6 @@ var TUI = class {
 	}
 };
 //#endregion
-//#region src/tools/mcp.ts
-/** 全局单例MCP加载器 */
-let router = null;
-var MCPRouter = class {
-	entries = /* @__PURE__ */ new Map();
-	/** 注册一个新的MCP客户端 */
-	async addClient(name, url, options) {
-		if (this.entries.has(name)) return;
-		const transport = new StreamableHTTPClientTransport(new URL(url), { requestInit: { headers: options?.headers } });
-		const client = new Client({
-			name,
-			version: "1.0.0"
-		});
-		await client.connect(transport);
-		const { tools } = await client.listTools();
-		const normalizedTools = tools.filter((tool) => !options?.ignoredToolNames?.includes(tool.name)).map((tool) => {
-			const _properties = { ...tool.inputSchema.properties ?? {} };
-			tool.inputSchema.required?.forEach((key) => {
-				if (isObject(_properties[key])) _properties[key] = {
-					..._properties[key],
-					required: true
-				};
-			});
-			return defineTool(tool.name, tool.description ?? "", _properties, (args) => client.callTool({
-				name: tool.name,
-				arguments: args
-			}));
-		});
-		this.entries.set(name, {
-			client,
-			tools: normalizedTools
-		});
-		return client;
-	}
-	/** 返回OpenAI API兼容的tools数组 */
-	async getTools() {
-		return [...this.entries.values()].flatMap((e) => e.tools);
-	}
-};
-/**
-* 把传入的MCPServer列表转换成OpenAI API兼容的tools数组
-*/
-const loadMCPTools = async (mcpServers) => {
-	router ||= new MCPRouter();
-	await Promise.allSettled(Object.entries(mcpServers).map(async ([name, server]) => {
-		try {
-			await router?.addClient(name, server.url, omit(server, ["type", "url"]));
-			console.log(`已加载MCP工具：${name}`);
-		} catch (e) {
-			console.error(`MCP服务器${name}连接失败，跳过：${extractErrorMessage(e)}`);
-		}
-	}));
-	return router.getTools();
-};
-//#endregion
 //#region src/cli.ts
 /** 启动交互对话：配置来自全局配置文件，环境变量可临时覆盖 */
 const startChat = async () => {

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+import { Client } from "@modelcontextprotocol/sdk/client";
 //#region src/types.d.ts
 type Model = {
   baseUrl: string;
@@ -148,6 +149,58 @@ declare const _default: ToolDefinition;
 //#region src/tools/get-weather.d.ts
 declare const _default$1: ToolDefinition;
 //#endregion
+//#region src/tools/mcp.d.ts
+type McpServer = {
+  type: "streamable_http" | "sse";
+  url: string;
+  headers?: Record<string, any>;
+  ignoredToolNames?: string[];
+};
+declare class MCPRouter {
+  private entries;
+  /** 注册一个新的MCP客户端 */
+  addClient(name: string, url: string, options?: Omit<McpServer, "type" | "url">): Promise<Client<{
+    method: string;
+    params?: {
+      [x: string]: unknown;
+      _meta?: {
+        [x: string]: unknown;
+        progressToken?: string | number | undefined;
+        "io.modelcontextprotocol/related-task"?: {
+          taskId: string;
+        } | undefined;
+      } | undefined;
+    } | undefined;
+  }, {
+    method: string;
+    params?: {
+      [x: string]: unknown;
+      _meta?: {
+        [x: string]: unknown;
+        progressToken?: string | number | undefined;
+        "io.modelcontextprotocol/related-task"?: {
+          taskId: string;
+        } | undefined;
+      } | undefined;
+    } | undefined;
+  }, {
+    [x: string]: unknown;
+    _meta?: {
+      [x: string]: unknown;
+      progressToken?: string | number | undefined;
+      "io.modelcontextprotocol/related-task"?: {
+        taskId: string;
+      } | undefined;
+    } | undefined;
+  }> | undefined>;
+  /** 返回OpenAI API兼容的tools数组 */
+  getTools(): Promise<ToolDefinition[]>;
+}
+/**
+ * 把传入的MCPServer列表转换成OpenAI API兼容的tools数组
+ */
+declare const loadMCPTools: (mcpServers: Record<string, McpServer>) => Promise<ToolDefinition[]>;
+//#endregion
 //#region src/utils/compact/types.d.ts
 declare namespace Compact {
   type Options = {
@@ -260,4 +313,4 @@ declare const defineModel: (config: Model) => Model;
  */
 declare const defineTool: (name: ToolDefinition["function"]["name"], description: ToolDefinition["function"]["description"], properties: ToolDefinition["function"]["parameters"]["properties"], execute: ToolDefinition["execute"]) => ToolDefinition;
 //#endregion
-export { type AgentEvent, type AudioContent, type ChatCompletionsChunk, type ContentPart, type FinishReason, type ImageContent, type LLMEvent, type Message, type Modality, type Model, type TextContent, type ToolCall, type ToolDefinition, type Usage, type VideoContent, compact, defineModel, defineTool, _default as getTime, _default$1 as getWeather, runAgent };
+export { type AgentEvent, type AudioContent, type ChatCompletionsChunk, type ContentPart, type FinishReason, type ImageContent, type LLMEvent, MCPRouter, McpServer, type Message, type Modality, type Model, type TextContent, type ToolCall, type ToolDefinition, type Usage, type VideoContent, compact, defineModel, defineTool, _default as getTime, _default$1 as getWeather, loadMCPTools, runAgent };

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { a as defineTool, i as defineModel, n as get_weather_default, o as runAgent, r as get_time_default, t as compact } from "./src-Dm0rwYe2.mjs";
-export { compact, defineModel, defineTool, get_time_default as getTime, get_weather_default as getWeather, runAgent };
+import { a as get_time_default, c as runAgent, i as get_weather_default, n as MCPRouter, o as defineModel, r as loadMCPTools, s as defineTool, t as compact } from "./src-DEDOOez9.mjs";
+export { MCPRouter, compact, defineModel, defineTool, get_time_default as getTime, get_weather_default as getWeather, loadMCPTools, runAgent };

package/dist/{src-Dm0rwYe2.mjs → src-DEDOOez9.mjs}

@@ -1,4 +1,6 @@
-import { createXMLText, fetcher, logger, parseSSE, pick, to } from "@nickyzj2023/utils";
+import { createXMLText, extractErrorMessage, fetcher, isObject, logger, omit, parseSSE, pick, to } from "@nickyzj2023/utils";
+import { Client } from "@modelcontextprotocol/sdk/client";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 //#region src/llm.ts
 /**
 * 分离ToolDefinition中的valid/invalid字段，前者可以传给模型，后者用于本地运算
@@ -229,6 +231,61 @@ var get_weather_default = defineTool("get_weather", "查询指定城市的天气
 	return fetcher("https://wttr.in", { params: { format: "j1" } }).get(`/${city}`);
 });
 //#endregion
+//#region src/tools/mcp.ts
+/** 全局单例MCP加载器 */
+let router = null;
+var MCPRouter = class {
+	entries = /* @__PURE__ */ new Map();
+	/** 注册一个新的MCP客户端 */
+	async addClient(name, url, options) {
+		if (this.entries.has(name)) return;
+		const transport = new StreamableHTTPClientTransport(new URL(url), { requestInit: { headers: options?.headers } });
+		const client = new Client({
+			name,
+			version: "1.0.0"
+		});
+		await client.connect(transport);
+		const { tools } = await client.listTools();
+		const normalizedTools = tools.filter((tool) => !options?.ignoredToolNames?.includes(tool.name)).map((tool) => {
+			const _properties = { ...tool.inputSchema.properties ?? {} };
+			tool.inputSchema.required?.forEach((key) => {
+				if (isObject(_properties[key])) _properties[key] = {
+					..._properties[key],
+					required: true
+				};
+			});
+			return defineTool(tool.name, tool.description ?? "", _properties, (args) => client.callTool({
+				name: tool.name,
+				arguments: args
+			}));
+		});
+		this.entries.set(name, {
+			client,
+			tools: normalizedTools
+		});
+		return client;
+	}
+	/** 返回OpenAI API兼容的tools数组 */
+	async getTools() {
+		return [...this.entries.values()].flatMap((e) => e.tools);
+	}
+};
+/**
+* 把传入的MCPServer列表转换成OpenAI API兼容的tools数组
+*/
+const loadMCPTools = async (mcpServers) => {
+	router ||= new MCPRouter();
+	await Promise.allSettled(Object.entries(mcpServers).map(async ([name, server]) => {
+		try {
+			await router?.addClient(name, server.url, omit(server, ["type", "url"]));
+			logger(`已激活MCP客户端：${name}`);
+		} catch (e) {
+			logger(`MCP服务器${name}连接失败，跳过：${extractErrorMessage(e)}`);
+		}
+	}));
+	return router.getTools();
+};
+//#endregion
 //#region src/utils/compact/helper.ts
 /**
 * 校验assistant(tool_calls)消息
@@ -428,4 +485,4 @@ const compact = Object.assign(async (messages, model, options) => {
 	discardMessagesUntil
 });
 //#endregion
-export { defineTool as a, defineModel as i, get_weather_default as n, runAgent as o, get_time_default as r, compact as t };
+export { get_time_default as a, runAgent as c, get_weather_default as i, MCPRouter as n, defineModel as o, loadMCPTools as r, defineTool as s, compact as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nickyzj2023/ai",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "我的“pi”，参考了pi-from-scratch",
   "type": "module",
   "main": "./dist/index.mjs",