evolcore 0.0.20 → 0.0.21

package/dist/core/handoff/store.js

@@ -9,6 +9,7 @@ import { HANDOFF_SCHEMA_VERSION, HANDOFF_QUERY_DEFAULT_LIMIT, HANDOFF_QUERY_MAX_
 import { normalizeCausation } from '../causation/context.js';
 const SAFE_ID_RE = /^[A-Za-z0-9._-]+$/;
 export const HANDOFF_ID_RE = /^h-[A-Za-z0-9._-]+$/;
+const HANDOFF_SNAPSHOT_FILE_RE = /^(h-[A-Za-z0-9._-]+)\.json(?:__?)?$/;
 const TERMINAL_HANDOFF_STATES = new Set(['failed', 'completed', 'discarded']);
 function safeSegment(value, field) {
     if (!value || !SAFE_ID_RE.test(value) || value === '.' || value === '..') {
@@ -55,13 +56,16 @@ export class HandoffStore {
             ? path.join(this.rootDir, aid, 'data', 'handoff')
             : path.join(this.rootDir, aid);
     }
-    handoffsDir(selfAid) {
-        return path.join(this.agentDir(selfAid), 'handoffs');
-    }
     instancePath(selfAid, handoffId) {
         if (!HANDOFF_ID_RE.test(handoffId))
             throw new Error('invalid handoff_id');
-        return path.join(this.handoffsDir(selfAid), safeSegment(handoffId, 'handoff_id'), 'handoff.json');
+        return path.join(this.agentDir(selfAid), `${safeSegment(handoffId, 'handoff_id')}.json`);
+    }
+    /** Read the pre-flat layout during the transition to the flat store. */
+    legacyInstancePath(selfAid, handoffId) {
+        if (!HANDOFF_ID_RE.test(handoffId))
+            throw new Error('invalid handoff_id');
+        return path.join(this.agentDir(selfAid), 'handoffs', safeSegment(handoffId, 'handoff_id'), 'handoff.json');
     }
     historyPath(selfAid) {
         return path.join(this.agentDir(selfAid), 'history.jsonl');
@@ -147,7 +151,8 @@ export class HandoffStore {
     get(selfAid, handoffId) {
         if (!HANDOFF_ID_RE.test(handoffId))
             return null;
-        const parsed = atomicReadJson(this.instancePath(selfAid, handoffId));
+        const parsed = atomicReadJson(this.instancePath(selfAid, handoffId))
+            ?? atomicReadJson(this.legacyInstancePath(selfAid, handoffId));
         if (!parsed)
             return null;
         if (parsed.schema_version !== HANDOFF_SCHEMA_VERSION || parsed.handoff_id !== handoffId) {
@@ -156,14 +161,32 @@ export class HandoffStore {
         return parsed;
     }
     list(selfAid) {
-        const dir = this.handoffsDir(selfAid);
+        const dir = this.agentDir(selfAid);
         if (!fs.existsSync(dir))
             return [];
-        const result = [];
+        const handoffIds = new Set();
         for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-            if (!entry.isDirectory() || !HANDOFF_ID_RE.test(entry.name))
+            if (!entry.isFile())
                 continue;
-            const instance = this.get(selfAid, entry.name);
+            const match = HANDOFF_SNAPSHOT_FILE_RE.exec(entry.name);
+            if (match && HANDOFF_ID_RE.test(match[1]))
+                handoffIds.add(match[1]);
+        }
+        // Keep nested snapshots visible; a later flat snapshot takes precedence.
+        const legacyDir = path.join(dir, 'handoffs');
+        try {
+            for (const entry of fs.readdirSync(legacyDir, { withFileTypes: true })) {
+                if (entry.isDirectory() && HANDOFF_ID_RE.test(entry.name))
+                    handoffIds.add(entry.name);
+            }
+        }
+        catch (error) {
+            if (error.code !== 'ENOENT')
+                throw error;
+        }
+        const result = [];
+        for (const handoffId of handoffIds) {
+            const instance = this.get(selfAid, handoffId);
             if (instance)
                 result.push(instance);
         }

package/dist/core/inference/text-inference.js

@@ -1,5 +1,6 @@
 import { normalizeBaseagent, resolveAnthropicDirectConfig, resolveEcagentConfig, resolveOpenaiDirectConfig, } from '../../agents/baseagent.js';
 import { buildModelRequestHeaders } from '../../agents/request-identity.js';
+import { appendRequestQueryParams } from '../../agents/request-identity.js';
 function apiEndpoint(baseUrl, resource) {
     const configured = baseUrl?.trim();
     if (!configured)
@@ -11,14 +12,6 @@ function apiEndpoint(baseUrl, resource) {
         : `${pathname}/v1/${resource}`;
     return parsed.toString();
 }
-function withQueryParams(url, queryParams) {
-    if (!queryParams || Object.keys(queryParams).length === 0)
-        return url;
-    const parsed = new URL(url);
-    for (const [name, value] of Object.entries(queryParams))
-        parsed.searchParams.set(name, value);
-    return parsed.toString();
-}
 async function parseError(response) {
     let raw = '';
     try {
@@ -41,7 +34,7 @@ export class AnthropicTextInferenceProvider {
         this.config = config;
     }
     async completeText(request) {
-        const response = await fetch(withQueryParams(apiEndpoint(this.config.baseUrl, 'messages'), this.config.queryParams), {
+        const response = await fetch(appendRequestQueryParams(apiEndpoint(this.config.baseUrl, 'messages'), this.config.queryParams), {
             method: 'POST',
             signal: request.signal,
             headers: { ...this.headers(), ...this.config.headers },
@@ -82,7 +75,7 @@ export class OpenAITextInferenceProvider {
         this.config = config;
     }
     async completeText(request) {
-        const response = await fetch(withQueryParams(apiEndpoint(this.config.baseUrl, 'responses'), this.config.queryParams), {
+        const response = await fetch(appendRequestQueryParams(apiEndpoint(this.config.baseUrl, 'responses'), this.config.queryParams), {
             method: 'POST',
             signal: request.signal,
             headers: {
@@ -118,20 +111,20 @@ export class OpenAITextInferenceProvider {
 export class EcagentTextInferenceProvider {
     config;
     baseagent = 'ecagent';
-    constructor(config) {
+    constructor(config, agentAid) {
         this.config = config;
         this.config = {
             ...config,
             headers: buildModelRequestHeaders({
                 baseagent: 'ecagent',
                 baseUrl: config.baseUrl,
-                agentAid: config.evolcoreAgentAid,
+                agentAid,
                 configuredHeaders: config.headers,
             }),
         };
     }
     async completeText(request) {
-        const response = await fetch(apiEndpoint(this.config.baseUrl, 'chat/completions'), {
+        const response = await fetch(appendRequestQueryParams(apiEndpoint(this.config.baseUrl, 'chat/completions'), this.config.queryParams), {
             method: 'POST',
             signal: request.signal,
             headers: {
@@ -190,10 +183,9 @@ export function createTextInferenceProvider(baseagent, config) {
         try {
             const override = {
                 ...(config.baseagents?.ecagent ?? {}),
-                evolcoreAgentAid: config.aid,
             };
             const resolved = resolveEcagentConfig({ agents: { ecagent: override } }, override);
-            return new EcagentTextInferenceProvider(resolved);
+            return new EcagentTextInferenceProvider(resolved, config.aid);
         }
         catch {
             return undefined;

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

@@ -1,23 +1,7 @@
 import { logger } from '../../utils/logger.js';
 import { summarizeToolInput } from '../../utils/tool-summary.js';
 import { getErrorMessage, isContextTooLongText } from '../../utils/error-utils.js';
-import fs from 'fs';
-import path from 'path';
-import { resolvePaths } from '../../paths.js';
 import { DEFAULT_FLUSH_DELAY_MS } from '../../types.js';
-let diagStream = null;
-function getDiagStream() {
-    if (!diagStream) {
-        const logDir = resolvePaths().logs;
-        diagStream = fs.createWriteStream(path.join(logDir, 'im-renderer-diag.log'), { flags: 'a' });
-    }
-    return diagStream;
-}
-function diag(instanceId, action, meta = {}) {
-    const line = JSON.stringify({ ts: new Date().toISOString(), id: instanceId, action, ...meta });
-    getDiagStream().write(line + '\n');
-}
-let instanceCounter = 0;
 export class IMRenderer {
     opts;
     itemsQueue = [];
@@ -28,8 +12,6 @@ export class IMRenderer {
     sentContent = false;
     flushCount = 0;
     messageTimestamps = [];
-    instanceId;
-    diagEnabled;
     /** 串行发送队列：保证消息按序到达 */
     sendChain = Promise.resolve();
     /** proactive：是否已发过 text 文本（用于去重 complete.result） */
@@ -38,16 +20,6 @@ export class IMRenderer {
     syntheticCallSeq = 0;
     constructor(opts) {
         this.opts = opts;
-        this.diagEnabled = opts.diagEnabled ?? false;
-        this.instanceId = `R${++instanceCounter}`;
-        if (this.diagEnabled) {
-            diag(this.instanceId, 'created', {
-                chatmode: opts.envelope.chatmode,
-                flushDelay: opts.flushDelay,
-                suppressActivityItems: this.suppressActivityItems(),
-                suppressIntermediateText: this.suppressIntermediateText(),
-            });
-        }
     }
     suppressActivityItems() {
         return this.opts.suppressActivityItems ?? this.opts.suppressActivities ?? false;
@@ -138,10 +110,14 @@ export class IMRenderer {
         this.itemsQueue = this.itemsQueue.filter(it => it.kind !== 'text');
         const payload = { kind: 'result.text', text: rawText, isFinal: false };
         this.sentContent = true;
-        this.sendChain = this.sendChain
-            .then(() => this.opts.send(payload))
-            .catch(e => logger.warn('[IMRenderer] flushText send failed:', e));
-        await this.sendChain;
+        try {
+            await this.sendPayload(payload);
+        }
+        catch (error) {
+            // A failed durable enqueue must remain retryable by the final flush.
+            this.textBuffer = rawText + this.textBuffer;
+            throw error;
+        }
         this.lastFlush = Date.now();
         this.flushCount++;
     }
@@ -195,13 +171,6 @@ export class IMRenderer {
         this.textBuffer += text;
         this.allText += text;
         this.messageTimestamps.push(Date.now());
-        if (this.diagEnabled) {
-            diag(this.instanceId, 'addText', {
-                len: text.length,
-                preview: text.substring(0, 60),
-                bufLen: this.textBuffer.length,
-            });
-        }
         this.scheduleFlush();
     }
     /** 添加工具调用 */
@@ -219,8 +188,6 @@ export class IMRenderer {
             text: descText,
         });
         this.messageTimestamps.push(Date.now());
-        if (this.diagEnabled)
-            diag(this.instanceId, 'addToolCall', { name, callId });
         this.scheduleFlush();
     }
     /** 添加工具结果 */
@@ -241,8 +208,6 @@ export class IMRenderer {
             ...(descText !== undefined && { text: descText }),
         });
         this.messageTimestamps.push(Date.now());
-        if (this.diagEnabled)
-            diag(this.instanceId, 'addToolResult', { name, ok, callId });
         this.scheduleFlush();
     }
     /** 添加进度提示 */
@@ -330,10 +295,7 @@ export class IMRenderer {
         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;
+        await this.sendPayload(payload);
         this.lastFlush = Date.now();
         this.flushCount++;
         return true;
@@ -342,10 +304,48 @@ export class IMRenderer {
     synthCallId() {
         return `synth-${this.opts.envelope.taskId}-${++this.syntheticCallSeq}`;
     }
+    /** Convert a structured failed receipt into the same error shape as a rejected sender. */
+    receiptError(receipt) {
+        return Object.assign(new Error(receipt.error), {
+            code: receipt.code,
+            outboxId: receipt.outboxId,
+            operationId: receipt.operationId,
+            status: receipt.status,
+        });
+    }
+    isOutboxFull(error) {
+        const value = error && typeof error === 'object' ? error : {};
+        const cause = value.cause && typeof value.cause === 'object'
+            ? value.cause
+            : undefined;
+        return value.code === 'OUTBOX_FULL' || cause?.code === 'OUTBOX_FULL';
+    }
+    /**
+     * Serialize durable sends while keeping the chain usable after a rejected
+     * operation. Activity queue saturation is best-effort: it is logged, but
+     * must not prevent the final response from being sent.
+     */
+    sendPayload(payload) {
+        const operation = this.sendChain.then(async () => {
+            const receipt = await this.opts.send(payload);
+            if (receipt?.status === 'failed') {
+                throw this.receiptError(receipt);
+            }
+        });
+        const handled = operation.catch(error => {
+            if (payload.kind === 'activity.batch' && this.isOutboxFull(error)) {
+                logger.warn(`[IMRenderer] activity outbox full; continuing without activity batch: ${error instanceof Error ? error.message : String(error)}`);
+                return;
+            }
+            throw error;
+        });
+        // A failed operation must not poison later sends. The caller still gets
+        // the rejection through `handled`, while the internal tail is recovered.
+        this.sendChain = handled.catch(() => { });
+        return handled;
+    }
     scheduleFlush() {
         if (this.timer) {
-            if (this.diagEnabled)
-                diag(this.instanceId, 'scheduleFlush:skip', { reason: 'timer_exists' });
             return;
         }
         const interval = this.opts.flushDelay ?? DEFAULT_FLUSH_DELAY_MS;
@@ -364,15 +364,11 @@ export class IMRenderer {
         }
         const elapsed = Date.now() - this.lastFlush;
         const delay = Math.max(0, targetDelay - elapsed);
-        if (this.diagEnabled) {
-            diag(this.instanceId, 'scheduleFlush:set', {
-                flushCount: this.flushCount,
-                targetDelay,
-                elapsed,
-                actualDelay: delay,
+        this.timer = setTimeout(() => {
+            void this.flushInternal().catch(error => {
+                logger.warn(`[IMRenderer] scheduled flush failed: ${error instanceof Error ? error.message : String(error)}`);
             });
-        }
-        this.timer = setTimeout(() => this.flushInternal(), delay);
+        }, delay);
     }
     calculateDynamicDelay(interval) {
         const recent = this.messageTimestamps.slice(-10);
@@ -402,13 +398,14 @@ export class IMRenderer {
         if (this.suppressActivityItems())
             return;
         const payload = { kind: 'activity.batch', items: nonThinking };
-        if (this.diagEnabled)
-            diag(this.instanceId, 'flushActivitiesOnly', { itemCount: nonThinking.length });
         this.sentContent = true;
-        this.sendChain = this.sendChain
-            .then(() => this.opts.send(payload))
-            .catch(e => logger.warn('[IMRenderer] activity.batch send failed:', e));
-        await this.sendChain;
+        try {
+            await this.sendPayload(payload);
+        }
+        catch (error) {
+            this.itemsQueue = [...nonThinking, ...this.itemsQueue];
+            throw error;
+        }
         this.lastFlush = Date.now();
         this.flushCount++;
     }
@@ -446,24 +443,20 @@ export class IMRenderer {
         const finalText = isFinal ? this.textBuffer : '';
         if (isFinal)
             this.textBuffer = '';
-        if (this.diagEnabled) {
-            diag(this.instanceId, 'flush', {
-                isFinal,
-                itemCount: items.length,
-                finalTextLen: finalText.length,
-                flushCount: this.flushCount,
-                sinceLastFlush: Date.now() - this.lastFlush,
-            });
-        }
         // 1. interactive 模式下：不发 text items（由 result.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;
-            this.sendChain = this.sendChain
-                .then(() => this.opts.send(payload))
-                .catch(e => logger.warn('[IMRenderer] activity.batch send failed:', e));
-            await this.sendChain;
+            try {
+                await this.sendPayload(payload);
+            }
+            catch (error) {
+                this.itemsQueue = [...itemsForBatch, ...this.itemsQueue];
+                if (isFinal && finalText)
+                    this.textBuffer = finalText + this.textBuffer;
+                throw error;
+            }
             this.lastFlush = Date.now();
             this.flushCount++;
         }
@@ -481,10 +474,13 @@ export class IMRenderer {
             this.textBuffer = '';
             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] timed result.text send failed:', e));
-            await this.sendChain;
+            try {
+                await this.sendPayload(payload);
+            }
+            catch (error) {
+                this.textBuffer = text + this.textBuffer;
+                throw error;
+            }
             this.lastFlush = Date.now();
             this.flushCount++;
         }
@@ -492,10 +488,13 @@ export class IMRenderer {
         if (isFinal && finalText.length > 0) {
             const payload = { kind: 'result.text', text: finalText, isFinal: true };
             this.sentContent = true;
-            this.sendChain = this.sendChain
-                .then(() => this.opts.send(payload))
-                .catch(e => logger.warn('[IMRenderer] result.text send failed:', e));
-            await this.sendChain;
+            try {
+                await this.sendPayload(payload);
+            }
+            catch (error) {
+                this.textBuffer = finalText + this.textBuffer;
+                throw error;
+            }
             this.lastFlush = Date.now();
             this.flushCount++;
         }

package/dist/core/message/{inbound-admission.js → message-admission.js}

@@ -1,5 +1,55 @@
 import { AccessPolicyError, readAccessPolicy, } from '../../config/access-policy.js';
-import { isAcceptedContact, resolveContactView, resolvePrincipal, } from '../../config/contact-book.js';
+import { getContactSnapshot, isAcceptedContact, resolveContactView, resolvePrincipal, } from '../../config/contact-book.js';
+import { isValidAid } from '../../aun/aid/validation.js';
+import { expirePendingContactRequests } from '../../config/contact-request-service.js';
+/** Validate managed private AUN sends against the sender's local contact policy. */
+export async function evaluateOutboundContactAdmission(input) {
+    const selfAid = String(input.selfAid || '').trim();
+    const targetAid = String(input.targetAid || '').trim();
+    if (!isValidAid(selfAid) || !isValidAid(targetAid)) {
+        return { allow: false, code: 'CONTACT_POLICY_INVALID', status: 'absent', error: 'A valid Agent AID is required for outbound contact admission' };
+    }
+    let policy;
+    try {
+        policy = readAccessPolicy(selfAid);
+    }
+    catch (error) {
+        return { allow: false, code: 'CONTACT_POLICY_INVALID', status: 'absent', error: error instanceof Error ? error.message : String(error) };
+    }
+    if (policy.policyMode !== 'contacts') {
+        try {
+            if (getContactSnapshot(selfAid).contacts.get(targetAid)?.status === 'blocked') {
+                return { allow: false, code: 'CONTACT_BLOCKED', status: 'blocked', error: `目标联系人 ${targetAid} 已被拉黑。请先解除拉黑：ec contact unblock ${targetAid} --self ${selfAid}` };
+            }
+        }
+        catch (error) {
+            return { allow: false, code: 'CONTACT_POLICY_INVALID', status: 'absent', error: error instanceof Error ? error.message : String(error) };
+        }
+        return { allow: true, status: policy.policyMode };
+    }
+    try {
+        await expirePendingContactRequests(selfAid);
+        const snapshot = getContactSnapshot(selfAid);
+        const entry = snapshot.contacts.get(targetAid);
+        const view = resolveContactView(selfAid, targetAid);
+        if (view.isOwner)
+            return { allow: true, status: 'owner' };
+        if (entry && (entry.status === undefined || entry.status === 'active'))
+            return { allow: true, status: 'active' };
+        const status = entry?.status ?? 'absent';
+        if (status === 'blocked')
+            return { allow: false, code: 'CONTACT_BLOCKED', status, error: `目标联系人 ${targetAid} 已被拉黑。请先解除拉黑：ec contact unblock ${targetAid} --self ${selfAid}` };
+        const addCommand = `ec contact add ${targetAid} --self ${selfAid}`;
+        if (status === 'pending')
+            return { allow: false, code: 'CONTACT_PENDING', status, error: `目标联系人 ${targetAid} 的联系人申请正在审核中，请等待 Owner 通过；如需重新提交，执行：${addCommand}` };
+        if (status === 'declined')
+            return { allow: false, code: 'CONTACT_DECLINED', status, error: `目标联系人 ${targetAid} 的联系人申请已拒绝或过期，请重新申请：${addCommand}` };
+        return { allow: false, code: 'CONTACT_NOT_ACTIVE', status: 'absent', error: `目标 ${targetAid} 不是联系人，请先申请添加：${addCommand}` };
+    }
+    catch (error) {
+        return { allow: false, code: 'CONTACT_POLICY_INVALID', status: 'absent', error: error instanceof Error ? error.message : String(error) };
+    }
+}
 export function evaluateInboundAdmissionPreflight(input) {
     const selfAid = String(input.selfAid || '').trim();
     const channelType = String(input.channelType || '').trim().toLowerCase();