zapmyco 0.14.0 → 0.16.0

package/dist/cli/index.mjs

@@ -1,29 +1,30 @@
 #!/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-CWzMinwj.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";
+import { mkdir, readFile, readdir, rename, stat, writeFile } from "node:fs/promises";
 import * as os from "node:os";
 import { homedir, tmpdir } from "node:os";
 import * as path from "node:path";
 import { dirname, isAbsolute, join, normalize, relative, resolve } from "node:path";
 import { EventEmitter } from "node:events";
-import { getModels, getProviders } from "@earendil-works/pi-ai";
 import { AsyncLocalStorage } from "node:async_hooks";
 import chalk, { Chalk } from "chalk";
 import { Command } from "commander";
 import { execFile, spawn, spawnSync } from "node:child_process";
-import { CombinedAutocompleteProvider, Container, Editor, Input, Key, ProcessTerminal, SelectList, TUI, getKeybindings, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
+import { CombinedAutocompleteProvider, Container, Editor, Input, Key, ProcessTerminal, SelectList, TUI, getKeybindings, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 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 "gray-matter";
 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$25 = 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$25.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$25.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$25.error(`命令 /${cmd.name} 执行出错`, {}, error);
 			console.log(`\n  命令执行出错: ${message}\n`);
 		}
 	}
@@ -342,7 +366,7 @@ function formatAgentInstanceTree(instances, options = {}) {
 	for (const inst of instances) {
 		const parentKey = inst.parentInstanceId;
 		if (!childrenMap.has(parentKey)) childrenMap.set(parentKey, []);
-		childrenMap.get(parentKey).push(inst);
+		childrenMap.get(parentKey)?.push(inst);
 	}
 	for (let i = 0; i < roots.length; i++) {
 		const root = roots[i];
@@ -446,6 +470,49 @@ const noColor = {
 	reset: ""
 };
 
+//#endregion
+//#region src/core/agent-team/types.ts
+/**
+* Agent 默认安全工具集
+*
+* 只读和搜索工具，不含任何可能产生副作用的操作。
+* 子 Agent 默认使用此集合。
+*/
+const AGENT_SAFE_TOOLS = [
+	"ReadFile",
+	"Glob",
+	"Grep",
+	"WebFetch",
+	"WebSearch",
+	"GetCurrentTime",
+	"GetWorkdirInfo"
+];
+/**
+* Agent 标准工具集
+*
+* safe + 文件写入 + Shell 执行。
+*/
+const AGENT_STANDARD_TOOLS = [
+	...AGENT_SAFE_TOOLS,
+	"WriteFile",
+	"EditFile",
+	"Exec",
+	"Process",
+	"TaskManage",
+	"Memory"
+];
+/**
+* Coordinator 专用工具集
+*
+* 借鉴 Claude Code：Coordinator 只保留编排相关工具，
+* 强制专注于任务分解和结果整合。
+*/
+const COORDINATOR_TOOLS = [
+	"AgentTool",
+	"SendMessage",
+	"TaskStop"
+];
+
 //#endregion
 //#region src/core/agent-team/agent-instance-manager.ts
 /**
@@ -456,7 +523,7 @@ const noColor = {
 *
 * @module core/agent-team
 */
-const log$19 = logger.child("agent-instance-manager");
+const log$24 = logger.child("agent-instance-manager");
 /**
 * Agent 实例状态转换表
 *
@@ -514,14 +581,16 @@ var AgentInstanceManager = class extends EventEmitter {
 			agent,
 			inbox: [],
 			task,
-			createdAt: Date.now()
+			createdAt: Date.now(),
+			toolCallHistory: [],
+			toolCallGroups: []
 		};
 		this.instances.set(instance.instanceId, instance);
 		if (parentInstanceId) {
 			const parent = this.instances.get(parentInstanceId);
 			if (parent) parent.childInstanceIds.push(instance.instanceId);
 		}
-		log$19.debug("注册 Agent 实例", {
+		log$24.debug("注册 Agent 实例", {
 			instanceId: instance.instanceId,
 			typeId: definition.typeId,
 			depth,
@@ -544,12 +613,12 @@ var AgentInstanceManager = class extends EventEmitter {
 	transition(instanceId, newStatus) {
 		const instance = this.instances.get(instanceId);
 		if (!instance) {
-			log$19.warn("状态转换失败：实例不存在", { instanceId });
+			log$24.warn("状态转换失败：实例不存在", { instanceId });
 			return false;
 		}
 		const allowed = VALID_TRANSITIONS[instance.status];
 		if (!allowed.includes(newStatus)) {
-			log$19.warn("状态转换拒绝", {
+			log$24.warn("状态转换拒绝", {
 				instanceId,
 				from: instance.status,
 				to: newStatus,
@@ -559,7 +628,7 @@ var AgentInstanceManager = class extends EventEmitter {
 		}
 		const oldStatus = instance.status;
 		instance.status = newStatus;
-		log$19.debug("Agent 实例状态转换", {
+		log$24.debug("Agent 实例状态转换", {
 			instanceId,
 			typeId: instance.typeId,
 			from: oldStatus,
@@ -598,6 +667,34 @@ var AgentInstanceManager = class extends EventEmitter {
 		return this.instances.get(instanceId)?.currentActivity;
 	}
 	/**
+	* 记录工具调用事件到实例历史
+	*
+	* 将工具调用记录推入 toolCallHistory（ring-buffer 风格），
+	* 同步更新 currentActivity，并发射 instance:toolcall 事件。
+	*
+	* @param instanceId - 实例 ID
+	* @param record - 工具调用记录
+	*/
+	recordToolCall(instanceId, record) {
+		const instance = this.instances.get(instanceId);
+		if (!instance) return;
+		instance.toolCallHistory.push(record);
+		if (instance.toolCallHistory.length > 100) instance.toolCallHistory = instance.toolCallHistory.slice(-100);
+		instance.toolCallGroups = [];
+		const runningCount = instance.toolCallHistory.filter((t) => t.status === "running" || t.status === "completed").length;
+		instance.currentActivity = {
+			toolName: record.toolName,
+			toolUses: runningCount,
+			args: record.argsDisplay,
+			startedAt: record.startedAt
+		};
+		this.emit("instance:toolcall", {
+			instanceId,
+			typeId: instance.typeId,
+			record
+		});
+	}
+	/**
 	* 获取指定实例
 	*
 	* @param instanceId - 实例 ID
@@ -690,7 +787,7 @@ var AgentInstanceManager = class extends EventEmitter {
 		instance.agent.removeAllListeners();
 		instance.agent.systemPromptOverride = null;
 		this.instances.delete(instanceId);
-		log$19.debug("Agent 实例已清理", { instanceId });
+		log$24.debug("Agent 实例已清理", { instanceId });
 	}
 	/**
 	* 清理所有终态的实例
@@ -1141,7 +1238,7 @@ const BUILTIN_AGENT_TYPES = [
 *
 * @module core/agent-team
 */
-const log$18 = logger.child("agent-type-registry");
+const log$23 = logger.child("agent-type-registry");
 /**
 * Agent 类型注册中心
 *
@@ -1165,14 +1262,14 @@ var AgentTypeRegistry = class {
 	*/
 	register(definition) {
 		const existing = this.types.get(definition.typeId);
-		if (existing) log$18.info("覆盖已注册的 Agent 类型", {
+		if (existing) log$23.info("覆盖已注册的 Agent 类型", {
 			typeId: definition.typeId,
 			oldSource: existing.source,
 			newSource: definition.source
 		});
 		this.types.set(definition.typeId, definition);
 		this.refreshCache();
-		log$18.debug("注册 Agent 类型", {
+		log$23.debug("注册 Agent 类型", {
 			typeId: definition.typeId,
 			source: definition.source
 		});
@@ -1185,7 +1282,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$23.info("批量注册 Agent 类型", { count: definitions.length });
 	}
 	/**
 	* 注销 Agent 类型
@@ -1197,7 +1294,7 @@ var AgentTypeRegistry = class {
 		const result = this.types.delete(typeId);
 		if (result) {
 			this.refreshCache();
-			log$18.debug("注销 Agent 类型", { typeId });
+			log$23.debug("注销 Agent 类型", { typeId });
 		}
 		return result;
 	}
@@ -1284,7 +1381,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$23.info("加载内置 Agent 类型", { count: BUILTIN_AGENT_TYPES.length });
 	}
 	/**
 	* 刷新可见类型缓存
@@ -1403,7 +1500,7 @@ function createCacheCommand() {
 			const lines = [];
 			lines.push("");
 			lines.push(chalk.cyan("  Prompt 缓存状态"));
-			lines.push("  " + chalk.gray("─".repeat(40)));
+			lines.push(`  ${chalk.gray("─".repeat(40))}`);
 			lines.push(chalk.gray("  缓存命中率: ") + formatPercent(stats.hitRate));
 			lines.push(chalk.gray("  平均缓存读取比例: ") + formatPercent(stats.averageCacheRatio));
 			lines.push(chalk.gray("  总调用次数: ") + chalk.white(String(stats.totalCalls)));
@@ -1445,11 +1542,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();
 		}
 	};
@@ -1504,7 +1601,7 @@ function updateSettingsFile(path, value) {
 			parsedValue = JSON.parse(value);
 		} catch {}
 		setByDotPath(config, path, parsedValue);
-		writeFileSync(HOME_CONFIG_PATH, JSON.stringify(config, null, 2) + "\n", "utf-8");
+		writeFileSync(HOME_CONFIG_PATH, `${JSON.stringify(config, null, 2)}\n`, "utf-8");
 		return {
 			success: true,
 			message: ""
@@ -1721,7 +1818,7 @@ function renderSecurityDefault(report) {
 /** 简单柱状图 */
 function barChart(score) {
 	const filled = Math.round(score / 10);
-	return "█".repeat(filled) + "░".repeat(10 - filled) + ` ${score}/100`;
+	return `${"█".repeat(filled) + "░".repeat(10 - filled)} ${score}/100`;
 }
 /**
 * 创建 security 命令定义
@@ -1912,7 +2009,7 @@ var en_default = {
 			"listProvidersUsage": "/settings list-providers     — List all known providers",
 			"listModelsUsage": "/settings list-models <name> — List available models for a provider",
 			"knownProviders": "Known providers:",
-			"noModelsAvailable": "No models available from pi-ai registry",
+			"noModelsAvailable": "No models available",
 			"hintConfigureFirst": "Hint: use /settings to configure this provider first",
 			"availableModels": "available models:"
 		},
@@ -2096,7 +2193,7 @@ var zh_CN_default = {
 			"listProvidersUsage": "/settings list-providers     — 列出所有已知提供商",
 			"listModelsUsage": "/settings list-models <name> — 列出提供商可用的模型",
 			"knownProviders": "已知提供商:",
-			"noModelsAvailable": "pi-ai 注册表中没有可用的模型",
+			"noModelsAvailable": "没有可用的模型",
 			"hintConfigureFirst": "提示: 使用 /settings 先配置此提供商",
 			"availableModels": "可用模型:"
 		},
@@ -2435,7 +2532,7 @@ function readSettings() {
 }
 /** Write back to settings.json */
 function writeSettings(settings) {
-	writeFileSync(HOME_CONFIG_PATH, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+	writeFileSync(HOME_CONFIG_PATH, `${JSON.stringify(settings, null, 2)}\n`, "utf-8");
 }
 /** Safely set a nested property (prototype-chain safe) */
 function _setByDotPath(obj, path, value) {
@@ -2465,15 +2562,6 @@ function _getByDotPath(obj, path) {
 
 //#endregion
 //#region src/cli/repl/commands/settings-cmd.ts
-/**
-* /settings command — interactive configuration menu
-*
-* TUI overlay-based graphical configuration interface:
-* - View and change the default model
-* - Configure API keys, models, and base URLs for existing providers
-* - Add new providers from a curated list
-* - All changes sync to ~/.zapmyco/settings.json in real-time
-*/
 /** Curated list of known providers (sorted by popularity) */
 const KNOWN_PROVIDERS = [
 	{
@@ -2550,6 +2638,18 @@ const KNOWN_PROVIDERS = [
 		label: "OpenCode"
 	}
 ];
+/** Built-in model IDs for known providers (fallback when not in config) */
+const BUILTIN_MODEL_IDS = {
+	anthropic: [
+		"claude-sonnet-4-20250514",
+		"claude-3-5-haiku-latest",
+		"claude-3-opus-latest"
+	],
+	deepseek: ["deepseek-v4-pro", "deepseek-v4-flash"],
+	glm: ["glm-4", "glm-4v"],
+	kimi: ["moonshot-v1-8k", "moonshot-v1-32k"],
+	minimax: ["minimax-text-01"]
+};
 /** Supported language locales */
 const SUPPORTED_LOCALES = [{
 	value: "zh-CN",
@@ -2575,14 +2675,12 @@ function hasApiKey(config, providerName) {
 	const keyStr = String(key);
 	return keyStr.length > 0 && keyStr !== "${}";
 }
-/** Get available model IDs for a provider (from config or pi-ai) */
+/** Get available model IDs for a provider (from config or built-in list) */
 function getProviderModels(config, providerName) {
 	const models = _getByDotPath(config, `llm.providers.${providerName}.models`);
 	if (models && typeof models === "object" && Object.keys(models).length > 0) return Object.keys(models);
-	try {
-		const piModels = getModels(providerName);
-		if (piModels && piModels.length > 0) return piModels.map((m) => m.id);
-	} catch {}
+	const builtinModels = BUILTIN_MODEL_IDS[providerName];
+	if (builtinModels && builtinModels.length > 0) return builtinModels;
 	return [];
 }
 /**
@@ -2766,7 +2864,7 @@ async function handleInteractiveMode(tui, session, config) {
 			label: id,
 			description: ""
 		})), { onExit: exitAll });
-		if (selected && selected.value) {
+		if (selected?.value) {
 			const modelId = selected.value;
 			const settings = readSettings();
 			_setByDotPath(settings, `llm.providers.${providerName}.models.${modelId}`, { id: modelId });
@@ -2809,7 +2907,9 @@ async function handleInteractiveMode(tui, session, config) {
 	*/
 	const handleModelSlotSelect = async (configKey, successMsgKey) => {
 		const configuredProviders = _getByDotPath(state.current, "llm.providers");
-		const allProviders = getProviders();
+		const configuredProviderNames = configuredProviders ? Object.keys(configuredProviders) : [];
+		const builtinProviderNames = Object.keys(BUILTIN_MODEL_IDS);
+		const allProviders = [...new Set([...configuredProviderNames, ...builtinProviderNames])];
 		const enabledItems = [];
 		const disabledItems = [];
 		for (const providerName of allProviders) {
@@ -2840,7 +2940,7 @@ async function handleInteractiveMode(tui, session, config) {
 			return;
 		}
 		const selected = await showSelectList(tui, modelItems, { onExit: exitAll });
-		if (!selected || !selected.value) return;
+		if (!selected?.value) return;
 		const selectedKey = selected.value;
 		const slashIndex = selectedKey.indexOf("/");
 		const providerName = selectedKey.slice(0, slashIndex);
@@ -2991,7 +3091,7 @@ async function handleInteractiveMode(tui, session, config) {
 					maxVisible: 12,
 					onExit: exitAll
 				});
-				if (!selected || !selected.value) continue;
+				if (!selected?.value) continue;
 				const providerName = selected.value;
 				const existingProviders = _getByDotPath(state.current, "llm.providers");
 				if (existingProviders && providerName in existingProviders) {
@@ -3033,7 +3133,7 @@ async function handleInteractiveMode(tui, session, config) {
 				...loc,
 				label: loc.value === currentLocale ? `${loc.label} ✓` : loc.label
 			})), { onExit: exitAll });
-			if (!selected || !selected.value) continue;
+			if (!selected?.value) continue;
 			if (selected.value !== currentLocale) {
 				setConfigValue(session, "locale", selected.value);
 				setLocale(selected.value);
@@ -3067,23 +3167,152 @@ function createStatusCommand() {
 	};
 }
 
+//#endregion
+//#region src/core/agent-team/agent-tool-categorizer.ts
+/** 内置工具分类映射表 */
+const TOOL_CATEGORIES = {
+	ReadFile: {
+		category: "read",
+		label: "Read"
+	},
+	Glob: {
+		category: "search",
+		label: "Search"
+	},
+	Grep: {
+		category: "search",
+		label: "Search"
+	},
+	WriteFile: {
+		category: "write",
+		label: "Write"
+	},
+	EditFile: {
+		category: "edit",
+		label: "Edit"
+	},
+	Exec: {
+		category: "exec",
+		label: "Exec"
+	},
+	Process: {
+		category: "exec",
+		label: "Process"
+	},
+	WebFetch: {
+		category: "web",
+		label: "WebFetch"
+	},
+	WebSearch: {
+		category: "web",
+		label: "WebSearch"
+	},
+	TaskManage: {
+		category: "task",
+		label: "Task"
+	},
+	Memory: {
+		category: "task",
+		label: "Memory"
+	},
+	AgentTool: {
+		category: "other",
+		label: "Spawn"
+	}
+};
+/**
+* 对工具名称进行分类
+*
+* @param toolName - 工具名称
+* @returns 分类信息和展示标签
+*/
+function categorizeTool(toolName) {
+	return TOOL_CATEGORIES[toolName] ?? {
+		category: "other",
+		label: toolName
+	};
+}
+
+//#endregion
+//#region src/core/agent-team/agent-progress-processor.ts
+/**
+* Agent 工具调用分组处理器
+*
+* 将扁平的工具调用记录按分类合为展示分组，
+* 类似 claude-code 的 processProgressMessages()。
+*
+* @module core/agent-team
+*/
+/**
+* 连续相同分类调用的最小分组阈值。
+* >= 2 时合并为分组（如 "Read 3 files"），
+* 否则保持独立条目（如 "ReadFile: src/foo.ts"）。
+*/
+const GROUP_THRESHOLD = 2;
+/**
+* 将扁平的工具调用记录处理为展示分组
+*
+* @param records - 工具调用记录列表
+* @returns 有序的展示分组
+*/
+function buildToolCallGroups(records) {
+	const groups = [];
+	let i = 0;
+	while (i < records.length) {
+		const record = records[i];
+		if (!record) {
+			i++;
+			continue;
+		}
+		const { category, label } = categorizeTool(record.toolName);
+		let j = i + 1;
+		while (j < records.length) {
+			const next = records[j];
+			if (!next) break;
+			if (categorizeTool(next.toolName).category !== category) break;
+			j++;
+		}
+		const count = j - i;
+		const batch = records.slice(i, j);
+		if (count >= GROUP_THRESHOLD) groups.push({
+			category,
+			label,
+			calls: batch,
+			count,
+			startTime: batch[0]?.startedAt ?? 0,
+			endTime: batch[batch.length - 1]?.endedAt
+		});
+		else for (const r of batch) groups.push({
+			category,
+			label,
+			calls: [r],
+			count: 1,
+			startTime: r.startedAt,
+			endTime: r.endedAt
+		});
+		i = j;
+	}
+	return groups;
+}
+
 //#endregion
 //#region src/cli/repl/components/agent-status-bar.ts
 /**
 * Agent 状态栏组件
 *
 * 实时显示正在运行的子 Agent 状态，类似 Claude Code 的 "Running N agents…" 效果。
+* 支持每个 Agent 的工具调用历史展示、分组摘要、"+N more" 折叠展开。
 * 固定在 OutputArea 和 Editor 之间，无活跃 Agent 时自动隐藏。
 *
 * @module cli/repl/components
 */
-/** 状态图标映射 */
+/** 状态图标映射 — 纯文字符号，无 emoji */
 const STATUS_ICONS$1 = {
 	idle: "○",
-	running: "◉",
+	running: "●",
 	paused: "◐",
-	completed: "●",
-	failed: "✕",
+	completed: "✔",
+	failed: "✘",
 	cancelled: "◌"
 };
 /** Loading 动画帧 */
@@ -3105,32 +3334,120 @@ const TREE_BRANCH = "├── ";
 const TREE_LAST = "└── ";
 const TREE_PIPE = "│   ";
 const TREE_SPACE = "    ";
-const TREE_CONT = "⎿  ";
+/** 工具名 → 可读动词描述 */
+const TOOL_DESCRIPTIONS = {
+	AgentTool: "派发子任务",
+	Grep: "搜索代码",
+	ReadFile: "读取文件",
+	Glob: "查找文件",
+	Exec: "执行命令",
+	WriteFile: "写入文件",
+	EditFile: "编辑文件",
+	WebFetch: "抓取网页",
+	WebSearch: "搜索网络",
+	SendMessage: "发送消息",
+	TaskStop: "停止任务"
+};
+/** 获取工具的可读描述 */
+function getToolDescription(toolName) {
+	return TOOL_DESCRIPTIONS[toolName] ?? toolName;
+}
 /**
 * Agent 状态栏组件
 *
 * 从 AgentInstanceManager 读取活跃实例状态，渲染为紧凑状态栏。
 */
 var AgentStatusBar = class extends Container {
-	/** 是否展开显示详情 */
-	#expanded = false;
+	/** AnimationManager 实例（用于渲染周期驱动的动画） */
+	#animationManager;
+	/** 是否展开显示详情（默认展开） */
+	#expanded = true;
+	/** 按实例的工具调用列表展开状态 */
+	#agentExpanded = /* @__PURE__ */ new Map();
 	/** loading 动画帧索引 */
 	#loadingFrame = 0;
-	/** loading 动画定时器 */
-	#loadingTimer;
+	/** AnimationManager 回调注销函数 */
+	#unregLoading = null;
+	/** 上次帧推进时间戳 */
+	#lastLoadingTick = 0;
 	/** 上次活跃实例快照（用于检测变化） */
 	#lastActiveCount = 0;
+	constructor(animationManager) {
+		super();
+		this.#animationManager = animationManager;
+	}
+	/** 当前模型名称 */
+	#modelName = null;
+	/** 累积非缓存 input tokens（usage.input = totalInput - cacheRead） */
+	#inputTokens = 0;
+	/** 累积 cache read tokens（缓存命中） */
+	#cacheReadTokens = 0;
+	/** 累积 output tokens */
+	#outputTokens = 0;
+	/** 任务已耗时（ms） */
+	#durationMs = 0;
 	/**
 	* 切换展开/折叠状态
+	*
+	* @param instanceId - 指定实例 ID 时，切换该实例的工具调用列表展开/折叠；不传时切换整体状态栏
 	*/
-	toggle() {
-		this.#expanded = !this.#expanded;
+	toggle(instanceId) {
+		if (instanceId) {
+			const current = this.#agentExpanded.get(instanceId) ?? false;
+			this.#agentExpanded.set(instanceId, !current);
+		} else {
+			this.#expanded = !this.#expanded;
+			if (!this.#expanded) this.#agentExpanded.clear();
+		}
 		this.invalidate();
 	}
+	/** 展开/折叠当前活跃 Agent 的工具调用详情 */
+	toggleActiveAgentDetails() {
+		const active = getAgentInstanceManager().listActive();
+		if (active.length === 0) return;
+		const first = active[0];
+		if (first) this.toggle(first.instanceId);
+	}
 	/** 获取当前展开状态 */
 	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 +3456,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,56 +3466,85 @@ 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) {
-		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)")}`;
+	#renderCollapsed(frame, count, _toolUses, duration) {
+		return `  ${chalk.cyan(`${frame} ${count} agent${count > 1 ? "s" : ""}`)} ${chalk.gray(`· ${duration}`)}`;
 	}
 	/** 渲染展开模式多行 */
 	#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(`${header}  ${hint}`.slice(0, width));
+		const totalDuration = this.#formatDuration(Math.max(...instances.map((i) => Date.now() - i.createdAt)));
+		const header = chalk.cyan(`  ${frame} ${count} agent${count > 1 ? "s" : ""} · ${totalDuration}`);
+		lines.push(truncateToWidth(header, 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(line1.slice(0, 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));
+			const agentLines = this.#renderAgentDetail(inst, connector, childPrefix, width);
+			lines.push(...agentLines);
+		}
+		return lines;
+	}
+	/**
+	* 渲染单个 Agent 的详情（header + 工具调用列表）
+	*/
+	#renderAgentDetail(inst, connector, childPrefix, width) {
+		const lines = [];
+		const icon = STATUS_ICONS$1[inst.status] ?? "?";
+		const statusColor = inst.status === "running" ? chalk.yellow : chalk.gray;
+		const typeLabel = chalk.bold(inst.typeId);
+		const act = inst.currentActivity;
+		let activityDesc = "";
+		if (act) activityDesc = `正在${getToolDescription(act.toolName)}`;
+		else {
+			const totalCalls = inst.toolCallHistory.length;
+			if (totalCalls > 0) {
+				if (inst.toolCallHistory.every((t) => t.status === "completed" || t.status === "failed")) activityDesc = `已完成 ${totalCalls} 次调用`;
 			}
 		}
+		const duration = chalk.gray(`· ${this.#formatDuration(Date.now() - inst.createdAt)}`);
+		let line1;
+		if (activityDesc) line1 = `  ${chalk.dim(connector)}${statusColor(icon)} ${typeLabel} ${chalk.dim(`· ${activityDesc}`)} ${duration}`;
+		else line1 = `  ${chalk.dim(connector)}${statusColor(icon)} ${typeLabel} ${duration}`;
+		lines.push(truncateToWidth(line1, width));
+		const totalCalls = inst.toolCallHistory.length;
+		if (totalCalls > 0 && !act) {
+			const summaries = buildToolCallGroups(inst.toolCallHistory).map((g) => `${getToolDescription(g.label)} ${g.count}次`);
+			if (summaries.length > 0) lines.push(truncateToWidth(`  ${chalk.dim(childPrefix + TREE_SPACE)}${chalk.dim(summaries.join("  "))}`, width));
+		} else if (totalCalls > 0 && act) lines.push(truncateToWidth(`  ${chalk.dim(childPrefix + TREE_SPACE)}${chalk.dim(`已完成 ${totalCalls} 次工具调用`)}`, width));
+		if (inst.status === "running" && !act) lines.push(truncateToWidth(`  ${chalk.dim(childPrefix + TREE_SPACE)}${chalk.dim("(ctrl+b to run in background)")}`, width));
 		return lines;
 	}
-	/** 启动 loading 动画 */
+	/** 启动 loading 动画（由 animationManager 在渲染周期中驱动） */
 	#startLoading() {
-		if (this.#loadingTimer) return;
-		this.#loadingTimer = setInterval(() => {
+		if (this.#unregLoading) return;
+		this.#lastLoadingTick = 0;
+		this.#unregLoading = this.#animationManager.register((now) => {
+			if (now - this.#lastLoadingTick < LOADING_INTERVAL_MS$1) return;
+			this.#lastLoadingTick = now;
 			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;
+		if (this.#unregLoading) {
+			this.#unregLoading();
+			this.#unregLoading = null;
 		}
+		this.#loadingFrame = 0;
 	}
 	/** 格式化持续时间为可读字符串 */
 	#formatDuration(ms) {
@@ -3205,24 +3552,37 @@ 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
 //#region src/cli/repl/components/custom-editor.ts
-/**
-* 自定义编辑器组件
-*
-* 继承自 pi-tui 的 Editor，添加 zapmyco 特有的快捷键处理：
-* - Ctrl+C: 取消任务 / 二次退出
-* - Ctrl+D: 退出
-* - Ctrl+O: 打开外部编辑器编辑输入
-* - Escape: 取消当前输入
-*
-* 同时 override render() 以：
-* - 去掉 Editor 默认的上下边框（───）
-* - 添加简洁的输入提示符（❯ ）
-* - 执行中时显示 loading spinner
-*/
 /** 输入提示符 */
 const PROMPT_PREFIX = "❯ ";
 /** loading 动画帧 */
@@ -3246,36 +3606,42 @@ function isBorderLine(line) {
 	return /^[\s─┌┐├┤└┘↑↓\-0-9a-zA-Z]+$/.test(stripped);
 }
 var ZapmycoEditor = class extends Editor {
+	/** AnimationManager 实例（用于渲染周期驱动的动画） */
+	#animationManager;
+	/** AnimationManager 回调注销函数 */
+	#unregLoading = null;
+	/** 上次帧推进时间戳 */
+	#lastLoadingTick = 0;
+	constructor(tui, theme, animationManager, options) {
+		super(tui, theme, options);
+		this.#animationManager = animationManager;
+	}
 	/** Escape 键回调 */
 	onEscape;
 	/** Ctrl+C 回调 */
 	onCtrlC;
 	/** Ctrl+D 回调 */
 	onCtrlD;
-	/** Ctrl+O 回调（打开外部编辑器） */
+	/** Ctrl+G 回调（打开外部编辑器） */
 	onOpenEditor;
-	/** Ctrl+T 回调（展开/折叠 TaskStatusBar） */
-	onToggleTasks;
-	/** Ctrl+Y 回调（展开/折叠 thinking 内容） */
+	/** Ctrl+B 回调（后台运行当前任务） */
+	onRunInBackground;
+	/** Ctrl+T 回调（展开/折叠 thinking 内容） */
 	onToggleThinking;
-	/** Ctrl+Shift+O 回调（展开/折叠 Agent 状态栏） */
-	onToggleAgentBar;
 	/** 是否正在执行（用于显示 loading） */
 	#executing = false;
 	/** 是否显示 spinner（执行期间禁用输入但不一定显示 spinner） */
 	#showSpinner = true;
 	/** loading 动画帧索引 */
 	#loadingFrame = 0;
-	/** loading 动画定时器 */
-	#loadingTimer;
 	/** 审批模式状态 */
 	#approvalState = null;
 	/** 进入审批模式，在编辑器区域显示审批选项 */
 	enterApprovalMode(title, options) {
 		this.#executing = false;
-		if (this.#loadingTimer) {
-			clearInterval(this.#loadingTimer);
-			this.#loadingTimer = void 0;
+		if (this.#unregLoading) {
+			this.#unregLoading();
+			this.#unregLoading = null;
 		}
 		this.#approvalState = {
 			title,
@@ -3310,23 +3676,17 @@ var ZapmycoEditor = class extends Editor {
 			if (this.getText().length === 0 && this.onCtrlD) this.onCtrlD();
 			return;
 		}
-		if (matchesKey(data, Key.ctrl("o"))) {
+		if (matchesKey(data, Key.ctrl("g"))) {
 			if (this.onOpenEditor) this.onOpenEditor();
 			return;
 		}
-		if (matchesKey(data, Key.ctrlShift("o")) && this.onToggleAgentBar) {
-			this.onToggleAgentBar();
+		if (matchesKey(data, Key.ctrl("b")) && this.onRunInBackground) {
+			this.onRunInBackground();
 			return;
 		}
-		if (matchesKey(data, Key.ctrl("t"))) {
-			if (this.onToggleTasks) {
-				this.onToggleTasks();
-				return;
-			}
-			if (this.onToggleThinking) {
-				this.onToggleThinking();
-				return;
-			}
+		if (matchesKey(data, Key.ctrl("t")) && this.onToggleThinking) {
+			this.onToggleThinking();
+			return;
 		}
 		if (matchesKey(data, Key.ctrl("y")) && this.onToggleThinking) {
 			this.onToggleThinking();
@@ -3377,13 +3737,19 @@ var ZapmycoEditor = class extends Editor {
 		this.#showSpinner = showSpinner;
 		if (executing && showSpinner) {
 			this.#loadingFrame = 0;
-			this.#loadingTimer = setInterval(() => {
+			this.#lastLoadingTick = 0;
+			this.#unregLoading = this.#animationManager.register((now) => {
+				if (now - this.#lastLoadingTick < 100) return;
+				this.#lastLoadingTick = now;
 				this.#loadingFrame = (this.#loadingFrame + 1) % LOADING_FRAMES$1.length;
 				this.tui?.requestRender();
-			}, 100);
-		} else if (this.#loadingTimer) {
-			clearInterval(this.#loadingTimer);
-			this.#loadingTimer = void 0;
+			});
+		} else {
+			if (this.#unregLoading) {
+				this.#unregLoading();
+				this.#unregLoading = null;
+			}
+			this.#loadingFrame = 0;
 		}
 		this.tui?.requestRender();
 	}
@@ -3453,17 +3819,13 @@ var ZapmycoEditor = class extends Editor {
 * 显示 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 高亮。
@@ -3499,34 +3861,22 @@ const STATUS_ICONS = {
 * 固定在 OutputArea 和 AgentStatusBar 之间。
 */
 var TaskStatusBar = class extends Container {
-	/**
-	* 用户手动折叠标记
-	*
-	* - false（默认）：根据任务状态自动决定展开/折叠
-	* - true：用户通过 Ctrl+T 手动折叠，覆盖自动行为
-	*/
-	#forceCollapsed = false;
+	/** AnimationManager 实例（用于渲染周期驱动的动画） */
+	#animationManager;
 	/** TaskStore 引用（只读，不写） */
 	#store;
 	/** loading 动画帧索引 */
 	#loadingFrame = 0;
-	/** loading 动画定时器 */
-	#loadingTimer;
+	/** AnimationManager 回调注销函数 */
+	#unregLoading = null;
+	/** 上次帧推进时间戳 */
+	#lastLoadingTick = 0;
 	/** 上次是否有 in_progress 任务（用于启停动画） */
 	#hadInProgress = false;
-	constructor(store) {
+	constructor(store, animationManager) {
 		super();
 		this.#store = store;
-	}
-	/**
-	* 切换展开/折叠状态
-	*
-	* 用户手动 Ctrl+T 时调用，设置 forceCollapsed 标记。
-	* 当新任务出现时，forceCollapsed 会被自动重置。
-	*/
-	toggle() {
-		this.#forceCollapsed = !this.#forceCollapsed;
-		this.invalidate();
+		this.#animationManager = animationManager;
 	}
 	/** 当前是否处于展开状态 */
 	get isExpanded() {
@@ -3535,22 +3885,16 @@ var TaskStatusBar = class extends Container {
 	}
 	/**
 	* 当 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;
+		return summary.total > 0;
 	}
 	/**
 	* 管理 loading 动画的启停
@@ -3562,21 +3906,24 @@ var TaskStatusBar = class extends Container {
 		if (hasInProgress && !this.#hadInProgress) this.#startLoading();
 		else if (!hasInProgress && this.#hadInProgress) this.#stopLoading();
 	}
-	/** 启动 loading 动画 */
+	/** 启动 loading 动画（由 animationManager 在渲染周期中驱动） */
 	#startLoading() {
-		if (this.#loadingTimer) return;
-		this.#loadingTimer = setInterval(() => {
+		if (this.#unregLoading) return;
+		this.#lastLoadingTick = 0;
+		this.#unregLoading = this.#animationManager.register((now) => {
+			if (now - this.#lastLoadingTick < LOADING_INTERVAL_MS) return;
+			this.#lastLoadingTick = now;
 			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;
+		if (this.#unregLoading) {
+			this.#unregLoading();
+			this.#unregLoading = null;
 		}
+		this.#loadingFrame = 0;
 	}
 	/** 获取当前 in_progress 的图标（可能为动画帧） */
 	#getInProgressIcon() {
@@ -3606,8 +3953,7 @@ var TaskStatusBar = class extends Container {
 		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}`;
+		return `  ${parts.join(" · ")}`;
 	}
 	/** 渲染展开模式多行 */
 	#renderExpanded(tasks, summary, width) {
@@ -3621,7 +3967,6 @@ var TaskStatusBar = class extends Container {
 		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;
 	}
 	/** 渲染单个任务行 */
@@ -3771,7 +4116,7 @@ function parseField(field, spec) {
 function parseFieldPart(part, spec) {
 	if (part.startsWith("*/")) {
 		const step = parseInt(part.slice(2), 10);
-		if (isNaN(step) || step < 1) return null;
+		if (Number.isNaN(step) || step < 1) return null;
 		return new StepMatcher(step, spec.min);
 	}
 	if (part === "*") return new WildcardMatcher();
@@ -3779,12 +4124,12 @@ function parseFieldPart(part, spec) {
 	if (rangeMatch) {
 		const start = parseInt(rangeMatch[1] ?? "", 10);
 		const end = parseInt(rangeMatch[2] ?? "", 10);
-		if (isNaN(start) || isNaN(end)) return null;
+		if (Number.isNaN(start) || Number.isNaN(end)) return null;
 		if (start < spec.min || end > spec.max || start > end) return null;
 		return new RangeMatcher(start, end);
 	}
 	const value = parseInt(part, 10);
-	if (!isNaN(value) && value >= spec.min && value <= spec.max) return new ValueMatcher([value]);
+	if (!Number.isNaN(value) && value >= spec.min && value <= spec.max) return new ValueMatcher([value]);
 	return null;
 }
 /**
@@ -3975,7 +4320,7 @@ const CRON_CONSTANTS = {
 *
 * @module cli/repl/cron/cron-scheduler
 */
-const log$17 = logger.child("cron:scheduler");
+const log$22 = logger.child("cron:scheduler");
 var CronScheduler = class extends EventEmitter {
 	store;
 	jobs = [];
@@ -3996,7 +4341,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$22.info(`调度器启动，加载 ${loadedJobs.length} 个 durable 任务`);
 		await this.handleMissedJobs();
 		this.checkAutoExpiry();
 		this.running = true;
@@ -4012,7 +4357,7 @@ var CronScheduler = class extends EventEmitter {
 			clearInterval(this.timer);
 			this.timer = null;
 		}
-		log$17.info("调度器已停止");
+		log$22.info("调度器已停止");
 	}
 	/** 添加任务 */
 	async addJob(job) {
@@ -4024,7 +4369,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$22.info("任务已添加", {
 			id: job.id,
 			cron: job.cron,
 			durable: job.durable
@@ -4154,7 +4499,7 @@ var CronScheduler = class extends EventEmitter {
 			}, delay);
 		}
 		if (toDelete.length > 0) {
-			log$17.info(`跳过 ${toDelete.length} 个错过的一次性任务（超出补发上限）`);
+			log$22.info(`跳过 ${toDelete.length} 个错过的一次性任务（超出补发上限）`);
 			this.emit("missed-overflow", {
 				count: toDelete.length,
 				jobIds: toDelete.map((m) => m.id)
@@ -4172,7 +4517,7 @@ var CronScheduler = class extends EventEmitter {
 				job.lastFiredAt = now;
 				job.fireCount++;
 				this.removeJob(job.id);
-				log$17.info("任务已过期并触发最后一次", { id: job.id });
+				log$22.info("任务已过期并触发最后一次", { id: job.id });
 			}
 		}
 	}
@@ -4233,7 +4578,7 @@ function applyOneShotJitter(jobId, rawNext) {
 *
 * @module cli/repl/cron/cron-store
 */
-const log$16 = logger.child("cron:store");
+const log$21 = logger.child("cron:store");
 const STORE_FILE = join(join(homedir(), ".zapmyco", "cron"), "scheduled_tasks.json");
 var CronStore = class {
 	filePath;
@@ -4257,13 +4602,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$21.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$21.warn("加载定时任务文件失败，将使用空列表", { error: err instanceof Error ? err.message : String(err) });
 			return [];
 		}
 	}
@@ -4310,7 +4655,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$21.warn(`跳过 ${raw.length - valid.length} 个无效任务条目`);
 		return valid;
 	}
 };
@@ -4328,7 +4673,7 @@ function getCronStore() {
 * 基于内存的环形缓冲区，记录 REPL 会话中的用户输入和执行结果。
 * 支持文件持久化到 ~/.zapmyco/history.json，跨会话恢复。
 */
-const log$15 = logger.child("history:store");
+const log$20 = logger.child("history:store");
 /** 默认最大历史条数 */
 const DEFAULT_MAX_SIZE = 100;
 /** 历史文件存储路径 */
@@ -4387,13 +4732,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$20.debug("历史记录已加载", {
 					count: this.entries.length,
 					nextId: this.nextId
 				});
 			}
 		} catch {
-			log$15.debug("无历史文件或加载失败，使用空历史");
+			log$20.debug("无历史文件或加载失败，使用空历史");
 		}
 	}
 	/** 持久化历史记录到文件 */
@@ -4406,7 +4751,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$20.warn("历史记录保存失败", { error: err instanceof Error ? err.message : String(err) });
 		}
 	}
 };
@@ -4531,7 +4876,7 @@ const OVERLAY_OPTIONS = {
 /** 截断文本到指定宽度 */
 function truncate(text, maxLen) {
 	if (text.length <= maxLen) return text;
-	return text.slice(0, maxLen - 1) + "…";
+	return `${text.slice(0, maxLen - 1)}…`;
 }
 var AskUserQuestionComponent = class {
 	tui;
@@ -5042,7 +5387,7 @@ var OutputFormatter = class {
 		const c = this.getColor();
 		const lines = [
 			"",
-			c.bold(`  📋 ${t("output.taskGraph.title")}`),
+			c.bold(`  ${t("output.taskGraph.title")}:`),
 			c.gray(`  ${t("output.taskGraph.total", {
 				count: graph.nodes.size,
 				layers: graph.layers.length
@@ -5181,7 +5526,7 @@ var OutputFormatter = class {
 		lines.push("  分类评分:");
 		const bar = (s) => {
 			const filled = Math.round(s / 10);
-			return c.green("█".repeat(filled)) + c.gray("░".repeat(10 - filled)) + ` ${s}/100`;
+			return `${c.green("█".repeat(filled)) + c.gray("░".repeat(10 - filled))} ${s}/100`;
 		};
 		lines.push(`    permissions:  ${bar(report.scores.permissions)}`);
 		lines.push(`    shell:        ${bar(report.scores.shell)}`);
@@ -5288,7 +5633,7 @@ var Renderer = class {
 *
 * @module core/agent-team
 */
-const log$14 = logger.child("background-store");
+const log$19 = logger.child("background-store");
 /**
 * 后台任务持久化存储
 *
@@ -5318,14 +5663,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$19.debug("后台任务已加载", {
 					count: entries.length,
 					path: this.filePath
 				});
 				return entries;
 			}
 		} catch (err) {
-			log$14.warn("后台任务加载失败", {
+			log$19.warn("后台任务加载失败", {
 				error: String(err),
 				path: this.filePath
 			});
@@ -5384,7 +5729,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$19.error("后台任务持久化失败", {
 				error: String(err),
 				path: this.filePath
 			});
@@ -5410,7 +5755,7 @@ var BackgroundTaskStore = class {
 		}
 		if (cleaned > 0) {
 			this.persist();
-			log$14.info("清理过期后台任务", { cleaned });
+			log$19.info("清理过期后台任务", { cleaned });
 		}
 		return cleaned;
 	}
@@ -5427,7 +5772,7 @@ var BackgroundTaskStore = class {
 *
 * @module core/agent-team
 */
-const log$13 = logger.child("agent-message-bus");
+const log$18 = logger.child("agent-message-bus");
 /**
 * Agent 消息总线（单例）
 *
@@ -5461,12 +5806,12 @@ var AgentMessageBus = class {
 		};
 		const targetInstance = getAgentInstanceManager().get(toAgentId);
 		if (targetInstance) targetInstance.inbox.push(fullMessage);
-		else log$13.warn("目标 Agent 实例不存在，消息丢弃", {
+		else log$18.warn("目标 Agent 实例不存在，消息丢弃", {
 			toAgentId,
 			messageId: fullMessage.messageId
 		});
 		this.emitter.emit(`msg:${toAgentId}`, fullMessage);
-		log$13.debug("消息已投递", {
+		log$18.debug("消息已投递", {
 			from: fromAgentId,
 			to: toAgentId,
 			type: fullMessage.type,
@@ -5549,7 +5894,7 @@ function getAgentMessageBus() {
 *
 * @module core/agent-team
 */
-const log$12 = logger.child("background-agent-manager");
+const log$17 = logger.child("background-agent-manager");
 /**
 * 后台 Agent 管理器（单例）
 */
@@ -5606,7 +5951,7 @@ var BackgroundAgentManager = class {
 			parentAgentId: params.parentInstanceId
 		});
 		this.runAsync(taskId, params, abortController, timeoutMs).catch((err) => {
-			log$12.error("后台 Agent 意外崩溃", {
+			log$17.error("后台 Agent 意外崩溃", {
 				taskId,
 				error: String(err)
 			});
@@ -5626,7 +5971,7 @@ var BackgroundAgentManager = class {
 		const orchestrator = this.orchestrator;
 		const messageBus = getAgentMessageBus();
 		const timeoutHandle = setTimeout(() => {
-			log$12.warn("后台 Agent 超时，自动取消", {
+			log$17.warn("后台 Agent 超时，自动取消", {
 				taskId,
 				timeoutMs
 			});
@@ -5670,7 +6015,7 @@ var BackgroundAgentManager = class {
 					taskId,
 					requiresResponse: false
 				});
-				log$12.info("后台 Agent 完成通知已发送", {
+				log$17.info("后台 Agent 完成通知已发送", {
 					taskId,
 					instanceId: result.instanceId,
 					parentId: params.parentInstanceId,
@@ -5697,7 +6042,7 @@ var BackgroundAgentManager = class {
 			completedAt: Date.now(),
 			error
 		});
-		log$12.warn("后台 Agent 失败", {
+		log$17.warn("后台 Agent 失败", {
 			taskId,
 			error
 		});
@@ -5734,7 +6079,7 @@ var BackgroundAgentManager = class {
 		if (runtime.instanceId) try {
 			await getAgentInstanceManager().cancel(runtime.instanceId);
 		} catch {}
-		log$12.info("后台 Agent 已取消", { taskId });
+		log$17.info("后台 Agent 已取消", { taskId });
 		return true;
 	}
 	/**
@@ -5743,13 +6088,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$17.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$17.info("跨会话恢复：标记活跃任务为 failed", { count: active.length });
 	}
 };
 /** 全局单例 */
@@ -5968,7 +6313,7 @@ function createDeferred() {
 *
 * @module core/question/question-manager
 */
-const log$11 = logger.child("question-manager");
+const log$16 = logger.child("question-manager");
 /** 问题超时时间（5 分钟） */
 const QUESTION_TIMEOUT_MS = 300 * 1e3;
 var QuestionManager = class {
@@ -6014,13 +6359,13 @@ var QuestionManager = class {
 			requestId,
 			questionCount: params.questions.length
 		});
-		log$11.debug("提问已发出", {
+		log$16.debug("提问已发出", {
 			requestId,
 			questionCount: params.questions.length
 		});
 		const timeout = setTimeout(() => {
 			if (!deferred.isSettled) {
-				log$11.warn("提问超时，自动取消", { requestId });
+				log$16.warn("提问超时，自动取消", { requestId });
 				deferred.reject(/* @__PURE__ */ new Error("提问超时，用户未在 5 分钟内回答"));
 				this.pending.delete(requestId);
 				eventBus.emit("question:timeout", { requestId });
@@ -6034,7 +6379,7 @@ var QuestionManager = class {
 				requestId,
 				answerCount: Object.keys(result.answers).length
 			});
-			log$11.debug("提问已回答", { requestId });
+			log$16.debug("提问已回答", { requestId });
 			return result;
 		} catch (err) {
 			clearTimeout(timeout);
@@ -6043,7 +6388,7 @@ var QuestionManager = class {
 				requestId,
 				reason: err instanceof Error ? err.message : String(err)
 			});
-			log$11.debug("提问已取消", {
+			log$16.debug("提问已取消", {
 				requestId,
 				error: err instanceof Error ? err.message : String(err)
 			});
@@ -6065,7 +6410,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$16.debug("已清理所有待处理问题", { count });
 	}
 };
 let globalQuestionManager = null;
@@ -7143,7 +7488,7 @@ function isPathWithinWorkdir(resolvedPath, workdir) {
 	try {
 		normalizedWorkdir = realpathSync(normalizedWorkdir).replace(/\\/g, "/");
 	} catch {}
-	if (!normalizedPath.startsWith(normalizedWorkdir + "/") && normalizedPath !== normalizedWorkdir) return false;
+	if (!normalizedPath.startsWith(`${normalizedWorkdir}/`) && normalizedPath !== normalizedWorkdir) return false;
 	return true;
 }
 /**
@@ -9298,7 +9643,7 @@ function runForeground(childProcess, timeoutSec, signal) {
 		childProcess.on("error", (err) => {
 			settle({
 				stdout: stdoutChunks.join(""),
-				stderr: stderrChunks.join("") + `\n[进程错误: ${err.message}]`,
+				stderr: `${stderrChunks.join("")}\n[进程错误: ${err.message}]`,
 				exitCode: -1,
 				signal: null,
 				timedOut: false,
@@ -9619,7 +9964,7 @@ function formatDuration(ms) {
 }
 function truncateCommand(command, maxLen = 80) {
 	if (command.length <= maxLen) return command;
-	return command.slice(0, maxLen - 3) + "...";
+	return `${command.slice(0, maxLen - 3)}...`;
 }
 
 //#endregion
@@ -9713,6 +10058,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 +10257,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 +10266,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 +10309,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 +10319,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 +11836,7 @@ var WorktreeStore = class {
 * @module core/worktree
 */
 const execFileAsync = promisify(execFile);
-const log$10 = logger.child("worktree-manager");
+const log$15 = logger.child("worktree-manager");
 let globalWorktreeManager = null;
 /** 获取全局 WorktreeManager 实例 */
 function getWorktreeManager() {
@@ -11396,7 +11872,7 @@ var WorktreeManager = class {
 			throw new WorktreeError("无法确定 git 仓库根目录，请确保在 git 仓库中运行", "NOT_GIT_REPO");
 		}
 		try {
-			log$10.info("创建 worktree", {
+			log$15.info("创建 worktree", {
 				branchName,
 				worktreePath,
 				gitRoot
@@ -11424,14 +11900,14 @@ var WorktreeManager = class {
 			});
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : String(err);
-			log$10.warn("创建分支失败，清理 worktree", {
+			log$15.warn("创建分支失败，清理 worktree", {
 				branchName,
 				error: msg
 			});
 			try {
 				await this.removeByPath(worktreePath, branchName, true);
 			} catch (err) {
-				log$10.warn("Worktree 创建失败后清理出错", {
+				log$15.warn("Worktree 创建失败后清理出错", {
 					worktreePath,
 					error: err instanceof Error ? err.message : String(err)
 				});
@@ -11456,7 +11932,7 @@ var WorktreeManager = class {
 			createdBy: info.createdBy,
 			status: "active"
 		});
-		log$10.info("Worktree 创建成功", {
+		log$15.info("Worktree 创建成功", {
 			id: info.id,
 			path: worktreePath
 		});
@@ -11468,13 +11944,13 @@ var WorktreeManager = class {
 	async remove(id, discardChanges) {
 		const info = this.activeWorktrees.get(id);
 		if (!info) {
-			log$10.warn("尝试删除不存在的 worktree", { id });
+			log$15.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$15.info("Worktree 已删除", { id });
 	}
 	/**
 	* 通过路径删除 worktree（内部方法）
@@ -11484,7 +11960,7 @@ var WorktreeManager = class {
 			try {
 				await execFileAsync("git", ["worktree", "prune"], { timeout: 1e4 });
 			} catch (err) {
-				log$10.warn("Worktree prune 失败（路径不存在）", {
+				log$15.warn("Worktree prune 失败（路径不存在）", {
 					worktreePath,
 					error: err instanceof Error ? err.message : String(err)
 				});
@@ -11498,7 +11974,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$15.warn("git worktree remove 失败", {
 				worktreePath,
 				error: msg
 			});
@@ -11510,7 +11986,7 @@ var WorktreeManager = class {
 				branchName
 			], { timeout: 1e4 });
 		} catch (err) {
-			log$10.warn("删除 worktree 分支失败", {
+			log$15.warn("删除 worktree 分支失败", {
 				branchName,
 				error: err instanceof Error ? err.message : String(err)
 			});
@@ -11518,7 +11994,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$15.warn("Worktree prune 失败", { error: err instanceof Error ? err.message : String(err) });
 		}
 	}
 	/**
@@ -11540,7 +12016,7 @@ var WorktreeManager = class {
 			await this.remove(id, true);
 			return { cleaned: true };
 		}
-		log$10.info("Worktree 有变更，保留", {
+		log$15.info("Worktree 有变更，保留", {
 			id,
 			path: info.worktreePath
 		});
@@ -11560,7 +12036,7 @@ var WorktreeManager = class {
 			});
 			return stdout.trim().length > 0;
 		} catch (err) {
-			log$10.warn("检查 worktree 变更状态失败", {
+			log$15.warn("检查 worktree 变更状态失败", {
 				worktreePath,
 				error: err instanceof Error ? err.message : String(err)
 			});
@@ -11580,7 +12056,7 @@ var WorktreeManager = class {
 				await this.removeByPath(record.worktreePath, record.branchName, true);
 				cleaned++;
 			} catch (err) {
-				log$10.warn("过期 worktree 清理失败", {
+				log$15.warn("过期 worktree 清理失败", {
 					id: record.id,
 					path: record.worktreePath,
 					error: err instanceof Error ? err.message : String(err)
@@ -11589,7 +12065,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$15.info("过期 worktree 清理完成", { cleaned });
 		return cleaned;
 	}
 	listActive() {
@@ -11607,48 +12083,16 @@ var WorktreeManager = class {
 };
 
 //#endregion
-//#region src/core/agent-team/types.ts
+//#region src/core/agent-team/agent-factory.ts
+const log$14 = logger.child("agent-factory");
 /**
-* Agent 默认安全工具集
+* 创建 Agent 实例
 *
-* 只读和搜索工具，不含任何可能产生副作用的操作。
-* 子 Agent 默认使用此集合。
-*/
-const AGENT_SAFE_TOOLS = [
-	"ReadFile",
-	"Glob",
-	"Grep",
-	"WebFetch",
-	"WebSearch",
-	"GetCurrentTime",
-	"GetWorkdirInfo"
-];
-/**
-* Agent 标准工具集
-*
-* safe + 文件写入 + Shell 执行。
-*/
-const AGENT_STANDARD_TOOLS = [
-	...AGENT_SAFE_TOOLS,
-	"WriteFile",
-	"EditFile",
-	"Exec",
-	"Process",
-	"TaskManage",
-	"Memory"
-];
-
-//#endregion
-//#region src/core/agent-team/agent-factory.ts
-const log$9 = logger.child("agent-factory");
-/**
-* 创建 Agent 实例
-*
-* 根据类型定义创建一个隔离的 LlmBasedAgent，包括：
-* - 独立的 PiAgent 实例（消息历史隔离）
-* - 类型特定的工具集（根据 toolPolicy 解析）
-* - 类型特定的系统提示词
-* - Security 配置覆盖注入
+* 根据类型定义创建一个隔离的 LlmBasedAgent，包括：
+* - 独立的 PiAgent 实例（消息历史隔离）
+* - 类型特定的工具集（根据 toolPolicy 解析）
+* - 类型特定的系统提示词
+* - Security 配置覆盖注入
 *
 * @param definition - Agent 类型定义
 * @param instance - Agent 实例（部分填充，含 depth/task 等）
@@ -11658,6 +12102,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 +12110,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$14.debug("创建 Agent 实例", {
 		typeId: definition.typeId,
 		instanceId: instance.instanceId,
 		depth: instance.depth,
@@ -11736,6 +12182,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 +12210,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$14.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;
@@ -11764,7 +12227,7 @@ function shareParentResources(subAgent, parentAgent, definition) {
 	if (parentGetApiKey) subAgent.innerAgent.getApiKey = parentGetApiKey;
 }
 /**
-* 根据 Agent 类型声明的 model 值解析对应的 pi-ai Model 对象
+* 根据 Agent 类型声明的 model 值解析本地 Model 对象
 *
 * 支持三种格式：
 * - 语义名称: 'analysis' → 指向 analysisModel 槽位
@@ -11774,7 +12237,7 @@ function shareParentResources(subAgent, parentAgent, definition) {
 *
 * @param model - Agent 类型声明的 model 值
 * @param parentAgent - 父 Agent（用于获取 AgentLlmFacade）
-* @returns 解析后的 pi-ai Model 对象，解析失败返回 undefined
+* @returns 解析后的本地 Model 对象，解析失败返回 undefined
 */
 function resolveModelForDefinition(model, parentAgent) {
 	const facade = parentAgent.llmFacade;
@@ -11788,14 +12251,14 @@ function resolveModelForDefinition(model, parentAgent) {
 		}
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
-		log$9.warn(`解析 Agent 类型偏好模型 [${model}] 失败`, { error: message });
+		log$14.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$13 = logger.child("agent-result-aggregator");
 /** 零值 TokenUsage */
 const ZERO_TOKEN = {
 	inputTokens: 0,
@@ -11825,7 +12288,7 @@ function aggregateResults(teamId, workerResults) {
 		estimatedCostUsd: sum.estimatedCostUsd + (r.tokenUsage?.estimatedCostUsd ?? 0)
 	}), { ...ZERO_TOKEN });
 	const summary = buildTeamSummary(workerResults);
-	log$8.debug("Team 结果聚合完成", {
+	log$13.debug("Team 结果聚合完成", {
 		teamId,
 		total: workerResults.length,
 		succeeded,
@@ -11903,7 +12366,7 @@ function escapeMarkdownTable(text) {
 
 //#endregion
 //#region src/core/agent-team/agent-orchestrator.ts
-const log$7 = logger.child("agent-orchestrator");
+const log$12 = logger.child("agent-orchestrator");
 /**
 * Agent 编排器
 *
@@ -11936,7 +12399,7 @@ var AgentOrchestrator = class {
 		const startTime = Date.now();
 		const defaultType = getAgentTypeRegistry().getDefault();
 		if (!defaultType) throw new Error("无法获取默认 Agent 类型（general-purpose）");
-		log$7.info("开始扁平并行执行", {
+		log$12.info("开始扁平并行执行", {
 			count: specs.length,
 			maxConcurrent: this.flatConfig.maxConcurrent,
 			hasContext: context != null
@@ -11944,7 +12407,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$12.debug("执行扁平批次", {
 				batchStart: i,
 				batchSize: batch.length,
 				totalSpecs: specs.length
@@ -11954,7 +12417,7 @@ var AgentOrchestrator = class {
 		}
 		const succeeded = allResults.filter((r) => r.status === "success").length;
 		const totalDuration = Date.now() - startTime;
-		log$7.info("扁平并行执行完成", {
+		log$12.info("扁平并行执行完成", {
 			total: allResults.length,
 			succeeded,
 			failed: allResults.length - succeeded,
@@ -12029,7 +12492,7 @@ var AgentOrchestrator = class {
 		} catch (error) {
 			const duration = Date.now() - startTime;
 			const message = error instanceof Error ? error.message : String(error);
-			log$7.warn("扁平子任务执行失败", {
+			log$12.warn("扁平子任务执行失败", {
 				specId: spec.id,
 				error: message,
 				duration
@@ -12086,7 +12549,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$12.warn("Worker 创建被拒绝：超过全局最大深度", {
 				typeId,
 				depth,
 				maxGlobalDepth: this.teamConfig.maxGlobalDepth
@@ -12208,7 +12671,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$12.warn("Worker 执行失败", {
 				typeId,
 				instanceId,
 				error: message,
@@ -12251,12 +12714,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$12.info("Worktree 有变更，保留", {
 						id: worktreeInfo.id,
 						path: cleanResult.worktreePath
 					});
 				} catch (err) {
-					log$7.warn("Worktree 清理失败", {
+					log$12.warn("Worktree 清理失败", {
 						id: worktreeInfo.id,
 						error: err instanceof Error ? err.message : String(err)
 					});
@@ -12276,7 +12739,7 @@ var AgentOrchestrator = class {
 	*/
 	async spawnTeam(taskDescription, workerSpecs) {
 		const teamId = `team-${Date.now()}-${++this.teamCounter}`;
-		log$7.info("创建 Team", {
+		log$12.info("创建 Team", {
 			teamId,
 			workerCount: workerSpecs.length,
 			taskDescription
@@ -12309,7 +12772,29 @@ var AgentOrchestrator = class {
 			const instanceManager = getAgentInstanceManager();
 			const instance = instanceManager.get(instanceId);
 			if (!instance) return;
-			if (event.percent === 0) {
+			if (event.detail?.isStart) instanceManager.recordToolCall(instanceId, {
+				toolName: event.detail.toolName,
+				toolCallId: event.detail.toolCallId,
+				argsDisplay: event.detail.argsDisplay,
+				status: "running",
+				startedAt: Date.now()
+			});
+			else if (event.detail?.isEnd) {
+				const lastRunning = [...instance.toolCallHistory].reverse().find((t) => t.status === "running" && t.toolName === event.detail?.toolName);
+				if (lastRunning) {
+					lastRunning.status = event.detail.isError ? "failed" : "completed";
+					lastRunning.endedAt = Date.now();
+				}
+				instanceManager.emit("instance:toolcall", {
+					instanceId,
+					typeId: instance.typeId,
+					record: {
+						toolName: event.detail.toolName,
+						status: event.detail.isError ? "failed" : "completed",
+						startedAt: 0
+					}
+				});
+			} else if (event.percent === 0) {
 				const toolName = event.message;
 				const prevUses = instance.currentActivity?.toolUses ?? 0;
 				const parenIdx = toolName.indexOf("(");
@@ -12322,7 +12807,7 @@ var AgentOrchestrator = class {
 					startedAt: Date.now()
 				};
 				instanceManager.setActivity(instanceId, activity);
-			} else if (event.percent === 100 || event.percent === -1) {}
+			}
 		};
 		agent.on(agent.EVENT_PROGRESS, progressHandler);
 		return () => {
@@ -12628,6 +13113,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$11 = 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$11.info("技能文件监视已就绪", { dirs: options.watchDirs });
+		}).on("add", (path) => {
+			log$11.debug("技能文件新增", { path });
+			this.debounceNotify(options.onChanged);
+		}).on("change", (path) => {
+			log$11.debug("技能文件修改", { path });
+			this.debounceNotify(options.onChanged);
+		}).on("unlink", (path) => {
+			log$11.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 实例 */
@@ -13113,6 +13676,233 @@ function createLspTool(lspManager) {
 	};
 }
 
+//#endregion
+//#region src/cli/repl/tools/send-message.ts
+/**
+* 创建 SendMessage 工具注册
+*
+* @param currentAgentInstanceId - 当前 Agent 的实例 ID（用于 fromAgentId）
+* @returns ToolRegistration
+*/
+function createSendMessageTool(currentAgentInstanceId) {
+	return {
+		id: "SendMessage",
+		label: "发送消息",
+		defaultRisk: "medium",
+		description: [
+			"向其他 Agent 发送消息，用于 Agent 间通信。",
+			"",
+			"### 何时使用此工具",
+			"1. 执行过程中需要向父 Agent/Coordinator 确认某些信息",
+			"2. 发现任务描述不够明确，需要澄清",
+			"3. 需要向 Coordinator 报告中间进度或部分结果",
+			"4. 需要告知 Coordinator 任务可以提前结束",
+			"",
+			"### 何时不使用此工具",
+			"- 任务已完全完成（直接返回结果即可）",
+			"- 不需要和其他 Agent 交互",
+			"",
+			"### 参数说明",
+			"- **toAgentId**: 目标 Agent 的实例 ID。使用 `parent` 表示父 Agent",
+			"- **message**: 要发送的消息内容",
+			"- **messageType**: 消息类型",
+			"  - `question`: 需要确认或回答的问题",
+			"  - `progress`: 进度报告",
+			"  - `task_result`: 部分结果或中间产出",
+			"",
+			`### 你的实例 ID: \`${currentAgentInstanceId}\``
+		].join("\n"),
+		parameters: {
+			type: "object",
+			properties: {
+				toAgentId: {
+					type: "string",
+					description: "目标 Agent 实例 ID（或 \"parent\" 表示父 Agent）"
+				},
+				message: {
+					type: "string",
+					description: "消息内容"
+				},
+				messageType: {
+					type: "string",
+					enum: [
+						"question",
+						"progress",
+						"task_result"
+					],
+					description: "消息类型",
+					default: "progress"
+				}
+			},
+			required: ["toAgentId", "message"]
+		},
+		execute: async (_toolCallId, params) => {
+			const p = params;
+			const messageBus = getAgentMessageBus();
+			const msgType = p.messageType === "question" ? "question" : p.messageType === "result" ? "task_result" : "progress";
+			const fullMessage = messageBus.publish(currentAgentInstanceId, p.toAgentId, {
+				type: msgType,
+				payload: p.message,
+				requiresResponse: p.messageType === "question"
+			});
+			return {
+				content: [{
+					type: "text",
+					text: `消息已发送 (ID: ${fullMessage.messageId})\n目标: ${p.toAgentId}\n类型: ${p.messageType ?? "progress"}`
+				}],
+				details: fullMessage
+			};
+		}
+	};
+}
+
+//#endregion
+//#region src/cli/repl/tools/task-stop.ts
+/**
+* 创建 TaskStop 工具注册
+*
+* @returns ToolRegistration
+*/
+function createTaskStopTool() {
+	return {
+		id: "TaskStop",
+		label: "停止任务",
+		defaultRisk: "medium",
+		description: [
+			"停止正在运行中的子 Agent 任务。",
+			"",
+			"### 何时使用此工具",
+			"1. 子 Agent 执行方向错误，需要中止",
+			"2. 用户需求变更，当前子任务不再需要",
+			"3. 子 Agent 陷入死循环或异常状态",
+			"4. 需要立即停止所有子任务以重新规划",
+			"",
+			"### 参数说明",
+			"- **task_id**: 要停止的子 Agent 实例 ID（AgentTool 返回的 instanceId）",
+			"",
+			"### 使用示例",
+			"停止指定任务: `{ \"task_id\": \"agent-xyz-123\" }`"
+		].join("\n"),
+		parameters: {
+			type: "object",
+			properties: { task_id: {
+				type: "string",
+				description: "要停止的子 Agent 实例 ID（AgentTool 返回结果中的 instanceId）"
+			} },
+			required: ["task_id"]
+		},
+		execute: async (_toolCallId, params) => {
+			const { task_id } = params;
+			const instanceManager = getAgentInstanceManager();
+			const instance = instanceManager.get(task_id);
+			if (!instance) return {
+				content: [{
+					type: "text",
+					text: `⚠️ 未找到任务 \`${task_id}\``
+				}],
+				details: {
+					taskId: task_id,
+					found: false
+				}
+			};
+			if (instance.status !== "running" && instance.status !== "idle") return {
+				content: [{
+					type: "text",
+					text: `⚠️ 任务 \`${task_id}\` 当前状态为 \`${instance.status}\`，无法停止`
+				}],
+				details: {
+					taskId: task_id,
+					status: instance.status,
+					stopped: false
+				}
+			};
+			const cancelled = await instanceManager.cancel(task_id);
+			return {
+				content: [{
+					type: "text",
+					text: `✅ 任务 \`${task_id}\` 已停止`
+				}],
+				details: {
+					taskId: task_id,
+					stopped: true,
+					cancelled: cancelled.length
+				}
+			};
+		}
+	};
+}
+
+//#endregion
+//#region src/cli/repl/utils/animation-manager.ts
+/**
+* AnimationManager — 将 spinner/计时器动画从 setInterval 迁移到渲染周期驱动
+*
+* 原理：
+* 通过 monkey-patch pi-tui 的 doRender() 方法，在每次实际渲染前统一推进
+* 所有已注册的 spinner 帧，从而：
+* 1. 消除对 setInterval (macrotask) 的依赖，避免 Timer 阶段被事件循环饿死
+* 2. 帧推进与渲染同步，视觉上更流畅
+* 3. 减少事件循环中的定时器数量，降低调度开销
+*
+* 使用方式：
+* ```typescript
+* const anim = new AnimationManager();
+* anim.bind(tui);
+*
+* const unsub = anim.register((now) => {
+*   // 根据 now 判断是否推进帧
+*   frame = (frame + 1) % frames.length;
+* });
+* ```
+*/
+var AnimationManager = class {
+	/** 已注册的帧推进回调 */
+	#callbacks = /* @__PURE__ */ new Set();
+	/** 绑定的 TUI 实例 */
+	#tui = null;
+	/** 备份的原始 doRender */
+	#originalDoRender = null;
+	/**
+	* 注册一个帧推进回调。
+	* 回调会在每次 doRender() 执行前被调用，传入当前 performance.now() 时间戳。
+	* 回调应该根据时间戳自行控制帧推进频率（如每 100ms 推进一帧）。
+	*
+	* @returns 注销函数
+	*/
+	register(cb) {
+		this.#callbacks.add(cb);
+		return () => {
+			this.#callbacks.delete(cb);
+		};
+	}
+	/**
+	* 绑定到 TUI 实例，monkey-patch 其 doRender 方法。
+	* 如果已经绑定到另一个 TUI 实例，会先解除绑定。
+	*/
+	bind(tui) {
+		if (this.#tui) this.unbind();
+		this.#tui = tui;
+		const tuiObj = tui;
+		if (typeof tuiObj.doRender !== "function") return;
+		this.#originalDoRender = tuiObj.doRender.bind(tui);
+		const callbacks = this.#callbacks;
+		const self = this;
+		tuiObj.doRender = function() {
+			const now = performance.now();
+			for (const cb of callbacks) cb(now);
+			self.#originalDoRender?.call(this);
+		};
+	}
+	/**
+	* 解除绑定，恢复 TUI 实例的原始 doRender。
+	*/
+	unbind() {
+		if (this.#originalDoRender && this.#tui) this.#tui.doRender = this.#originalDoRender;
+		this.#originalDoRender = null;
+		this.#tui = null;
+	}
+};
+
 //#endregion
 //#region src/cli/repl/utils/markdown-formatter.ts
 /**
@@ -13239,9 +14029,9 @@ function formatTable(token, colorEnabled) {
 	output += "┌";
 	for (let i = 0; i < columnCount; i++) {
 		const cw = colWidths[i] ?? 3;
-		output += "─".repeat(cw + 2) + "┬";
+		output += `${"─".repeat(cw + 2)}┬`;
 	}
-	output = output.slice(0, -1) + "┐\n";
+	output = `${output.slice(0, -1)}┐${EOL}`;
 	output += "│ ";
 	for (let i = 0; i < columnCount; i++) {
 		const cell = token.header[i];
@@ -13278,9 +14068,9 @@ function formatTable(token, colorEnabled) {
 	output += "└";
 	for (let i = 0; i < columnCount; i++) {
 		const cw = colWidths[i] ?? 3;
-		output += "─".repeat(cw + 2) + "┴";
+		output += `${"─".repeat(cw + 2)}┴`;
 	}
-	output = output.slice(0, -1) + "┘\n";
+	output = `${output.slice(0, -1)}┘${EOL}`;
 	return output + EOL;
 }
 /**
@@ -13347,6 +14137,93 @@ function normalizeMcpConfig(raw) {
 	return servers;
 }
 
+//#endregion
+//#region src/core/agent-team/markdown-agent-parser.ts
+const log$10 = logger.child("markdown-agent-parser");
+
+//#endregion
+//#region src/core/agent-team/agent-generator.ts
+const log$9 = logger.child("agent-generator");
+
+//#endregion
+//#region src/core/agent-team/agent-memory.ts
+const log$8 = logger.child("agent-memory");
+/** 记忆根目录 */
+const AGENT_MEMORY_DIR = join(homedir(), ".zapmyco", "memory", "agents");
+
+//#endregion
+//#region src/core/agent-team/coordinator-prompt.ts
+/**
+* 主 Agent Coordinator 模式系统提示词
+*
+* 当 agentTeam.defaultMode === 'coordinator' 时，
+* 主 REPL Agent 的 system prompt 被替换为此提示词，
+* 强制其专注于编排而非亲自执行。
+*
+* @module core/agent-team
+*/
+/**
+* 获取主 Agent Coordinator 模式系统提示词
+*
+* @param workdir - 当前工作目录
+* @returns 系统提示词文本
+*/
+function getMainCoordinatorSystemPrompt(workdir) {
+	return [
+		"你是一个团队协调者（Coordinator），负责编排多个专业子 Agent 协同完成复杂任务。",
+		"",
+		"## 核心原则",
+		"**你绝对不能直接执行任何具体工作。** 你必须将所有任务委派给合适的子 Agent。",
+		"不要使用 ReadFile、WriteFile、EditFile、Exec、Glob、Grep 等具体执行工具。",
+		"你的工具仅限于 AgentTool、SendMessage、TaskStop 三个编排工具。",
+		"",
+		"## 核心职责",
+		"- 分析用户任务并制定执行计划",
+		"- 将复杂任务拆解为可独立执行的子任务",
+		"- 为每个子任务匹配最合适的 Agent 类型",
+		"- 协调子 Agent 执行顺序，处理依赖关系",
+		"- 汇总所有子 Agent 的输出为统一结论",
+		"",
+		"## 可用 Agent 类型",
+		"- **researcher**: 信息搜集、技术调研、文档检索（只有只读工具，不能修改文件）",
+		"- **coder**: 代码生成与修改（有读写工具和 Shell 权限）",
+		"- **reviewer**: 代码审查、质量检查（只有只读工具）",
+		"- **planner**: 方案设计与架构规划（有标准工具集，可派生子 Agent 调研）",
+		"- **general-purpose**: 通用任务执行（有标准工具集）",
+		"",
+		"## 可用工具",
+		"- **AgentTool**: 创建并派遣子 Agent（使用 subagent_type 指定类型）",
+		"  - 同步模式（默认）: 等待子 Agent 完成后获取完整结果",
+		"  - 异步模式（run_in_background=true）: 后台执行，立即返回 taskId，完成后自动通知",
+		"- **SendMessage**: 向子 Agent 发送后续指令、回答问题或调整方向（使用其 agent ID 作为 to 参数）",
+		"- **TaskStop**: 停止运行中的子 Agent",
+		"",
+		"## 工作流程",
+		"1. **分析任务**: 理解用户需求，明确目标和约束条件",
+		"2. **拆解子任务**: 将复杂任务分解为可并行或串行执行的独立子任务",
+		"3. **匹配类型**: 为每个子任务选择最合适的 Agent 类型",
+		"4. **派发执行**: 调用 AgentTool 创建子 Agent（无依赖的子任务应并行派发）",
+		"5. **汇总结果**: 整合所有子 Agent 的输出，向用户汇报结论",
+		"",
+		"## 工作规则",
+		"- **绝不亲自执行**: 绝不使用 ReadFile、WriteFile、Exec、Glob、Grep、WebFetch、WebSearch 等直接执行工具",
+		"- **并行优先**: 无依赖的子任务应同时派发以提升效率",
+		"- **先规划后执行**: 在派发子 Agent 之前先制定清晰的执行计划",
+		"- **监控进度**: 通过 SendMessage 接收子 Agent 的进度汇报和提问",
+		"- **务实汇总**: 整合结果时保持客观，不添加未经验证的信息",
+		"- **后台任务**: 长时间运行的任务使用 run_in_background=true，任务完成后会自动收到通知",
+		"- **通知处理**: 当收到后台任务完成的通知消息时，汇总所有结果后一并回复用户",
+		"",
+		`## 工作目录\n${workdir}`,
+		"",
+		"> 记住：你是协调者，不是执行者。你的价值在于编排和整合，而不是亲自干活。"
+	].join("\n");
+}
+
+//#endregion
+//#region src/core/agent-team/user-agent-loader.ts
+const log$7 = logger.child("user-agent-loader");
+
 //#endregion
 //#region src/core/lsp/diagnostics.ts
 function createDiagnosticCollector() {
@@ -13609,10 +14486,10 @@ function createLspClient(config) {
 		const reader = createMessageReader(handleMessage, (err) => trace("←", `Reader error: ${err.message}`), () => {
 			if (!isStopping) rejectAllPending(new LspError("LSP stdout closed", "STDOUT_CLOSED"));
 		}, (msg) => trace("←", msg));
-		childProcess.stdout.on("data", (chunk) => {
+		childProcess.stdout?.on("data", (chunk) => {
 			reader.feed(chunk);
 		});
-		childProcess.stdout.on("end", () => {
+		childProcess.stdout?.on("end", () => {
 			if (!isStopping) rejectAllPending(new LspError("LSP stdout closed unexpectedly", "STDOUT_CLOSED"));
 		});
 		messageWriter = createMessageWriter(childProcess.stdin, (msg) => trace("→", msg));
@@ -13666,7 +14543,7 @@ function createLspClient(config) {
 				timer,
 				method
 			});
-			messageWriter.write(request).catch((err) => {
+			messageWriter?.write(request).catch((err) => {
 				clearTimeout(timer);
 				pendingRequests.delete(id);
 				reject(err);
@@ -13706,19 +14583,19 @@ function createLspClient(config) {
 	}
 	async function shutdown() {
 		if (!childProcess || isStopping) return;
-		isStopping = true;
 		try {
 			await sendRequest("shutdown");
 		} catch {}
 		try {
 			await sendNotification("exit");
 		} catch {}
+		isStopping = true;
 		await new Promise((resolve) => {
 			const timer = setTimeout(() => {
 				if (childProcess && !childProcess.killed) childProcess.kill("SIGKILL");
 				resolve();
 			}, 2e3);
-			childProcess.once("exit", () => {
+			childProcess?.once("exit", () => {
 				clearTimeout(timer);
 				resolve();
 			});
@@ -13776,7 +14653,7 @@ function createLspServerInstance(config) {
 		if (openedDocuments.get(uri)) return;
 		await ensureRunning();
 		try {
-			await client.sendNotification("textDocument/didOpen", { textDocument: {
+			await client?.sendNotification("textDocument/didOpen", { textDocument: {
 				uri,
 				languageId,
 				version: 1,
@@ -13848,6 +14725,7 @@ function createLspServerInstance(config) {
 	async function request(method, params) {
 		await ensureRunning();
 		requestCount++;
+		if (!client) throw new LspError("CLIENT_NOT_INITIALIZED", "LSP 客户端未初始化");
 		try {
 			return await client.sendRequest(method, params);
 		} catch (err) {
@@ -14200,7 +15078,7 @@ function withTimeout(promise, ms) {
 /**
 * 将单个 MCP Tool 转换为 zapmyco ToolRegistration
 *
-* MCP SDK 的 TextContent / ImageContent 与 pi-ai 对应类型结构兼容
+* MCP SDK 的 TextContent / ImageContent 与本地类型结构兼容
 * （都是 { type, text/data, mimeType }），因此直接透传 content。
 */
 function mcpToolToRegistration(mcpTool, serverName, client) {
@@ -14752,7 +15630,7 @@ var AuditLogger = class {
 		const entries = this.buffer.splice(0);
 		try {
 			this.rotateIfNeeded();
-			const lines = entries.map((e) => JSON.stringify(e)).join("\n") + "\n";
+			const lines = `${entries.map((e) => JSON.stringify(e)).join("\n")}\n`;
 			appendFileSync(this.filePath, lines, "utf-8");
 		} catch (err) {
 			log$3.error("审计日志写入失败", { error: err instanceof Error ? err.message : String(err) });
@@ -14856,7 +15734,7 @@ function resolveConfig(config = {}) {
 function matchToolPattern(pattern, toolId) {
 	if (pattern === toolId) return true;
 	if (pattern === "*") return true;
-	return new RegExp("^" + pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*") + "$").test(toolId);
+	return new RegExp(`^${pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*")}$`).test(toolId);
 }
 /**
 * 参数模式匹配
@@ -15519,7 +16397,7 @@ function threatSeverity(level) {
 /**
 * REPL 会话核心（pi-tui 版）
 *
-* 使用 @mariozechner/pi-tui 框架替代 readline，
+* 使用 @earendil-works/pi-tui 框架替代 readline，
 * 实现完整的 TUI 交互式 REPL：
 * - Editor 组件自带上下边框
 * - 差量渲染，无闪烁
@@ -15547,9 +16425,24 @@ function getApiKeyErrorHelp(errorMessage) {
 */
 var OutputArea = class extends Container {
 	lines = [];
+	/** 逐行缓存的渲染结果（避免每帧对所有历史行重新调用 wrapTextWithAnsi） */
+	lineCache = /* @__PURE__ */ new Map();
+	/** 缓存生成时使用的终端宽度，变化时重建 */
+	cacheWidth = 0;
 	render(width) {
+		if (width !== this.cacheWidth) {
+			this.cacheWidth = width;
+			this.lineCache.clear();
+		}
 		const result = [];
-		for (const line of this.lines) result.push(...wrapTextWithAnsi(line, width));
+		for (let i = 0; i < this.lines.length; i++) {
+			let cached = this.lineCache.get(i);
+			if (!cached) {
+				cached = wrapTextWithAnsi(this.lines[i] ?? "", width);
+				this.lineCache.set(i, cached);
+			}
+			result.push(...cached);
+		}
 		return result;
 	}
 	/** 追加多行内容，返回新追加行中第一行的索引 */
@@ -15562,33 +16455,45 @@ var OutputArea = class extends Container {
 	/** 追加文本到当前行末尾（用于流式输出） */
 	appendText(text) {
 		if (this.lines.length === 0) this.lines.push(text);
-		else this.lines[this.lines.length - 1] += text;
+		else {
+			this.lines[this.lines.length - 1] += text;
+			this.lineCache.delete(this.lines.length - 1);
+		}
 		this.invalidate();
 	}
 	/** 替换最后一行的完整内容（用于 spinner 动画和首 chunk 替换），返回行索引 */
 	replaceLastLine(text) {
-		if (this.lines.length > 0) this.lines[this.lines.length - 1] = text;
-		else this.lines.push(text);
+		if (this.lines.length > 0) {
+			this.lines[this.lines.length - 1] = text;
+			this.lineCache.delete(this.lines.length - 1);
+		} else this.lines.push(text);
 		this.invalidate();
 		return this.lines.length - 1;
 	}
 	/** 在指定位置插入/删除/替换行（原子操作） */
 	spliceLines(startIndex, deleteCount, insertLines) {
 		this.lines.splice(startIndex, deleteCount, ...insertLines);
+		this.invalidateCacheFrom(startIndex);
 		this.invalidate();
 	}
 	/** 更新指定索引行的内容 */
 	updateLine(index, text) {
 		if (index >= 0 && index < this.lines.length) {
 			this.lines[index] = text;
+			this.lineCache.delete(index);
 			this.invalidate();
 		}
 	}
 	/** 清空所有内容 */
 	clear() {
 		this.lines = [];
+		this.lineCache.clear();
 		this.invalidate();
 	}
+	/** 使从指定索引开始的所有缓存行失效 */
+	invalidateCacheFrom(startIndex) {
+		for (const key of this.lineCache.keys()) if (key >= startIndex) this.lineCache.delete(key);
+	}
 };
 /** 默认提示符（用于显示/格式化） */
 const DEFAULT_PROMPT = "❯ ";
@@ -15612,6 +16517,8 @@ var ReplSession = class {
 	renderer;
 	history;
 	currentTaskAbort = null;
+	/** 动画管理器（渲染周期驱动的 spinner/计时器，替代 setInterval） */
+	animationManager = new AnimationManager();
 	/** 欢迎语逐字输出定时器引用（用于 shutdown 时清理） */
 	welcomeTypewriterInterval;
 	/** Agent 实例（会话级复用，替代直接 LLM 调用） */
@@ -15640,6 +16547,7 @@ var ReplSession = class {
 	auditLogger;
 	secretRedactor;
 	skillGuard;
+	skillWatcher;
 	/** 交互式提问管理器 */
 	questionManager;
 	stats = {
@@ -15663,6 +16571,7 @@ var ReplSession = class {
 		const theme = createTheme(this.options.color);
 		const terminal = new ProcessTerminal();
 		this.tui = new TUI(terminal);
+		this.animationManager.bind(this.tui);
 		getKeybindings().setUserBindings({
 			"tui.select.up": ["up"],
 			"tui.select.down": ["down"],
@@ -15671,13 +16580,13 @@ var ReplSession = class {
 		});
 		this.taskStore = new TaskStore();
 		this.outputArea = new OutputArea();
-		this.agentStatusBar = new AgentStatusBar();
-		this.taskStatusBar = new TaskStatusBar(this.taskStore);
+		this.agentStatusBar = new AgentStatusBar(this.animationManager);
+		this.taskStatusBar = new TaskStatusBar(this.taskStore, this.animationManager);
 		this.taskStore.onChange(() => {
 			this.taskStatusBar.onTasksChanged();
 			this.tui.requestRender();
 		});
-		this.editor = new ZapmycoEditor(this.tui, theme.editorTheme);
+		this.editor = new ZapmycoEditor(this.tui, theme.editorTheme, this.animationManager);
 		const root = new Container();
 		root.addChild(this.outputArea);
 		root.addChild(this.taskStatusBar);
@@ -15701,6 +16610,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 +16672,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 +16701,37 @@ 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.taskStore.clear();
+		this.agentStatusBar.clearTokenStats();
+		this.tui.requestRender();
+	}
 	/** 获取会话统计 */
 	getStats() {
 		return { ...this.stats };
@@ -15891,8 +16833,72 @@ var ReplSession = class {
 		const execFailStyle = (s) => colorEnabled ? chalk.red(s) : s;
 		const dimStyle = (s) => colorEnabled ? chalk.gray(s) : s;
 		let spinnerActive = true;
-		let spinnerInterval;
-		let thinkingElapsedInterval;
+		/** 动画管理器帧推进计时（spinner，100ms间隔） */
+		let lastSpinnerTick = 0;
+		/** thinking 计时动画活跃标志（替代 thinkingElapsedInterval setInterval） */
+		let thinkingTimerActive = false;
+		let thinkingFrame = 0;
+		let lastThinkingTick = 0;
+		/** AnimationManager 回调注销函数集合（finally 中统一清理） */
+		const animCleanup = [];
+		/**
+		* 合并渲染请求——在同一个微任务内的多次调用合并为一次 requestRender。
+		* 流式事件（OUTPUT/THINKING/PROGRESS）短时间密集到达时，避免为每个事件
+		* 都调用 requestRender（即使 pi-tui 内部有 16ms 去抖，仍可减少调度开销）。
+		*/
+		let coalesceRenderPending = false;
+		const requestCoalescedRender = () => {
+			if (coalesceRenderPending) return;
+			coalesceRenderPending = true;
+			queueMicrotask(() => {
+				coalesceRenderPending = false;
+				this.tui.requestRender();
+			});
+		};
+		const mainAgentDef = this.isCoordinatorMode() ? {
+			typeId: "repl-coordinator",
+			displayName: "协调者",
+			whenToUse: "Main REPL coordinator",
+			role: "coordinator",
+			capabilities: [{
+				id: "agent-orchestration",
+				name: "Agent 编排",
+				description: "编排多个子 Agent 协同完成复杂任务",
+				category: "planning"
+			}],
+			toolPolicy: { mode: "inherit" },
+			permissionMode: "inherit",
+			source: "builtin",
+			maxTurns: 100,
+			maxSpawnDepth: 2,
+			getSystemPrompt: () => "",
+			color: "#e67e22"
+		} : {
+			typeId: "Explore",
+			displayName: "Explore Agent",
+			whenToUse: "Main REPL agent",
+			role: "universal",
+			capabilities: [],
+			toolPolicy: { mode: "inherit" },
+			permissionMode: "inherit",
+			source: "builtin",
+			maxTurns: 100,
+			maxSpawnDepth: 0,
+			getSystemPrompt: () => "",
+			color: "#3498db"
+		};
+		const mainAgent = this.agent;
+		const instanceManager = getAgentInstanceManager();
+		const mainInstance = instanceManager.register(mainAgentDef, mainAgent, {
+			taskId,
+			description: rawInput.slice(0, 200),
+			mode: "sync",
+			timeoutMs: this.config.scheduler.taskTimeoutMs,
+			inheritContext: false
+		}, null, 0);
+		instanceManager.transition(mainInstance.instanceId, "running");
+		/** Token 信息推送定时器 */
+		let tokenPushInterval;
 		try {
 			this._state = "executing";
 			this.updateStatsState();
@@ -15909,12 +16915,13 @@ var ReplSession = class {
 			this.outputArea.append([userStyle(displayLabel ?? rawInput), LOADING_FRAMES$1[0] ?? ""]);
 			let spinnerFrame = 0;
 			spinnerActive = true;
-			spinnerInterval = setInterval(() => {
+			animCleanup.push(this.animationManager.register((now) => {
 				if (!spinnerActive) return;
+				if (now - lastSpinnerTick < 100) return;
+				lastSpinnerTick = now;
 				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 = "";
@@ -15959,20 +16966,20 @@ var ReplSession = class {
 			};
 			const outputHandler = (event) => {
 				if (event.taskId !== taskId || !event.text) return;
+				if (hasExecutedTool) {
+					hasExecutedTool = false;
+					instanceManager.transition(mainInstance.instanceId, "completed");
+				}
 				if (!spinnerStopped) {
 					spinnerStopped = true;
 					spinnerActive = false;
-					clearInterval(spinnerInterval);
 					streamMode = "response";
 					thinkingAccumulator = "";
 					outputAccumulator = event.text;
 					responseLineIndex = this.outputArea.replaceLastLine(responseStyle(outputAccumulator));
 				} else if (streamMode !== "response") {
 					streamMode = "response";
-					if (thinkingElapsedInterval) {
-						clearInterval(thinkingElapsedInterval);
-						thinkingElapsedInterval = void 0;
-					}
+					thinkingTimerActive = false;
 					thinkingAccumulator = "";
 					outputAccumulator = event.text;
 					if (thinkingHeaderLineIndex !== null) {
@@ -15984,7 +16991,7 @@ var ReplSession = class {
 					outputAccumulator += event.text;
 					this.outputArea.replaceLastLine(responseStyle(outputAccumulator));
 				}
-				this.tui.requestRender();
+				requestCoalescedRender();
 			};
 			const thinkingHandler = (event) => {
 				if (event.taskId !== taskId || !event.text) return;
@@ -15995,7 +17002,6 @@ var ReplSession = class {
 					if (!spinnerStopped) {
 						spinnerStopped = true;
 						spinnerActive = false;
-						clearInterval(spinnerInterval);
 						thinkingHeaderLineIndex = this.outputArea.replaceLastLine(dimStyle(`  ${LOADING_FRAMES$1[0] ?? ""} Thinking...`));
 					} else thinkingHeaderLineIndex = this.outputArea.append([dimStyle(`  ${LOADING_FRAMES$1[0] ?? ""} Thinking...`)]);
 					thinkingAccumulator = event.text;
@@ -16004,16 +17010,19 @@ var ReplSession = class {
 						this.outputArea.append([dimStyle(THINKING_CONTINUE_PREFIX + thinkingAccumulator)]);
 						thinkingContentLineCount = 1;
 					} else if (thinkingDisplayMode === "collapse") {
-						let thinkingFrame = 0;
-						thinkingElapsedInterval = setInterval(() => {
+						thinkingTimerActive = true;
+						thinkingFrame = 0;
+						animCleanup.push(this.animationManager.register((now) => {
+							if (!thinkingTimerActive) return;
 							if (thinkingHeaderLineIndex === null) return;
 							if (thinkingContentLineCount > 0) return;
+							if (now - lastThinkingTick < 200) return;
+							lastThinkingTick = now;
 							const elapsed = ((Date.now() - thinkingStartTimeMs) / 1e3).toFixed(1);
 							const frame = LOADING_FRAMES$1[thinkingFrame % LOADING_FRAMES$1.length];
 							thinkingFrame++;
 							this.outputArea.updateLine(thinkingHeaderLineIndex, dimStyle(`  ${frame} Thinking... (${elapsed}s)`));
-							this.tui.requestRender();
-						}, 200);
+						}));
 					}
 				} else {
 					thinkingAccumulator += event.text;
@@ -16024,38 +17033,87 @@ var ReplSession = class {
 						this.outputArea.replaceLastLine(dimStyle(THINKING_CONTINUE_PREFIX + lastLine));
 					}
 				}
-				this.tui.requestRender();
+				requestCoalescedRender();
 			};
 			const errorHandler = (event) => {
 				if (event.taskId === taskId) log.error("Agent 执行中收到 error 事件", { error: event.error.message });
 			};
 			let execLineIndex;
 			let execMessage;
+			/** 是否执行过工具调用（用于判断输出阶段时是否结束 agent 状态） */
+			let hasExecutedTool = false;
+			/** 连续同类型工具调用的分组跟踪（用于 OutputArea 展示 ⎿ 分组） */
+			let lastToolCategory = "";
+			let lastToolLabel = "";
+			let toolGroupCount = 0;
+			let toolGroupLineIndex = null;
+			let toolGroupSampleArg = "";
 			const progressHandler = (event) => {
 				if (event.taskId !== taskId) return;
+				if (event.detail?.isStart) instanceManager.recordToolCall(mainInstance.instanceId, {
+					toolName: event.detail.toolName,
+					toolCallId: event.detail.toolCallId,
+					argsDisplay: event.detail.argsDisplay,
+					status: "running",
+					startedAt: Date.now()
+				});
+				else if (event.detail?.isEnd) {
+					const mainInst = instanceManager.get(mainInstance.instanceId);
+					if (mainInst) {
+						const lastRunning = [...mainInst.toolCallHistory].reverse().find((t) => t.status === "running" && t.toolName === event.detail?.toolName);
+						if (lastRunning) {
+							lastRunning.status = event.detail.isError ? "failed" : "completed";
+							lastRunning.endedAt = Date.now();
+						}
+					}
+				}
 				if (event.percent === 0) {
-					if (thinkingElapsedInterval && streamMode === "thinking") {
-						clearInterval(thinkingElapsedInterval);
-						thinkingElapsedInterval = void 0;
+					if (thinkingTimerActive && streamMode === "thinking") {
+						thinkingTimerActive = false;
 						if (thinkingHeaderLineIndex !== null) {
 							this.outputArea.spliceLines(thinkingHeaderLineIndex, 1, []);
 							thinkingHeaderLineIndex = null;
-							this.tui.requestRender();
+							requestCoalescedRender();
 						}
 					}
+					hasExecutedTool = true;
 					if (event.message.startsWith("Exec(")) {
 						execMessage = event.message;
 						execLineIndex = this.outputArea.append([execStyle(`  ⏺ ${event.message}`)]);
-					} else if (event.message.startsWith("TaskManage(")) log.debug("TaskManage 工具调用已记录，跳过 TUI 展示");
-					else this.outputArea.append([toolStyle(`  → ${event.message}`)]);
-					this.tui.requestRender();
+						lastToolCategory = "";
+						toolGroupCount = 0;
+						toolGroupLineIndex = null;
+					} else if (event.message.startsWith("TaskManage(")) {
+						log.debug("TaskManage 工具调用已记录，跳过 TUI 展示");
+						lastToolCategory = "";
+						toolGroupCount = 0;
+						toolGroupLineIndex = null;
+					} else if (event.detail?.toolName) {
+						const { category, label } = categorizeTool(event.detail.toolName);
+						const argsPart = event.detail.argsDisplay ?? "";
+						if (category === lastToolCategory && toolGroupLineIndex !== null) {
+							toolGroupCount++;
+							const sampleDisplay = toolGroupSampleArg ? ` (e.g. ${toolGroupSampleArg.slice(0, 50)})` : "";
+							const groupedText = toolStyle(`  ⎿  ${lastToolLabel} ${toolGroupCount} items${sampleDisplay}`);
+							this.outputArea.updateLine(toolGroupLineIndex, groupedText);
+						} else {
+							lastToolCategory = category;
+							lastToolLabel = label;
+							toolGroupCount = 1;
+							toolGroupSampleArg = argsPart;
+							const sampleDisplay = argsPart ? ` (e.g. ${argsPart.slice(0, 50)})` : "";
+							const lineText = toolStyle(`  ⎿  ${label} ${toolGroupCount} item${sampleDisplay}`);
+							toolGroupLineIndex = this.outputArea.append([lineText]);
+						}
+					} else this.outputArea.append([toolStyle(`  → ${event.message}`)]);
+					requestCoalescedRender();
 				} else if (event.percent === 100 && execLineIndex !== void 0 && execMessage) {
 					if (event.message.startsWith("工具 Exec")) {
 						const style = event.message.includes("完成") ? execSuccessStyle : execFailStyle;
 						this.outputArea.updateLine(execLineIndex, style(`  ⏺ ${execMessage}`));
 						execLineIndex = void 0;
 						execMessage = void 0;
-						this.tui.requestRender();
+						requestCoalescedRender();
 					}
 				}
 			};
@@ -16066,13 +17124,45 @@ 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)
 			});
+			let effectiveTaskDescription = rawInput;
+			if (this.isCoordinatorMode()) {
+				const pendingMessages = getAgentMessageBus().drainInbox("repl-chat-agent");
+				if (pendingMessages.length > 0) effectiveTaskDescription = [
+					"## 以下后台任务已完成",
+					...pendingMessages.map((msg) => {
+						try {
+							const parsed = JSON.parse(msg.payload);
+							if (parsed.type === "task_result") return [
+								`[任务完成通知]`,
+								`任务 ID: ${parsed.taskId}`,
+								`类型: ${parsed.typeId}`,
+								`状态: ${parsed.status}`,
+								parsed.summary ? `\n结果:\n${parsed.summary}` : "",
+								parsed.error ? `错误: ${parsed.error}` : ""
+							].join("\n");
+						} catch {}
+						return `[消息 - ${msg.fromAgentId}]\n${msg.payload}`;
+					}),
+					"---",
+					rawInput
+				].join("\n\n");
+			}
 			const taskResult = await this.agent.execute({
 				taskId,
-				taskDescription: rawInput,
+				taskDescription: effectiveTaskDescription,
 				workdir: process.cwd(),
 				options: {
 					timeout: this.config.scheduler.taskTimeoutMs,
@@ -16084,6 +17174,12 @@ var ReplSession = class {
 			this.agent.off(this.agent.EVENT_ERROR, errorHandler);
 			this.agent.off(this.agent.EVENT_PROGRESS, progressHandler);
 			this.editor.onToggleThinking = originalOnToggleThinking;
+			const mainInst = instanceManager.get(mainInstance.instanceId);
+			if (mainInst && mainInst.status === "running") {
+				const mainAgentStatus = taskResult.status === "success" ? "completed" : "failed";
+				instanceManager.transition(mainInstance.instanceId, mainAgentStatus);
+			}
+			this.tui.requestRender();
 			log.debug("Agent 执行完成", {
 				taskId,
 				status: taskResult.status,
@@ -16098,7 +17194,6 @@ var ReplSession = class {
 					""
 				]);
 				spinnerActive = false;
-				clearInterval(spinnerInterval);
 				try {
 					const compactionResult = await this.agent.compact();
 					if (compactionResult.success) {
@@ -16110,17 +17205,10 @@ var ReplSession = class {
 					this.outputArea.append([chalk.red("  上下文整理异常，请手动执行 /compact 后重试"), ""]);
 				}
 				spinnerActive = true;
-				spinnerInterval = setInterval(() => {
-					if (!spinnerActive) return;
-					spinnerFrame = (spinnerFrame + 1) % LOADING_FRAMES$1.length;
-					this.outputArea.replaceLastLine(LOADING_FRAMES$1[spinnerFrame] ?? "");
-					this.tui.requestRender();
-				}, 100);
 			}
 			const outputText = typeof taskResult.output === "string" ? taskResult.output : taskResult.output != null ? JSON.stringify(taskResult.output) : null;
 			if (spinnerActive) {
 				spinnerActive = false;
-				clearInterval(spinnerInterval);
 				if (outputText) this.outputArea.replaceLastLine(responseStyle(outputText));
 				else if (taskResult.status !== "success") {
 					const errorMsg = taskResult.error?.message ?? t("session.agentErrorMessage");
@@ -16232,11 +17320,7 @@ var ReplSession = class {
 			const err = error instanceof Error ? error : new Error(String(error));
 			log.error("目标执行失败", { input: rawInput }, err);
 			spinnerActive = false;
-			clearInterval(spinnerInterval);
-			if (thinkingElapsedInterval) {
-				clearInterval(thinkingElapsedInterval);
-				thinkingElapsedInterval = void 0;
-			}
+			thinkingTimerActive = false;
 			this.stats.totalRequests++;
 			this.stats.failureCount++;
 			eventBus.emit("goal:failed", {
@@ -16300,11 +17384,15 @@ var ReplSession = class {
 			};
 		} finally {
 			spinnerActive = false;
-			if (spinnerInterval) clearInterval(spinnerInterval);
-			if (thinkingElapsedInterval) {
-				clearInterval(thinkingElapsedInterval);
-				thinkingElapsedInterval = void 0;
+			thinkingTimerActive = false;
+			for (const unregister of animCleanup) unregister();
+			animCleanup.length = 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);
@@ -16464,7 +17552,7 @@ var ReplSession = class {
 	/**
 	* 创建 REPL 专用的 Agent 实例
 	*
-	* Agent 复用 pi-ai 的 Model 对象进行 LLM 调用，
+	* Agent 复用本地 Model 对象进行 LLM 调用，
 	* 因此需要从 config.llm 解析 model 并注入到 Agent state。
 	*/
 	createReplAgent() {
@@ -16480,7 +17568,7 @@ var ReplSession = class {
 			runtimeConfig: this.config.agentRuntime ?? {}
 		});
 		const facade = new AgentLlmFacade(this.config.llm);
-		agent.innerAgent.state.model = facade.resolvePiModel();
+		agent.innerAgent.state.model = facade.resolveResolvedModel();
 		agent.innerAgent.getApiKey = facade.createGetApiKeyFn();
 		agent.llmFacade = facade;
 		agent.innerAgent.cacheRetention = this.config.agentRuntime?.cacheRetention;
@@ -16509,17 +17597,36 @@ var ReplSession = class {
 		return agent;
 	}
 	/**
+	* 判断是否处于 Coordinator 模式
+	*
+	* 当 agentTeam.defaultMode === 'coordinator' 时，
+	* 主 Agent 切换为编排模式：工具受限、系统提示词替换。
+	*/
+	isCoordinatorMode() {
+		return this.config.agentTeam?.defaultMode === "coordinator";
+	}
+	/**
 	* 注册 REPL 场景下的基础工具
 	*
 	* 在注册内置工具后，异步初始化 MCP 工具。
 	* MCP 连接不阻塞内置工具注册——Agent 立即可用内置工具，
 	* MCP 工具在连接完成后自动追加。
+	*
+	* 在 Coordinator 模式下，主 Agent 仅注册编排工具
+	*（AgentTool + SendMessage + TaskStop），完整工具集
+	* 仍传递给 AgentOrchestrator 供子 Agent 使用。
 	*/
 	registerBuiltinTools() {
 		const rawTools = createReplBuiltinTools(this.config.web, this.taskStore, this.config.skill, this.agent, this.config.subAgent, this.cronScheduler ?? void 0, this.config.agentTeam, this.worktreeManager, this.toolGuard);
 		this.permissionEngine.setToolInfoResolver(createToolInfoResolver(rawTools));
-		const guardedTools = this.toolGuard.wrapAll(rawTools);
+		const mainTools = this.isCoordinatorMode() ? [
+			...rawTools.filter((t) => COORDINATOR_TOOLS.includes(t.id)),
+			createSendMessageTool("repl-chat-agent"),
+			createTaskStopTool()
+		] : rawTools;
+		const guardedTools = this.toolGuard.wrapAll(mainTools);
 		this.agent.registerTools(guardedTools);
+		if (this.isCoordinatorMode()) this.agent.systemPromptOverride = getMainCoordinatorSystemPrompt(process.cwd());
 		const mcpServers = this.config.mcp ? normalizeMcpConfig(this.config.mcp) : [];
 		if (mcpServers.length > 0) initializeMcpTools(mcpServers, this.agent).then((manager) => {
 			this.mcpManager = manager;
@@ -16567,33 +17674,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 +17775,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} 技能`;
@@ -16660,14 +17825,14 @@ 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();
+		this.editor.onRunInBackground = () => {
+			if (this.currentTaskId) {
+				const bgTaskId = this.currentTaskId;
+				this.cancelCurrentTask();
+				this.outputArea.append([chalk.gray(`  (任务 ${bgTaskId} 已转入后台运行)`), ""]);
+				this.tui.requestRender();
+			}
 		};
 	}
 	/** 设置信号处理 */
@@ -16687,10 +17852,12 @@ var ReplSession = class {
 		instanceManager.on("instance:registered", refreshStatusBar);
 		instanceManager.on("instance:transitioned", refreshStatusBar);
 		instanceManager.on("instance:activity", refreshStatusBar);
+		instanceManager.on("instance:toolcall", refreshStatusBar);
 		eventBus.on("system:shutdown", () => {
 			instanceManager.off("instance:registered", refreshStatusBar);
 			instanceManager.off("instance:transitioned", refreshStatusBar);
 			instanceManager.off("instance:activity", refreshStatusBar);
+			instanceManager.off("instance:toolcall", refreshStatusBar);
 		});
 	}
 	/** 取消当前正在执行的任务 */
@@ -16856,7 +18023,7 @@ var ReplSession = class {
 /**
 * 从消息 content 中提取文本内容
 *
-* pi-ai 的消息 content 可能是 string（UserMessage）或 content blocks 数组（AssistantMessage），
+* 消息 content 可能是 string（UserMessage）或 content blocks 数组（AssistantMessage），
 * 此函数统一处理两种格式，提取所有文本块和 thinking 块并拼接。
 *
 * thinking 内容会被包裹在 <thinking>...</thinking> 标签中以便区分。
@@ -16911,10 +18078,10 @@ var ConversationLogger = class {
 		this.turnCount++;
 		try {
 			this.rotateIfNeeded();
-			const line = JSON.stringify({
+			const line = `${JSON.stringify({
 				...turn,
 				turn: this.turnCount
-			}) + "\n";
+			})}\n`;
 			appendFileSync(this.filePath, line, "utf-8");
 		} catch (err) {
 			logger.warn("对话日志写入失败", { error: err instanceof Error ? err.message : String(err) });