fix(web): keep consultation thinking above one spoken answer

Per-domain thinking trees were interleaved with sliced analysis, so a finished reply still looked like unfinished checklists. One collapsed thinking panel and one full body restores the reading order.

Co-authored-by: Cursor <cursoragent@cursor.com>

frontend/src/components/chat-markdown-view.tsx

@@ -3,6 +3,8 @@
 import ReactMarkdown, { type Components } from "react-markdown";
 import remarkGfm from "remark-gfm";
 
+import { promoteDefinitionLists } from "@/lib/chat-definition-lists";
+
 const markdownComponents: Components = {
   a: ({ children, href, ...props }) => (
     <a {...props} href={href} rel="noreferrer" target="_blank">
@@ -25,7 +27,7 @@ export function renderChatMarkdown(text: string) {
       remarkPlugins={[remarkGfm]}
       skipHtml
     >
-      {text}
+      {promoteDefinitionLists(text)}
     </ReactMarkdown>
   );
 }

frontend/src/components/chat-message-content.tsx

@@ -54,6 +54,7 @@ export function ChatMessageContent({
   const split = splitSpokenAnswerAndTechniqueAudit(text);
   const rows = resolveTechniqueAuditRows(split, auditRows);
   const spoken = split.spoken;
+  const showFoldedAudit = rows.length > 0 && split.rows.length === 0;
 
   return (
     <div className="message-answer">
@@ -67,7 +68,7 @@ export function ChatMessageContent({
         </div>
       ) : null}
       {vargaSentence ? <p className="message-varga-sentence">{vargaSentence}</p> : null}
-      {rows.length > 0 ? <TechniqueAuditDisclosure rows={rows} /> : null}
+      {showFoldedAudit ? <TechniqueAuditDisclosure rows={rows} /> : null}
     </div>
   );
 }

frontend/src/components/consultation-thinking-report.tsx

@@ -5,25 +5,9 @@ import { ThinkingStepTree } from "@/components/thinking-step-tree";
 import type { TechniqueAuditRow } from "@/lib/consultation-agent-events";
 import {
   applyThinkingSectionProgress,
-  REPORT_HEADING,
-  splitAnswerByHeadings,
   type PublicThinkingSection,
 } from "@/lib/consultation-thinking-plan";
 
-function analysisForSection(
-  section: PublicThinkingSection,
-  preamble: string,
-  slices: Record<string, string>,
-  isFirst: boolean,
-): string {
-  const own = slices[section.heading] ?? "";
-  const wrap = section.id === "close" ? (slices[REPORT_HEADING.wrap] ?? "") : "";
-  const lead = isFirst || section.id === "foundation" || section.id === "answer" || section.id === "window"
-    ? preamble
-    : "";
-  return [lead, own, wrap].filter((part) => part.trim()).join("\n\n");
-}
-
 export function ConsultationThinkingReport({
   sections,
   answer,
@@ -43,44 +27,40 @@ export function ConsultationThinkingReport({
   auditRows?: readonly TechniqueAuditRow[];
   vargaSentence?: string | null;
 }>) {
-  const progressed = applyThinkingSectionProgress(sections, answer);
-  const headings = [
-    ...progressed.map((section) => section.heading),
-    REPORT_HEADING.wrap,
-  ];
-  const { preamble, slices } = splitAnswerByHeadings(answer, headings);
+  const hasAnswer = Boolean(answer.trim());
+  const progressed = applyThinkingSectionProgress(sections, answer, {
+    settled: !live && hasAnswer,
+  });
+  const activeIndex = progressed.findIndex((section) => (
+    section.steps.some((step) => step.status === "active")
+  ));
 
   return (
     <div className="consultation-thinking-report">
-      {progressed.map((section, index) => {
-        const active = section.steps.some((step) => step.status === "active");
-        const analysis = analysisForSection(section, preamble, slices, index === 0);
-        const last = index === progressed.length - 1;
-        return (
-          <section className="consultation-report-block" key={section.id}>
-            <ThinkingStepTree
-              caption="思考"
-              intent={section.title}
-              steps={section.steps}
-              live={live && active}
-              liveLabel={live && active ? liveLabel : undefined}
-              liveState={liveState}
-              startedAt={live && active ? startedAt : undefined}
-              defaultOpen={active || (live && index === 0 && !answer.trim())}
-            />
-            {analysis.trim() ? (
-              <div className="consultation-report-analysis">
-                <h3 className="consultation-report-analysis__label">分析</h3>
-                <ChatMessageContent
-                  text={analysis}
-                  auditRows={last ? auditRows : undefined}
-                  vargaSentence={last ? vargaSentence : null}
-                />
-              </div>
-            ) : null}
-          </section>
-        );
-      })}
+      <ThinkingStepTree
+        caption="思考"
+        groups={progressed.map((section, index) => ({
+          id: section.id,
+          intent: section.title,
+          steps: section.steps,
+          live: live && index === activeIndex,
+        }))}
+        revealAll
+        live={live && !hasAnswer}
+        liveLabel={live && !hasAnswer ? liveLabel : undefined}
+        liveState={liveState}
+        startedAt={live && !hasAnswer ? startedAt : undefined}
+        defaultOpen={live && !hasAnswer}
+      />
+      {hasAnswer ? (
+        <section className="consultation-report-analysis" aria-label="分析">
+          <ChatMessageContent
+            text={answer}
+            auditRows={auditRows}
+            vargaSentence={vargaSentence}
+          />
+        </section>
+      ) : null}
     </div>
   );
 }

frontend/src/components/thinking-step-tree.tsx

@@ -59,11 +59,68 @@ function StepMarker({
   return <span className="agent-thinking-marker is-pending" aria-hidden="true" />;
 }
 
+type ThinkingStepGroup = Readonly<{
+  id: string;
+  intent?: string;
+  steps: readonly PublicThinkingStep[];
+  live?: boolean;
+}>;
+
+function StepList({
+  steps,
+  revealAll,
+  live,
+  liveLabel,
+  liveState,
+  startedAt,
+}: Readonly<{
+  steps: readonly PublicThinkingStep[];
+  revealAll: boolean;
+  live: boolean;
+  liveLabel?: string;
+  liveState?: OrbState;
+  startedAt?: number;
+}>) {
+  const visible = revealAll ? { visible: steps, hiddenCount: 0 } : visibleThinkingSteps(steps);
+  const hiddenDone = visible.hiddenCount > 0
+    && steps.slice(visible.visible.length).every((step) => step.status === "done");
+  return (
+    <ol className="agent-thinking-timeline">
+      {visible.visible.map((step) => (
+        <li
+          className={`agent-thinking-step is-${step.status}`}
+          key={step.id}
+        >
+          <StepMarker status={step.status} liveState={liveState} />
+          <span>{step.label}</span>
+        </li>
+      ))}
+      {visible.hiddenCount > 0 ? (
+        <li className={`agent-thinking-step is-more${hiddenDone ? " is-done" : ""}`}>
+          <StepMarker status={hiddenDone ? "done" : "pending"} />
+          <span>还有 {visible.hiddenCount} 项</span>
+        </li>
+      ) : null}
+      {live && liveLabel ? (
+        <li className="agent-thinking-step is-live">
+          <StepMarker status="live" liveState={liveState} />
+          <span className="agent-activity-status__live" role="status">
+            <span key={liveLabel} className="agent-activity-status__text">{liveLabel}</span>
+            {startedAt ? <ActivityElapsed key={startedAt} startedAt={startedAt} /> : null}
+          </span>
+        </li>
+      ) : null}
+    </ol>
+  );
+}
+
 export function ThinkingStepTree({
   caption,
   intent,
-  steps,
+  steps = [],
+  groups,
   hiddenCount,
+  revealAll = false,
   live = false,
   liveLabel,
   liveState = "working",
@@ -72,8 +129,10 @@ export function ThinkingStepTree({
 }: Readonly<{
   caption?: string;
   intent?: string;
-  steps: readonly PublicThinkingStep[];
+  steps?: readonly PublicThinkingStep[];
+  groups?: readonly ThinkingStepGroup[];
   hiddenCount?: number;
+  revealAll?: boolean;
   live?: boolean;
   liveLabel?: string;
   liveState?: OrbState;
@@ -81,36 +140,28 @@ export function ThinkingStepTree({
   defaultOpen?: boolean;
 }>) {
   const [userOpen, setUserOpen] = useState<boolean | null>(null);
-  const visible = hiddenCount === undefined ? visibleThinkingSteps(steps) : { visible: steps, hiddenCount };
+  const groupItems = groups ?? [{
+    id: "default",
+    intent,
+    steps,
+    live,
+  }];
+  const showAll = revealAll || hiddenCount === 0;
   const body = (
     <>
-      {intent ? <p className="consultation-step-tree__intent">{intent}</p> : null}
-      <ol className="agent-thinking-timeline">
-        {visible.visible.map((step) => (
-          <li
-            className={`agent-thinking-step is-${step.status}`}
-            key={step.id}
-          >
-            <StepMarker status={step.status} liveState={liveState} />
-            <span>{step.label}</span>
-          </li>
-        ))}
-        {visible.hiddenCount > 0 ? (
-          <li className="agent-thinking-step is-more">
-            <span className="agent-thinking-marker is-pending" aria-hidden="true" />
-            <span>还有 {visible.hiddenCount} 项</span>
-          </li>
-        ) : null}
-        {live && liveLabel ? (
-          <li className="agent-thinking-step is-live">
-            <StepMarker status="live" liveState={liveState} />
-            <span className="agent-activity-status__live" role="status">
-              <span key={liveLabel} className="agent-activity-status__text">{liveLabel}</span>
-              {startedAt ? <ActivityElapsed key={startedAt} startedAt={startedAt} /> : null}
-            </span>
-          </li>
-        ) : null}
-      </ol>
+      {groupItems.map((group) => (
+        <div className="consultation-step-tree__group" key={group.id}>
+          {group.intent ? <p className="consultation-step-tree__intent">{group.intent}</p> : null}
+          <StepList
+            steps={group.steps}
+            revealAll={showAll}
+            live={Boolean(group.live)}
+            liveLabel={group.live ? liveLabel : undefined}
+            liveState={liveState}
+            startedAt={group.live ? startedAt : undefined}
+          />
+        </div>
+      ))}
     </>
   );