@@ -67,12 +67,17 @@ const encodeUnknownJson = Schema.encodeEffect(Schema.fromJsonString(Schema.Unkno
6767const encodeUnknownJsonString = Schema . encodeSync ( Schema . fromJsonString ( Schema . Unknown ) ) ;
6868const decodeUnknownJsonString = Schema . decodeSync ( Schema . fromJsonString ( Schema . Unknown ) ) ;
6969
70- function claudeLine ( id : number , outputTokens : number , model = "claude-fable-5" ) : string {
70+ function claudeLine (
71+ id : number ,
72+ outputTokens : number ,
73+ model = "claude-fable-5" ,
74+ sessionId = "session-1" ,
75+ ) : string {
7176 return `${ JSON . stringify ( {
7277 type : "assistant" ,
7378 timestamp : "2026-08-01T10:00:00Z" ,
7479 requestId : `req_${ id } ` ,
75- sessionId : "session-1" ,
80+ sessionId,
7681 message : {
7782 id : `msg_${ id } ` ,
7883 model,
@@ -2077,6 +2082,111 @@ describe("UsageService", () => {
20772082 } ) . pipe ( Effect . scoped ) ,
20782083 ) ;
20792084
2085+ it . live ( "filters original model IDs before aliases, pricing, buckets and session counts" , ( ) =>
2086+ Effect . gen ( function * ( ) {
2087+ const { transcript, settings, home } = yield * setup ;
2088+ yield * Effect . promise ( ( ) =>
2089+ NodeFSP . writeFile (
2090+ transcript ,
2091+ claudeLine ( 1 , 3 , "orbit-1" , "mixed" ) +
2092+ claudeLine ( 2 , 5 , "orbit-2" , "mixed" ) +
2093+ claudeLine ( 3 , 7 , "drift-9" , "mixed" ) +
2094+ claudeLine ( 4 , 11 , "drift-9" , "excluded-only" ) ,
2095+ ) ,
2096+ ) ;
2097+ const rates = {
2098+ "orbit-1" : { input_cost_per_token : 0.000001 , output_cost_per_token : 0.00001 } ,
2099+ "orbit-2" : { input_cost_per_token : 0.000002 , output_cost_per_token : 0.00002 } ,
2100+ } ;
2101+ const include = {
2102+ // The codex selector must not match the Claude drift-9 records.
2103+ include : [
2104+ { provider : "claude" , model : "orbit-1" } ,
2105+ { model : "orbit-2" } ,
2106+ { provider : "codex" , model : "drift-9" } ,
2107+ ] ,
2108+ } ;
2109+ const exclude = { exclude : [ { model : "drift-9" } ] } ;
2110+ const HOURLY : UsageSummaryInput = {
2111+ ...WINDOW ,
2112+ resolution : "hour" ,
2113+ sinceTime : "2026-08-01T09:00:00Z" ,
2114+ untilTime : "2026-08-01T11:00:00Z" ,
2115+ } ;
2116+ const cells = ( summary : UsageSummary ) =>
2117+ summary . buckets . map ( ( { model, totals, costUsd, records, sessions } ) => ( {
2118+ model,
2119+ outputTokens : totals . outputTokens ,
2120+ costUsd : Math . round ( costUsd * 1e6 ) ,
2121+ records,
2122+ sessions,
2123+ } ) ) ;
2124+
2125+ yield * Effect . gen ( function * ( ) {
2126+ const service = yield * UsageService . make ;
2127+ // Same service, concurrent reads: the in-flight key must keep these scans apart.
2128+ const [ unfiltered , noOp , keepNothing , included , reordered , excluded , hourly ] =
2129+ yield * Effect . all (
2130+ [
2131+ service . readSummary ( WINDOW ) ,
2132+ service . readSummary ( { ...WINDOW , modelFilter : { exclude : [ ] } } ) ,
2133+ service . readSummary ( { ...WINDOW , modelFilter : { include : [ ] } } ) ,
2134+ service . readSummary ( { ...WINDOW , modelFilter : include } ) ,
2135+ service . readSummary ( {
2136+ ...WINDOW ,
2137+ modelFilter : { include : [ ...include . include ] . reverse ( ) } ,
2138+ } ) ,
2139+ service . readSummary ( { ...WINDOW , modelFilter : exclude } ) ,
2140+ service . readSummary ( { ...HOURLY , modelFilter : include } ) ,
2141+ ] ,
2142+ { concurrency : "unbounded" } ,
2143+ ) ;
2144+
2145+ // Unfiltered keeps today's behavior: the alias folds drift-9 into orbit-1.
2146+ assert . deepStrictEqual ( cells ( unfiltered ) , [
2147+ { model : "orbit-1" , outputTokens : 21 , costUsd : 240 , records : 3 , sessions : 2 } ,
2148+ { model : "orbit-2" , outputTokens : 5 , costUsd : 120 , records : 1 , sessions : 1 } ,
2149+ ] ) ;
2150+ assert . strictEqual ( unfiltered . sources [ 0 ] ?. distinctSessions , 2 ) ;
2151+ assert . strictEqual ( unfiltered . modelFilter , undefined ) ;
2152+ assert . strictEqual ( noOp , unfiltered ) ;
2153+ assert . deepStrictEqual ( keepNothing . buckets , [ ] ) ;
2154+ assert . strictEqual ( keepNothing . sources [ 0 ] ?. distinctSessions , 0 ) ;
2155+
2156+ const kept = [
2157+ { model : "orbit-1" , outputTokens : 3 , costUsd : 40 , records : 1 , sessions : 1 } ,
2158+ { model : "orbit-2" , outputTokens : 5 , costUsd : 120 , records : 1 , sessions : 1 } ,
2159+ ] ;
2160+ assert . deepStrictEqual ( cells ( included ) , kept ) ;
2161+ assert . deepStrictEqual ( cells ( excluded ) , kept ) ;
2162+ assert . deepStrictEqual ( cells ( hourly ) , kept ) ;
2163+ assert . strictEqual ( hourly . buckets [ 0 ] ?. hourStart , "2026-08-01T10:00:00.000Z" ) ;
2164+ for ( const summary of [ included , excluded , hourly ] ) {
2165+ assert . strictEqual ( summary . sources [ 0 ] ?. distinctSessions , 1 ) ;
2166+ }
2167+ // Equal filters share one scan and echo one canonical form.
2168+ assert . strictEqual ( reordered , included ) ;
2169+ assert . deepStrictEqual ( included . modelFilter , {
2170+ include : [
2171+ { provider : "claude" , model : "orbit-1" } ,
2172+ { provider : "codex" , model : "drift-9" } ,
2173+ { model : "orbit-2" } ,
2174+ ] ,
2175+ } ) ;
2176+ } ) . pipe (
2177+ Effect . scoped ,
2178+ Effect . provide (
2179+ layerService ( {
2180+ prefix : "usage-service-model-filter-test" ,
2181+ home,
2182+ settings : { ...settings , usageModelAliases : { "drift-9" : "orbit-1" } } ,
2183+ ratesDocument : rates ,
2184+ } ) ,
2185+ ) ,
2186+ ) ;
2187+ } ) . pipe ( Effect . scoped ) ,
2188+ ) ;
2189+
20802190 it . live ( "reprices unchanged transcripts when custom prices are added, edited, or removed" , ( ) =>
20812191 Effect . gen ( function * ( ) {
20822192 const { transcript, settings, home } = yield * setup ;
0 commit comments