evolcore 0.0.25 → 0.0.27

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

@@ -51,6 +51,8 @@ export function parseMenuClientProtectedHeaders(value) {
         result.client_version = normalized.client_version;
     if (normalized.evol_version !== undefined)
         result.evol_version = normalized.evol_version;
+    if (normalized.sdk_version !== undefined)
+        result.sdk_version = normalized.sdk_version;
     if (normalized.auth_method === 'daemon-owner' || normalized.auth_method === 'remote-access-token' || normalized.auth_method === 'ecweb-token')
         result.auth_method = normalized.auth_method;
     else if (normalized.auth_method !== undefined)
@@ -118,11 +120,16 @@ export const MENU_NAME_COMMANDS = Object.freeze({
     dispatch: '/dispatch',
     observable: '/observable',
     system: '/system',
+    baseagents: '/baseagents',
     cli: '/cli',
     agent: '/agent',
     aid: '/aid',
     trigger: '/trigger',
     file: '/file',
+    'agent-data-root': '/agent-data-root',
+    'relation-data-root': '/relation-data-root',
+    'agent-storage-root': '/agent-storage-root',
+    storage: '/storage',
     gateway: '/gateway',
     config: '/config',
     capability: '/capability',
@@ -208,11 +215,17 @@ export function isEvolMenuVersionGateEnabled() {
 export function isAunMenuTokenRequired() {
     return loadDaemonConfig().aun?.menuTokenRequired === true;
 }
-export function evolMenuResponseTransportMetadata() {
+export function evolMenuResponseTransportMetadata(sdkVersion) {
     return {
         // Clear inherited request state so AUNChannel applies daemon aun.defaultEncrypt.
         encrypted: undefined,
-        protectedHeaders: { ec_version: readInstalledEvolcoreVersion() },
+        protectedHeaders: {
+            ec_version: readInstalledEvolcoreVersion(),
+            ...(typeof sdkVersion === 'string' && sdkVersion.trim() ? { sdk_version: sdkVersion.trim() } : {}),
+        },
+        ...(typeof sdkVersion === 'string' && sdkVersion.trim()
+            ? { menuClientSdkVersion: sdkVersion.trim() }
+            : {}),
     };
 }
 const EXPLICIT_SCOPE_UPDATE_NAMES = new Set([
@@ -329,6 +342,12 @@ export function validateMenuRequest(request) {
             return { code: 'INVALID_ARGUMENT', message: 'File fetch requires args.path' };
         }
     }
+    if ((request.name === 'file' || request.cmd === '/file') && request.args !== undefined) {
+        const args = request.args;
+        if (args.rootId !== undefined && (typeof args.rootId !== 'string' || args.rootId.trim().length === 0)) {
+            return { code: 'INVALID_ARGUMENT', message: 'File rootId must be a non-empty string' };
+        }
+    }
     return null;
 }
 export function menuSuccess(header, data) {
@@ -371,10 +390,10 @@ export function enforceMenuResponseSize(response, maxBytes = 128 * 1024) {
     });
 }
 const INVALID_ARGUMENT_CODES = new Set([
-    'ARGUMENT_MISMATCH', 'FILE_TOO_LARGE', 'INVALID_ARGS', 'INVALID_DELEGATION',
+    'ARGUMENT_MISMATCH', 'INVALID_ARGS', 'INVALID_DELEGATION',
     'INVALID_FIELD', 'INVALID_REVISION', 'INVALID_SCOPE', 'INVALID_TYPE', 'INVALID_VALUE', 'MISSING_AID',
     'MISSING_ARGV', 'MISSING_BASEAGENT', 'MISSING_CMD', 'MISSING_PEER', 'MISSING_VALUE',
-    'NOT_A_DIRECTORY', 'REVISION_REQUIRED', 'ROLE_VIOLATION',
+    'REVISION_REQUIRED', 'ROLE_VIOLATION',
 ]);
 const STABLE_CODES = new Set([
     'ROLE_ACCESS_DENIED', 'PERMISSION_DENIED', 'UNAUTHORIZED', 'FORBIDDEN',
@@ -386,6 +405,9 @@ const STABLE_CODES = new Set([
     'RATE_LIMITED', 'CATALOG_STALE', 'DATA_MIGRATION_REQUIRED',
     'INVALID_CLIENT', 'REMOTE_ACCESS_TOKEN_INVALID', 'ECWEB_TOKEN_INVALID', 'CLIENT_BUSY', 'INVALID_RESPONSE', 'TIMEOUT',
     'RESPONSE_TOO_LARGE',
+    'TOPIC_SESSION_NOT_FOUND', 'TOPIC_SESSION_LOOKUP_FAILED',
+    'ROOT_NOT_FOUND', 'ROOT_FORBIDDEN', 'ROOT_EXPIRED', 'ROOT_SCOPE_MISMATCH', 'ROOT_PEER_MISMATCH',
+    'INVALID_ROOT_ID', 'MISSING_ROOT_ID', 'INVALID_ROOT_PATH', 'NOT_A_DIRECTORY', 'FILE_TOO_LARGE',
 ]);
 export function normalizeMenuError(error) {
     const source = error && typeof error === 'object' ? error : {};
@@ -436,6 +458,16 @@ export class MenuRequestDeduper {
         this.ttlMs = ttlMs;
         this.maxEntries = maxEntries;
     }
+    /** Replace an acknowledged deferred operation's result after it fails. */
+    async replaceResult(key, fingerprint, previous, value) {
+        const entry = this.entries.get(key);
+        if (!entry || entry.fingerprint !== fingerprint || await entry.promise !== previous)
+            return;
+        if (this.entries.get(key) !== entry)
+            return;
+        entry.promise = Promise.resolve(value);
+        entry.expiresAt = Date.now() + this.ttlMs;
+    }
     async execute(key, fingerprint, operation) {
         this.prune();
         const existing = this.entries.get(key);
@@ -510,14 +542,16 @@ 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_KEY = /(?:^|[_-])(?:api[_-]?key|access[_-]?token|refresh[_-]?token|menu[_-]?token|root[_-]?id|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);
+    return SENSITIVE_LOG_KEY.test(normalized) || /^(?:next[_-]?)?cursor$|^(?:download[_-]?)?url$|^ticket$/i.test(normalized);
 }
 function sanitizeInlineLogSecrets(value) {
     return value
+        .replace(/\b(?:sr1|sc1|dr1)\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g, '[REDACTED]')
+        .replace(/https?:\/\/[^\s"'<>]*[?&](?:t|token|signature|x-amz-signature)=[^\s"'<>]*/gi, '[REDACTED_URL]')
         .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]')
@@ -567,6 +601,11 @@ function sanitizeLogArgv(value, depth, seen) {
 export function sanitizeMenuLogValue(value, key = '', depth = 0, seen = new WeakSet()) {
     if (isSensitiveLogKey(key))
         return '[REDACTED]';
+    // Pairing codes are intentionally returned as `code` on the wire for
+    // compatibility with /pair and the ECWeb API. Do not persist six-digit
+    // credentials in menu-protocol.log.
+    if (key === 'code' && typeof value === 'string' && /^\d{6}$/.test(value))
+        return '[REDACTED]';
     if (value === null || value === undefined || typeof value === 'number' || typeof value === 'boolean')
         return value;
     if (typeof value === 'bigint')

package/dist/core/command/menu-token-store.js

@@ -4,6 +4,20 @@ import { agentDataDir } from '../../paths.js';
 import { atomicReadJson, atomicWriteJson } from '../../utils/atomic-write.js';
 export const DEFAULT_MENU_TOKEN_IDLE_TIMEOUT_SECONDS = 30 * 24 * 60 * 60;
 export const MAX_MENU_TOKENS_PER_AGENT = 1_000;
+function validInstallationId(value) {
+    return value === undefined || (typeof value === 'string' && value.length <= 256
+        && !/[\u0000-\u001f\u007f]/.test(value));
+}
+function normalizeInstallation(value) {
+    if (!value || typeof value !== 'object' || !validInstallationId(value.deviceId)
+        || !validInstallationId(value.slotId))
+        return null;
+    const deviceId = value.deviceId?.trim() || '';
+    const slotId = value.slotId?.trim() || '';
+    if (slotId && !deviceId)
+        return null;
+    return { deviceId, slotId };
+}
 function hashToken(token) {
     return createHash('sha256').update(token).digest('hex');
 }
@@ -13,6 +27,9 @@ function isTokenRecord(value) {
     const record = value;
     return typeof record.peerAid === 'string'
         && record.peerAid.trim().length > 0
+        && validInstallationId(record.peerDeviceId)
+        && validInstallationId(record.peerSlotId)
+        && (!record.peerSlotId?.trim() || !!record.peerDeviceId?.trim())
         && typeof record.tokenHash === 'string'
         && /^[a-f0-9]{64}$/.test(record.tokenHash)
         && typeof record.requestedAt === 'number'
@@ -28,6 +45,10 @@ function isTokenRecord(value) {
 function isExpired(record, now) {
     return now - record.lastUsedAt >= record.idleTimeout * 1000;
 }
+function installationMatches(record, installation) {
+    return (record.peerDeviceId?.trim() || '') === (installation.deviceId?.trim() || '')
+        && (record.peerSlotId?.trim() || '') === (installation.slotId?.trim() || '');
+}
 function hashesEqual(left, right) {
     const leftBytes = Buffer.from(left, 'hex');
     const rightBytes = Buffer.from(right, 'hex');
@@ -41,10 +62,14 @@ export class MenuTokenStore {
     constructor(maxRecords = MAX_MENU_TOKENS_PER_AGENT) {
         this.maxRecords = maxRecords;
     }
-    issue(selfAid, peerAid, metadata = {}, now = Date.now()) {
+    issue(selfAid, peerAid, metadata = {}, installationOrNow = {}, now = Date.now()) {
+        const installation = normalizeInstallation(typeof installationOrNow === 'number' ? {} : installationOrNow);
+        if (!installation)
+            return null;
+        const issuedAt = typeof installationOrNow === 'number' ? installationOrNow : now;
         const file = this.read(selfAid);
         const idleTimeout = DEFAULT_MENU_TOKEN_IDLE_TIMEOUT_SECONDS;
-        const tokens = file.tokens.filter(record => record.peerAid !== peerAid && !isExpired(record, now));
+        const tokens = file.tokens.filter(record => (record.peerAid !== peerAid || !installationMatches(record, installation)) && !isExpired(record, issuedAt));
         if (tokens.length >= this.maxRecords) {
             if (tokens.length !== file.tokens.length)
                 this.write(selfAid, tokens);
@@ -53,9 +78,11 @@ export class MenuTokenStore {
         const menuToken = `mt_${randomBytes(32).toString('base64url')}`;
         tokens.push({
             peerAid,
+            ...(installation.deviceId?.trim() ? { peerDeviceId: installation.deviceId.trim() } : {}),
+            ...(installation.slotId?.trim() ? { peerSlotId: installation.slotId.trim() } : {}),
             tokenHash: hashToken(menuToken),
-            requestedAt: now,
-            lastUsedAt: now,
+            requestedAt: issuedAt,
+            lastUsedAt: issuedAt,
             idleTimeout,
             ...(metadata.clientName ? { clientName: metadata.clientName } : {}),
             ...(metadata.clientVersion ? { clientVersion: metadata.clientVersion } : {}),
@@ -64,21 +91,27 @@ export class MenuTokenStore {
         this.write(selfAid, tokens);
         return { menuToken, idleTimeout };
     }
-    use(selfAid, peerAid, menuToken, now = Date.now()) {
+    use(selfAid, peerAid, menuToken, installationOrNow = {}, now = Date.now()) {
+        const installation = normalizeInstallation(typeof installationOrNow === 'number' ? {} : installationOrNow);
+        if (!installation)
+            return false;
+        const usedAt = typeof installationOrNow === 'number' ? installationOrNow : now;
         const file = this.read(selfAid);
-        const activeTokens = file.tokens.filter(record => !isExpired(record, now));
+        const activeTokens = file.tokens.filter(record => !isExpired(record, usedAt));
         const tokenHash = typeof menuToken === 'string' && menuToken.length > 0 && menuToken.length <= 256
             ? hashToken(menuToken)
             : undefined;
         const matchingIndex = tokenHash
-            ? activeTokens.findIndex(record => record.peerAid === peerAid && hashesEqual(record.tokenHash, tokenHash))
+            ? activeTokens.findIndex(record => record.peerAid === peerAid
+                && installationMatches(record, installation)
+                && hashesEqual(record.tokenHash, tokenHash))
             : -1;
         if (matchingIndex < 0) {
             if (activeTokens.length !== file.tokens.length)
                 this.write(selfAid, activeTokens);
             return false;
         }
-        activeTokens[matchingIndex] = { ...activeTokens[matchingIndex], lastUsedAt: now };
+        activeTokens[matchingIndex] = { ...activeTokens[matchingIndex], lastUsedAt: usedAt };
         this.write(selfAid, activeTokens);
         return true;
     }

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

@@ -16,9 +16,9 @@ import { fileCache } from '../daemon-file-cache.js';
 import { currentVersion } from '../../config/schema-registry.js';
 import { loadSchema } from '../../config/schema-registry.js';
 import { rolePermissionFields, rolePermissionFieldOptions, rolePermissionFieldPatterns, validateRoleConfig, } from '../../config/role-schema.js';
-import { groupInfo, groupList, groupDirectoryErrorCode } from '../../aun/msg/group.js';
+import { groupInfo, groupList, groupDirectoryErrorCode } from '../../aun/group/index.js';
 import { aidLookup, isValidAid } from '../../aun/aid/identity.js';
-import { isExplicitGroupId } from '../../aun/group-identity.js';
+import { isExplicitGroupId } from '../../aun/group/index.js';
 import { readJsonFile, readLastJsonlLine, scanChatDirs, scanMetaFiles } from '../session/session-fs-store.js';
 import { constrainResolvedModelForRole } from '../model/model-permission.js';
 import { resolveRuntimePermissionMode, resolveRuntimeStringField } from '../role/runtime-policy.js';

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

@@ -45,7 +45,8 @@ export function probeSessionActivity(evidence, probes) {
 // 支持的命令列表
 const commands = ['/new', '/pwd', '/help', '/evolhelp', '/status', '/restart', '/reload', '/model', '/effort', '/baseagent', '/slist', '/session', '/rename', '/stop', '/pause', '/compact', '/renew', '/repair', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/observable', '/chatmode', '/mentionmode', '/ask', '/resume', '/aid', '/rpc', '/storage', '/agent', '/trigger', '/upgrade', '/pair'];
 const deprecatedCommands = ['/clear'];
-const exactBoundaryCommands = new Set(['/pause', '/resume', '/stop', '/pair']);
+commands.push('/diag');
+const exactBoundaryCommands = new Set(['/pause', '/resume', '/stop', '/pair', '/diag']);
 /** Parse the execution command without treating it as a quick/result command. */
 export function parseFullAccessCommand(content) {
     const match = content.match(/^\s*(\/fa|\/fullaccess)(?=\s|$)([\s\S]*)$/);
@@ -64,8 +65,37 @@ const aliases = {
     '/rw': '/rewind',
     '/base': '/baseagent',
 };
+const GROUP_READ_ONLY_COMMANDS = new Set(['/mentionmode', '/model', '/effort', '/perm', '/baseagent']);
+const GROUP_TASK_COMMANDS = new Set([
+    '/help', '/evolhelp', '/status', '/check', '/ask', '/pause', '/resume', '/stop', '/compact', '/renew',
+]);
+/** Group slash policy applies to every role, including old command-card clicks. */
+export function guardGroupSlashCommand(content, chatType) {
+    if (chatType !== 'group' || !content.trim().startsWith('/'))
+        return undefined;
+    const [inputCommand, ...args] = content.trim().split(/\s+/);
+    const command = aliases[inputCommand] ?? inputCommand;
+    if (GROUP_READ_ONLY_COMMANDS.has(command)) {
+        if (!args.length || (command === '/model' && args.length === 1 && ['current', 'list', 'check'].includes(args[0]))) {
+            return undefined;
+        }
+        return {
+            kind: 'command.error',
+            text: `❌ 群聊中 ${command} 仅支持查询，请在私聊或管理界面操作`,
+            reason: 'GROUP_COMMAND_READ_ONLY',
+        };
+    }
+    if (GROUP_TASK_COMMANDS.has(command))
+        return undefined;
+    return {
+        kind: 'command.error',
+        text: `❌ 群聊中不支持 ${inputCommand}，输入 /help 查看可用命令`,
+        reason: 'GROUP_COMMAND_UNSUPPORTED',
+    };
+}
 // 命令快速路径前缀（所有命令都不进入消息队列）
 const quickCommandPrefixes = ['/new', '/pwd', '/help', '/evolhelp', '/status', '/restart', '/reload', '/model', '/effort', '/baseagent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/pause', '/clear', '/compact', '/renew', '/del', '/perm', '/file', '/check', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/observable', '/chatmode', '/mentionmode', '/ask', '/resume', '/base ', '/aid', '/rpc', '/storage', '/agent', '/trigger', '/upgrade', '/pair'];
+quickCommandPrefixes.push('/diag');
 /**
  * 计算两个字符串的 Levenshtein 距离（编辑距离）
  */
@@ -95,7 +125,7 @@ function levenshteinDistance(str1, str2) {
     return matrix[len1][len2];
 }
 export function isQuickCommand(content) {
-    return content === '/s' || quickCommandPrefixes.some(cmd => exactBoundaryCommands.has(cmd)
+    return content === '/s' || content === '/base' || quickCommandPrefixes.some(cmd => exactBoundaryCommands.has(cmd)
         ? content === cmd || content.startsWith(cmd + ' ')
         : content.startsWith(cmd));
 }
@@ -131,7 +161,7 @@ export function guardRoleCommand(content, activeChatType, isAdmin) {
     const userGroupCommands = [
         '/status', '/help', '/evolhelp', '/check', '/chatmode', '/mentionmode',
         '/model', '/effort', '/baseagent', '/perm', '/activity', '/stop', '/pause',
-        '/resume', '/trigger', '/file',
+        '/resume', '/trigger', '/file', '/ask',
     ];
     const userCommands = activeChatType === 'group' && !isAdmin
         ? userGroupCommands
@@ -146,7 +176,7 @@ export function guardRoleCommand(content, activeChatType, isAdmin) {
     return {
         kind: 'command.error',
         text: activeChatType === 'group'
-            ? '❌ 无权限：当前群聊仅支持 /status 和 /help'
+            ? '❌ 无权限：此命令仅限管理员使用，输入 /help 查看可用命令'
             : '❌ 无权限：此命令仅限管理员使用',
     };
 }