evolcore 0.0.10 → 0.0.12

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

@@ -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';
@@ -36,11 +36,11 @@ 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 { 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 +60,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"
@@ -873,20 +874,36 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
     });
     const modelScope = args?.scope === 'agent' ? 'agent' : 'relation';
     if (verb === 'query') {
+        if (cmdBase === '/pwd')
+            return intent('project.current', 'relation');
+        if (cmdBase === '/session' || cmdBase === '/s')
+            return intent('session.current', 'relation');
+        if (cmdBase === '/topic')
+            return intent('session.topic.current', 'relation');
+        if (cmdBase === '/baseagent')
+            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')
             return intent('model.current', modelScope);
         if (cmdBase === '/effort')
-            return intent('model.current', modelScope);
+            return intent('model.effort.current', modelScope);
         if (cmdBase === '/chatmode')
             return intent('chatmode.current', args?.scope === 'agent' ? 'agent' : 'relation');
         if (cmdBase === '/mentionmode')
             return intent('mentionmode.current', args?.scope === 'agent' ? 'agent' : 'relation');
+        if (cmdBase === '/perm')
+            return intent('permission.current', args?.scope === 'agent' ? 'agent' : 'relation');
+        if (cmdBase === '/activity')
+            return intent('activity.current', args?.scope === 'agent' ? 'agent' : 'relation');
+        if (cmdBase === '/observable')
+            return intent('observable.current', 'agent');
+        if (cmdBase === '/capability')
+            return intent('capability.read', 'agent');
         if (cmdBase === '/gateway')
             return intent('gateway.read', 'process');
         if (cmdBase === '/config')
-            return intent('config.read', 'process');
+            return intent('config.read', args?.scope === 'agent' ? 'agent' : 'process');
         if (cmdBase === '/system')
             return intent('system.status', 'process');
         if (cmdBase === '/agent') {
@@ -895,7 +912,35 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
         if (cmdBase === '/trigger')
             return intent('trigger.list', 'relation');
     }
+    if (verb === 'options') {
+        if (cmdBase === '/agent')
+            return intent(fromControlChannel ? 'agent.list' : 'agent.show', fromControlChannel ? 'control' : 'agent');
+        if (cmdBase === '/capability')
+            return intent('capability.read', 'agent');
+        if (cmdBase === '/trigger')
+            return intent('trigger.list', 'relation');
+        if (cmdBase === '/topic')
+            return intent('session.topic.list', 'relation');
+        if (cmdBase === '/session' || cmdBase === '/s' || cmdBase === '/del')
+            return intent('session.list', 'relation');
+        if (cmdBase === '/baseagent')
+            return intent('agent.baseagent.list', 'agent');
+        if (cmdBase === '/model')
+            return intent('model.list', modelScope);
+        if (cmdBase === '/effort')
+            return intent('model.effort.current', modelScope);
+        if (cmdBase === '/chatmode')
+            return intent('chatmode.current', args?.scope === 'agent' ? 'agent' : 'relation');
+        if (cmdBase === '/mentionmode')
+            return intent('mentionmode.current', args?.scope === 'agent' ? 'agent' : 'relation');
+        if (cmdBase === '/activity')
+            return intent('activity.current', args?.scope === 'agent' ? 'agent' : 'relation');
+        if (cmdBase === '/perm')
+            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')
@@ -904,6 +949,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')
@@ -1010,6 +1059,9 @@ async function authorizeMenuIntent(params) {
             peerKey: subject.peerKey,
         });
     }
+    else if (intent.scope === 'agent' && subject.selfAid && intent.args.self === undefined) {
+        intent.args = { ...intent.args, self: subject.selfAid };
+    }
     const source = params.source ?? 'menu';
     intent.source = source;
     const decision = await authorizeOperation({ source, intent, subject });
@@ -1044,6 +1096,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,
@@ -1052,6 +1107,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: { 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] : []),
@@ -1240,6 +1315,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');
@@ -1248,7 +1324,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' },
@@ -1428,13 +1509,25 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
             throw { code: result.code, message: result.error, data: result.data };
         return result.data;
     }
+    const optionsIdentity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
+    const optionsAuthDenied = await authorizeMenuIntent.call(this, {
+        intent: buildMenuIntent('options', cmdBase0, args, undefined, undefined, fromControlChannel),
+        identity: optionsIdentity,
+        subject,
+        session,
+        explicitChatType,
+        channel,
+        channelId,
+        userId,
+        fromControlChannel,
+        source,
+    });
+    if (optionsAuthDenied)
+        throw { code: optionsAuthDenied.code, message: optionsAuthDenied.error, data: optionsAuthDenied.data };
     // ── /agent list（只读） ──
-    // 控制 channel：验 evolcore.owners，返回全量；agent channel：放行但仅返回自身单条。
+    // 控制 channel：返回全量；agent channel：仅返回自身单条。
     if (cmd === '/agent') {
         if (fromControlChannel) {
-            if (!subject.isDaemonOwner) {
-                throw { code: 'FORBIDDEN', message: '操作需要 owner 权限' };
-            }
             const res = await execAgentOptions(args);
             if ('error' in res)
                 throw { code: res.code, message: res.error };
@@ -1465,24 +1558,9 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
     }
     // ── 关系级 /trigger list（每个 trigger 一个 MenuItem） ──
     if (cmd === '/trigger') {
-        const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
-        const authDenied = await authorizeMenuIntent.call(this, {
-            intent: buildMenuIntent('query', cmd, args, undefined, undefined, fromControlChannel),
-            identity,
-            subject,
-            session,
-            explicitChatType,
-            channel,
-            channelId,
-            userId,
-            fromControlChannel,
-            source,
-        });
-        if (authDenied)
-            throw { code: authDenied.code, message: authDenied.error, data: authDenied.data };
         const triggerScheduler = this.getTriggerSchedulerForChannel?.(channel);
         const scope = args?.options === 'all' ? 'all' : 'enabled';
-        const role = identity.role;
+        const role = optionsIdentity.role;
         const isAdmin = isManagementRole(role);
         if (!triggerScheduler)
             return [];
@@ -1501,10 +1579,6 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
         });
     }
     if (cmd === '/topic') {
-        const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
-        if (!this.canReadTopics(identity.role)) {
-            throw { code: 'FORBIDDEN', message: '无权限查看话题' };
-        }
         if (args?.mode === 'fork-turns') {
             const source = await resolveTopicForkSource(this.sessionManager, channel, channelId, args?.sourceThreadId);
             if (!source)
@@ -1577,14 +1651,13 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
         return available.map((name) => ({ value: name, label: name, selected: name === currentAgent }));
     }
     if (cmd === '/model') {
-        const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
         const target = resolveMenuModelTarget.call(this, {
             args,
             session,
             channel,
             channelId,
             userId,
-            role: identity.role,
+            role: optionsIdentity.role,
             explicitChatType,
             fromControlChannel,
             field: 'model',
@@ -1593,31 +1666,8 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
             throw { code: target.code, message: target.error };
         const agent = this.getAgent(channel, target.baseagent);
         if (hasModelSwitcher(agent) && agent.listModels) {
-            const role = identity.role;
-            const authIntent = {
-                operation: 'model.list',
-                scope: target.scope,
-                source: 'menu',
-                args: {},
-            };
-            const subject = buildMenuAuthSubject(this, {
-                identity,
-                session,
-                explicitChatType,
-                channel,
-                channelId,
-                userId,
-                fromControlChannel,
-                subject: authSubject,
-            });
-            authIntent.args = target.scope === 'relation'
-                ? buildRelationIntentArgs({ args, selfAid: target.sel.self, peerKey: target.sel.peerKey })
-                : { ...(args ?? {}), self: target.sel.self };
-            const decision = await authorizeOperation({ source: 'menu', intent: authIntent, subject, audit: false });
-            if (!decision.allow)
-                throw { code: decision.code, message: decision.reason };
             const rawModels = await agent.listModels() ?? [];
-            const models = filterModelsForRole(role, target.baseagent, rawModels, agent.resolveModelId?.bind(agent));
+            const models = filterModelsForRole(optionsIdentity.role, target.baseagent, rawModels, agent.resolveModelId?.bind(agent));
             const requestedModel = menuStringArg(args, 'model') ?? menuStringArg(args, 'current');
             const currentModel = requestedModel || readMenuModel(target, agent).value || agent.getModel();
             if (models.length > 0)
@@ -1715,7 +1765,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' },
@@ -1741,6 +1791,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;
@@ -1756,6 +1810,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,
@@ -1813,12 +1879,9 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
     if (authDenied)
         return authDenied;
     // ── /agent 查询（只读） ──
-    // 控制 channel：验 owners，按 args.aid 查任意 agent；agent channel：强制查自身。
+    // 授权由 agent.list/agent.show operation 决定；channel 闸门只负责目标范围。
     if (cmdBase === '/agent') {
         if (fromControlChannel) {
-            if (!subject.isDaemonOwner) {
-                return { error: '操作需要 owner 权限', code: 'FORBIDDEN' };
-            }
             return await execAgentQuery(args);
         }
         const selfAid = this.getOwningAgent?.(channel)?.aid;
@@ -1827,29 +1890,17 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         return await execAgentQuery({ ...(args ?? {}), aid: selfAid });
     }
     // ── /gateway 查询（只读，列出全部作用域的网关配置；apiKey 已掩码） ──
-    // 进程级：闸门已要求 fromControlChannel；此处再验 owners 非空。
     if (cmdBase === '/gateway') {
-        if (!subject.isDaemonOwner) {
-            return { error: '操作需要 owner 权限', code: 'FORBIDDEN' };
-        }
         return gatewayList();
     }
     // ── /config 查询（只读，查询各层配置） ──
     if (cmdBase === '/config') {
         const scope = args?.scope || 'process';
         if (scope === 'process') {
-            // 进程级配置需要 owner 权限
-            if (!fromControlChannel || !subject.isDaemonOwner) {
-                return { error: '操作需要 owner 权限', code: 'FORBIDDEN' };
-            }
             const cfg = loadDaemonConfig();
             return { data: { scope: 'process', config: cfg } };
         }
         if (scope === 'defaults') {
-            // 全局默认配置需要 owner 权限
-            if (!fromControlChannel || !subject.isDaemonOwner) {
-                return { error: '操作需要 owner 权限', code: 'FORBIDDEN' };
-            }
             const { read, ConfigTarget } = await import('../../config/config-manager.js');
             const cfg = read(ConfigTarget.Defaults, undefined, { cache: true });
             return { data: { scope: 'defaults', config: cfg } };
@@ -1938,9 +1989,6 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         return { data };
     }
     if (cmdBase === '/topic') {
-        if (!this.canReadTopics(identity.role)) {
-            return { error: '无权限查看话题', code: 'FORBIDDEN' };
-        }
         const target = (args?.target ?? '').toString().trim();
         if (!target)
             return { error: '缺少 args.target', code: 'MISSING_VALUE' };
@@ -2095,8 +2143,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: {
@@ -2110,8 +2157,6 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         };
     }
     if (cmdBase === '/observable') {
-        if (identity.role !== 'owner')
-            return { error: '观察者模式仅限 owner 查看', code: 'NO_PERMISSION' };
         if (!evolagent)
             return { error: '找不到通道所属 agent', code: 'MISSING_AID' };
         const observable = evolagent?.getObservable() ?? false;
@@ -2173,9 +2218,6 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         };
     }
     if (cmdBase === '/system') {
-        if (!subject.isDaemonOwner) {
-            return { error: '操作需要 owner 权限', code: 'FORBIDDEN' };
-        }
         const data = {
             aid: loadDaemonConfig().aid ?? null,
             pid: process.pid,
@@ -2614,8 +2656,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,
@@ -3278,12 +3318,9 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 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();
+                spawnDetachedNode([path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
+                    EVOLCORE_HOME: resolvePaths().root,
+                });
             }
             else {
                 logger.info('[System] Suppressed real menu restart in test runtime');
@@ -3319,7 +3356,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 },
                 },
@@ -3500,16 +3537,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;
@@ -3520,6 +3547,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;
@@ -3540,13 +3574,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);
@@ -3567,21 +3603,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': {
@@ -3589,7 +3675,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': {
@@ -3597,7 +3690,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:
@@ -3615,7 +3718,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 后使用进程级操作' } };