evolcore 0.0.2 → 0.0.4

package/dist/core/protected-paths.js

@@ -6,7 +6,7 @@ const H_CLASS_RELATIVE_PATTERNS = [
     /^agents\/defaults\.json$/,
     /^agents\/[^/]+\/config\.json$/,
     /^agents\/[^/]+\/contact\.json$/,
-    /^agents\/[^/]+\/roles(?:\/|$)/,
+    /^agents\/[^/]+\/contact-operations\.jsonl$/,
     /^agents\/[^/]+\/relations\/[^/]+\/config\.json$/,
     /^backups\/config(?:\/|$)/,
     /^\.snapshots(?:\/|$)/,
@@ -29,17 +29,18 @@ const H_CLASS_RELATIVE_PATTERNS = [
 ];
 const H_CLASS_REFERENCE_PATTERNS = [
     /(?:^|[^A-Za-z0-9_.-])daemon\.json(?=$|[^A-Za-z0-9_.-])/,
-    /(?:^|[^A-Za-z0-9_.-])agents[\\/](?:defaults\.json|[^/\\\s"']+[\\/](?:(?:config|contact)\.json|relations[\\/][^/\\\s"']+[\\/]config\.json))(?=$|[\s"';&|<>)},])/,
-    /(?:^|[^A-Za-z0-9_.-])agents[\\/][^/\\\s"']+[\\/]roles(?:[\\/]|$|[\s"';&|<>)},])/,
+    /(?:^|[^A-Za-z0-9_.-])agents[\\/](?:defaults\.json|[^/\\\s"']+[\\/](?:(?:config|contact)\.json|contact-operations\.jsonl|relations[\\/][^/\\\s"']+[\\/]config\.json))(?=$|[\s"';&|<>)},])/,
     /(?:^|[^A-Za-z0-9_.-])(?:backups[\\/]config|\.snapshots|CA|(?:AIDs|aids)[\\/][^/\\\s"']+[\\/](?:cert|keys))(?:[\\/]|$|[\s"';&|<>)},])/,
     /(?:^|[/\\\s"'=<>])(?:\.device_id|\.env|\.seed(?:\.[^/\\\s"']*)?|\.migrated-[^/\\\s"']*|\.lock|daemon\.pid|data[\\/](?:causation-aun\.json(?:_|__)?|message-queue\.json(?:_|__|\.tmp-[^/\\\s"']*)?|instance[\\/]control\.token|outbox|handoff))(?:[\\/]|$|[\s"';&|<>)},])/,
     /(?:^|[/\\\s"'=<>])(?:[^/\\\s"']+\.json_|[^/\\\s"']+\.json\.migrated|defaults_\d+\.json)(?=$|[\s"';&|<>)},])/,
 ];
 const L_CLASS_RELATIVE_PATTERNS = [
     /^data\/triggers(?:\/|$)/,
+    /^agents\/[^/]+\/roles(?:\/|$)/,
 ];
 const L_CLASS_REFERENCE_PATTERNS = [
     /(?:^|[/\\\s"'=<>])data[\\/]triggers(?:[\\/]|$|[\s"';&|<>)},])/,
+    /(?:^|[^A-Za-z0-9_.-])agents[\\/][^/\\\s"']+[\\/]roles(?:[\\/]|$|[\s"';&|<>)},])/,
 ];
 function normalizeForComparison(value) {
     const resolved = path.resolve(value);
@@ -127,8 +128,7 @@ export function getHClassSandboxPatterns(root = resolveRoot()) {
         path.join('agents', 'defaults.json'),
         path.join('agents', '*', 'config.json'),
         path.join('agents', '*', 'contact.json'),
-        path.join('agents', '*', 'roles'),
-        path.join('agents', '*', 'roles', '**'),
+        path.join('agents', '*', 'contact-operations.jsonl'),
         path.join('agents', '*', 'relations', '*', 'config.json'),
         path.join('backups', 'config'),
         path.join('backups', 'config', '**'),
@@ -169,6 +169,7 @@ export function getLClassWritePatterns(root = resolveRoot()) {
     return [
         path.join(absoluteRoot, 'data', 'triggers'),
         path.join(absoluteRoot, 'data', 'triggers', '**'),
+        path.join(absoluteRoot, 'agents', '*', 'roles', '**'),
     ];
 }
 const CLAUDE_PROTECTED_TARGET_LIMIT = 8192;
@@ -213,10 +214,9 @@ export function getExistingHClassMaskTargets(root = resolveRoot()) {
             if (!entry.isDirectory())
                 continue;
             const agentRoot = path.join(agentsDir, entry.name);
-            for (const fileName of ['config.json', 'config.json_', 'contact.json', 'contact.json_']) {
+            for (const fileName of ['config.json', 'config.json_', 'contact.json', 'contact.json_', 'contact-operations.jsonl']) {
                 addExistingTarget(targets, path.join(agentRoot, fileName));
             }
-            addExistingTarget(targets, path.join(agentRoot, 'roles'));
             const relationsDir = path.join(agentRoot, 'relations');
             try {
                 for (const relation of fs.readdirSync(relationsDir, { withFileTypes: true })) {
@@ -247,7 +247,17 @@ export function getExistingHClassMaskTargets(root = resolveRoot()) {
 }
 export function getExistingLClassReadOnlyTargets(root = resolveRoot()) {
     const targets = new Map();
-    addExistingTarget(targets, path.join(resolveThroughExistingAncestor(root), 'data', 'triggers'));
+    const absoluteRoot = resolveThroughExistingAncestor(root);
+    addExistingTarget(targets, path.join(absoluteRoot, 'data', 'triggers'));
+    const agentsDir = path.join(absoluteRoot, 'agents');
+    try {
+        for (const entry of fs.readdirSync(agentsDir, { withFileTypes: true })) {
+            if (!entry.isDirectory())
+                continue;
+            addExistingTarget(targets, path.join(agentsDir, entry.name, 'roles'));
+        }
+    }
+    catch { }
     return [...targets.values()];
 }
 export function buildClaudeProtectedFilesystem(root = resolveRoot()) {
@@ -306,8 +316,9 @@ export function hClassGrantIncludesProtectedPath(value, options = {}) {
     return true;
 }
 export function lClassGrantIncludesProtectedPath(value, options = {}) {
+    if (!value.trim())
+        return false;
     const root = resolveThroughExistingAncestor(options.root ?? resolveRoot());
-    const protectedRoot = path.join(root, 'data', 'triggers');
     if (isLClassPath(value, { cwd: options.cwd, root }))
         return true;
     const normalized = value.replace(/\\/g, '/');
@@ -316,8 +327,24 @@ export function lClassGrantIncludesProtectedPath(value, options = {}) {
         ? value
         : normalized.slice(0, globIndex).replace(/\/+$/, '') || '.';
     const candidate = resolveProtectedCandidate(literalGrantRoot, options.cwd);
-    return isSameOrDescendant(candidate, protectedRoot)
-        || isSameOrDescendant(protectedRoot, candidate);
+    if (isSameOrDescendant(root, candidate))
+        return true;
+    if (!isSameOrDescendant(candidate, root))
+        return false;
+    const relative = path.relative(root, candidate);
+    const segments = relative.split(path.sep).filter(Boolean);
+    if (segments[0] === 'data') {
+        if (segments.length === 1)
+            return true;
+        return segments[1] === 'triggers';
+    }
+    if (segments[0] === 'agents') {
+        // The agents root and each individual Agent root contain a roles/ subtree.
+        if (segments.length <= 2)
+            return true;
+        return segments[2] === 'roles';
+    }
+    return false;
 }
 export function workspaceContainsHClassPaths(projectPath, root = resolveRoot()) {
     const project = resolveThroughExistingAncestor(projectPath);

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

@@ -13,12 +13,16 @@ function decodeSegment(s) {
 /**
  * 计算 chat 目录的完整路径。
  * - aun: sessionsDir/aun/<urlEncode(selfAID|'_unknown')>/<urlEncode(channelId)>/
+ * - wecom: sessionsDir/wecom/<urlEncode(channelKey)>/<urlEncode(channelId)>/
  * - 其它: sessionsDir/<channelType>/<urlEncode(channelId)>/
  */
-export function chatDirPath(sessionsDir, channelType, channelId, selfAID) {
+export function chatDirPath(sessionsDir, channelType, channelId, selfAID, channelKey) {
     if (channelType === 'aun') {
         return path.join(sessionsDir, channelType, encodeSegment(selfAID || '_unknown'), encodeSegment(channelId));
     }
+    if (channelType === 'wecom' && channelKey?.startsWith('wecom#')) {
+        return path.join(sessionsDir, channelType, encodeSegment(channelKey), encodeSegment(channelId));
+    }
     return path.join(sessionsDir, channelType, encodeSegment(channelId));
 }
 /** 解码目录段（用于扫描时把目录名还原为原始 channelId/selfAID） */
@@ -126,6 +130,7 @@ export function readAllJsonlLines(filePath) {
 /**
  * 扫描所有 chat 目录。
  * - aun: channelType / selfAID / channelId  (3层)
+ * - wecom: channelType / channelKey / channelId (3层；兼容旧的2层目录)
  * - 其它: channelType / channelId           (2层)
  */
 export function scanChatDirs(sessionsDir) {
@@ -176,6 +181,42 @@ export function scanChatDirs(sessionsDir) {
                 }
             }
         }
+        else if (channelType === 'wecom') {
+            for (const entry of level2Entries) {
+                if (!entry.isDirectory())
+                    continue;
+                const decoded = decodeSegment(entry.name);
+                const entryDir = path.join(typeDir, entry.name);
+                if (decoded.startsWith('wecom#') && decoded.split('#').length === 3) {
+                    let chatEntries;
+                    try {
+                        chatEntries = fs.readdirSync(entryDir, { withFileTypes: true });
+                    }
+                    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),
+                        });
+                    }
+                }
+                else {
+                    results.push({
+                        channelType,
+                        selfAID: '',
+                        channelId: decoded,
+                        dirPath: entryDir,
+                    });
+                }
+            }
+        }
         else {
             // 2-layer: channelType/channelId
             for (const chatEntry of level2Entries) {
@@ -205,8 +246,8 @@ export function scanMetaFiles(chatDir) {
         throw e;
     }
 }
-export function ensureChatDir(sessionsDir, channelType, channelId, selfAID) {
-    const dir = chatDirPath(sessionsDir, channelType, channelId, selfAID);
+export function ensureChatDir(sessionsDir, channelType, channelId, selfAID, channelKey) {
+    const dir = chatDirPath(sessionsDir, channelType, channelId, selfAID, channelKey);
     fs.mkdirSync(dir, { recursive: true });
     fs.mkdirSync(path.join(dir, '_threads'), { recursive: true });
     fs.mkdirSync(path.join(dir, '_trash'), { recursive: true });

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

@@ -9,6 +9,22 @@ import { isSystemControlChannel } from '../system-channels.js';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
+function newSessionStableMetadata(chatType, ...sources) {
+    const keys = chatType === 'group'
+        ? ['channelKey', 'groupId', 'groupName', 'dispatchMode']
+        : ['channelKey', 'peerId', 'peerName', 'peerType'];
+    const metadata = {};
+    for (const source of sources) {
+        if (!source)
+            continue;
+        for (const key of keys) {
+            const value = source[key];
+            if (value !== undefined && value !== null && value !== '')
+                metadata[key] = value;
+        }
+    }
+    return metadata;
+}
 /** 判定用户是否为指定渠道的 admin */
 /** 判定用户是否为指定渠道的 member */
 export class SessionManager {
@@ -23,6 +39,7 @@ export class SessionManager {
         this.eventBus = eventBus;
         this.identityResolver = identityResolver;
         this.migrateChannelKeyFormat();
+        this.migrateWecomChannelDirs();
     }
     setIdentityResolver(resolver) {
         this.identityResolver = resolver;
@@ -69,20 +86,20 @@ export class SessionManager {
      * 需要明确的 channelType + selfAID 才能确定路径。
      */
     resolveChatDir(channel, channelId, channelType, selfAID) {
-        return chatDirPath(this.sessionsDir, channelType, channelId, selfAID);
+        return chatDirPath(this.sessionsDir, channelType, channelId, selfAID, channel);
     }
     /**
      * 给定明确的 channelType + selfAID 时直接计算路径（不扫描）。
      * 用于 caller 已经知道完整路由信息的场景（如 message-bridge 透传）。
      */
     resolveChatDirExact(channel, channelId, channelType, selfAID) {
-        return chatDirPath(this.sessionsDir, channelType, channelId, selfAID);
+        return chatDirPath(this.sessionsDir, channelType, channelId, selfAID, channel);
     }
     resolveChatDirFromSession(session) {
         if (!session.channelType) {
             throw new Error(`[SessionManager] missing channelType for session ${session.id}`);
         }
-        return chatDirPath(this.sessionsDir, session.channelType, session.channelId, session.selfAID);
+        return chatDirPath(this.sessionsDir, session.channelType, session.channelId, session.selfAID, session.channel);
     }
     deriveChannelIdentity(channel, channelId) {
         const parsed = tryParseChannelKey(channel);
@@ -253,7 +270,7 @@ export class SessionManager {
     }
     ensureChatDirForSession(session) {
         const channelType = session.channelType || session.channel;
-        return ensureChatDir(this.sessionsDir, channelType, session.channelId, session.selfAID);
+        return ensureChatDir(this.sessionsDir, channelType, session.channelId, session.selfAID, session.channel);
     }
     metaFilePath(chatDir, sessionId) {
         return path.join(chatDir, `${sessionId}.jsonl`);
@@ -678,7 +695,7 @@ export class SessionManager {
     getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, baseagent, selfAID, channelType, peerType, chatType) {
         // 使用精确路径（channelType + selfAID）
         const chatDir = (channelType && selfAID)
-            ? (() => { const d = chatDirPath(this.sessionsDir, channelType, channelId, selfAID); fs.mkdirSync(d, { recursive: true }); fs.mkdirSync(path.join(d, '_threads'), { recursive: true }); return d; })()
+            ? (() => { const d = chatDirPath(this.sessionsDir, channelType, channelId, selfAID, channel); fs.mkdirSync(d, { recursive: true }); fs.mkdirSync(path.join(d, '_threads'), { recursive: true }); return d; })()
             : this.ensureResolvedChatDirSafe(channel, channelId, channelType, selfAID);
         const threadIndex = readThreadIndex(chatDir);
         const existingEntry = threadIndex[threadId];
@@ -1097,18 +1114,20 @@ export class SessionManager {
             }
         }
     }
-    async createNewSession(channel, channelId, projectPath, name, baseagent) {
+    async createNewSession(channel, channelId, projectPath, name, baseagent, identityMetadata) {
         const inheritedChatType = this.getActiveChatType(channel, channelId);
         // Derive selfAID and channelType from existing sessions
         const existingDir = this.findExistingChatDir(channel, channelId);
         const identity = this.deriveChannelIdentity(channel, channelId);
         let channelType = identity.channelType;
         let selfAID = identity.selfAID;
+        let activeMetadata;
         if (existingDir) {
             const active = readJsonFile(path.join(existingDir, 'active.json'));
             if (active) {
                 channelType = active.channelType || channel;
                 selfAID = active.selfAID || '';
+                activeMetadata = active.metadata;
                 // 兼容旧字段名
                 const activeBaseagent = active.baseagent || active.agentType;
                 if (!baseagent && activeBaseagent)
@@ -1129,7 +1148,7 @@ export class SessionManager {
             baseagent,
             sessionKey: formatSessionKey(channelType, channelId, DEFAULT_THREAD_ID),
             chatType: inheritedChatType,
-            metadata: {},
+            metadata: newSessionStableMetadata(inheritedChatType, activeMetadata, identityMetadata),
             name: name || '默认会话',
             createdAt: Date.now(),
             updatedAt: Date.now(),
@@ -1257,7 +1276,7 @@ export class SessionManager {
      * 为超时后的独立话题创建新会话。保留聊天路由和稳定 metadata，
      * 但不继承任何底层 agent session 或临时任务状态。
      */
-    async createRenewedSession(sourceSession) {
+    async createRenewedSession(sourceSession, context) {
         const metadata = { ...(sourceSession.metadata || {}) };
         delete metadata.agentSessions;
         delete metadata.resumeAt;
@@ -1288,7 +1307,11 @@ export class SessionManager {
             projectPath: session.projectPath,
             name: session.name,
             chatType: session.chatType,
+            cause: 'renew',
+            sourceSessionId: sourceSession.id,
+            renewSource: context?.source,
             timestamp: Date.now(),
+            causation: context?.causation,
         });
         return session;
     }
@@ -1584,4 +1607,59 @@ export class SessionManager {
         }
         return null;
     }
+    /**
+     * Move legacy `sessions/wecom/<chatId>` directories under their persisted
+     * channelKey. The stored SessionFile.channel is authoritative; ambiguous
+     * directories are deliberately left untouched for manual recovery.
+     */
+    migrateWecomChannelDirs() {
+        const legacyDirs = scanChatDirs(this.sessionsDir)
+            .filter(entry => entry.channelType === 'wecom' && !entry.channelKey);
+        let migrated = 0;
+        for (const entry of legacyDirs) {
+            const candidates = [];
+            const active = readJsonFile(path.join(entry.dirPath, 'active.json'));
+            if (active)
+                candidates.push(active);
+            for (const metaFile of scanMetaFiles(entry.dirPath)) {
+                const meta = readLastJsonlLine(path.join(entry.dirPath, metaFile));
+                if (meta)
+                    candidates.push(meta);
+            }
+            const threadDir = path.join(entry.dirPath, '_threads');
+            for (const metaFile of scanMetaFiles(threadDir)) {
+                const meta = readLastJsonlLine(path.join(threadDir, metaFile));
+                if (meta)
+                    candidates.push(meta);
+            }
+            const channelKeys = new Set(candidates
+                .map(item => item.channel)
+                .filter((value) => typeof value === 'string' && value.startsWith('wecom#')));
+            if (channelKeys.size !== 1) {
+                if (channelKeys.size > 1) {
+                    logger.error(`[SessionManager] Cannot auto-migrate mixed WeCom session directory: ${entry.dirPath}`);
+                }
+                continue;
+            }
+            const channelKey = [...channelKeys][0];
+            const target = chatDirPath(this.sessionsDir, 'wecom', entry.channelId, undefined, channelKey);
+            if (target === entry.dirPath)
+                continue;
+            if (fs.existsSync(target)) {
+                logger.error(`[SessionManager] Cannot migrate WeCom session directory because target exists: ${target}`);
+                continue;
+            }
+            try {
+                fs.mkdirSync(path.dirname(target), { recursive: true });
+                fs.renameSync(entry.dirPath, target);
+                migrated++;
+            }
+            catch (error) {
+                logger.error(`[SessionManager] Failed to migrate WeCom session directory ${entry.dirPath}: ${String(error)}`);
+            }
+        }
+        if (migrated > 0) {
+            logger.info(`[SessionManager] Migrated ${migrated} WeCom session director${migrated === 1 ? 'y' : 'ies'} to channelKey isolation`);
+        }
+    }
 }

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

@@ -3,6 +3,8 @@ import { formatSessionKey, DEFAULT_THREAD_ID } from './session-key.js';
 export function sessionToFile(session) {
     const metadata = {};
     if (session.metadata) {
+        if (session.metadata.channelKey)
+            metadata.channelKey = session.metadata.channelKey;
         if (session.metadata.peerId)
             metadata.peerId = session.metadata.peerId;
         if (session.metadata.peerName)