evolcore 0.0.2 → 0.0.4

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

@@ -1,6 +1,6 @@
 import { logger } from '../../utils/logger.js';
 import { summarizeToolInput } from '../../utils/tool-summary.js';
-import { CONTEXT_TOO_LONG_PATTERN, getErrorMessage, isContextTooLongText } from '../../utils/error-utils.js';
+import { getErrorMessage, isContextTooLongText } from '../../utils/error-utils.js';
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../../paths.js';
@@ -289,6 +289,22 @@ export class IMRenderer {
         this.messageTimestamps.push(Date.now());
         this.scheduleFlush();
     }
+    /** interactive 下，以普通非最终文本发送用户需要看到的运行状态。 */
+    async sendOperationalNoticeAsText(text) {
+        if (!this.opts.operationalNoticesAsText || this.opts.envelope.chatmode === 'proactive' || !text)
+            return false;
+        // 保持与流式正文的到达顺序：先发出已缓冲的正文，再投影运行状态。
+        await this.flushText();
+        const payload = { kind: 'result.text', text, isFinal: false };
+        this.sentContent = true;
+        this.sendChain = this.sendChain
+            .then(() => this.opts.send(payload))
+            .catch(e => logger.warn('[IMRenderer] notice text send failed:', e));
+        await this.sendChain;
+        this.lastFlush = Date.now();
+        this.flushCount++;
+        return true;
+    }
     // ── 内部：interactive 模式聚合窗口 ──
     synthCallId() {
         return `synth-${this.opts.envelope.taskId}-${++this.syntheticCallSeq}`;
@@ -387,18 +403,6 @@ export class IMRenderer {
                     item.text = item.text.replace(this.opts.fileMarkerPattern, '');
             }
         }
-        if (isFinal) {
-            // 上下文错误短语过滤：剔除错误关键词本身，保留前后内容。
-            // 只在最终 flush 清理，避免中间定时 flush trim 掉 Markdown 块级换行。
-            const ctxErrPattern = new RegExp(CONTEXT_TOO_LONG_PATTERN.source, 'gi');
-            const stripCtxErr = (s) => s.replace(ctxErrPattern, '').trim();
-            this.textBuffer = stripCtxErr(this.textBuffer);
-            this.allText = stripCtxErr(this.allText);
-            for (const item of this.itemsQueue) {
-                if (item.kind === 'text')
-                    item.text = stripCtxErr(item.text);
-            }
-        }
         // 清掉空 text items
         const items = this.itemsQueue.filter(it => {
             if (it.kind === 'text')
@@ -419,7 +423,7 @@ export class IMRenderer {
             });
         }
         // 1. interactive 模式下：不发 text items（由 result.text 统一发送最终文本）
-        let itemsForBatch = this.suppressActivityItems() ? [] : items.filter(it => it.kind !== 'text');
+        const itemsForBatch = this.suppressActivityItems() ? [] : items.filter(it => it.kind !== 'text');
         if (itemsForBatch.length > 0) {
             const payload = { kind: 'activity.batch', items: itemsForBatch };
             this.sentContent = true;
@@ -589,6 +593,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/inbound-admission.js

@@ -0,0 +1,124 @@
+import { AccessPolicyError, readAccessPolicy, } from '../../config/access-policy.js';
+import { isAcceptedContact, resolveContactView, resolvePrincipal, } from '../../config/contact-book.js';
+export function evaluateInboundAdmissionPreflight(input) {
+    const selfAid = String(input.selfAid || '').trim();
+    const channelType = String(input.channelType || '').trim().toLowerCase();
+    const actorId = String(input.actorId || '').trim();
+    const context = {
+        selfAid,
+        channelKey: input.channelKey,
+        channelType,
+        chatType: input.chatType,
+        actorId,
+        trustedHandoffEcho: input.trustedHandoffEcho === true,
+        isOwner: false,
+    };
+    if (context.trustedHandoffEcho)
+        return { allow: true, context };
+    if (!selfAid)
+        return { allow: false, reason: 'invalid_identity', context };
+    if (input.chatType === 'private') {
+        const principal = resolvePrincipal(selfAid, channelType, actorId, input.channelKey);
+        context.principal = principal;
+        context.primaryId = principal.principalId;
+        if (principal.principalStatus === 'conflict') {
+            return { allow: false, reason: 'identity_conflict', context };
+        }
+        if (principal.principalStatus === 'error') {
+            return { allow: false, reason: 'identity_resolution_error', context };
+        }
+        if (channelType === 'aun' && principal.principalStatus !== 'native_aid') {
+            return { allow: false, reason: 'invalid_identity', context };
+        }
+        if (principal.principalId) {
+            try {
+                const contact = resolveContactView(selfAid, principal.principalId);
+                context.contactStatus = contact.status;
+                context.contactSource = contact.source;
+                context.isOwner = contact.isOwner;
+                if (contact.blocked)
+                    return { allow: false, reason: 'blocked', context };
+            }
+            catch {
+                return { allow: false, reason: 'identity_resolution_error', context };
+            }
+        }
+    }
+    try {
+        context.policy = readAccessPolicy(selfAid);
+    }
+    catch (error) {
+        if (error instanceof AccessPolicyError && error.code === 'restricted_mode_without_owner') {
+            return { allow: false, reason: 'restricted_mode_without_owner', context };
+        }
+        return { allow: false, reason: 'invalid_access_policy', context };
+    }
+    return { allow: true, context };
+}
+export function evaluateOrdinaryInboundAdmission(context) {
+    if (context.trustedHandoffEcho)
+        return { allow: true, reason: 'trusted_handoff', context };
+    const policy = context.policy;
+    if (!policy)
+        return { allow: false, reason: 'invalid_access_policy', context };
+    if (context.chatType === 'group') {
+        if (policy.policyMode === 'owners-only') {
+            return { allow: false, reason: 'owners_only', context };
+        }
+        // `open` is genuinely open: group traffic is not gated by the optional
+        // channel allow-list. In `contacts`, AUN groups are currently open once
+        // the agent is receiving that group; non-AUN channels remain explicit.
+        if (policy.policyMode === 'open'
+            || (policy.policyMode === 'contacts' && context.channelType === 'aun')) {
+            return { allow: true, reason: 'group_channel_allowed', context };
+        }
+        return policy.allowedGroupChannels.includes(context.channelKey)
+            ? { allow: true, reason: 'group_channel_allowed', context }
+            : { allow: false, reason: 'group_channel_denied', context };
+    }
+    if (context.isOwner)
+        return { allow: true, reason: 'owner', context };
+    if (policy.policyMode === 'open')
+        return { allow: true, reason: 'open', context };
+    if (policy.policyMode === 'owners-only')
+        return { allow: false, reason: 'owners_only', context };
+    if (context.primaryId && isAcceptedContact(context.selfAid, context.primaryId)) {
+        return { allow: true, reason: 'contact', context };
+    }
+    return { allow: false, reason: 'contact_required', context };
+}
+const principalReplyBuckets = new Map();
+const channelReplyBuckets = new Map();
+const PRINCIPAL_REPLY_MAX = 3;
+const PRINCIPAL_REPLY_WINDOW_MS = 60 * 60 * 1000;
+/** Atomically consume both admission-control reply budgets. */
+export function consumeAdmissionReplyBudget(context, now = Date.now()) {
+    const principalKey = `${context.selfAid}\0${context.primaryId || context.actorId || '<unknown>'}`;
+    const channelKey = `${context.selfAid}\0${context.channelKey}`;
+    const policy = context.policy;
+    const maxTimes = policy?.requestLimit.maxTimes ?? 600;
+    const coolDownMs = (policy?.requestLimit.coolDown ?? 60 * 60) * 1000;
+    if (!canConsume(principalReplyBuckets.get(principalKey), PRINCIPAL_REPLY_MAX, PRINCIPAL_REPLY_WINDOW_MS, now)) {
+        return false;
+    }
+    if (!canConsume(channelReplyBuckets.get(channelKey), maxTimes, coolDownMs, now))
+        return false;
+    consume(principalReplyBuckets, principalKey, PRINCIPAL_REPLY_WINDOW_MS, now);
+    consume(channelReplyBuckets, channelKey, coolDownMs, now);
+    return true;
+}
+export function clearAdmissionReplyBudgets() {
+    principalReplyBuckets.clear();
+    channelReplyBuckets.clear();
+}
+function canConsume(bucket, limit, windowMs, now) {
+    return !bucket || now - bucket.windowStart >= windowMs || bucket.count < limit;
+}
+function consume(buckets, key, windowMs, now) {
+    const bucket = buckets.get(key);
+    if (!bucket || now - bucket.windowStart >= windowMs) {
+        buckets.set(key, { count: 1, windowStart: now });
+        return;
+    }
+    bucket.count += 1;
+}