evolclaw 2.8.0 → 2.8.2

package/dist/core/message/message-queue.js

@@ -1,8 +1,10 @@
 import path from 'path';
 import { logger } from '../../utils/logger.js';
+const DEFAULT_AGENT_NAME = '[default]';
 export class MessageQueue {
     queues = new Map();
     processing = new Set();
+    processingAgent = new Map(); // queueKey → agentName（处理中项目的 agent）
     externalLocks = new Map();
     handler;
     currentSessionKey;
@@ -77,18 +79,24 @@ export class MessageQueue {
             return Promise.resolve();
         }
         const queueKey = this.getQueueKey(sessionKey, projectPath);
-        logger.debug(`[Queue] Enqueuing message for ${queueKey}`);
+        const agentName = options?.agentName || DEFAULT_AGENT_NAME;
+        logger.debug(`[Queue] Enqueuing message for ${queueKey} (agent=${agentName})`);
         return new Promise((resolve, reject) => {
             if (!this.queues.has(queueKey)) {
                 this.queues.set(queueKey, []);
             }
-            this.queues.get(queueKey).push({ message, projectPath, resolve, reject });
+            this.queues.get(queueKey).push({ message, projectPath, agentName, resolve, reject });
             // 根据 interruptible 选项决定是否触发中断
             if (this.processing.has(queueKey)) {
                 if (options?.interruptible !== false) {
                     // 单聊：保留中断行为
                     logger.debug(`[Queue] ${queueKey} is processing, triggering interrupt`);
-                    this.eventBus?.publish({ type: 'message:interrupted', sessionId: sessionKey, reason: 'new_message' });
+                    this.eventBus?.publish({
+                        type: 'message:interrupted',
+                        sessionId: sessionKey,
+                        reason: 'new_message',
+                        agentName: this.processingAgent.get(queueKey),
+                    });
                     if (this.interruptCallback) {
                         this.interruptCallback(sessionKey, this.currentAgentId).catch(() => { });
                     }
@@ -118,6 +126,7 @@ export class MessageQueue {
             if (!queue || queue.length === 0) {
                 logger.debug(`[Queue] Queue ${queueKey} is empty, stopping`);
                 this.processing.delete(queueKey);
+                this.processingAgent.delete(queueKey);
                 this.currentSessionKey = undefined;
                 this.currentProjectPath = undefined;
                 this.activeMessageIds.clear();
@@ -129,6 +138,7 @@ export class MessageQueue {
             this.currentSessionKey = queueKey;
             this.currentProjectPath = merged.projectPath;
             this.currentAgentId = merged.message.agentId;
+            this.processingAgent.set(queueKey, merged.agentName);
             // 记录正在执行的 messageId（用于撤回中断）
             this.activeMessageIds.clear();
             for (const item of items) {
@@ -203,6 +213,7 @@ export class MessageQueue {
         return {
             message: merged,
             projectPath: last.projectPath,
+            agentName: last.agentName,
             resolve: () => { }, // 由调用方管理
             reject: () => { },
         };
@@ -226,6 +237,20 @@ export class MessageQueue {
         }
         return false;
     }
+    /**
+     * 检查指定 channel 下是否有任何 session 在处理。
+     * queueKey 格式为 `${sessionKey}::${projectPath}`，其中 sessionKey
+     * 形如 `${channelName}-${channelId}-${ts}`，因此匹配 `${channelName}-` 前缀。
+     */
+    isChannelProcessing(channelName) {
+        const prefix = `${channelName}-`;
+        for (const key of this.processing.keys()) {
+            if (key.startsWith(prefix) || key.startsWith(`${channelName}::`)) {
+                return true;
+            }
+        }
+        return false;
+    }
     cancel(messageId) {
         for (const queue of this.queues.values()) {
             const idx = queue.findIndex(q => q.message.messageId === messageId);
@@ -250,7 +275,12 @@ export class MessageQueue {
         // 从 queueKey 提取 sessionKey
         const sessionKey = this.currentSessionKey.split('::')[0];
         logger.info(`[Queue] Recalled active message ${messageId}, interrupting session ${sessionKey}`);
-        this.eventBus?.publish({ type: 'message:interrupted', sessionId: sessionKey, reason: 'recalled' });
+        this.eventBus?.publish({
+            type: 'message:interrupted',
+            sessionId: sessionKey,
+            reason: 'recalled',
+            agentName: this.processingAgent.get(this.currentSessionKey),
+        });
         if (this.interruptCallback) {
             this.interruptCallback(sessionKey, this.currentAgentId).catch(() => { });
         }
@@ -293,4 +323,29 @@ export class MessageQueue {
     getGlobalProcessingCount() {
         return this.processing.size;
     }
+    /**
+     * 获取指定 agent 的待处理消息数量。
+     * agent 维度按 enqueue 时传入的 agentName 计数。
+     */
+    getQueueLengthByAgent(agentName) {
+        let total = 0;
+        for (const queue of this.queues.values()) {
+            for (const item of queue) {
+                if ((item.agentName || DEFAULT_AGENT_NAME) === agentName)
+                    total++;
+            }
+        }
+        return total;
+    }
+    /**
+     * 获取指定 agent 的处理中队列数量。
+     */
+    getProcessingCountByAgent(agentName) {
+        let total = 0;
+        for (const a of this.processingAgent.values()) {
+            if ((a || DEFAULT_AGENT_NAME) === agentName)
+                total++;
+        }
+        return total;
+    }
 }

package/dist/core/reload-hooks.js

@@ -0,0 +1,87 @@
+/**
+ * Reload Hooks
+ *
+ * Extracted from index.ts main() for testability. Builds the ReloadHooks
+ * implementation used by AgentRegistry.reload() to drain/disconnect/start
+ * channels during a hot reload.
+ */
+import { logger } from '../utils/logger.js';
+export function buildReloadHooks(deps) {
+    const { channelLoader, channelInstances, registerChannelInstance, messageQueue } = deps;
+    const drainDelayMs = deps.drainDelayMs ?? 500;
+    const drainTimeoutMs = deps.drainTimeoutMs ?? 30000;
+    return {
+        async drainChannel(channelName) {
+            logger.info(`[Reload] Draining channel: ${channelName}`);
+            if (messageQueue) {
+                // Real drain: poll until empty or timeout
+                const pollMs = 100;
+                const start = Date.now();
+                while (messageQueue.isChannelProcessing(channelName)) {
+                    if (Date.now() - start > drainTimeoutMs) {
+                        logger.warn(`[Reload] Drain timeout (${drainTimeoutMs}ms) for channel: ${channelName}, proceeding anyway`);
+                        return;
+                    }
+                    await new Promise(r => setTimeout(r, pollMs));
+                }
+                logger.info(`[Reload] Drain complete: ${channelName}`);
+            }
+            else if (drainDelayMs > 0) {
+                await new Promise(r => setTimeout(r, drainDelayMs));
+            }
+        },
+        async disconnectChannel(channelName) {
+            const inst = channelInstances.find(i => i.adapter.channelName === channelName);
+            if (!inst) {
+                logger.warn(`[Reload] Channel ${channelName} not found, skipping disconnect`);
+                return;
+            }
+            try {
+                await inst.disconnect();
+                const idx = channelInstances.indexOf(inst);
+                if (idx >= 0)
+                    channelInstances.splice(idx, 1);
+                logger.info(`[Reload] Disconnected channel: ${channelName}`);
+            }
+            catch (e) {
+                logger.error(`[Reload] Failed to disconnect ${channelName}: ${e}`);
+                throw e;
+            }
+        },
+        async startChannel(agent, channelName) {
+            const channels = agent.config.channels;
+            let channelType = null;
+            for (const [type, raw] of Object.entries(channels)) {
+                const instances = Array.isArray(raw) ? raw : [raw];
+                for (const inst of instances) {
+                    const name = inst.name ?? type;
+                    if (name === channelName) {
+                        channelType = type;
+                        break;
+                    }
+                }
+                if (channelType)
+                    break;
+            }
+            if (!channelType) {
+                const msg = `[Reload] Channel ${channelName} not found in agent ${agent.name} config`;
+                logger.error(msg);
+                throw new Error(msg);
+            }
+            const partialConfig = {
+                agents: agent.config.agents,
+                channels: { [channelType]: channels[channelType] },
+                projects: agent.config.projects,
+            };
+            const newInstances = await channelLoader.createAll(partialConfig);
+            const newInst = newInstances.find(i => i.adapter.channelName === channelName);
+            if (!newInst) {
+                throw new Error(`[Reload] Failed to create instance ${channelName}`);
+            }
+            registerChannelInstance(newInst);
+            await newInst.connect();
+            channelInstances.push(newInst);
+            logger.info(`[Reload] Started channel: ${channelName}`);
+        },
+    };
+}

package/dist/index.js

@@ -1,7 +1,7 @@
 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 } from './config.js';
+import { loadConfig, ensureDataDirs, resolvePaths, resolveAnthropicConfig, isOwner, isAdmin, validateConfigIntegrity, validateChannelInstanceNames, getOwner, getDefaultSessionMode, setOwner as setOwnerInGlobalConfig, setChannelShowActivities as setShowActivitiesInGlobalConfig } from './config.js';
 import { SessionManager } from './core/session/session-manager.js';
 import { ClaudeAgentPlugin } from './agents/claude-runner.js';
 import { CodexAgentPlugin } from './agents/codex-runner.js';
@@ -23,10 +23,12 @@ 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 { EvolAgentRegistry } from './core/evolagent-registry.js';
+import { buildReloadHooks } from './utils/reload-hooks.js';
 import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
-import { detectDuplicates } from './utils/channel-fingerprint.js';
-import { loadPromptTemplates } from './prompts/templates.js';
+import { detectDuplicates } from './core/evolagent-registry.js';
+import { loadPromptTemplates } from './agents/templates.js';
 import path from 'path';
 import fs from 'fs';
 async function main() {
@@ -82,13 +84,45 @@ async function main() {
     if (anthropic.baseUrl) {
         logger.info(`✓ Using custom API base URL: ${anthropic.baseUrl}`);
     }
+    // EvolAgent Registry
+    const agentRegistry = new EvolAgentRegistry(paths.agentsDir, {
+        setOwner: (channelName, userId) => {
+            setOwnerInGlobalConfig(config, channelName, userId);
+        },
+        setShowActivities: (channelName, mode) => {
+            setShowActivitiesInGlobalConfig(config, channelName, mode);
+        },
+    });
+    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)}`);
+            }
+        }
+    }
+    // Store for IPC access (T10 will wire this)
+    // M4: removed dead globalThis.__evolclaw_agentRegistry assignment
     // 创建事件总线
     const eventBus = new EventBus();
     logger.info('✓ Event bus initialized');
     // 统计收集器（近 1 小时滚动统计）
     const statsCollector = new StatsCollector(eventBus);
     // 初始化数据库（带 ownerResolver）
-    const sessionManager = new SessionManager(undefined, eventBus, (channel, userId) => isOwner(config, channel, userId), (channel, userId) => isAdmin(config, channel, userId));
+    // 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);
@@ -143,8 +177,48 @@ async function main() {
     channelLoader.register(new DingtalkChannelPlugin());
     channelLoader.register(new QQBotChannelPlugin());
     channelLoader.register(new WecomChannelPlugin());
-    const channelInstances = await channelLoader.createAll(config);
-    logger.info(`✓ Created ${channelInstances.length} channel instance(s)`);
+    // Create channel instances: default (from evolclaw.json) + each evolagent
+    const defaultInstances = await channelLoader.createAll(config);
+    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);
+            evolagentInstances.push(...instances);
+        }
+        catch (e) {
+            logger.error(`[EvolAgent] Failed to create channels for ${agent.name}: ${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();
     // 创建命令处理器
@@ -166,6 +240,13 @@ async function main() {
     }, defaultAgent);
     // 回填 processor 和 messageQueue 的引用
     cmdHandler.setProcessor(processor);
+    // Inject EvolAgentRegistry (methods added by T6/T7)
+    if (processor.setAgentRegistry) {
+        processor.setAgentRegistry(agentRegistry);
+    }
+    if (cmdHandler.setAgentRegistry) {
+        cmdHandler.setAgentRegistry(agentRegistry);
+    }
     // 设置交互路由器
     processor.setInteractionRouter(interactionRouter);
     // 设置 compact 开始回调（对所有支持的 agent）
@@ -203,12 +284,18 @@ async function main() {
     };
     // ── MessageBridge：Channel ↔ Core 消息桥梁 ──
     const msgBridge = new MessageBridge(config, sessionManager, processor, messageQueue, cmdHandler, eventBus);
+    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) => {
-                const session = await sessionManager.getOrCreateSession(inst.adapter.channelName, channelId, config.projects?.defaultPath || process.cwd(), undefined, undefined, undefined, undefined);
+                // Effective default path: agent's projectPath if agent-owned, else global
+                const owningAgent = agentRegistry.resolveByChannel(inst.adapter.channelName);
+                const effectiveDefault = (owningAgent && !owningAgent.isDefault)
+                    ? owningAgent.projectPath
+                    : (config.projects?.defaultPath || process.cwd());
+                const session = await sessionManager.getOrCreateSession(inst.adapter.channelName, channelId, effectiveDefault, undefined, undefined, undefined, undefined);
                 return path.isAbsolute(session.projectPath)
                     ? session.projectPath
                     : path.resolve(process.cwd(), session.projectPath);
@@ -348,20 +435,20 @@ async function main() {
     for (const inst of channelInstances) {
         registerChannelInstance(inst);
     }
-    // ── 设置热加载回调 ──
-    cmdHandler.setHotLoadChannel(async (inst) => {
-        registerChannelInstance(inst);
-        channelInstances.push(inst);
-        await inst.connect();
-        eventBus.publish({
-            type: 'channel:connected',
-            channel: (inst.channelType || inst.adapter.channelName).toLowerCase(),
-            channelName: inst.adapter.channelName,
-            timestamp: Date.now(),
-        });
-    });
     // ── 连接所有渠道 ──
     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);
+    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)) {
+            agent.status = 'running';
+        }
+    }
     // 预填充 Feishu 已知 thread_id（重启后避免误判话题创建）
     for (const inst of channelInstances) {
         const channelType = inst.channelType || inst.adapter.channelName;
@@ -396,7 +483,7 @@ async function main() {
                 continue; // 跳过同类型通道
             if (notified.has(otherType))
                 continue; // 同类型已通知过
-            const ownerId = getOwner(config, other.adapter.channelName);
+            const ownerId = agentRegistry.getOwner(other.adapter.channelName) ?? getOwner(config, other.adapter.channelName);
             if (!ownerId)
                 continue;
             notified.add(otherType);
@@ -511,6 +598,18 @@ 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);
+    // ── Reload hooks: enable agentRegistry.reload() to drain/disconnect/restart channels ──
+    const reloadHooks = buildReloadHooks({
+        channelLoader,
+        channelInstances,
+        registerChannelInstance,
+        messageQueue,
+    });
+    // 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;

package/dist/ipc.js

@@ -8,11 +8,16 @@ export class IpcServer {
     getStatus;
     commandExecutor;
     server = null;
+    agentRegistry;
     constructor(socketPath, getStatus, commandExecutor) {
         this.socketPath = socketPath;
         this.getStatus = getStatus;
         this.commandExecutor = commandExecutor;
     }
+    /** Inject EvolAgentRegistry for evolagent.* IPC handlers */
+    setAgentRegistry(registry) {
+        this.agentRegistry = registry;
+    }
     start() {
         // Remove stale socket file (Unix only — named pipes auto-cleanup on process exit)
         if (!isNamedPipe(this.socketPath)) {
@@ -82,6 +87,48 @@ export class IpcServer {
                     return { ok: false, error: 'missing cmd or sessionId' };
                 return await this.commandExecutor(slashCmd, sessionId);
             }
+            case 'evolagent.list': {
+                if (!this.agentRegistry)
+                    return { ok: false, error: 'EvolAgentRegistry not available' };
+                return { ok: true, agents: this.agentRegistry.list() };
+            }
+            case 'evolagent.show': {
+                if (!this.agentRegistry)
+                    return { ok: false, error: 'EvolAgentRegistry not available' };
+                const name = cmd.name;
+                if (!name || typeof name !== 'string')
+                    return { ok: false, error: 'missing name' };
+                const agent = this.agentRegistry.get(name);
+                if (!agent)
+                    return { ok: false, error: `Agent "${name}" not found` };
+                const info = this.agentRegistry.list().find((i) => i.name === name);
+                // I7: null-guard list().find() result
+                if (!info)
+                    return { ok: false, error: `Agent "${name}" found but info missing (race?)` };
+                return { ok: true, agent: info };
+            }
+            case 'evolagent.reload': {
+                if (!this.agentRegistry)
+                    return { ok: false, error: 'EvolAgentRegistry not available' };
+                const name = cmd.name;
+                if (!name || typeof name !== 'string')
+                    return { ok: false, error: 'missing name' };
+                const hooks = globalThis.__evolclaw_reloadHooks;
+                if (!hooks)
+                    return { ok: false, error: 'Reload hooks not initialized' };
+                try {
+                    const a = this.agentRegistry.get(name);
+                    if (!a)
+                        return { ok: false, error: `Agent "${name}" not found` };
+                    if (!this.agentRegistry.reload)
+                        return { ok: false, error: 'EvolAgentRegistry.reload not available' };
+                    await this.agentRegistry.reload(name, hooks);
+                    return { ok: true, result: `Agent "${name}" reloaded` };
+                }
+                catch (e) {
+                    return { ok: false, error: e?.message || String(e) };
+                }
+            }
             default:
                 return { error: `unknown command: ${cmd.type}` };
         }

package/dist/paths.js

@@ -32,6 +32,7 @@ export function resolvePaths() {
         pid: path.join(root, 'logs', 'evolclaw.pid'),
         dataDir: path.join(root, 'data'),
         logs: path.join(root, 'logs'),
+        agentsDir: path.join(root, 'agents'),
         lineStats: path.join(root, 'logs', 'line-stats.log'),
         readySignal: path.join(root, 'logs', 'ready.signal'),
         selfHealLog: path.join(root, 'logs', 'self-heal.md'),
@@ -49,6 +50,7 @@ export function ensureDataDirs() {
     const p = resolvePaths();
     fs.mkdirSync(p.dataDir, { recursive: true });
     fs.mkdirSync(p.logs, { recursive: true });
+    fs.mkdirSync(p.agentsDir, { recursive: true });
 }
 export function getPackageRoot() {
     // import.meta.dirname is available in Node.js 21.2+ and always returns

package/dist/types.js

@@ -3,3 +3,5 @@
 // Array form: `name` is required to distinguish instances.
 /** Default permission mode applied to new sessions. Change here to affect all roles. */
 export const DEFAULT_PERMISSION_MODE = 'bypass';
+/** Reserved agent name used for DefaultAgent (no agent.json file). */
+export const DEFAULT_AGENT_NAME = '[default]';