evolcore 0.0.11 → 0.0.13

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

@@ -6,7 +6,7 @@ import { hasModelSwitcher } from '../../agents/runner-types.js';
 import { getCodexEfforts } from '../../agents/codex-runner.js';
 import { execCodexCliSync, resolveCodexCliPath } from '../../utils/codex-cli.js';
 import { resolvePaths, getPackageRoot, daemonControlDir } from '../../paths.js';
-import { buildEnvelope } from '../message/message-utils.js';
+import { buildEnvelope, isDeliveryTarget, isDeliveryTargetForChannel, replyContextFromSession } from '../message/message-utils.js';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
@@ -15,7 +15,7 @@ import { execFileSync } from 'child_process';
 import { CronExpressionParser } from 'cron-parser';
 import { parseDuration } from '../../trigger/parser.js';
 import { checkLatestVersion, getLocalVersion, isLinkedInstall, compareVersions, resolveGlobalPkg } from '../../utils/npm-ops.js';
-import { commandExists } from '../../utils/cross-platform.js';
+import { commandExists, spawnDetachedNode } from '../../utils/cross-platform.js';
 import { loadDefaults, loadDaemonConfig } from '../../config-store.js';
 import { WEB_PACKAGE_NAME } from '../../product.js';
 import { read as cfgRead, resolveEffective, resolveEffectiveFieldWithSource, routeFieldPath, write as cfgWrite, ConfigTarget, } from '../../config/config-manager.js';
@@ -28,7 +28,7 @@ import { normalizeCliArgv, parseCliIntent, parseLegacyCliCommand, validateCliArg
 import { auditCommandAuthorization, hashArgv } from '../auth/authorization-audit.js';
 import { authorizeOperation, buildAuthSubject } from '../auth/auth-gateway.js';
 import { evaluateRoleOperationCapability } from '../auth/operation-authorizer.js';
-import { splitConfigBatchGetArgv } from '../../config/config-batch-get.js';
+import { splitConfigBatchGetArgv } from '../../cli/cli-argv.js';
 import { chatmodeFieldForPeer, resolveChatModeForField } from '../message/peer-mode.js';
 import { PUBLIC_PERMISSION_MODES } from '../permission/mode.js';
 import { resolveRuntimePermissionMode, resolveRuntimeStringField, validateRuntimeStringFieldOverride, } from '../role/runtime-policy.js';
@@ -36,11 +36,12 @@ import { isManagementRole } from '../../config/builtin-roles.js';
 import { SYSTEM_CONTROL_CHANNEL } from '../system-channels.js';
 import { logger } from '../../utils/logger.js';
 import { shouldSuppressRealRestart } from '../../utils/restart-safety.js';
-import { dispatchToMentionMode } from '../../config/mention-mode.js';
-import { menuFailure, menuSuccess, normalizeMenuError, validateConfigWriteScope, validateMenuRequest } from './menu-protocol.js';
+import { AGENT_DELEGATION_TOKEN_ENV } from '../auth/agent-delegation.js';
+import { evolMenuResponseTransportMetadata, menuFailure, menuCommandForName, menuSuccess, normalizeMenuError, validateConfigWriteScope, validateMenuRequest, } from './menu-protocol.js';
 import { roleMenuAction, roleMenuOperation, roleMenuOptions, roleMenuQuery, roleMenuUpdate, } from './role-menu.js';
 import { handleConnectMenu, connectMenuOperation } from './connect-menu.js';
 import { groupMenuAuthorizationArgs, groupMenuIntent, handleGroupMenu, } from './group-menu.js';
+import { getMenuCatalog, execMenuValueBatch, resolveExplicitMenuExecutionContext, validateMenuCatalogArgs, validateMenuValueBatchArgs } from './menu-catalog.js';
 /**
  * 获取 baseagent CLI 的版本号（claude/gemini/codex）。
  * 失败返回 null（命令不存在或执行失败）。
@@ -60,6 +61,7 @@ function getBaseagentVersion(cmd) {
                 encoding: 'utf-8',
                 timeout: 3000,
                 stdio: ['ignore', 'pipe', 'pipe'],
+                windowsHide: process.platform === 'win32',
             });
         const versionOutput = String(output).trim();
         // claude: "2.1.187 (Claude Code)" → 提取 "2.1.187"
@@ -880,7 +882,7 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
         if (cmdBase === '/topic')
             return intent('session.topic.current', 'relation');
         if (cmdBase === '/baseagent')
-            return intent('agent.baseagent.current', fromControlChannel ? 'agent' : 'relation');
+            return intent('agent.baseagent.current', fromControlChannel || args?.scope === 'agent' ? 'agent' : 'relation');
         if (cmdBase === '/file')
             return intent('file.fetch', 'filesystem', { filePath: args?.path });
         if (cmdBase === '/model')
@@ -938,6 +940,8 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
             return intent('permission.current', args?.scope === 'agent' ? 'agent' : 'relation');
     }
     if (verb === 'update') {
+        if (cmdBase === '/baseagent')
+            return intent('agent.baseagent.update', 'agent', { baseagent: value });
         if (cmdBase === '/model')
             return intent('model.use', modelScope, { model: value });
         if (cmdBase === '/effort')
@@ -946,6 +950,10 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
             return intent('chatmode.update', args?.scope === 'agent' ? 'agent' : 'relation', { value });
         if (cmdBase === '/mentionmode')
             return intent('mentionmode.update', args?.scope === 'agent' ? 'agent' : 'relation', { value });
+        if (cmdBase === '/activity')
+            return intent('activity.update', args?.scope === 'agent' ? 'agent' : 'relation', { value });
+        if (cmdBase === '/observable')
+            return intent('observable.update', 'agent', { value });
         if (cmdBase === '/gateway')
             return intent('gateway.write', 'process');
         if (cmdBase === '/config')
@@ -1006,8 +1014,13 @@ function buildRelationIntentArgs(params) {
     return out;
 }
 function buildMenuAuthSubject(owner, params) {
-    if (params.subject)
-        return params.subject;
+    if (params.subject) {
+        return {
+            ...params.subject,
+            ...(params.requestId && !params.subject.requestId ? { requestId: params.requestId } : {}),
+            ...(params.session?.id && !params.subject.sessionId ? { sessionId: params.session.id } : {}),
+        };
+    }
     const agent = owner.getOwningAgent?.(params.channel);
     const selfAid = agent?.aid || params.session?.selfAID;
     const channelType = owner.resolveChannelType?.(params.channel) || params.session?.channelType;
@@ -1018,6 +1031,8 @@ function buildMenuAuthSubject(owner, params) {
     return buildAuthSubject({
         selfAid,
         actorId: params.userId,
+        requestId: params.requestId,
+        sessionId: params.session?.id,
         channel: params.channel,
         channelType: channelType || params.channel.split('#')[0],
         channelId: params.channelId,
@@ -1089,6 +1104,9 @@ function buildRoleMenuContext(owner, channel, subject) {
     }
     const aunAvailable = (owningAgent?.channelInstanceNames?.() ?? [])
         .some((channelName) => owner.hasRegisteredChannel?.(channelName, 'aun') === true);
+    const aunChannelName = (owningAgent?.channelInstanceNames?.() ?? [])
+        .find((name) => String(name).split('#', 1)[0].toLowerCase() === 'aun');
+    const contactAdapter = aunChannelName ? owner.getAdapter?.(aunChannelName) : undefined;
     return {
         self,
         actorRole: subject.role,
@@ -1097,6 +1115,26 @@ function buildRoleMenuContext(owner, channel, subject) {
         actorAid: subject.actorId,
         chatType: subject.chatType,
         aunAvailable,
+        ...(contactAdapter?.send ? {
+            notifyContactRequestReviewed: async ({ applicantAid, requestId, expiresAt, status }) => {
+                await contactAdapter.send(buildEnvelope({
+                    taskId: `contact-request-${requestId}`,
+                    channel: contactAdapter.channelName,
+                    channelId: applicantAid,
+                    agentName: owningAgent?.name ?? '<unknown>',
+                    replyContext: { delivery: { chatType: 'private' }, metadata: evolMenuResponseTransportMetadata() },
+                }), {
+                    kind: 'custom',
+                    channelType: 'aun',
+                    payload: {
+                        type: 'contact.request.response',
+                        status,
+                        request_id: requestId,
+                        expires_at: expiresAt,
+                    },
+                });
+            },
+        } : {}),
         availableBaseagents: Array.from(new Set([
             ...Object.keys(owningAgent?.config?.baseagents ?? {}),
             ...(owningAgent?.baseagent ? [owningAgent.baseagent] : []),
@@ -1285,6 +1323,7 @@ export function getMenuItems(role, chatType = 'private', scope = 'agent', authSu
             fromControlChannel: isControlScope,
         }).allow;
     };
+    const canReadModel = canOperation('model.list', 'relation') || canOperation('model.current', 'relation');
     const canUseModel = canOperation('model.use', 'relation');
     const canSetEffort = canOperation('model.effort', 'relation');
     const canSetChatmode = canOperation('chatmode.update', 'relation');
@@ -1293,7 +1332,12 @@ export function getMenuItems(role, chatType = 'private', scope = 'agent', authSu
     const canUseFile = canOperation('file.fetch', 'filesystem') || canOperation('file.list', 'filesystem');
     const canManageProcess = authSubject ? authSubject.isDaemonOwner : isOwner;
     const configurableSettings = [
-        ...(canUseModel ? [{ cmd: '/model', label: '切换模型', desc: '切换当前 Agent 使用的模型版本', next: { type: 'select', dynamic: true } }] : []),
+        ...(canReadModel ? [{
+                cmd: '/model',
+                label: canUseModel ? '切换模型' : '查看模型',
+                desc: canUseModel ? '切换当前 Agent 使用的模型版本' : '查看当前 Agent 使用的模型版本',
+                next: canUseModel ? { type: 'select', dynamic: true } : undefined,
+            }] : []),
         ...(canSetEffort ? [{ cmd: '/effort', label: '切换推理强度', desc: '调整模型推理深度，影响响应速度与质量', next: { type: 'select', items: [
                         { value: 'low', label: 'Low' },
                         { value: 'medium', label: 'Medium' },
@@ -1729,7 +1773,7 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
         });
         if ('error' in target)
             throw { code: target.code, message: target.error };
-        const fallback = dispatchToMentionMode(session?.metadata?.dispatchMode) ?? null;
+        const fallback = session?.metadata?.mentionMode ?? null;
         const currentMode = readMenuMentionMode(target, fallback, fallback === null ? null : 'session').value;
         return [
             { value: 'mention-only', label: '@提及时响应', selected: currentMode === 'mention-only' },
@@ -1755,6 +1799,10 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
     const cmdBase = cmd.trim().split(' ')[0];
     if (!cmdBase)
         return { error: '缺少命令', code: 'MISSING_CMD' };
+    const isRequesterRoleQuery = cmdBase === '/role' && args?.view === 'requester';
+    if (isRequesterRoleQuery && Object.keys(args).some(key => key !== 'view')) {
+        return { error: 'role requester query only accepts args.view', code: 'INVALID_ARGUMENT' };
+    }
     const gated = gateControlScope.call(this, { cmdBase, args, channel, fromControlChannel });
     if (gated)
         return gated;
@@ -1770,6 +1818,18 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         fromControlChannel,
         subject: authSubject,
     });
+    if (isRequesterRoleQuery) {
+        if (!subject.allowAccess) {
+            return { error: `Role ${subject.role} is not allowed to access this agent`, code: 'ROLE_ACCESS_DENIED' };
+        }
+        return {
+            data: {
+                roleId: subject.role,
+                source: subject.roleSource,
+                allowAccess: subject.allowAccess,
+            },
+        };
+    }
     if (cmdBase === '/role') {
         const authorized = await authorizeRoleMenu(this, {
             kind: 'query', args, identity, subject, session, channel, channelId,
@@ -2091,8 +2151,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         });
         if ('error' in target)
             return target;
-        // session metadata 是 AUN 协议词汇，翻译成 mentionMode 词汇；evolagent.config 已是 mentionMode 字段
-        const fallback = dispatchToMentionMode(session?.metadata?.dispatchMode) ?? null;
+        const fallback = session?.metadata?.mentionMode ?? null;
         const current = readMenuMentionMode(target, fallback, fallback === null ? null : 'session');
         return {
             data: {
@@ -2605,8 +2664,6 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
         const newMode = modeMap[arg];
         if (!newMode)
             return { error: `无效模式: ${arg}，可选: all / text / none`, code: 'INVALID_VALUE' };
-        if (identity.role !== 'owner')
-            return { error: '中间输出模式切换仅限 owner', code: 'NO_PERMISSION' };
         const target = resolveMenuActivityTarget.call(this, {
             args,
             session,
@@ -2661,6 +2718,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
     const subject = buildMenuAuthSubject(this, {
         identity: authIdentity,
         session: authSession,
+        requestId,
         explicitChatType,
         channel,
         channelId,
@@ -2878,6 +2936,10 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             if (triggerThread !== undefined && triggerThread !== 'per_run' && triggerThread !== 'by_run' && triggerThread !== 'by_trigger') {
                 return { error: `无效 triggerThread: ${triggerThread}`, code: 'INVALID_ARGS' };
             }
+            const targetChatType = args.targetChatType;
+            if (targetChatType !== undefined && targetChatType !== 'private' && targetChatType !== 'group') {
+                return { error: `无效 targetChatType: ${targetChatType}`, code: 'INVALID_ARGS' };
+            }
             const parsed = {
                 scheduleType: args.scheduleType,
                 scheduleValue: String(args.scheduleValue ?? ''),
@@ -2888,6 +2950,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 name: args.name,
                 targetChannel: args.targetChannel,
                 targetChannelId: args.targetChannelId,
+                targetChatType,
                 targetThreadId: args.targetThreadId,
                 agentId: args.agentId,
                 model: args.model,
@@ -3264,17 +3327,57 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
         }
         if (action === 'restart') {
             const suppressRealRestart = shouldSuppressRealRestart();
+            let restartReplyContext;
+            try {
+                restartReplyContext = session
+                    ? replyContextFromSession(session, transportReplyContext)
+                    : transportReplyContext;
+            }
+            catch (error) {
+                const code = error?.code;
+                if (channel.split('#', 1)[0].toLowerCase() !== 'aun'
+                    || (code !== 'AUN_OUTBOUND_ROUTE_REQUIRED' && code !== 'AUN_OUTBOUND_ROUTE_MISMATCH')) {
+                    throw error;
+                }
+                return {
+                    error: '当前 AUN 会话缺少有效的持久化出站路由，请从可信入站上下文重试',
+                    code,
+                };
+            }
+            const restartDelivery = restartReplyContext?.delivery
+                ?? (explicitChatType === 'group'
+                    ? { chatType: 'group', groupId: channelId }
+                    : explicitChatType === 'private'
+                        ? { chatType: 'private' }
+                        : undefined);
+            if (channel.split('#', 1)[0].toLowerCase() === 'aun'
+                && !isDeliveryTargetForChannel(restartDelivery, channelId)) {
+                return {
+                    error: '无法确定有效的重启通知出站路由，请从可信会话上下文重试',
+                    code: isDeliveryTarget(restartDelivery)
+                        ? 'AUN_OUTBOUND_ROUTE_MISMATCH'
+                        : 'AUN_OUTBOUND_ROUTE_REQUIRED',
+                };
+            }
             if (!suppressRealRestart) {
-                const restartInfo = { channel, channelId, timestamp: Date.now() };
+                const restartInfo = {
+                    channel,
+                    channelId,
+                    timestamp: Date.now(),
+                    ...(restartDelivery ? { delivery: restartDelivery } : {}),
+                };
                 const controlDir = daemonControlDir();
                 fs.mkdirSync(controlDir, { recursive: true });
                 fs.writeFileSync(path.join(controlDir, 'restart-pending.json'), JSON.stringify(restartInfo));
-                const { spawn } = await import('child_process');
-                spawn('node', [path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
-                    detached: true,
-                    stdio: 'ignore',
-                    env: { ...process.env, EVOLCORE_HOME: resolvePaths().root }
-                }).unref();
+                // Use the canonical CLI restart path so the restart itself performs
+                // the version check and automatic upgrades before replacing the daemon.
+                // Do not inherit managed-session credentials: otherwise cmdRestart can
+                // delegate back to this daemon and recursively enqueue another restart.
+                spawnDetachedNode([path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart'], {
+                    EVOLCORE_HOME: resolvePaths().root,
+                    EVOLCORE_SESSION_ID: '',
+                    [AGENT_DELEGATION_TOKEN_ENV]: '',
+                });
             }
             else {
                 logger.info('[System] Suppressed real menu restart in test runtime');
@@ -3310,7 +3413,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 data: {
                     devMode,
                     evolcore: { local: localEvolcore, remote: evolcoreRemote, hasUpdate: cmp(localEvolcore, evolcoreRemote) },
-                    fastaun: { local: localFastaun, remote: fastaunRemote, hasUpdate: cmp(localFastaun, fastaunRemote) },
+                    fastaun: { local: localFastaun, remote: fastaunRemote, hasUpdate: cmp(localFastaun, fastaunRemote), managedBy: 'evolcore' },
                     // ecweb 本地版本由 ECWeb 进程自身注入（data.ecwebVersion），此处仅给 remote
                     ecweb: { remote: ecwebRemote },
                 },
@@ -3340,6 +3443,17 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             ? (session?.metadata?.groupId || channelId)
             : userId;
         const cliPeerKey = cliChannelType && cliPeerKeyId ? formatPeerKey(cliChannelType, cliPeerKeyId) : undefined;
+        const subject = buildMenuAuthSubject(this, {
+            identity,
+            session,
+            requestId,
+            explicitChatType,
+            channel,
+            channelId,
+            userId,
+            fromControlChannel: fromControlChannel ?? false,
+            subject: authSubject,
+        });
         if (Array.isArray(args?.argv)) {
             argv = withDefaultRelationContext(argv, { self: cliSelfAid, peer: cliPeerKey });
         }
@@ -3358,6 +3472,8 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 await auditCommandAuthorization({
                     ts: Date.now(), source: 'menu.cli', operation: parsed.intent.operation,
                     scope: parsed.intent.scope, dangerous: true, actorId: userId,
+                    requestId, sessionId: subject.sessionId, agentAid: subject.selfAid,
+                    permissionMode: subject.permissionMode,
                     channel, channelId, role: identity.role, decision: 'deny', code: 'NOT_ALLOWED',
                     reason: 'Unrecognized CLI command', taskId: requestId, argvHash: hashArgv(intentArgv),
                     name: 'cli', action: 'exec', args: { argv: [...requestedArgv] },
@@ -3366,16 +3482,6 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             }
             parsedCommands.push(parsed);
         }
-        const subject = buildMenuAuthSubject(this, {
-            identity,
-            session,
-            explicitChatType,
-            channel,
-            channelId,
-            userId,
-            fromControlChannel: fromControlChannel ?? false,
-            subject: authSubject,
-        });
         const selfAid = subject.selfAid;
         const peerKey = subject.peerKey;
         const isDaemonOwner = subject.isDaemonOwner;
@@ -3400,6 +3506,10 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 allowExplicitRelationTarget: true,
                 auditAllowed: false,
                 auditMetadata: {
+                    requestId,
+                    sessionId: subject.sessionId,
+                    agentAid: subject.selfAid,
+                    permissionMode: subject.permissionMode,
                     taskId: requestId,
                     argvHash: hashArgv(authArgv),
                     name: 'cli',
@@ -3420,6 +3530,8 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 ts: Date.now(), source: 'menu.cli', operation: parsed.intent.operation,
                 scope: parsed.intent.scope, dangerous: parsed.intent.dangerous ?? false,
                 actorId: userId, selfAid, peerKey,
+                requestId, sessionId: subject.sessionId, agentAid: selfAid,
+                permissionMode: subject.permissionMode,
                 channel, channelId, role: identity.role, isDaemonOwner,
                 fromControlChannel: fromControlChannel ?? false, decision: 'allow',
                 matchedRule: decision.command?.matchedRule, taskId: requestId, argvHash: hashArgv(argv),
@@ -3463,7 +3575,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             return { error: '通道不存在', code: 'EXEC_FAILED' };
         if (!adapter.capabilities?.file)
             return { error: '通道不支持文件发送', code: 'NOT_SUPPORTED' };
-        const sessionReplyContext = session ? this.getReplyContext(session) : undefined;
+        const sessionReplyContext = session ? replyContextFromSession(session, this.getReplyContext(session)) : undefined;
         const replyCtx = transportReplyContext
             ? {
                 ...(sessionReplyContext ?? {}),
@@ -3491,16 +3603,6 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
     }
     return { error: `不支持 action: ${cmdBase}`, code: 'NOT_SUPPORTED' };
 }
-const SYSTEM_CONTROL_NAME_MAP = {
-    pwd: '/pwd', session: '/session', baseagent: '/baseagent', model: '/model',
-    topic: '/topic',
-    effort: '/effort', chatmode: '/chatmode', mentionmode: '/mentionmode',
-    permission: '/perm', activity: '/activity', system: '/system',
-    observable: '/observable',
-    agent: '/agent', trigger: '/trigger', file: '/file', gateway: '/gateway',
-    config: '/config', capability: '/capability', role: '/role',
-    group: '/group', connect: '/connect',
-};
 function menuCommandToken(cmd) {
     if (typeof cmd !== 'string')
         return undefined;
@@ -3511,6 +3613,13 @@ function isProcessLevelMenu(name, cmd) {
     return name === 'system' || name === 'agent' || name === 'gateway' || name === 'config'
         || cmdToken === '/system' || cmdToken === '/agent' || cmdToken === '/gateway' || cmdToken === '/config';
 }
+function isProcessContextMenu(payload) {
+    const isCatalog = payload?.type === 'menu.list' && payload?.args?.view === 'catalog';
+    const isValueBatch = payload?.type === 'menu.query'
+        && payload?.name === 'menu'
+        && payload?.args?.view === 'values';
+    return (isCatalog || isValueBatch) && payload?.args?.context?.kind === 'process';
+}
 async function execMenuForSystemControl(payload, context) {
     const id = payload?.id ?? '';
     const name = payload?.name;
@@ -3531,13 +3640,15 @@ async function execMenuForSystemControl(payload, context) {
             : 'cli 不在控制 channel 范围';
         return { type: 'menu.response', id, name, error: { code: 'NOT_SUPPORTED', message } };
     }
-    const isProcessLevel = isProcessLevelMenu(name, payload?.cmd);
+    const isProcessLevel = isProcessLevelMenu(name, payload?.cmd) || isProcessContextMenu(payload);
+    const requestedContextKind = payload?.args?.context?.kind;
     const isRoleRequest = name === 'role' || compatCmd === '/role';
     const isConnectRequest = name === 'connect' || compatCmd === '/connect';
     const requiresAgentTarget = isRoleRequest || isConnectRequest || [
         'observable', 'baseagent', 'model', 'effort', 'trigger', 'capability', 'group',
     ].includes(name)
-        || ['/observable', '/baseagent', '/model', '/effort', '/trigger', '/capability', '/group'].includes(compatCmd ?? '');
+        || ['/observable', '/baseagent', '/model', '/effort', '/trigger', '/capability', '/group'].includes(compatCmd ?? '')
+        || (!isProcessLevel && requestedContextKind !== undefined && requestedContextKind !== 'process');
     const target = isProcessLevel
         ? { channel: SYSTEM_CONTROL_CHANNEL }
         : resolveExternalMenuAgentChannel(this, payload, SYSTEM_CONTROL_CHANNEL, requiresAgentTarget);
@@ -3548,6 +3659,7 @@ async function execMenuForSystemControl(payload, context) {
     const trustedSubject = buildAuthSubject({
         selfAid: targetAid,
         actorId: context.actorAid,
+        requestId: id !== undefined && id !== null && String(id) ? String(id) : undefined,
         channel: targetChannel,
         channelType: 'aun',
         channelId: context.actorAid || SYSTEM_CONTROL_CHANNEL,
@@ -3558,21 +3670,71 @@ async function execMenuForSystemControl(payload, context) {
         fromControlChannel: true,
     });
     const trustedIdentity = trustedSubject.identity;
-    const cmd = name ? (SYSTEM_CONTROL_NAME_MAP[name] ?? payload.cmd) : payload.cmd;
+    const cmd = name ? (menuCommandForName(name) ?? payload.cmd) : payload.cmd;
     try {
         switch (payload?.type) {
             case 'menu.list':
+                if (payload?.args?.view === 'catalog') {
+                    validateMenuCatalogArgs(payload.args);
+                    const data = await getMenuCatalog({
+                        subject: trustedSubject,
+                        channelType: 'aun',
+                        channelScope: 'control',
+                        channelId: targetChannel,
+                        request: payload.args.context,
+                    });
+                    return menuSuccess({ id, ...(name ? { name } : {}) }, data);
+                }
+                if (payload?.args?.view !== undefined)
+                    return ecwebErr(id, name, 'NOT_SUPPORTED', `Unsupported menu.list view: ${String(payload.args.view)}`);
                 return menuSuccess({ id }, this.getMenuItems(trustedIdentity.role, 'private', 'control', trustedSubject));
             case 'menu.query': {
+                if (name === 'menu' && payload?.args?.view === 'values') {
+                    validateMenuValueBatchArgs(payload.args);
+                    const data = await execMenuValueBatch({
+                        subject: trustedSubject,
+                        channelType: 'aun',
+                        channelScope: 'control',
+                        channelId: targetChannel,
+                        request: payload.args.context,
+                        items: payload.args.items,
+                        schemaVersion: payload.args.schemaVersion,
+                        consistency: payload.args.consistency,
+                        execQuery: async (entryCmd, resolvedChannelId, queryArgs, catalogContext) => this.execMenuQuery(entryCmd, targetChannel, resolvedChannelId, catalogContext.subject.actorId, queryArgs, catalogContext.subject.chatType, true, catalogContext.subject.identity, catalogContext.subject, context.source),
+                    });
+                    return menuSuccess({ id, ...(name ? { name } : {}) }, data);
+                }
+                if (name === 'menu')
+                    return ecwebErr(id, name, 'NOT_SUPPORTED', `Unsupported menu.query view: ${String(payload?.args?.view)}`);
                 if (!cmd)
                     return ecwebErr(id, name, 'MISSING_CMD', '缺少 name/cmd');
-                const r = await this.execMenuQuery(cmd, targetChannel, targetChannel, context.actorAid, payload.args, undefined, true, trustedIdentity, trustedSubject, context.source);
+                const hasExplicitContext = !!payload?.args && Object.prototype.hasOwnProperty.call(payload.args, 'context');
+                const execution = await resolveExplicitMenuExecutionContext({
+                    subject: trustedSubject,
+                    channelType: 'aun',
+                    channelScope: 'control',
+                    channelId: targetChannel,
+                    args: payload.args,
+                });
+                const r = hasExplicitContext
+                    ? await this.execMenuQuery(cmd, targetChannel, execution.channelId, execution.subject.actorId, execution.args, execution.subject.chatType, true, execution.subject.identity, execution.subject, context.source)
+                    : await this.execMenuQuery(cmd, targetChannel, targetChannel, context.actorAid, payload.args, undefined, true, trustedIdentity, trustedSubject, context.source);
                 return ecwebResp(id, name, r);
             }
             case 'menu.options': {
                 if (!cmd)
                     return ecwebErr(id, name, 'MISSING_CMD', '缺少 name/cmd');
-                const data = await this.getSubMenuItems(cmd, targetChannel, targetChannel, context.actorAid, payload.args, trustedIdentity, undefined, true, trustedSubject, context.source) ?? [];
+                const hasExplicitContext = !!payload?.args && Object.prototype.hasOwnProperty.call(payload.args, 'context');
+                const execution = await resolveExplicitMenuExecutionContext({
+                    subject: trustedSubject,
+                    channelType: 'aun',
+                    channelScope: 'control',
+                    channelId: targetChannel,
+                    args: payload.args,
+                });
+                const data = hasExplicitContext
+                    ? await this.getSubMenuItems(cmd, targetChannel, execution.channelId, execution.subject.actorId, execution.args, execution.subject.identity, execution.subject.chatType, true, execution.subject, context.source) ?? []
+                    : await this.getSubMenuItems(cmd, targetChannel, targetChannel, context.actorAid, payload.args, trustedIdentity, undefined, true, trustedSubject, context.source) ?? [];
                 return menuSuccess({ id, ...(name ? { name } : {}) }, data);
             }
             case 'menu.update': {
@@ -3580,7 +3742,14 @@ async function execMenuForSystemControl(payload, context) {
                     return ecwebErr(id, name, 'MISSING_CMD', '缺少 name/cmd');
                 if (!payload.value)
                     return ecwebErr(id, name, 'MISSING_VALUE', '缺少 value');
-                const r = await this.execMenuUpdate(cmd, payload.value, targetChannel, targetChannel, context.actorAid, trustedIdentity, true, payload.args, trustedSubject, context.source);
+                const execution = await resolveExplicitMenuExecutionContext({
+                    subject: trustedSubject,
+                    channelType: 'aun',
+                    channelScope: 'control',
+                    channelId: targetChannel,
+                    args: payload.args,
+                });
+                const r = await this.execMenuUpdate(cmd, payload.value, targetChannel, execution.channelId, execution.subject.actorId, execution.subject.identity, true, execution.args, execution.subject, context.source);
                 return ecwebResp(id, name, r);
             }
             case 'menu.action': {
@@ -3588,7 +3757,17 @@ async function execMenuForSystemControl(payload, context) {
                     return ecwebErr(id, name, 'MISSING_CMD', '缺少 name/cmd');
                 if (!payload.action)
                     return ecwebErr(id, name, 'MISSING_VALUE', '缺少 action');
-                const r = await this.execMenuAction(cmd, payload.action, payload.args, targetChannel, targetChannel, context.actorAid, trustedIdentity, undefined, id, true, trustedSubject, context.source);
+                const hasExplicitContext = !!payload?.args && Object.prototype.hasOwnProperty.call(payload.args, 'context');
+                const execution = await resolveExplicitMenuExecutionContext({
+                    subject: trustedSubject,
+                    channelType: 'aun',
+                    channelScope: 'control',
+                    channelId: targetChannel,
+                    args: payload.args,
+                });
+                const r = hasExplicitContext
+                    ? await this.execMenuAction(cmd, payload.action, execution.args, targetChannel, execution.channelId, execution.subject.actorId, execution.subject.identity, execution.subject.chatType, id, true, execution.subject, context.source)
+                    : await this.execMenuAction(cmd, payload.action, payload.args, targetChannel, targetChannel, context.actorAid, trustedIdentity, undefined, id, true, trustedSubject, context.source);
                 return ecwebResp(id, name, r);
             }
             default:
@@ -3606,7 +3785,7 @@ export async function execMenuForEcweb(payload, trusted) {
     const validationError = validateMenuRequest(payload ?? {});
     if (validationError)
         return menuFailure({ id, ...(name ? { name } : {}) }, validationError);
-    const isProcessLevel = isProcessLevelMenu(name, payload?.cmd);
+    const isProcessLevel = isProcessLevelMenu(name, payload?.cmd) || isProcessContextMenu(payload);
     const owners = loadDaemonConfig().owners ?? [];
     if (isProcessLevel && owners.length === 0) {
         return { type: 'menu.response', id, name, error: { code: 'FORBIDDEN', message: '请在 daemon.json 配置 owners 后使用进程级操作' } };