From 09916566d887df6e3fd3adb29e32a4814df474ae Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Fri, 17 Jul 2026 20:12:16 +0000
Subject: [PATCH] fix: unify answer recovery states

Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
---
 src/components/ClinicalDashboard.tsx | 146 +++++++++++++--------------
 src/components/ui-primitives.tsx     |  39 ++++++-
 tests/ui-primitives.dom.test.tsx     |  30 ++++++
 3 files changed, 134 insertions(+), 81 deletions(-)
 create mode 100644 tests/ui-primitives.dom.test.tsx

diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index a4a636c71..d5de7857a 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -33,11 +33,11 @@ import {
   appBackdrop,
   answerSurface,
   cn,
+  EmptyState,
   floatingControl,
   InlineNotice,
   primaryControl,
   textMuted,
-  toneInfo,
 } from "@/components/ui-primitives";
 import { useAuthSession } from "@/lib/supabase/client";
 import { AccountSetupDialog } from "@/components/clinical-dashboard/account-setup-dialog";
@@ -3598,100 +3598,90 @@ export function ClinicalDashboard({
                   {activeModeSearch.resultHeading}
                 </h2>
                 {answerLifecycle.status === "cancelled" && activeModeResultKind === "answer" ? (
-                  <div
-                    role="status"
-                    aria-live="polite"
-                    data-testid="answer-cancelled"
-                    className={cn(
-                      "flex flex-wrap items-center justify-between gap-3 rounded-lg border p-4 text-sm",
-                      toneInfo,
-                    )}
-                  >
-                    <div>
-                      <p className="font-semibold text-[color:var(--text-heading)]">Generation stopped</p>
-                      <p className={textMuted}>No partial clinical answer was kept.</p>
-                    </div>
-                    <button
-                      type="button"
-                      className={cn(primaryControl, "text-xs")}
-                      onClick={() => void ask(answerLifecycle.query ?? query)}
-                    >
-                      <RefreshCw className="h-4 w-4" aria-hidden="true" />
-                      Run again
-                    </button>
-                  </div>
-                ) : error && errorKind === "no-results" && activeModeResultKind === "answer" ? (
-                  <div
-                    role="status"
-                    data-testid="answer-no-results"
-                    className={cn("rounded-lg border p-4 text-sm", toneInfo)}
-                  >
-                    <div className="flex items-start gap-2">
-                      <Search aria-hidden="true" className="mt-0.5 h-4 w-4 shrink-0" />
-                      <div className="min-w-0 space-y-1">
-                        <p className="font-semibold text-[color:var(--text-heading)]">
-                          {answerRecovery.noResults.heading}
-                        </p>
-                        <p className={textMuted}>{answerRecovery.noResults.body}</p>
-                      </div>
-                    </div>
-                    <div className="mt-3 flex flex-wrap gap-2">
+                  <EmptyState
+                    icon={Square}
+                    title="Generation stopped"
+                    body="No partial clinical answer was kept. You can safely run the same question again."
+                    live="polite"
+                    testId="answer-cancelled"
+                    actions={
                       <button
                         type="button"
-                        data-testid="answer-no-results-rephrase"
-                        onClick={() => focusComposerInput()}
                         className={cn(primaryControl, "text-xs")}
+                        onClick={() => void ask(answerLifecycle.query ?? query)}
                       >
-                        {answerRecovery.rephrase}
+                        <RefreshCw className="h-4 w-4" aria-hidden="true" />
+                        Run again
                       </button>
-                      <button
-                        type="button"
-                        data-testid="answer-no-results-search-documents"
-                        onClick={() => crossModeSearch("documents", (lastFailedQuery ?? query).trim())}
-                        className={cn(floatingControl, "text-xs")}
-                      >
-                        <FileText aria-hidden="true" className="h-4 w-4" />
-                        {answerRecovery.searchDocuments}
-                      </button>
-                    </div>
-                  </div>
-                ) : error ? (
-                  <div
-                    role="alert"
-                    data-testid="answer-error"
-                    className="rounded-lg border border-[color:var(--danger)]/30 bg-[color:var(--danger-soft)] p-3 text-sm font-medium text-[color:var(--danger)]"
-                  >
-                    <div className="flex items-start gap-2">
-                      <CircleAlert aria-hidden="true" className="mt-0.5 h-4 w-4 shrink-0" />
-                      <span className="min-w-0">{error}</span>
-                    </div>
-                    {activeModeResultKind === "answer" && lastFailedQuery && (
-                      <div className="mt-3 flex flex-wrap gap-2">
+                    }
+                  />
+                ) : error && errorKind === "no-results" && activeModeResultKind === "answer" ? (
+                  <EmptyState
+                    icon={Search}
+                    title={answerRecovery.noResults.heading}
+                    body={answerRecovery.noResults.body}
+                    live="polite"
+                    tone="info"
+                    testId="answer-no-results"
+                    actions={
+                      <>
                         <button
                           type="button"
-                          data-testid="answer-error-retry"
-                          onClick={() => {
-                            const retryQuery = lastFailedQuery ?? query;
-                            setError(null);
-                            void ask(retryQuery);
-                          }}
-                          className={cn(floatingControl, "text-xs")}
+                          data-testid="answer-no-results-rephrase"
+                          onClick={() => focusComposerInput()}
+                          className={cn(primaryControl, "text-xs")}
                         >
-                          <RefreshCw aria-hidden="true" className="h-4 w-4" />
-                          {answerRecovery.retry}
+                          {answerRecovery.rephrase}
                         </button>
                         <button
                           type="button"
-                          data-testid="answer-error-search-documents"
+                          data-testid="answer-no-results-search-documents"
                           onClick={() => crossModeSearch("documents", (lastFailedQuery ?? query).trim())}
                           className={cn(floatingControl, "text-xs")}
                         >
                           <FileText aria-hidden="true" className="h-4 w-4" />
                           {answerRecovery.searchDocuments}
                         </button>
-                      </div>
-                    )}
-                  </div>
+                      </>
+                    }
+                  />
+                ) : error ? (
+                  <EmptyState
+                    icon={CircleAlert}
+                    title="Answer unavailable"
+                    body={error}
+                    live="assertive"
+                    tone="danger"
+                    testId="answer-error"
+                    actions={
+                      activeModeResultKind === "answer" && lastFailedQuery ? (
+                        <>
+                          <button
+                            type="button"
+                            data-testid="answer-error-retry"
+                            onClick={() => {
+                              const retryQuery = lastFailedQuery ?? query;
+                              setError(null);
+                              void ask(retryQuery);
+                            }}
+                            className={cn(floatingControl, "text-xs")}
+                          >
+                            <RefreshCw aria-hidden="true" className="h-4 w-4" />
+                            {answerRecovery.retry}
+                          </button>
+                          <button
+                            type="button"
+                            data-testid="answer-error-search-documents"
+                            onClick={() => crossModeSearch("documents", (lastFailedQuery ?? query).trim())}
+                            className={cn(floatingControl, "text-xs")}
+                          >
+                            <FileText aria-hidden="true" className="h-4 w-4" />
+                            {answerRecovery.searchDocuments}
+                          </button>
+                        </>
+                      ) : undefined
+                    }
+                  />
                 ) : null}
 
                 {searchMode !== "prescribing" &&
diff --git a/src/components/ui-primitives.tsx b/src/components/ui-primitives.tsx
index 7c736d6bb..79effd296 100644
--- a/src/components/ui-primitives.tsx
+++ b/src/components/ui-primitives.tsx
@@ -426,18 +426,51 @@ export function LoadingPanel({
   );
 }
 
-export function EmptyState({ icon: Icon, title, body }: { icon?: IconComponent; title: string; body: string }) {
+export function EmptyState({
+  icon: Icon,
+  title,
+  body,
+  actions,
+  live,
+  tone = "neutral",
+  testId,
+}: {
+  icon?: IconComponent;
+  title: string;
+  body: string;
+  /** Optional controls stay within the shared state surface rather than becoming a second panel. */
+  actions?: ReactNode;
+  /** Announce a state transition only when the state is introduced dynamically. */
+  live?: "polite" | "assertive";
+  tone?: "neutral" | "info" | "danger";
+  testId?: string;
+}) {
   return (
-    <div className="rounded-lg border border-dashed border-[color:var(--border-strong)] bg-[color:var(--surface-inset)] p-4 text-sm shadow-[var(--shadow-inset)] sm:p-5">
+    <div
+      data-testid={testId}
+      role={live === "assertive" ? "alert" : live === "polite" ? "status" : undefined}
+      className={cn(
+        "rounded-lg border border-dashed border-[color:var(--border-strong)] bg-[color:var(--surface-inset)] p-4 text-sm shadow-[var(--shadow-inset)] sm:p-5",
+        tone === "info" && "border-[color:var(--info-border)] bg-[color:var(--info-soft)]",
+        tone === "danger" && "border-[color:var(--danger-border)] bg-[color:var(--danger-soft)]",
+      )}
+    >
       <div className="flex items-start gap-3">
         {Icon && (
-          <span className="grid h-10 w-10 shrink-0 place-items-center rounded-lg bg-[color:var(--surface)] text-[color:var(--text-muted)]">
+          <span
+            className={cn(
+              "grid h-10 w-10 shrink-0 place-items-center rounded-lg bg-[color:var(--surface)] text-[color:var(--text-muted)]",
+              tone === "info" && "bg-[color:var(--info-soft)] text-[color:var(--info)]",
+              tone === "danger" && "bg-[color:var(--danger-soft)] text-[color:var(--danger)]",
+            )}
+          >
             <Icon className="size-icon-md sm:size-icon-lg" />
           </span>
         )}
         <div className="min-w-0">
           <p className="font-semibold text-[color:var(--text)]">{title}</p>
           <p className={cn("mt-1 leading-6", textMuted)}>{body}</p>
+          {actions ? <div className="mt-3 flex flex-wrap gap-2">{actions}</div> : null}
         </div>
       </div>
     </div>
diff --git a/tests/ui-primitives.dom.test.tsx b/tests/ui-primitives.dom.test.tsx
new file mode 100644
index 000000000..4a380b2f8
--- /dev/null
+++ b/tests/ui-primitives.dom.test.tsx
@@ -0,0 +1,30 @@
+import { render, screen } from "@testing-library/react";
+import { Search } from "lucide-react";
+import { describe, expect, it } from "vitest";
+
+import { EmptyState } from "@/components/ui-primitives";
+
+describe("EmptyState", () => {
+  it("keeps recovery actions inside an announced state surface", () => {
+    render(
+      <EmptyState
+        icon={Search}
+        title="No matching sources"
+        body="Try a more specific question."
+        live="polite"
+        testId="recovery-state"
+        actions={<button type="button">Rephrase question</button>}
+      />,
+    );
+
+    const state = screen.getByTestId("recovery-state");
+    expect(state).toHaveAttribute("role", "status");
+    expect(screen.getByRole("button", { name: "Rephrase question" })).toBeVisible();
+  });
+
+  it("uses an assertive announcement for a dynamic failure", () => {
+    render(<EmptyState title="Answer unavailable" body="Please try again." live="assertive" />);
+
+    expect(screen.getByRole("alert")).toHaveTextContent("Answer unavailable");
+  });
+});