zapmyco 0.14.0 → 0.15.0

package/dist/cli/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { A as configureLogger, B as buildSkillSnapshot, D as eventBus, G as SESSION_DIR_NAME, K as VERSION, L as WebError, O as DEFAULT_COMPACTION_CONFIG, V as loadSkills, W as APP_NAME, d as SubAgentManager, f as SecurityBlockedError, g as runWithToolGuardContext, h as getToolGuardContext, i as AgentLlmFacade, j as logger, m as createToolInfoResolver, n as loadConfig, p as ToolGuard, q as __require, t as HOME_CONFIG_PATH, v as createLlmBasedAgent, z as ZapmycoErrorCode } from "../loader-BD5Odmr5.mjs";
+import { A as configureLogger, D as eventBus, G as SESSION_DIR_NAME, K as VERSION, L as WebError, O as DEFAULT_COMPACTION_CONFIG, V as loadSkills, W as APP_NAME, d as SubAgentManager, f as SecurityBlockedError, g as runWithToolGuardContext, h as getToolGuardContext, i as AgentLlmFacade, j as logger, m as createToolInfoResolver, n as loadConfig, p as ToolGuard, q as __require, t as HOME_CONFIG_PATH, v as createLlmBasedAgent, z as ZapmycoErrorCode } from "../loader-DEuRwvSw.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
@@ -18,12 +18,13 @@ import i18next from "i18next";
 import TurndownService from "turndown";
 import { lookup } from "node:dns/promises";
 import { promisify } from "node:util";
+import chokidar from "chokidar";
 import { marked } from "marked";
 import { Client } from "@modelcontextprotocol/sdk/client";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 
 //#region src/cli/repl/command-registry.ts
-const log$20 = logger.child("repl:command-registry");
+const log$21 = logger.child("repl:command-registry");
 /**
 * 命令注册表
 */
@@ -39,7 +40,7 @@ var CommandRegistry = class {
 	*/
 	register(cmd) {
 		const canonicalName = cmd.name.toLowerCase();
-		if (this.commands.has(canonicalName)) log$20.warn(`命令 "${canonicalName}" 已存在，将被覆盖`);
+		if (this.commands.has(canonicalName)) log$21.warn(`命令 "${canonicalName}" 已存在，将被覆盖`);
 		this.commands.set(canonicalName, cmd);
 		for (const alias of cmd.aliases) {
 			const lowerAlias = alias.toLowerCase();
@@ -63,11 +64,34 @@ var CommandRegistry = class {
 		return Array.from(this.commands.values());
 	}
 	/**
+	* 注销单个命令
+	*/
+	unregister(name) {
+		const lowerName = name.toLowerCase();
+		const cmd = this.commands.get(lowerName);
+		if (!cmd) return false;
+		for (const alias of cmd.aliases) this.aliasMap.delete(alias.toLowerCase());
+		return this.commands.delete(lowerName);
+	}
+	/**
+	* 注销所有指定来源的命令
+	*
+	* @returns 被注销的命令名称列表
+	*/
+	unregisterBySource(source) {
+		const removed = [];
+		for (const [name, cmd] of this.commands) if (cmd.source === source) {
+			this.unregister(name);
+			removed.push(name);
+		}
+		return removed;
+	}
+	/**
 	* 分发并执行命令
 	*/
 	async dispatch(parsed) {
 		if (parsed.kind !== "command") {
-			log$20.warn("dispatch 收到了非 command 类型的输入");
+			log$21.warn("dispatch 收到了非 command 类型的输入");
 			return;
 		}
 		const cmd = this.getCommand(parsed.name);
@@ -79,7 +103,7 @@ var CommandRegistry = class {
 			await cmd.handler(parsed.args, this.session);
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);
-			log$20.error(`命令 /${cmd.name} 执行出错`, {}, error);
+			log$21.error(`命令 /${cmd.name} 执行出错`, {}, error);
 			console.log(`\n  命令执行出错: ${message}\n`);
 		}
 	}
@@ -456,7 +480,7 @@ const noColor = {
 *
 * @module core/agent-team
 */
-const log$19 = logger.child("agent-instance-manager");
+const log$20 = logger.child("agent-instance-manager");
 /**
 * Agent 实例状态转换表
 *
@@ -521,7 +545,7 @@ var AgentInstanceManager = class extends EventEmitter {
 			const parent = this.instances.get(parentInstanceId);
 			if (parent) parent.childInstanceIds.push(instance.instanceId);
 		}
-		log$19.debug("注册 Agent 实例", {
+		log$20.debug("注册 Agent 实例", {
 			instanceId: instance.instanceId,
 			typeId: definition.typeId,
 			depth,
@@ -544,12 +568,12 @@ var AgentInstanceManager = class extends EventEmitter {
 	transition(instanceId, newStatus) {
 		const instance = this.instances.get(instanceId);
 		if (!instance) {
-			log$19.warn("状态转换失败：实例不存在", { instanceId });
+			log$20.warn("状态转换失败：实例不存在", { instanceId });
 			return false;
 		}
 		const allowed = VALID_TRANSITIONS[instance.status];
 		if (!allowed.includes(newStatus)) {
-			log$19.warn("状态转换拒绝", {
+			log$20.warn("状态转换拒绝", {
 				instanceId,
 				from: instance.status,
 				to: newStatus,
@@ -559,7 +583,7 @@ var AgentInstanceManager = class extends EventEmitter {
 		}
 		const oldStatus = instance.status;
 		instance.status = newStatus;
-		log$19.debug("Agent 实例状态转换", {
+		log$20.debug("Agent 实例状态转换", {
 			instanceId,
 			typeId: instance.typeId,
 			from: oldStatus,
@@ -690,7 +714,7 @@ var AgentInstanceManager = class extends EventEmitter {
 		instance.agent.removeAllListeners();
 		instance.agent.systemPromptOverride = null;
 		this.instances.delete(instanceId);
-		log$19.debug("Agent 实例已清理", { instanceId });
+		log$20.debug("Agent 实例已清理", { instanceId });
 	}
 	/**
 	* 清理所有终态的实例
@@ -1141,7 +1165,7 @@ const BUILTIN_AGENT_TYPES = [
 *
 * @module core/agent-team
 */
-const log$18 = logger.child("agent-type-registry");
+const log$19 = logger.child("agent-type-registry");
 /**
 * Agent 类型注册中心
 *
@@ -1165,14 +1189,14 @@ var AgentTypeRegistry = class {
 	*/
 	register(definition) {
 		const existing = this.types.get(definition.typeId);
-		if (existing) log$18.info("覆盖已注册的 Agent 类型", {
+		if (existing) log$19.info("覆盖已注册的 Agent 类型", {
 			typeId: definition.typeId,
 			oldSource: existing.source,
 			newSource: definition.source
 		});
 		this.types.set(definition.typeId, definition);
 		this.refreshCache();
-		log$18.debug("注册 Agent 类型", {
+		log$19.debug("注册 Agent 类型", {
 			typeId: definition.typeId,
 			source: definition.source
 		});
@@ -1185,7 +1209,7 @@ var AgentTypeRegistry = class {
 	registerAll(definitions) {
 		for (const def of definitions) this.types.set(def.typeId, def);
 		this.refreshCache();
-		log$18.info("批量注册 Agent 类型", { count: definitions.length });
+		log$19.info("批量注册 Agent 类型", { count: definitions.length });
 	}
 	/**
 	* 注销 Agent 类型
@@ -1197,7 +1221,7 @@ var AgentTypeRegistry = class {
 		const result = this.types.delete(typeId);
 		if (result) {
 			this.refreshCache();
-			log$18.debug("注销 Agent 类型", { typeId });
+			log$19.debug("注销 Agent 类型", { typeId });
 		}
 		return result;
 	}
@@ -1284,7 +1308,7 @@ var AgentTypeRegistry = class {
 	loadBuiltinTypes() {
 		for (const def of BUILTIN_AGENT_TYPES) this.types.set(def.typeId, def);
 		this.refreshCache();
-		log$18.info("加载内置 Agent 类型", { count: BUILTIN_AGENT_TYPES.length });
+		log$19.info("加载内置 Agent 类型", { count: BUILTIN_AGENT_TYPES.length });
 	}
 	/**
 	* 刷新可见类型缓存
@@ -1445,11 +1469,11 @@ function formatTokens(tokens) {
 function createClearCommand() {
 	return {
 		name: "clear",
-		aliases: [],
-		description: "清除屏幕",
+		aliases: ["reset", "new"],
+		description: "清空会话上下文，重置 Agent 状态",
 		usage: "/clear",
 		handler(_args, session) {
-			session.clearOutput();
+			session.clearAgentContext();
 			session.getInputParser().reset();
 		}
 	};
@@ -3120,6 +3144,16 @@ var AgentStatusBar = class extends Container {
 	#loadingTimer;
 	/** 上次活跃实例快照（用于检测变化） */
 	#lastActiveCount = 0;
+	/** 当前模型名称 */
+	#modelName = null;
+	/** 累积非缓存 input tokens（usage.input = totalInput - cacheRead） */
+	#inputTokens = 0;
+	/** 累积 cache read tokens（缓存命中） */
+	#cacheReadTokens = 0;
+	/** 累积 output tokens */
+	#outputTokens = 0;
+	/** 任务已耗时（ms） */
+	#durationMs = 0;
 	/**
 	* 切换展开/折叠状态
 	*/
@@ -3131,6 +3165,42 @@ var AgentStatusBar = class extends Container {
 	get isExpanded() {
 		return this.#expanded;
 	}
+	/**
+	* 设置当前模型名称
+	*/
+	setModelName(name) {
+		this.#modelName = name;
+		this.invalidate();
+	}
+	/**
+	* 更新 Token 统计数据
+	*
+	* @param inputTokens - 非缓存 input tokens（usage.input）
+	* @param cacheRead - 缓存读取 tokens（usage.cacheRead）
+	* @param outputTokens - 输出 tokens
+	* @param durationMs - 任务已耗时（毫秒）
+	*/
+	updateTokenStats(inputTokens, cacheRead, outputTokens, durationMs) {
+		this.#inputTokens = inputTokens;
+		this.#cacheReadTokens = cacheRead;
+		this.#outputTokens = outputTokens;
+		if (durationMs !== void 0) this.#durationMs = durationMs;
+		this.invalidate();
+	}
+	/**
+	* 清除 Token 数据（执行结束后调用）
+	*/
+	clearTokenStats() {
+		this.#modelName = null;
+		this.#inputTokens = 0;
+		this.#cacheReadTokens = 0;
+		this.#outputTokens = 0;
+		this.invalidate();
+	}
+	/** 是否有 Token 信息要显示 */
+	get hasTokenInfo() {
+		return this.#modelName !== null;
+	}
 	invalidate() {
 		super.invalidate();
 	}
@@ -3139,6 +3209,7 @@ var AgentStatusBar = class extends Container {
 		if (activeInstances.length === 0) {
 			this.#stopLoading();
 			this.#lastActiveCount = 0;
+			if (this.hasTokenInfo) return [truncateToWidth(this.#renderTokenInfoLine(), width)];
 			return [];
 		}
 		if (this.#lastActiveCount === 0) this.#startLoading();
@@ -3148,8 +3219,15 @@ var AgentStatusBar = class extends Container {
 		}, 0);
 		const totalDuration = this.#formatDuration(Math.max(...activeInstances.map((i) => Date.now() - i.createdAt)));
 		const frame = LOADING_FRAMES$2[this.#loadingFrame % LOADING_FRAMES$2.length] ?? "";
-		if (!this.#expanded) return [this.#renderCollapsed(frame, activeInstances.length, totalToolUses, totalDuration).slice(0, width)];
-		return this.#renderExpanded(frame, activeInstances, width);
+		if (!this.#expanded) {
+			const lines = [];
+			lines.push(truncateToWidth(this.#renderCollapsed(frame, activeInstances.length, totalToolUses, totalDuration), width));
+			if (this.hasTokenInfo) lines.push(truncateToWidth(this.#renderTokenInfoLine(), width));
+			return lines;
+		}
+		const lines = this.#renderExpanded(frame, activeInstances, width);
+		if (this.hasTokenInfo) lines.push(truncateToWidth(this.#renderTokenInfoLine(), width));
+		return lines;
 	}
 	/** 渲染折叠模式单行 */
 	#renderCollapsed(frame, count, toolUses, duration) {
@@ -3161,7 +3239,7 @@ var AgentStatusBar = class extends Container {
 		const count = instances.length;
 		const header = chalk.cyan(`  ${frame} Running ${count} agent${count > 1 ? "s" : ""}...`);
 		const hint = chalk.dim("(ctrl+o to collapse)");
-		lines.push(`${header}  ${hint}`.slice(0, width));
+		lines.push(truncateToWidth(`${header}  ${hint}`, width));
 		for (let i = 0; i < instances.length; i++) {
 			const inst = instances[i];
 			const isLast = i === instances.length - 1;
@@ -3175,11 +3253,11 @@ var AgentStatusBar = class extends Container {
 			const toolUsesStr = act ? chalk.gray(`\u00B7 ${act.toolUses} tool uses`) : "";
 			const durationStr = chalk.gray(`\u00B7 ${this.#formatDuration(Date.now() - inst.createdAt)}`);
 			const line1 = `  ${chalk.dim(connector)}${statusColor(icon)}${chalk.reset} ${typeLabel}  ${chalk.dim(taskPreview)}  ${toolUsesStr} ${durationStr}`;
-			lines.push(line1.slice(0, width));
+			lines.push(truncateToWidth(line1, width));
 			if (act) {
 				const toolDisplay = act.args ? `${act.toolName}: ${act.args.slice(0, 60)}` : act.toolName;
 				const line2 = `  ${chalk.dim(childPrefix + TREE_CONT)}${chalk.cyan(toolDisplay)}`;
-				lines.push(line2.slice(0, width));
+				lines.push(truncateToWidth(line2, width));
 			}
 		}
 		return lines;
@@ -3205,6 +3283,33 @@ var AgentStatusBar = class extends Container {
 		if (ms < 6e4) return `${(ms / 1e3).toFixed(1)}s`;
 		return `${Math.floor(ms / 6e4)}m${Math.floor(ms % 6e4 / 1e3)}s`;
 	}
+	/** 格式化 Token 数字
+	*
+	* - < 1,000: 原始数字（456）
+	* - ≥ 1,000: 千分位分隔（1,234）
+	* - ≥ 10,000: K 单位（15.3K）
+	* - ≥ 1,000,000: M 单位（1.2M）
+	*/
+	#formatTokenCount(n) {
+		if (n >= 1e6) return `${(n / 1e6).toFixed(1)}M`;
+		if (n >= 1e4) return `${(n / 1e3).toFixed(1)}K`;
+		return n.toLocaleString();
+	}
+	/** 渲染 Token 信息行 */
+	#renderTokenInfoLine() {
+		const modelStr = chalk.cyan(this.#modelName ?? "");
+		const separator = chalk.gray(" · ");
+		const totalInput = this.#inputTokens + this.#cacheReadTokens;
+		const missTokens = this.#inputTokens;
+		const cacheRate = totalInput > 0 ? Math.round(this.#cacheReadTokens / totalInput * 100) : 0;
+		const inStr = chalk.white(this.#formatTokenCount(totalInput));
+		const hitStr = chalk.green(this.#formatTokenCount(this.#cacheReadTokens));
+		const rateStr = cacheRate >= 80 ? chalk.green(`${cacheRate}%`) : chalk.yellow(`${cacheRate}%`);
+		const missStr = chalk.yellow(this.#formatTokenCount(missTokens));
+		const outStr = chalk.cyan(this.#formatTokenCount(this.#outputTokens));
+		const durationStr = chalk.magenta(this.#formatDuration(this.#durationMs));
+		return `  ${modelStr}${separator}${chalk.gray("IN")} ${inStr}${separator}${chalk.gray("HIT")} ${hitStr} ${chalk.dim(`(${rateStr})`)}${separator}${chalk.gray("MISS")} ${missStr}${separator}${chalk.gray("OUT")} ${outStr}${separator}${durationStr}`;
+	}
 };
 
 //#endregion
@@ -3975,7 +4080,7 @@ const CRON_CONSTANTS = {
 *
 * @module cli/repl/cron/cron-scheduler
 */
-const log$17 = logger.child("cron:scheduler");
+const log$18 = logger.child("cron:scheduler");
 var CronScheduler = class extends EventEmitter {
 	store;
 	jobs = [];
@@ -3996,7 +4101,7 @@ var CronScheduler = class extends EventEmitter {
 		if (this.running) return;
 		const loadedJobs = await this.store.load();
 		this.jobs = loadedJobs;
-		log$17.info(`调度器启动，加载 ${loadedJobs.length} 个 durable 任务`);
+		log$18.info(`调度器启动，加载 ${loadedJobs.length} 个 durable 任务`);
 		await this.handleMissedJobs();
 		this.checkAutoExpiry();
 		this.running = true;
@@ -4012,7 +4117,7 @@ var CronScheduler = class extends EventEmitter {
 			clearInterval(this.timer);
 			this.timer = null;
 		}
-		log$17.info("调度器已停止");
+		log$18.info("调度器已停止");
 	}
 	/** 添加任务 */
 	async addJob(job) {
@@ -4024,7 +4129,7 @@ var CronScheduler = class extends EventEmitter {
 			this.jobs.push(job);
 			await this.store.persist(this.jobs);
 		} else this.sessionJobs.push(job);
-		log$17.info("任务已添加", {
+		log$18.info("任务已添加", {
 			id: job.id,
 			cron: job.cron,
 			durable: job.durable
@@ -4154,7 +4259,7 @@ var CronScheduler = class extends EventEmitter {
 			}, delay);
 		}
 		if (toDelete.length > 0) {
-			log$17.info(`跳过 ${toDelete.length} 个错过的一次性任务（超出补发上限）`);
+			log$18.info(`跳过 ${toDelete.length} 个错过的一次性任务（超出补发上限）`);
 			this.emit("missed-overflow", {
 				count: toDelete.length,
 				jobIds: toDelete.map((m) => m.id)
@@ -4172,7 +4277,7 @@ var CronScheduler = class extends EventEmitter {
 				job.lastFiredAt = now;
 				job.fireCount++;
 				this.removeJob(job.id);
-				log$17.info("任务已过期并触发最后一次", { id: job.id });
+				log$18.info("任务已过期并触发最后一次", { id: job.id });
 			}
 		}
 	}
@@ -4233,7 +4338,7 @@ function applyOneShotJitter(jobId, rawNext) {
 *
 * @module cli/repl/cron/cron-store
 */
-const log$16 = logger.child("cron:store");
+const log$17 = logger.child("cron:store");
 const STORE_FILE = join(join(homedir(), ".zapmyco", "cron"), "scheduled_tasks.json");
 var CronStore = class {
 	filePath;
@@ -4257,13 +4362,13 @@ var CronStore = class {
 			const raw = await readFile(this.filePath, "utf-8");
 			const data = JSON.parse(raw);
 			if (!Array.isArray(data)) {
-				log$16.warn("存储文件格式无效（非数组），将使用空列表");
+				log$17.warn("存储文件格式无效（非数组），将使用空列表");
 				return [];
 			}
 			return this.validateJobs(data);
 		} catch (err) {
 			if (err.code === "ENOENT") return [];
-			log$16.warn("加载定时任务文件失败，将使用空列表", { error: err instanceof Error ? err.message : String(err) });
+			log$17.warn("加载定时任务文件失败，将使用空列表", { error: err instanceof Error ? err.message : String(err) });
 			return [];
 		}
 	}
@@ -4310,7 +4415,7 @@ var CronStore = class {
 			if (typeof obj.maxFires === "number") job.maxFires = obj.maxFires;
 			valid.push(job);
 		}
-		if (valid.length < raw.length) log$16.warn(`跳过 ${raw.length - valid.length} 个无效任务条目`);
+		if (valid.length < raw.length) log$17.warn(`跳过 ${raw.length - valid.length} 个无效任务条目`);
 		return valid;
 	}
 };
@@ -4328,7 +4433,7 @@ function getCronStore() {
 * 基于内存的环形缓冲区，记录 REPL 会话中的用户输入和执行结果。
 * 支持文件持久化到 ~/.zapmyco/history.json，跨会话恢复。
 */
-const log$15 = logger.child("history:store");
+const log$16 = logger.child("history:store");
 /** 默认最大历史条数 */
 const DEFAULT_MAX_SIZE = 100;
 /** 历史文件存储路径 */
@@ -4387,13 +4492,13 @@ var HistoryStore = class {
 			if (Array.isArray(data.entries)) {
 				this.entries = data.entries.slice(-this.maxSize);
 				this.nextId = typeof data.nextId === "number" ? data.nextId : 1;
-				log$15.debug("历史记录已加载", {
+				log$16.debug("历史记录已加载", {
 					count: this.entries.length,
 					nextId: this.nextId
 				});
 			}
 		} catch {
-			log$15.debug("无历史文件或加载失败，使用空历史");
+			log$16.debug("无历史文件或加载失败，使用空历史");
 		}
 	}
 	/** 持久化历史记录到文件 */
@@ -4406,7 +4511,7 @@ var HistoryStore = class {
 			}, null, 2);
 			writeFileSync(this.filePath, data, "utf-8");
 		} catch (err) {
-			log$15.warn("历史记录保存失败", { error: err instanceof Error ? err.message : String(err) });
+			log$16.warn("历史记录保存失败", { error: err instanceof Error ? err.message : String(err) });
 		}
 	}
 };
@@ -5288,7 +5393,7 @@ var Renderer = class {
 *
 * @module core/agent-team
 */
-const log$14 = logger.child("background-store");
+const log$15 = logger.child("background-store");
 /**
 * 后台任务持久化存储
 *
@@ -5318,14 +5423,14 @@ var BackgroundTaskStore = class {
 				const entries = JSON.parse(raw);
 				this.tasks.clear();
 				for (const entry of entries) this.tasks.set(entry.taskId, entry);
-				log$14.debug("后台任务已加载", {
+				log$15.debug("后台任务已加载", {
 					count: entries.length,
 					path: this.filePath
 				});
 				return entries;
 			}
 		} catch (err) {
-			log$14.warn("后台任务加载失败", {
+			log$15.warn("后台任务加载失败", {
 				error: String(err),
 				path: this.filePath
 			});
@@ -5384,7 +5489,7 @@ var BackgroundTaskStore = class {
 			const entries = Array.from(this.tasks.values());
 			writeFileSync(this.filePath, JSON.stringify(entries, null, 2), "utf-8");
 		} catch (err) {
-			log$14.error("后台任务持久化失败", {
+			log$15.error("后台任务持久化失败", {
 				error: String(err),
 				path: this.filePath
 			});
@@ -5410,7 +5515,7 @@ var BackgroundTaskStore = class {
 		}
 		if (cleaned > 0) {
 			this.persist();
-			log$14.info("清理过期后台任务", { cleaned });
+			log$15.info("清理过期后台任务", { cleaned });
 		}
 		return cleaned;
 	}
@@ -5427,7 +5532,7 @@ var BackgroundTaskStore = class {
 *
 * @module core/agent-team
 */
-const log$13 = logger.child("agent-message-bus");
+const log$14 = logger.child("agent-message-bus");
 /**
 * Agent 消息总线（单例）
 *
@@ -5461,12 +5566,12 @@ var AgentMessageBus = class {
 		};
 		const targetInstance = getAgentInstanceManager().get(toAgentId);
 		if (targetInstance) targetInstance.inbox.push(fullMessage);
-		else log$13.warn("目标 Agent 实例不存在，消息丢弃", {
+		else log$14.warn("目标 Agent 实例不存在，消息丢弃", {
 			toAgentId,
 			messageId: fullMessage.messageId
 		});
 		this.emitter.emit(`msg:${toAgentId}`, fullMessage);
-		log$13.debug("消息已投递", {
+		log$14.debug("消息已投递", {
 			from: fromAgentId,
 			to: toAgentId,
 			type: fullMessage.type,
@@ -5549,7 +5654,7 @@ function getAgentMessageBus() {
 *
 * @module core/agent-team
 */
-const log$12 = logger.child("background-agent-manager");
+const log$13 = logger.child("background-agent-manager");
 /**
 * 后台 Agent 管理器（单例）
 */
@@ -5606,7 +5711,7 @@ var BackgroundAgentManager = class {
 			parentAgentId: params.parentInstanceId
 		});
 		this.runAsync(taskId, params, abortController, timeoutMs).catch((err) => {
-			log$12.error("后台 Agent 意外崩溃", {
+			log$13.error("后台 Agent 意外崩溃", {
 				taskId,
 				error: String(err)
 			});
@@ -5626,7 +5731,7 @@ var BackgroundAgentManager = class {
 		const orchestrator = this.orchestrator;
 		const messageBus = getAgentMessageBus();
 		const timeoutHandle = setTimeout(() => {
-			log$12.warn("后台 Agent 超时，自动取消", {
+			log$13.warn("后台 Agent 超时，自动取消", {
 				taskId,
 				timeoutMs
 			});
@@ -5670,7 +5775,7 @@ var BackgroundAgentManager = class {
 					taskId,
 					requiresResponse: false
 				});
-				log$12.info("后台 Agent 完成通知已发送", {
+				log$13.info("后台 Agent 完成通知已发送", {
 					taskId,
 					instanceId: result.instanceId,
 					parentId: params.parentInstanceId,
@@ -5697,7 +5802,7 @@ var BackgroundAgentManager = class {
 			completedAt: Date.now(),
 			error
 		});
-		log$12.warn("后台 Agent 失败", {
+		log$13.warn("后台 Agent 失败", {
 			taskId,
 			error
 		});
@@ -5734,7 +5839,7 @@ var BackgroundAgentManager = class {
 		if (runtime.instanceId) try {
 			await getAgentInstanceManager().cancel(runtime.instanceId);
 		} catch {}
-		log$12.info("后台 Agent 已取消", { taskId });
+		log$13.info("后台 Agent 已取消", { taskId });
 		return true;
 	}
 	/**
@@ -5743,13 +5848,13 @@ var BackgroundAgentManager = class {
 	restore() {
 		this.store.load();
 		const stale = this.store.cleanStale();
-		if (stale > 0) log$12.info("跨会话恢复：清理了过期后台任务", { count: stale });
+		if (stale > 0) log$13.info("跨会话恢复：清理了过期后台任务", { count: stale });
 		const active = this.store.listActive();
 		for (const entry of active) this.store.updateStatus(entry.taskId, "failed", {
 			completedAt: Date.now(),
 			error: "会话终止导致任务丢失"
 		});
-		if (active.length > 0) log$12.info("跨会话恢复：标记活跃任务为 failed", { count: active.length });
+		if (active.length > 0) log$13.info("跨会话恢复：标记活跃任务为 failed", { count: active.length });
 	}
 };
 /** 全局单例 */
@@ -5968,7 +6073,7 @@ function createDeferred() {
 *
 * @module core/question/question-manager
 */
-const log$11 = logger.child("question-manager");
+const log$12 = logger.child("question-manager");
 /** 问题超时时间（5 分钟） */
 const QUESTION_TIMEOUT_MS = 300 * 1e3;
 var QuestionManager = class {
@@ -6014,13 +6119,13 @@ var QuestionManager = class {
 			requestId,
 			questionCount: params.questions.length
 		});
-		log$11.debug("提问已发出", {
+		log$12.debug("提问已发出", {
 			requestId,
 			questionCount: params.questions.length
 		});
 		const timeout = setTimeout(() => {
 			if (!deferred.isSettled) {
-				log$11.warn("提问超时，自动取消", { requestId });
+				log$12.warn("提问超时，自动取消", { requestId });
 				deferred.reject(/* @__PURE__ */ new Error("提问超时，用户未在 5 分钟内回答"));
 				this.pending.delete(requestId);
 				eventBus.emit("question:timeout", { requestId });
@@ -6034,7 +6139,7 @@ var QuestionManager = class {
 				requestId,
 				answerCount: Object.keys(result.answers).length
 			});
-			log$11.debug("提问已回答", { requestId });
+			log$12.debug("提问已回答", { requestId });
 			return result;
 		} catch (err) {
 			clearTimeout(timeout);
@@ -6043,7 +6148,7 @@ var QuestionManager = class {
 				requestId,
 				reason: err instanceof Error ? err.message : String(err)
 			});
-			log$11.debug("提问已取消", {
+			log$12.debug("提问已取消", {
 				requestId,
 				error: err instanceof Error ? err.message : String(err)
 			});
@@ -6065,7 +6170,7 @@ var QuestionManager = class {
 		const count = this.pending.size;
 		for (const [, entry] of this.pending) if (!entry.deferred.isSettled) entry.deferred.reject(error);
 		this.pending.clear();
-		if (count > 0) log$11.debug("已清理所有待处理问题", { count });
+		if (count > 0) log$12.debug("已清理所有待处理问题", { count });
 	}
 };
 let globalQuestionManager = null;
@@ -9713,6 +9818,137 @@ function parseArgs(args) {
 	if (current.length > 0) result.push(current);
 	return result;
 }
+/** 代码块模式: ```! ... ``` */
+const SHELL_BLOCK_PATTERN = /```!\s*\n?([\s\S]*?)\n?```/g;
+/** 行内模式: !`command`（前面需有空白或行首） */
+const SHELL_INLINE_PATTERN = /(?<=^|\s)!`([^`]+)`/gm;
+/** Shell 命令默认超时（秒） */
+const SKILL_SHELL_TIMEOUT_SEC = 30;
+/** Shell 命令输出最大字符数 */
+const SKILL_SHELL_MAX_OUTPUT_CHARS = 1e4;
+/**
+* 执行 SKILL.md 中的 Shell 命令
+*
+* 支持两种语法：
+* 1. 代码块: ```! echo "hello" ```
+* 2. 行内: 前导 !`echo "hello"`
+*/
+async function executeShellCommandsInSkill(content) {
+	if (!content.includes("```!") && !content.includes("!`")) return content;
+	let result = content;
+	result = await replaceBlockCommands(result);
+	result = await replaceInlineCommands(result);
+	return result;
+}
+/** 处理 ```! ... ``` 代码块 */
+async function replaceBlockCommands(content) {
+	const matches = [];
+	const pattern = new RegExp(SHELL_BLOCK_PATTERN.source, "g");
+	for (let match = pattern.exec(content); match !== null; match = pattern.exec(content)) matches.push({
+		full: match[0],
+		command: (match[1] ?? "").trim()
+	});
+	if (matches.length === 0) return content;
+	const results = await Promise.all(matches.map(async (m) => ({
+		target: m.full,
+		replacement: await executeSingleCommand(m.command, false)
+	})));
+	let result = content;
+	for (const { target, replacement } of results) result = result.replace(target, replacement);
+	return result;
+}
+/** 处理 !`command` 行内命令 */
+async function replaceInlineCommands(content) {
+	const matches = [];
+	const pattern = new RegExp(SHELL_INLINE_PATTERN.source, "gm");
+	for (let match = pattern.exec(content); match !== null; match = pattern.exec(content)) matches.push({
+		full: match[0],
+		command: (match[1] ?? "").trim()
+	});
+	if (matches.length === 0) return content;
+	let result = content;
+	for (const m of matches) {
+		const output = await executeSingleCommand(m.command, true);
+		result = result.replace(m.full, output);
+	}
+	return result;
+}
+/** 执行单个 Shell 命令并返回替换文本 */
+async function executeSingleCommand(command, inline) {
+	if (!command) return "";
+	const security = checkCommandSecurity(command);
+	if (security.blocked) return `[Shell 命令被阻断] 命令: ${command}  原因: ${security.reason ?? "未知"}`;
+	if (security.requiresApproval) return `[Shell 命令需审批] 命令: ${command}  原因: ${security.reason ?? "需要用户确认"}`;
+	const shell = process.env.SHELL || "/bin/bash";
+	try {
+		const { stdout, stderr, exitCode } = await spawnCommand(shell, command);
+		return formatShellOutput(stdout, stderr, exitCode, inline);
+	} catch (err) {
+		return `[Shell 命令执行失败] ${err instanceof Error ? err.message : String(err)}`;
+	}
+}
+/** spawn 执行命令并返回结构化结果 */
+function spawnCommand(shell, command) {
+	return new Promise((resolve) => {
+		const child = spawn(shell, ["-c", command], {
+			env: sanitizeEnv(),
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			]
+		});
+		const stdoutChunks = [];
+		const stderrChunks = [];
+		child.stdout?.on("data", (data) => {
+			stdoutChunks.push(data.toString());
+		});
+		child.stderr?.on("data", (data) => {
+			stderrChunks.push(data.toString());
+		});
+		let settled = false;
+		const settle = (result) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timer);
+			resolve(result);
+		};
+		child.on("exit", (code) => {
+			settle({
+				stdout: stdoutChunks.join(""),
+				stderr: stderrChunks.join(""),
+				exitCode: code
+			});
+		});
+		child.on("error", () => {
+			settle({
+				stdout: "",
+				stderr: "进程启动失败",
+				exitCode: -1
+			});
+		});
+		const timer = setTimeout(() => {
+			try {
+				child.kill("SIGTERM");
+			} catch {}
+			setTimeout(() => {
+				try {
+					child.kill("SIGKILL");
+				} catch {}
+			}, 2e3);
+		}, SKILL_SHELL_TIMEOUT_SEC * 1e3);
+	});
+}
+/** 格式化 shell 命令输出 */
+function formatShellOutput(stdout, stderr, exitCode, inline) {
+	let output = stdout;
+	if (stderr) output += (output ? "\n" : "") + (inline ? `[stderr: ${stderr.trim()}]` : `[stderr]\n${stderr.trim()}`);
+	output = stripAnsi(output);
+	output = redactSensitiveInfo(output);
+	output = truncateOutput(output, SKILL_SHELL_MAX_OUTPUT_CHARS);
+	if (exitCode !== null && exitCode !== 0) output += `\n(退出码: ${exitCode})`;
+	return output || "(无输出)";
+}
 /**
 * 创建 Skill 工具
 *
@@ -9781,7 +10017,7 @@ function createSkillTool(_config) {
 				const endIdx = content.indexOf("---", 3);
 				if (endIdx !== -1) bodyContent = content.slice(endIdx + 3).trim();
 			}
-			const substituted = substituteVariables(bodyContent, params.args, skill.baseDir, skill.name);
+			const withShell = await executeShellCommandsInSkill(substituteVariables(bodyContent, params.args, skill.baseDir, skill.name));
 			const hint = skill.frontmatter["argument-hint"] ? ` [${skill.frontmatter["argument-hint"]}]` : "";
 			const instructionParts = [
 				`# Skill: ${skill.name}${hint}`,
@@ -9790,12 +10026,12 @@ function createSkillTool(_config) {
 				"",
 				"---",
 				"",
-				substituted,
+				withShell,
 				"",
 				"---",
 				`Base directory: ${skill.baseDir}`
 			];
-			if (!substituted.includes(params.args ?? "") && params.args) instructionParts.push("", `ARGUMENTS: ${params.args}`);
+			if (!withShell.includes(params.args ?? "") && params.args) instructionParts.push("", `ARGUMENTS: ${params.args}`);
 			return {
 				content: [{
 					type: "text",
@@ -9833,8 +10069,8 @@ function getSkillCommandSpecs(entries) {
 * @param args - 用户传递的参数（可选）
 * @returns 格式化后的完整指令文本
 */
-function formatSkillContent(skill, args) {
-	const substituted = substituteVariables(skill.body, args, skill.baseDir, skill.name);
+async function formatSkillContent(skill, args) {
+	const withShell = await executeShellCommandsInSkill(substituteVariables(skill.body, args, skill.baseDir, skill.name));
 	const hint = skill.frontmatter["argument-hint"] ? ` [${skill.frontmatter["argument-hint"]}]` : "";
 	const instructionParts = [
 		`# Skill: ${skill.name}${hint}`,
@@ -9843,12 +10079,12 @@ function formatSkillContent(skill, args) {
 		"",
 		"---",
 		"",
-		substituted,
+		withShell,
 		"",
 		"---",
 		`Base directory: ${skill.baseDir}`
 	];
-	if (!substituted.includes(args ?? "") && args) instructionParts.push("", `ARGUMENTS: ${args}`);
+	if (!withShell.includes(args ?? "") && args) instructionParts.push("", `ARGUMENTS: ${args}`);
 	return instructionParts.filter(Boolean).join("\n");
 }
 /**
@@ -11360,7 +11596,7 @@ var WorktreeStore = class {
 * @module core/worktree
 */
 const execFileAsync = promisify(execFile);
-const log$10 = logger.child("worktree-manager");
+const log$11 = logger.child("worktree-manager");
 let globalWorktreeManager = null;
 /** 获取全局 WorktreeManager 实例 */
 function getWorktreeManager() {
@@ -11396,7 +11632,7 @@ var WorktreeManager = class {
 			throw new WorktreeError("无法确定 git 仓库根目录，请确保在 git 仓库中运行", "NOT_GIT_REPO");
 		}
 		try {
-			log$10.info("创建 worktree", {
+			log$11.info("创建 worktree", {
 				branchName,
 				worktreePath,
 				gitRoot
@@ -11424,14 +11660,14 @@ var WorktreeManager = class {
 			});
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : String(err);
-			log$10.warn("创建分支失败，清理 worktree", {
+			log$11.warn("创建分支失败，清理 worktree", {
 				branchName,
 				error: msg
 			});
 			try {
 				await this.removeByPath(worktreePath, branchName, true);
 			} catch (err) {
-				log$10.warn("Worktree 创建失败后清理出错", {
+				log$11.warn("Worktree 创建失败后清理出错", {
 					worktreePath,
 					error: err instanceof Error ? err.message : String(err)
 				});
@@ -11456,7 +11692,7 @@ var WorktreeManager = class {
 			createdBy: info.createdBy,
 			status: "active"
 		});
-		log$10.info("Worktree 创建成功", {
+		log$11.info("Worktree 创建成功", {
 			id: info.id,
 			path: worktreePath
 		});
@@ -11468,13 +11704,13 @@ var WorktreeManager = class {
 	async remove(id, discardChanges) {
 		const info = this.activeWorktrees.get(id);
 		if (!info) {
-			log$10.warn("尝试删除不存在的 worktree", { id });
+			log$11.warn("尝试删除不存在的 worktree", { id });
 			return;
 		}
 		await this.removeByPath(info.worktreePath, info.branchName, discardChanges);
 		this.activeWorktrees.delete(id);
 		this.store.delete(id);
-		log$10.info("Worktree 已删除", { id });
+		log$11.info("Worktree 已删除", { id });
 	}
 	/**
 	* 通过路径删除 worktree（内部方法）
@@ -11484,7 +11720,7 @@ var WorktreeManager = class {
 			try {
 				await execFileAsync("git", ["worktree", "prune"], { timeout: 1e4 });
 			} catch (err) {
-				log$10.warn("Worktree prune 失败（路径不存在）", {
+				log$11.warn("Worktree prune 失败（路径不存在）", {
 					worktreePath,
 					error: err instanceof Error ? err.message : String(err)
 				});
@@ -11498,7 +11734,7 @@ var WorktreeManager = class {
 			await execFileAsync("git", args, { timeout: 15e3 });
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : String(err);
-			log$10.warn("git worktree remove 失败", {
+			log$11.warn("git worktree remove 失败", {
 				worktreePath,
 				error: msg
 			});
@@ -11510,7 +11746,7 @@ var WorktreeManager = class {
 				branchName
 			], { timeout: 1e4 });
 		} catch (err) {
-			log$10.warn("删除 worktree 分支失败", {
+			log$11.warn("删除 worktree 分支失败", {
 				branchName,
 				error: err instanceof Error ? err.message : String(err)
 			});
@@ -11518,7 +11754,7 @@ var WorktreeManager = class {
 		try {
 			await execFileAsync("git", ["worktree", "prune"], { timeout: 1e4 });
 		} catch (err) {
-			log$10.warn("Worktree prune 失败", { error: err instanceof Error ? err.message : String(err) });
+			log$11.warn("Worktree prune 失败", { error: err instanceof Error ? err.message : String(err) });
 		}
 	}
 	/**
@@ -11540,7 +11776,7 @@ var WorktreeManager = class {
 			await this.remove(id, true);
 			return { cleaned: true };
 		}
-		log$10.info("Worktree 有变更，保留", {
+		log$11.info("Worktree 有变更，保留", {
 			id,
 			path: info.worktreePath
 		});
@@ -11560,7 +11796,7 @@ var WorktreeManager = class {
 			});
 			return stdout.trim().length > 0;
 		} catch (err) {
-			log$10.warn("检查 worktree 变更状态失败", {
+			log$11.warn("检查 worktree 变更状态失败", {
 				worktreePath,
 				error: err instanceof Error ? err.message : String(err)
 			});
@@ -11580,7 +11816,7 @@ var WorktreeManager = class {
 				await this.removeByPath(record.worktreePath, record.branchName, true);
 				cleaned++;
 			} catch (err) {
-				log$10.warn("过期 worktree 清理失败", {
+				log$11.warn("过期 worktree 清理失败", {
 					id: record.id,
 					path: record.worktreePath,
 					error: err instanceof Error ? err.message : String(err)
@@ -11589,7 +11825,7 @@ var WorktreeManager = class {
 			this.activeWorktrees.delete(record.id);
 			this.store.delete(record.id);
 		}
-		if (cleaned > 0) log$10.info("过期 worktree 清理完成", { cleaned });
+		if (cleaned > 0) log$11.info("过期 worktree 清理完成", { cleaned });
 		return cleaned;
 	}
 	listActive() {
@@ -11640,7 +11876,7 @@ const AGENT_STANDARD_TOOLS = [
 
 //#endregion
 //#region src/core/agent-team/agent-factory.ts
-const log$9 = logger.child("agent-factory");
+const log$10 = logger.child("agent-factory");
 /**
 * 创建 Agent 实例
 *
@@ -11658,6 +11894,7 @@ const log$9 = logger.child("agent-factory");
 * @returns 完全初始化的 LlmBasedAgent
 */
 function createAgentFromType(definition, instance, parentAgent, availableTools, config) {
+	const thinkingLevel = resolveAgentThinkingLevel(definition.thinkingLevel, config.thinkingLevel, parentAgent);
 	const agent = createLlmBasedAgent({
 		agentId: instance.instanceId,
 		displayName: definition.displayName,
@@ -11665,14 +11902,15 @@ function createAgentFromType(definition, instance, parentAgent, availableTools,
 		runtimeConfig: {
 			enabled: true,
 			toolExecution: "sequential",
-			maxTurns: definition.maxTurns
+			maxTurns: definition.maxTurns,
+			thinkingLevel
 		}
 	});
 	shareParentResources(agent, parentAgent, definition);
 	const tools = resolveTools(definition, availableTools, instance.depth, config);
 	agent.registerTools(tools);
 	agent.systemPromptOverride = buildSystemPrompt(definition, instance.task.description, config);
-	log$9.debug("创建 Agent 实例", {
+	log$10.debug("创建 Agent 实例", {
 		typeId: definition.typeId,
 		instanceId: instance.instanceId,
 		depth: instance.depth,
@@ -11736,6 +11974,17 @@ function buildSystemPrompt(definition, taskDescription, _config) {
 	return definition.getSystemPrompt(ctx);
 }
 /**
+* 解析 Agent 的 thinkingLevel
+*
+* 优先级：definition.thinkingLevel > config.thinkingLevel > 'off'
+* 'inherit' 值：从父 Agent 读取当前 thinkingLevel
+*/
+function resolveAgentThinkingLevel(definitionLevel, configLevel, parentAgent) {
+	const level = definitionLevel ?? configLevel ?? "off";
+	if (level === "inherit") return parentAgent.innerAgent.state.thinkingLevel ?? "medium";
+	return level;
+}
+/**
 * 共享父 Agent 的 Model 和 API Key 给子 Agent
 *
 * 如果 Agent 类型声明了偏好的模型（definition.model），则通过 AgentLlmFacade
@@ -11753,8 +12002,14 @@ function shareParentResources(subAgent, parentAgent, definition) {
 		subAgent.llmFacade = parentAgent.llmFacade;
 		if (definition?.model) {
 			const resolvedModel = resolveModelForDefinition(definition.model, parentAgent);
-			if (resolvedModel) subAgent.innerAgent.state.model = resolvedModel;
-			else subAgent.innerAgent.state.model = parentInner.state.model;
+			if (resolvedModel) {
+				subAgent.innerAgent.state.model = resolvedModel;
+				if (resolvedModel.id !== parentInner.state.model?.id) log$10.info(`子 Agent [${definition?.typeId}] 模型切换: ${parentInner.state.model?.id ?? "N/A"} → ${resolvedModel.id}`, {
+					typeId: definition?.typeId,
+					parentModel: parentInner.state.model?.id,
+					childModel: resolvedModel.id
+				});
+			} else subAgent.innerAgent.state.model = parentInner.state.model;
 		} else subAgent.innerAgent.state.model = parentInner.state.model;
 		subAgent.innerAgent.getApiKey = parentAgent.llmFacade.createGetApiKeyFn();
 		return;
@@ -11788,14 +12043,14 @@ function resolveModelForDefinition(model, parentAgent) {
 		}
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
-		log$9.warn(`解析 Agent 类型偏好模型 [${model}] 失败`, { error: message });
+		log$10.warn(`解析 Agent 类型偏好模型 [${model}] 失败`, { error: message });
 		return;
 	}
 }
 
 //#endregion
 //#region src/core/agent-team/agent-result-aggregator.ts
-const log$8 = logger.child("agent-result-aggregator");
+const log$9 = logger.child("agent-result-aggregator");
 /** 零值 TokenUsage */
 const ZERO_TOKEN = {
 	inputTokens: 0,
@@ -11825,7 +12080,7 @@ function aggregateResults(teamId, workerResults) {
 		estimatedCostUsd: sum.estimatedCostUsd + (r.tokenUsage?.estimatedCostUsd ?? 0)
 	}), { ...ZERO_TOKEN });
 	const summary = buildTeamSummary(workerResults);
-	log$8.debug("Team 结果聚合完成", {
+	log$9.debug("Team 结果聚合完成", {
 		teamId,
 		total: workerResults.length,
 		succeeded,
@@ -11903,7 +12158,7 @@ function escapeMarkdownTable(text) {
 
 //#endregion
 //#region src/core/agent-team/agent-orchestrator.ts
-const log$7 = logger.child("agent-orchestrator");
+const log$8 = logger.child("agent-orchestrator");
 /**
 * Agent 编排器
 *
@@ -11936,7 +12191,7 @@ var AgentOrchestrator = class {
 		const startTime = Date.now();
 		const defaultType = getAgentTypeRegistry().getDefault();
 		if (!defaultType) throw new Error("无法获取默认 Agent 类型（general-purpose）");
-		log$7.info("开始扁平并行执行", {
+		log$8.info("开始扁平并行执行", {
 			count: specs.length,
 			maxConcurrent: this.flatConfig.maxConcurrent,
 			hasContext: context != null
@@ -11944,7 +12199,7 @@ var AgentOrchestrator = class {
 		const allResults = [];
 		for (let i = 0; i < specs.length; i += this.flatConfig.maxConcurrent) {
 			const batch = specs.slice(i, i + this.flatConfig.maxConcurrent);
-			log$7.debug("执行扁平批次", {
+			log$8.debug("执行扁平批次", {
 				batchStart: i,
 				batchSize: batch.length,
 				totalSpecs: specs.length
@@ -11954,7 +12209,7 @@ var AgentOrchestrator = class {
 		}
 		const succeeded = allResults.filter((r) => r.status === "success").length;
 		const totalDuration = Date.now() - startTime;
-		log$7.info("扁平并行执行完成", {
+		log$8.info("扁平并行执行完成", {
 			total: allResults.length,
 			succeeded,
 			failed: allResults.length - succeeded,
@@ -12029,7 +12284,7 @@ var AgentOrchestrator = class {
 		} catch (error) {
 			const duration = Date.now() - startTime;
 			const message = error instanceof Error ? error.message : String(error);
-			log$7.warn("扁平子任务执行失败", {
+			log$8.warn("扁平子任务执行失败", {
 				specId: spec.id,
 				error: message,
 				duration
@@ -12086,7 +12341,7 @@ var AgentOrchestrator = class {
 		const parentInstanceId = options?.parentInstanceId ?? "";
 		const depth = (parentInstanceId && instanceManager.get(parentInstanceId) ? instanceManager.get(parentInstanceId)?.depth ?? 0 : 0) + 1;
 		if (depth > this.teamConfig.maxGlobalDepth) {
-			log$7.warn("Worker 创建被拒绝：超过全局最大深度", {
+			log$8.warn("Worker 创建被拒绝：超过全局最大深度", {
 				typeId,
 				depth,
 				maxGlobalDepth: this.teamConfig.maxGlobalDepth
@@ -12208,7 +12463,7 @@ var AgentOrchestrator = class {
 		} catch (error) {
 			const duration = Date.now() - startTime;
 			const message = error instanceof Error ? error.message : String(error);
-			log$7.warn("Worker 执行失败", {
+			log$8.warn("Worker 执行失败", {
 				typeId,
 				instanceId,
 				error: message,
@@ -12251,12 +12506,12 @@ var AgentOrchestrator = class {
 				const wm = getWorktreeManager();
 				if (wm) try {
 					const cleanResult = await wm.autoCleanIfNoChanges(worktreeInfo.id);
-					if (!cleanResult.cleaned) log$7.info("Worktree 有变更，保留", {
+					if (!cleanResult.cleaned) log$8.info("Worktree 有变更，保留", {
 						id: worktreeInfo.id,
 						path: cleanResult.worktreePath
 					});
 				} catch (err) {
-					log$7.warn("Worktree 清理失败", {
+					log$8.warn("Worktree 清理失败", {
 						id: worktreeInfo.id,
 						error: err instanceof Error ? err.message : String(err)
 					});
@@ -12276,7 +12531,7 @@ var AgentOrchestrator = class {
 	*/
 	async spawnTeam(taskDescription, workerSpecs) {
 		const teamId = `team-${Date.now()}-${++this.teamCounter}`;
-		log$7.info("创建 Team", {
+		log$8.info("创建 Team", {
 			teamId,
 			workerCount: workerSpecs.length,
 			taskDescription
@@ -12628,6 +12883,84 @@ function createReplBuiltinTools(webConfig, taskStore, skillConfig, parentAgent,
 	return tools;
 }
 
+//#endregion
+//#region src/cli/repl/skill-watcher.ts
+/**
+* Skill 文件变更监视器
+*
+* 使用 chokidar 监视技能目录中的 SKILL.md 文件变更，
+* 通过防抖机制触发外部回调，实现动态技能发现。
+*
+* @module cli/repl/skill-watcher
+*/
+const log$7 = logger.child("repl:skill-watcher");
+/** 防抖延迟（毫秒） */
+const DEBOUNCE_MS = 500;
+/**
+* Skill 文件变更监视器
+*/
+var SkillWatcher = class {
+	watcher = null;
+	debounceTimer = null;
+	_ready = false;
+	/** 监视器是否已就绪 */
+	get ready() {
+		return this._ready;
+	}
+	/**
+	* 启动监视
+	*
+	* 监视指定目录下 `**` 深层匹配 `SKILL.md` 文件变更。
+	* 忽略隐藏目录，`ignoreInitial: true` 避免初始扫描触发 add 事件。
+	*/
+	start(options) {
+		if (this.watcher) return;
+		this.watcher = chokidar.watch(options.watchDirs.map((dir) => `${dir}/**/SKILL.md`), {
+			ignored: /(^|[/\\])\./,
+			persistent: true,
+			ignoreInitial: true,
+			depth: 2
+		});
+		this.watcher.on("ready", () => {
+			this._ready = true;
+			log$7.info("技能文件监视已就绪", { dirs: options.watchDirs });
+		}).on("add", (path) => {
+			log$7.debug("技能文件新增", { path });
+			this.debounceNotify(options.onChanged);
+		}).on("change", (path) => {
+			log$7.debug("技能文件修改", { path });
+			this.debounceNotify(options.onChanged);
+		}).on("unlink", (path) => {
+			log$7.debug("技能文件删除", { path });
+			this.debounceNotify(options.onChanged);
+		});
+	}
+	/**
+	* 停止监视并清理资源
+	*/
+	stop() {
+		if (this.debounceTimer) {
+			clearTimeout(this.debounceTimer);
+			this.debounceTimer = null;
+		}
+		if (this.watcher) {
+			this.watcher.close();
+			this.watcher = null;
+		}
+		this._ready = false;
+	}
+	/**
+	* 防抖通知：批量操作（如 git pull）时合并为一次回调
+	*/
+	debounceNotify(callback) {
+		if (this.debounceTimer) clearTimeout(this.debounceTimer);
+		this.debounceTimer = setTimeout(() => {
+			this.debounceTimer = null;
+			callback();
+		}, DEBOUNCE_MS);
+	}
+};
+
 //#endregion
 //#region src/cli/repl/theme.ts
 /** 根据颜色开关获取 chalk 实例 */
@@ -15640,6 +15973,7 @@ var ReplSession = class {
 	auditLogger;
 	secretRedactor;
 	skillGuard;
+	skillWatcher;
 	/** 交互式提问管理器 */
 	questionManager;
 	stats = {
@@ -15701,6 +16035,7 @@ var ReplSession = class {
 			log.warn("记忆快照冻结失败，将使用空快照", { error: err instanceof Error ? err.message : String(err) });
 			this.agent.memorySnapshot = "";
 		});
+		this.skillWatcher = new SkillWatcher();
 		if (this.config.skill?.enabled !== false) this.initSkills();
 		this.initSecurity();
 		this.questionManager = getQuestionManager();
@@ -15762,6 +16097,7 @@ var ReplSession = class {
 			this.cronScheduler.stop();
 			this.cronScheduler = null;
 		}
+		this.skillWatcher.stop();
 		if (this.auditLogger) this.auditLogger.destroy();
 		if (this.mcpManager) {
 			await this.mcpManager.shutdown();
@@ -15790,6 +16126,36 @@ var ReplSession = class {
 	getHistoryStore() {
 		return this.history;
 	}
+	/**
+	* 彻底清空 Agent 会话上下文。
+	*
+	* - 清空消息历史、Token 统计、缓存、授权
+	* - 保留配置、记忆、持久化任务、定时任务
+	* - 效果等价于"新开一个会话"
+	*
+	* 由 /clear 命令调用。
+	*/
+	clearAgentContext() {
+		this.cancelCurrentTask();
+		this.currentTaskId = null;
+		this._state = "idle";
+		this.agent.resetContext();
+		this.conversationHistory = [];
+		this.stats = {
+			totalRequests: 0,
+			successCount: 0,
+			failureCount: 0,
+			totalTokens: 0,
+			totalCostUsd: 0,
+			state: "idle"
+		};
+		this.permissionStore.clear();
+		this.questionManager.rejectAll(/* @__PURE__ */ new Error("会话已重置"));
+		this.editor.setExecuting(false);
+		this.outputArea.clear();
+		this.agentStatusBar.clearTokenStats();
+		this.tui.requestRender();
+	}
 	/** 获取会话统计 */
 	getStats() {
 		return { ...this.stats };
@@ -15893,6 +16259,8 @@ var ReplSession = class {
 		let spinnerActive = true;
 		let spinnerInterval;
 		let thinkingElapsedInterval;
+		/** Token 信息推送定时器 */
+		let tokenPushInterval;
 		try {
 			this._state = "executing";
 			this.updateStatsState();
@@ -16066,6 +16434,15 @@ var ReplSession = class {
 			this.currentTaskId = taskId;
 			const originalOnToggleThinking = this.editor.onToggleThinking;
 			if (thinkingDisplayMode === "collapse") this.editor.onToggleThinking = toggleThinking;
+			this.agentStatusBar.clearTokenStats();
+			const agentModel = this.agent.innerAgent.state.model;
+			const modelName = typeof agentModel?.id === "string" ? agentModel.id : "unknown";
+			this.agentStatusBar.setModelName(modelName);
+			tokenPushInterval = setInterval(() => {
+				const usage = this.agent.tokenTracker.getUsage();
+				this.agentStatusBar.updateTokenStats(usage.inputTokens, usage.cacheReadTokens, usage.outputTokens, Date.now() - startTime);
+				this.tui.requestRender();
+			}, 2e3);
 			log.debug("开始通过 Agent 执行目标", {
 				taskId,
 				taskDescription: rawInput.slice(0, 100)
@@ -16305,6 +16682,12 @@ var ReplSession = class {
 				clearInterval(thinkingElapsedInterval);
 				thinkingElapsedInterval = void 0;
 			}
+			if (tokenPushInterval) {
+				clearInterval(tokenPushInterval);
+				tokenPushInterval = void 0;
+			}
+			const finalUsage = this.agent.tokenTracker.getUsage();
+			this.agentStatusBar.updateTokenStats(finalUsage.inputTokens, finalUsage.cacheReadTokens, finalUsage.outputTokens, Date.now() - startTime);
 			this._state = "idle";
 			this.updateStatsState();
 			this.editor.setExecuting(false);
@@ -16567,33 +16950,90 @@ var ReplSession = class {
 		}, process.cwd()).then((entries) => {
 			setSkillEntries(entries);
 			this.agent.skillEntries = entries;
-			const snapshot = buildSkillSnapshot(entries, skillConfig.maxSkillsInPrompt);
-			this.agent.skillPrompt = snapshot.prompt;
+			this.agent.resetSentSkills();
 			this._registerSkillCommands(entries);
 			this.buildAutocompleteProvider();
-			const results = this.skillGuard.scanAll(entries);
-			const summary = this.skillGuard.getThreatSummary(results);
-			if (summary.danger > 0 || summary.warning > 0) {
-				log.warn("Skill 威胁扫描完成", summary);
-				for (const result of results) if (!result.passed) for (const v of result.violations) eventBus.emit("security:violation", {
-					toolId: "Skill",
-					type: "skill-threat",
-					message: `[${result.skillName}] ${v.reason}`,
-					params: {
-						skillPath: result.skillPath,
-						ruleId: v.ruleId
-					}
-				});
-			}
+			this.scanSkillSecurity(entries);
 			log.info("Skill 系统初始化完成", {
-				count: snapshot.count,
-				names: snapshot.names
+				count: entries.length,
+				names: entries.map((e) => e.skill.name)
 			});
+			this.startSkillWatcher();
 		}).catch((err) => {
 			log.error("Skill 加载失败", { error: err instanceof Error ? err.message : String(err) });
 		});
 	}
 	/**
+	* 启动技能文件变更监视
+	*
+	* 监视项目级（.agents/skills/、.zapmyco/skills/）和用户级
+	*（~/.zapmyco/skills/）技能目录，文件变更时自动重新加载。
+	*/
+	startSkillWatcher() {
+		const watchDirs = [];
+		for (const dir of [
+			join(process.cwd(), ".agents", "skills"),
+			join(process.cwd(), ".zapmyco", "skills"),
+			join(homedir(), ".zapmyco", "skills")
+		]) try {
+			if (statSync(dir).isDirectory()) watchDirs.push(dir);
+		} catch {}
+		if (watchDirs.length === 0) return;
+		this.skillWatcher.start({
+			watchDirs,
+			onChanged: () => this.reloadSkills()
+		});
+	}
+	/**
+	* 重新加载所有技能（文件变更时调用）
+	*
+	* 幂等操作：重新扫描磁盘、更新全局状态、刷新命令注册和自动补全。
+	*/
+	reloadSkills() {
+		const skillConfig = this.config.skill;
+		if (!skillConfig?.enabled) return;
+		log.info("技能文件变更，重新加载技能...");
+		loadSkills({
+			enabled: true,
+			extraDirs: skillConfig.loadDirs,
+			maxSkillsInPrompt: skillConfig.maxSkillsInPrompt,
+			maxSkillFileBytes: skillConfig.maxSkillFileBytes
+		}, process.cwd()).then((entries) => {
+			setSkillEntries(entries);
+			this.agent.skillEntries = entries;
+			this.agent.resetSentSkills();
+			this.registry.unregisterBySource("skill");
+			this._registerSkillCommands(entries);
+			this.buildAutocompleteProvider();
+			this.scanSkillSecurity(entries);
+			log.info("技能重新加载完成", {
+				count: entries.length,
+				names: entries.map((e) => e.skill.name)
+			});
+		}).catch((err) => {
+			log.error("技能重新加载失败", { error: err instanceof Error ? err.message : String(err) });
+		});
+	}
+	/**
+	* 扫描 Skill 安全威胁
+	*/
+	scanSkillSecurity(entries) {
+		const results = this.skillGuard.scanAll(entries);
+		const summary = this.skillGuard.getThreatSummary(results);
+		if (summary.danger > 0 || summary.warning > 0) {
+			log.warn("Skill 威胁扫描完成", summary);
+			for (const result of results) if (!result.passed) for (const v of result.violations) eventBus.emit("security:violation", {
+				toolId: "Skill",
+				type: "skill-threat",
+				message: `[${result.skillName}] ${v.reason}`,
+				params: {
+					skillPath: result.skillPath,
+					ruleId: v.ruleId
+				}
+			});
+		}
+	}
+	/**
 	* 为 user-invocable 技能注册斜杠命令
 	*
 	* 将每个用户可调用的技能注册为 /skill-name 格式的 CLI 命令。
@@ -16611,11 +17051,12 @@ var ReplSession = class {
 				description: spec.description,
 				aliases: [],
 				usage: spec.name,
+				source: "skill",
 				handler: async (args) => {
 					const argsStr = args.join(" ");
 					const entry = getSkillEntries().find((e) => sanitizeSkillCommandName(e.skill.name) === spec.name);
 					if (entry) {
-						const skillContent = formatSkillContent(entry.skill, argsStr);
+						const skillContent = await formatSkillContent(entry.skill, argsStr);
 						await this.executeGoal(skillContent, `/${spec.name}`);
 					} else {
 						const goalInput = argsStr ? `请使用 /${spec.name} 技能，参数: ${argsStr}` : `请使用 /${spec.name} 技能`;