evolcore 0.0.35 → 0.0.36

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

@@ -1,34 +1,37 @@
+import { parsePermissionApprovalDecision } from '../permission/approval-gateway.js';
 import { hasModelSwitcher, hasPermissionController } from '../../agents/runner-types.js';
 import { normalizeBaseagent } from '../../agents/baseagent.js';
 import { buildEnvelope, isDeliveryTargetForChannel } from '../message/message-utils.js';
 import { resolvePaths, getPackageRoot, daemonControlDir } from '../../paths.js';
 import { logger } from '../../utils/logger.js';
-import { shouldSuppressRealRestart } from '../../utils/restart-safety.js';
+import { shouldSuppressRealRestart, createRestartRequest, updateRestartRequest, removeRestartRequest } from '../../utils/restart-safety.js';
+import { RESTART_REQUEST_ID_ENV } from '../../product.js';
 import crypto from 'crypto';
 import path from 'path';
 import fs from 'fs';
 import { ensureFreshPackageVersionInfo, refreshManagedPackageVersions } from '../../utils/package-version-info.js';
-import { loadDaemonConfig } from '../../config-store.js';
 import { remoteAccessService } from '../auth/remote-access-store.js';
 import { read as cfgRead, resolveEffective, routeFieldPath, write as cfgWrite, } from '../../config/config-manager.js';
 import { execAgentAction } from './agent-control.js';
 import { handleMemorySlash, memoryHelpEntries } from './memory-slash.js';
 import { handleSkillSlash, skillHelpEntries } from './skill-slash.js';
 import { handleTopicSlash, topicHelpEntries, canUseTopicSlash } from './topic-slash.js';
-import { authorizeOperation, buildAuthSubject } from '../auth/auth-gateway.js';
+import { authorizeOperation, authorizeFreshOperation, buildAuthSubject } from '../auth/auth-gateway.js';
+import { getDaemonOwners, ownerResolver, refreshOwnershipForAuthorization, OWNERSHIP_CACHE_MAX_AGE_MS } from '../ownership/owner-resolver.js';
 import { authorizationNextStep, formatAuthorizationDenial } from '../auth/authorization-denial.js';
 import { resolvePermissionMode, writeScope } from '../model/config-scope.js';
 import { formatPeerKey } from '../relation/peer-identity.js';
+import { isMainSession, isTopicSession, isTopicThreadId, sessionTopicThreadId } from '../thread/topic-id.js';
 import { modelMatches, getCatalog, assertCatalogSelectable, resolveCatalogModel, CONFIGURABLE_EFFORTS, configurableEfforts } from '../model/model-catalog.js';
 import { formatModelCheck, runModelCheck } from '../model/model-diagnostics.js';
 import { constrainResolvedModelForRole, filterModelsForRole, validateModelSelectionForRole } from '../model/model-permission.js';
 import { resolveRuntimeStringField } from '../role/runtime-policy.js';
 import { displaySessionTitle } from '../session/session-title.js';
-import { chatmodeFieldForPeer, resolveChatModeForField } from '../message/peer-mode.js';
+import { chatmodeFieldForPeer, isPrivateChatmodeRoleLocked, resolveChatModeForField } from '../message/peer-mode.js';
 import { normalizePermissionMode as normalizePermissionModeContract, PUBLIC_PERMISSION_MODES } from '../permission/mode.js';
 import { isManagementRole } from '../../config/builtin-roles.js';
 import { isSystemControlChannel } from '../system-channels.js';
-import { launchMonitorAndConfirm, resolveMonitorLaunch, cleanupMonitorStage } from '../../utils/cross-platform.js';
+import { launchMonitorAndConfirm, resolveMonitorLaunch, cleanupMonitorStage, isProcessRunning } from '../../utils/cross-platform.js';
 import { scanInstances } from '../../utils/instance-registry.js';
 import { guardIdleCommand, guardGroupSlashCommand, guardKnownCommand, guardRoleCommand, guardThreadCommand, isRecognizedSlashCommand, normalizeSlashContent, probeSessionActivity, } from './slash-gate.js';
 import { MAX_AUN_ATTACHMENT_SIZE } from '../../aun/msg/upload.js';
@@ -60,13 +63,14 @@ function resolveSlashChatmodeTarget(params) {
     const field = slashChatmodeField(params.session, params.chatType);
     return {
         sel: { self, peerKey: formatPeerKey(channelType, peerId) },
+        role: params.role,
         field,
         fieldPath: `chatmode.${field}`,
     };
 }
 function readSlashChatmode(target) {
     try {
-        const mode = resolveChatModeForField({ ...target.sel, field: target.field });
+        const mode = resolveChatModeForField({ ...target.sel, role: target.role, field: target.field });
         return mode === 'interactive' || mode === 'proactive'
             ? mode
             : defaultSlashChatmode(target.field);
@@ -192,7 +196,7 @@ async function authorizeSlashIntent(params) {
     if (intent.scope === 'relation') {
         intent.args = buildSlashRelationIntentArgs({ args: intent.args, selfAid: subject.selfAid, peerKey: subject.peerKey ?? peerKey });
     }
-    const decision = await authorizeOperation({ source: 'slash', intent, subject });
+    const decision = await authorizeFreshOperation({ source: 'slash', intent, subject });
     if (!decision.allow) {
         const reasonCode = decision.command?.reasonCode;
         return {
@@ -260,7 +264,7 @@ async function canReadSlashModelList(params) {
         processOwners: isDaemonOwner && userId ? [userId] : [],
         fromControlChannel: false,
     });
-    const decision = await authorizeOperation({ source: 'slash', intent, subject, audit: false });
+    const decision = await authorizeFreshOperation({ source: 'slash', intent, subject, audit: false });
     return decision.allow;
 }
 function getAgentBusyInfo(handler, aid, excludeSessionKey) {
@@ -394,6 +398,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         chatType = undefined;
     // 解析身份（按实例名）
     const narrowedChatType = chatType === 'group' ? 'group' : chatType === 'private' ? 'private' : undefined;
+    await refreshOwnershipForAuthorization(selfAID ?? this.agentRegistry?.resolveByChannel(channel)?.aid ?? this.resolveSelfAID(channel), {
+        maxAgeMs: OWNERSHIP_CACHE_MAX_AGE_MS,
+    });
     const identityConversationId = narrowedChatType === 'group' ? channelId : userId;
     const resolvedIdentity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId, narrowedChatType, identityConversationId);
     const authSubject = overrideSubject ?? buildAuthSubject({
@@ -407,7 +414,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         chatType: narrowedChatType,
         conversationId: identityConversationId,
         identity: resolvedIdentity,
-        processOwners: loadDaemonConfig().owners ?? [],
+        processOwners: getDaemonOwners(),
         fromControlChannel: false,
     });
     const identity = authSubject.identity;
@@ -681,7 +688,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                     return { ok: false, reason: 'unknown' };
                 }
             }
-            if (!current || current.threadId)
+            if (!current || isTopicSession(current))
                 return { ok: false, reason: 'missing' };
             // Preserve the legacy main-session /compact exclusion. Topic commands
             // use the stronger barrier below; main sessions retain the historical
@@ -712,7 +719,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 logger.warn(`[CommandHandler] session snapshot read failed: ${error instanceof Error ? error.message : String(error)}`);
                 return { ok: false, reason: 'unknown' };
             }
-            if (!current || (current.threadId || undefined) !== expectedThreadId) {
+            // expectedThreadId 到这里一定是话题 id，用线上形态比较。
+            if (!current || sessionTopicThreadId(current) !== expectedThreadId) {
                 return { ok: false, reason: 'missing' };
             }
             const activity = probeBackendActivity(current, snapshot);
@@ -789,7 +797,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                     '',
                     '🔐 权限管理：',
                     ...(canReadPermission ? ['  /perm - 查看当前权限模式'] : []),
-                    ...(canAnswerPermission ? ['  /perm allow|always|deny - 审批权限请求'] : []),
+                    ...(canAnswerPermission ? ['  /perm <动作> - 审批权限请求（按授权卡选项）'] : []),
                 ] : []),
                 '',
                 '其他：',
@@ -832,7 +840,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                     '',
                     '🔐 权限管理：',
                     ...(canReadPermission ? ['  /perm - 查看当前权限模式'] : []),
-                    ...(canAnswerPermission ? ['  /perm allow|always|deny - 审批权限请求'] : []),
+                    ...(canAnswerPermission ? ['  /perm <动作> - 审批权限请求（按授权卡选项）'] : []),
                 ] : []),
                 ...(canUseFile ? [
                     '',
@@ -885,7 +893,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             '🔐 权限管理：',
             ...(canReadPermission ? ['  /perm - 查看当前权限模式'] : []),
             ...(canReadPermission ? ['  权限模式请通过角色策略编辑器修改'] : []),
-            ...(canAnswerPermission ? ['  /perm allow|always|deny - 审批权限请求'] : []),
+            ...(canAnswerPermission ? ['  /perm <动作> - 审批权限请求（按授权卡选项）'] : []),
             '',
             '🛠️ 运维：',
             '  /status - 显示会话状态',
@@ -1027,9 +1035,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (canReadPermission)
             cmds.push({ command: '/perm', description: '查看当前角色决定的权限模式', category: '权限管理', roles: [identity.role] });
         if (canAnswerPermission)
-            cmds.push({ command: '/perm', args: 'allow|always|deny', description: '审批权限请求', category: '权限管理', roles: [identity.role] });
+            cmds.push({ command: '/perm', args: '[requestId] <动作>', description: '审批权限请求（按授权卡选项，支持文件/目录 60 分钟）', category: '权限管理', roles: [identity.role] });
         // 记忆管理（紧跟权限管理）：能一键执行的都展开成无参数条目
-        const memoryOwnerForHelp = this.agentRegistry?.get?.(authSubject.selfAid ?? '')?.config?.owners?.[0];
+        const memoryOwnerForHelp = ownerResolver.primaryOwner(authSubject.selfAid ?? '');
         cmds.push(...memoryHelpEntries({
             chatType: 'private',
             role: identity.role,
@@ -1089,6 +1097,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const permissionDecisionLabels = {
             allow: '✓ 已授权（本次），继续执行……',
             always: '✓ 已授权（当前会话临时授权 30 分钟），继续执行……',
+            file_60m: '✓ 已授权（同文件 60 分钟），继续执行……',
+            directory_60m: '✓ 已授权（当前目录及子目录 60 分钟），继续执行……',
+            all_directories_60m: '✓ 已授权（当前会话所有普通目录 60 分钟），继续执行……',
             deny: '✓ 已拒绝',
         };
         // Explicit request IDs are globally unique and already bound to an exact
@@ -1096,11 +1107,11 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         // lookup so an owner can answer a handoff in an otherwise idle AUN chat.
         const explicitParts = args.split(/\s+/);
         if (explicitParts.length === 2
-            && (explicitParts[1] === 'allow' || explicitParts[1] === 'always' || explicitParts[1] === 'deny')) {
+            && parsePermissionApprovalDecision(explicitParts[1])) {
             if (!this.permissionGateway) {
                 return { kind: 'command.error', text: '❌ 权限审批未启用' };
             }
-            const decision = explicitParts[1];
+            const decision = parsePermissionApprovalDecision(explicitParts[1]);
             const resolved = this.permissionGateway.resolvePermissionByRequestId(explicitParts[0], decision, userId, channel);
             if (!resolved) {
                 return { kind: 'command.error', text: '❌ 请求不存在、无法验证审批人身份或审批资格已失效' };
@@ -1181,9 +1192,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         // /perm <mode> 不再修改配置；allow/always/deny 仍用于快捷审批。
         if (parts.length === 1) {
             const arg = parts[0];
-            // /perm allow|always|deny：快捷审批
-            if (arg === 'allow' || arg === 'always' || arg === 'deny') {
-                const authDenied = await authorizePermissionAnswer(arg);
+            // /perm <action>: approve the sole pending request with the offered action.
+            const decision = parsePermissionApprovalDecision(arg);
+            if (decision) {
+                const authDenied = await authorizePermissionAnswer(decision);
                 if (authDenied)
                     return authDenied;
                 if (!this.permissionGateway) {
@@ -1197,7 +1209,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                     return { kind: 'command.error', text: `❌ 当前有 ${pendingIds.length} 个待审批请求，请指定 requestId：\n${pendingIds.map((id) => `  /perm ${id} ${arg}`).join('\n')}` };
                 }
                 const requestId = pendingIds[0];
-                return resolvePermissionAnswer(requestId, arg);
+                return resolvePermissionAnswer(requestId, decision);
             }
             // /perm <mode>：提示改用角色策略编辑器。
             if (hasPermissionController(permAgent)) {
@@ -1211,9 +1223,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             if (PERMISSION_MODE_KEYS.includes(arg)) {
                 return { kind: 'command.error', text: '❌ permissionMode 只能通过角色策略编辑器修改' };
             }
-            return { kind: 'command.error', text: `❌ 未知参数: ${arg}\n用法: /perm 或 /perm allow|always|deny` };
+            return { kind: 'command.error', text: `❌ 未知参数: ${arg}\n用法: /perm [requestId] <动作>；动作以授权卡为准：allow|file_60m|directory_60m|all_directories_60m|always|deny` };
         }
-        return { kind: 'command.error', text: `❌ 未知参数: ${args}\n用法: /perm、/perm allow|always|deny 或 /perm <requestId> allow|always|deny` };
+        return { kind: 'command.error', text: `❌ 未知参数: ${args}\n用法: /perm [requestId] <动作>；动作以授权卡为准：allow|file_60m|directory_60m|all_directories_60m|always|deny` };
     }
     // /ask 命令：回答 AskUserQuestion / ExitPlanMode 的交互式问题
     if (normalizedContent.startsWith('/ask')) {
@@ -1327,8 +1339,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         }
         const currentSession = await getExistingSessionForCommand();
         const previousBaseagent = owningAgent.baseagent || this.parseDefaultBaseagent();
-        if (currentSession?.threadId) {
-            const rotation = await withIdleTopicBackend(currentSession.id, currentSession.threadId, async (current) => {
+        const currentTopicThreadId = sessionTopicThreadId(currentSession);
+        if (currentSession && currentTopicThreadId) {
+            const rotation = await withIdleTopicBackend(currentSession.id, currentTopicThreadId, async (current) => {
                 try {
                     owningAgent.setActiveBaseagent(args);
                 }
@@ -1338,7 +1351,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 try {
                     const result = await this.sessionManager.rotateTopicBackend({
                         sessionId: current.id,
-                        expectedThreadId: current.threadId,
+                        // withIdleTopicBackend 已校验 sessionTopicThreadId(current) === currentTopicThreadId
+                        expectedThreadId: currentTopicThreadId,
                         baseagent: args,
                     });
                     return { ok: true, result };
@@ -2286,6 +2300,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (arg === currentMode) {
             return { kind: 'command.result', text: `📋 当前会话模式已是 ${arg}` };
         }
+        if (arg === 'interactive' && isPrivateChatmodeRoleLocked(target.field, target.role)) {
+            return { kind: 'command.error', text: '❌ 私聊交互模式仅限 owner/admin，当前角色固定为 proactive' };
+        }
         // 仅在真正需要切换时才要求会话空闲
         if (chatmodeSession && threadId) {
             const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
@@ -2473,7 +2490,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (normalizedContent !== '/renew') {
             return { kind: 'system.error', text: '❌ /renew 不接受参数，请直接使用 /renew', subtype: 'session.renew.invalid_arguments', recoverable: true };
         }
-        if (!threadId) {
+        if (!isTopicThreadId(threadId)) {
             return { kind: 'system.error', text: '⚠️ /renew 仅支持话题会话', subtype: 'session.renew.unsupported', recoverable: true };
         }
         // Card callbacks use synthetic message IDs on several adapters. They are
@@ -2515,7 +2532,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                     logger.warn(`[CommandHandler] /renew strict session read failed: session=${renewSession.id}: ${error instanceof Error ? error.message : String(error)}`);
                     return { kind: 'unknown' };
                 }
-                if (!current || current.threadId !== threadId)
+                if (!current || sessionTopicThreadId(current) !== threadId)
                     return { kind: 'missing' };
                 let claim;
                 try {
@@ -2580,9 +2597,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 ? { kind: 'command.error', text: '⚠️ 当前会话状态未知，无法安全压缩，请稍后再试' }
                 : { kind: 'command.error', text: '❌ 当前没有活跃会话，无需压缩' };
         }
-        if (!session.threadId)
+        if (isMainSession(session))
             await interruptPausedSessionBeforeReplacement(session);
-        const outcome = await withIdleTopicBackend(session.id, session.threadId || undefined, async (session) => {
+        const outcome = await withIdleTopicBackend(session.id, sessionTopicThreadId(session), async (session) => {
             if (!session.agentSessionId) {
                 return { kind: 'command.error', text: '❌ 当前会话没有历史记录，无需压缩' };
             }
@@ -2711,7 +2728,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const sessionAgent = this.getAgent(channel, session.baseagent);
         const isCurrentlyProcessing = this.messageQueue.isProcessing(sessionKey) || sessionAgent.hasActiveStream(sessionKey);
         const queueLength = this.messageQueue.getQueueLength(sessionKey);
-        const isThread = !!session.threadId;
+        const isThread = isTopicSession(session);
         let sessionStatus = isCurrentlyProcessing ? '处理中' : '空闲';
         // 处理中时显示时长
         if (isCurrentlyProcessing) {
@@ -2833,7 +2850,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             sourceChannel: sourceForConsolidation?.channelType || channel,
             sourceChannelId: channelId,
             sourceChatType: activeChatType,
-            sourceThreadId: sourceForConsolidation?.threadId || undefined,
+            sourceThreadId: sessionTopicThreadId(sourceForConsolidation),
             sourceSelfAid: sourceForConsolidation?.selfAID
                 || selfAID
                 || this.getOwningAgent(channel)?.aid
@@ -3103,7 +3120,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     }
     // /restart 命令：重启服务（进程级，仅 daemon owner）
     if (normalizedContent === '/restart') {
-        // 进程级操作：必须是 daemon owner（daemon.json.owners），与 menu 协议 /system restart 一致。
+        // 进程级操作：必须是已核验的 Control AID 协议 Owner，与 menu 协议 /system restart 一致。
         // agent-channel 的 owner/admin 角色不足以重启整个 daemon。
         const restartSelfAid = this.agentRegistry?.resolveByChannel(channel)?.aid;
         const commandSession = await getExistingSessionForCommand();
@@ -3207,6 +3224,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 channel,
                 channelId,
                 timestamp: Date.now(),
+                requestId: crypto.randomUUID(),
+                requesterPid: process.pid,
+                status: 'requested',
                 ...(restartReplyContext?.threadId ? { threadId: restartReplyContext.threadId } : {}),
                 ...(restartReplyContext?.delivery ? { delivery: restartReplyContext.delivery } : {}),
                 ...(restartReplyContext?.replyToMessageId ? { rootId: restartReplyContext.replyToMessageId } : {}),
@@ -3224,16 +3244,35 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 }
                 const controlDir = daemonControlDir();
                 fs.mkdirSync(controlDir, { recursive: true });
-                fs.writeFileSync(path.join(controlDir, 'restart-pending.json'), JSON.stringify(restartInfo));
-                const confirmation = await launchMonitorAndConfirm([...monitorEntry.args, 'restart-monitor'], { EVOLCORE_HOME: resolvePaths().root, ...monitorEntry.env }, pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid === pid), pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid !== pid));
+                const pendingFile = path.join(controlDir, 'restart-pending.json');
+                if (scanInstances().restartMonitors.some(item => item.alive)
+                    || !createRestartRequest(pendingFile, restartInfo, isProcessRunning)) {
+                    if (monitorEntry.stageDir)
+                        cleanupMonitorStage(monitorEntry.stageDir);
+                    return { code: 'RESTART_PENDING_CONFIRMATION', reason: '已有重启请求正在处理', requestId: restartInfo.requestId };
+                }
+                const confirmation = await launchMonitorAndConfirm([...monitorEntry.args, 'restart-monitor'], { EVOLCORE_HOME: resolvePaths().root, ...monitorEntry.env, [RESTART_REQUEST_ID_ENV]: restartInfo.requestId }, pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid === pid
+                    && m.record.requestId === restartInfo.requestId && m.record.phase === 'accepted'), pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid !== pid
+                    && m.record.requestId === restartInfo.requestId && m.record.phase === 'accepted'), {
+                    requestId: restartInfo.requestId,
+                    logFilePath: path.join(resolvePaths().logs, `restart-launch-${restartInfo.requestId}.log`),
+                    onSpawn: pid => { updateRestartRequest(pendingFile, restartInfo.requestId, { launcherPid: pid }); },
+                    isPendingInRegistry: () => scanInstances().restartMonitors.some(m => m.alive && m.record.requestId === restartInfo.requestId),
+                });
                 if (!confirmation.ok) {
+                    if (confirmation.pending) {
+                        logger.warn(`[System] Restart ownership remains unconfirmed (requestId=${restartInfo.requestId}, PID=${confirmation.pid ?? 'unknown'})`);
+                        return {
+                            code: 'RESTART_PENDING_CONFIRMATION',
+                            reason: confirmation.reason ?? 'ownership confirmation timed out',
+                            requestId: restartInfo.requestId,
+                            ...(confirmation.pid ? { pid: confirmation.pid } : {}),
+                        };
+                    }
                     // 没有看门狗就不要停服务：撤掉回执文件，让本进程继续跑。
                     if (monitorEntry.stageDir)
                         cleanupMonitorStage(monitorEntry.stageDir);
-                    try {
-                        fs.rmSync(path.join(controlDir, 'restart-pending.json'), { force: true });
-                    }
-                    catch { }
+                    removeRestartRequest(pendingFile, restartInfo.requestId);
                     logger.error(`[System] Refusing restart: restart-monitor did not come up (${confirmation.reason})`);
                     for (const line of (confirmation.stderrTail ?? '').split(/\r?\n/).filter(Boolean).slice(-8)) {
                         logger.error(`[System]   | ${line}`);
@@ -3274,7 +3313,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                             },
                         },
                     });
-                    await adapter.send(envelope, { kind: 'command.result', text: '🔄 服务正在重启，请稍候...（约 5 秒后恢复）' });
+                    await adapter.send(envelope, { kind: 'command.result', text: '🔄 重启监控已接管，服务正在重启；完成后会另行通知。' });
                     // 等待消息发送完成后再延迟 kill
                     await new Promise(resolve => setTimeout(resolve, 500));
                 }
@@ -3318,6 +3357,13 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 reason: restarted.code,
             };
         }
+        if (typeof restarted === 'object' && restarted.code === 'RESTART_PENDING_CONFIRMATION') {
+            return {
+                kind: 'command.error',
+                text: `⚠️ 重启请求状态暂不可确认（requestId=${restarted.requestId}）。监控进程仍在运行，可能继续执行；请勿立即重复发起。可稍后检查 restart.log 中该 requestId 的记录。`,
+                reason: restarted.code,
+            };
+        }
         if (typeof restarted === 'object' && restarted.code === 'RESTART_MONITOR_DEAD') {
             return {
                 kind: 'command.error',
@@ -3577,7 +3623,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         }
         // /slist — 仅显示 EvolCore 会话
         const sessions = await this.sessionManager.listSessions(channel, channelId);
-        const currentProjectSessions = sessions.filter((s) => s.projectPath === session.projectPath && s.baseagent === session.baseagent && !s.threadId);
+        const currentProjectSessions = sessions.filter((s) => s.projectPath === session.projectPath && s.baseagent === session.baseagent && isMainSession(s));
         // 从 SDK 同步会话名称（发现 CLI 改名）
         try {
             const sdkSessions = await this.sessionManager.listSdkSessions(session.projectPath, session.baseagent, session.selfAID);
@@ -3701,7 +3747,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!targetSession && /^\d+$/.test(sessionName) && session) {
             const idx = parseInt(sessionName, 10);
             const allSessions = await this.sessionManager.listSessions(channel, channelId);
-            const visibleSessions = allSessions.filter((s) => s.projectPath === session.projectPath && s.baseagent === session.baseagent && !s.threadId);
+            const visibleSessions = allSessions.filter((s) => s.projectPath === session.projectPath && s.baseagent === session.baseagent && isMainSession(s));
             if (idx >= 1 && idx <= visibleSessions.length) {
                 targetSession = visibleSessions[idx - 1];
             }
@@ -3712,7 +3758,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!targetSession && sessionName.length >= 8) {
             targetSession = await this.sessionManager.getSessionByUuidPrefix(channel, channelId, sessionName);
         }
-        if (targetSession?.threadId) {
+        if (isTopicSession(targetSession)) {
             return { kind: 'command.error', text: `❌ 话题会话不支持通过 /s 切换\n请在对应话题内继续对话` };
         }
         const canImport = policy.canImportCliSession(session?.chatType || 'private', identity.role);
@@ -3764,7 +3810,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             return { kind: 'command.result', text: `当前已在会话: ${displaySessionTitle(targetSession.name, sessionName)}` };
         }
         // 阻止从主会话切换到话题会话
-        if (!session.threadId && targetSession.threadId) {
+        if (isMainSession(session) && isTopicSession(targetSession)) {
             return { kind: 'command.error', text: `❌ 无法从主会话切换到话题会话\n话题会话仅在对应话题内可用` };
         }
         await interruptPausedSessionBeforeReplacement(session);
@@ -3809,14 +3855,15 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             });
         }
         // P1.2: 若当前是话题会话，同步更新话题索引
-        if (success && session.threadId) {
+        const renamedTopicThreadId = sessionTopicThreadId(session);
+        if (success && renamedTopicThreadId) {
             try {
                 const { ThreadService } = await import('../../core/thread/index.js');
                 const selfAid = session.selfAID;
                 const peer = session.channelId;
                 if (selfAid && peer) {
                     const svc = new ThreadService(this.sessionManager);
-                    await svc.renameThread({ selfAid, peer, threadId: session.threadId, name: newName });
+                    await svc.renameThread({ selfAid, peer, threadId: renamedTopicThreadId, name: newName });
                 }
             }
             catch (err) {
@@ -3846,7 +3893,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!targetSession && /^\d+$/.test(sessionName)) {
             const idx = parseInt(sessionName, 10);
             const allSessions = await this.sessionManager.listSessions(channel, channelId);
-            const visibleSessions = allSessions.filter((s) => s.projectPath === session.projectPath && s.baseagent === session.baseagent && !s.threadId);
+            const visibleSessions = allSessions.filter((s) => s.projectPath === session.projectPath && s.baseagent === session.baseagent && isMainSession(s));
             if (idx >= 1 && idx <= visibleSessions.length) {
                 targetSession = visibleSessions[idx - 1];
             }
@@ -3857,7 +3904,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!targetSession && sessionName.length >= 8) {
             targetSession = await this.sessionManager.getSessionByUuidPrefix(channel, channelId, sessionName);
         }
-        if (targetSession?.threadId) {
+        if (isTopicSession(targetSession)) {
             return { kind: 'command.error', text: `❌ 请使用话题管理删除话题会话` };
         }
         if (!targetSession) {
@@ -3949,12 +3996,13 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!['chat', 'file', 'all'].includes(mode)) {
             return { kind: 'command.error', text: `❌ 无效模式 "${mode}"，可选：chat | file | all` };
         }
-        if (session.threadId) {
+        const rewindTopicThreadId = sessionTopicThreadId(session);
+        if (rewindTopicThreadId) {
             // 话题只开放 N>1；N=1 会清空 backend binding，仍保留原有禁止边界。
             if (turnNum === 1) {
                 return { kind: 'command.error', text: '❌ 话题会话暂不支持 /rewind 1，仅开放 N>1' };
             }
-            const outcome = await withIdleTopicBackend(session.id, session.threadId, async (current) => {
+            const outcome = await withIdleTopicBackend(session.id, rewindTopicThreadId, async (current) => {
                 if (!current.baseagent) {
                     return '❌ 当前会话缺少 baseagent 绑定，拒绝隐式切换';
                 }
@@ -4020,7 +4068,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 // A topic backend binding may only be changed by an explicit boundary
                 // rotation/activation.  Repair clears runner-local state, but must not
                 // turn a legacy empty callback into an authoritative binding mutation.
-                if (!repairSession.threadId) {
+                if (isMainSession(repairSession)) {
                     await this.sessionManager.updateAgentSessionIdBySessionId(repairSession.id, '');
                 }
                 repairAgent.updateSessionId(repairSession.id, '');
@@ -4071,7 +4119,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     // /trigger 命令
     if (normalizedContent === '/memory' || normalizedContent.startsWith('/memory ')) {
         const memoryAgent = this.agentRegistry?.get?.(authSubject.selfAid ?? '');
-        const memoryOwnerAid = memoryAgent?.config?.owners?.[0];
+        const memoryOwnerAid = ownerResolver.primaryOwner(authSubject.selfAid ?? '');
         const memorySession = await getExistingSessionForCommand();
         return await handleMemorySlash({
             content: normalizedContent,

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

@@ -13,6 +13,8 @@
  * 不支持跨关系浏览以外的越权：非本关系的话题需要显式给出 peer，且按同一套角色判定。
  */
 import { ThreadService, ThreadServiceError } from '../thread/thread-service.js';
+import { isTopicThreadId } from '../thread/topic-id.js';
+import { parseTimeArg, TIME_ARG_FORMATS } from '../../cli/cli-argv.js';
 const TOPIC_STATUSES = ['pending', 'in_progress', 'completed', 'archived'];
 const USAGE = [
     '用法（更名与总结默认作用于当前话题，无需手写 ref）:',
@@ -139,7 +141,7 @@ function formatThreadLine(t, currentThreadId) {
         formatTime(t.lastActiveAt),
         t.lastMsgSnippet ? truncate(t.lastMsgSnippet, 30) : '',
     ].filter(Boolean);
-    return `  ${bits.join(' · ')}${mark}\n    ref: ${t.peer}/${t.threadId}  (${t.msgTotal ?? 0} 条)`;
+    return `  ${bits.join(' · ')}${mark}\n    ref: ${t.threadId}  (${t.msgTotal ?? 0} 条)`;
 }
 function formatThreadList(threads, opts, currentThreadId) {
     if (threads.length === 0)
@@ -241,15 +243,16 @@ export async function handleTopicSlash(ctx) {
             const target = resolveRef(ref, ctx, service);
             if (isPayload(target))
                 return target;
-            if (!target.threadId)
-                return error('当前是主会话，不显示话题元数据；请指定 <peer>/<threadId>');
+            if (!isTopicThreadId(target.threadId)) {
+                return error('当前是主话题；/thread show 只显示话题元数据，请指定 threadId');
+            }
             const t = service.findInIndex(ctx.selfAid, target.peer, target.threadId);
             if (!t)
                 return error(`话题不存在: ${target.peer}/${target.threadId}`);
             const summary = service.showSummary(ctx.selfAid, t.sessionId);
             const lines = [
                 `话题: ${t.name}`,
-                `ref: ${t.peer}/${t.threadId}`,
+                `ref: ${t.threadId}`,
                 `session: ${t.sessionId}`,
                 `对端: ${t.peer}（${t.peerKind === 'group' ? '群' : '私聊'}）`,
                 `状态: ${t.topicStatus}`,
@@ -269,11 +272,19 @@ export async function handleTopicSlash(ctx) {
             const limit = typeof flags.limit === 'string' ? parseInt(flags.limit, 10) : 20;
             if (!Number.isFinite(limit) || limit <= 0)
                 return error('--limit 必须是正整数');
+            const after = typeof flags.after === 'string' ? parseTimeArg(flags.after) : undefined;
+            if (typeof flags.after === 'string' && after === undefined)
+                return error(`--after 不是有效时间（支持 ${TIME_ARG_FORMATS}）`);
+            const before = typeof flags.before === 'string' ? parseTimeArg(flags.before) : undefined;
+            if (typeof flags.before === 'string' && before === undefined)
+                return error(`--before 不是有效时间（支持 ${TIME_ARG_FORMATS}）`);
             const h = await service.historyThread({
                 selfAid: ctx.selfAid,
                 peer: target.peer,
                 threadId: target.threadId,
                 limit,
+                after,
+                before,
             });
             return result(formatHistory(h.messages, { total: h.total, peer: h.peer, threadId: h.threadId }));
         }
@@ -307,7 +318,7 @@ export async function handleTopicSlash(ctx) {
                 ...(typeof flags.label === 'string' ? { label: flags.label } : {}),
                 ...(status ? { topicStatus: status } : {}),
             });
-            return result(`✅ 已创建话题: ${created.name}\nref: ${created.peer}/${created.threadId}`);
+            return result(`✅ 已创建话题: ${created.name}\nref: ${created.threadId}`);
         }
         if (sub === 'rename') {
             const ref = refSource(positional, flags);

package/dist/core/daemon-bootstrap.js

@@ -12,6 +12,7 @@ import { removeAll } from '../utils/instance-registry.js';
 import { controlReplyContext } from './message/outbound.js';
 import { TriggerDefinitionManager } from '../trigger/manager.js';
 import { seedUpgradeCheckTrigger } from '../trigger/system-definitions.js';
+import { ownerResolver } from './ownership/owner-resolver.js';
 export function detectAvailableBaseagents() {
     // 与 init/ECWeb 的探测保持同一判据；claude 在这里也走内置二进制，
     // 不再只看 PATH——否则 daemon 会对外声明一个实际跑不起来的 baseagent。
@@ -36,6 +37,11 @@ export async function runBindBootstrapDaemon(daemonCfg) {
         getUptimeSeconds: () => Math.floor(process.uptime()),
     });
     bindService.startCleanup();
+    ownerResolver.setDaemonAid(daemonCfg.aid);
+    ownerResolver.setConfiguredOwners(daemonCfg.aid, [
+        daemonCfg.owner,
+        ...(daemonCfg.owners ?? []),
+    ].filter((owner) => typeof owner === 'string'));
     let controlChannel;
     let shutdown;
     let pendingShutdownReason;
@@ -102,7 +108,7 @@ export async function runBindBootstrapDaemon(daemonCfg) {
     }));
     ipcServer.setControlToken(controlToken);
     ipcServer.setRemoteAccessService(remoteAccessService);
-    ipcServer.setRemoteAccessOwnerProvider(() => daemonCfg.owners?.[0]);
+    ipcServer.setRemoteAccessOwnerProvider(() => ownerResolver.primaryOwner(daemonCfg.aid));
     ipcServer.setShutdownExecutor(async (reason) => {
         if (!shutdown) {
             pendingShutdownReason = reason;

package/dist/core/daemon-control.js

@@ -10,6 +10,8 @@ import { isProcessLevelOwner } from './command/command-handler.js';
 import { onShutdown } from '../utils/cross-platform.js';
 import { logger } from '../utils/logger.js';
 import { resolvePaths } from '../paths.js';
+import { ownerResolver, OWNERSHIP_AUTHORIZATION_MAX_AGE_MS, OWNERSHIP_CACHE_MAX_AGE_MS } from './ownership/owner-resolver.js';
+import { subscribeUpgradeJob } from '../utils/upgrade-jobs.js';
 const controlMenuDeduper = new MenuRequestDeduper();
 export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diagService, getProcessOwners, }) {
     if (!daemonCfg.aid)
@@ -36,6 +38,11 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
         logger.warn(`控制 AID 首连失败（后台自动重连，不影响 daemon 主流程）: ${e?.message || e}`);
     });
     controlChannel.onMessage(async (opts) => {
+        const text = (opts.content || '').trim();
+        await ownerResolver.refresh(daemonCfg.aid, {
+            maxAgeMs: /^\/(?:pair|diag)(?:\s|$)/i.test(text)
+                ? OWNERSHIP_AUTHORIZATION_MAX_AGE_MS : OWNERSHIP_CACHE_MAX_AGE_MS,
+        });
         let activeMenuRequest;
         let menuCompletionLogged = false;
         const menuFlowContext = {
@@ -50,7 +57,6 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
         };
         try {
             const menuTiming = normalizeMenuResponseTiming(opts);
-            const text = (opts.content || '').trim();
             let parsed;
             try {
                 parsed = JSON.parse(text);
@@ -173,6 +179,18 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
                     ? menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, { code: 'CONFLICT', message: 'Request ID was already used with a different payload' })
                     : deduped.value;
                 await sendControlMenuResponse(response);
+                const upgradeData = 'data' in response ? response.data : undefined;
+                if (parsed?.type === 'menu.action' && parsed.action === 'upgrade' && (parsed.name === 'system' || parsed.cmd === '/system') && upgradeData?.jobId) {
+                    const jobId = upgradeData.jobId;
+                    subscribeUpgradeJob(jobId, async (event) => {
+                        const permission = await cmdHandler.execMenuForControl({ type: 'menu.action', id: parsed.id, name: 'system', action: 'upgrade', args: { mode: 'status', jobId } }, opts.peerId, {
+                            encrypted: opts.encrypted, protectedHeaders: opts.protectedHeaders,
+                        });
+                        if (permission.error)
+                            throw new Error('Upgrade event authorization expired');
+                        await controlChannel.sendStructuredOrThrow(opts.channelId, event, menuResponseContext());
+                    }, [opts.channelId, opts.peerId, opts.peerDeviceId || '', jobId].join('\u001f'));
+                }
                 return;
             }
             await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取远程控制配对码）、/diag <问题描述>、/diag stop', controlReplyContext(opts));