@nickyzj2023/ai 1.4.2 → 1.4.4

package/dist/cli.mjs

@@ -1,5 +1,5 @@
-import { a as get_time_default, c as runAgent, i as get_weather_default, o as defineModel, r as loadMCPTools } from "./src-izgP3Lfk.mjs";
-import { compactStr, extractErrorMessage } 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-CuZ-6Jye.mjs";
+import { compactStr, extractErrorMessage, isObject } from "@nickyzj2023/utils";
 import readline from "node:readline";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
@@ -55,6 +55,121 @@ const ask = (question) => {
 	});
 };
 /**
+* 询问一个可留空的字段：回车或输入空白时沿用默认值
+* @param question 提问文案
+* @param fallback 默认值
+* @returns 用户输入，空白时返回默认值
+*/
+const askWithDefault = async (question, fallback) => {
+	return (await ask(question)).trim() || fallback;
+};
+/**
+* 交互式录入一个MCP服务器配置
+* @param current 编辑时传入现有服务器，回车表示沿用原值；只传name表示配置缺失、重新录入
+* @returns 录入完成的配置；名称/URL为空或类型非法时返回null
+*/
+const askMcpServer = async (current) => {
+	const name = await askWithDefault(`名称 [当前为${current?.name ?? "(新)"}]: `, current?.name);
+	if (!name) {
+		console.log("名称不能为空，已取消");
+		return null;
+	}
+	const defaultType = current?.type ?? "streamable_http";
+	const typeInput = await askWithDefault(`类型 streamable_http/sse [当前为${defaultType}]: `, defaultType);
+	if (typeInput !== "streamable_http" && typeInput !== "sse") {
+		console.log("类型无效，已取消");
+		return null;
+	}
+	const type = typeInput;
+	const url = await askWithDefault(`URL [当前为${current?.url ?? "无"}]: `, current?.url);
+	if (!url) {
+		console.log("URL不能为空，已取消");
+		return null;
+	}
+	let headers = current?.headers;
+	const headersInput = (await ask(`headers(JSON对象) [当前为${current?.headers ? JSON.stringify(current.headers) : "无"}]: `)).trim();
+	if (headersInput) try {
+		const parsed = JSON.parse(headersInput);
+		if (isObject(parsed)) headers = parsed;
+		else console.log("headers需为JSON对象，已回退到原先的值");
+	} catch {
+		console.log("headers解析失败，已回退到原先的值");
+	}
+	let ignoredToolNames = current?.ignoredToolNames;
+	const ignoredInput = (await ask(`忽略的工具名(逗号分隔) [当前为${current?.ignoredToolNames?.join(",") ?? "无"}]: `)).trim();
+	if (ignoredInput) ignoredToolNames = ignoredInput.split(",").map((item) => item.trim()).filter(Boolean);
+	return {
+		name,
+		type,
+		url,
+		...headers ? { headers } : {},
+		...ignoredToolNames?.length ? { ignoredToolNames } : {}
+	};
+};
+/**
+* 把菜单输入的数字解析成对应的服务器名称
+* @param input 用户输入的数字串
+* @param names 当前菜单的服务器名称列表
+* @returns 对应名称；非整数或越界返回undefined
+*/
+const pickServerName = (input, names) => {
+	const index = Number(input) - 1;
+	return Number.isInteger(index) ? names[index] : void 0;
+};
+/**
+* MCP配置菜单：列出现有服务器，数字键编辑、a键添加、d键删除、回车或q结束
+*/
+const configMcp = async (mcpServers) => {
+	while (true) {
+		const names = Object.keys(mcpServers);
+		console.log("\n当前MCP服务器：");
+		if (names.length === 0) console.log("（空）");
+		else names.forEach((name, i) => {
+			const server = mcpServers[name];
+			console.log(`  ${i + 1}. ${name} ${server ? `(${server.type} ${server.url})` : "（配置缺失）"}`);
+		});
+		const choice = (await ask("输入数字编辑对应服务器，a添加新服务器，d删除服务器，回车或q结束: ")).trim().toLowerCase();
+		if (!choice || choice === "q") break;
+		switch (choice) {
+			case "a": {
+				const result = await askMcpServer();
+				if (result) mcpServers[result.name] = result;
+				break;
+			}
+			case "d": {
+				const target = (await ask("输入要删除的服务器编号: ")).trim();
+				const oldName = pickServerName(target, names);
+				if (!oldName) {
+					console.log("无效编号，请输入列表中的数字");
+					break;
+				}
+				if ((await ask(`确认删除${oldName}？(y/n): `)).trim().toLowerCase() === "y") {
+					delete mcpServers[oldName];
+					console.log(`已删除${oldName}`);
+				} else console.log("已取消删除");
+				break;
+			}
+			default: {
+				const oldName = pickServerName(choice, names);
+				if (oldName) {
+					const server = mcpServers[oldName];
+					if (!server) console.log("该服务器配置缺失，将重新录入");
+					const result = await askMcpServer({
+						name: oldName,
+						...server
+					});
+					if (result) {
+						if (result.name !== oldName) console.log(`已重命名 ${oldName} -> ${result.name}`);
+						delete mcpServers[oldName];
+						mcpServers[result.name] = result;
+					}
+				} else console.log("无效选择，请输入列表中的数字、a、d或回车");
+				break;
+			}
+		}
+	}
+};
+/**
 * setup入口：依次询问BASE_URL / MODEL / APIKEY，确认后写入全局配置
 */
 async function runSetup() {
@@ -66,11 +181,14 @@ async function runSetup() {
 	const baseUrl = await ask(`BASE_URL [当前为${config?.baseUrl}]: `) || config?.baseUrl;
 	const apiKey = await ask(`APIKEY [当前为${config?.apiKey}]: `) || config?.apiKey;
 	const model = await ask(`MODEL [当前为${config?.model}]: `) || config?.model;
+	const mcpServers = { ...config?.mcpServers };
+	if ((await ask("是否配置MCP服务器？(y/n): ")).trim().toLowerCase() === "y") await configMcp(mcpServers);
 	try {
 		saveConfig({
 			baseUrl,
 			apiKey,
-			model
+			model,
+			mcpServers
 		});
 		console.log(`配置已保存到${getConfigPath()}，直接运行ai即可开始对话`);
 	} catch (e) {

package/dist/index.d.mts

@@ -199,7 +199,7 @@ declare class MCPRouter {
 /**
  * 把传入的MCPServer列表转换成OpenAI API兼容的tools数组
  */
-declare const loadMCPTools: (mcpServers: Record<string, McpServer>) => Promise<ToolDefinition[]>;
+declare const loadMCPTools: (mcpServers?: Record<string, McpServer>) => Promise<ToolDefinition[]>;
 //#endregion
 //#region src/utils/compact/types.d.ts
 declare namespace Compact {

package/dist/index.mjs

@@ -1,2 +1,2 @@
-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-izgP3Lfk.mjs";
+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-CuZ-6Jye.mjs";
 export { MCPRouter, compact, defineModel, defineTool, get_time_default as getTime, get_weather_default as getWeather, loadMCPTools, runAgent };

package/dist/{src-izgP3Lfk.mjs → src-CuZ-6Jye.mjs}

@@ -273,7 +273,7 @@ var MCPRouter = class {
 /**
 * 把传入的MCPServer列表转换成OpenAI API兼容的tools数组
 */
-const loadMCPTools = async (mcpServers) => {
+const loadMCPTools = async (mcpServers = {}) => {
 	router ||= new MCPRouter();
 	await Promise.allSettled(Object.entries(mcpServers).map(async ([name, server]) => {
 		try {
@@ -327,7 +327,7 @@ const defaultReplacerOfToolResultContent = async (content, options) => {
 		content
 	}, {
 		role: "user",
-		content: "请用一两句话简述上条消息"
+		content: "请用一句话简述上面这条消息（直击要点，不要添加任何前言后语）"
 	}];
 	let simplifiedContent = "";
 	for await (const e of runAgent(model, messages, [])) if (e.type === "content_delta") simplifiedContent += e.delta;
@@ -358,7 +358,7 @@ const defaultReplacerOfMediaContent = async (content, options) => {
 		content
 	}, {
 		role: "user",
-		content: "请用一两句话简述上方的多模态消息"
+		content: "请用一句话简述上面这条消息（直击要点，不要添加任何前言后语）"
 	}];
 	let simplifiedContent = "";
 	for await (const e of runAgent(model, messages, [])) if (e.type === "content_delta") simplifiedContent += e.delta;

package/package.json

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