evolclaw 3.1.4 → 3.1.5

package/dist/core/relation/peer-key.js

@@ -0,0 +1,16 @@
+/**
+ * peerKey: 关系层路由键,格式 `<channelType>#<urlEncode(channelId)>`。
+ * 群聊场景下 channelId = groupId,所有发言者共用同一个 peerKey。
+ */
+export function formatPeerKey(channelType, channelId) {
+    return `${channelType}#${encodeURIComponent(channelId)}`;
+}
+export function parsePeerKey(key) {
+    const idx = key.indexOf('#');
+    if (idx <= 0)
+        throw new Error(`Invalid peer key: ${key}`);
+    return {
+        channelType: key.slice(0, idx),
+        channelId: decodeURIComponent(key.slice(idx + 1)),
+    };
+}

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

@@ -12,19 +12,16 @@ function decodeSegment(s) {
 }
 /**
  * 计算 chat 目录的完整路径。
- * - AUN：sessionsDir/aun/<urlEncode(selfId)>/<urlEncode(channelId)>/
- * - 其它：sessionsDir/<channelType>/<urlEncode(channelId)>/
- *
- * 注：channelType 自身不编码（限定枚举值，不含非法字符）。
+ * - aun: sessionsDir/aun/<urlEncode(selfAID|'_unknown')>/<urlEncode(channelId)>/
+ * - 其它: sessionsDir/<channelType>/<urlEncode(channelId)>/
  */
-export function chatDirPath(sessionsDir, channelType, channelId, selfId) {
+export function chatDirPath(sessionsDir, channelType, channelId, selfAID) {
     if (channelType === 'aun') {
-        const self = selfId || '_unknown';
-        return path.join(sessionsDir, 'aun', encodeSegment(self), encodeSegment(channelId));
+        return path.join(sessionsDir, channelType, encodeSegment(selfAID || '_unknown'), encodeSegment(channelId));
     }
     return path.join(sessionsDir, channelType, encodeSegment(channelId));
 }
-/** 解码目录段（用于扫描时把目录名还原为原始 channelId/selfId） */
+/** 解码目录段（用于扫描时把目录名还原为原始 channelId/selfAID） */
 export function decodeDirSegment(seg) {
     return decodeSegment(seg);
 }
@@ -128,8 +125,8 @@ export function readAllJsonlLines(filePath) {
 }
 /**
  * 扫描所有 chat 目录。
- * 顶层是 channelType 目录；aun 下面再有一层 selfId 目录。
- * 返回每个 chat 的：channelType、selfId（仅 aun 有）、channelId、dirPath。
+ * - aun: channelType / selfAID / channelId  (3层)
+ * - 其它: channelType / channelId           (2层)
  */
 export function scanChatDirs(sessionsDir) {
     const results = [];
@@ -146,40 +143,17 @@ 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),
-                });
-            }
+        const typeDir = path.join(sessionsDir, channelType);
+        let level2Entries;
+        try {
+            level2Entries = fs.readdirSync(typeDir, { withFileTypes: true });
+        }
+        catch {
             continue;
         }
-        const typeDir = path.join(sessionsDir, channelType);
         if (channelType === 'aun') {
-            // aun 下还有一层 selfId
-            let selfEntries;
-            try {
-                selfEntries = fs.readdirSync(typeDir, { withFileTypes: true });
-            }
-            catch {
-                continue;
-            }
-            for (const selfEntry of selfEntries) {
+            // 3-layer: aun/selfAID/channelId
+            for (const selfEntry of level2Entries) {
                 if (!selfEntry.isDirectory())
                     continue;
                 const selfDir = path.join(typeDir, selfEntry.name);
@@ -195,7 +169,7 @@ export function scanChatDirs(sessionsDir) {
                         continue;
                     results.push({
                         channelType,
-                        selfId: decodeSegment(selfEntry.name),
+                        selfAID: decodeSegment(selfEntry.name),
                         channelId: decodeSegment(chatEntry.name),
                         dirPath: path.join(selfDir, chatEntry.name),
                     });
@@ -203,20 +177,13 @@ export function scanChatDirs(sessionsDir) {
             }
         }
         else {
-            // 通用 channel：sessionsDir/{channelType}/{encodedChannelId}/
-            let chatEntries;
-            try {
-                chatEntries = fs.readdirSync(typeDir, { withFileTypes: true });
-            }
-            catch {
-                continue;
-            }
-            for (const chatEntry of chatEntries) {
+            // 2-layer: channelType/channelId
+            for (const chatEntry of level2Entries) {
                 if (!chatEntry.isDirectory())
                     continue;
                 results.push({
                     channelType,
-                    selfId: null,
+                    selfAID: '',
                     channelId: decodeSegment(chatEntry.name),
                     dirPath: path.join(typeDir, chatEntry.name),
                 });
@@ -238,15 +205,27 @@ export function scanMetaFiles(chatDir) {
         throw e;
     }
 }
-export function ensureChatDir(sessionsDir, channelType, channelId, selfId) {
-    const dir = chatDirPath(sessionsDir, channelType, channelId, selfId);
+export function ensureChatDir(sessionsDir, channelType, channelId, selfAID) {
+    const dir = chatDirPath(sessionsDir, channelType, channelId, selfAID);
     fs.mkdirSync(dir, { recursive: true });
     fs.mkdirSync(path.join(dir, '_threads'), { recursive: true });
     fs.mkdirSync(path.join(dir, '_trash'), { recursive: true });
     return dir;
 }
 export function readThreadIndex(chatDir) {
-    return readJsonFile(path.join(chatDir, '_threads', 'thread-index.json')) || {};
+    const raw = readJsonFile(path.join(chatDir, '_threads', 'thread-index.json')) || {};
+    // Migrate legacy format: { threadId: sessionId } → { threadId: { sessionId, sessionKey, metaFile } }
+    const result = {};
+    for (const [tid, val] of Object.entries(raw)) {
+        if (typeof val === 'string') {
+            // Legacy: val is sessionId
+            result[tid] = { sessionId: val, sessionKey: '', metaFile: `${val}.jsonl` };
+        }
+        else {
+            result[tid] = val;
+        }
+    }
+    return result;
 }
 export function writeThreadIndex(chatDir, index) {
     atomicWriteJson(path.join(chatDir, '_threads', 'thread-index.json'), index);

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

@@ -0,0 +1,24 @@
+/**
+ * sessionKey: agent 内部会话路由键。
+ * 格式: channelType#urlEncode(channelId)#urlEncode(threadId)
+ * 无话题时 threadId 固定为 'main'。
+ */
+export const DEFAULT_THREAD_ID = 'main';
+export function formatSessionKey(channelType, channelId, threadId) {
+    const tid = threadId || DEFAULT_THREAD_ID;
+    return `${channelType}#${encodeURIComponent(channelId)}#${encodeURIComponent(tid)}`;
+}
+export function parseSessionKey(key) {
+    const first = key.indexOf('#');
+    if (first <= 0)
+        throw new Error(`Invalid session key: ${key}`);
+    const rest = key.slice(first + 1);
+    const second = rest.indexOf('#');
+    if (second <= 0)
+        throw new Error(`Invalid session key (missing threadId): ${key}`);
+    return {
+        channelType: key.slice(0, first),
+        channelId: decodeURIComponent(rest.slice(0, second)),
+        threadId: decodeURIComponent(rest.slice(second + 1)),
+    };
+}