@nickyzj2023/ai 1.5.0 → 1.6.1

package/README.md

@@ -1,64 +1,83 @@
-# ai
-
-男生自用Coding Agent，参考了[nanopi教学](https://pi-from-scratch.vercel.app/)
-
-不断学习+开发中，当前项目仍属于比nano还简陋的“bare-pi”，but one day...
-
-![demo](demo.gif)
-
-## 安装
-
-```bash
-# npm
-npm install @nickyzj2023/ai
-
-# yarn
-yarn add @nickyzj2023/ai
-
-# pnpm
-pnpm add @nickyzj2023/ai
-```
-
-## 使用方式
-
-### 在项目里使用
-
-```typescript
-import { defineModel, runAgent, getWeather } from "@nickyzj2023/ai";
-
-const model = defineModel({
-  baseUrl: "https://api.deepseek.com/v1",
-  apiKey: process.env.APIKEY,
-  model: "deepseek-v4-flash",
-});
-
-const tools = [
-  // 内置工具
-  getWeather,
-  getTime,
-  // 自定义工具
-  defineTool("getRandomNumber", "生成随机数字", {min: {type: "number", description: "最小区间"}, max: {type:"number", description:"最大区间"}}, () => 33550336),
-];
-
-const messages = [{ role: "user", content: "随机一个负无穷到正无穷的整数" }];
-
-for await (const e of runAgent(model, messages, tools)) {
-  console.log(e);
-}
-```
-
-### 在终端里使用
-
-```bash
-# 首次使用：交互式配置BASE_URL / APIKEY / MODEL / ...
-ai setup
-
-# 启动对话
-ai
-```
-
-配置保存在 `~/.@nickyzj2023/ai/config.json`，任意目录下执行`ai`都能读取到
-
-## License
-
-ISC
+# ai
+
+男生自用Coding Agent，参考了[nanopi教学](https://pi-from-scratch.vercel.app/)
+
+不断学习+开发中，当前项目仍属于比nano还简陋的“bare-pi”，but one day...
+
+![demo](demo.gif)
+
+## 安装
+
+```bash
+# npm
+npm install @nickyzj2023/ai
+
+# yarn
+yarn add @nickyzj2023/ai
+
+# pnpm
+pnpm add @nickyzj2023/ai
+```
+
+## 使用方式
+
+### 在项目里使用
+
+```typescript
+import { defineModel, runAgent, getWeather } from "@nickyzj2023/ai";
+// MCP体积较大（200kb），有需要时单独引入
+import { loadMCPTools } from "@nickyzj2023/ai/mcp";
+
+const model = defineModel({
+  baseUrl: "https://api.deepseek.com/v1",
+  apiKey: process.env.APIKEY,
+  model: "deepseek-v4-flash",
+});
+
+const tools = [
+  // 内置工具
+  getWeather,
+  getTime,
+  // MCP工具
+  ..(await loadMCPTools({
+    exa: {
+			type: "streamable_http",
+			url: "https://mcp.exa.ai/mcp",
+			headers: {
+				"x-api-key": "xxxxx",
+			},
+		}
+  })),
+  // 自定义工具
+  defineTool("skipReply", "跳过本轮回复", {reason: {type: "string", description: "不回复的理由"}}, () => {
+    const error = new Error(`模型保持沉默，理由：${reason}`);
+		error.name = "skipReply";
+		throw error;
+  }),
+];
+
+const messages = [{ role: "user", content: "随机一个负无穷到正无穷的整数" }];
+
+for await (const e of runAgent(model, messages, tools)) {
+  console.log(e);
+}
+```
+
+### 在终端里使用
+
+```bash
+# 首次使用：交互式配置BASE_URL / APIKEY / MODEL / ...
+ai setup
+
+# 启动对话
+ai
+
+# 直接开聊，本质是“ai->输入提示词->回车”的语法糖
+ai 你好
+```
+
+配置保存在 `~/.@nickyzj2023/ai/config.json`，任意目录下执行`ai`都能读取到
+
+## License
+
+ISC

package/dist/cli.mjs

@@ -1,4 +1,6 @@
-import { a as get_time_default, i as get_weather_default, o as runAgent, r as loadMCPTools, s as defineModel } from "./src-C1Zeveeb.mjs";
+import { i as runAgent, n as get_weather_default, r as get_time_default } from "./src-BzQy5h8z.mjs";
+import { t as defineModel } from "./helper-juLVGxlQ.mjs";
+import { n as loadMCPTools } from "./mcp-DcntQg-a.mjs";
 import { compactStr, extractErrorMessage, isObject } from "@nickyzj2023/utils";
 import readline from "node:readline";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -306,6 +308,8 @@ var TUI = class {
 	md = null;
 	/** 是否允许输入 */
 	isBusy = false;
+	/** 是否正停在提示符上等输入（决定printNotice要不要重绘提示符） */
+	isPrompting = false;
 	/** 上次打印内容所属的状态（reasoning/content/tool）
 	* 用于在新的状态开始时改变样式、打印前缀
 	*/
@@ -317,19 +321,28 @@ var TUI = class {
 	constructor(onPrompt) {
 		this.onPrompt = onPrompt;
 	}
-	/** 启动TUI */
-	start() {
+	/**
+	* 启动TUI
+	* @param initialPrompt 传入时先替用户发出这一轮（ai “提示词”的快捷方式），之后照常等输入
+	*/
+	start(initialPrompt) {
 		this.rl = readline.createInterface({
 			input: process.stdin,
 			output: process.stdout
 		});
 		process.stdin.on("keypress", this.onKeypress);
-		this.prompting();
 		this.rl.on("close", () => {
 			process.stdin.off("keypress", this.onKeypress);
 			this.rl?.close();
 			this.rl = null;
 		});
+		if (initialPrompt) {
+			process.stdout.write(`> ${initialPrompt}\n`);
+			this.submit({
+				text: initialPrompt,
+				images: []
+			});
+		} else this.prompting();
 	}
 	/** 监听用户的特定按键 */
 	onKeypress = (_str, key) => {
@@ -339,7 +352,9 @@ var TUI = class {
 	/** 监听用户输入 */
 	prompting() {
 		if (this.isBusy) return;
+		this.isPrompting = true;
 		this.rl?.question("> ", async (answer) => {
+			this.isPrompting = false;
 			await this.clipboardTask;
 			const text = answer.trim();
 			const images = this.pendingImages;
@@ -348,15 +363,22 @@ var TUI = class {
 				this.prompting();
 				return;
 			}
-			this.isBusy = true;
-			await this.onPrompt?.({
+			await this.submit({
 				text,
 				images
 			});
-			this.isBusy = false;
-			this.prompting();
 		});
 	}
+	/**
+	* 走完整的一轮：把输入交给调用方，结束后继续等用户输入
+	* @remarks 提示词来源可以是用户敲的，也可以是start()传进来的initialPrompt
+	*/
+	async submit(input) {
+		this.isBusy = true;
+		await this.onPrompt?.(input);
+		this.isBusy = false;
+		this.prompting();
+	}
 	/** 读取剪贴板图片，推入待发送列表 */
 	async attachImage() {
 		const image = await readClipboardImage();
@@ -399,6 +421,27 @@ var TUI = class {
 		if (!process.stdout.isTTY) return text;
 		return `\x1b[${ansiCode}m${text}\x1b[0m`;
 	}
+	/** 把一个Agent事件分发到对应的print方法上 */
+	render(event) {
+		switch (event.type) {
+			case "reasoning_delta":
+				this.printReasoning(event.delta);
+				break;
+			case "content_delta":
+				this.printContent(event.delta);
+				break;
+			case "tool_call":
+				this.printToolCall(event.name, event.args);
+				break;
+			case "tool_result":
+				this.printToolResult(event.name, event.result);
+				break;
+			case "error":
+				this.printContent(event.message);
+				break;
+			case "done": this.printFinish(event.finishReason, event.usage);
+		}
+	}
 	/** 流式打印AI思考内容（灰色） */
 	printReasoning(delta) {
 		if (this.preparePrint("reasoning_delta")) delta = `[思考内容] ${delta.replaceAll("\n", "")}`;
@@ -430,10 +473,10 @@ var TUI = class {
 		this.preparePrint("done");
 		process.stdout.write(this.colorize(`[本轮结束：${finishReason}] ${usage ? `输入${humanizeNumber(usage.prompt_tokens)}，输出${humanizeNumber(usage.completion_tokens)}，总共${humanizeNumber(usage.total_tokens)}` : ""}${usage?.speed ? `，速度${usage.speed}/秒` : ""}${finishReason === "stop" ? "\n\n" : "\n"}`, "90"));
 	}
-	/** 打印一行黄字提示，并重绘当前输入行 */
+	/** 打印一行黄字提示，正停在提示符上时顺便重绘输入行 */
 	printNotice(message) {
 		process.stdout.write(`${this.colorize(message, "93")}\n`);
-		this.rl?.prompt(true);
+		if (this.isPrompting) this.rl?.prompt(true);
 	}
 };
 //#endregion
@@ -452,8 +495,11 @@ const buildUserContent = (text, images) => {
 	content.push(...images);
 	return content;
 };
-/** 启动交互对话：配置来自全局配置文件，环境变量可临时覆盖 */
-const startChat = async () => {
+/**
+* 启动交互对话：配置来自全局配置文件，环境变量可临时覆盖
+* @param prompt 带上提示词时，先自动发出这一轮，之后照常继续对话
+*/
+const startChat = async (prompt) => {
 	const config = loadConfig();
 	if (!config) {
 		console.error("请先运行 `ai setup` 配置一个模型");
@@ -481,38 +527,23 @@ const startChat = async () => {
 			get_time_default,
 			...await mcpLoading
 		];
-		for await (const e of runAgent(model, messages, tools)) switch (e.type) {
-			case "reasoning_delta":
-				tui.printReasoning(e.delta);
-				break;
-			case "content_delta":
-				tui.printContent(e.delta);
-				break;
-			case "tool_call":
-				tui.printToolCall(e.name, e.args);
-				break;
-			case "tool_result":
-				tui.printToolResult(e.name, e.result);
-				break;
-			case "error":
-				tui.printContent(e.message);
-				break;
-			case "done": tui.printFinish(e.finishReason, e.usage);
-		}
+		for await (const e of runAgent(model, messages, tools)) tui.render(e);
 	});
-	tui.start();
+	tui.start(prompt);
 };
 /** 打印命令用法 */
 const printHelp = () => {
-	console.log(`用法: ai [命令]
+	console.log(`用法: ai [命令/提示词]
 
 	命令:
   --help    显示帮助
   setup     交互式配置模型APIKEY / BASE_URL / MODEL（保存到 ~/.@nickyzj2023/ai/config.json）
 
-不带命令则启动对话`);
+带上提示词时，启动对话的同时先把这段提示词发出去（如\`ai 明天适合洗车吗\`）
+不带参数则直接进入对话`);
 };
-const command = process.argv[2];
+const args = process.argv.slice(2);
+const command = args[0];
 switch (command) {
 	case void 0:
 		startChat();
@@ -525,8 +556,11 @@ switch (command) {
 		printHelp();
 		break;
 	default:
-		console.error(`未知命令：${command}（可以运行ai --help查看用法）`);
-		process.exit(1);
+		if (command.startsWith("-")) {
+			console.error(`未知命令：${command}（可以运行ai --help查看用法）`);
+			process.exit(1);
+		}
+		startChat(args.join(" ").trim() || void 0);
 }
 //#endregion
 export {};

package/dist/helper-juLVGxlQ.mjs

@@ -0,0 +1,65 @@
+//#region src/utils/helper.ts
+/**
+* 辅助定义一个POST /chat/completions支持的model参数
+* @remarks 只有baseUrl字段是必须的
+*/
+const defineModel = (config) => ({
+	modalities: ["text"],
+	context: 131072,
+	...config
+});
+/**
+* 辅助定义一个POST /chat/completions支持的tool对象
+* @param execute 实际执行工具的函数
+*/
+const defineTool = (name, description, properties, execute) => {
+	const _required = [];
+	return {
+		type: "function",
+		function: {
+			name,
+			description,
+			parameters: {
+				type: "object",
+				properties: Object.entries(properties).reduce((result, [key, property]) => {
+					if ("required" in property) {
+						_required.push(key);
+						delete property.required;
+					}
+					result[key] = property;
+					return result;
+				}, {}),
+				required: _required
+			}
+		},
+		execute
+	};
+};
+const segmenter = new Intl.Segmenter([], { granularity: "word" });
+const estimateTextTokens = (text) => {
+	let words = 0;
+	let others = 0;
+	for (const seg of segmenter.segment(text)) if (seg.isWordLike) words++;
+	else others++;
+	return Math.ceil(words * 1.5 + others / 4);
+};
+/**
+* 根据上下文里的中/英文/多模态消息，估算出可能消耗的token
+* - 单词 ≈ 1.5token
+* - 标点/空白等非词字符每4个 ≈ 1token
+* - 图片/音频/视频/文件 ≈ 4096token（不好估算，取个较大的值）
+*/
+const estimateTokens = (messages) => {
+	if (!messages?.length) return 0;
+	return messages.reduce((acc, message) => {
+		const { content, tool_calls, ...metadata } = message;
+		if (typeof content === "string") acc += estimateTextTokens(content);
+		else for (const part of content) if (part.type === "text") acc += estimateTextTokens(part.text);
+		else acc += 4096;
+		if (tool_calls) acc += estimateTextTokens(JSON.stringify(tool_calls));
+		acc += estimateTextTokens(JSON.stringify(metadata));
+		return acc;
+	}, 0);
+};
+//#endregion
+export { estimateTokens as i, defineTool as n, estimateTextTokens as r, defineModel as t };

package/dist/index.d.mts

@@ -1,208 +1,21 @@
-import { Client } from "@modelcontextprotocol/sdk/client";
-//#region src/types.d.ts
-type Model = {
-  baseUrl: string;
-  /** 如果不传，会尝试使用GET {baseUrl}/models获取到的第一个模型 */
-  model?: string;
-  /** 使用本地llama.cpp等服务时可以不填 */
-  apiKey?: string;
-  /**
-   * 模型支持的消息输入类型
-   * @default ["text"]
-   * @remarks 会在每轮对话前校验消息类型，存在不支持的输入时报错
-   */
-  modalities?: Modality[];
-  /**
-   * 模型的最大上下文
-   * @default 131072
-   * @remarks 会在每轮对话结束后检查上下文阈值，自动压缩消息
-   */
-  context?: number;
-  /**
-   * 自定义请求体，会在每轮请求时带上
-   * @example chat_template_kwargs: { enable_thinking: false }
-   */
-  [key: string]: unknown;
-};
-/** 文/图/音/视频，暂未实现文件输入 */
-type Modality = "text" | "image" | "audio" | "video";
-type Message = {
-  role: "system" | "user" | "assistant" | "tool";
-  reasoning?: string | null;
-  content: string | ContentPart[];
-  tool_calls?: ToolCall[];
-  tool_call_id?: string;
-  [key: string]: unknown;
-};
-type ContentPart = TextContent | ImageContent | AudioContent | VideoContent;
-type TextContent = {
-  type: "text";
-  text: string;
-};
-type ImageContent = {
-  type: "image_url";
-  image_url: {
-    url: string;
-  };
-};
-type AudioContent = {
-  type: "input_audio";
-  input_audio: {
-    /** 使用公网可访问的音频链接 */
-    url?: string;
-    /** 使用base64 */
-    data?: string;
-    format: string;
-  };
-};
-type VideoContent = {
-  type: "video_url";
-  video_url: {
-    url: string;
-  };
-};
-type ToolDefinition = {
-  type: "function";
-  function: {
-    name: string;
-    description: string;
-    parameters: {
-      type: "object";
-      properties: Record<string, {
-        type: string;
-        description?: string;
-        /** defineTool()提供的语法糖，等价于在parameters.required.push(当前property key) */
-        required?: boolean;
-      }>;
-      required?: string[];
-    };
-  };
-  /** 工具的实际执行函数 */
-  execute: (...args: any) => any;
-};
-type ToolCall = {
-  id: string;
-  type: "function";
-  function: {
-    name: string;
-    arguments: string;
-  };
-};
-/** stream()对外输出的事件 */
-type LLMEvent = {
-  type: "reasoning_delta";
-  delta: string;
-} | {
-  type: "content_delta";
-  delta: string;
-} | {
-  type: "tool_call";
-  id: string;
-  name: string;
-  args: any;
-} | {
-  type: "done";
-  finishReason: FinishReason;
-  usage?: Usage;
-} | {
-  type: "error";
-  message: string;
-};
-/** stream()内部要处理的事件流 */
-type ChatCompletionsChunk = {
-  id: string;
-  object: "chat.completion.chunk";
-  created: number;
-  model: string;
-  choices: {
-    index: number;
-    delta: Pick<Message, "reasoning" | "content"> & {
-      tool_calls?: ({
-        index: number;
-      } & Partial<ToolCall>)[];
-    };
-    finish_reason: FinishReason;
-  }[];
-  usage?: Usage;
-} | "[DONE]";
-/** 模型可能返回的finish_reason值：停止/工具调用/上下文超限 */
-type FinishReason = "stop" | "tool_calls" | "length" | null;
-type Usage = {
-  prompt_tokens: number;
-  completion_tokens: number;
-  total_tokens: number;
-  /** 每秒生成多少个token */
-  speed?: number;
-  [key: string]: any;
-};
-type AgentEvent = LLMEvent | {
-  type: "tool_result";
-  id: string;
-  name: string;
-  result: string;
-};
-//#endregion
+import { a as FinishReason, c as Message, d as TextContent, f as ToolCall, h as VideoContent, i as ContentPart, l as Modality, m as Usage, n as AudioContent, o as ImageContent, p as ToolDefinition, r as ChatCompletionsChunk, s as LLMEvent, t as AgentEvent, u as Model } from "./types--dXFoUow.mjs";
 //#region src/agent.d.ts
 declare function runAgent(model: Model, messages: Message[], tools: ToolDefinition[]): AsyncGenerator<AgentEvent>;
 //#endregion
+//#region src/llm.d.ts
+/**
+ * 流式请求模型，转发
+ */
+declare function stream(model: Model, messages: Message[], tools?: ToolDefinition[], options?: Omit<RequestInit, "body"> & {
+  body?: Record<string, unknown>;
+}): AsyncGenerator<LLMEvent>;
+//#endregion
 //#region src/tools/get-time.d.ts
 declare const _default: ToolDefinition;
 //#endregion
 //#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 = {
@@ -264,6 +77,8 @@ declare namespace Compact {
     /** 指导大模型如何总结消息 */
     systemPrompt: string;
     model: Model;
+    /** 触发总结前的钩子 */
+    beforeSummarize?: (summarizable: Message[]) => void | Promise<void>;
   };
   type Result = {
     /** 是否压缩了工具调用结果 */
@@ -321,5 +136,13 @@ declare const defineModel: (config: Model) => Model;
  * @param execute 实际执行工具的函数
  */
 declare const defineTool: (name: ToolDefinition["function"]["name"], description: ToolDefinition["function"]["description"], properties: ToolDefinition["function"]["parameters"]["properties"], execute: ToolDefinition["execute"]) => ToolDefinition;
+declare const estimateTextTokens: (text: string) => number;
+/**
+ * 根据上下文里的中/英文/多模态消息，估算出可能消耗的token
+ * - 单词 ≈ 1.5token
+ * - 标点/空白等非词字符每4个 ≈ 1token
+ * - 图片/音频/视频/文件 ≈ 4096token（不好估算，取个较大的值）
+ */
+declare const estimateTokens: (messages?: Message[]) => number;
 //#endregion
-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 };
+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, estimateTextTokens, estimateTokens, _default as getTime, _default$1 as getWeather, runAgent, stream };

package/dist/index.mjs

@@ -1,2 +1,3 @@
-import { a as get_time_default, c as defineTool, i as get_weather_default, n as MCPRouter, o as runAgent, r as loadMCPTools, s as defineModel, t as compact } from "./src-C1Zeveeb.mjs";
-export { MCPRouter, compact, defineModel, defineTool, get_time_default as getTime, get_weather_default as getWeather, loadMCPTools, runAgent };
+import { a as stream, i as runAgent, n as get_weather_default, r as get_time_default, t as compact } from "./src-BzQy5h8z.mjs";
+import { i as estimateTokens, n as defineTool, r as estimateTextTokens, t as defineModel } from "./helper-juLVGxlQ.mjs";
+export { compact, defineModel, defineTool, estimateTextTokens, estimateTokens, get_time_default as getTime, get_weather_default as getWeather, runAgent, stream };

package/dist/mcp-DcntQg-a.mjs

@@ -0,0 +1,58 @@
+import { n as defineTool } from "./helper-juLVGxlQ.mjs";
+import { extractErrorMessage, isObject, logger, omit } from "@nickyzj2023/utils";
+//#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 [{ Client }, { StreamableHTTPClientTransport }] = await Promise.all([import("@modelcontextprotocol/sdk/client"), import("@modelcontextprotocol/sdk/client/streamableHttp.js")]);
+		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"]));
+		} catch (e) {
+			logger(`MCP服务器${name}加载失败：${extractErrorMessage(e)}`);
+		}
+	}));
+	return router.getTools();
+};
+//#endregion
+export { loadMCPTools as n, MCPRouter as t };

package/dist/{src-C1Zeveeb.mjs → src-BzQy5h8z.mjs}

@@ -1,6 +1,5 @@
-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";
+import { i as estimateTokens, n as defineTool, r as estimateTextTokens } from "./helper-juLVGxlQ.mjs";
+import { createXMLText, extractErrorMessage, fetcher, logger, parseSSE, pick, to } from "@nickyzj2023/utils";
 //#region src/llm.ts
 /**
 * 分离ToolDefinition中的valid/invalid字段，前者可以传给模型，后者用于本地运算
@@ -22,7 +21,7 @@ const extractReasoning = (msgLike) => {
 /**
 * 流式请求模型，转发
 */
-async function* stream(model, messages, tools = []) {
+async function* stream(model, messages, tools = [], options) {
 	const validTools = tools.map((tool) => detachToolArguments(tool)[0]);
 	const api = fetcher(model.baseUrl, {
 		headers: { Authorization: `Bearer ${model.apiKey}` },
@@ -32,9 +31,11 @@ async function* stream(model, messages, tools = []) {
 		stream: true,
 		model: model.model,
 		messages,
-		tools: validTools
-	}));
+		tools: validTools,
+		...options?.body
+	}, options));
 	if (error) {
+		if (options?.signal?.aborted) return;
 		yield {
 			type: "error",
 			message: error.message
@@ -44,39 +45,48 @@ async function* stream(model, messages, tools = []) {
 	const toolCallBuffers = /* @__PURE__ */ new Map();
 	let usage;
 	let finishReason = null;
-	for await (const chunk of parseSSE(response)) {
-		if (typeof chunk === "string") continue;
-		if (chunk.usage) usage = chunk.usage;
-		const choice = chunk.choices?.[0];
-		if (!choice) continue;
-		const { delta } = choice;
-		const { content: contentDelta, tool_calls: toolCalls } = delta;
-		const reasoning = extractReasoning(delta);
-		if (reasoning) yield {
-			type: "reasoning_delta",
-			delta: reasoning
-		};
-		if (contentDelta) yield {
-			type: "content_delta",
-			delta: contentDelta.toString()
-		};
-		if (toolCalls) for (const call of toolCalls) {
-			const { index = 0, type = "function", id, function: fn, ...extra } = call;
-			const existing = toolCallBuffers.getOrInsert(index, {
-				id: "",
-				type,
-				function: {
-					name: "",
-					arguments: ""
-				}
-			});
-			if (id) existing.id = id;
-			if (fn?.name) existing.function.name += fn.name;
-			if (fn?.arguments) existing.function.arguments += fn.arguments;
-			if (extra) Object.assign(existing, extra);
-			toolCallBuffers.set(index, existing);
+	try {
+		for await (const chunk of parseSSE(response)) {
+			if (typeof chunk === "string") continue;
+			if (chunk.usage) usage = chunk.usage;
+			const choice = chunk.choices?.[0];
+			if (!choice) continue;
+			const { delta } = choice;
+			const { content: contentDelta, tool_calls: toolCalls } = delta;
+			const reasoning = extractReasoning(delta);
+			if (reasoning) yield {
+				type: "reasoning_delta",
+				delta: reasoning
+			};
+			if (contentDelta) yield {
+				type: "content_delta",
+				delta: contentDelta.toString()
+			};
+			if (toolCalls) for (const call of toolCalls) {
+				const { index = 0, type = "function", id, function: fn, ...extra } = call;
+				const existing = toolCallBuffers.getOrInsert(index, {
+					id: "",
+					type,
+					function: {
+						name: "",
+						arguments: ""
+					}
+				});
+				if (id) existing.id = id;
+				if (fn?.name) existing.function.name += fn.name;
+				if (fn?.arguments) existing.function.arguments += fn.arguments;
+				if (extra) Object.assign(existing, extra);
+				toolCallBuffers.set(index, existing);
+			}
+			if (choice.finish_reason) finishReason = choice.finish_reason;
 		}
-		if (choice.finish_reason) finishReason = choice.finish_reason;
+	} catch (e) {
+		if (options?.signal?.aborted) return;
+		yield {
+			type: "error",
+			message: extractErrorMessage(e)
+		};
+		return;
 	}
 	for (const [, call] of toolCallBuffers) yield {
 		type: "tool_call",
@@ -91,70 +101,6 @@ async function* stream(model, messages, tools = []) {
 	};
 }
 //#endregion
-//#region src/utils/helper.ts
-/**
-* 辅助定义一个POST /chat/completions支持的model参数
-* @remarks 只有baseUrl字段是必须的
-*/
-const defineModel = (config) => ({
-	modalities: ["text"],
-	context: 131072,
-	...config
-});
-/**
-* 辅助定义一个POST /chat/completions支持的tool对象
-* @param execute 实际执行工具的函数
-*/
-const defineTool = (name, description, properties, execute) => {
-	const _required = [];
-	return {
-		type: "function",
-		function: {
-			name,
-			description,
-			parameters: {
-				type: "object",
-				properties: Object.entries(properties).reduce((result, [key, property]) => {
-					if ("required" in property) {
-						_required.push(key);
-						delete property.required;
-					}
-					result[key] = property;
-					return result;
-				}, {}),
-				required: _required
-			}
-		},
-		execute
-	};
-};
-const segmenter = new Intl.Segmenter([], { granularity: "word" });
-const estimateTextTokens = (text) => {
-	let words = 0;
-	let others = 0;
-	for (const seg of segmenter.segment(text)) if (seg.isWordLike) words++;
-	else others++;
-	return Math.ceil(words * 1.5 + others / 4);
-};
-/**
-* 根据上下文里的中/英文/多模态消息，估算出可能消耗的token
-* - 单词 ≈ 1.5token
-* - 标点/空白等非词字符每4个 ≈ 1token
-* - 图片/音频/视频/文件 ≈ 4096token（不好估算，取个较大的值）
-*/
-const estimateTokens = (messages) => {
-	if (!messages?.length) return 0;
-	return messages.reduce((acc, message) => {
-		const { content, tool_calls, ...metadata } = message;
-		if (typeof content === "string") acc += estimateTextTokens(content);
-		else for (const part of content) if (part.type === "text") acc += estimateTextTokens(part.text);
-		else acc += 4096;
-		if (tool_calls) acc += estimateTextTokens(JSON.stringify(tool_calls));
-		acc += estimateTextTokens(JSON.stringify(metadata));
-		return acc;
-	}, 0);
-};
-//#endregion
 //#region src/agent.ts
 async function* runAgent(model, messages, tools) {
 	const toolMap = new Map(tools.map((tool) => [tool.function.name, tool]));
@@ -252,60 +198,6 @@ 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"]));
-		} catch (e) {
-			logger(`MCP服务器${name}加载失败：${extractErrorMessage(e)}`);
-		}
-	}));
-	return router.getTools();
-};
-//#endregion
 //#region src/utils/compact/helper.ts
 /**
 * 校验assistant(tool_calls)消息
@@ -410,12 +302,13 @@ const compactMediaMessages = async (compressible, options) => {
 	return count;
 };
 const summarizeMessages = async (compressible, options) => {
-	const { model, systemPrompt } = options ?? {};
+	const { model, systemPrompt, beforeSummarize } = options ?? {};
 	const summarizable = compressible.slice(1);
 	if (summarizable.length === 0) {
 		logger("消息太少，无需总结");
 		return 0;
 	}
+	await beforeSummarize?.(summarizable);
 	const count = summarizable.length;
 	summarizable.push({
 		role: "system",
@@ -487,10 +380,11 @@ const compact = Object.assign(async (messages, model, options) => {
 		model
 	}) > 0;
 	if (tokens > context * ratioToSummarize) {
-		const { systemPrompt = "你现在的任务是总结历史消息" } = summarizeOptions ?? {};
+		const { systemPrompt = "你现在的任务是总结历史消息", beforeSummarize } = summarizeOptions ?? {};
 		const [error, count] = await to(summarizeMessages(compressible, {
 			model,
-			systemPrompt
+			systemPrompt,
+			beforeSummarize
 		}));
 		if (!error) result.hasSummarized = count > 0;
 		else result.hasDiscardMessages = discardMessagesUntil(compressible, (compressible) => {
@@ -512,4 +406,4 @@ const compact = Object.assign(async (messages, model, options) => {
 	discardMessagesUntil
 });
 //#endregion
-export { get_time_default as a, defineTool as c, get_weather_default as i, MCPRouter as n, runAgent as o, loadMCPTools as r, defineModel as s, compact as t };
+export { stream as a, runAgent as i, get_weather_default as n, get_time_default as r, compact as t };

package/dist/tools/mcp.d.mts

@@ -0,0 +1,55 @@
+import { p as ToolDefinition } from "../types--dXFoUow.mjs";
+import { Client } from "@modelcontextprotocol/sdk/client";
+//#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
+export { MCPRouter, McpServer, loadMCPTools };

package/dist/tools/mcp.mjs

@@ -0,0 +1,2 @@
+import { n as loadMCPTools, t as MCPRouter } from "../mcp-DcntQg-a.mjs";
+export { MCPRouter, loadMCPTools };

package/dist/types--dXFoUow.d.mts

@@ -0,0 +1,144 @@
+//#region src/types.d.ts
+type Model = {
+  baseUrl: string;
+  /** 如果不传，会尝试使用GET {baseUrl}/models获取到的第一个模型 */
+  model?: string;
+  /** 使用本地llama.cpp等服务时可以不填 */
+  apiKey?: string;
+  /**
+   * 模型支持的消息输入类型
+   * @default ["text"]
+   * @remarks 会在每轮对话前校验消息类型，存在不支持的输入时报错
+   */
+  modalities?: Modality[];
+  /**
+   * 模型的最大上下文
+   * @default 131072
+   * @remarks 会在每轮对话结束后检查上下文阈值，自动压缩消息
+   */
+  context?: number;
+  /**
+   * 自定义请求体，会在每轮请求时带上
+   * @example chat_template_kwargs: { enable_thinking: false }
+   */
+  [key: string]: unknown;
+};
+/** 文/图/音/视频，暂未实现文件输入 */
+type Modality = "text" | "image" | "audio" | "video";
+type Message = {
+  role: "system" | "user" | "assistant" | "tool";
+  reasoning?: string | null;
+  content: string | ContentPart[];
+  tool_calls?: ToolCall[];
+  tool_call_id?: string;
+  [key: string]: unknown;
+};
+type ContentPart = TextContent | ImageContent | AudioContent | VideoContent;
+type TextContent = {
+  type: "text";
+  text: string;
+};
+type ImageContent = {
+  type: "image_url";
+  image_url: {
+    url: string;
+  };
+};
+type AudioContent = {
+  type: "input_audio";
+  input_audio: {
+    /** 使用公网可访问的音频链接 */
+    url?: string;
+    /** 使用base64 */
+    data?: string;
+    format: string;
+  };
+};
+type VideoContent = {
+  type: "video_url";
+  video_url: {
+    url: string;
+  };
+};
+type ToolDefinition = {
+  type: "function";
+  function: {
+    name: string;
+    description: string;
+    parameters: {
+      type: "object";
+      properties: Record<string, {
+        type: string;
+        description?: string;
+        /** defineTool()提供的语法糖，等价于在parameters.required.push(当前property key) */
+        required?: boolean;
+      }>;
+      required?: string[];
+    };
+  };
+  /** 工具的实际执行函数 */
+  execute: (...args: any) => any;
+};
+type ToolCall = {
+  id: string;
+  type: "function";
+  function: {
+    name: string;
+    arguments: string;
+  };
+};
+/** stream()对外输出的事件 */
+type LLMEvent = {
+  type: "reasoning_delta";
+  delta: string;
+} | {
+  type: "content_delta";
+  delta: string;
+} | {
+  type: "tool_call";
+  id: string;
+  name: string;
+  args: any;
+} | {
+  type: "done";
+  finishReason: FinishReason;
+  usage?: Usage;
+} | {
+  type: "error";
+  message: string;
+};
+/** stream()内部要处理的事件流 */
+type ChatCompletionsChunk = {
+  id: string;
+  object: "chat.completion.chunk";
+  created: number;
+  model: string;
+  choices: {
+    index: number;
+    delta: Pick<Message, "reasoning" | "content"> & {
+      tool_calls?: ({
+        index: number;
+      } & Partial<ToolCall>)[];
+    };
+    finish_reason: FinishReason;
+  }[];
+  usage?: Usage;
+} | "[DONE]";
+/** 模型可能返回的finish_reason值：停止/工具调用/上下文超限 */
+type FinishReason = "stop" | "tool_calls" | "length" | null;
+type Usage = {
+  prompt_tokens: number;
+  completion_tokens: number;
+  total_tokens: number;
+  /** 每秒生成多少个token */
+  speed?: number;
+  [key: string]: any;
+};
+type AgentEvent = LLMEvent | {
+  type: "tool_result";
+  id: string;
+  name: string;
+  result: string;
+};
+//#endregion
+export { FinishReason as a, Message as c, TextContent as d, ToolCall as f, VideoContent as h, ContentPart as i, Modality as l, Usage as m, AudioContent as n, ImageContent as o, ToolDefinition as p, ChatCompletionsChunk as r, LLMEvent as s, AgentEvent as t, Model as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nickyzj2023/ai",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "我的“pi”，参考了pi-from-scratch",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -9,6 +9,10 @@
     ".": {
       "types": "./dist/index.d.mts",
       "import": "./dist/index.mjs"
+    },
+    "./mcp": {
+      "types": "./dist/tools/mcp.d.mts",
+      "import": "./dist/tools/mcp.mjs"
     }
   },
   "files": [