evolcore 0.0.2 → 0.0.4

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

@@ -25,6 +25,7 @@ import { isCapabilityType, listCapabilityOptions, queryCapabilityTypes, resolveC
 import { normalizeCliArgv, parseCliIntent, parseLegacyCliCommand, validateCliArgv, withDefaultRelationContext } from './cli-intent-parser.js';
 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 { chatmodeFieldForPeer, resolveChatModeForField } from '../message/peer-mode.js';
 import { PUBLIC_PERMISSION_MODES } from '../permission/mode.js';
@@ -32,9 +33,12 @@ import { resolveRuntimePermissionMode, resolveRuntimeStringField, validateRuntim
 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 { roleMenuAction, roleMenuOperation, roleMenuOptions, roleMenuQuery, roleMenuUpdate, } from './role-menu.js';
+import { handleConnectMenu, connectMenuOperation } from './connect-menu.js';
+import { groupMenuAuthorizationArgs, groupMenuIntent, handleGroupMenu, } from './group-menu.js';
 /**
  * 获取 baseagent CLI 的版本号（claude/gemini/codex）。
  * 失败返回 null（命令不存在或执行失败）。
@@ -65,6 +69,43 @@ const FILE_HASH_MAX_SIZE = 2 * 1024 * 1024;
 const FILE_LIST_DEFAULT_LIMIT = 500;
 const FILE_LIST_MAX_LIMIT = 1000;
 const topicForkTargetsInFlight = new Set();
+const GROUP_RULES_RESUME_UNSUPPORTED_NOTE = '群规则加载策略已保存；当前会话使用的 baseagent 不支持在恢复会话中更新群规则上下文。请新建或清空该群会话后生效。';
+function appendGroupRulesCompatibilityNote(execution, command, session) {
+    if (!('data' in execution)
+        || execution.data?.exitCode !== 0
+        || command?.kind !== 'field'
+        || (command.subcommand !== 'set' && command.subcommand !== 'unset')
+        || command.field !== 'groupRules.mode'
+        || !session?.baseagent
+        || session.baseagent === 'claude'
+        || session.baseagent === 'codex') {
+        return execution;
+    }
+    const note = `${GROUP_RULES_RESUME_UNSUPPORTED_NOTE}（当前：${session.baseagent}）`;
+    const stdout = String(execution.data.stdout ?? '');
+    if (command.format === 'json') {
+        try {
+            const payload = JSON.parse(stdout);
+            if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+                return {
+                    data: {
+                        ...execution.data,
+                        stdout: `${JSON.stringify({ ...payload, note }, null, 2)}\n`,
+                    },
+                };
+            }
+        }
+        catch {
+            // Fall through to a text suffix if a future CLI returns non-JSON output.
+        }
+    }
+    return {
+        data: {
+            ...execution.data,
+            stdout: stdout.trimEnd() ? `${stdout.trimEnd()}\n${note}\n` : `${note}\n`,
+        },
+    };
+}
 function validateCapabilityScope(args) {
     const scope = args?.scope ?? 'project';
     return scope === 'project' ? null : { error: 'MVP 只支持 scope=project', code: 'INVALID_SCOPE' };
@@ -178,9 +219,9 @@ async function resolveTopicForkSource(sessionManager, channel, channelId, source
  * 沿用 /file 的安全校验链：拒绝 `..` 穿越、realpathSync 后验证落点。
  * 成功返回 `{ realPath, projectPath, stat }`；失败返回 `{ error, code }`。
  */
-function resolveMenuFilePath(input, session, role, expectType) {
-    if (!session?.projectPath)
-        return { error: '当前无活跃会话', code: 'NO_ACTIVE_SESSION' };
+function resolveMenuFilePath(input, projectPath, role, expectType) {
+    if (!projectPath)
+        return { error: '无法解析当前 agent projectPath', code: 'NO_PROJECT' };
     const raw = (input ?? '').toString().trim();
     if (!raw)
         return { error: '缺少 path 参数', code: 'MISSING_VALUE' };
@@ -189,7 +230,7 @@ function resolveMenuFilePath(input, session, role, expectType) {
         return { error: '不支持 .. 路径穿越', code: 'NO_PERMISSION' };
     }
     // 相对路径基于 projectPath 解析；绝对路径原样
-    const resolved = path.isAbsolute(raw) ? raw : path.resolve(session.projectPath, raw);
+    const resolved = path.isAbsolute(raw) ? raw : path.resolve(projectPath, raw);
     if (!fs.existsSync(resolved)) {
         return { error: '文件不存在', code: 'NOT_FOUND' };
     }
@@ -197,7 +238,7 @@ function resolveMenuFilePath(input, session, role, expectType) {
     let realProjectPath;
     try {
         realPath = fs.realpathSync(resolved);
-        realProjectPath = fs.realpathSync(session.projectPath);
+        realProjectPath = fs.realpathSync(projectPath);
     }
     catch {
         return { error: '文件不存在', code: 'NOT_FOUND' };
@@ -823,6 +864,8 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
     });
     const modelScope = args?.scope === 'agent' ? 'agent' : 'relation';
     if (verb === 'query') {
+        if (cmdBase === '/file')
+            return intent('file.fetch', 'filesystem', { filePath: args?.path });
         if (cmdBase === '/model')
             return intent('model.current', modelScope);
         if (cmdBase === '/effort')
@@ -862,9 +905,9 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
     if (verb === 'action') {
         if (cmdBase === '/file') {
             if (action === 'list')
-                return intent('file.list', 'filesystem');
+                return intent('file.list', 'filesystem', { filePath: args?.path });
             if (action === 'fetch')
-                return intent('file.fetch', 'filesystem');
+                return intent('file.fetch', 'filesystem', { filePath: args?.path });
         }
         if (cmdBase === '/gateway')
             return intent('gateway.write', 'process', { action });
@@ -885,7 +928,7 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
                 return intent('agent.delete', 'control', { action });
         }
         if (cmdBase === '/trigger') {
-            if (action === 'set')
+            if (action === 'create' || action === 'set')
                 return intent('trigger.create', 'relation', { action });
             if (action === 'show')
                 return intent('trigger.show', 'relation', { action });
@@ -962,13 +1005,14 @@ async function authorizeMenuIntent(params) {
     intent.source = source;
     const decision = await authorizeOperation({ source, intent, subject });
     if (!decision.allow) {
-        if (intent.operation.startsWith('role.')) {
+        if (intent.operation.startsWith('role.') || intent.operation.startsWith('connect.')) {
+            const namespace = intent.operation.split('.', 1)[0];
             return {
                 error: decision.reason,
                 code: 'PERMISSION_DENIED',
                 data: {
                     $schema_version: 1,
-                    kind: 'role_permission_denied',
+                    kind: `${namespace}_permission_denied`,
                     self: subject.selfAid ?? null,
                     actorRole: subject.role,
                     operation: intent.operation,
@@ -1024,7 +1068,7 @@ async function authorizeRoleMenu(owner, params) {
         fromControlChannel: params.fromControlChannel,
         subject: params.subject,
     });
-    const operation = roleMenuOperation(params.kind, params.args, params.value);
+    const operation = params.operation ?? roleMenuOperation(params.kind, params.args, params.value);
     const denied = await authorizeMenuIntent.call(owner, {
         intent: { operation, scope: 'agent', source: params.source, args: { ...(params.args ?? {}) } },
         identity: params.identity,
@@ -1040,6 +1084,57 @@ async function authorizeRoleMenu(owner, params) {
         return denied;
     return { context: buildRoleMenuContext(owner, params.channel, subject) };
 }
+async function executeGroupMenu(owner, params) {
+    let menuIntent;
+    try {
+        menuIntent = groupMenuIntent(params.kind, params.args);
+    }
+    catch (error) {
+        return menuResultFailure(error);
+    }
+    const authorizationArgs = groupMenuAuthorizationArgs(params.args, params.subject.selfAid, menuIntent.scope === 'relation' ? params.subject.peerKey : undefined);
+    const authorizationSubject = params.subject.isDaemonOwner && params.subject.role !== 'owner'
+        ? { ...params.subject, role: 'owner' }
+        : params.subject;
+    const denied = await authorizeMenuIntent.call(owner, {
+        intent: {
+            operation: menuIntent.operation,
+            scope: menuIntent.scope,
+            source: params.source,
+            args: authorizationArgs,
+        },
+        identity: params.identity,
+        subject: authorizationSubject,
+        session: params.session,
+        explicitChatType: params.explicitChatType,
+        channel: params.channel,
+        channelId: params.channelId,
+        userId: params.userId,
+        fromControlChannel: params.fromControlChannel,
+        source: params.source,
+    });
+    if (denied)
+        return { ...denied, code: 'PERMISSION_DENIED' };
+    try {
+        const currentGroupId = params.session?.chatType === 'group'
+            ? String(params.session.metadata?.groupId || params.channelId)
+            : undefined;
+        const roleContext = buildRoleMenuContext(owner, params.channel, params.subject);
+        return {
+            data: await handleGroupMenu({ kind: params.kind, args: params.args, value: params.value }, {
+                self: params.subject.selfAid ?? roleContext.self,
+                role: params.subject.role,
+                isDaemonOwner: params.subject.isDaemonOwner,
+                currentGroupId,
+                baseagent: params.session?.baseagent,
+                roleContext,
+            }),
+        };
+    }
+    catch (error) {
+        return menuResultFailure(error);
+    }
+}
 function ecwebErr(id, name, code, message) {
     return menuFailure({ id, ...(name ? { name } : {}) }, normalizeMenuError({ code, message }));
 }
@@ -1105,14 +1200,59 @@ export function validateScheduleParams(scheduleType, scheduleValue) {
 }
 /**
  * 返回结构化命令菜单（供 menu.query 使用）
- * owner 看到全部命令，admin 看到管理级命令（不含 owner-only），visitor/member 仅看到用户级命令
+ * owner-only 及尚未迁移的命令保留角色语义；已迁移的命令按 operation capability 展示。
  */
-export function getMenuItems(role, chatType = 'private', scope = 'agent') {
+export function getMenuItems(role, chatType = 'private', scope = 'agent', authSubject) {
     const isOwner = role === 'owner';
     const isAdmin = isManagementRole(role);
     const isControlScope = scope === 'control';
     const canReadTopic = role !== 'none';
     const items = [];
+    const normalizedChatType = chatType === 'group' ? 'group' : 'private';
+    const canOperation = (operation, operationScope) => {
+        if (authSubject) {
+            const relationArgs = operationScope === 'relation'
+                ? buildRelationIntentArgs({ selfAid: authSubject.selfAid, peerKey: authSubject.peerKey })
+                : {};
+            return authorizeOperation({
+                source: 'menu',
+                intent: { operation, scope: operationScope, source: 'menu', args: relationArgs },
+                subject: authSubject,
+                audit: false,
+            }).allow;
+        }
+        return evaluateRoleOperationCapability({
+            role,
+            operation,
+            scope: operationScope,
+            chatType: normalizedChatType,
+            fromControlChannel: isControlScope,
+        }).allow;
+    };
+    const canUseModel = canOperation('model.use', 'relation');
+    const canSetEffort = canOperation('model.effort', 'relation');
+    const canSetChatmode = canOperation('chatmode.update', 'relation');
+    const canSetMentionmode = normalizedChatType === 'group' && canOperation('mentionmode.update', 'relation');
+    const canReadPermission = canOperation('permission.current', 'relation');
+    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 } }] : []),
+        ...(canSetEffort ? [{ cmd: '/effort', label: '切换推理强度', desc: '调整模型推理深度，影响响应速度与质量', next: { type: 'select', items: [
+                        { value: 'low', label: 'Low' },
+                        { value: 'medium', label: 'Medium' },
+                        { value: 'high', label: 'High' },
+                        { value: 'max', label: 'Max' },
+                    ] } }] : []),
+        ...(canSetChatmode ? [{ cmd: '/chatmode', label: '切换会话模式', desc: '控制 Agent 主动性（被动响应或主动推进）', next: { type: 'select', items: [
+                        { value: 'interactive', label: '交互模式', desc: '仅在收到消息时响应' },
+                        { value: 'proactive', label: '主动模式', desc: 'Agent 可主动推进任务' },
+                    ] } }] : []),
+        ...(canSetMentionmode ? [{ cmd: '/mentionmode', label: '切换 @ 处理模式', desc: '控制群聊消息过滤（仅@提及或全部响应）', next: { type: 'select', items: [
+                        { value: 'mention-only', label: '@ 提及', desc: '仅在被 @ 提及时响应' },
+                        { value: 'disabled', label: '全部响应', desc: '响应群内所有消息' },
+                    ] } }] : []),
+    ];
     if (!isAdmin && chatType === 'group') {
         return [
             ...(canReadTopic ? [{
@@ -1121,11 +1261,20 @@ export function getMenuItems(role, chatType = 'private', scope = 'agent') {
                         { cmd: '/topic', label: '话题管理', desc: '查看当前聊天的话题会话', next: { type: 'select', dynamic: true } },
                     ]
                 }] : []),
+            ...(configurableSettings.length > 0 ? [{
+                    group: 'Agent 与模型',
+                    commands: configurableSettings,
+                }] : []),
+            ...(canReadPermission ? [{
+                    group: '权限管理',
+                    commands: [{ cmd: '/perm', label: '查看权限模式', desc: '权限模式由当前角色定义决定' }],
+                }] : []),
             {
                 group: '其他',
                 commands: [
                     { cmd: '/status', label: '显示会话状态' },
                     { cmd: '/check', label: '检查 EvolAgent 实例健康' },
+                    ...(canUseFile ? [{ cmd: '/file', label: '发送项目内文件', desc: '将项目目录内的文件发送给用户' }] : []),
                     { cmd: '/help', label: '显示帮助信息' },
                 ]
             }
@@ -1146,73 +1295,52 @@ export function getMenuItems(role, chatType = 'private', scope = 'agent') {
             ] : []),
         ]
     });
-    if (isAdmin) {
+    if (isAdmin || configurableSettings.length > 0) {
         items.push({
             group: 'Agent 与模型',
             commands: [
-                { cmd: '/baseagent', label: '切换 Agent 后端', desc: '切换 Agent 当前 Baseagent', next: { type: 'select', dynamic: true } },
-                { cmd: '/model', label: '切换模型', desc: '切换当前 Agent 使用的模型版本', next: { type: 'select', dynamic: true } },
-                { cmd: '/effort', label: '切换推理强度', desc: '调整模型推理深度，影响响应速度与质量', next: { type: 'select', items: [
-                            { value: 'low', label: 'Low' },
-                            { value: 'medium', label: 'Medium' },
-                            { value: 'high', label: 'High' },
-                            { value: 'max', label: 'Max' },
-                        ] } },
-                { cmd: '/chatmode', label: '切换会话模式', desc: '控制 Agent 主动性（被动响应或主动推进）', next: { type: 'select', items: [
-                            { value: 'interactive', label: '交互模式', desc: '仅在收到消息时响应' },
-                            { value: 'proactive', label: '主动模式', desc: 'Agent 可主动推进任务' },
-                        ] } },
-                { cmd: '/mentionmode', label: '切换 @ 处理模式', desc: '控制群聊消息过滤（仅@提及或全部响应）', next: { type: 'select', items: [
-                            { value: 'mention-only', label: '@ 提及', desc: '仅在被 @ 提及时响应' },
-                            { value: 'disabled', label: '全部响应', desc: '响应群内所有消息' },
-                        ] } },
-                { cmd: '/capability', label: '能力开关管理', desc: '查看并管理 Skills / MCP / Plugins' },
+                ...(isAdmin ? [{ cmd: '/baseagent', label: '切换 Agent 后端', desc: '切换 Agent 当前 Baseagent', next: { type: 'select', dynamic: true } }] : []),
+                ...configurableSettings,
+                ...(isAdmin ? [{ cmd: '/capability', label: '能力开关管理', desc: '查看并管理 Skills / MCP / Plugins' }] : []),
             ]
         });
+    }
+    if (canReadPermission) {
         items.push({
             group: '权限管理',
             commands: [
                 { cmd: '/perm', label: '查看权限模式', desc: '权限模式由当前角色定义决定' },
             ]
         });
-        items.push({
-            group: '运维',
-            commands: [
-                { cmd: '/status', label: '显示会话状态', desc: '查看当前会话、项目、Agent 的详细状态' },
-                { cmd: '/stop', label: '中断当前任务', desc: '立即中断正在执行的 Agent 任务' },
-                { cmd: '/check', label: '检查 EvolAgent 实例健康', desc: '检查各 EvolAgent 实例、后端与消息通道的健康状态' },
-                ...(isOwner && !isControlScope ? [{
-                        cmd: '/observable',
-                        label: '观察者模式',
-                        desc: '向 owners 转发 Agent 入站和出站消息',
-                        next: { type: 'select', items: [
-                                { value: 'true', label: '开启' },
-                                { value: 'false', label: '关闭' },
-                            ] },
-                    }] : []),
-                { cmd: '/activity', label: '控制中间输出显示', desc: '设置工具调用过程的可见范围', next: { type: 'select', items: [
+    }
+    items.push({
+        group: isAdmin ? '运维' : '其他',
+        commands: [
+            { cmd: '/status', label: '显示会话状态', desc: isAdmin ? '查看当前会话、项目、Agent 的详细状态' : '查看当前会话的基本状态' },
+            ...(isAdmin ? [{ cmd: '/stop', label: '中断当前任务', desc: '立即中断正在执行的 Agent 任务' }] : []),
+            { cmd: '/check', label: '检查 EvolAgent 实例健康', desc: isAdmin ? '检查各 EvolAgent 实例、后端与消息通道的健康状态' : '检查 EvolAgent 实例与消息通道健康状态' },
+            ...(isOwner && !isControlScope ? [{
+                    cmd: '/observable',
+                    label: '观察者模式',
+                    desc: '向 owners 转发 Agent 入站和出站消息',
+                    next: { type: 'select', items: [
+                            { value: 'true', label: '开启' },
+                            { value: 'false', label: '关闭' },
+                        ] },
+                }] : []),
+            ...(isAdmin ? [{ cmd: '/activity', label: '控制中间输出显示', desc: '设置工具调用过程的可见范围', next: { type: 'select', items: [
                             { value: 'all', label: '全部显示', desc: '所有用户均可见中间输出' },
                             { value: 'text', label: '仅文字进展', desc: '显示文字进展，隐藏工具活动' },
                             { value: 'none', label: '不显示', desc: '关闭所有中间输出' },
-                        ] } },
-                ...(isControlScope && isOwner ? [
-                    { cmd: '/restart', label: '重启服务', desc: '重启整个 EvolCore 服务进程' },
-                ] : []),
-                ...(isAdmin ? [
-                    { cmd: '/file', label: '发送项目内文件', desc: '将项目目录内的文件发送给用户' },
-                ] : []),
-            ]
-        });
-    }
-    else {
-        items.push({
-            group: '其他',
-            commands: [
-                { cmd: '/status', label: '显示会话状态', desc: '查看当前会话的基本状态' },
-                { cmd: '/check', label: '检查 EvolAgent 实例健康', desc: '检查 EvolAgent 实例与消息通道健康状态' },
-            ]
-        });
-    }
+                        ] } }] : []),
+            ...(isControlScope && canManageProcess && canOperation('system.restart', 'process') ? [
+                { cmd: '/restart', label: '重启服务', desc: '重启整个 EvolCore 服务进程' },
+            ] : []),
+            ...(canUseFile ? [
+                { cmd: '/file', label: '发送项目内文件', desc: '将项目目录内的文件发送给用户' },
+            ] : []),
+        ]
+    });
     items.push({
         group: '帮助',
         commands: [
@@ -1248,6 +1376,47 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
             throw authorized;
         return await roleMenuOptions(authorized.context, args);
     }
+    if (cmdBase0 === '/connect') {
+        const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
+        const authorized = await authorizeRoleMenu(this, {
+            kind: 'options', args, operation: connectMenuOperation('options', args), identity, subject: authSubject, session, channel, channelId,
+            userId, fromControlChannel, source,
+        });
+        if ('error' in authorized)
+            throw authorized;
+        try {
+            const result = await handleConnectMenu({ type: 'menu.options', subtype: 'options', args }, authorized.context);
+            if ('error' in result)
+                throw result.error;
+            const opts = result.data?.options ?? [];
+            return opts.map((opt) => ({
+                value: opt.option,
+                label: opt.label,
+                desc: opt.description,
+                ...(typeof opt.selected === 'boolean' ? { selected: opt.selected } : {}),
+            }));
+        }
+        catch (error) {
+            throw menuResultFailure(error);
+        }
+    }
+    if (cmdBase0 === '/group') {
+        const result = await executeGroupMenu(this, {
+            kind: 'options', args,
+            identity: subject.identity,
+            subject,
+            session,
+            explicitChatType,
+            channel,
+            channelId,
+            userId,
+            fromControlChannel,
+            source,
+        });
+        if ('error' in result)
+            throw { code: result.code, message: result.error, data: result.data };
+        return result.data;
+    }
     // ── /agent list（只读） ──
     // 控制 channel：验 evolcore.owners，返回全量；agent channel：放行但仅返回自身单条。
     if (cmd === '/agent') {
@@ -1590,6 +1759,34 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
             return menuResultFailure(error);
         }
     }
+    if (cmdBase === '/connect') {
+        const authorized = await authorizeRoleMenu(this, {
+            kind: 'query', args, operation: connectMenuOperation('query', args), identity, subject, session, channel, channelId,
+            userId, fromControlChannel, source,
+        });
+        if ('error' in authorized)
+            return authorized;
+        try {
+            const result = await handleConnectMenu({ type: 'menu.query', subtype: 'query', args }, authorized.context);
+            if (result.error) {
+                return {
+                    error: result.error.message,
+                    code: result.error.code,
+                    ...(result.error.data === undefined ? {} : { data: result.error.data }),
+                };
+            }
+            return { data: result.data };
+        }
+        catch (error) {
+            return menuResultFailure(error);
+        }
+    }
+    if (cmdBase === '/group') {
+        return await executeGroupMenu(this, {
+            kind: 'query', args, identity, subject, session,
+            explicitChatType, channel, channelId, userId, fromControlChannel, source,
+        });
+    }
     const authDenied = await authorizeMenuIntent.call(this, {
         intent: buildMenuIntent('query', cmdBase, args, undefined, undefined, fromControlChannel),
         identity,
@@ -2013,13 +2210,11 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         return { data };
     }
     // ── name=file：文件元信息（§5.1） ──
-    // 权限（§6.3）：agent owner/admin 或 aid channel owner。项目外文件仅 owner 可取（§6.2，由 resolveMenuFilePath 校验）。
+    // operation 权限已在入口统一判定；项目外文件仍仅 owner 可取。
     if (cmdBase === '/file') {
         const role = identity.role;
-        if (!isManagementRole(role)) {
-            return { error: '无权限', code: 'NO_PERMISSION' };
-        }
-        const resolved = resolveMenuFilePath(args?.path, session, role, 'file');
+        const projectPath = session?.projectPath ?? evolagent?.projectPath ?? this.getOwningAgent?.(channel)?.projectPath;
+        const resolved = resolveMenuFilePath(args?.path, projectPath, role, 'file');
         if ('error' in resolved)
             return resolved;
         const { realPath, stat } = resolved;
@@ -2088,6 +2283,34 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
             return menuResultFailure(error);
         }
     }
+    if (cmdBase === '/connect') {
+        const authorized = await authorizeRoleMenu(this, {
+            kind: 'update', args, value: arg, operation: connectMenuOperation('update', args, arg), identity, subject: authSubject, session, channel, channelId,
+            userId, fromControlChannel, source,
+        });
+        if ('error' in authorized)
+            return authorized;
+        try {
+            const result = await handleConnectMenu({ type: 'menu.update', subtype: 'update', args, value: arg }, authorized.context);
+            if (result.error) {
+                return {
+                    error: result.error.message,
+                    code: result.error.code,
+                    ...(result.error.data === undefined ? {} : { data: result.error.data }),
+                };
+            }
+            return { data: result.data };
+        }
+        catch (error) {
+            return menuResultFailure(error);
+        }
+    }
+    if (cmdBase === '/group') {
+        return await executeGroupMenu(this, {
+            kind: 'update', args, value: arg, identity, subject, session,
+            channel, channelId, userId, fromControlChannel, source,
+        });
+    }
     const authDenied = await authorizeMenuIntent.call(this, {
         intent: buildMenuIntent('update', cmdBase, args, undefined, arg, fromControlChannel),
         identity,
@@ -2427,7 +2650,7 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
     return { error: `不支持 update: ${cmdBase}`, code: 'NOT_SUPPORTED' };
 }
 /** menu.action — 触发动词。 */
-export async function execMenuAction(cmd, action, args, channel, channelId, userId, overrideIdentity, explicitChatType, requestId, fromControlChannel = false, authSubject, source = 'menu') {
+export async function execMenuAction(cmd, action, args, channel, channelId, userId, overrideIdentity, explicitChatType, requestId, fromControlChannel = false, authSubject, source = 'menu', transportReplyContext, deferSideEffect) {
     const cmdBase = cmd.trim().split(' ')[0];
     if (!cmdBase)
         return { error: '缺少命令', code: 'MISSING_CMD' };
@@ -2465,6 +2688,28 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             return menuResultFailure(error);
         }
     }
+    if (cmdBase === '/connect') {
+        const authorized = await authorizeRoleMenu(this, {
+            kind: 'action', args, operation: connectMenuOperation('action', args), identity: authIdentity, subject, session: authSession,
+            channel, channelId, userId, fromControlChannel, source,
+        });
+        if ('error' in authorized)
+            return authorized;
+        try {
+            const result = await handleConnectMenu({ type: 'menu.action', subtype: 'action', action, args }, authorized.context);
+            if (result.error) {
+                return {
+                    error: result.error.message,
+                    code: result.error.code,
+                    ...(result.error.data === undefined ? {} : { data: result.error.data }),
+                };
+            }
+            return { data: result.data };
+        }
+        catch (error) {
+            return menuResultFailure(error);
+        }
+    }
     if (cmdBase === '/agent' && !fromControlChannel && !args?.aid) {
         const selfAid = this.getOwningAgent?.(channel)?.aid;
         if (selfAid)
@@ -2499,7 +2744,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             return await gatewaySyncEnv(args);
         return { error: `不支持 gateway action: ${action}`, code: 'NOT_SUPPORTED' };
     }
-    const { session } = await this.loadMenuContext(channel, channelId);
+    const { session, evolagent } = await this.loadMenuContext(channel, channelId);
     const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
     const isMenuAdmin = isManagementRole(identity.role);
     // ── /agent action ──
@@ -2618,7 +2863,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
         const triggerScheduler = this.getTriggerSchedulerForChannel?.(channel);
         if (!triggerScheduler)
             return { error: '触发器功能未启用', code: 'NOT_SUPPORTED' };
-        if (action === 'set') {
+        if (action === 'create' || action === 'set') {
             // args 结构化 → 直接组装 ParsedTriggerSet（绕过 parseTriggerSet 文本解析，无注入风险）
             if (!args?.scheduleType || (args.scheduleType !== 'once' && !args?.scheduleValue) || !args?.prompt) {
                 return { error: '缺少必填参数：scheduleType / scheduleValue / prompt', code: 'INVALID_ARGS' };
@@ -2652,6 +2897,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 effort: args.effort,
                 permissionMode: args.permissionMode,
                 triggerThread,
+                baseagent: args.baseagent,
             };
             const r = await this.registerTriggerFromParsed(parsed, channel, channelId, userId ?? '', undefined, this.resolveMenuChatType(channel, channelId, explicitChatType), undefined, isAdmin);
             if (!r.ok)
@@ -3020,18 +3266,26 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             return { error: '操作需要 owner 权限', code: 'FORBIDDEN' };
         }
         if (action === 'restart') {
-            const restartInfo = { channel, channelId, timestamp: Date.now() };
-            const dataDir = resolvePaths().dataDir;
-            fs.mkdirSync(dataDir, { recursive: true });
-            fs.writeFileSync(path.join(dataDir, '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();
+            const suppressRealRestart = shouldSuppressRealRestart();
+            if (!suppressRealRestart) {
+                const restartInfo = { channel, channelId, timestamp: Date.now() };
+                const dataDir = resolvePaths().dataDir;
+                fs.mkdirSync(dataDir, { recursive: true });
+                fs.writeFileSync(path.join(dataDir, '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();
+            }
+            else {
+                logger.info('[System] Suppressed real menu restart in test runtime');
+            }
             this.eventBus.publish({ type: 'system:restart', channel, channelId });
-            setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 1000);
+            if (!suppressRealRestart) {
+                setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 1000);
+            }
             return { data: { action: 'restart', success: true } };
         }
         if (action === 'check') {
@@ -3079,6 +3333,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
         if (!argvValidation.ok)
             return { error: argvValidation.reason, code: 'INVALID_ARGUMENT' };
         let argv = argvValidation.argv;
+        const requestedArgv = [...argvValidation.argv];
         argv = normalizeCliArgv(argv);
         const cliAgent = this.getOwningAgent?.(channel);
         const cliSelfAid = cliAgent?.aid;
@@ -3108,6 +3363,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                     scope: parsed.intent.scope, dangerous: true, actorId: userId,
                     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] },
                 });
                 return { error: 'CLI command is not allowed', code: 'NOT_ALLOWED' };
             }
@@ -3146,14 +3402,21 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 resolvedConfigCommand: parsed.resolvedConfigCommand,
                 allowExplicitRelationTarget: true,
                 auditAllowed: false,
-                auditMetadata: { taskId: requestId, argvHash: hashArgv(authArgv) },
+                auditMetadata: {
+                    taskId: requestId,
+                    argvHash: hashArgv(authArgv),
+                    name: 'cli',
+                    action: 'exec',
+                    args: { argv: [...requestedArgv] },
+                },
             });
             if (!decision.allow) {
                 return { error: decision.reason, code: decision.code };
             }
             authorizedCommands.push({ parsed, decision });
         }
-        const execution = await this.execCliPassthrough(argv, subject.role);
+        const rawExecution = await this.execCliPassthrough(argv, subject.role);
+        const execution = appendGroupRulesCompatibilityNote(rawExecution, parsedCommands[0]?.resolvedConfigCommand, session);
         const executionData = 'data' in execution ? execution.data : undefined;
         for (const { parsed, decision } of authorizedCommands) {
             await auditCommandAuthorization({
@@ -3163,6 +3426,8 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 channel, channelId, role: identity.role, isDaemonOwner,
                 fromControlChannel: fromControlChannel ?? false, decision: 'allow',
                 matchedRule: decision.command?.matchedRule, taskId: requestId, argvHash: hashArgv(argv),
+                name: 'cli', action: 'exec',
+                args: { argv: [...requestedArgv] },
                 durationMs: executionData?.durationMs, exitCode: executionData?.exitCode,
             });
         }
@@ -3173,13 +3438,10 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
     // fetch 文件作为独立 result.file 消息异步发回；把请求 id 作为 correlationId 透传，
     // 客户端用它把异步到达的文件消息对回这次 fetch 点击。
     if (cmdBase === '/file') {
-        // 权限（§6.3）：agent owner/admin 或 aid channel owner。项目外文件仅 owner（§6.2，由 resolveMenuFilePath 校验）。
-        if (!isManagementRole(identity.role)) {
-            return { error: '无权限', code: 'NO_PERMISSION' };
-        }
+        const projectPath = session?.projectPath ?? evolagent?.projectPath ?? this.getOwningAgent?.(channel)?.projectPath;
         if (action === 'list') {
             const dirArg = (args?.path ?? '.').toString().trim() || '.';
-            const resolved = resolveMenuFilePath(dirArg, session, identity.role, 'directory');
+            const resolved = resolveMenuFilePath(dirArg, projectPath, identity.role, 'directory');
             if ('error' in resolved)
                 return resolved;
             const offset = parseFileListOffset(args?.offset);
@@ -3192,7 +3454,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
         }
         if (action !== 'fetch')
             return { error: `不支持的 file action: ${action}`, code: 'NOT_SUPPORTED' };
-        const resolved = resolveMenuFilePath(args?.path, session, identity.role, 'file');
+        const resolved = resolveMenuFilePath(args?.path, projectPath, identity.role, 'file');
         if ('error' in resolved)
             return resolved;
         const { realPath, stat } = resolved;
@@ -3204,9 +3466,26 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             return { error: '通道不存在', code: 'EXEC_FAILED' };
         if (!adapter.capabilities?.file)
             return { error: '通道不支持文件发送', code: 'NOT_SUPPORTED' };
-        try {
-            const replyCtx = session ? this.getReplyContext(session) : undefined;
+        const sessionReplyContext = session ? this.getReplyContext(session) : undefined;
+        const replyCtx = transportReplyContext
+            ? {
+                ...(sessionReplyContext ?? {}),
+                ...transportReplyContext,
+                metadata: {
+                    ...(sessionReplyContext?.metadata ?? {}),
+                    ...(transportReplyContext.metadata ?? {}),
+                },
+            }
+            : sessionReplyContext;
+        const sendFile = async () => {
             await adapter.send(buildEnvelope({ channel: adapter.channelName, channelId, replyContext: replyCtx }), { kind: 'result.file', filePath: realPath, correlationId: requestId });
+        };
+        if (deferSideEffect) {
+            deferSideEffect(sendFile);
+            return { data: { accepted: true } };
+        }
+        try {
+            await sendFile();
             return { data: { accepted: true } };
         }
         catch (e) {
@@ -3223,6 +3502,7 @@ const SYSTEM_CONTROL_NAME_MAP = {
     observable: '/observable',
     agent: '/agent', trigger: '/trigger', file: '/file', gateway: '/gateway',
     config: '/config', capability: '/capability', role: '/role',
+    group: '/group', connect: '/connect',
 };
 function isProcessLevelMenu(name, cmd) {
     return name === 'system' || name === 'agent' || name === 'gateway' || name === 'config'
@@ -3239,10 +3519,11 @@ async function execMenuForSystemControl(payload, context) {
     }
     const isProcessLevel = isProcessLevelMenu(name, payload?.cmd);
     const isRoleRequest = name === 'role' || payload?.cmd === '/role';
-    const requiresAgentTarget = isRoleRequest || [
-        'observable', 'baseagent', 'model', 'effort', 'trigger', 'capability',
+    const isConnectRequest = name === 'connect' || payload?.cmd === '/connect';
+    const requiresAgentTarget = isRoleRequest || isConnectRequest || [
+        'observable', 'baseagent', 'model', 'effort', 'trigger', 'capability', 'group',
     ].includes(name)
-        || ['/observable', '/baseagent', '/model', '/effort', '/trigger', '/capability'].includes(payload?.cmd);
+        || ['/observable', '/baseagent', '/model', '/effort', '/trigger', '/capability', '/group'].includes(payload?.cmd);
     const target = isProcessLevel
         ? { channel: SYSTEM_CONTROL_CHANNEL }
         : resolveExternalMenuAgentChannel(this, payload, SYSTEM_CONTROL_CHANNEL, requiresAgentTarget);
@@ -3267,7 +3548,7 @@ async function execMenuForSystemControl(payload, context) {
     try {
         switch (payload?.type) {
             case 'menu.list':
-                return menuSuccess({ id }, this.getMenuItems(trustedIdentity.role, 'private', 'control'));
+                return menuSuccess({ id }, this.getMenuItems(trustedIdentity.role, 'private', 'control', trustedSubject));
             case 'menu.query': {
                 if (!cmd)
                     return ecwebErr(id, name, 'MISSING_CMD', '缺少 name/cmd');
@@ -3342,7 +3623,8 @@ export async function execMenuForControl(payload, peerId) {
         return menuFailure({ id, ...(name ? { name } : {}) }, validationError);
     const owners = loadDaemonConfig().owners ?? [];
     const isRoleRequest = name === 'role' || payload?.cmd === '/role';
-    if (!isRoleRequest && !isProcessLevelOwner(peerId, owners)) {
+    const isConnectRequest = name === 'connect' || payload?.cmd === '/connect';
+    if (!isRoleRequest && !isConnectRequest && !isProcessLevelOwner(peerId, owners)) {
         return menuFailure({ id, ...(name ? { name } : {}) }, { code: 'ROLE_ACCESS_DENIED', message: '控制 channel 操作需要 owner 权限' });
     }
     return execMenuForSystemControl.call(this, payload, {