evolcore 0.0.23 → 0.0.24

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

@@ -22,7 +22,7 @@ import { splitConfigBatchGetArgv } from '../../cli/cli-argv.js';
 import { auditCommandAuthorization, auditFullAccessEvent, hashArgv } from '../auth/authorization-audit.js';
 import { executeResolvedContactCommand, resolveContactCommand } from '../../config/contact-operation-service.js';
 import { hasTrustedFullAccessDelegation, trustedExecutionIdentityInput } from '../auth/agent-delegation.js';
-import { executeManagedAidOperation, ManagedAidOperationError, resolveManagedAidOperation, } from '../../aun/aid/managed-operation.js';
+import { executeManagedAidOperation, ManagedAidOperationError, managedAidShowViewForRole, resolveManagedAidOperation, } from '../../aun/aid/managed-operation.js';
 import { executeManagedGroupOperation, isManagedGroupRelationRead, ManagedGroupOperationError, resolveManagedGroupOperation, executeManagedMsgOperation, ManagedMsgOperationError, resolveManagedMsgOperation, executeManagedFsOperation, ManagedFsOperationError, resolveManagedFsOperation, } from '../../aun/msg/managed-operation.js';
 import { authorizeOperation, buildAuthSubject } from '../auth/auth-gateway.js';
 import { isHClassPath, isLClassPath, isSameOrDescendant } from '../permission/protected-paths.js';
@@ -108,6 +108,7 @@ export class CommandHandler {
     interactionRouter;
     statsCollector;
     agentMap;
+    legacySingleRunnerMode;
     primaryRunnerKey;
     agentRegistry;
     agentApplicationService;
@@ -131,23 +132,42 @@ export class CommandHandler {
      * different backend; that would corrupt session metadata.
      */
     getAgent(channel, baseagent) {
-        if (channel && baseagent) {
+        const requestedBaseagent = typeof baseagent === 'string' ? baseagent.trim() : '';
+        // Support callers that intentionally provide a single-runner map keyed by
+        // the backend name. This exact lookup does not select another agent.
+        if (requestedBaseagent && this.agentMap.has(requestedBaseagent)) {
+            return this.agentMap.get(requestedBaseagent);
+        }
+        // A caller that passed one runner explicitly has already selected the
+        // backend; this compatibility path does not exist for multi-agent maps.
+        if (this.legacySingleRunnerMode && this.agentMap.size === 1
+            && this.agentMap.values().next().value?.name === requestedBaseagent) {
+            return this.agentMap.values().next().value;
+        }
+        if (channel && requestedBaseagent) {
             const owner = this.agentRegistry?.resolveByChannel(channel);
             const evolName = owner?.name || '<unknown>';
-            const key = `${evolName}::${baseagent}`;
+            const key = `${evolName}::${requestedBaseagent}`;
             if (this.agentMap.has(key))
                 return this.agentMap.get(key);
             if (owner) {
-                throw new BaseagentRunnerUnavailableError(evolName, baseagent, this.getAvailableBaseagentsForOwner(evolName));
+                throw new BaseagentRunnerUnavailableError(evolName, requestedBaseagent, this.getAvailableBaseagentsForOwner(evolName));
             }
-            const globalRunner = [...this.agentMap.entries()]
-                .find(([runnerKey]) => runnerKey === baseagent || runnerKey.endsWith(`::${baseagent}`));
-            if (globalRunner)
-                return globalRunner[1];
-        }
-        if (this.agentMap.has(this.primaryRunnerKey))
-            return this.agentMap.get(this.primaryRunnerKey);
-        return this.agentMap.values().next().value;
+            const matches = [...this.agentMap.entries()]
+                .filter(([runnerKey]) => runnerKey.endsWith(`::${requestedBaseagent}`));
+            if (matches.length === 1)
+                return matches[0][1];
+            logger.error(`[RunnerLookup] unavailable channel=${channel ?? '<none>'} baseagent=${requestedBaseagent} owner=${evolName} keys=${[...this.agentMap.keys()].join(',')}`);
+            throw new BaseagentRunnerUnavailableError('<unknown>', requestedBaseagent, []);
+        }
+        if (requestedBaseagent) {
+            const matches = [...this.agentMap.entries()]
+                .filter(([runnerKey]) => runnerKey.endsWith(`::${requestedBaseagent}`));
+            if (matches.length === 1)
+                return matches[0][1];
+        }
+        logger.error(`[RunnerLookup] unavailable channel=${channel ?? '<none>'} baseagent=${requestedBaseagent || '<missing>'} keys=${[...this.agentMap.keys()].join(',')}`);
+        throw new BaseagentRunnerUnavailableError('<unknown>', requestedBaseagent || '<missing>', []);
     }
     getAvailableBaseagentsForOwner(evolName) {
         const prefix = `${evolName}::`;
@@ -205,11 +225,13 @@ export class CommandHandler {
         this.eventBus = eventBus;
         if (agentRunnerOrMap instanceof Map) {
             this.agentMap = agentRunnerOrMap;
+            this.legacySingleRunnerMode = false;
             this.primaryRunnerKey = primaryRunnerKey || '<unknown>::claude';
         }
         else {
             // 测试 / 单 runner 路径：占位 agent name 用 '<unknown>'
             this.agentMap = new Map([[`<unknown>::${agentRunnerOrMap.name}`, agentRunnerOrMap]]);
+            this.legacySingleRunnerMode = true;
             this.primaryRunnerKey = `<unknown>::${agentRunnerOrMap.name}`;
         }
     }
@@ -424,13 +446,13 @@ export class CommandHandler {
             return fallback;
         }
     }
-    validateTriggerPermissionModeForRole(mode, isAdmin, role, selfAid, isDaemonOwner = false) {
+    validateTriggerPermissionModeForRole(mode, isAdmin, role, selfAid, isDaemonOwner = false, canApprovePersistentFullAccess = isDaemonOwner) {
         if (!mode)
             return undefined;
         if (mode === 'fullaccess') {
             if (!isFullAccessEnabled())
                 return 'fullaccess 功能未启用';
-            return isDaemonOwner ? undefined : '无权限：只有 daemon-owner 可以配置 fullaccess Trigger';
+            return canApprovePersistentFullAccess ? undefined : '无权限：只有 daemon-owner 可以配置 fullaccess Trigger';
         }
         if (!role) {
             if (mode === 'bypass' && !isAdmin)
@@ -486,7 +508,9 @@ export class CommandHandler {
                 return modelDecision.message || '当前角色不允许使用该 Trigger 模型';
         }
         if (definition.execution.effort) {
-            const base = executionBaseagent || 'claude';
+            if (!executionBaseagent)
+                return '无法确定 Trigger 会话的 baseagent';
+            const base = executionBaseagent;
             const effortDecision = validateRuntimeStringFieldOverride({
                 selfAid: definition.agentAid,
                 role,
@@ -575,7 +599,7 @@ export class CommandHandler {
         } : undefined;
         const permissionMode = this.triggerPermissionFromParsed(parsed);
         const triggerRole = this.triggerRoleContext(schedulerAid, channel, peerId, chatType);
-        const permissionError = this.validateTriggerPermissionModeForRole(permissionMode, isAdmin, triggerRole.role, schedulerAid, isDaemonOwner);
+        const permissionError = this.validateTriggerPermissionModeForRole(permissionMode, isAdmin, triggerRole.role, schedulerAid, isDaemonOwner, canApprovePersistentFullAccess);
         if (permissionError)
             return { error: permissionError };
         if (permissionMode === 'fullaccess' && !canApprovePersistentFullAccess) {
@@ -604,7 +628,7 @@ export class CommandHandler {
                 };
             }
         }
-        const authorizedBy = permissionMode === 'fullaccess' && isDaemonOwner
+        const authorizedBy = permissionMode === 'fullaccess' && canApprovePersistentFullAccess
             ? this.canonicalDaemonOwnerId(schedulerAid, channel, peerId, chatType)
             : undefined;
         const definition = {
@@ -1000,8 +1024,8 @@ export class CommandHandler {
         return await menuExecMenuQuery.call(this, cmd, channel, channelId, userId, args, explicitChatType, fromControlChannel, overrideIdentity, authSubject, source);
     }
     /** menu.update — 写入新值。 */
-    async execMenuUpdate(cmd, value, channel, channelId, userId, overrideIdentity, fromControlChannel = false, args, authSubject, source = 'menu') {
-        return await menuExecMenuUpdate.call(this, cmd, value, channel, channelId, userId, overrideIdentity, fromControlChannel, args, authSubject, source);
+    async execMenuUpdate(cmd, value, channel, channelId, userId, overrideIdentity, fromControlChannel = false, args, authSubject, source = 'menu', transportReplyContext) {
+        return await menuExecMenuUpdate.call(this, cmd, value, channel, channelId, userId, overrideIdentity, fromControlChannel, args, authSubject, source, transportReplyContext);
     }
     /** menu.action — 触发动词。 */
     async execMenuAction(cmd, action, args, channel, channelId, userId, overrideIdentity, explicitChatType, requestId, fromControlChannel = false, authSubject, source = 'menu', transportReplyContext, deferSideEffect) {
@@ -1103,7 +1127,7 @@ export class CommandHandler {
     /** 把 menu.action 委派给已有 slash 命令处理逻辑，把 OutboundPayload 包成结构化结果。 */
     async delegateAsAction(action, slashCmd, channel, channelId, userId, opts = {}) {
         try {
-            const result = await this._handleInternal(slashCmd, channel, channelId, undefined, userId, undefined, undefined, undefined, undefined, undefined, opts.overrideIdentity, opts.authSubject);
+            const result = await this._handleInternal(slashCmd, channel, channelId, undefined, userId, opts.threadId, opts.chatType, undefined, undefined, undefined, opts.overrideIdentity, opts.authSubject, opts.replyContext);
             if (result == null) {
                 // null / undefined: 命令未识别或前置守卫拦截（如 idle 检查），视为失败
                 return { error: '命令未执行（可能被前置守卫拦截）', code: 'EXEC_FAILED' };
@@ -1432,7 +1456,7 @@ export class CommandHandler {
             return { ok: false, error: err?.message || String(err) };
         }
         if (updated.execution.permissionMode === 'fullaccess') {
-            if (!isDaemonOwner) {
+            if (!isDaemonOwner && !canApprovePersistentFullAccess) {
                 return { ok: false, code: 'FORBIDDEN', error: '无权限：只有 daemon-owner 可以配置 fullaccess Trigger' };
             }
             if (!canApprovePersistentFullAccess) {
@@ -1455,7 +1479,7 @@ export class CommandHandler {
             return { ok: false, error: '无权限：只有 owner/admin 可以修改 script trigger' };
         }
         const triggerRole = this.triggerRoleContext(definition.agentAid, definition.origin?.channelKey || channel, definition.origin?.peerId || peerId);
-        const permissionError = this.validateTriggerPermissionModeForRole(updated.execution.permissionMode, isAdmin, triggerRole.role, definition.agentAid, isDaemonOwner);
+        const permissionError = this.validateTriggerPermissionModeForRole(updated.execution.permissionMode, isAdmin, triggerRole.role, definition.agentAid, isDaemonOwner, canApprovePersistentFullAccess);
         if (permissionError) {
             return {
                 ok: false,
@@ -1922,7 +1946,10 @@ export class CommandHandler {
         if (sessionSelfAid && sessionSelfAid !== grantSelfAid) {
             return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation self agent does not match the active session' };
         }
-        if (parsed.command.aid !== grantSelfAid && !hasTrustedFullAccessDelegation(delegation.grant)) {
+        const requiresSelfAid = parsed.command.kind === 'show' || parsed.command.kind === 'agentmd.put';
+        if (requiresSelfAid
+            && parsed.command.aid !== grantSelfAid
+            && !hasTrustedFullAccessDelegation(delegation.grant)) {
             return { ok: false, code: 'SCOPE_MISMATCH', error: 'Only the current Agent AID can be targeted' };
         }
         let conversationId;
@@ -1962,7 +1989,12 @@ export class CommandHandler {
         if (!decision.allow)
             return { ok: false, code: decision.code, error: decision.reason };
         try {
-            return { ok: true, result: await executeManagedAidOperation(parsed.command) };
+            return {
+                ok: true,
+                result: await executeManagedAidOperation(parsed.command, {
+                    showView: managedAidShowViewForRole(subject.role),
+                }),
+            };
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -2188,7 +2220,14 @@ export class CommandHandler {
             if (!hasTrustedFullAccessDelegation(grant) && (grant.channelType !== 'aun' || grant.chatType !== 'private')) {
                 return { ok: false, code: 'SCOPE_MISMATCH', error: 'Managed msg reads require the current AUN private relation' };
             }
-            if (!hasTrustedFullAccessDelegation(grant) && parsed.command.target !== conversationId) {
+            // A management role may read history for any peer, one peer per query.
+            // `issuedRole` is resolved daemon-side from the persisted relation
+            // config, so it cannot be spoofed by the calling task. Narrower roles
+            // stay pinned here, and authorizeOperation below remains the authority
+            // for every role (member carries currentRelationOnly; visitor is denied).
+            const mayReadCrossPeer = hasTrustedFullAccessDelegation(grant)
+                || (parsed.command.kind === 'history' && isAdminRole(grant.issuedRole));
+            if (!mayReadCrossPeer && parsed.command.target !== conversationId) {
                 return { ok: false, code: 'SCOPE_MISMATCH', error: 'Only the current AUN private relation can be targeted' };
             }
         }
@@ -2458,6 +2497,29 @@ export class CommandHandler {
         });
         if (!ctlDecision.allow)
             return { ok: false, code: ctlDecision.code, error: ctlDecision.reason };
+        if (cmd.startsWith('/status ') && cmd !== '/status --format json') {
+            return { ok: false, code: 'INVALID_ARGUMENT', error: 'status 仅支持可选参数 --format json' };
+        }
+        if (cmd === '/status --format json') {
+            const context = {
+                selfAid: grantSelfAid,
+                sessionId,
+                taskId: grant.taskId,
+                ...(grant.messageId ? { messageId: grant.messageId } : {}),
+                baseagent: session.baseagent,
+                channel: grant.channelType,
+                channelKey: grant.channel,
+                channelId: conversationId,
+                chatType: grant.chatType,
+                peerKey: grant.peerKey,
+                peerId: conversationId,
+                peerRole: ctlSubject.role,
+                permissionMode: grant.permissionMode ?? ctlSubject.permissionMode,
+                projectPath: path.resolve(session.projectPath),
+                ...(grant.sessionRuntimeDir ? { tmpDir: grant.sessionRuntimeDir } : {}),
+            };
+            return { ok: true, result: JSON.stringify(context, null, 2), data: context };
+        }
         if (cmd.startsWith('/model info ')) {
             const modelId = cmd.slice('/model info '.length).trim();
             if (!modelId || /\s/.test(modelId))

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

@@ -83,6 +83,7 @@ const ENTRIES = [
     { id: 'system.monitor', type: 'list', contexts: ['process'], name: 'system', label: '运行监控快照', section: 'process', order: 11, query: { cmd: '/system', args: { view: 'monitor' }, operation: 'system.status', scope: 'process' }, control: 'list' },
     { id: 'system.logs', type: 'list', contexts: ['process'], name: 'system', label: 'Daemon 日志', section: 'process', order: 12, query: { cmd: '/system', args: { view: 'logs' }, operation: 'system.status', scope: 'process' }, options: { cmd: '/system', args: { option: 'logs' }, operation: 'system.status', scope: 'process', mode: 'dynamic' }, control: 'list' },
     { id: 'config.rawFile', type: 'list', contexts: ['process'], name: 'config', label: '原始配置文件', section: 'process', order: 13, query: { cmd: '/config', args: { view: 'rawFile' }, operation: 'config.read', scope: 'process' }, options: { cmd: '/config', args: { option: 'rawFile' }, operation: 'config.read', scope: 'process', mode: 'dynamic' }, control: 'list' },
+    { id: 'baseagent.models', type: 'list', contexts: ['process'], name: 'baseagent-models', label: 'Baseagent 模型目录', section: 'process', order: 41, query: { cmd: '/baseagent-models', args: { baseagent: 'claude' }, operation: 'baseagent.models.list', scope: 'process' }, control: 'list' },
     { id: 'system.restart', type: 'action', contexts: ['process'], name: 'system', label: '重启服务', section: 'process', order: 20, action: { cmd: '/system', action: 'restart', operation: 'system.restart', scope: 'process' } },
     { id: 'system.upgrade', type: 'action', contexts: ['process'], name: 'system', label: '升级服务', section: 'process', order: 30, action: { cmd: '/system', action: 'upgrade', operation: 'system.upgrade', scope: 'process' } },
     { id: 'agent.list', type: 'list', contexts: ['process'], name: 'agent', label: 'Agent 列表', section: 'process', order: 40, options: { cmd: '/agent', args: { options: 'all' }, operation: 'agent.list', scope: 'control', mode: 'dynamic' }, control: 'list' },
@@ -110,7 +111,8 @@ export async function resolveMenuCatalogContext(input) {
         throw { code: 'FORBIDDEN', message: 'control catalog context requires a control subject' };
     }
     if (requested === 'process') {
-        if (input.channelScope !== 'control' || !subject.fromControlChannel || !subject.isDaemonOwner) {
+        if (input.channelScope !== 'control' || !subject.fromControlChannel
+            || (!subject.isDaemonOwner && subject.processRole !== 'daemon-service')) {
             throw {
                 code: 'NOT_ALLOWED',
                 message: formatAuthorizationDenial('Process context requires a DaemonOwner control subject.', 'DAEMON_OWNER_REQUIRED'),