evolclaw 2.3.0 → 2.5.0

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

@@ -9,17 +9,22 @@ export class SessionManager {
     db;
     eventBus;
     ownerResolver;
+    adminResolver;
     fileAdapters = new Map();
-    constructor(dbPath = resolvePaths().db, eventBus, ownerResolver) {
+    constructor(dbPath = resolvePaths().db, eventBus, ownerResolver, adminResolver) {
         ensureDir(path.dirname(dbPath));
         this.db = new DatabaseSync(dbPath);
         this.eventBus = eventBus;
         this.ownerResolver = ownerResolver;
+        this.adminResolver = adminResolver;
         this.initDatabase();
     }
     setOwnerResolver(resolver) {
         this.ownerResolver = resolver;
     }
+    setAdminResolver(resolver) {
+        this.adminResolver = resolver;
+    }
     registerFileAdapter(adapter) {
         this.fileAdapters.set(adapter.agentId, adapter);
         logger.debug(`[SessionManager] Registered file adapter: ${adapter.agentId}`);
@@ -62,8 +67,11 @@ export class SessionManager {
     resolveIdentity(channel, userId) {
         if (!userId)
             return { role: 'anonymous', mode: 'interactive' };
-        const isOwner = this.ownerResolver?.(channel, userId) ?? false;
-        return { role: isOwner ? 'owner' : 'guest', mode: 'interactive' };
+        if (this.ownerResolver?.(channel, userId))
+            return { role: 'owner', mode: 'interactive' };
+        if (this.adminResolver?.(channel, userId))
+            return { role: 'admin', mode: 'interactive' };
+        return { role: 'guest', mode: 'interactive' };
     }
     /** 更新 session 的 identity（owner 绑定后调用） */
     async updateIdentity(sessionId, identity) {
@@ -546,6 +554,10 @@ export class SessionManager {
             sets.push('metadata = ?');
             values.push(updates.metadata ? JSON.stringify(updates.metadata) : null);
         }
+        if ('agentSessionId' in updates) {
+            sets.push('claude_session_id = ?');
+            values.push(updates.agentSessionId ?? null);
+        }
         if (sets.length === 0)
             return;
         sets.push('updated_at = ?');
@@ -731,6 +743,12 @@ export class SessionManager {
     `).get(targetChannel, ownerPeerId);
         return row?.channel_id;
     }
+    async getSessionById(sessionId) {
+        const row = this.db.prepare('SELECT * FROM sessions WHERE id = ? AND deleted_at IS NULL').get(sessionId);
+        if (!row)
+            return undefined;
+        return this.rowToSession(row);
+    }
     async getActiveSession(channel, channelId) {
         const row = this.db.prepare(`
       SELECT * FROM sessions
@@ -798,6 +816,10 @@ export class SessionManager {
             .run(JSON.stringify(metadata), Date.now(), targetSessionId);
         return { ...this.rowToSession(target), metadata, updatedAt: Date.now() };
     }
+    updateMetadata(sessionId, metadata) {
+        this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+            .run(JSON.stringify(metadata), Date.now(), sessionId);
+    }
     async renameSession(sessionId, newName) {
         const result = this.db.prepare(`
       UPDATE sessions SET name = ?, updated_at = ? WHERE id = ?

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, validateConfigIntegrity, validateChannelInstanceNames, getOwner } from './config.js';
+import { loadConfig, ensureDataDirs, resolvePaths, resolveAnthropicConfig, isOwner, isAdmin, validateConfigIntegrity, validateChannelInstanceNames, getOwner } 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';
@@ -9,6 +9,9 @@ import { GeminiAgentPlugin } from './agents/gemini-runner.js';
 import { FeishuChannelPlugin } from './channels/feishu.js';
 import { WechatChannelPlugin } from './channels/wechat.js';
 import { AUNChannelPlugin } from './channels/aun.js';
+import { DingtalkChannelPlugin } from './channels/dingtalk.js';
+import { QQBotChannelPlugin } from './channels/qqbot.js';
+import { WecomChannelPlugin } from './channels/wecom.js';
 import { MessageProcessor } from './core/message/message-processor.js';
 import { MessageQueue } from './core/message/message-queue.js';
 import { MessageBridge } from './core/message/message-bridge.js';
@@ -47,6 +50,7 @@ async function main() {
     ensureDataDirs();
     // 加载配置
     const config = loadConfig();
+    const paths = resolvePaths();
     // 配置完整性校验
     const integrity = validateConfigIntegrity(config);
     if (!integrity.valid) {
@@ -68,9 +72,7 @@ async function main() {
     // 统计收集器（近 1 小时滚动统计）
     const statsCollector = new StatsCollector(eventBus);
     // 初始化数据库（带 ownerResolver）
-    const sessionManager = new SessionManager(undefined, eventBus, (channel, userId) => {
-        return isOwner(config, channel, userId);
-    });
+    const sessionManager = new SessionManager(undefined, eventBus, (channel, userId) => isOwner(config, channel, userId), (channel, userId) => isAdmin(config, channel, userId));
     logger.info('✓ Database initialized');
     // 注册会话文件适配器（Claude / Codex 各自的会话文件操作）
     sessionManager.registerFileAdapter(new ClaudeSessionFileAdapter());
@@ -118,6 +120,9 @@ async function main() {
     channelLoader.register(new FeishuChannelPlugin());
     channelLoader.register(new WechatChannelPlugin());
     channelLoader.register(new AUNChannelPlugin());
+    channelLoader.register(new DingtalkChannelPlugin());
+    channelLoader.register(new QQBotChannelPlugin());
+    channelLoader.register(new WecomChannelPlugin());
     const channelInstances = await channelLoader.createAll(config);
     logger.info(`✓ Created ${channelInstances.length} channel instance(s)`);
     // 启动迁移：将 sessions.channel 从 channelType 回填为实例名
@@ -163,13 +168,14 @@ async function main() {
     messageQueue.setEventBus(eventBus);
     // 回填 messageQueue 引用
     cmdHandler.setMessageQueue(messageQueue);
+    processor.setMessageQueue(messageQueue);
     // 默认策略
     const defaultPolicy = {
-        canSwitchProject: (chatType, role) => chatType === 'private' || role === 'owner',
-        canListProjects: (chatType, role) => chatType === 'private' || role === 'owner',
+        canSwitchProject: (chatType, role) => chatType === 'private' ? (role === 'owner' || role === 'admin') : role === 'owner',
+        canListProjects: (chatType, role) => chatType === 'private' ? (role === 'owner' || role === 'admin') : role === 'owner',
         canCreateSession: () => true,
-        canDeleteSession: (chatType, role) => chatType === 'private' || role === 'owner',
-        canImportCliSession: (chatType, role) => chatType === 'private' || role === 'owner',
+        canDeleteSession: (chatType, role) => chatType === 'private' ? (role === 'owner' || role === 'admin') : role === 'owner',
+        canImportCliSession: (chatType, role) => chatType === 'private' ? (role === 'owner' || role === 'admin') : role === 'owner',
         messagePrefix: () => '',
         showMiddleResult: () => true,
         showIdleMonitor: () => true,
@@ -214,15 +220,12 @@ async function main() {
                 await handler({
                     channel: channelType, channelId: chatId, content, images, chatType,
                     peerId: peerId || '', peerName, messageId, mentions, threadId,
-                    replyContext: rootId ? { replyToMessageId: rootId, replyInThread: true } : undefined,
+                    replyContext: rootId ? { replyToMessageId: rootId, replyInThread: !!threadId } : undefined,
                 });
             }), (channelId, text, replyContext) => inst.channel.sendMessage(channelId, text, {
                 replyToMessageId: replyContext?.replyToMessageId,
-                replyInThread: true,
+                replyInThread: replyContext?.replyInThread,
             }), inst.adapter, channelType);
-            inst.channel.onRecall?.((messageId) => {
-                msgBridge.cancel(messageId);
-            });
         }
         if (channelType === 'wechat') {
             // 注入 EventBus（用于 channel:health 事件）
@@ -256,6 +259,38 @@ async function main() {
                 });
             }), (channelId, text, replyContext) => inst.channel.sendMessage(channelId, text, replyContext), inst.adapter, channelType);
         }
+        if (channelType === 'dingtalk') {
+            msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (event) => {
+                handler({
+                    channel: channelType,
+                    channelId: event.channelId,
+                    content: event.content,
+                    images: event.images,
+                    chatType: event.chatType || 'private',
+                    peerId: event.peerId || '',
+                    peerName: event.peerName,
+                    messageId: event.messageId,
+                });
+            }), (channelId, text) => inst.channel.sendMessage(channelId, text), inst.adapter, channelType);
+        }
+        if (channelType === 'qqbot') {
+            msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (event) => {
+                handler({
+                    channel: channelType,
+                    channelId: event.channelId,
+                    content: event.content,
+                    images: event.images,
+                    chatType: event.chatType || 'private',
+                    peerId: event.peerId || '',
+                    peerName: event.peerName,
+                    messageId: event.messageId,
+                });
+            }), (channelId, text) => inst.channel.sendMessage(channelId, text), inst.adapter, channelType);
+        }
+        // 通用：撤回消息 → 中断执行中任务（所有支持 onRecall 的渠道）
+        inst.channel.onRecall?.((messageId) => {
+            msgBridge.cancel(messageId);
+        });
     }
     // ── 连接所有渠道 ──
     const connected = await channelLoader.connectAll(channelInstances);
@@ -303,18 +338,17 @@ async function main() {
         const sourceChannelName = event.channelName || sourceChannelType;
         const msg = event.message;
         logger.error(`[ChannelHealth] ${sourceChannelName} auth_error: ${msg}`);
-        const notified = new Set(); // channelType:ownerId 去重
+        const notified = new Set(); // channelType 去重（同类型只通知一次）
         for (const other of channelInstances) {
             const otherType = other.channelType || other.adapter.channelName;
             if (otherType === sourceChannelType)
                 continue; // 跳过同类型通道
+            if (notified.has(otherType))
+                continue; // 同类型已通知过
             const ownerId = getOwner(config, other.adapter.channelName);
             if (!ownerId)
                 continue;
-            const key = `${otherType}:${ownerId}`;
-            if (notified.has(key))
-                continue; // 同类型已通知过此 owner
-            notified.add(key);
+            notified.add(otherType);
             other.adapter.sendText(ownerId, msg).catch(err => {
                 logger.error(`[ChannelHealth] Failed to notify ${other.adapter.channelName} owner:`, err);
             });
@@ -380,7 +414,7 @@ async function main() {
             const adapter = cmdHandler.getAdapter(pending.channel);
             if (adapter) {
                 const replyContext = pending.rootId
-                    ? { replyToMessageId: pending.rootId, replyInThread: true }
+                    ? { replyToMessageId: pending.rootId, replyInThread: !!pending.threadId }
                     : undefined;
                 await adapter.sendText(pending.channelId, '✅ 服务重启成功！', replyContext);
                 logger.info(`[Restart] Notification sent via ${pending.channel}`);
@@ -395,7 +429,7 @@ async function main() {
     const readySignalPath = resolvePaths().readySignal;
     fs.writeFileSync(readySignalPath, String(Date.now()));
     logger.info(`✓ Ready signal written: ${readySignalPath}`);
-    // IPC server — 供 CLI 查询实时状态
+    // IPC server — 供 CLI 查询实时状态 + Agent ctl 指令执行
     const ipcServer = new IpcServer(resolvePaths().socket, () => {
         const channels = {};
         const channelsByType = {};
@@ -425,7 +459,7 @@ async function main() {
                 avgResponseMs: snap.lastHour.avgResponseMs,
             },
         };
-    });
+    }, async (cmd, sessionId) => cmdHandler.handleCtl(cmd, sessionId));
     ipcServer.start();
     // 运行时配置文件监控
     const configPath = resolvePaths().config;

package/dist/ipc.js

@@ -4,10 +4,12 @@ import { logger } from './utils/logger.js';
 export class IpcServer {
     socketPath;
     getStatus;
+    commandExecutor;
     server = null;
-    constructor(socketPath, getStatus) {
+    constructor(socketPath, getStatus, commandExecutor) {
         this.socketPath = socketPath;
         this.getStatus = getStatus;
+        this.commandExecutor = commandExecutor;
     }
     start() {
         // Remove stale socket file
@@ -17,7 +19,7 @@ export class IpcServer {
         catch { }
         this.server = net.createServer((conn) => {
             let buf = '';
-            conn.on('data', (data) => {
+            conn.on('data', async (data) => {
                 buf += data.toString();
                 // Simple newline-delimited JSON protocol
                 const idx = buf.indexOf('\n');
@@ -27,7 +29,7 @@ export class IpcServer {
                 buf = buf.slice(idx + 1);
                 try {
                     const cmd = JSON.parse(line);
-                    const response = this.handleCommand(cmd);
+                    const response = await this.handleCommand(cmd);
                     conn.end(JSON.stringify(response) + '\n');
                 }
                 catch {
@@ -58,12 +60,20 @@ export class IpcServer {
         }
         catch { }
     }
-    handleCommand(cmd) {
+    async handleCommand(cmd) {
         switch (cmd.type) {
             case 'status':
                 return this.getStatus();
             case 'ping':
                 return { pong: true, pid: process.pid };
+            case 'ctl': {
+                if (!this.commandExecutor)
+                    return { ok: false, error: 'ctl not configured' };
+                const { cmd: slashCmd, sessionId } = cmd;
+                if (!slashCmd || !sessionId)
+                    return { ok: false, error: 'missing cmd or sessionId' };
+                return await this.commandExecutor(slashCmd, sessionId);
+            }
             default:
                 return { error: `unknown command: ${cmd.type}` };
         }

package/dist/templates/skills.md

@@ -0,0 +1,64 @@
+---
+name: evolclaw-ctl
+version: 1.0.0
+description: EvolClaw 运行时自管理指令，仅在 evolclaw 托管环境中可用
+trigger: 用户询问或需要切换模型、调整推理强度、查看运行状态、压缩上下文、检查通道健康、管理权限模式、发送文件、重启服务、重连渠道时
+---
+
+# EvolClaw Ctl
+
+通过 `evolclaw ctl <command> [args]` 管理运行时配置。仅在 evolclaw 托管环境中可用（`EVOLCLAW_SESSION_ID` 已设置）。
+
+## 可用指令
+
+### 查询类（所有用户）
+- `evolclaw ctl help` — 显示帮助
+- `evolclaw ctl status` — 显示会话状态
+- `evolclaw ctl check` — 检查渠道健康状态
+
+### 配置类（管理员）
+- `evolclaw ctl model` — 查看当前模型和可选列表
+- `evolclaw ctl model <model-id>` — 切换模型（如 `opus`, `sonnet`, `haiku`）
+- `evolclaw ctl effort` — 查看当前推理强度
+- `evolclaw ctl effort <low|medium|high|max>` — 切换推理强度
+- `evolclaw ctl compact` — 压缩当前会话上下文
+
+### 权限类
+- `evolclaw ctl perm` — 查看当前权限模式（管理员）
+- `evolclaw ctl perm <mode>` — 切换权限模式（仅 owner）
+
+### 运维类（仅 owner）
+- `evolclaw ctl activity <all|dm|owner|none>` — 查看/控制中间输出显示模式
+- `evolclaw ctl send [channel] <path>` — 发送项目内文件（仅限项目目录内）
+- `evolclaw ctl restart` — 重启服务（慎用：中断所有会话）
+- `evolclaw ctl restart <channel>` — 重连指定渠道（管理员可用）
+- `evolclaw ctl agentmd` — 查看当前 agent.md
+- `evolclaw ctl agentmd put` — 发布本地 agent.md
+- `evolclaw ctl agentmd set <内容>` — 直接设置 agent.md 内容
+
+## 使用示例
+
+```bash
+# 查看当前模型
+evolclaw ctl model
+
+# 切换到 opus
+evolclaw ctl model opus
+
+# 降低推理强度以加快响应
+evolclaw ctl effort low
+
+# 压缩上下文
+evolclaw ctl compact
+
+# 查看服务状态
+evolclaw ctl status
+```
+
+## 注意事项
+
+- 仅在 evolclaw 托管环境中可用（EVOLCLAW_SESSION_ID 环境变量已设置时）
+- 权限继承当前会话用户的角色（owner / admin / guest）
+- `compact` 不能在当前会话处理消息期间执行
+- `send` 只能发送项目目录下的文件
+- `restart` 会中断当前所有会话，谨慎使用

package/dist/utils/error-dict.js

@@ -0,0 +1,63 @@
+import fs from 'fs';
+import { logger } from './logger.js';
+let rules = [];
+/**
+ * 加载错误字典文件
+ * 文件不存在或格式错误 → 警告日志，rules = []（不影响启动）
+ */
+export function loadErrorDict(dictPath) {
+    try {
+        if (!fs.existsSync(dictPath)) {
+            logger.debug('[error-dict] 字典文件不存在，使用内置规则: %s', dictPath);
+            rules = [];
+            return;
+        }
+        const raw = JSON.parse(fs.readFileSync(dictPath, 'utf-8'));
+        if (!Array.isArray(raw?.rules)) {
+            logger.warn('[error-dict] 字典格式错误（缺少 rules 数组），忽略: %s', dictPath);
+            rules = [];
+            return;
+        }
+        // 校验每条规则的必填字段
+        rules = raw.rules.filter((r) => {
+            if (!r.id || !r.match || !r.action) {
+                logger.warn('[error-dict] 跳过无效规则（缺少 id/match/action）: %o', r);
+                return false;
+            }
+            if (!['retry', 'stop', 'ignore'].includes(r.action)) {
+                logger.warn('[error-dict] 跳过无效 action "%s": %s', r.action, r.id);
+                return false;
+            }
+            return true;
+        });
+        logger.info('[error-dict] 已加载 %d 条规则: %s', rules.length, dictPath);
+    }
+    catch (err) {
+        logger.warn('[error-dict] 加载失败: %s — %s', dictPath, err.message);
+        rules = [];
+    }
+}
+/** 运行时重新加载（供 /reload 命令使用） */
+export function reloadErrorDict(dictPath) {
+    loadErrorDict(dictPath);
+}
+/**
+ * 匹配错误消息，返回首条命中的规则
+ * @param errorMessage 已 toLowerCase 的错误消息
+ */
+export function matchErrorRule(errorMessage) {
+    for (const rule of rules) {
+        if (errorMessage.includes(rule.match.toLowerCase())) {
+            return rule;
+        }
+    }
+    return null;
+}
+/** 获取当前已加载的规则数量（供测试和状态查询使用） */
+export function getLoadedRuleCount() {
+    return rules.length;
+}
+/** 重置规则（仅供测试使用） */
+export function _resetRules() {
+    rules = [];
+}