evolclaw 3.2.0 → 3.3.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v3.3.0 (2026-06-10)
+
+### New Features
+
+- **Thread 会话继承 baseagent** — 创建 thread 会话时自动继承父会话的 `agentId` 及 baseagent 配置，多线程场景无需重新切换
+- **Codex runner 增强** — 新增 CLI 版本检测、streaming delta 支持、server 可用性检查；codex-app-server-client 补充类型定义
+- **Menu 话题管理** — command-handler 新增话题菜单的权限判定（`canReadTopics`/`canDeleteTopic`）与格式化（`buildTopicMenuItem`/`resolveMenuChatType`）
+
+### Improvements
+
+- **Channel plugin 接口统一** — `ChannelPlugin` 从 `isEnabled/createChannel/createChannels` 收敛为单一 `createInstance(inst, ctx)` 单实例模型，新增 `ChannelBuildContext` 与 `showActivities` 共享策略；六个渠道（aun/feishu/wechat/dingtalk/qqbot/wecom）同步迁移
+- **ECWeb 控制台重构** — control source 拆分为 `system`（evolclaw/fastaun/evolclaw-web 三包版本与健康检查）和 `triggers`（定时任务管理），前端联动更新
+- **Trigger 失败统计** — Trigger 新增 `failCount`/`lastResult` 字段，scheduler/manager/parser 同步
+- **Runner 类型模块化** — 抽出 `runner-types.ts` 统一共享类型，消除各 runner 重复声明
+- **Agent AID 展示** — `AgentInfo` 新增 `aid` 字段，`ec agent` 命令展示 agent AID
+- **缓存模块更名** — `read-cache` 重命名为 `daemon-file-cache`，语义更清晰
+
 ## v3.2.0 (2026-06-05)
 
 ### New Features

package/README.md

@@ -250,7 +250,6 @@ evolclaw/
 - `/perm [mode]` - 查看或切换权限模式（auto / edit / default / readonly）
 
 **系统管理**：
-- `/clear` - 清空对话历史
 - `/compact` - 压缩会话上下文
 - `/rewind <turn>` - 回退会话到指定轮次
 - `/stop` - 中断当前任务
@@ -296,7 +295,7 @@ v3.2 新增进程级身份标识。启动时自动生成 `ec+5位数字.agentid.
 ## 技术栈
 
 - **运行时**：Node.js >= 22 + TypeScript（ES modules）
-- **AI SDK**：@anthropic-ai/claude-agent-sdk >= 0.2.100、@openai/codex-sdk、Gemini CLI
+- **AI 后端**：@anthropic-ai/claude-agent-sdk >= 0.2.100、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/{resolve.js → baseagent.js}

@@ -1,14 +1,37 @@
 /**
- * Baseagent credential resolvers.
+ * Baseagent identity + credential resolution.
  *
- * 输入是 Config 形态（`config.agents.<baseagent>` + override）。启动期由 index.ts
- * 从 primaryAgent.config.baseagents 构造一个 syntheticConfig 喂入；各 plugin 的
- * createAgent 也各自构造 syntheticConfig。
+ * 两部分：
+ *  1. normalizeBaseagent —— 把用户输入的各种别名（cc / claude-code / gemini cli …）
+ *     归一到 canonical 标识 + 展示名。
+ *  2. resolve*Config —— 各后端的凭证解析。输入是 Config 形态
+ *     （`config.agents.<baseagent>` + override）。启动期由 index.ts 从
+ *     primaryAgent.config.baseagents 构造一个 syntheticConfig 喂入；各 plugin 的
+ *     createAgent 也各自构造 syntheticConfig。
  */
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import { commandExists } from '../utils/cross-platform.js';
+const BASEAGENT_ALIASES = {
+    claude: { canonical: 'claude', displayName: 'Claude Code' },
+    cc: { canonical: 'claude', displayName: 'Claude Code' },
+    'claude-code': { canonical: 'claude', displayName: 'Claude Code' },
+    'claude code': { canonical: 'claude', displayName: 'Claude Code' },
+    claudecode: { canonical: 'claude', displayName: 'Claude Code' },
+    codex: { canonical: 'codex', displayName: 'Codex' },
+    'codex-cli': { canonical: 'codex', displayName: 'Codex' },
+    'codex cli': { canonical: 'codex', displayName: 'Codex' },
+    gemini: { canonical: 'gemini', displayName: 'Gemini CLI' },
+    'gemini-cli': { canonical: 'gemini', displayName: 'Gemini CLI' },
+    'gemini cli': { canonical: 'gemini', displayName: 'Gemini CLI' },
+    geminicli: { canonical: 'gemini', displayName: 'Gemini CLI' },
+    hermes: { canonical: 'hermes', displayName: 'Hermes' },
+};
+export function normalizeBaseagent(input) {
+    const key = String(input || '').trim().toLowerCase().replace(/_/g, '-');
+    return BASEAGENT_ALIASES[key] || { canonical: 'unknown', displayName: input ? String(input) : 'Unknown' };
+}
 function loadClaudeSettings() {
     try {
         const settingsPath = path.join(os.homedir(), '.claude', 'settings.json');
@@ -109,7 +132,13 @@ export function resolveOpenaiConfig(config, override) {
         || config.agents?.codex?.effort
         || config.agents?.codex?.reasoning
         || undefined;
-    return { apiKey, baseUrl, model, effort };
+    const enableRequestUserInput = override?.enableRequestUserInput
+        ?? config.agents?.codex?.enableRequestUserInput
+        ?? true;
+    const approvalsReviewer = override?.approvalsReviewer
+        ?? config.agents?.codex?.approvalsReviewer
+        ?? undefined;
+    return { apiKey, baseUrl, model, effort, enableRequestUserInput, approvalsReviewer };
 }
 export function resolveGoogleConfig(config, override) {
     const googleCfg = config.agents?.gemini;

package/dist/agents/claude-runner.js

@@ -1,6 +1,6 @@
 import { query, forkSession as sdkForkSession, getSessionMessages as sdkGetSessionMessages } from '@anthropic-ai/claude-agent-sdk';
 import { ensureDir } from '../utils/atomic-write.js';
-import { resolveAnthropicConfig } from './resolve.js';
+import { resolveAnthropicConfig } from './baseagent.js';
 import { DEFAULT_PERMISSION_MODE } from '../types.js';
 import { renderActionAsText } from '../core/interaction-router.js';
 import { buildEnvelope, sendInteractionPayload } from '../core/message/message-processor.js';
@@ -10,6 +10,8 @@ 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';
+export { hasCompact, hasModelSwitcher, hasPermissionController } from './runner-types.js';
 // ── 模型别名解析 ──
 // SDK 内置的别名表可能落后于代理实际可用的最新模型，
 // 因此优先从 {baseUrl}/models 动态获取各系列最新版本，失败则回退静态表。
@@ -110,9 +112,21 @@ function applyContextWindow(modelId) {
         return `${modelId}[1m]`;
     return modelId;
 }
-/** 根据 SDK model 串（含 [1m] 后缀）返回合适的 autoCompactWindow 值。 */
-function contextWindowFor(sdkModel) {
-    return /\[1m\]$/.test(sdkModel) ? 900000 : 200000;
+/** 真实上下文窗口大小：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) {
@@ -168,19 +182,9 @@ class MessageStream {
         }
     }
 }
-// ── 类型守卫 ──
-export function hasModelSwitcher(agent) {
-    return typeof agent.setModel === 'function' && typeof agent.listModels === 'function';
-}
-export function hasPermissionController(agent) {
-    return typeof agent.setMode === 'function' && typeof agent.listModes === 'function';
-}
-export function hasCompact(agent) {
-    return typeof agent.compact === 'function';
-}
 export class AgentRunner {
     name = 'claude';
-    capabilities = { clear: true, compact: true, fork: true };
+    capabilities = { clear: true, compact: true, fork: true, askUserQuestion: true, planApproval: true, fileRewind: 'checkpoint' };
     apiKey;
     model;
     effort;
@@ -383,7 +387,6 @@ export class AgentRunner {
                     },
                     channelId: permCtx.channelId,
                     sessionId,
-                    expiresAt: Date.now() + 5 * 60 * 1000,
                 };
             }
             else {
@@ -411,11 +414,11 @@ export class AgentRunner {
                     },
                     channelId: permCtx.channelId,
                     sessionId,
-                    expiresAt: Date.now() + 5 * 60 * 1000,
                 };
             }
             let cardSent = false;
             try {
+                await permCtx.flushPending?.();
                 const envelope = buildEnvelope({
                     taskId: permCtx.taskId,
                     channel: permCtx.channel ?? permCtx.adapter.channelName,
@@ -433,6 +436,7 @@ export class AgentRunner {
                 logger.warn(`[AgentRunner] AskUserQuestion card send failed for q${i}:`, err);
             }
             if (!cardSent) {
+                await permCtx.flushPending?.();
                 const firstLabel = q.options[0]?.label || '';
                 answers[q.question] = q.multiSelect ? [firstLabel] : firstLabel;
                 if (sendPrompt) {
@@ -530,7 +534,7 @@ export class AgentRunner {
                             else {
                                 resolve(action.trim());
                             }
-                        }, { timeoutMs: 120_000, onTimeout: () => resolve(q.options[0]?.label || ''), initiatorId: permCtx.userId, fallbackCommand: 'ask' });
+                        }, { initiatorId: permCtx.userId, fallbackCommand: 'ask' });
                     });
                     answers[q.question] = answer;
                 }
@@ -606,6 +610,7 @@ export class AgentRunner {
                 },
             };
             try {
+                await permCtx.flushPending?.();
                 const envelope = buildEnvelope({
                     taskId: permCtx.taskId,
                     channel: permCtx.channel ?? permCtx.adapter.channelName,
@@ -663,6 +668,7 @@ export class AgentRunner {
                     buttonArgMap: { approve: '1', reject: '2' },
                 },
             };
+            await permCtx.flushPending?.();
             await sendPrompt(renderActionAsText(fallbackInteraction));
             permCtx.interactionRouter.unmarkWaiting(sessionId);
             return new Promise((resolve) => {
@@ -674,11 +680,12 @@ export class AgentRunner {
                     else {
                         resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
                     }
-                }, { timeoutMs: 300_000, onTimeout: () => resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' }), initiatorId: permCtx.userId, fallbackCommand: 'ask' });
+                }, { initiatorId: permCtx.userId, fallbackCommand: 'ask' });
             });
         }
         // 无交互能力，发提示后直接 allow
         permCtx?.interactionRouter?.unmarkWaiting(sessionId);
+        await permCtx.flushPending?.();
         await sendPrompt('📋 计划审批\nAI 已完成规划，自动批准执行。');
         return { behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' };
     }
@@ -692,6 +699,9 @@ export class AgentRunner {
         const toolUseNames = new Map();
         let turnCount = 0;
         const seenMessageIds = new Set();
+        let lastModelCall;
+        // 流式收集各次大模型调用（fallback：SDK iterations 为空时使用）
+        const collectedCalls = [];
         try {
             for await (const event of sdkStream) {
                 // 提取 session_id（任意 SDK 事件都可能携带）
@@ -700,6 +710,38 @@ export class AgentRunner {
                     this.updateSessionId(sessionId, event.session_id);
                     yield { type: 'session_id', sessionId: event.session_id };
                 }
+                if (event.type === 'stream_event') {
+                    const streamEvent = event.event;
+                    if (streamEvent?.type === 'message_start' && streamEvent.message?.usage) {
+                        lastModelCall = {
+                            uuid: event.uuid,
+                            model: streamEvent.message.model,
+                            tokenUsage: streamEvent.message.usage,
+                        };
+                        // 流式收集：每个 message_start = 一次新的大模型调用
+                        collectedCalls.push({
+                            call_index: collectedCalls.length,
+                            model: streamEvent.message.model ?? callModel ?? this.model,
+                            request_id: event.request_id,
+                            tokenUsage: { ...streamEvent.message.usage },
+                        });
+                    }
+                    else if (streamEvent?.type === 'message_delta' && streamEvent.usage) {
+                        lastModelCall = {
+                            ...lastModelCall,
+                            uuid: lastModelCall?.uuid ?? event.uuid,
+                            tokenUsage: {
+                                ...(lastModelCall?.tokenUsage ?? {}),
+                                ...streamEvent.usage,
+                            },
+                        };
+                        // 将 message_delta 的 usage 合并进当前(最后一次)收集的调用
+                        const last = collectedCalls[collectedCalls.length - 1];
+                        if (last)
+                            last.tokenUsage = { ...last.tokenUsage, ...streamEvent.usage };
+                    }
+                    continue;
+                }
                 // system: compact_boundary → compact
                 if (event.type === 'system' && event.subtype === 'compact_boundary') {
                     yield {
@@ -730,6 +772,18 @@ export class AgentRunner {
                             seenMessageIds.add(msgId);
                         turnCount++;
                     }
+                    if (event.message.usage) {
+                        lastModelCall = {
+                            ...lastModelCall,
+                            messageId: event.message.id,
+                            requestId: event.request_id,
+                            model: event.message.model,
+                            tokenUsage: {
+                                ...event.message.usage,
+                                ...(lastModelCall?.tokenUsage ?? {}),
+                            },
+                        };
+                    }
                     // 统计本轮 base agent 全部输出字符数（text + tool_use input）
                     let turnOutputChars = 0;
                     for (const content of event.message.content) {
@@ -790,19 +844,55 @@ export class AgentRunner {
                     const cleanResult = typeof event.result === 'string'
                         ? event.result.replace(/<thinking>[\s\S]*?<\/thinking>\s*/g, '').trim()
                         : event.result;
-                    // 从 usage 三项求和得到当前上下文占用（与 claude-hud getTotalTokens 相同算法）
+                    // 从 usage 求当前上下文占用。
+                    // Claude：input_tokens 是净输入（不含 cache），三项求和 = 实际上下文长度。
+                    // 非 Claude（DeepSeek/OpenAI 兼容）：cache_read 是服务端 KV cache 不占上下文窗口，
+                    // input_tokens 本身就是完整的上下文输入量。
                     const u = event.usage;
-                    const totalTokens = u
-                        ? (u.input_tokens ?? 0) + (u.cache_creation_input_tokens ?? 0) + (u.cache_read_input_tokens ?? 0)
-                        : 0;
-                    const maxTokens = sdkModel ? contextWindowFor(sdkModel) : 200000;
+                    const effectiveModel = callModel ?? this.model;
+                    const isClaudeModel = effectiveModel?.startsWith('claude');
+                    const totalTokens = contextTokensForUsage(u, !!isClaudeModel);
+                    const contextWindowTokens = sdkModel ? realContextWindowFor(sdkModel) : 200000;
+                    const autoCompactTokens = sdkModel ? autoCompactWindowFor(sdkModel) : 200000;
                     const contextUsage = totalTokens > 0 ? {
                         totalTokens,
-                        maxTokens,
-                        percentage: Math.round((totalTokens / maxTokens) * 100),
+                        maxTokens: contextWindowTokens,
+                        percentage: Math.round((totalTokens / contextWindowTokens) * 100),
+                        autoCompactTokens,
                         model: callModel ?? this.model,
                         effort: callEffort ?? this.effort,
                     } : undefined;
+                    if (lastModelCall?.tokenUsage) {
+                        const lastUsageForContext = usageForContext(lastModelCall.tokenUsage);
+                        const lastTotalTokens = contextTokensForUsage(lastUsageForContext, !!isClaudeModel);
+                        lastModelCall = {
+                            ...lastModelCall,
+                            contextUsage: lastTotalTokens > 0 ? {
+                                totalTokens: lastTotalTokens,
+                                maxTokens: contextWindowTokens,
+                                percentage: Math.round((lastTotalTokens / 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,
+                        }));
+                    }
+                    else if (collectedCalls.length > 0) {
+                        modelCalls = collectedCalls;
+                    }
+                    else if (u) {
+                        // 降级：无逐次数据，写一条累计行
+                        modelCalls = [{ call_index: 0, model: callModel_, tokenUsage: u, degraded: true }];
+                    }
                     yield {
                         type: 'complete',
                         result: cleanResult,
@@ -817,6 +907,8 @@ export class AgentRunner {
                         numTurns: event.num_turns,
                         tokenUsage: event.usage,
                         contextUsage,
+                        lastModelCall,
+                        modelCalls,
                     };
                     // result 是 SDK 流的终结事件，不再等待后续（防止 interrupt 后流不关闭导致挂起）
                     return;
@@ -1030,11 +1122,12 @@ export class AgentRunner {
             model: sdkModel,
             ...(callEffort ? { effort: callEffort } : {}),
             ...(this.claudeExecutablePath ? { pathToClaudeCodeExecutable: this.claudeExecutablePath } : {}),
-            autoCompactWindow: contextWindowFor(sdkModel),
+            autoCompactWindow: autoCompactWindowFor(sdkModel),
             advisorModel: 'haiku',
             canUseTool: canUseToolCallback,
             permissionMode: sdkPermissionMode,
             persistSession: true,
+            includePartialMessages: true,
             enableFileCheckpointing: true,
             hooks: {
                 PreCompact: [{ matcher: '.*', hooks: [preCompactHook] }],