Skip to content

Commit 4eb3ad3

Browse files
committed
Avoid transient thread error flash
1 parent 7b64b9c commit 4eb3ad3

4 files changed

Lines changed: 2 additions & 53 deletions

File tree

‎apps/web/src/routes/_chat.$environmentId.$threadId.tsx‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import ChatView from "../components/ChatView";
55
import { threadHasStarted } from "../components/ChatView.logic";
66
import { finalizePromotedDraftThreadByRef, useComposerDraftStore } from "../composerDraftStore";
77
import { resolveThreadRouteRef, resolveThreadRouteRenderState } from "../threadRoutes";
8-
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "~/components/ui/empty";
98
import { SidebarInset } from "~/components/ui/sidebar";
109
import {
1110
useEnvironmentThreadRefs,
1211
useThreadDetail,
13-
useThreadError,
1412
useThreadShell,
1513
useThreadStatus,
1614
} from "../state/entities";
@@ -28,7 +26,6 @@ function ChatThreadRouteView() {
2826
const serverThreadShell = useThreadShell(threadRef);
2927
const serverThreadDetail = useThreadDetail(threadRef);
3028
const serverThreadStatus = useThreadStatus(threadRef);
31-
const serverThreadError = useThreadError(threadRef);
3229
const environmentThreadRefs = useEnvironmentThreadRefs(threadRef?.environmentId ?? null);
3330
const bootstrapComplete = shell.data?.snapshot._tag === "Some";
3431
const environmentHasServerThreads = environmentThreadRefs.length > 0;
@@ -49,7 +46,6 @@ function ChatThreadRouteView() {
4946
serverThreadShellExists: serverThreadShell !== null,
5047
serverThreadDetailExists: serverThreadDetail !== null,
5148
serverThreadDetailDeleted: serverThreadStatus === "deleted",
52-
serverThreadDetailFailed: serverThreadError !== null,
5349
draftThreadExists,
5450
});
5551
const serverThreadStarted = threadHasStarted(serverThreadDetail);
@@ -73,9 +69,6 @@ function ChatThreadRouteView() {
7369
}, [draftThread, serverThreadStarted, threadRef]);
7470

7571
if (!threadRef || renderState !== "ready") {
76-
if (renderState === "error") {
77-
return <ThreadLoadErrorState error={serverThreadError} />;
78-
}
7972
return null;
8073
}
8174

@@ -90,21 +83,6 @@ function ChatThreadRouteView() {
9083
);
9184
}
9285

93-
function ThreadLoadErrorState({ error }: { error: string | null }) {
94-
return (
95-
<SidebarInset className="h-svh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground md:h-dvh">
96-
<Empty className="flex-1">
97-
<EmptyHeader>
98-
<EmptyTitle>Couldn’t load thread</EmptyTitle>
99-
<EmptyDescription>
100-
{error ?? "T3 Code will keep trying to reconnect automatically."}
101-
</EmptyDescription>
102-
</EmptyHeader>
103-
</Empty>
104-
</SidebarInset>
105-
);
106-
}
107-
10886
export const Route = createFileRoute("/_chat/$environmentId/$threadId")({
10987
component: ChatThreadRouteView,
11088
});

‎apps/web/src/state/entities.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ const EMPTY_THREAD_DETAIL_ATOM = Atom.make<EnvironmentThread | null>(null).pipe(
5050
const EMPTY_THREAD_STATUS_ATOM = Atom.make<EnvironmentThreadStatus>("empty").pipe(
5151
Atom.withLabel("web-thread-status:empty"),
5252
);
53-
const EMPTY_THREAD_ERROR_ATOM = Atom.make<string | null>(null).pipe(
54-
Atom.withLabel("web-thread-error:empty"),
55-
);
5653
const EMPTY_MESSAGES_ATOM = Atom.make(EMPTY_MESSAGES).pipe(
5754
Atom.withLabel("web-thread-messages:empty"),
5855
);
@@ -155,12 +152,6 @@ export function useThreadStatus(ref: ScopedThreadRef | null): EnvironmentThreadS
155152
);
156153
}
157154

158-
export function useThreadError(ref: ScopedThreadRef | null): string | null {
159-
return useAtomValue(
160-
ref === null ? EMPTY_THREAD_ERROR_ATOM : environmentThreadDetails.errorAtom(ref),
161-
);
162-
}
163-
164155
/** Detail collections composed with shell-authoritative thread/workspace metadata. */
165156
export function useThread(ref: ScopedThreadRef | null): EnvironmentThread | null {
166157
const shell = useThreadShell(ref);

‎apps/web/src/threadRoutes.test.ts‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ describe("threadRoutes", () => {
101101
serverThreadShellExists: true,
102102
serverThreadDetailExists: false,
103103
serverThreadDetailDeleted: false,
104-
serverThreadDetailFailed: false,
105104
draftThreadExists: false,
106105
}),
107106
).toBe("loading");
@@ -114,7 +113,6 @@ describe("threadRoutes", () => {
114113
serverThreadShellExists: true,
115114
serverThreadDetailExists: true,
116115
serverThreadDetailDeleted: false,
117-
serverThreadDetailFailed: false,
118116
draftThreadExists: false,
119117
}),
120118
).toBe("ready");
@@ -124,7 +122,6 @@ describe("threadRoutes", () => {
124122
serverThreadShellExists: false,
125123
serverThreadDetailExists: false,
126124
serverThreadDetailDeleted: false,
127-
serverThreadDetailFailed: false,
128125
draftThreadExists: true,
129126
}),
130127
).toBe("ready");
@@ -137,7 +134,6 @@ describe("threadRoutes", () => {
137134
serverThreadShellExists: false,
138135
serverThreadDetailExists: false,
139136
serverThreadDetailDeleted: false,
140-
serverThreadDetailFailed: false,
141137
draftThreadExists: false,
142138
}),
143139
).toBe("loading");
@@ -147,30 +143,18 @@ describe("threadRoutes", () => {
147143
serverThreadShellExists: false,
148144
serverThreadDetailExists: false,
149145
serverThreadDetailDeleted: false,
150-
serverThreadDetailFailed: false,
151146
draftThreadExists: false,
152147
}),
153148
).toBe("missing");
154149
});
155150

156-
it("does not leave failed or deleted shell-only threads loading", () => {
157-
expect(
158-
resolveThreadRouteRenderState({
159-
bootstrapComplete: true,
160-
serverThreadShellExists: true,
161-
serverThreadDetailExists: false,
162-
serverThreadDetailDeleted: false,
163-
serverThreadDetailFailed: true,
164-
draftThreadExists: false,
165-
}),
166-
).toBe("error");
151+
it("redirects deleted shell-only threads", () => {
167152
expect(
168153
resolveThreadRouteRenderState({
169154
bootstrapComplete: true,
170155
serverThreadShellExists: true,
171156
serverThreadDetailExists: false,
172157
serverThreadDetailDeleted: true,
173-
serverThreadDetailFailed: false,
174158
draftThreadExists: false,
175159
}),
176160
).toBe("missing");

‎apps/web/src/threadRoutes.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ type DraftThreadRouteState = {
1818
promotedTo?: ScopedThreadRef | null;
1919
};
2020

21-
export type ThreadRouteRenderState = "loading" | "ready" | "missing" | "error";
21+
export type ThreadRouteRenderState = "loading" | "ready" | "missing";
2222

2323
export function resolveThreadRouteRenderState(input: {
2424
bootstrapComplete: boolean;
2525
serverThreadShellExists: boolean;
2626
serverThreadDetailExists: boolean;
2727
serverThreadDetailDeleted: boolean;
28-
serverThreadDetailFailed: boolean;
2928
draftThreadExists: boolean;
3029
}): ThreadRouteRenderState {
3130
if (!input.bootstrapComplete) {
@@ -37,9 +36,6 @@ export function resolveThreadRouteRenderState(input: {
3736
if (input.serverThreadDetailDeleted) {
3837
return "missing";
3938
}
40-
if (input.serverThreadDetailFailed) {
41-
return "error";
42-
}
4339
return input.serverThreadShellExists ? "loading" : "missing";
4440
}
4541

0 commit comments

Comments
 (0)