@nickyzj2023/ai 1.6.0 → 1.6.1

package/README.md

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

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { i as runAgent, n as get_weather_default, r as get_time_default } from "./src-CKKPKPMG.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";
@@ -308,6 +308,8 @@ var TUI = class {
 	md = null;
 	/** 是否允许输入 */
 	isBusy = false;
+	/** 是否正停在提示符上等输入（决定printNotice要不要重绘提示符） */
+	isPrompting = false;
 	/** 上次打印内容所属的状态（reasoning/content/tool）
 	* 用于在新的状态开始时改变样式、打印前缀
 	*/
@@ -319,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) => {
@@ -341,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;
@@ -350,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();
@@ -401,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", "")}`;
@@ -432,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
@@ -454,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` 配置一个模型");
@@ -483,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();
@@ -527,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/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 { 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/{src-CKKPKPMG.mjs → src-BzQy5h8z.mjs}

@@ -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/package.json

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