Skip to content

Commit 5137d13

Browse files
Fr4nzzclaude
andcommitted
fix(web): a thread link opened right after the thread is created no longer bounces to the start page
The thread route treated a server thread as missing as soon as the environment shell was live and did not list it. A thread another client created a moment ago reaches the route before the shell stream delivers it, so the page replaced itself with `/` and a new draft. While the live shell does not list the thread, the route now reads the thread's own load and waits until it settles: missing only once the server answers 404 (or a delete event arrives), the load fails, or the thread turns out to be archived (archived threads are not in the active shell). The thread state is only read while the thread is unlisted, so a listed thread's updates do not re-render the route. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent ec1313c commit 5137d13

3 files changed

Lines changed: 95 additions & 0 deletions

File tree

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ import { useSidebarPendingFileDropStore } from "../sidebarPendingFileDropStore";
1717
import { useEnvironmentThreadRefs, useThreadRefs, useThreadShell } from "../state/entities";
1818
import { useEnvironmentQuery } from "../state/query";
1919
import { environmentShell } from "../state/shell";
20+
import { useEnvironmentThread } from "../state/threads";
2021
import {
2122
buildThreadRouteParams,
2223
isThreadRouteSnapshotAuthoritative,
24+
isUnlistedThreadUnavailable,
2325
resolveThreadRouteRenderState,
2426
type ThreadRouteTarget,
2527
} from "../threadRoutes";
@@ -99,10 +101,22 @@ export function ThreadRouteView({ target }: { target: ThreadRouteTarget }) {
99101
const environmentHasDraftThreads = useComposerDraftStore((store) =>
100102
serverThreadRef ? store.hasDraftThreadsInEnvironment(serverThreadRef.environmentId) : false,
101103
);
104+
// Until the shell lists the thread, its own load (HTTP, then the socket)
105+
// decides whether it exists. Read only then: once listed, ChatView keeps
106+
// this stream open and its updates need not re-render the route.
107+
const unlistedThreadRef =
108+
target.kind === "server" && serverThreadShell === null && draftThread === null
109+
? target.threadRef
110+
: null;
111+
const unlistedThreadDetail = useEnvironmentThread(
112+
unlistedThreadRef?.environmentId ?? null,
113+
unlistedThreadRef?.threadId ?? null,
114+
);
102115
const renderState = resolveThreadRouteRenderState({
103116
bootstrapComplete,
104117
serverThreadExists: serverThreadShell !== null,
105118
serverThreadDeleted: serverThreadShell?.deletedAt != null,
119+
serverThreadUnavailable: isUnlistedThreadUnavailable(unlistedThreadDetail),
106120
draftThreadExists: draftThread !== null,
107121
});
108122
const serverThreadStarted = threadHasStarted(serverThreadShell);

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
import { describe, expect, it } from "vite-plus/test";
22
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
3+
import { EMPTY_ENVIRONMENT_THREAD_STATE } from "@t3tools/client-runtime/state/threads";
34
import { ThreadId } from "@t3tools/contracts";
5+
import * as DateTime from "effect/DateTime";
6+
import * as Option from "effect/Option";
47
import { DraftId } from "./composerDraftStore";
8+
import { makeThreadProjectionFixture } from "./test-fixtures";
59

610
import {
711
buildDraftThreadRouteParams,
812
buildThreadRouteParams,
913
isThreadRouteSnapshotAuthoritative,
14+
isUnlistedThreadUnavailable,
1015
resolveActiveThreadRouteRef,
1116
resolveThreadRouteRenderState,
1217
resolveThreadRouteRef,
@@ -108,6 +113,7 @@ describe("threadRoutes", () => {
108113
bootstrapComplete: true,
109114
serverThreadExists: true,
110115
serverThreadDeleted: false,
116+
serverThreadUnavailable: false,
111117
draftThreadExists: false,
112118
}),
113119
).toBe("ready");
@@ -119,6 +125,7 @@ describe("threadRoutes", () => {
119125
bootstrapComplete: true,
120126
serverThreadExists: true,
121127
serverThreadDeleted: false,
128+
serverThreadUnavailable: false,
122129
draftThreadExists: false,
123130
}),
124131
).toBe("ready");
@@ -127,6 +134,7 @@ describe("threadRoutes", () => {
127134
bootstrapComplete: true,
128135
serverThreadExists: false,
129136
serverThreadDeleted: false,
137+
serverThreadUnavailable: false,
130138
draftThreadExists: true,
131139
}),
132140
).toBe("ready");
@@ -145,6 +153,7 @@ describe("threadRoutes", () => {
145153
bootstrapComplete: isThreadRouteSnapshotAuthoritative(status),
146154
serverThreadExists: source === "server thread",
147155
serverThreadDeleted: false,
156+
serverThreadUnavailable: false,
148157
draftThreadExists: source === "draft",
149158
}),
150159
).toBe("ready");
@@ -157,6 +166,7 @@ describe("threadRoutes", () => {
157166
bootstrapComplete: false,
158167
serverThreadExists: false,
159168
serverThreadDeleted: false,
169+
serverThreadUnavailable: true,
160170
draftThreadExists: false,
161171
}),
162172
).toBe("loading");
@@ -165,17 +175,66 @@ describe("threadRoutes", () => {
165175
bootstrapComplete: true,
166176
serverThreadExists: false,
167177
serverThreadDeleted: false,
178+
serverThreadUnavailable: true,
168179
draftThreadExists: false,
169180
}),
170181
).toBe("missing");
171182
});
172183

184+
it("waits for a thread the live shell does not list yet while its own load is pending", () => {
185+
expect(
186+
resolveThreadRouteRenderState({
187+
bootstrapComplete: isThreadRouteSnapshotAuthoritative("live"),
188+
serverThreadExists: false,
189+
serverThreadDeleted: false,
190+
serverThreadUnavailable: false,
191+
draftThreadExists: false,
192+
}),
193+
).toBe("loading");
194+
});
195+
196+
it("reads an unlisted thread as unavailable only once its own load settles that way", () => {
197+
const projection = makeThreadProjectionFixture();
198+
const pending = [
199+
EMPTY_ENVIRONMENT_THREAD_STATE,
200+
{ ...EMPTY_ENVIRONMENT_THREAD_STATE, status: "synchronizing" as const },
201+
{
202+
...EMPTY_ENVIRONMENT_THREAD_STATE,
203+
status: "live" as const,
204+
data: Option.some(projection),
205+
},
206+
];
207+
for (const detail of pending) {
208+
expect(isUnlistedThreadUnavailable(detail)).toBe(false);
209+
}
210+
211+
const unavailable = [
212+
{ ...EMPTY_ENVIRONMENT_THREAD_STATE, status: "deleted" as const },
213+
{
214+
...EMPTY_ENVIRONMENT_THREAD_STATE,
215+
error: Option.some("Could not synchronize the thread."),
216+
},
217+
{
218+
...EMPTY_ENVIRONMENT_THREAD_STATE,
219+
status: "live" as const,
220+
data: Option.some({
221+
...projection,
222+
thread: { ...projection.thread, archivedAt: DateTime.makeUnsafe("2026-01-02T00:00:00Z") },
223+
}),
224+
},
225+
];
226+
for (const detail of unavailable) {
227+
expect(isUnlistedThreadUnavailable(detail)).toBe(true);
228+
}
229+
});
230+
173231
it("redirects deleted server threads", () => {
174232
expect(
175233
resolveThreadRouteRenderState({
176234
bootstrapComplete: true,
177235
serverThreadExists: true,
178236
serverThreadDeleted: true,
237+
serverThreadUnavailable: false,
179238
draftThreadExists: false,
180239
}),
181240
).toBe("missing");
@@ -187,6 +246,7 @@ describe("threadRoutes", () => {
187246
bootstrapComplete: isThreadRouteSnapshotAuthoritative("cached"),
188247
serverThreadExists: true,
189248
serverThreadDeleted: true,
249+
serverThreadUnavailable: false,
190250
draftThreadExists: false,
191251
}),
192252
).toBe("loading");

‎apps/web/src/threadRoutes.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
22
import type { EnvironmentShellStatus } from "@t3tools/client-runtime/state/shell";
3+
import type { EnvironmentThreadState } from "@t3tools/client-runtime/state/threads";
34
import type { EnvironmentId, ScopedThreadRef, ThreadId } from "@t3tools/contracts";
5+
import * as Option from "effect/Option";
46
import type { DraftId } from "./composerDraftStore";
57

68
export type ThreadRouteTarget =
@@ -27,10 +29,24 @@ export function isThreadRouteSnapshotAuthoritative(
2729
return status === "live";
2830
}
2931

32+
/**
33+
* Whether the thread's own load says a thread the shell does not list cannot
34+
* be opened: the server has no such thread, the load failed, or the thread is
35+
* archived (the active shell leaves archived threads out).
36+
*/
37+
export function isUnlistedThreadUnavailable(detail: EnvironmentThreadState): boolean {
38+
return (
39+
detail.status === "deleted" ||
40+
Option.isSome(detail.error) ||
41+
Option.exists(detail.data, (projection) => projection.thread.archivedAt !== null)
42+
);
43+
}
44+
3045
export function resolveThreadRouteRenderState(input: {
3146
bootstrapComplete: boolean;
3247
serverThreadExists: boolean;
3348
serverThreadDeleted: boolean;
49+
serverThreadUnavailable: boolean;
3450
draftThreadExists: boolean;
3551
}): ThreadRouteRenderState {
3652
if (input.draftThreadExists || (input.serverThreadExists && !input.serverThreadDeleted)) {
@@ -39,6 +55,11 @@ export function resolveThreadRouteRenderState(input: {
3955
if (!input.bootstrapComplete) {
4056
return "loading";
4157
}
58+
// A thread another client created a moment ago can reach this route before
59+
// the live shell lists it, so the shell alone cannot tell it from a missing one.
60+
if (!input.serverThreadExists && !input.serverThreadUnavailable) {
61+
return "loading";
62+
}
4263
return "missing";
4364
}
4465

0 commit comments

Comments
 (0)