Skip to content

Commit 30d1fa9

Browse files
committed
fix(web): thread error banner dismissal persists across thread switches
1 parent 8e93850 commit 30d1fa9

3 files changed

Lines changed: 70 additions & 21 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,9 @@ import {
265265
shouldShowProviderStatusBanner,
266266
} from "./chat/ProviderStatusBanner";
267267
import {
268+
dismissThreadErrorBannerForSession,
268269
getThreadErrorBannerKey,
270+
isThreadErrorBannerDismissedForSession,
269271
shouldShowThreadErrorBanner,
270272
ThreadErrorBanner,
271273
} from "./chat/ThreadErrorBanner";
@@ -1502,18 +1504,10 @@ function ChatViewContent(props: ChatViewProps) {
15021504
// just fall through to the persisted one. Mask the current error until a
15031505
// different error arrives, mirroring the provider status banner.
15041506
const threadErrorBannerKey = getThreadErrorBannerKey(routeThreadKey, threadError);
1505-
const [dismissedThreadErrorBannerKey, setDismissedThreadErrorBannerKey] = useState<string | null>(
1506-
null,
1507-
);
1508-
useEffect(() => {
1509-
if (threadError === null && dismissedThreadErrorBannerKey !== null) {
1510-
setDismissedThreadErrorBannerKey(null);
1511-
}
1512-
}, [dismissedThreadErrorBannerKey, threadError]);
15131507
const visibleThreadError = shouldShowThreadErrorBanner(
15141508
routeThreadKey,
15151509
threadError,
1516-
dismissedThreadErrorBannerKey,
1510+
isThreadErrorBannerDismissedForSession(threadErrorBannerKey),
15171511
)
15181512
? threadError
15191513
: null;
@@ -6173,7 +6167,7 @@ function ChatViewContent(props: ChatViewProps) {
61736167
error={visibleThreadError}
61746168
onDismiss={() => {
61756169
setThreadError(activeThread.id, null);
6176-
setDismissedThreadErrorBannerKey(threadErrorBannerKey);
6170+
dismissThreadErrorBannerForSession(threadErrorBannerKey);
61776171
}}
61786172
/>
61796173
{/* Main content area with optional plan sidebar */}

‎apps/web/src/components/chat/ThreadErrorBanner.test.tsx‎

Lines changed: 47 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,72 @@ import { renderToStaticMarkup } from "react-dom/server";
22
import { describe, expect, it } from "vite-plus/test";
33

44
import {
5+
dismissThreadErrorBannerForSession,
56
getThreadErrorBannerKey,
7+
isThreadErrorBannerDismissedForSession,
68
shouldShowThreadErrorBanner,
79
ThreadErrorBanner,
810
} from "./ThreadErrorBanner";
911

1012
describe("ThreadErrorBanner", () => {
1113
it("stays hidden after its current error is dismissed", () => {
12-
const dismissedKey = getThreadErrorBannerKey("env:thread", "Aborted");
14+
const bannerKey = getThreadErrorBannerKey("env:thread-a", "Aborted");
15+
dismissThreadErrorBannerForSession(bannerKey);
1316

14-
expect(shouldShowThreadErrorBanner("env:thread", "Aborted", null)).toBe(true);
15-
expect(shouldShowThreadErrorBanner("env:thread", "Aborted", dismissedKey)).toBe(false);
17+
expect(
18+
shouldShowThreadErrorBanner(
19+
"env:thread-a",
20+
"Aborted",
21+
isThreadErrorBannerDismissedForSession(bannerKey),
22+
),
23+
).toBe(false);
1624
});
1725

1826
it("reappears when a new error arrives on the same thread", () => {
19-
const dismissedKey = getThreadErrorBannerKey("env:thread", "Aborted");
27+
dismissThreadErrorBannerForSession(getThreadErrorBannerKey("env:thread-b", "Turn failed"));
28+
const newErrorKey = getThreadErrorBannerKey("env:thread-b", "Provider crashed");
2029

21-
expect(shouldShowThreadErrorBanner("env:thread", "Turn failed", dismissedKey)).toBe(true);
30+
expect(isThreadErrorBannerDismissedForSession(newErrorKey)).toBe(false);
31+
expect(
32+
shouldShowThreadErrorBanner(
33+
"env:thread-b",
34+
"Provider crashed",
35+
isThreadErrorBannerDismissedForSession(newErrorKey),
36+
),
37+
).toBe(true);
2238
});
2339

2440
it("scopes dismissals to the thread that dismissed them", () => {
25-
const dismissedKey = getThreadErrorBannerKey("env:thread", "Aborted");
41+
dismissThreadErrorBannerForSession(getThreadErrorBannerKey("env:thread-c", "Aborted"));
42+
const otherThreadKey = getThreadErrorBannerKey("env:other-thread", "Aborted");
2643

27-
expect(shouldShowThreadErrorBanner("env:other-thread", "Aborted", dismissedKey)).toBe(true);
44+
expect(isThreadErrorBannerDismissedForSession(otherThreadKey)).toBe(false);
45+
expect(
46+
shouldShowThreadErrorBanner(
47+
"env:other-thread",
48+
"Aborted",
49+
isThreadErrorBannerDismissedForSession(otherThreadKey),
50+
),
51+
).toBe(true);
52+
});
53+
54+
it("keeps a dismissal across visiting threads with no error", () => {
55+
const bannerKey = getThreadErrorBannerKey("env:thread-d", "Aborted");
56+
dismissThreadErrorBannerForSession(bannerKey);
57+
58+
expect(shouldShowThreadErrorBanner("env:thread-d", null, false)).toBe(false);
59+
expect(isThreadErrorBannerDismissedForSession(bannerKey)).toBe(true);
60+
expect(
61+
shouldShowThreadErrorBanner(
62+
"env:thread-d",
63+
"Aborted",
64+
isThreadErrorBannerDismissedForSession(bannerKey),
65+
),
66+
).toBe(false);
2867
});
2968

3069
it("never shows a null error", () => {
31-
expect(shouldShowThreadErrorBanner("env:thread", null, null)).toBe(false);
70+
expect(shouldShowThreadErrorBanner("env:thread-e", null, false)).toBe(false);
3271
});
3372
it("aligns the warning and dismiss icons with the first line of a multi-line error", () => {
3473
const markup = renderToStaticMarkup(

‎apps/web/src/components/chat/ThreadErrorBanner.tsx‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,26 @@ export function getThreadErrorBannerKey(threadKey: string, error: string | null)
1111
export function shouldShowThreadErrorBanner(
1212
threadKey: string,
1313
error: string | null,
14-
dismissedBannerKey: string | null,
14+
isDismissed: boolean,
1515
): boolean {
16-
const bannerKey = getThreadErrorBannerKey(threadKey, error);
17-
return bannerKey !== null && bannerKey !== dismissedBannerKey;
16+
return getThreadErrorBannerKey(threadKey, error) !== null && !isDismissed;
17+
}
18+
19+
// Session-scoped (module-level so it survives ChatView remounts, e.g. route
20+
// changes between threads). Mirrors the branch-mismatch banner: a dismissal
21+
// is remembered per thread key plus message, so navigating away to a thread
22+
// with no error cannot resurrect the banner, while a different error message
23+
// on the same thread still appears.
24+
const sessionDismissedThreadErrorBannerKeys = new Set<string>();
25+
26+
export function dismissThreadErrorBannerForSession(bannerKey: string | null): void {
27+
if (bannerKey !== null) {
28+
sessionDismissedThreadErrorBannerKeys.add(bannerKey);
29+
}
30+
}
31+
32+
export function isThreadErrorBannerDismissedForSession(bannerKey: string | null): boolean {
33+
return bannerKey !== null && sessionDismissedThreadErrorBannerKeys.has(bannerKey);
1834
}
1935

2036
export const ThreadErrorBanner = memo(function ThreadErrorBanner({

0 commit comments

Comments
 (0)