|
1 | 1 | import { scopedThreadKey } from "@t3tools/client-runtime/environment"; |
2 | 2 | import type { ScopedThreadRef } from "@t3tools/contracts"; |
3 | | -import { useNavigate } from "@tanstack/react-router"; |
| 3 | +import { useLocation, useNavigate } from "@tanstack/react-router"; |
4 | 4 | import { useEffect, useState } from "react"; |
5 | 5 |
|
6 | 6 | import ChatView from "./ChatView"; |
@@ -38,6 +38,7 @@ import { |
38 | 38 | */ |
39 | 39 | export function ThreadRouteView({ target }: { target: ThreadRouteTarget }) { |
40 | 40 | const navigate = useNavigate(); |
| 41 | + const archiveDraftRetry = useLocation({ select: (location) => location.state.archiveDraftRetry }); |
41 | 42 | const draftId = target.kind === "draft" ? target.draftId : null; |
42 | 43 | const draftSession = useComposerDraftStore((store) => |
43 | 44 | draftId === null ? null : store.getDraftSession(draftId), |
@@ -151,11 +152,21 @@ export function ThreadRouteView({ target }: { target: ThreadRouteTarget }) { |
151 | 152 | if (renderState === "missing") { |
152 | 153 | const { clearPendingFileDropsForThread } = useSidebarPendingFileDropStore.getState(); |
153 | 154 | clearPendingFileDropsForThread(target.threadRef); |
154 | | - if (environmentHasAnyThreads) { |
| 155 | + if (archiveDraftRetry && scopedThreadKey(archiveDraftRetry.threadRef) === serverThreadKey) { |
| 156 | + void navigate({ to: "/", replace: true, state: { archiveDraftRetry } }); |
| 157 | + } else if (environmentHasAnyThreads) { |
155 | 158 | void navigate({ to: "/", replace: true }); |
156 | 159 | } |
157 | 160 | } |
158 | | - }, [bootstrapComplete, environmentHasAnyThreads, navigate, renderState, target]); |
| 161 | + }, [ |
| 162 | + archiveDraftRetry, |
| 163 | + bootstrapComplete, |
| 164 | + environmentHasAnyThreads, |
| 165 | + navigate, |
| 166 | + renderState, |
| 167 | + serverThreadKey, |
| 168 | + target, |
| 169 | + ]); |
159 | 170 |
|
160 | 171 | useEffect(() => { |
161 | 172 | if (target.kind !== "server" || !serverThreadStarted || !draftThread) { |
|
0 commit comments