npm - zapmyco - Versions diffs - 0.13.0 → 0.15.0 - Mend

zapmyco 0.13.0 → 0.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/cli/index.mjs +1385 -147
package/dist/cli/index.mjs.map +1 -1
package/dist/index.d.mts +35 -6
package/dist/index.d.mts.map +1 -1
package/dist/index.mjs +1 -1
package/dist/{loader-BVhTlDtc.mjs → loader-DEuRwvSw.mjs} +410 -35
package/dist/loader-DEuRwvSw.mjs.map +1 -0
package/package.json +4 -2
package/dist/loader-BVhTlDtc.mjs.map +0 -1

package/dist/cli/index.mjs CHANGED Viewed

@@ -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-BVhTlDtc.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,11 +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");
 /**
 * 命令注册表
 */
@@ -38,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();
@@ -62,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);
@@ -78,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`);
 		}
 	}
@@ -447,7 +472,15 @@ const noColor = {
 //#endregion
 //#region src/core/agent-team/agent-instance-manager.ts
-const log$19 = logger.child("agent-instance-manager");
+/**
+* Agent 实例管理器
+*
+* 管理所有 AgentInstance 的生命周期：创建、注册、状态转换、取消、清理。
+* 全局实例注册表，支持按 team/type/depth/status 查询。
+*
+* @module core/agent-team
+*/
+const log$20 = logger.child("agent-instance-manager");
 /**
 * Agent 实例状态转换表
 *
@@ -479,8 +512,9 @@ const TERMINAL_STATES = [
 *
 * 单例模式，全局唯一。
 * 维护所有活跃和已完成的 Agent 实例的运行状态。
+* 继承 EventEmitter 以支持 UI 组件实时监听状态变更。
 */
-var AgentInstanceManager = class {
+var AgentInstanceManager = class extends EventEmitter {
 	/** 实例注册表（按 instanceId 索引） */
 	instances = /* @__PURE__ */ new Map();
 	/**
@@ -511,12 +545,17 @@ var AgentInstanceManager = class {
 			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,
 			parentInstanceId
 		});
+		this.emit("instance:registered", {
+			instanceId: instance.instanceId,
+			typeId: instance.typeId,
+			depth
+		});
 		return instance;
 	}
 	/**
@@ -529,12 +568,12 @@ var AgentInstanceManager = class {
 	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,
@@ -542,16 +581,47 @@ var AgentInstanceManager = class {
 			});
 			return false;
 		}
+		const oldStatus = instance.status;
 		instance.status = newStatus;
-		log$19.debug("Agent 实例状态转换", {
+		log$20.debug("Agent 实例状态转换", {
 			instanceId,
 			typeId: instance.typeId,
-			from: instance.status,
+			from: oldStatus,
+			to: newStatus
+		});
+		this.emit("instance:transitioned", {
+			instanceId,
+			typeId: instance.typeId,
+			from: oldStatus,
 			to: newStatus
 		});
 		return true;
 	}
 	/**
+	* 更新实例当前活动信息（供 UI 状态栏实时展示）
+	*
+	* @param instanceId - 实例 ID
+	* @param activity - 活动信息（工具名称、调用次数、参数等）
+	*/
+	setActivity(instanceId, activity) {
+		const instance = this.instances.get(instanceId);
+		if (!instance) return;
+		instance.currentActivity = activity;
+		this.emit("instance:activity", {
+			instanceId,
+			typeId: instance.typeId,
+			activity
+		});
+	}
+	/**
+	* 获取实例当前活动信息
+	*
+	* @param instanceId - 实例 ID
+	*/
+	getActivity(instanceId) {
+		return this.instances.get(instanceId)?.currentActivity;
+	}
+	/**
 	* 获取指定实例
 	*
 	* @param instanceId - 实例 ID
@@ -644,7 +714,7 @@ var AgentInstanceManager = class {
 		instance.agent.removeAllListeners();
 		instance.agent.systemPromptOverride = null;
 		this.instances.delete(instanceId);
-		log$19.debug("Agent 实例已清理", { instanceId });
+		log$20.debug("Agent 实例已清理", { instanceId });
 	}
 	/**
 	* 清理所有终态的实例
@@ -1095,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 类型注册中心
 *
@@ -1119,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
 		});
@@ -1139,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 类型
@@ -1151,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;
 	}
@@ -1238,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 });
 	}
 	/**
 	* 刷新可见类型缓存
@@ -1399,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();
 		}
 	};
@@ -3021,6 +3091,227 @@ function createStatusCommand() {
 	};
 }
+//#endregion
+//#region src/cli/repl/components/agent-status-bar.ts
+/**
+* Agent 状态栏组件
+*
+* 实时显示正在运行的子 Agent 状态，类似 Claude Code 的 "Running N agents…" 效果。
+* 固定在 OutputArea 和 Editor 之间，无活跃 Agent 时自动隐藏。
+*
+* @module cli/repl/components
+*/
+/** 状态图标映射 */
+const STATUS_ICONS$1 = {
+	idle: "○",
+	running: "◉",
+	paused: "◐",
+	completed: "●",
+	failed: "✕",
+	cancelled: "◌"
+};
+/** Loading 动画帧 */
+const LOADING_FRAMES$2 = [
+	"⠋",
+	"⠙",
+	"⠹",
+	"⠸",
+	"⠼",
+	"⠴",
+	"⠦",
+	"⠧",
+	"⠇",
+	"⠏"
+];
+const LOADING_INTERVAL_MS$1 = 200;
+/** 树形连接线 */
+const TREE_BRANCH = "├── ";
+const TREE_LAST = "└── ";
+const TREE_PIPE = "│   ";
+const TREE_SPACE = "    ";
+const TREE_CONT = "⎿  ";
+/**
+* Agent 状态栏组件
+*
+* 从 AgentInstanceManager 读取活跃实例状态，渲染为紧凑状态栏。
+*/
+var AgentStatusBar = class extends Container {
+	/** 是否展开显示详情 */
+	#expanded = false;
+	/** loading 动画帧索引 */
+	#loadingFrame = 0;
+	/** loading 动画定时器 */
+	#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;
+	/**
+	* 切换展开/折叠状态
+	*/
+	toggle() {
+		this.#expanded = !this.#expanded;
+		this.invalidate();
+	}
+	/** 获取当前展开状态 */
+	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();
+	}
+	render(width) {
+		const activeInstances = getAgentInstanceManager().listActive();
+		if (activeInstances.length === 0) {
+			this.#stopLoading();
+			this.#lastActiveCount = 0;
+			if (this.hasTokenInfo) return [truncateToWidth(this.#renderTokenInfoLine(), width)];
+			return [];
+		}
+		if (this.#lastActiveCount === 0) this.#startLoading();
+		this.#lastActiveCount = activeInstances.length;
+		const totalToolUses = activeInstances.reduce((sum, inst) => {
+			return sum + (inst.currentActivity?.toolUses ?? 0);
+		}, 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) {
+			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) {
+		return `  ${chalk.cyan(`${frame} Running ${count} agent${count > 1 ? "s" : ""}...`)} ${chalk.gray(`\u00B7 ${toolUses} tool use${toolUses !== 1 ? "s" : ""} \u00B7 ${duration}`)}  ${chalk.dim("(ctrl+o to expand)")}`;
+	}
+	/** 渲染展开模式多行 */
+	#renderExpanded(frame, instances, width) {
+		const lines = [];
+		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(truncateToWidth(`${header}  ${hint}`, width));
+		for (let i = 0; i < instances.length; i++) {
+			const inst = instances[i];
+			const isLast = i === instances.length - 1;
+			const connector = isLast ? TREE_LAST : TREE_BRANCH;
+			const childPrefix = isLast ? TREE_SPACE : TREE_PIPE;
+			const icon = STATUS_ICONS$1[inst.status] ?? "?";
+			const statusColor = inst.status === "running" ? chalk.yellow : chalk.gray;
+			const typeLabel = chalk.bold(inst.typeId);
+			const taskPreview = inst.task.description.slice(0, 40);
+			const act = inst.currentActivity;
+			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(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(truncateToWidth(line2, width));
+			}
+		}
+		return lines;
+	}
+	/** 启动 loading 动画 */
+	#startLoading() {
+		if (this.#loadingTimer) return;
+		this.#loadingTimer = setInterval(() => {
+			this.#loadingFrame = (this.#loadingFrame + 1) % LOADING_FRAMES$2.length;
+			this.invalidate();
+		}, LOADING_INTERVAL_MS$1);
+	}
+	/** 停止 loading 动画 */
+	#stopLoading() {
+		if (this.#loadingTimer) {
+			clearInterval(this.#loadingTimer);
+			this.#loadingTimer = void 0;
+		}
+	}
+	/** 格式化持续时间为可读字符串 */
+	#formatDuration(ms) {
+		if (ms < 1e3) return `${ms}ms`;
+		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
 //#region src/cli/repl/components/custom-editor.ts
 /**
@@ -3040,7 +3331,7 @@ function createStatusCommand() {
 /** 输入提示符 */
 const PROMPT_PREFIX = "❯ ";
 /** loading 动画帧 */
-const LOADING_FRAMES = [
+const LOADING_FRAMES$1 = [
 	"⠋",
 	"⠙",
 	"⠹",
@@ -3068,8 +3359,12 @@ var ZapmycoEditor = class extends Editor {
 	onCtrlD;
 	/** Ctrl+O 回调（打开外部编辑器） */
 	onOpenEditor;
-	/** Ctrl+T / Ctrl+Y 回调（展开/折叠 thinking 内容） */
+	/** Ctrl+T 回调（展开/折叠 TaskStatusBar） */
+	onToggleTasks;
+	/** Ctrl+Y 回调（展开/折叠 thinking 内容） */
 	onToggleThinking;
+	/** Ctrl+Shift+O 回调（展开/折叠 Agent 状态栏） */
+	onToggleAgentBar;
 	/** 是否正在执行（用于显示 loading） */
 	#executing = false;
 	/** 是否显示 spinner（执行期间禁用输入但不一定显示 spinner） */
@@ -3120,14 +3415,24 @@ var ZapmycoEditor = class extends Editor {
 			if (this.getText().length === 0 && this.onCtrlD) this.onCtrlD();
 			return;
 		}
-		if (matchesKey(data, Key.ctrl("o")) && this.onOpenEditor) {
-			this.onOpenEditor();
+		if (matchesKey(data, Key.ctrl("o"))) {
+			if (this.onOpenEditor) this.onOpenEditor();
 			return;
 		}
-		if (matchesKey(data, Key.ctrl("t")) && this.onToggleThinking) {
-			this.onToggleThinking();
+		if (matchesKey(data, Key.ctrlShift("o")) && this.onToggleAgentBar) {
+			this.onToggleAgentBar();
 			return;
 		}
+		if (matchesKey(data, Key.ctrl("t"))) {
+			if (this.onToggleTasks) {
+				this.onToggleTasks();
+				return;
+			}
+			if (this.onToggleThinking) {
+				this.onToggleThinking();
+				return;
+			}
+		}
 		if (matchesKey(data, Key.ctrl("y")) && this.onToggleThinking) {
 			this.onToggleThinking();
 			return;
@@ -3178,7 +3483,7 @@ var ZapmycoEditor = class extends Editor {
 		if (executing && showSpinner) {
 			this.#loadingFrame = 0;
 			this.#loadingTimer = setInterval(() => {
-				this.#loadingFrame = (this.#loadingFrame + 1) % LOADING_FRAMES.length;
+				this.#loadingFrame = (this.#loadingFrame + 1) % LOADING_FRAMES$1.length;
 				this.tui?.requestRender();
 			}, 100);
 		} else if (this.#loadingTimer) {
@@ -3211,7 +3516,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 && this.#showSpinner) line = `${prefix}${LOADING_FRAMES[this.#loadingFrame]} ${contentLines[i]}`;
+			if (i === 0 && this.#executing && this.#showSpinner) line = `${prefix}${LOADING_FRAMES$1[this.#loadingFrame]} ${contentLines[i]}`;
 			else line = prefix + contentLines[i];
 			contentLines[i] = truncateToWidth(line, width);
 		}
@@ -3245,6 +3550,243 @@ var ZapmycoEditor = class extends Editor {
 	}
 };
+//#endregion
+//#region src/cli/repl/components/task-status-bar.ts
+/**
+* TaskStatusBar — 任务状态栏组件
+*
+* 显示 TaskManage 创建的任务列表，支持折叠/展开两种模式。
+* 类似 Claude Code 的 TaskListV2，使用 pi-tui Container 实现。
+*
+* 折叠模式（默认，单行）:
+*   📋 3 tasks · ◼ 1 in_progress · ◻ 1 pending · ✔ 1 completed    Ctrl+T expand
+*
+* 展开模式（Ctrl+T 切换）:
+*   ⠋ #1 Search files
+*   ◻ #2 Core logic
+*   ◻ #3 Tests                     ▸ blocked by #1
+*   ✔ #4 Analysis
+*
+*   1 in_progress · 1 pending · 1 completed
+*   (Ctrl+T collapse)
+*
+* 自动隐藏：无任务时 render() 返回 []。
+* 进行中任务：显示 loading spinner 动画 + cyan 高亮。
+* 已完成任务：绿色 + 删除线。
+*
+* @module cli/repl/components
+*/
+/** Loading 动画帧（Braille 模式 spinner） */
+const LOADING_FRAMES = [
+	"⠋",
+	"⠙",
+	"⠹",
+	"⠸",
+	"⠼",
+	"⠴",
+	"⠦",
+	"⠧",
+	"⠇",
+	"⠏"
+];
+const LOADING_INTERVAL_MS = 200;
+/** 静态状态图标映射 */
+const STATUS_ICONS = {
+	pending: "◻",
+	in_progress: "◼",
+	completed: "✔",
+	cancelled: "✕"
+};
+/**
+* 任务状态栏组件
+*
+* 从 TaskStore 读取任务列表，渲染为紧凑状态栏。
+* 固定在 OutputArea 和 AgentStatusBar 之间。
+*/
+var TaskStatusBar = class extends Container {
+	/**
+	* 用户手动折叠标记
+	*
+	* - false（默认）：根据任务状态自动决定展开/折叠
+	* - true：用户通过 Ctrl+T 手动折叠，覆盖自动行为
+	*/
+	#forceCollapsed = false;
+	/** TaskStore 引用（只读，不写） */
+	#store;
+	/** loading 动画帧索引 */
+	#loadingFrame = 0;
+	/** loading 动画定时器 */
+	#loadingTimer;
+	/** 上次是否有 in_progress 任务（用于启停动画） */
+	#hadInProgress = false;
+	constructor(store) {
+		super();
+		this.#store = store;
+	}
+	/**
+	* 切换展开/折叠状态
+	*
+	* 用户手动 Ctrl+T 时调用，设置 forceCollapsed 标记。
+	* 当新任务出现时，forceCollapsed 会被自动重置。
+	*/
+	toggle() {
+		this.#forceCollapsed = !this.#forceCollapsed;
+		this.invalidate();
+	}
+	/** 当前是否处于展开状态 */
+	get isExpanded() {
+		const summary = this.#store.summary();
+		return this.#shouldExpand(summary);
+	}
+	/**
+	* 当 TaskStore 变化时由外部调用
+	*
+	* 如果出现新的活跃任务，自动展开；全部完成后自动折叠。
+	*/
+	onTasksChanged() {
+		const summary = this.#store.summary();
+		if (summary.pending > 0 || summary.in_progress > 0) this.#forceCollapsed = false;
+		this.invalidate();
+	}
+	invalidate() {
+		super.invalidate();
+	}
+	/** 判断当前是否应展开 */
+	#shouldExpand(summary) {
+		if (summary.total === 0) return false;
+		if (this.#forceCollapsed) return false;
+		return summary.pending > 0 || summary.in_progress > 0;
+	}
+	/**
+	* 管理 loading 动画的启停
+	*
+	* 当有 in_progress 任务时启动 spinner，全部完成后停止。
+	*/
+	#updateLoading(summary) {
+		const hasInProgress = summary.in_progress > 0;
+		if (hasInProgress && !this.#hadInProgress) this.#startLoading();
+		else if (!hasInProgress && this.#hadInProgress) this.#stopLoading();
+	}
+	/** 启动 loading 动画 */
+	#startLoading() {
+		if (this.#loadingTimer) return;
+		this.#loadingTimer = setInterval(() => {
+			this.#loadingFrame = (this.#loadingFrame + 1) % LOADING_FRAMES.length;
+			this.invalidate();
+		}, LOADING_INTERVAL_MS);
+	}
+	/** 停止 loading 动画 */
+	#stopLoading() {
+		if (this.#loadingTimer) {
+			clearInterval(this.#loadingTimer);
+			this.#loadingTimer = void 0;
+			this.#loadingFrame = 0;
+		}
+	}
+	/** 获取当前 in_progress 的图标（可能为动画帧） */
+	#getInProgressIcon() {
+		return LOADING_FRAMES[this.#loadingFrame % LOADING_FRAMES.length];
+	}
+	render(width) {
+		const tasks = this.#store.read();
+		const summary = this.#store.summary();
+		this.#updateLoading(summary);
+		this.#hadInProgress = summary.in_progress > 0;
+		if (tasks.length === 0) {
+			this.#stopLoading();
+			return [];
+		}
+		if (this.#shouldExpand(summary)) return this.#renderExpanded(tasks, summary, width);
+		return [this.#renderCollapsed(summary).slice(0, width)];
+	}
+	/** 渲染折叠模式单行 */
+	#renderCollapsed(summary) {
+		const parts = [];
+		const taskCount = summary.total === 1 ? "1 task" : `${summary.total} tasks`;
+		parts.push(chalk.cyan(`\uD83D\uDCCB ${taskCount}`));
+		if (summary.in_progress > 0) {
+			const icon = this.#getInProgressIcon();
+			parts.push(chalk.cyan(`${icon} ${summary.in_progress} in_progress`));
+		}
+		if (summary.pending > 0) parts.push(`${STATUS_ICONS.pending} ${summary.pending} pending`);
+		if (summary.completed > 0) parts.push(chalk.green(`${STATUS_ICONS.completed} ${summary.completed} completed`));
+		if (summary.cancelled > 0) parts.push(chalk.red.dim(`${STATUS_ICONS.cancelled} ${summary.cancelled} cancelled`));
+		const hint = chalk.dim("Ctrl+T expand");
+		return `  ${parts.join(" · ")}    ${hint}`;
+	}
+	/** 渲染展开模式多行 */
+	#renderExpanded(tasks, summary, width) {
+		const lines = [];
+		const sorted = this.#sortTasks(tasks);
+		for (const task of sorted) lines.push(this.#renderTaskLine(task, width));
+		lines.push("");
+		const summaryParts = [];
+		if (summary.in_progress > 0) summaryParts.push(chalk.cyan(`${summary.in_progress} in_progress`));
+		if (summary.pending > 0) summaryParts.push(`${summary.pending} pending`);
+		if (summary.completed > 0) summaryParts.push(chalk.green(`${summary.completed} completed`));
+		if (summary.cancelled > 0) summaryParts.push(chalk.red.dim(`${summary.cancelled} cancelled`));
+		lines.push(`  ${summaryParts.join(" · ")}`);
+		lines.push(chalk.dim("  (Ctrl+T collapse)"));
+		return lines;
+	}
+	/** 渲染单个任务行 */
+	#renderTaskLine(task, width) {
+		const prefix = `  ${task.status === "in_progress" ? this.#getInProgressIcon() : STATUS_ICONS[task.status] ?? "?"} #${task.id} `;
+		const blockedBy = this.#getBlockedHint(task);
+		const blockedText = blockedBy ? `  ${blockedBy}` : "";
+		const availableWidth = Math.max(10, width - [...prefix].length - [...blockedText].length);
+		const subject = task.subject.length > availableWidth ? `${task.subject.slice(0, availableWidth - 1)}\u2026` : task.subject;
+		let subjectStyled;
+		if (task.status === "completed") subjectStyled = chalk.green.dim.strikethrough(subject);
+		else if (task.status === "in_progress") subjectStyled = chalk.cyan.bold(subject);
+		else if (task.status === "cancelled") subjectStyled = chalk.red.dim(subject);
+		else subjectStyled = subject;
+		const rightStyled = blockedBy ? chalk.dim(blockedBy) : "";
+		return `${prefix}${subjectStyled}${blockedBy ? `  ${rightStyled}` : ""}`.slice(0, width);
+	}
+	/** 获取阻塞提示文本 */
+	#getBlockedHint(task) {
+		if (!task.dependencies || task.dependencies.length === 0) return "";
+		if (task.status !== "pending") return "";
+		const allTasks = this.#store.read();
+		const openBlockers = [];
+		for (const depId of task.dependencies) {
+			const depTask = allTasks.find((t) => t.id === depId);
+			if (depTask && depTask.status !== "completed") openBlockers.push(`#${depId}`);
+			else if (!depTask) openBlockers.push(`#${depId}?`);
+		}
+		if (openBlockers.length === 0) return "";
+		return `\u25B8 blocked by ${openBlockers.join(", ")}`;
+	}
+	/** 排序任务 */
+	#sortTasks(tasks) {
+		const allTasks = this.#store.read();
+		return [...tasks].sort((a, b) => {
+			return this.#taskPriority(a, allTasks) - this.#taskPriority(b, allTasks);
+		});
+	}
+	/** 计算任务优先级（值越小越靠前） */
+	#taskPriority(task, allTasks) {
+		switch (task.status) {
+			case "in_progress": return 0;
+			case "pending":
+				if (this.#isBlocked(task, allTasks)) return 2;
+				return 1;
+			case "completed": return 10 - Date.now() + task.updatedAt;
+			case "cancelled": return 20;
+			default: return 100;
+		}
+	}
+	/** 判断任务是否被阻塞 */
+	#isBlocked(task, allTasks) {
+		if (!task.dependencies || task.dependencies.length === 0) return false;
+		return task.dependencies.some((depId) => {
+			const depTask = allTasks.find((t) => t.id === depId);
+			return !depTask || depTask.status !== "completed";
+		});
+	}
+};
 //#endregion
 //#region src/cli/repl/cron/cron-parser.ts
 /** 通配符 * — 匹配所有值 */
@@ -3538,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 = [];
@@ -3559,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;
@@ -3575,7 +4117,7 @@ var CronScheduler = class extends EventEmitter {
 			clearInterval(this.timer);
 			this.timer = null;
 		}
-		log$17.info("调度器已停止");
+		log$18.info("调度器已停止");
 	}
 	/** 添加任务 */
 	async addJob(job) {
@@ -3587,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
@@ -3717,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)
@@ -3735,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 });
 			}
 		}
 	}
@@ -3796,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;
@@ -3820,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 [];
 		}
 	}
@@ -3873,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;
 	}
 };
@@ -3891,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;
 /** 历史文件存储路径 */
@@ -3950,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("无历史文件或加载失败，使用空历史");
 		}
 	}
 	/** 持久化历史记录到文件 */
@@ -3969,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) });
 		}
 	}
 };
@@ -4851,7 +5393,7 @@ var Renderer = class {
 *
 * @module core/agent-team
 */
-const log$14 = logger.child("background-store");
+const log$15 = logger.child("background-store");
 /**
 * 后台任务持久化存储
 *
@@ -4881,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
 			});
@@ -4947,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
 			});
@@ -4973,7 +5515,7 @@ var BackgroundTaskStore = class {
 		}
 		if (cleaned > 0) {
 			this.persist();
-			log$14.info("清理过期后台任务", { cleaned });
+			log$15.info("清理过期后台任务", { cleaned });
 		}
 		return cleaned;
 	}
@@ -4990,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 消息总线（单例）
 *
@@ -5024,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,
@@ -5112,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 管理器（单例）
 */
@@ -5169,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)
 			});
@@ -5189,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
 			});
@@ -5233,7 +5775,7 @@ var BackgroundAgentManager = class {
 					taskId,
 					requiresResponse: false
 				});
-				log$12.info("后台 Agent 完成通知已发送", {
+				log$13.info("后台 Agent 完成通知已发送", {
 					taskId,
 					instanceId: result.instanceId,
 					parentId: params.parentInstanceId,
@@ -5260,7 +5802,7 @@ var BackgroundAgentManager = class {
 			completedAt: Date.now(),
 			error
 		});
-		log$12.warn("后台 Agent 失败", {
+		log$13.warn("后台 Agent 失败", {
 			taskId,
 			error
 		});
@@ -5297,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;
 	}
 	/**
@@ -5306,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 });
 	}
 };
 /** 全局单例 */
@@ -5531,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 {
@@ -5577,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 });
@@ -5597,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);
@@ -5606,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)
 			});
@@ -5628,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;
@@ -9218,6 +9760,12 @@ function setSkillEntries(entries) {
 	skillEntries = entries;
 }
 /**
+* 获取当前已加载的 Skill 列表
+*/
+function getSkillEntries() {
+	return skillEntries;
+}
+/**
 * 替换 Skill 内容中的模板变量
 *
 * 支持的变量：
@@ -9270,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 工具
 *
@@ -9338,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}`,
@@ -9347,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",
@@ -9382,6 +10061,33 @@ function getSkillCommandSpecs(entries) {
 	}));
 }
 /**
+* 格式化 Skill 指令内容（供 Skill tool 和斜杠命令 handler 共用）
+*
+* 使用内存中已解析的 skill.body，无需重新读取 SKILL.md 文件。
+*
+* @param skill - Skill 定义（含 frontmatter、body、baseDir）
+* @param args - 用户传递的参数（可选）
+* @returns 格式化后的完整指令文本
+*/
+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}`,
+		"",
+		skill.description ? `> ${skill.description}` : "",
+		"",
+		"---",
+		"",
+		withShell,
+		"",
+		"---",
+		`Base directory: ${skill.baseDir}`
+	];
+	if (!withShell.includes(args ?? "") && args) instructionParts.push("", `ARGUMENTS: ${args}`);
+	return instructionParts.filter(Boolean).join("\n");
+}
+/**
 * 规范化技能命令名称
 *
 * 转换为小写，非字母数字字符替换为连字符。
@@ -10890,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() {
@@ -10926,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
@@ -10954,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)
 				});
@@ -10986,7 +11692,7 @@ var WorktreeManager = class {
 			createdBy: info.createdBy,
 			status: "active"
 		});
-		log$10.info("Worktree 创建成功", {
+		log$11.info("Worktree 创建成功", {
 			id: info.id,
 			path: worktreePath
 		});
@@ -10998,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（内部方法）
@@ -11014,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)
 				});
@@ -11028,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
 			});
@@ -11040,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)
 			});
@@ -11048,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) });
 		}
 	}
 	/**
@@ -11070,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
 		});
@@ -11090,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)
 			});
@@ -11110,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)
@@ -11119,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() {
@@ -11170,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 实例
 *
@@ -11188,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,
@@ -11195,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,
@@ -11266,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
@@ -11283,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;
@@ -11318,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,
@@ -11355,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,
@@ -11433,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 编排器
 *
@@ -11466,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
@@ -11474,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
@@ -11484,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,
@@ -11514,6 +12239,7 @@ var AgentOrchestrator = class {
 		};
 		const depth = 1;
 		const instanceId = `flat-${spec.id}-${Date.now()}`;
+		let stopRelay;
 		try {
 			const agent = createAgentFromType(definition, {
 				instanceId,
@@ -11533,6 +12259,7 @@ var AgentOrchestrator = class {
 				timeoutMs: this.flatConfig.taskTimeoutMs,
 				inheritContext: false
 			}, null, depth);
+			stopRelay = this.#relayAgentProgress(agent, instanceId);
 			agent.systemPromptOverride = this.buildFlatSystemPrompt(spec, context);
 			const result = await Promise.race([agent.execute({
 				taskId: `flat-${spec.id}`,
@@ -11547,6 +12274,7 @@ var AgentOrchestrator = class {
 			const outputText = this.extractOutputText(result);
 			const isSuccess = typeof result === "object" && result !== null && "status" in result && result.status === "success";
 			instanceManager.transition(instanceId, isSuccess ? "completed" : "failed");
+			stopRelay();
 			return {
 				specId: spec.id,
 				status: isSuccess ? "success" : "failure",
@@ -11556,11 +12284,14 @@ 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
 			});
+			try {
+				stopRelay?.();
+			} catch {}
 			try {
 				instanceManager.transition(instanceId, "failed");
 			} catch {}
@@ -11610,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
@@ -11642,6 +12373,7 @@ var AgentOrchestrator = class {
 		const instanceId = `agent-${typeId}-${Date.now()}`;
 		const timeoutMs = options?.timeoutMs ?? this.flatConfig.taskTimeoutMs;
 		let worktreeInfo;
+		let stopRelay;
 		try {
 			const agent = createAgentFromType(definition, {
 				instanceId,
@@ -11661,6 +12393,7 @@ var AgentOrchestrator = class {
 				timeoutMs,
 				inheritContext: options?.inheritContext ?? false
 			}, parentInstanceId || null, depth);
+			stopRelay = this.#relayAgentProgress(agent, instanceId);
 			const promptCtx = {
 				taskDescription,
 				workdir: process.cwd()
@@ -11730,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,
@@ -11762,6 +12495,9 @@ var AgentOrchestrator = class {
 				}
 			};
 		} finally {
+			try {
+				stopRelay?.();
+			} catch {}
 			try {
 				const instance = instanceManager.get(instanceId);
 				if (instance) instance.agent.systemPromptOverride = null;
@@ -11770,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)
 					});
@@ -11795,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
@@ -11814,6 +12550,41 @@ var AgentOrchestrator = class {
 		return aggregateResults(teamId, workerResults);
 	}
 	/**
+	* 监听子 Agent 进度事件并中继到 InstanceManager
+	*
+	* 在子 Agent 执行工具调用时，更新其 AgentInstance 的 currentActivity，
+	* 驱动 UI 状态栏实时展示子 Agent 当前操作。
+	*
+	* @param agent - 子 Agent 实例
+	* @param instanceId - 对应的 InstanceManager 实例 ID
+	* @returns 清理函数，调用后移除事件监听
+	*/
+	#relayAgentProgress(agent, instanceId) {
+		const progressHandler = (event) => {
+			const instanceManager = getAgentInstanceManager();
+			const instance = instanceManager.get(instanceId);
+			if (!instance) return;
+			if (event.percent === 0) {
+				const toolName = event.message;
+				const prevUses = instance.currentActivity?.toolUses ?? 0;
+				const parenIdx = toolName.indexOf("(");
+				const namePart = parenIdx > 0 ? toolName.slice(0, parenIdx) : toolName;
+				const argsPart = parenIdx > 0 ? toolName.slice(parenIdx + 1, -1) : void 0;
+				const activity = {
+					toolName: namePart,
+					toolUses: prevUses + 1,
+					...argsPart !== void 0 ? { args: argsPart } : {},
+					startedAt: Date.now()
+				};
+				instanceManager.setActivity(instanceId, activity);
+			} else if (event.percent === 100 || event.percent === -1) {}
+		};
+		agent.on(agent.EVENT_PROGRESS, progressHandler);
+		return () => {
+			agent.off(agent.EVENT_PROGRESS, progressHandler);
+		};
+	}
+	/**
 	* 为扁平子 Agent 构建系统提示词
 	*/
 	buildFlatSystemPrompt(spec, context) {
@@ -11923,10 +12694,10 @@ const MODE_STRATEGIES = {
 		defaultAction: "deny",
 		maxAutoAllow: "low"
 	},
-	/** normal: low 直接 allow，medium+ 需要 ask，critical deny */
+	/** normal: 工具默认放行，仅内容级安全检查（shell 危险命令、敏感文件路径）触发审批 */
 	normal: {
-		defaultAction: "ask",
-		maxAutoAllow: "low"
+		defaultAction: "allow",
+		maxAutoAllow: "high"
 	},
 	/** permissive: low/medium 直接 allow，high ask，critical deny */
 	permissive: {
@@ -12112,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 实例 */
@@ -12597,6 +13446,207 @@ function createLspTool(lspManager) {
 	};
 }
+//#endregion
+//#region src/cli/repl/utils/markdown-formatter.ts
+/**
+* Markdown → ANSI 格式化器
+*
+* 将 LLM 返回的 Markdown 文本解析并应用 ANSI 样式（颜色、加粗、斜体等），
+* 使终端输出更易读。参考 Claude Code 的 formatToken 实现。
+*
+* 使用方式:
+*   import { formatMarkdown } from '@/cli/repl/utils/markdown-formatter';
+*   console.log(formatMarkdown('**hello** world'));
+*/
+let markedConfigured = false;
+function configureMarked() {
+	if (markedConfigured) return;
+	markedConfigured = true;
+	marked.use({ tokenizer: { del() {} } });
+}
+const EOL = "\n";
+const LIST_ITEM_MARKER = "-";
+const BLOCKQUOTE_BAR = "│";
+/**
+* 格式化 Markdown 文本为 ANSI 样式字符串
+*
+* @param text - 原始 Markdown 文本
+* @param colorEnabled - 是否启用颜色（false 时仅保留结构格式化）
+* @returns 格式化后的字符串
+*/
+function formatMarkdown(text, colorEnabled = true) {
+	if (!text) return "";
+	configureMarked();
+	const tokens = marked.lexer(text);
+	const parts = [];
+	for (const token of tokens) parts.push(formatToken(token, colorEnabled, 0, null, null));
+	return parts.join("").trimEnd();
+}
+function c(colorEnabled) {
+	if (colorEnabled) return chalk;
+	const noColor = Object.create(chalk);
+	noColor.level = 0;
+	return noColor;
+}
+function formatToken(token, colorEnabled, listDepth, orderedListNumber, parent) {
+	const ch = c(colorEnabled);
+	switch (token.type) {
+		case "blockquote": {
+			const inner = token.tokens ? token.tokens.map((t) => formatToken(t, colorEnabled, 0, null, null)).join("") : "";
+			const bar = ch.dim(BLOCKQUOTE_BAR);
+			return inner.split(EOL).map((line) => line.trim() ? `${bar} ${ch.italic(line)}` : line).join(EOL);
+		}
+		case "code": {
+			const lang = token.lang ? `${ch.dim(` ${token.lang}`)}` : "";
+			const header = token.lang ? `${ch.dim("```")}${lang}${EOL}` : "";
+			const footer = token.lang ? `${EOL}${ch.dim("```")}` : "";
+			return `${header}${ch.dim(token.text)}${footer}${EOL}`;
+		}
+		case "codespan": return ch.cyan(token.text);
+		case "em": {
+			const inner = token.tokens ? token.tokens.map((t) => formatToken(t, colorEnabled, 0, null, token)).join("") : "";
+			return ch.italic(inner);
+		}
+		case "strong": {
+			const inner = token.tokens ? token.tokens.map((t) => formatToken(t, colorEnabled, 0, null, token)).join("") : "";
+			return ch.bold(inner);
+		}
+		case "heading": {
+			const inner = token.tokens ? token.tokens.map((t) => formatToken(t, colorEnabled, 0, null, null)).join("") : "";
+			if (token.depth === 1) return `${ch.bold.italic.underline(inner)}${EOL}${EOL}`;
+			return `${ch.bold(inner)}${EOL}${EOL}`;
+		}
+		case "hr": return ch.dim("─".repeat(50)) + EOL;
+		case "image": return token.href;
+		case "link": {
+			const linkText = token.tokens ? token.tokens.map((t) => formatToken(t, colorEnabled, 0, null, token)).join("") : "";
+			if (linkText && linkText !== token.href) return `${linkText} ${ch.dim(`(${token.href})`)}`;
+			return ch.dim(token.href);
+		}
+		case "list": return token.items.map((item, index) => formatToken(item, colorEnabled, listDepth, token.ordered ? (token.start ?? 1) + index : null, token)).join("");
+		case "list_item": {
+			const marker = orderedListNumber !== null ? `${orderedListNumber}.` : LIST_ITEM_MARKER;
+			return `${"  ".repeat(listDepth)}${marker} ${(token.tokens ? token.tokens.map((t) => formatToken(t, colorEnabled, listDepth + 1, orderedListNumber, token)).join("") : "").trimStart()}`;
+		}
+		case "paragraph": return (token.tokens ? token.tokens.map((t) => formatToken(t, colorEnabled, 0, null, null)).join("") : "") + EOL;
+		case "space": return EOL;
+		case "br": return EOL;
+		case "text":
+			if (parent?.type === "list_item") {
+				const marker = orderedListNumber !== null ? `${orderedListNumber}.` : LIST_ITEM_MARKER;
+				return `${"  ".repeat(listDepth)}${marker} ${token.tokens ? token.tokens.map((t) => formatToken(t, colorEnabled, listDepth, orderedListNumber, token)).join("") : token.text}${EOL}`;
+			}
+			return token.text;
+		case "table": return formatTable(token, colorEnabled);
+		case "escape": return token.text;
+		case "def":
+		case "html":
+		case "del": return "";
+		default: return "";
+	}
+}
+/**
+* 格式化表格为对齐的 ASCII 表格
+*/
+function formatTable(token, colorEnabled) {
+	const ch = c(colorEnabled);
+	function getCellText(cellTokens) {
+		if (!cellTokens) return "";
+		return cellTokens.map((t) => formatToken(t, colorEnabled, 0, null, null)).join("");
+	}
+	const columnCount = token.header.length;
+	const colWidths = [];
+	for (let i = 0; i < columnCount; i++) {
+		const headerCell = token.header[i];
+		let maxW = ansiCellWidth(headerCell ? getCellText(headerCell.tokens) : "");
+		for (const row of token.rows) {
+			const cell = row[i];
+			if (cell?.tokens) {
+				const cellText = getCellText(cell.tokens);
+				maxW = Math.max(maxW, ansiCellWidth(cellText));
+			}
+		}
+		colWidths.push(Math.max(maxW, 3));
+	}
+	let output = "";
+	output += "┌";
+	for (let i = 0; i < columnCount; i++) {
+		const cw = colWidths[i] ?? 3;
+		output += "─".repeat(cw + 2) + "┬";
+	}
+	output = output.slice(0, -1) + "┐\n";
+	output += "│ ";
+	for (let i = 0; i < columnCount; i++) {
+		const cell = token.header[i];
+		const content = cell?.tokens ? cell.tokens.map((t) => formatToken(t, colorEnabled, 0, null, null)).join("") : "";
+		const displayLen = ansiCellWidth(content);
+		const pad = (colWidths[i] ?? 3) - displayLen;
+		const align = token.align?.[i];
+		output += align === "right" ? " ".repeat(pad) + ch.bold(content) : align === "center" ? " ".repeat(Math.floor(pad / 2)) + ch.bold(content) + " ".repeat(Math.ceil(pad / 2)) : ch.bold(content) + " ".repeat(pad);
+		output += " │ ";
+	}
+	output = output.trimEnd() + EOL;
+	output += "├";
+	for (let i = 0; i < columnCount; i++) {
+		const align = token.align?.[i];
+		const left = align === "center" || align === "right" ? ":" : "─";
+		const right = align === "center" || align === "left" ? ":" : "─";
+		const cw = colWidths[i] ?? 3;
+		output += `${left}${"─".repeat(cw)}${right}┼`;
+	}
+	output = `${output.slice(0, -1)}┤${EOL}`;
+	for (const row of token.rows) {
+		output += "│ ";
+		for (let i = 0; i < columnCount; i++) {
+			const cell = row[i];
+			const content = cell?.tokens ? cell.tokens.map((t) => formatToken(t, colorEnabled, 0, null, null)).join("") : "";
+			const displayLen = ansiCellWidth(content);
+			const pad = (colWidths[i] ?? 3) - displayLen;
+			const align = token.align?.[i];
+			output += align === "right" ? " ".repeat(pad) + content : align === "center" ? " ".repeat(Math.floor(pad / 2)) + content + " ".repeat(Math.ceil(pad / 2)) : content + " ".repeat(pad);
+			output += " │ ";
+		}
+		output = output.trimEnd() + EOL;
+	}
+	output += "└";
+	for (let i = 0; i < columnCount; i++) {
+		const cw = colWidths[i] ?? 3;
+		output += "─".repeat(cw + 2) + "┴";
+	}
+	output = output.slice(0, -1) + "┘\n";
+	return output + EOL;
+}
+/**
+* 计算字符串在终端中的可见宽度（考虑 CJK 和 emoji 占 2 列宽）
+*
+* ANSI 转义序列不计入宽度，中文字符/emoji 占 2 列，ASCII 占 1 列。
+*/
+function ansiCellWidth(str) {
+	const ESC = String.fromCharCode(27);
+	const plain = str.replace(new RegExp(`${ESC}\\[[0-9;]*m`, "g"), "");
+	let width = 0;
+	for (const ch of plain) {
+		const code = ch.codePointAt(0) ?? 0;
+		if (isZeroWidthChar(code)) continue;
+		if (isWideChar(code)) width += 2;
+		else width += 1;
+	}
+	return width;
+}
+/**
+* 判断 Unicode 码点是否为零宽字符（不可见 / 组合用字符）
+*
+* 这些字符在终端中不占据任何列宽，无论是 CJK 字体还是等宽字体下。
+* 如果在宽度计算中按 1 或 2 计算，会导致表格列对齐错误。
+*/
+function isZeroWidthChar(code) {
+	return code === 8203 || code === 8204 || code === 8205 || code === 8206 || code === 8207 || code === 8288 || code >= 8289 && code <= 8292 || code === 65038 || code === 65039 || code >= 768 && code <= 879 || code >= 7616 && code <= 7679 || code >= 8400 && code <= 8447 || code >= 65056 && code <= 65071;
+}
+/** 判断 Unicode 码点是否为终端宽字符（CJK / 全角 / emoji） */
+function isWideChar(code) {
+	return code >= 4352 && code <= 4447 || code >= 11904 && code <= 12287 || code >= 12288 && code <= 13311 || code >= 13312 && code <= 19903 || code >= 19968 && code <= 40959 || code >= 40960 && code <= 42191 || code >= 44032 && code <= 55215 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65049 || code >= 65072 && code <= 65135 || code >= 65281 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 126976 && code <= 131071 || code >= 131072 && code <= 196607 || code >= 196608 && code <= 262143 || code === 169 || code === 174 || code >= 8192 && code <= 8303 || code >= 8448 && code <= 10175 || code >= 11008 && code <= 11263 || code >= 10496 && code <= 10623 || code === 12336 || code === 12349 || code === 12951 || code === 12952 || code === 8986 || code === 8987 || code === 9193 || code === 9196 || code === 9200 || code === 9203 || code === 9725 || code === 9726 || code === 9748 || code === 9749 || code === 9800 || code === 9811 || code === 9855 || code === 9875 || code === 9889 || code === 9898 || code === 9899 || code === 9917 || code === 9918 || code === 9924 || code === 9925 || code === 9934 || code === 9940 || code === 9962 || code === 9970 || code === 9971 || code === 9973 || code === 9978 || code === 9981 || code === 9986 || code === 9989 || code === 9992 || code === 9993 || code === 9994 || code === 9995 || code === 9996 || code === 9997 || code === 9999 || code === 10002 || code === 10004 || code === 10006 || code === 10013 || code === 10017 || code === 10024 || code === 10035 || code === 10036 || code === 10052 || code === 10055 || code === 10060 || code === 10062 || code === 10067 || code === 10068 || code === 10069 || code === 10071 || code === 10083 || code === 10084 || code === 10133 || code === 10134 || code === 10135 || code === 10145 || code === 10160 || code === 10175 || code === 10548 || code === 10549 || code === 11013 || code === 11014 || code === 11015 || code === 11035 || code === 11036 || code === 11088 || code === 11093 || code === 11203 || code === 11204;
+}
 //#endregion
 //#region src/config/types.ts
 /**
@@ -13603,6 +14653,7 @@ function ensureTaskDir() {
 }
 var TaskStore = class {
 	tasks = /* @__PURE__ */ new Map();
+	changeCallbacks = [];
 	/** 读取完整任务列表 */
 	read() {
 		return Array.from(this.tasks.values());
@@ -13646,6 +14697,24 @@ var TaskStore = class {
 		return this.tasks.size > 0;
 	}
 	/**
+	* 注册任务变更监听
+	*
+	* @param callback - 任务列表变更时回调
+	* @returns unsubscribe 函数，组件销毁时调用以清理
+	*/
+	onChange(callback) {
+		this.changeCallbacks.push(callback);
+		return () => {
+			this.changeCallbacks = this.changeCallbacks.filter((cb) => cb !== callback);
+		};
+	}
+	/** 通知所有监听者（write/update/clear 操作后调用） */
+	notifyChange() {
+		for (const cb of this.changeCallbacks) try {
+			cb();
+		} catch {}
+	}
+	/**
 	* 全量替换任务列表
 	*
 	* @param items - 新任务列表
@@ -13675,11 +14744,13 @@ var TaskStore = class {
 				updatedAt: now
 			};
 			if (item.description !== void 0) taskItem.description = item.description;
+			if (item.dependencies !== void 0) taskItem.dependencies = item.dependencies;
 			newTasks.set(item.id, taskItem);
 		}
 		if (inProgressCount > 1) return `不允许同时有 ${inProgressCount} 个进行中的任务，请先将当前任务完成或取消后再开始新任务`;
 		this.tasks = newTasks;
 		this.persist();
+		this.notifyChange();
 		return null;
 	}
 	/**
@@ -13705,12 +14776,14 @@ var TaskStore = class {
 		};
 		this.tasks.set(id, updated);
 		this.persist();
+		this.notifyChange();
 		return null;
 	}
 	/** 清空所有任务 */
 	clear() {
 		this.tasks.clear();
 		this.persist();
+		this.notifyChange();
 	}
 	/** 持久化到文件系统 */
 	persist() {
@@ -13761,7 +14834,7 @@ var TaskStore = class {
 		const lines = ["## 当前任务列表"];
 		for (const task of active) {
 			const marker = task.status === "in_progress" ? "▶" : "○";
-			lines.push(`  ${marker} [${task.id}] ${task.subject}`);
+			lines.push(`  ${marker} #${task.id} ${task.subject}`);
 		}
 		return lines.join("\n");
 	}
@@ -14863,6 +15936,8 @@ var ReplSession = class {
 	tui;
 	editor;
 	outputArea;
+	taskStatusBar;
+	agentStatusBar;
 	options;
 	_state = "idle";
 	parser;
@@ -14898,6 +15973,7 @@ var ReplSession = class {
 	auditLogger;
 	secretRedactor;
 	skillGuard;
+	skillWatcher;
 	/** 交互式提问管理器 */
 	questionManager;
 	stats = {
@@ -14927,10 +16003,19 @@ var ReplSession = class {
 			"tui.select.cancel": ["escape"],
 			"tui.select.confirm": ["enter"]
 		});
+		this.taskStore = new TaskStore();
 		this.outputArea = new OutputArea();
+		this.agentStatusBar = new AgentStatusBar();
+		this.taskStatusBar = new TaskStatusBar(this.taskStore);
+		this.taskStore.onChange(() => {
+			this.taskStatusBar.onTasksChanged();
+			this.tui.requestRender();
+		});
 		this.editor = new ZapmycoEditor(this.tui, theme.editorTheme);
 		const root = new Container();
 		root.addChild(this.outputArea);
+		root.addChild(this.taskStatusBar);
+		root.addChild(this.agentStatusBar);
 		root.addChild(this.editor);
 		this.tui.addChild(root);
 		this.tui.setFocus(this.editor);
@@ -14940,8 +16025,6 @@ var ReplSession = class {
 		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();
 		this.cronScheduler = new CronScheduler(getCronStore(), { isIdle: () => this._state === "idle" });
 		this.cronScheduler.start();
 		this.initWorktreeManager();
@@ -14952,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();
@@ -15013,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();
@@ -15041,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 };
@@ -15128,12 +16243,13 @@ var ReplSession = class {
 	/**
 	* 执行用户目标 — 通过 Agent 执行并流式输出回复
 	*/
-	async executeGoal(rawInput) {
+	async executeGoal(rawInput, displayLabel) {
 		const startTime = Date.now();
 		let historyEntry;
 		const taskId = `task-${Date.now()}`;
 		const colorEnabled = this.options.color;
 		const userStyle = (s) => colorEnabled ? chalk.bold.cyan(s) : s;
+		const markdownFormattingEnabled = this.config.cli.markdownFormatting !== false;
 		const responseStyle = (s) => s;
 		const toolStyle = (s) => colorEnabled ? chalk.yellow(s) : s;
 		const execStyle = (s) => colorEnabled ? chalk.cyan(s) : s;
@@ -15143,6 +16259,8 @@ var ReplSession = class {
 		let spinnerActive = true;
 		let spinnerInterval;
 		let thinkingElapsedInterval;
+		/** Token 信息推送定时器 */
+		let tokenPushInterval;
 		try {
 			this._state = "executing";
 			this.updateStatsState();
@@ -15156,19 +16274,20 @@ var ReplSession = class {
 				goalId: `goal-${startTime}`,
 				rawInput
 			});
-			this.outputArea.append([userStyle(rawInput), LOADING_FRAMES[0] ?? ""]);
+			this.outputArea.append([userStyle(displayLabel ?? rawInput), LOADING_FRAMES$1[0] ?? ""]);
 			let spinnerFrame = 0;
 			spinnerActive = true;
 			spinnerInterval = setInterval(() => {
 				if (!spinnerActive) return;
-				spinnerFrame = (spinnerFrame + 1) % LOADING_FRAMES.length;
-				this.outputArea.replaceLastLine(LOADING_FRAMES[spinnerFrame] ?? "");
+				spinnerFrame = (spinnerFrame + 1) % LOADING_FRAMES$1.length;
+				this.outputArea.replaceLastLine(LOADING_FRAMES$1[spinnerFrame] ?? "");
 				this.tui.requestRender();
 			}, 100);
 			let spinnerStopped = false;
 			let outputAccumulator = "";
 			let thinkingAccumulator = "";
 			let streamMode = "response";
+			let responseLineIndex = null;
 			const thinkingDisplayMode = this.config.cli.thinkingDisplay ?? "collapse";
 			let thinkingHeaderLineIndex = null;
 			let thinkingContentLineCount = 0;
@@ -15215,20 +16334,20 @@ var ReplSession = class {
 					streamMode = "response";
 					thinkingAccumulator = "";
 					outputAccumulator = event.text;
-					this.outputArea.replaceLastLine(responseStyle(outputAccumulator));
+					responseLineIndex = this.outputArea.replaceLastLine(responseStyle(outputAccumulator));
 				} else if (streamMode !== "response") {
 					streamMode = "response";
 					if (thinkingElapsedInterval) {
 						clearInterval(thinkingElapsedInterval);
 						thinkingElapsedInterval = void 0;
 					}
-					if (thinkingHeaderLineIndex !== null && thinkingDisplayMode === "collapse") {
-						const elapsed = ((Date.now() - thinkingStartTimeMs) / 1e3).toFixed(1);
-						this.outputArea.updateLine(thinkingHeaderLineIndex, dimStyle(`  \u2234 Thinking (${elapsed}s)`));
-					}
 					thinkingAccumulator = "";
 					outputAccumulator = event.text;
-					this.outputArea.append([responseStyle(outputAccumulator)]);
+					if (thinkingHeaderLineIndex !== null) {
+						this.outputArea.spliceLines(thinkingHeaderLineIndex, 1, [responseStyle(outputAccumulator)]);
+						responseLineIndex = thinkingHeaderLineIndex;
+						thinkingHeaderLineIndex = null;
+					} else responseLineIndex = this.outputArea.append([responseStyle(outputAccumulator)]);
 				} else {
 					outputAccumulator += event.text;
 					this.outputArea.replaceLastLine(responseStyle(outputAccumulator));
@@ -15245,8 +16364,8 @@ var ReplSession = class {
 						spinnerStopped = true;
 						spinnerActive = false;
 						clearInterval(spinnerInterval);
-						thinkingHeaderLineIndex = this.outputArea.replaceLastLine(dimStyle(`  ${LOADING_FRAMES[0] ?? ""} Thinking...`));
-					} else thinkingHeaderLineIndex = this.outputArea.append([dimStyle(`  ${LOADING_FRAMES[0] ?? ""} Thinking...`)]);
+						thinkingHeaderLineIndex = this.outputArea.replaceLastLine(dimStyle(`  ${LOADING_FRAMES$1[0] ?? ""} Thinking...`));
+					} else thinkingHeaderLineIndex = this.outputArea.append([dimStyle(`  ${LOADING_FRAMES$1[0] ?? ""} Thinking...`)]);
 					thinkingAccumulator = event.text;
 					thinkingContentLineCount = 0;
 					if (thinkingDisplayMode === "expand") {
@@ -15258,7 +16377,7 @@ var ReplSession = class {
 							if (thinkingHeaderLineIndex === null) return;
 							if (thinkingContentLineCount > 0) return;
 							const elapsed = ((Date.now() - thinkingStartTimeMs) / 1e3).toFixed(1);
-							const frame = LOADING_FRAMES[thinkingFrame % LOADING_FRAMES.length];
+							const frame = LOADING_FRAMES$1[thinkingFrame % LOADING_FRAMES$1.length];
 							thinkingFrame++;
 							this.outputArea.updateLine(thinkingHeaderLineIndex, dimStyle(`  ${frame} Thinking... (${elapsed}s)`));
 							this.tui.requestRender();
@@ -15286,16 +16405,17 @@ var ReplSession = class {
 					if (thinkingElapsedInterval && streamMode === "thinking") {
 						clearInterval(thinkingElapsedInterval);
 						thinkingElapsedInterval = void 0;
-						if (thinkingHeaderLineIndex !== null && thinkingDisplayMode === "collapse") {
-							const elapsed = ((Date.now() - thinkingStartTimeMs) / 1e3).toFixed(1);
-							this.outputArea.updateLine(thinkingHeaderLineIndex, dimStyle(`  \u2234 Thinking (${elapsed}s)`));
+						if (thinkingHeaderLineIndex !== null) {
+							this.outputArea.spliceLines(thinkingHeaderLineIndex, 1, []);
+							thinkingHeaderLineIndex = null;
 							this.tui.requestRender();
 						}
 					}
 					if (event.message.startsWith("Exec(")) {
 						execMessage = event.message;
 						execLineIndex = this.outputArea.append([execStyle(`  ⏺ ${event.message}`)]);
-					} else this.outputArea.append([toolStyle(`  → ${event.message}`)]);
+					} else if (event.message.startsWith("TaskManage(")) log.debug("TaskManage 工具调用已记录，跳过 TUI 展示");
+					else this.outputArea.append([toolStyle(`  → ${event.message}`)]);
 					this.tui.requestRender();
 				} else if (event.percent === 100 && execLineIndex !== void 0 && execMessage) {
 					if (event.message.startsWith("工具 Exec")) {
@@ -15314,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)
@@ -15360,8 +16489,8 @@ var ReplSession = class {
 				spinnerActive = true;
 				spinnerInterval = setInterval(() => {
 					if (!spinnerActive) return;
-					spinnerFrame = (spinnerFrame + 1) % LOADING_FRAMES.length;
-					this.outputArea.replaceLastLine(LOADING_FRAMES[spinnerFrame] ?? "");
+					spinnerFrame = (spinnerFrame + 1) % LOADING_FRAMES$1.length;
+					this.outputArea.replaceLastLine(LOADING_FRAMES$1[spinnerFrame] ?? "");
 					this.tui.requestRender();
 				}, 100);
 			}
@@ -15419,6 +16548,24 @@ var ReplSession = class {
 					status: taskResult.status
 				});
 			}
+			if (markdownFormattingEnabled && taskResult.status === "success") {
+				if (outputAccumulator && responseLineIndex !== null) {
+					const formatted = formatMarkdown(outputAccumulator, colorEnabled);
+					if (formatted) {
+						const formattedLines = formatted.split("\n");
+						this.outputArea.spliceLines(responseLineIndex, 1, formattedLines);
+						this.tui.requestRender();
+					}
+				} else if (spinnerStopped === false && outputText) {
+					const formatted = formatMarkdown(outputText, colorEnabled);
+					if (formatted) {
+						const lines = formatted.split("\n");
+						this.outputArea.replaceLastLine(lines[0] ?? "");
+						if (lines.length > 1) this.outputArea.append(lines.slice(1));
+						this.tui.requestRender();
+					}
+				}
+			}
 			this.outputArea.append([""]);
 			const duration = Date.now() - startTime;
 			const result = {
@@ -15535,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);
@@ -15797,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 命令。
@@ -15841,10 +17051,17 @@ var ReplSession = class {
 				description: spec.description,
 				aliases: [],
 				usage: spec.name,
+				source: "skill",
 				handler: async (args) => {
 					const argsStr = args.join(" ");
-					const goalInput = argsStr ? `请使用 /${spec.name} 技能，参数: ${argsStr}` : `请使用 /${spec.name} 技能`;
-					await this.executeGoal(goalInput);
+					const entry = getSkillEntries().find((e) => sanitizeSkillCommandName(e.skill.name) === spec.name);
+					if (entry) {
+						const skillContent = await formatSkillContent(entry.skill, argsStr);
+						await this.executeGoal(skillContent, `/${spec.name}`);
+					} else {
+						const goalInput = argsStr ? `请使用 /${spec.name} 技能，参数: ${argsStr}` : `请使用 /${spec.name} 技能`;
+						await this.executeGoal(goalInput);
+					}
 				}
 			});
 		}
@@ -15884,7 +17101,15 @@ var ReplSession = class {
 		this.editor.onCtrlD = () => {
 			this.shutdown("收到 EOF (Ctrl+D)");
 		};
+		this.editor.onToggleAgentBar = () => {
+			this.agentStatusBar.toggle();
+			this.tui.requestRender();
+		};
 		this.editor.onOpenEditor = () => this.openInEditor();
+		this.editor.onToggleTasks = () => {
+			this.taskStatusBar.toggle();
+			this.tui.requestRender();
+		};
 	}
 	/** 设置信号处理 */
 	setupSignalHandlers() {
@@ -15895,6 +17120,19 @@ var ReplSession = class {
 		eventBus.on("system:shutdown", ({ reason }) => {
 			log.debug(`收到系统关闭信号: ${reason ?? "未知"}`);
 		});
+		const instanceManager = getAgentInstanceManager();
+		const refreshStatusBar = () => {
+			this.agentStatusBar.invalidate();
+			this.tui.requestRender();
+		};
+		instanceManager.on("instance:registered", refreshStatusBar);
+		instanceManager.on("instance:transitioned", refreshStatusBar);
+		instanceManager.on("instance:activity", refreshStatusBar);
+		eventBus.on("system:shutdown", () => {
+			instanceManager.off("instance:registered", refreshStatusBar);
+			instanceManager.off("instance:transitioned", refreshStatusBar);
+			instanceManager.off("instance:activity", refreshStatusBar);
+		});
 	}
 	/** 取消当前正在执行的任务 */
 	cancelCurrentTask() {