@@ -1258,7 +1258,7 @@ describe("/usage-limits", () => {
12581258 expect ( report ?. accounts [ 0 ] ?. limits . resetCredits ?. availableCount ) . toBe ( 3 ) ;
12591259 } ) ;
12601260
1261- it ( "keeps accounts and custom instances separate, filtering by driver" , ( ) => {
1261+ it ( "keeps unidentified custom instances separate, filtering by driver" , ( ) => {
12621262 const report = collectProviderUsageLimits (
12631263 selected . instanceId ,
12641264 [
@@ -1299,6 +1299,93 @@ describe("/usage-limits", () => {
12991299 expect ( report ?. notices ) . toEqual ( [ ] ) ;
13001300 } ) ;
13011301
1302+ it ( "keeps the freshest usable native duplicate and the freshest native credits in either order" , ( ) => {
1303+ const failed = provider ( {
1304+ auth : selected . auth ,
1305+ usageLimits : {
1306+ ...limits ,
1307+ checkedAt : "2026-09-03T11:40:00.000Z" ,
1308+ unavailable : { reason : "probeFailed" } ,
1309+ } ,
1310+ } ) ;
1311+ const credited = provider ( {
1312+ instanceId : ProviderInstanceId . make ( "codex-credit" ) ,
1313+ auth : selected . auth ,
1314+ usageLimits : {
1315+ checkedAt : "2026-09-03T11:20:00.000Z" ,
1316+ windows : [ { ...window , usedPercent : 50 } ] ,
1317+ resetCredits : { availableCount : 2 } ,
1318+ } ,
1319+ } ) ;
1320+ const staleCredit = provider ( {
1321+ ...credited ,
1322+ instanceId : ProviderInstanceId . make ( "codex-stale-credit" ) ,
1323+ usageLimits : { ...limits , resetCredits : { availableCount : 3 } } ,
1324+ } ) ;
1325+ const freshest = provider ( {
1326+ instanceId : ProviderInstanceId . make ( "codex-fresh" ) ,
1327+ auth : selected . auth ,
1328+ usageLimits : {
1329+ checkedAt : "2026-09-03T11:30:00.000Z" ,
1330+ windows : [ { ...window , usedPercent : 55 } ] ,
1331+ } ,
1332+ } ) ;
1333+ const duplicates = [ failed , staleCredit , credited , freshest ] ;
1334+ for ( const providers of [ duplicates , duplicates . toReversed ( ) ] ) {
1335+ const report = collectProviderUsageLimits ( failed . instanceId , providers , sources , now ) ;
1336+ expect ( report ?. accounts . map ( ( account ) => account . id ) ) . toEqual ( [ "codex-fresh" , "hub:oss" ] ) ;
1337+ expect ( report ?. accounts [ 0 ] ) . toMatchObject ( {
1338+ limits : {
1339+ checkedAt : "2026-09-03T11:30:00.000Z" ,
1340+ windows : [ { usedPercent : 55 } ] ,
1341+ resetCredits : { availableCount : 2 } ,
1342+ } ,
1343+ resetCreditInput : { instanceId : "codex-credit" } ,
1344+ } ) ;
1345+ expect ( report ?. accounts [ 0 ] ?. limits . unavailable ) . toBeUndefined ( ) ;
1346+ }
1347+ } ) ;
1348+
1349+ it ( "merges native workspace duplicates only while the workspace evidence is unambiguous" , ( ) => {
1350+ const known = provider ( {
1351+ ...selected ,
1352+ instanceId : ProviderInstanceId . make ( "workspace-a" ) ,
1353+ auth : { ...selected . auth , workspaceId : "ws-a" } ,
1354+ } ) ;
1355+ const fresh = provider ( {
1356+ ...known ,
1357+ instanceId : ProviderInstanceId . make ( "workspace-a-fresh" ) ,
1358+ usageLimits : { ...limits , checkedAt : "2026-09-03T11:30:00.000Z" } ,
1359+ } ) ;
1360+ const natives = [ known , fresh , selected ] ;
1361+ expect (
1362+ collectProviderUsageLimits ( selected . instanceId , natives , [ ] , now ) ?. accounts . map (
1363+ ( account ) => account . id ,
1364+ ) ,
1365+ ) . toEqual ( [ "workspace-a-fresh" ] ) ;
1366+
1367+ const unreadable = provider ( {
1368+ instanceId : ProviderInstanceId . make ( "workspace-b" ) ,
1369+ auth : { ...selected . auth , workspaceId : "ws-b" } ,
1370+ } ) ;
1371+ expect (
1372+ collectProviderUsageLimits (
1373+ selected . instanceId ,
1374+ [ ...natives , unreadable ] ,
1375+ [ ] ,
1376+ now ,
1377+ ) ?. accounts . map ( ( account ) => account . id ) ,
1378+ ) . toEqual ( [ "workspace-a-fresh" , "codex" ] ) ;
1379+ expect (
1380+ collectProviderUsageLimits (
1381+ selected . instanceId ,
1382+ [ ...natives , { ...unreadable , usageLimits : limits } ] ,
1383+ [ ] ,
1384+ now ,
1385+ ) ?. accounts . map ( ( account ) => account . id ) ,
1386+ ) . toEqual ( [ "workspace-a-fresh" , "codex" , "workspace-b" ] ) ;
1387+ } ) ;
1388+
13021389 it ( "supports a source-only provider and keeps duplicates when the native probe failed" , ( ) => {
13031390 expect (
13041391 collectProviderUsageLimits ( selected . instanceId , [ provider ( { } ) ] , sources , now ) ?. accounts . map (
0 commit comments