evolclaw 2.8.3 → 3.1.0

package/dist/core/message/message-queue.js

@@ -1,6 +1,6 @@
 import path from 'path';
 import { logger } from '../../utils/logger.js';
-const DEFAULT_AGENT_NAME = '[default]';
+const DEFAULT_AGENT_NAME = '<unknown>';
 export class MessageQueue {
     queues = new Map();
     processing = new Set();
@@ -80,7 +80,8 @@ export class MessageQueue {
         }
         const queueKey = this.getQueueKey(sessionKey, projectPath);
         const agentName = options?.agentName || DEFAULT_AGENT_NAME;
-        logger.debug(`[Queue] Enqueuing message for ${queueKey} (agent=${agentName})`);
+        const isProcessing = this.processing.has(queueKey);
+        logger.info(`[Queue] enqueue: key=${queueKey} processing=${isProcessing} queueLen=${this.queues.get(queueKey)?.length ?? 0} agent=${agentName}`);
         return new Promise((resolve, reject) => {
             if (!this.queues.has(queueKey)) {
                 this.queues.set(queueKey, []);
@@ -92,7 +93,7 @@ export class MessageQueue {
                     // 单聊：保留中断行为
                     logger.debug(`[Queue] ${queueKey} is processing, triggering interrupt`);
                     this.eventBus?.publish({
-                        type: 'message:interrupted',
+                        type: 'task:interrupted',
                         sessionId: sessionKey,
                         reason: 'new_message',
                         agentName: this.processingAgent.get(queueKey),
@@ -104,6 +105,12 @@ export class MessageQueue {
                 else {
                     // 群聊：FIFO，不打断
                     logger.debug(`[Queue] ${queueKey} is processing, message queued (FIFO)`);
+                    this.eventBus?.publish({
+                        type: 'task:queued',
+                        channel: message.channel,
+                        channelId: message.channelId,
+                        replyContext: message.replyContext,
+                    });
                 }
             }
             else {
@@ -114,7 +121,7 @@ export class MessageQueue {
     }
     async processNext(queueKey) {
         this.processing.add(queueKey);
-        logger.debug(`[Queue] Processing queue ${queueKey}`);
+        logger.info(`[Queue] processNext: start key=${queueKey}`);
         while (true) {
             // 等待外部锁释放（/compact, /clear 等快速命令）
             const lock = this.getExternalLock(queueKey);
@@ -124,7 +131,7 @@ export class MessageQueue {
             }
             const queue = this.queues.get(queueKey);
             if (!queue || queue.length === 0) {
-                logger.debug(`[Queue] Queue ${queueKey} is empty, stopping`);
+                logger.info(`[Queue] processNext: queue empty, releasing key=${queueKey}`);
                 this.processing.delete(queueKey);
                 this.processingAgent.delete(queueKey);
                 this.currentSessionKey = undefined;
@@ -276,7 +283,7 @@ export class MessageQueue {
         const sessionKey = this.currentSessionKey.split('::')[0];
         logger.info(`[Queue] Recalled active message ${messageId}, interrupting session ${sessionKey}`);
         this.eventBus?.publish({
-            type: 'message:interrupted',
+            type: 'task:interrupted',
             sessionId: sessionKey,
             reason: 'recalled',
             agentName: this.processingAgent.get(this.currentSessionKey),

package/dist/core/permission.js

@@ -1,4 +1,7 @@
 import path from 'path';
+import fs from 'fs';
+import { renderActionAsText } from './interaction-router.js';
+import { buildEnvelope, sendInteractionPayload } from './message/message-processor.js';
 // 危险命令黑名单（正则表达式）
 const DANGEROUS_PATTERNS = [
     // Unix
@@ -87,9 +90,15 @@ export function summarizeToolInput(toolName, input) {
         return '';
     const extractors = {
         'Read': (i) => i.file_path,
-        'Edit': (i) => i.file_path,
+        'Edit': (i) => formatEditSummary(i),
         'Write': (i) => i.file_path,
-        'Bash': (i) => i.command?.substring(0, 80),
+        'Bash': (i) => {
+            const cmd = i.command?.substring(0, 80) || '';
+            const desc = i.description;
+            if (desc && cmd)
+                return `${cmd} | ${desc}`;
+            return cmd || desc;
+        },
         'Grep': (i) => `pattern: ${i.pattern}`,
         'Glob': (i) => `pattern: ${i.pattern}`,
         'Agent': (i) => i.description || i.prompt?.substring(0, 80),
@@ -108,6 +117,8 @@ export function summarizeToolInput(toolName, input) {
         },
         'TaskCreate': (i) => i.subject || i.description?.substring(0, 80),
         'TaskUpdate': (i) => i.status ? `${i.taskId} → ${i.status}` : i.taskId,
+        'TaskOutput': (i) => `${i.task_id || '?'}${i.block === false ? ' (non-blocking)' : ''}${i.timeout ? ` timeout=${i.timeout}ms` : ''}`,
+        'TaskStop': (i) => i.task_id || i.shell_id || '?',
         'NotebookEdit': (i) => i.notebook_path,
         'WebFetch': (i) => i.url,
         'WebSearch': (i) => i.query?.substring(0, 80),
@@ -129,6 +140,81 @@ export function summarizeToolInput(toolName, input) {
         || input.url
         || '';
 }
+/** 为 Edit 工具生成 diff 风格摘要 */
+function formatEditSummary(input) {
+    const filePath = input.file_path || '';
+    const oldStr = typeof input.old_string === 'string' ? input.old_string : '';
+    const newStr = typeof input.new_string === 'string' ? input.new_string : '';
+    if (!oldStr && !newStr)
+        return filePath;
+    const MAX_DIFF_LINES = 14;
+    const oldLines = oldStr.split('\n');
+    const newLines = newStr.split('\n');
+    // 尝试从文件中定位 old_string 的起始行号
+    let startLine = 0; // 0-based; 0 means unknown
+    if (filePath && oldStr) {
+        try {
+            const content = fs.readFileSync(filePath, 'utf-8');
+            const idx = content.indexOf(oldStr);
+            if (idx >= 0) {
+                startLine = content.slice(0, idx).split('\n').length; // 1-based
+            }
+        }
+        catch {
+            // 文件不可读，行号留空
+        }
+    }
+    const diffLines = [];
+    // 找公共前缀行数
+    let prefixLen = 0;
+    while (prefixLen < oldLines.length && prefixLen < newLines.length && oldLines[prefixLen] === newLines[prefixLen]) {
+        prefixLen++;
+    }
+    // 找公共后缀行数
+    let suffixLen = 0;
+    while (suffixLen < oldLines.length - prefixLen &&
+        suffixLen < newLines.length - prefixLen &&
+        oldLines[oldLines.length - 1 - suffixLen] === newLines[newLines.length - 1 - suffixLen]) {
+        suffixLen++;
+    }
+    const CONTEXT = 2;
+    // 计算行号宽度（用于对齐）
+    const maxLineNo = startLine > 0 ? startLine + oldLines.length - 1 : 0;
+    const newMaxLineNo = startLine > 0 ? startLine + prefixLen + (newLines.length - suffixLen - prefixLen) - 1 : 0;
+    const padWidth = startLine > 0 ? Math.max(maxLineNo, newMaxLineNo).toString().length : 0;
+    // 格式化一行：行号 + 标记 + 内容
+    // 使用 Unicode 符号避免飞书 Markdown 将 "- " 解析为列表
+    const fmtLine = (lineNo, marker, text) => {
+        if (startLine > 0) {
+            return `${lineNo.toString().padStart(padWidth)} ${marker}  ${text}`;
+        }
+        return `${marker}  ${text}`;
+    };
+    // 上下文前缀（最多 CONTEXT 行）
+    const ctxStart = Math.max(0, prefixLen - CONTEXT);
+    for (let i = ctxStart; i < prefixLen; i++) {
+        diffLines.push(fmtLine(startLine + i, ' ', oldLines[i]));
+    }
+    // 删除行
+    const removedEnd = oldLines.length - suffixLen;
+    for (let i = prefixLen; i < removedEnd && diffLines.length < MAX_DIFF_LINES; i++) {
+        diffLines.push(fmtLine(startLine + i, '−', oldLines[i]));
+    }
+    // 新增行（行号从 prefixLen 位置开始递增）
+    const addedEnd = newLines.length - suffixLen;
+    for (let i = prefixLen; i < addedEnd && diffLines.length < MAX_DIFF_LINES; i++) {
+        diffLines.push(fmtLine(startLine + i, '＋', newLines[i]));
+    }
+    // 上下文后缀（最多 CONTEXT 行）
+    const ctxEnd = Math.min(oldLines.length, removedEnd + CONTEXT);
+    for (let i = removedEnd; i < ctxEnd && diffLines.length < MAX_DIFF_LINES + 2; i++) {
+        diffLines.push(fmtLine(startLine + i, ' ', oldLines[i]));
+    }
+    if (diffLines.length > MAX_DIFF_LINES + 2) {
+        diffLines.splice(MAX_DIFF_LINES, diffLines.length, '  ...');
+    }
+    return `${filePath}\n\`\`\`\n${diffLines.join('\n')}\n\`\`\``;
+}
 export class PermissionGateway {
     pending = new Map();
     timeout = 5 * 60 * 1000;
@@ -192,29 +278,48 @@ export class PermissionGateway {
             },
             channelId: context?.channelId || '',
             sessionId,
+            initiatorId: context?.userId,
+            fallback: { command: 'perm' },
         };
-        // 尝试富交互
+        // 尝试富交互（走统一 adapter.send 入口）
         let interactionSent = false;
-        if (context?.adapter?.sendInteraction && context.channelId) {
+        if (context?.adapter && context.channelId) {
             try {
-                const result = await context.adapter.sendInteraction(context.channelId, interaction, context.replyContext);
+                const envelope = buildEnvelope({
+                    taskId: context.taskId,
+                    channel: context.channel ?? context.adapter.channelName,
+                    channelId: context.channelId,
+                    agentName: context.agentName,
+                    chatmode: context.chatmode,
+                    replyContext: context.replyContext,
+                });
+                const fallbackText = `🔐 权限请求 - ${toolName}\n${displaySummary}${reasonLine}\n回复 /perm allow 同意 / /perm always 始终允许 / /perm deny 拒绝`;
+                const result = await sendInteractionPayload(context.adapter, envelope, interaction, fallbackText, context.replyContext);
                 interactionSent = !!result;
             }
             catch (err) {
-                // sendInteraction 失败，fallback 到文本
+                // sendInteractionPayload 已内部捕获，但保险起见再 try/catch
             }
         }
         // fallback 到文本
         if (!interactionSent) {
-            await sendPrompt(`🔐 权限请求\n工具：${toolName}\n操作：${displaySummary}${reasonLine}\n\n回复 /perm allow 本次允许 | always 始终允许 | deny 拒绝`);
+            await sendPrompt(renderActionAsText(interaction));
         }
         return new Promise((resolve) => {
-            this.pending.set(requestId, { sessionId, toolName, resolve, timer: setTimeout(() => { }, 0) });
-            // 如果发了交互卡片，同时注册到 InteractionRouter
-            if (interactionSent && context?.interactionRouter) {
+            const timer = setTimeout(() => {
+                const pending = this.pending.get(requestId);
+                if (!pending)
+                    return;
+                this.pending.delete(requestId);
+                this.eventBus?.publish({ type: 'permission:timeout', sessionId, requestId, toolName });
+                pending.resolve('deny');
+            }, this.timeout);
+            this.pending.set(requestId, { sessionId, toolName, resolve, timer });
+            // 注册到 InteractionRouter（卡片和文本降级都注册，统一路由）
+            if (context?.interactionRouter) {
                 context.interactionRouter.register(requestId, sessionId, (action) => {
                     this.resolvePermission(sessionId, requestId, action);
-                });
+                }, { initiatorId: context?.userId, fallbackCommand: 'perm' });
             }
         });
     }

package/dist/core/session/adapters/codex-session-file-adapter.js

@@ -3,12 +3,31 @@
  *
  * Reads Codex thread data from ~/.codex/state_*.sqlite (read-only)
  * and Codex rollout JSONL files for detailed session info.
+ *
+ * `node:sqlite` 是 Node 22.5+ 的实验性内置模块。低版本 Node 上懒加载会失败，
+ * adapter 自动降级到只读 rollout JSONL —— `checkExists/getFileInfo/readFirstMessage/
+ * readLastUserMessage` 仍可工作；`scanCliSessions/listSdkSessions` 因依赖 DB 索引
+ * 会返回空数组。
  */
-import { DatabaseSync } from 'node:sqlite';
+import { createRequire } from 'module';
 import { logger } from '../../../utils/logger.js';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
+const requireFromHere = createRequire(import.meta.url);
+let sqliteModule; // undefined = not tried, null = unavailable
+function loadSqlite() {
+    if (sqliteModule !== undefined)
+        return sqliteModule;
+    try {
+        sqliteModule = requireFromHere('node:sqlite');
+    }
+    catch (e) {
+        logger.warn(`[CodexAdapter] node:sqlite unavailable (Node < 22.5?): ${e?.message || e}. Codex session listing falls back to rollout JSONL.`);
+        sqliteModule = null;
+    }
+    return sqliteModule;
+}
 export class CodexSessionFileAdapter {
     agentId = 'codex';
     db = null;
@@ -39,11 +58,14 @@ export class CodexSessionFileAdapter {
         if (this.dbInitialized)
             return this.db;
         this.dbInitialized = true;
+        const sqlite = loadSqlite();
+        if (!sqlite)
+            return null;
         const dbPath = this.resolveStateDbPath();
         if (!dbPath)
             return null;
         try {
-            this.db = new DatabaseSync(dbPath, { readOnly: true });
+            this.db = new sqlite.DatabaseSync(dbPath, { readOnly: true });
             logger.debug(`[CodexAdapter] Opened state DB: ${dbPath}`);
         }
         catch (error) {

package/dist/core/session/session-fs-store.js

@@ -0,0 +1,230 @@
+import fs from 'fs';
+import path from 'path';
+// 文件系统非法字符（Windows 最严格）：< > : " / \ | ? *
+// 还有控制字符 0x00-0x1F。我们把这些字符编码为 %XX（hex 大写）。
+// `%` 本身也要转义为 %25，保证可逆。
+const UNSAFE_CHARS_RE = /[<>:"/\\|?*\x00-\x1F%]/g;
+function encodeSegment(s) {
+    return s.replace(UNSAFE_CHARS_RE, ch => '%' + ch.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0'));
+}
+function decodeSegment(s) {
+    return s.replace(/%([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
+}
+/**
+ * 计算 chat 目录的完整路径。
+ * - AUN：sessionsDir/aun/<urlEncode(selfId)>/<urlEncode(channelId)>/
+ * - 其它：sessionsDir/<channelType>/<urlEncode(channelId)>/
+ *
+ * 注：channelType 自身不编码（限定枚举值，不含非法字符）。
+ */
+export function chatDirPath(sessionsDir, channelType, channelId, selfId) {
+    if (channelType === 'aun') {
+        const self = selfId || '_unknown';
+        return path.join(sessionsDir, 'aun', encodeSegment(self), encodeSegment(channelId));
+    }
+    return path.join(sessionsDir, channelType, encodeSegment(channelId));
+}
+/** 解码目录段（用于扫描时把目录名还原为原始 channelId/selfId） */
+export function decodeDirSegment(seg) {
+    return decodeSegment(seg);
+}
+export function generateSessionId(now) {
+    const ts = now ?? Date.now();
+    const d = new Date(ts);
+    const yyyy = d.getFullYear();
+    const mm = String(d.getMonth() + 1).padStart(2, '0');
+    const dd = String(d.getDate()).padStart(2, '0');
+    return `meta_${yyyy}${mm}${dd}_${ts}`;
+}
+export function formatTimestamp(epochMs) {
+    const d = new Date(epochMs);
+    const yyyy = d.getFullYear();
+    const mo = String(d.getMonth() + 1).padStart(2, '0');
+    const dd = String(d.getDate()).padStart(2, '0');
+    const hh = String(d.getHours()).padStart(2, '0');
+    const mi = String(d.getMinutes()).padStart(2, '0');
+    const ss = String(d.getSeconds()).padStart(2, '0');
+    return `${yyyy}-${mo}-${dd} ${hh}:${mi}:${ss}`;
+}
+export function atomicWriteJson(filePath, data) {
+    const tmpPath = filePath + '.tmp';
+    const content = JSON.stringify(data, null, 2) + '\n';
+    const fd = fs.openSync(tmpPath, 'w');
+    fs.writeSync(fd, content);
+    fs.fsyncSync(fd);
+    fs.closeSync(fd);
+    try {
+        fs.unlinkSync(filePath);
+    }
+    catch (e) {
+        if (e.code !== 'ENOENT')
+            throw e;
+    }
+    fs.renameSync(tmpPath, filePath);
+}
+export function appendJsonl(filePath, record) {
+    const line = JSON.stringify(record) + '\n';
+    const fd = fs.openSync(filePath, 'a');
+    fs.writeSync(fd, line);
+    fs.fsyncSync(fd);
+    fs.closeSync(fd);
+}
+export function readJsonFile(filePath) {
+    try {
+        const content = fs.readFileSync(filePath, 'utf-8');
+        return JSON.parse(content);
+    }
+    catch (e) {
+        if (e.code === 'ENOENT')
+            return undefined;
+        if (e instanceof SyntaxError)
+            return undefined;
+        throw e;
+    }
+}
+export function readLastJsonlLine(filePath) {
+    try {
+        const content = fs.readFileSync(filePath, 'utf-8');
+        const lines = content.trimEnd().split('\n');
+        for (let i = lines.length - 1; i >= 0; i--) {
+            const line = lines[i].trim();
+            if (!line)
+                continue;
+            try {
+                return JSON.parse(line);
+            }
+            catch {
+                continue;
+            }
+        }
+        return undefined;
+    }
+    catch (e) {
+        if (e.code === 'ENOENT')
+            return undefined;
+        throw e;
+    }
+}
+export function readAllJsonlLines(filePath) {
+    try {
+        const content = fs.readFileSync(filePath, 'utf-8');
+        const results = [];
+        for (const line of content.split('\n')) {
+            const trimmed = line.trim();
+            if (!trimmed)
+                continue;
+            try {
+                results.push(JSON.parse(trimmed));
+            }
+            catch { /* skip corrupt line */ }
+        }
+        return results;
+    }
+    catch (e) {
+        if (e.code === 'ENOENT')
+            return [];
+        throw e;
+    }
+}
+/**
+ * 扫描所有 chat 目录。
+ * 顶层是 channelType 目录；aun 下面再有一层 selfId 目录。
+ * 返回每个 chat 的：channelType、selfId（仅 aun 有）、channelId、dirPath。
+ */
+export function scanChatDirs(sessionsDir) {
+    const results = [];
+    let typeEntries;
+    try {
+        typeEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+    }
+    catch (e) {
+        if (e.code === 'ENOENT')
+            return [];
+        throw e;
+    }
+    for (const typeEntry of typeEntries) {
+        if (!typeEntry.isDirectory())
+            continue;
+        const channelType = typeEntry.name;
+        const typeDir = path.join(sessionsDir, channelType);
+        if (channelType === 'aun') {
+            // aun 下还有一层 selfId
+            let selfEntries;
+            try {
+                selfEntries = fs.readdirSync(typeDir, { withFileTypes: true });
+            }
+            catch {
+                continue;
+            }
+            for (const selfEntry of selfEntries) {
+                if (!selfEntry.isDirectory())
+                    continue;
+                const selfDir = path.join(typeDir, selfEntry.name);
+                let chatEntries;
+                try {
+                    chatEntries = fs.readdirSync(selfDir, { withFileTypes: true });
+                }
+                catch {
+                    continue;
+                }
+                for (const chatEntry of chatEntries) {
+                    if (!chatEntry.isDirectory())
+                        continue;
+                    results.push({
+                        channelType,
+                        selfId: decodeSegment(selfEntry.name),
+                        channelId: decodeSegment(chatEntry.name),
+                        dirPath: path.join(selfDir, chatEntry.name),
+                    });
+                }
+            }
+        }
+        else {
+            // 通用 channel：sessionsDir/{channelType}/{encodedChannelId}/
+            let chatEntries;
+            try {
+                chatEntries = fs.readdirSync(typeDir, { withFileTypes: true });
+            }
+            catch {
+                continue;
+            }
+            for (const chatEntry of chatEntries) {
+                if (!chatEntry.isDirectory())
+                    continue;
+                results.push({
+                    channelType,
+                    selfId: null,
+                    channelId: decodeSegment(chatEntry.name),
+                    dirPath: path.join(typeDir, chatEntry.name),
+                });
+            }
+        }
+    }
+    return results;
+}
+export function scanMetaFiles(chatDir) {
+    try {
+        const entries = fs.readdirSync(chatDir);
+        return entries
+            .filter(f => f.startsWith('meta_') && f.endsWith('.jsonl'))
+            .sort();
+    }
+    catch (e) {
+        if (e.code === 'ENOENT')
+            return [];
+        throw e;
+    }
+}
+export function ensureChatDir(sessionsDir, channelType, channelId, selfId) {
+    const dir = chatDirPath(sessionsDir, channelType, channelId, selfId);
+    fs.mkdirSync(dir, { recursive: true });
+    fs.mkdirSync(path.join(dir, '_threads'), { recursive: true });
+    fs.mkdirSync(path.join(dir, '_trash'), { recursive: true });
+    return dir;
+}
+export function readThreadIndex(chatDir) {
+    return readJsonFile(path.join(chatDir, '_threads', 'thread-index.json')) || {};
+}
+export function writeThreadIndex(chatDir, index) {
+    atomicWriteJson(path.join(chatDir, '_threads', 'thread-index.json'), index);
+}