@nickyzj2023/ai 1.6.0 → 1.6.2

package/README.md

@@ -71,6 +71,9 @@ ai setup
 
 # 启动对话
 ai
+
+# 直接开聊，本质是“ai->输入提示词->回车”的语法糖
+ai 你好
 ```
 
 配置保存在 `~/.@nickyzj2023/ai/config.json`，任意目录下执行`ai`都能读取到

package/dist/cli.mjs

@@ -1,7 +1,7 @@
-import { i as runAgent, n as get_weather_default, r as get_time_default } from "./src-CKKPKPMG.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 { i as runAgent, n as get_weather_default, r as get_time_default } from "./src-DPR9YjB3.mjs";
+import { a as listModels, t as defineModel } from "./helper-DJw58Gmz.mjs";
+import { n as loadMCPTools } from "./mcp-BBjcb8es.mjs";
+import { compactStr, extractErrorMessage, isObject, to } from "@nickyzj2023/utils";
 import readline from "node:readline";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
@@ -110,12 +110,12 @@ const askMcpServer = async (current) => {
 	};
 };
 /**
-* 把菜单输入的数字解析成对应的服务器名称
+* 把菜单输入的数字解析成对应的名称
 * @param input 用户输入的数字串
-* @param names 当前菜单的服务器名称列表
+* @param names 当前菜单的名称列表
 * @returns 对应名称；非整数或越界返回undefined
 */
-const pickServerName = (input, names) => {
+const pickByIndex = (input, names) => {
 	const index = Number(input) - 1;
 	return Number.isInteger(index) ? names[index] : void 0;
 };
@@ -141,7 +141,7 @@ const configMcp = async (mcpServers) => {
 			}
 			case "d": {
 				const target = (await ask("输入要删除的服务器编号: ")).trim();
-				const oldName = pickServerName(target, names);
+				const oldName = pickByIndex(target, names);
 				if (!oldName) {
 					console.log("无效编号，请输入列表中的数字");
 					break;
@@ -153,7 +153,7 @@ const configMcp = async (mcpServers) => {
 				break;
 			}
 			default: {
-				const oldName = pickServerName(choice, names);
+				const oldName = pickByIndex(choice, names);
 				if (oldName) {
 					const server = mcpServers[oldName];
 					if (!server) console.log("该服务器配置缺失，将重新录入");
@@ -173,17 +173,33 @@ const configMcp = async (mcpServers) => {
 	}
 };
 /**
+* 询问MODEL：能连上服务时先列出GET /models的模型，输入序号即可选中，同时也支持直接手输模型名
+* @param baseUrl 刚录入的BASE_URL
+* @param apiKey 刚录入的APIKEY
+* @param fallback 直接回车时沿用的模型
+*/
+const askModel = async (baseUrl, apiKey, fallback) => {
+	const [error, models] = await to(baseUrl ? listModels(baseUrl, apiKey) : Promise.resolve([]));
+	const names = models ?? [];
+	if (error) console.log(`获取模型列表失败：${extractErrorMessage(error)}`);
+	else if (names.length === 0) console.log("服务端未返回任何模型，请手动输入模型名");
+	else {
+		console.log("可用模型（输入序号快速选择，也可直接输入模型名）：");
+		names.forEach((name, i) => {
+			console.log(`  ${i + 1}. ${name}`);
+		});
+	}
+	const input = (await ask(`MODEL [当前为${fallback}]: `)).trim();
+	return pickByIndex(input, names) || input || fallback;
+};
+/**
 * setup入口：依次询问BASE_URL / MODEL / APIKEY，确认后写入全局配置
 */
 async function runSetup() {
 	const config = loadConfig();
-	if (config) {
-		console.log(`当前配置：BASE_URL ${config.baseUrl}，APIKEY ${config.apiKey}，MODEL ${config.model}`);
-		console.log("直接回车可沿用当前值。\n");
-	}
 	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 model = await askModel(baseUrl, apiKey, config?.model);
 	const mcpServers = { ...config?.mcpServers };
 	if ((await ask("是否配置MCP服务器？(y/n): ")).trim().toLowerCase() === "y") await configMcp(mcpServers);
 	try {
@@ -308,6 +324,8 @@ var TUI = class {
 	md = null;
 	/** 是否允许输入 */
 	isBusy = false;
+	/** 是否正停在提示符上等输入（决定printNotice要不要重绘提示符） */
+	isPrompting = false;
 	/** 上次打印内容所属的状态（reasoning/content/tool）
 	* 用于在新的状态开始时改变样式、打印前缀
 	*/
@@ -319,19 +337,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) => {
@@ -341,7 +368,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;
@@ -350,15 +379,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();
@@ -401,6 +437,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", "")}`;
@@ -432,10 +489,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
@@ -454,8 +511,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` 配置一个模型");
@@ -483,38 +543,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();
@@ -527,8 +572,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 → helper-DJw58Gmz.mjs}

@@ -1,3 +1,4 @@
+import { fetcher } from "@nickyzj2023/utils";
 //#region src/utils/helper.ts
 /**
 * 辅助定义一个POST /chat/completions支持的model参数
@@ -44,6 +45,17 @@ const estimateTextTokens = (text) => {
 	return Math.ceil(words * 1.5 + others / 4);
 };
 /**
+* 列出GET /models返回的模型id
+* @param baseUrl 接口前缀，如http://127.0.0.1:11434/v1
+* @param apiKey 本地llama.cpp等不校验鉴权的服务可以不传，不传就不带Authorization头
+* @returns 模型的id列表
+* @remarks 请求失败（服务没起、鉴权不过等）会抛异常，由调用方自行兜底
+*/
+const listModels = async (baseUrl, apiKey) => {
+	const { data } = await fetcher(baseUrl, { headers: apiKey ? { Authorization: `Bearer ${apiKey}` } : void 0 }).get("/models");
+	return (data ?? []).map((model) => model.id).filter((id) => typeof id === "string");
+};
+/**
 * 根据上下文里的中/英文/多模态消息，估算出可能消耗的token
 * - 单词 ≈ 1.5token
 * - 标点/空白等非词字符每4个 ≈ 1token
@@ -62,4 +74,4 @@ const estimateTokens = (messages) => {
 	}, 0);
 };
 //#endregion
-export { estimateTokens as i, defineTool as n, estimateTextTokens as r, defineModel as t };
+export { listModels as a, estimateTokens as i, defineTool as n, estimateTextTokens as r, defineModel as t };

package/dist/index.d.mts

@@ -137,6 +137,14 @@ 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;
 declare const estimateTextTokens: (text: string) => number;
+/**
+ * 列出GET /models返回的模型id
+ * @param baseUrl 接口前缀，如http://127.0.0.1:11434/v1
+ * @param apiKey 本地llama.cpp等不校验鉴权的服务可以不传，不传就不带Authorization头
+ * @returns 模型的id列表
+ * @remarks 请求失败（服务没起、鉴权不过等）会抛异常，由调用方自行兜底
+ */
+declare const listModels: (baseUrl: string, apiKey?: string) => Promise<string[]>;
 /**
  * 根据上下文里的中/英文/多模态消息，估算出可能消耗的token
  * - 单词 ≈ 1.5token
@@ -145,4 +153,4 @@ declare const estimateTextTokens: (text: string) => number;
  */
 declare const estimateTokens: (messages?: Message[]) => number;
 //#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, estimateTextTokens, estimateTokens, _default as getTime, _default$1 as getWeather, runAgent, stream };
+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, listModels, runAgent, stream };

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { a as stream, i as runAgent, n as get_weather_default, r as get_time_default, t as compact } from "./src-CKKPKPMG.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 };
+import { a as stream, i as runAgent, n as get_weather_default, r as get_time_default, t as compact } from "./src-DPR9YjB3.mjs";
+import { a as listModels, i as estimateTokens, n as defineTool, r as estimateTextTokens, t as defineModel } from "./helper-DJw58Gmz.mjs";
+export { compact, defineModel, defineTool, estimateTextTokens, estimateTokens, get_time_default as getTime, get_weather_default as getWeather, listModels, runAgent, stream };

package/dist/{mcp-DcntQg-a.mjs → mcp-BBjcb8es.mjs}

@@ -1,4 +1,4 @@
-import { n as defineTool } from "./helper-juLVGxlQ.mjs";
+import { n as defineTool } from "./helper-DJw58Gmz.mjs";
 import { extractErrorMessage, isObject, logger, omit } from "@nickyzj2023/utils";
 //#region src/tools/mcp.ts
 /** 全局单例MCP加载器 */

package/dist/{src-CKKPKPMG.mjs → src-DPR9YjB3.mjs}

@@ -1,4 +1,4 @@
-import { i as estimateTokens, n as defineTool, r as estimateTextTokens } from "./helper-juLVGxlQ.mjs";
+import { i as estimateTokens, n as defineTool, r as estimateTextTokens } from "./helper-DJw58Gmz.mjs";
 import { createXMLText, extractErrorMessage, fetcher, logger, parseSSE, pick, to } from "@nickyzj2023/utils";
 //#region src/llm.ts
 /**
@@ -308,7 +308,7 @@ const summarizeMessages = async (compressible, options) => {
 		logger("消息太少，无需总结");
 		return 0;
 	}
-	beforeSummarize?.(summarizable);
+	await beforeSummarize?.(summarizable);
 	const count = summarizable.length;
 	summarizable.push({
 		role: "system",

package/dist/tools/mcp.mjs

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

package/package.json

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