evolclaw 2.7.3 → 2.8.1

package/dist/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import fs from 'fs';
 import path from 'path';
+import os from 'os';
 import { spawn, execFile } from 'child_process';
 import { promisify } from 'util';
 import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot } from './paths.js';
@@ -1378,6 +1379,343 @@ async function cmdCtl(args) {
         process.exit(1);
     }
 }
+// ==================== Agent ====================
+async function cmdAgent(args) {
+    const sub = args[0];
+    if (!sub) {
+        await cmdAgentList();
+        return;
+    }
+    if (sub === 'new') {
+        const name = args[1];
+        if (!name) {
+            console.error('Usage: evolclaw agent new <name>');
+            process.exit(1);
+        }
+        await cmdAgentNew(name);
+        return;
+    }
+    if (sub === 'reload') {
+        const name = args[1];
+        if (!name) {
+            console.error('Usage: evolclaw agent reload <name>');
+            process.exit(1);
+        }
+        // Phase 1 stub: no IPC yet
+        console.error('⚠ evolclaw 未运行或 IPC 未就绪，请使用 evolclaw restart 重新加载所有 agent');
+        process.exit(1);
+    }
+    // `evolclaw agent <name>` — show detail
+    await cmdAgentShow(sub);
+}
+async function cmdAgentList() {
+    const p = resolvePaths();
+    const { AgentRegistry } = await import('./core/agent-registry.js');
+    const { loadConfig } = await import('./config.js');
+    let config;
+    try {
+        config = loadConfig(p.config);
+    }
+    catch {
+        config = { agents: {}, channels: {}, projects: { defaultPath: process.cwd() } };
+    }
+    const registry = new AgentRegistry(p.agentsDir);
+    registry.loadAll(config);
+    const list = registry.list();
+    if (list.length === 0) {
+        console.log('No agents configured.');
+        return;
+    }
+    // Table output
+    console.log('NAME'.padEnd(14) + 'STATUS'.padEnd(10) + 'CHANNELS'.padEnd(24) + 'PROJECT'.padEnd(22) + 'BASEAGENT'.padEnd(11) + 'LAST ACTIVE');
+    for (const info of list) {
+        const name = info.isDefault ? '[default]' : info.name;
+        const status = info.status;
+        const channels = info.channels.length > 0 ? info.channels.join(', ').slice(0, 22) : '—';
+        const project = info.projectPath ? path.basename(info.projectPath) : '—';
+        const baseagent = info.baseagent || '—';
+        const lastActive = info.lastActivity ? formatTimeAgo(Date.now() - info.lastActivity) : '—';
+        console.log(name.padEnd(14) +
+            status.padEnd(10) +
+            channels.padEnd(24) +
+            project.padEnd(22) +
+            baseagent.padEnd(11) +
+            lastActive);
+    }
+}
+async function cmdAgentShow(name) {
+    const p = resolvePaths();
+    const { AgentRegistry } = await import('./core/agent-registry.js');
+    const { loadConfig } = await import('./config.js');
+    let config;
+    try {
+        config = loadConfig(p.config);
+    }
+    catch {
+        config = { agents: {}, channels: {}, projects: { defaultPath: process.cwd() } };
+    }
+    const registry = new AgentRegistry(p.agentsDir);
+    registry.loadAll(config);
+    const agent = registry.get(name);
+    if (!agent) {
+        console.error(`Agent "${name}" not found.`);
+        const allList = registry.list().filter(i => !i.isDefault);
+        if (allList.length > 0) {
+            console.log(`Available: ${allList.map(i => i.name).join(', ')}`);
+        }
+        process.exit(1);
+    }
+    console.log(`${agent.name} (${agent.status})\n`);
+    console.log(`  Baseagent:  ${agent.baseagent}`);
+    if (agent.model)
+        console.log(`  Model:      ${agent.model}`);
+    if (agent.effort)
+        console.log(`  Effort:     ${agent.effort}`);
+    console.log(`  Project:    ${agent.projectPath}`);
+    console.log(`  Channels:   ${agent.channelInstanceNames().join(', ') || '—'}`);
+    if (agent.error)
+        console.log(`  Error:      ${agent.error}`);
+    if (agent.configPath)
+        console.log(`  Config:     ${agent.configPath}`);
+}
+async function cmdAgentNew(name) {
+    const p = resolvePaths();
+    const agentPath = path.join(p.agentsDir, `${name}.json`);
+    if (fs.existsSync(agentPath)) {
+        console.error(`Agent "${name}" already exists: ${agentPath}`);
+        process.exit(1);
+    }
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const ask = (q) => new Promise(r => rl.question(q, r));
+    try {
+        console.log(`\nCreating agent: ${name}\n`);
+        const projectPath = await ask('Project path: ');
+        if (!projectPath.trim() || !path.isAbsolute(projectPath.trim())) {
+            console.error('Project path must be an absolute path.');
+            process.exit(1);
+        }
+        const baseagentChoices = ['claude', 'codex', 'gemini', 'hermes'];
+        const baseagent = (await ask(`Baseagent (${baseagentChoices.join('/')}) [claude]: `)).trim() || 'claude';
+        if (!baseagentChoices.includes(baseagent)) {
+            console.error(`Invalid baseagent: ${baseagent}`);
+            process.exit(1);
+        }
+        const model = (await ask('Model (leave empty for default): ')).trim() || undefined;
+        const effort = (await ask('Effort (low/medium/high/max) [high]: ')).trim() || 'high';
+        const chatmodeChoices = ['interactive', 'proactive'];
+        const chatmodePrivate = (await ask(`ChatMode private (${chatmodeChoices.join('/')}) [interactive]: `)).trim() || 'interactive';
+        // Channels (loop to allow multiple)
+        const channelsConfig = {};
+        const { getChannelCredentialCollector } = await import('./utils/init-channel.js');
+        // Close outer rl before channel loop (collectors create their own readline)
+        rl.close();
+        while (true) {
+            const loopRl = readline.createInterface({ input: process.stdin, output: process.stdout });
+            const loopAsk = (q) => new Promise(r => loopRl.question(q, r));
+            const addChannel = (await loopAsk('\nAdd channel? (y/n) [n]: ')).trim().toLowerCase();
+            if (addChannel !== 'y') {
+                loopRl.close();
+                break;
+            }
+            const channelType = (await loopAsk('Channel type (feishu/aun/wechat/wecom/dingtalk/qqbot): ')).trim();
+            const collector = getChannelCredentialCollector(channelType);
+            if (!collector) {
+                console.error(`Unknown channel type: ${channelType}`);
+                loopRl.close();
+                continue;
+            }
+            // Close loop rl before collector opens its own
+            loopRl.close();
+            let creds = null;
+            try {
+                creds = await collector();
+            }
+            catch (e) {
+                console.error(`  Channel setup failed: ${e?.message || e}`);
+            }
+            if (!creds) {
+                console.log('  Channel setup cancelled.');
+                continue;
+            }
+            const nameRl = readline.createInterface({ input: process.stdin, output: process.stdout });
+            const instName = await new Promise(r => nameRl.question(`  Channel instance name [${name}]: `, r));
+            nameRl.close();
+            creds.name = instName.trim() || name;
+            if (!channelsConfig[channelType])
+                channelsConfig[channelType] = [];
+            channelsConfig[channelType].push(creds);
+        }
+        // Simplify channels: if only one instance per type, unwrap from array
+        const finalChannels = {};
+        for (const [type, instances] of Object.entries(channelsConfig)) {
+            finalChannels[type] = instances.length === 1 ? instances[0] : instances;
+        }
+        const agentConfig = {
+            name,
+            enabled: true,
+            agents: { [baseagent]: { ...(model && { model }), effort } },
+            channels: finalChannels,
+            projects: { defaultPath: projectPath.trim() },
+            chatmode: { private: chatmodePrivate, group: 'proactive' },
+        };
+        fs.mkdirSync(p.agentsDir, { recursive: true });
+        fs.writeFileSync(agentPath, JSON.stringify(agentConfig, null, 2));
+        console.log(`\n✓ Created: ${agentPath}`);
+        console.log('  Run `evolclaw restart` to activate.');
+    }
+    finally {
+        // rl may already be closed if channel collector was invoked
+        try {
+            rl.close();
+        }
+        catch { }
+    }
+}
+// ==================== AID ====================
+async function cmdAid(args) {
+    const sub = args[0] || 'list';
+    if (sub === 'help') {
+        console.log(`用法: evolclaw aid <command>
+
+Commands:
+  list              列出本地所有 AID
+  new <aid>         创建新 AID 身份
+
+示例:
+  evolclaw aid list
+  evolclaw aid new reviewer.agentid.pub`);
+        return;
+    }
+    const { aidList, aidCreate, agentmdPut, buildInitialAgentMd, isValidAid } = await import('./channels/aun-ops.js');
+    if (sub === 'list') {
+        const aids = aidList();
+        if (aids.length === 0) {
+            console.log('本地无 AID');
+            return;
+        }
+        console.log('本地 AID:');
+        for (const a of aids) {
+            const icons = [
+                a.hasPrivateKey ? '🔑' : '  ',
+                a.hasAgentMd ? '📄' : '  ',
+            ].join('');
+            console.log(`  ${icons} ${a.aid}`);
+        }
+        console.log('\n🔑=私钥  📄=agent.md');
+        return;
+    }
+    if (sub === 'new') {
+        const aid = args[1];
+        if (!aid) {
+            console.error('用法: evolclaw aid new <完整AID>\n例: evolclaw aid new reviewer.agentid.pub');
+            process.exit(1);
+        }
+        if (!isValidAid(aid)) {
+            console.error(`❌ 无效 AID 格式: ${aid}`);
+            process.exit(1);
+        }
+        const result = await aidCreate(aid);
+        if (!result.alreadyExisted) {
+            const content = buildInitialAgentMd({ aid });
+            try {
+                await agentmdPut(content, { aid, client: result.client });
+                console.log('✓ agent.md 已发布');
+            }
+            catch (e) {
+                console.warn(`⚠ agent.md 发布失败（首次连接将自动重试）: ${String(e.message || e).slice(0, 100)}`);
+            }
+        }
+        try {
+            await result.client.close();
+        }
+        catch { }
+        const verb = result.alreadyExisted ? '已存在' : '已创建';
+        console.log(`✓ ${aid} ${verb}`);
+        console.log('  如需上线 AUN 通道，运行 evolclaw init aun');
+        return;
+    }
+    console.error(`未知子命令: ${sub}\n用法: evolclaw aid [list|new <aid>]`);
+    process.exit(1);
+}
+// ==================== AgentMd ====================
+async function cmdAgentmd(args) {
+    if (args.length === 0 || args[0] === 'help') {
+        console.log(`用法: evolclaw agentmd <command> <aid>
+
+Commands:
+  <aid>                 查看指定 AID 的 agent.md
+  put <aid>             上传本地 agent.md 到 AUN 网络
+  set <aid> <内容>      设置并上传 agent.md
+
+示例:
+  evolclaw agentmd mybot.agentid.pub
+  evolclaw agentmd put mybot.agentid.pub
+  evolclaw agentmd set mybot.agentid.pub "---\\naid: mybot.agentid.pub\\n---"`);
+        return;
+    }
+    const { agentmdGet, agentmdPut, isValidAid } = await import('./channels/aun-ops.js');
+    if (args[0] === 'put') {
+        const aid = args[1];
+        if (!aid) {
+            console.error('用法: evolclaw agentmd put <aid>');
+            process.exit(1);
+        }
+        if (!isValidAid(aid)) {
+            console.error(`❌ 无效 AID 格式: ${aid}`);
+            process.exit(1);
+        }
+        // Read local file directly (put = push local → network)
+        const localPath = path.join(os.homedir(), '.aun', 'AIDs', aid, 'agent.md');
+        if (!fs.existsSync(localPath)) {
+            console.error(`❌ 本地无 agent.md: ${aid}`);
+            process.exit(1);
+        }
+        const content = fs.readFileSync(localPath, 'utf-8');
+        await agentmdPut(content, { aid });
+        console.log('✓ agent.md 已发布');
+        return;
+    }
+    if (args[0] === 'set') {
+        const aid = args[1];
+        const content = args.slice(2).join(' ');
+        if (!aid || !content) {
+            console.error('用法: evolclaw agentmd set <aid> <内容>');
+            process.exit(1);
+        }
+        if (!isValidAid(aid)) {
+            console.error(`❌ 无效 AID 格式: ${aid}`);
+            process.exit(1);
+        }
+        await agentmdPut(content, { aid });
+        console.log('✓ agent.md 已更新并发布');
+        return;
+    }
+    // Default: view
+    const aid = args[0];
+    if (!isValidAid(aid)) {
+        console.error(`❌ 无效 AID 格式: ${aid}`);
+        process.exit(1);
+    }
+    try {
+        const md = await agentmdGet(aid);
+        if (!md || !md.trim()) {
+            console.log(`ℹ️ ${aid} 尚未设置 agent.md`);
+        }
+        else {
+            console.log(md);
+        }
+    }
+    catch (e) {
+        const msg = String(e.message || e);
+        if (msg.includes('not found') || msg.includes('404')) {
+            console.log(`ℹ️ ${aid} 尚未设置 agent.md`);
+        }
+        else {
+            console.error(`❌ 获取失败: ${msg.slice(0, 100)}`);
+            process.exit(1);
+        }
+    }
+}
 // ==================== Main ====================
 function getArgValue(args, flag) {
     const idx = args.indexOf(flag);
@@ -1446,7 +1784,7 @@ export async function main(args) {
                 if (nonInteractive) {
                     await cmdInit({
                         nonInteractive: true,
-                        defaultPath: getArgValue(args, '--default-path') || process.cwd(),
+                        defaultPath: getArgValue(args, '--default-path') || path.join(os.homedir(), 'projects', 'default'),
                         channel: getArgValue(args, '--channel') || 'aun',
                         aunAid: getArgValue(args, '--aun-aid'),
                         aunOwner: getArgValue(args, '--aun-owner'),
@@ -1484,6 +1822,15 @@ export async function main(args) {
         case 'ctl':
             await cmdCtl(args.slice(1));
             break;
+        case 'agent':
+            await cmdAgent(args.slice(1));
+            break;
+        case 'aid':
+            await cmdAid(args.slice(1));
+            break;
+        case 'agentmd':
+            await cmdAgentmd(args.slice(1));
+            break;
         default:
             console.log(`Usage: evolclaw {init|start|stop|restart|status|logs|ctl|diagnose|mv}
 
@@ -1505,6 +1852,18 @@ Commands:
                   --raw                原始输出，不着色
   ctl           运行时自管理（模型切换、推理强度、压缩上下文等）
                   evolclaw ctl help 查看完整命令列表
+  agent         管理 EvolAgent
+                  agent              列出所有 agent
+                  agent <name>       查看指定 agent 详情
+                  agent new <name>   创建新 agent（交互式）
+                  agent reload <n>   热重载 agent 配置
+  aid             AID 身份管理
+                  aid list           列出本地所有 AID
+                  aid new <aid>      创建新 AID 身份
+  agentmd         agent.md 管理
+                  agentmd <aid>      查看 agent.md
+                  agentmd put <aid>  上传本地 agent.md
+                  agentmd set <aid> <内容>  设置并上传
   diagnose      诊断启动环境（配置、数据库、进程）
   mv <old> <new>  迁移项目目录（保留 Claude/Codex/EvolClaw 会话）
 

package/dist/config.js

@@ -155,7 +155,7 @@ export function loadConfig(configPath = resolvePaths().config) {
                     logger.warn(`Config file missing, creating from sample: ${samplePath}`);
                     const sample = JSON.parse(fs.readFileSync(samplePath, 'utf-8'));
                     // Set a usable defaultPath
-                    const defaultProjectDir = path.join(os.homedir(), 'evolclaw-project');
+                    const defaultProjectDir = path.join(os.homedir(), 'projects', 'default');
                     sample.projects.defaultPath = defaultProjectDir;
                     if (!fs.existsSync(defaultProjectDir)) {
                         fs.mkdirSync(defaultProjectDir, { recursive: true });

package/dist/core/agent-registry.js

@@ -0,0 +1,164 @@
+import fs from 'fs';
+import path from 'path';
+import { EvolAgent } from './evolagent.js';
+import { validateEvolAgentConfig } from './evolagent-schema.js';
+import { extractFingerprint } from '../utils/channel-fingerprint.js';
+import { logger } from '../utils/logger.js';
+export class AgentRegistry {
+    agentsDir;
+    agents = new Map();
+    defaultAgent = null;
+    channelIndex = new Map();
+    constructor(agentsDir) {
+        this.agentsDir = agentsDir;
+    }
+    loadAll(globalConfig) {
+        this.agents.clear();
+        this.channelIndex.clear();
+        const files = fs.existsSync(this.agentsDir)
+            ? fs.readdirSync(this.agentsDir).filter(f => f.endsWith('.json'))
+            : [];
+        for (const file of files) {
+            const fullPath = path.join(this.agentsDir, file);
+            try {
+                const raw = JSON.parse(fs.readFileSync(fullPath, 'utf-8'));
+                const validation = validateEvolAgentConfig(raw);
+                if (!validation.valid) {
+                    const name = raw?.name || path.basename(file, '.json');
+                    const errorAgent = new EvolAgent(fullPath, { ...raw, name });
+                    errorAgent.status = 'error';
+                    errorAgent.error = validation.errors.join('; ');
+                    this.agents.set(name, errorAgent);
+                    logger.warn(`[AgentRegistry] ${file}: ${validation.errors.join('; ')}`);
+                    continue;
+                }
+                const agent = new EvolAgent(fullPath, raw);
+                this.agents.set(agent.name, agent);
+            }
+            catch (e) {
+                logger.warn(`[AgentRegistry] Failed to load ${file}: ${e}`);
+            }
+        }
+        this.defaultAgent = this.buildDefaultAgent(globalConfig);
+        this.detectAndFlagConflicts();
+        this.buildChannelIndex();
+    }
+    buildDefaultAgent(globalConfig) {
+        const agents = globalConfig.agents || {};
+        const defaultName = agents.defaultAgent || 'claude';
+        const cfg = {
+            name: '[default]',
+            enabled: true,
+            agents: { [defaultName]: agents[defaultName] || {} },
+            channels: globalConfig.channels || {},
+            projects: { defaultPath: globalConfig.projects?.defaultPath || process.cwd() },
+            chatmode: globalConfig.chatmode,
+        };
+        return new EvolAgent(null, cfg, { isDefault: true });
+    }
+    detectAndFlagConflicts() {
+        const seen = new Map();
+        const record = (agentName, channelsBlock) => {
+            for (const [type, raw] of Object.entries(channelsBlock || {})) {
+                if (type === 'defaultChannel')
+                    continue;
+                const instances = Array.isArray(raw) ? raw : [raw];
+                for (const inst of instances) {
+                    if (!inst || typeof inst !== 'object')
+                        continue;
+                    const fp = extractFingerprint(type, inst);
+                    if (!fp)
+                        continue;
+                    const instName = inst.name ?? type;
+                    const entry = seen.get(fp) || [];
+                    entry.push({ agent: agentName, instance: instName });
+                    seen.set(fp, entry);
+                }
+            }
+        };
+        for (const agent of this.agents.values()) {
+            if (agent.status === 'error')
+                continue;
+            record(agent.name, agent.config.channels);
+        }
+        if (this.defaultAgent) {
+            record(this.defaultAgent.name, this.defaultAgent.config.channels);
+        }
+        for (const [_fp, occurrences] of seen) {
+            if (occurrences.length <= 1)
+                continue;
+            const msg = `Channel conflict: fingerprint claimed by ${occurrences.map(o => `${o.agent}(${o.instance})`).join(', ')}`;
+            const involvedNames = [...new Set(occurrences.map(o => o.agent))];
+            for (const name of involvedNames) {
+                if (name === '[default]')
+                    continue;
+                const a = this.agents.get(name);
+                if (a && a.status !== 'error') {
+                    a.status = 'error';
+                    a.error = msg;
+                }
+            }
+            logger.error(`[AgentRegistry] ${msg}`);
+        }
+    }
+    buildChannelIndex() {
+        for (const agent of this.agents.values()) {
+            if (agent.status === 'error' || agent.status === 'disabled')
+                continue;
+            for (const name of agent.channelInstanceNames()) {
+                this.channelIndex.set(name, agent.name);
+            }
+        }
+        if (this.defaultAgent) {
+            for (const name of this.defaultAgent.channelInstanceNames()) {
+                if (this.channelIndex.has(name))
+                    continue;
+                this.channelIndex.set(name, '[default]');
+            }
+        }
+    }
+    resolveByChannel(channelName) {
+        const agentName = this.channelIndex.get(channelName);
+        if (!agentName)
+            return null;
+        if (agentName === '[default]')
+            return this.defaultAgent;
+        return this.agents.get(agentName) || null;
+    }
+    get(name) {
+        if (name === '[default]')
+            return this.defaultAgent;
+        return this.agents.get(name) || null;
+    }
+    list() {
+        const result = [];
+        for (const agent of this.agents.values()) {
+            result.push(this.toInfo(agent));
+        }
+        if (this.defaultAgent) {
+            result.push(this.toInfo(this.defaultAgent));
+        }
+        return result;
+    }
+    runnableAgents() {
+        return [...this.agents.values()].filter(a => a.status === 'stopped');
+    }
+    toInfo(agent) {
+        let baseagent = 'claude';
+        try {
+            baseagent = agent.baseagent;
+        }
+        catch { /* invalid config */ }
+        return {
+            name: agent.name,
+            status: agent.status,
+            channels: agent.channelInstanceNames(),
+            projectPath: agent.config.projects?.defaultPath ?? '',
+            baseagent,
+            lastActivity: agent.lastActivity,
+            activeSessions: agent.activeSessions,
+            error: agent.error,
+            isDefault: agent.isDefault,
+        };
+    }
+}