evolcore 0.0.35 → 0.0.36

package/dist/core/memory/consolidation.js

@@ -9,6 +9,7 @@
  * `execution.memoryMode` 会经 session.metadata 透传到渲染层与 ipc 的权限校验。
  */
 import fs from 'fs';
+import { getPrimaryOwner, ownerResolver } from '../ownership/owner-resolver.js';
 import path from 'path';
 import { agentDir, resolveRoot } from '../../paths.js';
 import { serializeConsolidationContext } from './consolidation-context.js';
@@ -16,6 +17,7 @@ import { assertSystemSessionLaunchable } from '../system-session/registry.js';
 import { resolveAgentLifecycle } from '../../config/lifecycle.js';
 import { ensureSessionRuntimeDir } from '../../cli/task-context.js';
 import { formatChannelKey } from '../channel-loader.js';
+import { isTopicThreadId } from '../thread/topic-id.js';
 import { logger } from '../../utils/logger.js';
 import { appendOpsRecord, feedbackFilePath, readFeedbackText } from './consolidation-ops-records.js';
 import { updateBatchMeta } from './batch-meta.js';
@@ -76,10 +78,13 @@ export async function launchConsolidation(channel, params) {
     const selfAid = effectiveCtx.selfAid;
     if (!selfAid)
         throw new Error('无法确定当前 agent AID（selfAid 为空）');
+    const baseagent = effectiveCtx.baseagent?.trim();
+    if (!baseagent)
+        throw new Error(`无法确定记忆整理会话的 baseagent（agent=${selfAid}）`);
     // 系统会话标记：类型 / subtype 必须已注册，runner 必须受支持（Gemini 拒绝）。
     // 放在认领 processing 之前，拒绝时不留副作用。
     const systemSession = { type: 'memory', subtype: mode };
-    assertSystemSessionLaunchable(systemSession, effectiveCtx.baseagent ?? 'claude');
+    assertSystemSessionLaunchable(systemSession, baseagent);
     const blockedReason = consolidationBlockedReason(selfAid);
     if (blockedReason)
         throw new Error(blockedReason);
@@ -129,7 +134,6 @@ export async function launchConsolidation(channel, params) {
             restorePendingNotes(memoryDir);
         throw error;
     }
-    const baseagent = effectiveCtx.baseagent ?? 'claude';
     const now = Date.now();
     const scopeTag = params.scopeOverride ? `-${params.scopeOverride}` : '';
     const kind = `memory-consolidate-${mode}${scopeTag}`;
@@ -141,8 +145,9 @@ export async function launchConsolidation(channel, params) {
         channelId: effectiveCtx.peerId,
         channelType: effectiveCtx.channel,
         peerId: effectiveCtx.peerId,
-        session: effectiveCtx.threadId ? 'thread' : 'main',
-        ...(effectiveCtx.threadId ? { threadId: effectiveCtx.threadId } : {}),
+        // 主话题的规范 id 不是话题会话：反馈落到该关系的主话题，线上形态不带 thread_id。
+        session: isTopicThreadId(effectiveCtx.threadId) ? 'thread' : 'main',
+        ...(isTopicThreadId(effectiveCtx.threadId) ? { threadId: effectiveCtx.threadId } : {}),
         delivery: { chatType: effectiveCtx.chatType ?? 'private' },
     } : undefined;
     const projectPath = params.projectPath ?? path.join(resolveRoot(), 'agents', selfAid);
@@ -202,7 +207,7 @@ export async function launchConsolidation(channel, params) {
             logger.warn(`[Memory] 整理会话未正常结束（mode=${mode}，outcome=${r.outcome}）: ${r.error ?? ''}`);
         }
     });
-    logger.info(`[Memory] 已拉起整理会话（mode=${mode}，triggeredBy=${triggeredBy}，` +
+    logger.info(`[Memory] 已拉起整理会话（mode=${mode}，triggeredBy=${triggeredBy}，baseagent=${baseagent}，` +
         `selfAid=${selfAid}${effectiveCtx.peerKey ? `，peerKey=${effectiveCtx.peerKey}` : ''}` +
         `${executionSessionId ? `，session=${executionSessionId}` : ''}）`);
     return {
@@ -455,7 +460,8 @@ export function createConsolidationSessionFinalizer({ sessionManager, getAgent,
                             const { collectCandidates, isDueForReview, deferCandidate } = await import('./staleness.js');
                             const selfAid = session.selfAID;
                             if (selfAid) {
-                                const memoryConfig = getAgent(selfAid)?.config.memory;
+                                const agent = getAgent(selfAid);
+                                const memoryConfig = agent?.config.memory;
                                 const thresholds = { forgetAfterDays: memoryConfig?.forgetAfterDays ?? 3 };
                                 const now = Date.now();
                                 const affectedScopes = collectAffectedScopes(batchDir);
@@ -478,8 +484,8 @@ export function createConsolidationSessionFinalizer({ sessionManager, getAgent,
                                         continue;
                                     }
                                     if (due > 0) {
-                                        const ownerAid = memoryConfig ? getAgent(selfAid)?.config.owners?.[0] : undefined;
-                                        const taskCtx = { selfAid, peerKey: meta.peerKey };
+                                        const ownerAid = memoryConfig ? getPrimaryOwner(selfAid) : undefined;
+                                        const taskCtx = { selfAid, peerKey: meta.peerKey, baseagent: agent?.baseagent };
                                         void enqueueConsolidation({
                                             taskCtx,
                                             mode: 'forget',
@@ -592,7 +598,7 @@ export function createConsolidationFeedbackSender(getChannel) {
         const threadId = origin.threadId;
         const chatType = origin.delivery?.chatType;
         const replyContext = {};
-        if (threadId)
+        if (isTopicThreadId(threadId))
             replyContext.threadId = threadId;
         if (chatType)
             replyContext.delivery = { chatType };
@@ -799,12 +805,14 @@ export function registerConsolidationLaunchExecutor({ ipcServer, enqueueConsolid
 }
 export function registerConsolidationCheckExecutor({ ipcServer, agentRegistry, enqueueConsolidation, }) {
     ipcServer.setConsolidationCheckExecutor(async ({ selfAid }) => {
-        const agentConfig = agentRegistry.get(selfAid)?.config;
+        const agent = agentRegistry.get(selfAid);
+        const agentConfig = agent?.config;
         if (agentConfig?.memory?.enableRelation === false)
             return { launched: [] };
         if (consolidationBlockedReason(selfAid))
             return { launched: [] };
-        const ownerAid = agentConfig?.owners?.[0];
+        await ownerResolver.refresh(selfAid);
+        const ownerAid = getPrimaryOwner(selfAid);
         const agentCount = agentRegistry.runnableAgents().length;
         const relationsDir = path.join(agentDir(selfAid), 'relations');
         let relationCount = 0;
@@ -828,11 +836,11 @@ export function registerConsolidationCheckExecutor({ ipcServer, agentRegistry, e
             const taskCtx = {
                 selfAid,
                 peerKey: candidate.peerKey,
-                baseagent: undefined,
+                baseagent: agent?.baseagent,
                 sessionId: undefined,
             };
             try {
-                await enqueueConsolidation({
+                const result = await enqueueConsolidation({
                     taskCtx,
                     mode: candidate.mode,
                     triggeredBy: 'periodic-trigger',
@@ -840,6 +848,8 @@ export function registerConsolidationCheckExecutor({ ipcServer, agentRegistry, e
                     forgetAfterDays: agentConfig?.memory?.forgetAfterDays,
                     ...(candidate.scope ? { scopeOverride: candidate.scope } : {}),
                 });
+                if (!result)
+                    continue;
                 launched.push({ mode: candidate.mode, ...(candidate.peerKey ? { peerKey: candidate.peerKey } : {}) });
             }
             catch (error) {
@@ -865,7 +875,8 @@ export function registerRelationConsolidationEvents({ eventBus, agentRegistry, r
             const memoryConfig = agentRegistry.get(taskCtx.selfAid)?.config?.memory;
             if (memoryConfig?.enableRelation === false)
                 return;
-            const ownerAid = agentRegistry.get(taskCtx.selfAid)?.config?.owners?.[0];
+            await ownerResolver.refresh(taskCtx.selfAid);
+            const ownerAid = getPrimaryOwner(taskCtx.selfAid);
             await enqueueConsolidation({
                 taskCtx,
                 mode: 'notes',