evolclaw 3.1.1 → 3.1.2

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

@@ -2,7 +2,6 @@ import path from 'path';
 import fs from 'fs';
 import crypto from 'crypto';
 import { hasCompact } from '../../agents/claude-runner.js';
-import { appendMessageLog, buildOutboundEntry } from './message-log.js';
 import { IMRenderer } from './im-renderer.js';
 import { StreamIdleMonitor } from './stream-idle-monitor.js';
 import { logger } from '../../utils/logger.js';
@@ -1161,29 +1160,8 @@ export class MessageProcessor {
                         }
                         // 记录完成状态 + 最后一轮回复文本（后续 complete 覆盖前序）
                         completeResult = { isError: !!event.isError, subtype: event.subtype, errors: event.errors, terminalReason: event.terminalReason, lastReplyText, fullText: event.result || '', hasReceivedText, numTurns: event.numTurns, usage: event.usage };
-                        // proactive 模式：每轮 LLM 调用完成后写一条 thought 到 messages.jsonl
-                        // 这样 thought 数 = LLM 调用轮数，而不是 chunk 数
-                        if (session.sessionMode === 'proactive' && lastReplyText) {
-                            try {
-                                const chatDir = this.sessionManager.getChatDir(session);
-                                const sessionEncrypt = this.sessionManager.getSessionEncrypt(session.id);
-                                appendMessageLog(chatDir, buildOutboundEntry({
-                                    from: session.selfId || 'self',
-                                    to: session.metadata?.peerId ?? session.channelId,
-                                    chatType: (session.chatType ?? 'private'),
-                                    groupId: session.metadata?.groupId ?? null,
-                                    msgId: `thought-${session.id}-${Date.now()}`,
-                                    content: lastReplyText,
-                                    agent: session.agentId || null,
-                                    model: null,
-                                    durationMs: null,
-                                    encrypt: sessionEncrypt ?? undefined,
-                                    chatmode: 'proactive',
-                                    msgType: 'thought',
-                                }));
-                            }
-                            catch { }
-                        }
+                        // thought jsonl 写入已下沉到 aun.ts:sendThought 成功后，
+                        // 由那里按 LLM 输出的每个 text item 单独写一条，此处不再写。
                         // 失败且无前置错误输出：显示 errors 摘要
                         // 但用户主动中断（新消息打断 或 /stop 命令）时不显示错误提示
                         // 上下文过长的错误留给外层 isPromptTooLong 触发 auto-compact，不在此处输出

package/dist/core/session/session-fs-store.js

@@ -146,6 +146,29 @@ export function scanChatDirs(sessionsDir) {
         if (!typeEntry.isDirectory())
             continue;
         const channelType = typeEntry.name;
+        // 包含 '#' 的目录是旧 channelKey 格式（如 'aun#dddd.agentid.pub#main'），
+        // 按通用 channel 布局扫描（sessionsDir/{channelKey}/{encodedChannelId}/），保持兼容
+        if (channelType.includes('#')) {
+            const typeDir = path.join(sessionsDir, channelType);
+            let chatEntries;
+            try {
+                chatEntries = fs.readdirSync(typeDir, { withFileTypes: true });
+            }
+            catch {
+                continue;
+            }
+            for (const chatEntry of chatEntries) {
+                if (!chatEntry.isDirectory())
+                    continue;
+                results.push({
+                    channelType,
+                    selfId: null,
+                    channelId: decodeSegment(chatEntry.name),
+                    dirPath: path.join(typeDir, chatEntry.name),
+                });
+            }
+            continue;
+        }
         const typeDir = path.join(sessionsDir, channelType);
         if (channelType === 'aun') {
             // aun 下还有一层 selfId

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

@@ -540,7 +540,10 @@ export class SessionManager {
         this.writeSessionIfChanged(current.channel, current.channelId, prev, current);
     }
     getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, agentId, selfId, channelType, peerType) {
-        const chatDir = this.ensureResolvedChatDir(channel, channelId);
+        // 优先使用精确路径（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);
         const threadIndex = readThreadIndex(chatDir);
         const existingMetaId = threadIndex[threadId];
         if (existingMetaId) {

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 { ensureDataDirs, resolvePaths, getPackageRoot } from './paths.js';
+import { ensureDataDirs, resolvePaths, getPackageRoot, agentMdPath } from './paths.js';
 import { resolveAnthropicConfig } from './agents/resolve.js';
 import { loadDefaults, autoMigrateIfNeeded, migrateIdentitiesIfNeeded } from './config-store.js';
 import { CONFIG_SCHEMA_VERSION } from './types.js';
@@ -41,7 +41,6 @@ import { agentTriggersDir } from './paths.js';
 import { isLinkedInstall } from './utils/npm-ops.js';
 import path from 'path';
 import fs from 'fs';
-import os from 'os';
 import crypto from 'crypto';
 import { fileURLToPath } from 'url';
 /** 出站 payload 摘要（用于 channel-out.log） */
@@ -473,7 +472,7 @@ async function main() {
             logger.error(`[Trigger] Scheduler init failed for ${agent.aid}: ${err}`);
         }
     }
-    // Inject primary agent's trigger scheduler into cmdHandler
+    // Inject primary agent's trigger scheduler as fallback (used when owning agent has no scheduler)
     const primaryAgentForTrigger = agentRegistry.runnableAgents()[0];
     if (primaryAgentForTrigger?.triggerScheduler && primaryAgentForTrigger?.triggerManager) {
         cmdHandler.setTriggerScheduler(primaryAgentForTrigger.triggerScheduler, primaryAgentForTrigger.triggerManager);
@@ -548,10 +547,10 @@ async function main() {
         if (inst.onProjectPathRequest && inst.channel.onProjectPathRequest) {
             inst.channel.onProjectPathRequest(async (channelId) => {
                 // Effective default path: use the agent that owns this channel.
-                const owningAgent = agentRegistry.resolveByChannel(inst.adapter.channelName);
+                const owningAgent = agentRegistry.resolveByChannel(inst.adapter.channelKey);
                 const effectiveDefault = owningAgent?.projectPath
                     ?? primaryAgent.projectPath;
-                const session = await sessionManager.getOrCreateSession(inst.adapter.channelName, channelId, effectiveDefault, undefined, undefined, undefined, undefined);
+                const session = await sessionManager.getOrCreateSession(inst.adapter.channelKey, channelId, effectiveDefault, undefined, undefined, undefined, undefined);
                 return path.isAbsolute(session.projectPath)
                     ? session.projectPath
                     : path.resolve(process.cwd(), session.projectPath);
@@ -593,10 +592,10 @@ async function main() {
     }
     // Bind adapters to their owning agents and mark running
     for (const inst of channelInstances) {
-        const agent = agentRegistry.resolveByChannel(inst.adapter.channelName);
+        const agent = agentRegistry.resolveByChannel(inst.adapter.channelKey);
         if (!agent || agent.status === 'error')
             continue;
-        agent.channels.set(inst.adapter.channelName, inst.adapter);
+        agent.channels.set(inst.adapter.channelKey, inst.adapter);
         if (agent.status === 'stopped') {
             agent.status = 'running';
         }
@@ -611,7 +610,7 @@ async function main() {
     for (const inst of channelInstances) {
         const channelType = inst.channelType || inst.adapter.channelName;
         if (channelType === 'feishu' && 'preloadThreads' in inst.channel) {
-            const threadIds = sessionManager.getKnownThreadIds(inst.adapter.channelName);
+            const threadIds = sessionManager.getKnownThreadIds(inst.adapter.channelKey);
             inst.channel.preloadThreads(threadIds);
         }
     }
@@ -643,9 +642,8 @@ async function main() {
             // 尝试从 agent.md 读取 name
             let agentName = agent.aid;
             try {
-                const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-                const agentMdPath = path.join(aunPath, 'AIDs', agent.aid, 'agent.md');
-                const content = fs.readFileSync(agentMdPath, 'utf-8');
+                const mdPath = agentMdPath(agent.aid);
+                const content = fs.readFileSync(mdPath, 'utf-8');
                 const nameMatch = content.match(/^name:\s*"?([^"\n]+)/m);
                 if (nameMatch)
                     agentName = nameMatch[1].trim().replace(/"$/, '');
@@ -682,14 +680,14 @@ async function main() {
                 continue; // 跳过同类型通道
             if (notified.has(otherType))
                 continue; // 同类型已通知过
-            const ownerId = agentRegistry.getOwner(other.adapter.channelName);
+            const ownerId = agentRegistry.getOwner(other.adapter.channelKey);
             if (!ownerId)
                 continue;
             notified.add(otherType);
-            const owningAgent = agentRegistry.resolveByChannel(other.adapter.channelName);
+            const owningAgent = agentRegistry.resolveByChannel(other.adapter.channelKey);
             const envelope = buildEnvelope({
                 taskId: `system-channel-down-${crypto.randomBytes(5).toString('hex')}`,
-                channel: other.adapter.channelName,
+                channel: other.adapter.channelKey,
                 channelId: ownerId,
                 agentName: owningAgent?.aid || 'evolclaw',
             });
@@ -780,10 +778,10 @@ async function main() {
                 const replyContext = pending.rootId
                     ? { replyToMessageId: pending.rootId, replyInThread: !!pending.threadId }
                     : undefined;
-                const owningAgent = agentRegistry.resolveByChannel(adapter.channelName);
+                const owningAgent = agentRegistry.resolveByChannel(adapter.channelKey);
                 const envelope = buildEnvelope({
                     taskId: `system-restart-${process.pid}`,
-                    channel: adapter.channelName,
+                    channel: adapter.channelKey,
                     channelId: pending.channelId,
                     agentName: owningAgent?.aid || 'evolclaw',
                     replyContext,
@@ -883,7 +881,7 @@ async function main() {
         const instances = await channelLoader.createForAgent(agent);
         for (const inst of instances) {
             registerChannelInstance(inst);
-            agent.channels.set(inst.adapter.channelName, inst.adapter);
+            agent.channels.set(inst.adapter.channelKey, inst.adapter);
             channelInstances.push(inst);
         }
         agent.status = 'running';

package/dist/paths.js

@@ -45,6 +45,16 @@ export function resolvePaths() {
         aidLogsDir: path.join(root, 'logs', 'aids'),
     };
 }
+// ── AID 路径（agent.md 存放在 $EVOLCLAW_HOME/AIDs/<aid>/）──
+export function aidsDir() {
+    return path.join(resolveRoot(), 'AIDs');
+}
+export function aidLocalDir(aid) {
+    return path.join(resolveRoot(), 'AIDs', aid);
+}
+export function agentMdPath(aid) {
+    return path.join(resolveRoot(), 'AIDs', aid, 'agent.md');
+}
 // ── per-agent 路径（参数化，不进 resolvePaths() 的固定 map）──
 export function agentDir(aid) {
     return path.join(resolveRoot(), 'agents', aid);
@@ -98,6 +108,31 @@ export function ensureDataDirs() {
     fs.mkdirSync(p.outboxDir, { recursive: true });
     fs.mkdirSync(p.eckDir, { recursive: true });
     fs.mkdirSync(eckDebugDir(), { recursive: true });
+    fs.mkdirSync(aidsDir(), { recursive: true });
+    migrateAgentMdFromAun();
+}
+/**
+ * One-time migration: copy agent.md from ~/.aun/AIDs/<aid>/ to $EVOLCLAW_HOME/AIDs/<aid>/
+ * if the new location doesn't have it yet.
+ */
+function migrateAgentMdFromAun() {
+    const aunAidsDir = path.join(os.homedir(), '.aun', 'AIDs');
+    const ecAids = aidsDir();
+    if (!fs.existsSync(aunAidsDir) || aunAidsDir === ecAids)
+        return;
+    try {
+        for (const entry of fs.readdirSync(aunAidsDir, { withFileTypes: true })) {
+            if (!entry.isDirectory())
+                continue;
+            const oldMd = path.join(aunAidsDir, entry.name, 'agent.md');
+            const newMd = path.join(ecAids, entry.name, 'agent.md');
+            if (fs.existsSync(oldMd) && !fs.existsSync(newMd)) {
+                fs.mkdirSync(path.join(ecAids, entry.name), { recursive: true });
+                fs.copyFileSync(oldMd, newMd);
+            }
+        }
+    }
+    catch { /* best-effort migration */ }
 }
 // ── kits 路径（始终从包内读取，不复制到 EVOLCLAW_HOME）──
 export function kitsDir() {

package/dist/utils/cross-platform.js

@@ -12,7 +12,8 @@ export const isWindows = process.platform === 'win32';
  *      C:\Users\project -> C--Users-project
  */
 export function encodePath(projectPath) {
-    return projectPath.replace(/[/\\:]/g, '-');
+    const normalized = projectPath.replace(/[/\\]+$/, '');
+    return normalized.replace(/[/\\:]/g, '-');
 }
 /**
  * Cross-platform process liveness check.

package/kits/docs/INDEX.md

@@ -50,3 +50,9 @@
 | 路径注册表模板 | `eck_templates/path-registry.template.md` | 路径实例模板 |
 | 索引模板 | `eck_templates/INDEX.template.md` | agent 级索引模板 |
 | 指南模板 | `eck_templates/GUIDE.template.md` | agent 级查阅指南模板 |
+
+## Base Agent
+
+| 文档 | 路径 | 说明 |
+|------|------|------|
+| Claude Code 日志 | `baseagent/cc-logs.md` | CC 会话日志查阅（找完整对话/工具调用/注入） |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "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",
@@ -14,7 +14,10 @@
     "!dist/experimental/",
     "kits/",
     "!kits/.kits-version",
-    "evolclaw-install-aun.md"
+    "*.md",
+    "!CLAUDE.md",
+    "!DEPLOYMENT.md",
+    "!ONBOARDING.md"
   ],
   "scripts": {
     "dev": "tsx watch src/index.ts",