evolclaw 2.6.2 → 2.6.4

package/dist/core/message/thought-emitter.js

@@ -6,20 +6,24 @@ import { logger } from '../../utils/logger.js';
  * - 不做聚合/batching，逐事件调用 adapter.putThought()
  * - 不感知 group vs P2P，通道差异由 adapter 内部处理
  * - taskId 映射为 context: { type: 'task', id: taskId }（协议 selector）
+ *   同时写入 payload.task_id / payload.chatmode，与 message.send/group.send 保持一致
  * - fire-and-forget：调用方不 await emit()，错误被内部捕获
  */
 export class ThoughtEmitter {
     adapter;
     channelId;
     taskId;
+    chatmode;
     hasEmittedText = false;
-    constructor(adapter, channelId, taskId) {
+    constructor(adapter, channelId, taskId, chatmode = 'proactive') {
         if (!taskId) {
             throw new Error('[ThoughtEmitter] taskId is required at construction');
         }
         this.adapter = adapter;
         this.channelId = channelId;
         this.taskId = taskId;
+        this.chatmode = chatmode;
+        logger.info(`[ThoughtEmitter] created channel=${channelId} task=${taskId} chatmode=${chatmode}`);
     }
     async emit(event) {
         // 对齐 interactive 的 dedup：流式 text 已推过时，complete.result 不再重复发 summary
@@ -37,6 +41,9 @@ export class ThoughtEmitter {
         if (payload.stage === 'thinking') {
             this.hasEmittedText = true;
         }
+        // payload 也带上 task_id / chatmode（与 message.send/group.send 对齐）
+        payload.task_id = this.taskId;
+        payload.chatmode = this.chatmode;
         try {
             await this.adapter.putThought(this.channelId, this.taskId, payload);
         }

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

@@ -315,6 +315,26 @@ export class SessionManager {
                 logger.info(`✓ Migrated ${migrated} session(s): rootId normalized to replyContext`);
             }
         }
+        // Migration: readonly 模式已暂时禁用，历史会话统一转为 noask
+        if (hasMetadata && tableInfo.length > 0) {
+            const rows = this.db.prepare(`SELECT id, metadata FROM sessions WHERE metadata IS NOT NULL AND metadata != ''`).all();
+            let migratedPerm = 0;
+            for (const row of rows) {
+                try {
+                    const meta = JSON.parse(row.metadata);
+                    if (meta.permissionMode === 'readonly') {
+                        meta.permissionMode = 'noask';
+                        this.db.prepare('UPDATE sessions SET metadata = ? WHERE id = ?')
+                            .run(JSON.stringify(meta), row.id);
+                        migratedPerm++;
+                    }
+                }
+                catch { /* skip malformed JSON */ }
+            }
+            if (migratedPerm > 0) {
+                logger.info(`✓ Migrated ${migratedPerm} session(s): permissionMode readonly → noask`);
+            }
+        }
         // 创建新表（首次初始化）
         this.db.exec(`
       CREATE TABLE IF NOT EXISTS sessions (
@@ -451,7 +471,7 @@ export class SessionManager {
             session.identity = this.resolveIdentity(channel, userId);
             // 新话题会话补写默认权限模式
             if (session.metadata && !session.metadata.permissionMode) {
-                session.metadata.permissionMode = session.identity?.role === 'owner' ? 'bypass' : 'readonly';
+                session.metadata.permissionMode = session.identity?.role === 'owner' ? 'bypass' : session.identity?.role === 'admin' ? 'auto' : 'noask';
                 this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
                     .run(JSON.stringify(session.metadata), Date.now(), session.id);
             }
@@ -562,7 +582,7 @@ export class SessionManager {
         session.identity = this.resolveIdentity(channel, userId);
         // 写入默认权限模式（基于角色，只在首次创建时设置）
         if (!sessionMetadata.permissionMode) {
-            sessionMetadata.permissionMode = session.identity?.role === 'owner' ? 'bypass' : 'readonly';
+            sessionMetadata.permissionMode = session.identity?.role === 'owner' ? 'bypass' : session.identity?.role === 'admin' ? 'auto' : 'noask';
         }
         this.insertSession(session);
         this.eventBus.publish({

package/dist/index.js

@@ -25,6 +25,7 @@ import { ChannelLoader } from './core/channel-loader.js';
 import { AgentLoader } from './core/agent-loader.js';
 import { IpcServer } from './ipc.js';
 import { logger } from './utils/logger.js';
+import { loadPromptTemplates } from './prompts/templates.js';
 import path from 'path';
 import fs from 'fs';
 async function main() {
@@ -48,6 +49,8 @@ async function main() {
     logger.info('EvolClaw starting...');
     // 确保数据目录存在
     ensureDataDirs();
+    // 加载提示词模板
+    loadPromptTemplates();
     // 加载配置
     const config = loadConfig();
     const paths = resolvePaths();

package/dist/prompts/templates.js

@@ -0,0 +1,122 @@
+import fs from 'fs';
+import path from 'path';
+import { getPackageRoot, resolveRoot } from '../paths.js';
+import { logger } from '../utils/logger.js';
+const KNOWN_SECTIONS = new Set(['runtime', 'group', 'proactive']);
+const SECTION_RE = /^##\s+(\w+)\s*$/;
+let sections = null;
+let builtinSections = null;
+function parseTemplate(content) {
+    const result = new Map();
+    let currentSection = null;
+    let currentLines = [];
+    for (const line of content.split('\n')) {
+        // Stop parsing at horizontal rule separator (documentation follows)
+        if (/^---\s*$/.test(line)) {
+            if (currentSection) {
+                result.set(currentSection, currentLines.join('\n').trim());
+            }
+            break;
+        }
+        const m = line.match(SECTION_RE);
+        if (m) {
+            if (currentSection) {
+                result.set(currentSection, currentLines.join('\n').trim());
+            }
+            const name = m[1];
+            if (KNOWN_SECTIONS.has(name)) {
+                currentSection = name;
+                currentLines = [];
+            }
+            else {
+                currentSection = null;
+                currentLines = [];
+            }
+        }
+        else if (currentSection) {
+            currentLines.push(line);
+        }
+    }
+    if (currentSection) {
+        result.set(currentSection, currentLines.join('\n').trim());
+    }
+    return result;
+}
+function loadBuiltinTemplate() {
+    const builtinPath = path.join(getPackageRoot(), 'dist', 'templates', 'prompts.md');
+    const srcPath = path.join(getPackageRoot(), 'src', 'templates', 'prompts.md');
+    const filePath = fs.existsSync(builtinPath) ? builtinPath : srcPath;
+    const content = fs.readFileSync(filePath, 'utf-8');
+    return parseTemplate(content);
+}
+export function loadPromptTemplates() {
+    builtinSections = loadBuiltinTemplate();
+    const userPath = path.join(resolveRoot(), 'data', 'prompts.md');
+    if (fs.existsSync(userPath)) {
+        try {
+            const content = fs.readFileSync(userPath, 'utf-8');
+            const parsed = parseTemplate(content);
+            sections = new Map(builtinSections);
+            for (const [key, value] of parsed) {
+                sections.set(key, value);
+            }
+            logger.info(`[PromptTemplates] Loaded user override: ${userPath}`);
+        }
+        catch (err) {
+            logger.warn(`[PromptTemplates] Failed to load user override (${userPath}), using builtin:`, err);
+            sections = builtinSections;
+        }
+    }
+    else {
+        sections = builtinSections;
+        logger.info(`[PromptTemplates] Using builtin templates`);
+    }
+    for (const name of KNOWN_SECTIONS) {
+        if (!sections.has(name)) {
+            logger.warn(`[PromptTemplates] Section "${name}" missing, using builtin fallback`);
+            const fallback = builtinSections.get(name);
+            if (fallback)
+                sections.set(name, fallback);
+        }
+    }
+}
+function isTruthy(val) {
+    if (val === undefined || val === null || val === false || val === '' || val === 0)
+        return false;
+    return true;
+}
+function renderTemplate(template, vars) {
+    // Pass 1: conditional sections {{?key}}...{{/}}
+    let result = template.replace(/\{\{\?(\w+)\}\}([\s\S]*?)\{\{\/\}\}/g, (_match, key, body) => {
+        return isTruthy(vars[key]) ? body : '';
+    });
+    // Pass 2: variable substitution {{key}}
+    result = result.replace(/\{\{(\w+)\}\}/g, (_match, key) => {
+        const val = vars[key];
+        if (!isTruthy(val))
+            return '';
+        return String(val);
+    });
+    // Pass 3: remove blank lines
+    return result.split('\n').filter(line => line.trim() !== '').join('\n');
+}
+export function renderPromptSection(section, vars) {
+    if (!sections)
+        loadPromptTemplates();
+    const template = sections.get(section);
+    if (!template) {
+        logger.warn(`[PromptTemplates] Section "${section}" not found`);
+        return '';
+    }
+    return renderTemplate(template, vars);
+}
+/** Reset loaded templates (for testing) */
+export function _resetTemplates() {
+    sections = null;
+    builtinSections = null;
+}
+/** Load templates from a raw string (for testing) */
+export function _loadFromString(content) {
+    builtinSections = parseTemplate(content);
+    sections = builtinSections;
+}

package/dist/templates/prompts.md

@@ -0,0 +1,103 @@
+# EvolClaw 运行时系统提示模板
+
+# 本文件定义 LLM 每次收到消息时注入到 system prompt 尾部的三段内容。
+# 修改后执行 `evolclaw restart` 生效。
+# 放在 {EVOLCLAW_HOME}/data/prompts.md 会覆盖内置默认。
+
+## runtime
+
+[当前环境] 会话通道: {{channel}} | 当前项目: {{project}}{{?sessionName}} | 会话名称: {{sessionName}}{{/}}{{?selfIdentity}} | 当前名称: {{selfIdentity}}{{/}} | 对端身份: {{peerRole}}{{?peerIdentity}} | 对端名称: {{peerIdentity}}{{/}}{{?peerType}} | 对端类型: {{peerType}}{{/}}{{?chatType}} | 聊天类型: {{chatType}}{{/}}{{?agent}} | 当前Agent: {{agent}}{{/}}
+{{?readonly}}[只读模式] 禁止修改项目文件。如需生成文件供用户下载，请写入 .evolclaw/tmp/ 目录后{{readonlySendHint}}{{/}}
+{{?fileSendCurrent}}[SEND_FILE:路径] 发送文件到当前通道{{/}}
+{{?fileSendCross}}[SEND_FILE:{{crossPrimary}}:路径] 发送文件到指定通道（可用: {{crossTypes}}）{{/}}
+{{?capability}}[通道能力] {{capabilities}}{{/}}
+
+## group
+
+[群聊回复规则] 回复时必须在开头添加 @{{peerId}} 来通知对方
+
+## proactive
+
+[Proactive 模式] 本次对话中你的流式输出不会自动发送给用户，必须通过以下命令主动发送：
+- 发送文本：evolclaw ctl send "<消息内容>"
+- 发送文件：evolclaw ctl file <路径>
+可多次调用。如不调用，用户将看不到任何回复。
+
+
+---
+
+## 格式说明
+
+模板由多个以 `## 段名` 分隔的段组成，加载器只识别 `runtime`、`group`、`proactive` 三段，其它段（包括本说明）会被忽略，可以随意增删。
+
+**占位符语法：**
+
+| 语法 | 作用 | 示例 |
+|---|---|---|
+| `{{var}}` | 变量替换。值为空串/undefined/null/false 时替换为空 | `{{project}}` → `evolclaw` |
+| `{{?var}}...{{/}}` | 条件段。var 为真值时保留整段（含字面量），否则整段删除。段内可嵌套 `{{var}}` | `{{?peerId}} | @{{peerId}}{{/}}` |
+| 空行 | 渲染后若某行只剩空白，整行自动删除 | 条件段删完后的空行会消失 |
+
+**注入时机：**
+
+| 段 | 触发条件 | 说明 |
+|---|---|---|
+| `runtime` | 每次消息 | 每条用户消息都会注入 |
+| `group` | `chatType === 'group' && peerId` | 仅群聊消息注入 |
+| `proactive` | `sessionMode === 'proactive'` | 仅 proactive 会话注入 |
+
+三段以换行拼接，追加到该消息的 system prompt 末尾。
+
+---
+
+## 参数说明
+
+### runtime 段
+
+| 字段 | 类型 | 说明 | 示例 |
+|---|---|---|---|
+| `channel` | string | 当前通道类型 | `feishu` / `wechat` / `aun` |
+| `project` | string | 当前项目目录名（非完整路径） | `evolclaw` |
+| `sessionName` | string? | 会话名（用户通过 `/name` 设置） | `CLI开发` |
+| `selfIdentity` | string? | 机器人自身标识「名称 (ID)」 | `Evol (evolai.xxx.pub)` |
+| `peerRole` | string | 对端角色 | `owner` / `admin` / `guest` / `unknown` |
+| `peerIdentity` | string? | 对端标识「名称 (ID)」 | `张三 (u_abc)` |
+| `peerType` | string? | 对端类型（`unknown` 时为空） | `user` / `group` |
+| `chatType` | string? | 聊天类型 | `private` / `group` |
+| `agent` | string? | 当前 agent（`claude` 时为空不显示） | `hermes` / `gemini` |
+| `readonly` | bool | 是否只读模式（触发只读行） | `true` / `false` |
+| `readonlySendHint` | string | 只读模式下提示使用的发送方式 | `使用 [SEND_FILE:] 发送` |
+| `fileSendCurrent` | bool | 当前通道是否支持发文件（触发该行） | `true` / `false` |
+| `fileSendCross` | bool | 是否存在可跨通道发文件的其它通道 | `true` / `false` |
+| `crossPrimary` | string | 跨通道发送示例用的首选通道 | `wechat` |
+| `crossTypes` | string | 所有支持跨通道发送的通道列表 | `wechat/aun` |
+| `capability` | bool | 是否有任何通道能力要展示（触发通道能力行） | `true` / `false` |
+| `capabilities` | string | 通道能力清单 | `图片输入、图片输出、文件发送` |
+
+### group 段
+
+| 字段 | 类型 | 说明 | 示例 |
+|---|---|---|---|
+| `peerId` | string | 对端用户 ID（@ 所需） | `ou_xxx` / `wxid_xxx` |
+
+### proactive 段
+
+无参数。
+
+---
+
+## 修改示例
+
+**只改文案，不改结构：**
+
+```
+## runtime
+当前项目 {{project}}，你正在和 {{peerIdentity}} 对话。
+{{?readonly}}⚠ 只读模式，不要修改代码{{/}}
+```
+
+**关闭某一行：** 模板里删掉那一行即可。内置条件段（如只读提示）删了之后，只读模式就不再在 system prompt 里出现（但权限拦截依然生效）。
+
+**追加自定义规则：** 直接在对应段里加行文本，不需要占位符。
+
+**用英文：** 所有文案重写成英文即可，字段含义不变。

package/dist/utils/init-channel.js

@@ -728,7 +728,7 @@ export async function createAidSilent(opts) {
     if (fs.existsSync(aidDir) && fs.existsSync(path.join(aidDir, 'private'))) {
         return { aid: opts.aid, alreadyExisted: true };
     }
-    const { AUNClient } = await import('@agentunion/fastaun');
+    const { AUNClient, GatewayDiscovery } = await import('@agentunion/fastaun');
     let client = new AUNClient({ aun_path: aunPath });
     const result = await client.auth.createAid({ aid: opts.aid });
     // Download CA root cert (if not already present)
@@ -742,6 +742,18 @@ export async function createAidSilent(opts) {
         catch { /* ignore */ }
         client = new AUNClient({ aun_path: aunPath, root_ca_path: caCertPath, aid: opts.aid });
     }
+    // Set gateway URL for uploadAgentMd
+    let gatewayUrl = result.gateway || '';
+    if (!gatewayUrl) {
+        try {
+            const discovery = new GatewayDiscovery({});
+            gatewayUrl = await discovery.discover(`https://${opts.aid}/.well-known/aun-gateway`);
+        }
+        catch { /* fall through */ }
+    }
+    if (gatewayUrl) {
+        client._gatewayUrl = gatewayUrl;
+    }
     // Write initial agent.md (initialized: false, name = aid first label)
     const agentName = opts.aid.split('.')[0];
     const agentMdContent = `---\naid: "${opts.aid}"\nname: "${agentName}"\ntype: "ai"\nversion: "1.0.0"\ndescription: ""\ntags:\n  - evolclaw\ninitialized: false\n---\n`;
@@ -790,7 +802,6 @@ export function appendAunInstance(config, inst) {
 }
 export async function setupAunAid(rl, _config) {
     let aid = '';
-    let gatewayPort; // only used locally for AID creation, not written to config
     // Outer loop: allows retrying with a different AID
     while (true) {
         // Ask AID with format validation
@@ -806,12 +817,6 @@ export async function setupAunAid(rl, _config) {
                 aid = '';
             }
         }
-        const portStr = (await ask(rl, '  Gateway 端口 [留空使用默认 443]: ')).trim();
-        gatewayPort = portStr ? parseInt(portStr, 10) : undefined;
-        if (gatewayPort !== undefined && (isNaN(gatewayPort) || gatewayPort < 1 || gatewayPort > 65535)) {
-            console.log('  ⚠ 端口号无效，使用默认 443');
-            gatewayPort = undefined;
-        }
         // Check if AID exists locally
         const aunPath = path.join(os.homedir(), '.aun');
         const aidDir = path.join(aunPath, 'AIDs', aid);
@@ -828,21 +833,13 @@ export async function setupAunAid(rl, _config) {
         console.log('  正在创建 AID...');
         let failed = false;
         try {
-            const { AUNClient } = await import('@agentunion/fastaun');
+            const { AUNClient, GatewayDiscovery } = await import('@agentunion/fastaun');
             let client = new AUNClient({ aun_path: aunPath });
-            // 如果用户指定了自定义端口，手动设置 gateway URL；否则让 SDK 自动发现
-            if (gatewayPort) {
-                const domain = aid.split('.').slice(1).join('.');
-                client._gatewayUrl = `wss://gateway.${domain}:${gatewayPort}/aun`;
-            }
             const result = await client.auth.createAid({ aid });
             console.log(`  ✓ AID ${result.aid} 创建成功`);
             // 下载 CA 根证书（如果本地不存在），从 SDK 返回的实际网关 URL 派生
             const caDownloaded = await downloadCaRoot(aunPath, result.gateway || '', '  ');
-            // 关键：SDK 默认 rootCaPath=null，只读取包内 bundled certs。
-            // 必须显式传 root_ca_path 指向刚下载的 root.crt，uploadAgentMd 才能验证 server cert。
-            // 同时传 aid，否则新 client 不知道该加载哪个身份，uploadAgentMd 会报
-            // "no local identity found, call auth.createAid() first"。
+            // 重建 client：传 root_ca_path 以验证 server cert，传 aid 以加载身份
             const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
             if (caDownloaded && fs.existsSync(caCertPath)) {
                 try {
@@ -850,10 +847,18 @@ export async function setupAunAid(rl, _config) {
                 }
                 catch { /* ignore */ }
                 client = new AUNClient({ aun_path: aunPath, root_ca_path: caCertPath, aid });
-                if (gatewayPort) {
-                    const domain = aid.split('.').slice(1).join('.');
-                    client._gatewayUrl = `wss://gateway.${domain}:${gatewayPort}/aun`;
+            }
+            // 设置 gateway URL（从 createAid 返回值或 well-known 自动发现）
+            let gatewayUrl = result.gateway || '';
+            if (!gatewayUrl) {
+                try {
+                    const discovery = new GatewayDiscovery({});
+                    gatewayUrl = await discovery.discover(`https://${aid}/.well-known/aun-gateway`);
                 }
+                catch { /* fall through */ }
+            }
+            if (gatewayUrl) {
+                client._gatewayUrl = gatewayUrl;
             }
             // Collect agent.md info and publish
             const typeInput = (await ask(rl, '  Agent 类型 human/ai [ai]: ')).trim().toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.6.2",
+  "version": "2.6.4",
   "description": "Lightweight AI Agent gateway connecting Claude Agent SDK to messaging channels (Feishu, ACP) with multi-project session management",
   "type": "module",
   "main": "dist/index.js",