@@ -361,7 +361,7 @@ export function UsageRouteScreen() {
361361 />
362362 < TotalsSection merged = { merged } isPast24Hours = { isPast24Hours } />
363363 < CostSection merged = { merged } />
364- < ModelsSection merged = { merged } />
364+ < ModelsSection merged = { merged } metric = { metric } />
365365 </ >
366366 ) }
367367 </ >
@@ -781,14 +781,22 @@ function MetricCell(props: {
781781 ) ;
782782}
783783
784- function ModelsSection ( props : { readonly merged : MergedUsage } ) {
785- const { merged } = props ;
784+ function ModelsSection ( props : { readonly merged : MergedUsage ; readonly metric : UsageChartMetric } ) {
785+ const { merged, metric } = props ;
786786 const colors = useProviderColors ( ) ;
787787 if ( merged . models . length === 0 ) return null ;
788788
789+ // Ranked like the provider rows. .sort() on a copy, not .toSorted(): Hermes
790+ // doesn't ship the ES2023 method.
791+ const ordered = [ ...merged . models ] . sort ( ( a , b ) =>
792+ metric === "cost"
793+ ? b . costUsd - a . costUsd || b . totalTokens - a . totalTokens
794+ : b . totalTokens - a . totalTokens || b . costUsd - a . costUsd ,
795+ ) ;
796+
789797 return (
790798 < SettingsSection title = "By model" >
791- { merged . models . map ( ( model , index ) => (
799+ { ordered . map ( ( model , index ) => (
792800 < View
793801 key = { `${ model . provider } :${ model . model } ` }
794802 className = {
@@ -806,13 +814,21 @@ function ModelsSection(props: { readonly merged: MergedUsage }) {
806814 { model . model }
807815 </ Text >
808816 < Text className = "text-sm text-foreground-muted" >
809- { isModelCostUnknown ( model )
810- ? `no known rates · ${ formatTokens ( model . totalTokens ) } tokens`
811- : `${ formatPercent ( model . costShare ) } of cost · ${ formatTokens ( model . totalTokens ) } tokens` }
817+ { metric === "tokens"
818+ ? `${ formatPercent ( model . tokenShare ) } of tokens · ${
819+ isModelCostUnknown ( model ) ? "no known rates" : formatUsd ( model . costUsd )
820+ } `
821+ : isModelCostUnknown ( model )
822+ ? `no known rates · ${ formatTokens ( model . totalTokens ) } tokens`
823+ : `${ formatPercent ( model . costShare ) } of cost · ${ formatTokens ( model . totalTokens ) } tokens` }
812824 </ Text >
813825 </ View >
814826 < Text className = "text-base tabular-nums text-foreground" >
815- { isModelCostUnknown ( model ) ? "Unpriced" : formatUsd ( model . costUsd ) }
827+ { metric === "tokens"
828+ ? formatTokens ( model . totalTokens )
829+ : isModelCostUnknown ( model )
830+ ? "Unpriced"
831+ : formatUsd ( model . costUsd ) }
816832 </ Text >
817833 </ View >
818834 ) ) }
0 commit comments