@@ -1290,10 +1290,14 @@ describe("/usage-limits", () => {
12901290 expect ( report ?. notices ) . toEqual ( [ ] ) ;
12911291 } ) ;
12921292
1293- it ( "keeps the freshest usable duplicate and its latest native credits" , ( ) => {
1293+ it ( "keeps the freshest usable native duplicate and the freshest native credits in either order " , ( ) => {
12941294 const failed = provider ( {
12951295 auth : selected . auth ,
1296- usageLimits : { ...limits , unavailable : { reason : "probeFailed" } } ,
1296+ usageLimits : {
1297+ ...limits ,
1298+ checkedAt : "2026-09-03T11:40:00.000Z" ,
1299+ unavailable : { reason : "probeFailed" } ,
1300+ } ,
12971301 } ) ;
12981302 const credited = provider ( {
12991303 instanceId : ProviderInstanceId . make ( "codex-credit" ) ,
@@ -1304,6 +1308,11 @@ describe("/usage-limits", () => {
13041308 resetCredits : { availableCount : 2 } ,
13051309 } ,
13061310 } ) ;
1311+ const staleCredit = provider ( {
1312+ ...credited ,
1313+ instanceId : ProviderInstanceId . make ( "codex-stale-credit" ) ,
1314+ usageLimits : { ...limits , resetCredits : { availableCount : 3 } } ,
1315+ } ) ;
13071316 const freshest = provider ( {
13081317 instanceId : ProviderInstanceId . make ( "codex-fresh" ) ,
13091318 auth : selected . auth ,
@@ -1312,21 +1321,60 @@ describe("/usage-limits", () => {
13121321 windows : [ { ...window , usedPercent : 55 } ] ,
13131322 } ,
13141323 } ) ;
1315- const report = collectProviderUsageLimits (
1316- failed . instanceId ,
1317- [ failed , credited , freshest ] ,
1318- sources ,
1319- now ,
1320- ) ;
1321- expect ( report ?. accounts . map ( ( account ) => account . id ) ) . toEqual ( [ "codex-fresh" , "hub:oss" ] ) ;
1322- expect ( report ?. accounts [ 0 ] ) . toMatchObject ( {
1323- limits : {
1324- checkedAt : "2026-09-03T11:30:00.000Z" ,
1325- windows : [ { usedPercent : 55 } ] ,
1326- resetCredits : { availableCount : 2 } ,
1327- } ,
1328- resetCreditInput : { instanceId : "codex-credit" } ,
1324+ const duplicates = [ failed , staleCredit , credited , freshest ] ;
1325+ for ( const providers of [ duplicates , duplicates . toReversed ( ) ] ) {
1326+ const report = collectProviderUsageLimits ( failed . instanceId , providers , sources , now ) ;
1327+ expect ( report ?. accounts . map ( ( account ) => account . id ) ) . toEqual ( [ "codex-fresh" , "hub:oss" ] ) ;
1328+ expect ( report ?. accounts [ 0 ] ) . toMatchObject ( {
1329+ limits : {
1330+ checkedAt : "2026-09-03T11:30:00.000Z" ,
1331+ windows : [ { usedPercent : 55 } ] ,
1332+ resetCredits : { availableCount : 2 } ,
1333+ } ,
1334+ resetCreditInput : { instanceId : "codex-credit" } ,
1335+ } ) ;
1336+ expect ( report ?. accounts [ 0 ] ?. limits . unavailable ) . toBeUndefined ( ) ;
1337+ }
1338+ } ) ;
1339+
1340+ it ( "merges native workspace duplicates only while the workspace evidence is unambiguous" , ( ) => {
1341+ const known = provider ( {
1342+ ...selected ,
1343+ instanceId : ProviderInstanceId . make ( "workspace-a" ) ,
1344+ auth : { ...selected . auth , workspaceId : "ws-a" } ,
13291345 } ) ;
1346+ const fresh = provider ( {
1347+ ...known ,
1348+ instanceId : ProviderInstanceId . make ( "workspace-a-fresh" ) ,
1349+ usageLimits : { ...limits , checkedAt : "2026-09-03T11:30:00.000Z" } ,
1350+ } ) ;
1351+ const natives = [ known , fresh , selected ] ;
1352+ expect (
1353+ collectProviderUsageLimits ( selected . instanceId , natives , [ ] , now ) ?. accounts . map (
1354+ ( account ) => account . id ,
1355+ ) ,
1356+ ) . toEqual ( [ "workspace-a-fresh" ] ) ;
1357+
1358+ const unreadable = provider ( {
1359+ instanceId : ProviderInstanceId . make ( "workspace-b" ) ,
1360+ auth : { ...selected . auth , workspaceId : "ws-b" } ,
1361+ } ) ;
1362+ expect (
1363+ collectProviderUsageLimits (
1364+ selected . instanceId ,
1365+ [ ...natives , unreadable ] ,
1366+ [ ] ,
1367+ now ,
1368+ ) ?. accounts . map ( ( account ) => account . id ) ,
1369+ ) . toEqual ( [ "workspace-a-fresh" , "codex" ] ) ;
1370+ expect (
1371+ collectProviderUsageLimits (
1372+ selected . instanceId ,
1373+ [ ...natives , { ...unreadable , usageLimits : limits } ] ,
1374+ [ ] ,
1375+ now ,
1376+ ) ?. accounts . map ( ( account ) => account . id ) ,
1377+ ) . toEqual ( [ "workspace-a-fresh" , "codex" , "workspace-b" ] ) ;
13301378 } ) ;
13311379
13321380 it ( "supports a source-only provider and keeps duplicates when the native probe failed" , ( ) => {
0 commit comments