evolclaw 2.8.2 → 3.0.0

package/dist/index.js

@@ -1,7 +1,10 @@
 import { ClaudeSessionFileAdapter } from './core/session/adapters/claude-session-file-adapter.js';
 import { CodexSessionFileAdapter } from './core/session/adapters/codex-session-file-adapter.js';
 import { GeminiSessionFileAdapter } from './core/session/adapters/gemini-session-file-adapter.js';
-import { loadConfig, ensureDataDirs, resolvePaths, resolveAnthropicConfig, isOwner, isAdmin, validateConfigIntegrity, validateChannelInstanceNames, getOwner, getDefaultSessionMode, setOwner as setOwnerInGlobalConfig, setChannelShowActivities as setShowActivitiesInGlobalConfig } from './config.js';
+import { ensureDataDirs, resolvePaths, syncKitsFromPackage } from './paths.js';
+import { resolveAnthropicConfig } from './agents/resolve.js';
+import { loadDefaults, autoMigrateIfNeeded } from './config-store.js';
+import { CONFIG_SCHEMA_VERSION } from './types.js';
 import { SessionManager } from './core/session/session-manager.js';
 import { ClaudeAgentPlugin } from './agents/claude-runner.js';
 import { CodexAgentPlugin } from './agents/codex-runner.js';
@@ -12,25 +15,45 @@ import { AUNChannelPlugin } from './channels/aun.js';
 import { DingtalkChannelPlugin } from './channels/dingtalk.js';
 import { QQBotChannelPlugin } from './channels/qqbot.js';
 import { WecomChannelPlugin } from './channels/wecom.js';
-import { MessageProcessor } from './core/message/message-processor.js';
+import { MessageProcessor, buildEnvelope } from './core/message/message-processor.js';
 import { MessageQueue } from './core/message/message-queue.js';
 import { MessageBridge } from './core/message/message-bridge.js';
 import { MessageCache } from './core/message/message-cache.js';
 import { CommandHandler } from './core/command-handler.js';
 import { EventBus } from './core/event-bus.js';
-import { StatsCollector } from './utils/stats-collector.js';
+import { StatsCollector } from './utils/stats.js';
+import { AidStatsCollector } from './utils/stats.js';
 import { PermissionGateway } from './core/permission.js';
 import { InteractionRouter } from './core/interaction-router.js';
 import { ChannelLoader } from './core/channel-loader.js';
-import { AgentLoader } from './core/agent-loader.js';
+import { AgentLoader } from './core/baseagent-loader.js';
 import { EvolAgentRegistry } from './core/evolagent-registry.js';
-import { buildReloadHooks } from './utils/reload-hooks.js';
+import { buildReloadHooks } from './core/channel-loader.js';
 import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
+import { writeMain, removeAll, isMainWinner, scanInstances } from './utils/instance-registry.js';
 import { detectDuplicates } from './core/evolagent-registry.js';
 import { loadPromptTemplates } from './agents/templates.js';
+import { TriggerManager } from './core/trigger/manager.js';
+import { TriggerScheduler } from './core/trigger/scheduler.js';
+import { agentTriggersDir } from './paths.js';
 import path from 'path';
 import fs from 'fs';
+import os from 'os';
+import crypto from 'crypto';
+/**
+ * 通过 adapter.send 发送系统类 payload（system.notice / system.error / 等）。
+ *
+ * 网关层（本文件）的所有出站系统通知（上线 / 重启完成 / 渠道告警 / agent 启动失败等）
+ * 走这里集中调度，让渠道按 capabilities 决定呈现方式。
+ *
+ * 当 adapter 还没实现 send（旧 adapter）时，按 payload.kind 降级到 sendText。
+ *
+ * Exported for unit test coverage; runtime callers are inside main() closure.
+ */
+export async function sendSystemPayload(adapter, envelope, payload) {
+    await adapter.send(envelope, payload);
+}
 async function main() {
     // 过滤飞书 SDK 的 info 日志
     const originalLog = console.log;
@@ -52,107 +75,159 @@ async function main() {
     logger.info('EvolClaw starting...');
     // 确保数据目录存在
     ensureDataDirs();
+    // 同步包内 kits/ 到 EVOLCLAW_HOME/kits/（首次启动或升级时）
+    syncKitsFromPackage();
+    // ── 单实例保护（pre-check + post-write self-check）──
+    // pre-check：发现已有活 main 直接退出，避免起任何副作用
+    {
+        const pre = scanInstances();
+        const aliveOthers = pre.mains.filter(m => m.alive && m.record.pid !== process.pid);
+        if (aliveOthers.length > 0) {
+            const pids = aliveOthers.map(m => m.record.pid).join(', ');
+            const msg = `❌ Another EvolClaw instance is already running (PID: ${pids}). Use 'evolclaw restart' to replace it.`;
+            logger.error(msg);
+            console.error(msg);
+            process.exit(1);
+        }
+    }
+    // 立即登记自己（让其他并发启动者能看见我）
+    const launchedBy = process.env.EVOLCLAW_LAUNCHED_BY || 'start';
+    writeMain(launchedBy);
+    logger.info(`✓ Instance record written: main-${process.pid}.json`);
+    // post-write 自检：写完 record 后再扫一次，发现并发对手时按 (startedAt, pid) 选赢家
+    {
+        const verdict = isMainWinner();
+        if (!verdict.winner) {
+            logger.warn(`Lost main election to PID ${verdict.conflictingPid}, yielding`);
+            console.error(`⚠ Another instance (PID ${verdict.conflictingPid}) started concurrently and won the election. Yielding.`);
+            removeAll();
+            process.exit(0);
+        }
+    }
     // 加载提示词模板
     loadPromptTemplates();
-    // 加载配置
-    const config = loadConfig();
+    // 加载配置（新结构：defaults.json + per-agent config.json）
+    const defaults = loadDefaults() ?? { $schema_version: CONFIG_SCHEMA_VERSION };
     // 应用配置中的日志级别（优先于环境变量）
-    if (config.debug?.logLevel) {
-        setLogLevel(config.debug.logLevel);
-    }
+    // logLevel 现在不在新结构中——若要保留，将来可加 defaults.debug.logLevel
+    // 阶段 2c 暂跳过
     const paths = resolvePaths();
-    // 配置完整性校验
-    const integrity = validateConfigIntegrity(config);
-    if (!integrity.valid) {
-        const msg = `❌ Config integrity check failed:\n  ${integrity.reasons.join('\n  ')}`;
+    // ── 自动迁移：旧 data/evolclaw.json → 新结构 ──
+    autoMigrateIfNeeded();
+    // ── EvolAgent Registry：加载 agents/<aid>/config.json ──
+    const agentRegistry = new EvolAgentRegistry(paths.agentsDir);
+    agentRegistry.loadAll();
+    const agentInfos = agentRegistry.list();
+    // 启动期硬约束：必须至少有一个 self-agent
+    if (agentInfos.length === 0) {
+        const skipped = agentRegistry.getSkipped();
+        const lines = [
+            '❌ No self-agent configured.',
+            `  Run \`evolclaw aid new <name>\` to create one.`,
+        ];
+        if (skipped.length > 0) {
+            lines.push(`  Skipped ${skipped.length} dir(s):`);
+            for (const s of skipped)
+                lines.push(`    - ${s.dirName}: ${s.reason}`);
+        }
+        const msg = lines.join('\n');
         logger.error(msg);
-        console.error(msg); // ensure it lands in stdout.log for self-heal diagnostics
+        console.error(msg);
         process.exit(1);
     }
-    const anthropic = resolveAnthropicConfig(config);
-    logger.info('✓ Config loaded (API keys hidden)');
-    // Channel instance name uniqueness check
-    validateChannelInstanceNames(config);
-    // Detect duplicate channel credentials
-    const duplicates = detectDuplicates(config);
-    if (duplicates.length > 0) {
-        for (const d of duplicates) {
-            logger.warn(`⚠ Duplicate channel credential: ${d.fingerprint} is used by instances [${d.instances.join(', ')}]. ` +
-                `Only the first instance will be active.`);
+    logger.info(`✓ Loaded ${agentInfos.length} self-agent(s)`);
+    for (const info of agentInfos) {
+        if (info.status === 'error') {
+            logger.error(`  ✗ ${info.name}: ${info.error}`);
+        }
+        else if (info.status === 'disabled') {
+            logger.info(`  ○ ${info.name} (disabled)`);
+        }
+        else {
+            logger.info(`  ● ${info.name} ${info.baseagent} @ ${path.basename(info.projectPath)}`);
         }
     }
-    if (anthropic.baseUrl) {
-        logger.info(`✓ Using custom API base URL: ${anthropic.baseUrl}`);
+    // 跨 agent 凭证冲突
+    {
+        const dups = detectDuplicates(agentRegistry.runnableAgents());
+        for (const d of dups) {
+            const owners = d.agents.map(o => `${o.aid}(${o.channelName})`).join(', ');
+            logger.warn(`⚠ Duplicate channel credential: ${d.fingerprint} claimed by ${owners}.`);
+        }
     }
-    // EvolAgent Registry
-    const agentRegistry = new EvolAgentRegistry(paths.agentsDir, {
-        setOwner: (channelName, userId) => {
-            setOwnerInGlobalConfig(config, channelName, userId);
-        },
-        setShowActivities: (channelName, mode) => {
-            setShowActivitiesInGlobalConfig(config, channelName, mode);
-        },
+    // 选定主 agent（启动期 anthropic resolve 用，配合 IPC `evolagent.list` 显示）
+    // 主 agent 取第一个非 error 非 disabled 的 self-agent。
+    const primaryAgent = agentRegistry.runnableAgents()[0];
+    if (!primaryAgent) {
+        const msg = '❌ No runnable self-agent (all are error/disabled). Aborting.';
+        logger.error(msg);
+        console.error(msg);
+        process.exit(1);
+    }
+    // 进程级设置（从 defaults 取，不属于任何 agent）
+    const globalSettings = {
+        idleMonitor: defaults.idleMonitor,
+        debug: defaults.debug,
+    };
+    if (globalSettings.debug?.logLevel) {
+        setLogLevel(globalSettings.debug.logLevel);
+    }
+    // 启动期 anthropic 凭证校验（用 primaryAgent 的 baseagents.claude）
+    const anthropic = resolveAnthropicConfig({
+        agents: { claude: primaryAgent.config.baseagents?.claude },
     });
-    agentRegistry.loadAll(config);
-    const agentInfos = agentRegistry.list();
-    const evolagentCount = agentInfos.filter(i => !i.isDefault).length;
-    if (evolagentCount > 0) {
-        logger.info(`✓ Loaded ${evolagentCount} evolagent(s)`);
-        for (const info of agentInfos) {
-            if (info.isDefault)
-                continue;
-            if (info.status === 'error') {
-                logger.error(`  ✗ [${info.name}] ${info.error}`);
-            }
-            else if (info.status === 'disabled') {
-                logger.info(`  ○ [${info.name}] disabled`);
-            }
-            else {
-                logger.info(`  ● [${info.name}] ${info.baseagent} @ ${path.basename(info.projectPath)}`);
-            }
-        }
+    logger.info('✓ Config loaded (API keys hidden)');
+    if (anthropic.baseUrl) {
+        logger.info(`✓ Using custom API base URL: ${anthropic.baseUrl}`);
     }
     // Store for IPC access (T10 will wire this)
     // M4: removed dead globalThis.__evolclaw_agentRegistry assignment
     // 创建事件总线
     const eventBus = new EventBus();
     logger.info('✓ Event bus initialized');
+    // 把所有事件录到 events.log（受 EVENT_LOG 环境变量控制）
+    eventBus.subscribeAll((event) => logger.event(event));
     // 统计收集器（近 1 小时滚动统计）
     const statsCollector = new StatsCollector(eventBus);
-    // 初始化数据库（带 ownerResolver）
-    // Registry-first: agent-owned channels resolve via EvolAgent.isOwner/isAdmin,
-    // default-agent channels fall back to global config (evolclaw.json).
-    const sessionManager = new SessionManager(undefined, eventBus, (channel, userId) => agentRegistry.isOwner(channel, userId, (ch, uid) => isOwner(config, ch, uid)), (channel, userId) => agentRegistry.isAdmin(channel, userId, (ch, uid) => isAdmin(config, ch, uid)));
-    // sessionMode 解析：全局 chatmode 配置 > 默认 'interactive'
-    sessionManager.setSessionModeResolver((_channel, chatType) => {
-        return getDefaultSessionMode(config, chatType);
+    // Per-AID 消息统计收集器（累计，供 watch aid 实时展示）
+    const aidStatsCollector = new AidStatsCollector();
+    // 初始化 SessionManager（文件系统后端）
+    const sessionManager = new SessionManager(paths.sessionsDir, eventBus, (channel, userId) => agentRegistry.isOwner(channel, userId), (channel, userId) => agentRegistry.isAdmin(channel, userId));
+    // sessionMode 解析：从 channel 路由到具体 agent，按 agent.config.chatmode
+    sessionManager.setSessionModeResolver((channelKey, chatType) => {
+        const agent = agentRegistry.resolveByChannel(channelKey);
+        const cm = agent?.config.chatmode;
+        if (!cm)
+            return undefined;
+        return chatType === 'group' ? cm.group : cm.private;
     });
     logger.info('✓ Database initialized');
     // 注册会话文件适配器（Claude / Codex 各自的会话文件操作）
     sessionManager.registerFileAdapter(new ClaudeSessionFileAdapter());
     sessionManager.registerFileAdapter(new CodexSessionFileAdapter());
     sessionManager.registerFileAdapter(new GeminiSessionFileAdapter());
-    // Agent 插件系统
+    // Agent 插件系统：每个 EvolAgent × 每个 baseagent 一个独立 runner（H1/H2 修复）
     const agentLoader = new AgentLoader();
     agentLoader.register(new ClaudeAgentPlugin());
     agentLoader.register(new CodexAgentPlugin());
     agentLoader.register(new GeminiAgentPlugin());
-    const agentInstances = agentLoader.createAll(config, {
+    const agentInstances = agentLoader.createAll(agentRegistry, {
         onSessionIdUpdate: async (sessionId, agentSessionId) => {
             await sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId);
         },
     });
-    // 构建 agent map，支持按 agentId 路由（当前默认使用第一个 agent）
+    // agentMap 复合键：${aid}::${baseagent}
     const agentMap = new Map();
     for (const inst of agentInstances) {
-        agentMap.set(inst.agent.name, inst.agent);
+        agentMap.set(`${inst.evolagentName}::${inst.baseagent}`, inst.agent);
     }
-    const defaultAgent = config.agents?.defaultAgent || 'claude';
-    const agentRunner = agentMap.get(defaultAgent) || agentInstances[0]?.agent;
+    const primaryBaseagent = primaryAgent.baseagent;
+    const primaryRunnerKey = `${primaryAgent.aid}::${primaryBaseagent}`;
+    const agentRunner = agentMap.get(primaryRunnerKey) || agentInstances[0]?.agent;
     if (!agentRunner) {
-        throw new Error('No agent backend available. Check agents config.');
+        throw new Error('No agent backend available. Check baseagents config (no runners created).');
     }
-    logger.info(`✓ Agent runner ready (default: ${agentRunner.name}, available: ${[...agentMap.keys()].join(', ')})`);
+    logger.info(`✓ Runners ready (primary key: ${primaryRunnerKey}, total: ${agentMap.size}, keys: ${[...agentMap.keys()].join(', ')})`);
     // 权限审批网关
     const permissionGateway = new PermissionGateway();
     permissionGateway.setEventBus(eventBus);
@@ -177,67 +252,46 @@ async function main() {
     channelLoader.register(new DingtalkChannelPlugin());
     channelLoader.register(new QQBotChannelPlugin());
     channelLoader.register(new WecomChannelPlugin());
-    // Create channel instances: default (from evolclaw.json) + each evolagent
-    const defaultInstances = await channelLoader.createAll(config);
+    // Create channel instances: 每个 self-agent 各自的 channels
     const evolagentInstances = [];
     for (const agent of agentRegistry.runnableAgents()) {
-        // Rewrite channel instance names with agent prefix to avoid collisions
-        // with DefaultAgent and other EvolAgents.
-        // Rule (EvolAgent only):
-        //   - explicit name → `${agent.name}-${type}-${name}`
-        //   - omitted name  → `${agent.name}-${type}`
-        const rewrittenChannels = {};
-        for (const [type, raw] of Object.entries(agent.config.channels || {})) {
-            if (type === 'defaultChannel') {
-                rewrittenChannels[type] = raw;
-                continue;
-            }
-            const instances = Array.isArray(raw) ? raw : [raw];
-            const rewritten = instances.map((inst) => {
-                if (!inst || typeof inst !== 'object')
-                    return inst;
-                const effName = agent.effectiveChannelName(type, inst.name);
-                return { ...inst, name: effName };
-            });
-            // Preserve original shape (array vs single object)
-            rewrittenChannels[type] = Array.isArray(raw) ? rewritten : rewritten[0];
-        }
-        const agentConfig = {
-            agents: agent.config.agents,
-            channels: rewrittenChannels,
-            projects: agent.config.projects,
-        };
         try {
-            const instances = await channelLoader.createAll(agentConfig);
+            const instances = await channelLoader.createForAgent(agent);
             evolagentInstances.push(...instances);
         }
         catch (e) {
-            logger.error(`[EvolAgent] Failed to create channels for ${agent.name}: ${e}`);
+            logger.error(`[Agent ${agent.aid}] Failed to create channels: ${e}`);
             agent.status = 'error';
             agent.error = `Channel creation failed: ${e}`;
         }
     }
-    const channelInstances = [...defaultInstances, ...evolagentInstances];
-    logger.info(`✓ Created ${channelInstances.length} channel instance(s)${evolagentInstances.length > 0 ? ` (${defaultInstances.length} default + ${evolagentInstances.length} agent)` : ''}`);
-    // 启动迁移：将 sessions.channel 从 channelType 回填为实例名
-    sessionManager.migrateChannelToInstanceName();
+    const channelInstances = evolagentInstances;
+    logger.info(`✓ Created ${channelInstances.length} channel instance(s)`);
+    // 初始化触发器调度器（每个 EvolAgent 独立）
+    for (const agent of agentRegistry.runnableAgents()) {
+        const triggersDir = agentTriggersDir(agent.aid);
+        const triggerManager = new TriggerManager(agent.aid, triggersDir);
+        const triggerScheduler = new TriggerScheduler(agent.aid, triggerManager, eventBus);
+        agent.triggerManager = triggerManager;
+        agent.triggerScheduler = triggerScheduler;
+    }
     // 创建命令处理器
-    const cmdHandler = new CommandHandler(sessionManager, agentMap, config, messageCache, eventBus, defaultAgent);
+    const cmdHandler = new CommandHandler(sessionManager, agentMap, messageCache, eventBus, primaryRunnerKey);
     cmdHandler.setPermissionGateway(permissionGateway);
     cmdHandler.setInteractionRouter(interactionRouter);
     cmdHandler.setStatsCollector(statsCollector);
     // 创建消息处理器
-    const processor = new MessageProcessor(agentMap, sessionManager, config, messageCache, eventBus, (content, channel, channelId, userId, threadId) => {
+    const processor = new MessageProcessor(agentMap, sessionManager, globalSettings, messageCache, eventBus, (content, channel, channelId, userId, threadId) => {
         const sendFn = async (id, text, opts) => {
             const adapter = cmdHandler.getAdapter(channel);
             if (!adapter)
                 return;
             if (text) {
-                await adapter.sendText(id, text, opts);
+                await adapter.send(buildEnvelope({ channel: adapter.channelName, channelId: id, replyContext: opts }), { kind: 'system.notice', text, subtype: 'health' });
             }
         };
         return cmdHandler.handle(content, channel, channelId, sendFn, userId, threadId);
-    }, defaultAgent);
+    }, primaryRunnerKey);
     // 回填 processor 和 messageQueue 的引用
     cmdHandler.setProcessor(processor);
     // Inject EvolAgentRegistry (methods added by T6/T7)
@@ -260,8 +314,11 @@ async function main() {
         await processor.processMessage(message);
     });
     // 设置中断回调（精确中断正在处理的 agent）
-    messageQueue.setInterruptCallback(async (sessionKey, agentId) => {
-        const agent = agentMap.get(agentId || defaultAgent);
+    messageQueue.setInterruptCallback(async (sessionKey, agentId, evolagentName) => {
+        const baseagent = agentId || primaryBaseagent;
+        const evol = evolagentName || primaryAgent.aid;
+        const agent = agentMap.get(`${evol}::${baseagent}`)
+            || agentMap.get(primaryRunnerKey);
         if (agent?.hasActiveStream(sessionKey)) {
             await agent.interrupt(sessionKey);
         }
@@ -270,6 +327,40 @@ async function main() {
     // 回填 messageQueue 引用
     cmdHandler.setMessageQueue(messageQueue);
     processor.setMessageQueue(messageQueue);
+    // 启动触发器调度器，设置 fireCallback 投递合成消息
+    for (const agent of agentRegistry.runnableAgents()) {
+        if (!agent.triggerScheduler || !agent.triggerManager)
+            continue;
+        const scheduler = agent.triggerScheduler;
+        const primaryProjectPath = agent.config.projects?.defaultPath ?? primaryAgent.projectPath;
+        scheduler.setFireCallback((msg, trigger) => {
+            const sessionKey = `${msg.channel}:${msg.channelId}`;
+            messageQueue.enqueue(sessionKey, msg, primaryProjectPath, { interruptible: false }).catch(err => {
+                logger.error(`[Trigger] Failed to enqueue trigger ${trigger.id}: ${err}`);
+            });
+        });
+        // Subscribe to trigger:completed/failed/skipped to update cron inflight state
+        eventBus.subscribe('trigger:completed', (ev) => scheduler.onTriggerComplete(ev.triggerId, 'completed'));
+        eventBus.subscribe('trigger:failed', (ev) => scheduler.onTriggerComplete(ev.triggerId, 'failed'));
+        eventBus.subscribe('trigger:skipped', (ev) => {
+            if (ev.reason === 'interrupted')
+                scheduler.onTriggerComplete(ev.triggerId, 'interrupted');
+        });
+        // Note: only the primary agent's scheduler is wired to cmdHandler.
+        // Non-primary agent channels will receive "⚠️ 触发器功能未启用" when using /trigger.
+        // Full per-channel scheduler routing is a future improvement.
+        try {
+            await scheduler.init();
+        }
+        catch (err) {
+            logger.error(`[Trigger] Scheduler init failed for ${agent.aid}: ${err}`);
+        }
+    }
+    // Inject primary agent's trigger scheduler into cmdHandler
+    const primaryAgentForTrigger = agentRegistry.runnableAgents()[0];
+    if (primaryAgentForTrigger?.triggerScheduler && primaryAgentForTrigger?.triggerManager) {
+        cmdHandler.setTriggerScheduler(primaryAgentForTrigger.triggerScheduler, primaryAgentForTrigger.triggerManager);
+    }
     // 默认策略
     const defaultPolicy = {
         canSwitchProject: (chatType, role) => chatType === 'private' ? (role === 'owner' || role === 'admin') : role === 'owner',
@@ -283,18 +374,17 @@ async function main() {
         accumulateErrors: () => true,
     };
     // ── MessageBridge：Channel ↔ Core 消息桥梁 ──
-    const msgBridge = new MessageBridge(config, sessionManager, processor, messageQueue, cmdHandler, eventBus);
+    const msgBridge = new MessageBridge(primaryAgent.projectPath, sessionManager, processor, messageQueue, cmdHandler, eventBus, primaryAgent.config.debounce);
     msgBridge.setAgentRegistry(agentRegistry);
     // ── Channel instance registration (shared by startup and hot-load) ──
     function registerChannelInstance(inst) {
         // 1. 项目路径提供器
         if (inst.onProjectPathRequest && inst.channel.onProjectPathRequest) {
             inst.channel.onProjectPathRequest(async (channelId) => {
-                // Effective default path: agent's projectPath if agent-owned, else global
+                // Effective default path: use the agent that owns this channel.
                 const owningAgent = agentRegistry.resolveByChannel(inst.adapter.channelName);
-                const effectiveDefault = (owningAgent && !owningAgent.isDefault)
-                    ? owningAgent.projectPath
-                    : (config.projects?.defaultPath || process.cwd());
+                const effectiveDefault = owningAgent?.projectPath
+                    ?? primaryAgent.projectPath;
                 const session = await sessionManager.getOrCreateSession(inst.adapter.channelName, channelId, effectiveDefault, undefined, undefined, undefined, undefined);
                 return path.isAbsolute(session.projectPath)
                     ? session.projectPath
@@ -317,114 +407,14 @@ async function main() {
                 interactionRouter.handle(response);
             });
         }
-        // 4. MessageBridge 注册（按 channelType 分发）
+        // 4. MessageBridge 注册
         const channelType = inst.channelType || inst.adapter.channelName;
-        if (channelType === 'feishu') {
-            msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async ({ channelId: chatId, content, images, peerId, peerName, messageId, mentions, threadId, rootId, chatType }) => {
-                await handler({
-                    channel: channelType, channelId: chatId, content, images, chatType,
-                    peerId: peerId || '', peerName, messageId, mentions, threadId,
-                    // 只在话题场景（threadId 有值）才设置 replyContext；
-                    // 纯引用回复（rootId 有值但无 threadId）不设置，避免所有回复都带引用头
-                    replyContext: threadId ? { replyToMessageId: rootId ?? threadId, replyInThread: true } : undefined,
-                });
-            }), (channelId, text, replyContext) => inst.channel.sendMessage(channelId, text, {
-                replyToMessageId: replyContext?.replyToMessageId,
-                replyInThread: replyContext?.replyInThread,
-            }), inst.adapter, channelType);
-        }
-        if (channelType === 'wechat') {
-            if (inst.channel.setEventBus) {
-                inst.channel.setEventBus(eventBus);
-            }
-            msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (channelId, content, peerId, images, chatType) => {
-                handler({
-                    channel: channelType,
-                    channelId,
-                    content,
-                    images,
-                    chatType: chatType || 'private',
-                    peerId: peerId || '',
-                });
-            }), (channelId, text) => inst.channel.sendMessage(channelId, text), inst.adapter, channelType);
-        }
-        if (channelType === 'aun') {
-            msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (opts) => {
-                handler({
-                    channel: channelType,
-                    channelId: opts.channelId,
-                    content: opts.content,
-                    chatType: opts.chatType || 'private',
-                    peerId: opts.peerId || '',
-                    peerName: opts.peerName,
-                    messageId: opts.messageId,
-                    mentions: opts.mentions,
-                    threadId: opts.threadId,
-                    replyContext: opts.replyContext,
-                });
-            }), (channelId, text, replyContext) => inst.channel.sendMessage(channelId, text, replyContext), inst.adapter, channelType);
-            // AUN 重连失败通知
-            if (inst.channel.setOnChannelDown) {
-                inst.channel.setOnChannelDown(() => {
-                    eventBus.publish({
-                        type: 'channel:health',
-                        channel: channelType,
-                        channelName: inst.adapter.channelName,
-                        status: 'auth_error',
-                        message: `⚠️ AUN 渠道 ${inst.adapter.channelName} 断连，自动重试已用尽。\n使用 /check rty aun 手动重连`,
-                        timestamp: Date.now(),
-                    });
-                });
-            }
-            // proactive 模式入站白名单：注入 sessionMode 查询器
-            if (typeof inst.channel.setSessionModeResolver === 'function') {
-                const chName = inst.adapter.channelName;
-                inst.channel.setSessionModeResolver(async (channelId) => {
-                    const session = await sessionManager.getActiveSession(chName, channelId);
-                    return session?.sessionMode;
-                });
-            }
+        if (inst.registerBridge) {
+            inst.registerBridge(msgBridge, channelType);
         }
-        if (channelType === 'dingtalk') {
-            msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (event) => {
-                handler({
-                    channel: channelType,
-                    channelId: event.channelId,
-                    content: event.content,
-                    images: event.images,
-                    chatType: event.chatType || 'private',
-                    peerId: event.peerId || '',
-                    peerName: event.peerName,
-                    messageId: event.messageId,
-                });
-            }), (channelId, text) => inst.channel.sendMessage(channelId, text), inst.adapter, channelType);
-        }
-        if (channelType === 'qqbot') {
-            msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (event) => {
-                handler({
-                    channel: channelType,
-                    channelId: event.channelId,
-                    content: event.content,
-                    images: event.images,
-                    chatType: event.chatType || 'private',
-                    peerId: event.peerId || '',
-                    peerName: event.peerName,
-                    messageId: event.messageId,
-                });
-            }), (channelId, text) => inst.channel.sendMessage(channelId, text), inst.adapter, channelType);
-        }
-        if (channelType === 'wecom') {
-            msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (event) => {
-                handler({
-                    channel: channelType,
-                    channelId: event.channelId,
-                    content: event.content,
-                    chatType: event.chatType || 'private',
-                    peerId: event.peerId || '',
-                    peerName: event.peerName,
-                    messageId: event.messageId,
-                });
-            }), (channelId, text) => inst.channel.sendMessage(channelId, text), inst.adapter, channelType);
+        // 4b. 生命周期钩子
+        if (inst.registerHooks) {
+            inst.registerHooks({ eventBus, sessionManager });
         }
         // 5. 撤回消息 → 中断执行中任务
         inst.channel.onRecall?.((messageId) => {
@@ -435,20 +425,18 @@ async function main() {
     for (const inst of channelInstances) {
         registerChannelInstance(inst);
     }
-    // ── 连接所有渠道 ──
-    const connected = await channelLoader.connectAll(channelInstances);
-    // Bind connected adapters to their owning agents
-    // I1: only mark 'running' if a channel actually connected for that agent
-    const connectedSet = new Set(connected);
+    // Bind adapters to their owning agents and mark running
     for (const inst of channelInstances) {
         const agent = agentRegistry.resolveByChannel(inst.adapter.channelName);
         if (!agent || agent.status === 'error')
             continue;
         agent.channels.set(inst.adapter.channelName, inst.adapter);
-        if (agent.status === 'stopped' && connectedSet.has(inst.adapter.channelName)) {
+        if (agent.status === 'stopped') {
             agent.status = 'running';
         }
     }
+    // ── 连接所有渠道（异步，AUN 等 WebSocket 渠道在后台重连）──
+    const connected = await channelLoader.connectAll(channelInstances);
     // 预填充 Feishu 已知 thread_id（重启后避免误判话题创建）
     for (const inst of channelInstances) {
         const channelType = inst.channelType || inst.adapter.channelName;
@@ -467,10 +455,51 @@ async function main() {
             timestamp: Date.now()
         });
     }
+    // 上线通知：延迟 1-3 秒后向 owner 发送上线消息（带 name + 工作目录）
+    // 需在配置中 debug.upmsg: true 手动开启
+    setTimeout(() => {
+        for (const name of connected) {
+            const agent = agentRegistry.resolveByChannel(name);
+            if (!agent)
+                continue;
+            if (!agent.config.debug?.upmsg)
+                continue;
+            const ownerAid = agent.config.owners?.[0];
+            if (!ownerAid)
+                continue;
+            const adapter = agent.channels.get(name);
+            if (!adapter)
+                continue;
+            // 尝试从 agent.md 读取 name
+            let agentName = agent.aid;
+            try {
+                const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
+                const agentMdPath = path.join(aunPath, 'AIDs', agent.aid, 'agent.md');
+                const content = fs.readFileSync(agentMdPath, 'utf-8');
+                const nameMatch = content.match(/^name:\s*"?([^"\n]+)/m);
+                if (nameMatch)
+                    agentName = nameMatch[1].trim().replace(/"$/, '');
+            }
+            catch { }
+            const projectDir = path.basename(agent.projectPath);
+            const text = `✓ ${agentName} 已上线 | 工作目录: ${projectDir}`;
+            const envelope = buildEnvelope({
+                taskId: `system-online-${crypto.randomBytes(5).toString('hex')}`,
+                channel: adapter.channelName,
+                channelId: ownerAid,
+                agentName,
+            });
+            sendSystemPayload(adapter, envelope, {
+                kind: 'system.notice',
+                text,
+                subtype: 'restarted',
+            }).catch(() => { });
+        }
+    }, 1000 + Math.random() * 2000);
     // 统一 channel:health 跨通道通知（仅 auth_error）
     // 按 (channelType, ownerId) 去重，避免同类型多实例重复通知
-    eventBus.subscribe('channel:health', (event) => {
-        if (event.type !== 'channel:health' || event.status !== 'auth_error')
+    eventBus.subscribe('channel:error', (event) => {
+        if (event.type !== 'channel:error' || event.status !== 'auth_error')
             return;
         const sourceChannelType = event.channel;
         const sourceChannelName = event.channelName || sourceChannelType;
@@ -483,28 +512,46 @@ async function main() {
                 continue; // 跳过同类型通道
             if (notified.has(otherType))
                 continue; // 同类型已通知过
-            const ownerId = agentRegistry.getOwner(other.adapter.channelName) ?? getOwner(config, other.adapter.channelName);
+            const ownerId = agentRegistry.getOwner(other.adapter.channelName);
             if (!ownerId)
                 continue;
             notified.add(otherType);
-            other.adapter.sendText(ownerId, msg).catch(err => {
+            const owningAgent = agentRegistry.resolveByChannel(other.adapter.channelName);
+            const envelope = buildEnvelope({
+                taskId: `system-channel-down-${crypto.randomBytes(5).toString('hex')}`,
+                channel: other.adapter.channelName,
+                channelId: ownerId,
+                agentName: owningAgent?.aid || 'evolclaw',
+            });
+            sendSystemPayload(other.adapter, envelope, {
+                kind: 'system.error',
+                text: msg,
+                subtype: 'channel_down',
+                recoverable: false,
+            }).catch(err => {
                 logger.error(`[ChannelHealth] Failed to notify ${other.adapter.channelName} owner:`, err);
             });
         }
     });
-    // 按 channelType 归组显示连接摘要
-    const connectedGroups = new Map();
+    // 按 channelType 归组显示连接摘要（启动 banner 只显示类型+计数，详情看 `evolclaw status`）
+    const connectedTypeCount = new Map();
+    const typeOrder = [];
     for (const inst of channelInstances) {
         const name = inst.adapter.channelName;
         if (!connected.includes(name))
             continue;
         const type = inst.channelType || name;
-        if (!connectedGroups.has(type))
-            connectedGroups.set(type, []);
-        connectedGroups.get(type).push(name);
+        if (!connectedTypeCount.has(type)) {
+            connectedTypeCount.set(type, 0);
+            typeOrder.push(type);
+        }
+        connectedTypeCount.set(type, connectedTypeCount.get(type) + 1);
     }
-    const channelSummary = Array.from(connectedGroups.entries())
-        .map(([type, names]) => names.length === 1 ? names[0] : `${type}[${names.join(', ')}]`)
+    const channelSummary = typeOrder
+        .map(type => {
+        const n = connectedTypeCount.get(type);
+        return n === 1 ? type : `${type}×${n}`;
+    })
         .join(', ');
     const totalCount = connected.length;
     logger.info(`🚀 EvolClaw is running with ${totalCount} channel(s): ${channelSummary}`);
@@ -522,12 +569,21 @@ async function main() {
                 sessionManager.clearProcessing(session.id);
                 continue;
             }
-            const agent = agentMap.get(session.agentId) || agentMap.get(defaultAgent);
+            // 复合键：${aid}::${baseagent}，从 channel 反查 self-agent
+            const owningAgent = agentRegistry.resolveByChannel(session.channel);
+            if (!owningAgent) {
+                logger.warn(`[Resume] session ${session.id}: channel "${session.channel}" not routable, skipping`);
+                sessionManager.clearProcessing(session.id);
+                continue;
+            }
+            const evolName = owningAgent.aid;
+            const baseagentName = session.agentId || primaryBaseagent;
+            const agent = agentMap.get(`${evolName}::${baseagentName}`) || agentMap.get(primaryRunnerKey);
             if (!agent) {
                 sessionManager.clearProcessing(session.id);
                 continue;
             }
-            logger.info(`[Resume] Resuming session: ${session.id} (agent: ${session.agentId})`);
+            logger.info(`[Resume] Resuming session: ${session.id} (agent: ${evolName}::${baseagentName})`);
             const resumeMessage = {
                 channel: session.channel,
                 channelId: session.channelId,
@@ -554,7 +610,19 @@ async function main() {
                 const replyContext = pending.rootId
                     ? { replyToMessageId: pending.rootId, replyInThread: !!pending.threadId }
                     : undefined;
-                await adapter.sendText(pending.channelId, '✅ 服务重启成功！', replyContext);
+                const owningAgent = agentRegistry.resolveByChannel(adapter.channelName);
+                const envelope = buildEnvelope({
+                    taskId: `system-restart-${process.pid}`,
+                    channel: adapter.channelName,
+                    channelId: pending.channelId,
+                    agentName: owningAgent?.aid || 'evolclaw',
+                    replyContext,
+                });
+                await sendSystemPayload(adapter, envelope, {
+                    kind: 'system.notice',
+                    text: '✅ 服务重启成功！',
+                    subtype: 'restarted',
+                });
                 logger.info(`[Restart] Notification sent via ${pending.channel}`);
             }
             fs.unlinkSync(pendingFile);
@@ -600,6 +668,37 @@ async function main() {
     }, async (cmd, sessionId) => cmdHandler.handleCtl(cmd, sessionId));
     // M3: direct call (not cast) — wire EvolAgentRegistry into IPC for evolagent.* handlers
     ipcServer.setAgentRegistry(agentRegistry);
+    // 注入 AUN AID 状态聚合器：遍历所有 aun 类型 channel，调 getAidState() 收集
+    ipcServer.setAunAidProvider(() => {
+        const out = [];
+        for (const inst of channelInstances) {
+            if (inst.channelType !== 'aun')
+                continue;
+            const ch = inst.channel;
+            if (typeof ch?.getAidState === 'function') {
+                try {
+                    out.push(ch.getAidState());
+                }
+                catch { /* ignore */ }
+            }
+        }
+        return out;
+    });
+    // 注入 Per-AID 统计收集器到所有 AUN channel 实例
+    for (const inst of channelInstances) {
+        if (inst.channelType !== 'aun')
+            continue;
+        const ch = inst.channel;
+        if (typeof ch?.setAidStatsCollector === 'function') {
+            ch.setAidStatsCollector(aidStatsCollector);
+        }
+    }
+    // 注入 Per-AID 统计 IPC provider
+    aidStatsCollector.setQueueStatsProvider((agentName) => ({
+        processing: messageQueue.getProcessingCountByAgent(agentName),
+        queued: messageQueue.getQueueLengthByAgent(agentName),
+    }));
+    ipcServer.setAunAidStatsProvider(() => aidStatsCollector.getAllSnapshots());
     // ── Reload hooks: enable agentRegistry.reload() to drain/disconnect/restart channels ──
     const reloadHooks = buildReloadHooks({
         channelLoader,
@@ -609,36 +708,93 @@ async function main() {
     });
     // Make reload hooks accessible to IPC handler & ctl handler (both run in this process)
     globalThis.__evolclaw_reloadHooks = reloadHooks;
-    // I3: start IPC server LAST, after all hook setup, to eliminate race window
-    ipcServer.start();
-    // 运行时配置文件监控
-    const configPath = resolvePaths().config;
-    fs.watchFile(configPath, { interval: 5000 }, (_curr, _prev) => {
-        let newConfig;
-        try {
-            newConfig = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-        }
-        catch {
-            // JSON 解析失败 → 视为坏文件，备份内存中的好副本
-            const ts = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
-            const backupPath = path.join(resolvePaths().dataDir, `evolclaw-${ts}.json`);
-            fs.writeFileSync(backupPath, JSON.stringify(config, null, 2));
-            logger.warn(`[Config Watch] Config file is not valid JSON. In-memory snapshot saved to ${backupPath}`);
-            eventBus.publish({ type: 'config:corrupted', backupPath, reasons: ['Invalid JSON'] });
-            return;
+    // Hot-load handler: dynamically add a new agent at runtime
+    globalThis.__evolclaw_hotLoadAgent = async (aid) => {
+        const agent = agentRegistry.loadNewAgent(aid);
+        if (!agent)
+            throw new Error(`Failed to load agent ${aid}`);
+        // 创建 channels
+        const instances = await channelLoader.createForAgent(agent);
+        for (const inst of instances) {
+            registerChannelInstance(inst);
+            agent.channels.set(inst.adapter.channelName, inst.adapter);
+            channelInstances.push(inst);
         }
-        const result = validateConfigIntegrity(newConfig);
-        if (!result.valid) {
-            const ts = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
-            const backupPath = path.join(resolvePaths().dataDir, `evolclaw-${ts}.json`);
-            fs.writeFileSync(backupPath, JSON.stringify(config, null, 2));
-            logger.warn(`[Config Watch] Bad config write detected. Reasons: ${result.reasons.join('; ')}. In-memory snapshot saved to ${backupPath}`);
-            eventBus.publish({ type: 'config:corrupted', backupPath, reasons: result.reasons });
+        agent.status = 'running';
+        // 连接
+        await channelLoader.connectAll(instances);
+        logger.info(`[HotLoad] ✓ Agent ${aid} online with ${instances.length} channel(s)`);
+    };
+    // Full resync handler: scan disk, load new agents, unload removed/disabled, reload changed
+    globalThis.__evolclaw_resyncAgents = async () => {
+        const { loadAllAgents: scanAgents, loadDefaults: readDefaults, mergeForAgent: merge } = await import('./config-store.js');
+        const freshDefaults = readDefaults();
+        const { agents: diskAgents } = scanAgents();
+        const diskAidSet = new Set(diskAgents.map(a => a.aid));
+        const results = [];
+        // 1. 下线：运行时有但磁盘上没有 / disabled 的
+        for (const [aid, agent] of [...agentRegistry.agents.entries()]) {
+            const diskCfg = diskAgents.find(a => a.aid === aid);
+            if (!diskCfg || diskCfg.enabled === false) {
+                // 断开所有 channels
+                for (const chName of agent.channelInstanceNames()) {
+                    const inst = channelInstances.find(i => i.adapter.channelName === chName);
+                    if (inst) {
+                        try {
+                            await inst.disconnect();
+                        }
+                        catch { }
+                        const idx = channelInstances.indexOf(inst);
+                        if (idx >= 0)
+                            channelInstances.splice(idx, 1);
+                    }
+                }
+                agentRegistry.agents.delete(aid);
+                results.push(`- ${aid} (offline)`);
+                continue;
+            }
         }
-        else {
-            logger.debug(`[Config Watch] Config file modified, passes integrity check`);
+        // 2. 新增：磁盘上有但运行时没有的
+        for (const cfg of diskAgents) {
+            if (cfg.enabled === false)
+                continue;
+            if (agentRegistry.agents.has(cfg.aid))
+                continue;
+            try {
+                await globalThis.__evolclaw_hotLoadAgent(cfg.aid);
+                results.push(`+ ${cfg.aid} (online)`);
+            }
+            catch (e) {
+                results.push(`✗ ${cfg.aid}: ${e?.message || e}`);
+            }
         }
-    });
+        // 3. 已有的：重新 reload（config 可能改了）
+        const hooks = globalThis.__evolclaw_reloadHooks;
+        for (const cfg of diskAgents) {
+            if (cfg.enabled === false)
+                continue;
+            if (!agentRegistry.agents.has(cfg.aid))
+                continue;
+            // 只有磁盘上存在且运行时也存在的才 reload
+            try {
+                await agentRegistry.reload(cfg.aid, hooks);
+                results.push(`↻ ${cfg.aid} (reloaded)`);
+            }
+            catch (e) {
+                results.push(`⚠ ${cfg.aid}: ${e?.message || e}`);
+            }
+        }
+        // 重建 channel index
+        agentRegistry.channelIndex.clear();
+        agentRegistry.buildChannelIndex();
+        logger.info(`[Resync] Done: ${results.length} agent(s) processed`);
+        return results;
+    };
+    // I3: start IPC server LAST, after all hook setup, to eliminate race window
+    ipcServer.start();
+    // 配置 reload 走 IPC `evolagent.reload` 触发，不再用 watchFile。
+    // 双 rename 原子写下 watchFile 的语义会被破坏，且新结构有 N 个 config.json 要监控；
+    // 显式触发更可控。
     // 优雅关闭
     let shutdownSignal = 'unknown';
     const shutdown = async (signal) => {
@@ -647,7 +803,6 @@ async function main() {
         const pid = process.pid;
         const ppid = process.ppid;
         logger.info(`\n\nShutting down gracefully... (signal=${shutdownSignal}, pid=${pid}, ppid=${ppid})`);
-        fs.unwatchFile(configPath);
         ipcServer.stop();
         eventBus.publish({
             type: 'system:shutdown',
@@ -660,15 +815,24 @@ async function main() {
             eventBus.publish({ type: 'channel:disconnected', channel: type, channelName: inst.adapter.channelName, reason: 'shutdown' });
         }
         sessionManager.close();
+        removeAll();
         logger.info('✓ Shutdown complete');
         process.exit(0);
     };
     process.on('SIGINT', () => shutdown('SIGINT'));
     process.on('SIGTERM', () => shutdown('SIGTERM'));
+    // 兜底：进程退出前同步删除 instance 文件（防 async shutdown 未完成就被杀）
+    process.on('exit', () => {
+        removeAll();
+    });
+}
+// 仅在直接执行时启动；导入此模块（如单元测试）时不触发 main()。
+import { isMainScript } from './utils/cross-platform.js';
+if (isMainScript(import.meta.url)) {
+    main().catch((error) => {
+        const msg = `Fatal error: ${error?.stack || error}`;
+        logger.error('Fatal error:', error);
+        console.error(msg); // ensure it lands in stdout.log for self-heal diagnostics
+        process.exit(1);
+    });
 }
-main().catch((error) => {
-    const msg = `Fatal error: ${error?.stack || error}`;
-    logger.error('Fatal error:', error);
-    console.error(msg); // ensure it lands in stdout.log for self-heal diagnostics
-    process.exit(1);
-});