evolcore 0.0.39 → 0.0.40

package/dist/core/command/slash-handler.js

@@ -10,8 +10,9 @@ import crypto from 'crypto';
 import path from 'path';
 import fs from 'fs';
 import { ensureFreshPackageVersionInfo, refreshManagedPackageVersions } from '../../utils/package-version-info.js';
+import { loadDaemonConfig } from '../../config-store.js';
 import { remoteAccessService } from '../auth/remote-access-store.js';
-import { read as cfgRead, resolveEffective, routeFieldPath, write as cfgWrite, } from '../../config/config-manager.js';
+import { read as cfgRead, resolveEffective, routeFieldPath, write as cfgWrite, ConfigTarget, } from '../../config/config-manager.js';
 import { execAgentAction } from './agent-control.js';
 import { handleMemorySlash, memoryHelpEntries } from './memory-slash.js';
 import { handleSkillSlash, skillHelpEntries } from './skill-slash.js';
@@ -21,11 +22,12 @@ import { getDaemonOwners, ownerResolver, refreshOwnershipForAuthorization, OWNER
 import { authorizationNextStep, formatAuthorizationDenial } from '../auth/authorization-denial.js';
 import { resolvePermissionMode, writeScope } from '../model/config-scope.js';
 import { formatPeerKey } from '../relation/peer-identity.js';
+import { auditFullAccessEvent } from '../auth/authorization-audit.js';
 import { isMainSession, isTopicSession, isTopicThreadId, sessionTopicThreadId } from '../thread/topic-id.js';
 import { modelMatches, getCatalog, assertCatalogSelectable, resolveCatalogModel, CONFIGURABLE_EFFORTS, configurableEfforts } from '../model/model-catalog.js';
 import { formatModelCheck, runModelCheck } from '../model/model-diagnostics.js';
 import { constrainResolvedModelForRole, filterModelsForRole, validateModelSelectionForRole } from '../model/model-permission.js';
-import { resolveRuntimeStringField } from '../role/runtime-policy.js';
+import { isAgentFullAccessOwner, resolveRuntimeStringField, sessionFullAccessStatus, } from '../role/runtime-policy.js';
 import { displaySessionTitle } from '../session/session-title.js';
 import { chatmodeFieldForPeer, isPrivateChatmodeRoleLocked, resolveChatModeForField } from '../message/peer-mode.js';
 import { normalizePermissionMode as normalizePermissionModeContract, PUBLIC_PERMISSION_MODES } from '../permission/mode.js';
@@ -33,7 +35,7 @@ import { isManagementRole } from '../../config/builtin-roles.js';
 import { isSystemControlChannel } from '../system-channels.js';
 import { launchMonitorAndConfirm, resolveMonitorLaunch, cleanupMonitorStage, isProcessRunning } from '../../utils/cross-platform.js';
 import { scanInstances } from '../../utils/instance-registry.js';
-import { guardIdleCommand, guardGroupSlashCommand, guardKnownCommand, guardRoleCommand, guardThreadCommand, isRecognizedSlashCommand, normalizeSlashContent, probeSessionActivity, } from './slash-gate.js';
+import { guardIdleCommand, guardGroupSlashCommand, guardKnownCommand, guardRoleCommand, guardThreadCommand, isRecognizedSlashCommand, normalizeSlashContent, parseFullAccessCommand, probeSessionActivity, } from './slash-gate.js';
 import { MAX_AUN_ATTACHMENT_SIZE } from '../../aun/msg/upload.js';
 import { DEFAULT_SESSION_LOOP_SECONDS, MAX_SESSION_LOOP_SECONDS, MIN_SESSION_LOOP_SECONDS, refreshSessionLoopTarget, resolveCurrentSessionLoopTarget, sessionLoopPayload, validateIdleSeconds, writeSessionLoopConfig, } from '../session/session-idle-monitor.js';
 const allEfforts = CONFIGURABLE_EFFORTS;
@@ -400,6 +402,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     const narrowedChatType = chatType === 'group' ? 'group' : chatType === 'private' ? 'private' : undefined;
     await refreshOwnershipForAuthorization(selfAID ?? this.agentRegistry?.resolveByChannel(channel)?.aid ?? this.resolveSelfAID(channel), {
         maxAgeMs: OWNERSHIP_CACHE_MAX_AGE_MS,
+        allowTransient: true,
     });
     const identityConversationId = narrowedChatType === 'group' ? channelId : userId;
     const resolvedIdentity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, narrowedChatType, identityConversationId);
@@ -523,6 +526,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         || normalizedContent === '/reload'
         || normalizedContent.startsWith('/reload ')
         || normalizedContent === '/pair'
+        || normalizedContent === '/fa'
+        || normalizedContent === '/fullaccess'
+        || normalizedContent.startsWith('/fa ')
+        || normalizedContent.startsWith('/fullaccess ')
         || /^\/diag(?:\s|$)/.test(normalizedContent);
     const roleGuard = guardRoleCommand(normalizedContent, activeChatType, isAdmin || (isDaemonOwner && isProcessLevelSlash));
     if (roleGuard)
@@ -622,6 +629,71 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             return { kind: 'command.error', text: `❌ ${error instanceof Error ? error.message : String(error)}` };
         }
     }
+    const fullAccessControl = parseFullAccessCommand(normalizedContent);
+    if (fullAccessControl.matched) {
+        if (activeChatType === 'group' || source === 'card-trigger') {
+            return { kind: 'command.error', text: '❌ /fa 仅支持私聊中的当前 EC 会话' };
+        }
+        const commandSession = await getExistingSessionForCommand();
+        const agentAid = authSubject.selfAid ?? selfAID;
+        const principalId = authSubject.principalId;
+        if (!commandSession || !agentAid) {
+            return { kind: 'command.error', text: '❌ 当前没有可绑定的 EC 会话' };
+        }
+        if (this.messageQueue.isProcessing(commandSession.id) || this.messageQueue.getQueueLength(commandSession.id) > 0) {
+            return { kind: 'command.error', text: '❌ 当前会话有任务执行中，结束后再修改 fullaccess' };
+        }
+        if (!principalId || !authSubject.isDaemonOwner || !isAgentFullAccessOwner(agentAid, principalId)) {
+            return { kind: 'command.error', text: '❌ /fa 需要同一身份同时具备 Agent Owner 和 daemon Owner 权限' };
+        }
+        if (fullAccessControl.action === 'status') {
+            const status = sessionFullAccessStatus(commandSession, principalId);
+            const scope = isTopicSession(commandSession) ? 'session' : 'agent';
+            return {
+                kind: 'command.result',
+                text: '当前 fullaccess（' + scope + '，session=' + commandSession.id + '）：'
+                    + (status.effective ? '开启' : '关闭'),
+            };
+        }
+        const enabled = fullAccessControl.action === 'on';
+        try {
+            if (isTopicSession(commandSession)) {
+                const latest = await this.sessionManager.getThreadSession(channel, channelId, threadId);
+                if (!latest || latest.id !== commandSession.id || !isTopicSession(latest)) {
+                    return { kind: 'command.error', text: '❌ 当前话题已发生变化，请重新执行 /fa' };
+                }
+                this.sessionManager.updateSessionFullAccess(latest.id, { enabled, authorizedBy: principalId });
+            }
+            else {
+                const latest = await this.sessionManager.getActiveSession(channel, channelId);
+                if (!latest || latest.id !== commandSession.id || !isMainSession(latest)) {
+                    return { kind: 'command.error', text: '❌ 当前主会话已发生变化，请重新执行 /fa' };
+                }
+                const config = cfgRead(ConfigTarget.Agent, { self: agentAid }, { cache: false });
+                if (!config)
+                    return { kind: 'command.error', text: '❌ 找不到当前 Agent 配置' };
+                config.fullaccess = { enabled };
+                cfgWrite(ConfigTarget.Agent, config, { self: agentAid });
+            }
+            auditFullAccessEvent({
+                event: enabled ? 'fullaccess.session-policy.configured' : 'fullaccess.session-policy.deescalated',
+                source: 'session-policy',
+                actorId: principalId,
+                processRole: 'daemon-owner',
+                agentAid,
+                sessionId: commandSession.id,
+                authorizedBy: principalId,
+                reason: isTopicSession(commandSession) ? 'topic session fullaccess updated' : 'Agent main-session fullaccess updated',
+            });
+            return {
+                kind: 'command.result',
+                text: '✅ 当前 EC 会话 fullaccess 已' + (enabled ? '开启' : '关闭'),
+            };
+        }
+        catch (error) {
+            return { kind: 'command.error', text: '❌ ' + (error instanceof Error ? error.message : String(error)) };
+        }
+    }
     const interruptPausedSessionBeforeReplacement = async (commandSession) => {
         if (commandSession && (this.processor?.isPauseRequested?.(commandSession.id) ?? false)) {
             this.eventBus.publish({
@@ -629,6 +701,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 sessionId: commandSession.id,
                 reason: 'stop',
                 agentName: this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>',
+                agentAid: commandSession.selfAID,
             });
             await this.processor.interruptSession(commandSession.id, 'stop');
             this.processor?.clearPauseSession?.(commandSession.id);
@@ -775,7 +848,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const appendProcessCommands = (lines) => {
             if (!isDaemonOwner)
                 return;
-            lines.push('', '🛠️ 进程级运维：', '  /restart - 重启服务', '  /upgrade - 检查版本更新', '  /reload [aid] - 热重载 Agent 配置', '  /fa <提示词> - 单次使用宿主级 fullaccess 执行（别名: /fullaccess）', '  /pair - 获取远程控制配对码', '  /diag <问题描述> - 邀请或追加远程诊断；/diag stop 撤销授权');
+            lines.push('', '🛠️ 进程级运维：', '  /restart - 重启服务', '  /upgrade - 检查版本更新', '  /reload [aid] - 热重载 Agent 配置', '  /fa [on|off] - 查看或切换当前 EC 会话 fullaccess', '  /pair - 获取远程控制配对码', '  /diag <问题描述> - 邀请或追加远程诊断；/diag stop 撤销授权');
         };
         if (!isAdmin && activeChatType === 'group') {
             const lines = [
@@ -907,7 +980,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             ...(isDaemonOwner ? [
                 '  /restart - 重启服务',
                 '  /reload [aid] - 热重载 Agent 配置',
-                '  /fa <提示词> - 单次使用宿主级 fullaccess 执行（别名: /fullaccess）',
+                '  /fa [on|off] - 查看或切换当前 EC 会话 fullaccess',
                 '  /pair - 获取远程控制配对码',
             ] : []),
             ...(!isDaemonOwner && isAdmin ? [
@@ -1067,7 +1140,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             cmds.push({ command: '/observable', args: '[true|false]', description: '查看或切换观察者模式', category: '运维', roles: ['owner'] });
         }
         if (isDaemonOwner) {
-            cmds.push({ command: '/fa', aliases: ['/fullaccess'], args: '<提示词>', description: '仅让当前提示词对应的 run 使用宿主级 fullaccess', category: '权限管理', roles: ['daemon-owner'] });
+            cmds.push({ command: '/fa', aliases: ['/fullaccess'], args: '[on|off]', description: '查看或切换当前 EC 会话 fullaccess', category: '权限管理', roles: ['daemon-owner'] });
             cmds.push({ command: '/restart', description: '重启服务', category: '运维', roles: ['daemon-owner'] });
             cmds.push({ command: '/upgrade', description: '检查版本更新', category: '运维', roles: ['daemon-owner'] });
             cmds.push({ command: '/reload', args: '[aid]', description: '热重载 Agent 配置', category: '运维', roles: ['daemon-owner'] });
@@ -2475,6 +2548,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             sessionId: sessionKey,
             reason: 'stop',
             agentName: this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>',
+            agentAid: stopSession.selfAID,
         });
         await this.processor.interruptSession(sessionKey, 'stop');
         return { kind: 'command.result', text: '✓ 已发送中断信号，任务将尽快停止' };
@@ -3214,7 +3288,16 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 logger.warn(`[System] Refusing restart without a valid explicit delivery route: channel=${channel} channelId=${channelId}`);
                 return false;
             }
+            let autoUpgrade = true;
             if (!suppressRealRestart) {
+                try {
+                    autoUpgrade = loadDaemonConfig().upgrade?.autoOnStart !== false;
+                }
+                catch {
+                    autoUpgrade = false;
+                }
+            }
+            if (!suppressRealRestart && autoUpgrade) {
                 await ensureFreshPackageVersionInfo(undefined, {
                     source: 'slash-restart',
                     log: message => logger.info(`[System] ${message}`),
@@ -3251,7 +3334,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                         cleanupMonitorStage(monitorEntry.stageDir);
                     return { code: 'RESTART_PENDING_CONFIRMATION', reason: '已有重启请求正在处理', requestId: restartInfo.requestId };
                 }
-                const confirmation = await launchMonitorAndConfirm([...monitorEntry.args, 'restart-monitor'], { EVOLCORE_HOME: resolvePaths().root, ...monitorEntry.env, [RESTART_REQUEST_ID_ENV]: restartInfo.requestId }, pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid === pid
+                const confirmation = await launchMonitorAndConfirm([...monitorEntry.args, 'restart-monitor', autoUpgrade ? '--apply-package-upgrades' : '--skip-package-upgrades'], { EVOLCORE_HOME: resolvePaths().root, ...monitorEntry.env, [RESTART_REQUEST_ID_ENV]: restartInfo.requestId }, pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid === pid
                     && m.record.requestId === restartInfo.requestId && m.record.phase === 'accepted'), pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid !== pid
                     && m.record.requestId === restartInfo.requestId && m.record.phase === 'accepted'), {
                     requestId: restartInfo.requestId,

package/dist/core/event-catalog.js

@@ -318,6 +318,7 @@ const CATALOG = [
             { path: 'durationMs', type: 'number', optional: true },
             { path: 'terminalReason', type: 'string', optional: true },
             { path: 'agentName', type: 'string', optional: true },
+            { path: 'agentAid', type: 'string', optional: true },
             { path: 'numTurns', type: 'number', optional: true },
             { path: 'encrypted', type: 'boolean', optional: true },
             { path: 'timestamp', type: 'number', optional: true },
@@ -354,6 +355,7 @@ const CATALOG = [
             { path: 'generation', type: 'number', optional: true },
             { path: 'reason', type: 'string', optional: true },
             { path: 'agentName', type: 'string', optional: true },
+            { path: 'agentAid', type: 'string', optional: true },
             { path: 'encrypted', type: 'boolean', optional: true },
         ],
     },

package/dist/core/interaction-router.js

@@ -290,7 +290,8 @@ export function renderActionAsText(req) {
     lines.push('', '回复:');
     for (const btn of action.buttons) {
         const arg = fb.buttonArgMap?.[btn.key] ?? btn.key;
-        lines.push(`  /${fb.command} ${arg}    ← ${btn.label}`);
+        const label = action.recommendedOption === btn.key ? `💡 ${btn.label}` : btn.label;
+        lines.push(`  /${fb.command} ${arg}    ← ${label}`);
     }
     if (fb.acceptFreeText && fb.freeTextHint) {
         lines.push(`  ${fb.freeTextHint}`);

package/dist/core/ipc-registration.js

@@ -11,7 +11,6 @@ import { agentDir } from '../paths.js';
 import { parsePeerKey } from './relation/peer-identity.js';
 import { resolvePeerRoleDetail } from '../config/peer-role-resolver.js';
 import { buildDebugTaskContext } from './auth/debug-context.js';
-import { computeBuildId } from '../utils/evolcore-version.js';
 import { loadAgent } from '../config-store.js';
 import { executeLocalInitializationCommand, hasSuppliedInitialization } from '../cli/agent-create.js';
 import { remoteAccessService } from './auth/remote-access-store.js';
@@ -25,7 +24,7 @@ import { createTriggerBaseagentResolver, registerTriggerIpcExecutor } from '../t
 import { createThreadOperationExecutor } from './thread/ipc-operation.js';
 import { isLinkedInstall } from '../utils/npm-ops.js';
 import { buildSystemSessionContext, getSystemSessionModule } from './system-session/registry.js';
-export function registerDaemonIpc({ ipcServer, agentRegistry, agentDelegationRegistry, sessionManager, statsCollector, aidStatsCollector, responseEngine, messageQueue, agentMap, commandHandler, channelInstances, eventBus, handoffRuntime, reloadCoordinator, agentApplicationService, agentInitializationService, enqueueConsolidation, completeAgentBootstrap, contactBinds, bindService, diagService, getProcessOwners, getControlAidState, daemonAid, triggerControlToken, triggerSchedulers, daemonTriggerOwner, primaryAgent, triggerAuthorization, }) {
+export function registerDaemonIpc({ ipcServer, agentRegistry, agentDelegationRegistry, sessionManager, statsCollector, aidStatsCollector, responseEngine, messageQueue, agentMap, commandHandler, channelInstances, eventBus, handoffRuntime, reloadCoordinator, agentApplicationService, agentInitializationService, enqueueConsolidation, requestRelationSweep, completeAgentBootstrap, contactBinds, bindService, diagService, getProcessOwners, getControlAidState, daemonAid, triggerControlToken, triggerSchedulers, daemonTriggerOwner, primaryAgent, triggerAuthorization, }) {
     const authorizeManagedAgentOperation = createDelegationAuthorizer({
         agentDelegationRegistry,
         sessionManager,
@@ -229,7 +228,7 @@ export function registerDaemonIpc({ ipcServer, agentRegistry, agentDelegationReg
     });
     registerAunIpcSender({ ipcServer, channelInstances, agentDelegationRegistry, responseEngine, handoffRuntime, triggerSchedulers, sessionManager });
     ipcServer.setAgentReloadExecutor((aid, options) => reloadCoordinator.reload(aid, options));
-    registerConsolidationCheckExecutor({ ipcServer, agentRegistry, enqueueConsolidation });
+    registerConsolidationCheckExecutor({ ipcServer, agentRegistry, enqueueConsolidation, requestRelationSweep });
     ipcServer.setInitializationExecutor(async (command) => executeLocalInitializationCommand(agentInitializationService, command));
     ipcServer.setAgentApplicationService(agentApplicationService);
     registerQueueIpcProviders({ ipcServer, statsCollector, agentRegistry, messageQueue });
@@ -288,10 +287,12 @@ export function createIpcStatusProvider(dependencies) {
         return {
             pid: process.pid,
             uptime: snapshot.uptimeMs,
+            ...(dependencies.runMode ? { runMode: dependencies.runMode } : {}),
+            ...(dependencies.host ? { host: dependencies.host } : {}),
             build: {
                 runtimeMode: dependencies.runtimeIsDist ? 'dist' : 'source',
                 runtimeId: dependencies.runtimeBuildIdentity.id,
-                diskDistId: computeBuildId(dependencies.diskDistDir),
+                diskDistId: dependencies.diskDistId ?? null,
                 entry: dependencies.runtimeBuildIdentity.entry,
                 version: dependencies.runtimeBuildIdentity.version,
             },
@@ -302,9 +303,26 @@ export function createIpcStatusProvider(dependencies) {
                 runningAgents: agents.filter(agent => agent.status === 'running').length,
                 ...(runtimeError ? { error: runtimeError } : {}),
             },
+            ...(dependencies.baseagents ? {
+                baseagents: {
+                    source: 'runtime-cache',
+                    items: dependencies.baseagents.baseagents.map(baseagent => ({
+                        ...baseagent,
+                        state: baseagent.loaded === true
+                            ? 'ready'
+                            : baseagent.detected === true
+                                ? 'available'
+                                : baseagent.detected === false
+                                    ? 'unavailable'
+                                    : 'unknown',
+                    })),
+                },
+            } : {}),
             channels,
             channelsByType,
             queue: { pending: dependencies.messageQueue.getGlobalQueueLength(), processing: dependencies.messageQueue.getGlobalProcessingCount() },
+            ...(dependencies.getTriggerSummary ? { triggers: dependencies.getTriggerSummary() } : {}),
+            ...(dependencies.getStatusSnapshot ? dependencies.getStatusSnapshot() : {}),
             stats: {
                 received: snapshot.lastHour.received,
                 sent: snapshot.lastHour.sent,
@@ -455,6 +473,7 @@ export function registerQueueIpcProviders({ ipcServer, statsCollector, agentRegi
         const snapshots = statsCollector.getSnapshots(agents.map(agent => agent.aid));
         return agents.map((agent) => {
             const snapshot = snapshots.get(agent.aid);
+            const queueAgentName = agentRegistry.get(agent.aid)?.name ?? agent.aid;
             return {
                 aid: agent.aid,
                 received: snapshot.lastHour.received,
@@ -463,9 +482,9 @@ export function registerQueueIpcProviders({ ipcServer, statsCollector, agentRegi
                 errors: snapshot.lastHour.errors,
                 interrupts: snapshot.lastHour.interrupts,
                 avgResponseMs: snapshot.lastHour.avgResponseMs,
-                processing: messageQueue.getProcessingCountByAgent(agent.aid),
-                queued: messageQueue.getQueueLengthByAgent(agent.aid),
-                muted: messageQueue.isAgentMuted(agent.aid),
+                processing: messageQueue.getProcessingCountByAgent(queueAgentName),
+                queued: messageQueue.getQueueLengthByAgent(queueAgentName),
+                muted: messageQueue.isAgentMuted(queueAgentName),
             };
         });
     });

package/dist/core/memory/batch-meta.js

@@ -95,6 +95,8 @@ export function updateBatchMeta(batchDir, updates) {
             finishedAt: updates.finishedAt,
             success: updates.success,
             ...(updates.agentSessionId ? { agentSessionId: updates.agentSessionId } : {}),
+            ...(updates.requestedModel ? { requestedModel: updates.requestedModel } : {}),
+            ...(updates.actualModel ? { actualModel: updates.actualModel } : {}),
             ...(updates.failureReason ? { failureReason: updates.failureReason } : {}),
         };
         // 更新 feedback 正文

package/dist/core/memory/consolidation-context.js

@@ -38,6 +38,10 @@ export const MODE_SCOPE = {
     promote: 'owner',
     profile: 'relation',
 };
+/** 系统自动发起、不向对端发反馈的触发来源。 */
+export function isSilentConsolidationTrigger(triggeredBy) {
+    return triggeredBy === 'periodic-trigger' || triggeredBy === 'relation-idle';
+}
 // 超期判据集中在 staleness.ts；这里做转发，保证 trigger 与 context 用同一套规则
 export { DEFAULT_FORGET_AFTER_DAYS, LONG_TERM_REVIEW_DAYS } from './staleness.js';
 // ── Checkpoint 读写 ──────────────────────────────────────────────────────────
@@ -136,6 +140,7 @@ function buildScopeContext(scope, input, selfAid,
 /** 候选来源作用域，默认与本作用域一致 */
 sourceScope) {
     const memoryDir = memoryDirOf(scope, selfAid, input.taskCtx.peerKey, input.ownerAid);
+    // 整理一律按关系进行：generalize / promote 的候选只来自本次会话所属关系（taskCtx.peerKey）。
     const candidateSourceDir = sourceScope === undefined || sourceScope === scope
         ? path.join(memoryDir, 'consolidated')
         : path.join(memoryDirOf(sourceScope, selfAid, input.taskCtx.peerKey, input.ownerAid), 'consolidated');
@@ -212,14 +217,24 @@ function scanCandidates(consolidatedDir, pick) {
     out.sort((a, b) => a.relPath.localeCompare(b.relPath));
     return out;
 }
+/**
+ * 给关系级候选补上来源关系前缀：`consolidated/x.md` → `<peerKey>/consolidated/x.md`。
+ * generalize / promote 的产出层（agent / owner）与候选层（relation）不同，不带前缀的
+ * 路径在产出层会解析成同名文件。
+ */
+function withPeerPrefix(candidates, peerKey) {
+    if (!peerKey)
+        return candidates;
+    return candidates.map(c => ({ ...c, relPath: `${peerKey}/${c.relPath}` }));
+}
 /** 按模式填充候选清单。 */
-function fillCandidates(ctx, mode, forgetAfterDays) {
+function fillCandidates(ctx, mode, forgetAfterDays, sourcePeerKey) {
     const source = ctx.candidateSourceDir ?? ctx.consolidatedDir;
     if (mode === 'generalize') {
-        ctx.candidates = scanCandidates(source, ({ tags }) => tags.includes('to-generalize'));
+        ctx.candidates = withPeerPrefix(scanCandidates(source, ({ tags }) => tags.includes('to-generalize')), sourcePeerKey);
     }
     else if (mode === 'promote') {
-        ctx.candidates = scanCandidates(source, ({ tags }) => tags.includes('to-promote'));
+        ctx.candidates = withPeerPrefix(scanCandidates(source, ({ tags }) => tags.includes('to-promote')), sourcePeerKey);
     }
     else if (mode === 'profile') {
         ctx.candidates = scanCandidates(source, () => true);
@@ -227,50 +242,15 @@ function fillCandidates(ctx, mode, forgetAfterDays) {
     else if (mode === 'forget') {
         const now = Date.now();
         const thresholds = { forgetAfterDays };
-        // forget + scope=agent：扫描所有 relation 的 consolidated 目录，以及 agent 自身的 consolidated
-        if (ctx.scope === 'agent') {
-            ctx.candidates = [];
-            // ctx.consolidatedDir 是 agents/<selfAid>/personal/memory/consolidated，
-            // 往上走三级才是 agents/<selfAid>
-            const agentDir = path.dirname(path.dirname(path.dirname(ctx.consolidatedDir)));
-            const relationsRoot = path.join(agentDir, 'relations');
-            if (fs.existsSync(relationsRoot)) {
-                for (const peerKey of fs.readdirSync(relationsRoot)) {
-                    const consolidatedDir = path.join(relationsRoot, peerKey, 'memory', 'consolidated');
-                    if (fs.existsSync(consolidatedDir)) {
-                        const candidates = collectCandidates(consolidatedDir, thresholds, now)
-                            .filter(info => isDueForReview(info, thresholds, now))
-                            .map(info => ({
-                            relPath: `${peerKey}/consolidated/${info.name}`,
-                            description: readFmValue(info.content, 'description') ?? info.name.replace(/\.md$/, ''),
-                            tags: info.tags,
-                        }));
-                        ctx.candidates.push(...candidates);
-                    }
-                }
-            }
-            // agent 自身的 consolidated（原 ⑤b 拉起 forget/agent 的来源）
-            if (fs.existsSync(ctx.consolidatedDir)) {
-                const own = collectCandidates(ctx.consolidatedDir, thresholds, now)
-                    .filter(info => isDueForReview(info, thresholds, now))
-                    .map(info => ({
-                    relPath: `consolidated/${info.name}`,
-                    description: readFmValue(info.content, 'description') ?? info.name.replace(/\.md$/, ''),
-                    tags: info.tags,
-                }));
-                ctx.candidates.push(...own);
-            }
-        }
-        else {
-            // relation / owner 级 forget：只扫描当前层级的 consolidated
-            ctx.candidates = collectCandidates(source, thresholds, now)
-                .filter(info => isDueForReview(info, thresholds, now))
-                .map(info => ({
-                relPath: `consolidated/${info.name}`,
-                description: readFmValue(info.content, 'description') ?? info.name.replace(/\.md$/, ''),
-                tags: info.tags,
-            }));
-        }
+        // 一次会话只审一层：relation / agent / owner 各自只扫本层 consolidated/。
+        // 关系层由关系整理链逐关系审，agent 层只审 personal/memory 自身。
+        ctx.candidates = collectCandidates(source, thresholds, now)
+            .filter(info => isDueForReview(info, thresholds, now))
+            .map(info => ({
+            relPath: `consolidated/${info.name}`,
+            description: readFmValue(info.content, 'description') ?? info.name.replace(/\.md$/, ''),
+            tags: info.tags,
+        }));
     }
 }
 // ── 渲染 ────────────────────────────────────────────────────────────────────
@@ -285,7 +265,10 @@ function renderScopeSection(ctx, mode, threadFiles) {
         lines.push(`- ownerAid: ${ctx.ownerAid}`);
     if (ctx.baseagent)
         lines.push(`- baseagent: ${ctx.baseagent}`);
-    lines.push(`- processingDir: ${ctx.processingDir}`);
+    // processingDir 只在 notes 模式下是有效输入（待整理的 note 在那里）。
+    // 其他模式不读它，列出来会诱导模型去 Glob 一个 hook 不放行的目录。
+    if (mode === 'notes')
+        lines.push(`- processingDir: ${ctx.processingDir}`);
     lines.push(`- consolidatedDir: ${ctx.consolidatedDir}`);
     lines.push(`- indexPath: ${ctx.indexPath}`);
     lines.push('');
@@ -499,7 +482,7 @@ export function serializeConsolidationContext(input) {
     const now = new Date();
     const forgetAfterDays = input.forgetAfterDays ?? DEFAULT_FORGET_AFTER_DAYS;
     for (const ctx of scopes) {
-        fillCandidates(ctx, input.mode, forgetAfterDays);
+        fillCandidates(ctx, input.mode, forgetAfterDays, input.taskCtx.peerKey);
     }
     // ── 批次目录（长期批次）────────────────────────────────────────────────────
     const batchRoot = path.join(resolveRoot(), 'memory', 'consolidation-batches');
@@ -564,16 +547,24 @@ export function serializeConsolidationContext(input) {
         '',
         ...scopes.flatMap(ctx => [renderScopeSection(ctx, input.mode, threadFiles), '', '---', '']),
     ];
-    // 列出可读根（工具 path/file_path 参数必须落在这些路径内）
+    // 列出可读根（工具 path/file_path 参数必须落在这些路径内）。
+    // 这份清单必须与 system-session/memory.ts 的 memoryReadRoots 一致——两边各算一份
+    // 就会出现"任务书让模型去读、hook 却拒绝"的假阴性。
     lines.push('', '**可读根（工具 path/file_path 参数必须落在这些路径内）**：');
     lines.push('- 批次目录：`' + batchDir + '`');
     for (const ctx of scopes) {
-        if (ctx.processingDir)
+        // 与 renderScopeSection 同判据：processingDir 只在 notes 模式可读
+        if (input.mode === 'notes' && ctx.processingDir)
             lines.push('- processingDir: `' + ctx.processingDir + '`');
         if (ctx.consolidatedDir)
             lines.push('- consolidatedDir: `' + ctx.consolidatedDir + '`');
         if (ctx.indexPath)
             lines.push('- indexPath: `' + ctx.indexPath + '`');
+        // generalize / promote 的候选在本关系的 consolidated/（hook 只放行该目录，不含关系级 MEMORY.md）
+        if ((input.mode === 'generalize' || input.mode === 'promote') && input.taskCtx.peerKey) {
+            const relationMemoryDir = path.join(resolveRoot(), 'agents', ctx.selfAid, 'relations', input.taskCtx.peerKey, 'memory');
+            lines.push('- relationConsolidatedDir: `' + path.join(relationMemoryDir, 'consolidated') + '`');
+        }
     }
     if (historyJsonlPath)
         lines.push('- 消息流水: `' + historyJsonlPath + '`');

package/dist/core/memory/consolidation-ops-records.js

@@ -76,15 +76,19 @@ export function readFeedbackText(batchDir) {
     return undefined;
 }
 /**
- * 收集 ops 记录里所有出现过的作用域及其 memory 根目录。
- * 供 finishConsolidationSession 决定要对哪几个 scope 重建索引。
- * 返回 Map<scope, memoryDir>；同一 scope 若出现多次取第一条（目录相同）。
+ * 收集 ops 记录里所有被写过的 memory 根目录及其作用域。
+ * 供 finishConsolidationSession 决定要对哪几个目录重建索引。
+ *
+ * 按 memoryDir 去重，不按 scope：同一 scope 可能涉及多个目录（群聊按发言人分流到
+ * 多条关系；archive 记的是源文件所属层）。按 scope 去重会只重建第一个目录的索引。
+ * 作用域优先从路径推断（archive 流水的 scope 是会话写入层，不一定是 memoryDir 所属层），
+ * 推不出来时用记录里的 scope。
  */
 export function collectAffectedScopes(batchDir) {
     const result = new Map();
     const filePath = path.join(batchDir, 'ops.jsonl');
     if (!fs.existsSync(filePath))
-        return result;
+        return [];
     try {
         for (const line of fs.readFileSync(filePath, 'utf-8').split('\n').filter(Boolean)) {
             const entry = JSON.parse(line);
@@ -92,13 +96,41 @@ export function collectAffectedScopes(batchDir) {
                 continue;
             const e = entry;
             const s = e.scope;
-            if ((s === 'relation' || s === 'agent' || s === 'owner') && e.memoryDir && !result.has(s)) {
-                result.set(s, e.memoryDir);
+            if ((s === 'relation' || s === 'agent' || s === 'owner') && e.memoryDir && !result.has(e.memoryDir)) {
+                result.set(e.memoryDir, scopeOfMemoryDir(e.memoryDir) ?? s);
+            }
+            // create --replaces 跨层归档（如泛化把关系级源文件归档）：源文件所在层也被改了，
+            // 它的索引同样要重建。源路径是绝对路径，形如 <memoryDir>/consolidated/<file>。
+            for (const af of e.archivedFiles ?? []) {
+                if (!af.source || !path.isAbsolute(af.source))
+                    continue;
+                const consolidatedDir = path.dirname(af.source);
+                if (path.basename(consolidatedDir) !== 'consolidated')
+                    continue;
+                const srcMemoryDir = path.dirname(consolidatedDir);
+                const srcScope = scopeOfMemoryDir(srcMemoryDir);
+                if (srcScope && !result.has(srcMemoryDir))
+                    result.set(srcMemoryDir, srcScope);
             }
         }
     }
     catch { /* ignore */ }
-    return result;
+    return [...result].map(([memoryDir, scope]) => [scope, memoryDir]);
+}
+/** 从 memory 根目录路径推断作用域；不是标准布局时返回 undefined。 */
+function scopeOfMemoryDir(memoryDir) {
+    const parts = path.resolve(memoryDir).split(path.sep);
+    const last = parts.length - 1;
+    // .../agents/<selfAid>/relations/<peerKey>/memory
+    if (parts[last] === 'memory' && parts[last - 2] === 'relations')
+        return 'relation';
+    // .../agents/<selfAid>/personal/memory
+    if (parts[last] === 'memory' && parts[last - 1] === 'personal')
+        return 'agent';
+    // .../memory/owner/<ownerAid>
+    if (parts[last - 1] === 'owner' && parts[last - 2] === 'memory')
+        return 'owner';
+    return undefined;
 }
 /**
  * 读取 ops 记录里所有成功的写操作，按写入顺序倒序返回（最后写的先回撤）。