@@ -137,6 +137,8 @@ describe("magpieQuotasToAccounts", () => {
137137 "magpie-go:oc-billed" ,
138138 "magpie-go:oc-other" ,
139139 "claude:second@example.com" ,
140+ "grok:jeffrey.smith@closura.ai" ,
141+ "grok:kameron.smith@closura.ai" ,
140142 ] ) ;
141143 const team = accounts [ 2 ] ! ;
142144 const billed = accounts [ 3 ] ! ;
@@ -173,6 +175,129 @@ describe("magpieQuotasToAccounts", () => {
173175 "weekly" ,
174176 "monthly" ,
175177 ] ) ;
178+ // Both seats share the product name "Grok" and neither has an alias.
179+ expect ( grok . map ( ( account ) => account . displayName ) ) . toEqual ( [ "Jeffrey Smith" , "Kameron Smith" ] ) ;
180+ } ) ;
181+
182+ it ( "prefers an alias, splits a shared product name, and keeps held and lapsed seats" , ( ) => {
183+ const labeled = magpieQuotasToAccounts (
184+ [
185+ {
186+ provider : "claude" ,
187+ name : "Claude Code" ,
188+ plan : "max" ,
189+ user : "a@example.com" ,
190+ alias : "Kameron · Claude work" ,
191+ windows : [ { name : "5 hours" , used : 0 } ] ,
192+ } ,
193+ {
194+ provider : "claude" ,
195+ name : "Claude Code" ,
196+ plan : "max" ,
197+ user : "bee.person@example.com" ,
198+ alias : null ,
199+ windows : [ { name : "5 hours" , used : 10 } ] ,
200+ } ,
201+ {
202+ provider : "grok" ,
203+ name : "Grok (SuperGrok)" ,
204+ user : "jeffrey.smith@example.com" ,
205+ alias : null ,
206+ windows : [ { name : "7 days" , used : 65 } ] ,
207+ } ,
208+ {
209+ provider : "grok" ,
210+ name : "Grok (SuperGrok)" ,
211+ user : "kameron.smith@example.com" ,
212+ windows : [ { name : "7 days" , used : 7 } ] ,
213+ } ,
214+ {
215+ provider : "codex" ,
216+ name : "Codex" ,
217+ plan : "pro" ,
218+ user : "a@example.com" ,
219+ held : true ,
220+ until : "2026-12-02T00:00:00Z" ,
221+ windows : [ { name : "7 days" , used : 100 } ] ,
222+ } ,
223+ {
224+ provider : "claude" ,
225+ user : "old@example.com" ,
226+ lapsed : "Claude Code is no longer signed in" ,
227+ windows : [ { name : "7 days" , used : 100 } ] ,
228+ } ,
229+ ] ,
230+ checkedAt ,
231+ ) ;
232+ expect ( labeled . find ( ( account ) => account . email === "a@example.com" ) ?. displayName ) . toBe (
233+ "Kameron · Claude work" ,
234+ ) ;
235+ // The second Claude seat shares the product name and has no alias.
236+ expect ( labeled . find ( ( account ) => account . email === "bee.person@example.com" ) ?. displayName ) . toBe (
237+ "Bee Person" ,
238+ ) ;
239+ expect (
240+ labeled . filter ( ( account ) => account . driver === "grok" ) . map ( ( account ) => account . displayName ) ,
241+ ) . toEqual ( [ "Jeffrey Smith · SuperGrok" , "Kameron Smith · SuperGrok" ] ) ;
242+ const held = labeled . find ( ( account ) => account . driver === "codex" ) ;
243+ expect ( held ?. status ) . toBe ( "held" ) ;
244+ expect ( held ?. statusDetail ) . toBe ( "Held until 2026-12-02." ) ;
245+ const lapsed = labeled . find ( ( account ) => account . email === "old@example.com" ) ;
246+ expect ( lapsed ?. status ) . toBe ( "signed-out" ) ;
247+ expect ( lapsed ?. statusDetail ) . toBe ( "Claude Code is no longer signed in." ) ;
248+ expect ( lapsed ?. usageLimits . windows ) . toHaveLength ( 1 ) ;
249+ } ) ;
250+
251+ it ( "leaves one emailed seat unnamed, including a duplicate row, and keeps a colliding alias" , ( ) => {
252+ const lone = magpieQuotasToAccounts (
253+ [
254+ {
255+ provider : "grok" ,
256+ name : "Grok (SuperGrok)" ,
257+ user : "only@example.com" ,
258+ alias : null ,
259+ held : null ,
260+ lapsed : null ,
261+ windows : [ { name : "7 days" , used : 10 } ] ,
262+ } ,
263+ {
264+ provider : "grok" ,
265+ name : "Grok (SuperGrok)" ,
266+ user : "only@example.com" ,
267+ windows : [ { name : "7 days" , used : 12 } ] ,
268+ } ,
269+ {
270+ provider : "claude" ,
271+ name : "Claude Code" ,
272+ user : "a@example.com" ,
273+ alias : "Bee Person" ,
274+ windows : [ { name : "5 hours" , used : 1 } ] ,
275+ } ,
276+ {
277+ provider : "claude" ,
278+ name : "Claude Code" ,
279+ user : "bee.person@example.com" ,
280+ alias : null ,
281+ windows : [ { name : "5 hours" , used : 2 } ] ,
282+ } ,
283+ {
284+ provider : "claude" ,
285+ name : "Claude Code" ,
286+ user : "c@example.com" ,
287+ windows : [ { name : "5 hours" , used : 3 } ] ,
288+ } ,
289+ ] ,
290+ checkedAt ,
291+ ) ;
292+ const grok = lone . filter ( ( account ) => account . driver === "grok" ) ;
293+ expect ( grok . map ( ( account ) => account . email ) ) . toEqual ( [ "only@example.com" ] ) ;
294+ expect ( grok [ 0 ] ?. displayName ) . toBeUndefined ( ) ;
295+ expect ( lone . find ( ( account ) => account . email === "a@example.com" ) ?. displayName ) . toBe (
296+ "Bee Person" ,
297+ ) ;
298+ expect ( lone . find ( ( account ) => account . email === "bee.person@example.com" ) ?. displayName ) . toBe (
299+ "Bee Person · example" ,
300+ ) ;
176301 } ) ;
177302} ) ;
178303
@@ -327,6 +452,45 @@ describe("makeMagpieApi", () => {
327452 } ) ,
328453 ) ;
329454
455+ it . effect ( "accepts null alias, held, and lapsed on a quota row" , ( ) =>
456+ Effect . gen ( function * ( ) {
457+ const http = HttpClient . make ( ( request ) =>
458+ Effect . sync ( ( ) =>
459+ HttpClientResponse . fromWeb (
460+ request ,
461+ Response . json ( {
462+ object : "list" ,
463+ data : [
464+ {
465+ provider : "grok" ,
466+ name : "Grok (SuperGrok)" ,
467+ user : "only@example.com" ,
468+ alias : null ,
469+ held : null ,
470+ until : null ,
471+ lapsed : null ,
472+ windows : [ { name : "7 days" , used : 4 , resetsAt : null } ] ,
473+ } ,
474+ ] ,
475+ } ) ,
476+ ) ,
477+ ) ,
478+ ) ;
479+ const result = yield * makeMagpieApi . pipe (
480+ Effect . flatMap ( ( api ) =>
481+ api . readAccounts ( { url : "http://127.0.0.1:3425" , managementKey : "" } ) ,
482+ ) ,
483+ Effect . result ,
484+ Effect . provideService ( HttpClient . HttpClient , http ) ,
485+ ) ;
486+ expect ( result . _tag ) . toBe ( "Success" ) ;
487+ if ( result . _tag !== "Success" ) return ;
488+ expect ( result . success . map ( ( account ) => account . id ) ) . toEqual ( [ "grok:only@example.com" ] ) ;
489+ expect ( result . success [ 0 ] ?. displayName ) . toBeUndefined ( ) ;
490+ expect ( result . success [ 0 ] ?. status ) . toBeUndefined ( ) ;
491+ } ) ,
492+ ) ;
493+
330494 it . effect ( "sends a configured gateway key and explains a refusal" , ( ) =>
331495 Effect . gen ( function * ( ) {
332496 const { result, seen } = yield * run ( "gateway-key" , 401 ) ;
0 commit comments