npm - evolclaw - Versions diffs - 2.1.1 → 2.2.0 - Mend

evolclaw 2.1.1 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

package/README.md +10 -3
package/data/evolclaw.sample.json +9 -1
package/dist/agents/claude-runner.js +612 -0
package/dist/agents/codex-runner.js +310 -0
package/dist/channels/aun.js +416 -9
package/dist/channels/feishu.js +397 -104
package/dist/channels/wechat.js +84 -2
package/dist/cli.js +427 -126
package/dist/config.js +102 -4
package/dist/core/adapters/claude-session-file-adapter.js +144 -0
package/dist/core/adapters/codex-session-file-adapter.js +196 -0
package/dist/core/agent-loader.js +39 -0
package/dist/core/channel-loader.js +60 -0
package/dist/core/command-handler.js +908 -304
package/dist/core/event-bus.js +32 -0
package/dist/core/ipc-server.js +71 -0
package/dist/core/message-bridge.js +187 -0
package/dist/core/message-processor.js +370 -227
package/dist/core/message-queue.js +153 -29
package/dist/core/permission.js +58 -0
package/dist/core/session-file-adapter.js +7 -0
package/dist/core/session-manager.js +571 -223
package/dist/core/stats-collector.js +86 -0
package/dist/index.js +309 -243
package/dist/paths.js +1 -0
package/dist/utils/error-utils.js +4 -2
package/dist/utils/init-feishu.js +2 -0
package/dist/utils/init-wechat.js +2 -0
package/dist/utils/init.js +285 -53
package/dist/utils/ipc-client.js +36 -0
package/dist/utils/migrate-project.js +122 -0
package/dist/utils/{permission.js → permission-utils.js} +31 -3
package/dist/utils/rich-content-renderer.js +228 -0
package/dist/utils/session-file-health.js +11 -34
package/dist/utils/stream-debouncer.js +122 -0
package/dist/utils/stream-idle-monitor.js +1 -1
package/package.json +3 -1
package/dist/core/agent-runner.js +0 -348
package/dist/core/message-stream.js +0 -59
package/dist/index.js.bak +0 -340
package/dist/utils/markdown-to-feishu.js +0 -94
/package/dist/utils/{platform.js → cross-platform.js} +0 -0
/package/dist/{core → utils}/message-cache.js +0 -0

package/dist/utils/rich-content-renderer.js ADDED Viewed

@@ -0,0 +1,228 @@
+/**
+ * Rich Content Renderer
+ *
+ * Renders LaTeX formulas and Mermaid diagrams to PNG images using Playwright.
+ * KaTeX CSS/JS/fonts and Mermaid JS are loaded from node_modules and injected
+ * inline via setContent — no network, CDN, or local server needed.
+ */
+import fs from 'fs';
+import path from 'path';
+import { getPackageRoot } from '../paths.js';
+import { logger } from './logger.js';
+// Lazy-loaded Playwright
+let chromium;
+let browserInstance;
+let browserContext;
+// Cached inline resources (loaded once, reused)
+let katexCSS = null;
+let katexJS = null;
+let mermaidJS = null;
+// Dependency availability check (cached)
+let dependenciesAvailable = null;
+function getKatexCSS() {
+    if (katexCSS)
+        return katexCSS;
+    const katexDir = path.join(getPackageRoot(), 'node_modules', 'katex', 'dist');
+    let css = fs.readFileSync(path.join(katexDir, 'katex.min.css'), 'utf8');
+    // Embed woff2 fonts as data URIs so they work without file:// or http
+    css = css.replace(/url\(fonts\/([\w.-]+\.woff2)\)/g, (_m, fontFile) => {
+        const fontPath = path.join(katexDir, 'fonts', fontFile);
+        if (fs.existsSync(fontPath)) {
+            const b64 = fs.readFileSync(fontPath).toString('base64');
+            return `url(data:font/woff2;base64,${b64})`;
+        }
+        return _m;
+    });
+    katexCSS = css;
+    return css;
+}
+function getKatexJS() {
+    if (katexJS)
+        return katexJS;
+    const katexDir = path.join(getPackageRoot(), 'node_modules', 'katex', 'dist');
+    katexJS = fs.readFileSync(path.join(katexDir, 'katex.min.js'), 'utf8');
+    return katexJS;
+}
+function getMermaidJS() {
+    if (mermaidJS)
+        return mermaidJS;
+    const mermaidDir = path.join(getPackageRoot(), 'node_modules', 'mermaid', 'dist');
+    mermaidJS = fs.readFileSync(path.join(mermaidDir, 'mermaid.min.js'), 'utf8');
+    return mermaidJS;
+}
+async function getBrowser() {
+    if (browserInstance?.isConnected?.())
+        return browserInstance;
+    try {
+        // @ts-ignore - runtime path, not a declared module
+        const pw = await import('/root/.claude/node_modules/playwright/index.mjs');
+        chromium = pw.chromium;
+    }
+    catch {
+        // @ts-ignore - optional dependency
+        const pw = await import('playwright');
+        chromium = pw.chromium;
+    }
+    browserInstance = await chromium.launch({
+        headless: false,
+        args: ['--headless=new', '--no-sandbox', '--disable-dev-shm-usage'],
+    });
+    browserContext = await browserInstance.newContext({
+        viewport: { width: 1280, height: 800 },
+    });
+    return browserInstance;
+}
+async function getPage() {
+    await getBrowser();
+    return browserContext.newPage();
+}
+export async function renderLatex(formula, displayMode = true) {
+    const page = await getPage();
+    try {
+        const css = getKatexCSS();
+        const js = getKatexJS();
+        const escaped = formula.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n');
+        const html = '<!DOCTYPE html><html><head><style>' + css + '</style>'
+            + '<style>body{background:white;margin:0;padding:16px;display:inline-block;}#f{font-size:1.2em;}</style>'
+            + '</head><body><div id="f"></div>'
+            + '<scr' + 'ipt>' + js + '</scr' + 'ipt>'
+            + '<scr' + 'ipt>'
+            + 'try{katex.render("' + escaped + '",document.getElementById("f"),'
+            + '{displayMode:' + displayMode + ',throwOnError:false});'
+            + '}catch(e){document.getElementById("f").textContent="Error: "+e.message;}'
+            + '</scr' + 'ipt></body></html>';
+        await page.setContent(html, { waitUntil: 'load' });
+        await page.waitForTimeout(500);
+        const el = page.locator('#f');
+        const box = await el.boundingBox();
+        if (!box || box.width === 0 || box.height === 0) {
+            throw new Error('LaTeX element has zero size');
+        }
+        return Buffer.from(await el.screenshot({ type: 'png' }));
+    }
+    finally {
+        await page.close();
+    }
+}
+export async function renderMermaid(code) {
+    const page = await getPage();
+    try {
+        const js = getMermaidJS();
+        const escaped = code.replace(/\\/g, '\\\\').replace(/`/g, '\\`').replace(/\$/g, '\\$');
+        const html = '<!DOCTYPE html><html><head>'
+            + '<style>body{background:white;margin:0;padding:16px;display:inline-block;}</style>'
+            + '</head><body><div id="m"></div>'
+            + '<scr' + 'ipt>' + js + '</scr' + 'ipt>'
+            + '<scr' + 'ipt>'
+            + '(async()=>{'
+            + 'mermaid.initialize({startOnLoad:false,theme:"default"});'
+            + 'try{const{svg}=await mermaid.render("md",`' + escaped + '`);'
+            + 'document.getElementById("m").innerHTML=svg;'
+            + '}catch(e){document.getElementById("m").textContent="Error: "+e.message;}'
+            + '})();'
+            + '</scr' + 'ipt></body></html>';
+        await page.setContent(html, { waitUntil: 'load' });
+        await page.waitForTimeout(1500);
+        const el = page.locator('#m');
+        const box = await el.boundingBox();
+        if (!box || box.width === 0 || box.height === 0) {
+            throw new Error('Mermaid element has zero size');
+        }
+        return Buffer.from(await el.screenshot({ type: 'png' }));
+    }
+    finally {
+        await page.close();
+    }
+}
+export function extractLatex(text) {
+    const results = [];
+    const blockRe = /\$\$([\s\S]+?)\$\$/g;
+    let m;
+    while ((m = blockRe.exec(text)) !== null) {
+        results.push({
+            match: m[0], formula: m[1].trim(), displayMode: true,
+            start: m.index, end: m.index + m[0].length,
+        });
+    }
+    const inlineRe = /(?<!\$)\$(?!\$)(.+?)(?<!\$)\$(?!\$)/g;
+    while ((m = inlineRe.exec(text)) !== null) {
+        const overlaps = results.some(r => m.index >= r.start && m.index < r.end);
+        if (!overlaps) {
+            results.push({
+                match: m[0], formula: m[1].trim(), displayMode: false,
+                start: m.index, end: m.index + m[0].length,
+            });
+        }
+    }
+    results.sort((a, b) => a.start - b.start);
+    return results;
+}
+export function extractMermaid(text) {
+    const results = [];
+    const re = /```mermaid\s*\n([\s\S]+?)```/g;
+    let m;
+    while ((m = re.exec(text)) !== null) {
+        results.push({ match: m[0], code: m[1].trim(), start: m.index, end: m.index + m[0].length });
+    }
+    return results;
+}
+export async function renderAllRichContent(text) {
+    const latexItems = extractLatex(text);
+    const mermaidItems = extractMermaid(text);
+    const results = [];
+    for (const item of latexItems) {
+        try {
+            const png = await renderLatex(item.formula, item.displayMode);
+            results.push({ match: item.match, start: item.start, end: item.end, type: 'latex', png });
+        }
+        catch (err) {
+            logger.warn('[RichContent] LaTeX render failed: ' + item.formula, err);
+        }
+    }
+    for (const item of mermaidItems) {
+        try {
+            const png = await renderMermaid(item.code);
+            results.push({ match: item.match, start: item.start, end: item.end, type: 'mermaid', png });
+        }
+        catch (err) {
+            logger.warn('[RichContent] Mermaid render failed', err);
+        }
+    }
+    return results;
+}
+/**
+ * 检查富内容渲染依赖是否可用（playwright、katex、mermaid）
+ */
+export function checkDependencies() {
+    if (dependenciesAvailable !== null)
+        return dependenciesAvailable;
+    try {
+        const pkgRoot = getPackageRoot();
+        const playwrightPath = path.join(pkgRoot, 'node_modules', 'playwright');
+        const katexPath = path.join(pkgRoot, 'node_modules', 'katex', 'dist', 'katex.min.js');
+        const mermaidPath = path.join(pkgRoot, 'node_modules', 'mermaid', 'dist', 'mermaid.min.js');
+        dependenciesAvailable = fs.existsSync(playwrightPath) && fs.existsSync(katexPath) && fs.existsSync(mermaidPath);
+        if (!dependenciesAvailable) {
+            logger.warn('[RichContent] Dependencies not installed (playwright/katex/mermaid), rich content rendering disabled');
+        }
+        return dependenciesAvailable;
+    }
+    catch (err) {
+        logger.warn('[RichContent] Failed to check dependencies:', err);
+        dependenciesAvailable = false;
+        return false;
+    }
+}
+export function hasRichContent(text) {
+    return extractLatex(text).length > 0 || extractMermaid(text).length > 0;
+}
+export async function closeBrowser() {
+    if (browserContext) {
+        await browserContext.close().catch(() => { });
+        browserContext = null;
+    }
+    if (browserInstance) {
+        await browserInstance.close().catch(() => { });
+        browserInstance = null;
+    }
+}

package/dist/utils/session-file-health.js CHANGED Viewed

@@ -1,38 +1,17 @@
-import fs from 'fs/promises';
-import path from 'path';
+import fsPromises from 'fs/promises';
 import { logger } from './logger.js';
 /**
- * 检查会话文件是否存在
+ * 检查会话文件健康度（接收完整文件路径）
  */
-async function fileExists(filePath) {
-    try {
-        await fs.access(filePath);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * 检查会话文件健康度
- */
-export async function checkSessionFileHealth(projectPath, agentSessionId) {
+export async function checkSessionFile(sessionFile) {
     const issues = [];
-    const sessionFile = path.join(projectPath, '.claude', `${agentSessionId}.jsonl`);
-    // 检查文件是否存在
-    if (!(await fileExists(sessionFile))) {
-        // 新会话没有文件是正常的
-        return { healthy: true, issues: [] };
-    }
     try {
-        // 检查文件大小
-        const stats = await fs.stat(sessionFile);
+        const stats = await fsPromises.stat(sessionFile);
         const sizeMB = stats.size / (1024 * 1024);
         if (stats.size > 50 * 1024 * 1024) {
             issues.push(`会话文件过大: ${sizeMB.toFixed(1)}MB`);
         }
-        // 检查 JSON 格式
-        const content = await fs.readFile(sessionFile, 'utf-8');
+        const content = await fsPromises.readFile(sessionFile, 'utf-8');
         const lines = content.split('\n').filter(l => l.trim());
         for (let i = 0; i < lines.length; i++) {
             try {
@@ -56,13 +35,11 @@ export async function checkSessionFileHealth(projectPath, agentSessionId) {
     }
 }
 /**
- * 备份会话目录
+ * 备份单个会话文件（在同目录下创建 .bak 副本）
  */
-export async function backupClaudeDir(projectPath) {
-    const claudeDir = path.join(projectPath, '.claude');
-    const dirName = path.basename(claudeDir);
-    const backupDir = path.join(path.dirname(claudeDir), `${dirName}-backup-${Date.now()}`);
-    await fs.cp(claudeDir, backupDir, { recursive: true });
-    logger.info(`[SessionFileHealth] Backup created: ${backupDir}`);
-    return backupDir;
+export async function backupSessionFile(sessionFile) {
+    const backupPath = `${sessionFile}.bak-${Date.now()}`;
+    await fsPromises.copyFile(sessionFile, backupPath);
+    logger.info(`[SessionFileHealth] Backup created: ${backupPath}`);
+    return backupPath;
 }

package/dist/utils/stream-debouncer.js ADDED Viewed

@@ -0,0 +1,122 @@
+import { logger } from './logger.js';
+/**
+ * 入站消息去抖器
+ *
+ * 在 debounceMs 窗口内收到的同一 session 的多条消息合并为一次 enqueue：
+ * - content 用 \n 连接
+ * - images / mentions 合并
+ * - replyContext / 其余字段取最后一条
+ *
+ * cancel(messageId) 可精确移除窗口中的某条消息，不影响其余消息。
+ */
+export class StreamDebouncer {
+    pending = new Map();
+    delayMs;
+    maxWaitMs;
+    maxMessages;
+    constructor(debounceSeconds, maxMessages = 5) {
+        this.delayMs = debounceSeconds * 1000;
+        this.maxWaitMs = this.delayMs * 3;
+        this.maxMessages = maxMessages;
+    }
+    get enabled() {
+        return this.delayMs > 0;
+    }
+    /**
+     * 提交一条消息。如果窗口内已有消息则追加并重置 timer；
+     * 否则新建窗口。timer 到期后自动 flush。
+     */
+    submit(key, message, enqueue) {
+        const { content, images, mentions, messageId, replyContext, ...rest } = message;
+        return new Promise((resolve, reject) => {
+            const entry = { messageId, content, images, mentions, replyContext, rest, resolve, reject };
+            const win = this.pending.get(key);
+            if (win) {
+                clearTimeout(win.timer);
+                win.entries.push(entry);
+                if (win.entries.length >= this.maxMessages) {
+                    logger.debug(`[Debounce] Max messages (${this.maxMessages}) reached for ${key}, flushing immediately`);
+                    clearTimeout(win.maxWaitTimer);
+                    this.flush(key, enqueue);
+                    return;
+                }
+                win.timer = setTimeout(() => this.flush(key, enqueue), this.delayMs);
+                logger.debug(`[Debounce] Appended message for ${key}, ${win.entries.length} pending`);
+            }
+            else {
+                const timer = setTimeout(() => this.flush(key, enqueue), this.delayMs);
+                const maxWaitTimer = setTimeout(() => this.flush(key, enqueue), this.maxWaitMs);
+                this.pending.set(key, { entries: [entry], timer, maxWaitTimer });
+                logger.debug(`[Debounce] New window for ${key}, debounce=${this.delayMs}ms, maxWait=${this.maxWaitMs}ms`);
+            }
+        });
+    }
+    /**
+     * 从 debounce 窗口中撤回指定 messageId 的消息。
+     * 如果窗口只剩这一条，整个窗口取消。
+     * @returns true 如果找到并移除
+     */
+    cancel(messageId) {
+        for (const [key, win] of this.pending) {
+            const idx = win.entries.findIndex(e => e.messageId === messageId);
+            if (idx === -1)
+                continue;
+            // resolve 被撤回的那条（静默完成，不报错）
+            win.entries.splice(idx, 1)[0].resolve();
+            logger.info(`[Debounce] Cancelled message ${messageId} from window ${key}`);
+            // 窗口空了 → 整个取消
+            if (win.entries.length === 0) {
+                clearTimeout(win.timer);
+                clearTimeout(win.maxWaitTimer);
+                this.pending.delete(key);
+                logger.info(`[Debounce] Window ${key} empty after cancel, removed`);
+            }
+            return true;
+        }
+        return false;
+    }
+    flush(key, enqueue) {
+        const win = this.pending.get(key);
+        if (!win)
+            return;
+        this.pending.delete(key);
+        clearTimeout(win.timer);
+        clearTimeout(win.maxWaitTimer);
+        const { entries } = win;
+        // 合并：content 用 \n 连接，images/mentions 扁平合并，其余取最后一条
+        const allImages = [];
+        const allMentions = [];
+        const contents = [];
+        for (const e of entries) {
+            contents.push(e.content);
+            if (e.images)
+                allImages.push(...e.images);
+            if (e.mentions)
+                allMentions.push(...e.mentions);
+        }
+        const last = entries[entries.length - 1];
+        const merged = {
+            ...last.rest,
+            content: contents.join('\n'),
+            images: allImages.length > 0 ? allImages : undefined,
+            mentions: allMentions.length > 0 ? allMentions : undefined,
+            replyContext: last.replyContext,
+            messageId: entries.length > 1 ? undefined : last.messageId,
+        };
+        const resolves = entries.map(e => e.resolve);
+        const rejects = entries.map(e => e.reject);
+        enqueue(merged).then(() => resolves.forEach(r => r()), (e) => rejects.forEach(r => r(e)));
+    }
+    /** 当前挂起的 key 数量（用于测试/调试） */
+    get pendingCount() {
+        return this.pending.size;
+    }
+    /** 清理所有挂起的 timer（用于 shutdown） */
+    dispose() {
+        for (const win of this.pending.values()) {
+            clearTimeout(win.timer);
+            clearTimeout(win.maxWaitTimer);
+        }
+        this.pending.clear();
+    }
+}

package/dist/utils/stream-idle-monitor.js CHANGED Viewed

@@ -34,7 +34,7 @@ export class StreamIdleMonitor {
             this.state.lastToolStartTime = Date.now();
             this.state.totalToolCalls++;
         }
-        if (type === 'text_delta' || type === 'result') {
+        if (type === 'text' || type === 'text_delta' || type === 'complete' || type === 'result') {
             this.state.hasReceivedText = true;
         }
         // 收到新事件，重置已触发级别

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Lightweight AI Agent gateway connecting Claude Agent SDK to messaging channels (Feishu, ACP) with multi-project session management",
   "type": "module",
   "main": "dist/index.js",
@@ -23,7 +23,9 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.75",
+    "@aun/core-node": "file:aun/aun-sdk-core/ts",
     "@larksuiteoapi/node-sdk": "^1.59.0",
+    "@openai/codex-sdk": "^0.118.0",
     "image-type": "^6.0.0",
     "qrcode-terminal": "^0.12.0"
   },