evolcore 0.0.19 → 0.0.21

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

@@ -1,7 +1,7 @@
 import { roleMenuQuery, roleMenuGroupCount, roleMenuUpdate, } from './role-menu.js';
 import { getContactSnapshot, resolveContactView } from '../../config/contact-book.js';
 import { mutateAccessPolicy, readAccessPolicySnapshot, } from '../../config/access-policy.js';
-import { expirePendingContactRequests, mutateContactWithOperation, reviewContactRequest, } from '../../config/contact-request-service.js';
+import { expirePendingContactRequests, addContact, mutateContactWithOperation, reviewContactRequest, } from '../../config/contact-request-service.js';
 import { formatPeerKey, parsePeerKey } from '../relation/peer-identity.js';
 /**
  * Connect Menu — 联系人与关系管理协议
@@ -374,13 +374,12 @@ async function actionAdd(req, self, context) {
     }
     const current = getContactSnapshot(self).contacts.get(primaryId);
     const displayName = hasDisplayName ? args.displayName : current?.displayName ?? null;
-    const result = await mutateContactWithOperation({
+    const result = await addContact({
         selfAid: self,
         actorId: context.actorAid ?? 'connect-menu',
-        operation: 'manual-add',
         expectedContactRevision,
-        mutation: { type: 'set-display-name', primaryId, displayName },
         primaryId,
+        displayName,
     });
     const storedDisplayName = result.contact.contacts[primaryId]?.displayName ?? null;
     return ok({

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

@@ -2,7 +2,7 @@ import crypto from 'crypto';
 import { ConfigTarget, mutateConfig, read as readConfig, resolveEffectiveFieldWithSource, } from '../../config/config-manager.js';
 import { normalizeMentionMode } from '../../config/mention-mode.js';
 import { readRolesConfig } from '../../config/roles.js';
-import { groupInfo, groupList } from '../../aun/msg/group.js';
+import { groupInfo, groupList, groupDirectoryErrorCode } from '../../aun/msg/group.js';
 import { formatPeerKey, parsePeerKey } from '../relation/peer-identity.js';
 const DEFAULT_DIRECTORY = {
     getGroup: groupInfo,
@@ -141,11 +141,10 @@ async function resolveTarget(args, context) {
         required: ['member', 'state'],
     });
     if (!result.ok) {
-        if (result.code === -33001 || result.code === -33006
-            || result.code === '-33001' || result.code === '-33006') {
-            throw new GroupMenuError('NOT_FOUND', 'The target group is not joined by this Agent');
-        }
-        throw new GroupMenuError('TEMPORARILY_UNAVAILABLE', result.error || 'Unable to verify the target group');
+        const code = groupDirectoryErrorCode(result.code, result.error);
+        throw new GroupMenuError(code, code === 'NOT_FOUND'
+            ? 'The target group is not joined by this Agent'
+            : result.error || 'Unable to verify the target group');
     }
     const group = result.group;
     if (!result.found || !group || !group.my_role || group.status === 'dissolved') {
@@ -209,7 +208,6 @@ function settingOptions(key, target) {
         ...values.map(option => ({
             ...option,
             selected: state.override === option.value,
-            ...(state.mode ? { effective: state.mode === option.value } : {}),
             revision: state.revision,
         })),
     ];

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

@@ -16,7 +16,7 @@ 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 { loadDefaults, loadDaemonConfig } from '../../config-store.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';
 import { execAgentAction, execAgentQuery, execAgentOptions, resolveProjectPath } from './agent-control.js';
@@ -25,7 +25,7 @@ import { displaySessionTitle } from '../session/session-title.js';
 import { buildSessionTurnList } from '../session/session-turns.js';
 import { isCapabilityType, listCapabilityOptions, queryCapabilityTypes, resolveCapabilityContext, updateCapabilityPolicy, } from '../capability/capability-manager.js';
 import { normalizeCliArgv, parseCliIntent, parseLegacyCliCommand, validateCliArgv, withDefaultRelationContext } from './cli-intent-parser.js';
-import { auditCommandAuthorization, hashArgv } from '../auth/authorization-audit.js';
+import { auditCommandAuthorization, auditFullAccessEvent, hashArgv } from '../auth/authorization-audit.js';
 import { authorizeOperation, buildAuthSubject } from '../auth/auth-gateway.js';
 import { authorizationDenialData, formatAuthorizationDenial } from '../auth/authorization-denial.js';
 import { evaluateRoleOperationCapability } from '../auth/operation-authorizer.js';
@@ -43,6 +43,7 @@ import { roleMenuAction, roleMenuOperation, roleMenuOptions, roleMenuQuery, role
 import { handleConnectMenu, connectMenuOperation } from './connect-menu.js';
 import { groupMenuAuthorizationArgs, groupMenuIntent, handleGroupMenu, } from './group-menu.js';
 import { getMenuCatalog, execMenuValueBatch, resolveExplicitMenuExecutionContext, validateMenuCatalogArgs, validateMenuValueBatchArgs } from './menu-catalog.js';
+import { probeSessionActivity } from './slash-gate.js';
 /**
  * 获取 baseagent CLI 的版本号（claude/gemini/codex）。
  * 失败返回 null（命令不存在或执行失败）。
@@ -455,6 +456,24 @@ function menuConfigSource(fieldPath, sel) {
     catch { }
     return null;
 }
+/** Read the explicit value stored in the scope being queried, without resolving inheritance. */
+function readMenuScopeOverride(scope, fieldPath, sel) {
+    const target = scope === 'agent' ? ConfigTarget.Agent : ConfigTarget.Relation;
+    try {
+        let current = cfgRead(target, sel, { cache: false });
+        for (const part of fieldPath.split('.')) {
+            if (!current || typeof current !== 'object'
+                || !Object.prototype.hasOwnProperty.call(current, part)) {
+                return null;
+            }
+            current = current[part];
+        }
+        return current === undefined ? null : current;
+    }
+    catch {
+        return null;
+    }
+}
 function menuModelConfigFieldPath(target) {
     return target.fieldPath;
 }
@@ -1131,6 +1150,8 @@ function buildRoleMenuContext(owner, channel, subject) {
         actorRoleSource: subject.roleSource,
         actorAllowAccess: subject.allowAccess,
         actorAid: subject.actorId,
+        isDaemonOwner: subject.isDaemonOwner,
+        fromControlChannel: subject.fromControlChannel,
         chatType: subject.chatType,
         aunAvailable,
         ...(contactAdapter?.send ? {
@@ -1549,7 +1570,9 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
     // 控制 channel：返回全量；agent channel：仅返回自身单条。
     if (cmd === '/agent') {
         if (fromControlChannel) {
-            const res = await execAgentOptions(args);
+            const res = this.agentApplicationService
+                ? await execAgentOptions(args, this.agentApplicationService)
+                : await execAgentOptions(args);
             if ('error' in res)
                 throw { code: res.code, message: res.error };
             return res.data.agents.map(ag => ({ value: ag.aid, label: ag.name || ag.aid, desc: ag.status }));
@@ -1558,7 +1581,9 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
         const selfAid = this.getOwningAgent?.(channel)?.aid;
         if (!selfAid)
             throw { code: 'FORBIDDEN', message: '当前 channel 无绑定 agent' };
-        const res = await execAgentQuery({ aid: selfAid });
+        const res = this.agentApplicationService
+            ? await execAgentQuery({ aid: selfAid }, this.agentApplicationService)
+            : await execAgentQuery({ aid: selfAid });
         if ('error' in res)
             throw { code: res.code, message: res.error };
         const ag = res.data;
@@ -1902,12 +1927,21 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
     // 授权由 agent.list/agent.show operation 决定；channel 闸门只负责目标范围。
     if (cmdBase === '/agent') {
         if (fromControlChannel) {
-            return args?.aid ? await execAgentQuery(args) : await execAgentOptions(args);
+            if (args?.aid) {
+                return this.agentApplicationService
+                    ? await execAgentQuery(args, this.agentApplicationService)
+                    : await execAgentQuery(args);
+            }
+            return this.agentApplicationService
+                ? await execAgentOptions(args, this.agentApplicationService)
+                : await execAgentOptions(args);
         }
         const selfAid = this.getOwningAgent?.(channel)?.aid;
         if (!selfAid)
             return { error: '当前 channel 无绑定 agent', code: 'FORBIDDEN' };
-        return await execAgentQuery({ ...(args ?? {}), aid: selfAid });
+        return this.agentApplicationService
+            ? await execAgentQuery({ ...(args ?? {}), aid: selfAid }, this.agentApplicationService)
+            : await execAgentQuery({ ...(args ?? {}), aid: selfAid });
     }
     // ── /gateway 查询（只读，列出全部作用域的网关配置；apiKey 已掩码） ──
     if (cmdBase === '/gateway') {
@@ -2058,12 +2092,15 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
             : null;
         const targetAgent = requestedAgent ?? evolagent;
         const value = targetAgent?.baseagent ?? targetAgent?.config?.active_baseagent ?? null;
+        const override = targetAgent?.aid
+            ? readMenuScopeOverride('agent', 'active_baseagent', { self: targetAgent.aid })
+            : null;
         const source = value == null
             ? null
             : targetAgent?.aid
                 ? menuConfigSource('active_baseagent', { self: targetAgent.aid }) ?? 'agent'
                 : 'agent';
-        return { data: { baseagent: value, scope: 'agent', source } };
+        return { data: { baseagent: value, scope: 'agent', override, source } };
     }
     if (cmdBase === '/model') {
         const target = resolveMenuModelTarget.call(this, {
@@ -2087,6 +2124,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
                 baseagent: target.baseagent,
                 source: current.source,
                 scope: target.scope,
+                override: readMenuScopeOverride(target.scope, target.fieldPath, target.sel),
                 field: target.fieldPath,
                 self: target.sel.self,
                 ...(target.sel.peerKey ? { peerKey: target.sel.peerKey } : {}),
@@ -2115,6 +2153,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
                 baseagent: target.baseagent,
                 source: current.source,
                 scope: target.scope,
+                override: readMenuScopeOverride(target.scope, target.fieldPath, target.sel),
                 field: target.fieldPath,
                 self: target.sel.self,
                 ...(target.sel.peerKey ? { peerKey: target.sel.peerKey } : {}),
@@ -2140,6 +2179,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
                 mode: current.value,
                 source: current.source,
                 scope: target.scope,
+                override: readMenuScopeOverride(target.scope, target.fieldPath, target.sel),
                 field: target.fieldPath,
                 self: target.sel.self,
                 ...(target.sel.peerKey ? { peerKey: target.sel.peerKey } : {}),
@@ -2170,6 +2210,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
                 mode: current.value,
                 source: current.source,
                 scope: target.scope,
+                override: readMenuScopeOverride(target.scope, target.fieldPath, target.sel),
                 field: target.fieldPath,
                 self: target.sel.self,
                 ...(target.sel.peerKey ? { peerKey: target.sel.peerKey } : {}),
@@ -2180,10 +2221,13 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         if (!evolagent)
             return { error: '找不到通道所属 agent', code: 'MISSING_AID' };
         const observable = evolagent?.getObservable() ?? false;
+        const override = evolagent?.aid
+            ? readMenuScopeOverride('agent', 'observable', { self: evolagent.aid })
+            : null;
         const source = evolagent?.aid
             ? menuConfigSource('observable', { self: evolagent.aid }) ?? 'builtin'
             : 'builtin';
-        return { data: { observable, source } };
+        return { data: { observable, scope: 'agent', override, source } };
     }
     if (cmdBase === '/perm') {
         const target = resolveMenuPermissionTarget.call(this, {
@@ -2231,6 +2275,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
                 mode: current.value,
                 source: current.source,
                 scope: target.scope,
+                override: readMenuScopeOverride(target.scope, target.fieldPath, target.sel),
                 field: target.fieldPath,
                 self: target.sel.self,
                 ...(target.sel.peerKey ? { peerKey: target.sel.peerKey } : {}),
@@ -2420,11 +2465,13 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
         const triggerScheduler = this.getTriggerSchedulerForChannel?.(channel);
         if (!triggerScheduler)
             return { error: '触发器功能未启用', code: 'NOT_SUPPORTED' };
-        const updated = await this.updateTriggerFromPatch(triggerScheduler, patch.nameOrId, patch, channel, channelId, userId ?? '', isAdmin);
+        const updated = await this.updateTriggerFromPatch(triggerScheduler, patch.nameOrId, patch, channel, channelId, userId ?? '', isAdmin, undefined, undefined, subject.isDaemonOwner, subject.canApprovePersistentFullAccess);
         if (!updated.ok) {
             return {
                 error: updated.error,
-                code: updated.code ?? (/不存在|无权限/.test(updated.error) ? 'NOT_FOUND' : 'INVALID_ARGS'),
+                code: updated.code ?? (/不存在/.test(updated.error) ? 'NOT_FOUND'
+                    : /无权限|只有 daemon-owner|不能批准/.test(updated.error) ? 'FORBIDDEN'
+                        : 'INVALID_ARGS'),
                 ...(updated.currentRevision ? { data: { currentRevision: updated.currentRevision } } : {}),
             };
         }
@@ -2474,7 +2521,12 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
             return { error: `无效 baseagent: ${arg}，可选: ${valid.join(' / ')}`, code: 'INVALID_VALUE' };
         }
         const previousBaseagent = evolagent.baseagent;
-        evolagent.setActiveBaseagent(arg);
+        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,
@@ -2890,23 +2942,31 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             if (!a.aid)
                 return { error: '缺少 aid', code: 'INVALID_ARGS' };
             const hooks = globalThis.__evolcore_reloadHooks;
-            if (!hooks)
+            if (!this.agentApplicationService && !hooks)
                 return { error: 'Reload hooks 未初始化', code: 'INTERNAL' };
             try {
                 if (action === 'stop') {
-                    if (!this.agentRegistry?.stopAgent)
-                        return { error: 'stopAgent 不可用', code: 'INTERNAL' };
-                    await this.agentRegistry.stopAgent(a.aid, hooks);
+                    const result = this.agentApplicationService
+                        ? await this.agentApplicationService.stop(a.aid)
+                        : this.agentRegistry?.stopAgent
+                            ? await this.agentRegistry.stopAgent(a.aid, hooks).then(() => ({ ok: true, aid: a.aid }))
+                            : { ok: false, error: 'stopAgent 不可用', code: 'INTERNAL' };
+                    if (!result.ok)
+                        return { error: result.error, code: result.code || 'INTERNAL' };
                     this.eventBus.publish({ type: 'agent:stopped', aid: a.aid, timestamp: Date.now() });
                     // 中断该 agent 正在执行的大模型调用
-                    const handle = this.agentRegistry.get(a.aid);
+                    const handle = this.agentRegistry?.get(a.aid);
                     if (handle)
                         this.messageQueue.interruptByAgent(handle.name);
                 }
                 else {
-                    if (!this.agentRegistry?.startAgent)
-                        return { error: 'startAgent 不可用', code: 'INTERNAL' };
-                    await this.agentRegistry.startAgent(a.aid, hooks);
+                    const result = this.agentApplicationService
+                        ? await this.agentApplicationService.start(a.aid)
+                        : this.agentRegistry?.startAgent
+                            ? await this.agentRegistry.startAgent(a.aid, hooks).then(() => ({ ok: true, aid: a.aid }))
+                            : { ok: false, error: 'startAgent 不可用', code: 'INTERNAL' };
+                    if (!result.ok)
+                        return { error: result.error, code: result.code || 'INTERNAL' };
                     this.eventBus.publish({ type: 'agent:started', aid: a.aid, timestamp: Date.now() });
                 }
                 return { data: { aid: a.aid, action } };
@@ -2929,7 +2989,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 }
             }
         }
-        return await execAgentAction(action, a, userId ?? '', this.eventBus);
+        return await execAgentAction(action, a, userId ?? '', this.eventBus, this.agentApplicationService);
     }
     // ── 关系级 /trigger（不走 owners；复用 isAdmin + scoped 逻辑，D4 直调底层） ──
     if (cmdBase === '/trigger') {
@@ -2979,9 +3039,15 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 triggerThread,
                 baseagent: args.baseagent,
             };
-            const r = await this.registerTriggerFromParsed(parsed, channel, channelId, userId ?? '', undefined, this.resolveMenuChatType(channel, channelId, explicitChatType), undefined, isAdmin);
-            if (!r.ok)
-                return { error: r.error, code: /已存在|exists|重复/.test(r.error) ? 'CONFLICT' : 'INVALID_ARGS' };
+            const r = await this.registerTriggerFromParsed(parsed, channel, channelId, userId ?? '', undefined, this.resolveMenuChatType(channel, channelId, explicitChatType), undefined, isAdmin, subject.isDaemonOwner, subject.canApprovePersistentFullAccess);
+            if (!r.ok) {
+                const code = /已存在|exists|重复/.test(r.error)
+                    ? 'CONFLICT'
+                    : /不能批准|只有 daemon-owner|无权限/.test(r.error)
+                        ? 'FORBIDDEN'
+                        : 'INVALID_ARGS';
+                return { error: r.error, code };
+            }
             return { data: { id: r.trigger.id, name: r.trigger.name, nextFireAt: r.trigger.nextFireAt } };
         }
         if (action === 'cancel') {
@@ -3006,7 +3072,35 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             const trigger = this.findTriggerDefinition(triggerScheduler, nameOrId, userId ?? '', channel, isAdmin);
             if (!trigger)
                 return { error: '触发器不存在或无权限', code: 'NOT_FOUND' };
+            if (action === 'enable' && trigger.execution.permissionMode === 'fullaccess') {
+                if (!isFullAccessEnabled())
+                    return { error: 'fullaccess 功能未启用', code: 'NOT_SUPPORTED' };
+                if (!subject.isDaemonOwner)
+                    return { error: '只有 daemon-owner 可以启用 fullaccess Trigger', code: 'FORBIDDEN' };
+                if (subject.canApprovePersistentFullAccess === false) {
+                    return { error: '当前认证通道不能批准持久 fullaccess Trigger', code: 'FORBIDDEN' };
+                }
+                const authorizedBy = subject.principalId ?? userId;
+                if (!authorizedBy)
+                    return { error: '无法确认 fullaccess Trigger 的批准者', code: 'FORBIDDEN' };
+                // Enabling is itself a persistent fullaccess configuration action. Keep
+                // the canonical owner provenance on definitions created before this
+                // field existed, or after an owner explicitly re-enables the Trigger.
+                triggerScheduler.update(trigger.id, { ...trigger, authorizedBy });
+            }
             const updated = triggerScheduler.setEnabled(trigger.id, action === 'enable');
+            if (action === 'enable' && updated.execution.permissionMode === 'fullaccess') {
+                auditFullAccessEvent({
+                    event: 'fullaccess.trigger.configured',
+                    source: 'trigger',
+                    actorId: userId,
+                    processRole: subject.isDaemonOwner ? 'daemon-owner' : 'none',
+                    agentAid: updated.agentAid,
+                    triggerId: updated.id,
+                    authorizedBy: updated.authorizedBy,
+                    reason: 'fullaccess Trigger enabled',
+                });
+            }
             return { data: { id: updated.id, enabled: updated.enabled } };
         }
         if (action === 'delete') {
@@ -3021,6 +3115,18 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             if (trigger.enabled)
                 return { error: '请先禁用触发器再删除', code: 'INVALID_STATE' };
             const deleted = triggerScheduler.delete(trigger.id);
+            if (deleted.execution.permissionMode === 'fullaccess') {
+                auditFullAccessEvent({
+                    event: 'fullaccess.trigger.deescalated',
+                    source: 'trigger',
+                    actorId: userId,
+                    processRole: subject.isDaemonOwner ? 'daemon-owner' : 'none',
+                    agentAid: deleted.agentAid,
+                    triggerId: deleted.id,
+                    authorizedBy: deleted.authorizedBy,
+                    reason: 'fullaccess Trigger deleted',
+                });
+            }
             return { data: { id: deleted.id, deleted: true } };
         }
         if (action === 'run' || action === 'test') {
@@ -3124,72 +3230,146 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 return { error: `当前 Agent (${agent.name}) 不支持按轮次分叉`, code: 'NOT_SUPPORTED' };
             }
             const sourceKey = this.getQueueKey(source, channel, channelId);
-            const isBusy = !!source.processingState
+            const sourceIsBusy = (current, currentAgent) => !!current.processingState
+                || !!current.metadata?.turnState?.active
                 || this.messageQueue.isProcessing?.(sourceKey)
-                || this.messageQueue.getQueueLength?.(sourceKey) > 0
-                || agent.hasActiveStream(sourceKey);
-            if (isBusy)
+                || (this.messageQueue.getQueueLength?.(sourceKey) ?? 0) > 0
+                || currentAgent.hasActiveStream(sourceKey)
+                || (this.processor?.isPauseRequested?.(sourceKey) ?? false);
+            if (!source.threadId && sourceIsBusy(source, agent)) {
                 return { error: '来源会话正在处理消息，请完成后重试', code: 'BUSY' };
+            }
             const targetKey = JSON.stringify([source.channelType || source.channel, source.selfAID || '', channelId, targetThreadId]);
             if (topicForkTargetsInFlight.has(targetKey))
                 return { error: '目标话题正在创建', code: 'CONFLICT' };
             topicForkTargetsInFlight.add(targetKey);
-            const releaseLock = this.messageQueue.acquireLock?.(sourceKey) ?? (() => { });
             try {
-                if (this.messageQueue.isProcessing?.(sourceKey) || agent.hasActiveStream(sourceKey)) {
-                    return { error: '来源会话正在处理消息，请完成后重试', code: 'BUSY' };
-                }
-                const messages = await agent.getSessionMessages(source.agentSessionId, source.projectPath);
-                const turns = buildSessionTurnList(messages);
-                const forkTurn = turns.find((turn) => turn.assistantUuid === sourceAssistantMessageId);
-                if (!forkTurn)
-                    return { error: '分叉点已失效，请刷新历史后重试', code: 'NOT_FOUND' };
-                const forkedAgentSessionId = await agent.forkSessionAt(source.agentSessionId, source.projectPath, sourceAssistantMessageId, name || undefined);
-                const topic = await this.sessionManager.createForkedThreadSession(source, forkedAgentSessionId, targetThreadId, {
-                    name: name || undefined,
-                    creatorPeerId: userId,
-                    sourceAssistantMessageId,
-                    sourceTurn: forkTurn.index,
-                    requestId,
-                });
-                await agent.updateSessionMetadata?.(forkedAgentSessionId, {
-                    evolcoreSessionId: topic.id,
-                    sourceSessionId: source.id,
-                    sourceAssistantMessageId,
-                    sourceTurn: forkTurn.index,
-                }).catch((error) => {
-                    logger.debug(`[MenuHandler] Topic fork metadata sync failed: ${error}`);
-                });
-                this.eventBus.publish({
-                    type: 'session:forked',
-                    sessionId: topic.id,
-                    sourceSessionId: source.id,
-                    name: topic.name,
-                    threadId: topic.threadId,
-                    sourceAssistantMessageId,
-                    sourceTurn: forkTurn.index,
-                });
-                return {
-                    data: {
-                        action: 'fork',
-                        success: true,
-                        topic: {
-                            ...buildSessionPayload(topic, topic.name || ''),
-                            threadId: topic.threadId,
-                            sourceSessionId: source.id,
-                            sourceThreadId: source.threadId || null,
-                            sourceAssistantMessageId,
-                            sourceTurn: forkTurn.index,
+                const executeFork = async (current, currentAgent) => {
+                    const messages = await currentAgent.getSessionMessages(current.agentSessionId, current.projectPath);
+                    const turns = buildSessionTurnList(messages);
+                    const forkTurn = turns.find((turn) => turn.assistantUuid === sourceAssistantMessageId);
+                    if (!forkTurn)
+                        return { error: '分叉点已失效，请刷新历史后重试', code: 'NOT_FOUND' };
+                    const forkedAgentSessionId = await currentAgent.forkSessionAt(current.agentSessionId, current.projectPath, sourceAssistantMessageId, name || undefined);
+                    const topic = await this.sessionManager.createForkedThreadSession(current, forkedAgentSessionId, targetThreadId, {
+                        name: name || undefined,
+                        creatorPeerId: userId,
+                        sourceAssistantMessageId,
+                        sourceTurn: forkTurn.index,
+                        requestId,
+                    });
+                    await currentAgent.updateSessionMetadata?.(forkedAgentSessionId, {
+                        evolcoreSessionId: topic.id,
+                        sourceSessionId: current.id,
+                        sourceAssistantMessageId,
+                        sourceTurn: forkTurn.index,
+                    }).catch((error) => {
+                        logger.debug(`[MenuHandler] Topic fork metadata sync failed: ${error}`);
+                    });
+                    this.eventBus.publish({
+                        type: 'session:forked',
+                        sessionId: topic.id,
+                        sourceSessionId: current.id,
+                        name: topic.name,
+                        threadId: topic.threadId,
+                        sourceAssistantMessageId,
+                        sourceTurn: forkTurn.index,
+                    });
+                    return {
+                        data: {
+                            action: 'fork',
+                            success: true,
+                            topic: {
+                                ...buildSessionPayload(topic, topic.name || ''),
+                                threadId: topic.threadId,
+                                sourceSessionId: current.id,
+                                sourceThreadId: current.threadId || null,
+                                sourceAssistantMessageId,
+                                sourceTurn: forkTurn.index,
+                            },
                         },
-                    },
+                    };
                 };
+                const runForkUnderBarrier = async () => {
+                    if (source.threadId) {
+                        if (typeof this.messageQueue.withSessionBarrier !== 'function') {
+                            return { error: '当前运行环境不支持安全话题分叉', code: 'NOT_SUPPORTED' };
+                        }
+                        return this.messageQueue.withSessionBarrier(sourceKey, async (snapshot) => {
+                            const latest = await this.sessionManager.getSessionById?.(source.id);
+                            const current = latest;
+                            if (!current) {
+                                return { error: '来源会话不存在或归属已变化', code: 'NOT_FOUND' };
+                            }
+                            if (current.id !== source.id || (current.threadId || '') !== (source.threadId || '')) {
+                                return { error: '来源会话不存在或归属已变化', code: 'NOT_FOUND' };
+                            }
+                            if (!current.agentSessionId) {
+                                return { error: '来源会话暂无对话历史', code: 'INVALID_STATE' };
+                            }
+                            const currentAgent = this.getAgent(channel, current.baseagent);
+                            if (!currentAgent.capabilities?.forkAtTurn || !currentAgent.getSessionMessages || !currentAgent.forkSessionAt) {
+                                return { error: `当前 Agent (${currentAgent.name}) 不支持按轮次分叉`, code: 'NOT_SUPPORTED' };
+                            }
+                            const probes = {
+                                paused: () => this.processor?.isPauseRequested?.(current.id) ?? false,
+                                activeStream: () => currentAgent.hasActiveStream(current.id),
+                            };
+                            if (this.permissionGateway) {
+                                probes.pendingPermission = () => this.permissionGateway.getPendingRequests(current.id).length > 0;
+                            }
+                            if (this.interactionRouter) {
+                                probes.pendingInteraction = () => this.interactionRouter.getPending(current.id).length > 0;
+                            }
+                            const selfAid = current.selfAID || this.getOwningAgent?.(channel)?.aid;
+                            if (this.handoffRuntime) {
+                                probes.activeHandoff = () => {
+                                    if (!selfAid)
+                                        throw new Error('handoff activity owner unavailable');
+                                    return this.handoffRuntime.hasActiveSessionWork(selfAid, current.id);
+                                };
+                                probes.openHandoffTarget = () => {
+                                    if (!selfAid)
+                                        throw new Error('handoff activity owner unavailable');
+                                    return this.handoffRuntime.hasOpenTarget(selfAid, current.id);
+                                };
+                            }
+                            const activity = probeSessionActivity({
+                                prequeue: snapshot.prequeue,
+                                active: snapshot.active,
+                                queued: snapshot.queued,
+                                dispatching: snapshot.dispatching,
+                                processing: !!current.processingState,
+                                activeTurn: !!current.metadata?.turnState?.active,
+                            }, probes);
+                            if (activity === 'busy') {
+                                return { error: '来源会话正在处理消息，请完成后重试', code: 'BUSY' };
+                            }
+                            if (activity === 'unknown') {
+                                return { error: '无法可靠确认来源会话为空闲，请稍后重试', code: 'INVALID_STATE' };
+                            }
+                            return executeFork(current, currentAgent);
+                        });
+                    }
+                    // Main-session sources keep compatibility with older embeddings.
+                    const release = this.messageQueue.acquireLock?.(sourceKey) ?? (() => { });
+                    try {
+                        if (sourceIsBusy(source, agent)) {
+                            return { error: '来源会话正在处理消息，请完成后重试', code: 'BUSY' };
+                        }
+                        return await executeFork(source, agent);
+                    }
+                    finally {
+                        release();
+                    }
+                };
+                return await runForkUnderBarrier();
             }
             catch (error) {
                 logger.error('[MenuHandler] Topic history fork failed:', error);
                 return { error: error instanceof Error ? error.message : '话题分叉失败', code: 'EXEC_FAILED' };
             }
             finally {
-                releaseLock();
                 topicForkTargetsInFlight.delete(targetKey);
             }
         }
@@ -3694,6 +3874,7 @@ async function execMenuForSystemControl(payload, context) {
         conversationId: context.actorAid || SYSTEM_CONTROL_CHANNEL,
         processOwners: context.owners,
         fromControlChannel: true,
+        canApprovePersistentFullAccess: context.canApprovePersistentFullAccess,
     });
     const trustedIdentity = trustedSubject.identity;
     const cmd = name ? (menuCommandForName(name) ?? payload.cmd) : payload.cmd;
@@ -3820,20 +4001,37 @@ export async function execMenuForEcweb(payload, trusted) {
             data: authorizationDenialData('DAEMON_OWNER_REQUIRED'),
         });
     }
-    if (!trusted || (!trusted.localDirect && !trusted.actorAid)) {
+    if (!trusted || (!trusted.localDirect && trusted.authenticated !== true)) {
+        return menuFailure({ id, ...(name ? { name } : {}) }, {
+            code: 'PERMISSION_DENIED',
+            message: 'ECWeb operation requires an authenticated ECWeb connection',
+            data: { $schema_version: 1, kind: 'role_permission_denied', self: payload?.args?.self ?? null },
+        });
+    }
+    // A verified ECWeb connection has daemon-owner management authority. If the
+    // bearer token has no explicit owner provenance (the normal pairing path),
+    // use the first currently configured owner as the canonical management
+    // principal. This keeps audit/Trigger approval attribution deterministic
+    // without requiring owner-bound pairing metadata.
+    const userId = (trusted.actorAid && owners.includes(trusted.actorAid))
+        ? trusted.actorAid
+        : owners[0] ?? (trusted.localDirect ? 'local-direct' : undefined);
+    if (!userId) {
         return menuFailure({ id, ...(name ? { name } : {}) }, {
             code: 'PERMISSION_DENIED',
-            message: 'ECWeb operation requires a trusted local connection or authenticated actor',
+            message: 'ECWeb operation requires configured daemon owners',
             data: { $schema_version: 1, kind: 'role_permission_denied', self: payload?.args?.self ?? null },
         });
     }
-    // A verified local ECWeb connection acts through the configured human
-    // DaemonOwner identity; it is not an anonymous daemon service principal.
-    const userId = trusted.actorAid ?? (trusted.localDirect ? (owners[0] || 'local-direct') : undefined);
     return execMenuForSystemControl.call(this, payload, {
         source: 'ecweb',
-        actorAid: userId || 'local-direct',
+        actorAid: userId,
         localDirect: trusted.localDirect,
+        // The ECWeb server/IPC control-token gate authenticates this management
+        // request. All authenticated ECWeb connections are equally eligible to
+        // approve persistent fullaccess; actorAid is used only when it identifies
+        // a current configured owner.
+        canApprovePersistentFullAccess: true,
         owners,
     });
 }
@@ -3861,6 +4059,7 @@ export async function execMenuForControl(payload, peerId) {
         source: 'control',
         actorAid: peerId,
         localDirect: false,
+        canApprovePersistentFullAccess: false,
         owners,
     });
 }