@@ -9,7 +9,10 @@ import {
99 type UsageProviderKind ,
1010} from "@t3tools/contracts" ;
1111import { CircleAlertIcon , ChevronDownIcon , InfoIcon , SlidersHorizontalIcon } from "lucide-react" ;
12- import { useEffect , useEffectEvent , useMemo , useRef , useState } from "react" ;
12+ import { useEffect , useEffectEvent , useRef , useState } from "react" ;
13+ import { settlePromise } from "@t3tools/client-runtime/state/runtime" ;
14+ import * as AsyncResult from "effect/reactivity/AsyncResult" ;
15+ import * as Cause from "effect/Cause" ;
1316import {
1417 cursorKeychainAccessEnvironments ,
1518 refreshUsageLimits ,
@@ -111,6 +114,61 @@ function isUsageWindowDays(value: number): value is UsagePagePreferences["window
111114
112115const providerLabel = ( provider : UsageProviderKind ) => PROVIDER_PRESENTATION [ provider ] . label ;
113116
117+ // useUsage keys its queries on this set, so it must keep its identity.
118+ function useHiddenProviderSet ( hiddenProviders : UsagePagePreferences [ "hiddenProviders" ] ) {
119+ "use memo" ;
120+ return new Set ( hiddenProviders ) ;
121+ }
122+
123+ function usageLoading (
124+ showingKept : boolean ,
125+ selectedEnvironments : Parameters < typeof usageLoadingState > [ 0 ] ,
126+ refreshingUsage : boolean ,
127+ hiddenProviders : ReadonlySet < UsageProviderKind > ,
128+ ) {
129+ if ( showingKept ) {
130+ return { partial : true , everyProvider : true , providers : new Set < UsageProviderKind > ( ) } ;
131+ }
132+ const state = usageLoadingState ( selectedEnvironments , refreshingUsage ) ;
133+ const providers = new Set ( [ ...state . providers ] . filter ( ( p ) => ! hiddenProviders . has ( p ) ) ) ;
134+ return {
135+ partial : state . everyProvider || providers . size > 0 ,
136+ everyProvider : state . everyProvider ,
137+ providers,
138+ } ;
139+ }
140+
141+ // UsageProviderChart memoizes on the provider collections, so they must keep their identity.
142+ function useUsageProviders (
143+ showingKept : boolean ,
144+ selectedEnvironments : Parameters < typeof usageLoadingState > [ 0 ] ,
145+ refreshingUsage : boolean ,
146+ hiddenProviders : ReadonlySet < UsageProviderKind > ,
147+ mergedProviders : MergedUsage [ "providers" ] ,
148+ ) {
149+ "use memo" ;
150+ const loading = usageLoading ( showingKept , selectedEnvironments , refreshingUsage , hiddenProviders ) ;
151+ const providersWithData = providersWithUsage ( mergedProviders ) ;
152+ const activeProviders = PROVIDER_ORDER . filter (
153+ ( provider ) => providersWithData . includes ( provider ) || loading . providers . has ( provider ) ,
154+ ) ;
155+ const chartLoadingProviders = new Set (
156+ activeProviders . filter ( ( provider ) => loading . everyProvider || loading . providers . has ( provider ) ) ,
157+ ) ;
158+ return { loading, providersWithData, activeProviders, chartLoadingProviders } ;
159+ }
160+
161+ // UsageProviderChart memoizes on these arrays, so they must keep their identity.
162+ function useUsagePeriods ( usageWindow : ReturnType < typeof makeWindow > ) {
163+ "use memo" ;
164+ const days = enumerateDays ( usageWindow . sinceDay , usageWindow . untilDay ) ;
165+ const hours =
166+ usageWindow . sinceTime === undefined || usageWindow . untilTime === undefined
167+ ? [ ]
168+ : enumerateHourStarts ( usageWindow . sinceTime , usageWindow . untilTime ) ;
169+ return { days, hours } ;
170+ }
171+
114172export function UsagePage ( ) {
115173 const [ preferences , setPreferences ] = useState ( readUsagePagePreferences ) ;
116174 useEscapeToGoBack ( ) ;
@@ -141,10 +199,7 @@ export function UsagePage() {
141199 const [ selectedModelKey , setSelectedModelKey ] = useState < string | null > ( null ) ;
142200 const [ selectedEnvironmentIds , setSelectedEnvironmentIds ] =
143201 useState < ReadonlySet < EnvironmentId > | null > ( null ) ;
144- const hiddenProviders = useMemo (
145- ( ) => new Set ( preferences . hiddenProviders ) ,
146- [ preferences . hiddenProviders ] ,
147- ) ;
202+ const hiddenProviders = useHiddenProviderSet ( preferences . hiddenProviders ) ;
148203 const { days : windowDays , window } = windowSelection ;
149204 const isPast24Hours = windowDays === 1 ;
150205 const {
@@ -160,18 +215,13 @@ export function UsagePage() {
160215 const shownHourly = shownWindow . resolution === "hour" ;
161216 const refreshingUsage = isRefreshing && ! showingLimits ;
162217 const showingKept = shown !== null && shown . window !== window ;
163- const loading = useMemo ( ( ) => {
164- if ( showingKept ) {
165- return { partial : true , everyProvider : true , providers : new Set < UsageProviderKind > ( ) } ;
166- }
167- const state = usageLoadingState ( selectedEnvironments , refreshingUsage ) ;
168- const providers = new Set ( [ ...state . providers ] . filter ( ( p ) => ! hiddenProviders . has ( p ) ) ) ;
169- return {
170- partial : state . everyProvider || providers . size > 0 ,
171- everyProvider : state . everyProvider ,
172- providers,
173- } ;
174- } , [ showingKept , refreshingUsage , selectedEnvironments , hiddenProviders ] ) ;
218+ const { loading, providersWithData, activeProviders, chartLoadingProviders } = useUsageProviders (
219+ showingKept ,
220+ selectedEnvironments ,
221+ refreshingUsage ,
222+ hiddenProviders ,
223+ merged . providers ,
224+ ) ;
175225 const isProviderLoading = ( provider : UsageProviderKind ) =>
176226 loading . everyProvider || loading . providers . has ( provider ) ;
177227 const presentations = useAtomValue ( environmentPresentations . presentationsAtom ) ;
@@ -203,45 +253,14 @@ export function UsagePage() {
203253 ( environment ) => environment . canReadDiagnostics ,
204254 ) ;
205255
206- const days = useMemo (
207- ( ) => enumerateDays ( shownWindow . sinceDay , shownWindow . untilDay ) ,
208- [ shownWindow . sinceDay , shownWindow . untilDay ] ,
209- ) ;
210- const hours = useMemo (
211- ( ) =>
212- shownWindow . sinceTime === undefined || shownWindow . untilTime === undefined
213- ? [ ]
214- : enumerateHourStarts ( shownWindow . sinceTime , shownWindow . untilTime ) ,
215- [ shownWindow . sinceTime , shownWindow . untilTime ] ,
216- ) ;
217- const breakdownPeriods = useMemo < readonly ( DailyTotals | HourlyTotals ) [ ] > (
218- ( ) => ( shownHourly ? merged . hourly : merged . daily ) . toReversed ( ) ,
219- [ shownHourly , merged . daily , merged . hourly ] ,
220- ) ;
221- const breakdownModels = useMemo (
222- ( ) =>
223- breakdown === "model" && metric === "tokens"
224- ? sortModelsByTokens ( merged . models )
225- : merged . models ,
226- [ breakdown , merged . models , metric ] ,
227- ) ;
228- const providersWithData = useMemo ( ( ) => providersWithUsage ( merged . providers ) , [ merged . providers ] ) ;
229- const activeProviders = useMemo (
230- ( ) =>
231- PROVIDER_ORDER . filter (
232- ( provider ) => providersWithData . includes ( provider ) || loading . providers . has ( provider ) ,
233- ) ,
234- [ loading . providers , providersWithData ] ,
235- ) ;
236- const chartLoadingProviders = useMemo (
237- ( ) =>
238- new Set (
239- activeProviders . filter (
240- ( provider ) => loading . everyProvider || loading . providers . has ( provider ) ,
241- ) ,
242- ) ,
243- [ activeProviders , loading . everyProvider , loading . providers ] ,
244- ) ;
256+ const { days, hours } = useUsagePeriods ( shownWindow ) ;
257+ const breakdownPeriods : readonly ( DailyTotals | HourlyTotals ) [ ] = (
258+ shownHourly ? merged . hourly : merged . daily
259+ ) . toReversed ( ) ;
260+ const breakdownModels =
261+ breakdown === "model" && metric === "tokens"
262+ ? sortModelsByTokens ( merged . models )
263+ : merged . models ;
245264 const selectedModel =
246265 selectedModelKey === null
247266 ? undefined
@@ -280,9 +299,10 @@ export function UsagePage() {
280299 if ( nextMetric === "limits" ) setLimitsNow ( Date . now ( ) ) ;
281300 updatePreferences ( { metric : nextMetric } ) ;
282301 } ;
283- const refreshLimits = async ( automatic = false , afterPending = false ) => {
284- try {
285- await Promise . all (
302+ const refreshLimits = ( automatic = false , afterPending = false ) =>
303+ // Settled so the timestamp still advances when a refresh throws.
304+ settlePromise ( ( ) =>
305+ Promise . all (
286306 Array . from ( presentations , ( [ environmentId , presentation ] ) => {
287307 if ( selectedEnvironmentIds !== null && ! selectedEnvironmentIds . has ( environmentId ) ) return ;
288308 if ( presentation . connection . phase === "connected" && presentation . serverConfig !== null ) {
@@ -294,11 +314,11 @@ export function UsagePage() {
294314 ) ;
295315 }
296316 } ) ,
297- ) ;
298- } finally {
317+ ) ,
318+ ) . then ( ( result ) => {
299319 setLimitsNow ( Date . now ( ) ) ;
300- }
301- } ;
320+ if ( ! AsyncResult . isSuccess ( result ) ) throw Cause . squash ( result . cause ) ;
321+ } ) ;
302322 const onUsageKeyDown = useEffectEvent ( ( event : KeyboardEvent ) => {
303323 if (
304324 event . defaultPrevented ||
@@ -1019,15 +1039,12 @@ function CursorEnableButton({
10191039 const [ pending , setPending ] = useState ( false ) ;
10201040 const enable = async ( ) => {
10211041 setPending ( true ) ;
1022- try {
1023- const result = await updateSettings ( {
1024- environmentId,
1025- input : { patch : { cursorKeychainUsageEnabled : true } } ,
1026- } ) ;
1027- if ( result . _tag === "Success" ) onEnabled ( ) ;
1028- } finally {
1029- setPending ( false ) ;
1030- }
1042+ const result = await updateSettings ( {
1043+ environmentId,
1044+ input : { patch : { cursorKeychainUsageEnabled : true } } ,
1045+ } ) ;
1046+ if ( result . _tag === "Success" ) onEnabled ( ) ;
1047+ setPending ( false ) ;
10311048 } ;
10321049 const button = tooltip ? (
10331050 < InlineButton
0 commit comments