evolcore 0.0.4 → 0.0.6

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

@@ -10,22 +10,108 @@ function encodeSegment(s) {
 function decodeSegment(s) {
     return s.replace(/%([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
 }
+function resolveAunSelfAID(selfAID, channelKey) {
+    const direct = selfAID?.trim();
+    if (direct && direct !== '_unknown')
+        return direct;
+    const parts = channelKey?.split('#');
+    const inferred = parts?.length === 3 && parts[0] === 'aun' ? parts[1]?.trim() : undefined;
+    if (inferred && inferred !== '_unknown')
+        return inferred;
+    throw new Error('[SessionFsStore] AUN chat directory requires selfAID or an aun channel key.');
+}
+function resolveSessionChannelKey(channelType, selfAID, channelKey) {
+    if (channelKey?.trim())
+        return channelKey.trim();
+    return `${channelType}#${selfAID}#main`;
+}
+function encodeChannelSessionComponent(value) {
+    // encodeURIComponent leaves `*` untouched, but it is illegal in a Windows
+    // filename. A trailing dot is also rejected by Windows filesystems.
+    const encoded = encodeURIComponent(value).replace(/\*/g, '%2A');
+    return encoded.endsWith('.') ? `${encoded.slice(0, -1)}%2E` : encoded;
+}
+const MAX_CHANNEL_SESSION_KEY_BYTES = 255;
+function formatChannelSessionKeyParts(channelType, channelName, channelId) {
+    if (!channelType || !channelName || !channelId) {
+        throw new Error('[SessionFsStore] channel session key components must not be empty.');
+    }
+    const key = [channelType, channelName, channelId]
+        .map(encodeChannelSessionComponent)
+        .join('#');
+    const bytes = Buffer.byteLength(key, 'utf8');
+    if (bytes > MAX_CHANNEL_SESSION_KEY_BYTES) {
+        throw new Error(`[SessionFsStore] channel session key is ${bytes} bytes; filesystem limit is ${MAX_CHANNEL_SESSION_KEY_BYTES} bytes.`);
+    }
+    return key;
+}
 /**
- * 计算 chat 目录的完整路径。
- * - aun: sessionsDir/aun/<urlEncode(selfAID|'_unknown')>/<urlEncode(channelId)>/
- * - wecom: sessionsDir/wecom/<urlEncode(channelKey)>/<urlEncode(channelId)>/
- * - 其它: sessionsDir/<channelType>/<urlEncode(channelId)>/
+ * Session 的磁盘路由键。它将实例名和会话路由 ID 合并为一个目录段；
+ * Agent 身份由父目录 `agents/<aid>/` 提供，不能省略这个父目录。
+ *
+ * This is intentionally distinct from SessionFile.sessionKey, which includes
+ * the thread ID and is used as the agent-internal session routing key.
  */
-export function chatDirPath(sessionsDir, channelType, channelId, selfAID, channelKey) {
-    if (channelType === 'aun') {
-        return path.join(sessionsDir, channelType, encodeSegment(selfAID || '_unknown'), encodeSegment(channelId));
+export function formatChannelSessionKey(channelType, channelId, channelKey) {
+    const parts = channelKey?.split('#');
+    const channelName = parts?.length === 3 && parts[0] === channelType && parts[2]?.trim()
+        ? parts[2].trim()
+        : 'main';
+    return formatChannelSessionKeyParts(channelType, channelName, channelId);
+}
+function parseChannelSessionKeyComponents(key) {
+    const parts = key.split('#');
+    if (parts.length !== 3 || !parts[0] || !parts[1] || !parts[2])
+        return undefined;
+    try {
+        const channelType = decodeURIComponent(parts[0]);
+        const channelName = decodeURIComponent(parts[1]);
+        const channelId = decodeURIComponent(parts[2]);
+        if (!channelType || !channelName || !channelId)
+            return undefined;
+        return { channelType, channelName, channelId };
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Parse only the canonical channelSessionKey emitted by the current formatter. */
+export function tryParseChannelSessionKey(key) {
+    const parsed = parseChannelSessionKeyComponents(key);
+    if (!parsed)
+        return undefined;
+    try {
+        return formatChannelSessionKeyParts(parsed.channelType, parsed.channelName, parsed.channelId) === key
+            ? parsed
+            : undefined;
     }
-    if (channelType === 'wecom' && channelKey?.startsWith('wecom#')) {
-        return path.join(sessionsDir, channelType, encodeSegment(channelKey), encodeSegment(channelId));
+    catch {
+        return undefined;
     }
-    return path.join(sessionsDir, channelType, encodeSegment(channelId));
 }
-/** 解码目录段（用于扫描时把目录名还原为原始 channelId/selfAID） */
+/** Parse the immediately preceding v3 encoding for explicit migration only. */
+export function tryParseLegacyChannelSessionKey(key) {
+    return parseChannelSessionKeyComponents(key);
+}
+/**
+ * 计算 chat 目录的完整路径。
+ * - agents/<selfAID>/sessions/<channelSessionKey>/
+ *
+ * The relation peerKey intentionally is not used here: it omits the channel
+ * instance. channelSessionKey retains the configured instance name and the
+ * chat route in one path segment.
+ */
+export function chatDirPath(sessionsRoot, channelType, channelId, selfAID, channelKey) {
+    const aid = channelType === 'aun'
+        ? resolveAunSelfAID(selfAID, channelKey)
+        : (selfAID?.trim() || trySelfAIDFromChannelKey(channelKey) || '_unknown');
+    return path.join(sessionsRoot, encodeSegment(aid), 'sessions', formatChannelSessionKey(channelType, channelId, resolveSessionChannelKey(channelType, aid, channelKey)));
+}
+function trySelfAIDFromChannelKey(channelKey) {
+    const parts = channelKey?.split('#');
+    return parts?.length === 3 && parts[1]?.trim() ? parts[1].trim() : undefined;
+}
+/** 解码目录段（用于扫描时把目录名还原为逻辑路径键） */
 export function decodeDirSegment(seg) {
     return decodeSegment(seg);
 }
@@ -47,9 +133,8 @@ export function formatTimestamp(epochMs) {
     const ss = String(d.getSeconds()).padStart(2, '0');
     return `${yyyy}-${mo}-${dd} ${hh}:${mi}:${ss}`;
 }
-export function atomicWriteJson(filePath, data) {
+function atomicWrite(filePath, content) {
     const tmpPath = filePath + '.tmp';
-    const content = JSON.stringify(data, null, 2) + '\n';
     const fd = fs.openSync(tmpPath, 'w');
     fs.writeSync(fd, content);
     fs.fsyncSync(fd);
@@ -63,6 +148,12 @@ export function atomicWriteJson(filePath, data) {
     }
     fs.renameSync(tmpPath, filePath);
 }
+export function atomicWriteJson(filePath, data) {
+    atomicWrite(filePath, JSON.stringify(data, null, 2) + '\n');
+}
+export function atomicWriteText(filePath, content) {
+    atomicWrite(filePath, content);
+}
 export function appendJsonl(filePath, record) {
     const line = JSON.stringify(record) + '\n';
     const fd = fs.openSync(filePath, 'a');
@@ -128,22 +219,193 @@ export function readAllJsonlLines(filePath) {
     }
 }
 /**
- * 扫描所有 chat 目录。
- * - aun: channelType / selfAID / channelId  (3层)
- * - wecom: channelType / channelKey / channelId (3层；兼容旧的2层目录)
- * - 其它: channelType / channelId           (2层)
+ * Scan the current per-Agent layout:
+ * `agents/<aid>/sessions/<channelSessionKey>/`.
  */
-export function scanChatDirs(sessionsDir) {
+export function scanChatDirs(sessionsRoot) {
     const results = [];
-    let typeEntries;
+    let agentEntries;
     try {
-        typeEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+        agentEntries = fs.readdirSync(sessionsRoot, { withFileTypes: true });
     }
     catch (e) {
         if (e.code === 'ENOENT')
             return [];
         throw e;
     }
+    const hasAgentLayout = agentEntries.some(entry => entry.isDirectory() && (fs.existsSync(path.join(sessionsRoot, entry.name, 'config.json'))
+        || fs.existsSync(path.join(sessionsRoot, entry.name, 'sessions'))));
+    if (!hasAgentLayout)
+        return [];
+    for (const agentEntry of agentEntries) {
+        if (!agentEntry.isDirectory())
+            continue;
+        const sessionsDir = path.join(sessionsRoot, agentEntry.name, 'sessions');
+        let sessionEntries;
+        try {
+            sessionEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        const selfAID = decodeSegment(agentEntry.name);
+        for (const sessionEntry of sessionEntries) {
+            if (!sessionEntry.isDirectory())
+                continue;
+            const channelSessionKey = sessionEntry.name;
+            const parsed = tryParseChannelSessionKey(channelSessionKey);
+            if (!parsed)
+                continue;
+            const dirPath = path.join(sessionsDir, sessionEntry.name);
+            if (!hasSessionPayload(dirPath))
+                continue;
+            results.push({
+                channelType: parsed.channelType,
+                selfAID,
+                channelId: parsed.channelId,
+                channelKey: parsed.channelType === 'daemon'
+                    ? 'daemon'
+                    : `${parsed.channelType}#${selfAID}#${parsed.channelName}`,
+                channelSessionKey,
+                dirPath,
+            });
+        }
+    }
+    return results.sort((left, right) => left.dirPath < right.dirPath ? -1 : left.dirPath > right.dirPath ? 1 : 0);
+}
+function hasSessionPayload(dirPath) {
+    try {
+        return fs.readdirSync(dirPath, { withFileTypes: true }).some(entry => (entry.isFile() && (entry.name === 'active.json'
+            || entry.name === 'messages.jsonl'
+            || (entry.name.startsWith('meta_') && entry.name.endsWith('.jsonl')))) || (entry.isDirectory() && entry.name === '_threads'));
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Scan non-canonical single-level v3 keys. The runtime ignores these entries;
+ * only the explicit migration planner may copy them into their canonical key.
+ */
+export function scanNonCanonicalAgentChatDirs(sessionsRoot) {
+    const results = [];
+    let agentEntries;
+    try {
+        agentEntries = fs.readdirSync(sessionsRoot, { withFileTypes: true });
+    }
+    catch {
+        return results;
+    }
+    for (const agentEntry of agentEntries) {
+        if (!agentEntry.isDirectory())
+            continue;
+        const selfAID = decodeSegment(agentEntry.name);
+        const sessionsDir = path.join(sessionsRoot, agentEntry.name, 'sessions');
+        let sessionEntries;
+        try {
+            sessionEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const sessionEntry of sessionEntries) {
+            if (!sessionEntry.isDirectory() || tryParseChannelSessionKey(sessionEntry.name))
+                continue;
+            const parsed = tryParseLegacyChannelSessionKey(sessionEntry.name);
+            const dirPath = path.join(sessionsDir, sessionEntry.name);
+            if (!parsed || !hasSessionPayload(dirPath))
+                continue;
+            results.push({
+                ...parsed,
+                selfAID,
+                channelKey: parsed.channelType === 'daemon'
+                    ? 'daemon'
+                    : `${parsed.channelType}#${selfAID}#${parsed.channelName}`,
+                channelSessionKey: sessionEntry.name,
+                dirPath,
+            });
+        }
+    }
+    return results.sort((left, right) => left.dirPath < right.dirPath ? -1 : left.dirPath > right.dirPath ? 1 : 0);
+}
+/**
+ * Scan the immediately preceding per-Agent layout:
+ * `agents/<aid>/sessions/<channelKey>/<channelId>/`.
+ *
+ * The runtime must not use this scanner. It exists solely for the explicit
+ * migration that copies the old two-level layout into channelSessionKey.
+ */
+export function scanNestedAgentChatDirs(sessionsRoot) {
+    const results = [];
+    let agentEntries;
+    try {
+        agentEntries = fs.readdirSync(sessionsRoot, { withFileTypes: true });
+    }
+    catch {
+        return results;
+    }
+    for (const agentEntry of agentEntries) {
+        if (!agentEntry.isDirectory())
+            continue;
+        const selfAID = decodeSegment(agentEntry.name);
+        const sessionsDir = path.join(sessionsRoot, agentEntry.name, 'sessions');
+        let channelEntries;
+        try {
+            channelEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const channelEntry of channelEntries) {
+            if (!channelEntry.isDirectory())
+                continue;
+            const channelKey = decodeSegment(channelEntry.name);
+            const parts = channelKey.split('#');
+            const isDaemon = channelKey === 'daemon';
+            const isCurrentKey = parts.length === 3 && parts[1] === selfAID && !!parts[0] && !!parts[2];
+            const isReversedLegacyKey = parts.length === 3 && parts[0] === selfAID && !!parts[1] && !!parts[2];
+            const isAgentChannel = isCurrentKey || isReversedLegacyKey;
+            if (!isDaemon && !isAgentChannel)
+                continue;
+            const channelDir = path.join(sessionsDir, channelEntry.name);
+            // A single-level channelSessionKey can look superficially like a legacy
+            // key when an AID happens to match an instance name. Its own active.json
+            // proves it is a current chat directory, not a legacy channel parent.
+            if (fs.existsSync(path.join(channelDir, 'active.json')))
+                continue;
+            const channelType = isDaemon ? 'daemon' : (isCurrentKey ? parts[0] : parts[1]);
+            let chatEntries;
+            try {
+                chatEntries = fs.readdirSync(channelDir, { withFileTypes: true });
+            }
+            catch {
+                continue;
+            }
+            for (const chatEntry of chatEntries) {
+                if (!chatEntry.isDirectory())
+                    continue;
+                results.push({
+                    channelType,
+                    selfAID,
+                    channelKey,
+                    channelId: decodeSegment(chatEntry.name),
+                    dirPath: path.join(channelDir, chatEntry.name),
+                });
+            }
+        }
+    }
+    return results.sort((left, right) => left.dirPath < right.dirPath ? -1 : left.dirPath > right.dirPath ? 1 : 0);
+}
+/** Scan the pre-migration data/sessions layout without changing it. */
+export function scanLegacyChatDirs(sessionsDir) {
+    const results = [];
+    let typeEntries;
+    try {
+        typeEntries = fs.readdirSync(sessionsDir, { withFileTypes: true });
+    }
+    catch {
+        return results;
+    }
     for (const typeEntry of typeEntries) {
         if (!typeEntry.isDirectory())
             continue;
@@ -157,7 +419,6 @@ export function scanChatDirs(sessionsDir) {
             continue;
         }
         if (channelType === 'aun') {
-            // 3-layer: aun/selfAID/channelId
             for (const selfEntry of level2Entries) {
                 if (!selfEntry.isDirectory())
                     continue;
@@ -169,19 +430,15 @@ export function scanChatDirs(sessionsDir) {
                 catch {
                     continue;
                 }
-                for (const chatEntry of chatEntries) {
-                    if (!chatEntry.isDirectory())
-                        continue;
-                    results.push({
-                        channelType,
-                        selfAID: decodeSegment(selfEntry.name),
-                        channelId: decodeSegment(chatEntry.name),
-                        dirPath: path.join(selfDir, chatEntry.name),
-                    });
-                }
+                for (const chatEntry of chatEntries)
+                    if (chatEntry.isDirectory())
+                        results.push({
+                            channelType, selfAID: decodeSegment(selfEntry.name), channelId: decodeSegment(chatEntry.name), dirPath: path.join(selfDir, chatEntry.name),
+                        });
             }
+            continue;
         }
-        else if (channelType === 'wecom') {
+        if (channelType === 'wecom') {
             for (const entry of level2Entries) {
                 if (!entry.isDirectory())
                     continue;
@@ -195,43 +452,25 @@ export function scanChatDirs(sessionsDir) {
                     catch {
                         continue;
                     }
-                    for (const chatEntry of chatEntries) {
-                        if (!chatEntry.isDirectory())
-                            continue;
-                        results.push({
-                            channelType,
-                            selfAID: '',
-                            channelKey: decoded,
-                            channelId: decodeSegment(chatEntry.name),
-                            dirPath: path.join(entryDir, chatEntry.name),
-                        });
-                    }
+                    for (const chatEntry of chatEntries)
+                        if (chatEntry.isDirectory())
+                            results.push({
+                                channelType, selfAID: '', channelKey: decoded, channelId: decodeSegment(chatEntry.name), dirPath: path.join(entryDir, chatEntry.name),
+                            });
                 }
                 else {
-                    results.push({
-                        channelType,
-                        selfAID: '',
-                        channelId: decoded,
-                        dirPath: entryDir,
-                    });
+                    results.push({ channelType, selfAID: '', channelId: decoded, dirPath: entryDir });
                 }
             }
+            continue;
         }
-        else {
-            // 2-layer: channelType/channelId
-            for (const chatEntry of level2Entries) {
-                if (!chatEntry.isDirectory())
-                    continue;
+        for (const chatEntry of level2Entries)
+            if (chatEntry.isDirectory())
                 results.push({
-                    channelType,
-                    selfAID: '',
-                    channelId: decodeSegment(chatEntry.name),
-                    dirPath: path.join(typeDir, chatEntry.name),
+                    channelType, selfAID: '', channelId: decodeSegment(chatEntry.name), dirPath: path.join(typeDir, chatEntry.name),
                 });
-            }
-        }
     }
-    return results;
+    return results.sort((left, right) => left.dirPath < right.dirPath ? -1 : left.dirPath > right.dirPath ? 1 : 0);
 }
 export function scanMetaFiles(chatDir) {
     try {