zapmyco 0.4.0 → 0.6.0

package/dist/cli/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { D as buildSkillSnapshot, E as eventBus, M as __VERSION__, N as __require, O as loadSkills, _ as createLlmBasedAgent, a as SubAgentManager, h as ZapmycoErrorCode, j as APP_NAME, p as WebError, s as logger, t as loadConfig } from "../loader-BK1Z72gI.mjs";
+import { D as eventBus, F as __require, M as APP_NAME, N as SESSION_DIR_NAME, O as buildSkillSnapshot, P as __VERSION__, a as SubAgentManager, c as logger, g as ZapmycoErrorCode, k as loadSkills, m as WebError, s as configureLogger, t as loadConfig, v as createLlmBasedAgent } from "../loader-CyGlMdl7.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
@@ -11,7 +11,7 @@ import { EventEmitter } from "node:events";
 import chalk, { Chalk } from "chalk";
 import { Command } from "commander";
 import { getModel } from "@mariozechner/pi-ai";
-import { Container, Editor, Key, ProcessTerminal, TUI, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
+import { CombinedAutocompleteProvider, Container, Editor, Key, ProcessTerminal, TUI, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
 import { spawn } from "node:child_process";
 import TurndownService from "turndown";
 import { lookup } from "node:dns/promises";
@@ -19,7 +19,7 @@ import { Client } from "@modelcontextprotocol/sdk/client";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 
 //#region src/cli/repl/command-registry.ts
-const log$5 = logger.child("repl:command-registry");
+const log$6 = logger.child("repl:command-registry");
 /**
 * 命令注册表
 */
@@ -34,7 +34,7 @@ var CommandRegistry = class {
 	*/
 	register(cmd) {
 		const canonicalName = cmd.name.toLowerCase();
-		if (this.commands.has(canonicalName)) log$5.warn(`命令 "${canonicalName}" 已存在，将被覆盖`);
+		if (this.commands.has(canonicalName)) log$6.warn(`命令 "${canonicalName}" 已存在，将被覆盖`);
 		this.commands.set(canonicalName, cmd);
 		for (const alias of cmd.aliases) {
 			const lowerAlias = alias.toLowerCase();
@@ -62,7 +62,7 @@ var CommandRegistry = class {
 	*/
 	async dispatch(parsed) {
 		if (parsed.kind !== "command") {
-			log$5.warn("dispatch 收到了非 command 类型的输入");
+			log$6.warn("dispatch 收到了非 command 类型的输入");
 			return;
 		}
 		const cmd = this.getCommand(parsed.name);
@@ -74,7 +74,7 @@ var CommandRegistry = class {
 			await cmd.handler(parsed.args, this.session);
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);
-			log$5.error(`命令 /${cmd.name} 执行出错`, {}, error);
+			log$6.error(`命令 /${cmd.name} 执行出错`, {}, error);
 			console.log(`\n  命令执行出错: ${message}\n`);
 		}
 	}
@@ -359,6 +359,8 @@ var ZapmycoEditor = class extends Editor {
 	onCtrlD;
 	/** 是否正在执行（用于显示 loading） */
 	#executing = false;
+	/** 是否显示 spinner（执行期间禁用输入但不一定显示 spinner） */
+	#showSpinner = true;
 	/** loading 动画帧索引 */
 	#loadingFrame = 0;
 	/** loading 动画定时器 */
@@ -380,11 +382,14 @@ var ZapmycoEditor = class extends Editor {
 	}
 	/**
 	* 设置执行状态（控制 loading spinner 显示）
+	* @param executing 是否正在执行
+	* @param showSpinner 是否显示 spinner（默认 true）。设为 false 时仅禁用输入，不显示动画
 	*/
-	setExecuting(executing) {
-		if (this.#executing === executing) return;
+	setExecuting(executing, showSpinner = true) {
+		if (this.#executing === executing && this.#showSpinner === showSpinner) return;
 		this.#executing = executing;
-		if (executing) {
+		this.#showSpinner = showSpinner;
+		if (executing && showSpinner) {
 			this.#loadingFrame = 0;
 			this.#loadingTimer = setInterval(() => {
 				this.#loadingFrame = (this.#loadingFrame + 1) % LOADING_FRAMES.length;
@@ -417,7 +422,7 @@ var ZapmycoEditor = class extends Editor {
 		for (let i = 0; i < contentLines.length; i++) {
 			const prefix = i === 0 ? PROMPT_PREFIX : " ".repeat(promptWidth);
 			let line;
-			if (i === 0 && this.#executing) line = `${prefix}${LOADING_FRAMES[this.#loadingFrame]} ${contentLines[i]}`;
+			if (i === 0 && this.#executing && this.#showSpinner) line = `${prefix}${LOADING_FRAMES[this.#loadingFrame]} ${contentLines[i]}`;
 			else line = prefix + contentLines[i];
 			contentLines[i] = truncateToWidth(line, width);
 		}
@@ -718,7 +723,7 @@ const CRON_CONSTANTS = {
 *
 * @module cli/repl/cron/cron-scheduler
 */
-const log$4 = logger.child("cron:scheduler");
+const log$5 = logger.child("cron:scheduler");
 var CronScheduler = class extends EventEmitter {
 	store;
 	jobs = [];
@@ -739,7 +744,7 @@ var CronScheduler = class extends EventEmitter {
 		if (this.running) return;
 		const loadedJobs = await this.store.load();
 		this.jobs = loadedJobs;
-		log$4.info(`调度器启动，加载 ${loadedJobs.length} 个 durable 任务`);
+		log$5.info(`调度器启动，加载 ${loadedJobs.length} 个 durable 任务`);
 		await this.handleMissedJobs();
 		this.checkAutoExpiry();
 		this.running = true;
@@ -755,7 +760,7 @@ var CronScheduler = class extends EventEmitter {
 			clearInterval(this.timer);
 			this.timer = null;
 		}
-		log$4.info("调度器已停止");
+		log$5.info("调度器已停止");
 	}
 	/** 添加任务 */
 	async addJob(job) {
@@ -767,7 +772,7 @@ var CronScheduler = class extends EventEmitter {
 			this.jobs.push(job);
 			await this.store.persist(this.jobs);
 		} else this.sessionJobs.push(job);
-		log$4.info("任务已添加", {
+		log$5.info("任务已添加", {
 			id: job.id,
 			cron: job.cron,
 			durable: job.durable
@@ -897,7 +902,7 @@ var CronScheduler = class extends EventEmitter {
 			}, delay);
 		}
 		if (toDelete.length > 0) {
-			log$4.info(`跳过 ${toDelete.length} 个错过的一次性任务（超出补发上限）`);
+			log$5.info(`跳过 ${toDelete.length} 个错过的一次性任务（超出补发上限）`);
 			this.emit("missed-overflow", {
 				count: toDelete.length,
 				jobIds: toDelete.map((m) => m.id)
@@ -915,7 +920,7 @@ var CronScheduler = class extends EventEmitter {
 				job.lastFiredAt = now;
 				job.fireCount++;
 				this.removeJob(job.id);
-				log$4.info("任务已过期并触发最后一次", { id: job.id });
+				log$5.info("任务已过期并触发最后一次", { id: job.id });
 			}
 		}
 	}
@@ -976,7 +981,7 @@ function applyOneShotJitter(jobId, rawNext) {
 *
 * @module cli/repl/cron/cron-store
 */
-const log$3 = logger.child("cron:store");
+const log$4 = logger.child("cron:store");
 const STORE_FILE = join(join(homedir(), ".zapmyco", "cron"), "scheduled_tasks.json");
 var CronStore = class {
 	filePath;
@@ -1000,13 +1005,13 @@ var CronStore = class {
 			const raw = await readFile(this.filePath, "utf-8");
 			const data = JSON.parse(raw);
 			if (!Array.isArray(data)) {
-				log$3.warn("存储文件格式无效（非数组），将使用空列表");
+				log$4.warn("存储文件格式无效（非数组），将使用空列表");
 				return [];
 			}
 			return this.validateJobs(data);
 		} catch (err) {
 			if (err.code === "ENOENT") return [];
-			log$3.warn("加载定时任务文件失败，将使用空列表", { error: err instanceof Error ? err.message : String(err) });
+			log$4.warn("加载定时任务文件失败，将使用空列表", { error: err instanceof Error ? err.message : String(err) });
 			return [];
 		}
 	}
@@ -1053,7 +1058,7 @@ var CronStore = class {
 			if (typeof obj.maxFires === "number") job.maxFires = obj.maxFires;
 			valid.push(job);
 		}
-		if (valid.length < raw.length) log$3.warn(`跳过 ${raw.length - valid.length} 个无效任务条目`);
+		if (valid.length < raw.length) log$4.warn(`跳过 ${raw.length - valid.length} 个无效任务条目`);
 		return valid;
 	}
 };
@@ -1065,8 +1070,19 @@ function getCronStore() {
 
 //#endregion
 //#region src/cli/repl/history-store.ts
+/**
+* 会话历史存储
+*
+* 基于内存的环形缓冲区，记录 REPL 会话中的用户输入和执行结果。
+* 支持文件持久化到 ~/.zapmyco/history.json，跨会话恢复。
+*/
+const log$3 = logger.child("history:store");
 /** 默认最大历史条数 */
 const DEFAULT_MAX_SIZE = 100;
+/** 历史文件存储路径 */
+function getHistoryFilePath() {
+	return join(homedir(), SESSION_DIR_NAME, "history.json");
+}
 /**
 * 历史存储类
 */
@@ -1074,8 +1090,11 @@ var HistoryStore = class {
 	entries = [];
 	nextId = 1;
 	maxSize;
+	filePath;
 	constructor(maxSize = DEFAULT_MAX_SIZE) {
 		this.maxSize = maxSize;
+		this.filePath = getHistoryFilePath();
+		this.load();
 	}
 	/** 添加条目 */
 	push(entry) {
@@ -1085,6 +1104,7 @@ var HistoryStore = class {
 		};
 		this.entries.push(newEntry);
 		if (this.entries.length > this.maxSize) this.entries.shift();
+		this.save();
 		return newEntry;
 	}
 	/** 获取所有条目 */
@@ -1096,16 +1116,52 @@ var HistoryStore = class {
 		const count = Math.min(n, this.entries.length);
 		return this.entries.slice(-count);
 	}
-	/** 清空所有条目 */
+	/** 清空所有条目（同时清除持久化文件） */
 	clear() {
 		this.entries = [];
+		this.save();
 	}
 	/** 搜索条目（按输入内容模糊匹配） */
 	search(query) {
 		const lowerQuery = query.toLowerCase();
 		return this.entries.filter((entry) => entry.input.toLowerCase().includes(lowerQuery));
 	}
+	/** 从文件加载历史记录 */
+	load() {
+		try {
+			ensureDir(dirname(this.filePath));
+			const raw = readFileSync(this.filePath, "utf-8");
+			const data = JSON.parse(raw);
+			if (Array.isArray(data.entries)) {
+				this.entries = data.entries.slice(-this.maxSize);
+				this.nextId = typeof data.nextId === "number" ? data.nextId : 1;
+				log$3.debug("历史记录已加载", {
+					count: this.entries.length,
+					nextId: this.nextId
+				});
+			}
+		} catch {
+			log$3.debug("无历史文件或加载失败，使用空历史");
+		}
+	}
+	/** 持久化历史记录到文件 */
+	save() {
+		try {
+			ensureDir(dirname(this.filePath));
+			const data = JSON.stringify({
+				entries: this.entries,
+				nextId: this.nextId
+			}, null, 2);
+			writeFileSync(this.filePath, data, "utf-8");
+		} catch (err) {
+			log$3.warn("历史记录保存失败", { error: err instanceof Error ? err.message : String(err) });
+		}
+	}
 };
+/** 确保目录存在 */
+function ensureDir(dir) {
+	mkdirSync(dir, { recursive: true });
+}
 
 //#endregion
 //#region src/cli/repl/input-parser.ts
@@ -6599,6 +6655,12 @@ var OutputArea = class extends Container {
 		else this.lines[this.lines.length - 1] += text;
 		this.invalidate();
 	}
+	/** 替换最后一行的完整内容（用于 spinner 动画和首 chunk 替换） */
+	replaceLastLine(text) {
+		if (this.lines.length > 0) this.lines[this.lines.length - 1] = text;
+		else this.lines.push(text);
+		this.invalidate();
+	}
 	/** 清空所有内容 */
 	clear() {
 		this.lines = [];
@@ -6666,6 +6728,7 @@ var ReplSession = class {
 		this.registry = new CommandRegistry(this);
 		this.renderer = new Renderer(this.options);
 		this.history = new HistoryStore(this.options.maxHistorySize);
+		for (const entry of this.history.getAll()) this.editor.addToHistory(entry.input);
 		this.agent = this.createReplAgent();
 		this.taskStore = new TaskStore();
 		this.taskStore.load();
@@ -6749,10 +6812,13 @@ var ReplSession = class {
 		const startTime = Date.now();
 		let historyEntry;
 		const taskId = `task-${Date.now()}`;
+		const ZAPMYCO_PREFIX = "ZapMyco: ";
+		let spinnerActive = true;
+		let spinnerInterval;
 		try {
 			this._state = "executing";
 			this.updateStatsState();
-			this.editor.setExecuting(true);
+			this.editor.setExecuting(true, false);
 			this.currentTaskAbort = new AbortController();
 			historyEntry = this.history.push({
 				timestamp: Date.now(),
@@ -6762,11 +6828,24 @@ var ReplSession = class {
 				goalId: `goal-${startTime}`,
 				rawInput
 			});
-			const goalLines = [`Me: ${rawInput}`, "ZapMyco: "];
-			this.outputArea.append(goalLines);
+			this.outputArea.append([`Me: ${rawInput}`, ZAPMYCO_PREFIX + LOADING_FRAMES[0]]);
+			let spinnerFrame = 0;
+			spinnerActive = true;
+			spinnerInterval = setInterval(() => {
+				if (!spinnerActive) return;
+				spinnerFrame = (spinnerFrame + 1) % LOADING_FRAMES.length;
+				this.outputArea.replaceLastLine(ZAPMYCO_PREFIX + LOADING_FRAMES[spinnerFrame]);
+				this.tui.requestRender();
+			}, 100);
+			let firstOutputReceived = false;
 			const outputHandler = (event) => {
 				if (event.taskId === taskId) {
-					this.outputArea.appendText(event.text);
+					if (!firstOutputReceived) {
+						firstOutputReceived = true;
+						spinnerActive = false;
+						clearInterval(spinnerInterval);
+						this.outputArea.replaceLastLine(ZAPMYCO_PREFIX + event.text);
+					} else this.outputArea.appendText(event.text);
 					this.tui.requestRender();
 				}
 			};
@@ -6806,6 +6885,11 @@ var ReplSession = class {
 				duration: Date.now() - startTime
 			});
 			const outputText = typeof taskResult.output === "string" ? taskResult.output : taskResult.output != null ? JSON.stringify(taskResult.output) : null;
+			if (spinnerActive) {
+				spinnerActive = false;
+				clearInterval(spinnerInterval);
+				if (outputText) this.outputArea.replaceLastLine(ZAPMYCO_PREFIX + outputText);
+			}
 			if (taskResult.status !== "success") {
 				const errorMsg = taskResult.error?.message ?? "Agent 执行失败（无详细错误信息）";
 				this.outputArea.appendText(`[错误] ${errorMsg}`);
@@ -6854,14 +6938,17 @@ var ReplSession = class {
 		} catch (error) {
 			const err = error instanceof Error ? error : new Error(String(error));
 			log.error("目标执行失败", { input: rawInput }, err);
+			spinnerActive = false;
+			clearInterval(spinnerInterval);
 			this.stats.totalRequests++;
 			this.stats.failureCount++;
 			eventBus.emit("goal:failed", {
 				goalId: `goal-${startTime}`,
 				error: err
 			});
-			const errorLines = this.renderer.renderError(err);
-			this.outputArea.append(errorLines);
+			this.outputArea.replaceLastLine(`ZapMyco: [错误] ${err.message}`);
+			const errorLines = this.renderer.renderError(err).slice(1);
+			if (errorLines.length > 0) this.outputArea.append(errorLines);
 			const duration = Date.now() - startTime;
 			return {
 				goalId: `goal-${startTime}`,
@@ -6878,6 +6965,8 @@ var ReplSession = class {
 				}
 			};
 		} finally {
+			spinnerActive = false;
+			if (spinnerInterval) clearInterval(spinnerInterval);
 			this._state = "idle";
 			this.updateStatsState();
 			this.editor.setExecuting(false);
@@ -6906,9 +6995,11 @@ var ReplSession = class {
 			case "incomplete": break;
 			case "command":
 				await this.registry.dispatch(parsed);
+				this.editor.addToHistory(line);
 				break;
 			case "goal":
 				await this.executeGoal(parsed.rawInput);
+				this.editor.addToHistory(line);
 				break;
 		}
 	}
@@ -6921,6 +7012,26 @@ var ReplSession = class {
 		this.registry.register(createConfigCommand());
 		this.registry.register(createAgentsCommand());
 		this.registry.register(createStatusCommand());
+		this.buildAutocompleteProvider();
+	}
+	/** 构建并设置 autocomplete provider，将命令注册表中的命令接入 pi-tui 补全系统 */
+	buildAutocompleteProvider() {
+		const slashCommands = [];
+		for (const cmd of this.registry.listCommands()) {
+			const base = {
+				name: cmd.name,
+				description: cmd.description
+			};
+			if (cmd.usage !== `/${cmd.name}`) base.argumentHint = cmd.usage;
+			slashCommands.push(base);
+			for (const alias of cmd.aliases) slashCommands.push({
+				name: alias,
+				description: `${cmd.description}（别名: /${cmd.name}）`
+			});
+		}
+		const provider = new CombinedAutocompleteProvider(slashCommands, process.cwd(), null);
+		this.editor.setAutocompleteProvider(provider);
+		this.editor.setAutocompleteMaxVisible(12);
 	}
 	/**
 	* 创建 REPL 专用的 Agent 实例
@@ -7010,6 +7121,7 @@ var ReplSession = class {
 			const snapshot = buildSkillSnapshot(entries, skillConfig.maxSkillsInPrompt);
 			this.agent.skillPrompt = snapshot.prompt;
 			this._registerSkillCommands(entries);
+			this.buildAutocompleteProvider();
 			log.info("Skill 系统初始化完成", {
 				count: snapshot.count,
 				names: snapshot.names
@@ -7118,7 +7230,14 @@ var ReplSession = class {
 * 加载配置 → 创建会话 → 进入输入循环
 */
 async function startRepl() {
-	await new ReplSession(await loadConfig()).start();
+	configureLogger({
+		logFilePath: join(homedir(), ".zapmyco", "logs", "zapmyco.log"),
+		quiet: true
+	});
+	const config = await loadConfig();
+	if (config.logging?.level) configureLogger({ level: config.logging.level });
+	if (config.logging?.file) configureLogger({ logFilePath: config.logging.file });
+	await new ReplSession(config).start();
 }
 
 //#endregion