diff --git a/src/components/server-catalog/CatalogResults.tsx b/src/components/server-catalog/CatalogResults.tsx
index 7d47fdb2..6bde098d 100644
--- a/src/components/server-catalog/CatalogResults.tsx
+++ b/src/components/server-catalog/CatalogResults.tsx
@@ -23,6 +23,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { StatusIndicator } from "@/components/ui/status-indicator";
 import type { CatalogServer } from "@/generated/types";
 import { useDebouncedValue } from "@/hooks/useDebouncedValue";
 import { getAuthTypeGroupId, getAuthTypeGroupLabelId } from "@/utils/catalogAuthTypes";
@@ -30,6 +31,7 @@ import { getTagLabels } from "@/utils/tags";
 
 const EMPTY_PENDING_IDS: ReadonlySet<string> = new Set();
 const EMPTY_OAUTH_STATUSES: Readonly<Record<string, OAuthGatewayStatus>> = {};
+const EMPTY_ADD_ERRORS: Readonly<Record<string, string>> = {};
 
 function getOAuthCardState(server: CatalogServer, status?: OAuthGatewayStatus) {
   const tokenState = status?.user_token_status?.status;
@@ -77,6 +79,8 @@ function CatalogCard({
   canTest,
   canDisconnect,
   oauthStatuses,
+  addError,
+  onAddErrorRead,
 }: {
   server: CatalogServer;
   onView: (trigger: HTMLElement) => void;
@@ -90,6 +94,10 @@ function CatalogCard({
   canTest: boolean;
   canDisconnect: boolean;
   oauthStatuses?: Readonly<Record<string, OAuthGatewayStatus>>;
+  /** Why the last add attempt failed, resolved to the server's reason or the fallback. */
+  addError?: string;
+  /** Called once the reason has been read, which is what retires the error. */
+  onAddErrorRead?: () => void;
 }) {
   const intl = useIntl();
   const headingId = useId();
@@ -97,6 +105,7 @@ function CatalogCard({
   const actionsTriggerRef = useRef<HTMLButtonElement | null>(null);
   const pendingDetailsTriggerRef = useRef<HTMLButtonElement | null>(null);
   const shouldTransferAddFocusRef = useRef(false);
+  const shouldRestoreErrorFocusRef = useRef(false);
   const oauthState = getOAuthCardState(
     server,
     server.gateway_id ? oauthStatuses?.[server.gateway_id] : undefined,
@@ -117,6 +126,21 @@ function CatalogCard({
     }
   }, [isAdding, server.is_registered]);
 
+  // Retiring the error unmounts the trigger the popover returns focus to.
+  useEffect(() => {
+    if (addError || !shouldRestoreErrorFocusRef.current) return;
+    shouldRestoreErrorFocusRef.current = false;
+
+    const timeoutId = window.setTimeout(() => {
+      const trigger = addTriggerRef.current;
+      if (!trigger) return;
+      const { activeElement, body } = trigger.ownerDocument;
+      if (activeElement === null || activeElement === body) trigger.focus();
+    }, 0);
+
+    return () => window.clearTimeout(timeoutId);
+  }, [addError]);
+
   return (
     <li className="min-w-0">
       <Card className="h-full min-h-[200px] gap-0 rounded-xl border border-border bg-card p-0 py-0 shadow-none ring-0 transition-colors hover:border-ring dark:hover:border-muted-foreground">
@@ -278,6 +302,32 @@ function CatalogCard({
                   <FileText className="size-4 text-muted-foreground" aria-hidden="true" />
                 </Button>
               )}
+
+              {!server.is_registered && addError && !isAdding && (
+                <StatusIndicator
+                  Icon={STATUS_ICON.error}
+                  iconClassName={STATUS_TONE_CLASS.error}
+                  labelClassName="text-foreground"
+                  className="ml-2"
+                  label={intl.formatMessage({ id: "mcpServer.catalog.addFailed.short" })}
+                  fullLabel={intl.formatMessage({ id: "mcpServer.catalog.addFailed.label" })}
+                  triggerAriaLabel={intl.formatMessage(
+                    { id: "mcpServer.catalog.addFailed.trigger" },
+                    { name: server.name },
+                  )}
+                  contentAriaLabel={intl.formatMessage(
+                    { id: "mcpServer.catalog.addFailed.detail" },
+                    { name: server.name },
+                  )}
+                  onOpenChange={(open) => {
+                    if (open) return;
+                    shouldRestoreErrorFocusRef.current = true;
+                    onAddErrorRead?.();
+                  }}
+                >
+                  <p className="break-words text-sm text-foreground">{addError}</p>
+                </StatusIndicator>
+              )}
             </div>
           </CardContent>
         </article>
@@ -375,6 +425,8 @@ export function CatalogResults({
   canTest,
   canDisconnect,
   oauthStatuses = EMPTY_OAUTH_STATUSES,
+  addErrors = EMPTY_ADD_ERRORS,
+  onAddErrorRead,
 }: {
   servers: CatalogServer[];
   emptyStateMessageId: string;
@@ -389,6 +441,8 @@ export function CatalogResults({
   canTest: boolean;
   canDisconnect: boolean;
   oauthStatuses?: Readonly<Record<string, OAuthGatewayStatus>>;
+  addErrors?: Readonly<Record<string, string>>;
+  onAddErrorRead?: (serverId: string) => void;
 }) {
   const intl = useIntl();
   const announcedCount = useDebouncedValue(servers.length, 300);
@@ -418,6 +472,8 @@ export function CatalogResults({
               canTest={canTest}
               canDisconnect={canDisconnect}
               oauthStatuses={oauthStatuses}
+              addError={addErrors[server.id]}
+              onAddErrorRead={onAddErrorRead && (() => onAddErrorRead(server.id))}
             />
           ))}
         </ul>
diff --git a/src/components/servers/ServerStatusIndicator.tsx b/src/components/servers/ServerStatusIndicator.tsx
index 99cebf06..1d029bd5 100644
--- a/src/components/servers/ServerStatusIndicator.tsx
+++ b/src/components/servers/ServerStatusIndicator.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { useIntl } from "react-intl";
 
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { StatusIndicator } from "@/components/ui/status-indicator";
 import { cn } from "@/lib/utils";
 import {
   getAvailabilityPresentation,
@@ -61,32 +61,18 @@ export function ServerStatusIndicator({
   const fullLabel = intl.formatMessage({ id: presentation.labelId });
   const isAbbreviated = compact && presentation.shortLabelId !== presentation.labelId;
 
-  const icon = (
-    <StatusIcon
-      className={cn("h-3.5 w-3.5 shrink-0", presentation.iconClassName)}
-      aria-hidden="true"
-      focusable="false"
-    />
-  );
-
-  const content = (
-    <>
-      {icon}
-      <span className="text-muted-foreground" aria-hidden={isAbbreviated || undefined}>
-        {label}
-      </span>
-      {isAbbreviated && <span className="sr-only">{fullLabel}</span>}
-    </>
-  );
-  const layout = "inline-flex items-center gap-1.5 text-xs";
-  const trigger =
-    "rounded hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring";
-
-  if (!interactive) {
-    return <span className={cn(layout, className)}>{content}</span>;
-  }
+  if (interactive && authorize) {
+    const layout = "inline-flex items-center gap-1.5 text-xs";
+    const trigger =
+      "rounded hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring";
+    const icon = (
+      <StatusIcon
+        className={cn("h-3.5 w-3.5 shrink-0", presentation.iconClassName)}
+        aria-hidden="true"
+        focusable="false"
+      />
+    );
 
-  if (authorize) {
     const runAuthorize = async () => {
       setIsAuthorizing(true);
       try {
@@ -119,25 +105,28 @@ export function ServerStatusIndicator({
   }
 
   return (
-    <Popover>
-      <PopoverTrigger
-        type="button"
-        aria-label={intl.formatMessage(
-          { id: "mcpServer.status.trigger" },
-          { name: server.name, status: fullLabel },
-        )}
-        className={cn(layout, trigger, className)}
-      >
-        {content}
-      </PopoverTrigger>
-      <PopoverContent align="end" className="w-auto max-w-xs p-3">
-        <ServerStatusDetail
-          availability={availability}
-          enabled={server.enabled}
-          lastSeen={server.lastSeen}
-          lastError={server.lastError}
-        />
-      </PopoverContent>
-    </Popover>
+    <StatusIndicator
+      Icon={StatusIcon}
+      iconClassName={presentation.iconClassName}
+      label={label}
+      fullLabel={isAbbreviated ? fullLabel : undefined}
+      triggerAriaLabel={intl.formatMessage(
+        { id: "mcpServer.status.trigger" },
+        { name: server.name, status: fullLabel },
+      )}
+      contentAriaLabel={intl.formatMessage(
+        { id: "mcpServer.status.detail.label" },
+        { name: server.name },
+      )}
+      interactive={interactive}
+      className={className}
+    >
+      <ServerStatusDetail
+        availability={availability}
+        enabled={server.enabled}
+        lastSeen={server.lastSeen}
+        lastError={server.lastError}
+      />
+    </StatusIndicator>
   );
 }
diff --git a/src/components/ui/status-indicator.test.tsx b/src/components/ui/status-indicator.test.tsx
new file mode 100644
index 00000000..45dc7d56
--- /dev/null
+++ b/src/components/ui/status-indicator.test.tsx
@@ -0,0 +1,92 @@
+import { describe, expect, it } from "vitest";
+import userEvent from "@testing-library/user-event";
+import { OctagonXIcon } from "lucide-react";
+
+import { renderWithProviders, screen } from "@/test/test-utils";
+import { StatusIndicator } from "./status-indicator";
+
+const props = {
+  Icon: OctagonXIcon,
+  iconClassName: "text-destructive",
+  label: "Error",
+};
+
+describe("StatusIndicator", () => {
+  it("opens its popover on click", async () => {
+    const user = userEvent.setup();
+    renderWithProviders(
+      <StatusIndicator {...props} triggerAriaLabel="Show details">
+        <p>Unable to add this server.</p>
+      </StatusIndicator>,
+    );
+
+    await user.click(screen.getByRole("button", { name: "Show details" }));
+
+    expect(await screen.findByText("Unable to add this server.")).toBeVisible();
+  });
+
+  it("names the popover it opens", async () => {
+    const user = userEvent.setup();
+    renderWithProviders(
+      <StatusIndicator
+        {...props}
+        triggerAriaLabel="Show details"
+        contentAriaLabel="Acme add failure details"
+      >
+        <p>Unable to add this server.</p>
+      </StatusIndicator>,
+    );
+
+    await user.click(screen.getByRole("button", { name: "Show details" }));
+
+    expect(await screen.findByRole("dialog", { name: "Acme add failure details" })).toBeVisible();
+  });
+
+  it("announces the full label where the visible one is abbreviated", () => {
+    renderWithProviders(
+      <StatusIndicator {...props} fullLabel="Error adding server" triggerAriaLabel="Show details">
+        <p>Detail</p>
+      </StatusIndicator>,
+    );
+
+    expect(screen.getByText("Error")).toHaveAttribute("aria-hidden", "true");
+    expect(screen.getByText("Error adding server")).toBeInTheDocument();
+  });
+
+  it("leaves the label announced where it is not abbreviated", () => {
+    renderWithProviders(
+      <StatusIndicator {...props} fullLabel="Error" triggerAriaLabel="Show details">
+        <p>Detail</p>
+      </StatusIndicator>,
+    );
+
+    expect(screen.getByText("Error")).not.toHaveAttribute("aria-hidden");
+  });
+
+  it("mutes the label unless the caller overrides it", () => {
+    const { rerender } = renderWithProviders(<StatusIndicator {...props} />);
+
+    expect(screen.getByText("Error")).toHaveClass("text-muted-foreground");
+
+    rerender(<StatusIndicator {...props} labelClassName="text-foreground" />);
+
+    expect(screen.getByText("Error")).toHaveClass("text-foreground");
+  });
+
+  it("renders as plain text where a button cannot nest", () => {
+    renderWithProviders(
+      <StatusIndicator {...props} interactive={false}>
+        <p>Detail</p>
+      </StatusIndicator>,
+    );
+
+    expect(screen.queryByRole("button")).not.toBeInTheDocument();
+    expect(screen.getByText("Error")).toBeInTheDocument();
+  });
+
+  it("renders as plain text with nothing to explain", () => {
+    renderWithProviders(<StatusIndicator {...props} />);
+
+    expect(screen.queryByRole("button")).not.toBeInTheDocument();
+  });
+});
diff --git a/src/components/ui/status-indicator.tsx b/src/components/ui/status-indicator.tsx
new file mode 100644
index 00000000..f91d66ab
--- /dev/null
+++ b/src/components/ui/status-indicator.tsx
@@ -0,0 +1,96 @@
+import type { ReactNode } from "react";
+import type { LucideIcon } from "lucide-react";
+
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { cn } from "@/lib/utils";
+
+interface StatusIndicatorProps {
+  Icon: LucideIcon;
+  /** Applies to the icon only. */
+  iconClassName: string;
+  /** Overrides the muted label colour, which the catalog card does. */
+  labelClassName?: string;
+  /** The visible label. Pass the abbreviated form where the column is narrow. */
+  label: string;
+  /** The unabbreviated label, announced in place of `label` when the two differ. */
+  fullLabel?: string;
+  /** Accessible name for the trigger. Required wherever `children` are given. */
+  triggerAriaLabel?: string;
+  /** Accessible name for the popover, which Radix leaves unnamed. */
+  contentAriaLabel?: string;
+  size?: "xs" | "sm";
+  /** Render as plain text rather than a button. Required inside another button. */
+  interactive?: boolean;
+  /** Popover contents. Without them the indicator has nothing to open and stays plain text. */
+  children?: ReactNode;
+  /** Fires on open and on close, for a caller that treats reading the popover as an action. */
+  onOpenChange?: (open: boolean) => void;
+  className?: string;
+}
+
+const SIZE_CLASS = {
+  xs: "text-xs",
+  sm: "text-sm",
+} as const;
+
+/**
+ * Status icon and label, optionally opening a popover that explains the state.
+ *
+ * Presentation only: callers classify their own subject and pass the icon, tone
+ * and copy. Consumers are the MCP server status indicator, the catalog card and
+ * the source picker, which share this shape but not their state models.
+ */
+export function StatusIndicator({
+  Icon,
+  iconClassName,
+  labelClassName = "text-muted-foreground",
+  label,
+  fullLabel,
+  triggerAriaLabel,
+  contentAriaLabel,
+  size = "xs",
+  interactive = true,
+  children,
+  onOpenChange,
+  className,
+}: StatusIndicatorProps) {
+  const isAbbreviated = Boolean(fullLabel && fullLabel !== label);
+  const layout = cn("inline-flex items-center gap-1.5", SIZE_CLASS[size]);
+
+  const content = (
+    <>
+      <Icon
+        className={cn("h-3.5 w-3.5 shrink-0", iconClassName)}
+        aria-hidden="true"
+        focusable="false"
+      />
+      <span className={labelClassName} aria-hidden={isAbbreviated || undefined}>
+        {label}
+      </span>
+      {isAbbreviated && <span className="sr-only">{fullLabel}</span>}
+    </>
+  );
+
+  if (!interactive || !children) {
+    return <span className={cn(layout, className)}>{content}</span>;
+  }
+
+  return (
+    <Popover onOpenChange={onOpenChange}>
+      <PopoverTrigger
+        type="button"
+        aria-label={triggerAriaLabel}
+        className={cn(
+          layout,
+          "rounded hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+          className,
+        )}
+      >
+        {content}
+      </PopoverTrigger>
+      <PopoverContent align="end" aria-label={contentAriaLabel} className="w-auto max-w-xs p-3">
+        {children}
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/src/i18n/locales/en-US/mcpServer.json b/src/i18n/locales/en-US/mcpServer.json
index 98c87958..07a0ba8f 100644
--- a/src/i18n/locales/en-US/mcpServer.json
+++ b/src/i18n/locales/en-US/mcpServer.json
@@ -83,6 +83,7 @@
   "mcpServer.status.checking": "Connecting",
   "mcpServer.status.inactive": "Inactive",
   "mcpServer.status.trigger": "{name} status: {status}. Show details",
+  "mcpServer.status.detail.label": "{name} status details",
   "mcpServer.status.authorizeTrigger": "Authorize {name}",
   "mcpServer.status.detail.active": "This server is responding and its tools, resources, and prompts are up to date.",
   "mcpServer.status.detail.auth": "You have not authorized this server. Tools, resources, and prompts stay hidden until you do. Authorization is per person, so a colleague authorizing does not authorize you.",
@@ -157,6 +158,11 @@
   "mcpServer.catalog.oauth.authorizationError": "OAuth authorization could not be completed. Try again.",
   "mcpServer.catalog.oauth.authorizedToolsPending": "{name} is authorized, but tools could not be fetched. Try again from the server actions.",
   "mcpServer.catalog.addError": "Unable to add this server. Try again.",
+  "mcpServer.catalog.addFailed.short": "Error",
+  "mcpServer.catalog.addFailed.label": "Error adding server",
+  "mcpServer.catalog.addFailed.trigger": "{name} status: error adding server. Show details",
+  "mcpServer.catalog.addFailed.detail": "{name} add failure details",
+  "mcpServer.catalog.addFailed.announcement": "Error adding {name}. {message}",
   "mcpServer.catalog.addNotFound": "{name} is no longer available in the catalog.",
   "mcpServer.catalog.alreadyConnected": "{name} is already connected.",
   "mcpServer.catalog.actionsFor": "Actions for {name}",
diff --git a/src/i18n/locales/es-ES/mcpServer.json b/src/i18n/locales/es-ES/mcpServer.json
index f733ca1e..3562edaf 100644
--- a/src/i18n/locales/es-ES/mcpServer.json
+++ b/src/i18n/locales/es-ES/mcpServer.json
@@ -83,6 +83,7 @@
   "mcpServer.status.checking": "Conectando",
   "mcpServer.status.inactive": "Inactivo",
   "mcpServer.status.trigger": "Estado de {name}: {status}. Ver detalles",
+  "mcpServer.status.detail.label": "Detalles del estado de {name}",
   "mcpServer.status.authorizeTrigger": "Autorizar {name}",
   "mcpServer.status.detail.active": "Este servidor responde y sus herramientas, recursos y prompts están al día.",
   "mcpServer.status.detail.auth": "No has autorizado este servidor. Sus herramientas, recursos y prompts permanecen ocultos hasta que lo hagas. La autorización es individual, así que si otra persona lo autoriza no queda autorizado para ti.",
@@ -157,6 +158,11 @@
   "mcpServer.catalog.oauth.authorizationError": "No se pudo completar la autorización OAuth. Inténtalo de nuevo.",
   "mcpServer.catalog.oauth.authorizedToolsPending": "{name} está autorizado, pero no se pudieron obtener las herramientas. Inténtalo de nuevo desde las acciones del servidor.",
   "mcpServer.catalog.addError": "No se pudo añadir este servidor. Inténtalo de nuevo.",
+  "mcpServer.catalog.addFailed.short": "Error",
+  "mcpServer.catalog.addFailed.label": "Error al añadir el servidor",
+  "mcpServer.catalog.addFailed.trigger": "Estado de {name}: error al añadir el servidor. Ver detalles",
+  "mcpServer.catalog.addFailed.detail": "Detalles del error al añadir {name}",
+  "mcpServer.catalog.addFailed.announcement": "Error al añadir {name}. {message}",
   "mcpServer.catalog.addNotFound": "{name} ya no está disponible en el catálogo.",
   "mcpServer.catalog.alreadyConnected": "{name} ya está conectado.",
   "mcpServer.catalog.actionsFor": "Acciones para {name}",
diff --git a/src/i18n/locales/pt-BR/mcpServer.json b/src/i18n/locales/pt-BR/mcpServer.json
index 46b60ee4..c8154020 100644
--- a/src/i18n/locales/pt-BR/mcpServer.json
+++ b/src/i18n/locales/pt-BR/mcpServer.json
@@ -83,6 +83,7 @@
   "mcpServer.status.checking": "Conectando",
   "mcpServer.status.inactive": "Inativo",
   "mcpServer.status.trigger": "Status de {name}: {status}. Ver detalhes",
+  "mcpServer.status.detail.label": "Detalhes do status de {name}",
   "mcpServer.status.authorizeTrigger": "Autorizar {name}",
   "mcpServer.status.detail.active": "Este servidor está respondendo e suas ferramentas, recursos e prompts estão atualizados.",
   "mcpServer.status.detail.auth": "Você ainda não autorizou este servidor. As ferramentas, recursos e prompts ficam ocultos até que autorize. A autorização é individual, então outra pessoa autorizar não autoriza você.",
@@ -157,6 +158,11 @@
   "mcpServer.catalog.oauth.authorizationError": "Não foi possível concluir a autorização OAuth. Tente novamente.",
   "mcpServer.catalog.oauth.authorizedToolsPending": "{name} está autorizado, mas não foi possível buscar as ferramentas. Tente novamente pelas ações do servidor.",
   "mcpServer.catalog.addError": "Não foi possível adicionar este servidor. Tente novamente.",
+  "mcpServer.catalog.addFailed.short": "Erro",
+  "mcpServer.catalog.addFailed.label": "Erro ao adicionar o servidor",
+  "mcpServer.catalog.addFailed.trigger": "Status de {name}: erro ao adicionar o servidor. Ver detalhes",
+  "mcpServer.catalog.addFailed.detail": "Detalhes do erro ao adicionar {name}",
+  "mcpServer.catalog.addFailed.announcement": "Erro ao adicionar {name}. {message}",
   "mcpServer.catalog.addNotFound": "{name} não está mais disponível no catálogo.",
   "mcpServer.catalog.alreadyConnected": "{name} já está conectado.",
   "mcpServer.catalog.actionsFor": "Ações para {name}",
diff --git a/src/pages/ServerCatalog.test.tsx b/src/pages/ServerCatalog.test.tsx
index 8a976e2a..585f8335 100644
--- a/src/pages/ServerCatalog.test.tsx
+++ b/src/pages/ServerCatalog.test.tsx
@@ -544,7 +544,11 @@ describe("ServerCatalog", () => {
     await screen.findByText("Globalping connection failed with status 503 in 12 ms.");
 
     await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
-    expect(await screen.findByText("Unable to add this server. Try again.")).toBeVisible();
+    expect(
+      await screen.findByRole("button", {
+        name: "Public Notes status: error adding server. Show details",
+      }),
+    ).toBeVisible();
     expect(
       screen.getByText("Globalping connection failed with status 503 in 12 ms."),
     ).toBeVisible();
@@ -813,19 +817,188 @@ describe("ServerCatalog", () => {
     expect(screen.getAllByText("Connected")).toHaveLength(2);
   });
 
-  it("reports catalog registration failures", async () => {
+  it("reports catalog registration failures on the card that failed", async () => {
     const user = userEvent.setup();
     mockRegisterCatalogServer.mockRejectedValue(new Error("network detail must not leak"));
     renderWithRouter(<ServerCatalog />);
 
     await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
 
-    expect(await screen.findByRole("alert")).toHaveTextContent(
-      "Unable to add this server. Try again.",
-    );
+    const indicator = await screen.findByRole("button", {
+      name: "Public Notes status: error adding server. Show details",
+    });
+    expect(screen.queryByRole("alert")).not.toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Add Public Notes" })).toBeEnabled();
+
+    await user.click(indicator);
+
+    expect(await screen.findByText("Unable to add this server. Try again.")).toBeVisible();
     expect(screen.queryByText(/network detail/i)).not.toBeInTheDocument();
   });
 
+  it("shows the reason a rejected registration gives on the card that failed", async () => {
+    const user = userEvent.setup();
+    // server_id is empty rather than absent on every backend rejection.
+    mockRegisterCatalogServer.mockResolvedValue({
+      success: false,
+      server_id: "",
+      message: "Remote server error - the MCP server is experiencing issues",
+    });
+    renderWithRouter(<ServerCatalog />);
+
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+
+    const indicator = await screen.findByRole("button", {
+      name: "Public Notes status: error adding server. Show details",
+    });
+    expect(screen.queryByRole("alert")).not.toBeInTheDocument();
+
+    await user.click(indicator);
+
+    expect(
+      await screen.findByText("Remote server error - the MCP server is experiencing issues"),
+    ).toBeVisible();
+  });
+
+  it("falls back to generic copy where a rejected registration carries no message", async () => {
+    const user = userEvent.setup();
+    mockRegisterCatalogServer.mockResolvedValue({ success: false, server_id: "", message: "" });
+    renderWithRouter(<ServerCatalog />);
+
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+    await user.click(
+      await screen.findByRole("button", {
+        name: "Public Notes status: error adding server. Show details",
+      }),
+    );
+
+    expect(await screen.findByText("Unable to add this server. Try again.")).toBeVisible();
+  });
+
+  it("announces an add failure with the reason the card indicator only shows silently", async () => {
+    const user = userEvent.setup();
+    mockRegisterCatalogServer.mockRejectedValue(new Error("network"));
+    renderWithRouter(<ServerCatalog />);
+
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+
+    const announcement = await screen.findByText(
+      "Error adding Public Notes. Unable to add this server. Try again.",
+    );
+    expect(announcement).toHaveAttribute("aria-live", "polite");
+  });
+
+  it("reannounces a repeat failure and drops the announcement once the add succeeds", async () => {
+    const user = userEvent.setup();
+    let failSecondAttempt: (error: Error) => void = () => {};
+    mockRegisterCatalogServer.mockRejectedValueOnce(new Error("network")).mockImplementationOnce(
+      () =>
+        new Promise((_resolve, reject) => {
+          failSecondAttempt = reject;
+        }),
+    );
+    renderWithRouter(<ServerCatalog />);
+    const liveRegion = () => document.querySelector("p[aria-live='polite']:not([role])");
+
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+    await waitFor(() => expect(liveRegion()).toHaveTextContent("Error adding Public Notes"));
+
+    // The second failure repeats the first message, so the region has to empty
+    // while the attempt is in flight for there to be a change to announce.
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+    expect(liveRegion()).toBeEmptyDOMElement();
+
+    failSecondAttempt(new Error("network"));
+    await waitFor(() => expect(liveRegion()).toHaveTextContent("Error adding Public Notes"));
+
+    mockRegisterCatalogServer.mockResolvedValue({
+      success: true,
+      message: "Registered",
+      server_id: "gw-public-notes",
+    });
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+
+    await waitFor(() => expect(liveRegion()).toBeEmptyDOMElement());
+  });
+
+  it("keeps a failure announced while an unrelated server is added", async () => {
+    const user = userEvent.setup();
+    mockUseQuery.mockReturnValue(
+      queryResult({
+        data: {
+          ...response,
+          servers: [...response.servers, { ...openAvailable, id: "open-other", name: "Team Wiki" }],
+          total: 5,
+        },
+      }),
+    );
+    mockRegisterCatalogServer
+      .mockRejectedValueOnce(new Error("network"))
+      .mockImplementationOnce(() => new Promise(() => {}));
+    renderWithRouter(<ServerCatalog />);
+    const liveRegion = () => document.querySelector("p[aria-live='polite']:not([role])");
+
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+    await waitFor(() => expect(liveRegion()).toHaveTextContent("Error adding Public Notes"));
+
+    // Every add flow clears, but the announcement belongs to the server that failed.
+    await user.click(screen.getByRole("button", { name: "Add Team Wiki" }));
+
+    expect(liveRegion()).toHaveTextContent("Error adding Public Notes");
+  });
+
+  it("retires the card error once the reason has been read", async () => {
+    const user = userEvent.setup();
+    mockRegisterCatalogServer.mockRejectedValueOnce(new Error("network"));
+    renderWithRouter(<ServerCatalog />);
+
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+    const indicator = await screen.findByRole("button", {
+      name: "Public Notes status: error adding server. Show details",
+    });
+
+    await user.click(indicator);
+    expect(await screen.findByRole("dialog")).toBeVisible();
+
+    await user.keyboard("{Escape}");
+
+    await waitFor(() => expect(screen.queryByRole("dialog")).not.toBeInTheDocument());
+    expect(
+      screen.queryByRole("button", {
+        name: "Public Notes status: error adding server. Show details",
+      }),
+    ).not.toBeInTheDocument();
+    await waitFor(() =>
+      expect(screen.getByRole("button", { name: "Add Public Notes" })).toHaveFocus(),
+    );
+  });
+
+  it("clears the card error when the add is retried", async () => {
+    const user = userEvent.setup();
+    mockRegisterCatalogServer.mockRejectedValueOnce(new Error("first attempt failed"));
+    renderWithRouter(<ServerCatalog />);
+
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+    await screen.findByRole("button", {
+      name: "Public Notes status: error adding server. Show details",
+    });
+
+    mockRegisterCatalogServer.mockResolvedValue({
+      success: true,
+      message: "Registered",
+      server_id: "gw-public-notes",
+    });
+    await user.click(screen.getByRole("button", { name: "Add Public Notes" }));
+
+    await waitFor(() =>
+      expect(
+        screen.queryByRole("button", {
+          name: "Public Notes status: error adding server. Show details",
+        }),
+      ).not.toBeInTheDocument(),
+    );
+  });
+
   it("registers an available server then refetches authoritative gateway state", async () => {
     const user = userEvent.setup();
     const refetch = vi.fn().mockResolvedValue(undefined);
diff --git a/src/pages/ServerCatalog.tsx b/src/pages/ServerCatalog.tsx
index 9d3d7c40..6c9cd210 100644
--- a/src/pages/ServerCatalog.tsx
+++ b/src/pages/ServerCatalog.tsx
@@ -76,6 +76,13 @@ interface RegistrationResult {
   gatewayId?: string;
 }
 
+interface RegistrationReporting {
+  // Destination for failures. Defaults to the page notification stack.
+  reportNotification?: (notification: RegistrationNotification, shouldFocus?: boolean) => void;
+  // Diverts add failures away from reportNotification, onto the card that failed.
+  onAddFailure?: (server: CatalogServer, message: string) => void;
+}
+
 type ImpactPreviewStatus = "idle" | "loading" | "loaded" | "error";
 
 const DISCONNECT_POLL_TIMEOUT_MS = 30_000;
@@ -403,6 +410,9 @@ export function ServerCatalog() {
   const [registrationNotifications, setRegistrationNotifications] = useState<
     RegistrationNotification[]
   >([]);
+  const [addErrors, setAddErrors] = useState<Record<string, string>>({});
+  const addErrorsRef = useRef<Record<string, string>>({});
+  const [addErrorAnnouncement, setAddErrorAnnouncement] = useState("");
   const [apiKeyDialogNotification, setApiKeyDialogNotification] = useState<
     RegistrationNotification | undefined
   >();
@@ -483,6 +493,34 @@ export function ServerCatalog() {
     [],
   );
 
+  const showAddError = useCallback(
+    (server: CatalogServer, message: string) => {
+      addErrorsRef.current = { ...addErrorsRef.current, [server.id]: message };
+      setAddErrors(addErrorsRef.current);
+      setAddErrorAnnouncement(
+        intl.formatMessage(
+          { id: "mcpServer.catalog.addFailed.announcement" },
+          {
+            name: server.name,
+            message,
+          },
+        ),
+      );
+    },
+    [intl],
+  );
+
+  // Returns early for any other server, whose failure is still on its card.
+  const clearAddError = useCallback((serverId: string) => {
+    if (!(serverId in addErrorsRef.current)) return;
+    const next = { ...addErrorsRef.current };
+    delete next[serverId];
+    addErrorsRef.current = next;
+    setAddErrors(next);
+    // Emptied on retry, so a repeat failure is still a change to announce.
+    setAddErrorAnnouncement("");
+  }, []);
+
   const dismissRegistrationNotification = useCallback((notificationId: string) => {
     setRegistrationNotifications((current) =>
       current.filter((notification) => notification.id !== notificationId),
@@ -568,23 +606,26 @@ export function ServerCatalog() {
     async (
       server: CatalogServer,
       body?: CatalogServerRegisterBody,
-      reportNotification: (
-        notification: RegistrationNotification,
-        shouldFocus?: boolean,
-      ) => void = showRegistrationNotification,
+      {
+        reportNotification = showRegistrationNotification,
+        onAddFailure,
+      }: RegistrationReporting = {},
     ): Promise<RegistrationResult> => {
       if (!beginAdding(server.id)) return { success: false };
       dismissRegistrationNotification(`add:${server.id}`);
+      clearAddError(server.id);
+      const reportAddFailure = (message: string) => {
+        if (onAddFailure) onAddFailure(server, message);
+        else reportNotification({ id: `add:${server.id}`, type: "error", message });
+      };
       try {
         const result = body
           ? await registerCatalogServer(server.id, body)
           : await registerCatalogServer(server.id);
         if (!result.success) {
-          reportNotification({
-            id: `add:${server.id}`,
-            type: "error",
-            message: result.message || intl.formatMessage({ id: "mcpServer.catalog.addError" }),
-          });
+          reportAddFailure(
+            result.message || intl.formatMessage({ id: "mcpServer.catalog.addError" }),
+          );
           return { success: false };
         }
 
@@ -627,11 +668,7 @@ export function ServerCatalog() {
           return { success: false };
         }
 
-        reportNotification({
-          id: `add:${server.id}`,
-          type: "error",
-          message: intl.formatMessage({ id: "mcpServer.catalog.addError" }),
-        });
+        reportAddFailure(intl.formatMessage({ id: "mcpServer.catalog.addError" }));
         return { success: false };
       } finally {
         endAdding(server.id);
@@ -639,6 +676,7 @@ export function ServerCatalog() {
     },
     [
       beginAdding,
+      clearAddError,
       dismissRegistrationNotification,
       endAdding,
       intl,
@@ -660,9 +698,11 @@ export function ServerCatalog() {
         setOAuthServer(server);
         return;
       }
-      if (server.auth_type === OPEN_AUTH_TYPE) void registerServer(server);
+      if (server.auth_type === OPEN_AUTH_TYPE) {
+        void registerServer(server, undefined, { onAddFailure: showAddError });
+      }
     },
-    [registerServer],
+    [registerServer, showAddError],
   );
 
   const handleApiKeySubmit = useCallback(
@@ -672,9 +712,9 @@ export function ServerCatalog() {
       // The dialog notification has no focus-ref registry like the grid's does, and doesn't
       // need one: InlineNotification already uses role="alert"/"status" for a11y announcement,
       // so shouldFocus is intentionally dropped here rather than passed to a state setter.
-      const { success } = await registerServer(apiKeyServer, body, (notification) =>
-        setApiKeyDialogNotification(notification),
-      );
+      const { success } = await registerServer(apiKeyServer, body, {
+        reportNotification: (notification) => setApiKeyDialogNotification(notification),
+      });
       if (success) setFocusActionsForServerId(apiKeyServer.id);
       return success;
     },
@@ -704,9 +744,9 @@ export function ServerCatalog() {
 
       let gatewayId = pendingOAuthGatewayId;
       if (!gatewayId) {
-        const registration = await registerServer(oauthServer, body, (notification) =>
-          setOAuthDialogNotification(notification),
-        );
+        const registration = await registerServer(oauthServer, body, {
+          reportNotification: (notification) => setOAuthDialogNotification(notification),
+        });
         if (!registration.success) {
           authWindow.close();
           return false;
@@ -1252,8 +1292,14 @@ export function ServerCatalog() {
         canTest={canTest}
         canDisconnect={canDisconnect}
         oauthStatuses={oauthStatuses}
+        addErrors={addErrors}
+        onAddErrorRead={clearAddError}
       />
 
+      <p aria-live="polite" aria-atomic="true" className="sr-only">
+        {addErrorAnnouncement}
+      </p>
+
       <CatalogServerDetailsDialog server={selectedServer} onOpenChange={handleDetailsOpenChange} />
       <ConfirmDialog
         open={disconnectServer !== null}