evolclaw 2.6.4 → 2.7.0

package/dist/index.js

@@ -1,7 +1,7 @@
 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 { loadConfig, ensureDataDirs, resolvePaths, resolveAnthropicConfig, isOwner, isAdmin, validateConfigIntegrity, validateChannelInstanceNames, getOwner, getChannelSessionMode } from './config.js';
+import { loadConfig, ensureDataDirs, resolvePaths, resolveAnthropicConfig, isOwner, isAdmin, validateConfigIntegrity, validateChannelInstanceNames, getOwner, getDefaultSessionMode } from './config.js';
 import { SessionManager } from './core/session/session-manager.js';
 import { ClaudeAgentPlugin } from './agents/claude-runner.js';
 import { CodexAgentPlugin } from './agents/codex-runner.js';
@@ -24,7 +24,8 @@ import { InteractionRouter } from './core/interaction-router.js';
 import { ChannelLoader } from './core/channel-loader.js';
 import { AgentLoader } from './core/agent-loader.js';
 import { IpcServer } from './ipc.js';
-import { logger } from './utils/logger.js';
+import { logger, setLogLevel } from './utils/logger.js';
+import { detectDuplicates } from './utils/channel-fingerprint.js';
 import { loadPromptTemplates } from './prompts/templates.js';
 import path from 'path';
 import fs from 'fs';
@@ -53,6 +54,10 @@ async function main() {
     loadPromptTemplates();
     // 加载配置
     const config = loadConfig();
+    // 应用配置中的日志级别（优先于环境变量）
+    if (config.debug?.logLevel) {
+        setLogLevel(config.debug.logLevel);
+    }
     const paths = resolvePaths();
     // 配置完整性校验
     const integrity = validateConfigIntegrity(config);
@@ -66,6 +71,14 @@ async function main() {
     logger.info('✓ Config loaded (API keys hidden)');
     // Channel instance name uniqueness check
     validateChannelInstanceNames(config);
+    // Detect duplicate channel credentials
+    const duplicates = detectDuplicates(config);
+    if (duplicates.length > 0) {
+        for (const d of duplicates) {
+            logger.warn(`⚠ Duplicate channel credential: ${d.fingerprint} is used by instances [${d.instances.join(', ')}]. ` +
+                `Only the first instance will be active.`);
+        }
+    }
     if (anthropic.baseUrl) {
         logger.info(`✓ Using custom API base URL: ${anthropic.baseUrl}`);
     }
@@ -76,28 +89,9 @@ async function main() {
     const statsCollector = new StatsCollector(eventBus);
     // 初始化数据库（带 ownerResolver）
     const sessionManager = new SessionManager(undefined, eventBus, (channel, userId) => isOwner(config, channel, userId), (channel, userId) => isAdmin(config, channel, userId));
-    // sessionMode 解析：通道配置锁定 > chatType 默认（AUN 群聊 → proactive，其余 → interactive）
-    sessionManager.setSessionModeResolver((channel, chatType) => {
-        const locked = getChannelSessionMode(config, channel);
-        if (locked)
-            return locked;
-        // chatType 默认值：仅 AUN 群聊默认为 proactive，其余通道默认 interactive
-        // channel 在多实例时为 instanceName，需要识别 AUN 系
-        // 简化：通过 ChannelOptions.channelType 在 MessageProcessor 注册时已知，但 SessionManager 不持有这个映射
-        // 这里回退到按 instanceName 反查 config.channels.aun
-        if (chatType === 'group') {
-            const aun = config.channels?.aun;
-            if (Array.isArray(aun)) {
-                if (aun.some((i) => i.name === channel))
-                    return 'proactive';
-            }
-            else if (aun) {
-                const effectiveName = aun.name ?? 'aun';
-                if (effectiveName === channel)
-                    return 'proactive';
-            }
-        }
-        return undefined;
+    // sessionMode 解析：全局 chatmode 配置 > 默认 'interactive'
+    sessionManager.setSessionModeResolver((_channel, chatType) => {
+        return getDefaultSessionMode(config, chatType);
     });
     logger.info('✓ Database initialized');
     // 注册会话文件适配器（Claude / Codex 各自的会话文件操作）
@@ -243,7 +237,9 @@ async function main() {
                 await handler({
                     channel: channelType, channelId: chatId, content, images, chatType,
                     peerId: peerId || '', peerName, messageId, mentions, threadId,
-                    replyContext: rootId ? { replyToMessageId: rootId, replyInThread: !!threadId } : undefined,
+                    // 只在话题场景（threadId 有值）才设置 replyContext；
+                    // 纯引用回复（rootId 有值但无 threadId）不设置，避免所有回复都带引用头
+                    replyContext: threadId ? { replyToMessageId: rootId, replyInThread: true } : undefined,
                 });
             }), (channelId, text, replyContext) => inst.channel.sendMessage(channelId, text, {
                 replyToMessageId: replyContext?.replyToMessageId,

package/dist/utils/channel-fingerprint.js

@@ -0,0 +1,59 @@
+/**
+ * Channel Fingerprint
+ *
+ * 为每个 channel 实例提取一个全局唯一标识，用于冲突检测和路由索引。
+ * 格式：{type}:{primaryKey}
+ */
+/** Channel 类型 → 主键字段映射 */
+const PRIMARY_KEY_MAP = {
+    feishu: 'appId',
+    aun: 'aid',
+    wechat: 'token',
+    wecom: 'botId',
+    dingtalk: 'clientId',
+    qqbot: 'appId',
+};
+export function extractFingerprint(channelType, instance) {
+    const keyField = PRIMARY_KEY_MAP[channelType];
+    if (!keyField)
+        return null;
+    const value = instance[keyField];
+    if (!value || typeof value !== 'string')
+        return null;
+    return `${channelType}:${value}`;
+}
+export function detectDuplicates(config) {
+    const seen = new Map();
+    const channels = config.channels || {};
+    for (const [type, raw] of Object.entries(channels)) {
+        if (type === 'defaultChannel')
+            continue;
+        const instances = Array.isArray(raw) ? raw : [raw];
+        for (const inst of instances) {
+            if (!inst || typeof inst !== 'object')
+                continue;
+            const fingerprint = extractFingerprint(type, inst);
+            if (!fingerprint)
+                continue;
+            const instName = inst.name ?? type;
+            const entry = seen.get(fingerprint);
+            if (entry) {
+                entry.instances.push(instName);
+            }
+            else {
+                seen.set(fingerprint, { channelType: type, instances: [instName] });
+            }
+        }
+    }
+    const duplicates = [];
+    for (const [fingerprint, entry] of seen) {
+        if (entry.instances.length > 1) {
+            duplicates.push({
+                fingerprint,
+                channelType: entry.channelType,
+                instances: entry.instances,
+            });
+        }
+    }
+    return duplicates;
+}

package/dist/utils/init.js

@@ -503,7 +503,7 @@ export async function cmdInit(options) {
         const config = JSON.parse(fs.readFileSync(sampleSrc, 'utf-8'));
         config.projects.defaultPath = defaultPath;
         config.projects.list = { [path.basename(defaultPath)]: defaultPath };
-        config.agents.anthropic.model = model;
+        config.agents.claude.model = model;
         let channelConfigured = false;
         while (!channelConfigured) {
             console.log('\n选择消息渠道:');

package/dist/utils/logger.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
 const LOG_DIR = resolvePaths().logs;
-const LOG_LEVEL = process.env.LOG_LEVEL || 'INFO';
+let currentLevel = process.env.LOG_LEVEL || 'INFO';
 const LEVELS = { DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3 };
 const config = {
     messageLog: process.env.MESSAGE_LOG === 'true',
@@ -17,7 +17,7 @@ const streams = {
     event: config.eventLog ? fs.createWriteStream(path.join(LOG_DIR, 'events.log'), { flags: 'a' }) : null
 };
 function shouldLog(level) {
-    return LEVELS[level] >= LEVELS[LOG_LEVEL];
+    return (LEVELS[level] ?? 1) >= (LEVELS[currentLevel] ?? 1);
 }
 function write(stream, data) {
     if (!stream)
@@ -35,9 +35,21 @@ function log(level, ...args) {
         return;
     const timestamp = localTimestamp();
     const msg = `[${timestamp}] [${level}] ${args.join(' ')}`;
-    // 只写文件，不输出到 console（避免重定向时重复）
     write(streams.main, msg);
 }
+/**
+ * 设置日志级别（config 加载后调用，覆盖环境变量默认值）
+ * 优先级：config.debug.logLevel → LOG_LEVEL 环境变量 → 'INFO'
+ */
+export function setLogLevel(level) {
+    const upper = level.toUpperCase();
+    if (upper in LEVELS) {
+        currentLevel = upper;
+    }
+}
+export function getLogLevel() {
+    return currentLevel;
+}
 export const logger = {
     debug: (...args) => log('DEBUG', ...args),
     info: (...args) => log('INFO', ...args),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.6.4",
+  "version": "2.7.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",