evolclaw 2.8.0 → 2.8.1

package/dist/core/command-handler.js

@@ -128,7 +128,6 @@ export class CommandHandler {
     permissionGateway;
     interactionRouter;
     statsCollector;
-    hotLoadChannel;
     agentMap;
     defaultAgentId;
     /** 按 agentId 获取 agent，回退到默认 */
@@ -294,9 +293,6 @@ export class CommandHandler {
     setMessageQueue(messageQueue) {
         this.messageQueue = messageQueue;
     }
-    setHotLoadChannel(fn) {
-        this.hotLoadChannel = fn;
-    }
     setPermissionGateway(gateway) {
         this.permissionGateway = gateway;
     }
@@ -442,9 +438,9 @@ export class CommandHandler {
                     ] : []),
                     ...(isOwner ? [
                         { cmd: '/file', label: '发送项目内文件', desc: '将项目目录内的文件发送给用户' },
-                        { cmd: '/aid', label: 'AID 管理', desc: '创建新 AID 并上线新 Agent 实例', next: { type: 'select', items: [
-                                    { value: 'list', label: '列表', desc: '列出所有 AUN 实例及连接状态' },
-                                    { value: 'new', label: '创建', desc: '创建新 AID 并热加载上线', next: { type: 'text' } },
+                        { cmd: '/aid', label: 'AID 身份管理', desc: '管理本地 AID 身份（创建/列表）', next: { type: 'select', items: [
+                                    { value: 'list', label: '列表', desc: '列出本地所有 AID' },
+                                    { value: 'new', label: '创建', desc: '创建新 AID 身份', next: { type: 'text' } },
                                 ] } },
                         { cmd: '/agentmd', label: '管理 agent.md', desc: '查看或更新 AUN 网络上的 agent.md 身份文件', next: { type: 'select', items: [
                                     { value: 'put', label: '上传当前', desc: '将本地 agent.md 上传到 AUN 网络' },
@@ -741,7 +737,7 @@ export class CommandHandler {
                 ...(isOwner ? [
                     '  /restart - 重启服务',
                     '  /file [channel] <path> - 发送项目内文件',
-                    '  /aid [list|new <aid>] - AID 管理',
+                    '  /aid [list|new <aid>] - AID 身份管理',
                     '  /agentmd [put|set <内容>] - 管理 agent.md',
                 ] : []),
                 '',
@@ -1299,87 +1295,51 @@ export class CommandHandler {
             }
             return `✓ 推理强度: ${newEffort}`;
         }
-        // /aid 命令：AID 管理（list / new）
+        // /aid 命令：AID 身份管理（list / new）
         if (normalizedContent === '/aid' || normalizedContent === '/aid list' || normalizedContent.startsWith('/aid ')) {
             if (!isOwner)
                 return '❌ 无权限：此命令仅限 owner 使用';
-            const adapter = this.adapters.get(channel);
-            const channelType = this.channelTypeMap.get(channel);
-            if (channelType !== 'aun')
-                return '❌ 此命令仅在 AUN 通道中可用';
             const arg = normalizedContent.slice(4).trim();
-            // /aid 或 /aid list — 列出所有 AUN 实例
+            const { aidList, aidCreate, agentmdPut, buildInitialAgentMd, isValidAid } = await import('../channels/aun-ops.js');
+            // /aid 或 /aid list — 列出本地所有 AID
             if (!arg || arg === 'list') {
-                const { normalizeChannelInstances } = await import('../config.js');
-                const instances = normalizeChannelInstances(this.config.channels?.aun, 'aun');
-                if (instances.length === 0)
-                    return '暂无 AUN 实例';
-                const lines = ['AUN 实例:'];
-                for (const inst of instances) {
-                    if (inst.enabled === false || !inst.aid)
-                        continue;
-                    const channelObj = this.channelObjects.get(inst.name);
-                    const status = channelObj?.getStatus?.();
-                    const connected = status?.connected ?? false;
-                    const icon = connected ? '✓' : '✗';
-                    const state = connected ? '已连接' : '未连接';
-                    lines.push(`  ${icon} ${inst.name}  ${inst.aid}  ${state}`);
-                }
+                const aids = aidList();
+                if (aids.length === 0)
+                    return '本地无 AID';
+                const lines = ['本地 AID:'];
+                for (const a of aids) {
+                    const icons = [
+                        a.hasPrivateKey ? '🔑' : '  ',
+                        a.hasAgentMd ? '📄' : '  ',
+                    ].join('');
+                    lines.push(`  ${icons} ${a.aid}`);
+                }
+                lines.push('\n🔑=私钥  📄=agent.md');
                 return lines.join('\n');
             }
-            // /aid new <aid> — 创建新 AID 并热加载
+            // /aid new <aid> — 创建 AID（纯身份，不动 config）
             if (arg.startsWith('new ')) {
-                const rawName = arg.slice(4).trim();
-                if (!rawName)
-                    return '用法: /aid new <aid>\n例: /aid new reviewer';
-                if (!this.hotLoadChannel)
-                    return '❌ 热加载未就绪';
-                // Derive full AID: if no dots, append domain from current AID
-                const selfAid = typeof adapter._selfAid === 'function' ? adapter._selfAid() : '';
-                let fullAid = rawName;
-                if (!rawName.includes('.')) {
-                    const domain = selfAid.split('.').slice(1).join('.');
-                    if (!domain)
-                        return '❌ 无法推导 AID 域（当前实例未连接）';
-                    fullAid = `${rawName}.${domain}`;
-                }
-                // Validate AID format
-                const { isValidAid } = await import('../utils/init-channel.js');
-                if (!isValidAid(fullAid))
-                    return `❌ 无效 AID 格式: ${fullAid}`;
-                // Check instance name conflict
-                const instName = rawName.includes('.') ? rawName.split('.')[0] : rawName;
-                const { normalizeChannelInstances } = await import('../config.js');
-                const existing = normalizeChannelInstances(this.config.channels?.aun, 'aun');
-                if (existing.some(e => e.name === instName)) {
-                    return `❌ 实例名 "${instName}" 已存在`;
-                }
-                if (existing.some(e => e.aid === fullAid)) {
-                    return `❌ AID ${fullAid} 已在配置中`;
-                }
-                // Create AID (reuse init-channel.ts silent logic)
+                const rawAid = arg.slice(4).trim();
+                if (!rawAid)
+                    return '用法: /aid new <完整AID>\n例: /aid new reviewer.agentid.pub';
+                if (!isValidAid(rawAid))
+                    return `❌ 无效 AID 格式: ${rawAid}`;
                 try {
-                    const { createAidSilent, appendAunInstance } = await import('../utils/init-channel.js');
-                    const createResult = await createAidSilent({ aid: fullAid, owner: selfAid });
-                    // Resolve owner from current AUN instance config
-                    const owner = this.config.channels?.aun
-                        ? (Array.isArray(this.config.channels.aun)
-                            ? this.config.channels.aun.find((a) => a.aid === selfAid)?.owner
-                            : this.config.channels.aun.owner)
-                        : undefined;
-                    // Hot-load: build and register new channel instance BEFORE writing config
-                    const { AUNChannelPlugin } = await import('../channels/aun.js');
-                    const plugin = new AUNChannelPlugin();
-                    const tempConfig = JSON.parse(JSON.stringify(this.config));
-                    tempConfig.channels.aun = [{ name: instName, enabled: true, aid: fullAid, owner }];
-                    const newInstances = await plugin.createChannels(tempConfig);
-                    if (newInstances.length === 0)
-                        return '❌ 通道实例创建失败';
-                    await this.hotLoadChannel(newInstances[0]);
-                    // Write config only after successful hot-load
-                    appendAunInstance(this.config, { name: instName, aid: fullAid, owner });
-                    const verb = createResult.alreadyExisted ? '已存在，现已上线' : '已创建并上线';
-                    return `✓ ${fullAid} ${verb}\n  实例名: ${instName}\n  可在 AUN 中搜索该 AID 开始对话`;
+                    const result = await aidCreate(rawAid);
+                    if (!result.alreadyExisted) {
+                        const content = buildInitialAgentMd({ aid: rawAid });
+                        try {
+                            await agentmdPut(content, { aid: rawAid, client: result.client });
+                        }
+                        catch { /* non-fatal */ }
+                    }
+                    try {
+                        await result.client.close();
+                    }
+                    catch { /* ignore */ }
+                    const verb = result.alreadyExisted ? '已存在' : '已创建';
+                    return `✓ ${rawAid} ${verb}
+  如需上线 AUN 通道，运行 evolclaw init aun`;
                 }
                 catch (e) {
                     return `❌ 创建失败: ${String(e.message || e).slice(0, 200)}`;
@@ -1387,7 +1347,7 @@ export class CommandHandler {
             }
             return '用法: /aid [list|new <aid>]';
         }
-        // /activity 命令：控制中间输出显示模式
+        // /agentmd 命令：管理 agent.md 身份文件
         if (normalizedContent === '/agentmd' || normalizedContent.startsWith('/agentmd ')) {
             if (!isOwner)
                 return '❌ 无权限：此命令仅限 owner 使用';
@@ -1396,7 +1356,8 @@ export class CommandHandler {
                 return '❌ 当前通道不支持 agent.md 操作';
             const selfAid = typeof adapter._selfAid === 'function' ? adapter._selfAid() : '';
             const arg = normalizedContent.slice(9).trim();
-            // put — read local ~/.aun/AIDs/{aid}/agent.md and upload
+            const { agentmdGet, agentmdPut } = await import('../channels/aun-ops.js');
+            // put — read local agent.md and upload to network
             if (arg === 'put') {
                 if (!selfAid)
                     return '❌ 未连接，无法确定本地 AID';
@@ -1405,15 +1366,17 @@ export class CommandHandler {
                     const { join } = await import('node:path');
                     const { homedir } = await import('node:os');
                     const localPath = join(homedir(), '.aun', 'AIDs', selfAid, 'agent.md');
+                    if (!readFileSync)
+                        return '❌ 读取失败';
                     const content = readFileSync(localPath, 'utf-8');
-                    await adapter.uploadAgentMd(content);
+                    await agentmdPut(content, { aid: selfAid });
                     return '✅ agent.md 已发布';
                 }
                 catch (e) {
                     return `❌ 发布失败: ${String(e.message || e).slice(0, 100)}`;
                 }
             }
-            // set <content> — upload inline content and sync to local
+            // set <content> — upload inline content
             if (arg.startsWith('set ')) {
                 const content = arg.slice(4).trim();
                 if (!content)
@@ -1421,13 +1384,7 @@ export class CommandHandler {
                 if (!selfAid)
                     return '❌ 未连接，无法确定本地 AID';
                 try {
-                    await adapter.uploadAgentMd(content);
-                    const { writeFileSync, mkdirSync } = await import('node:fs');
-                    const { join } = await import('node:path');
-                    const { homedir } = await import('node:os');
-                    const localDir = join(homedir(), '.aun', 'AIDs', selfAid);
-                    mkdirSync(localDir, { recursive: true });
-                    writeFileSync(join(localDir, 'agent.md'), content, 'utf-8');
+                    await agentmdPut(content, { aid: selfAid });
                     return '✅ agent.md 已更新并发布到AUN网络';
                 }
                 catch (e) {
@@ -1439,7 +1396,7 @@ export class CommandHandler {
             if (!aidToView)
                 return '用法：/agentmd [<aid>] | put | set <内容>';
             try {
-                const md = await adapter.downloadAgentMd(aidToView);
+                const md = await agentmdGet(aidToView);
                 if (!md || !md.trim())
                     return `ℹ️ ${aidToView} 尚未设置 agent.md`;
                 return `\`\`\`\n${md.slice(0, 1500)}\n\`\`\``;
@@ -2530,11 +2487,11 @@ export class CommandHandler {
                     return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /s 查看可用会话`;
                 }
             }
-            if (!targetSession && sessionName.length === 8) {
+            if (!targetSession && sessionName.length >= 8) {
                 targetSession = await this.sessionManager.getSessionByUuidPrefix(channel, channelId, sessionName);
             }
             const canImport = policy.canImportCliSession(session?.chatType || 'private', identity.role);
-            if (!targetSession && sessionName.length === 8 && canImport) {
+            if (!targetSession && sessionName.length >= 8 && canImport) {
                 const projectPaths = Object.values(this.projects);
                 if (session) {
                     projectPaths.unshift(session.projectPath);
@@ -2637,7 +2594,7 @@ export class CommandHandler {
                     return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /s 查看可用会话`;
                 }
             }
-            if (!targetSession && sessionName.length === 8) {
+            if (!targetSession && sessionName.length >= 8) {
                 targetSession = await this.sessionManager.getSessionByUuidPrefix(channel, channelId, sessionName);
             }
             if (!targetSession) {

package/dist/core/evolagent-schema.js

@@ -0,0 +1,72 @@
+import path from 'path';
+const VALID_BASEAGENTS = new Set(['claude', 'codex', 'gemini', 'hermes']);
+const VALID_CHANNEL_TYPES = new Set(['feishu', 'aun', 'wechat', 'wecom', 'dingtalk', 'qqbot']);
+const VALID_CHATMODES = new Set(['interactive', 'proactive']);
+export function validateEvolAgentConfig(raw) {
+    const errors = [];
+    if (!raw || typeof raw !== 'object') {
+        return { valid: false, errors: ['config must be an object'] };
+    }
+    if (typeof raw.name !== 'string' || raw.name.trim() === '') {
+        errors.push('name is required and must be a non-empty string');
+    }
+    if (raw.enabled !== undefined && typeof raw.enabled !== 'boolean') {
+        errors.push('enabled must be a boolean if present');
+    }
+    if (!raw.agents || typeof raw.agents !== 'object') {
+        errors.push('agents must be an object with exactly one baseagent block');
+    }
+    else {
+        const keys = Object.keys(raw.agents).filter(k => VALID_BASEAGENTS.has(k));
+        const unknownKeys = Object.keys(raw.agents).filter(k => !VALID_BASEAGENTS.has(k));
+        if (unknownKeys.length > 0) {
+            errors.push(`agents contains unknown baseagent keys: ${unknownKeys.join(', ')}`);
+        }
+        if (keys.length === 0) {
+            errors.push('agents must contain exactly one of: claude | codex | gemini | hermes');
+        }
+        else if (keys.length > 1) {
+            errors.push(`agents must contain exactly one baseagent (single baseagent only), got: ${keys.join(', ')}`);
+        }
+    }
+    if (!raw.channels || typeof raw.channels !== 'object') {
+        errors.push('channels is required');
+    }
+    else {
+        const channelKeys = Object.keys(raw.channels);
+        if (channelKeys.length === 0) {
+            errors.push('channels must contain at least one channel type');
+        }
+        for (const key of channelKeys) {
+            if (!VALID_CHANNEL_TYPES.has(key)) {
+                errors.push(`unknown channel type: ${key}`);
+            }
+        }
+    }
+    if (!raw.projects || typeof raw.projects !== 'object') {
+        errors.push('projects is required');
+    }
+    else {
+        const p = raw.projects.defaultPath;
+        if (typeof p !== 'string' || p === '') {
+            errors.push('projects.defaultPath is required');
+        }
+        else if (!path.isAbsolute(p)) {
+            errors.push(`projects.defaultPath must be absolute, got: ${p}`);
+        }
+    }
+    if (raw.chatmode !== undefined) {
+        if (typeof raw.chatmode !== 'object' || raw.chatmode === null) {
+            errors.push('chatmode must be an object if present');
+        }
+        else {
+            for (const key of ['private', 'group']) {
+                const val = raw.chatmode[key];
+                if (val !== undefined && !VALID_CHATMODES.has(val)) {
+                    errors.push(`chatmode.${key} must be 'interactive' or 'proactive'`);
+                }
+            }
+        }
+    }
+    return { valid: errors.length === 0, errors };
+}

package/dist/core/evolagent.js

@@ -0,0 +1,66 @@
+export class EvolAgent {
+    name;
+    configPath;
+    config;
+    isDefault;
+    channels = new Map();
+    activeSessions = 0;
+    lastActivity;
+    status;
+    error;
+    constructor(configPath, config, opts = {}) {
+        this.configPath = configPath;
+        this.config = config;
+        this.name = config.name;
+        this.isDefault = opts.isDefault === true;
+        this.status = config.enabled === false ? 'disabled' : 'stopped';
+    }
+    get baseagent() {
+        const keys = Object.keys(this.config.agents);
+        return keys[0] || 'claude';
+    }
+    get model() {
+        return this.config.agents[this.baseagent]?.model;
+    }
+    get effort() {
+        return this.config.agents[this.baseagent]?.effort;
+    }
+    get projectPath() {
+        return this.config.projects.defaultPath;
+    }
+    channelInstanceNames() {
+        const names = [];
+        for (const [type, raw] of Object.entries(this.config.channels || {})) {
+            const instances = Array.isArray(raw) ? raw : [raw];
+            for (const inst of instances) {
+                if (!inst || typeof inst !== 'object')
+                    continue;
+                names.push(inst.name ?? type);
+            }
+        }
+        return names;
+    }
+    getContext(channelName, chatType, globalChatmode) {
+        const chatMode = this.resolveChatMode(chatType, globalChatmode);
+        return {
+            name: this.name,
+            isOwned: !this.isDefault,
+            baseagent: this.baseagent,
+            model: this.model,
+            effort: this.effort,
+            chatMode,
+            projectPath: this.projectPath,
+        };
+    }
+    resolveChatMode(chatType, globalChatmode) {
+        const agentCm = this.config.chatmode;
+        const key = chatType === 'group' ? 'group' : 'private';
+        if (agentCm) {
+            return (agentCm[key] || 'interactive');
+        }
+        if (globalChatmode) {
+            return (globalChatmode[key] || 'interactive');
+        }
+        return 'interactive';
+    }
+}

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

@@ -318,10 +318,15 @@ export class MessageProcessor {
             const modeInfo = isBackground ? ' [\u540e\u53f0]' : '';
             const e2eeInfo = message.replyContext?.metadata?.encrypted != null ? ` encrypt=${message.replyContext.metadata.encrypted}` : '';
             logger.info(`[${message.channel}] ${message.channelId}: ${message.content}${imageInfo}${modeInfo}${e2eeInfo}`);
-            logger.info(`[MessageProcessor] session=${session.id} task=${taskId} chatType=${session.chatType} sessionMode=${session.sessionMode} agentId=${session.agentId} msgChatType=${message.chatType ?? 'n/a'}`);
+            // 构建 peer 标识（优先 peerName，退化到 peerId / channelId）
+            const peerName = session.metadata?.peerName ?? message.peerName;
+            const peerId = session.metadata?.peerId ?? message.peerId ?? message.channelId;
+            const peerShort = peerId ? peerId.split('.')[0].split(':')[0] : '?';
+            const peerLabel = peerName && peerName !== peerShort ? `${peerShort}(${peerName})` : peerShort;
+            logger.info(`[MessageProcessor] session=${session.id} task=${taskId} peer=${peerLabel} chatType=${session.chatType} sessionMode=${session.sessionMode} agentId=${session.agentId} msgChatType=${message.chatType ?? 'n/a'}`);
             // 记录开始处理
             this.eventBus.publish({ type: 'message:processing', sessionId: session.id });
-            adapter.sendProcessingStatus?.(message.channelId, 'start', session.id, taskId, this.getReplyContext(message));
+            adapter.sendProcessingStatus?.(message.channelId, 'start', session.id, taskId, taskReplyContext());
             logger.message({
                 msgId: messageId,
                 sessionId: session.id,
@@ -531,8 +536,13 @@ export class MessageProcessor {
                 for (const match of fileMatches) {
                     // 兼容旧格式 (1组) 和新格式 (2组)
                     const hasChannelGroup = match.length >= 3;
-                    const targetSpec = hasChannelGroup ? (match[1] ?? undefined) : undefined;
-                    const filePath = (hasChannelGroup ? match[2] : match[1]).trim();
+                    let targetSpec = hasChannelGroup ? (match[1] ?? undefined) : undefined;
+                    let filePath = (hasChannelGroup ? match[2] : match[1]).trim();
+                    // 白名单校验：targetSpec 必须是已注册通道，否则视为路径的一部分（如 Windows 盘符 C:）
+                    if (targetSpec && !this.channels.has(targetSpec) && !this.channelTypeMap.has(targetSpec)) {
+                        filePath = `${targetSpec}:${filePath}`;
+                        targetSpec = undefined;
+                    }
                     if (this.isPlaceholderPath(filePath)) {
                         logger.info(`[${adapter.channelName}] Skipped placeholder file marker: [SEND_FILE:${filePath}]`);
                         continue;
@@ -639,7 +649,7 @@ export class MessageProcessor {
                 const errorSummary = streamResult.errors?.join('; ') || '任务执行失败';
                 const rawSubtype = streamResult.subtype || 'agent_error';
                 const errorType = prefixErrorType(ERROR_PREFIX.AGENT, rawSubtype);
-                adapter.sendProcessingStatus?.(message.channelId, 'error', session.id, taskId, this.getReplyContext(message));
+                adapter.sendProcessingStatus?.(message.channelId, 'error', session.id, taskId, taskReplyContext());
                 this.eventBus.publish({
                     type: 'message:error',
                     sessionId: session.id,
@@ -667,7 +677,7 @@ export class MessageProcessor {
             }
             else {
                 // 真正的成功
-                adapter.sendProcessingStatus?.(message.channelId, interruptReason ? 'interrupted' : 'done', session.id, taskId, this.getReplyContext(message));
+                adapter.sendProcessingStatus?.(message.channelId, interruptReason ? 'interrupted' : 'done', session.id, taskId, taskReplyContext());
                 await this.sessionManager.recordSuccess(session.id);
                 this.eventBus.publish({
                     type: 'message:completed',
@@ -722,7 +732,7 @@ export class MessageProcessor {
             // 用户主动中断（新消息打断 或 /stop 命令）时静默，不发送中断/错误提示
             if (!isUserInterrupt) {
                 try {
-                    adapter.sendProcessingStatus?.(message.channelId, procStatus, session.id, taskId, this.getReplyContext(message));
+                    adapter.sendProcessingStatus?.(message.channelId, procStatus, session.id, taskId, taskReplyContext());
                 }
                 catch { }
             }

package/dist/index.js

@@ -348,18 +348,6 @@ 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);
     // 预填充 Feishu 已知 thread_id（重启后避免误判话题创建）

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