@xmanrui/dsh-im 4.34.2 → 4.35.1

package/locale/en.json

@@ -1,5 +1,6 @@
 {
   "meta": {
+    "title": "IM bots",
     "description": "Connect Telegram, WhatsApp, Slack, Discord, Matrix, WeChat, Feishu, WeCom, DingTalk, and QQ to DSH."
   }
 }

package/locale/zh.json

@@ -1,5 +1,6 @@
 {
   "meta": {
+    "title": "IM 机器人",
     "description": "把微信、飞书、企微、钉钉、QQ、Telegram、WhatsApp、Slack、Discord、Matrix接入DSH。"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "4.34.2",
+  "version": "4.35.1",
   "icon": "./assets/logo-plugin-message-link-gradient.webp",
   "description": "把微信、飞书、企微、钉钉、QQ、Telegram、WhatsApp、Slack、Discord、Matrix接入DSH。 Connect Telegram, WhatsApp, Slack, Discord, Matrix, WeChat, Feishu, WeCom, DingTalk, and QQ to DSH.",
   "keywords": [

package/plugin-src/host/delivery-adapter.mjs

@@ -286,8 +286,8 @@ export function createDeliveryAdapter({ channel, workspaces, coreController, sta
       if (typeof coreController.sendProactiveText !== 'function') {
         throw new TypeError('delivery controller cannot send proactive text');
       }
-      await coreController.sendProactiveText(botId, normalized, text, options);
-      return { sent: true };
+      const result = await coreController.sendProactiveText(botId, normalized, text, options);
+      return options.receipt === true ? result : { sent: true };
     },
     async setSessionSync(botId, targetId, enabled) {
       if (typeof workspaces.setDeliveryTargetSessionSync !== 'function') {

package/plugin-src/host/delivery-service.mjs

@@ -30,6 +30,7 @@ const DELIVERY_ERROR_CODES = new Set([
   'bot-not-connected',
   'target-rejected',
   'delivery-failed',
+  'send-result-unknown',
   'session-sync-unavailable',
   'cancelled',
 ]);
@@ -314,10 +315,10 @@ export class DeliveryService {
     } catch (error) { throw publicOperationError(error); }
   }
 
-  async sendChecked(botId, targetId, text, { expectedFingerprint, expectedTargetDigest, signal, format = 'plain' } = {}) {
+  async sendChecked(botId, targetId, text, { expectedFingerprint, expectedTargetDigest, signal, format = 'plain', receipt = false } = {}) {
     const id = botIdOf(botId);
     const key = targetIdOf(targetId);
-    if (typeof text !== 'string' || !text.trim() || !['plain', 'markdown'].includes(format)
+    if (typeof text !== 'string' || !text.trim() || !['plain', 'markdown'].includes(format) || typeof receipt !== 'boolean'
       || !/^[a-f0-9]{64}$/.test(expectedFingerprint ?? '') || !/^[a-f0-9]{64}$/.test(expectedTargetDigest ?? '')) {
       throw deliveryError('bad-request');
     }
@@ -341,14 +342,22 @@ export class DeliveryService {
         throw deliveryError('capability-unavailable');
       }
       if (account.account?.fingerprint !== expectedFingerprint) throw deliveryError('account-changed');
+      if (receipt && (!account.capabilities?.includes('proactive-receipt-checked') || target.kind !== 'group'))
+        throw deliveryError('capability-unavailable');
       const beforeSend = () => {
         cancellation(signal);
         this.#assertRegistered(registration);
       };
       beforeSend();
-      await adapter.sendText(id, target, text, { signal, expectedFingerprint, beforeSend,
+      const result = await adapter.sendText(id, target, text, { signal, expectedFingerprint, beforeSend,
+        ...(receipt ? { receipt: true } : {}),
         ...(format === 'markdown' ? { format } : {}) });
-      return { sent: true };
+      if (!receipt) return { sent: true };
+      if (result?.sent !== true || result.receipt?.version !== 1
+        || typeof result.receipt.messageId !== 'string' || !result.receipt.messageId || result.receipt.messageId.length > 512
+        || result.receipt.conversationId !== target.route.chatId)
+        throw deliveryError('send-result-unknown');
+      return { sent: true, receipt: { version: 1, messageId: result.receipt.messageId, conversationId: result.receipt.conversationId } };
     } catch (error) { throw publicOperationError(error); }
   }
 

package/plugin-src/host/index.mjs

@@ -92,6 +92,7 @@ export function createImHostPlugin(internals = {}) {
       if (typeof ctx?.provide === 'function') {
         ctx.provide('dshIm', Object.freeze({
           contractVersion: 1,
+          receiptVersion: 1,
           describeBot: (botId) => deliveryService.describeBot(botId),
           sendChecked: (botId, targetId, text, options) => deliveryService.sendChecked(botId, targetId, text, options),
           send: (botId, targetId, text, options) => (

package/src/channels/feishu/bridge.mjs

@@ -3041,14 +3041,14 @@ export class FeishuHarnessBridge {
 
   async #showWorkspaces({ chatId, key, replyTo = null }, { updateMessageId = null } = {}) {
     try {
-      const { current, paths } = await workspacePathSnapshot(
+      const { current, paths, titles } = await workspacePathSnapshot(
         this.#harness,
-        { signal: this.#cardDataSignal() },
+        { signal: this.#cardDataSignal(), includeTitles: true },
       );
       this.#rememberMenu(key, { kind: 'workspaces', paths });
       await this.#sendCard(
         chatId,
-        workspaceListCard(paths, current),
+        workspaceListCard(paths, current, titles),
         { key, updateMessageId, replyTo },
       );
     } catch (error) {
@@ -3239,7 +3239,7 @@ export class FeishuHarnessBridge {
     const dataSignal = this.#cardDataSignal();
     // Independent sections start together. Each one degrades on its own so a
     // slow preset/model RPC cannot force redundant session-list scans.
-    const workspaceTask = workspacePathSnapshot(this.#harness, { signal: dataSignal })
+    const workspaceTask = workspacePathSnapshot(this.#harness, { signal: dataSignal, includeTitles: true })
       .catch(() => {
         const current = typeof this.#harness.currentWorkspace === 'function'
           ? this.#harness.currentWorkspace()
@@ -3316,7 +3316,7 @@ export class FeishuHarnessBridge {
     const archiveVisible = this.#state?.includesArchivedSessions?.() ?? false;
     this.#rememberMenu(key, { kind: 'menu', chatId });
     const menuContext = {
-      workspaces, currentWorkspace,
+      workspaces, currentWorkspace, workspaceTitles: snapshot.titles,
       currentSession: currentSessionId ? { id: currentSessionId, title: currentSessionTitle } : null,
       sessions, archiveVisible, presetCatalog, modelCatalog,
       newSessionAction: { id: randomUUID(), status: 'idle' },

package/src/channels/feishu/feishu-cards.mjs

@@ -14,6 +14,7 @@
  * without button callbacks.
  */
 
+import { posix, win32 } from 'node:path';
 import { t } from '../shared/i18n.mjs';
 
 export const MENU_PAGE_SIZE = 10;
@@ -87,9 +88,56 @@ function initialIndex(options, currentValue) {
   return idx >= 0 ? idx + 1 : 0;
 }
 
+function cleanTitle(value) {
+  return String(value ?? '').replace(/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]+/gu, ' ').replace(/\s+/gu, ' ').trim();
+}
+
 function safeTitle(value) {
-  const title = String(value ?? '').replace(/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]+/gu, ' ').replace(/\s+/gu, ' ').trim();
-  return title || t('暂无标题');
+  return cleanTitle(value) || t('暂无标题');
+}
+
+const WORKSPACE_LABEL_LENGTH = 22;
+
+/** Display labels only: paths and their snapshot order remain the callback identity. */
+function workspaceLabels(paths, titles = {}) {
+  const entries = paths.map((path) => {
+    const api = /^[a-z]:[\\/]|^\\\\/iu.test(path) ? win32 : posix;
+    const normalized = api.normalize(path);
+    const name = cleanTitle(api.basename(normalized) || api.parse(normalized).root);
+    const base = (typeof titles[path] === 'string' && cleanTitle(titles[path])) || name;
+    return {
+      api, base, label: base, parent: api.dirname(normalized),
+      context: base === name ? '' : api.basename(normalized),
+    };
+  });
+  const counts = () => {
+    const result = new Map();
+    for (const { label } of entries) result.set(label, (result.get(label) ?? 0) + 1);
+    return result;
+  };
+  // Grow only ambiguous path suffixes; stop at the root even if display text collides.
+  for (;;) {
+    const repeated = counts();
+    let changed = false;
+    for (const entry of entries) {
+      if (repeated.get(entry.label) < 2 || entry.parent === null) continue;
+      const { api, parent } = entry;
+      entry.context = api.join(api.basename(parent) || parent, entry.context);
+      entry.label = `${entry.base} · ${cleanTitle(entry.context)}`;
+      const next = api.dirname(parent);
+      entry.parent = next === parent ? null : next;
+      changed = true;
+    }
+    if (!changed) break;
+  }
+  for (const entry of entries) {
+    const chars = Array.from(entry.label);
+    if (chars.length > WORKSPACE_LABEL_LENGTH) {
+      entry.label = `${chars.slice(0, 11).join('')}…${chars.slice(-10).join('')}`;
+    }
+  }
+  const repeated = counts();
+  return entries.map(({ label }) => ({ label, numbered: repeated.get(label) > 1 }));
 }
 
 function cardWith(headerText, elements) {
@@ -117,6 +165,7 @@ function backButton() {
  *   4. 系统 → 状态 · 帮助
  * `ctx` bundle:
  *   - workspaces: string[]          (工作区下拉选项)
+ *   - workspaceTitles: object      (可选，按绝对路径索引的工作区名称)
  *   - currentWorkspace: string|null (当前工作区,下拉高亮)
  *   - currentSession: {id,title}|null (当前绑定会话,续写目标)
  *   - sessions: {id,title}[]        (最近会话,供会话下拉切换)
@@ -130,6 +179,7 @@ function backButton() {
 export function menuCard(ctx) {
   const {
     workspaces = [],
+    workspaceTitles = {},
     currentWorkspace = null,
     currentSession = null,
     sessions = [],
@@ -188,8 +238,9 @@ export function menuCard(ctx) {
 
   let workspaceDropdown = null;
   if (hasWorkspaces) {
-    const wsOptions = workspaces.slice(0, 20).map((path) => ({
-      text: { tag: 'plain_text', content: `${path === currentWorkspace ? '✓ ' : ''}${path}` },
+    const labels = workspaceLabels(workspaces, workspaceTitles);
+    const wsOptions = workspaces.slice(0, 20).map((path, index) => ({
+      text: { tag: 'plain_text', content: `${path === currentWorkspace ? '✓ ' : ''}${labels[index].numbered ? `${index + 1}. ` : ''}${labels[index].label}` },
       value: path,
     }));
     workspaceDropdown = {
@@ -726,7 +777,8 @@ export function sessionListCard(workspace, sessions, page, total, watchedSession
 // ── Workspace list card (preserved, with back button) ─────────────────────
 
 /** The workspace list card (switch-workspace buttons + reply fallback). */
-export function workspaceListCard(paths, current) {
+export function workspaceListCard(paths, current, titles = {}) {
+  const labels = workspaceLabels(paths, titles);
   const elements = paths.length === 0
     ? [
         { tag: 'div', text: markdown(t('当前 Host 上没有已登记的工作区。')) },
@@ -735,7 +787,7 @@ export function workspaceListCard(paths, current) {
     : [
         { tag: 'div', text: markdown(t('回复数字切换工作区，或点击按钮：')) },
         ...paths.map((path, index) => button(
-          `${index + 1}. ${path}${path === current ? t('（当前）') : ''}`,
+          `${index + 1}. ${labels[index].label}${path === current ? t('（当前）') : ''}`,
           `workspace:${path}`,
         )),
         { tag: 'hr' },

package/src/channels/feishu/feishu-runtime.mjs

@@ -675,7 +675,7 @@ export class FeishuRuntime {
     });
   }
 
-  async sendProactiveText(target, text, { signal, format = 'plain' } = {}) {
+  async sendProactiveText(target, text, { signal, format = 'plain', receipt = false } = {}) {
     if (!this.#status.ready || !this.#client) {
       const error = new Error('飞书机器人尚未连接');
       error.code = 'bot-not-connected';
@@ -698,6 +698,8 @@ export class FeishuRuntime {
       error.code = 'bad-request';
       throw error;
     }
+    if (typeof receipt !== 'boolean' || (receipt && target.kind !== 'group'))
+      throw Object.assign(new Error('capability-unavailable'), { code: 'capability-unavailable' });
     signal?.throwIfAborted();
     // Use the same native Markdown element as chat, without opening a stream
     // or retrying as plain text after a possibly accepted delivery.
@@ -724,7 +726,12 @@ export class FeishuRuntime {
       error.code = 'target-rejected';
       throw error;
     }
-    return { sent: true };
+    if (!receipt) return { sent: true };
+    const messageId = response?.data?.message_id;
+    const conversationId = response?.data?.chat_id;
+    if (typeof messageId !== 'string' || !messageId || messageId.length > 512 || conversationId !== receiveId)
+      throw Object.assign(new Error('send-result-unknown'), { code: 'send-result-unknown' });
+    return { sent: true, receipt: { version: 1, messageId, conversationId } };
   }
 
   /**

package/src/channels/feishu/multi-bot-controller.mjs

@@ -594,7 +594,7 @@ export class MultiBotDshFeishuController {
       this.#assertOpen('capability-unavailable');
       return { version: 1, botId, channel: 'feishu', account,
         connected: isConnected(connectionStatus(this.#runtimes.get(botId))),
-        capabilities: ['proactive-text-checked'] };
+        capabilities: ['proactive-text-checked', 'proactive-receipt-checked'] };
     });
   }
 

package/src/channels/qq/qq-bridge.mjs

@@ -75,6 +75,7 @@ import {
 } from './qq-menu.mjs';
 import { withSessionBindingLock } from '../shared/session-binding-lock.mjs';
 import { t } from '../shared/i18n.mjs';
+import { isQqMessageAddressed, normalizeQqMentions } from './qq-mention.mjs';
 
 function interactionResolvedText() {
   return t('这个问题已在其他客户端处理，无需再次回答。');
@@ -408,7 +409,7 @@ async function sendQqFile(
 function canClaimInteractionReply(message, pending) {
   return pending.questions[pending.index]
     && nonEmptyString(message?.senderId) === pending.actor
-    && (message.kind !== 'group' || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE')
+    && isQqMessageAddressed(message)
     && !hasQqImageAttachments(message)
     && !hasQqFileAttachments(message)
     && nonEmptyString(safeText(message));
@@ -487,6 +488,7 @@ export class QqHarnessBridge {
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#signal = signal;
     this.#deferred = createDeferredDeliveryCoordinator({ harness, state, signal, logger,
+      finalAnswerOnly: true,
       deliver: (entry, outcome) => this.#deliverDeferredOutcome(entry, outcome),
     });
     this.#fetchImpl = fetchImpl;
@@ -506,9 +508,9 @@ export class QqHarnessBridge {
       || !['c2c', 'group'].includes(message?.kind)
       || this.#state.hasSeen(messageId)
       || this.#acceptedMessageIds.has(messageId)) return Promise.resolve();
+    message = normalizeQqMentions(message, new Set([this.#bot.appId]));
     const key = conversationKey(message);
-    const addressed = message.kind !== 'group'
-      || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE';
+    const addressed = isQqMessageAddressed(message);
     const commandText = safeText(message);
     const menuTextOnly = !hasQqImageAttachments(message) && !hasQqFileAttachments(message)
       && !qqReplyReference(message);
@@ -634,7 +636,7 @@ export class QqHarnessBridge {
       actor: sender,
       messageId,
       text: hasQqImageAttachments(message) || hasQqFileAttachments(message) ? '' : safeText(message),
-      addressed: message.kind !== 'group' || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE',
+      addressed,
       hasPendingQuestion: Boolean(pending),
       questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
         ? pending.queue
@@ -689,8 +691,7 @@ export class QqHarnessBridge {
     alreadyRecorded = false,
     batchSubmission = null,
   } = {}) {
-    const addressed = message.kind !== 'group'
-      || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE';
+    const addressed = isQqMessageAddressed(message);
     const preparedMessage = addressed
       ? prefetchInboundFiles(
           qqInboundMessage(message, { fetchImpl: this.#fetchImpl }),
@@ -984,7 +985,7 @@ export class QqHarnessBridge {
       await this.#state.markSeen(messageId);
       messageRecorded = true;
     };
-    if (message.kind === 'group' && message.rawEventType !== 'GROUP_AT_MESSAGE_CREATE') return;
+    if (!isQqMessageAddressed(message)) return;
 
     const target = message.replyTarget;
     const promptMessage = preparedMessage
@@ -1085,6 +1086,7 @@ export class QqHarnessBridge {
             signal: this.#signal,
             control: { owner: this, key },
             progressMode: 'all',
+            finalAnswerOnly: true,
             onUpdate: (update) => {
               if (update.error) {
                 const name = (nonEmptyString(update.toolName) ?? t('工具'))
@@ -1245,7 +1247,7 @@ export class QqHarnessBridge {
     this.#status.messagesReceived += 1;
     this.#status.lastMessageAt = new Date().toISOString();
 
-    if (message.kind === 'group' && message.rawEventType !== 'GROUP_AT_MESSAGE_CREATE') return;
+    if (!isQqMessageAddressed(message)) return;
     const text = nonEmptyString(safeText(message));
     if (!text || hasQqImageAttachments(message) || hasQqFileAttachments(message)) {
       await this.#bot.sendText(message.replyTarget, t('请用文字回答当前问题。'));

package/src/channels/qq/qq-mention.mjs

@@ -0,0 +1,37 @@
+// Keep the decision after the SDK sanitizes the mention out of the content.
+const addressedToBot = Symbol('qq.addressedToBot');
+
+function selfMentions(message) {
+  return Array.isArray(message?.mentions)
+    ? message.mentions.filter((mention) => mention?.is_you === true)
+    : [];
+}
+
+export function isQqMessageAddressed(message) {
+  return Boolean(message) && (message.kind !== 'group'
+    || message[addressedToBot] === true
+    || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE'
+    || selfMentions(message).length > 0);
+}
+
+/** botIds belongs to one runtime; only platform-marked self mentions add IDs. */
+export function normalizeQqMentions(message, botIds = new Set()) {
+  if (message?.kind !== 'group') return message;
+  for (const mention of selfMentions(message)) {
+    for (const id of [mention.id, mention.user_openid, mention.member_openid]) {
+      if (typeof id === 'string' && id.trim()) botIds.add(id.trim());
+    }
+  }
+  const marker = /<@!?([^<>\s]+)>/gu;
+  const content = typeof message.content === 'string' ? message.content : '';
+  // raw.content is still the current message, never the quoted message snapshot.
+  const rawContent = typeof message.raw?.content === 'string' ? message.raw.content : '';
+  const mentioned = isQqMessageAddressed(message)
+    || [...`${content}\n${rawContent}`.matchAll(marker)].some((match) => botIds.has(match[1]));
+  // Match the SDK sanitizer's in-place contract: later sender enrichment must
+  // remain visible to the existing queued message and source-context capture.
+  message[addressedToBot] = mentioned;
+  message.content = content.replace(/<@!?([^<>\s]+)>[ \t]*/gu,
+    (match, id) => botIds.has(id) ? '' : match).trim();
+  return message;
+}

package/src/channels/qq/qq-runtime.mjs

@@ -8,6 +8,7 @@ import {
 import { t } from '../shared/i18n.mjs';
 import { evaluateInboundAccess } from '../shared/inbound-access.mjs';
 import { createQqBridgeStatus, QqHarnessBridge } from './qq-bridge.mjs';
+import { isQqMessageAddressed, normalizeQqMentions } from './qq-mention.mjs';
 
 function timeoutError() {
   const error = new Error('QQ WebSocket did not become ready in time');
@@ -178,6 +179,11 @@ export class QqRuntime {
       replyTimeoutMs: this.#replyTimeoutMs,
       signal: controller.signal,
     });
+    const botMentionIds = new Set([this.#config.appId]);
+    bot.use(async (ctx, next) => {
+      ctx.message = normalizeQqMentions(ctx.message, botMentionIds);
+      await next();
+    });
     // QQ delivers emoji/face messages as opaque `<faceType=..,faceId="..",ext="..">`
     // tags. Parse them into readable text so the Harness sees what the sender
     // actually meant instead of an unusable markup fragment.
@@ -186,8 +192,7 @@ export class QqRuntime {
       keepAlive: true,
       predicate: (ctx) => {
         const message = ctx?.message;
-        if (!message || (message.kind === 'group'
-          && message.rawEventType !== 'GROUP_AT_MESSAGE_CREATE')) return false;
+        if (!isQqMessageAddressed(message)) return false;
         if (!this.#accessPolicy) {
           return message.kind === 'group'
             || this.#config.ownerUserOpenid === '*'
@@ -207,7 +212,10 @@ export class QqRuntime {
       readyResolve = resolve;
       readyReject = reject;
     });
-    const onReady = () => {
+    const onReady = (data) => {
+      if (typeof data?.user?.id === 'string' && data.user.id.trim()) {
+        botMentionIds.add(data.user.id.trim());
+      }
       const now = Date.now();
       this.#status.ready = true;
       this.#status.qqConnectionState = 'connected';

package/src/channels/shared/bot-workspace-store.mjs

@@ -1709,6 +1709,7 @@ export function createBotWorkspaceScope(
         };
       }
       if ((property === 'listWorkspaces'
+        || property === 'listWorkspaceEntries'
         || property === 'listWorkspaceSessions'
         || property === 'listModels')
         && typeof target[property] === 'function') {

package/src/channels/shared/deferred-delivery-coordinator.mjs

@@ -24,6 +24,7 @@ function orderedEvents(history) {
 export function createDeferredDeliveryCoordinator({
   harness, state, deliver, signal, logger = console,
   retryDelayMs = 1_000, pollDelayMs = 30_000, watch = true,
+  finalAnswerOnly = false,
 } = {}) {
   const enabled = ['deferredEntries', 'putDeferred', 'patchDeferred', 'removeDeferred']
     .every((name) => typeof state?.[name] === 'function');
@@ -100,7 +101,7 @@ export function createDeferredDeliveryCoordinator({
       }
       const outcome = targetTurn === null
         ? { found: false, endSeq: -1, turn: null }
-        : extractCompletedTurnAnswer(ordered, { turn: targetTurn });
+        : extractCompletedTurnAnswer(ordered, { turn: targetTurn, finalAnswerOnly });
       const hasStart = ordered.some((event) => event.type === 'turn/start' && event.data?.turn === targetTurn);
       if (!history.hasMore || hasStart) return { ...outcome, turn: targetTurn };
       const oldest = batch[0]?.seq;

package/src/channels/shared/deferred-delivery.mjs

@@ -1,4 +1,4 @@
-import { AssistantTextAccumulator } from './harness-client.mjs';
+import { AssistantTextAccumulator, accumulateFinalAssistantText } from './harness-client.mjs';
 
 export const MAX_DEFERRED_PER_KEY = 4;
 
@@ -35,12 +35,13 @@ function textFromContent(content) {
  *
  * Reuses HarnessReplyTracker text accumulation: chunk deltas accumulate per
  * (step, part index); a canonical assistant/message replaces its step; steps
- * join with a blank line. `turn` omitted → prefer the latest completed answer.
+ * join with a blank line. finalAnswerOnly discards text before tool calls.
+ * `turn` omitted → prefer the latest completed answer.
  * Returns `{ found, turn, text, reason, endSeq }`; `found: false` when the
  * turn ended without a completed final answer (stopped/failed/empty/
  * interrupted) — `reason`/`endSeq` still identify the confirmed terminal.
  */
-export function extractCompletedTurnAnswer(entries, { turn } = {}) {
+export function extractCompletedTurnAnswer(entries, { turn, finalAnswerOnly = false } = {}) {
   const events = orderedEvents(entries);
   const wantTurn = Number.isSafeInteger(turn) ? turn : null;
   function turnAnswer(turnEnd) {
@@ -48,12 +49,14 @@ export function extractCompletedTurnAnswer(entries, { turn } = {}) {
     let interrupted = false;
     for (const event of events) {
       if (event.seq > turnEnd.seq || event.data?.turn !== turnEnd.data.turn) continue;
-      if (event.type === 'assistant/chunk' && event.data?.chunk?.type === 'text-delta') {
+      if (finalAnswerOnly === true) {
+        accumulateFinalAssistantText(accumulator, event);
+      } else if (event.type === 'assistant/chunk' && event.data?.chunk?.type === 'text-delta') {
         accumulator.appendDelta(event.data.step, event.data.chunk.index, event.data.chunk.text);
       } else if (event.type === 'assistant/message') {
         accumulator.setCanonical(event.data.step, textFromContent(event.data.message?.content));
-        interrupted = event.data.interrupted === true;
       }
+      if (event.type === 'assistant/message') interrupted = event.data.interrupted === true;
     }
     return { text: accumulator.text, interrupted };
   }