@keyou007/agent-bot 0.1.24-alpha.8 → 0.1.25-alpha.0

package/src/feishu/MergedForwardMessage.ts

@@ -105,6 +105,7 @@ export function renderMergedForwardPrompt(
 
   const senderLabels = new Map<string, string>();
   const imageNumbers = new Map<string, number>();
+  const fileNumbers = new Map<string, number>();
   const images: MergedForwardImageReference[] = [];
   const files: MergedForwardFileReference[] = [];
   let userIndex = 0;
@@ -126,22 +127,24 @@ export function renderMergedForwardPrompt(
     const time = formatMessageTime(item.create_time);
     const heading = [`消息 ${index + 1}`, senderLabel, time].filter(Boolean).join(" · ");
     return `[${heading}]\n${renderMessageContent(item, (imageKey) => {
-      const messageId = item.message_id?.trim();
-      if (!messageId || !imageKey) return "[图片]";
-      const referenceKey = `${messageId}:${imageKey}`;
-      let imageNumber = imageNumbers.get(referenceKey);
+      if (!imageKey) return "[图片]";
+      let imageNumber = imageNumbers.get(imageKey);
       if (!imageNumber) {
         imageNumber = images.length + 1;
-        imageNumbers.set(referenceKey, imageNumber);
-        images.push({ messageId, imageKey });
+        imageNumbers.set(imageKey, imageNumber);
+        // Forwarded resources belong to the container, not the listed child IDs.
+        images.push({ messageId: parentMessageId, imageKey });
       }
       return `[图片 ${imageNumber}]`;
     }, (fileKey, fileName) => {
-      const messageId = item.message_id?.trim();
-      if (!messageId || !fileKey) return namedPlaceholder("文件", fileName);
-      const fileNumber = files.length + 1;
-      files.push({ messageId, fileKey, fileName: fileName || `file-${fileNumber}` });
-      return `[文件 ${fileNumber}：${fileName || `file-${fileNumber}`}]`;
+      if (!fileKey) return namedPlaceholder("文件", fileName);
+      let fileNumber = fileNumbers.get(fileKey);
+      if (!fileNumber) {
+        fileNumber = files.length + 1;
+        fileNumbers.set(fileKey, fileNumber);
+        files.push({ messageId: parentMessageId, fileKey, fileName: fileName || `file-${fileNumber}` });
+      }
+      return `[文件 ${fileNumber}：${files[fileNumber - 1]!.fileName}]`;
     })}`;
   });
   const prompt = [

package/src/feishu/types.ts

@@ -9,6 +9,9 @@ export interface IncomingMessage {
   messageId: string;
   messageType?: string;
   createdAt?: number;
+  /** SDK callback time, not WebSocket frame arrival time. */
+  receivedAt?: number;
+  eventId?: string;
   contextKey: string;
   chatId?: string;
   chatType?: "p2p" | "group";

package/src/local-files/TurnPreviewPage.ts

@@ -8,6 +8,8 @@ import type { ApprovalRequest, ToolState } from "../runtime/types.js";
 import type { FileSummary, TurnActivity, TurnReasoningItem, TurnViewState, TurnViewStatus } from "../presentation/turnViewTypes.js";
 import { displayFilePath, displayToolCommand, formatShellCommandForDisplay, toolStatusIcon } from "../feishu/CardRenderer.js";
 import { turnReasoningItems } from "../presentation/turnReasoning.js";
+import { visibleTurnActivities } from "../presentation/visibleTurnActivities.js";
+import { displayRuntimeError } from "../runtime/responseErrors.js";
 import { isFileUrl, rewriteMarkdownFileLinks } from "./MarkdownFileLinks.js";
 
 const MARKDOWN = new MarkdownIt({
@@ -285,6 +287,10 @@ export const TURN_PREVIEW_CLIENT_SCRIPT = DIAGRAM_PREVIEW_CLIENT_SCRIPT + `(() =
   };
   const compatible = (current, next) => current.nodeType === next.nodeType && current.nodeName === next.nodeName;
   const patchNode = (current, next) => {
+    if (!compatible(current, next)) {
+      current.replaceWith(next.cloneNode(true));
+      return;
+    }
     // Summary snapshots never own a detail body that has already been fetched.
     if (current.nodeType === 1 && current.hasAttribute("data-detail-body") && next.hasAttribute("data-detail-body")) return;
     if (current.isEqualNode(next)) return;
@@ -620,16 +626,19 @@ export function renderTurnPreviewPatch(
   state: TurnViewState, changed: Set<string>, removed: Set<string>,
   localFileUrl: (filePath: string) => string | undefined, language: TurnPreviewLanguage,
 ): TurnPreviewSnapshot & { removed: string[]; before: Record<string, string> } {
+  const visible = visibleTurnActivities(state);
+  const visibleIds = new Set(visible.map((activity) => activity.id));
+  const suppressed = state.activities.filter((activity) => !visibleIds.has(activity.id)).map((activity) => activity.id);
   const partial = { ...state,
-    activities: state.activities.filter((a) => changed.has(a.id)),
+    activities: visible.filter((a) => changed.has(a.id)),
     reasoningItems: state.reasoningItems?.filter((r) => changed.has(`reasoning:${r.itemId}`)),
   };
   const order = [
     ...(state.reasoningItems ?? []).filter((r) => !r.afterActivityId).map((r) => `reasoning:${r.itemId}`),
-    ...state.activities.flatMap((a) => [a.id, ...(state.reasoningItems ?? []).filter((r) => r.afterActivityId === a.id).map((r) => `reasoning:${r.itemId}`)]),
+    ...visible.flatMap((a) => [a.id, ...(state.reasoningItems ?? []).filter((r) => r.afterActivityId === a.id).map((r) => `reasoning:${r.itemId}`)]),
   ];
   const before = Object.fromEntries(order.flatMap((id, i) => changed.has(id) && order[i + 1] ? [[id, order[i + 1]]] : []));
-  return { ...renderTurnPreviewSnapshot(partial, localFileUrl, language, { deferDetails: true }), removed: [...removed], before };
+  return { ...renderTurnPreviewSnapshot(partial, localFileUrl, language, { deferDetails: true }), removed: [...new Set([...removed, ...suppressed])], before };
 }
 
 export function renderTurnPreviewSnapshot(
@@ -645,7 +654,7 @@ export function renderTurnPreviewSnapshot(
     return localFileUrl(path.resolve(state.projectCwd, filePath));
   } : undefined;
   const renderText = (value: string): string => renderMarkdown(value, state.projectCwd, localFileUrl, language);
-  const timeline = renderTimeline(state, renderText, resolveFileUrl, state.fullToolOutputs, state.fullToolErrors, language, state.projectCwd, options.deferDetails);
+  const timeline = renderTimeline({ ...state, activities: visibleTurnActivities(state) }, renderText, resolveFileUrl, state.fullToolOutputs, state.fullToolErrors, language, state.projectCwd, options.deferDetails);
   const terminal = isTerminal(state.status);
   const waitingForProgress = !terminal && !state.finalResponse && !state.assistantText
     && !state.error && !state.approval && state.status !== "waiting_for_approval"
@@ -666,7 +675,7 @@ export function renderTurnPreviewSnapshot(
     `<section class="timeline" data-preview-key="timeline"${timelineContent ? "" : " hidden"}>${timelineContent}</section>`,
     state.fileSummary.length > 0 ? renderFileSummary(state, language, resolveFileUrl, options.deferDetails) : "",
     state.approval ? renderApprovalNotice(state.approval, renderText, language) : "",
-    state.error ? `<section class="result error-result" data-preview-key="error"><h2>${escapeHtml(labels.error)}</h2><pre>${escapeHtml(state.error)}</pre></section>` : "",
+    state.error ? `<section class="result error-result" data-preview-key="error"><h2>${escapeHtml(labels.error)}</h2><pre>${escapeHtml(displayRuntimeError(state.error))}</pre></section>` : "",
     state.finalResponse
       ? renderFinalAnswer(state.finalResponse, state.turnId, renderText, language)
       : state.assistantText
@@ -792,8 +801,12 @@ function renderReasoningItem(
   deferDetails: boolean,
 ): string {
   const presentation = reasoningPresentation(item);
-  if (!presentation.title && !presentation.sections.some((section) => section.parts.length > 0)) return "";
+  const hasBody = presentation.sections.some((section) => section.parts.length > 0);
+  if (!presentation.title && !hasBody) return "";
   const title = presentation.title ?? previewLabels(language).reasoning;
+  if (!hasBody) {
+    return `<article class="reasoning-step" data-activity-id="reasoning:${escapeAttribute(item.itemId)}"><div class="reasoning-header" title="${escapeAttribute(title)}"><span class="reasoning-title">💭 ${escapeHtml(title)}</span></div></article>`;
+  }
   const lazy = deferDetails ? lazyDetailAttributes(`reasoning:${item.itemId}`, reasoningRevision(item, cwd)) : "";
   const body = deferDetails ? lazyDetailBody() : renderReasoningBody(item, cwd, localFileUrl, language, presentation);
   return `<details class="reasoning-step" data-activity-id="reasoning:${escapeAttribute(item.itemId)}"${lazy}><summary class="reasoning-header" title="${escapeAttribute(title)}"><span class="reasoning-title">💭 ${escapeHtml(title)}</span></summary>${body}</details>`;
@@ -831,7 +844,7 @@ function renderActivity(
   switch (activity.kind) {
     case "assistant":
       if (activity.id.startsWith("commentary:runtime-error:")) {
-        return `<article class="activity message runtime-error" data-activity="${escapeAttribute(activity.id)}"><pre>${escapeHtml(activity.text)}</pre></article>`;
+        return `<article class="activity message runtime-error" data-activity="${escapeAttribute(activity.id)}"><pre>${escapeHtml(displayRuntimeError(activity.text))}</pre></article>`;
       }
       return renderMessageActivity(activity.id, activity.text, "commentary", renderText);
     case "user":
@@ -1163,9 +1176,11 @@ export function renderTurnPreviewDetail(
   }
   if (key.startsWith("reasoning:")) {
     const item = turnReasoningItems(state).find((item) => `reasoning:${item.itemId}` === key);
-    if (!item || ![...item.summary, ...item.content].some((text) => text?.trim())) return undefined;
+    if (!item) return undefined;
+    const presentation = reasoningPresentation(item);
+    if (!presentation.sections.some((section) => section.parts.length > 0)) return undefined;
     return { key, revision: reasoningRevision(item, state.projectCwd),
-      content: renderReasoningBody(item, state.projectCwd, localFileUrl, language) };
+      content: renderReasoningBody(item, state.projectCwd, localFileUrl, language, presentation) };
   }
   const activity = state.activities?.find((item) => item.kind === "tool" && `tool:${item.id}` === key);
   if (activity?.kind !== "tool") return undefined;
@@ -1334,7 +1349,7 @@ main { max-width: 1320px; margin: 0 auto; padding: 0 20px 40px; }
 .markdown > :first-child { margin-top: 0; }
 .markdown > :last-child { margin-bottom: 0; }
 .reasoning-step { margin:8px 0; border:1px solid var(--line); border-radius:7px; min-width:0; }
-.reasoning-header { cursor:pointer; padding:8px 10px; color:var(--muted); }
+.reasoning-header { display:flex; align-items:center; gap:8px; min-height:32px; padding:8px 10px; color:var(--muted); }
 .reasoning-title { min-width:0; flex:1; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
 .reasoning-section { margin:0 10px 10px; max-height:30em; overflow:auto; overflow-wrap:anywhere; }
 .reasoning-part + .reasoning-part { border-top:1px solid var(--line); padding-top:8px; }

package/src/presentation/visibleTurnActivities.ts

@@ -0,0 +1,12 @@
+import { RUNTIME_WARNING_PREFIXES, sameRuntimeError } from "../runtime/responseErrors.js";
+import type { TurnActivity, TurnViewState } from "./turnViewTypes.js";
+
+export function visibleTurnActivities(state: TurnViewState): TurnActivity[] {
+  if (state.status !== "failed" || !state.error) return state.activities;
+  return state.activities.filter((activity) => {
+    if (activity.id !== `commentary:runtime-error:${state.turnId}`
+      || (activity.kind !== "assistant" && activity.kind !== "reasoning")) return true;
+    const prefix = RUNTIME_WARNING_PREFIXES.find((value) => activity.text.startsWith(value));
+    return !sameRuntimeError(prefix ? activity.text.slice(prefix.length) : activity.text, state.error!);
+  });
+}