evolclaw 2.1.1 → 2.2.0

package/dist/core/agent-runner.js

@@ -1,348 +0,0 @@
-import { query } from '@anthropic-ai/claude-agent-sdk';
-import { ensureDir } from '../config.js';
-import path from 'path';
-import fs from 'fs';
-import os from 'os';
-import { MessageStream } from './message-stream.js';
-import { logger } from '../utils/logger.js';
-import { canUseTool } from '../utils/permission.js';
-import { encodePath } from '../utils/platform.js';
-export class AgentRunner {
-    apiKey;
-    model;
-    effort;
-    baseUrl;
-    config;
-    activeSessions = new Map();
-    activeStreams = new Map();
-    onSessionIdUpdate;
-    onCompactStart;
-    constructor(apiKey, model, onSessionIdUpdate, baseUrl, config) {
-        this.apiKey = apiKey;
-        this.model = model || 'sonnet';
-        this.effort = undefined;
-        this.baseUrl = baseUrl;
-        this.config = config;
-        this.onSessionIdUpdate = onSessionIdUpdate;
-    }
-    getAgentEnv() {
-        return {
-            ...process.env,
-            ANTHROPIC_AUTH_TOKEN: this.apiKey,
-            PATH: process.env.PATH,
-            DISABLE_AUTOUPDATER: '1',
-            ...(this.baseUrl ? { ANTHROPIC_BASE_URL: this.baseUrl } : {})
-        };
-    }
-    setModel(model) {
-        this.model = model;
-    }
-    getModel() {
-        return this.model;
-    }
-    setEffort(effort) {
-        this.effort = effort;
-    }
-    getEffort() {
-        return this.effort;
-    }
-    syncFromUserSettings() {
-        try {
-            const settingsPath = path.join(os.homedir(), '.claude', 'settings.json');
-            if (!fs.existsSync(settingsPath))
-                return;
-            const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
-            if (settings.model && settings.model !== this.model) {
-                logger.info(`[AgentRunner] Synced model from ~/.claude/settings.json: ${settings.model}`);
-                this.model = settings.model;
-            }
-            const newEffort = settings.effortLevel || undefined;
-            if (newEffort !== this.effort) {
-                logger.info(`[AgentRunner] Synced effort from ~/.claude/settings.json: ${newEffort ?? 'auto'}`);
-                this.effort = newEffort;
-            }
-        }
-        catch (error) {
-            logger.debug(`[AgentRunner] Failed to sync from ~/.claude/settings.json:`, error);
-        }
-    }
-    setCompactStartCallback(callback) {
-        this.onCompactStart = callback;
-    }
-    async runQuery(sessionId, prompt, projectPath, initialClaudeSessionId, images, systemPromptAppend, sessionManager) {
-        // 同步用户级配置到内存
-        this.syncFromUserSettings();
-        ensureDir(projectPath);
-        ensureDir(path.join(projectPath, '.claude'));
-        // 优先使用传入的 agentSessionId（从数据库恢复），否则使用内存中的
-        let agentSessionId = initialClaudeSessionId || this.activeSessions.get(sessionId);
-        // 检查是否在安全模式
-        let skipResume = false;
-        if (sessionManager) {
-            const health = await sessionManager.getHealthStatus(sessionId);
-            if (health.safeMode) {
-                // 安全模式：不使用 resume，每次都是新对话
-                agentSessionId = undefined;
-                skipResume = true;
-                logger.warn(`[AgentRunner] Safe mode enabled for ${sessionId}, not resuming session`);
-            }
-        }
-        // 验证会话文件是否存在且有效（仅在非安全模式且有 agentSessionId 时）
-        if (agentSessionId && !skipResume) {
-            const homeDir = os.homedir();
-            const encodedProjectPath = encodePath(projectPath);
-            const sessionFile = path.join(homeDir, '.claude', 'projects', encodedProjectPath, `${agentSessionId}.jsonl`);
-            let isValid = false;
-            if (fs.existsSync(sessionFile)) {
-                try {
-                    const content = fs.readFileSync(sessionFile, 'utf-8');
-                    const lines = content.split('\n').filter(l => l.trim());
-                    // 查找第一个包含 sessionId 和 version 的行（跳过 queue-operation）
-                    for (const line of lines) {
-                        try {
-                            const data = JSON.parse(line);
-                            if (data.sessionId && data.version) {
-                                isValid = true;
-                                break;
-                            }
-                        }
-                        catch { }
-                    }
-                    if (!isValid) {
-                        logger.warn(`[AgentRunner] Session file missing session data: ${sessionFile}`);
-                    }
-                }
-                catch (error) {
-                    logger.warn(`[AgentRunner] Session file corrupted: ${sessionFile}`);
-                }
-            }
-            if (!isValid) {
-                logger.warn(`[AgentRunner] Invalid session file, starting new session`);
-                agentSessionId = undefined;
-                this.activeSessions.delete(sessionId);
-                if (this.onSessionIdUpdate) {
-                    this.onSessionIdUpdate(sessionId, '');
-                }
-            }
-        }
-        // PreCompact Hook - 在压缩开始时触发
-        const preCompactHook = async () => {
-            if (this.onCompactStart) {
-                this.onCompactStart(sessionId);
-            }
-            return {};
-        };
-        // PreToolUse Hook - 工具执行前安全检查
-        const preToolUseHook = async (input) => {
-            const result = await canUseTool(input.tool_name, input.tool_input || {});
-            if (result.behavior === 'deny') {
-                // 使用 decision: 'block' 来拒绝工具执行
-                return {
-                    decision: 'block',
-                    reason: result.message
-                };
-            }
-            return {};
-        };
-        const useSettingSources = this.config?.agents?.anthropic?.useSettingSources !== false;
-        const enableSummaries = this.config?.agents?.anthropic?.agentProgressSummaries !== false;
-        // 公共 options（新旧模式共用）
-        logger.info(`[AgentRunner] runQuery model=${this.model} effort=${this.effort ?? 'auto'}`);
-        const commonOptions = {
-            cwd: projectPath,
-            model: this.model,
-            ...(this.effort ? { effort: this.effort } : {}),
-            canUseTool,
-            permissionMode: 'default',
-            persistSession: true,
-            hooks: {
-                PreCompact: [{ matcher: '.*', hooks: [preCompactHook] }],
-                PreToolUse: [{ matcher: '.*', hooks: [preToolUseHook] }]
-            },
-            ...(enableSummaries ? { agentProgressSummaries: true } : {}),
-            stderr: (msg) => {
-                if (msg.includes('[ERROR]') || msg.includes('[WARN]') || msg.includes('Stream started')) {
-                    logger.info(`[Claude-stderr] ${msg.trim()}`);
-                }
-                else {
-                    logger.debug(`[Claude-stderr] ${msg.trim()}`);
-                }
-            },
-            env: this.getAgentEnv()
-        };
-        const createQuery = (promptInput, resumeSessionId) => {
-            if (useSettingSources) {
-                // 新方式：SDK 自动加载 CLAUDE.md 和 MCP 配置
-                return query({
-                    prompt: promptInput,
-                    options: {
-                        ...commonOptions,
-                        settingSources: ['project', 'user'],
-                        systemPrompt: {
-                            type: 'preset',
-                            preset: 'claude_code',
-                            ...(systemPromptAppend ? { append: systemPromptAppend } : {})
-                        },
-                        ...(resumeSessionId ? { resume: resumeSessionId } : {}),
-                    }
-                });
-            }
-            else {
-                // 旧方式：手动加载 CLAUDE.md 和 MCP 配置（保留用于回滚）
-                const globalClaudeMd = (() => {
-                    try {
-                        const globalPath = path.join(os.homedir(), '.claude', 'CLAUDE.md');
-                        if (fs.existsSync(globalPath)) {
-                            return fs.readFileSync(globalPath, 'utf-8').trim();
-                        }
-                    }
-                    catch { }
-                    return '';
-                })();
-                const projectClaudeMds = [
-                    path.join(projectPath, 'CLAUDE.md'),
-                    path.join(projectPath, '.claude', 'CLAUDE.md'),
-                ].map(p => {
-                    try {
-                        return fs.existsSync(p) ? fs.readFileSync(p, 'utf-8').trim() : '';
-                    }
-                    catch {
-                        return '';
-                    }
-                }).filter(Boolean);
-                const globalMcpServers = (() => {
-                    try {
-                        const mcpPath = path.join(os.homedir(), '.claude', 'mcp.json');
-                        if (fs.existsSync(mcpPath)) {
-                            const config = JSON.parse(fs.readFileSync(mcpPath, 'utf-8'));
-                            return config.mcpServers || {};
-                        }
-                    }
-                    catch { }
-                    return {};
-                })();
-                const fullAppend = [...projectClaudeMds, globalClaudeMd, systemPromptAppend].filter(Boolean).join('\n\n');
-                return query({
-                    prompt: promptInput,
-                    options: {
-                        ...commonOptions,
-                        ...(resumeSessionId ? { resume: resumeSessionId } : {}),
-                        ...(Object.keys(globalMcpServers).length > 0 ? { mcpServers: globalMcpServers } : {}),
-                        ...(fullAppend ? {
-                            systemPrompt: {
-                                type: 'preset',
-                                preset: 'claude_code',
-                                append: fullAppend
-                            }
-                        } : {}),
-                    }
-                });
-            }
-        };
-        let lastError;
-        for (let attempt = 0; attempt < 3; attempt++) {
-            try {
-                let queryStream;
-                if (images && images.length > 0) {
-                    logger.debug('[AgentRunner] Creating query with images, images:', images.length);
-                    logger.debug('[AgentRunner] Skipping resume for image message to avoid history conflict');
-                    const stream = new MessageStream();
-                    stream.push(prompt, images);
-                    stream.end();
-                    queryStream = createQuery(stream);
-                }
-                else {
-                    logger.debug('[AgentRunner] Creating query with text only, agentSessionId:', initialClaudeSessionId);
-                    queryStream = createQuery(prompt, agentSessionId);
-                }
-                this.activeStreams.set(sessionId, queryStream);
-                return queryStream;
-            }
-            catch (error) {
-                lastError = error;
-                if (attempt < 2) {
-                    await new Promise(resolve => setTimeout(resolve, (attempt + 1) * 1000));
-                }
-            }
-        }
-        throw lastError;
-    }
-    async interrupt(sessionId) {
-        const stream = this.activeStreams.get(sessionId);
-        if (stream && 'interrupt' in stream && typeof stream.interrupt === 'function') {
-            await stream.interrupt();
-            this.activeStreams.delete(sessionId);
-            logger.info(`[AgentRunner] Interrupted session: ${sessionId}`);
-        }
-    }
-    hasActiveStream(sessionId) {
-        return this.activeStreams.has(sessionId);
-    }
-    registerStream(key, stream) {
-        this.activeStreams.set(key, stream);
-    }
-    cleanupStream(sessionId) {
-        this.activeStreams.delete(sessionId);
-    }
-    updateSessionId(sessionId, agentSessionId) {
-        logger.info(`[AgentRunner] updateSessionId called: sessionId=${sessionId}, agentSessionId=${agentSessionId}`);
-        this.activeSessions.set(sessionId, agentSessionId);
-        if (this.onSessionIdUpdate) {
-            this.onSessionIdUpdate(sessionId, agentSessionId);
-        }
-    }
-    runSessionCommand(prompt, agentSessionId, projectPath) {
-        return query({
-            prompt,
-            options: {
-                cwd: projectPath,
-                model: this.model,
-                resume: agentSessionId,
-                maxTurns: 1,
-                permissionMode: 'default',
-                env: this.getAgentEnv()
-            }
-        });
-    }
-    /**
-     * 主动压缩会话上下文
-     */
-    async compactSession(sessionId, agentSessionId, projectPath) {
-        try {
-            logger.info(`[AgentRunner] Compacting session: ${agentSessionId}`);
-            const stream = this.runSessionCommand('/compact', agentSessionId, projectPath);
-            for await (const event of stream) {
-                if (event.type === 'system' && event.subtype === 'compact_boundary') {
-                    logger.info(`[AgentRunner] Compact completed, pre_tokens: ${event.compact_metadata?.pre_tokens}`);
-                    return true;
-                }
-            }
-            return true; // 正常结束也算成功
-        }
-        catch (error) {
-            logger.error('[AgentRunner] Compact failed:', error);
-            return false;
-        }
-    }
-    /**
-     * 通过 SDK /clear 命令清空会话历史
-     */
-    async clearSession(agentSessionId, projectPath) {
-        try {
-            logger.info(`[AgentRunner] Clearing session via SDK: ${agentSessionId}`);
-            const stream = this.runSessionCommand('/clear', agentSessionId, projectPath);
-            for await (const event of stream) {
-                logger.debug(`[AgentRunner] Clear event: type=${event.type}, subtype=${event.subtype || 'none'}`);
-            }
-            return true;
-        }
-        catch (error) {
-            logger.error('[AgentRunner] Clear session failed:', error);
-            return false;
-        }
-    }
-    async closeSession(sessionId) {
-        this.activeSessions.delete(sessionId);
-        this.activeStreams.delete(sessionId);
-    }
-}

package/dist/core/message-stream.js

@@ -1,59 +0,0 @@
-/**
- * MessageStream - Push-based async iterable for streaming user messages to the SDK.
- * Based on HappyClaw's implementation.
- */
-import { logger } from '../utils/logger.js';
-export class MessageStream {
-    queue = [];
-    waiting = null;
-    done = false;
-    push(text, images) {
-        let content;
-        if (images && images.length > 0) {
-            logger.debug('[MessageStream] Creating multimodal message with', images.length, 'images');
-            logger.debug('[MessageStream] Image sizes:', images.map(img => img.data.length).join(', '));
-            // 多模态消息：text + images
-            content = [
-                { type: 'text', text },
-                ...images.map((img) => ({
-                    type: 'image',
-                    source: {
-                        type: 'base64',
-                        media_type: img.mimeType || 'image/png',
-                        data: img.data,
-                    },
-                })),
-            ];
-        }
-        else {
-            // 纯文本消息
-            content = text;
-        }
-        const message = {
-            type: 'user',
-            message: { role: 'user', content },
-            parent_tool_use_id: null,
-            session_id: '',
-        };
-        logger.debug('[MessageStream] Pushing message, content type:', Array.isArray(content) ? 'array' : 'string');
-        this.queue.push(message);
-        this.waiting?.();
-    }
-    end() {
-        this.done = true;
-        this.waiting?.();
-    }
-    async *[Symbol.asyncIterator]() {
-        while (true) {
-            while (this.queue.length > 0) {
-                yield this.queue.shift();
-            }
-            if (this.done)
-                return;
-            await new Promise((r) => {
-                this.waiting = r;
-            });
-            this.waiting = null;
-        }
-    }
-}