evolcore 0.0.31 → 0.0.33

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

@@ -15,6 +15,8 @@ import { sameGroupAid } from '../../aun/group/index.js';
 import crypto from 'crypto';
 import path from 'path';
 import fs from 'fs';
+import { parseDocument } from 'yaml';
+import { agentmdGet } from '../../aun/aid/agentmd.js';
 import { parseDuration, parseTriggerSet, parseTriggerUpdate } from '../../trigger/parser.js';
 import { applyTriggerPatch, replaceEditableTriggerDefinition } from '../../trigger/patch.js';
 import { definitionRevision } from '../../trigger/validation.js';
@@ -25,6 +27,8 @@ 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 { auditCommandAuthorization, auditFullAccessEvent, hashArgv } from '../auth/authorization-audit.js';
+import { ResponseModeRegistry } from '../../response-system/registry.js';
+import { registerBuiltinModes } from '../../response-system/modes/index.js';
 import { executeResolvedContactCommand, resolveContactCommand } from '../../config/contact-operation-service.js';
 import { hasTrustedFullAccessDelegation, trustedExecutionIdentityInput } from '../auth/agent-delegation.js';
 import { executeManagedAidOperation, ManagedAidOperationError, managedAidShowViewForRole, resolveManagedAidOperation, } from '../../aun/aid/managed-operation.js';
@@ -41,6 +45,7 @@ import { handleSlashCommand } from './slash-handler.js';
 import { resolveChatMode } from '../message/peer-mode.js';
 import { execMenuAction as menuExecMenuAction, execMenuForEcweb as menuExecMenuForEcweb, execMenuForControl as menuExecMenuForControl, execMenuQuery as menuExecMenuQuery, execMenuUpdate as menuExecMenuUpdate, getMenuItems as menuGetMenuItems, getSubMenuItems as menuGetSubMenuItems, buildTopicForkSourcePayload, } from './menu-handler.js';
 import { getMenuCatalog, execMenuValueBatch, validateMenuValueBatchArgs } from './menu-catalog.js';
+import { resolveCurrentSessionLoopTarget } from '../session/session-idle-monitor.js';
 export { isProcessLevelOwner } from './menu-handler.js';
 const CLI_EXEC_TIMEOUT_MS = 15_000;
 const CLI_EXEC_MAX_OUTPUT = 128 * 1024;
@@ -126,6 +131,8 @@ export class CommandHandler {
     primaryRunnerKey;
     agentRegistry;
     memoryConsolidationLauncher;
+    /** /skill refresh 的 daemon 侧入口：重建指定 agent 的技能索引 */
+    skillIndexRefresher;
     agentApplicationService;
     triggerSchedulerResolver;
     triggerSchedulerFallback;
@@ -141,9 +148,10 @@ export class CommandHandler {
     diagService;
     setDiagService(service) { this.diagService = service; }
     async handleMenuClientOperation(argv, sessionId, delegationToken, delegationCommandHash, send) {
-        const validation = this.agentDelegationRegistry?.validate(delegationToken, sessionId, delegationCommandHash);
-        if (!validation?.ok)
-            return { ok: false, code: validation?.code ?? 'DELEGATION_REQUIRED', error: validation?.reason ?? 'Task delegation is required' };
+        const validation = this.agentDelegationRegistry?.validate(delegationToken, sessionId, delegationCommandHash)
+            ?? { ok: false, code: 'DELEGATION_REQUIRED', reason: 'Task delegation registry is not configured', diagnosticCause: 'missing_token' };
+        if (!validation.ok)
+            return { ok: false, code: validation.code ?? 'DELEGATION_REQUIRED', error: validation.reason ?? 'Task delegation is required' };
         const grant = validation.grant;
         const session = await this.sessionManager.getSessionById(sessionId);
         if (!session || session.selfAID !== grant.selfAid || argv[0] !== 'request' || argv[1] !== grant.selfAid)
@@ -537,17 +545,21 @@ export class CommandHandler {
             reason: input.reason,
         });
     }
-    triggerRoleContext(selfAid, channel, peerId, chatType) {
+    triggerRoleContext(selfAid, channel, peerId, chatType, conversationId) {
         const owning = this.getOwningAgent(channel);
         if (!owning || owning.aid !== selfAid)
             return {};
+        const resolvedChatType = chatType === 'group' ? 'group' : 'private';
+        const resolvedConversationId = resolvedChatType === 'group'
+            ? conversationId || peerId
+            : peerId;
         const role = resolvePeerRoleDetail({
             selfAid,
             channelKey: channel,
             channelType: this.resolveChannelType(channel),
-            chatType: chatType === 'group' ? 'group' : 'private',
+            chatType: resolvedChatType,
             actorId: peerId,
-            conversationId: peerId,
+            conversationId: resolvedConversationId,
         }).effectiveRole;
         return { role: role || 'none', baseagent: owning.baseagent };
     }
@@ -592,12 +604,18 @@ export class CommandHandler {
         const now = Date.now();
         const id = `trig_${now}_${crypto.randomBytes(4).toString('hex')}`;
         const name = parsed.name ?? `trigger-${now.toString(36)}`;
+        const originChatType = chatType === 'group' ? 'group' : 'private';
+        const originIsGroup = originChatType === 'group';
+        const originConversationId = originIsGroup ? channelId : peerId;
         const feedbackChannel = parsed.targetChannel ?? channel;
+        const hasExplicitTarget = parsed.targetChannel !== undefined
+            || parsed.targetChannelId !== undefined
+            || parsed.targetChatType !== undefined;
         if (parsed.targetChannel && !this.adapters.has(parsed.targetChannel)) {
             return { error: `目标渠道不存在或未启用：${parsed.targetChannel}` };
         }
         const targetChannelType = this.resolveChannelType(feedbackChannel);
-        const feedbackChannelId = parsed.targetChannelId ?? peerId;
+        const feedbackChannelId = parsed.targetChannelId ?? originConversationId;
         const schedulerAid = parsed.agentId
             ?? this.getOwningAgent(feedbackChannel)?.aid
             ?? tryParseChannelKey(feedbackChannel)?.selfAID
@@ -609,19 +627,12 @@ export class CommandHandler {
         if (targetChannelType === 'aun' && parsed.targetChannelId && !parsed.targetChatType) {
             return { error: 'AUN 目标必须显式指定 --target-chat-type private 或 group' };
         }
-        const targetDelivery = targetChannelType === 'aun'
-            ? parsed.targetChatType === 'group'
-                ? { chatType: 'group', groupId: feedbackChannelId }
-                : parsed.targetChatType === 'private'
-                    ? { chatType: 'private' }
-                    : { chatType: 'private' }
-            : undefined;
         const target = {
             channelKey: feedbackChannel,
             channelId: feedbackChannelId,
             session: parsed.targetSession,
             threadId: parsed.targetSession === 'thread' ? parsed.targetThreadId : undefined,
-            chatType: targetDelivery?.chatType,
+            chatType: parsed.targetChatType ?? (hasExplicitTarget ? undefined : originChatType),
         };
         if (target.session === 'thread') {
             const adapter = this.adapters.get(feedbackChannel);
@@ -630,19 +641,20 @@ export class CommandHandler {
             if (!target.threadId)
                 return { error: '--target-session thread 需要 --target-thread-id' };
         }
-        const originIsGroup = chatType === 'group';
         const activeSession = originIsGroup
             ? undefined
             : this.sessionManager.getActiveSessionSync(channel, peerId, this.resolveChannelType(channel), schedulerAid);
         const origin = {
             channelKey: channel,
             channelType: this.resolveChannelType(channel),
-            channelId: peerId,
-            session: !originIsGroup && threadId ? 'thread' : 'main',
-            threadId: !originIsGroup ? threadId : undefined,
+            channelId: originConversationId,
+            session: threadId ? 'thread' : 'main',
+            threadId,
             peerId,
             sessionKey: activeSession?.sessionKey,
-            delivery: { chatType: 'private' },
+            delivery: originIsGroup
+                ? { chatType: 'group', groupId: originConversationId }
+                : { chatType: 'private' },
         };
         if (!isAdmin && parsed.feedbackStrategy === 'target' && !sameFeedbackTarget(target, origin)) {
             return { error: '无权限：非 admin 只能把 trigger 投递到来源会话' };
@@ -664,7 +676,7 @@ export class CommandHandler {
             timeoutMs: parsed.scriptTimeoutMs ?? 30_000,
         } : undefined;
         const permissionMode = this.triggerPermissionFromParsed(parsed);
-        const triggerRole = this.triggerRoleContext(schedulerAid, channel, peerId, chatType);
+        const triggerRole = this.triggerRoleContext(schedulerAid, channel, peerId, originChatType, originConversationId);
         const permissionError = this.validateTriggerPermissionModeForRole(permissionMode, isAdmin, triggerRole.role, schedulerAid, isDaemonOwner, canApprovePersistentFullAccess);
         if (permissionError)
             return { error: permissionError };
@@ -929,10 +941,21 @@ export class CommandHandler {
     setStatsCollector(collector) {
         this.statsCollector = collector;
     }
-    /** 注入记忆整理入口（daemon 的统一整理队列），供 /memory consolidate 使用。返回 null 表示已入队。 */
+    /**
+     * 注入记忆整理入口（daemon 的统一整理队列），供 /memory consolidate 使用。
+     * 已入队时返回带 queued 的占位结果；返回 null 表示拉起失败。
+     */
     setMemoryConsolidationLauncher(launcher) {
         this.memoryConsolidationLauncher = launcher;
     }
+    /** 注入 /skill refresh 的索引重建入口（daemon 启动时调用）。 */
+    setSkillIndexRefresher(refresher) {
+        this.skillIndexRefresher = refresher;
+    }
+    /** 供 slash-handler 读取。 */
+    getSkillIndexRefresher() {
+        return this.skillIndexRefresher;
+    }
     registerAdapter(adapter) {
         this.adapters.set(adapter.channelName, adapter);
     }
@@ -1072,7 +1095,7 @@ export class CommandHandler {
     getMenuItems(role, chatType = 'private', scope = 'agent', authSubject) {
         return menuGetMenuItems.call(this, role, chatType, scope, authSubject);
     }
-    async getMenuCatalog(channel, channelId, subject, request, channelScope = 'agent', paircodeAllowed) {
+    async getMenuCatalog(channel, channelId, subject, request, channelScope = 'agent', paircodeAllowed, transportReplyContext) {
         return await getMenuCatalog({
             subject,
             channelType: this.resolveChannelType(channel),
@@ -1080,6 +1103,19 @@ export class CommandHandler {
             channelId,
             request,
             ...(paircodeAllowed === undefined ? {} : { paircodeAllowed }),
+            resolveLoopTarget: async (context) => {
+                const target = await resolveCurrentSessionLoopTarget(this.sessionManager, {
+                    channel,
+                    channelId: context.channelId,
+                    selfAid: context.self ?? '',
+                    ...(transportReplyContext?.threadId && context.channelId === channelId
+                        ? { threadId: transportReplyContext.threadId }
+                        : {}),
+                });
+                if (target.peerKey !== context.peerKey)
+                    throw { code: 'INVALID_CONTEXT', message: '当前会话关系不匹配' };
+                return { level: target.level, sessionId: target.session.id };
+            },
         });
     }
     async execMenuValueBatch(channel, channelId, subject, args, request, channelScope = 'agent', transportReplyContext) {
@@ -1573,7 +1609,11 @@ export class CommandHandler {
         if (!isAdmin && updated.execution.type === 'script') {
             return { ok: false, error: '无权限：只有 owner/admin 可以修改 script trigger' };
         }
-        const triggerRole = this.triggerRoleContext(definition.agentAid, definition.origin?.channelKey || channel, definition.origin?.peerId || peerId);
+        const originChatType = definition.origin?.delivery?.chatType;
+        const originConversationId = originChatType === 'group'
+            ? definition.origin?.channelId
+            : definition.origin?.peerId;
+        const triggerRole = this.triggerRoleContext(definition.agentAid, definition.origin?.channelKey || channel, definition.origin?.peerId || peerId, originChatType, originConversationId);
         const permissionError = this.validateTriggerPermissionModeForRole(updated.execution.permissionMode, isAdmin, triggerRole.role, definition.agentAid, isDaemonOwner, canApprovePersistentFullAccess);
         if (permissionError) {
             return {
@@ -1853,10 +1893,23 @@ export class CommandHandler {
         const delegation = this.agentDelegationRegistry.validate(delegationToken, sessionId, delegationCommandHash);
         if (!delegation.ok)
             return { ok: false, code: delegation.code, error: delegation.reason };
+        return this.executeConfigOperation(argv, sessionId, delegation.grant);
+    }
+    async executeConfigOperation(argv, sessionId, grant) {
         const session = await this.sessionManager.getSessionById(sessionId);
         if (!session)
             return { ok: false, code: 'INVALID_SESSION', error: 'Invalid session' };
-        const grant = delegation.grant;
+        if (session.selfAID !== grant.selfAid || grant.sessionId !== sessionId) {
+            return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation does not match the current session' };
+        }
+        if (argv[0] === 'agent') {
+            const tail = argv.at(-2) === '--format' && argv.at(-1) === 'json' ? argv.slice(0, -2) : argv;
+            const sub = tail[1];
+            if ((sub !== 'get' && sub !== 'set') || tail.length !== (sub === 'get' ? 4 : 5)) {
+                return { ok: false, code: 'INVALID_ARGS', error: 'Expected agent get/set <aid> <key> [value] [--format json]' };
+            }
+            argv = ['config', sub, ...tail.slice(3), '--self', tail[2]];
+        }
         let conversationId;
         try {
             conversationId = parsePeerKey(grant.peerKey).channelId;
@@ -2549,39 +2602,76 @@ export class CommandHandler {
         if (sessionSelfAid && sessionSelfAid !== actorAid) {
             return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation self agent does not match the active session' };
         }
-        if (!hasTrustedFullAccessDelegation(grant) && (grant.channelType !== 'aun' || grant.chatType !== 'group')) {
-            return { ok: false, code: 'SCOPE_MISMATCH', error: 'Managed fs operations require the current AUN group relation' };
-        }
+        const isPersonalTarget = parsed.command.targetAid === actorAid;
         let currentGroup;
-        try {
-            currentGroup = parsePeerKey(grant.peerKey).channelId;
-        }
-        catch {
-            return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation contains an invalid relation key' };
+        if (isPersonalTarget) {
+            if (grant.issuedRole !== 'owner' && !hasTrustedFullAccessDelegation(grant)) {
+                return { ok: false, code: 'NO_PERMISSION', error: 'Managed personal storage requires the current Agent owner relation' };
+            }
+            if (parsed.command.actorAid && parsed.command.actorAid !== actorAid) {
+                return { ok: false, code: 'SCOPE_MISMATCH', error: 'Only the current Agent can access its personal storage' };
+            }
         }
-        if (!hasTrustedFullAccessDelegation(grant)
-            && ((parsed.command.actorAid && parsed.command.actorAid !== actorAid) || !sameGroupAid(parsed.command.groupId, currentGroup))) {
-            return { ok: false, code: 'SCOPE_MISMATCH', error: 'Only the current AUN group can be targeted' };
+        else {
+            const trustedFullAccess = hasTrustedFullAccessDelegation(grant);
+            if (trustedFullAccess) {
+                let targetType;
+                try {
+                    const card = await agentmdGet(parsed.command.targetAid, { withVerification: true, remoteOnly: true });
+                    if (card.verification.status !== 'verified') {
+                        return { ok: false, code: 'INVALID_TARGET', error: 'Target AID agent.md verification did not succeed' };
+                    }
+                    const frontmatter = card.content.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/)?.[1];
+                    const document = frontmatter ? parseDocument(frontmatter) : undefined;
+                    targetType = document && document.errors.length === 0
+                        ? String(document.toJS()?.type ?? '').trim().toLowerCase()
+                        : undefined;
+                }
+                catch {
+                    return { ok: false, code: 'INVALID_TARGET', error: 'Target AID agent.md could not be verified' };
+                }
+                if (targetType !== 'group') {
+                    return { ok: false, code: 'INVALID_TARGET', error: 'Managed group storage requires a verified group AID' };
+                }
+            }
+            if (!hasTrustedFullAccessDelegation(grant) && (grant.channelType !== 'aun' || grant.chatType !== 'group')) {
+                return { ok: false, code: 'SCOPE_MISMATCH', error: 'Managed group fs operations require the current AUN group relation' };
+            }
+            try {
+                currentGroup = parsePeerKey(grant.peerKey).channelId;
+            }
+            catch {
+                return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation contains an invalid relation key' };
+            }
+            if (parsed.command.actorAid && parsed.command.actorAid !== actorAid) {
+                return { ok: false, code: 'SCOPE_MISMATCH', error: 'Managed fs cannot switch the execution identity with --as' };
+            }
+            if (!hasTrustedFullAccessDelegation(grant)
+                && !sameGroupAid(parsed.command.targetAid, currentGroup)) {
+                return { ok: false, code: 'SCOPE_MISMATCH', error: 'Only the current AUN group can be targeted' };
+            }
         }
-        parsed.command.actorAid = hasTrustedFullAccessDelegation(grant)
-            ? (parsed.command.actorAid ?? actorAid)
+        const resolvedCommand = parsed.command;
+        resolvedCommand.storageBackend = isPersonalTarget ? 'personal' : 'group';
+        resolvedCommand.actorAid = hasTrustedFullAccessDelegation(grant) && !isPersonalTarget
+            ? (resolvedCommand.actorAid ?? actorAid)
             : actorAid;
         const subject = buildAuthSubject({
             selfAid: grant.selfAid,
             actorId: grant.actorId,
             channel: grant.channel,
             channelType: grant.channelType,
-            channelId: currentGroup,
+            channelId: currentGroup ?? actorAid,
             chatType: grant.chatType,
-            conversationId: currentGroup,
+            conversationId: currentGroup ?? actorAid,
             processOwners: loadDaemonConfig().owners ?? [],
             ...trustedExecutionIdentityInput(grant),
         });
         const intentArgs = {
             self: actorAid,
-            targetId: currentGroup,
-            peer: currentGroup,
-            peerKey: formatPeerKey('aun', currentGroup),
+            targetId: parsed.command.targetAid,
+            peer: currentGroup ?? actorAid,
+            peerKey: formatPeerKey('aun', currentGroup ?? actorAid),
             path: parsed.command.remotePath,
             targetPath: parsed.command.remotePath,
             ...(parsed.command.remoteSourcePath ? { sourcePath: parsed.command.remoteSourcePath } : {}),
@@ -2598,7 +2688,7 @@ export class CommandHandler {
             subject,
             intent: {
                 operation: parsed.command.operationId,
-                scope: 'relation',
+                scope: isPersonalTarget ? 'agent' : 'relation',
                 source: 'agent-tool',
                 args: intentArgs,
             },
@@ -2655,7 +2745,7 @@ export class CommandHandler {
             }
         }
         try {
-            return { ok: true, result: await executeManagedFsOperation(parsed.command) };
+            return { ok: true, result: await executeManagedFsOperation(resolvedCommand) };
         }
         catch (error) {
             return {
@@ -2668,6 +2758,95 @@ export class CommandHandler {
     setAgentDelegationRegistry(registry) {
         this.agentDelegationRegistry = registry;
     }
+    async handleManagedCliOperation(argv, sessionId, grant) {
+        const invalid = (error) => ({ ok: false, code: 'INVALID_ARGUMENT', error });
+        if (argv[0] === 'ctl') {
+            if (!argv[1] || /\s/.test(argv[1]))
+                return invalid('Expected a ctl subcommand');
+            return this.handleCtl('/' + argv.slice(1).join(' '), sessionId, grant);
+        }
+        if (argv[0] !== 'model' && argv[0] !== 'response')
+            return invalid('Expected a model or response command');
+        if (argv.includes('--self') || argv.includes('--peer') || argv.includes('--role')) {
+            return { ok: false, code: 'NOT_ALLOWED', error: 'Managed commands always use the authenticated current relation' };
+        }
+        const args = argv.slice(2);
+        const formatIndex = args.indexOf('--format');
+        if (formatIndex >= 0) {
+            if (args[formatIndex + 1] !== 'json' || args.lastIndexOf('--format') !== formatIndex)
+                return invalid('--format must be json');
+            args.splice(formatIndex, 2);
+        }
+        const sub = argv[1];
+        if (argv[0] === 'model') {
+            let command;
+            if (['list', 'current', 'reset', 'check'].includes(sub) && args.length === 0) {
+                command = `/model ${sub}`;
+            }
+            else if ((sub === 'info' || sub === 'effort') && args.length === 1 && args[0] && !/\s|^--/.test(args[0])) {
+                command = sub === 'info' ? `/model info ${args[0]}` : `/effort ${args[0]}`;
+            }
+            else if (sub === 'use' && args[0] && !/\s|^--/.test(args[0])
+                && !['list', 'current', 'reset', 'check', 'info'].includes(args[0])
+                && (args.length === 1 || (args.length === 3 && args[1] === '--effort' && args[2] && !/\s|^--/.test(args[2])))) {
+                command = `/model ${args[0]}${args.length === 3 ? ` ${args[2]}` : ''}`;
+            }
+            else
+                return invalid('Invalid managed model arguments');
+            return this.handleCtl(command, sessionId, grant);
+        }
+        const execute = (fieldArgs) => this.executeConfigOperation(['config', ...fieldArgs], sessionId, grant);
+        const failure = (response) => ({
+            ok: false, code: response.code, error: response.error, data: response.data,
+        });
+        const emit = (data, result) => ({ ok: true, data, result });
+        if (sub === 'set' && args.length === 1) {
+            const registry = new ResponseModeRegistry();
+            registerBuiltinModes(registry);
+            if (!registry.has(args[0]))
+                return { ok: false, code: 'UNKNOWN_MODE', error: `Unknown mode: ${args[0]}` };
+            const result = await execute(['set', 'responseMode', args[0]]);
+            if (!result.ok)
+                return failure(result);
+            return emit({ ok: true, scope: 'relation', mode: args[0] }, `✓ 已设置响应模式为 ${args[0]}（作用域: relation）`);
+        }
+        if (sub === 'reset' && args.length === 0) {
+            const result = await execute(['unset', 'responseMode']);
+            if (!result.ok)
+                return failure(result);
+            return emit({ ok: true, scope: 'relation' }, '✓ 已清除当前关系的响应模式设置');
+        }
+        if (sub === 'current' && args.length === 0) {
+            const modeResult = await execute(['get', 'responseMode']);
+            if (!modeResult.ok)
+                return failure(modeResult);
+            const paramsResult = await execute(['get', 'responseModeParams']);
+            if (!paramsResult.ok)
+                return failure(paramsResult);
+            if (!modeResult.result?.ok || modeResult.result.subcommand !== 'get'
+                || !paramsResult.result?.ok || paramsResult.result.subcommand !== 'get')
+                return invalid('Unexpected config result');
+            const configuredMode = typeof modeResult.result.value === 'string' ? modeResult.result.value : undefined;
+            const registry = new ResponseModeRegistry();
+            registerBuiltinModes(registry);
+            const mode = configuredMode ?? registry.getPreferredId();
+            return emit({ ok: true, scope: 'relation', responseMode: mode ?? null,
+                source: configuredMode ? 'config' : 'preferred', sourceTarget: modeResult.result.source?.target ?? null,
+                responseModeParams: paramsResult.result.value ?? null }, `当前响应模式: ${mode ?? '(无)'}`);
+        }
+        if (sub === 'config' && (args.length === 0 || (args.length === 1 && !args[0].startsWith('--') && args[0] !== 'set'))) {
+            const result = await execute(['get', 'responseModeParams']);
+            if (!result.ok)
+                return failure(result);
+            if (!result.result?.ok || result.result.subcommand !== 'get')
+                return invalid('Unexpected config result');
+            const params = (result.result.value ?? {});
+            return args.length === 1
+                ? emit({ ok: true, mode: args[0], config: params[args[0]] ?? {} }, `${args[0]} 配置: ${JSON.stringify(params[args[0]] ?? {}, null, 2)}`)
+                : emit({ ok: true, responseModeParams: params }, `所有模式配置: ${JSON.stringify(params, null, 2)}`);
+        }
+        return { ok: false, code: 'NOT_ALLOWED', error: `response ${sub} is not available in a managed task` };
+    }
     /**
      * Agent ctl 入口：通过 IPC 接收 Agent 自主管理指令
      * 复用现有 slash cmd 逻辑，权限继承 session 用户角色

package/dist/core/command/diag-service.js

@@ -19,13 +19,17 @@ export async function executeDiagIpc(service, registry, owners, cmd) {
     try {
         if (!Array.isArray(cmd.argv) || cmd.argv.some((v) => typeof v !== 'string'))
             throw new Error('Invalid diag argv');
-        return await service.execute(parseDiagArgs(cmd.argv));
+        if (cmd.argv[0] !== 'diag')
+            throw new Error('Expected a diag command');
+        return await service.execute(parseDiagArgs(cmd.argv.slice(1)));
     }
     catch (error) {
         return { ok: false, code: error.code ?? 'INVALID_ARGUMENT', message: error.message };
     }
 }
 export function parseDiagArgs(args) {
+    if (args.at(-2) === '--format' && args.at(-1) === 'json')
+        args = args.slice(0, -2);
     const words = [];
     let ownerAid;
     let literal = false;

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

@@ -8,6 +8,7 @@
  * 不支持跨关系浏览：relation 永远是发起命令的这段关系。
  */
 import { CONSOLIDATION_MODES, MODE_SCOPE } from '../memory/consolidation-context.js';
+import { formatQueueDetails } from '../memory/consolidation-queue-format.js';
 import { MEMORY_SCOPES, isMemoryScope, memoryOverview, listMemoryFiles, formatMemoryFiles, readMemoryIndex, showMemoryFile, formatPendingNotes, showPendingNote, reindexScope, dropNote, archiveMemoryFile, restoreMemoryFile, } from '../memory/memory-admin.js';
 const USAGE = [
     '用法:',
@@ -263,8 +264,11 @@ async function consolidate(ctx, target, rawMode, rawScope, needScope, isPayload)
         ...(scopeOverride ? { scopeOverride } : {}),
     });
     const label = `${mode}${scopeOverride ? `(${scopeOverride})` : ''}`;
-    if (!launched || launched.queued) {
-        return result(`⏳ 整理请求已入队（${label}），前一个整理会话结束后自动开始`);
+    if (!launched)
+        return error(`拉起整理会话失败（${label}），详见 daemon 日志`);
+    if (launched.queued) {
+        return result(`⏳ 整理请求已入队（${label}），前一个整理会话结束后自动开始\n` +
+            formatQueueDetails(launched.queued).join('\n'));
     }
     return result(`✅ 已拉起整理会话（${label}）${launched.executionSessionId ? `\n会话: ${launched.executionSessionId}` : ''}\n完成后会在当前对话反馈结果`);
 }

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

@@ -7,6 +7,7 @@ import { ConfigTarget, read as readConfig } from '../../config/config-manager.js
 import { readRolesConfig } from '../../config/roles.js';
 import { normalizeMenuError } from './menu-protocol.js';
 import { isValidAid } from '../../aun/aid/validation.js';
+import { DEFAULT_SESSION_LOOP_SECONDS, MAX_SESSION_LOOP_SECONDS, MIN_SESSION_LOOP_SECONDS } from '../session/session-idle-monitor.js';
 const DEFAULT_DIRECTORY = { getGroup: groupInfo, getMembers: groupMembers };
 const HOST_BASEAGENTS = ['claude', 'codex', 'ecagent', 'gemini'];
 export function validateMenuValueBatchArgs(args) {
@@ -65,6 +66,19 @@ const relation = (id, name, label, order, cmd, operation, extra) => ({
     ...extra,
 });
 const ENTRIES = [
+    {
+        id: 'session.loop',
+        type: 'setting',
+        contexts: ['private_relation', 'group_relation'],
+        name: 'session',
+        label: '当前会话闲置触发',
+        section: 'relation_behavior',
+        order: 5,
+        query: { cmd: '/session', args: { view: 'loop' }, operation: 'session.loop.current', scope: 'relation' },
+        update: { cmd: '/session', args: { resource: 'loop' }, operation: 'session.loop.update', scope: 'relation' },
+        valueSchema: { type: 'boolean' },
+        control: 'toggle-with-number',
+    },
     relation('model.relation', 'model', '模型', 10, '/model', 'model.current', { options: { cmd: '/model', operation: 'model.list', scope: 'relation', mode: 'dynamic' }, update: { cmd: '/model', operation: 'model.use', scope: 'relation' }, control: 'select' }),
     relation('effort.relation', 'effort', '推理强度', 20, '/effort', 'model.effort.current', { options: { cmd: '/effort', operation: 'model.effort.current', scope: 'relation', mode: 'dynamic', dependsOn: ['model.relation'] }, update: { cmd: '/effort', operation: 'model.effort', scope: 'relation' }, control: 'select' }),
     relation('chatmode.relation', 'chatmode', '对话模式', 30, '/chatmode', 'chatmode.current', { options: { cmd: '/chatmode', operation: 'chatmode.current', scope: 'relation', mode: 'static', items: [{ value: 'interactive', label: '交互模式' }, { value: 'proactive', label: '主动模式' }] }, update: { cmd: '/chatmode', operation: 'chatmode.update', scope: 'relation' }, control: 'select' }),
@@ -272,6 +286,9 @@ export function bindMenuExecutionContextArgs(args, context) {
     if (!args && context.kind !== 'group_relation')
         return args;
     const { context: _context, ...bound } = args ?? {};
+    const isSessionLoop = bound.resource === 'loop' || bound.view === 'loop';
+    if (isSessionLoop)
+        return bound;
     if (context.kind === 'private_relation' || context.kind === 'group_relation') {
         if (bound.scope !== 'role')
             bound.scope = 'relation';
@@ -356,6 +373,12 @@ async function operationView(binding, context, options = {}) {
 function wireBinding(binding, context) {
     if (!binding || binding.supported === false)
         return undefined;
+    if (binding.operation.startsWith('session.loop.'))
+        return {
+            args: context.kind === 'group_relation'
+                ? { ...(binding.args ?? {}), context: { kind: context.kind, ...(context.groupId ? { groupId: context.groupId } : {}) } }
+                : binding.args ?? {},
+        };
     return {
         args: context.kind === 'group_relation'
             ? {
@@ -379,6 +402,27 @@ export async function getMenuCatalog(input) {
                 operations[key] = view;
         }
         entries.push({ id: entry.id, type: entry.type, name: entry.name, label: entry.label, section: entry.section, order: entry.order, target: { scope: context.kind === 'agent' ? 'agent' : context.kind === 'process' ? 'process' : 'relation', ...(context.self ? { self: context.self } : {}), ...(context.peerKey ? { peerKey: context.peerKey } : {}) }, valueSchema: entry.valueSchema ?? { type: 'object' }, operations, wire: { name: entry.name, operations: { ...(wireBinding(entry.query, context) ? { query: wireBinding(entry.query, context) } : {}), ...(wireBinding(entry.options, context) ? { options: wireBinding(entry.options, context) } : {}), ...(wireBinding(entry.update, context) ? { update: wireBinding(entry.update, context) } : {}), ...(wireBinding(entry.action, context) ? { action: wireBinding(entry.action, context) } : {}) } }, ui: { control: entry.control ?? 'action' } });
+        if (entry.id === 'session.loop') {
+            const loopEntry = entries[entries.length - 1];
+            let target = { level: 'relation-main' };
+            if (input.resolveLoopTarget) {
+                try {
+                    target = await input.resolveLoopTarget(context);
+                }
+                catch (error) {
+                    const reason = normalizeMenuError(error);
+                    for (const operation of Object.values(operations)) {
+                        Object.assign(operation, { allowed: false, reason });
+                    }
+                }
+            }
+            loopEntry.target = target;
+            loopEntry.label = target.level === 'topic-session' ? '当前话题闲置触发' : '关系主会话闲置触发';
+            loopEntry.ui = {
+                control: entry.control,
+                idleSeconds: { type: 'integer', minimum: MIN_SESSION_LOOP_SECONDS, maximum: MAX_SESSION_LOOP_SECONDS, default: DEFAULT_SESSION_LOOP_SECONDS, unit: 'seconds' },
+            };
+        }
     }
     const policyRevision = hash({ role: context.subject.role, self: context.subject.selfAid, peerKey: context.subject.peerKey, groupMembershipRole: context.groupMembershipRole, baselineRole: context.baselineRole, paircodeAllowed, roles: readRolesConfig(context.subject.selfAid) });
     const data = { $schema_version: 1, kind: 'menu.catalog', complete: true, catalogRevision: hash({ entries, context: context.contextKey, policyRevision }), policyRevision, generatedAt: Date.now(), context: { contextKey: context.contextKey, kind: context.kind, channelScope: context.channelScope, transport: context.transport, chatType: context.chatType, ...(context.self ? { self: context.self } : {}), ...(context.actor ? { actor: context.actor } : {}), ...(context.groupId ? { groupId: context.groupId } : {}), ...(context.peerKey ? { peerKey: context.peerKey } : {}), requesterRole: context.requesterRole, ...(context.groupMembershipRole ? { groupMembershipRole: context.groupMembershipRole } : {}), ...(context.baselineRole !== undefined ? { baselineRole: context.baselineRole } : {}) }, features: { batchValuesV1: true, verifiedExplicitGroupContext: context.kind === 'group_relation' }, entries };
@@ -420,7 +464,10 @@ export async function execMenuValueBatch(input) {
         if (allowed?.supported === false || !(allowed?.allowed))
             return { itemId, entryId, ok: false, error: allowed?.reason ?? { code: 'NOT_SUPPORTED', message: 'operation is not supported or denied' } };
         try {
-            const result = await input.execQuery(entry.query.cmd, context.channelId, bindingArgs(entry.query, context), context);
+            const queryArgs = entry.id === 'session.loop'
+                ? { ...(entry.query.args ?? {}) }
+                : bindingArgs(entry.query, context);
+            const result = await input.execQuery(entry.query.cmd, context.channelId, queryArgs, context);
             return !('error' in result) ? { itemId, entryId, ok: true, data: result.data } : { itemId, entryId, ok: false, error: { code: normalizeMenuError({ code: result.code, message: result.error, data: result.data }).code, message: result.error, ...(result.data !== undefined ? { data: result.data } : {}) } };
         }
         catch (error) {