evolclaw 2.5.3 → 2.5.5

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

@@ -127,7 +127,7 @@ export class MessageProcessor {
     static COMMAND_PREFIXES = [
         '/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart',
         '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork',
-        '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/send', '/check',
+        '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check',
         '/p ', '/s ', '/name ',
     ];
     /** 判断消息内容是否为已知命令 */
@@ -299,6 +299,7 @@ export class MessageProcessor {
             const imageInfo = message.images && message.images.length > 0 ? ` [${message.images.length} image(s)]` : '';
             const modeInfo = isBackground ? ' [\u540e\u53f0]' : '';
             logger.info(`[${message.channel}] ${message.channelId}: ${message.content}${imageInfo}${modeInfo}`);
+            logger.info(`[MessageProcessor] session=${session.id} chatType=${session.chatType} sessionMode=${session.sessionMode} agentId=${session.agentId} msgChatType=${message.chatType ?? 'n/a'}`);
             // 记录开始处理
             this.eventBus.publish({ type: 'message:processing', sessionId: session.id });
             adapter.sendProcessingStatus?.(message.channelId, 'start', session.id, this.getReplyContext(message));
@@ -312,6 +313,7 @@ export class MessageProcessor {
             // 创建 StreamFlusher，传入文件标记模式用于自动过滤
             // 使用动态判断，确保切换项目后不会继续输出
             let firstReply = true;
+            const isProactive = session.sessionMode === 'proactive';
             const flusher = new StreamFlusher(async (text, isFinal, hasText) => {
                 const isCurrentlyBackground = await this.isBackgroundSession(session, message.channel, message.channelId);
                 if (!isCurrentlyBackground) {
@@ -333,7 +335,7 @@ export class MessageProcessor {
                     await adapter.sendText(message.channelId, text, Object.keys(opts).length ? opts : undefined);
                 }
                 // 后台任务：静默，不发送输出
-            }, (options?.flushDelay ?? this.config.flushDelay ?? 3) * 1000, options?.fileMarkerPattern, this.config.debug?.flusherDiag);
+            }, (options?.flushDelay ?? this.config.flushDelay ?? 3) * 1000, options?.fileMarkerPattern, this.config.debug?.flusherDiag, isProactive);
             // 保存当前 flusher，用于 compact 事件
             this.currentFlusher = flusher;
             // 调用 AgentRunner（含上下文过长自动 compact 重试）
@@ -396,24 +398,30 @@ export class MessageProcessor {
                 contextParts.push(`[当前环境] ${envParts.join(' | ')}`);
                 // 只读模式提示
                 if (session.metadata?.permissionMode === 'readonly') {
-                    contextParts.push('[只读模式] 禁止修改项目文件。如需生成文件供用户下载，请写入 .evolclaw/tmp/ 目录后使用 [SEND_FILE:] 发送');
+                    const sendHint = isProactive
+                        ? '使用 evolclaw ctl file 发送'
+                        : '使用 [SEND_FILE:] 发送';
+                    contextParts.push(`[只读模式] 禁止修改项目文件。如需生成文件供用户下载，请写入 .evolclaw/tmp/ 目录后${sendHint}`);
                 }
                 // 2. 文件发送能力（按 channelType 去重，提示词只展示第一级通道名）
-                const fileChannelTypes = new Set();
-                const currentCanSend = !!channelInfo.adapter.sendFile;
-                for (const [, info] of this.channels) {
-                    if (info.adapter.sendFile) {
-                        fileChannelTypes.add(info.options?.channelType || info.adapter.channelName);
+                // proactive 模式：不推送 [SEND_FILE:] 提示，统一通过 evolclaw ctl file 显式发送（与 ctl send 契约一致）
+                if (!isProactive) {
+                    const fileChannelTypes = new Set();
+                    const currentCanSend = !!channelInfo.adapter.sendFile;
+                    for (const [, info] of this.channels) {
+                        if (info.adapter.sendFile) {
+                            fileChannelTypes.add(info.options?.channelType || info.adapter.channelName);
+                        }
+                    }
+                    const crossChannelTypes = [...fileChannelTypes].filter(t => t !== currentChannelType);
+                    if (currentCanSend || crossChannelTypes.length > 0) {
+                        const hints = [];
+                        if (currentCanSend)
+                            hints.push(`[SEND_FILE:路径] 发送文件到当前通道`);
+                        if (crossChannelTypes.length > 0)
+                            hints.push(`[SEND_FILE:${crossChannelTypes[0]}:路径] 发送文件到指定通道（可用: ${crossChannelTypes.join('/')}）`);
+                        contextParts.push(hints.join('，'));
                     }
-                }
-                const crossChannelTypes = [...fileChannelTypes].filter(t => t !== currentChannelType);
-                if (currentCanSend || crossChannelTypes.length > 0) {
-                    const hints = [];
-                    if (currentCanSend)
-                        hints.push(`[SEND_FILE:路径] 发送文件到当前通道`);
-                    if (crossChannelTypes.length > 0)
-                        hints.push(`[SEND_FILE:${crossChannelTypes[0]}:路径] 发送文件到指定通道（可用: ${crossChannelTypes.join('/')}）`);
-                    contextParts.push(hints.join('，'));
                 }
                 // 3. 当前通道能力
                 const capParts = [];
@@ -439,6 +447,13 @@ export class MessageProcessor {
                 if (skillsHint) {
                     contextParts.push(`[EvolClaw 自管理] ${skillsHint}`);
                 }
+                // 6. Proactive 模式提示词：agent 的输出不会自动发送，必须主动调用 ctl send/file
+                if (isProactive) {
+                    contextParts.push('[Proactive 模式] 本次对话中你的流式输出不会自动发送给用户，必须通过以下命令主动发送：\n' +
+                        '- 发送文本：evolclaw ctl send "<消息内容>"\n' +
+                        '- 发送文件：evolclaw ctl file <路径>\n' +
+                        '可多次调用。如不调用，用户将看不到任何回复。');
+                }
                 const effectiveSystemPrompt = [options?.systemPromptAppend, ...contextParts].filter(Boolean).join('\n') || undefined;
                 // 可重试错误（403/429/5xx）指数退避重试，最多 3 次
                 const MAX_RETRIES = 3;
@@ -491,77 +506,80 @@ export class MessageProcessor {
             // 处理文件标记 - 支持 [SEND_FILE:path] 和 [SEND_FILE:channel:path]
             // 注意：始终扫描全部文本（含中间轮），因为文件标记可能出现在任意轮次
             // suppressed 模式下 flusher 只有最后一轮文本，需要用 streamResult.fullText（SDK 全文）兜底
-            const FILE_MARKER_RE = /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g;
-            const markerPattern = options?.fileMarkerPattern ?? FILE_MARKER_RE;
-            const flusherText = flusher.getFinalText();
-            const fullText = flusherText.length >= (streamResult.fullText?.length || 0) ? flusherText : streamResult.fullText;
-            const fileMatches = [...fullText.matchAll(markerPattern)];
-            for (const match of fileMatches) {
-                // 兼容旧格式 (1组) 和新格式 (2组)
-                const hasChannelGroup = match.length >= 3;
-                const targetSpec = hasChannelGroup ? (match[1] ?? undefined) : undefined;
-                const filePath = (hasChannelGroup ? match[2] : match[1]).trim();
-                if (this.isPlaceholderPath(filePath)) {
-                    logger.info(`[${adapter.channelName}] Skipped placeholder file marker: [SEND_FILE:${filePath}]`);
-                    continue;
-                }
-                // 解析目标：按实例名匹配，再按 channelType 映射
-                let targetInfo = targetSpec ? this.channels.get(targetSpec) : channelInfo;
-                let targetLabel = targetSpec || message.channel;
-                if (targetSpec && !targetInfo) {
-                    // 按 channelType 查找首个匹配的实例
-                    const instanceName = this.channelTypeMap.get(targetSpec);
-                    if (instanceName)
-                        targetInfo = this.channels.get(instanceName);
-                }
-                const currentChannelType = channelInfo.options?.channelType || adapter.channelName;
-                const isCrossChannel = targetSpec && targetSpec !== message.channel
-                    && targetSpec !== currentChannelType;
-                // 跨通道仅限 owner
-                if (isCrossChannel && session.identity?.role !== 'owner') {
-                    await adapter.sendText(message.channelId, `\u274c 跨通道发送仅限管理员`, this.getReplyContext(message));
-                    continue;
-                }
-                const resolvedPath = this.resolveFilePath(filePath, absoluteProjectPath);
-                if (!fs.existsSync(resolvedPath)) {
-                    logger.warn(`[${adapter.channelName}] File not found: ${resolvedPath}`);
-                    await adapter.sendText(message.channelId, `\u26a0\ufe0f 文件未找到: ${filePath}`, this.getReplyContext(message));
-                    continue;
-                }
-                // 找目标 adapter
-                if (!targetInfo) {
-                    await adapter.sendText(message.channelId, `\u274c 通道 ${targetLabel} 未启用或不存在`, this.getReplyContext(message));
-                    continue;
-                }
-                if (!targetInfo.adapter.sendFile) {
-                    await adapter.sendText(message.channelId, `\u274c 通道 ${targetLabel} 不支持文件发送`, this.getReplyContext(message));
-                    continue;
-                }
-                // 找目标 channelId
-                let targetChannelId = message.channelId;
-                if (isCrossChannel) {
-                    const targetAdapterName = targetInfo.adapter.channelName;
-                    const targetChannelType = targetInfo.options?.channelType || targetAdapterName;
-                    const ownerPeerId = getOwner(this.config, targetAdapterName);
-                    targetChannelId = ownerPeerId ? (this.sessionManager.getOwnerChatId(targetChannelType, ownerPeerId) ?? '') : '';
-                    if (!targetChannelId) {
-                        await adapter.sendText(message.channelId, `\u274c 未找到 ${targetLabel} 的私聊会话，请先在该通道发送一条消息`, this.getReplyContext(message));
+            // proactive 模式：agent 主动调用 ctl file 发送文件，跳过标记处理
+            if (!isProactive) {
+                const FILE_MARKER_RE = /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g;
+                const markerPattern = options?.fileMarkerPattern ?? FILE_MARKER_RE;
+                const flusherText = flusher.getFinalText();
+                const fullText = flusherText.length >= (streamResult.fullText?.length || 0) ? flusherText : streamResult.fullText;
+                const fileMatches = [...fullText.matchAll(markerPattern)];
+                for (const match of fileMatches) {
+                    // 兼容旧格式 (1组) 和新格式 (2组)
+                    const hasChannelGroup = match.length >= 3;
+                    const targetSpec = hasChannelGroup ? (match[1] ?? undefined) : undefined;
+                    const filePath = (hasChannelGroup ? match[2] : match[1]).trim();
+                    if (this.isPlaceholderPath(filePath)) {
+                        logger.info(`[${adapter.channelName}] Skipped placeholder file marker: [SEND_FILE:${filePath}]`);
                         continue;
                     }
-                }
-                logger.info(`[${adapter.channelName}] Sending file via ${targetInfo.adapter.channelName}: ${resolvedPath}`);
-                try {
-                    await targetInfo.adapter.sendFile(targetChannelId, resolvedPath, this.getReplyContext(message));
-                    this.eventBus.publish({ type: 'agent:file-sent', sessionId: session.id, filePath: resolvedPath, channel: targetInfo.adapter.channelName });
+                    // 解析目标：按实例名匹配，再按 channelType 映射
+                    let targetInfo = targetSpec ? this.channels.get(targetSpec) : channelInfo;
+                    let targetLabel = targetSpec || message.channel;
+                    if (targetSpec && !targetInfo) {
+                        // 按 channelType 查找首个匹配的实例
+                        const instanceName = this.channelTypeMap.get(targetSpec);
+                        if (instanceName)
+                            targetInfo = this.channels.get(instanceName);
+                    }
+                    const currentChannelType = channelInfo.options?.channelType || adapter.channelName;
+                    const isCrossChannel = targetSpec && targetSpec !== message.channel
+                        && targetSpec !== currentChannelType;
+                    // 跨通道仅限 owner
+                    if (isCrossChannel && session.identity?.role !== 'owner') {
+                        await adapter.sendText(message.channelId, `\u274c 跨通道发送仅限管理员`, this.getReplyContext(message));
+                        continue;
+                    }
+                    const resolvedPath = this.resolveFilePath(filePath, absoluteProjectPath);
+                    if (!fs.existsSync(resolvedPath)) {
+                        logger.warn(`[${adapter.channelName}] File not found: ${resolvedPath}`);
+                        await adapter.sendText(message.channelId, `\u26a0\ufe0f 文件未找到: ${filePath}`, this.getReplyContext(message));
+                        continue;
+                    }
+                    // 找目标 adapter
+                    if (!targetInfo) {
+                        await adapter.sendText(message.channelId, `\u274c 通道 ${targetLabel} 未启用或不存在`, this.getReplyContext(message));
+                        continue;
+                    }
+                    if (!targetInfo.adapter.sendFile) {
+                        await adapter.sendText(message.channelId, `\u274c 通道 ${targetLabel} 不支持文件发送`, this.getReplyContext(message));
+                        continue;
+                    }
+                    // 找目标 channelId
+                    let targetChannelId = message.channelId;
                     if (isCrossChannel) {
-                        await adapter.sendText(message.channelId, `\ud83d\udcce 文件已通过 ${targetLabel} 发送`, this.getReplyContext(message));
+                        const targetAdapterName = targetInfo.adapter.channelName;
+                        const targetChannelType = targetInfo.options?.channelType || targetAdapterName;
+                        const ownerPeerId = getOwner(this.config, targetAdapterName);
+                        targetChannelId = ownerPeerId ? (this.sessionManager.getOwnerChatId(targetChannelType, ownerPeerId) ?? '') : '';
+                        if (!targetChannelId) {
+                            await adapter.sendText(message.channelId, `\u274c 未找到 ${targetLabel} 的私聊会话，请先在该通道发送一条消息`, this.getReplyContext(message));
+                            continue;
+                        }
+                    }
+                    logger.info(`[${adapter.channelName}] Sending file via ${targetInfo.adapter.channelName}: ${resolvedPath}`);
+                    try {
+                        await targetInfo.adapter.sendFile(targetChannelId, resolvedPath, this.getReplyContext(message));
+                        this.eventBus.publish({ type: 'agent:file-sent', sessionId: session.id, filePath: resolvedPath, channel: targetInfo.adapter.channelName });
+                        if (isCrossChannel) {
+                            await adapter.sendText(message.channelId, `\ud83d\udcce 文件已通过 ${targetLabel} 发送`, this.getReplyContext(message));
+                        }
+                    }
+                    catch (error) {
+                        logger.error(`[${adapter.channelName}] Failed to send file: ${resolvedPath}`, error);
+                        await adapter.sendText(message.channelId, `\u274c 文件发送失败: ${filePath}`, this.getReplyContext(message));
                     }
                 }
-                catch (error) {
-                    logger.error(`[${adapter.channelName}] Failed to send file: ${resolvedPath}`, error);
-                    await adapter.sendText(message.channelId, `\u274c 文件发送失败: ${filePath}`, this.getReplyContext(message));
-                }
-            }
+            } // end of !isProactive
             // 最终回复文本添加到 flusher（统一在流结束后处理，避免多 complete 事件重复发送）
             // suppressed 模式：中间流式文本未推送，使用最后一轮回复（回退到全文）
             // 非 suppressed 且无流式文本：同上

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

@@ -32,6 +32,7 @@ let instanceCounter = 0;
 export class StreamFlusher {
     send;
     interval;
+    silent;
     buffer = '';
     queue = []; // 按入队顺序记录 activity 和 text 段
     timer;
@@ -45,14 +46,15 @@ export class StreamFlusher {
     createTime = Date.now();
     diagEnabled;
     sendChain = Promise.resolve(); // 串行发送队列，保证消息按序到达
-    constructor(send, interval = 4000, fileMarkerPattern, diagEnabled = false) {
+    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 });
+            diag(this.instanceId, 'created', { interval, silent });
     }
     addText(text) {
         if (this.buffer.length === 0 && text.length > 0) {
@@ -101,6 +103,8 @@ export class StreamFlusher {
         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' });
@@ -144,6 +148,8 @@ export class StreamFlusher {
      * 用于 complete 事件前清空 pending activities，让最终文本留给 flush(true) 发送
      */
     async flushActivitiesOnly() {
+        if (this.silent)
+            return;
         const hasActivities = this.queue.some(e => e.kind === 'activity');
         if (!hasActivities)
             return;
@@ -173,6 +179,16 @@ export class StreamFlusher {
         }
     }
     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;

package/dist/core/session/session-manager.js

@@ -10,6 +10,7 @@ export class SessionManager {
     eventBus;
     ownerResolver;
     adminResolver;
+    sessionModeResolver;
     fileAdapters = new Map();
     constructor(dbPath = resolvePaths().db, eventBus, ownerResolver, adminResolver) {
         ensureDir(path.dirname(dbPath));
@@ -25,6 +26,15 @@ export class SessionManager {
     setAdminResolver(resolver) {
         this.adminResolver = resolver;
     }
+    setSessionModeResolver(resolver) {
+        this.sessionModeResolver = resolver;
+    }
+    /** 解析默认 sessionMode：通道配置锁定 > chatType 默认 > 'interactive' */
+    resolveDefaultSessionMode(channel, chatType) {
+        const ct = chatType || 'private';
+        const resolved = this.sessionModeResolver?.(channel, ct);
+        return resolved || 'interactive';
+    }
     registerFileAdapter(adapter) {
         this.fileAdapters.set(adapter.agentId, adapter);
         logger.debug(`[SessionManager] Registered file adapter: ${adapter.agentId}`);
@@ -93,6 +103,15 @@ export class SessionManager {
       `).run(JSON.stringify(metadata), Date.now(), row.id);
         }
     }
+    /** 获取当前活跃 session 的 chatType（用于新建 session 时继承） */
+    getActiveChatType(channel, channelId) {
+        const row = this.db.prepare(`
+      SELECT chat_type FROM sessions
+      WHERE channel = ? AND channel_id = ? AND json_extract(metadata, '$.isActive') = true AND thread_id = '' AND deleted_at IS NULL
+      ORDER BY updated_at DESC LIMIT 1
+    `).get(channel, channelId);
+        return row?.chat_type || 'private';
+    }
     validateSessionFile(row) {
         const agentSessionId = row.agent_session_id;
         if (!agentSessionId)
@@ -447,6 +466,13 @@ export class SessionManager {
             const validSessionId = this.validateSessionFile(active);
             const session = { ...this.rowToSession(active), agentSessionId: validSessionId };
             session.identity = this.resolveIdentity(channel, userId);
+            // chatType 自动修正：入站 chatType 与存储值不一致时更新（修复历史 session 因错误识别留下的脏数据）
+            if (chatType && session.chatType !== chatType) {
+                logger.info(`[SessionManager] Updating chatType for session ${session.id}: ${session.chatType} -> ${chatType}`);
+                this.db.prepare(`UPDATE sessions SET chat_type = ?, updated_at = ? WHERE id = ?`)
+                    .run(chatType, Date.now(), active.id);
+                session.chatType = chatType;
+            }
             // 补写 peerId/peerName/channelName（旧 session 可能在这些字段引入前创建）
             if (chatType === 'private' && userId) {
                 const activeMeta = active.metadata ? JSON.parse(active.metadata) : {};
@@ -492,6 +518,12 @@ export class SessionManager {
             // 激活此会话
             const existingMeta = existing.metadata ? JSON.parse(existing.metadata) : {};
             existingMeta.isActive = true;
+            // chatType 自动修正（同 active 分支）
+            const shouldUpdateChatType = chatType !== undefined && existing.chat_type !== chatType;
+            if (shouldUpdateChatType) {
+                logger.info(`[SessionManager] Updating chatType for session ${existing.id}: ${existing.chat_type} -> ${chatType}`);
+                existing.chat_type = chatType;
+            }
             // 补写 peerId/peerName
             if (chatType === 'private' && userId && !existingMeta.peerId) {
                 existingMeta.peerId = userId;
@@ -499,8 +531,14 @@ export class SessionManager {
             if (chatType === 'private' && metadata?.peerName && !existingMeta.peerName) {
                 existingMeta.peerName = metadata.peerName;
             }
-            this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
-                .run(JSON.stringify(existingMeta), Date.now(), existing.id);
+            if (shouldUpdateChatType) {
+                this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ?, chat_type = ? WHERE id = ?`)
+                    .run(JSON.stringify(existingMeta), Date.now(), chatType, existing.id);
+            }
+            else {
+                this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+                    .run(JSON.stringify(existingMeta), Date.now(), existing.id);
+            }
             const session = { ...this.rowToSession(existing), agentSessionId: validSessionId, metadata: existingMeta };
             session.identity = this.resolveIdentity(channel, userId);
             return session;
@@ -515,7 +553,7 @@ export class SessionManager {
             threadId: '',
             agentId: agentId || 'claude',
             chatType: chatType || 'private',
-            sessionMode: 'interactive',
+            sessionMode: this.resolveDefaultSessionMode(channel, chatType || 'private'),
             metadata: sessionMetadata,
             name: name || '默认会话',
             createdAt: Date.now(),
@@ -550,6 +588,10 @@ export class SessionManager {
             sets.push('name = ?');
             values.push(updates.name);
         }
+        if (updates.sessionMode !== undefined) {
+            sets.push('session_mode = ?');
+            values.push(updates.sessionMode);
+        }
         if (updates.metadata !== undefined) {
             sets.push('metadata = ?');
             values.push(updates.metadata ? JSON.stringify(updates.metadata) : null);
@@ -583,13 +625,14 @@ export class SessionManager {
             }
             return { ...this.rowToSession(existing), agentSessionId: validSessionId };
         }
-        // 继承当前活跃主会话的项目路径
+        // 继承当前活跃主会话的项目路径和 chatType
         const activeMain = this.db.prepare(`
-      SELECT project_path FROM sessions
+      SELECT project_path, chat_type FROM sessions
       WHERE channel = ? AND channel_id = ? AND json_extract(metadata, '$.isActive') = true AND thread_id = ''
     `).get(channel, channelId);
         const projectPath = activeMain?.project_path || defaultProjectPath;
         // 创建新话题会话
+        const inheritedChatType = activeMain?.chat_type || 'private';
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
             channel,
@@ -597,8 +640,8 @@ export class SessionManager {
             projectPath,
             threadId,
             agentId: agentId || 'claude',
-            chatType: 'private',
-            sessionMode: 'interactive',
+            chatType: inheritedChatType,
+            sessionMode: this.resolveDefaultSessionMode(channel, inheritedChatType),
             metadata,
             name: name || '话题会话',
             createdAt: Date.now(),
@@ -618,9 +661,11 @@ export class SessionManager {
     }
     async switchProject(channel, channelId, newProjectPath, currentAgentId) {
         const agentId = currentAgentId || 'claude';
-        // 1. 取消当前活跃会话
+        // 1. 继承当前 chatType（在 deactivate 之前读取）
+        const inheritedChatType = this.getActiveChatType(channel, channelId);
+        // 2. 取消当前活跃会话
         this.deactivateAllMetadata(channel, channelId);
-        // 2. 查找目标项目 + 当前 agent 的会话
+        // 3. 查找目标项目 + 当前 agent 的会话
         const target = this.db.prepare(`
       SELECT * FROM sessions
       WHERE channel = ? AND channel_id = ? AND project_path = ? AND agent_id = ? AND thread_id = '' AND deleted_at IS NULL
@@ -635,7 +680,7 @@ export class SessionManager {
                 .run(JSON.stringify(metadata), Date.now(), target.id);
             return { ...this.rowToSession(target), agentSessionId: validSessionId, metadata };
         }
-        // 3. 创建新会话
+        // 4. 创建新会话
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
             channel,
@@ -643,8 +688,8 @@ export class SessionManager {
             projectPath: newProjectPath,
             threadId: '',
             agentId,
-            chatType: 'private',
-            sessionMode: 'interactive',
+            chatType: inheritedChatType,
+            sessionMode: this.resolveDefaultSessionMode(channel, inheritedChatType),
             metadata: { isActive: true },
             name: '默认会话',
             createdAt: Date.now(),
@@ -680,9 +725,11 @@ export class SessionManager {
     `).run(agentSessionId, Date.now(), sessionId);
     }
     async switchAgent(channel, channelId, projectPath, newAgentId) {
-        // 1. 取消当前活跃会话
+        // 1. 继承当前 chatType（在 deactivate 之前读取）
+        const inheritedChatType = this.getActiveChatType(channel, channelId);
+        // 2. 取消当前活跃会话
         this.deactivateAllMetadata(channel, channelId);
-        // 2. 查找目标 agent 在当前项目下的会话
+        // 3. 查找目标 agent 在当前项目下的会话
         const target = this.db.prepare(`
       SELECT * FROM sessions
       WHERE channel = ? AND channel_id = ? AND project_path = ? AND agent_id = ? AND thread_id = '' AND deleted_at IS NULL
@@ -697,7 +744,7 @@ export class SessionManager {
                 .run(JSON.stringify(metadata), Date.now(), target.id);
             return { ...this.rowToSession(target), agentSessionId: validSessionId, metadata };
         }
-        // 3. 创建新会话（与 switchProject 保持一致）
+        // 4. 创建新会话（与 switchProject 保持一致）
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
             channel,
@@ -705,8 +752,8 @@ export class SessionManager {
             projectPath,
             threadId: '',
             agentId: newAgentId,
-            chatType: 'private',
-            sessionMode: 'interactive',
+            chatType: inheritedChatType,
+            sessionMode: this.resolveDefaultSessionMode(channel, inheritedChatType),
             metadata: { isActive: true },
             name: '默认会话',
             createdAt: Date.now(),
@@ -838,6 +885,8 @@ export class SessionManager {
     `).run(Date.now(), Date.now(), channelId);
     }
     async createNewSession(channel, channelId, projectPath, name, agentId) {
+        // 继承当前 chatType（在 deactivate 之前读取）
+        const inheritedChatType = this.getActiveChatType(channel, channelId);
         // 取消当前活跃会话
         this.deactivateAllMetadata(channel, channelId);
         // 创建新会话
@@ -848,8 +897,8 @@ export class SessionManager {
             projectPath,
             threadId: '',
             agentId: agentId || 'claude',
-            chatType: 'private',
-            sessionMode: 'interactive',
+            chatType: inheritedChatType,
+            sessionMode: this.resolveDefaultSessionMode(channel, inheritedChatType),
             metadata: { isActive: true },
             name: name || '默认会话',
             createdAt: Date.now(),
@@ -955,6 +1004,8 @@ export class SessionManager {
         return this.rowToSession(rows[0]);
     }
     async importCliSession(channel, channelId, projectPath, agentSessionId, agentId = 'claude') {
+        // 继承当前 chatType（在 deactivate 之前读取）
+        const inheritedChatType = this.getActiveChatType(channel, channelId);
         // 取消当前活跃会话
         this.deactivateAllMetadata(channel, channelId);
         // 从 CLI 会话文件读取标题
@@ -968,8 +1019,8 @@ export class SessionManager {
             projectPath,
             threadId: '',
             agentId,
-            chatType: 'private',
-            sessionMode: 'interactive',
+            chatType: inheritedChatType,
+            sessionMode: this.resolveDefaultSessionMode(channel, inheritedChatType),
             agentSessionId,
             metadata: { isActive: true },
             name,

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 } from './config.js';
+import { loadConfig, ensureDataDirs, resolvePaths, resolveAnthropicConfig, isOwner, isAdmin, validateConfigIntegrity, validateChannelInstanceNames, getOwner, getChannelSessionMode } 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';
@@ -73,6 +73,29 @@ 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;
+    });
     logger.info('✓ Database initialized');
     // 注册会话文件适配器（Claude / Codex 各自的会话文件操作）
     sessionManager.registerFileAdapter(new ClaudeSessionFileAdapter());
@@ -369,7 +392,7 @@ async function main() {
         .map(([type, names]) => names.length === 1 ? names[0] : `${type}[${names.join(', ')}]`)
         .join(', ');
     const totalCount = connected.length;
-    logger.info(`\n🚀 EvolClaw is running with ${totalCount} channel(s): ${channelSummary}\n`);
+    logger.info(`🚀 EvolClaw is running with ${totalCount} channel(s): ${channelSummary}`);
     eventBus.publish({
         type: 'system:started',
         channels: connected.map(c => c.toLowerCase()),