evolclaw 2.8.3 → 3.1.0

package/dist/core/message/stream-flusher.js

@@ -1,238 +0,0 @@
-import { logger } from '../../utils/logger.js';
-import fs from 'fs';
-import path from 'path';
-import { resolvePaths } from '../../paths.js';
-// 诊断日志（按需启用，通过 config.debug.flusherDiag 控制）
-let diagStream = null;
-function getDiagStream() {
-    if (!diagStream) {
-        const logDir = resolvePaths().logs;
-        diagStream = fs.createWriteStream(path.join(logDir, 'flusher-diag.log'), { flags: 'a' });
-    }
-    return diagStream;
-}
-function diag(instanceId, action, meta = {}) {
-    const line = JSON.stringify({ ts: new Date().toISOString(), id: instanceId, action, ...meta });
-    getDiagStream().write(line + '\n');
-}
-/**
- * 流式输出缓冲器
- * 按时间窗口批量推送文本和活动事件
- *
- * 延迟策略：
- * - 第1次：立即发送（0ms）
- * - 第2-4次：半延迟（interval / 2）
- * - 第5次起：动态自适应延迟
- *   - 计算最近10条消息的平均间隔
- *   - 动态延迟 = 平均间隔 * 3
- *   - 下限：interval（额定值）
- *   - 上限：interval * 2.5
- */
-let instanceCounter = 0;
-export class StreamFlusher {
-    send;
-    interval;
-    silent;
-    buffer = '';
-    queue = []; // 按入队顺序记录 activity 和 text 段
-    timer;
-    lastFlush = Date.now();
-    allText = '';
-    sentContent = false;
-    fileMarkerPattern;
-    flushCount = 0;
-    messageTimestamps = [];
-    instanceId;
-    createTime = Date.now();
-    diagEnabled;
-    sendChain = Promise.resolve(); // 串行发送队列，保证消息按序到达
-    constructor(send, interval = 4000, fileMarkerPattern, diagEnabled = false, silent = false) {
-        this.send = send;
-        this.interval = interval;
-        this.silent = silent;
-        this.fileMarkerPattern = fileMarkerPattern;
-        this.diagEnabled = diagEnabled;
-        this.instanceId = `F${++instanceCounter}`;
-        if (this.diagEnabled)
-            diag(this.instanceId, 'created', { interval, silent });
-    }
-    addText(text) {
-        if (this.buffer.length === 0 && text.length > 0) {
-            this.queue.push({ kind: 'text' });
-        }
-        this.buffer += text;
-        this.allText += text;
-        this.messageTimestamps.push(Date.now());
-        if (this.diagEnabled)
-            diag(this.instanceId, 'addText', { len: text.length, preview: text.substring(0, 60), bufLen: this.buffer.length, queueLen: this.queue.length });
-        this.scheduleFlush();
-    }
-    addTextBlock(text) {
-        if (this.buffer && !this.buffer.endsWith('\n')) {
-            this.buffer += '\n\n';
-            this.allText += '\n\n';
-        }
-        this.buffer += text;
-        this.allText += text;
-        this.queue.push({ kind: 'text' });
-        this.messageTimestamps.push(Date.now());
-        if (this.diagEnabled)
-            diag(this.instanceId, 'addTextBlock', { len: text.length, preview: text.substring(0, 60), bufLen: this.buffer.length });
-        this.scheduleFlush();
-    }
-    addActivity(desc) {
-        this.queue.push({ kind: 'activity', text: desc });
-        this.messageTimestamps.push(Date.now());
-        if (this.diagEnabled)
-            diag(this.instanceId, 'addActivity', { desc: desc.substring(0, 80), queueLen: this.queue.length });
-        this.scheduleFlush();
-    }
-    hasContent() {
-        return this.buffer.length > 0 || this.queue.some(e => e.kind === 'activity');
-    }
-    hasSentContent() {
-        return this.sentContent;
-    }
-    getFinalText() {
-        return this.allText;
-    }
-    getRemainingText() {
-        return this.buffer;
-    }
-    stripFromBuffer(pattern) {
-        this.buffer = this.buffer.replace(pattern, '').trim();
-    }
-    scheduleFlush() {
-        if (this.silent)
-            return; // proactive 模式：不调度发送
-        if (this.timer) {
-            if (this.diagEnabled)
-                diag(this.instanceId, 'scheduleFlush:skip', { reason: 'timer_exists' });
-            return;
-        }
-        let targetDelay;
-        if (this.flushCount === 0) {
-            targetDelay = 500;
-        }
-        else if (this.flushCount <= 3) {
-            targetDelay = Math.ceil(this.interval / 2);
-        }
-        else if (this.messageTimestamps.length >= 5) {
-            targetDelay = this.calculateDynamicDelay();
-        }
-        else {
-            targetDelay = this.interval;
-        }
-        const elapsed = Date.now() - this.lastFlush;
-        const delay = Math.max(0, targetDelay - elapsed);
-        if (this.diagEnabled)
-            diag(this.instanceId, 'scheduleFlush:set', { flushCount: this.flushCount, targetDelay, elapsed, actualDelay: delay });
-        this.timer = setTimeout(() => this.flush(), delay);
-    }
-    calculateDynamicDelay() {
-        const recent = this.messageTimestamps.slice(-10);
-        const intervals = [];
-        for (let i = 1; i < recent.length; i++) {
-            intervals.push(recent[i] - recent[i - 1]);
-        }
-        if (intervals.length === 0)
-            return this.interval;
-        const avgInterval = intervals.reduce((a, b) => a + b) / intervals.length;
-        let dynamicDelay = avgInterval * 3;
-        const minDelay = this.interval;
-        const maxDelay = this.interval * 2.5;
-        return Math.max(minDelay, Math.min(maxDelay, dynamicDelay));
-    }
-    /**
-     * 只 flush activities，保留 text buffer 不动
-     * 用于 complete 事件前清空 pending activities，让最终文本留给 flush(true) 发送
-     */
-    async flushActivitiesOnly() {
-        if (this.silent)
-            return;
-        const hasActivities = this.queue.some(e => e.kind === 'activity');
-        if (!hasActivities)
-            return;
-        if (this.timer) {
-            clearTimeout(this.timer);
-            this.timer = undefined;
-        }
-        // 只取 activity 条目，保留 text 条目在 queue 中
-        const activities = this.queue.filter(e => e.kind === 'activity');
-        this.queue = this.queue.filter(e => e.kind === 'text');
-        let output = activities.map(e => e.text).join('\n') + '\n\n';
-        if (output && this.fileMarkerPattern) {
-            output = output.replace(this.fileMarkerPattern, '').trim();
-        }
-        if (this.diagEnabled)
-            diag(this.instanceId, 'flushActivitiesOnly', { outputLen: output.length });
-        if (output) {
-            this.sentContent = true; // 同步标记，避免 timer flush 未 await 时的竞态
-            const text = output;
-            // chain 保持不断裂：单条失败不阻塞后续（catch → resolve）
-            this.sendChain = this.sendChain
-                .then(() => this.send(text, false, false))
-                .catch(e => { logger.warn('[StreamFlusher] send failed:', e); });
-            await this.sendChain;
-            this.lastFlush = Date.now();
-            this.flushCount++;
-        }
-    }
-    async flush(isFinal) {
-        if (this.silent) {
-            // 清理内部状态，避免后续误用
-            if (this.timer) {
-                clearTimeout(this.timer);
-                this.timer = undefined;
-            }
-            this.queue = [];
-            this.buffer = '';
-            return;
-        }
-        if (this.timer) {
-            clearTimeout(this.timer);
-            this.timer = undefined;
-        }
-        let output = '';
-        const hasText = this.buffer.length > 0;
-        // 按入队顺序合并：遇到 text 条目时插入 buffer 内容，遇到 activity 直接追加
-        let textInserted = false;
-        for (const entry of this.queue) {
-            if (entry.kind === 'activity') {
-                // 确保 activity 前有换行分隔（text 末尾可能没有换行）
-                if (output && !output.endsWith('\n'))
-                    output += '\n';
-                output += entry.text + '\n';
-            }
-            else if (!textInserted) {
-                if (output)
-                    output += output.endsWith('\n') ? '\n' : '\n\n';
-                output += this.buffer;
-                textInserted = true;
-            }
-        }
-        // 如果 queue 为空但有 buffer（纯文本情况）
-        if (!textInserted && hasText) {
-            output += this.buffer;
-        }
-        this.queue = [];
-        this.buffer = '';
-        if (output && this.fileMarkerPattern) {
-            output = output.replace(this.fileMarkerPattern, '').trim();
-        }
-        if (this.diagEnabled)
-            diag(this.instanceId, 'flush', { isFinal, outputLen: output.length, flushCount: this.flushCount, sinceLastFlush: Date.now() - this.lastFlush, preview: output.substring(0, 80) });
-        if (output) {
-            this.sentContent = true; // 同步标记，避免 timer flush 未 await 时的竞态
-            const text = output;
-            const final = isFinal;
-            const ht = hasText;
-            this.sendChain = this.sendChain
-                .then(() => this.send(text, final, ht))
-                .catch(e => { logger.warn('[StreamFlusher] send failed:', e); });
-            await this.sendChain;
-            this.lastFlush = Date.now();
-            this.flushCount++;
-        }
-    }
-}

package/dist/core/message/thought-emitter.js

@@ -1,162 +0,0 @@
-import { logger } from '../../utils/logger.js';
-/**
- * ThoughtEmitter — 将 Proactive 模式下的流式 AgentEvent 实时发送为 thought
- *
- * 设计特点：
- * - 不做聚合/batching，逐事件调用 adapter.putThought()
- * - 不感知 group vs P2P，通道差异由 adapter 内部处理
- * - taskId 映射为 context: { type: 'task', id: taskId }（协议 selector）
- *   同时写入 payload.task_id / payload.chatmode，与 message.send/group.send 保持一致
- * - fire-and-forget：调用方不 await emit()，错误被内部捕获
- */
-export class ThoughtEmitter {
-    adapter;
-    channelId;
-    taskId;
-    chatmode;
-    replyContext;
-    hasEmittedText = false;
-    constructor(adapter, channelId, taskId, chatmode = 'proactive', replyContext) {
-        if (!taskId) {
-            throw new Error('[ThoughtEmitter] taskId is required at construction');
-        }
-        this.adapter = adapter;
-        this.channelId = channelId;
-        this.taskId = taskId;
-        this.chatmode = chatmode;
-        this.replyContext = replyContext;
-        logger.info(`[ThoughtEmitter] created channel=${channelId} task=${taskId} chatmode=${chatmode}`);
-    }
-    async emit(event) {
-        // 对齐 interactive 的 dedup：流式 text 已推过时，complete.result 不再重复发 summary
-        if (event.type === 'complete' &&
-            !event.isError &&
-            event.result &&
-            this.hasEmittedText) {
-            return;
-        }
-        const payload = this.mapEventToPayload(event);
-        if (!payload)
-            return;
-        if (!this.adapter.putThought)
-            return;
-        if (payload.stage === 'thinking') {
-            this.hasEmittedText = true;
-        }
-        // payload 也带上 task_id / chatmode（与 message.send/group.send 对齐）
-        payload.task_id = this.taskId;
-        payload.chatmode = this.chatmode;
-        try {
-            await this.adapter.putThought(this.channelId, this.taskId, payload, this.replyContext);
-        }
-        catch (err) {
-            logger.debug(`[ThoughtEmitter] putThought failed: ${err.message}`);
-        }
-    }
-    mapEventToPayload(event) {
-        switch (event.type) {
-            case 'text':
-                if (!event.text)
-                    return null;
-                return { type: 'thought', text: event.text, stage: 'thinking' };
-            case 'tool_use': {
-                const desc = this.summarizeInput(event.input, event.name);
-                return {
-                    type: 'thought',
-                    text: desc ? `🔧 ${event.name}: ${desc}` : `🔧 ${event.name}`,
-                    stage: 'tool',
-                    metadata: { tool: event.name, input: desc },
-                };
-            }
-            case 'tool_result':
-                if (event.isError) {
-                    return {
-                        type: 'thought',
-                        text: `⚠️ ${event.name}: ${event.error || '执行失败'}`,
-                        stage: 'tool',
-                        metadata: { tool: event.name, ok: false },
-                    };
-                }
-                {
-                    const resultText = this.truncate(this.stringifyResult(event.result), 200);
-                    return {
-                        type: 'thought',
-                        text: resultText ? `✅ ${event.name}: ${resultText}` : `✅ ${event.name}`,
-                        stage: 'tool',
-                        metadata: { tool: event.name, ok: true },
-                    };
-                }
-            case 'compact':
-                return {
-                    type: 'thought',
-                    text: `💡 会话压缩完成 (压缩前 tokens: ${event.preTokens})`,
-                    stage: 'system',
-                };
-            case 'task_progress': {
-                const stats = this.formatTaskStats(event);
-                const text = event.summary
-                    ? `⏳ 子任务: ${event.summary}${stats ? ` (${stats})` : ''}`
-                    : `⏳ 子任务进行中${stats ? `: ${stats}` : ''}`;
-                return { type: 'thought', text, stage: 'planning' };
-            }
-            case 'error':
-                return { type: 'thought', text: `❌ ${event.error}`, stage: 'error' };
-            case 'complete':
-                if (event.isError) {
-                    const errText = event.errors?.join('; ') || event.result || '任务失败';
-                    return { type: 'thought', text: `❌ ${errText}`, stage: 'error' };
-                }
-                if (event.result) {
-                    return { type: 'thought', text: event.result, stage: 'summary' };
-                }
-                return null;
-            case 'session_id':
-            case 'state_changed':
-            case 'status':
-                return null;
-            default:
-                return null;
-        }
-    }
-    summarizeInput(input, toolName) {
-        if (!input || typeof input !== 'object')
-            return '';
-        // Bash + ctl send/file: 显示完整命令内容（含发送的消息正文）
-        if (toolName === 'Bash' && typeof input.command === 'string') {
-            const cmd = input.command;
-            if (cmd.includes('evolclaw ctl send') || cmd.includes('evolclaw ctl file')) {
-                return cmd;
-            }
-        }
-        return (input.description ||
-            input.file_path ||
-            input.pattern ||
-            (typeof input.command === 'string' ? input.command.substring(0, 80) : '') ||
-            (typeof input.prompt === 'string' ? input.prompt.substring(0, 80) : '') ||
-            (typeof input.query === 'string' ? input.query.substring(0, 80) : '') ||
-            '');
-    }
-    stringifyResult(result) {
-        if (result === null || result === undefined)
-            return '';
-        if (typeof result === 'string')
-            return result;
-        try {
-            return JSON.stringify(result);
-        }
-        catch {
-            return String(result);
-        }
-    }
-    truncate(text, maxLen) {
-        return text.length > maxLen ? text.substring(0, maxLen) + '...' : text;
-    }
-    formatTaskStats(event) {
-        const parts = [];
-        if (event.toolUses)
-            parts.push(`${event.toolUses} tools`);
-        if (event.durationMs)
-            parts.push(`${Math.round(event.durationMs / 1000)}s`);
-        return parts.join(', ');
-    }
-}

package/dist/core/reload-hooks.js

@@ -1,87 +0,0 @@
-/**
- * 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/prompts/templates.js

@@ -1,122 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { getPackageRoot, resolveRoot } from '../paths.js';
-import { logger } from '../utils/logger.js';
-const KNOWN_SECTIONS = new Set(['runtime', 'group', 'proactive']);
-const SECTION_RE = /^##\s+(\w+)\s*$/;
-let sections = null;
-let builtinSections = null;
-function parseTemplate(content) {
-    const result = new Map();
-    let currentSection = null;
-    let currentLines = [];
-    for (const line of content.split('\n')) {
-        // Stop parsing at horizontal rule separator (documentation follows)
-        if (/^---\s*$/.test(line)) {
-            if (currentSection) {
-                result.set(currentSection, currentLines.join('\n').trim());
-            }
-            break;
-        }
-        const m = line.match(SECTION_RE);
-        if (m) {
-            if (currentSection) {
-                result.set(currentSection, currentLines.join('\n').trim());
-            }
-            const name = m[1];
-            if (KNOWN_SECTIONS.has(name)) {
-                currentSection = name;
-                currentLines = [];
-            }
-            else {
-                currentSection = null;
-                currentLines = [];
-            }
-        }
-        else if (currentSection) {
-            currentLines.push(line);
-        }
-    }
-    if (currentSection) {
-        result.set(currentSection, currentLines.join('\n').trim());
-    }
-    return result;
-}
-function loadBuiltinTemplate() {
-    const builtinPath = path.join(getPackageRoot(), 'dist', 'templates', 'prompts.md');
-    const srcPath = path.join(getPackageRoot(), 'src', 'templates', 'prompts.md');
-    const filePath = fs.existsSync(builtinPath) ? builtinPath : srcPath;
-    const content = fs.readFileSync(filePath, 'utf-8');
-    return parseTemplate(content);
-}
-export function loadPromptTemplates() {
-    builtinSections = loadBuiltinTemplate();
-    const userPath = path.join(resolveRoot(), 'data', 'prompts.md');
-    if (fs.existsSync(userPath)) {
-        try {
-            const content = fs.readFileSync(userPath, 'utf-8');
-            const parsed = parseTemplate(content);
-            sections = new Map(builtinSections);
-            for (const [key, value] of parsed) {
-                sections.set(key, value);
-            }
-            logger.info(`[PromptTemplates] Loaded user override: ${userPath}`);
-        }
-        catch (err) {
-            logger.warn(`[PromptTemplates] Failed to load user override (${userPath}), using builtin:`, err);
-            sections = builtinSections;
-        }
-    }
-    else {
-        sections = builtinSections;
-        logger.info(`[PromptTemplates] Using builtin templates`);
-    }
-    for (const name of KNOWN_SECTIONS) {
-        if (!sections.has(name)) {
-            logger.warn(`[PromptTemplates] Section "${name}" missing, using builtin fallback`);
-            const fallback = builtinSections.get(name);
-            if (fallback)
-                sections.set(name, fallback);
-        }
-    }
-}
-function isTruthy(val) {
-    if (val === undefined || val === null || val === false || val === '' || val === 0)
-        return false;
-    return true;
-}
-function renderTemplate(template, vars) {
-    // Pass 1: conditional sections {{?key}}...{{/}}
-    let result = template.replace(/\{\{\?(\w+)\}\}([\s\S]*?)\{\{\/\}\}/g, (_match, key, body) => {
-        return isTruthy(vars[key]) ? body : '';
-    });
-    // Pass 2: variable substitution {{key}}
-    result = result.replace(/\{\{(\w+)\}\}/g, (_match, key) => {
-        const val = vars[key];
-        if (!isTruthy(val))
-            return '';
-        return String(val);
-    });
-    // Pass 3: remove blank lines
-    return result.split('\n').filter(line => line.trim() !== '').join('\n');
-}
-export function renderPromptSection(section, vars) {
-    if (!sections)
-        loadPromptTemplates();
-    const template = sections.get(section);
-    if (!template) {
-        logger.warn(`[PromptTemplates] Section "${section}" not found`);
-        return '';
-    }
-    return renderTemplate(template, vars);
-}
-/** Reset loaded templates (for testing) */
-export function _resetTemplates() {
-    sections = null;
-    builtinSections = null;
-}
-/** Load templates from a raw string (for testing) */
-export function _loadFromString(content) {
-    builtinSections = parseTemplate(content);
-    sections = builtinSections;
-}