Skip to content

Commit 63f1cab

Browse files
torztomaszclaude
andcommitted
fix(web): a provider banner dismissal stays with its environment
Built-in instance ids such as `codex` repeat across environments, so the dismissal key now includes the environment the banner belongs to. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 45c4541 commit 63f1cab

4 files changed

Lines changed: 49 additions & 22 deletions

File tree

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ import {
288288
shouldShowEnvironmentIndicator,
289289
} from "./BranchToolbar.logic";
290290
import {
291-
getProviderStatusBannerKey,
291+
getProviderStatusDismissalKey,
292292
isProviderStatusBannerDismissedForSession,
293293
shouldShowProviderStatusBanner,
294294
} from "./chat/ProviderStatusBanner";
@@ -1608,10 +1608,13 @@ export default function ChatView(props: ChatViewProps) {
16081608
resumeCompactionPermanentlyDismissed,
16091609
setResumeCompactionPermanentlyDismissed,
16101610
]);
1611-
const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
1611+
const providerStatusDismissalKey = getProviderStatusDismissalKey(
1612+
providerEnvironmentId,
1613+
activeProviderStatus,
1614+
);
16121615
const visibleProviderStatus = shouldShowProviderStatusBanner(
16131616
activeProviderStatus,
1614-
isProviderStatusBannerDismissedForSession(providerStatusBannerKey),
1617+
isProviderStatusBannerDismissedForSession(providerStatusDismissalKey),
16151618
)
16161619
? activeProviderStatus
16171620
: null;
@@ -3186,7 +3189,7 @@ export default function ChatView(props: ChatViewProps) {
31863189
{isWorkspaceFileDragActive ? <WorkspaceFileDropOverlay /> : null}
31873190
<ChatBannerLane
31883191
providerStatus={visibleProviderStatus}
3189-
providerStatusBannerKey={providerStatusBannerKey}
3192+
providerStatusDismissalKey={providerStatusDismissalKey}
31903193
setProviderStatusBannerDismissTick={setProviderStatusBannerDismissTick}
31913194
onOpenProviderSetup={openProviderSetupStable}
31923195
threadId={activeThread.id}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { dismissThreadErrorBannerForSession, ThreadErrorBanner } from "./ThreadE
1717
*/
1818
export function ChatBannerLane(props: {
1919
providerStatus: ServerProvider | null;
20-
providerStatusBannerKey: string | null;
20+
providerStatusDismissalKey: string | null;
2121
setProviderStatusBannerDismissTick: Dispatch<SetStateAction<number>>;
2222
onOpenProviderSetup: (instanceId: ProviderInstanceId) => void;
2323
threadId: ThreadId;
@@ -30,7 +30,7 @@ export function ChatBannerLane(props: {
3030
}) {
3131
const {
3232
providerStatus,
33-
providerStatusBannerKey,
33+
providerStatusDismissalKey,
3434
setProviderStatusBannerDismissTick,
3535
onOpenProviderSetup,
3636
threadId,
@@ -46,7 +46,7 @@ export function ChatBannerLane(props: {
4646
<ProviderStatusBanner
4747
status={providerStatus}
4848
onDismiss={() => {
49-
dismissProviderStatusBannerForSession(providerStatusBannerKey);
49+
dismissProviderStatusBannerForSession(providerStatusDismissalKey);
5050
setProviderStatusBannerDismissTick((tick) => tick + 1);
5151
}}
5252
onOpenProviderSetup={onOpenProviderSetup}

‎apps/web/src/components/chat/ProviderStatusBanner.test.ts‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3
33
import {
44
dismissProviderStatusBannerForSession,
55
getProviderStatusBannerKey,
6+
getProviderStatusDismissalKey,
67
getProviderStatusMessage,
78
isProviderStatusBannerDismissedForSession,
89
shouldShowProviderStatusBanner,
@@ -109,25 +110,39 @@ describe("compatibility banners", () => {
109110
});
110111

111112
describe("banner dismissal", () => {
113+
const { compatibilityAdvisory: _advisory, ...healthy } = provider;
114+
const failing: ServerProvider = {
115+
...healthy,
116+
instanceId: ProviderInstanceId.make("codex-dismissal"),
117+
status: "error",
118+
message: "Could not start Codex CLI.",
119+
};
120+
112121
it("keeps a dismissed status hidden in other views until the status changes", () => {
113-
const { compatibilityAdvisory: _advisory, ...healthy } = provider;
114-
const failing: ServerProvider = {
115-
...healthy,
116-
instanceId: ProviderInstanceId.make("codex-dismissal"),
117-
status: "error",
118-
message: "Could not start Codex CLI.",
119-
};
120-
const key = getProviderStatusBannerKey(failing);
122+
const key = getProviderStatusDismissalKey("environment-a", failing);
121123
expect(isProviderStatusBannerDismissedForSession(key)).toBe(false);
122124

123125
dismissProviderStatusBannerForSession(key);
124126

125-
expect(isProviderStatusBannerDismissedForSession(getProviderStatusBannerKey(failing))).toBe(
126-
true,
127-
);
128-
const changed = { ...failing, message: "Codex CLI exited." };
129-
expect(isProviderStatusBannerDismissedForSession(getProviderStatusBannerKey(changed))).toBe(
130-
false,
131-
);
127+
expect(
128+
isProviderStatusBannerDismissedForSession(
129+
getProviderStatusDismissalKey("environment-a", failing),
130+
),
131+
).toBe(true);
132+
expect(
133+
isProviderStatusBannerDismissedForSession(
134+
getProviderStatusDismissalKey("environment-a", { ...failing, message: "Codex exited." }),
135+
),
136+
).toBe(false);
137+
});
138+
139+
it("keeps a dismissal to the environment it was taken in", () => {
140+
dismissProviderStatusBannerForSession(getProviderStatusDismissalKey("environment-c", failing));
141+
142+
expect(
143+
isProviderStatusBannerDismissedForSession(
144+
getProviderStatusDismissalKey("environment-d", failing),
145+
),
146+
).toBe(false);
132147
});
133148
});

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ export function shouldShowProviderStatusBanner(
4848
return getProviderStatusBannerKey(status) !== null && !isDismissed;
4949
}
5050

51+
// Built-in instance ids such as `codex` repeat across environments.
52+
export function getProviderStatusDismissalKey(
53+
environmentId: string | undefined,
54+
status: ServerProvider | null,
55+
): string | null {
56+
const bannerKey = getProviderStatusBannerKey(status);
57+
return bannerKey === null ? null : `${environmentId ?? ""}\u0000${bannerKey}`;
58+
}
59+
5160
// A dismissal lasts the session, not one view, so opening another thread cannot bring it back.
5261
const sessionDismissedProviderStatusBannerKeys = new Set<string>();
5362

0 commit comments

Comments
 (0)