@@ -10,7 +10,10 @@ import * as Schema from "effect/Schema";
1010import * as TestClock from "effect/testing/TestClock" ;
1111import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner" ;
1212import { MuseSettings } from "../settings.ts" ;
13- import { refreshMuseUsage } from "./usageProbe.ts" ;
13+ import { refreshMuseUsage as refreshState , type MuseUsageReport } from "./usageProbe.ts" ;
14+ import type { MuseUsageAccount } from "./usageLimits.ts" ;
15+ import * as Ref from "effect/Ref" ;
16+ import * as Semaphore from "effect/Semaphore" ;
1417
1518const settings = Schema . decodeEffect ( MuseSettings ) ;
1619
@@ -72,6 +75,22 @@ const fixture = (source = `process.stdout.write(${JSON.stringify(JSON.stringify(
7275 } ;
7376 } ) ;
7477
78+ const refreshMuseUsage = Effect . fn ( "test.refreshMuseUsage" ) ( function * (
79+ input : Omit < Parameters < typeof refreshState > [ 0 ] , "state" > & {
80+ readonly account : MuseUsageAccount ;
81+ readonly latestUsage : MuseUsageReport | undefined ;
82+ } ,
83+ ) {
84+ return yield * refreshState ( {
85+ ...input ,
86+ state : {
87+ account : yield * Ref . make ( input . account ) ,
88+ latestUsage : yield * Ref . make ( input . latestUsage ) ,
89+ permit : yield * Semaphore . make ( 1 ) ,
90+ } ,
91+ } ) ;
92+ } ) ;
93+
7594it . layer ( NodeServices . layer ) ( "Muse CLI usage refresh" , ( it ) => {
7695 it . effect ( "fills limits on the first status refresh without a model turn" , ( ) =>
7796 Effect . scoped (
@@ -212,6 +231,8 @@ it.layer(NodeServices.layer)("Muse CLI usage refresh", (it) => {
212231 { ...provider , auth : { status : "unknown" } } ,
213232 { ...provider , enabled : false } ,
214233 { ...provider , status : "error" } ,
234+ { ...provider , version : "1.4.12-R6909.1" } ,
235+ { ...provider , version : null } ,
215236 ] ;
216237 for ( const candidate of cases ) {
217238 const refreshed = yield * refreshMuseUsage ( {
@@ -230,6 +251,105 @@ it.layer(NodeServices.layer)("Muse CLI usage refresh", (it) => {
230251 ) ,
231252 ) ;
232253
254+ it . effect (
255+ "publishes a notification while the CLI read is stalled and retains the newer report" ,
256+ ( ) =>
257+ Effect . scoped (
258+ Effect . gen ( function * ( ) {
259+ const input = yield * fixture ( ) ;
260+ const state = {
261+ account : yield * Ref . make < MuseUsageAccount > ( account ) ,
262+ latestUsage : yield * Ref . make < MuseUsageReport | undefined > ( report ) ,
263+ permit : yield * Semaphore . make ( 1 ) ,
264+ } ;
265+ const started = yield * Deferred . make < void > ( ) ;
266+ const release = yield * Deferred . make < void > ( ) ;
267+ const spawner = yield * ChildProcessSpawner . ChildProcessSpawner ;
268+ const pending = yield * refreshState ( {
269+ ...input ,
270+ provider :
{ ...
provider , auth :
{ ...
provider . auth , email :
"[email protected] " } } , 271+ state,
272+ } ) . pipe (
273+ Effect . provideService ( ChildProcessSpawner . ChildProcessSpawner , {
274+ ...spawner ,
275+ spawn : ( command ) =>
276+ Deferred . succeed ( started , undefined ) . pipe (
277+ Effect . andThen ( Deferred . await ( release ) ) ,
278+ Effect . andThen ( spawner . spawn ( command ) ) ,
279+ ) ,
280+ } ) ,
281+ Effect . forkChild ,
282+ ) ;
283+ yield * Deferred . await ( started ) ;
284+ expect ( yield * Ref . get ( state . account ) ) . toEqual ( {
285+ generation : 1 ,
286+ 287+ } ) ;
288+ const newer = {
289+ ...report ,
290+ generation : 1 ,
291+ usage : {
292+ ...report . usage ,
293+ observedAtMs : observedAtMs + 1 ,
294+ window : { ...report . usage . window , usedPercent : 10 } ,
295+ } ,
296+ } ;
297+ const published = yield * Deferred . make < void > ( ) ;
298+ yield * state . permit . withPermits ( 1 ) (
299+ Ref . set ( state . latestUsage , newer ) . pipe (
300+ Effect . andThen ( Deferred . succeed ( published , undefined ) ) ,
301+ ) ,
302+ ) ;
303+ yield * Deferred . await ( published ) ;
304+ expect ( yield * Ref . get ( state . latestUsage ) ) . toBe ( newer ) ;
305+ yield * Deferred . succeed ( release , undefined ) ;
306+ const refreshed = yield * Fiber . join ( pending ) ;
307+ expect ( refreshed . latestUsage ) . toBe ( newer ) ;
308+ expect ( refreshed . provider . usageLimits ?. windows [ 0 ] ?. usedPercent ) . toBe ( 10 ) ;
309+ } ) ,
310+ ) ,
311+ ) ;
312+
313+ it . effect ( "discards an in-flight read after the account generation changes" , ( ) =>
314+ Effect . scoped (
315+ Effect . gen ( function * ( ) {
316+ const input = yield * fixture ( ) ;
317+ const state = {
318+ account : yield * Ref . make < MuseUsageAccount > ( account ) ,
319+ latestUsage : yield * Ref . make < MuseUsageReport | undefined > ( report ) ,
320+ permit : yield * Semaphore . make ( 1 ) ,
321+ } ;
322+ const started = yield * Deferred . make < void > ( ) ;
323+ const release = yield * Deferred . make < void > ( ) ;
324+ const spawner = yield * ChildProcessSpawner . ChildProcessSpawner ;
325+ const pending = yield * refreshState ( { ...input , state } ) . pipe (
326+ Effect . provideService ( ChildProcessSpawner . ChildProcessSpawner , {
327+ ...spawner ,
328+ spawn : ( command ) =>
329+ Deferred . succeed ( started , undefined ) . pipe (
330+ Effect . andThen ( Deferred . await ( release ) ) ,
331+ Effect . andThen ( spawner . spawn ( command ) ) ,
332+ ) ,
333+ } ) ,
334+ Effect . forkChild ,
335+ ) ;
336+ yield * Deferred . await ( started ) ;
337+ const signedOut = { generation : 1 , identity : null } ;
338+ yield * state . permit . withPermits ( 1 ) (
339+ Ref . set ( state . account , signedOut ) . pipe (
340+ Effect . andThen ( Ref . set ( state . latestUsage , undefined ) ) ,
341+ ) ,
342+ ) ;
343+ yield * Deferred . succeed ( release , undefined ) ;
344+ const refreshed = yield * Fiber . join ( pending ) ;
345+ expect ( refreshed . account ) . toBe ( signedOut ) ;
346+ expect ( refreshed . latestUsage ) . toBeUndefined ( ) ;
347+ expect ( refreshed . provider . usageLimits ) . toBeUndefined ( ) ;
348+ expect ( yield * Ref . get ( state . account ) ) . toBe ( signedOut ) ;
349+ } ) ,
350+ ) ,
351+ ) ;
352+
233353 it . effect ( "bounds a stalled CLI read and keeps the last observation" , ( ) =>
234354 Effect . scoped (
235355 Effect . gen ( function * ( ) {
0 commit comments