evolcore 0.0.22 → 0.0.24

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

@@ -1,10 +1,8 @@
 import { normalizePeer, writeScope } from '../model/config-scope.js';
 import { formatPeerKey } from '../relation/peer-identity.js';
-import { modelMatches } from '../model/model-catalog.js';
+import { modelMatches, getCatalog, getBaseagentCatalog, resolveCatalogModel, assertCatalogSelectable, TRANSPORT_EFFORTS } from '../model/model-catalog.js';
 import { constrainResolvedModelForRole, filterModelsForRole, validateModelSelectionForRole } from '../model/model-permission.js';
 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 { inspectDataMigrationRequirement } from '../data-migration.js';
 import { buildEnvelope, isDeliveryTarget, isDeliveryTargetForChannel, replyContextFromSession } from '../message/message-utils.js';
@@ -12,11 +10,12 @@ import path from 'path';
 import fs from 'fs';
 import os from 'os';
 import crypto from 'crypto';
-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, spawnDetachedNode } from '../../utils/cross-platform.js';
+import { commandExists, resolveCliEntry, launchMonitorAndConfirm } from '../../utils/cross-platform.js';
+import { cachedCliVersion } from '../../utils/cross-platform.js';
+import { scanInstances } from '../../utils/instance-registry.js';
 import { isFullAccessEnabled, 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';
@@ -40,6 +39,9 @@ import { logger } from '../../utils/logger.js';
 import { shouldSuppressRealRestart } from '../../utils/restart-safety.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../auth/agent-delegation.js';
 import { evolMenuResponseTransportMetadata, menuFailure, menuCommandForName, menuSuccess, normalizeMenuError, validateConfigWriteScope, validateMenuRequest, } from './menu-protocol.js';
+import { parseMenuClientProtectedHeaders } from './menu-protocol.js';
+import { validateAndRenewRemoteAccessToken } from '../auth/remote-access-store.js';
+import { listDiagnosticLogOptions, listRawConfigResources, queryDiagnosticLogs, readRawConfigResource, } from './daemon-diagnostics.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';
@@ -50,34 +52,9 @@ import { probeSessionActivity } from './slash-gate.js';
  * 失败返回 null（命令不存在或执行失败）。
  */
 function getBaseagentVersion(cmd) {
-    try {
-        const executable = cmd === 'codex' ? resolveCodexCliPath() : cmd;
-        if (!executable)
-            return null;
-        const output = cmd === 'codex'
-            ? execCodexCliSync(['--version'], {
-                encoding: 'utf-8',
-                timeout: 3000,
-                stdio: ['ignore', 'pipe', 'pipe'],
-            })
-            : execFileSync(executable, ['--version'], {
-                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"
-        // gemini: "0.38.0" → 直接返回
-        // codex: "codex-cli 0.142.0" → 提取 "0.142.0"
-        const match = versionOutput.match(/(\d+\.\d+\.\d+)/);
-        return match ? match[1] : null;
-    }
-    catch {
-        return null;
-    }
+    return cachedCliVersion(cmd);
 }
-const allEfforts = ['low', 'medium', 'high', 'xhigh', 'max'];
+const allEfforts = ['none', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'];
 const PERMISSION_MODE_KEYS = PUBLIC_PERMISSION_MODES;
 /** menu file: fetch 文件大小上限（与 /file 一致） */
 const FILE_FETCH_MAX_SIZE = 10 * 1024 * 1024;
@@ -394,14 +371,15 @@ function tokenizeArgv(line) {
     }
     return out;
 }
-function getAvailableEfforts(agent, model) {
-    if (agent.name === 'claude') {
-        return allEfforts;
-    }
-    if (agent.name === 'codex') {
-        return getCodexEfforts(model);
-    }
-    return [];
+async function getAvailableEfforts(agent, model) {
+    const dynamic = await agent.getAvailableEfforts?.(model);
+    if (Array.isArray(dynamic))
+        return dynamic;
+    // Keep Menu usable with legacy/embedded runner implementations that do not
+    // expose the optional catalog method.  Full runners still take the dynamic
+    // path above, so this fallback cannot broaden their advertised capabilities.
+    const baseagent = agent?.baseagent || agent?.name;
+    return (TRANSPORT_EFFORTS[baseagent] ?? []);
 }
 function modelDisplayLabel(agent, model) {
     const full = agent.resolveModelId?.(model);
@@ -414,6 +392,29 @@ function menuStringArg(args, key) {
     const trimmed = value.trim();
     return trimmed || undefined;
 }
+function hostCatalogArgs(args = {}) {
+    const invalid = (message) => { throw { code: 'INVALID_ARGUMENT', message }; };
+    if (!args || typeof args !== 'object' || Array.isArray(args))
+        invalid('Baseagent catalog args must be an object');
+    if (Object.keys(args).some(key => !['baseagent', 'ba', 'refresh', 'scope', 'context'].includes(key))) {
+        invalid('Baseagent catalog only accepts baseagent, ba, refresh and process context');
+    }
+    if (args.scope !== undefined && args.scope !== 'process')
+        invalid('Baseagent catalog requires process scope');
+    if (args.context !== undefined && (!args.context || typeof args.context !== 'object'
+        || Array.isArray(args.context) || args.context.kind !== 'process'
+        || Object.keys(args.context).some(key => key !== 'kind'))) {
+        invalid('Baseagent catalog requires process context');
+    }
+    for (const key of ['baseagent', 'ba']) {
+        if (args[key] !== undefined && (typeof args[key] !== 'string' || !args[key].trim())) {
+            invalid(`${key} must be a non-empty string`);
+        }
+    }
+    if (args.refresh !== undefined && typeof args.refresh !== 'boolean')
+        invalid('refresh must be a boolean');
+    return { baseagent: menuStringArg(args, 'baseagent') ?? menuStringArg(args, 'ba') ?? 'claude', refresh: args.refresh === true };
+}
 const LEGACY_SESSION_CONFIG_ARG_KEYS = [
     'session',
     'sessionId',
@@ -856,6 +857,8 @@ export const SELF_MANAGE_AGENT_ACTIONS = new Set(['update', 'reload']);
 /** 判断 (cmdBase, action) 是否为进程级操作（仅控制 channel 可执行）。
  *  /system 全部进程级；/agent 仅 create/delete/enable/disable 进程级；其余关系级。 */
 export function isProcessLevelAction(cmdBase, action) {
+    if (cmdBase === '/baseagent-models')
+        return true;
     if (cmdBase === '/system')
         return true;
     if (cmdBase === '/gateway')
@@ -904,6 +907,8 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
     });
     const modelScope = args?.scope === 'agent' ? 'agent' : 'relation';
     if (verb === 'query') {
+        if (cmdBase === '/baseagent-models')
+            return intent('baseagent.models.list', 'process');
         if (cmdBase === '/pwd')
             return intent('project.current', 'relation');
         if (cmdBase === '/session' || cmdBase === '/s')
@@ -943,6 +948,10 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
             return intent('trigger.list', 'relation');
     }
     if (verb === 'options') {
+        if (cmdBase === '/system')
+            return intent('system.status', 'process');
+        if (cmdBase === '/config')
+            return intent('config.read', args?.scope === 'agent' ? 'agent' : 'process');
         if (cmdBase === '/agent')
             return intent(fromControlChannel ? 'agent.list' : 'agent.show', fromControlChannel ? 'control' : 'agent');
         if (cmdBase === '/capability')
@@ -1107,6 +1116,7 @@ async function authorizeMenuIntent(params) {
     intent.source = source;
     const decision = await authorizeOperation({ source, intent, subject });
     if (!decision.allow) {
+        logger.warn(`[MenuAuth] denied operation=${intent.operation} scope=${intent.scope} source=${source} selfAid=${subject.selfAid ?? '<none>'} actor=${subject.actorId ?? '<none>'} role=${subject.role} processRole=${subject.processRole} dataScope=${subject.dataScope} daemonOwner=${subject.isDaemonOwner} control=${subject.fromControlChannel} reason=${decision.reason}`);
         if (intent.operation.startsWith('role.') || intent.operation.startsWith('connect.')) {
             const namespace = intent.operation.split('.', 1)[0];
             return {
@@ -1284,8 +1294,14 @@ function resolveExternalMenuAgentChannel(owner, payload, fallbackChannel, requir
             : { channel: fallbackChannel };
     }
     const agent = owner.agentRegistry?.get?.(requestedAid) ?? null;
-    if (!agent)
+    if (!agent) {
+        // The daemon trigger owner is a virtual control identity and therefore is
+        // intentionally absent from the normal Agent registry.
+        const daemonAid = owner.getDaemonTriggerOwnerAid?.();
+        if (daemonAid && requestedAid === daemonAid)
+            return { channel: 'daemon' };
         return { error: `未找到 Agent: ${requestedAid}`, code: 'NOT_FOUND' };
+    }
     const channel = agent.channelInstanceNames?.()[0];
     if (!channel)
         return { error: `Agent 无可用 channel: ${requestedAid}`, code: 'NOT_FOUND' };
@@ -1471,6 +1487,9 @@ export function getMenuItems(role, chatType = 'private', scope = 'agent', authSu
             ...(isControlScope && canManageProcess && canOperation('system.restart', 'process') ? [
                 { cmd: '/restart', label: '重启服务', desc: '重启整个 EvolCore 服务进程' },
             ] : []),
+            ...(isControlScope && canManageProcess && canOperation('system.status', 'process') ? [
+                { cmd: '/system', label: 'Daemon 诊断', desc: '查询 daemon 状态、监控快照和日志' },
+            ] : []),
             ...(canUseFile ? [
                 { cmd: '/file', label: '发送项目内文件', desc: '将项目目录内的文件发送给用户' },
             ] : []),
@@ -1501,6 +1520,8 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
     const gated0 = gateControlScope.call(this, { cmdBase: cmdBase0, args, channel, fromControlChannel });
     if (gated0)
         throw { code: gated0.code, message: gated0.error };
+    if (cmdBase0 === '/baseagent-models')
+        throw { code: 'NOT_SUPPORTED', message: 'Baseagent catalog only supports menu.query' };
     if (cmdBase0 === '/role') {
         const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
         const authorized = await authorizeRoleMenu(this, {
@@ -1567,6 +1588,18 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
     });
     if (optionsAuthDenied)
         throw { code: optionsAuthDenied.code, message: optionsAuthDenied.error, data: optionsAuthDenied.data };
+    if (cmdBase0 === '/system') {
+        if (args?.option !== 'logs')
+            throw { code: 'NOT_SUPPORTED', message: `Unsupported system option: ${String(args?.option ?? '')}` };
+        const options = listDiagnosticLogOptions();
+        return [
+            ...options.sources.map(source => ({ value: source.id, label: source.label, desc: `${source.fileCount} file(s), ${source.size} bytes` })),
+            ...options.levels.map(level => ({ value: `level:${level}`, label: level, desc: 'minimum log level' })),
+        ];
+    }
+    if (cmdBase0 === '/config' && args?.option === 'rawFile') {
+        return listRawConfigResources();
+    }
     // ── /agent list（只读） ──
     // 控制 channel：返回全量；agent channel：仅返回自身单条。
     if (cmd === '/agent') {
@@ -1607,7 +1640,7 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
         const triggerScheduler = this.getTriggerSchedulerForChannel?.(channel);
         const scope = args?.options === 'all' ? 'all' : 'enabled';
         const role = optionsIdentity.role;
-        const isAdmin = isManagementRole(role);
+        const isAdmin = isManagementRole(role) || subject.isDaemonOwner || subject.processRole === 'daemon-service';
         if (!triggerScheduler)
             return [];
         const list = triggerScheduler.list({ all: scope === 'all' });
@@ -1710,14 +1743,25 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
         });
         if ('error' in target)
             throw { code: target.code, message: target.error };
-        const agent = this.getAgent(channel, target.baseagent);
-        if (hasModelSwitcher(agent) && agent.listModels) {
-            const rawModels = await agent.listModels() ?? [];
-            const models = filterModelsForRole(optionsIdentity.role, target.baseagent, rawModels, agent.resolveModelId?.bind(agent));
+        let agent;
+        try {
+            agent = this.getAgent(channel, target.baseagent);
+        }
+        catch (error) {
+            if (subject.processRole === 'daemon-service') {
+                return [{ value: target.baseagent, label: target.baseagent, selected: true }];
+            }
+            throw error;
+        }
+        if (hasModelSwitcher(agent)) {
+            const catalog = await getCatalog(target.sel.self, target.baseagent);
+            assertCatalogSelectable(catalog);
+            const rawModels = catalog.models.map(m => m.id);
+            const models = filterModelsForRole(optionsIdentity.role, target.baseagent, rawModels, model => resolveCatalogModel(catalog, model), target.sel.self);
             const requestedModel = menuStringArg(args, 'model') ?? menuStringArg(args, 'current');
             const currentModel = requestedModel || readMenuModel(target, agent).value || agent.getModel();
             if (models.length > 0)
-                return models.map((m) => ({ value: m, label: modelDisplayLabel(agent, m), selected: modelMatches(agent, m, currentModel) }));
+                return models.map((m) => ({ value: m, label: modelDisplayLabel(agent, m) + (catalog.models.find(e => e.id === m)?.verification === 'unverified' ? ' [unverified]' : '') + (catalog.freshness === 'stale' ? ' [stale]' : ''), selected: modelMatches(agent, m, currentModel) }));
         }
         return null;
     }
@@ -1770,11 +1814,20 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
         });
         if ('error' in target)
             throw { code: target.code, message: target.error };
-        const agent = this.getAgent(channel, target.baseagent);
+        let agent;
+        try {
+            agent = this.getAgent(channel, target.baseagent);
+        }
+        catch (error) {
+            if (subject.processRole === 'daemon-service') {
+                return ['low', 'medium', 'high', 'auto'].map(e => ({ value: e, label: e === 'auto' ? 'auto (SDK默认)' : e }));
+            }
+            throw error;
+        }
         const requestedModel = menuStringArg(args, 'model') ?? menuStringArg(args, 'currentModel');
         const modelTarget = { ...target, field: 'model', fieldPath: `baseagents.${target.baseagent}.model` };
         const currentModel = requestedModel || (hasModelSwitcher(agent) ? (readMenuModel(modelTarget, agent).value || agent.getModel()) : agent.name);
-        const efforts = getAvailableEfforts(agent, currentModel);
+        const efforts = await getAvailableEfforts(agent, currentModel);
         const currentEffort = menuStringArg(args, 'effort') ?? menuStringArg(args, 'current') ?? readMenuModel(target, agent).value ?? 'auto';
         const allItems = [...efforts, 'auto'];
         return allItems.map(e => ({ value: e, label: e === 'auto' ? 'auto (SDK默认)' : e, selected: e === currentEffort }));
@@ -1924,6 +1977,18 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
     });
     if (authDenied)
         return authDenied;
+    if (cmdBase === '/baseagent-models') {
+        try {
+            const query = hostCatalogArgs(args);
+            return { data: await getBaseagentCatalog(query.baseagent, { refresh: query.refresh }) };
+        }
+        catch (error) {
+            if (error?.code === 'INVALID_ARGUMENT')
+                return menuResultFailure(error);
+            logger.error('Failed to query host baseagent catalog');
+            return { error: 'Unable to query host baseagent catalog', code: 'INTERNAL_ERROR' };
+        }
+    }
     // ── /agent 查询（只读） ──
     // 授权由 agent.list/agent.show operation 决定；channel 闸门只负责目标范围。
     if (cmdBase === '/agent') {
@@ -1950,9 +2015,25 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
     }
     // ── /config 查询（只读，查询各层配置） ──
     if (cmdBase === '/config') {
+        if (args?.view === 'rawFile') {
+            return { data: readRawConfigResource(args, subject.actorId ?? '') };
+        }
         const scope = args?.scope || 'process';
         if (scope === 'process') {
             const cfg = loadDaemonConfig();
+            if (args?.fields !== undefined) {
+                if (!Array.isArray(args.fields) || args.fields.length === 0
+                    || args.fields.some((field) => typeof field !== 'string' || !field.trim())) {
+                    return { error: 'fields must be a non-empty string array', code: 'INVALID_ARGUMENT' };
+                }
+                const selected = {};
+                for (const rawField of args.fields) {
+                    const field = rawField.trim();
+                    if (Object.prototype.hasOwnProperty.call(cfg, field))
+                        selected[field] = cfg[field];
+                }
+                return { data: { scope: 'process', fields: args.fields, config: selected } };
+            }
             return { data: { scope: 'process', config: cfg } };
         }
         if (scope === 'defaults') {
@@ -2284,6 +2365,23 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         };
     }
     if (cmdBase === '/system') {
+        const view = args?.view ?? 'status';
+        if (view === 'monitor') {
+            if (typeof this.daemonMonitorProvider !== 'function') {
+                return { error: 'Daemon monitor snapshot is unavailable', code: 'DEPENDENCY_UNAVAILABLE' };
+            }
+            return { data: await this.daemonMonitorProvider() };
+        }
+        if (view === 'logs') {
+            try {
+                return { data: queryDiagnosticLogs(args ?? {}, subject.actorId ?? '') };
+            }
+            catch (error) {
+                return { error: error?.message ?? String(error), code: error?.code ?? 'INTERNAL_ERROR' };
+            }
+        }
+        if (view !== 'status')
+            return { error: `Unsupported system view: ${String(view)}`, code: 'NOT_SUPPORTED' };
         const data = {
             aid: loadDaemonConfig().aid ?? null,
             pid: process.pid,
@@ -2352,7 +2450,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
     return { error: `不支持 query: ${cmdBase}`, code: 'NOT_SUPPORTED' };
 }
 /** menu.update — 写入新值。 */
-export async function execMenuUpdate(cmd, value, channel, channelId, userId, overrideIdentity, fromControlChannel = false, args, authSubject, source = 'menu') {
+export async function execMenuUpdate(cmd, value, channel, channelId, userId, overrideIdentity, fromControlChannel = false, args, authSubject, source = 'menu', transportReplyContext) {
     const cmdBase = cmd.trim().split(' ')[0];
     if (!cmdBase)
         return { error: '缺少命令', code: 'MISSING_CMD' };
@@ -2368,10 +2466,27 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
     const gated = gateControlScope.call(this, { cmdBase, args, channel, fromControlChannel });
     if (gated)
         return gated;
+    const loadedContext = await this.loadMenuContext(channel, channelId);
+    let session = loadedContext.session;
+    const evolagent = loadedContext.evolagent;
+    if (transportReplyContext?.threadId && typeof this.sessionManager.getThreadSession === 'function') {
+        try {
+            const topicSession = await this.sessionManager.getThreadSession(channel, channelId, transportReplyContext.threadId);
+            if (!topicSession) {
+                return { error: '话题会话不存在，拒绝回退到主会话', code: 'TOPIC_SESSION_NOT_FOUND' };
+            }
+            session = topicSession;
+        }
+        catch (error) {
+            logger.debug('[MenuHandler] topic session lookup failed for menu update: thread=' + transportReplyContext.threadId + ': ' + (error instanceof Error ? error.message : String(error)));
+            return { error: '无法读取话题会话，拒绝回退到主会话', code: 'TOPIC_SESSION_LOOKUP_FAILED' };
+        }
+    }
+    if (cmdBase === '/baseagent-models')
+        return { error: 'Baseagent catalog only supports menu.query', code: 'NOT_SUPPORTED' };
     const arg = value.trim();
     if (!arg)
         return { error: '缺少 value 参数', code: 'MISSING_VALUE' };
-    const { session, evolagent } = await this.loadMenuContext(channel, channelId);
     const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
     const isAdmin = isManagementRole(identity.role);
     const subject = buildMenuAuthSubject(this, {
@@ -2460,7 +2575,7 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
         }
         if (!patch?.nameOrId)
             return { error: '缺少 nameOrId', code: 'INVALID_ARGS' };
-        const isAdmin = isManagementRole(identity.role);
+        const isAdmin = isManagementRole(identity.role) || subject.isDaemonOwner || subject.processRole === 'daemon-service';
         if (!isAdmin && !userId)
             return { error: '无法确认身份，请确保渠道提供发送者 ID', code: 'FORBIDDEN' };
         const triggerScheduler = this.getTriggerSchedulerForChannel?.(channel);
@@ -2522,21 +2637,112 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
             return { error: `无效 baseagent: ${arg}，可选: ${valid.join(' / ')}`, code: 'INVALID_VALUE' };
         }
         const previousBaseagent = evolagent.baseagent;
+        if (session?.threadId) {
+            if (transportReplyContext?.threadId !== session.threadId) {
+                return { error: '话题路由上下文不匹配，拒绝切换', code: 'THREAD_CONTEXT_MISMATCH' };
+            }
+            if (typeof this.messageQueue.withSessionBarrier !== 'function') {
+                return { error: '当前运行环境不支持安全话题切换', code: 'NOT_SUPPORTED' };
+            }
+            const sessionKey = this.getQueueKey(session, channel, channelId);
+            const currentAgent = this.getAgent(channel, session.baseagent);
+            const outcome = await this.messageQueue.withSessionBarrier(sessionKey, async (snapshot) => {
+                const latest = await this.sessionManager.getSessionById?.(session.id);
+                if (!latest || latest.threadId !== session.threadId) {
+                    return { error: '话题会话不存在或归属已变化', code: 'NOT_FOUND' };
+                }
+                const busy = !!latest.processingState
+                    || !!latest.metadata?.turnState?.active
+                    || snapshot.active
+                    || snapshot.queued > 0
+                    || snapshot.dispatching
+                    || this.messageQueue.isProcessing?.(sessionKey)
+                    || (this.messageQueue.getQueueLength?.(sessionKey) ?? 0) > 0
+                    || currentAgent.hasActiveStream(sessionKey);
+                if (busy) {
+                    return { error: '当前话题会话忙碌，无法切换 baseagent', code: 'BUSY' };
+                }
+                try {
+                    evolagent.setActiveBaseagent(arg);
+                    await this.sessionManager.rotateTopicBackend({
+                        sessionId: latest.id,
+                        expectedThreadId: latest.threadId,
+                        baseagent: arg,
+                    });
+                    return { ok: true };
+                }
+                catch (error) {
+                    try {
+                        evolagent.setActiveBaseagent(previousBaseagent);
+                    }
+                    catch { }
+                    return { error: error instanceof Error ? error.message : String(error), code: 'EXEC_FAILED' };
+                }
+            });
+            if ('error' in outcome)
+                return outcome;
+            this.eventBus.publish({
+                type: 'agent:baseagent-changed',
+                aid: evolagent.aid,
+                baseagent: arg,
+                previousBaseagent,
+                scope: 'agent',
+                timestamp: Date.now(),
+            });
+            return { data: {
+                    baseagent: arg,
+                    previousBaseagent,
+                    baseagentChanged: previousBaseagent !== arg,
+                    scope: 'agent',
+                    sessionId: session.id,
+                    threadId: session.threadId,
+                    sessionIdChanged: false,
+                    notice: '已切换 Baseagent: ' + previousBaseagent + ' → ' + arg + '，话题会话 ID 保持不变',
+                } };
+        }
         try {
             evolagent.setActiveBaseagent(arg);
         }
         catch (error) {
             return { error: error instanceof Error ? error.message : String(error), code: 'INVALID_VALUE' };
         }
-        this.eventBus.publish({
-            type: 'agent:baseagent-changed',
-            aid: evolagent.aid,
-            baseagent: arg,
-            previousBaseagent,
-            scope: 'agent',
-            timestamp: Date.now(),
-        });
-        return { data: { baseagent: arg, scope: 'agent' } };
+        try {
+            const newSession = await this.sessionManager.createNewSession(channel, channelId, evolagent.projectPath, undefined, arg, session?.metadata, { previousBaseagent, baseagentChanged: previousBaseagent !== arg });
+            if (session) {
+                try {
+                    const previousAgent = this.getAgent(channel, session.baseagent);
+                    await previousAgent.clearSession(session.id, session.agentSessionId || '', session.projectPath);
+                    await previousAgent.closeSession(session.id);
+                }
+                catch (error) {
+                    // The new Evolcore session is already active; backend cleanup is best effort.
+                    logger.warn(`[Menu] baseagent switch cleanup failed: session=${session.id}: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }
+            this.eventBus.publish({
+                type: 'agent:baseagent-changed',
+                aid: evolagent.aid,
+                baseagent: arg,
+                previousBaseagent,
+                scope: 'agent',
+                timestamp: Date.now(),
+            });
+            return { data: {
+                    baseagent: arg,
+                    previousBaseagent,
+                    baseagentChanged: previousBaseagent !== arg,
+                    scope: 'agent',
+                    sessionId: newSession.id,
+                    notice: `已切换 Baseagent: ${previousBaseagent} → ${arg}，已创建新的主会话`,
+                } };
+        }
+        catch (error) {
+            try {
+                evolagent.setActiveBaseagent(previousBaseagent);
+            }
+            catch { }
+            return { error: `创建新会话失败：${error instanceof Error ? error.message : String(error)}`, code: 'EXEC_FAILED' };
+        }
     }
     if (cmdBase === '/model') {
         const target = resolveMenuModelTarget.call(this, {
@@ -2554,13 +2760,16 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
         const agent = this.getAgent(channel, target.baseagent);
         let targetModel = arg;
         if (hasModelSwitcher(agent)) {
-            const models = (await agent.listModels?.()) ?? [];
+            const catalog = await getCatalog(target.sel.self, target.baseagent);
+            assertCatalogSelectable(catalog);
+            const models = catalog.models.map(m => m.id);
             const decision = validateModelSelectionForRole({
                 role: identity.role,
                 baseagent: target.baseagent,
                 requestedModel: arg,
                 models,
-                resolveModelId: agent.resolveModelId?.bind(agent),
+                selfAid: target.sel.self,
+                resolveModelId: model => resolveCatalogModel(catalog, model),
             });
             if (!decision.ok)
                 return { error: decision.message || `invalid model: ${arg}`, code: decision.code || 'INVALID_VALUE' };
@@ -2610,7 +2819,7 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
         const agent = this.getAgent(channel, target.baseagent);
         const modelTarget = { ...target, field: 'model', fieldPath: `baseagents.${target.baseagent}.model` };
         const currentModel = hasModelSwitcher(agent) ? (readMenuModel(modelTarget, agent).value || agent.getModel()) : agent.name;
-        const validEfforts = getAvailableEfforts(agent, currentModel);
+        const validEfforts = await getAvailableEfforts(agent, currentModel);
         const allValid = [...validEfforts, 'auto'];
         if (!allValid.includes(arg)) {
             return { error: `无效推理强度: ${arg}，可选: ${allValid.join(' / ')}`, code: 'INVALID_VALUE' };
@@ -2757,8 +2966,9 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
         };
     }
     if (cmdBase === '/observable') {
-        if (identity.role !== 'owner')
+        if (identity.role !== 'owner' && subject.processRole !== 'daemon-service' && !subject.isDaemonOwner) {
             return { error: '观察者模式仅限 owner 开关', code: 'NO_PERMISSION' };
+        }
         if (arg !== 'true' && arg !== 'false')
             return { error: `无效值: ${arg}，可选: true / false`, code: 'INVALID_VALUE' };
         if (!evolagent)
@@ -2778,8 +2988,25 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
     const gated = gateControlScope.call(this, { cmdBase, action, args, channel, fromControlChannel });
     if (gated)
         return gated;
-    const { session: authSession } = await this.loadMenuContext(channel, channelId);
+    const loadedContext = await this.loadMenuContext(channel, channelId);
+    // Menu callbacks can arrive from a topic while the channel's active
+    // session still points at the main conversation. Prefer the explicitly
+    // transported topic route for session-scoped actions and authorization.
+    let authSession = loadedContext.session;
+    if (transportReplyContext?.threadId && typeof this.sessionManager.getThreadSession === 'function') {
+        try {
+            authSession = await this.sessionManager.getThreadSession(channel, channelId, transportReplyContext.threadId) ?? authSession;
+        }
+        catch (error) {
+            logger.debug(`[MenuHandler] topic session lookup failed for menu action: thread=${transportReplyContext.threadId}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    const session = authSession;
+    const evolagent = loadedContext.evolagent;
+    if (cmdBase === '/baseagent-models')
+        return { error: 'Baseagent catalog only supports menu.query', code: 'NOT_SUPPORTED' };
     const authIdentity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(authSession));
+    const identity = authIdentity;
     const subject = buildMenuAuthSubject(this, {
         identity: authIdentity,
         session: authSession,
@@ -2791,7 +3018,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
         fromControlChannel,
         subject: authSubject,
     });
-    if (cmdBase === '/system' && fromControlChannel && !subject.isDaemonOwner) {
+    if (cmdBase === '/system' && fromControlChannel && !subject.isDaemonOwner && subject.processRole !== 'daemon-service') {
         return {
             error: formatAuthorizationDenial('This daemon-level operation requires DaemonOwner.', 'DAEMON_OWNER_REQUIRED'),
             code: 'NOT_ALLOWED',
@@ -2868,15 +3095,13 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             return await gatewaySyncEnv(args);
         return { error: `不支持 gateway action: ${action}`, code: 'NOT_SUPPORTED' };
     }
-    const { session, evolagent } = await this.loadMenuContext(channel, channelId);
-    const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
-    const isMenuAdmin = isManagementRole(identity.role);
+    const isMenuAdmin = isManagementRole(authIdentity.role);
     // ── /agent action ──
     // 控制 channel：验 evolcore.owners，可执行进程级（create/delete/enable/disable）+ 自管理（update/reload）。
     // agent channel：闸门已挡掉进程级 + 跨 agent，仅 update/reload 能到此；reload 允许 owner/admin，update 仅 owner。
     if (cmdBase === '/agent') {
         if (fromControlChannel) {
-            if (!subject.isDaemonOwner) {
+            if (!subject.isDaemonOwner && subject.processRole !== 'daemon-service') {
                 return {
                     error: formatAuthorizationDenial('This Agent lifecycle operation requires DaemonOwner.', 'DAEMON_OWNER_REQUIRED'),
                     code: 'NOT_ALLOWED',
@@ -2995,7 +3220,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
     // ── 关系级 /trigger（不走 owners；复用 isAdmin + scoped 逻辑，D4 直调底层） ──
     if (cmdBase === '/trigger') {
         const role = identity.role;
-        const isAdmin = isManagementRole(role);
+        const isAdmin = isManagementRole(role) || subject.isDaemonOwner || subject.processRole === 'daemon-service';
         const triggerScheduler = this.getTriggerSchedulerForChannel?.(channel);
         if (!triggerScheduler)
             return { error: '触发器功能未启用', code: 'NOT_SUPPORTED' };
@@ -3076,7 +3301,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             if (action === 'enable' && trigger.execution.permissionMode === 'fullaccess') {
                 if (!isFullAccessEnabled())
                     return { error: 'fullaccess 功能未启用', code: 'NOT_SUPPORTED' };
-                if (!subject.isDaemonOwner)
+                if (!subject.isDaemonOwner && subject.processRole !== 'daemon-service')
                     return { error: '只有 daemon-owner 可以启用 fullaccess Trigger', code: 'FORBIDDEN' };
                 if (subject.canApprovePersistentFullAccess === false) {
                     return { error: '当前认证通道不能批准持久 fullaccess Trigger', code: 'FORBIDDEN' };
@@ -3454,7 +3679,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
         }
         if (action === 'new') {
             const name = (args?.name ?? '').toString().trim();
-            return await this.delegateAsAction(action, name ? `/new ${name}` : '/new', channel, channelId, userId, { enrichSession: true, authSubject: subject });
+            return await this.delegateAsAction(action, name ? `/new ${name}` : '/new', channel, channelId, userId, { enrichSession: true, authSubject: subject, threadId: transportReplyContext?.threadId, chatType: transportReplyContext?.delivery?.chatType, replyContext: transportReplyContext });
         }
         if (action === 'rename') {
             const newName = getRenameName(args);
@@ -3497,33 +3722,33 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             const target = (args?.target ?? '').toString().trim();
             if (!target)
                 return { error: '缺少 args.target', code: 'MISSING_VALUE' };
-            return await this.delegateAsAction(action, `/del ${target}`, channel, channelId, userId, { authSubject: subject });
+            return await this.delegateAsAction(action, `/del ${target}`, channel, channelId, userId, { authSubject: subject, threadId: transportReplyContext?.threadId, chatType: transportReplyContext?.delivery?.chatType, replyContext: transportReplyContext });
         }
         if (action === 'switch') {
             const target = (args?.target ?? '').toString().trim();
             if (!target)
                 return { error: '缺少 args.target', code: 'MISSING_VALUE' };
-            return await this.delegateAsAction(action, `/s ${target}`, channel, channelId, userId, { enrichSession: true, authSubject: subject });
+            return await this.delegateAsAction(action, `/s ${target}`, channel, channelId, userId, { enrichSession: true, authSubject: subject, threadId: transportReplyContext?.threadId, chatType: transportReplyContext?.delivery?.chatType, replyContext: transportReplyContext });
         }
         if (action === 'compact') {
             const need = this.requireSession(session);
             if (need)
                 return need;
-            return await this.delegateAsAction(action, '/compact', channel, channelId, userId, { authSubject: subject });
+            return await this.delegateAsAction(action, '/compact', channel, channelId, userId, { authSubject: subject, threadId: transportReplyContext?.threadId, chatType: transportReplyContext?.delivery?.chatType, replyContext: transportReplyContext });
         }
         if (action === 'fork') {
             const need = this.requireSession(session);
             if (need)
                 return need;
             const name = (args?.name ?? '').toString().trim();
-            return await this.delegateAsAction(action, name ? `/fork ${name}` : '/fork', channel, channelId, userId, { enrichSession: true, authSubject: subject });
+            return await this.delegateAsAction(action, name ? `/fork ${name}` : '/fork', channel, channelId, userId, { enrichSession: true, authSubject: subject, threadId: transportReplyContext?.threadId, chatType: transportReplyContext?.delivery?.chatType, replyContext: transportReplyContext });
         }
         return { error: `不支持的 session action: ${action}`, code: 'NOT_SUPPORTED' };
     }
     // ── /system 系列 ──
     if (cmdBase === '/system') {
         // D1 迁移：进程级鉴权统一查 daemon.json owners，替代各 action 内联的 identity.role 判断
-        if (!subject.isDaemonOwner) {
+        if (!subject.isDaemonOwner && subject.processRole !== 'daemon-service') {
             return {
                 error: formatAuthorizationDenial('This daemon-level operation requires DaemonOwner.', 'DAEMON_OWNER_REQUIRED'),
                 code: 'NOT_ALLOWED',
@@ -3567,17 +3792,28 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             const migrationRequirement = inspectDataMigrationRequirement(resolvePaths().root);
             if (migrationRequirement.required) {
                 return {
-                    error: `待处理的用户数据迁移（${migrationRequirement.operationCount} 项）阻止重启。请先运行 ec data migrate --dry-run，然后运行 ec data migrate --apply。`,
+                    error: `待处理的用户数据迁移（${migrationRequirement.operationCount} 项）阻止重启；本次仅检查，未停止当前服务。请先运行 ec data migrate --dry-run，然后运行 ec data migrate --apply。`,
                     code: 'DATA_MIGRATION_REQUIRED',
                     data: { reasonCode: 'DATA_MIGRATION_REQUIRED', operationCount: migrationRequirement.operationCount },
                 };
             }
             if (!suppressRealRestart) {
+                // 这条路径同样以 daemon 自杀收尾，入口缺失必须在写 pending 和自杀之前拦下。
+                const restartEntry = resolveCliEntry(getPackageRoot());
+                if (!fs.existsSync(restartEntry.entry)) {
+                    return {
+                        error: `找不到重启入口：${restartEntry.entry}。请先执行 npm run build 重建产物。`,
+                        code: 'RESTART_ENTRY_MISSING',
+                        data: { reasonCode: 'RESTART_ENTRY_MISSING', entry: restartEntry.entry },
+                    };
+                }
                 const restartInfo = {
                     channel,
                     channelId,
                     timestamp: Date.now(),
+                    ...(restartReplyContext?.threadId ? { threadId: restartReplyContext.threadId } : {}),
                     ...(restartDelivery ? { delivery: restartDelivery } : {}),
+                    ...(restartReplyContext?.replyToMessageId ? { rootId: restartReplyContext.replyToMessageId } : {}),
                 };
                 const controlDir = daemonControlDir();
                 fs.mkdirSync(controlDir, { recursive: true });
@@ -3586,23 +3822,41 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 // 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'], {
+                //
+                // `ec restart` owns the monitor liveness check, but it can itself die on
+                // load (tsx + a broken source tree), and this path kills the daemon
+                // afterwards — so confirm the CLI process survived before proceeding.
+                const restartLaunch = await launchMonitorAndConfirm([...restartEntry.args, 'restart'], {
                     EVOLCORE_HOME: resolvePaths().root,
                     EVOLCORE_SESSION_ID: '',
                     [AGENT_DELEGATION_TOKEN_ENV]: '',
-                });
+                }, 
+                // `ec restart` does not register itself; staying alive is the signal.
+                () => false, pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid !== pid), 8_000);
+                if (!restartLaunch.ok) {
+                    try {
+                        fs.rmSync(path.join(controlDir, 'restart-pending.json'), { force: true });
+                    }
+                    catch { }
+                    logger.error(`[System] Refusing menu restart: launcher did not survive (${restartLaunch.reason})`);
+                    for (const line of (restartLaunch.stderrTail ?? '').split(/\r?\n/).filter(Boolean).slice(-8)) {
+                        logger.error(`[System]   | ${line}`);
+                    }
+                    return {
+                        error: `重启已中止：启动器未能运行（${restartLaunch.reason}）。服务未停止，仍在运行当前版本。`,
+                        code: 'RESTART_LAUNCH_FAILED',
+                        data: { reasonCode: 'RESTART_LAUNCH_FAILED', reason: restartLaunch.reason },
+                    };
+                }
             }
             else {
                 logger.info('[System] Suppressed real menu restart in test runtime');
             }
             this.eventBus.publish({ type: 'system:restart', channel, channelId });
-            if (!suppressRealRestart) {
-                setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 1000);
-            }
             return { data: { action: 'restart', success: true } };
         }
         if (action === 'check') {
-            const r = await this.delegateAsAction(action, '/check', channel, channelId, userId, { overrideIdentity, authSubject: subject });
+            const r = await this.delegateAsAction(action, '/check', channel, channelId, userId, { overrideIdentity, authSubject: subject, threadId: transportReplyContext?.threadId, chatType: transportReplyContext?.delivery?.chatType, replyContext: transportReplyContext });
             // delegateAsAction 会把 structured 展开到 data 顶层，并保留 data.structured 兼容旧客户端。
             return r;
         }
@@ -3819,6 +4073,48 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
     }
     return { error: `不支持 action: ${cmdBase}`, code: 'NOT_SUPPORTED' };
 }
+export function resolveControlMenuAuthorization(input) {
+    const headers = parseMenuClientProtectedHeaders(input.auth.protectedHeaders);
+    const wireAuthMethod = headers.auth_method ?? 'daemon-owner';
+    const authMethod = wireAuthMethod === 'ecweb-token' ? 'remote-access-token' : wireAuthMethod;
+    const remoteToken = headers.remote_access_token ?? headers.ecweb_token;
+    if (authMethod !== 'daemon-owner' && authMethod !== 'remote-access-token') {
+        return { allowed: false, code: 'PERMISSION_DENIED', message: 'Unsupported Control Menu authorization method' };
+    }
+    if (authMethod === 'daemon-owner') {
+        if (remoteToken) {
+            return { allowed: false, code: 'PERMISSION_DENIED', message: 'remote_access_token requires auth_method=remote-access-token' };
+        }
+        if (!isProcessLevelOwner(input.peerId, input.owners)) {
+            return {
+                allowed: false,
+                code: 'NOT_ALLOWED',
+                message: formatAuthorizationDenial('Control-channel process operations require DaemonOwner.', 'DAEMON_OWNER_REQUIRED'),
+                data: authorizationDenialData('DAEMON_OWNER_REQUIRED'),
+            };
+        }
+        return { allowed: true, actorAid: input.peerId, authMethod };
+    }
+    if (!input.auth.encrypted || !remoteToken) {
+        return { allowed: false, code: 'REMOTE_ACCESS_TOKEN_INVALID', message: 'Remote access token authorization requires an encrypted protected header' };
+    }
+    const checked = (input.validateToken ?? validateAndRenewRemoteAccessToken)(remoteToken);
+    if (!checked.valid) {
+        return { allowed: false, code: 'REMOTE_ACCESS_TOKEN_INVALID', message: 'Remote access token is invalid or expired' };
+    }
+    const actorAid = checked.authorizedBy && input.owners.includes(checked.authorizedBy)
+        ? checked.authorizedBy
+        : input.owners[0];
+    if (!actorAid) {
+        return {
+            allowed: false,
+            code: 'NOT_ALLOWED',
+            message: formatAuthorizationDenial('Configure daemon.json.owners before using Control Menu operations.', 'DAEMON_OWNER_REQUIRED'),
+            data: authorizationDenialData('DAEMON_OWNER_REQUIRED'),
+        };
+    }
+    return { allowed: true, actorAid, authMethod };
+}
 function menuCommandToken(cmd) {
     if (typeof cmd !== 'string')
         return undefined;
@@ -3826,8 +4122,8 @@ function menuCommandToken(cmd) {
 }
 function isProcessLevelMenu(name, cmd) {
     const cmdToken = menuCommandToken(cmd);
-    return name === 'system' || name === 'agent' || name === 'gateway' || name === 'config'
-        || cmdToken === '/system' || cmdToken === '/agent' || cmdToken === '/gateway' || cmdToken === '/config';
+    return name === 'system' || name === 'agent' || name === 'gateway' || name === 'config' || name === 'baseagent-models'
+        || cmdToken === '/system' || cmdToken === '/agent' || cmdToken === '/gateway' || cmdToken === '/config' || cmdToken === '/baseagent-models';
 }
 function isProcessContextMenu(payload) {
     const isCatalog = payload?.type === 'menu.list' && payload?.args?.view === 'catalog';
@@ -3871,7 +4167,8 @@ async function execMenuForSystemControl(payload, context) {
     if ('error' in target)
         return ecwebErr(id, name, target.code, target.error);
     const targetChannel = target.channel;
-    const targetAid = this.getOwningAgent?.(targetChannel)?.aid;
+    const targetAid = this.getOwningAgent?.(targetChannel)?.aid
+        ?? this.getDaemonTriggerOwnerAid?.(targetChannel);
     const trustedSubject = buildAuthSubject({
         selfAid: targetAid,
         actorId: context.actorAid,
@@ -3884,10 +4181,18 @@ async function execMenuForSystemControl(payload, context) {
         processOwners: context.owners,
         fromControlChannel: true,
         canApprovePersistentFullAccess: context.canApprovePersistentFullAccess,
+        trustedProcessRole: context.source === 'ecweb' ? 'daemon-owner' : undefined,
     });
     const trustedIdentity = trustedSubject.identity;
     const cmd = name ? (menuCommandForName(name) ?? payload.cmd) : payload.cmd;
     try {
+        if (menuCommandToken(cmd) === '/baseagent-models') {
+            if (payload.type !== 'menu.query')
+                return ecwebErr(id, name, 'NOT_SUPPORTED', 'Baseagent catalog only supports menu.query');
+            if (payload.agent !== undefined)
+                return ecwebErr(id, name, 'INVALID_ARGUMENT', 'Baseagent catalog does not accept an Agent target');
+            hostCatalogArgs(payload.args);
+        }
         switch (payload?.type) {
             case 'menu.list':
                 if (payload?.args?.view === 'catalog') {
@@ -3991,6 +4296,7 @@ async function execMenuForSystemControl(payload, context) {
         }
     }
     catch (e) {
+        logger.error(`[ECWebMenu] failed type=${payload?.type ?? '<none>'} name=${name ?? '<none>'} cmd=${cmd ?? '<none>'} agent=${payload?.agent ?? '<none>'} actor=${context.actorAid ?? '<none>'}: ${e?.stack || e?.message || String(e)}`);
         return menuFailure({ id, ...(name ? { name } : {}) }, normalizeMenuError(e));
     }
 }
@@ -4044,10 +4350,10 @@ export async function execMenuForEcweb(payload, trusted) {
         owners,
     });
 }
-/** 控制 AID channel 专用入口：peerId 必须 ∈ evolcore.owners。
- *  全量权限（进程级 + 跨 agent + 关系级），fromControlChannel=true 放行闸门。
- *  与 ECWeb 入口的区别：鉴权主体是真实 peerId（而非注入 owner），按 evolcore.owners 校验。 */
-export async function execMenuForControl(payload, peerId) {
+/** Control AID entry: daemon-owner and valid ECWeb token modes share the same
+ * process authorization path. The authenticated envelope peerId remains the
+ * requester; token mode maps to a configured owner as its management actor. */
+export async function execMenuForControl(payload, peerId, auth = {}) {
     const id = payload?.id ?? '';
     const name = payload?.name;
     const validationError = validateMenuRequest(payload ?? {});
@@ -4057,16 +4363,22 @@ export async function execMenuForControl(payload, peerId) {
     const compatCmd = menuCommandToken(payload?.cmd);
     const isRoleRequest = name === 'role' || compatCmd === '/role';
     const isConnectRequest = name === 'connect' || compatCmd === '/connect';
-    if (!isRoleRequest && !isConnectRequest && !isProcessLevelOwner(peerId, owners)) {
+    const authorization = resolveControlMenuAuthorization({ peerId, owners, auth });
+    const hasExplicitAuthMethod = auth.protectedHeaders?.auth_method !== undefined;
+    if (!authorization.allowed && (hasExplicitAuthMethod || (!isRoleRequest && !isConnectRequest))) {
         return menuFailure({ id, ...(name ? { name } : {}) }, {
-            code: 'NOT_ALLOWED',
-            message: formatAuthorizationDenial('Control-channel process operations require DaemonOwner.', 'DAEMON_OWNER_REQUIRED'),
-            data: authorizationDenialData('DAEMON_OWNER_REQUIRED'),
+            code: authorization.code,
+            message: authorization.message,
+            ...(authorization.data !== undefined ? { data: authorization.data } : {}),
         });
     }
+    // Existing role/connect self-inspection remains available without process
+    // authority. Token-authorized and daemon-owner requests use one canonical
+    // management actor for the common process authorization path.
+    const managementActor = authorization.allowed ? authorization.actorAid : peerId;
     return execMenuForSystemControl.call(this, payload, {
         source: 'control',
-        actorAid: peerId,
+        actorAid: managementActor,
         localDirect: false,
         canApprovePersistentFullAccess: false,
         owners,