evolclaw 3.1.2 → 3.1.3

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

@@ -92,22 +92,12 @@ export class SessionManager {
      *
      * 这样保持兼容：不知道 channelType 的 caller 仍可以用 (channel, channelId) 调用。
      */
-    resolveChatDir(channel, channelId) {
-        // 优先尝试从已有目录里找
-        const dirs = scanChatDirs(this.sessionsDir);
-        for (const d of dirs) {
-            if (d.channelId !== channelId)
-                continue;
-            // 验证 active.json 或 meta 文件里 channel（实例名）匹配
-            const active = readJsonFile(path.join(d.dirPath, 'active.json'));
-            if (active && active.channel === channel)
-                return d.dirPath;
-            // 没 active.json 时，看 channelType 是否能匹配 channel
-            if (!active && d.channelType === channel)
-                return d.dirPath;
+    resolveChatDir(channel, channelId, channelType, selfId) {
+        // 必须有明确 channelType 才能确定路径
+        if (!channelType) {
+            throw new Error(`[SessionManager] resolveChatDir requires channelType. Got channel="${channel}" channelId="${channelId}". Caller must pass channelType (e.g. 'aun', 'feishu').`);
         }
-        // Fallback：按 channel 当 channelType 创建（旧路径布局兼容）
-        return chatDirPath(this.sessionsDir, channel, channelId);
+        return chatDirPath(this.sessionsDir, channelType, channelId, selfId);
     }
     /**
      * 给定明确的 channelType + selfId 时直接计算路径（不扫描）。
@@ -117,7 +107,7 @@ export class SessionManager {
         if (channelType) {
             return chatDirPath(this.sessionsDir, channelType, channelId, selfId);
         }
-        return this.resolveChatDir(channel, channelId);
+        return this.resolveChatDirSafe(channel, channelId);
     }
     resolveChatDirFromSession(session) {
         const channelType = session.channelType || session.channel;
@@ -128,25 +118,129 @@ export class SessionManager {
         return this.resolveChatDirFromSession(session);
     }
     /** Like resolveChatDir but also ensures the dir + _threads + _trash exist. */
-    ensureResolvedChatDir(channel, channelId) {
-        const dir = this.resolveChatDir(channel, channelId);
+    ensureResolvedChatDir(channel, channelId, channelType, selfId) {
+        const dir = this.resolveChatDir(channel, channelId, channelType, selfId);
         fs.mkdirSync(dir, { recursive: true });
         fs.mkdirSync(path.join(dir, '_threads'), { recursive: true });
         fs.mkdirSync(path.join(dir, '_trash'), { recursive: true });
         return dir;
     }
     /** 推断给定 chat 的 channelType（优先取 active.json）。无活跃时回落到 channel 实例名。 */
-    inferChannelType(channel, channelId) {
-        const active = this.readActive(channel, channelId);
-        return active?.channelType || channel;
+    inferChannelType(channel, channelId, chatDir) {
+        if (chatDir) {
+            const active = readJsonFile(path.join(chatDir, 'active.json'));
+            if (active?.channelType)
+                return active.channelType;
+        }
+        // 扫描已有目录
+        const dirs = scanChatDirs(this.sessionsDir);
+        for (const d of dirs) {
+            if (d.channelId !== channelId)
+                continue;
+            const active = readJsonFile(path.join(d.dirPath, 'active.json'));
+            if (active && active.channel === channel && active.channelType)
+                return active.channelType;
+        }
+        throw new Error(`[SessionManager] Cannot infer channelType for channel="${channel}" channelId="${channelId}". No existing session found.`);
     }
     /** 从 active 推断 selfId（已有 session 的复用） */
-    inferSelfId(channel, channelId) {
-        const active = this.readActive(channel, channelId);
-        return active?.selfId;
+    inferSelfId(channel, channelId, chatDir) {
+        if (chatDir) {
+            const active = readJsonFile(path.join(chatDir, 'active.json'));
+            if (active?.selfId)
+                return active.selfId;
+        }
+        // 扫描已有目录
+        const dirs = scanChatDirs(this.sessionsDir);
+        for (const d of dirs) {
+            if (d.channelId !== channelId)
+                continue;
+            const active = readJsonFile(path.join(d.dirPath, 'active.json'));
+            if (active && active.channel === channel)
+                return active.selfId || undefined;
+        }
+        return undefined;
+    }
+    /**
+     * 扫描已有 chat 目录，找到匹配 channel+channelId 的目录并返回其 chatDir 路径。
+     * 用于不知道 channelType/selfId 的 caller 在调用 resolveChatDir 前定位已有目录。
+     */
+    findExistingChatDir(channel, channelId) {
+        const dirs = scanChatDirs(this.sessionsDir);
+        for (const d of dirs) {
+            if (d.channelId !== channelId)
+                continue;
+            const active = readJsonFile(path.join(d.dirPath, 'active.json'));
+            if (active && active.channel === channel)
+                return d.dirPath;
+            // 即使没有 active.json，也检查 meta 文件
+            const metaFiles = scanMetaFiles(d.dirPath);
+            for (const mf of metaFiles) {
+                const meta = readLastJsonlLine(path.join(d.dirPath, mf));
+                if (meta && meta.channel === channel)
+                    return d.dirPath;
+            }
+            // 仅 thread session 场景：主目录无 active.json 也无 main meta，但 _threads/ 有内容
+            const threadsDir = path.join(d.dirPath, '_threads');
+            if (fs.existsSync(threadsDir)) {
+                const threadMetas = scanMetaFiles(threadsDir);
+                for (const mf of threadMetas) {
+                    const meta = readLastJsonlLine(path.join(threadsDir, mf));
+                    if (meta && meta.channel === channel)
+                        return d.dirPath;
+                }
+            }
+        }
+        return undefined;
+    }
+    /**
+     * 安全版 resolveChatDir：先尝试用提供的 channelType/selfId，
+     * 如果没有则扫描已有目录推断。用于操作已有 session 的公共方法。
+     */
+    resolveChatDirSafe(channel, channelId, channelType, selfId) {
+        if (channelType) {
+            return this.resolveChatDir(channel, channelId, channelType, selfId);
+        }
+        // 尝试从已有目录推断
+        const existingDir = this.findExistingChatDir(channel, channelId);
+        if (existingDir)
+            return existingDir;
+        throw new Error(`[SessionManager] Cannot resolve chat dir for channel="${channel}" channelId="${channelId}". No channelType provided and no existing session found.`);
     }
-    readActive(channel, channelId) {
-        const dir = this.resolveChatDir(channel, channelId);
+    /**
+     * 安全版 ensureResolvedChatDir：先尝试用提供的 channelType/selfId，
+     * 如果没有则扫描已有目录推断。确保目录存在。
+     */
+    ensureResolvedChatDirSafe(channel, channelId, channelType, selfId) {
+        if (channelType) {
+            return this.ensureResolvedChatDir(channel, channelId, channelType, selfId);
+        }
+        // 尝试从已有目录推断
+        const existingDir = this.findExistingChatDir(channel, channelId);
+        if (existingDir) {
+            // 确保子目录存在
+            fs.mkdirSync(existingDir, { recursive: true });
+            fs.mkdirSync(path.join(existingDir, '_threads'), { recursive: true });
+            fs.mkdirSync(path.join(existingDir, '_trash'), { recursive: true });
+            return existingDir;
+        }
+        // 回退：推断 channelType 和 selfId
+        const inferredType = this.inferChannelType(channel, channelId);
+        const inferredSelfId = this.inferSelfId(channel, channelId);
+        return this.ensureResolvedChatDir(channel, channelId, inferredType, inferredSelfId);
+    }
+    readActive(channel, channelId, channelType, selfId) {
+        let dir;
+        try {
+            dir = this.resolveChatDir(channel, channelId, channelType, selfId);
+        }
+        catch {
+            // channelType not provided — try to find existing dir
+            const existingDir = this.findExistingChatDir(channel, channelId);
+            if (!existingDir)
+                return undefined;
+            dir = existingDir;
+        }
         const file = readJsonFile(path.join(dir, 'active.json'));
         if (!file)
             return undefined;
@@ -157,8 +251,17 @@ export class SessionManager {
         const file = sessionToFile(session);
         atomicWriteJson(path.join(dir, 'active.json'), file);
     }
-    clearActive(channel, channelId) {
-        const dir = this.resolveChatDir(channel, channelId);
+    clearActive(channel, channelId, channelType, selfId) {
+        let dir;
+        try {
+            dir = this.resolveChatDir(channel, channelId, channelType, selfId);
+        }
+        catch {
+            const existingDir = this.findExistingChatDir(channel, channelId);
+            if (!existingDir)
+                return;
+            dir = existingDir;
+        }
         const activePath = path.join(dir, 'active.json');
         try {
             fs.unlinkSync(activePath);
@@ -459,7 +562,7 @@ export class SessionManager {
             return session;
         }
         // Find existing session for default project path
-        const chatDir = this.resolveChatDir(channel, channelId);
+        const chatDir = this.resolveChatDir(channel, channelId, channelType, selfId);
         const allSessions = this.findAllSessionsInChat(chatDir, false);
         const existing = allSessions
             .filter(s => s.projectPath === defaultProjectPath && !s.threadId)
@@ -543,7 +646,7 @@ export class SessionManager {
         // 优先使用精确路径（channelType + selfId），避免 fallback 到错误目录
         const chatDir = (channelType && selfId)
             ? (() => { const d = chatDirPath(this.sessionsDir, channelType, channelId, selfId); fs.mkdirSync(d, { recursive: true }); fs.mkdirSync(path.join(d, '_threads'), { recursive: true }); return d; })()
-            : this.ensureResolvedChatDir(channelType || channel, channelId);
+            : this.ensureResolvedChatDirSafe(channel, channelId, channelType);
         const threadIndex = readThreadIndex(chatDir);
         const existingMetaId = threadIndex[threadId];
         if (existingMetaId) {
@@ -560,7 +663,7 @@ export class SessionManager {
             }
         }
         // Inherit project path & chatType from active main session
-        const activeMain = this.readActive(channel, channelId);
+        const activeMain = this.readActive(channel, channelId, channelType, selfId);
         const projectPath = (activeMain && !activeMain.threadId ? activeMain.projectPath : undefined) || defaultProjectPath;
         const inheritedChatType = (activeMain && !activeMain.threadId ? activeMain.chatType : undefined) || 'private';
         const session = {
@@ -597,7 +700,7 @@ export class SessionManager {
         const agentId = currentAgentId || 'claude';
         logger.info(`[SessionManager] switchProject: channel=${channel} channelId=${channelId} newPath=${newProjectPath} agent=${agentId}`);
         const inheritedChatType = this.getActiveChatType(channel, channelId);
-        const chatDir = this.ensureResolvedChatDir(channel, channelId);
+        const chatDir = this.ensureResolvedChatDirSafe(channel, channelId);
         const allSessions = this.findAllSessionsInChat(chatDir, false);
         const target = allSessions
             .filter(s => s.projectPath === newProjectPath && (s.agentId || 'claude') === agentId && !s.threadId)
@@ -660,7 +763,7 @@ export class SessionManager {
     }
     async switchAgent(channel, channelId, projectPath, newAgentId) {
         const inheritedChatType = this.getActiveChatType(channel, channelId);
-        const chatDir = this.ensureResolvedChatDir(channel, channelId);
+        const chatDir = this.ensureResolvedChatDirSafe(channel, channelId);
         const allSessions = this.findAllSessionsInChat(chatDir, false);
         const target = allSessions
             .filter(s => s.projectPath === projectPath && (s.agentId || 'claude') === newAgentId && !s.threadId)
@@ -748,7 +851,13 @@ export class SessionManager {
         return this.readActive(channel, channelId);
     }
     async getThreadSession(channel, channelId, threadId) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return undefined;
+        }
         const threadIndex = readThreadIndex(chatDir);
         const metaId = threadIndex[threadId];
         if (!metaId)
@@ -761,12 +870,24 @@ export class SessionManager {
         return { ...session, agentSessionId: validSessionId };
     }
     async listSessions(channel, channelId) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return [];
+        }
         const sessions = this.findAllSessionsInChat(chatDir, true);
         return sessions.sort((a, b) => b.updatedAt - a.updatedAt);
     }
     async getSessionByProjectPath(channel, channelId, projectPath) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return undefined;
+        }
         const sessions = this.findAllSessionsInChat(chatDir, false);
         const matched = sessions.filter(s => s.projectPath === projectPath);
         if (matched.length === 0)
@@ -781,12 +902,24 @@ export class SessionManager {
         return matched[0];
     }
     async getSessionByName(channel, channelId, name) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return undefined;
+        }
         const sessions = this.findAllSessionsInChat(chatDir, true);
         return sessions.find(s => s.name === name);
     }
     async switchToSession(channel, channelId, targetSessionId) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        let chatDir;
+        try {
+            chatDir = this.resolveChatDirSafe(channel, channelId);
+        }
+        catch {
+            return null;
+        }
         const sessions = this.findAllSessionsInChat(chatDir, true);
         const target = sessions.find(s => s.id === targetSessionId);
         if (!target)
@@ -903,12 +1036,22 @@ export class SessionManager {
     }
     async createNewSession(channel, channelId, projectPath, name, agentId) {
         const inheritedChatType = this.getActiveChatType(channel, channelId);
+        let inferredType;
+        let inferredSelfId;
+        try {
+            inferredType = this.inferChannelType(channel, channelId);
+            inferredSelfId = this.inferSelfId(channel, channelId);
+        }
+        catch {
+            inferredType = channel;
+            inferredSelfId = undefined;
+        }
         const session = {
             id: generateSessionId(),
             channel,
-            channelType: this.inferChannelType(channel, channelId),
+            channelType: inferredType,
             channelId,
-            selfId: this.inferSelfId(channel, channelId),
+            selfId: inferredSelfId,
             projectPath,
             threadId: '',
             agentId: agentId || 'claude',
@@ -1000,7 +1143,7 @@ export class SessionManager {
         return adapter.listSdkSessions(projectPath);
     }
     async getSessionByUuidPrefix(channel, channelId, uuidPrefix) {
-        const chatDir = this.resolveChatDir(channel, channelId);
+        const chatDir = this.resolveChatDirSafe(channel, channelId);
         const sessions = this.findAllSessionsInChat(chatDir, true);
         const matched = sessions.filter(s => s.agentSessionId && s.agentSessionId.startsWith(uuidPrefix));
         if (matched.length === 0)
@@ -1046,7 +1189,7 @@ export class SessionManager {
     }
     // ─── Health status ───
     healthFilePath(channel, channelId) {
-        return path.join(this.ensureResolvedChatDir(channel, channelId), 'health.jsonl');
+        return path.join(this.ensureResolvedChatDirSafe(channel, channelId), 'health.jsonl');
     }
     /** Find the chat dir containing a given session id */
     chatDirForSession(sessionId) {

package/kits/eck_manifest.json

@@ -71,9 +71,9 @@
       "description": "渠道层：我通过什么通信"
     },
     {
-      "id": "runtime",
+      "id": "eckruntime",
       "type": "file",
-      "file": "$PACKAGE_ROOT/kits/templates/system-fragments/runtime.md",
+      "file": "$PACKAGE_ROOT/kits/templates/system-fragments/eckruntime.md",
       "order": 60,
       "needsInjection": true,
       "when": "always",
@@ -92,4 +92,4 @@
       "description": "Base Agent 特定配置"
     }
   ]
-}
+}

package/kits/rules/02-navigation.md

@@ -18,6 +18,7 @@
 | `$KITS_RULES` | `$KITS/rules` | 自动载入部分（本目录） |
 | `$KITS_DOCS` | `$KITS/docs` | 按需载入文档 |
 | `$KITS_TEMPLATES` | `$KITS/templates` | prompt 模板 |
+| `$KITS_FRAGMENTS` | `$KITS_TEMPLATES/system-fragments` | ECK 动态注入 fragment 模板 |
 | `$ECK` | `$EVOLCLAW_HOME/eck` | 运行时配置 |
 | `$AGENTS_DIR` | `$EVOLCLAW_HOME/agents` | per-agent 数据根 |
 | `$AGENT_DIR` | `$AGENTS_DIR/<self-aid>` | 当前 agent 根 |

package/kits/rules/06-channel.md

@@ -13,29 +13,15 @@
 
 与其他主体通信时，**必须调用 CLI 命令**发消息，不要把输出当成发送给对方的内容。
 
-### 必须使用 `ec msg send`（首选）
+当前渠道的发消息命令已在上下文中注入（见 `[aun]` 或对应渠道块）。
 
-```bash
-# 明文
-ec msg send <self-aid> <to-aid> "<text>"
-
-# 密文
-ec msg send <self-aid> <to-aid> "<text>" --encrypt
-```
-
-`<self-aid>` 是注入上下文里的 selfAid，`<to-aid>` 是 peerKey 解析出的对端 AID。
-
-### 仅在无法获取 selfAid 时才用 `ec ctl send`
+### 仅在无法获取 self-aid 时才用 `ec ctl send`
 
 ```bash
 ec ctl send "<text>"
 ec ctl send --encrypt "<text>"
 ```
 
-### 加密策略
-
-对端发来密文消息时回复必须加密；明文消息默认明文回复。
-
 ### 命令返回值
 
 - 成功：`ok` 或包含 `✓ 已发送 ...` 的输出（exit 0）
@@ -43,8 +29,6 @@ ec ctl send --encrypt "<text>"
 
 发送成功后**继续后续处理**。一次任务可能发 0 到多条消息，不要因为看到"已发送"就反复发送同一条消息。
 
-不同渠道有不同的命令行工具，使用方式参见各渠道文档。
-
 ## Agent 管理命令
 
 `evolclaw agent` — agent 全生命周期管理。

package/kits/templates/system-fragments/baseagent.md

@@ -1,2 +1,2 @@
-[Base Agent]
-当前基座：{{baseAgentName}}（{{baseAgent}}）
+[baseagent]
+base-agent: {{baseAgentName}}

package/kits/templates/system-fragments/channel.md

@@ -1,10 +1,19 @@
-[渠道层]
-通信渠道：{{channel}}
-
-{{?canSendFile}}
-[文件发送] 当前渠道支持文件发送
-{{/}}
-
-{{?capabilities}}
-[渠道能力] {{capabilities}}
+[channel]
+channel: {{channel}}
+{{?peerId}}
+{{?channel=aun}}
+ec msg send {{selfAid}} {{peerId}} "<text>" [--encrypt] [--file <path> --as image|video|voice|file] [--link <url> --title "<title>"] [--payload '<json>']
+encrypt: 跟随对端消息加密状态（密文回密文，明文回明文）；本端主动发时依据会话 encrypt 配置（待实现）
+{{/}}
+{{?channel!=aun}}
+非 aun 渠道：回复由 evolclaw 自动完成，无需调用 CLI
+{{/}}
+{{/}}
+{{?groupId}}
+{{?channel=aun}}
+ec group send {{selfAid}} {{groupId}} "<text>" [--file <path> --as image|video|voice|file] [--mention <aid>]
+{{/}}
+{{?channel!=aun}}
+非 aun 渠道：回复由 evolclaw 自动完成，无需调用 CLI
+{{/}}
 {{/}}

package/kits/templates/system-fragments/eckruntime.md

@@ -0,0 +1,14 @@
+[runtime]
+project: {{project}}
+{{?sessionName}}
+session-name: {{sessionName}}
+{{/}}
+chatmode: {{chatmode}}
+chatType: {{chatType}}
+{{?readonly}}
+readonly: true — 禁止修改项目文件，如需生成文件请写入 .evolclaw/tmp/
+{{/}}
+{{?chatmode=proactive}}
+proactive-send: evolclaw ctl send "<text>"
+proactive-file: evolclaw ctl file <path>
+{{/}}

package/kits/templates/system-fragments/identity.md

@@ -1,12 +1,11 @@
-[身份层]
+[identity]
 {{?selfAid}}
-我是 {{selfName}} ({{selfAid}})
+self-name: {{selfName}}
+self-aid: {{selfAid}}
 {{/}}
-
 {{?hasPersona}}
-[人格] 已加载 persona.md 行为规范
+persona: loaded
 {{/}}
-
 {{?hasWorkingMemory}}
-[当前关注] 已加载 working memory
+working-memory: loaded
 {{/}}

package/kits/templates/system-fragments/relation.md

@@ -1,9 +1,11 @@
 {{?peerKey}}
-[关系层]
-对话者：{{peerName}} ({{peerId}})，权限：{{peerRole}}
-对端标识：{{peerKey}}
+[relation]
+peer-name: {{peerName}}
+peer-aid: {{peerId}}
+peer-role: {{peerRole}}
+peer-key: {{peerKey}}
 {{/}}
 {{?groupId}}
-[关系层]
-群组：{{groupId}}
+[relation]
+group-id: {{groupId}}
 {{/}}

package/kits/templates/system-fragments/venue.md

@@ -1,5 +1,4 @@
-[环境层]
-聊天类型：{{chatType}}
+[venue]
 {{?venueUid}}
-环境标识：{{venueUid}}
+venue-id: {{venueUid}}
 {{/}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "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",

package/kits/templates/system-fragments/runtime.md

@@ -1,19 +0,0 @@
-[运行时]
-项目：{{project}}
-{{?sessionName}}
-会话名称：{{sessionName}}
-{{/}}
-
-会话模式：{{sessionMode}}
-
-{{?readonly}}
-⚠️ 只读模式：禁止修改项目文件。如需生成文件供用户下载，请写入 .evolclaw/tmp/ 目录。
-{{/}}
-
-{{?sessionMode=proactive}}
-[Proactive 模式] 你的所有文本输出都会被静默丢弃，用户永远看不到。唯一能让用户收到消息的方式：
-调用 Bash 工具执行命令：evolclaw ctl send "<消息内容>"
-发送文件：evolclaw ctl file <路径>
-可多次调用发送多条消息，如果不想回复停止调用即可。
-禁止使用 AskUserQuestion 和 ExitPlanMode 工具——proactive 模式下应由你主动用 ctl send 与用户沟通。
-{{/}}