evolcore 0.0.25 → 0.0.27

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

@@ -1,4 +1,7 @@
 import { BaseagentRunnerUnavailableError } from '../../agents/runner-types.js';
+import { loadedBaseagentIds } from '../../agents/baseagent-availability.js';
+import { parseMenuClientArgs } from '../../cli/menu-client.js';
+import { ensureSessionRuntimeDir } from '../../cli/task-context.js';
 import { renderCommandCardAsText } from '../interaction-router.js';
 import { buildEnvelope, deliveryTargetFromSession, isInteractionSendAccepted, replyContextFromSession, sendInteractionPayload } from '../message/message-utils.js';
 import { resolvePaths, getPackageRoot } from '../../paths.js';
@@ -7,6 +10,7 @@ import { logger } from '../../utils/logger.js';
 import { resolvePeerRoleDetail, roleToSessionIdentity } from '../../config/peer-role-resolver.js';
 import { isManagementRole } from '../../config/builtin-roles.js';
 import { formatPeerKey } from '../relation/peer-identity.js';
+import { sameGroupAid } from '../../aun/group/index.js';
 import crypto from 'crypto';
 import path from 'path';
 import fs from 'fs';
@@ -17,13 +21,13 @@ import { tryParseChannelKey } from '../channel-loader.js';
 import { displaySessionTitle } from '../session/session-title.js';
 import { buildSessionTurnList } from '../session/session-turns.js';
 import { resolveConfigCommand } from '../../config/resolved-config-op.js';
-import { AUTHENTICATED_CONFIG_ROLE_ENV, executeResolvedConfigCommand } from '../../config/config-operation-service.js';
+import { AUTHENTICATED_CONFIG_ROLE_ENV, executeResolvedConfigCommandAsync } from '../../config/config-operation-service.js';
 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, 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 { executeManagedGroupOperation, isManagedGroupRelationRead, isManagedGroupRelationWrite, 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';
 import { validateModelSelectionForRole } from '../model/model-permission.js';
@@ -98,6 +102,14 @@ export class CommandHandler {
     sessionManager;
     messageCache;
     eventBus;
+    agentStorageClientResolver;
+    groupInviteDecisionResolver;
+    setAgentStorageClientResolver(resolver) {
+        this.agentStorageClientResolver = resolver;
+    }
+    setGroupInviteDecisionResolver(resolver) {
+        this.groupInviteDecisionResolver = resolver;
+    }
     adapters = new Map();
     policies = new Map();
     channelObjects = new Map(); // name → actual channel instance (for /check)
@@ -123,6 +135,43 @@ export class CommandHandler {
     daemonMonitorProvider;
     agentDelegationRegistry;
     handoffRuntime;
+    diagService;
+    setDiagService(service) { this.diagService = service; }
+    async handleMenuClientOperation(argv, sessionId, delegationToken, delegationCommandHash, send) {
+        const validation = this.agentDelegationRegistry?.validate(delegationToken, sessionId, delegationCommandHash);
+        if (!validation?.ok)
+            return { ok: false, code: validation?.code ?? 'DELEGATION_REQUIRED', error: validation?.reason ?? 'Task delegation is required' };
+        const grant = validation.grant;
+        const session = await this.sessionManager.getSessionById(sessionId);
+        if (!session || session.selfAID !== grant.selfAid || argv[0] !== 'request' || argv[1] !== grant.selfAid)
+            return { ok: false, code: 'SCOPE_MISMATCH', error: 'Menu requests must use the current Agent identity and session' };
+        try {
+            const channelId = parsePeerKey(grant.peerKey).channelId;
+            const subject = buildAuthSubject({ selfAid: grant.selfAid, actorId: grant.actorId, channel: grant.channel,
+                channelType: grant.channelType, channelId, chatType: grant.chatType, conversationId: channelId,
+                processOwners: [], ...trustedExecutionIdentityInput(grant) });
+            const decision = authorizeOperation({ source: 'agent-tool', subject,
+                intent: { operation: 'ec.menu.request', scope: 'relation', source: 'agent-tool', args: { self: grant.selfAid, peer: argv[2], targetId: argv[2] } },
+                auditMetadata: { taskId: grant.taskId, sessionId, messageId: grant.messageId } });
+            if (!decision.allow)
+                return { ok: false, code: decision.code, error: decision.reason };
+            const options = parseMenuClientArgs(argv, file => {
+                const target = fs.realpathSync(path.resolve(session.projectPath, file));
+                const roots = [session.projectPath, this.getManagedSessionTempDir(session)].filter((v) => !!v)
+                    .map(root => fs.realpathSync(root));
+                if (!roots.some(root => isSameOrDescendant(target, root)) || isHClassPath(target) || isLClassPath(target))
+                    throw new Error('Menu request file must be an unprotected file in the project or session TMPDIR');
+                const stat = fs.statSync(target);
+                if (!stat.isFile() || stat.nlink > 1 || stat.size > 128 * 1024)
+                    throw new Error('Menu request file must be a regular file of at most 128 KiB');
+                return fs.readFileSync(target, 'utf8');
+            });
+            return { ok: true, response: await send(options) };
+        }
+        catch (error) {
+            return { ok: false, code: error.code ?? 'MENU_REQUEST_FAILED', error: error.message };
+        }
+    }
     contactRequestSubmitter;
     /**
      * Get the runner for a (channel, baseagent) pair.
@@ -170,19 +219,11 @@ export class CommandHandler {
         throw new BaseagentRunnerUnavailableError('<unknown>', requestedBaseagent || '<missing>', []);
     }
     getAvailableBaseagentsForOwner(evolName) {
-        const prefix = `${evolName}::`;
-        return [...this.agentMap.keys()]
-            .filter(key => key.startsWith(prefix))
-            .map(key => key.slice(prefix.length));
+        return loadedBaseagentIds(this.agentMap.keys(), evolName);
     }
-    /** Return the runner-owned temporary root for a managed session, if any. */
+    /** Return the stable temporary root for a managed session, if available. */
     getManagedSessionTempDir(session) {
-        try {
-            return this.getAgent(session.channel, session.baseagent).getManagedTempDir?.(session.id);
-        }
-        catch {
-            return undefined;
-        }
+        return ensureSessionRuntimeDir(session.id);
     }
     formatBaseagentUnavailable(error) {
         const available = error.availableBaseagents.length ? error.availableBaseagents.join(', ') : '(none)';
@@ -198,21 +239,10 @@ export class CommandHandler {
     getAvailableBaseagents(channel) {
         const owner = this.agentRegistry?.resolveByChannel(channel);
         if (!owner) {
-            const result = new Set();
-            for (const key of this.agentMap.keys()) {
-                const idx = key.indexOf('::');
-                result.add(idx >= 0 ? key.slice(idx + 2) : key);
-            }
-            return [...result];
+            return loadedBaseagentIds(this.agentMap.keys());
         }
         const evolName = owner.name || '<unknown>';
-        const prefix = `${evolName}::`;
-        const result = [];
-        for (const key of this.agentMap.keys()) {
-            if (key.startsWith(prefix))
-                result.push(key.slice(prefix.length));
-        }
-        return result;
+        return loadedBaseagentIds(this.agentMap.keys(), evolName);
     }
     /** Extract the baseagent component from `primaryRunnerKey` (e.g. `aid::claude` → `claude`). */
     parseDefaultBaseagent() {
@@ -403,6 +433,8 @@ export class CommandHandler {
     primaryFeedbackTarget(definition) {
         if (definition.feedback.strategy === 'target')
             return definition.feedback.target;
+        if (definition.feedback.strategy === 'event_session')
+            return undefined;
         if (!definition.origin)
             return undefined;
         return {
@@ -587,10 +619,16 @@ export class CommandHandler {
         if (!isAdmin && parsed.feedbackStrategy === 'target' && !sameFeedbackTarget(target, origin)) {
             return { error: '无权限：非 admin 只能把 trigger 投递到来源会话' };
         }
+        if (!isAdmin && parsed.feedbackStrategy === 'event_session') {
+            return { error: '无权限：只有 owner/admin 可以使用事件来源会话' };
+        }
         const source = this.triggerSourceFromSchedule(parsed.scheduleType, parsed.scheduleValue);
         if (parsed.timezone && source.type === 'cron') {
             source.timezone = parsed.timezone;
         }
+        if (parsed.eventFilter !== undefined && source.type === 'event') {
+            source.filter = parsed.eventFilter;
+        }
         const script = parsed.scriptPath ? {
             path: parsed.scriptPath,
             runtime: parsed.scriptRuntime,
@@ -650,6 +688,7 @@ export class CommandHandler {
                     baseagent: executionBaseagent,
                 } : {}),
                 model: parsed.model,
+                timeoutMs: parsed.executionTimeoutMs,
                 effort: parsed.effort,
                 ...(permissionMode !== undefined ? { permissionMode } : {}),
                 onError: 'retry',
@@ -809,23 +848,36 @@ export class CommandHandler {
      * 通用降级应答入口：按 (sessionId, fallbackCommand) 查找 pending interaction 并路由。
      * 返回 { matched: true } 表示已处理，调用方直接返回 result。
      */
-    async handleInteractionFallback(command, args, sessionId, userId) {
+    async handleInteractionFallback(command, args, sessionId, userId, channelKey) {
         if (!this.interactionRouter)
             return { matched: false };
-        const pendingId = this.interactionRouter.findPendingByCommand(sessionId, command);
+        const candidates = this.interactionRouter.getPending(sessionId, command);
+        const explicitId = args.split(/\s+/, 1)[0];
+        if (explicitId.startsWith('aq-') && !candidates.includes(explicitId)) {
+            return { matched: true, result: '⚠️ 该问题不存在、已回答或已过期，请使用当前问题卡片。' };
+        }
+        const pendingId = candidates.includes(explicitId)
+            ? explicitId : this.interactionRouter.findPendingByCommand(sessionId, command);
         if (!pendingId)
             return { matched: false };
+        if (explicitId !== pendingId && candidates.length > 1) {
+            return { matched: true, result: `有多个待回答问题，请使用 /ask <问题ID> <回答>：\n${candidates.join('\n')}` };
+        }
+        const answer = explicitId === pendingId ? args.slice(explicitId.length).trim() : args.trim();
+        if (!answer)
+            return { matched: true, result: `请使用 /ask ${pendingId} <回答>` };
         const initiatorId = this.interactionRouter.getInitiator(pendingId);
         if (initiatorId && initiatorId !== userId) {
             return { matched: true, result: '⚠️ 仅卡片发起者可应答' };
         }
-        const handled = this.interactionRouter.handle({
+        const handled = await this.interactionRouter.handleAsync({
             type: 'interaction.response',
             id: pendingId,
-            action: args,
+            action: answer,
             operatorId: userId,
+            ...(channelKey ? { channelKey } : {}),
         });
-        return { matched: true, result: handled ? '✓ 已回答' : '⚠️ 无法验证应答者身份' };
+        return { matched: true, result: handled ? '✓ 已回答' : '⚠️ 回答未被接受，请检查选项或问题是否仍有效。' };
     }
     setProcessor(processor) {
         this.processor = processor;
@@ -965,6 +1017,7 @@ export class CommandHandler {
         const item = {
             value: s.threadId,
             label: displayName,
+            lable: s.lable || null,
         };
         if (s.agentSessionId) {
             item.agentSessionId = s.agentSessionId;
@@ -983,16 +1036,17 @@ export class CommandHandler {
     getMenuItems(role, chatType = 'private', scope = 'agent', authSubject) {
         return menuGetMenuItems.call(this, role, chatType, scope, authSubject);
     }
-    async getMenuCatalog(channel, channelId, subject, request, channelScope = 'agent') {
+    async getMenuCatalog(channel, channelId, subject, request, channelScope = 'agent', paircodeAllowed) {
         return await getMenuCatalog({
             subject,
             channelType: this.resolveChannelType(channel),
             channelScope,
             channelId,
             request,
+            ...(paircodeAllowed === undefined ? {} : { paircodeAllowed }),
         });
     }
-    async execMenuValueBatch(channel, channelId, subject, args, request, channelScope = 'agent') {
+    async execMenuValueBatch(channel, channelId, subject, args, request, channelScope = 'agent', transportReplyContext) {
         validateMenuValueBatchArgs(args);
         return await execMenuValueBatch({
             subject,
@@ -1003,12 +1057,12 @@ export class CommandHandler {
             items: args?.items,
             schemaVersion: args?.schemaVersion,
             consistency: args?.consistency,
-            execQuery: async (cmd, resolvedChannelId, queryArgs, context) => this.execMenuQuery(cmd, channel, resolvedChannelId, context.subject.actorId, queryArgs, context.subject.chatType, context.subject.fromControlChannel, context.subject.identity, context.subject, channelScope === 'control' ? 'control' : 'menu'),
+            execQuery: async (cmd, resolvedChannelId, queryArgs, context) => this.execMenuQuery(cmd, channel, resolvedChannelId, context.subject.actorId, queryArgs, context.subject.chatType, context.subject.fromControlChannel, context.subject.identity, context.subject, channelScope === 'control' ? 'control' : 'menu', resolvedChannelId === channelId ? transportReplyContext : undefined),
         });
     }
     /** 动态子菜单：根据 cmd 路径返回选项列表（供 menu.query + cmd 使用） */
-    async getSubMenuItems(cmd, channel, channelId, userId, args, overrideIdentity, explicitChatType, fromControlChannel = false, authSubject, source = 'menu') {
-        return await menuGetSubMenuItems.call(this, cmd, channel, channelId, userId, args, overrideIdentity, explicitChatType, fromControlChannel, authSubject, source);
+    async getSubMenuItems(cmd, channel, channelId, userId, args, overrideIdentity, explicitChatType, fromControlChannel = false, authSubject, source = 'menu', transportReplyContext) {
+        return await menuGetSubMenuItems.call(this, cmd, channel, channelId, userId, args, overrideIdentity, explicitChatType, fromControlChannel, authSubject, source, transportReplyContext);
     }
     // ── Menu Protocol exec ────────────────────────────────────────────────
     async loadMenuContext(channel, channelId) {
@@ -1020,8 +1074,8 @@ export class CommandHandler {
         return s ? null : { error: '当前无活跃会话', code: 'NO_ACTIVE_SESSION' };
     }
     /** menu.query — 查询当前值。 */
-    async execMenuQuery(cmd, channel, channelId, userId, args, explicitChatType, fromControlChannel = false, overrideIdentity, authSubject, source = 'menu') {
-        return await menuExecMenuQuery.call(this, cmd, channel, channelId, userId, args, explicitChatType, fromControlChannel, overrideIdentity, authSubject, source);
+    async execMenuQuery(cmd, channel, channelId, userId, args, explicitChatType, fromControlChannel = false, overrideIdentity, authSubject, source = 'menu', transportReplyContext) {
+        return await menuExecMenuQuery.call(this, cmd, channel, channelId, userId, args, explicitChatType, fromControlChannel, overrideIdentity, authSubject, source, transportReplyContext);
     }
     /** menu.update — 写入新值。 */
     async execMenuUpdate(cmd, value, channel, channelId, userId, overrideIdentity, fromControlChannel = false, args, authSubject, source = 'menu', transportReplyContext) {
@@ -1176,9 +1230,9 @@ export class CommandHandler {
     /**
      * 主命令处理入口
      */
-    async handle(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, authSubject, replyContext) {
+    async handle(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, authSubject, replyContext, enforceGroupSlashPolicy = false) {
         try {
-            const result = await this._handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, authSubject, replyContext);
+            const result = await this._handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, authSubject, replyContext, enforceGroupSlashPolicy);
             // Lifecycle commands are control-plane operations. Their replies must
             // use notification payloads so other agents in a group do not treat the
             // text as ordinary model input. Normalize guard-path replies here too,
@@ -1210,8 +1264,10 @@ export class CommandHandler {
             throw error;
         }
     }
-    async _handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, authSubject, replyContext) {
-        return await handleSlashCommand.call(this, content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, authSubject, replyContext);
+    async _handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, authSubject, replyContext, 
+    // Menu and delegated CLI operations reuse this implementation without the chat-only policy.
+    applyGroupSlashPolicy = false) {
+        return await handleSlashCommand.call(this, content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, authSubject, replyContext, applyGroupSlashPolicy);
     }
     async handleTriggerCommand(scheduler, content, channel, channelId, peerId, isAdmin, messageId, chatType, threadId, isDaemonOwner = false, canApprovePersistentFullAccess = isDaemonOwner) {
         if (content === '/trigger') {
@@ -1399,17 +1455,17 @@ export class CommandHandler {
             const nextStr = reg.trigger.nextFireAt ? new Date(reg.trigger.nextFireAt).toLocaleString() : '未计算';
             return `✅ 触发器已注册：**${reg.trigger.name}**\n下次触发：${nextStr}`;
         }
-        return `❌ 未知子命令。用法：
-/trigger — 查看活跃触发器
-/trigger list [--all] — 查看所有触发器
-/trigger create <参数> — 创建触发器（set 为兼容别名）
-/trigger update <名称|ID> <参数> — 修改触发器
-常用参数：--delay/--at/--cron/--every、--prompt、--description、--model、--effort、--permission（省略则继承；update 可用 inherit 清除覆盖）、--feedback、--target-channel/--target-channel-id、--trigger-thread、--baseagent、--on-error、--retry-attempts/--retry-backoff、--script-runtime/--script-args/--script-timeout
-/trigger enable <名称|ID> — 启用触发器
-/trigger disable <名称|ID> — 暂停触发器
-/trigger show <名称|ID> — 查看触发器详情
-/trigger run <名称|ID> [--dry-run] — 手动触发
-/trigger cancel <名称|ID> — 禁用触发器（disable 的兼容别名）
+        return `❌ 未知子命令。用法：
+/trigger — 查看活跃触发器
+/trigger list [--all] — 查看所有触发器
+/trigger create <参数> — 创建触发器（set 为兼容别名）
+/trigger update <名称|ID> <参数> — 修改触发器
+常用参数：--delay/--at/--cron/--every、--prompt、--description、--model、--effort、--permission（省略则继承；update 可用 inherit 清除覆盖）、--feedback、--target-channel/--target-channel-id、--trigger-thread、--baseagent、--on-error、--retry-attempts/--retry-backoff、--script-runtime/--script-args/--script-timeout
+/trigger enable <名称|ID> — 启用触发器
+/trigger disable <名称|ID> — 暂停触发器
+/trigger show <名称|ID> — 查看触发器详情
+/trigger run <名称|ID> [--dry-run] — 手动触发
+/trigger cancel <名称|ID> — 禁用触发器（disable 的兼容别名）
 /trigger delete <名称|ID> — 删除触发器`;
     }
     async handleTrigger(content, channel, channelId, peerId, isAdmin, messageId, chatType, threadId, isDaemonOwner = false, canApprovePersistentFullAccess = isDaemonOwner) {
@@ -1472,6 +1528,9 @@ export class CommandHandler {
             updated = deescalated;
         }
         const target = this.primaryFeedbackTarget(updated);
+        if (!isAdmin && updated.feedback.strategy === 'event_session') {
+            return { ok: false, error: '无权限：只有 owner/admin 可以使用事件来源会话' };
+        }
         if (!isAdmin && target && !sameFeedbackTarget(target, definition.origin)) {
             return { ok: false, error: '无权限：非 admin 只能把 trigger 投递到来源会话' };
         }
@@ -1677,8 +1736,9 @@ export class CommandHandler {
     buildCtlReplyContext(session) {
         const ctx = { delivery: deliveryTargetFromSession(session) };
         const meta = session.metadata;
-        if (meta?.replyContext?.threadId)
-            ctx.threadId = meta.replyContext.threadId;
+        const threadId = session.threadId || meta?.replyContext?.threadId;
+        if (threadId)
+            ctx.threadId = threadId;
         if (meta?.replyContext?.peerId)
             ctx.peerId = meta.replyContext.peerId;
         if (!ctx.peerId && meta?.peerId)
@@ -1759,7 +1819,7 @@ export class CommandHandler {
             processOwners: loadDaemonConfig().owners ?? [],
             ...trustedExecutionIdentityInput(grant),
         });
-        const executeOne = (fieldArgv) => {
+        const executeOne = async (fieldArgv) => {
             const resolved = resolveConfigCommand(fieldArgv, {
                 defaultRelation: { self: grant.selfAid, peerKey: grant.peerKey },
             });
@@ -1780,6 +1840,7 @@ export class CommandHandler {
                     dangerous: resolved.command.dangerous,
                 },
                 resolvedConfigCommand: resolved.command,
+                allowExplicitRelationTarget: true,
                 auditMetadata: {
                     argvHash: hashArgv(resolved.command.canonicalArgv),
                     taskId: grant.taskId,
@@ -1788,22 +1849,35 @@ export class CommandHandler {
             });
             if (!decision.allow)
                 return { ok: false, code: decision.code, error: decision.reason };
-            return executeResolvedConfigCommand(resolved.command, { role: subject.role });
+            const roleContext = {
+                self: grant.selfAid,
+                actorRole: subject.role,
+                actorRoleSource: subject.roleSource,
+                actorAllowAccess: subject.allowAccess,
+                actorAid: grant.actorId,
+                isDaemonOwner: subject.isDaemonOwner,
+                fromControlChannel: subject.fromControlChannel,
+                chatType: grant.chatType,
+            };
+            return await executeResolvedConfigCommandAsync(resolved.command, {
+                role: subject.role,
+                roleContext,
+            });
         };
         const batch = splitConfigBatchGetArgv(argv);
         if (batch && batch.fields.length > 1) {
-            const results = batch.fields.map(field => {
-                const result = executeOne(['config', 'get', field, ...batch.rest]);
+            const results = await Promise.all(batch.fields.map(async (field) => {
+                const result = await executeOne(['config', 'get', field, ...batch.rest]);
                 if (!result.ok)
                     return { ok: false, field, code: result.code, error: result.error };
                 if (result.subcommand !== 'get') {
                     return { ok: false, field, code: 'UNEXPECTED_RESULT', error: `config get ${field} produced a non-get result` };
                 }
                 return result;
-            });
+            }));
             return { ok: true, result: { ok: true, subcommand: 'batch-get', results } };
         }
-        const result = executeOne(argv);
+        const result = await executeOne(argv);
         return result.ok
             ? { ok: true, result }
             : { ok: false, code: result.code, error: result.error, ...(result.data !== undefined ? { data: result.data } : {}) };
@@ -1827,7 +1901,8 @@ export class CommandHandler {
         catch {
             return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation contains an invalid relation key' };
         }
-        const resolved = resolveContactCommand(argv);
+        const resolvedArgv = argv.includes('--self') ? argv : [...argv, '--self', grant.selfAid];
+        const resolved = resolveContactCommand(resolvedArgv);
         if (!resolved.ok)
             return { ok: false, code: resolved.code, error: resolved.reason };
         if (resolved.command.selfAid !== grant.selfAid && !hasTrustedFullAccessDelegation(grant)) {
@@ -2124,7 +2199,8 @@ export class CommandHandler {
         const managementRole = isManagementRole(subject.role) || subject.dataScope === 'daemon';
         if (subject.dataScope !== 'daemon'
             && !managementRole
-            && (grant.channelType !== 'aun' || !isManagedGroupRelationRead(parsed.command))) {
+            && (grant.channelType !== 'aun'
+                || !(isManagedGroupRelationRead(parsed.command) || isManagedGroupRelationWrite(parsed.command)))) {
             return { ok: false, code: 'ROLE_ACCESS_DENIED', error: `Role ${subject.role} cannot manage Agent group membership or settings` };
         }
         if ((parsed.command.kind === 'dissolve' || parsed.command.kind === 'owner')
@@ -2156,6 +2232,21 @@ export class CommandHandler {
         });
         if (!decision.allow)
             return { ok: false, code: decision.code, error: decision.reason };
+        if (parsed.command.kind === 'accept-invite' || parsed.command.kind === 'reject-invite') {
+            if (subject.role !== 'owner' || grant.channelType !== 'aun' || grant.chatType !== 'private'
+                || parsed.command.from !== grantSelfAid || !this.groupInviteDecisionResolver) {
+                return { ok: false, code: 'ROLE_ACCESS_DENIED', error: 'Targeted invitation decisions require the current Agent Owner' };
+            }
+            try {
+                const result = await this.groupInviteDecisionResolver(grantSelfAid, grant.actorId, parsed.command.inviteId, parsed.command.kind === 'accept-invite' ? 'accept' : 'reject');
+                return result.accepted
+                    ? { ok: true, result: { ok: true, status: result.status, group_id: result.groupId, message: result.text } }
+                    : { ok: false, code: 'GROUP_INVITE_DECISION_REJECTED', error: result.text };
+            }
+            catch (error) {
+                return { ok: false, code: 'GROUP_INVITE_DECISION_FAILED', error: error instanceof Error ? error.message : String(error) };
+            }
+        }
         let rulesContent;
         if (parsed.command.kind === 'rules.set') {
             const filePath = String(parsed.command.filePath || '');
@@ -2210,7 +2301,10 @@ export class CommandHandler {
             }
         }
         try {
-            return { ok: true, result: await executeManagedGroupOperation(parsed.command, rulesContent) };
+            return { ok: true, result: await executeManagedGroupOperation(parsed.command, rulesContent, {
+                    defaultThread: grant.chatType === 'group' && conversationId === parsed.command.groupId
+                        ? session.threadId || 'main' : 'all',
+                }) };
         }
         catch (error) {
             return {
@@ -2407,7 +2501,7 @@ export class CommandHandler {
             return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation contains an invalid relation key' };
         }
         if (!hasTrustedFullAccessDelegation(grant)
-            && ((parsed.command.actorAid && parsed.command.actorAid !== actorAid) || parsed.command.groupId !== currentGroup)) {
+            && ((parsed.command.actorAid && parsed.command.actorAid !== actorAid) || !sameGroupAid(parsed.command.groupId, currentGroup))) {
             return { ok: false, code: 'SCOPE_MISMATCH', error: 'Only the current AUN group can be targeted' };
         }
         parsed.command.actorAid = hasTrustedFullAccessDelegation(grant)