@@ -2,7 +2,7 @@ import { useStableCallback } from "../../hooks/useStableCallback";
22import { type EnvironmentId } from "@t3tools/contracts" ;
33import { type EnvironmentConnectionPresentation } from "@t3tools/client-runtime/connection" ;
44import { useAtomValue } from "@effect/atom-react" ;
5- import { useEffect , useState } from "react" ;
5+ import { useState } from "react" ;
66import { useNavigate } from "@tanstack/react-router" ;
77import {
88 isAtomCommandInterrupted ,
@@ -13,14 +13,14 @@ import { stackedThreadToast, toastManager } from "../ui/toast";
1313import { environmentCatalog } from "../../connection/catalog" ;
1414import { ConnectionDiagnosisHeadline } from "../settings/ConnectionDiagnosisDetails" ;
1515import { isDesktopLocalConnectionTarget } from "../../connection/desktopLocal" ;
16- import { useEnvironmentDisconnectDelay } from "../../hooks/useEnvironmentDisconnectDelay" ;
16+ import {
17+ useEnvironmentDisconnectDelay ,
18+ useEnvironmentStateHeldFor ,
19+ } from "../../hooks/useEnvironmentDisconnectDelay" ;
1720import { serverEnvironment } from "../../state/server" ;
1821import { type EnvironmentPresentation } from "../../state/environments" ;
1922import type { ComposerBannerStackItem } from "./ComposerBannerStack" ;
20- import {
21- hasEnvironmentReconnectWarningGraceElapsed ,
22- scheduleEnvironmentReconnectWarning ,
23- } from "../ChatView.logic" ;
23+ import { ENVIRONMENT_RECONNECT_WARNING_GRACE_MS } from "../ChatView.logic" ;
2424import { useAtomCommand } from "../../state/use-atom-command" ;
2525import { Button } from "../ui/button" ;
2626import { Tooltip , TooltipPopup , TooltipTrigger } from "../ui/tooltip" ;
@@ -83,27 +83,12 @@ export function useSystemComposerBanners(input: SystemComposerBannersInput) {
8383 activeEnvironmentConnectionPhase === "reconnecting"
8484 ? ( activeEnvironment ?. environmentId ?? null )
8585 : null ;
86- const [ reconnectWarningGraceElapsedEnvironmentId , setReconnectWarningGraceElapsedEnvironmentId ] =
87- useState < EnvironmentId | null > ( null ) ;
8886 // Each reconnect attempt gets its own grace period, including a later one to
8987 // the same environment.
90- const [ graceReconnectingEnvironmentId , setGraceReconnectingEnvironmentId ] = useState (
91- activeReconnectingEnvironmentId ,
92- ) ;
93- if ( graceReconnectingEnvironmentId !== activeReconnectingEnvironmentId ) {
94- setGraceReconnectingEnvironmentId ( activeReconnectingEnvironmentId ) ;
95- setReconnectWarningGraceElapsedEnvironmentId ( null ) ;
96- }
97- const reconnectWarningGraceElapsed = hasEnvironmentReconnectWarningGraceElapsed (
88+ const reconnectWarningGraceElapsed = useEnvironmentStateHeldFor (
9889 activeReconnectingEnvironmentId ,
99- reconnectWarningGraceElapsedEnvironmentId ,
90+ ENVIRONMENT_RECONNECT_WARNING_GRACE_MS ,
10091 ) ;
101- useEffect ( ( ) => {
102- if ( activeReconnectingEnvironmentId === null ) return ;
103- return scheduleEnvironmentReconnectWarning ( ( ) =>
104- setReconnectWarningGraceElapsedEnvironmentId ( activeReconnectingEnvironmentId ) ,
105- ) ;
106- } , [ activeReconnectingEnvironmentId ] ) ;
10792 const handleReconnectActiveEnvironment = async ( environmentId : EnvironmentId ) => {
10893 const result = await retryEnvironment ( environmentId ) ;
10994 if ( result . _tag === "Failure" && ! isAtomCommandInterrupted ( result ) ) {
0 commit comments