evolcore 0.0.10 → 0.0.12

package/dist/core/runner-reload-transaction.js

@@ -0,0 +1,57 @@
+export async function disposeAgentInstances(instances, onError) {
+    await Promise.allSettled(instances.map(async (instance) => {
+        try {
+            await instance.agent.dispose?.();
+        }
+        catch (error) {
+            onError?.(instance, error);
+        }
+    }));
+}
+export function createRunnerReloadTransaction(input) {
+    const prefix = `${input.aid}::`;
+    const previous = [...input.agentMap.entries()]
+        .filter(([key]) => key.startsWith(prefix))
+        .map(([key, agent]) => {
+        const split = key.lastIndexOf('::');
+        return {
+            evolagentName: key.slice(0, split),
+            baseagent: key.slice(split + 2),
+            agent,
+        };
+    });
+    let committed = false;
+    let stagedDisposed = false;
+    const disposeStaged = async () => {
+        if (stagedDisposed)
+            return;
+        stagedDisposed = true;
+        await disposeAgentInstances(input.staged, input.onDisposeError);
+    };
+    return {
+        commit() {
+            if (committed)
+                return;
+            for (const instance of previous)
+                input.agentMap.delete(`${instance.evolagentName}::${instance.baseagent}`);
+            for (const instance of input.staged)
+                input.agentMap.set(`${instance.evolagentName}::${instance.baseagent}`, instance.agent);
+            committed = true;
+        },
+        async rollback() {
+            if (committed) {
+                for (const instance of input.staged)
+                    input.agentMap.delete(`${instance.evolagentName}::${instance.baseagent}`);
+                for (const instance of previous)
+                    input.agentMap.set(`${instance.evolagentName}::${instance.baseagent}`, instance.agent);
+                committed = false;
+            }
+            await disposeStaged();
+        },
+        async finalize() {
+            if (!committed)
+                return;
+            await disposeAgentInstances(previous, input.onDisposeError);
+        },
+    };
+}

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

@@ -11,7 +11,7 @@ import fs from 'fs';
 import os from 'os';
 function newSessionStableMetadata(chatType, ...sources) {
     const keys = chatType === 'group'
-        ? ['channelKey', 'groupId', 'groupName', 'dispatchMode']
+        ? ['channelKey', 'groupId', 'groupName', 'mentionMode']
         : ['channelKey', 'peerId', 'peerName', 'peerType'];
     const metadata = {};
     for (const source of sources) {
@@ -1135,6 +1135,10 @@ export class SessionManager {
         if (!baseagent) {
             throw new Error(`[SessionManager] createNewSession: baseagent is empty for channel=${channel} channelId=${channelId}`);
         }
+        const metadata = newSessionStableMetadata(inheritedChatType, activeMetadata, identityMetadata);
+        if (identityMetadata?.sessionBoundaryOperationId) {
+            metadata.sessionBoundaryOperationId = identityMetadata.sessionBoundaryOperationId;
+        }
         const session = {
             id: generateSessionId(),
             channel,
@@ -1146,7 +1150,7 @@ export class SessionManager {
             baseagent,
             sessionKey: formatSessionKey(channelType, channelId, DEFAULT_THREAD_ID),
             chatType: inheritedChatType,
-            metadata: newSessionStableMetadata(inheritedChatType, activeMetadata, identityMetadata),
+            metadata,
             name: name || '默认会话',
             createdAt: Date.now(),
             updatedAt: Date.now(),
@@ -1163,6 +1167,21 @@ export class SessionManager {
         });
         return session;
     }
+    /**
+     * Create and activate one fresh main session for a durable system operation.
+     * Replaying the same operation returns the already-created session.
+     */
+    async ensureNewMainSessionForOperation(opts) {
+        const active = this.getActiveSessionSync(opts.channel, opts.channelId);
+        if (active?.metadata?.sessionBoundaryOperationId === opts.operationId) {
+            return { session: active, created: false };
+        }
+        const session = await this.createNewSession(opts.channel, opts.channelId, opts.projectPath, undefined, opts.baseagent, {
+            ...(opts.identityMetadata ?? {}),
+            sessionBoundaryOperationId: opts.operationId,
+        });
+        return { session, created: true };
+    }
     async createForkedSession(sourceSession, forkedAgentSessionId, name) {
         const channelType = sourceSession.channelType || sourceSession.channel;
         const threadId = sourceSession.threadId || '';

package/dist/eck/manifest-engine.js

@@ -55,6 +55,10 @@ function loadAndMergeManifest(filename) {
         for (const s of base.sections)
             merged.set(s.id, { ...s });
         for (const s of override.sections) {
+            if (s.id === 'relation-group-profile' && merged.has('peer-profile')) {
+                logger.warn('[ManifestEngine] Ignoring deprecated patch section "relation-group-profile"; use "peer-profile" instead');
+                continue;
+            }
             const existing = merged.get(s.id);
             merged.set(s.id, existing ? { ...existing, ...s } : s);
         }
@@ -320,15 +324,35 @@ function resolvePath(rawPath, vars) {
     const r = resolvePathWithDiag(rawPath, vars);
     return r.status === 'ok' ? r.resolved : null;
 }
+function isWithinDirectory(filePath, directory) {
+    const relative = path.relative(path.resolve(directory), path.resolve(filePath));
+    return relative === '' || (!path.isAbsolute(relative) && relative !== '..' && !relative.startsWith(`..${path.sep}`));
+}
+/**
+ * 随包发布的 kits 内容只在 reload/重启后刷新；personal/relations 及用户自定义
+ * manifest 路径属于运行时数据，必须用 mtime 检查，否则同一 daemon 内会长期陈旧。
+ */
+function sectionCacheOptions(resolvedPath, vars) {
+    if (isWithinDirectory(resolvedPath, kitsDir())) {
+        return { policy: 'on-reload', group: 'kits' };
+    }
+    const personalDir = typeof vars.PERSONAL_DIR === 'string' ? vars.PERSONAL_DIR : null;
+    const selfAid = typeof vars.selfAid === 'string' ? vars.selfAid : null;
+    if (personalDir && selfAid && isWithinDirectory(resolvedPath, personalDir)) {
+        return { policy: 'mtime', group: `agent-files:${selfAid}` };
+    }
+    return { policy: 'mtime', group: 'eck-runtime' };
+}
 /** 加载 loop 的 child 子模板文件内容（路径解析 + fileCache）。找不到返回 null。 */
 export function loadChildTemplate(childFile, vars) {
     const resolved = resolvePath(childFile, vars);
     if (!resolved)
         return null;
-    return fileCache.getText(resolved, { policy: 'on-reload', group: 'kits' });
+    return fileCache.getText(resolved, sectionCacheOptions(resolved, vars));
 }
 /**
- * 返回 [filePath, rawContent][]；按 sessionId 缓存已读文件内容。
+ * 返回 [filePath, rawContent][]。kits 文件跨 session 缓存到 reload；运行时文件
+ * （personal/relations/用户自定义路径）每次按 mtime 检查。
  * 若传入 overflowOut 且目录段触发单目录限额（maxFiles/maxBytes），
  * 会把溢出信息写入 overflowOut.value（不传则不启用限额收集，行为同旧版但仍应用默认上限）。
  */
@@ -343,7 +367,7 @@ export function loadSectionFiles(section, vars, sessionCache, overflowOut) {
             return [];
         const maxFiles = section.maxFiles ?? DIR_MAX_FILES;
         const maxBytes = section.maxBytes ?? DIR_MAX_BYTES;
-        const { files, overflow } = readDirectoryFiles(resolved, section.pattern, maxFiles, maxBytes);
+        const { files, overflow } = readDirectoryFiles(resolved, section.pattern, maxFiles, maxBytes, vars);
         if (overflow && overflowOut)
             overflowOut.value = overflow;
         return files.map(([name, content]) => [path.join(resolved, name), content]);
@@ -351,31 +375,33 @@ export function loadSectionFiles(section, vars, sessionCache, overflowOut) {
     return [];
 }
 function loadFileSection(filePath, vars, sessionCache) {
-    void sessionCache; // 内容跨 session 共享，改走全局 fileCache（on-reload）
+    void sessionCache; // 内容跨 session 共享，统一走全局 fileCache
     const resolved = resolvePath(filePath, vars);
     if (!resolved)
         return null;
-    // 内容跨 session 共享：用全局 fileCache（on-reload，reload/重启时失效），
-    // 不再按 session 重复缓存同一文件内容。
-    const content = fileCache.getText(resolved, { policy: 'on-reload', group: 'kits' });
+    const content = fileCache.getText(resolved, sectionCacheOptions(resolved, vars));
     return content === null ? null : [resolved, content];
 }
 /**
  * 读取目录下匹配文件，受单目录限额（maxFiles/maxBytes）约束。
  * 返回已加载文件 + 溢出信息（超限时）。按 fileCache 缓存目录列表与文件内容。
  */
-function readDirectoryFiles(dirPath, pattern, maxFiles, maxBytes) {
+function readDirectoryFiles(dirPath, pattern, maxFiles, maxBytes, vars) {
     const glob = pattern || '*.md';
-    // 目录列表 + 各文件内容均走 fileCache（on-reload）。目录列表以 "<dir>|<glob>"
-    // 为键缓存文件名数组；各文件内容走 fileCache.getText 共享。
-    const names = fileCache.get(`${dirPath} ${glob}`, () => {
+    const cacheOptions = sectionCacheOptions(dirPath, vars);
+    const readNames = () => {
         try {
             return fs.readdirSync(dirPath).filter(f => matchGlob(f, glob)).sort();
         }
         catch {
             return [];
         }
-    }, { policy: 'on-reload', group: 'kits' });
+    };
+    // synthetic cache key 无法用文件 mtime 门控。kits 目录结构只在 reload 后刷新；
+    // 运行时目录直接重扫，确保新增/删除文件在同一 session 内可见。
+    const names = cacheOptions.policy === 'on-reload'
+        ? fileCache.get(`${dirPath} ${glob}`, readNames, cacheOptions)
+        : readNames();
     const out = [];
     let usedBytes = 0;
     let overflow;
@@ -387,7 +413,7 @@ function readDirectoryFiles(dirPath, pattern, maxFiles, maxBytes) {
             break;
         }
         const fp = path.join(dirPath, f);
-        const content = fileCache.getText(fp, { policy: 'on-reload', group: 'kits' });
+        const content = fileCache.getText(fp, sectionCacheOptions(fp, vars));
         if (content === null)
             continue;
         // 字节限额（至少加载一个文件，避免单个超大文件导致空目录）