evolclaw 2.8.3 → 3.1.0

package/dist/core/evolagent.js

@@ -1,299 +1,246 @@
-import fs from 'fs';
 import path from 'path';
+import fs from 'fs';
 import { logger } from '../utils/logger.js';
-import { validateDefaultChannelRef } from '../config.js';
-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).filter(k => k !== 'defaultChannel');
-        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}`);
-            }
-        }
-        // defaultChannel reference validation (same rules as evolclaw.json)
-        let totalInstances = 0;
-        for (const key of channelKeys) {
-            const block = raw.channels[key];
-            const insts = Array.isArray(block) ? block : (block ? [block] : []);
-            totalInstances += insts.length;
-        }
-        const dc = raw.channels.defaultChannel;
-        if (dc) {
-            const err = validateDefaultChannelRef(dc, raw.channels);
-            if (err)
-                errors.push(err);
-        }
-        else if (totalInstances > 1) {
-            errors.push('channels.defaultChannel is required when multiple channel instances are configured (use "type" or "type/instanceName")');
-        }
-    }
-    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 };
-}
+import { saveAgent } from '../config-store.js';
+import { formatChannelKey, tryParseChannelKey } from './channel-loader.js';
+import { agentPersonalDir } from '../paths.js';
+/**
+ * EvolAgent —— 一个 self-agent 的运行时表示。
+ *
+ * 输入：MergedAgentConfig（defaults + per-agent 合并后的 effective 形态）。
+ * 持有该 agent 的 channels Map、活跃状态、生命周期。
+ *
+ * 写入永远落到 agents/<aid>/config.json（通过 ConfigStore.saveAgent 走双 rename），
+ * 不再有 "DefaultAgent" 概念，不再有 globalWriter / configPath null 的路径。
+ */
 export class EvolAgent {
+    aid;
+    /** 兼容字段：name = aid。channel routing / log / IPC 都用 aid 作 agent 标识。 */
     name;
-    configPath;
-    config;
-    isDefault;
+    /** in-memory effective config（含 defaults 合并结果）；写盘时只回写 per-agent 部分。 */
+    merged;
+    /** per-agent 原始配置（写盘真相源） */
+    rawAgent;
     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';
+    triggerScheduler;
+    triggerManager;
+    constructor(rawAgent, merged) {
+        if (rawAgent.aid !== merged.aid) {
+            throw new Error(`EvolAgent: rawAgent.aid (${rawAgent.aid}) != merged.aid (${merged.aid})`);
+        }
+        this.rawAgent = rawAgent;
+        this.merged = merged;
+        this.aid = rawAgent.aid;
+        this.name = rawAgent.aid;
+        this.status = rawAgent.enabled === false ? 'disabled' : 'stopped';
+    }
+    /** 当前 effective config（合并后的） */
+    get config() {
+        return this.merged;
     }
     get baseagent() {
-        const keys = Object.keys(this.config.agents);
-        return keys[0] || 'claude';
+        return this.merged.active_baseagent || 'claude';
     }
     get model() {
-        return this.config.agents[this.baseagent]?.model;
+        const ba = this.baseagent;
+        const block = this.merged.baseagents?.[ba];
+        return block?.model;
     }
     get effort() {
-        return this.config.agents[this.baseagent]?.effort;
+        const ba = this.baseagent;
+        const block = this.merged.baseagents?.[ba];
+        if (ba === 'codex')
+            return block?.effort ?? block?.reasoning;
+        return block?.effort;
     }
     get projectPath() {
-        return this.config.projects.defaultPath;
+        return this.merged.projects?.defaultPath || process.cwd();
     }
+    // ── Channels ──────────────────────────────────────────────────────────
     /**
-     * Compute the effective channel-instance name (used as registry key, session.channel, etc).
-     *
-     * - DefaultAgent: rawName ?? type  (preserves backward-compat with evolclaw.json)
-     * - EvolAgent:
-     *   - rawName present → `${agent.name}-${type}-${rawName}`
-     *   - rawName absent  → `${agent.name}-${type}`
-     *
-     * The agent-name prefix avoids collisions with DefaultAgent channels, e.g.
-     * test-bot's aun → "test-bot-aun" instead of "aun".
+     * effective channel key：`<aid>#<type>#<name>`。AUN 实例一个 agent 只有一条；
+     * 其它类型靠 name 区分。
      */
     effectiveChannelName(type, rawName) {
-        if (this.isDefault)
-            return rawName ?? type;
-        return rawName ? `${this.name}-${type}-${rawName}` : `${this.name}-${type}`;
+        return formatChannelKey({ aid: this.aid, type, name: rawName });
     }
     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(this.effectiveChannelName(type, inst.name));
-            }
-        }
-        return names;
+        // AUN channel 隐式存在（从 agent.aid 派生），不需要在 channels[] 里声明
+        const aunKey = this.effectiveChannelName('aun', 'main');
+        const others = this.merged.channels
+            .filter(c => c.type !== 'aun')
+            .map(c => this.effectiveChannelName(c.type, c.name));
+        return [aunKey, ...others];
+    }
+    /** 列出所有 channel 实例（含 effective key） */
+    listChannels() {
+        return this.merged.channels.map(inst => ({
+            key: this.effectiveChannelName(inst.type, inst.name),
+            instance: inst,
+        }));
     }
     /**
-     * Locate a channel-instance config block within this agent's config by
-     * matching the effective channel name (with agent prefix for EvolAgents).
-     * Returns the raw mutable instance object, or `null` if not found.
+     * 按 effective channel key 找到 instance（只读视图）。
+     * 找不到返回 null。
      */
-    findChannelInstance(channelName) {
-        const channels = this.config.channels || {};
-        for (const [type, raw] of Object.entries(channels)) {
-            if (type === 'defaultChannel')
-                continue;
-            const instances = Array.isArray(raw) ? raw : [raw];
-            for (const inst of instances) {
-                if (!inst || typeof inst !== 'object')
-                    continue;
-                const effName = this.effectiveChannelName(type, inst.name);
-                if (effName === channelName)
-                    return inst;
-            }
-        }
-        return null;
-    }
-    /** Get owner of a specific channel instance owned by this agent. */
-    getOwner(channelName) {
-        const inst = this.findChannelInstance(channelName);
-        return inst?.owner;
-    }
-    /** True when `userId` is the owner of `channelName`. */
-    isOwner(channelName, userId) {
-        return this.getOwner(channelName) === userId;
+    findChannelInstance(channelKey) {
+        return this.merged.channels.find(c => this.effectiveChannelName(c.type, c.name) === channelKey) ?? null;
     }
+    // ── Owner / Admin（per-channel-instance；AUN 走顶层 owners/admins）──────
     /**
-     * True when `userId` is admin (or owner) of `channelName`.
-     * Owner implicitly has admin rights.
+     * AUN channel 是隐式的，不在 channels[] 里——其 owner/admin 存于 EvolAgent 顶层
+     * `owners`/`admins`（config 加载时由 aunBlock.owner/admins 收集而来）。
      */
-    isAdmin(channelName, userId) {
-        if (this.isOwner(channelName, userId))
+    isAunChannelKey(channelKey) {
+        const parsed = tryParseChannelKey(channelKey);
+        return parsed?.type === 'aun' && parsed.aid === this.aid;
+    }
+    getOwner(channelKey) {
+        if (this.isAunChannelKey(channelKey)) {
+            return this.merged.owners?.[0];
+        }
+        const inst = this.findChannelInstance(channelKey);
+        return inst?.owners?.[0];
+    }
+    isOwner(channelKey, userId) {
+        if (this.isAunChannelKey(channelKey)) {
+            return this.merged.owners?.includes(userId) ?? false;
+        }
+        const inst = this.findChannelInstance(channelKey);
+        return inst?.owners?.includes(userId) ?? false;
+    }
+    isAdmin(channelKey, userId) {
+        if (this.isOwner(channelKey, userId))
             return true;
-        const inst = this.findChannelInstance(channelName);
-        const admins = inst?.admins || [];
-        return admins.includes(userId);
+        if (this.isAunChannelKey(channelKey)) {
+            return this.merged.admins?.includes(userId) ?? false;
+        }
+        const inst = this.findChannelInstance(channelKey);
+        return inst?.admins?.includes(userId) ?? false;
     }
-    /**
-     * Set owner for a channel instance and persist to agent.json.
-     * Throws when called on DefaultAgent (no configPath) — callers must use
-     * the global config setter for default channels.
-     */
-    setOwner(channelName, userId) {
-        const inst = this.findChannelInstance(channelName);
+    setOwner(channelKey, userId) {
+        // AUN：写到 rawAgent 顶层 owners（merged 也指向同一份引用）
+        if (this.isAunChannelKey(channelKey)) {
+            if (!this.rawAgent.owners)
+                this.rawAgent.owners = [];
+            if (!this.rawAgent.owners.includes(userId))
+                this.rawAgent.owners.push(userId);
+            // merged.owners 是从 rawAgent.owners 派生的拷贝；同步内存视图避免重新 merge
+            if (!this.merged.owners)
+                this.merged.owners = [];
+            if (!this.merged.owners.includes(userId))
+                this.merged.owners.push(userId);
+            this.persist();
+            return;
+        }
+        const inst = this.findRawChannelInstance(channelKey);
         if (!inst) {
-            logger.warn(`[EvolAgent] setOwner: channel "${channelName}" not found in agent "${this.name}"`);
+            logger.warn(`[EvolAgent ${this.aid}] setOwner: channel "${channelKey}" not found`);
             return;
         }
-        inst.owner = userId;
+        // 顶层 owners 是单值列表（首通信者即 owner）；channel 实例 owners 也允许多值
+        if (!inst.owners)
+            inst.owners = [];
+        if (!inst.owners.includes(userId))
+            inst.owners.push(userId);
         this.persist();
     }
-    /** Get showActivities mode for a channel instance owned by this agent. */
-    getShowActivities(channelName) {
-        const inst = this.findChannelInstance(channelName);
-        return inst?.showActivities ?? 'all';
+    // ── ShowActivities ────────────────────────────────────────────────────
+    getShowActivities(_channelKey) {
+        return this.merged.show_activities ?? 'all';
     }
-    /**
-     * Set showActivities for a channel instance and persist to agent.json.
-     * Throws when called on DefaultAgent — callers must use the global setter.
-     */
-    setShowActivities(channelName, mode) {
-        const inst = this.findChannelInstance(channelName);
-        if (!inst) {
-            logger.warn(`[EvolAgent] setShowActivities: channel "${channelName}" not found in agent "${this.name}"`);
-            return;
-        }
-        inst.showActivities = mode;
+    setShowActivities(_channelKey, mode) {
+        this.rawAgent.show_activities = mode;
+        this.merged.show_activities = mode;
         this.persist();
     }
-    /**
-     * Set this agent's baseagent.model and persist to agent.json.
-     * Refuses for DefaultAgent. Writes to config.agents[baseagent].model.
-     */
+    // ── Baseagent 字段写入 ────────────────────────────────────────────────
     setBaseagentModel(value) {
         const ba = this.baseagent;
-        if (!this.config.agents[ba])
-            this.config.agents[ba] = {};
-        if (value === undefined) {
-            delete this.config.agents[ba].model;
-        }
-        else {
-            this.config.agents[ba].model = value;
-        }
+        if (!this.rawAgent.baseagents)
+            this.rawAgent.baseagents = {};
+        const block = (this.rawAgent.baseagents[ba] ??= {});
+        if (value === undefined)
+            delete block.model;
+        else
+            block.model = value;
         this.persist();
     }
-    /**
-     * Get the agent's project list (defaults to a single entry derived from
-     * projects.defaultPath when projects.list is empty/absent).
-     */
+    setBaseagentEffort(value) {
+        const ba = this.baseagent;
+        if (!this.rawAgent.baseagents)
+            this.rawAgent.baseagents = {};
+        const block = (this.rawAgent.baseagents[ba] ??= {});
+        const fieldName = ba === 'codex' ? 'reasoning' : 'effort';
+        if (value === undefined)
+            delete block[fieldName];
+        else
+            block[fieldName] = value;
+        this.persist();
+    }
+    // ── Projects ──────────────────────────────────────────────────────────
     getProjects() {
-        const list = this.config.projects?.list;
+        const list = this.merged.projects?.list;
         if (list && Object.keys(list).length > 0)
             return { ...list };
-        const dp = this.config.projects?.defaultPath;
+        const dp = this.merged.projects?.defaultPath;
         if (dp)
             return { [path.basename(dp)]: dp };
         return {};
     }
-    /**
-     * Add (or update) a named project in this agent's projects.list and persist.
-     * Throws for DefaultAgent (caller should write to evolclaw.json instead).
-     */
     addProject(name, projectPath) {
-        if (!this.config.projects)
-            this.config.projects = { defaultPath: projectPath, list: {} };
-        if (!this.config.projects.list)
-            this.config.projects.list = {};
-        this.config.projects.list[name] = projectPath;
+        if (!this.rawAgent.projects)
+            this.rawAgent.projects = { defaultPath: projectPath, list: {} };
+        if (!this.rawAgent.projects.list)
+            this.rawAgent.projects.list = {};
+        this.rawAgent.projects.list[name] = projectPath;
         this.persist();
     }
+    // ── Personal layer ────────────────────────────────────────────────────
+    _personaCache = undefined;
     /**
-     * Set this agent's baseagent.effort and persist to agent.json.
-     * For codex, the field is named `reasoning` (alias). Refuses for DefaultAgent.
+     * 读取 personal/persona.md 内容（缓存，首次调用时从磁盘读）。
+     * 文件不存在返回 null。
      */
-    setBaseagentEffort(value) {
-        const ba = this.baseagent;
-        if (!this.config.agents[ba])
-            this.config.agents[ba] = {};
-        const fieldName = ba === 'codex' ? 'reasoning' : 'effort';
-        if (value === undefined) {
-            delete this.config.agents[ba][fieldName];
+    getPersona() {
+        if (this._personaCache !== undefined)
+            return this._personaCache;
+        const personaPath = path.join(agentPersonalDir(this.aid), 'persona.md');
+        try {
+            this._personaCache = fs.readFileSync(personaPath, 'utf-8').trim() || null;
         }
-        else {
-            this.config.agents[ba][fieldName] = value;
+        catch {
+            this._personaCache = null;
         }
-        this.persist();
+        return this._personaCache;
     }
     /**
-     * Persist the in-memory config back to the agent.json file.
-     * Refuses for DefaultAgent: it is built from evolclaw.json and has no
-     * dedicated file — callers must route writes through the global config.
+     * 读取 personal/memory/working.md 内容（不缓存，每次会话开始时读）。
      */
-    persist() {
-        if (!this.configPath) {
-            throw new Error('Cannot persist DefaultAgent config; use global config setters');
+    getWorkingMemory() {
+        const workingPath = path.join(agentPersonalDir(this.aid), 'memory', 'working.md');
+        try {
+            const content = fs.readFileSync(workingPath, 'utf-8').trim();
+            return content || null;
+        }
+        catch {
+            return null;
         }
-        fs.writeFileSync(this.configPath, JSON.stringify(this.config, null, 2) + '\n', 'utf-8');
     }
-    getContext(channelName, chatType, globalChatmode) {
+    /** 清除 persona 缓存（reload 后重新读取） */
+    invalidatePersonaCache() {
+        this._personaCache = undefined;
+    }
+    // ── Context（喂给 message-processor / command-handler） ──────────────
+    getContext(_channelKey, chatType, globalChatmode) {
         const chatMode = this.resolveChatMode(chatType, globalChatmode);
         return {
             name: this.name,
-            isOwned: !this.isDefault,
+            isOwned: true,
             baseagent: this.baseagent,
             model: this.model,
             effort: this.effort,
@@ -302,14 +249,31 @@ export class EvolAgent {
         };
     }
     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 (this.merged.chatmode?.[key]
+            ?? globalChatmode?.[key]
+            ?? (key === 'group' ? 'proactive' : 'interactive'));
+    }
+    // ── Reload 支持：替换 in-memory config 并复用 channels Map ───────────
+    /** 用新的 raw + merged 替换 in-memory 状态。channels 由调用方决定如何 reconcile。 */
+    swapConfig(rawAgent, merged) {
+        if (rawAgent.aid !== this.aid) {
+            throw new Error(`EvolAgent.swapConfig: aid mismatch (${rawAgent.aid} vs ${this.aid})`);
         }
-        return 'interactive';
+        this.rawAgent = rawAgent;
+        this.merged = merged;
+    }
+    // ── 内部辅助 ─────────────────────────────────────────────────────────
+    /**
+     * 找 rawAgent.channels 里的可变实例，用于写入。
+     *
+     * merged.channels 是 deep clone 时 raw 跟 merged 的 channels 引用同一份（mergeForAgent
+     * 直接 `agent.channels` 透传），所以 raw 里的实例就等于 merged 里的实例。
+     */
+    findRawChannelInstance(channelKey) {
+        return this.rawAgent.channels.find(c => this.effectiveChannelName(c.type, c.name) === channelKey) ?? null;
+    }
+    persist() {
+        saveAgent(this.rawAgent);
     }
 }

package/dist/core/interaction-router.js

@@ -2,7 +2,6 @@ import { logger } from '../utils/logger.js';
 export class InteractionRouter {
     handlers = new Map();
     register(id, sessionId, callback, opts) {
-        // Clear any existing handler for this ID
         const existing = this.handlers.get(id);
         if (existing?.timer)
             clearTimeout(existing.timer);
@@ -14,7 +13,13 @@ export class InteractionRouter {
                 opts.onTimeout?.();
             }, opts.timeoutMs);
         }
-        this.handlers.set(id, { callback, timer, sessionId, messageId: opts?.messageId });
+        this.handlers.set(id, {
+            callback,
+            timer,
+            sessionId,
+            initiatorId: opts?.initiatorId,
+            fallbackCommand: opts?.fallbackCommand,
+        });
     }
     handle(response) {
         const handler = this.handlers.get(response.id);
@@ -25,7 +30,6 @@ export class InteractionRouter {
         this.handlers.delete(response.id);
         try {
             const result = handler.callback(response.action, response.values, response.operatorId);
-            // Catch async callback errors to prevent unhandled rejections
             if (result && typeof result.catch === 'function') {
                 result.catch((err) => {
                     logger.error(`[InteractionRouter] Async callback error for ${response.id}:`, err);
@@ -62,7 +66,50 @@ export class InteractionRouter {
         }
         return ids;
     }
-    getMessageId(id) {
-        return this.handlers.get(id)?.messageId;
+    getInitiator(id) {
+        return this.handlers.get(id)?.initiatorId;
     }
+    findPendingByCommand(sessionId, command) {
+        for (const [id, handler] of this.handlers.entries()) {
+            if (handler.sessionId === sessionId && handler.fallbackCommand === command) {
+                return id;
+            }
+        }
+        return undefined;
+    }
+}
+/** 把 CommandCard 渲染为文本提示，channel 不支持卡片时使用 */
+export function renderCommandCardAsText(card) {
+    const lines = [card.title];
+    if (card.body)
+        lines.push(card.body);
+    lines.push('', '可用命令:');
+    for (const btn of card.buttons) {
+        const marker = btn.disabled ? '✓' : ' ';
+        lines.push(`  ${marker} ${btn.command}    ← ${btn.label}`);
+    }
+    return lines.join('\n');
+}
+/** 把 ActionInteraction 渲染为文本提示，channel 不支持卡片或卡片发送失败时使用 */
+export function renderActionAsText(req) {
+    if (req.kind.kind !== 'action') {
+        throw new Error('[renderActionAsText] expected ActionInteraction, got ' + req.kind.kind);
+    }
+    const action = req.kind;
+    const fb = req.fallback;
+    const lines = [action.title];
+    if (action.body)
+        lines.push(action.body);
+    if (!fb) {
+        return lines.join('\n');
+    }
+    lines.push('', '回复:');
+    for (const btn of action.buttons) {
+        const arg = fb.buttonArgMap?.[btn.key] ?? btn.key;
+        lines.push(`  /${fb.command} ${arg}    ← ${btn.label}`);
+    }
+    if (fb.acceptFreeText && fb.freeTextHint) {
+        lines.push(`  ${fb.freeTextHint}`);
+    }
+    return lines.join('\n');
 }