Skip to content

πŸ™Œ OpenHands: AI-Driven Development

feat(ui): restyle chat error banner and add connection retry (#726)

FraterCCCLXIIIb027b8621310
diff --git a/__tests__/components/chat/error-message-banner.test.tsx b/__tests__/components/chat/error-message-banner.test.tsx
index f1ea8eaa17..88bcc27049 100644
--- a/__tests__/components/chat/error-message-banner.test.tsx
+++ b/__tests__/components/chat/error-message-banner.test.tsx
@@ -15,10 +15,35 @@ describe("ErrorMessageBanner", () => {
/>,
);
- await user.click(screen.getByLabelText("BUTTON$CLOSE"));
+ await user.click(screen.getByTestId("error-message-banner-dismiss"));
expect(onDismiss).toHaveBeenCalledTimes(1);
});
+ it("calls onRetry when the retry button is clicked", async () => {
+ const user = userEvent.setup();
+ const onRetry = vi.fn();
+
+ render(
+ <ErrorMessageBanner
+ message="Unable to connect to server"
+ onRetry={onRetry}
+ />,
+ );
+
+ await user.click(screen.getByTestId("error-message-banner-retry"));
+ expect(onRetry).toHaveBeenCalledTimes(1);
+ });
+
+ it("uses greyscale theme tokens instead of red error styling", () => {
+ render(<ErrorMessageBanner message="Something went wrong" />);
+
+ const banner = screen.getByTestId("error-message-banner");
+ expect(banner.className).toContain("border-[var(--oh-border)]");
+ expect(banner.className).toContain("bg-[var(--oh-surface-raised)]");
+ expect(banner.className).not.toContain("#FF0006");
+ expect(banner.className).not.toContain("#4A0709");
+ });
+
it("shows a View More / View Less toggle for long messages", async () => {
const user = userEvent.setup();
const longMessage = "a".repeat(400);
diff --git a/__tests__/components/chat/message-display-continuity.test.tsx b/__tests__/components/chat/message-display-continuity.test.tsx
index fbe7475487..9e3690b8eb 100644
--- a/__tests__/components/chat/message-display-continuity.test.tsx
+++ b/__tests__/components/chat/message-display-continuity.test.tsx
@@ -142,6 +142,7 @@ describe("ChatInterface – message display continuity (spec 3.1)", () => {
isLoadingHistory: true,
connectionState: "OPEN",
sendMessage: vi.fn(),
+ reconnect: vi.fn(),
});
// Put agent-server user events in the store
@@ -171,6 +172,7 @@ describe("ChatInterface – message display continuity (spec 3.1)", () => {
isLoadingHistory: true,
connectionState: "OPEN",
sendMessage: vi.fn(),
+ reconnect: vi.fn(),
});
// Store is empty
@@ -192,6 +194,7 @@ describe("ChatInterface – message display continuity (spec 3.1)", () => {
isLoadingHistory: false,
connectionState: "OPEN",
sendMessage: vi.fn(),
+ reconnect: vi.fn(),
});
// agent-server events in store
diff --git a/src/components/features/chat/chat-interface.tsx b/src/components/features/chat/chat-interface.tsx
index 67f9a329f2..3a64b84ae1 100644
--- a/src/components/features/chat/chat-interface.tsx
+++ b/src/components/features/chat/chat-interface.tsx
@@ -25,6 +25,7 @@ import { ChatMessagesSkeleton } from "./chat-messages-skeleton";
import { displayErrorToast } from "#/utils/custom-toast-handlers";
import { useErrorMessageStore } from "#/stores/error-message-store";
import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";
+import { SERVER_CONNECTION_ERROR_MESSAGE } from "#/constants/server-connection-error";
import { ErrorMessageBanner } from "./error-message-banner";
import { Messages } from "#/components/conversation-events/chat/messages";
import { PendingUserMessages } from "./pending-user-messages";
@@ -491,6 +492,11 @@ export function ChatInterface() {
<ErrorMessageBanner
message={errorMessage}
onDismiss={removeErrorMessage}
+ onRetry={
+ errorMessage === SERVER_CONNECTION_ERROR_MESSAGE
+ ? () => conversationWebSocket?.reconnect()
+ : undefined
+ }
/>
)}
diff --git a/src/components/features/chat/error-message-banner.tsx b/src/components/features/chat/error-message-banner.tsx
index 219981ab62..a5814911c6 100644
--- a/src/components/features/chat/error-message-banner.tsx
+++ b/src/components/features/chat/error-message-banner.tsx
@@ -7,6 +7,7 @@ import { cn } from "#/utils/utils";
interface ErrorMessageBannerProps {
message: string;
onDismiss?: () => void;
+ onRetry?: () => void;
}
const DEFAULT_MAX_COLLAPSED_CHARS = 220;
@@ -14,9 +15,12 @@ const DEFAULT_MAX_COLLAPSED_CHARS = 220;
export function ErrorMessageBanner({
message,
onDismiss,
+ onRetry,
}: ErrorMessageBannerProps) {
const { t, i18n } = useTranslation("openhands");
const [isExpanded, setIsExpanded] = React.useState(false);
+ const [isMultiLine, setIsMultiLine] = React.useState(false);
+ const contentRef = React.useRef<HTMLDivElement>(null);
const isI18nKey = i18n.exists(message, { ns: "openhands" });
const displayTextForLength = isI18nKey ? String(t(message)) : message;
@@ -25,15 +29,45 @@ export function ErrorMessageBanner({
const isCollapsed = shouldShowToggle && !isExpanded;
+ React.useLayoutEffect(() => {
+ const content = contentRef.current;
+ if (!content) {
+ return undefined;
+ }
+
+ const updateIsMultiLine = () => {
+ const lineHeight = Number.parseFloat(
+ getComputedStyle(content).lineHeight,
+ );
+ if (!Number.isFinite(lineHeight) || lineHeight <= 0) {
+ setIsMultiLine(false);
+ return;
+ }
+
+ setIsMultiLine(content.getBoundingClientRect().height > lineHeight * 1.5);
+ };
+
+ updateIsMultiLine();
+
+ const observer = new ResizeObserver(updateIsMultiLine);
+ observer.observe(content);
+
+ return () => observer.disconnect();
+ }, [displayTextForLength, isCollapsed, isExpanded, message]);
+
return (
<div
- className="w-full rounded-lg p-2 border border-[#FF0006] bg-[#4A0709] flex gap-2 items-start text-white"
+ className={cn(
+ "flex w-full gap-2 rounded-lg border border-[var(--oh-border)] bg-[var(--oh-surface-raised)] p-2 text-[var(--oh-foreground)]",
+ isMultiLine ? "items-start" : "items-center",
+ )}
data-testid="error-message-banner"
>
<div className="min-w-0 flex-1">
<div
+ ref={contentRef}
className={cn(
- "whitespace-pre-wrap break-words",
+ "whitespace-pre-wrap break-words text-sm text-[var(--oh-muted)]",
isCollapsed && "line-clamp-3",
)}
data-testid="error-message-banner-content"
@@ -44,7 +78,7 @@ export function ErrorMessageBanner({
{shouldShowToggle && (
<button
type="button"
- className="mt-1 text-xs underline font-semibold cursor-pointer"
+ className="mt-1 cursor-pointer text-xs font-semibold text-[var(--oh-foreground)] underline"
onClick={() => setIsExpanded((prev) => !prev)}
data-testid="error-message-banner-toggle"
>
@@ -55,17 +89,35 @@ export function ErrorMessageBanner({
)}
</div>
- {onDismiss && (
- <button
- type="button"
- onClick={onDismiss}
- className="shrink-0 rounded-md p-1 hover:bg-black/10 cursor-pointer"
- aria-label={t(I18nKey.BUTTON$CLOSE)}
- data-testid="error-message-banner-dismiss"
- >
- <X className="h-4 w-4" />
- </button>
- )}
+ <div
+ className={cn(
+ "flex shrink-0 gap-1",
+ isMultiLine ? "self-start" : "items-center",
+ )}
+ >
+ {onRetry && (
+ <button
+ type="button"
+ onClick={onRetry}
+ className="cursor-pointer rounded-md border border-[var(--oh-border)] px-2 py-1 text-xs font-medium text-[var(--oh-foreground)] hover:bg-[var(--oh-interactive-hover)]"
+ data-testid="error-message-banner-retry"
+ >
+ {t(I18nKey.CHAT_INTERFACE$MESSAGE_RETRY)}
+ </button>
+ )}
+
+ {onDismiss && (
+ <button
+ type="button"
+ onClick={onDismiss}
+ className="shrink-0 cursor-pointer rounded-md p-1 text-[var(--oh-muted)] hover:bg-[var(--oh-interactive-hover)] hover:text-[var(--oh-foreground)]"
+ aria-label={t(I18nKey.BUTTON$CLOSE)}
+ data-testid="error-message-banner-dismiss"
+ >
+ <X className="h-4 w-4" aria-hidden />
+ </button>
+ )}
+ </div>
</div>
);
}
diff --git a/src/constants/server-connection-error.ts b/src/constants/server-connection-error.ts
new file mode 100644
index 0000000000..9054d6bbfb
--- /dev/null
+++ b/src/constants/server-connection-error.ts
@@ -0,0 +1 @@
+export const SERVER_CONNECTION_ERROR_MESSAGE = "Unable to connect to server";
diff --git a/src/contexts/conversation-websocket-context.tsx b/src/contexts/conversation-websocket-context.tsx
index c8c0a05859..b6c6d7fd67 100644
--- a/src/contexts/conversation-websocket-context.tsx
+++ b/src/contexts/conversation-websocket-context.tsx
@@ -12,6 +12,7 @@ import { ConversationClient } from "@openhands/typescript-client/clients";
import { useQueryClient } from "@tanstack/react-query";
import { usePostHog } from "posthog-js/react";
import { useWebSocket, WebSocketHookOptions } from "#/hooks/use-websocket";
+import { SERVER_CONNECTION_ERROR_MESSAGE } from "#/constants/server-connection-error";
import { useEventStore } from "#/stores/use-event-store";
import { useErrorMessageStore } from "#/stores/error-message-store";
import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";
@@ -70,6 +71,7 @@ interface ConversationWebSocketContextType {
connectionState: WebSocketConnectionState;
sendMessage: (message: SendMessageRequest) => Promise<SendMessageResult>;
isLoadingHistory: boolean;
+ reconnect: () => void;
}
const ConversationWebSocketContext = createContext<
@@ -733,7 +735,7 @@ export function ConversationWebSocketProvider({
setMainConnectionState("CLOSED");
// Only show error message if we've previously connected successfully
if (hasConnectedRefMain.current) {
- setErrorMessage("Failed to connect to server");
+ setErrorMessage(SERVER_CONNECTION_ERROR_MESSAGE);
}
},
onMessage: handleMainMessage,
@@ -797,7 +799,7 @@ export function ConversationWebSocketProvider({
setPlanningConnectionState("CLOSED");
// Only show error message if we've previously connected successfully
if (hasConnectedRefPlanning.current) {
- setErrorMessage("Failed to connect to server");
+ setErrorMessage(SERVER_CONNECTION_ERROR_MESSAGE);
}
},
onMessage: handlePlanningMessage,
@@ -813,15 +815,28 @@ export function ConversationWebSocketProvider({
// Only attempt WebSocket connection when we have a valid URL
// This prevents connection attempts during task polling phase
const websocketUrl = wsUrl;
- const { socket: mainSocket } = useWebSocket(
+ const { socket: mainSocket, reconnect: reconnectMain } = useWebSocket(
websocketUrl || "",
mainWebsocketOptions,
);
- const { socket: planningAgentSocket } = useWebSocket(
- planningAgentWsUrl || "",
- planningWebsocketOptions,
- );
+ const { socket: planningAgentSocket, reconnect: reconnectPlanning } =
+ useWebSocket(planningAgentWsUrl || "", planningWebsocketOptions);
+
+ const reconnect = useCallback(() => {
+ removeErrorMessage();
+ const currentMode = useConversationStore.getState().conversationMode;
+ if (currentMode === "plan" && planningAgentWsUrl) {
+ reconnectPlanning();
+ return;
+ }
+ reconnectMain();
+ }, [
+ planningAgentWsUrl,
+ reconnectMain,
+ reconnectPlanning,
+ removeErrorMessage,
+ ]);
// V1 send message function via WebSocket
// Falls back to REST API queue when WebSocket is not connected
@@ -936,8 +951,8 @@ export function ConversationWebSocketProvider({
}, [planningAgentSocket, planningAgentWsUrl]);
const contextValue = useMemo(
- () => ({ connectionState, sendMessage, isLoadingHistory }),
- [connectionState, sendMessage, isLoadingHistory],
+ () => ({ connectionState, sendMessage, isLoadingHistory, reconnect }),
+ [connectionState, sendMessage, isLoadingHistory, reconnect],
);
return (
diff --git a/src/hooks/use-websocket.ts b/src/hooks/use-websocket.ts
index 47636944a6..45093c9ddf 100644
--- a/src/hooks/use-websocket.ts
+++ b/src/hooks/use-websocket.ts
@@ -178,6 +178,32 @@ export const useWebSocket = <T = string>(
}
}, []);
+ const reconnect = React.useCallback(() => {
+ shouldReconnectRef.current = true;
+ attemptCountRef.current = 0;
+ setIsReconnecting(true);
+ setError(null);
+
+ if (reconnectTimeoutRef.current) {
+ clearTimeout(reconnectTimeoutRef.current);
+ reconnectTimeoutRef.current = null;
+ }
+
+ if (wsRef.current) {
+ const ws = wsRef.current;
+ allowedToReconnectRef.current.delete(ws);
+ wsRef.current = null;
+ if (
+ ws.readyState === WebSocket.CONNECTING ||
+ ws.readyState === WebSocket.OPEN
+ ) {
+ ws.close();
+ }
+ }
+
+ connectWebSocket();
+ }, [connectWebSocket]);
+
return {
isConnected,
lastMessage,
@@ -188,5 +214,6 @@ export const useWebSocket = <T = string>(
isReconnecting,
attemptCount: attemptCountRef.current,
disconnect,
+ reconnect,
};
};
diff --git a/tests/e2e/snapshots/support/stub-websocket.ts b/tests/e2e/snapshots/support/stub-websocket.ts
index 9ed7b8f394..e7821dd5c8 100644
--- a/tests/e2e/snapshots/support/stub-websocket.ts
+++ b/tests/e2e/snapshots/support/stub-websocket.ts
@@ -3,7 +3,7 @@ import type { Page } from "@playwright/test";
/**
* Stubs the browser's native `WebSocket` so conversation-page snapshot
* tests don't trigger real connection attempts (which fail in CI with
- * "Failed to connect to server" toasts because no agent-server is
+ * "Unable to connect to server" toasts because no agent-server is
* running at the Vite proxy target).
*
* Must be called **before** `page.goto()` β€” it uses `page.addInitScript`