evolclaw 3.3.0 → 3.4.0

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## v3.4.0 (2026-06-12)
+
+### New Features
+
+- **CLI 模块化** — 将4640行 `command-handler.ts` 和5131行 `cli/index.ts` 拆分为8个专注模块（`command/`、`cli/`子目录），claude-agent-sdk 升级至 ^0.3.170，净减约10000行
+- **ECWeb Monitor 视图** — 新增实时监控页面：进程级 CPU/内存采样（1s 后台循环）、全局统计、per-agent 摘要；IPC 新增 `monitor-snapshot` 处理器
+- **Agent 运行时控制** — ECWeb 支持对每个 agent 执行 start/stop/mute/unmute/queue-clear，stop 中断进行中的模型调用，mute 暂停队列消费同时保留入队消息
+- **`ec watch logs` 多选** — 新增日志类型多选菜单，支持按类型（session/tool/error等）筛选实时聚合日志；`watch.logTypes` 配置默认可选集
+- **AUN 结构化出站 payload** — task status 改走 `notify`（`event/app.task.status`）不入消息历史；activity 逐条结构化（`type:'activity'` + `item`）；notice/error 结构化；`ref_message_id`/`initiator`/`thread_id` 统一透传
+- **Context-aware auto-compact** — 根据 DB 中上次 model call 的实际 context token 记录决策压缩时机，在下一任务开始前执行；DB 新增 `context_tokens`/`max_tokens`/`auto_compact_tokens` 字段
+- **Codex Edit events 统一 diff** — fileChange 映射为 `Edit` tool_use 事件并附带 unified diff，permission 层直接渲染，不重新计算
+- **AUN 群命令 mention 过滤** — broadcast 指令强制要求 @ 触发；`action_card_reply` 归属由消息上下文精确判定
+- **群话题创建权限** — 由 AUN `group.get_admins` 实时查询，仅 owner/admin 可建话题，fail-closed；无权时静默丢弃避免 agent 互相拒绝循环
+- **`/baseagent scope` 参数** — 支持 `session`/`default`/`both` 三档控制切换范围
+- **Session topic rename** — 支持 `/rename` 重命名当前话题会话
+- **evolclaw-web 自动升级** — ECWeb 启动时检测并自动升级新版本，对标 fastaun 升级机制
+- **Agent displayName 解析** — 从 agent.md 本地缓存 + 异步网络拉取 displayName，ECWeb 展示更友好
+
+### Improvements
+
+- **用户中断归类** — 新消息/`/stop`/撤回触发的流中断独立为 `task:interrupted` 事件，不计入 `task:error`
+- **统一出站响应投递** — AUN 渠道所有出站路径收敛到 `adapter.send`，消除渠道间重复分支
+- **Feishu Pin→CheckMark 两阶段 ack** — 收到消息先加 Pin（排队中），runner 开始时升级为 CheckMark 并移除 Pin，视觉无空窗
+- **dispatchModeOverride 分离** — 动态覆盖与持久化 `dispatchMode` 解耦，避免一次性覆盖污染会话配置
+- **ECWeb token TTL 延长至30天** — 支持滑动续期；端口被占时杀旧进程而非漂移到 port+1
+- **`evolclaw status` 展示 ECWeb** — 状态命令新增 ECWeb 进程与 HTTP 就绪状态
+
+### Bug Fixes
+
+- **话题回复上下文丢失** — `ctl send/file` 在 Feishu 话题内未透传 `replyToMessageId`/`replyInThread`，回复落到主会话气泡
+- **文件标记提前暴露** — 定时 flush（非最终）触发时 `[SEND_FILE:...]` 未过滤，原样发给用户
+- **AUN inbound replyContext 缺字段** — 入站消息未填充 `peerId`/`replyToMessageId`，导致 task.status `initiator` 为空
+- **Codex SSE idle 重连误报错** — SSE 超时重连的空 error 事件被当作任务错误处理
+- **JSON parse error 自动重试** — API 返回 JSON 解析异常时触发指数退避重试
+- **ECWeb 启动就绪检测** — HTTP 探测根路径判断就绪，避免进程存活但 HTTP 未就绪的误判
+
 ## v3.3.0 (2026-06-10)
 
 ### New Features

package/README.md

@@ -42,7 +42,7 @@ EvolClaw 是一个轻量级 AI Agent 网关系统。它为 Claude Code / Codex
 
 1. **消息渠道层** (`src/channels/`) - Feishu + WeChat + DingTalk + QQBot + WeCom + AUN 网络
 2. **消息队列层** (`src/core/message/message-queue.ts`) - 会话级串行处理 + 中断支持
-3. **命令处理层** (`src/core/command-handler.ts`) - 斜杠命令处理（CommandHandler 类）
+3. **命令处理层** (`src/core/command/`) - 斜杠命令处理（slash-handler / menu-handler / command-handler）
 4. **消息处理层** (`src/core/message/message-processor.ts`) - 统一事件处理引擎
 5. **会话管理层** (`src/core/session/session-manager.ts`) - 多项目会话管理
 6. **交互路由层** (`src/core/interaction-router.ts`) - 卡片交互回调注册与路由
@@ -190,6 +190,11 @@ evolclaw/
 │   │   └── gemini-runner.ts        # Gemini CLI 封装
 │   ├── aun/                        # AUN 协议工具
 │   ├── core/
+│   │   ├── command/
+│   │   │   ├── command-handler.ts  # 命令派发入口
+│   │   │   ├── slash-handler.ts    # 斜杠命令实现
+│   │   │   ├── menu-handler.ts     # Menu 协议处理
+│   │   │   └── slash-gate.ts       # 权限前置拦截
 │   │   ├── message/
 │   │   │   ├── message-bridge.ts   # 渠道 ↔ 核心消息桥
 │   │   │   ├── message-processor.ts # 统一消息处理引擎
@@ -202,7 +207,6 @@ evolclaw/
 │   │   │   ├── session-fs-store.ts # 文件系统存储原语
 │   │   │   └── session-manager.ts  # 会话管理（多项目支持）
 │   │   ├── trigger/                # 触发器引擎
-│   │   ├── command-handler.ts      # 斜杠命令处理
 │   │   ├── evolagent.ts            # EvolAgent 实体
 │   │   ├── evolagent-registry.ts   # Agent 注册表（扫描/路由/热重载）
 │   │   ├── interaction-router.ts   # 卡片交互回调路由
@@ -295,7 +299,7 @@ v3.2 新增进程级身份标识。启动时自动生成 `ec+5位数字.agentid.
 ## 技术栈
 
 - **运行时**：Node.js >= 22 + TypeScript（ES modules）
-- **AI 后端**：@anthropic-ai/claude-agent-sdk >= 0.2.100、Codex CLI app-server、Gemini CLI
+- **AI 后端**：@anthropic-ai/claude-agent-sdk >= 0.3.170、Codex CLI app-server、Gemini CLI
 - **消息渠道**：飞书（@larksuiteoapi/node-sdk）、微信（ClawBot ilink API）、钉钉（dingtalk-stream）、QQ频道（pure-qqbot）、企业微信（AI Bot API）、AUN 网络
 - **数据存储**：文件系统（per-chat 目录） + JSONL（CLI 共用）
 - **测试框架**：Vitest

package/dist/agents/claude-runner.js

@@ -10,7 +10,7 @@ import os from 'os';
 import { logger } from '../utils/logger.js';
 import { checkBlacklist, checkReadonly, summarizeToolInput } from '../core/permission.js';
 import { encodePath } from '../utils/cross-platform.js';
-import { contextTokensForUsage, usageForContext } from './runner-types.js';
+import { contextTokensForUsage, usageForContext, isClaudeContextUsageModel, isOneMillionContextModel, realContextWindowForModel, autoCompactWindowForModel } from './runner-types.js';
 export { hasCompact, hasModelSwitcher, hasPermissionController } from './runner-types.js';
 // ── 模型别名解析 ──
 // SDK 内置的别名表可能落后于代理实际可用的最新模型，
@@ -99,8 +99,6 @@ function resolveModelAlias(model, baseUrl) {
     // 回退静态表
     return STATIC_MODEL_ALIASES[model] || model;
 }
-/** 支持 1M 上下文窗口的模型 ID 前缀（SDK 通过 `[1m]` 后缀启用）。 */
-const ONE_M_CONTEXT_PREFIXES = ['claude-opus-4-8', 'claude-sonnet-4-6'];
 /**
  * 为支持 1M 上下文的模型追加 `[1m]` 后缀——仅在交给 SDK query() 时调用。
  * 目录与校验层始终使用不带后缀的基础 ID，避免与网关 /models 返回值（无 `[1m]`）冲突。
@@ -108,26 +106,10 @@ const ONE_M_CONTEXT_PREFIXES = ['claude-opus-4-8', 'claude-sonnet-4-6'];
 function applyContextWindow(modelId) {
     if (/\[1m\]$/.test(modelId))
         return modelId; // 已带后缀
-    if (ONE_M_CONTEXT_PREFIXES.some(p => modelId === p))
+    if (isOneMillionContextModel(modelId))
         return `${modelId}[1m]`;
     return modelId;
 }
-/** 真实上下文窗口大小：1M 模型 = 1000000，否则 200000 */
-function realContextWindowFor(sdkModel) {
-    if (/\[1m\]$/.test(sdkModel))
-        return 1000000;
-    if (/deepseek-v4/i.test(sdkModel))
-        return 1000000; // deepseek-v4 系列原生 1M 窗口（无 [1m] 后缀）
-    return 200000;
-}
-/** autoCompact 触发阈值：1M 模型 = 900000（留 ~100k buffer），否则 200000 */
-function autoCompactWindowFor(sdkModel) {
-    if (/\[1m\]$/.test(sdkModel))
-        return 900000;
-    if (/deepseek-v4/i.test(sdkModel))
-        return 900000;
-    return 200000;
-}
 /** 解析别名 + 追加 1M 后缀，得到最终交给 SDK 的 model 串。 */
 function resolveSdkModel(model, baseUrl) {
     return applyContextWindow(resolveModelAlias(model, baseUrl));
@@ -850,10 +832,10 @@ export class AgentRunner {
                     // input_tokens 本身就是完整的上下文输入量。
                     const u = event.usage;
                     const effectiveModel = callModel ?? this.model;
-                    const isClaudeModel = effectiveModel?.startsWith('claude');
+                    const isClaudeModel = isClaudeContextUsageModel(effectiveModel);
                     const totalTokens = contextTokensForUsage(u, !!isClaudeModel);
-                    const contextWindowTokens = sdkModel ? realContextWindowFor(sdkModel) : 200000;
-                    const autoCompactTokens = sdkModel ? autoCompactWindowFor(sdkModel) : 200000;
+                    const contextWindowTokens = realContextWindowForModel(sdkModel);
+                    const autoCompactTokens = autoCompactWindowForModel(sdkModel);
                     const contextUsage = totalTokens > 0 ? {
                         totalTokens,
                         maxTokens: contextWindowTokens,
@@ -877,21 +859,35 @@ export class AgentRunner {
                             } : undefined,
                         };
                     }
+                    const contextUsageForCall = (usage) => {
+                        const callTotalTokens = contextTokensForUsage(usageForContext(usage), !!isClaudeModel);
+                        return callTotalTokens > 0 ? {
+                            totalTokens: callTotalTokens,
+                            maxTokens: contextWindowTokens,
+                            percentage: Math.round((callTotalTokens / contextWindowTokens) * 100),
+                            autoCompactTokens,
+                            model: callModel ?? this.model,
+                            effort: callEffort ?? this.effort,
+                        } : undefined;
+                    };
                     // 组装 modelCalls：优先 SDK iterations，fallback 流式收集，兜底降级单行。
                     const callModel_ = callModel ?? this.model;
                     let modelCalls;
                     const iterArr = Array.isArray(u?.iterations) && u.iterations.length > 0 ? u.iterations : null;
                     if (iterArr) {
                         modelCalls = iterArr.map((it, i) => ({
-                            call_index: i, model: callModel_, tokenUsage: it,
+                            call_index: i, model: callModel_, tokenUsage: it, contextUsage: contextUsageForCall(it),
                         }));
                     }
                     else if (collectedCalls.length > 0) {
-                        modelCalls = collectedCalls;
+                        modelCalls = collectedCalls.map(call => ({
+                            ...call,
+                            contextUsage: contextUsageForCall(call.tokenUsage),
+                        }));
                     }
                     else if (u) {
                         // 降级：无逐次数据，写一条累计行
-                        modelCalls = [{ call_index: 0, model: callModel_, tokenUsage: u, degraded: true }];
+                        modelCalls = [{ call_index: 0, model: callModel_, tokenUsage: u, contextUsage: contextUsageForCall(u), degraded: true }];
                     }
                     yield {
                         type: 'complete',
@@ -1122,7 +1118,7 @@ export class AgentRunner {
             model: sdkModel,
             ...(callEffort ? { effort: callEffort } : {}),
             ...(this.claudeExecutablePath ? { pathToClaudeCodeExecutable: this.claudeExecutablePath } : {}),
-            autoCompactWindow: autoCompactWindowFor(sdkModel),
+            autoCompactWindow: autoCompactWindowForModel(sdkModel),
             advisorModel: 'haiku',
             canUseTool: canUseToolCallback,
             permissionMode: sdkPermissionMode,

package/dist/agents/codex-runner.js

@@ -307,6 +307,7 @@ export class CodexRunner {
             streamedAgentMessageIds: new Set(),
             agentMessageDeltaText: new Map(),
             completedItemIds: new Set(),
+            emittedEditCallIds: new Set(),
             completedTurnIds: new Set(),
         };
         const unsubscribe = appServer.onNotification(notification => {
@@ -1073,7 +1074,7 @@ export class CodexRunner {
                 break;
             }
             case 'item/started': {
-                yield* this.mapAppServerItemStarted(params.item);
+                yield* this.mapAppServerItemStarted(params.item, state);
                 break;
             }
             case 'item/agentMessage/delta': {
@@ -1092,6 +1093,10 @@ export class CodexRunner {
                 yield* this.mapAppServerItemCompleted(item, state);
                 break;
             }
+            case 'item/fileChange/patchUpdated': {
+                yield* this.mapAppServerFileChangePatchUpdated(params, state);
+                break;
+            }
             case 'turn/plan/updated': {
                 const plan = Array.isArray(params.plan) ? params.plan : [];
                 const completed = plan.filter((step) => step?.status === 'completed').length;
@@ -1123,12 +1128,17 @@ export class CodexRunner {
                 break;
             }
             case 'error': {
-                yield { type: 'error', error: params.message || 'Codex app-server error', errorType: 'unknown' };
+                if (!params.message) {
+                    // SSE idle timeout reconnect — not a real task error, suppress
+                    logger.debug(`[CodexRunner] app-server SSE reconnect (no message)`);
+                    break;
+                }
+                yield { type: 'error', error: params.message, errorType: 'unknown' };
                 break;
             }
         }
     }
-    *mapAppServerItemStarted(item) {
+    *mapAppServerItemStarted(item, state) {
         if (!item)
             return;
         switch (item.type) {
@@ -1142,8 +1152,12 @@ export class CodexRunner {
                 yield { type: 'tool_use', name: item.namespace ? `${item.namespace}:${item.tool}` : item.tool, input: item.arguments, callId: item.id };
                 break;
             case 'fileChange': {
-                const desc = this.normalizeFileChanges(item.changes).map((change) => this.describeFileChange(change)).join(', ');
-                yield { type: 'tool_use', name: 'FileChange', input: { description: desc }, callId: item.id };
+                const editEvent = this.buildCodexEditEvent(item.id, item.changes);
+                if (editEvent) {
+                    if (item.id)
+                        state?.emittedEditCallIds.add(item.id);
+                    yield editEvent;
+                }
                 break;
             }
             case 'webSearch':
@@ -1197,10 +1211,80 @@ export class CodexRunner {
                 };
                 break;
             case 'fileChange':
-                yield { type: 'tool_result', name: 'FileChange', result: item.changes, isError: item.status === 'failed', callId: item.id };
+                if (this.fileChangesHaveProtocolDiff(item.changes)) {
+                    if (item.id && !state.emittedEditCallIds.has(item.id)) {
+                        const editEvent = this.buildCodexEditEvent(item.id, item.changes);
+                        if (editEvent) {
+                            state.emittedEditCallIds.add(item.id);
+                            yield editEvent;
+                        }
+                    }
+                    yield { type: 'tool_result', name: 'Edit', result: item.changes, isError: item.status === 'failed', callId: item.id };
+                }
+                else {
+                    const desc = this.normalizeFileChanges(item.changes).map((change) => this.describeFileChange(change)).join(', ');
+                    yield { type: 'tool_use', name: 'FileChange', input: { description: desc }, callId: item.id };
+                    yield { type: 'tool_result', name: 'FileChange', result: item.changes, isError: item.status === 'failed', callId: item.id };
+                }
                 break;
         }
     }
+    *mapAppServerFileChangePatchUpdated(params, state) {
+        const itemId = typeof params.itemId === 'string' ? params.itemId : undefined;
+        if (!itemId || state.emittedEditCallIds.has(itemId))
+            return;
+        const editEvent = this.buildCodexEditEvent(itemId, params.changes);
+        if (!editEvent)
+            return;
+        state.emittedEditCallIds.add(itemId);
+        yield editEvent;
+    }
+    buildCodexEditEvent(callId, changes) {
+        const editInput = this.buildCodexEditInput(changes);
+        if (!editInput)
+            return null;
+        return { type: 'tool_use', name: 'Edit', input: editInput, callId };
+    }
+    buildCodexEditInput(changes) {
+        const normalized = this.normalizeFileChanges(changes)
+            .map((change) => this.normalizeCodexProtocolDiffChange(change))
+            .filter((change) => !!change);
+        if (normalized.length === 0)
+            return null;
+        const first = normalized[0];
+        return {
+            file_path: first.path,
+            unified_diff: normalized.map(change => this.formatCodexUnifiedDiff(change)).join('\n'),
+            codex_file_changes: normalized,
+        };
+    }
+    normalizeCodexProtocolDiffChange(change) {
+        const filePath = typeof change?.path === 'string' ? change.path : '';
+        const diff = typeof change?.diff === 'string' ? change.diff
+            : typeof change?.unified_diff === 'string' ? change.unified_diff
+                : typeof change?.unifiedDiff === 'string' ? change.unifiedDiff
+                    : '';
+        if (!filePath || !diff)
+            return null;
+        return {
+            path: filePath,
+            diff,
+            kind: this.normalizeFileChangeKind(change.kind ?? change.type),
+        };
+    }
+    fileChangesHaveProtocolDiff(changes) {
+        return this.buildCodexEditInput(changes) !== null;
+    }
+    formatCodexUnifiedDiff(change) {
+        const pathLabel = change.path.replace(/\\/g, '/');
+        const diffPath = pathLabel.replace(/^\/+/, '');
+        const header = change.diff.startsWith('diff ')
+            || change.diff.startsWith('--- ')
+            || change.diff.startsWith('+++ ')
+            ? ''
+            : `--- a/${diffPath}\n+++ b/${diffPath}\n`;
+        return `${header}${change.diff.trimEnd()}`;
+    }
     pickNumber(...values) {
         for (const value of values) {
             if (typeof value === 'number' && Number.isFinite(value))

package/dist/agents/runner-types.js

@@ -26,3 +26,33 @@ export function usageForContext(usage) {
     const lastIteration = iterations?.slice().reverse().find(it => contextTokensForUsage(it, true) > 0);
     return lastIteration ?? usage;
 }
+/** Models whose base ID uses a 1M context window when sent to the SDK with [1m]. */
+export const ONE_M_CONTEXT_MODEL_PREFIXES = ['claude-opus-4-8', 'claude-sonnet-4-6'];
+const ONE_M_CONTEXT_MODEL_ALIASES = ['opus', 'sonnet'];
+const CLAUDE_CONTEXT_MODEL_ALIASES = ['opus', 'sonnet', 'haiku'];
+export function isClaudeContextUsageModel(model) {
+    if (!model)
+        return false;
+    const baseModel = model.replace(/\[1m\]$/i, '');
+    return /^claude-/i.test(baseModel) || CLAUDE_CONTEXT_MODEL_ALIASES.includes(baseModel);
+}
+export function isOneMillionContextModel(model) {
+    if (!model)
+        return false;
+    if (ONE_M_CONTEXT_MODEL_ALIASES.includes(model))
+        return true;
+    if (/\[1m\]$/i.test(model))
+        return true;
+    if (/deepseek-v4/i.test(model))
+        return true;
+    const baseModel = model.replace(/\[1m\]$/i, '');
+    return ONE_M_CONTEXT_MODEL_PREFIXES.some(prefix => baseModel === prefix || baseModel.startsWith(`${prefix}-`));
+}
+/** Real context window size: 1M models = 1000000, otherwise 200000. */
+export function realContextWindowForModel(model) {
+    return isOneMillionContextModel(model) ? 1000000 : 200000;
+}
+/** autoCompact trigger threshold: 1M models = 900000, otherwise 200000. */
+export function autoCompactWindowForModel(model) {
+    return isOneMillionContextModel(model) ? 900000 : 200000;
+}

package/dist/aun/outbox.js

@@ -59,10 +59,14 @@ export function enqueue(aid, opts) {
         aid,
         channelId: opts.channelId,
         type: opts.type,
+        contentKind: opts.contentKind,
+        payload: opts.payload,
         text: opts.text,
         filePath: opts.filePath,
+        logText: opts.logText,
         context: opts.context,
         ttl: opts.ttl ?? DEFAULT_TTL,
+        postSend: opts.postSend,
     };
     const dir = outboxDir();
     fs.mkdirSync(dir, { recursive: true });
@@ -97,6 +101,7 @@ export async function drain(aid, sender) {
     const entries = readEntries(aid);
     if (entries.length === 0)
         return { sent: 0, expired: 0, failed: 0 };
+    const drainedIds = new Set(entries.map(e => e.id));
     let sent = 0;
     let expired = 0;
     let failed = 0;
@@ -107,21 +112,28 @@ export async function drain(aid, sender) {
             continue;
         }
         try {
+            entry.attempts = (entry.attempts ?? 0) + 1;
             const ok = await sender(entry);
             if (ok) {
                 sent++;
             }
             else {
                 failed++;
+                entry.lastError = 'sender returned false';
                 remaining.push(entry);
             }
         }
-        catch {
+        catch (e) {
             failed++;
+            entry.lastError = e instanceof Error ? e.message : String(e);
             remaining.push(entry);
         }
     }
-    writeEntries(aid, remaining);
+    const current = readEntries(aid);
+    const currentIds = new Set(current.map(e => e.id));
+    const retainedNewEntries = current.filter(e => !drainedIds.has(e.id));
+    const retainedFailedEntries = remaining.filter(e => currentIds.has(e.id));
+    writeEntries(aid, [...retainedFailedEntries, ...retainedNewEntries]);
     return { sent, expired, failed };
 }
 export function hasPending(aid) {