evolclaw 3.0.0 → 3.1.1

package/dist/index.js

@@ -1,9 +1,9 @@
 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 { ensureDataDirs, resolvePaths, syncKitsFromPackage } from './paths.js';
+import { ensureDataDirs, resolvePaths, getPackageRoot } from './paths.js';
 import { resolveAnthropicConfig } from './agents/resolve.js';
-import { loadDefaults, autoMigrateIfNeeded } from './config-store.js';
+import { loadDefaults, autoMigrateIfNeeded, migrateIdentitiesIfNeeded } from './config-store.js';
 import { CONFIG_SCHEMA_VERSION } from './types.js';
 import { SessionManager } from './core/session/session-manager.js';
 import { ClaudeAgentPlugin } from './agents/claude-runner.js';
@@ -33,14 +33,53 @@ import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
 import { writeMain, removeAll, isMainWinner, scanInstances } from './utils/instance-registry.js';
 import { detectDuplicates } from './core/evolagent-registry.js';
-import { loadPromptTemplates } from './agents/templates.js';
+import { loadKitManifest, cleanEckDebug, invalidateKitCache } from './agents/kit-renderer.js';
+import { initEck } from './eck/init.js';
 import { TriggerManager } from './core/trigger/manager.js';
-import { TriggerScheduler } from './core/trigger/scheduler.js';
+import { TriggerScheduler, calcNextFireAt } from './core/trigger/scheduler.js';
 import { agentTriggersDir } from './paths.js';
+import { isLinkedInstall } from './utils/npm-ops.js';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
 import crypto from 'crypto';
+import { fileURLToPath } from 'url';
+/** 出站 payload 摘要（用于 channel-out.log） */
+function summarizeOutboundPayload(payload) {
+    if (!payload)
+        return { kind: 'unknown' };
+    const s = { kind: payload.kind };
+    switch (payload.kind) {
+        case 'activity.batch':
+            s.itemCount = payload.items?.length ?? 0;
+            s.items = payload.items;
+            break;
+        case 'result.text':
+            s.isFinal = payload.isFinal;
+            s.text = payload.text;
+            break;
+        case 'result.file':
+            s.filePath = payload.filePath;
+            break;
+        case 'system.notice':
+        case 'system.error':
+            s.subtype = payload.subtype;
+            s.text = payload.text;
+            break;
+        case 'interaction':
+            s.interactionId = payload.interaction?.id;
+            s.interactionKind = payload.interaction?.kind?.kind;
+            break;
+        case 'status.started':
+        case 'status.completed':
+        case 'status.interrupted':
+        case 'status.error':
+        case 'status.timeout':
+            s.metadata = payload.metadata;
+            break;
+    }
+    return s;
+}
 /**
  * 通过 adapter.send 发送系统类 payload（system.notice / system.error / 等）。
  *
@@ -54,7 +93,77 @@ import crypto from 'crypto';
 export async function sendSystemPayload(adapter, envelope, payload) {
     await adapter.send(envelope, payload);
 }
+function readEvolclawVersion() {
+    try {
+        const pkg = JSON.parse(fs.readFileSync(path.join(getPackageRoot(), 'package.json'), 'utf-8'));
+        return pkg.version || 'unknown';
+    }
+    catch {
+        return 'unknown';
+    }
+}
+function readFastaunVersion() {
+    try {
+        const url = import.meta.resolve?.('@agentunion/fastaun');
+        if (!url)
+            return 'unknown';
+        let dir = path.dirname(fileURLToPath(url));
+        while (dir !== path.dirname(dir)) {
+            const pkgPath = path.join(dir, 'package.json');
+            if (fs.existsSync(pkgPath)) {
+                const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+                if (pkg.name === '@agentunion/fastaun')
+                    return pkg.version || 'unknown';
+            }
+            dir = path.dirname(dir);
+        }
+        return 'unknown';
+    }
+    catch {
+        return 'unknown';
+    }
+}
 async function main() {
+    // 启动信息：目录类型 + 版本号 + 代码最新时间戳
+    {
+        const pkgRoot = getPackageRoot();
+        const runDir = path.dirname(new URL(import.meta.url).pathname.replace(/^\/([A-Z]:)/, '$1'));
+        const isDist = runDir.includes(path.join(pkgRoot, 'dist'));
+        const isLinked = fs.existsSync(path.join(pkgRoot, '.git'));
+        const dirType = isDist ? (isLinked ? '开发仓/dist' : '安装路径/dist') : '源码(tsx)';
+        const scanDir = isDist ? path.join(pkgRoot, 'dist') : path.join(pkgRoot, 'src');
+        let latestMtime = 0;
+        const scanRecursive = (dir) => {
+            try {
+                for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+                    if (entry.name === 'node_modules')
+                        continue;
+                    const full = path.join(dir, entry.name);
+                    if (entry.isDirectory()) {
+                        scanRecursive(full);
+                        continue;
+                    }
+                    if (entry.name.endsWith('.js') || entry.name.endsWith('.ts')) {
+                        const mt = fs.statSync(full).mtimeMs;
+                        if (mt > latestMtime)
+                            latestMtime = mt;
+                    }
+                }
+            }
+            catch { }
+        };
+        scanRecursive(scanDir);
+        let version = '?';
+        try {
+            version = JSON.parse(fs.readFileSync(path.join(pkgRoot, 'package.json'), 'utf-8')).version;
+        }
+        catch { }
+        const fmtTime = (ms) => { const d = new Date(ms); return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')} ${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}`; };
+        console.error(`[EvolClaw] EvolClaw v${version}`);
+        console.error(`[EvolClaw] 执行类型: ${dirType}`);
+        console.error(`[EvolClaw] 包路径:   ${pkgRoot}`);
+        console.error(`[EvolClaw] 代码时间: ${latestMtime ? fmtTime(latestMtime) : '?'}`);
+    }
     // 过滤飞书 SDK 的 info 日志
     const originalLog = console.log;
     const originalInfo = console.info;
@@ -72,11 +181,9 @@ async function main() {
             return;
         originalInfo(...args);
     };
-    logger.info('EvolClaw starting...');
+    logger.info(`EvolClaw v${readEvolclawVersion()} starting... (fastaun v${readFastaunVersion()})`);
     // 确保数据目录存在
     ensureDataDirs();
-    // 同步包内 kits/ 到 EVOLCLAW_HOME/kits/（首次启动或升级时）
-    syncKitsFromPackage();
     // ── 单实例保护（pre-check + post-write self-check）──
     // pre-check：发现已有活 main 直接退出，避免起任何副作用
     {
@@ -104,16 +211,20 @@ async function main() {
             process.exit(0);
         }
     }
-    // 加载提示词模板
-    loadPromptTemplates();
+    // ── 自动迁移 ──
+    migrateIdentitiesIfNeeded();
+    autoMigrateIfNeeded();
+    // ── ECK 运行时初始化 ──
+    initEck();
+    // 加载 ECK manifest + 清理旧调试文件
+    cleanEckDebug();
+    loadKitManifest();
     // 加载配置（新结构：defaults.json + per-agent config.json）
     const defaults = loadDefaults() ?? { $schema_version: CONFIG_SCHEMA_VERSION };
     // 应用配置中的日志级别（优先于环境变量）
     // logLevel 现在不在新结构中——若要保留，将来可加 defaults.debug.logLevel
     // 阶段 2c 暂跳过
     const paths = resolvePaths();
-    // ── 自动迁移：旧 data/evolclaw.json → 新结构 ──
-    autoMigrateIfNeeded();
     // ── EvolAgent Registry：加载 agents/<aid>/config.json ──
     const agentRegistry = new EvolAgentRegistry(paths.agentsDir);
     agentRegistry.loadAll();
@@ -190,16 +301,22 @@ async function main() {
     // 统计收集器（近 1 小时滚动统计）
     const statsCollector = new StatsCollector(eventBus);
     // Per-AID 消息统计收集器（累计，供 watch aid 实时展示）
-    const aidStatsCollector = new AidStatsCollector();
+    const aidStatsCollector = new AidStatsCollector(eventBus);
+    aidStatsCollector.setSessionsDir(paths.sessionsDir);
     // 初始化 SessionManager（文件系统后端）
     const sessionManager = new SessionManager(paths.sessionsDir, eventBus, (channel, userId) => agentRegistry.isOwner(channel, userId), (channel, userId) => agentRegistry.isAdmin(channel, userId));
     // sessionMode 解析：从 channel 路由到具体 agent，按 agent.config.chatmode
-    sessionManager.setSessionModeResolver((channelKey, chatType) => {
+    sessionManager.setSessionModeResolver((channelKey, chatType, peerType) => {
         const agent = agentRegistry.resolveByChannel(channelKey);
         const cm = agent?.config.chatmode;
         if (!cm)
             return undefined;
-        return chatType === 'group' ? cm.group : cm.private;
+        // 优先级：群聊 > nothuman > private
+        if (chatType === 'group')
+            return cm.group;
+        if (peerType && peerType !== 'human' && peerType !== 'unknown')
+            return cm.nothuman;
+        return cm.private;
     });
     logger.info('✓ Database initialized');
     // 注册会话文件适配器（Claude / Codex 各自的会话文件操作）
@@ -361,6 +478,49 @@ async function main() {
     if (primaryAgentForTrigger?.triggerScheduler && primaryAgentForTrigger?.triggerManager) {
         cmdHandler.setTriggerScheduler(primaryAgentForTrigger.triggerScheduler, primaryAgentForTrigger.triggerManager);
     }
+    // Seed default __upgrade-check trigger (daily at random time 3:00~3:59)
+    // 用户可通过 /trigger cancel __upgrade-check 永久禁用（不会再自动重建）
+    if (!isLinkedInstall() && primaryAgentForTrigger?.triggerManager && primaryAgentForTrigger?.triggerScheduler) {
+        const mgr = primaryAgentForTrigger.triggerManager;
+        const sched = primaryAgentForTrigger.triggerScheduler;
+        const UPGRADE_TRIGGER_NAME = '__upgrade-check';
+        if (!mgr.getByName(UPGRADE_TRIGGER_NAME)) {
+            // Check history: if user cancelled it before, respect that decision
+            const { history } = mgr.listAll();
+            const wasCancelled = history.some(h => h.name === UPGRADE_TRIGGER_NAME && h.doneReason === 'cancelled');
+            if (!wasCancelled) {
+                // Random minute in 3:00~3:59 to avoid all instances hitting registry simultaneously
+                const randomMinute = Math.floor(Math.random() * 60);
+                const cronExpr = `${randomMinute} 3 * * *`;
+                // Use first channel instance as target (command doesn't need real channelId)
+                const firstChannel = channelInstances[0]?.adapter?.channelName || 'system';
+                const trigger = {
+                    id: crypto.randomUUID(),
+                    name: UPGRADE_TRIGGER_NAME,
+                    scheduleType: 'cron',
+                    scheduleValue: cronExpr,
+                    nextFireAt: calcNextFireAt('cron', cronExpr),
+                    targetChannel: firstChannel,
+                    targetChannelId: '__system__',
+                    targetSessionStrategy: 'silent',
+                    prompt: '检查 evolclaw 是否有新版本可用。执行 `npm view evolclaw version` 获取最新版本，与当前版本（执行 `evolclaw --version`）对比。如果有新版本，执行 /restart 进行升级。如果已是最新版本，无需任何操作。',
+                    createdByPeerId: '__system__',
+                    createdByChannel: '__system__',
+                    fireCount: 0,
+                    createdAt: Date.now(),
+                    updatedAt: Date.now(),
+                };
+                try {
+                    mgr.register(trigger);
+                    sched.register(trigger);
+                    logger.info(`[Trigger] Seeded default trigger: ${UPGRADE_TRIGGER_NAME} (cron ${cronExpr})`);
+                }
+                catch (e) {
+                    logger.warn(`[Trigger] Failed to seed ${UPGRADE_TRIGGER_NAME}: ${e}`);
+                }
+            }
+        }
+    }
     // 默认策略
     const defaultPolicy = {
         canSwitchProject: (chatType, role) => chatType === 'private' ? (role === 'owner' || role === 'admin') : role === 'owner',
@@ -378,6 +538,12 @@ async function main() {
     msgBridge.setAgentRegistry(agentRegistry);
     // ── Channel instance registration (shared by startup and hot-load) ──
     function registerChannelInstance(inst) {
+        // 0. 包装 adapter.send，记录所有出站到 channel-out.log
+        const originalSend = inst.adapter.send.bind(inst.adapter);
+        inst.adapter.send = async (envelope, payload) => {
+            logger.channelOut({ channel: inst.adapter.channelName, channelId: envelope.channelId, taskId: envelope.taskId, payload: summarizeOutboundPayload(payload) });
+            return originalSend(envelope, payload);
+        };
         // 1. 项目路径提供器
         if (inst.onProjectPathRequest && inst.channel.onProjectPathRequest) {
             inst.channel.onProjectPathRequest(async (channelId) => {
@@ -435,6 +601,10 @@ async function main() {
             agent.status = 'running';
         }
     }
+    // 写入 ready 信号（核心服务已就绪，channel 连接不阻塞启动判定）
+    const readySignalPath = resolvePaths().readySignal;
+    fs.writeFileSync(readySignalPath, String(Date.now()));
+    logger.info(`✓ Ready signal written: ${readySignalPath}`);
     // ── 连接所有渠道（异步，AUN 等 WebSocket 渠道在后台重连）──
     const connected = await channelLoader.connectAll(channelInstances);
     // 预填充 Feishu 已知 thread_id（重启后避免误判话题创建）
@@ -631,10 +801,6 @@ async function main() {
             logger.error('[Restart] Failed to send restart notification:', e);
         }
     }
-    // 写入 ready 信号，供 restart-monitor 检测启动成功
-    const readySignalPath = resolvePaths().readySignal;
-    fs.writeFileSync(readySignalPath, String(Date.now()));
-    logger.info(`✓ Ready signal written: ${readySignalPath}`);
     // IPC server — 供 CLI 查询实时状态 + Agent ctl 指令执行
     const ipcServer = new IpcServer(resolvePaths().socket, () => {
         const channels = {};
@@ -784,7 +950,8 @@ async function main() {
                 results.push(`⚠ ${cfg.aid}: ${e?.message || e}`);
             }
         }
-        // 重建 channel index
+        // 重建 channel index + 清除 kit 缓存
+        invalidateKitCache();
         agentRegistry.channelIndex.clear();
         agentRegistry.buildChannelIndex();
         logger.info(`[Resync] Done: ${results.length} agent(s) processed`);