evolcore 0.0.17 → 0.0.19

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

@@ -1,7 +1,9 @@
 import { createHash } from 'crypto';
+import { performance } from 'node:perf_hooks';
 import { loadDaemonConfig } from '../../config-store.js';
 import { readInstalledEvolcoreVersion } from '../../utils/evolcore-version.js';
 import { compareStableSemver, parseStableSemver } from '../../utils/stable-semver.js';
+import { logger } from '../../utils/logger.js';
 export const MENU_REQUEST_TYPES = new Set([
     'menu.token.request',
     'menu.list',
@@ -40,6 +42,51 @@ export function menuCommandForName(name) {
         return undefined;
     return MENU_NAME_COMMANDS[name];
 }
+/**
+ * Preserve a valid adapter receive mark, or capture a local monotonic fallback
+ * at the earliest boundary available to the caller.
+ */
+export function normalizeMenuResponseTiming(timing, clock = {}) {
+    const receivedAtMono = typeof timing.receivedAtMono === 'number' && Number.isFinite(timing.receivedAtMono)
+        ? timing.receivedAtMono
+        : undefined;
+    const receivedAt = typeof timing.receivedAt === 'number' && Number.isFinite(timing.receivedAt)
+        ? timing.receivedAt
+        : undefined;
+    if (receivedAtMono !== undefined) {
+        return { ...(receivedAt !== undefined ? { receivedAt } : {}), receivedAtMono };
+    }
+    if (receivedAt !== undefined)
+        return { receivedAt };
+    return {
+        receivedAt: clock.wallNow ?? Date.now(),
+        receivedAtMono: clock.monotonicNow ?? performance.now(),
+    };
+}
+/**
+ * Finalize a Menu response at an external transport boundary.
+ *
+ * Keeping this outside menuSuccess/menuFailure is intentional: dedupe caches
+ * response drafts, while every inbound request (including a replay) must get
+ * its own inbound-to-outbound processing time.
+ */
+export function withMenuProcessingTime(response, timing, clock = {}) {
+    const receivedAtMono = typeof timing.receivedAtMono === 'number' && Number.isFinite(timing.receivedAtMono)
+        ? timing.receivedAtMono
+        : undefined;
+    const receivedAt = typeof timing.receivedAt === 'number' && Number.isFinite(timing.receivedAt)
+        ? timing.receivedAt
+        : undefined;
+    const elapsed = receivedAtMono !== undefined
+        ? (clock.monotonicNow ?? performance.now()) - receivedAtMono
+        : receivedAt !== undefined
+            ? (clock.wallNow ?? Date.now()) - receivedAt
+            : 0;
+    return {
+        ...response,
+        processing_ms: Math.max(0, Math.round(Number.isFinite(elapsed) ? elapsed : 0)),
+    };
+}
 export function evaluateEvolMenuVersionGate(input) {
     const minimum = loadDaemonConfig().aun?.minEvolVersion;
     if (!minimum)
@@ -346,3 +393,152 @@ export class MenuDiagnosticLimiter {
         return { log: false, suppressed: previous.suppressed };
     }
 }
+const MAX_LOG_DEPTH = 8;
+const MAX_LOG_KEYS = 100;
+const MAX_LOG_ARRAY_ITEMS = 100;
+const MAX_LOG_STRING_LENGTH = 4096;
+const SENSITIVE_LOG_KEY = /(?:^|[_-])(?:api[_-]?key|access[_-]?token|refresh[_-]?token|menu[_-]?token|token|secret(?:[_-]?key)?|password|passwd|credentials?|authorization|cookie|private[_-]?key|seed)(?:$|[_-])/i;
+const SENSITIVE_LOG_ARG = /(?:api[_-]?key|access[_-]?token|refresh[_-]?token|menu[_-]?token|token|secret|password|passwd|credential|authorization|cookie|private[_-]?key|seed)/i;
+function isSensitiveLogKey(key) {
+    const normalized = key.replace(/([a-z0-9])([A-Z])/g, '$1_$2');
+    return SENSITIVE_LOG_KEY.test(normalized);
+}
+function sanitizeInlineLogSecrets(value) {
+    return value
+        .replace(/\b(authorization\s*:\s*Bearer\s+)[^\s"',;]+/gi, '$1[REDACTED]')
+        .replace(/\bBearer\s+[^\s,;]+/gi, 'Bearer [REDACTED]')
+        .replace(/\b(api[_-]?key|access[_-]?token|refresh[_-]?token|menu[_-]?token|token|password|passwd|secret|credential|authorization|cookie)\s*([=:])\s*(?:"[^"]*"|'[^']*'|\S+)/gi, '$1$2[REDACTED]')
+        .replace(/(--(?:api-key|access-token|refresh-token|menu-token|token|password|secret|credential))(?:=|\s+)(?:"[^"]*"|'[^']*'|\S+)/gi, '$1 [REDACTED]');
+}
+function sanitizeLogString(value) {
+    let sanitized = value;
+    const trimmed = value.trim();
+    if ((trimmed.startsWith('{') || trimmed.startsWith('[')) && trimmed.length <= 64 * 1024) {
+        try {
+            const parsed = JSON.parse(trimmed);
+            if (parsed && typeof parsed === 'object')
+                sanitized = JSON.stringify(sanitizeMenuLogValue(parsed));
+        }
+        catch {
+            // Ordinary strings may start with JSON punctuation; keep their original shape.
+        }
+    }
+    sanitized = sanitizeInlineLogSecrets(sanitized);
+    if (sanitized.length <= MAX_LOG_STRING_LENGTH)
+        return sanitized;
+    return `${sanitized.slice(0, MAX_LOG_STRING_LENGTH)}...[TRUNCATED ${sanitized.length - MAX_LOG_STRING_LENGTH} chars]`;
+}
+function sanitizeLogArgv(value, depth, seen) {
+    const output = [];
+    let redactNext = false;
+    for (const item of value.slice(0, MAX_LOG_ARRAY_ITEMS)) {
+        if (typeof item !== 'string') {
+            output.push(sanitizeMenuLogValue(item, '', depth + 1, seen));
+            redactNext = false;
+            continue;
+        }
+        if (redactNext) {
+            output.push('[REDACTED]');
+            redactNext = false;
+            continue;
+        }
+        const sanitized = sanitizeLogString(item);
+        output.push(sanitized);
+        const token = item.replace(/^--?/, '').replace(/=.*$/, '');
+        redactNext = SENSITIVE_LOG_ARG.test(token) && !item.includes('=');
+    }
+    if (value.length > MAX_LOG_ARRAY_ITEMS)
+        output.push(`[TRUNCATED ${value.length - MAX_LOG_ARRAY_ITEMS} items]`);
+    return output;
+}
+export function sanitizeMenuLogValue(value, key = '', depth = 0, seen = new WeakSet()) {
+    if (isSensitiveLogKey(key))
+        return '[REDACTED]';
+    if (value === null || value === undefined || typeof value === 'number' || typeof value === 'boolean')
+        return value;
+    if (typeof value === 'bigint')
+        return value.toString();
+    if (typeof value === 'string')
+        return sanitizeLogString(value);
+    if (typeof value !== 'object')
+        return String(value);
+    if (depth >= MAX_LOG_DEPTH)
+        return '[MAX_DEPTH]';
+    if (seen.has(value))
+        return '[CIRCULAR]';
+    seen.add(value);
+    if (Array.isArray(value)) {
+        const items = value.slice(0, MAX_LOG_ARRAY_ITEMS).map(item => sanitizeMenuLogValue(item, '', depth + 1, seen));
+        if (value.length > MAX_LOG_ARRAY_ITEMS)
+            items.push(`[TRUNCATED ${value.length - MAX_LOG_ARRAY_ITEMS} items]`);
+        return items;
+    }
+    const output = {};
+    const entries = Object.entries(value);
+    for (const [entryKey, entryValue] of entries.slice(0, MAX_LOG_KEYS)) {
+        output[entryKey] = entryKey === 'argv' && Array.isArray(entryValue)
+            ? sanitizeLogArgv(entryValue, depth + 1, seen)
+            : sanitizeMenuLogValue(entryValue, entryKey, depth + 1, seen);
+    }
+    if (entries.length > MAX_LOG_KEYS)
+        output.$truncated_keys = entries.length - MAX_LOG_KEYS;
+    return output;
+}
+function menuRequestId(request) {
+    return typeof request.id === 'string' && request.id.trim() ? request.id : undefined;
+}
+function menuFlowBaseRecord(request, context) {
+    return {
+        source: context.source,
+        requestId: menuRequestId(request),
+        messageId: context.messageId,
+        selfAid: context.selfAid,
+    };
+}
+function menuRequestBusinessFields(request) {
+    return sanitizeMenuLogValue({
+        type: request.type,
+        name: request.name,
+        agent: request.agent,
+        action: request.action,
+        cmd: request.cmd,
+        args: request.args,
+        value: request.value,
+    });
+}
+function writeMenuFlowRecord(record) {
+    try {
+        logger.menu(record);
+    }
+    catch {
+        // Observability must never affect Menu execution.
+    }
+}
+export function logMenuRequestReceived(request, context) {
+    writeMenuFlowRecord({
+        ...menuFlowBaseRecord(request, context),
+        event: 'menu.request.received',
+        request: menuRequestBusinessFields(request),
+    });
+}
+export function logMenuRequestCompleted(request, response, context, options) {
+    const error = response && 'error' in response ? response.error : undefined;
+    const transportError = options.transportError instanceof Error
+        ? { message: sanitizeLogString(options.transportError.message) }
+        : options.transportError === undefined
+            ? undefined
+            : { message: sanitizeLogString(String(options.transportError)) };
+    const processingMs = response && typeof response.processing_ms === 'number'
+        ? response.processing_ms
+        : undefined;
+    writeMenuFlowRecord({
+        ...menuFlowBaseRecord(request, context),
+        event: options.delivery === 'failed' ? 'menu.request.failed' : 'menu.request.completed',
+        delivery: options.delivery,
+        processingMs,
+        reason: options.reason,
+        result: response && 'data' in response ? sanitizeMenuLogValue(response.data) : undefined,
+        warning: response && 'warning' in response ? sanitizeMenuLogValue(response.warning) : undefined,
+        error: error ? sanitizeMenuLogValue(error) : transportError,
+    });
+}

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

@@ -1,6 +1,7 @@
 // 支持的命令列表
-const commands = ['/new', '/pwd', '/help', '/evolhelp', '/status', '/restart', '/reload', '/model', '/effort', '/baseagent', '/slist', '/session', '/rename', '/stop', '/compact', '/repair', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/observable', '/chatmode', '/mentionmode', '/ask', '/resume', '/aid', '/rpc', '/storage', '/agent', '/trigger', '/upgrade'];
+const commands = ['/new', '/pwd', '/help', '/evolhelp', '/status', '/restart', '/reload', '/model', '/effort', '/baseagent', '/slist', '/session', '/rename', '/stop', '/pause', '/compact', '/repair', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/observable', '/chatmode', '/mentionmode', '/ask', '/resume', '/aid', '/rpc', '/storage', '/agent', '/trigger', '/upgrade'];
 const deprecatedCommands = ['/clear'];
+const exactBoundaryCommands = new Set(['/pause', '/resume', '/stop']);
 // 命令别名映射
 const aliases = {
     '/s': '/session',
@@ -9,7 +10,7 @@ const aliases = {
     '/base': '/baseagent',
 };
 // 命令快速路径前缀（所有命令都不进入消息队列）
-const quickCommandPrefixes = ['/new', '/pwd', '/help', '/evolhelp', '/status', '/restart', '/reload', '/model', '/effort', '/baseagent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/del', '/perm', '/file', '/check', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/observable', '/chatmode', '/mentionmode', '/ask', '/resume', '/base ', '/aid', '/rpc', '/storage', '/agent', '/trigger', '/upgrade'];
+const quickCommandPrefixes = ['/new', '/pwd', '/help', '/evolhelp', '/status', '/restart', '/reload', '/model', '/effort', '/baseagent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/pause', '/clear', '/compact', '/del', '/perm', '/file', '/check', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/observable', '/chatmode', '/mentionmode', '/ask', '/resume', '/base ', '/aid', '/rpc', '/storage', '/agent', '/trigger', '/upgrade'];
 /**
  * 计算两个字符串的 Levenshtein 距离（编辑距离）
  */
@@ -39,7 +40,9 @@ function levenshteinDistance(str1, str2) {
     return matrix[len1][len2];
 }
 export function isQuickCommand(content) {
-    return content === '/s' || quickCommandPrefixes.some(cmd => content.startsWith(cmd));
+    return content === '/s' || quickCommandPrefixes.some(cmd => exactBoundaryCommands.has(cmd)
+        ? content === cmd || content.startsWith(cmd + ' ')
+        : content.startsWith(cmd));
 }
 export function normalizeSlashContent(content) {
     for (const [alias, full] of Object.entries(aliases)) {
@@ -50,7 +53,9 @@ export function normalizeSlashContent(content) {
     return content;
 }
 export function isRecognizedSlashCommand(content) {
-    return commands.some(cmd => content.startsWith(cmd)) ||
+    return commands.some(cmd => exactBoundaryCommands.has(cmd)
+        ? content === cmd || content.startsWith(cmd + ' ')
+        : content.startsWith(cmd)) ||
         deprecatedCommands.some(cmd => content === cmd || content.startsWith(cmd + ' '));
 }
 export function guardThreadCommand(content, threadId) {
@@ -70,7 +75,7 @@ export function guardRoleCommand(content, activeChatType, isAdmin) {
     // visitor/member 在群聊和私聊中均可访问的只读命令：纯查询形态（带参写操作由各 handler 内部守卫拦截）
     const userGroupCommands = [
         '/status', '/help', '/evolhelp', '/check', '/chatmode', '/mentionmode',
-        '/model', '/effort', '/baseagent', '/perm', '/activity', '/stop',
+        '/model', '/effort', '/baseagent', '/perm', '/activity', '/stop', '/pause',
         '/resume', '/trigger', '/file',
     ];
     const userCommands = activeChatType === 'group' && !isAdmin
@@ -107,6 +112,8 @@ export async function guardIdleCommand(opts) {
         // 话题中：检查话题 session 是否在处理（不创建）
         const threadSession = await opts.sessionManager.getThreadSession(opts.channel, opts.channelId, opts.threadId);
         if (threadSession) {
+            if (opts.isSessionPaused?.(threadSession.id))
+                return undefined;
             let hasActiveStream = false;
             try {
                 hasActiveStream = opts.getAgentForSession(threadSession).hasActiveStream(threadSession.id);
@@ -123,6 +130,8 @@ export async function guardIdleCommand(opts) {
         }
     }
     else if (opts.activeSession) {
+        if (opts.isSessionPaused?.(opts.activeSession.id))
+            return undefined;
         const isBusy = (opts.activeAgent?.hasActiveStream(opts.activeSession.id) ?? false) ||
             opts.messageQueue?.isProcessing(opts.activeSession.id) ||
             (opts.messageQueue?.getQueueLength(opts.activeSession.id) ?? 0) > 0;

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

@@ -7,18 +7,18 @@ import { shouldSuppressRealRestart } from '../../utils/restart-safety.js';
 import crypto from 'crypto';
 import path from 'path';
 import fs from 'fs';
-import os from 'os';
 import { checkLatestVersion, getLocalVersion, isLinkedInstall, compareVersions } from '../../utils/npm-ops.js';
 import { loadDaemonConfig } from '../../config-store.js';
 import { read as cfgRead, resolveEffective, routeFieldPath, write as cfgWrite, } from '../../config/config-manager.js';
 import { execAgentAction } from './agent-control.js';
 import { authorizeOperation, buildAuthSubject } from '../auth/auth-gateway.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 { modelMatches } from '../model/model-catalog.js';
 import { formatModelCheck, runModelCheck } from '../model/model-diagnostics.js';
 import { filterModelsForRole, validateModelSelectionForRole } from '../model/model-permission.js';
-import { displaySessionTitle, isSyntheticCliPrompt } from '../session/session-title.js';
+import { displaySessionTitle } from '../session/session-title.js';
 import { chatmodeFieldForPeer, resolveChatModeForField } from '../message/peer-mode.js';
 import { normalizePermissionMode as normalizePermissionModeContract, PUBLIC_PERMISSION_MODES } from '../permission/mode.js';
 import { isManagementRole } from '../../config/builtin-roles.js';
@@ -157,7 +157,7 @@ async function authorizeSlashIntent(params) {
     const channelType = channel.split('#')[0];
     const peerKey = channelType && peerKeyId ? formatPeerKey(channelType, peerKeyId) : undefined;
     const subject = params.subject
-        ? { ...params.subject, role: identity.role, identity }
+        ? { ...params.subject, identity }
         : buildAuthSubject({
             selfAid,
             actorId: userId,
@@ -175,7 +175,13 @@ async function authorizeSlashIntent(params) {
     }
     const decision = await authorizeOperation({ source: 'slash', intent, subject });
     if (!decision.allow) {
-        return { kind: 'command.error', text: decision.reason };
+        const reasonCode = decision.command?.reasonCode;
+        return {
+            kind: 'command.error',
+            text: formatAuthorizationDenial(decision.reason, reasonCode),
+            reason: decision.code,
+            ...(reasonCode ? { reasonCode, nextStep: authorizationNextStep(reasonCode) } : {}),
+        };
     }
     return null;
 }
@@ -471,6 +477,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         activeAgent: getActiveAgentIfAvailable(),
         sessionManager: this.sessionManager,
         messageQueue: this.messageQueue,
+        isSessionPaused: sessionId => this.processor?.isPauseRequested?.(sessionId) ?? false,
         getAgentForSession: session => this.getAgent(channel, session.baseagent),
     });
     if (idleGuard)
@@ -481,6 +488,17 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     const isCmd = isRecognizedSlashCommand(normalizedContent);
     if (!isCmd)
         return undefined;
+    const interruptPausedSessionBeforeReplacement = async (commandSession) => {
+        if (commandSession && (this.processor?.isPauseRequested?.(commandSession.id) ?? false)) {
+            this.eventBus.publish({
+                type: 'task:interrupted',
+                sessionId: commandSession.id,
+                reason: 'stop',
+                agentName: this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>',
+            });
+            await this.processor.interruptSession(commandSession.id, 'stop');
+        }
+    };
     // /help 命令不需要会话
     if (normalizedContent === '/help') {
         const canReadModel = canAccessSlashOperation('model.current', 'relation')
@@ -541,6 +559,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 '  /s [cli|名称|序号|uuid] - 列出或切换会话（cli 查看未导入的 CLI 会话）',
                 '  /name <新名称> - 重命名当前会话',
                 '  /del <名称> - 删除指定会话（仅解绑，不删除文件）',
+                '  /pause - 在下一次工具调用前暂停当前任务',
+                '  /resume - 继续已暂停的当前任务',
+                '  /stop - 中断当前任务',
                 '  /status - 显示会话状态',
                 '  /check - 检查 EvolAgent 实例健康',
                 ...((canReadModel || canUseModel || canSetEffort) ? [
@@ -587,6 +608,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             '  /fork [名称] - 分支当前会话（从当前对话点创建分支）',
             '  /rewind [N] [chat|file|all] - 查看历史/撤销指定轮次（别名: /rw）',
             '  /compact - 压缩会话上下文（减少 token 用量）',
+            '  /pause - 在下一次工具调用前暂停当前任务',
+            '  /resume - 继续已暂停的当前任务',
+            '  /stop - 中断当前任务',
             '',
             '🤖 Agent 与模型：',
             '  /baseagent [name] - 查看或切换 Agent 后端（别名: /base）',
@@ -605,6 +629,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             '',
             '🛠️ 运维：',
             '  /status - 显示会话状态',
+            '  /pause - 在下一次工具调用前暂停当前任务',
+            '  /resume - 继续已暂停的当前任务',
             '  /stop - 中断当前任务',
             '  /check - 检查 EvolAgent 实例健康',
             ...(isOwner ? [
@@ -670,6 +696,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             cmds.push({ command: '/perm', args: 'allow|always|deny', description: '审批权限请求', category: '权限管理', roles: [identity.role] });
         // 运维
         cmds.push({ command: '/status', description: '显示会话状态', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] });
+        cmds.push({ command: '/pause', description: '在下一次工具调用前暂停当前任务', category: '运维', roles: ['admin', 'owner'] });
+        cmds.push({ command: '/resume', description: '继续已暂停的当前任务', category: '运维', roles: ['admin', 'owner'] });
         cmds.push({ command: '/stop', description: '中断当前任务', category: '运维', roles: ['admin', 'owner'] });
         cmds.push({ command: '/check', description: '检查 EvolAgent 实例健康', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] });
         if (isAdmin) {
@@ -851,92 +879,36 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             return { kind: 'command.result', text: fb.result ?? '✓ 已回答' };
         return { kind: 'command.error', text: '❌ 当前没有待回答的问题' };
     }
-    // /resume 命令：返回当前项目的 Claude 会话记录（JSON）
-    if (normalizedContent === '/resume' || normalizedContent.startsWith('/resume ')) {
+    // /pause and /resume control the current session's next-tool gate.
+    if (normalizedContent.startsWith('/pause ')) {
+        return { kind: 'command.error', text: '用法: /pause' };
+    }
+    if (normalizedContent === '/pause') {
+        const pauseSession = await getExistingSessionForCommand();
+        if (!pauseSession)
+            return { kind: 'command.result', text: '当前没有活跃会话' };
+        const pauseAgent = this.getAgent(channel, pauseSession.baseagent);
+        const hasActiveTask = pauseAgent.hasActiveStream(pauseSession.id)
+            || this.messageQueue.isProcessing(pauseSession.id);
+        if (!hasActiveTask)
+            return { kind: 'command.result', text: '当前没有正在处理的任务' };
+        const requested = this.processor.pauseSession(pauseSession.id);
+        return {
+            kind: 'command.result',
+            text: requested
+                ? '✓ 已请求暂停，任务将在下一次工具调用前暂停'
+                : '当前任务已请求暂停或正在暂停',
+        };
+    }
+    if (normalizedContent.startsWith('/resume ')) {
+        return { kind: 'command.error', text: '用法: /resume' };
+    }
+    if (normalizedContent === '/resume') {
         const resumeSession = await getExistingSessionForCommand();
         if (!resumeSession)
             return { kind: 'command.result', text: '当前没有活跃会话' };
-        try {
-            const { encodePath } = await import('../../utils/cross-platform.js');
-            const homeDir = os.homedir();
-            const encodedPath = encodePath(resumeSession.projectPath);
-            const projectDir = path.join(homeDir, '.claude', 'projects', encodedPath);
-            if (!fs.existsSync(projectDir)) {
-                return { kind: 'command.error', text: '❌ 未找到 Claude 会话记录目录' };
-            }
-            const jsonlFiles = fs.readdirSync(projectDir).filter(f => f.endsWith('.jsonl'));
-            if (jsonlFiles.length === 0) {
-                return { kind: 'command.error', text: '❌ 当前项目没有 Claude 会话记录' };
-            }
-            const sessions = [];
-            for (const file of jsonlFiles) {
-                const filePath = path.join(projectDir, file);
-                const sessionId = file.replace('.jsonl', '');
-                let lastTimestamp = '';
-                let firstUserMessage = '';
-                let model = '';
-                let branch = '';
-                let turns = 0;
-                try {
-                    const content = fs.readFileSync(filePath, 'utf-8');
-                    const lines = content.split('\n').filter(l => l.trim());
-                    for (const line of lines) {
-                        const event = JSON.parse(line);
-                        if (event.timestamp && event.timestamp > lastTimestamp) {
-                            lastTimestamp = event.timestamp;
-                        }
-                        if (event.gitBranch && !branch) {
-                            branch = event.gitBranch;
-                        }
-                        if (event.type === 'user' && event.message?.role === 'user') {
-                            const msgContent = event.message.content;
-                            const isToolResult = Array.isArray(msgContent) && msgContent.every((c) => c.type === 'tool_result');
-                            if (!isToolResult) {
-                                turns++;
-                                if (!firstUserMessage) {
-                                    let candidate = '';
-                                    if (typeof msgContent === 'string') {
-                                        candidate = msgContent;
-                                    }
-                                    else if (Array.isArray(msgContent)) {
-                                        const textBlock = msgContent.find((c) => c.type === 'text');
-                                        if (textBlock?.text) {
-                                            candidate = textBlock.text;
-                                        }
-                                    }
-                                    // 跳过 Claude Code 注入的脚手架 prompt，取第一条真人消息
-                                    if (candidate && !isSyntheticCliPrompt(candidate, 'claude')) {
-                                        firstUserMessage = candidate.slice(0, 100);
-                                    }
-                                }
-                            }
-                        }
-                        if (event.type === 'assistant' && event.message?.model && !model) {
-                            model = event.message.model;
-                        }
-                    }
-                }
-                catch {
-                    continue;
-                }
-                if (!lastTimestamp)
-                    continue;
-                sessions.push({
-                    sessionId,
-                    lastMessageTime: lastTimestamp,
-                    firstUserMessage: firstUserMessage || '(无消息)',
-                    model: model || 'unknown',
-                    turns,
-                    branch: branch || 'unknown',
-                });
-            }
-            sessions.sort((a, b) => b.lastMessageTime.localeCompare(a.lastMessageTime));
-            return { kind: 'command.result', text: JSON.stringify(sessions, null, 2) };
-        }
-        catch (error) {
-            logger.error('[CommandHandler] /resume failed:', error);
-            return { kind: 'command.error', text: `❌ 读取会话记录失败: ${error instanceof Error ? error.message : '未知错误'}` };
-        }
+        const resumed = this.processor.resumeSession(resumeSession.id);
+        return { kind: 'command.result', text: resumed ? '✓ 已继续当前任务' : '当前任务未处于暂停状态' };
     }
     // /baseagent 命令：查看或切换 Agent 后端
     if (normalizedContent === '/baseagent' || normalizedContent.startsWith('/baseagent ')) {
@@ -988,6 +960,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!owningAgent) {
             return { kind: 'command.error', text: '❌ 当前 channel 无绑定 agent，无法设置 active_baseagent' };
         }
+        await interruptPausedSessionBeforeReplacement(await getExistingSessionForCommand());
         const previousDefaultBaseagent = owningAgent.baseagent || this.parseDefaultBaseagent();
         owningAgent.setActiveBaseagent(args);
         this.eventBus.publish({
@@ -1646,11 +1619,6 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     if (normalizedContent === '/reload' || normalizedContent.startsWith('/reload ')) {
         const aidArg = normalizedContent.slice('/reload'.length).trim() || undefined;
         const selfAid = this.agentRegistry?.resolveByChannel(channel)?.aid;
-        // agent channel 的 owner/admin 不能跨 agent reload；先返回领域内错误，避免落到
-        // 底层 daemon-owner 约束的英文 reason。
-        if (!isDaemonOwner && aidArg && aidArg !== selfAid) {
-            return { kind: 'command.error', text: '❌ 无权限：跨 agent reload 仅限 daemon owner 使用' };
-        }
         const targetAid = aidArg ?? selfAid;
         if (!targetAid) {
             return { kind: 'command.error', text: '❌ 无法确定目标 agent，请指定 aid：/reload <aid>' };
@@ -1664,7 +1632,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 args: { ...(aidArg ? { aid: aidArg } : {}), ...(selfAid ? { self: selfAid } : {}) },
                 dangerous: true,
             },
-            identity: isDaemonOwner ? { ...identity, role: 'owner' } : identity,
+            identity,
             session: activeSession,
             channel,
             channelId,
@@ -2010,12 +1978,16 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         return { kind: 'command.result', text: `✅ @ 处理模式已切换: ${currentMode ?? '未设置'} → ${arg}` };
     }
     // /stop 命令：中断当前任务
+    if (normalizedContent.startsWith('/stop ')) {
+        return { kind: 'command.error', text: '用法: /stop' };
+    }
     if (normalizedContent === '/stop') {
         const stopSession = await getExistingSessionForCommand();
         if (!stopSession)
             return { kind: 'command.result', text: '当前没有正在处理的任务' };
         const stopAgent = this.getAgent(channel, stopSession.baseagent);
         const sessionKey = stopSession.id;
+        this.processor?.clearPauseSession?.(sessionKey);
         const queueLength = this.messageQueue.getQueueLength(sessionKey);
         const hasActive = stopAgent.hasActiveStream(sessionKey);
         const isProcessing = this.messageQueue.isProcessing(sessionKey);
@@ -2049,6 +2021,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!session.agentSessionId) {
             return { kind: 'command.error', text: '❌ 当前会话没有历史记录，无需压缩' };
         }
+        await interruptPausedSessionBeforeReplacement(session);
         const projectPath = path.isAbsolute(session.projectPath)
             ? session.projectPath
             : path.resolve(process.cwd(), session.projectPath);
@@ -2168,6 +2141,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 return { kind: 'command.error', text: `❌ 会话名称 "${sessionName}" 已存在，请使用其他名称` };
             }
         }
+        await interruptPausedSessionBeforeReplacement(session || activeSession);
         const projectPath = this.getEffectiveDefaultPath(channel);
         if (sendMessage && session) {
             await sendMessage(channelId, `⏳ 正在创建新会话${sessionName ? `: ${sessionName}` : ''}...`, this.getReplyContext(session));
@@ -2291,7 +2265,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 groups.set(type, []);
             groups.get(type).push({ name, status });
         }
-        if (!isAdmin) {
+        if (!isAdmin && !isDaemonOwner) {
             // visitor/member: 仅显示实例通道摘要
             const total = [...groups.values()].flat().length;
             const healthy = [...groups.values()].flat().filter(i => i.status.includes('✓')).length;
@@ -2443,9 +2417,6 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     if (normalizedContent === '/restart') {
         // 进程级操作：必须是 daemon owner（daemon.json.owners），与 menu 协议 /system restart 一致。
         // agent-channel 的 owner/admin 角色不足以重启整个 daemon。
-        if (!isDaemonOwner) {
-            return { kind: 'command.error', text: '❌ 无权限：服务重启仅限 daemon owner 使用' };
-        }
         const restartSelfAid = this.agentRegistry?.resolveByChannel(channel)?.aid;
         const authDenied = await authorizeIntent({
             intent: {
@@ -2455,7 +2426,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 args: {},
                 dangerous: true,
             },
-            identity: { ...identity, role: 'owner' },
+            identity,
             session: activeSession,
             channel,
             channelId,
@@ -2624,7 +2595,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 args: {},
                 dangerous: true,
             },
-            identity: isDaemonOwner ? { ...identity, role: 'owner' } : identity,
+            identity,
             session: activeSession,
             channel,
             channelId,
@@ -3008,6 +2979,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                     : await this.sessionManager.listImportableCliSessions(projectPath, currentBaseagent);
                 const cliSession = cliSessions.find((c) => c.uuid.startsWith(sessionName));
                 if (cliSession) {
+                    // Importing a CLI session replaces the active session. Cancel any
+                    // pending tool-boundary pause only after the target has been
+                    // validated, so an invalid UUID cannot interrupt the current task.
+                    await interruptPausedSessionBeforeReplacement(session || activeSession);
                     const imported = await this.sessionManager.importCliSession(channel, channelId, projectPath, cliSession.uuid, currentBaseagent, selfAID ?? session?.selfAID);
                     this.eventBus.publish({ type: 'session:imported', sessionId: imported.id, agentSessionId: cliSession.uuid, projectPath });
                     const projectName = this.getProjectName(projectPath);
@@ -3038,6 +3013,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!session.threadId && targetSession.threadId) {
             return { kind: 'command.error', text: `❌ 无法从主会话切换到话题会话\n话题会话仅在对应话题内可用` };
         }
+        await interruptPausedSessionBeforeReplacement(session);
+        this.processor?.clearPauseSession?.(session.id);
+        this.processor?.clearPauseSession?.(targetSession.id);
         const switched = await this.sessionManager.switchToSession(channel, channelId, targetSession.id);
         if (!switched) {
             return { kind: 'command.error', text: `❌ 切换会话失败` };
@@ -3125,6 +3103,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         }
         this.eventBus.publish({ type: 'session:deleted', sessionId: targetSession.id });
         const targetAgent = this.getAgent(channel, targetSession.baseagent);
+        this.processor?.clearPauseSession?.(targetSession.id);
         await targetAgent.closeSession(targetSession.id);
         return { kind: 'command.result', text: `✓ 已删除会话: ${displaySessionTitle(targetSession.name, sessionName)}\n会话文件已保留，可通过 CLI 访问` };
     }
@@ -3141,6 +3120,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!forkAgent.capabilities?.fork) {
             return { kind: 'command.error', text: `❌ 当前 Agent (${forkAgent.name}) 不支持 /fork\n\n可使用 /new 创建新会话替代` };
         }
+        await interruptPausedSessionBeforeReplacement(session);
         try {
             const forkedSessionId = await forkAgent.forkSession(session.agentSessionId, session.projectPath, forkName);
             const newSession = await this.sessionManager.createForkedSession(session, forkedSessionId, forkName);
@@ -3195,6 +3175,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!['chat', 'file', 'all'].includes(mode)) {
             return { kind: 'command.error', text: `❌ 无效模式 "${mode}"，可选：chat | file | all` };
         }
+        await interruptPausedSessionBeforeReplacement(session);
         return { kind: 'command.result', text: await this.handleRewind(session, rewindAgent, turnNum, mode) };
     }
     // /repair 命令：检查并修复会话文件
@@ -3204,6 +3185,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             return { kind: 'command.result', text: '当前没有活跃会话' };
         const repairAgent = this.getAgent(channel, repairSession.baseagent);
         const { checkSessionFile, backupSessionFile } = await import('../session/session-file-health.js');
+        await interruptPausedSessionBeforeReplacement(repairSession);
         try {
             if (!repairSession.agentSessionId) {
                 await this.sessionManager.resetHealthStatus(repairSession.id);