evolcore 0.0.35 → 0.0.37

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

@@ -6,10 +6,14 @@ import { parseMenuClientArgs } from '../../cli/menu-client.js';
 import { ensureSessionRuntimeDir } from '../../cli/task-context.js';
 import { renderCommandCardAsText } from '../interaction-router.js';
 import { buildEnvelope, deliveryTargetFromSession, isInteractionSendAccepted, replyContextFromSession, sendInteractionPayload } from '../message/message-utils.js';
+import { sessionTopicThreadId } from '../thread/topic-id.js';
 import { resolvePaths, getPackageRoot } from '../../paths.js';
 import { loadDaemonConfig } from '../../config-store.js';
+import { parseOwnershipCommand, executeOwnershipCommand, ownershipFailure } from '../../aun/aid/ownership-operation.js';
+import { ownerResolver, refreshOwnershipForAuthorization } from '../ownership/owner-resolver.js';
 import { logger } from '../../utils/logger.js';
 import { resolvePeerRoleDetail, roleToSessionIdentity } from '../../config/peer-role-resolver.js';
+import { ThreadService } from '../thread/thread-service.js';
 import { isManagementRole } from '../../config/builtin-roles.js';
 import { formatPeerKey } from '../relation/peer-identity.js';
 import { sameGroupAid } from '../../aun/group/index.js';
@@ -22,12 +26,13 @@ import { parseDuration, parseTriggerSet, parseTriggerUpdate } from '../../trigge
 import { applyTriggerPatch, replaceEditableTriggerDefinition } from '../../trigger/patch.js';
 import { definitionRevision } from '../../trigger/validation.js';
 import { isDaemonEventSessionTrigger, matchTriggerEvent } from '../../trigger/event-source.js';
+import { isTriggerOperator } from '../../trigger/authorization.js';
 import { tryParseChannelKey } from '../channel-loader.js';
 import { displaySessionTitle } from '../session/session-title.js';
 import { buildTranscriptTurns } from '../session/session-transcript.js';
 import { resolveConfigCommand } from '../../config/resolved-config-op.js';
 import { AUTHENTICATED_CONFIG_ROLE_ENV, executeResolvedConfigCommandAsync } from '../../config/config-operation-service.js';
-import { splitConfigBatchGetArgv } from '../../cli/cli-argv.js';
+import { parseTimeArg, TIME_ARG_FORMATS, splitConfigBatchGetArgv } from '../../cli/cli-argv.js';
 import { auditCommandAuthorization, auditFullAccessEvent, hashArgv } from '../auth/authorization-audit.js';
 import { ResponseModeRegistry } from '../../response-system/registry.js';
 import { registerBuiltinModes } from '../../response-system/modes/index.js';
@@ -36,7 +41,7 @@ import { hasTrustedFullAccessDelegation, trustedExecutionIdentityInput } from '.
 import { executeManagedAidOperation, ManagedAidOperationError, managedAidShowViewForRole, resolveManagedAidOperation, } from '../../aun/aid/managed-operation.js';
 import { MAX_AVATAR_SOURCE_BYTES } from '../../utils/avatar-upload.js';
 import { executeManagedGroupOperation, isManagedGroupRelationRead, isManagedGroupRelationWrite, ManagedGroupOperationError, resolveManagedGroupOperation, executeManagedMsgOperation, ManagedMsgOperationError, resolveManagedMsgOperation, executeManagedFsOperation, ManagedFsOperationError, resolveManagedFsOperation, } from '../../aun/msg/managed-operation.js';
-import { authorizeOperation, buildAuthSubject } from '../auth/auth-gateway.js';
+import { authorizeFreshOperation, buildAuthSubject } from '../auth/auth-gateway.js';
 import { isHClassPath, isLClassPath, isSameOrDescendant } from '../permission/protected-paths.js';
 import { validateModelSelectionForRole } from '../model/model-permission.js';
 import { getModelInfo } from '../model/model-catalog.js';
@@ -146,6 +151,7 @@ export class CommandHandler {
     daemonStatusProvider;
     daemonMonitorProvider;
     agentDelegationRegistry;
+    threadSystemMsgSender;
     handoffRuntime;
     diagService;
     setDiagService(service) { this.diagService = service; }
@@ -163,7 +169,7 @@ export class CommandHandler {
             const subject = buildAuthSubject({ selfAid: grant.selfAid, actorId: grant.actorId, channel: grant.channel,
                 channelType: grant.channelType, channelId, chatType: grant.chatType, conversationId: channelId,
                 processOwners: [], ...trustedExecutionIdentityInput(grant) });
-            const decision = authorizeOperation({ source: 'agent-tool', subject,
+            const decision = await authorizeFreshOperation({ source: 'agent-tool', subject,
                 intent: { operation: 'ec.menu.request', scope: 'relation', source: 'agent-tool', args: { self: grant.selfAid, peer: argv[2], targetId: argv[2] } },
                 auditMetadata: { taskId: grant.taskId, sessionId, messageId: grant.messageId } });
             if (!decision.allow)
@@ -325,7 +331,10 @@ export class CommandHandler {
         this.daemonTriggerChannel = String(channel || 'daemon').trim() || 'daemon';
     }
     /** Used by control-menu routing; daemon owner is not in the Agent registry. */
-    getDaemonTriggerOwnerAid(channel = 'daemon') {
+    getDaemonTriggerChannel() {
+        return this.daemonTriggerChannel;
+    }
+    getDaemonTriggerOwnerAid(channel = this.daemonTriggerChannel) {
         if (channel !== this.daemonTriggerChannel)
             return undefined;
         if (this.daemonTriggerOwnerAid)
@@ -398,7 +407,7 @@ export class CommandHandler {
             channelName: session.channel,
             channelId: session.channelId,
             chatType: session.chatType,
-            ...(session.threadId ? { threadId: session.threadId } : {}),
+            ...(sessionTopicThreadId(session) ? { threadId: sessionTopicThreadId(session) } : {}),
             peerId: session.metadata?.peerId || session.channelId,
         };
         const valid = enabled.some(definition => definition.source.type === 'event'
@@ -513,7 +522,7 @@ export class CommandHandler {
     primaryFeedbackTarget(definition) {
         if (definition.feedback.strategy === 'target')
             return definition.feedback.target;
-        if (definition.feedback.strategy === 'event_session')
+        if (definition.feedback.strategy !== 'origin')
             return undefined;
         if (!definition.origin)
             return undefined;
@@ -525,10 +534,14 @@ export class CommandHandler {
             chatType: definition.origin.delivery?.chatType,
         };
     }
-    canAccessTriggerDefinition(definition, peerId, channel, isAdmin) {
+    /**
+     * 与 IPC 侧同一判据：操作主体集合由定义的 operatorPeers 决定（缺省时按
+     * origin 对端 + feedback 目标对端现算）。群聊身份是群 AID，调用方传 channelId。
+     */
+    canAccessTriggerDefinition(definition, actorConversationPeerId, isAdmin) {
         if (isAdmin)
             return true;
-        return definition.origin?.peerId === peerId && definition.origin?.channelKey === channel;
+        return isTriggerOperator(definition, actorConversationPeerId);
     }
     triggerPermissionFromParsed(parsed) {
         return parsed.permissionMode ?? undefined;
@@ -537,7 +550,7 @@ export class CommandHandler {
      * Persist fullaccess approval provenance as the canonical process owner,
      * rather than the transport-specific peer id.  A Feishu/other-channel
      * alias may authenticate as a daemon-owner while its raw peer id is not an
-     * entry in daemon.json.owners; storing that alias would make the Trigger
+     * the verified Control AID protocol Owner; storing that alias would make the Trigger
      * fail its next scheduler-time owner check.
      */
     canonicalDaemonOwnerId(selfAid, channel, peerId, chatType) {
@@ -636,11 +649,11 @@ export class CommandHandler {
         }
         return undefined;
     }
-    findTriggerDefinition(scheduler, nameOrId, peerId, channel, isAdmin) {
+    findTriggerDefinition(scheduler, nameOrId, actorConversationPeerId, isAdmin) {
         return scheduler
             .list({ all: true })
             .find(definition => (definition.id === nameOrId || definition.name === nameOrId)
-            && this.canAccessTriggerDefinition(definition, peerId, channel, isAdmin));
+            && this.canAccessTriggerDefinition(definition, actorConversationPeerId, isAdmin));
     }
     async buildTriggerDefinitionFromParsed(parsed, channel, channelId, peerId, isAdmin, messageId, chatType, threadId, isDaemonOwner = false, canApprovePersistentFullAccess = isDaemonOwner) {
         const now = Date.now();
@@ -659,6 +672,7 @@ export class CommandHandler {
         const targetChannelType = this.resolveChannelType(feedbackChannel);
         const feedbackChannelId = parsed.targetChannelId ?? originConversationId;
         const schedulerAid = parsed.agentId
+            ?? this.getDaemonTriggerOwnerAid(channel)
             ?? this.getOwningAgent(feedbackChannel)?.aid
             ?? tryParseChannelKey(feedbackChannel)?.selfAID
             ?? this.triggerSchedulerFallbackAid;
@@ -733,14 +747,20 @@ export class CommandHandler {
                 return { error: 'Trigger baseagent 仅适用于 trigger_session' };
             }
         }
-        const triggerOwner = this.agentRegistry?.get?.(schedulerAid) ?? this.getOwningAgent(channel);
+        const daemonScheduler = schedulerAid === this.getDaemonTriggerOwnerAid(channel);
+        const triggerOwner = daemonScheduler
+            ? undefined
+            : this.agentRegistry?.get?.(schedulerAid) ?? this.getOwningAgent(channel);
         const executionBaseagent = parsed.executionType === 'trigger_session'
             ? parsed.baseagent?.trim() ?? triggerOwner?.baseagent ?? triggerRole.baseagent
+                ?? (daemonScheduler ? this.parseDefaultBaseagent() : undefined)
             : undefined;
         if (parsed.executionType === 'trigger_session') {
             if (!executionBaseagent)
                 return { error: '无法确定 Trigger 会话的 baseagent' };
-            const ownerName = triggerOwner?.name || '<unknown>';
+            const ownerName = daemonScheduler
+                ? this.primaryRunnerKey.split('::')[0]
+                : triggerOwner?.name || '<unknown>';
             const available = this.getAvailableBaseagentsForOwner(ownerName);
             if (!available.includes(executionBaseagent)) {
                 return {
@@ -1111,9 +1131,9 @@ export class CommandHandler {
         return !!userId && topic.metadata?.peerId === userId;
     }
     buildTopicMenuItem(s) {
-        const displayName = displaySessionTitle(s.name, s.threadId || s.id.slice(0, 8));
+        const displayName = displaySessionTitle(s.name, sessionTopicThreadId(s) || s.id.slice(0, 8));
         const item = {
-            value: s.threadId,
+            value: sessionTopicThreadId(s) ?? '',
             label: displayName,
             topicLabel: s.label || null,
             topicStatus: s.topicStatus ?? 'pending',
@@ -1385,10 +1405,12 @@ export class CommandHandler {
         return await handleSlashCommand.call(this, content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, authSubject, replyContext, applyGroupSlashPolicy);
     }
     async handleTriggerCommand(scheduler, content, channel, channelId, peerId, isAdmin, messageId, chatType, threadId, isDaemonOwner = false, canApprovePersistentFullAccess = isDaemonOwner) {
+        // 操作主体身份：群聊是群 AID（channelId），私聊是对端 AID（peerId）。
+        const actorConversationPeerId = chatType === 'group' ? channelId : peerId;
         if (content === '/trigger') {
             const visible = scheduler
                 .list()
-                .filter(definition => this.canAccessTriggerDefinition(definition, peerId, channel, isAdmin));
+                .filter(definition => this.canAccessTriggerDefinition(definition, actorConversationPeerId, isAdmin));
             if (visible.length === 0)
                 return '📭 当前没有活跃的触发器';
             const lines = visible.map(definition => {
@@ -1403,7 +1425,7 @@ export class CommandHandler {
             const includeDisabled = sub.includes('--all') || sub.includes('all');
             const visible = scheduler
                 .list({ all: includeDisabled })
-                .filter(definition => this.canAccessTriggerDefinition(definition, peerId, channel, isAdmin));
+                .filter(definition => this.canAccessTriggerDefinition(definition, actorConversationPeerId, isAdmin));
             if (visible.length === 0)
                 return '📭 没有触发器记录';
             const lines = visible.map(definition => {
@@ -1419,7 +1441,7 @@ export class CommandHandler {
             const nameOrId = sub.slice(prefix.length).trim();
             if (!nameOrId)
                 throw new Error(`❌ 用法：/trigger ${action} <名称>`);
-            const definition = this.findTriggerDefinition(scheduler, nameOrId, peerId, channel, isAdmin);
+            const definition = this.findTriggerDefinition(scheduler, nameOrId, actorConversationPeerId, isAdmin);
             if (!definition) {
                 throw new Error(isAdmin
                     ? `❌ 未找到触发器：${nameOrId}`
@@ -1528,7 +1550,7 @@ export class CommandHandler {
                 : args.trim();
             if (!nameOrId)
                 return '❌ 用法：/trigger run <名称> [--dry-run]';
-            const definition = this.findTriggerDefinition(scheduler, nameOrId, peerId, channel, isAdmin);
+            const definition = this.findTriggerDefinition(scheduler, nameOrId, actorConversationPeerId, isAdmin);
             if (!definition) {
                 return isAdmin
                     ? `❌ 未找到触发器：${nameOrId}`
@@ -1548,7 +1570,7 @@ export class CommandHandler {
             const result = parseTriggerUpdate(args);
             if (!result.ok)
                 return `❌ ${result.error}`;
-            const updated = await this.updateTriggerFromPatch(scheduler, result.nameOrId, result.value, channel, channelId, peerId, isAdmin, messageId, threadId, isDaemonOwner, canApprovePersistentFullAccess);
+            const updated = await this.updateTriggerFromPatch(scheduler, result.nameOrId, result.value, channel, channelId, peerId, isAdmin, messageId, threadId, isDaemonOwner, canApprovePersistentFullAccess, chatType);
             if (!updated.ok)
                 return `❌ ${updated.error}`;
             const nextStr = updated.trigger.nextFireAt ? new Date(updated.trigger.nextFireAt).toLocaleString() : '未计算';
@@ -1589,8 +1611,9 @@ export class CommandHandler {
             return '⚠️ 触发器功能未启用';
         return await this.handleTriggerCommand(scheduler, content, channel, channelId, peerId, isAdmin, messageId, chatType, threadId, isDaemonOwner, canApprovePersistentFullAccess);
     }
-    async updateTriggerFromPatch(scheduler, nameOrId, patch, channel, channelId, peerId, isAdmin, messageId, threadId, isDaemonOwner = false, canApprovePersistentFullAccess = isDaemonOwner) {
-        const definition = this.findTriggerDefinition(scheduler, nameOrId, peerId, channel, isAdmin);
+    async updateTriggerFromPatch(scheduler, nameOrId, patch, channel, channelId, peerId, isAdmin, messageId, threadId, isDaemonOwner = false, canApprovePersistentFullAccess = isDaemonOwner, chatType) {
+        const actorConversationPeerId = chatType === 'group' ? channelId : peerId;
+        const definition = this.findTriggerDefinition(scheduler, nameOrId, actorConversationPeerId, isAdmin);
         if (!definition) {
             return { ok: false, error: isAdmin ? `未找到触发器：${nameOrId}` : `未找到触发器 "${nameOrId}"，或无权限修改` };
         }
@@ -1768,7 +1791,7 @@ export class CommandHandler {
     }
     async handleRewind(session, agent, turnNum, mode) {
         try {
-            if (session.threadId && turnNum === 1) {
+            if (sessionTopicThreadId(session) && turnNum === 1) {
                 return '❌ 话题会话暂不支持 /rewind 1，仅开放 N>1';
             }
             const messages = await agent.getSessionMessages(session.agentSessionId, session.projectPath);
@@ -1811,10 +1834,11 @@ export class CommandHandler {
                     const ok = await agent.rollbackSessionTurns(session.agentSessionId, session.projectPath, discarded, rewindTarget.assistantUuid);
                     if (!ok)
                         return '❌ 对话回退失败';
-                    if (session.threadId) {
+                    const topicThreadId = sessionTopicThreadId(session);
+                    if (topicThreadId) {
                         await this.sessionManager.clearTopicResumeAt({
                             sessionId: session.id,
-                            expectedThreadId: session.threadId,
+                            expectedThreadId: topicThreadId,
                             expectedAgentSessionId: session.agentSessionId,
                         });
                     }
@@ -1825,10 +1849,11 @@ export class CommandHandler {
                     }
                 }
                 else if (keepTarget) {
-                    if (session.threadId) {
+                    const topicThreadId = sessionTopicThreadId(session);
+                    if (topicThreadId) {
                         await this.sessionManager.setTopicResumeAt({
                             sessionId: session.id,
-                            expectedThreadId: session.threadId,
+                            expectedThreadId: topicThreadId,
                             expectedAgentSessionId: session.agentSessionId,
                             resumeAt: keepTarget.assistantUuid,
                         });
@@ -1876,7 +1901,7 @@ export class CommandHandler {
     buildCtlReplyContext(session) {
         const ctx = { delivery: deliveryTargetFromSession(session) };
         const meta = session.metadata;
-        const threadId = session.threadId || meta?.replyContext?.threadId;
+        const threadId = sessionTopicThreadId(session) || meta?.replyContext?.threadId;
         if (threadId)
             ctx.threadId = threadId;
         if (meta?.replyContext?.peerId)
@@ -1969,7 +1994,7 @@ export class CommandHandler {
             channelId: conversationId,
             chatType: grant.chatType,
             conversationId,
-            processOwners: loadDaemonConfig().owners ?? [],
+            processOwners: ownerResolver.daemonOwners(),
             ...trustedExecutionIdentityInput(grant),
         });
         const executeOne = async (fieldArgv) => {
@@ -1978,7 +2003,7 @@ export class CommandHandler {
             });
             if (!resolved.ok)
                 return { ok: false, code: resolved.code, error: resolved.reason };
-            const decision = authorizeOperation({
+            const decision = await authorizeFreshOperation({
                 source: 'agent-tool',
                 subject,
                 intent: {
@@ -2079,10 +2104,10 @@ export class CommandHandler {
             channelId: conversationId,
             chatType: grant.chatType,
             conversationId,
-            processOwners: loadDaemonConfig().owners ?? [],
+            processOwners: ownerResolver.daemonOwners(),
             ...trustedExecutionIdentityInput(grant),
         });
-        const decision = authorizeOperation({
+        const decision = await authorizeFreshOperation({
             source: 'agent-tool',
             subject,
             intent: {
@@ -2156,6 +2181,56 @@ export class CommandHandler {
             : { ok: false, code: result.code, error: result.error, ...(result.data ? { data: result.data } : {}) };
     }
     /** Agent-managed AID CLI entrypoint. Private key and CA access stay inside the daemon. */
+    async handleOwnershipOperation(argv, sessionId, delegationToken, delegationCommandHash) {
+        const delegation = this.agentDelegationRegistry?.validate(delegationToken, sessionId, delegationCommandHash);
+        if (!delegation?.ok)
+            return { ok: false, code: 'INVALID_DELEGATION', error: 'Valid task delegation is required' };
+        const grant = delegation.grant;
+        if (grant.executionIdentity) {
+            return { ok: false, code: 'NOT_ALLOWED', error: 'Fullaccess execution does not grant protocol Owner binding authority' };
+        }
+        const session = await this.sessionManager.getSessionById(sessionId);
+        if (!session || session.selfAID !== grant.selfAid)
+            return { ok: false, code: 'INVALID_SESSION', error: 'Delegation does not match the session identity' };
+        try {
+            const command = parseOwnershipCommand(argv);
+            const targetAid = command.subjectAid ?? grant.selfAid;
+            ownerResolver.assertLocalSubject(targetAid);
+            if (command.action === 'bind' && ['readonly', 'auto'].includes(grant.permissionMode ?? '')) {
+                return { ok: false, code: 'NOT_ALLOWED', error: 'Binding requires a request or bypass task' };
+            }
+            await refreshOwnershipForAuthorization(targetAid);
+            let conversationId;
+            try {
+                conversationId = parsePeerKey(grant.peerKey).channelId;
+            }
+            catch {
+                return { ok: false, code: 'INVALID_DELEGATION', error: 'Invalid relation key' };
+            }
+            const subject = buildAuthSubject({
+                selfAid: targetAid, actorId: grant.actorId, channel: grant.channel, channelType: grant.channelType,
+                channelId: conversationId, chatType: grant.chatType, conversationId,
+                processOwners: ownerResolver.daemonOwners(),
+            });
+            if (targetAid !== grant.selfAid && !subject.isDaemonOwner) {
+                return { ok: false, code: 'SCOPE_MISMATCH', error: 'A different local subject requires the current daemon Owner' };
+            }
+            if (!subject.isDaemonOwner && (command.action === 'bind' ? subject.role !== 'owner' : !isManagementRole(subject.role))) {
+                return { ok: false, code: 'OWNER_REQUIRED', error: 'Ownership binding requires the subject Owner or daemon Owner; first daemon binding uses the local CLI' };
+            }
+            const decision = await authorizeFreshOperation({
+                source: 'agent-tool', subject,
+                intent: { operation: command.action === 'bind' ? 'ec.aid.bind' : 'ec.aid.bind.status', scope: 'agent', source: 'agent-tool', args: { self: targetAid, ...(command.action === 'bind' ? { ownerAid: command.ownerAid } : {}) } },
+                auditMetadata: { taskId: grant.taskId, messageId: grant.messageId },
+            });
+            if (!decision.allow)
+                return { ok: false, code: decision.code, error: decision.reason };
+            return { ok: true, state: await executeOwnershipCommand(command, grant.selfAid) };
+        }
+        catch (error) {
+            return ownershipFailure(error);
+        }
+    }
     async handleAidOperation(argv, sessionId, delegationToken, delegationCommandHash) {
         if (!this.agentDelegationRegistry) {
             return { ok: false, code: 'DELEGATION_REQUIRED', error: 'Task delegation is not configured' };
@@ -2198,11 +2273,11 @@ export class CommandHandler {
             channelId: conversationId,
             chatType: delegation.grant.chatType,
             conversationId,
-            processOwners: loadDaemonConfig().owners ?? [],
+            processOwners: ownerResolver.daemonOwners(),
             ...trustedExecutionIdentityInput(delegation.grant),
         });
         const managementRole = isManagementRole(subject.role);
-        const decision = authorizeOperation({
+        const decision = await authorizeFreshOperation({
             source: 'agent-tool',
             subject,
             intent: {
@@ -2349,7 +2424,7 @@ export class CommandHandler {
             channelId: conversationId,
             chatType: grant.chatType,
             conversationId,
-            processOwners: loadDaemonConfig().owners ?? [],
+            processOwners: ownerResolver.daemonOwners(),
             ...trustedExecutionIdentityInput(grant),
         });
         const managementRole = isManagementRole(subject.role) || subject.dataScope === 'daemon';
@@ -2363,7 +2438,7 @@ export class CommandHandler {
             && subject.dataScope !== 'daemon' && subject.role !== 'owner') {
             return { ok: false, code: 'ROLE_ACCESS_DENIED', error: `${parsed.command.kind} requires Agent owner permission` };
         }
-        const decision = authorizeOperation({
+        const decision = await authorizeFreshOperation({
             source: 'agent-tool',
             subject,
             intent: {
@@ -2459,7 +2534,7 @@ export class CommandHandler {
         try {
             return { ok: true, result: await executeManagedGroupOperation(parsed.command, rulesContent, {
                     defaultThread: grant.chatType === 'group' && conversationId === parsed.command.groupId
-                        ? session.threadId || 'main' : 'all',
+                        ? sessionTopicThreadId(session) ?? 'main' : 'all',
                 }) };
         }
         catch (error) {
@@ -2580,10 +2655,10 @@ export class CommandHandler {
             chatType: grant.chatType,
             conversationId,
             ...(isSelectorHistory ? { identity: roleToSessionIdentity(grant.issuedRole ?? null) } : {}),
-            processOwners: loadDaemonConfig().owners ?? [],
+            processOwners: ownerResolver.daemonOwners(),
             ...trustedExecutionIdentityInput(grant),
         });
-        const decision = authorizeOperation({
+        const decision = await authorizeFreshOperation({
             source: 'agent-tool',
             subject,
             intent: {
@@ -2632,7 +2707,7 @@ export class CommandHandler {
             };
         }
     }
-    /** Agent-managed current-group filesystem entrypoint. */
+    /** Agent-managed filesystem entrypoint for self, current-group, and current-private-peer reads. */
     async handleFsOperation(argv, sessionId, delegationToken, delegationCommandHash) {
         if (!this.agentDelegationRegistry) {
             return { ok: false, code: 'DELEGATION_REQUIRED', error: 'Task delegation is not configured' };
@@ -2652,9 +2727,21 @@ export class CommandHandler {
         if (sessionSelfAid && sessionSelfAid !== actorAid) {
             return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation self agent does not match the active session' };
         }
-        const isPersonalTarget = parsed.command.targetAid === actorAid;
+        const isSelfPersonalTarget = parsed.command.targetAid === actorAid;
+        let currentPrivatePeer;
         let currentGroup;
-        if (isPersonalTarget) {
+        if (grant.channelType === 'aun' && grant.chatType === 'private') {
+            try {
+                currentPrivatePeer = parsePeerKey(grant.peerKey).channelId;
+            }
+            catch {
+                return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation contains an invalid relation key' };
+            }
+        }
+        const isCurrentPrivatePeerCat = parsed.command.kind === 'cat'
+            && currentPrivatePeer !== undefined
+            && parsed.command.targetAid === currentPrivatePeer;
+        if (isSelfPersonalTarget) {
             if (grant.issuedRole !== 'owner' && !hasTrustedFullAccessDelegation(grant)) {
                 return { ok: false, code: 'NO_PERMISSION', error: 'Managed personal storage requires the current Agent owner relation' };
             }
@@ -2662,6 +2749,11 @@ export class CommandHandler {
                 return { ok: false, code: 'SCOPE_MISMATCH', error: 'Only the current Agent can access its personal storage' };
             }
         }
+        else if (isCurrentPrivatePeerCat) {
+            if (parsed.command.actorAid && parsed.command.actorAid !== actorAid) {
+                return { ok: false, code: 'SCOPE_MISMATCH', error: 'Managed fs cannot switch the execution identity with --as' };
+            }
+        }
         else {
             const trustedFullAccess = hasTrustedFullAccessDelegation(grant);
             if (trustedFullAccess) {
@@ -2702,26 +2794,27 @@ export class CommandHandler {
             }
         }
         const resolvedCommand = parsed.command;
-        resolvedCommand.storageBackend = isPersonalTarget ? 'personal' : 'group';
-        resolvedCommand.actorAid = hasTrustedFullAccessDelegation(grant) && !isPersonalTarget
+        resolvedCommand.storageBackend = isSelfPersonalTarget || isCurrentPrivatePeerCat ? 'personal' : 'group';
+        resolvedCommand.actorAid = hasTrustedFullAccessDelegation(grant) && !isSelfPersonalTarget && !isCurrentPrivatePeerCat
             ? (resolvedCommand.actorAid ?? actorAid)
             : actorAid;
+        const relationTarget = currentPrivatePeer ?? currentGroup;
         const subject = buildAuthSubject({
             selfAid: grant.selfAid,
             actorId: grant.actorId,
             channel: grant.channel,
             channelType: grant.channelType,
-            channelId: currentGroup ?? actorAid,
+            channelId: relationTarget ?? actorAid,
             chatType: grant.chatType,
-            conversationId: currentGroup ?? actorAid,
-            processOwners: loadDaemonConfig().owners ?? [],
+            conversationId: relationTarget ?? actorAid,
+            processOwners: ownerResolver.daemonOwners(),
             ...trustedExecutionIdentityInput(grant),
         });
         const intentArgs = {
             self: actorAid,
             targetId: parsed.command.targetAid,
-            peer: currentGroup ?? actorAid,
-            peerKey: formatPeerKey('aun', currentGroup ?? actorAid),
+            peer: relationTarget ?? actorAid,
+            peerKey: formatPeerKey('aun', relationTarget ?? actorAid),
             path: parsed.command.remotePath,
             targetPath: parsed.command.remotePath,
             ...(parsed.command.remoteSourcePath ? { sourcePath: parsed.command.remoteSourcePath } : {}),
@@ -2733,12 +2826,12 @@ export class CommandHandler {
             ...(parsed.command.aclPerms ? { aclPerms: parsed.command.aclPerms } : {}),
             ...(parsed.command.aclRemove !== undefined ? { aclRemove: parsed.command.aclRemove } : {}),
         };
-        const decision = authorizeOperation({
+        const decision = await authorizeFreshOperation({
             source: 'agent-tool',
             subject,
             intent: {
                 operation: parsed.command.operationId,
-                scope: isPersonalTarget ? 'agent' : 'relation',
+                scope: isSelfPersonalTarget ? 'agent' : 'relation',
                 source: 'agent-tool',
                 args: intentArgs,
             },
@@ -2808,6 +2901,68 @@ export class CommandHandler {
     setAgentDelegationRegistry(registry) {
         this.agentDelegationRegistry = registry;
     }
+    /** Inject the daemon-owned system-message transport used by thread operations. */
+    setThreadSystemMsgSender(sender) {
+        this.threadSystemMsgSender = sender;
+    }
+    /** Menu actions share the same transport as CLI/thread operations. */
+    getThreadSystemMsgSender() {
+        return this.threadSystemMsgSender;
+    }
+    async executeThreadSummaryCli(input) {
+        const startedAt = Date.now();
+        try {
+            if (!input.selfAid || input.selfAid !== input.authenticatedSelfAid
+                || !input.peer || !input.threadId) {
+                return {
+                    data: {
+                        exitCode: 1,
+                        stdout: JSON.stringify({ code: 'SCOPE_MISMATCH', message: 'Only the current Agent and a concrete topic can be targeted' }),
+                        stderr: '',
+                        durationMs: Date.now() - startedAt,
+                    },
+                };
+            }
+            const service = new ThreadService(this.sessionManager);
+            const topic = await service.showThread({
+                selfAid: input.selfAid,
+                peer: input.peer,
+                threadId: input.threadId,
+            });
+            const summaries = service.logSummary(input.selfAid, topic.sessionId);
+            const result = {
+                thread: {
+                    peer: topic.peer,
+                    threadId: topic.threadId,
+                    name: topic.name,
+                    topicStatus: topic.topicStatus,
+                    label: topic.label ?? null,
+                },
+                currentSummary: service.showSummary(input.selfAid, topic.sessionId) ?? null,
+                summaries,
+            };
+            return {
+                data: {
+                    exitCode: 0,
+                    stdout: JSON.stringify(result),
+                    stderr: '',
+                    durationMs: Date.now() - startedAt,
+                },
+            };
+        }
+        catch (error) {
+            const code = error?.code ?? 'THREAD_READ_FAILED';
+            const message = error instanceof Error ? error.message : String(error);
+            return {
+                data: {
+                    exitCode: 1,
+                    stdout: JSON.stringify({ code, message }),
+                    stderr: '',
+                    durationMs: Date.now() - startedAt,
+                },
+            };
+        }
+    }
     async handleManagedCliOperation(argv, sessionId, grant) {
         const invalid = (error) => ({ ok: false, code: 'INVALID_ARGUMENT', error });
         if (argv[0] === 'ctl') {
@@ -2936,13 +3091,13 @@ export class CommandHandler {
             channelId: conversationId,
             chatType: grant.chatType,
             conversationId,
-            processOwners: loadDaemonConfig().owners ?? [],
+            processOwners: ownerResolver.daemonOwners(),
             ...trustedExecutionIdentityInput(grant),
         });
         const ctlIntent = this.resolveCtlIntent(cmd, grantSelfAid, grant.peerKey);
         if (!ctlIntent)
             return { ok: false, code: 'NOT_ALLOWED', error: `不允许的指令: ${inputCmd}` };
-        const ctlDecision = authorizeOperation({
+        const ctlDecision = await authorizeFreshOperation({
             source: 'agent-tool',
             subject: ctlSubject,
             intent: ctlIntent,
@@ -3045,7 +3200,7 @@ export class CommandHandler {
         // 6. 调用现有 handle()，不传 sendMessage 回调（结果直接返回）
         try {
             const result = await this._handleInternal(cmd, session.channel, session.channelId, undefined, // 不发送消息
-            userId, session.threadId || undefined, session.chatType, undefined, undefined, session.selfAID, ctlIdentity, ctlSubject);
+            userId, sessionTopicThreadId(session), session.chatType, undefined, undefined, session.selfAID, ctlIdentity, ctlSubject);
             const text = typeof result === 'string' ? result : (result && 'text' in result ? result.text : '(无输出)');
             if (result && typeof result === 'object' && 'kind' in result && result.kind === 'command.error') {
                 return { ok: false, error: text || '执行失败' };
@@ -3204,9 +3359,9 @@ export class CommandHandler {
         const after = parseQueueTimeArg(this.extractArg(args, '--after'));
         const before = parseQueueTimeArg(this.extractArg(args, '--before'));
         if (this.extractArg(args, '--after') && after === undefined)
-            return { ok: false, error: '❌ --after 必须是 epoch 毫秒或 ISO 时间' };
+            return { ok: false, error: `❌ --after 不是有效时间（支持 ${TIME_ARG_FORMATS}）` };
         if (this.extractArg(args, '--before') && before === undefined)
-            return { ok: false, error: '❌ --before 必须是 epoch 毫秒或 ISO 时间' };
+            return { ok: false, error: `❌ --before 不是有效时间（支持 ${TIME_ARG_FORMATS}）` };
         if (after !== undefined && before !== undefined && after >= before)
             return { ok: false, error: '❌ --after 必须早于 --before' };
         // 操作分支
@@ -3238,10 +3393,7 @@ export class CommandHandler {
     }
 }
 function parseQueueTimeArg(value) {
-    if (!value)
-        return undefined;
-    const parsed = /^\d+$/.test(value) ? Number(value) : Date.parse(value);
-    return Number.isFinite(parsed) ? parsed : undefined;
+    return parseTimeArg(value);
 }
 /**
  * ctl 专用渲染：不显示 session 标识列（因为只有一个 session）

package/dist/core/command/connect-menu.js

@@ -195,6 +195,7 @@ function contactItem(self, primaryId) {
         status: view.status,
         blocked: view.blocked,
         isOwner: view.isOwner,
+        ...(view.managementRole ? { managementRole: view.managementRole } : {}),
         aliases: view.aliases,
         ...(pendingRequest ? {
             pendingRequest: {