Skip to content

Commit ab638a6

Browse files
Fr4nzzclaudejuliusmarminge
authored
fix(web): opening a just-created thread no longer bounces to the start page (pingdotgg#19724)
Co-authored-by: FranzCh <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 03fe16a commit ab638a6

4 files changed

Lines changed: 174 additions & 4 deletions

File tree

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

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ import {
8888
import { readPastedComposerContext } from "./composerInlineTokenPaste";
8989
import { isPasteAsTextShortcut } from "@t3tools/client-runtime/text-paste";
9090
import { effectiveSnoozed, threadWokeAt } from "@t3tools/client-runtime/state/thread-settled";
91+
import { presentThreadShell } from "@t3tools/client-runtime/state/shell";
9192
import { childThreadInputsTitle } from "@t3tools/client-runtime/state/threads";
9293
import { useAcknowledgeThreadWoke, useThreadActions } from "../hooks/useThreadActions";
9394
import {
@@ -1120,13 +1121,55 @@ export default function ChatView(props: ChatViewProps) {
11201121
? store.getDraftSession(draftId)
11211122
: null,
11221123
);
1123-
const serverThread = useQuietThreadShell(routeThreadRef);
1124+
const serverThreadShell = useQuietThreadShell(routeThreadRef);
11241125
const routeThreadDetailRef = resolveThreadDetailRef(routeThreadRef, {
1125-
shellExists: serverThread !== null,
1126+
shellExists: serverThreadShell !== null,
11261127
waitForShell: draftThread !== null,
11271128
});
11281129
const serverThreadProjection = useThreadProjection(routeThreadDetailRef);
11291130
const serverProjection = serverThreadProjection?.projection ?? null;
1131+
const serverThread = (() => {
1132+
if (serverThreadShell !== null || serverProjection === null) {
1133+
return serverThreadShell;
1134+
}
1135+
const latestRun = deriveLatestThreadRun(serverProjection);
1136+
const runtime = deriveThreadRuntime(serverProjection);
1137+
const pendingRuntimeRequest =
1138+
serverProjection.runtimeRequests.findLast((request) => request.status === "pending") ?? null;
1139+
// Direct links can hydrate detail before the thread enters the shell index.
1140+
return {
1141+
...presentThreadShell(environmentId, {
1142+
...serverProjection.thread,
1143+
latestRunId: latestRun?.runId ?? null,
1144+
activeRunId: runtime?.activeRunId ?? null,
1145+
status: runtime?.status ?? "idle",
1146+
pendingRuntimeRequest,
1147+
latestVisibleMessage: null,
1148+
latestUserMessageAt:
1149+
serverProjection.messages.findLast((message) => message.role === "user")?.updatedAt ??
1150+
null,
1151+
hasActionableProposedPlan: serverProjection.plans.some(
1152+
(plan) => plan.kind === "proposed_plan" && plan.status === "active",
1153+
),
1154+
providerInstanceHistory: [
1155+
...new Set(
1156+
serverProjection.providerThreads
1157+
.filter((thread) => thread.appThreadId === threadId && thread.ownerNodeId === null)
1158+
.map((thread) => thread.providerInstanceId),
1159+
),
1160+
],
1161+
goal:
1162+
serverProjection.providerThreads.find(
1163+
(thread) => thread.id === serverProjection.thread.activeProviderThreadId,
1164+
)?.goal ?? null,
1165+
itemCount: serverProjection.turnItems.length,
1166+
visibleItemCount: serverProjection.visibleTurnItems.length,
1167+
updatedAt: serverProjection.updatedAt,
1168+
}),
1169+
latestRun,
1170+
runtime,
1171+
};
1172+
})();
11301173
const promptRef = useRef("");
11311174
const localComposerRef = useRef<ChatComposerHandle | null>(null);
11321175
const composerRef = useComposerHandleContext() ?? localComposerRef;
@@ -1608,7 +1651,7 @@ export default function ChatView(props: ChatViewProps) {
16081651
container: workspaceLayoutElement,
16091652
widthStorageKey: `t3code:preview-panel-width:${activeThreadKey}`,
16101653
});
1611-
const activeThreadShell = useQuietThreadShell(isServerThread ? activeThreadRef : null);
1654+
const activeThreadShell = serverThread;
16121655
const timelineThreadError =
16131656
serverRuntime?.status === "failed" &&
16141657
serverRuntime.lastErrorClass === "usage_limit" &&

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
import { useSidebarPendingFileDropStore } from "../sidebarPendingFileDropStore";
1717
import { useEnvironmentThreadRefs, useThreadRefs, useQuietThreadShell } from "../state/entities";
1818
import { useEnvironmentShellStatus } from "../state/shell";
19+
import { useEnvironmentThread } from "../state/threads";
1920
import {
2021
buildThreadRouteParams,
2122
isThreadRouteSnapshotAuthoritative,
@@ -87,10 +88,22 @@ export function ThreadRouteView({ target }: { target: ThreadRouteTarget }) {
8788
const environmentHasDraftThreads = useComposerDraftStore((store) =>
8889
serverThreadRef ? store.hasDraftThreadsInEnvironment(serverThreadRef.environmentId) : false,
8990
);
91+
// Until the shell lists the thread, its own load (HTTP, then the socket)
92+
// decides whether it exists. Read only then: once listed, ChatView keeps
93+
// this stream open and its updates need not re-render the route.
94+
const unlistedThreadRef =
95+
target.kind === "server" && serverThreadShell === null && draftThread === null
96+
? target.threadRef
97+
: null;
98+
const unlistedThreadDetail = useEnvironmentThread(
99+
unlistedThreadRef?.environmentId ?? null,
100+
unlistedThreadRef?.threadId ?? null,
101+
);
90102
const renderState = resolveThreadRouteRenderState({
91103
bootstrapComplete,
92104
serverThreadExists: serverThreadShell !== null,
93105
serverThreadDeleted: serverThreadShell?.deletedAt != null,
106+
unlistedThreadDetail,
94107
draftThreadExists: draftThread !== null,
95108
});
96109
const serverThreadStarted = threadHasStarted(serverThreadShell);

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

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
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,
@@ -122,6 +126,7 @@ describe("threadRoutes", () => {
122126
bootstrapComplete: true,
123127
serverThreadExists: true,
124128
serverThreadDeleted: false,
129+
unlistedThreadDetail: EMPTY_ENVIRONMENT_THREAD_STATE,
125130
draftThreadExists: false,
126131
}),
127132
).toBe("ready");
@@ -133,6 +138,7 @@ describe("threadRoutes", () => {
133138
bootstrapComplete: true,
134139
serverThreadExists: true,
135140
serverThreadDeleted: false,
141+
unlistedThreadDetail: EMPTY_ENVIRONMENT_THREAD_STATE,
136142
draftThreadExists: false,
137143
}),
138144
).toBe("ready");
@@ -141,6 +147,7 @@ describe("threadRoutes", () => {
141147
bootstrapComplete: true,
142148
serverThreadExists: false,
143149
serverThreadDeleted: false,
150+
unlistedThreadDetail: EMPTY_ENVIRONMENT_THREAD_STATE,
144151
draftThreadExists: true,
145152
}),
146153
).toBe("ready");
@@ -159,6 +166,7 @@ describe("threadRoutes", () => {
159166
bootstrapComplete: isThreadRouteSnapshotAuthoritative(status),
160167
serverThreadExists: source === "server thread",
161168
serverThreadDeleted: false,
169+
unlistedThreadDetail: EMPTY_ENVIRONMENT_THREAD_STATE,
162170
draftThreadExists: source === "draft",
163171
}),
164172
).toBe("ready");
@@ -171,6 +179,7 @@ describe("threadRoutes", () => {
171179
bootstrapComplete: false,
172180
serverThreadExists: false,
173181
serverThreadDeleted: false,
182+
unlistedThreadDetail: { ...EMPTY_ENVIRONMENT_THREAD_STATE, status: "deleted" },
174183
draftThreadExists: false,
175184
}),
176185
).toBe("loading");
@@ -179,17 +188,108 @@ describe("threadRoutes", () => {
179188
bootstrapComplete: true,
180189
serverThreadExists: false,
181190
serverThreadDeleted: false,
191+
unlistedThreadDetail: { ...EMPTY_ENVIRONMENT_THREAD_STATE, status: "deleted" },
182192
draftThreadExists: false,
183193
}),
184194
).toBe("missing");
185195
});
186196

197+
it("opens an unlisted server thread once its detail arrives, without waiting for the shell", () => {
198+
const route = {
199+
bootstrapComplete: isThreadRouteSnapshotAuthoritative("live"),
200+
serverThreadExists: false,
201+
serverThreadDeleted: false,
202+
draftThreadExists: false,
203+
};
204+
205+
expect(
206+
resolveThreadRouteRenderState({
207+
...route,
208+
unlistedThreadDetail: EMPTY_ENVIRONMENT_THREAD_STATE,
209+
}),
210+
).toBe("loading");
211+
expect(
212+
resolveThreadRouteRenderState({
213+
...route,
214+
unlistedThreadDetail: {
215+
...EMPTY_ENVIRONMENT_THREAD_STATE,
216+
status: "synchronizing",
217+
},
218+
}),
219+
).toBe("loading");
220+
expect(
221+
resolveThreadRouteRenderState({
222+
...route,
223+
unlistedThreadDetail: {
224+
...EMPTY_ENVIRONMENT_THREAD_STATE,
225+
status: "synchronizing",
226+
error: Option.some("Connection interrupted"),
227+
},
228+
}),
229+
).toBe("loading");
230+
expect(
231+
resolveThreadRouteRenderState({
232+
...route,
233+
unlistedThreadDetail: {
234+
...EMPTY_ENVIRONMENT_THREAD_STATE,
235+
status: "live",
236+
data: Option.some(makeThreadProjectionFixture()),
237+
},
238+
}),
239+
).toBe("ready");
240+
});
241+
242+
it.each(["missing", "deleted", "archived"] as const)(
243+
"redirects an unlisted thread only after detail confirms it is %s",
244+
(outcome) => {
245+
const route = {
246+
bootstrapComplete: isThreadRouteSnapshotAuthoritative("live"),
247+
serverThreadExists: false,
248+
serverThreadDeleted: false,
249+
draftThreadExists: false,
250+
};
251+
expect(
252+
resolveThreadRouteRenderState({
253+
...route,
254+
unlistedThreadDetail: {
255+
...EMPTY_ENVIRONMENT_THREAD_STATE,
256+
status: "synchronizing",
257+
},
258+
}),
259+
).toBe("loading");
260+
261+
const projection = makeThreadProjectionFixture();
262+
const removedAt = DateTime.makeUnsafe("2026-01-02T00:00:00Z");
263+
expect(
264+
resolveThreadRouteRenderState({
265+
...route,
266+
unlistedThreadDetail:
267+
outcome === "missing"
268+
? { ...EMPTY_ENVIRONMENT_THREAD_STATE, status: "deleted" }
269+
: {
270+
...EMPTY_ENVIRONMENT_THREAD_STATE,
271+
status: "live",
272+
data: Option.some({
273+
...projection,
274+
thread: {
275+
...projection.thread,
276+
deletedAt: outcome === "deleted" ? removedAt : null,
277+
archivedAt: outcome === "archived" ? removedAt : null,
278+
},
279+
}),
280+
},
281+
}),
282+
).toBe("missing");
283+
},
284+
);
285+
187286
it("redirects deleted server threads", () => {
188287
expect(
189288
resolveThreadRouteRenderState({
190289
bootstrapComplete: true,
191290
serverThreadExists: true,
192291
serverThreadDeleted: true,
292+
unlistedThreadDetail: EMPTY_ENVIRONMENT_THREAD_STATE,
193293
draftThreadExists: false,
194294
}),
195295
).toBe("missing");
@@ -201,6 +301,7 @@ describe("threadRoutes", () => {
201301
bootstrapComplete: isThreadRouteSnapshotAuthoritative("cached"),
202302
serverThreadExists: true,
203303
serverThreadDeleted: true,
304+
unlistedThreadDetail: EMPTY_ENVIRONMENT_THREAD_STATE,
204305
draftThreadExists: false,
205306
}),
206307
).toBe("loading");

‎apps/web/src/threadRoutes.ts‎

Lines changed: 14 additions & 1 deletion
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 =
@@ -31,6 +33,7 @@ export function resolveThreadRouteRenderState(input: {
3133
bootstrapComplete: boolean;
3234
serverThreadExists: boolean;
3335
serverThreadDeleted: boolean;
36+
unlistedThreadDetail: EnvironmentThreadState;
3437
draftThreadExists: boolean;
3538
}): ThreadRouteRenderState {
3639
if (input.draftThreadExists || (input.serverThreadExists && !input.serverThreadDeleted)) {
@@ -39,7 +42,17 @@ export function resolveThreadRouteRenderState(input: {
3942
if (!input.bootstrapComplete) {
4043
return "loading";
4144
}
42-
return "missing";
45+
if (input.serverThreadExists || input.unlistedThreadDetail.status === "deleted") {
46+
return "missing";
47+
}
48+
// Shell membership can lag a new thread; its detail decides.
49+
const projection = Option.getOrNull(input.unlistedThreadDetail.data);
50+
if (projection === null) {
51+
return "loading";
52+
}
53+
return projection.thread.deletedAt !== null || projection.thread.archivedAt !== null
54+
? "missing"
55+
: "ready";
4356
}
4457

4558
export function buildThreadRouteParams(ref: ScopedThreadRef): {

0 commit comments

Comments
 (0)