evolcore 0.0.2 → 0.0.3

package/dist/core/daemon-file-cache.js

@@ -12,7 +12,7 @@
  * 策略（reload/重启永远全量失效，无视策略；策略只决定"平时每次读怎么检查"）：
  *  - on-reload：平时不检查，直接用缓存（kits 文件、persona）。靠 reload/重启刷新。
  *  - manual：同 on-reload，额外支持显式 invalidate(file) 单刷。
- *  - mtime：每次读 statSync 门控 mtime，变了自动重读（working.md、config.json）。
+ *  - mtime：每次读 statSync 门控 size + mtime，变了自动重读（working.md、config.json）。
  *
  * 容量：项数可无界增长的组（如 relation-prefs，每 peer 一文件）设 LRU 硬上限
  * （见 GROUP_CAPS），命中/写入移到末尾、超限驱逐同组最旧项；无 timer。
@@ -71,9 +71,9 @@ export class FileCache {
         const read = opts.read ?? readFileOrNull;
         this.bump(opts.group, opts.policy, 'gets');
         if (opts.policy === 'mtime') {
-            const mtimeMs = statMtime(file);
+            const fingerprint = statFingerprint(file);
             this.bump(opts.group, opts.policy, 'statChecks');
-            if (existing && existing.mtimeMs === mtimeMs) {
+            if (existing && sameFingerprint(existing.fingerprint, fingerprint)) {
                 this.bump(opts.group, opts.policy, 'hits');
                 this.touch(file, existing);
                 return existing.value;
@@ -84,7 +84,7 @@ export class FileCache {
             this.bump(opts.group, opts.policy, 'misses');
             const raw = read(file);
             const value = loader(raw);
-            this.store(file, { policy: 'mtime', group: opts.group, mtimeMs, value, bytes: approxBytes(raw) });
+            this.store(file, { policy: 'mtime', group: opts.group, fingerprint, value, bytes: approxBytes(raw) });
             return value;
         }
         // on-reload / manual：命中即用，不检查文件
@@ -192,14 +192,20 @@ export class FileCache {
         };
     }
 }
-function statMtime(file) {
+function statFingerprint(file) {
     try {
-        return fs.statSync(file).mtimeMs;
+        const stat = fs.statSync(file);
+        return { size: stat.size, mtimeMs: stat.mtimeMs };
     }
     catch {
         return null; // 文件不存在
     }
 }
+function sameFingerprint(left, right) {
+    if (left === null || right === null)
+        return left === right;
+    return !!left && left.size === right.size && left.mtimeMs === right.mtimeMs;
+}
 function readFileOrNull(file) {
     try {
         return fs.readFileSync(file, 'utf-8');

package/dist/core/event-catalog.js

@@ -355,6 +355,76 @@ const CATALOG = [
             { path: 'preTokens', type: 'number' },
         ],
     },
+    {
+        type: 'runner:task-started',
+        namespace: 'runner',
+        name: 'task-started',
+        description: 'Runner 子任务已创建',
+        fields: [
+            { path: 'sessionId', type: 'string' },
+            { path: 'taskId', type: 'string' },
+            { path: 'taskKind', type: 'string' },
+            { path: 'toolUseId', type: 'string', optional: true },
+            { path: 'description', type: 'string' },
+            { path: 'subagentType', type: 'string', optional: true },
+            { path: 'taskType', type: 'string', optional: true },
+            { path: 'workflowName', type: 'string', optional: true },
+            { path: 'prompt', type: 'string', optional: true },
+            { path: 'skipTranscript', type: 'boolean', optional: true },
+            { path: 'timestamp', type: 'number', optional: true },
+        ],
+    },
+    {
+        type: 'runner:task-progress',
+        namespace: 'runner',
+        name: 'task-progress',
+        description: 'Runner 子任务进度',
+        fields: [
+            { path: 'sessionId', type: 'string' },
+            { path: 'taskId', type: 'string', optional: true },
+            { path: 'taskKind', type: 'string', optional: true },
+            { path: 'toolUseId', type: 'string', optional: true },
+            { path: 'description', type: 'string', optional: true },
+            { path: 'subagentType', type: 'string', optional: true },
+            { path: 'summary', type: 'string', optional: true },
+            { path: 'lastToolName', type: 'string', optional: true },
+            { path: 'totalTokens', type: 'number', optional: true },
+            { path: 'toolUses', type: 'number', optional: true },
+            { path: 'durationMs', type: 'number', optional: true },
+            { path: 'timestamp', type: 'number', optional: true },
+        ],
+    },
+    {
+        type: 'runner:task-notification',
+        namespace: 'runner',
+        name: 'task-notification',
+        description: 'Runner 子任务终态和输出',
+        fields: [
+            { path: 'sessionId', type: 'string' },
+            { path: 'taskId', type: 'string' },
+            { path: 'taskKind', type: 'string' },
+            { path: 'toolUseId', type: 'string', optional: true },
+            { path: 'description', type: 'string', optional: true },
+            { path: 'subagentType', type: 'string', optional: true },
+            { path: 'status', type: 'string' },
+            { path: 'outputFile', type: 'string', optional: true },
+            { path: 'summary', type: 'string', optional: true },
+            { path: 'usage', type: 'object', optional: true },
+            { path: 'skipTranscript', type: 'boolean', optional: true },
+            { path: 'timestamp', type: 'number', optional: true },
+        ],
+    },
+    {
+        type: 'runner:background-tasks-changed',
+        namespace: 'runner',
+        name: 'background-tasks-changed',
+        description: 'Runner 后台任务集合变化',
+        fields: [
+            { path: 'sessionId', type: 'string' },
+            { path: 'tasks', type: 'array' },
+            { path: 'timestamp', type: 'number', optional: true },
+        ],
+    },
     {
         type: 'runner:model-changed',
         namespace: 'runner',

package/dist/core/evolagent-registry.js

@@ -129,7 +129,6 @@ export class EvolAgentRegistry {
                 aid: raw.aid,
                 enabled: raw.enabled,
                 owners: raw.owners,
-                admins: raw.admins,
                 channels: Array.isArray(raw.channels) ? raw.channels : [],
                 active_baseagent: raw.active_baseagent,
                 baseagents: raw.baseagents,

package/dist/core/evolagent.js

@@ -1,9 +1,11 @@
 import path from 'path';
-import { formatChannelKey } from './channel-loader.js';
+import { formatChannelKey, tryParseChannelKey } from './channel-loader.js';
 import { agentPersonalDir } from '../paths.js';
 import { fileCache } from './daemon-file-cache.js';
 import { ConfigTarget, read as cfgRead, write as cfgWrite, ensureFile as cfgEnsure, resolveEffective } from '../config/config-manager.js';
 import { withLifecycleForWrite } from '../config/lifecycle.js';
+import { isStaticAgentAdmin, isStaticAgentOwner } from '../config/peer-role-resolver.js';
+import { resolvePrincipal } from '../config/contact-book.js';
 /**
  * EvolAgent —— 一个 self-agent 的运行时表示。
  *
@@ -123,19 +125,28 @@ export class EvolAgent {
     /**
      * Check if a user has owner role for this agent (private scope).
      */
-    isOwner(_channelKey, userId) {
-        if (this.merged.owners?.includes(userId))
-            return true;
-        return false;
+    isOwner(channelKey, userId) {
+        const principalId = this.managementPrincipal(channelKey, userId);
+        return !!principalId && isStaticAgentOwner(this.aid, principalId);
     }
     /**
      * Check if a user has admin role for this agent (private scope).
-     * Uses static owners/admins from agent config.
+     * Owner remains in Agent config; admin is resolved from the direct AUN relation.
      */
-    isAdmin(_channelKey, userId) {
-        if (this.isOwner(_channelKey, userId))
+    isAdmin(channelKey, userId) {
+        const principalId = this.managementPrincipal(channelKey, userId);
+        if (!principalId)
+            return false;
+        if (isStaticAgentOwner(this.aid, principalId))
             return true;
-        return this.merged.admins?.includes(userId) ?? false;
+        return isStaticAgentAdmin(this.aid, principalId);
+    }
+    managementPrincipal(channelKey, userId) {
+        const channelType = tryParseChannelKey(channelKey)?.type ?? String(channelKey || '').split('#')[0];
+        const resolution = resolvePrincipal(this.aid, channelType, userId, channelKey);
+        return resolution.principalStatus === 'native_aid' || resolution.principalStatus === 'mapped'
+            ? resolution.principalId ?? null
+            : null;
     }
     /**
      * Get the first owner of this agent (private scope).

package/dist/core/message/im-renderer.js

@@ -589,6 +589,8 @@ export class IMRenderer {
                 return { kind: 'notice', text, severity: 'warn' };
             }
             case 'complete': {
+                if (event.queryFinal === false)
+                    return null;
                 // 上下文过长错误不输出（留给外层 auto-compact 处理）
                 const hasContextError = event.terminalReason === 'prompt_too_long'
                     || isContextTooLongText(event.errors?.join(' ') || '')

package/dist/core/message/message-bridge.js

@@ -5,14 +5,58 @@ import { appendMessageLog, appendMessageLogStrict, buildInboundEntry, isTransien
 import { buildEnvelope } from './message-utils.js';
 import { chatDirPath } from '../session/session-fs-store.js';
 import { tryParseChannelKey } from '../channel-loader.js';
-import { resolvePaths } from '../../paths.js';
+import { agentDir, resolvePaths } from '../../paths.js';
 import { resolvePeerRoleDetail } from '../../config/peer-role-resolver.js';
+import { isBlockedContact, resolveContactView } from '../../config/contact-book.js';
+import { isValidAid } from '../../aun/aid/validation.js';
+import { PeerIdentityCache } from '../relation/peer-identity.js';
 import { handlePendingDingtalkContactBindMessage } from '../../channels/dingtalk.js';
+import { handlePendingWecomContactBindMessage } from '../../channels/wecom.js';
 import { authorizeAccess, buildAuthSubject } from '../auth/auth-gateway.js';
 import { MenuDiagnosticLimiter, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, menuSuccess, normalizeMenuError, parseMenuControl, validateMenuRequest, } from '../command/menu-protocol.js';
 import { SessionRenewService } from '../session/session-renew.js';
 import { createRootCausation, deriveCausation, normalizeCausation } from '../causation/context.js';
 import { recordCausationSpan } from '../causation/audit.js';
+const CONTACT_REJECTION_NOTICE = '[rejection] Not accepting messages from you.';
+const REJECTABLE_PEER_TYPES = new Set(['ai', 'bot', 'agent', 'service']);
+const REJECTION_MAX = 3;
+const REJECTION_WINDOW_MS = 60 * 60 * 1000;
+const rejectionState = new Map();
+export function shouldBlockInboundContact(input) {
+    if (String(input.channelType || '').trim().toLowerCase() !== 'aun' || !input.selfAid) {
+        return { blocked: false, status: 'unsupported-channel' };
+    }
+    if (input.chatType !== 'private')
+        return { blocked: false, status: 'unsupported-chat' };
+    const primaryId = String(input.actorId || '').trim();
+    if (!isValidAid(primaryId))
+        return { blocked: false, status: 'invalid-aid' };
+    if (input.chatType === 'private' && resolveContactView(input.selfAid, primaryId).isOwner) {
+        return { blocked: false, status: 'owner-exempt', primaryId };
+    }
+    return {
+        blocked: isBlockedContact(input.selfAid, primaryId),
+        status: 'resolved',
+        primaryId,
+    };
+}
+export function shouldSendContactRejection(peerType, selfAid, primaryId, now = Date.now()) {
+    if (!REJECTABLE_PEER_TYPES.has(String(peerType || '').trim().toLowerCase()))
+        return false;
+    const key = `${selfAid}\0${primaryId}`;
+    const state = rejectionState.get(key);
+    if (!state || now - state.windowStart >= REJECTION_WINDOW_MS) {
+        rejectionState.set(key, { count: 1, windowStart: now });
+        return true;
+    }
+    if (state.count >= REJECTION_MAX)
+        return false;
+    state.count += 1;
+    return true;
+}
+export function clearContactRejectionRateLimits() {
+    rejectionState.clear();
+}
 /**
  * MessageBridge — Channel 与 Core 之间的消息桥梁
  *
@@ -119,6 +163,25 @@ export class MessageBridge {
                 const conversationId = chatType === 'group' ? (msg.groupId || msg.channelId) : msg.peerId;
                 const selfAid = msg.selfAID || owningAgent?.aid || parsedChannelKey?.selfAID;
                 const resolvedChannelType = msg.channelType || parsedChannelKey?.type || effectiveChannelType;
+                const blockDecision = shouldBlockInboundContact({
+                    selfAid,
+                    channelType: resolvedChannelType,
+                    chatType,
+                    actorId,
+                    conversationId,
+                });
+                if (blockDecision.blocked && selfAid && blockDecision.primaryId) {
+                    let peerType = msg.peerType;
+                    if (chatType === 'private' && !peerType) {
+                        peerType = PeerIdentityCache.get('aun', blockDecision.primaryId, agentDir(selfAid))?.type;
+                    }
+                    if (chatType === 'private'
+                        && shouldSendContactRejection(peerType, selfAid, blockDecision.primaryId)) {
+                        await sendReply(msg.channelId, CONTACT_REJECTION_NOTICE, msg.replyContext);
+                    }
+                    logger.info(`[MessageBridge] Blocked AUN inbound before business routing: self=${selfAid} peer=${blockDecision.primaryId} type=${peerType ?? 'unknown'} chatType=${chatType}`);
+                    return;
+                }
                 const menuControl = resolvedChannelType === 'aun'
                     ? parseMenuControl(content)
                     : { isMenu: false };
@@ -136,16 +199,21 @@ export class MessageBridge {
                     }
                 }
                 if (!menuControl.isMenu) {
-                    const contactBind = handlePendingDingtalkContactBindMessage({
+                    const bindContext = {
                         selfAid,
                         channelName: channelKey,
                         channelType: resolvedChannelType,
                         chatType,
                         actorId,
                         content,
-                    });
+                    };
+                    const contactBind = resolvedChannelType === 'dingtalk'
+                        ? handlePendingDingtalkContactBindMessage(bindContext)
+                        : resolvedChannelType === 'wecom'
+                            ? handlePendingWecomContactBindMessage(bindContext)
+                            : { handled: false };
                     if (contactBind.handled) {
-                        logger.info(`[MessageBridge] DingTalk contact bind handled: channel=${channelKey} actor=${actorId ?? '<none>'} status=${contactBind.status}`);
+                        logger.info(`[MessageBridge] ${resolvedChannelType} contact bind handled: channel=${channelKey} actor=${actorId ?? '<none>'} status=${contactBind.status}`);
                         if (contactBind.reply) {
                             await sendReply(msg.channelId, contactBind.reply, msg.replyContext);
                         }
@@ -236,7 +304,7 @@ export class MessageBridge {
                     logger.debug(`[MessageBridge] Command detected: "${cmdContent}", routing to handler`);
                     // 命令也要记录入方向 jsonl（不创建 session，直接用 chatDirPath 计算路径）
                     try {
-                        const chatDir = chatDirPath(resolvePaths().sessionsDir, msg.channelType || effectiveChannelType, msg.channelId, msg.selfAID || '');
+                        const chatDir = chatDirPath(resolvePaths().sessionsDir, msg.channelType || effectiveChannelType, msg.channelId, msg.selfAID || '', channelKey);
                         const inboundEncrypt = msg.replyContext?.metadata?.encrypted != null ? !!(msg.replyContext.metadata.encrypted) : undefined;
                         const inboundChatmode = msg.replyContext?.metadata?.chatmode;
                         const inboundReplyTo = typeof msg.replyContext?.metadata?.refMessageId === 'string'
@@ -429,8 +497,11 @@ export class MessageBridge {
                 //    ACK 在到达时立即做（每条独立 ACK），不等合并
                 //    Interrupt 模式（单聊）→ 入队前 debounce 合并
                 //    FIFO 模式（群聊）    → 跳过 debouncer，独立入队，出队时贪心合并
-                //    优化：队列空闲时跳过 Pin 表情，直接在开始执行时添加 CheckMark
-                if (fullMessage.messageId && this.messageQueue.getGlobalProcessingCount() > 0) {
+                //    优化：当前会话队列空闲时跳过 Pin，直接在开始执行时添加 CheckMark。
+                //    不能使用全局 processing 数，否则其他会话正在执行也会让本会话误显示“已排队”。
+                const currentSessionBusy = (this.messageQueue.isProcessing?.(session.id) ?? false)
+                    || (this.messageQueue.getQueueLength?.(session.id) ?? 0) > 0;
+                if (fullMessage.messageId && currentSessionBusy) {
                     adapter?.acknowledge?.(fullMessage.messageId).catch(() => { });
                 }
                 const isInterrupt = chatType !== 'group' && !handoffCandidate;
@@ -726,7 +797,7 @@ export class MessageBridge {
         if (!this.cmdHandler.isCommand(content))
             return false;
         logger.info(`[${channel}] ${channelId}: ${content}${source === 'card-trigger' ? ' [card]' : ''}`);
-        const cmdResult = await this.cmdHandler.handle(content, channel, channelId, (_cid, text, opts) => sendReply(text), userId, threadId, chatType, source, messageId, selfAID, authSubject?.identity, authSubject);
+        const cmdResult = await this.cmdHandler.handle(content, channel, channelId, (_cid, text, opts) => sendReply(text), userId, threadId, chatType, source, messageId, selfAID, authSubject?.identity, authSubject, replyContext);
         logger.debug(`[MessageBridge] handleCommand: result type=${typeof cmdResult}`);
         if (cmdResult === undefined)
             return false;

package/dist/core/message/message-queue.js

@@ -856,6 +856,7 @@ export class MessageQueue {
      * - items: 保留每条子消息（含各自 peer/timestamp），供消息渲染层逐条渲染
      * - images / mentions: 扁平合并
      * - messageId: 取最新一条的 messageId（用于 thought 锚定与中断追踪）
+     * - sourceMessageIds: 保留全部原始入站消息 ID（用于渠道确认状态批量迁移）
      * - replyContext / peerName / 其余字段: 取最后一条
      */
     mergeItems(items) {
@@ -864,6 +865,8 @@ export class MessageQueue {
         const allMentions = [];
         const subMessages = [];
         let mergedPeerType;
+        const sourceMessageIds = [];
+        const seenSourceMessageIds = new Set();
         let hasRestartResume = false;
         let hasMessagesAfterRestartResume = false;
         for (const item of items) {
@@ -879,6 +882,12 @@ export class MessageQueue {
                 allImages.push(...m.images);
             if (m.mentions)
                 allMentions.push(...m.mentions);
+            for (const id of [...(m.sourceMessageIds ?? []), ...(m.messageId ? [m.messageId] : [])]) {
+                if (!seenSourceMessageIds.has(id)) {
+                    seenSourceMessageIds.add(id);
+                    sourceMessageIds.push(id);
+                }
+            }
             if (m.peerType && m.peerType !== 'human') {
                 mergedPeerType = m.peerType;
             }
@@ -919,6 +928,7 @@ export class MessageQueue {
             images: allImages.length > 0 ? allImages : undefined,
             mentions: allMentions.length > 0 ? allMentions : undefined,
             messageId: latestMessageId,
+            sourceMessageIds: sourceMessageIds.length > 0 ? sourceMessageIds : undefined,
             // 密文优先：合并批次内任一条密文，则整轮（interactive 自动回复的单值出站）按密文。
             // 任一条 encrypted===true 即 true；否则若有明确的 false 则 false；全 undefined（非 aun）则 undefined。
             encrypted: subMessages.some(s => s.encrypted === true)

package/dist/core/message/message-utils.js

@@ -8,8 +8,10 @@ import { renderCommandCardAsText, renderActionAsText } from '../interaction-rout
  * 构造出站消息信封
  */
 export function buildEnvelope(opts) {
+    const taskId = opts.taskId ?? `interaction-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
     return {
-        taskId: opts.taskId ?? `interaction-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+        taskId,
+        operationId: opts.operationId ?? taskId,
         sessionId: opts.sessionId,
         channel: opts.channel,
         channelId: opts.channelId,
@@ -61,7 +63,11 @@ export async function sendInteractionPayload(adapter, envelope, interaction, fal
         const enriched = replyCtx
             ? { ...envelope, replyContext: replyCtx }
             : envelope;
-        await adapter.send(enriched, payload);
+        const receipt = await adapter.send(enriched, payload);
+        if (receipt?.status === 'suppressed')
+            return false;
+        if (receipt?.status === 'sent')
+            return receipt.messages[0]?.messageId || false;
         return 'sent';
     }
     catch {