evolcore 0.0.2 → 0.0.3

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

@@ -32,9 +32,11 @@ import { resolveRuntimePermissionMode, resolveRuntimeStringField, validateRuntim
 import { isManagementRole } from '../../config/builtin-roles.js';
 import { SYSTEM_CONTROL_CHANNEL } from '../system-channels.js';
 import { logger } from '../../utils/logger.js';
+import { shouldSuppressRealRestart } from '../../utils/restart-safety.js';
 import { dispatchToMentionMode } from '../../config/mention-mode.js';
 import { menuFailure, menuSuccess, normalizeMenuError, validateConfigWriteScope, validateMenuRequest } from './menu-protocol.js';
 import { roleMenuAction, roleMenuOperation, roleMenuOptions, roleMenuQuery, roleMenuUpdate, } from './role-menu.js';
+import { handleConnectMenu, connectMenuOperation } from './connect-menu.js';
 /**
  * 获取 baseagent CLI 的版本号（claude/gemini/codex）。
  * 失败返回 null（命令不存在或执行失败）。
@@ -885,7 +887,7 @@ function buildMenuIntent(verb, cmdBase, args, action, value, fromControlChannel
                 return intent('agent.delete', 'control', { action });
         }
         if (cmdBase === '/trigger') {
-            if (action === 'set')
+            if (action === 'create' || action === 'set')
                 return intent('trigger.create', 'relation', { action });
             if (action === 'show')
                 return intent('trigger.show', 'relation', { action });
@@ -1024,7 +1026,7 @@ async function authorizeRoleMenu(owner, params) {
         fromControlChannel: params.fromControlChannel,
         subject: params.subject,
     });
-    const operation = roleMenuOperation(params.kind, params.args, params.value);
+    const operation = params.operation ?? roleMenuOperation(params.kind, params.args, params.value);
     const denied = await authorizeMenuIntent.call(owner, {
         intent: { operation, scope: 'agent', source: params.source, args: { ...(params.args ?? {}) } },
         identity: params.identity,
@@ -1248,6 +1250,25 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
             throw authorized;
         return await roleMenuOptions(authorized.context, args);
     }
+    if (cmdBase0 === '/connect') {
+        const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, ...menuIdentityArgs(session));
+        const authorized = await authorizeRoleMenu(this, {
+            kind: 'options', args, operation: connectMenuOperation('options', args), identity, subject: authSubject, session, channel, channelId,
+            userId, fromControlChannel, source,
+        });
+        if ('error' in authorized)
+            throw authorized;
+        try {
+            const result = await handleConnectMenu({ type: 'menu.options', subtype: 'options', args }, authorized.context);
+            if ('error' in result)
+                throw result.error;
+            const opts = result.data?.options ?? [];
+            return opts.map((opt) => ({ value: opt.option, label: opt.label, desc: opt.description }));
+        }
+        catch (error) {
+            throw menuResultFailure(error);
+        }
+    }
     // ── /agent list（只读） ──
     // 控制 channel：验 evolcore.owners，返回全量；agent channel：放行但仅返回自身单条。
     if (cmd === '/agent') {
@@ -1590,6 +1611,28 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
             return menuResultFailure(error);
         }
     }
+    if (cmdBase === '/connect') {
+        const authorized = await authorizeRoleMenu(this, {
+            kind: 'query', args, operation: connectMenuOperation('query', args), identity, subject, session, channel, channelId,
+            userId, fromControlChannel, source,
+        });
+        if ('error' in authorized)
+            return authorized;
+        try {
+            const result = await handleConnectMenu({ type: 'menu.query', subtype: 'query', args }, authorized.context);
+            if (result.error) {
+                return {
+                    error: result.error.message,
+                    code: result.error.code,
+                    ...(result.error.data === undefined ? {} : { data: result.error.data }),
+                };
+            }
+            return { data: result.data };
+        }
+        catch (error) {
+            return menuResultFailure(error);
+        }
+    }
     const authDenied = await authorizeMenuIntent.call(this, {
         intent: buildMenuIntent('query', cmdBase, args, undefined, undefined, fromControlChannel),
         identity,
@@ -2088,6 +2131,28 @@ export async function execMenuUpdate(cmd, value, channel, channelId, userId, ove
             return menuResultFailure(error);
         }
     }
+    if (cmdBase === '/connect') {
+        const authorized = await authorizeRoleMenu(this, {
+            kind: 'update', args, value: arg, operation: connectMenuOperation('update', args, arg), identity, subject: authSubject, session, channel, channelId,
+            userId, fromControlChannel, source,
+        });
+        if ('error' in authorized)
+            return authorized;
+        try {
+            const result = await handleConnectMenu({ type: 'menu.update', subtype: 'update', args, value: arg }, authorized.context);
+            if (result.error) {
+                return {
+                    error: result.error.message,
+                    code: result.error.code,
+                    ...(result.error.data === undefined ? {} : { data: result.error.data }),
+                };
+            }
+            return { data: result.data };
+        }
+        catch (error) {
+            return menuResultFailure(error);
+        }
+    }
     const authDenied = await authorizeMenuIntent.call(this, {
         intent: buildMenuIntent('update', cmdBase, args, undefined, arg, fromControlChannel),
         identity,
@@ -2465,6 +2530,28 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             return menuResultFailure(error);
         }
     }
+    if (cmdBase === '/connect') {
+        const authorized = await authorizeRoleMenu(this, {
+            kind: 'action', args, operation: connectMenuOperation('action', args), identity: authIdentity, subject, session: authSession,
+            channel, channelId, userId, fromControlChannel, source,
+        });
+        if ('error' in authorized)
+            return authorized;
+        try {
+            const result = await handleConnectMenu({ type: 'menu.action', subtype: 'action', action, args }, authorized.context);
+            if (result.error) {
+                return {
+                    error: result.error.message,
+                    code: result.error.code,
+                    ...(result.error.data === undefined ? {} : { data: result.error.data }),
+                };
+            }
+            return { data: result.data };
+        }
+        catch (error) {
+            return menuResultFailure(error);
+        }
+    }
     if (cmdBase === '/agent' && !fromControlChannel && !args?.aid) {
         const selfAid = this.getOwningAgent?.(channel)?.aid;
         if (selfAid)
@@ -2618,7 +2705,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
         const triggerScheduler = this.getTriggerSchedulerForChannel?.(channel);
         if (!triggerScheduler)
             return { error: '触发器功能未启用', code: 'NOT_SUPPORTED' };
-        if (action === 'set') {
+        if (action === 'create' || action === 'set') {
             // args 结构化 → 直接组装 ParsedTriggerSet（绕过 parseTriggerSet 文本解析，无注入风险）
             if (!args?.scheduleType || (args.scheduleType !== 'once' && !args?.scheduleValue) || !args?.prompt) {
                 return { error: '缺少必填参数：scheduleType / scheduleValue / prompt', code: 'INVALID_ARGS' };
@@ -2652,6 +2739,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 effort: args.effort,
                 permissionMode: args.permissionMode,
                 triggerThread,
+                baseagent: args.baseagent,
             };
             const r = await this.registerTriggerFromParsed(parsed, channel, channelId, userId ?? '', undefined, this.resolveMenuChatType(channel, channelId, explicitChatType), undefined, isAdmin);
             if (!r.ok)
@@ -3020,18 +3108,26 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             return { error: '操作需要 owner 权限', code: 'FORBIDDEN' };
         }
         if (action === 'restart') {
-            const restartInfo = { channel, channelId, timestamp: Date.now() };
-            const dataDir = resolvePaths().dataDir;
-            fs.mkdirSync(dataDir, { recursive: true });
-            fs.writeFileSync(path.join(dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
-            const { spawn } = await import('child_process');
-            spawn('node', [path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
-                detached: true,
-                stdio: 'ignore',
-                env: { ...process.env, EVOLCORE_HOME: resolvePaths().root }
-            }).unref();
+            const suppressRealRestart = shouldSuppressRealRestart();
+            if (!suppressRealRestart) {
+                const restartInfo = { channel, channelId, timestamp: Date.now() };
+                const dataDir = resolvePaths().dataDir;
+                fs.mkdirSync(dataDir, { recursive: true });
+                fs.writeFileSync(path.join(dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
+                const { spawn } = await import('child_process');
+                spawn('node', [path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
+                    detached: true,
+                    stdio: 'ignore',
+                    env: { ...process.env, EVOLCORE_HOME: resolvePaths().root }
+                }).unref();
+            }
+            else {
+                logger.info('[System] Suppressed real menu restart in test runtime');
+            }
             this.eventBus.publish({ type: 'system:restart', channel, channelId });
-            setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 1000);
+            if (!suppressRealRestart) {
+                setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 1000);
+            }
             return { data: { action: 'restart', success: true } };
         }
         if (action === 'check') {
@@ -3239,7 +3335,8 @@ async function execMenuForSystemControl(payload, context) {
     }
     const isProcessLevel = isProcessLevelMenu(name, payload?.cmd);
     const isRoleRequest = name === 'role' || payload?.cmd === '/role';
-    const requiresAgentTarget = isRoleRequest || [
+    const isConnectRequest = name === 'connect' || payload?.cmd === '/connect';
+    const requiresAgentTarget = isRoleRequest || isConnectRequest || [
         'observable', 'baseagent', 'model', 'effort', 'trigger', 'capability',
     ].includes(name)
         || ['/observable', '/baseagent', '/model', '/effort', '/trigger', '/capability'].includes(payload?.cmd);
@@ -3342,7 +3439,8 @@ export async function execMenuForControl(payload, peerId) {
         return menuFailure({ id, ...(name ? { name } : {}) }, validationError);
     const owners = loadDaemonConfig().owners ?? [];
     const isRoleRequest = name === 'role' || payload?.cmd === '/role';
-    if (!isRoleRequest && !isProcessLevelOwner(peerId, owners)) {
+    const isConnectRequest = name === 'connect' || payload?.cmd === '/connect';
+    if (!isRoleRequest && !isConnectRequest && !isProcessLevelOwner(peerId, owners)) {
         return menuFailure({ id, ...(name ? { name } : {}) }, { code: 'ROLE_ACCESS_DENIED', message: '控制 channel 操作需要 owner 权限' });
     }
     return execMenuForSystemControl.call(this, payload, {

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

@@ -3,8 +3,8 @@ import path from 'path';
 import crypto from 'crypto';
 import { ConfigTarget, read, resolveEffectiveWithSources, write } from '../../config/config-manager.js';
 import { getBuiltinRolesConfig, getRoleDefinition, isValidUserRoleName, readRolesConfig, } from '../../config/roles.js';
-import { BUILTIN_USER_ROLES, MANAGEMENT_ROLES, isManagementRole } from '../../config/builtin-roles.js';
-import { checkRoleAccess, isStaticAgentAdmin, isStaticAgentOwner, resolvePeerRoleDetail } from '../../config/peer-role-resolver.js';
+import { BUILTIN_USER_ROLES, MANAGEMENT_ROLES, expectedRoleRank, isManagementRole } from '../../config/builtin-roles.js';
+import { checkRoleAccess, isStaticAgentOwner, resolvePeerRoleDetail } from '../../config/peer-role-resolver.js';
 import { relationFieldWriteOperation, resolveRoleFieldPermission, } from '../../config/config-field-policy.js';
 import { evaluateRoleOperationCapability } from '../auth/operation-authorizer.js';
 import { listOperations } from '../auth/operation-catalog.js';
@@ -55,8 +55,10 @@ export function roleMenuOperation(kind, args, value) {
     }
     if (kind === 'action')
         return 'role.policy.write';
-    if (args?.resource !== 'assignment')
+    if (args?.resource !== 'assignment' && args?.resource !== 'admin')
         return 'role.policy.write';
+    if (args?.resource === 'admin')
+        return 'role.assign';
     try {
         return JSON.parse(value ?? '') === null ? 'role.revoke' : 'role.assign';
     }
@@ -168,9 +170,11 @@ export async function roleMenuUpdate(context, args, rawValue) {
             result = updateDefinition(context.self, args, value);
         }
         else if (resource === 'defaultRoles')
-            result = updateDefaultRoles(context.self, args, value);
+            result = updateDefaultRoles(context, args, value);
         else if (resource === 'assignment')
             result = await updateAssignment(context, args, value);
+        else if (resource === 'admin')
+            result = await updateAdminAssignment(context, args, value);
         else
             throw roleError('NOT_SUPPORTED', 'The requested Role resource is not supported', context.self, { resource: resource || null });
         auditMutation(context, args, before, result, resource === 'defaultRoles' ? 'default-update' : resource === 'assignment' ? 'assignment' : 'update');
@@ -260,6 +264,8 @@ function auditMutation(context, args, before, result, operation) {
     const afterRelation = relationFile ? afterFiles[relationFile] : undefined;
     const roleId = (stringArg(args?.roleId) || undefined)
         ?? result?.roleId
+        ?? result?.assignment?.explicitRole
+        ?? result?.assignment?.explicitDefaultRole
         ?? (isObject(afterRelation) && typeof afterRelation.role === 'string' ? afterRelation.role : undefined)
         ?? (isObject(beforeRelation) && typeof beforeRelation.role === 'string' ? beforeRelation.role : undefined);
     const primaryFile = before.relation
@@ -300,7 +306,7 @@ export function recoverAllRoleMutationsSync() {
     if (!fs.existsSync(agentsDir))
         return;
     for (const entry of fs.readdirSync(agentsDir, { withFileTypes: true })) {
-        if (!entry.isDirectory())
+        if (!entry.isDirectory() || !isValidAid(entry.name))
             continue;
         if (!fs.existsSync(roleJournalPath(entry.name)))
             continue;
@@ -447,7 +453,8 @@ function updateDefinition(self, args, value) {
         ...(args?.remove ? { removed: normalizeRemove(args.remove) } : {}),
     };
 }
-function updateDefaultRoles(self, args, value) {
+function updateDefaultRoles(context, args, value) {
+    const self = context.self;
     if (!isObject(value))
         throw invalidJsonType(self, 'defaultRoles', 'object');
     assertOnlyKeys(value, ['private', 'group'], 'defaultRoles', self);
@@ -460,6 +467,13 @@ function updateDefaultRoles(self, args, value) {
     };
     assertPolicyRevision(self, args);
     const registry = readRoleRegistry(self);
+    const changesAdminDefault = ['private', 'group'].some(scene => registry.defaultRoles[scene] !== nextDefaults[scene]
+        && (registry.defaultRoles[scene] === 'admin' || nextDefaults[scene] === 'admin'));
+    if (context.actorRole !== 'owner' && changesAdminDefault) {
+        throw roleError('NOT_ALLOWED', 'Only an owner can set or replace an admin default role', self, {
+            kind: 'admin_owner_only',
+        });
+    }
     const nextRegistry = { ...registry, defaultRoles: nextDefaults };
     const changed = stableStringify(registry) !== stableStringify(nextRegistry);
     if (changed)
@@ -484,30 +498,79 @@ async function updateAssignment(context, args, value) {
     if (roleId !== null)
         target = await validateTargetExists(context, target);
     const targetAid = target.kind === 'private' ? target.peerAid : null;
-    if (targetAid && (isStaticAgentOwner(self, targetAid) || isStaticAgentAdmin(self, targetAid))) {
-        throw roleError('NOT_ALLOWED', 'Static Agent owner/admin assignments cannot be changed through relations', self, {
-            kind: 'protected_management_assignment',
+    if (targetAid && isStaticAgentOwner(self, targetAid)) {
+        throw roleError('NOT_ALLOWED', 'Owner assignments cannot be changed through relations', self, {
+            kind: 'owner_protected',
             targetAid,
         });
     }
     const current = readRelation(target.peerKey, self);
+    if (context.actorRole !== 'owner' && (roleId === 'admin' || current?.config.role === 'admin')) {
+        throw roleError('NOT_ALLOWED', 'Only an owner can grant or revoke admin', self, {
+            kind: 'admin_owner_only',
+            target: target.peerKey,
+        });
+    }
     assertRelationRevision(self, args, current?.revision ?? null, target.peerKey);
-    if (!current && roleId === null) {
+    if (!current && roleId === null)
         return assignmentResponse(self, target, null, false, null);
-    }
     const relation = clone(current?.config ?? { $schema_version: currentVersion('relation-config') });
-    relation.targetKind = target.kind === 'private' ? 'private' : 'group';
+    relation.targetKind = target.kind;
     if (roleId === null)
         delete relation.role;
     else
         relation.role = roleId;
-    const normalized = normalizeRelationForScene(relation, target.kind === 'private' ? 'private' : 'group');
+    const normalized = normalizeRelationForScene(relation, target.kind);
     const changed = stableStringify(current?.config ?? null) !== stableStringify(normalized);
     if (changed)
         write(ConfigTarget.Relation, normalized, { self, peerKey: target.peerKey });
     const nextRevision = changed ? revision(normalized) : current?.revision ?? null;
     return assignmentResponse(self, target, normalized, changed, nextRevision);
 }
+async function updateAdminAssignment(context, args, value) {
+    const self = context.self;
+    if (context.actorRole !== 'owner') {
+        throw roleError('NOT_ALLOWED', 'Only an owner can grant or revoke admin', self, { kind: 'admin_owner_only' });
+    }
+    let target = normalizeTarget(args?.target, self);
+    if (target.kind !== 'private')
+        throw invalidTargetValue(self, 'target.kind');
+    if (isStaticAgentOwner(self, target.peerAid)) {
+        throw roleError('NOT_ALLOWED', 'Owner assignments cannot be changed through contact admin', self, { kind: 'owner_protected' });
+    }
+    const enabled = value === true || value === 'grant'
+        ? true
+        : value === false || value === null || value === 'revoke'
+            ? false
+            : undefined;
+    if (enabled === undefined)
+        throw invalidJsonType(self, 'admin', 'boolean, grant, revoke, or null');
+    if (enabled)
+        target = await validateTargetExists(context, target);
+    const current = readRelation(target.peerKey, self);
+    assertRelationRevision(self, args, current?.revision ?? null, target.peerKey);
+    if (!current && !enabled) {
+        return {
+            $schema_version: ROLE_MENU_SCHEMA_VERSION, self, resource: 'admin', target,
+            changed: false, relationRevision: null, admin: false,
+        };
+    }
+    const relation = clone(current?.config ?? { $schema_version: currentVersion('relation-config') });
+    relation.targetKind = 'private';
+    if (enabled)
+        relation.role = 'admin';
+    else if (relation.role === 'admin')
+        delete relation.role;
+    const normalized = normalizeRelationForScene(relation, 'private');
+    const changed = stableStringify(current?.config ?? null) !== stableStringify(normalized);
+    if (changed)
+        write(ConfigTarget.Relation, normalized, { self, peerKey: target.peerKey });
+    const nextRevision = changed ? revision(normalized) : current?.revision ?? null;
+    return {
+        $schema_version: ROLE_MENU_SCHEMA_VERSION, self, resource: 'admin', target,
+        changed, relationRevision: nextRevision, admin: normalized.role === 'admin',
+    };
+}
 function createRole(self, args) {
     const roleId = requiredRoleId(args, self);
     if (!isValidUserRoleName(roleId)) {
@@ -520,6 +583,10 @@ function createRole(self, args) {
     if (!isObject(args?.definition))
         throw validationFailed(self, roleId, [{ field: 'definition', code: 'INVALID_TYPE', message: 'definition must be an object' }]);
     const definition = clone(args.definition);
+    if (definition.rank !== undefined && definition.rank !== expectedRoleRank(roleId)) {
+        throw validationFailed(self, roleId, [{ field: 'definition.rank', code: 'INVALID_VALUE', message: 'custom role rank is fixed at 500' }]);
+    }
+    definition.rank = expectedRoleRank(roleId);
     const errors = validateRoleConfig(definition);
     if (errors.length)
         throw validationFailed(self, roleId, errors);
@@ -596,6 +663,11 @@ async function deleteRole(context, args) {
     const replacement = hasReplacement
         ? validateAssignableRole(args?.replacementRoleId, self, 'replacementRoleId')
         : undefined;
+    if (replacement === 'admin' && context.actorRole !== 'owner') {
+        throw roleError('NOT_ALLOWED', 'Only an owner can replace role assignments with admin', self, {
+            kind: 'admin_owner_only',
+        });
+    }
     if (replacement === roleId) {
         throw validationFailed(self, roleId, [{ field: 'replacementRoleId', code: 'INVALID_VALUE', message: 'replacementRoleId must differ from roleId' }]);
     }
@@ -646,11 +718,13 @@ async function assignmentInventory(context, args, policyRevision) {
     if (args?.roleId !== undefined && !roleFilter)
         throw validationFailed(self, undefined, [{ field: 'roleId', code: 'INVALID_VALUE', message: 'roleId must be a non-empty string' }]);
     const items = [];
-    const defaults = effectiveDefaultRoles(self);
-    for (const scene of ['private', 'group']) {
-        const roleId = defaults[scene];
-        if (roleId && (!roleFilter || roleFilter === roleId)) {
-            items.push({ target: { kind: 'default', scene }, roleId, relationRevision: null });
+    if (args?.includeDefaults !== false) {
+        const defaults = effectiveDefaultRoles(self);
+        for (const scene of ['private', 'group']) {
+            const roleId = defaults[scene];
+            if (roleId && (!roleFilter || roleFilter === roleId)) {
+                items.push({ target: { kind: 'default', scene }, roleId, relationRevision: null });
+            }
         }
     }
     let complete = true;
@@ -930,11 +1004,13 @@ function normalizeTarget(value, self) {
         const groupId = stringArg(value.groupId);
         if (!groupId)
             throw invalidTarget(self, 'target.groupId');
+        if (!isValidAid(groupId) && !isExplicitGroupId(groupId))
+            throw invalidTargetValue(self, 'target.groupId');
         return { kind, groupId, peerKey: formatPeerKey('aun', groupId) };
     }
     throw validationFailed(self, undefined, [{ field: 'target.kind', code: 'INVALID_VALUE', message: 'target.kind must be private or group' }]);
 }
-function targetRoleView(self, target, relation) {
+function targetRoleView(self, target, relation = null) {
     if (target.kind === 'private') {
         const explicitRole = relation?.role ?? null;
         const detail = resolvePeerRoleDetail({
@@ -1086,7 +1162,15 @@ function policyDocument(agent) {
 function roleMeta(self, roleId) {
     if (isManagementRole(roleId)) {
         const overridden = fs.existsSync(agentRoleConfig(self, roleId));
-        return { origin: 'builtin', overridden, kind: 'management', assignable: false, editable: true, deletable: false, resettable: true };
+        return {
+            origin: 'builtin',
+            overridden,
+            kind: 'management',
+            assignable: roleId === 'admin',
+            editable: true,
+            deletable: false,
+            resettable: true,
+        };
     }
     const builtin = Object.prototype.hasOwnProperty.call(getBuiltinRolesConfig().roles, roleId);
     const overridden = fs.existsSync(agentRoleConfig(self, roleId));
@@ -1131,7 +1215,7 @@ function parseUpdateValue(rawValue, self) {
 function validateAssignableRole(value, self, field) {
     if (value === null)
         return null;
-    if (typeof value !== 'string' || !value.trim() || isManagementRole(value) || !getRoleDefinition(value, self)) {
+    if (typeof value !== 'string' || !value.trim() || value === 'owner' || !getRoleDefinition(value, self)) {
         throw validationFailed(self, undefined, [{ field, code: 'INVALID_VALUE', message: 'value must be null or an existing assignable user role' }]);
     }
     return value;
@@ -1288,11 +1372,15 @@ function validateRoleDomainTransactionChanges(self, registry, changes) {
     for (const change of changes) {
         if (!change.after || !change.file.endsWith('.json') || change.file.endsWith('index.json'))
             continue;
-        if (!change.file.includes(`${path.sep}relations${path.sep}`)) {
-            const roleSchema = loadSchema('role-config');
-            const value = JSON.parse(change.after);
-            if (!roleSchema.validate(value))
-                throw validationFailed(self, undefined, [{ field: 'role', code: 'SCHEMA_INVALID', message: 'invalid role definition' }]);
+        const isRelation = change.file.includes(`${path.sep}relations${path.sep}`);
+        const schema = loadSchema(isRelation ? 'relation-config' : 'role-config');
+        const value = JSON.parse(change.after);
+        if (!schema.validate(value)) {
+            throw validationFailed(self, undefined, [{
+                    field: isRelation ? 'relation' : 'role',
+                    code: 'SCHEMA_INVALID',
+                    message: isRelation ? 'invalid relation config' : 'invalid role definition',
+                }]);
         }
     }
 }
@@ -1337,12 +1425,23 @@ function removeJournalFiles(journalFile) {
 }
 function validateJournal(self, journal) {
     const root = path.resolve(agentDir(self));
-    if (journal.$schema_version !== 1 || journal.self !== self || !Array.isArray(journal.changes))
+    if (journal.$schema_version !== 1 || journal.self !== self
+        || (journal.state !== 'prepared' && journal.state !== 'committed')
+        || !Array.isArray(journal.changes))
         throw new Error('Invalid Role mutation journal');
+    const seen = new Set();
     for (const change of journal.changes) {
+        if (!change || typeof change !== 'object' || typeof change.file !== 'string'
+            || (change.before !== null && typeof change.before !== 'string')
+            || (change.after !== null && typeof change.after !== 'string')) {
+            throw new Error('Role mutation journal contains an invalid change');
+        }
         const file = path.resolve(change.file);
-        if (file !== root && !file.startsWith(root + path.sep))
+        if (file === root || !file.startsWith(root + path.sep))
             throw new Error('Role mutation journal contains an unsafe path');
+        if (seen.has(file))
+            throw new Error('Role mutation journal contains duplicate file changes');
+        seen.add(file);
     }
 }
 function applyFileContent(file, content) {
@@ -1498,7 +1597,7 @@ function operationLabel(id) {
     return labels[id] ?? title(id);
 }
 function validRoleOrNull(value, self) {
-    return typeof value === 'string' && !isManagementRole(value) && getRoleDefinition(value, self) ? value : null;
+    return typeof value === 'string' && value !== 'owner' && getRoleDefinition(value, self) ? value : null;
 }
 function getNested(value, field) {
     let cursor = value;

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

@@ -3,6 +3,7 @@ import { getCodexEfforts } from '../../agents/codex-runner.js';
 import { buildEnvelope } from '../message/message-utils.js';
 import { resolvePaths, getPackageRoot } from '../../paths.js';
 import { logger } from '../../utils/logger.js';
+import { shouldSuppressRealRestart } from '../../utils/restart-safety.js';
 import crypto from 'crypto';
 import path from 'path';
 import fs from 'fs';
@@ -186,7 +187,7 @@ function triggerOperationForSlash(content) {
         return 'trigger.show';
     if (subcommand === 'history')
         return 'trigger.history';
-    if (subcommand === 'set')
+    if (subcommand === 'create' || subcommand === 'set')
         return 'trigger.create';
     if (subcommand === 'update')
         return 'trigger.update';
@@ -351,7 +352,7 @@ async function getGitWorkingDirInfo(projectPath) {
         return null; // git 命令失败时静默返回 null
     }
 }
-export async function handleSlashCommand(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, overrideSubject) {
+export async function handleSlashCommand(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, overrideSubject, replyContext) {
     // 卡片回调的 chatType 不可靠（飞书 bot 单聊 chatId 也是 oc_ 前缀），
     // 不应覆盖 session 中已有的正确值
     if (source === 'card-trigger')
@@ -1628,11 +1629,12 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     }
     if (normalizedContent === '/activity' || normalizedContent.startsWith('/activity ')) {
         const activityArg = normalizedContent.slice(9).trim();
+        const activitySession = await getExistingSessionForCommand();
         // 带参（写操作）需 admin+；无参查询对所有人开放（owner 门在具体切换点还有一道）
         if (activityArg && !isAdmin)
             return { kind: 'command.error', text: '❌ 无权限：此命令仅限管理员使用' };
         // proactive 模式下流式输出全部静默，activity 配置无意义
-        if (getEffectiveChatmode(activeSession) === 'proactive') {
+        if (getEffectiveChatmode(activitySession) === 'proactive') {
             return { kind: 'command.error', text: '❌ 当前会话为 proactive 模式，不支持 activity 配置（流式输出已全部静默）' };
         }
         const modeMap = {
@@ -1655,7 +1657,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                     type: 'interaction',
                     id: `activity-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`,
                     channelId,
-                    sessionId: activeSession?.id || '',
+                    sessionId: activitySession?.id || '',
                     initiatorId: userId,
                     kind: {
                         kind: 'command-card',
@@ -1669,7 +1671,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                         })),
                     },
                 };
-                const replyCtx = activeSession ? this.getReplyContext(activeSession) : undefined;
+                const replyCtx = replyContext ?? (activitySession ? this.getReplyContext(activitySession) : undefined);
                 const cardResult = await this.sendCommandCard({ channel, channelId, interaction, replyCtx, canWrite: isOwner });
                 if (cardResult === null)
                     return null;
@@ -2370,6 +2372,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         });
         // 执行重启逻辑（共用于卡片回调和文本确认）
         const executeRestart = async () => {
+            const suppressRealRestart = shouldSuppressRealRestart();
             let replyContext;
             if (threadId) {
                 const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
@@ -2382,15 +2385,20 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 timestamp: Date.now(),
                 ...(replyContext?.replyToMessageId ? { rootId: replyContext.replyToMessageId } : {}),
             };
-            const dataDir = resolvePaths().dataDir;
-            fs.mkdirSync(dataDir, { recursive: true });
-            fs.writeFileSync(path.join(dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
-            const { spawn } = await import('child_process');
-            spawn('node', [path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
-                detached: true,
-                stdio: 'ignore',
-                env: { ...process.env, EVOLCORE_HOME: resolvePaths().root }
-            }).unref();
+            if (!suppressRealRestart) {
+                const dataDir = resolvePaths().dataDir;
+                fs.mkdirSync(dataDir, { recursive: true });
+                fs.writeFileSync(path.join(dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
+                const { spawn } = await import('child_process');
+                spawn('node', [path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
+                    detached: true,
+                    stdio: 'ignore',
+                    env: { ...process.env, EVOLCORE_HOME: resolvePaths().root }
+                }).unref();
+            }
+            else {
+                logger.info('[System] Suppressed real restart in test runtime');
+            }
             this.eventBus.publish({ type: 'system:restart', channel, channelId });
             // 先发送重启反馈消息，等待发送完成后再 kill 进程
             // 避免消息还没发出去进程就退出了
@@ -2416,10 +2424,12 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             // 发 SIGTERM 而非直接 process.exit(0)，让 index.ts 的 shutdown() 先
             // 正常关闭所有 channel（包括 Feishu WebSocket close frame），
             // 避免 Feishu 服务端因连接异常断开而重推未 ack 的消息给新进程。
-            setTimeout(() => {
-                logger.info('[System] Restarting by user command...');
-                process.kill(process.pid, 'SIGTERM');
-            }, 1000);
+            if (!suppressRealRestart) {
+                setTimeout(() => {
+                    logger.info('[System] Restarting by user command...');
+                    process.kill(process.pid, 'SIGTERM');
+                }, 1000);
+            }
             return true;
         };
         // 文本确认流程