evolcore 0.0.26 → 0.0.28

package/dist/core/interaction-router.js

@@ -46,6 +46,8 @@ export class InteractionRouter {
             clearTimeout(existing.timer);
         const isReplacement = !!existing;
         const pending = {
+            blocking: opts?.blocking !== false,
+            retainOnRejected: opts?.retainOnRejected === true,
             callback,
             sessionId,
             initiatorId: opts?.initiatorId,
@@ -61,7 +63,8 @@ export class InteractionRouter {
                 if (this.handlers.get(id) !== pending)
                     return;
                 this.handlers.delete(id);
-                this.decPending(pending.sessionId);
+                if (pending.blocking)
+                    this.decPending(pending.sessionId);
                 const cancelReason = opts.timeoutCancelReason ?? 'timeout';
                 logger.debug(`[InteractionRouter] Timeout for interaction: ${id}`);
                 opts.onTimeout?.();
@@ -73,7 +76,9 @@ export class InteractionRouter {
             }, opts.timeoutMs);
         }
         this.handlers.set(id, pending);
-        if (!isReplacement)
+        if (existing?.blocking && (!pending.blocking || existing.sessionId !== sessionId))
+            this.decPending(existing.sessionId);
+        if (pending.blocking && (!isReplacement || !existing?.blocking || existing.sessionId !== sessionId))
             this.incPending(sessionId);
     }
     dispatch(response) {
@@ -104,10 +109,15 @@ export class InteractionRouter {
             // The callback may already have resolved/cancelled this exact handler.
             if (this.handlers.get(response.id) !== handler)
                 return accepted;
+            if (!accepted && handler.retainOnRejected && rejectionReason === 'backend_rejected') {
+                handler.inFlight = false;
+                return false;
+            }
             if (handler.timer)
                 clearTimeout(handler.timer);
             this.handlers.delete(response.id);
-            this.decPending(handler.sessionId);
+            if (handler.blocking)
+                this.decPending(handler.sessionId);
             if (!accepted && handler.onCancel) {
                 Promise.resolve(handler.onCancel(rejectionReason)).catch(err => {
                     logger.error(`[InteractionRouter] Rejection cancellation error for ${response.id}:`, err);
@@ -153,10 +163,13 @@ export class InteractionRouter {
         const pending = [];
         for (const [id, handler] of this.handlers.entries()) {
             if (handler.sessionId === sessionId) {
+                if (!handler.blocking && reason === 'new_message')
+                    continue;
                 if (handler.timer)
                     clearTimeout(handler.timer);
                 this.handlers.delete(id);
-                this.decPending(handler.sessionId);
+                if (handler.blocking)
+                    this.decPending(handler.sessionId);
                 if (reason && handler.onCancel) {
                     pending.push(Promise.resolve(handler.onCancel(reason)).then(() => undefined));
                 }
@@ -170,7 +183,8 @@ export class InteractionRouter {
             if (handler.timer)
                 clearTimeout(handler.timer);
             this.handlers.delete(id);
-            this.decPending(handler.sessionId);
+            if (handler.blocking)
+                this.decPending(handler.sessionId);
             if (reason && handler.onCancel)
                 await handler.onCancel(reason);
             return true;
@@ -208,10 +222,10 @@ export class InteractionRouter {
             return false;
         }
     }
-    getPending(sessionId) {
+    getPending(sessionId, command) {
         const ids = [];
         for (const [id, handler] of this.handlers.entries()) {
-            if (handler.sessionId === sessionId)
+            if (handler.sessionId === sessionId && (!command || handler.fallbackCommand === command))
                 ids.push(id);
         }
         return ids;
@@ -281,7 +295,7 @@ export function renderActionAsText(req) {
     if (fb.acceptFreeText && fb.freeTextHint) {
         lines.push(`  ${fb.freeTextHint}`);
     }
-    if (action.allowCustomInput) {
+    if (action.allowCustomInput && req.blocking !== false) {
         lines.push(`  或直接输入自定义内容`);
     }
     return lines.join('\n');

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

@@ -1,8 +1,9 @@
 import { logger } from '../../utils/logger.js';
-import { summarizeToolInput, toolInputForDisplay } from '../../utils/tool-summary.js';
+import { summarizeToolInput, summarizeToolInputForDisplay, toolInputForDisplay } from '../../utils/tool-summary.js';
 import { getErrorMessage, isContextTooLongText } from '../../utils/error-utils.js';
 import { tagErrorTextWithEvolcoreVersion } from '../../utils/evolcore-version.js';
 import { DEFAULT_FLUSH_DELAY_MS } from '../../types.js';
+import { classifyAunToolErrorCode } from '../permission/tool-error-code.js';
 export class IMRenderer {
     opts;
     itemsQueue = [];
@@ -19,6 +20,8 @@ export class IMRenderer {
     hasEmittedText = false;
     /** 自增 callId 兜底（runner 没提供时用） */
     syntheticCallSeq = 0;
+    currentAssistantUuid;
+    currentTextPhase;
     constructor(opts) {
         this.opts = opts;
     }
@@ -61,12 +64,12 @@ export class IMRenderer {
         // interactive 模式由 MessageProcessor 显式调 addText/addToolCall/... 推入 items
     }
     /** 强制刷新所有 pending 事件 */
-    async flush(isFinal) {
+    async flush(isFinal, attention) {
         if (this.opts.envelope.chatmode === 'proactive') {
             // proactive 是 fire-and-forget，无 pending buffer
             return;
         }
-        return this.flushInternal(isFinal);
+        return this.flushInternal(isFinal, attention);
     }
     /** 仅 flush activities，保留 textBuffer（用于中间 complete 事件） */
     async flushActivitiesOnly() {
@@ -122,7 +125,12 @@ export class IMRenderer {
         this.textBuffer = '';
         // 清掉已消费的 text items，包括被拦截的纯空白正文。
         this.itemsQueue = this.itemsQueue.filter(it => it.kind !== 'text');
-        const payload = { kind: 'result.text', text: rawText, isFinal: false };
+        const payload = {
+            kind: 'result.text',
+            text: rawText,
+            isFinal: false,
+            ...this.forkAnchorMetadata(),
+        };
         this.sentContent = true;
         try {
             await this.sendPayload(payload);
@@ -168,9 +176,24 @@ export class IMRenderer {
     }
     // ── 文本/活动注入（替代 StreamFlusher.addText/addActivity）──
     /** 添加文本片段（流式 text） */
-    addText(text, outputTokens, turn) {
+    async addText(text, outputTokens, turn, assistantUuid, phase) {
         if (this.opts.envelope.chatmode === 'proactive')
             return;
+        const sameAssistant = this.currentAssistantUuid === assistantUuid;
+        // In deferred AUN private delivery, only explicit text_start/tool_use
+        // handlers are semantic boundaries. assistantUuid is correlation data and
+        // may be absent or change without proving that the prior text is final.
+        const hadPendingText = this.textBuffer.length > 0;
+        if (hadPendingText && !this.opts.deferTextUntilBoundary && !sameAssistant
+            && !this.suppressIntermediateText()) {
+            await this.flushText();
+        }
+        // Do not carry the previous item's anchor onto unanchored output.
+        this.currentAssistantUuid = assistantUuid;
+        // A mixed buffer has no trustworthy phase, even when its latest chunk is commentary.
+        this.currentTextPhase = hadPendingText && this.opts.deferTextUntilBoundary
+            ? this.currentTextPhase === phase ? phase : undefined
+            : phase;
         this.emitProgress('text', outputTokens, turn);
         if (!text)
             return;
@@ -195,18 +218,19 @@ export class IMRenderer {
         this.emitProgress('tool_call', outputTokens, turn, { toolName: name, callId });
         if (this.suppressActivityItems())
             return;
+        const displayInput = toolInputForDisplay(name, input);
         this.itemsQueue.push({
             kind: 'tool_call',
             call_id: callId || this.synthCallId(),
             name,
-            arguments: toolInputForDisplay(name, input),
-            text: descText,
+            arguments: displayInput,
+            text: displayInput !== input ? summarizeToolInput(name, displayInput || {}) : descText,
         });
         this.messageTimestamps.push(Date.now());
         this.scheduleFlush();
     }
     /** 添加工具结果 */
-    addToolResult(name, ok, result, error, callId, durationMs, descText) {
+    addToolResult(name, ok, result, error, callId, durationMs, descText, classification) {
         if (this.opts.envelope.chatmode === 'proactive')
             return;
         this.emitProgress('tool_result', undefined, undefined, { toolName: name, callId, ok, durationMs });
@@ -219,6 +243,7 @@ export class IMRenderer {
             ok,
             ...(result !== undefined && { result }),
             ...(error !== undefined && { error }),
+            ...(!ok && { error_code: classifyAunToolErrorCode(classification ?? {}) }),
             ...(durationMs !== undefined && { duration_ms: durationMs }),
             ...(descText !== undefined && { text: descText }),
         });
@@ -260,6 +285,21 @@ export class IMRenderer {
             logger.warn(`[IMRenderer] status notice send failed: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
+    /** Notify the client that a new model text block has started. */
+    async sendTextStart(contentIndex, turn) {
+        if (this.opts.deferTextUntilBoundary)
+            await this.flushText();
+        const payload = {
+            kind: 'status.progress',
+            metadata: { activityType: 'text', kind: 'text_start', contentIndex, turn },
+        };
+        try {
+            await this.opts.send(payload);
+        }
+        catch (error) {
+            logger.debug(`[IMRenderer] text_start status send failed: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     /** 兼容旧调用方：发送 warning 级别的任务 notice。 */
     async sendWarningStatus(message, subtype, details) {
         return this.sendStatusNotice(message, 'warn', subtype, details);
@@ -317,7 +357,11 @@ export class IMRenderer {
             return false;
         // 保持与流式正文的到达顺序：先发出已缓冲的正文，再投影运行状态。
         await this.flushText();
-        const payload = { kind: 'result.text', text, isFinal: false };
+        const payload = {
+            kind: 'result.text',
+            text,
+            isFinal: false,
+        };
         this.sentContent = true;
         await this.sendPayload(payload);
         this.lastFlush = Date.now();
@@ -422,7 +466,7 @@ export class IMRenderer {
         const elapsed = Date.now() - this.lastFlush;
         const delay = Math.max(0, targetDelay - elapsed);
         this.timer = setTimeout(() => {
-            void this.flushInternal().catch(error => {
+            void this.flushInternal(undefined, undefined, true).catch(error => {
                 logger.warn(`[IMRenderer] scheduled flush failed: ${error instanceof Error ? error.message : String(error)}`);
             });
         }, delay);
@@ -470,7 +514,7 @@ export class IMRenderer {
      * 完整 flush：把 itemsQueue 里所有 items 打包成 activity.batch 发送。
      * 如果 isFinal=true，还会在 batch 之后单独发一条 result.text 作为最终回复。
      */
-    async flushInternal(isFinal) {
+    async flushInternal(isFinal, attention, scheduled = false) {
         if (this.timer) {
             clearTimeout(this.timer);
             this.timer = undefined;
@@ -501,6 +545,7 @@ export class IMRenderer {
         });
         this.itemsQueue = [];
         const finalText = isFinal ? this.textBuffer : '';
+        const finalAnchor = this.forkAnchorMetadata();
         if (isFinal)
             this.textBuffer = '';
         // 1. interactive 模式下：不发 text items（由 result.text 统一发送最终文本）
@@ -530,9 +575,18 @@ export class IMRenderer {
         if (!isFinal && this.textBuffer.length > 0) {
             if (this.suppressIntermediateText())
                 return;
+            // A timer cannot decide whether this is the final answer. Keep it for
+            // an explicit boundary; known commentary can still be sent immediately.
+            if (scheduled && this.opts.deferTextUntilBoundary && this.currentTextPhase !== 'commentary')
+                return;
             const text = this.textBuffer;
             this.textBuffer = '';
-            const payload = { kind: 'result.text', text, isFinal: false };
+            const payload = {
+                kind: 'result.text',
+                text,
+                isFinal: false,
+                ...this.forkAnchorMetadata(),
+            };
             this.sentContent = true;
             try {
                 await this.sendPayload(payload);
@@ -546,7 +600,14 @@ export class IMRenderer {
         }
         // 2. isFinal=true 时单独发最终回复文本
         if (isFinal && finalText.length > 0) {
-            const payload = { kind: 'result.text', text: finalText, isFinal: true };
+            const payload = {
+                kind: 'result.text',
+                text: finalText,
+                isFinal: true,
+                ...finalAnchor,
+            };
+            if (attention !== undefined)
+                payload.attention = attention;
             this.sentContent = true;
             try {
                 await this.sendPayload(payload);
@@ -559,6 +620,15 @@ export class IMRenderer {
             this.flushCount++;
         }
     }
+    forkAnchorMetadata() {
+        const assistantMessageId = this.currentAssistantUuid?.trim();
+        if (!assistantMessageId)
+            return {};
+        const anchor = {
+            assistantMessageId,
+        };
+        return { metadata: { forkAnchor: anchor } };
+    }
     // ── 内部：status.progress 发送 ──
     emitProgress(activityType, outputTokens, turn, extra) {
         if (this.suppressActivityItems())
@@ -592,9 +662,16 @@ export class IMRenderer {
         const item = this.mapEventToItem(event);
         if (!item)
             return;
+        // Proactive output is optional thought content. Blank runner blocks are
+        // normal; keep diagnostics without reporting a failed message send.
+        if ((item.kind === 'text' || (item.kind === 'summary' && !item.is_error)) && !item.text.trim()) {
+            const { envelope, agentAid } = this.opts;
+            logger.debug(`[IMRenderer] Skipping blank proactive thought: kind=${item.kind}`
+                + ` task=${envelope.taskId} session=${envelope.sessionId ?? '<none>'}`
+                + ` agent=${agentAid ?? envelope.agentName} textLength=${item.text.length}`);
+            return;
+        }
         if (item.kind === 'text') {
-            if (!this.hasSendableText(item.text, 'proactive'))
-                return;
             this.hasEmittedText = true;
             this.allText += item.text;
         }
@@ -622,7 +699,7 @@ export class IMRenderer {
                     return null;
                 return { kind: 'text', text: event.text };
             case 'tool_use': {
-                const desc = summarizeToolInput(event.name, event.input || {});
+                const desc = summarizeToolInputForDisplay(event.name, event.input || {});
                 const item = {
                     kind: 'tool_call',
                     call_id: event.callId || this.synthCallId(),
@@ -640,6 +717,7 @@ export class IMRenderer {
                         call_id: event.callId || this.synthCallId(),
                         name: event.name,
                         ok: false,
+                        error_code: classifyAunToolErrorCode(event),
                         error: event.error || (typeof event.result === 'string' ? event.result : '执行失败'),
                         ...(event.durationMs !== undefined && { duration_ms: event.durationMs }),
                     };