evolclaw 3.1.0 → 3.1.1

package/dist/core/command-handler.js

@@ -8,7 +8,7 @@ import crypto from 'crypto';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
-import { parseTriggerSet } from './trigger/parser.js';
+import { parseTriggerSet, parseTriggerUpdate } from './trigger/parser.js';
 import { calcNextFireAt } from './trigger/scheduler.js';
 import { checkLatestVersion, getLocalVersion, isLinkedInstall, compareVersions } from '../utils/npm-ops.js';
 const allEfforts = ['low', 'medium', 'high', 'max'];
@@ -24,17 +24,8 @@ function getAvailableEfforts(agent, model) {
     }
     return [];
 }
-function formatModelUsage(agent, model) {
-    const efforts = getAvailableEfforts(agent, model);
-    const lines = [
-        '用法:',
-        '  /model <模型>            切换模型',
-    ];
-    if (efforts.length > 0) {
-        lines.push('  /model <模型> <强度>     切换模型+推理强度');
-        lines.push('  /effort [level]          查看或切换推理强度');
-    }
-    return lines.join('\n');
+function formatModelUsage(_agent, _model) {
+    return '用法: /model <模型>';
 }
 /**
  * 写入用户级 ~/.claude/settings.json（与 Claude CLI 行为一致）
@@ -341,8 +332,6 @@ export class CommandHandler {
             return renderCommandCardAsText(card);
         if (!adapter?.send)
             return renderCommandCardAsText(card);
-        if (this.isSessionBusy(opts.interaction.sessionId))
-            return renderCommandCardAsText(card);
         try {
             const envelope = buildEnvelope({
                 channel: opts.channel,
@@ -382,14 +371,6 @@ export class CommandHandler {
         });
         return { matched: true, result: '✓ 已回答' };
     }
-    /** 判断指定 session 是否有活跃流（用于 idle 守卫和卡片降级） */
-    isSessionBusy(sessionId) {
-        for (const agent of this.agentMap.values()) {
-            if (agent.hasActiveStream(sessionId))
-                return true;
-        }
-        return false;
-    }
     /** 获取活跃会话，无会话时自动创建（话题除外） */
     async ensureSession(channel, channelId, threadId, chatType) {
         if (threadId) {
@@ -1029,9 +1010,9 @@ export class CommandHandler {
                     return `  ${prefix} ${m.key} (${m.nameZh}) - ${m.description}${suffix}`;
                 }).join('\n');
                 if (isOwner) {
-                    return { kind: 'command.result', text: `🔐 当前权限模式: ${currentMode}\n\n${modeList}\n\n用法:\n  /perm <模式>              切换权限模式\n  /perm allow|always|deny   审批权限请求` };
+                    return { kind: 'command.result', text: `权限模式: ${currentMode}\n\n${modeList}\n\n用法: /perm <模式> 或 allow|always|deny` };
                 }
-                return { kind: 'command.result', text: `🔐 当前权限模式: ${currentMode}` };
+                return { kind: 'command.result', text: `当前权限模式: ${currentMode}` };
             }
             const parts = args.split(/\s+/);
             // /perm <mode> 或 /perm allow|always|deny：切换模式 / 快捷审批
@@ -1235,7 +1216,7 @@ export class CommandHandler {
                 const list = available.map(a => `${a === currentAgent ? ' ✓' : '  '} ${a}`).join('\n');
                 const canSwitchAgent = activeChatType === 'group' ? isOwner : isAdmin;
                 if (canSwitchAgent) {
-                    return { kind: 'command.result', text: `当前 Agent: ${currentAgent}\n\n可用:\n${list}\n\n用法: /agent <name>` };
+                    return { kind: 'command.result', text: `当前 Agent: ${currentAgent}\n\n可用:\n${list}\n用法: /agent <name>` };
                 }
                 return { kind: 'command.result', text: `当前 Agent: ${currentAgent}` };
             }
@@ -1373,7 +1354,7 @@ export class CommandHandler {
                     ? `\n推理强度: ${currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort}  (使用 /effort 调整)`
                     : '';
                 if (isAdmin) {
-                    return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}\n\n可用模型：\n${modelList}\n\n${formatModelUsage(modelAgent, currentModel)}` };
+                    return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}\n\n可用模型：\n${modelList}\n\n用法: /model <模型>` };
                 }
                 return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}` };
             }
@@ -1494,12 +1475,11 @@ export class CommandHandler {
                 }
                 // 降级：文本
                 const effortDisplay = currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort;
-                const allItems = [...efforts, 'auto'];
-                const effortList = allItems.map(e => `  ${e === currentEffort ? '✓' : ' '} ${e}${e === 'auto' ? ' (SDK默认)' : ''}`).join('\n');
+                const effortOptions = [...efforts, 'auto'].join(' / ');
                 if (isAdmin) {
-                    return { kind: 'command.result', text: `⚡ 推理强度: ${effortDisplay}\n\n可选:\n${effortList}\n\n用法: /effort <level>` };
+                    return { kind: 'command.result', text: `推理强度: ${effortDisplay}  可选: ${effortOptions}  用法: /effort <level>` };
                 }
-                return { kind: 'command.result', text: `⚡ 推理强度: ${effortDisplay}` };
+                return { kind: 'command.result', text: `推理强度: ${effortDisplay}` };
             }
             // 带参（切换）需 admin+；无参查询已在上方返回
             if (!isAdmin)
@@ -1534,9 +1514,7 @@ export class CommandHandler {
                 return { kind: 'command.error', text: '❌ 无权限：此命令仅限 owner 使用' };
             // 无参数时返回用法说明
             if (normalizedContent === '/aid') {
-                return { kind: 'command.result', text: `🆔 AID 身份管理
-
-用法:
+                return { kind: 'command.result', text: `用法:
   /aid list              列出本地所有 AID
   /aid show <aid>        查看 AID 详情
   /aid new <aid>         创建新 AID
@@ -1546,27 +1524,16 @@ export class CommandHandler {
   /aid agentmd get <aid> 下载并验签 agent.md` };
             }
             if (normalizedContent === '/rpc') {
-                return { kind: 'command.result', text: `📡 AUN RPC 调用
-
-用法:
-  /rpc --as <aid> --params <json>
-
-参数格式:
-  单行 JSON    单次调用
-  多行 JSONL   逐行执行，失败即停
-
-示例:
-  /rpc --as myaid.agentid.pub --params {"method":"meta.ping","params":{}}` };
+                return { kind: 'command.result', text: `用法: /rpc --as <aid> --params <json>
+示例: /rpc --as myaid.agentid.pub --params {"method":"meta.ping","params":{}}` };
             }
             if (normalizedContent === '/storage') {
-                return { kind: 'command.result', text: `📦 文件存储
-
-用法:
-  /storage upload <aid> <file> <path> [--public]   上传文件
-  /storage download <aid> <url> [local-path]       下载文件
-  /storage ls <aid> [prefix]                       列文件
-  /storage rm <aid> <path>                         删文件
-  /storage quota <aid>                             查配额` };
+                return { kind: 'command.result', text: `用法:
+  /storage upload <aid> <file> <path> [--public]
+  /storage download <aid> <url> [local-path]
+  /storage ls <aid> [prefix]
+  /storage rm <aid> <path>
+  /storage quota <aid>` };
             }
             const cliArgs = normalizedContent.slice(1); // strip leading /
             try {
@@ -1644,9 +1611,9 @@ export class CommandHandler {
                     return `  ${prefix} ${m.key} — ${m.label}`;
                 }).join('\n');
                 if (isOwner) {
-                    return { kind: 'command.result', text: [`📋 中间输出模式: ${currentMode}`, '', modeList, '', '用法: /activity <all|dm|owner|none>'].join('\n') };
+                    return { kind: 'command.result', text: `中间输出: ${currentMode}  用法: /activity <all|dm|owner|none>` };
                 }
-                return { kind: 'command.result', text: `📋 中间输出模式: ${currentMode}` };
+                return { kind: 'command.result', text: `中间输出: ${currentMode}` };
             }
             const newMode = modeMap[activityArg];
             if (!newMode) {
@@ -1678,8 +1645,12 @@ export class CommandHandler {
             const arg = normalizedContent.slice(9).trim();
             const currentMode = chatmodeSession.sessionMode || 'interactive';
             const chatmodeChatType = chatmodeSession.chatType || activeChatType;
-            const canSwitch = chatmodeChatType !== 'group' || isAdmin;
+            const isGroup = chatmodeChatType === 'group';
+            const canSwitch = !isGroup;
             if (!arg) {
+                if (isGroup) {
+                    return { kind: 'command.result', text: `📋 会话模式: proactive（群聊强制）` };
+                }
                 // 尝试发送 CommandCard 卡片
                 if (canSwitch) {
                     const modes = [
@@ -1712,23 +1683,16 @@ export class CommandHandler {
                 }
                 // 降级：文本
                 if (canSwitch) {
-                    return { kind: 'command.result', text: [
-                            `📋 会话模式: ${currentMode}`,
-                            '',
-                            '模式说明：',
-                            '  • interactive — 交互模式：收到消息时才回复，回复直接显示',
-                            '  • proactive   — 主动模式：流式输出静默，由 Agent 自调 ctl send 发声',
-                            '',
-                            '用法: /chatmode <interactive|proactive>',
-                        ].join('\n') };
-                }
-                return { kind: 'command.result', text: `📋 会话模式: ${currentMode}` };
+                    return { kind: 'command.result', text: `会话模式: ${currentMode}  用法: /chatmode <interactive|proactive>` };
+                }
+                return { kind: 'command.result', text: `会话模式: ${currentMode}` };
             }
             if (arg !== 'interactive' && arg !== 'proactive') {
                 return { kind: 'command.error', text: `❌ 无效模式: ${arg}\n可选: interactive / proactive` };
             }
-            if ((chatmodeSession.chatType || activeChatType) === 'group' && !isAdmin) {
-                return { kind: 'command.error', text: '❌ 无权限：群聊中切换会话模式仅限管理员使用' };
+            // 群聊强制 proactive，不可切换
+            if ((chatmodeSession.chatType || activeChatType) === 'group') {
+                return { kind: 'command.error', text: '❌ 群聊强制 proactive 模式，不可切换' };
             }
             if (arg === currentMode) {
                 return { kind: 'command.result', text: `📋 当前会话模式已是 ${arg}` };
@@ -1796,17 +1760,10 @@ export class CommandHandler {
                     // 卡片降级：fall through 到下方文本输出
                 }
                 // 降级：文本
-                const lines = [];
-                lines.push(`📋 分发模式: ${displayMode}`);
-                lines.push('');
-                lines.push('模式说明：');
-                lines.push('  • mention   — 提及模式：仅当被@提及时响应群消息(含@all)');
-                lines.push('  • broadcast — 广播模式：群内所有消息都触发响应');
                 if (isAdmin) {
-                    lines.push('');
-                    lines.push('用法: /dispatch <mention|broadcast>');
+                    return { kind: 'command.result', text: `分发模式: ${displayMode}  用法: /dispatch <mention|broadcast>` };
                 }
-                return { kind: 'command.result', text: lines.join('\n') };
+                return { kind: 'command.result', text: `分发模式: ${displayMode}` };
             }
             if (arg !== 'mention' && arg !== 'broadcast') {
                 return { kind: 'command.error', text: `❌ 无效模式: ${arg}\n可选: mention / broadcast\n用法: /dispatch <模式>` };
@@ -1815,7 +1772,7 @@ export class CommandHandler {
                 return { kind: 'command.error', text: '❌ 无权限：群聊中切换分发模式仅限管理员使用' };
             }
             if (arg === currentMode) {
-                return { kind: 'command.result', text: `📋 当前已是 ${arg}` };
+                return { kind: 'command.result', text: `当前已是 ${arg}` };
             }
             const metadata = { ...(dispatchSession.metadata || {}), dispatchMode: arg };
             await this.sessionManager.updateSession(dispatchSession.id, { metadata });
@@ -3111,6 +3068,45 @@ export class CommandHandler {
             this.eventBus.publish({ type: 'trigger:cancelled', triggerId: trigger.id, by: peerId });
             return `✅ 触发器已取消：**${trigger.name}**`;
         }
+        // /trigger update <name|id> [--参数...]
+        if (sub.startsWith('update ')) {
+            if (!manager || !scheduler)
+                return '⚠️ 触发器功能未启用';
+            const args = sub.slice('update '.length);
+            const result = parseTriggerUpdate(args);
+            if (!result.ok)
+                return `❌ ${result.error}`;
+            const { nameOrId, value: patch } = result;
+            // Find trigger: non-admin lookup is scoped
+            let trigger;
+            if (isAdmin) {
+                trigger = manager.getByName(nameOrId) ?? manager.getById(nameOrId);
+            }
+            else {
+                trigger = manager.getByNameScoped(nameOrId, peerId, channel)
+                    ?? manager.getByIdScoped(nameOrId, peerId, channel);
+            }
+            if (!trigger) {
+                return isAdmin
+                    ? `❌ 未找到触发器：${nameOrId}`
+                    : `❌ 未找到触发器 "${nameOrId}"，或无权限修改`;
+            }
+            // If schedule changed, recalculate nextFireAt
+            if (patch.scheduleType && patch.scheduleValue) {
+                const now = Date.now();
+                patch.nextFireAt = calcNextFireAt(patch.scheduleType, patch.scheduleValue, now);
+            }
+            let updated;
+            try {
+                updated = manager.update(trigger.id, patch);
+                scheduler.update(updated);
+            }
+            catch (err) {
+                return `❌ 更新失败：${err.message}`;
+            }
+            const nextStr = new Date(updated.nextFireAt).toLocaleString();
+            return `✅ 触发器已更新：**${updated.name}**\n下次触发：${nextStr}`;
+        }
         // /trigger set ...
         if (sub.startsWith('set ')) {
             if (!manager || !scheduler)
@@ -3155,7 +3151,7 @@ export class CommandHandler {
             const nextStr = new Date(nextFireAt).toLocaleString();
             return `✅ 触发器已注册：**${name}**\n下次触发：${nextStr}`;
         }
-        return `❌ 未知子命令。用法：\n/trigger — 查看活跃触发器\n/trigger list — 查看所有触发器\n/trigger set <参数> — 注册触发器\n/trigger cancel <名称> — 取消触发器`;
+        return `❌ 未知子命令。用法：\n/trigger — 查看活跃触发器\n/trigger list — 查看所有触发器\n/trigger set <参数> — 注册触发器\n/trigger update <名称|ID> <参数> — 修改触发器\n/trigger cancel <名称> — 取消触发器`;
     }
     // ── /rewind helpers ──
     async handleRewindList(session, agent) {
@@ -3376,7 +3372,10 @@ export class CommandHandler {
         }
         // 4. /send 文本消息：直接通过 adapter 主动发送，不走 handle()
         if (cmd.startsWith('/send ') || cmd === '/send') {
-            const text = cmd.startsWith('/send ') ? cmd.slice(6).trim() : '';
+            // 解析 --encrypt 标志和消息文本
+            const raw = cmd.startsWith('/send ') ? cmd.slice(6).trim() : '';
+            const forceEncrypt = raw.startsWith('--encrypt ');
+            const text = forceEncrypt ? raw.slice(10).trim() : raw;
             if (!text)
                 return { ok: false, error: '消息内容不能为空' };
             const adapter = this.adapters.get(session.channel);
@@ -3386,8 +3385,13 @@ export class CommandHandler {
                 const replyContext = this.buildCtlReplyContext(session);
                 const taskId = replyContext?.metadata?.taskId;
                 const chatmode = replyContext?.metadata?.chatmode ?? 'interactive';
-                await adapter.send(buildEnvelope({ taskId, channel: adapter.channelName, channelId: session.channelId, chatmode, replyContext }), { kind: 'result.text', text, isFinal: true });
-                return { ok: true, result: '已发送' };
+                // --encrypt 覆盖 session 加密状态
+                const enrichedReplyContext = forceEncrypt
+                    ? { ...(replyContext ?? {}), metadata: { ...(replyContext?.metadata ?? {}), encrypted: true } }
+                    : replyContext;
+                await adapter.send(buildEnvelope({ taskId, channel: adapter.channelName, channelId: session.channelId, chatmode, replyContext: enrichedReplyContext }), { kind: 'result.text', text, isFinal: true });
+                // 出方向 jsonl 写入已下沉到 aun.ts:deliverTextEntry，message.send 成功后统一写入。
+                return { ok: true, result: 'ok' };
             }
             catch (err) {
                 return { ok: false, error: err.message || String(err) };

package/dist/core/message/im-renderer.js

@@ -3,6 +3,21 @@ import { summarizeToolInput } from '../permission.js';
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../../paths.js';
+/**
+ * 检测是否为上下文过长错误
+ * 统一的检测逻辑，覆盖所有已知的错误文本模式
+ */
+function isContextTooLongError(text) {
+    if (!text)
+        return false;
+    const lower = text.toLowerCase();
+    return (lower.includes('prompt is too long') ||
+        lower.includes('input is too long') ||
+        lower.includes('context too long') ||
+        lower.includes('context limit') ||
+        lower.includes('context_length_exceeded') ||
+        text.includes('上下文过长'));
+}
 let diagStream = null;
 function getDiagStream() {
     if (!diagStream) {
@@ -129,7 +144,8 @@ export class IMRenderer {
     }
     // ── 文本/活动注入（替代 StreamFlusher.addText/addActivity）──
     /** 添加文本片段（流式 text） */
-    addText(text) {
+    addText(text, outputTokens, turn) {
+        this.emitProgress('text', outputTokens, turn);
         if (this.opts.envelope.chatmode === 'proactive')
             return;
         if (!text)
@@ -155,7 +171,8 @@ export class IMRenderer {
         this.scheduleFlush();
     }
     /** 添加工具调用 */
-    addToolCall(name, input, callId, descText) {
+    addToolCall(name, input, callId, descText, turn, outputTokens) {
+        this.emitProgress('tool_call', outputTokens, turn);
         if (this.opts.envelope.chatmode === 'proactive')
             return;
         if (this.opts.suppressActivities)
@@ -174,6 +191,7 @@ export class IMRenderer {
     }
     /** 添加工具结果 */
     addToolResult(name, ok, result, error, callId, durationMs, descText) {
+        this.emitProgress('tool_result');
         if (this.opts.envelope.chatmode === 'proactive')
             return;
         if (this.opts.suppressActivities)
@@ -351,6 +369,11 @@ export class IMRenderer {
             this.flushCount++;
         }
     }
+    // ── 内部：status.progress 发送 ──
+    emitProgress(activityType, outputTokens, turn) {
+        const payload = { kind: 'status.progress', metadata: { activityType, ...(turn != null && { turn }), ...(outputTokens != null && { outputTokens }) } };
+        this.opts.send(payload).catch(() => { });
+    }
     // ── 内部：proactive 模式（逐事件 activity.batch[1 item]） ──
     emitProactive(event) {
         // 对齐 interactive 的 dedup：流式 text 已推过时，complete.result 不再重复发 summary
@@ -367,6 +390,10 @@ export class IMRenderer {
             this.hasEmittedText = true;
             this.allText += item.text;
         }
+        const outputTokens = event.outputTokens;
+        const turn = event.turn;
+        const activityType = item.kind === 'text' ? 'text' : item.kind === 'tool_call' ? 'tool_call' : 'tool_result';
+        this.emitProgress(activityType, outputTokens, turn);
         const payload = { kind: 'activity.batch', items: [item] };
         // fire-and-forget
         this.opts.send(payload).catch(err => {
@@ -430,9 +457,20 @@ export class IMRenderer {
                     duration_ms: event.durationMs,
                 };
             }
-            case 'error':
+            case 'error': {
+                // 上下文过长错误不输出（留给外层 auto-compact 处理）
+                if (isContextTooLongError(event.error || ''))
+                    return null;
                 return { kind: 'notice', text: event.error, severity: 'warn' };
-            case 'complete':
+            }
+            case 'complete': {
+                // 上下文过长错误不输出（留给外层 auto-compact 处理）
+                const hasContextError = event.terminalReason === 'prompt_too_long'
+                    || isContextTooLongError(event.errors?.join(' ') || '')
+                    || isContextTooLongError(event.result || '');
+                if (event.isError && hasContextError) {
+                    return null;
+                }
                 if (event.isError) {
                     const errText = event.errors?.join('; ') || event.result || '任务失败';
                     return {
@@ -452,6 +490,7 @@ export class IMRenderer {
                     };
                 }
                 return null;
+            }
             case 'session_id':
             case 'state_changed':
             case 'status':

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

@@ -133,6 +133,8 @@ export class MessageBridge {
                 };
                 // 5.5 写入消息记录（入方向）
                 const chatDir = this.sessionManager.getChatDir(session);
+                const inboundEncrypt = msg.replyContext?.metadata?.encrypted != null ? !!(msg.replyContext.metadata.encrypted) : undefined;
+                const inboundChatmode = msg.replyContext?.metadata?.chatmode;
                 appendMessageLog(chatDir, buildInboundEntry({
                     from: msg.peerId || 'unknown',
                     to: msg.selfId || 'self',
@@ -143,6 +145,8 @@ export class MessageBridge {
                     replyTo: msg.replyContext?.replyToMessageId ?? null,
                     permMode: session.identity?.role ?? null,
                     timestamp: fullMessage.timestamp,
+                    encrypt: inboundEncrypt,
+                    chatmode: inboundChatmode,
                 }));
                 // 6. ACK + debounce/enqueue
                 //    ACK 在到达时立即做（每条独立 ACK），不等合并

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

@@ -66,6 +66,8 @@ export function buildInboundEntry(opts) {
         permMode: opts.permMode ?? null,
         cmdParsed: isCommand ? opts.content.split(/\s/)[0] : null,
         durationMs: null,
+        encrypt: opts.encrypt,
+        chatmode: opts.chatmode,
     };
 }
 export function buildOutboundEntry(opts) {
@@ -79,7 +81,7 @@ export function buildOutboundEntry(opts) {
         chatType: opts.chatType,
         groupId: opts.groupId ?? null,
         msgId: opts.msgId ?? null,
-        msgType: 'text',
+        msgType: opts.msgType ?? 'text',
         content: opts.content,
         replyTo: opts.replyTo ?? null,
         agent: opts.agent ?? null,
@@ -89,5 +91,8 @@ export function buildOutboundEntry(opts) {
         durationMs: opts.durationMs ?? null,
         numTurns: opts.numTurns ?? null,
         usage: opts.usage ?? null,
+        encrypt: opts.encrypt,
+        chatmode: opts.chatmode,
+        source: opts.source ?? 'daemon',
     };
 }