@@ -16,7 +16,6 @@ import {
1616} from "@t3tools/contracts" ;
1717import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions" ;
1818import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions" ;
19- import type { AnyProviderDriver , ProviderInstance } from "@t3tools/provider-core/server/driver" ;
2019import * as HostProcess from "@t3tools/shared/HostProcess" ;
2120import * as DateTime from "effect/DateTime" ;
2221import * as Deferred from "effect/Deferred" ;
@@ -25,9 +24,6 @@ import * as Fiber from "effect/Fiber";
2524import * as FileSystem from "effect/FileSystem" ;
2625import * as Layer from "effect/Layer" ;
2726import * as Path from "effect/Path" ;
28- import * as Ref from "effect/Ref" ;
29- import * as Schema from "effect/Schema" ;
30- import * as Stream from "effect/Stream" ;
3127import * as TestClock from "effect/testing/TestClock" ;
3228import { HttpClient , HttpClientResponse } from "effect/http" ;
3329
@@ -198,6 +194,61 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
198194 Layer . provideMerge ( layerBase ) ,
199195 ) ;
200196
197+ it . effect . each ( [ "replacement" , "removal" ] as const ) (
198+ "hides retired instances during reconcile (%s)" ,
199+ ( scenario ) =>
200+ Effect . gen ( function * ( ) {
201+ let closed = 0 ;
202+ const replacementStarted = yield * Deferred . make < void > ( ) ;
203+ const releaseReplacement = yield * Deferred . make < void > ( ) ;
204+ const driver : typeof CodexDriver = {
205+ ...CodexDriver ,
206+ create : ( input ) =>
207+ Effect . gen ( function * ( ) {
208+ if ( input . displayName === "Second" ) {
209+ yield * Deferred . succeed ( replacementStarted , undefined ) ;
210+ yield * Deferred . await ( releaseReplacement ) ;
211+ }
212+ const instance = yield * CodexDriver . create ( input ) ;
213+ yield * Effect . addFinalizer ( ( ) => Effect . sync ( ( ) => closed ++ ) ) ;
214+ return instance ;
215+ } ) ,
216+ } ;
217+ const retiredId = ProviderInstanceId . make ( "retired" ) ;
218+ const siblingId = ProviderInstanceId . make ( "sibling" ) ;
219+ const nextId = scenario === "replacement" ? retiredId : ProviderInstanceId . make ( "new" ) ;
220+ const entry = {
221+ driver : CodexDriver . driverKind ,
222+ enabled : false ,
223+ config : makeCodexConfig ( { } ) ,
224+ } ;
225+ const { registry, mutator } = yield * makeProviderInstanceRegistry ( {
226+ drivers : [ driver ] ,
227+ configMap : { [ retiredId ] : entry , [ siblingId ] : entry } ,
228+ } ) ;
229+ const sibling = yield * registry . getInstance ( siblingId ) ;
230+ const reconcile = yield * mutator
231+ . reconcile ( {
232+ [ siblingId ] : entry ,
233+ [ nextId ] : {
234+ ...entry ,
235+ displayName : "Second" ,
236+ config : makeCodexConfig ( { customModels : [ "replacement-model" ] } ) ,
237+ } ,
238+ } )
239+ . pipe ( Effect . forkChild ( { startImmediately : true } ) ) ;
240+ yield * Deferred . await ( replacementStarted ) ;
241+ expect ( closed ) . toBe ( 1 ) ;
242+ expect ( yield * registry . getInstance ( retiredId ) ) . toBeUndefined ( ) ;
243+ expect ( yield * registry . listInstances ) . toEqual ( [ sibling ] ) ;
244+ yield * Deferred . succeed ( releaseReplacement , undefined ) ;
245+ yield * Fiber . join ( reconcile ) ;
246+ expect ( ( yield * registry . getInstance ( nextId ) ) ?. displayName ) . toBe ( "Second" ) ;
247+ expect ( yield * registry . getInstance ( siblingId ) ) . toBe ( sibling ) ;
248+ expect ( closed ) . toBe ( 1 ) ;
249+ } ) . pipe ( Effect . provide ( layerTest ) ) ,
250+ ) ;
251+
201252 it . live ( "treats an explicit in-config enabled:false as disabling despite the envelope" , ( ) =>
202253 Effect . gen ( function * ( ) {
203254 const staleId = ProviderInstanceId . make ( "codex_stale" ) ;
@@ -649,84 +700,3 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
649700 } ) . pipe ( Effect . provide ( layerTest ) ) ,
650701 ) ;
651702} ) ;
652-
653- describe ( "ProviderInstanceRegistry — reconcile" , ( ) => {
654- const reconcileDriverKind = ProviderDriverKind . make ( "reconcileTest" ) ;
655- const reconcileInstanceId = ProviderInstanceId . make ( "reconcile_test" ) ;
656-
657- const makeReconcileInstance = ( displayName : string | undefined ) : ProviderInstance => ( {
658- instanceId : reconcileInstanceId ,
659- driverKind : reconcileDriverKind ,
660- continuationIdentity : {
661- driverKind : reconcileDriverKind ,
662- continuationKey : `reconcileTest:${ displayName } ` ,
663- } ,
664- displayName,
665- enabled : true ,
666- // Real effects, so the registry can wrap the snapshot when it builds an entry.
667- snapshot : {
668- getSnapshot : Effect . never ,
669- refresh : Effect . never ,
670- streamChanges : Stream . empty ,
671- } as Partial < ProviderInstance [ "snapshot" ] > as ProviderInstance [ "snapshot" ] ,
672- orchestrationAdapter : { } as ProviderInstance [ "orchestrationAdapter" ] ,
673- textGeneration : { } as ProviderInstance [ "textGeneration" ] ,
674- } ) ;
675-
676- // Change runtime config, not only the display name, so the edit always
677- // replaces the instance rather than counting as cosmetic.
678- const configWithName = ( displayName : string ) : ProviderInstanceConfigMap => ( {
679- [ reconcileInstanceId ] : {
680- driver : reconcileDriverKind ,
681- displayName,
682- config : { revision : displayName } ,
683- } ,
684- } ) ;
685-
686- it . effect ( "stops returning a replaced instance before closing its scope" , ( ) =>
687- Effect . scoped (
688- Effect . gen ( function * ( ) {
689- const closedNames = yield * Ref . make < ReadonlyArray < string | undefined > > ( [ ] ) ;
690- const replacementStarted = yield * Deferred . make < void > ( ) ;
691- const releaseReplacement = yield * Deferred . make < void > ( ) ;
692-
693- const driver : AnyProviderDriver = {
694- driverKind : reconcileDriverKind ,
695- metadata : { displayName : "Reconcile test" } ,
696- configSchema : Schema . Struct ( { revision : Schema . String } ) ,
697- defaultConfig : ( ) => ( { revision : "" } ) ,
698- create : ( { displayName } ) =>
699- Effect . gen ( function * ( ) {
700- yield * Effect . addFinalizer ( ( ) =>
701- Ref . update ( closedNames , ( names ) => [ ...names , displayName ] ) ,
702- ) ;
703- if ( displayName === "Second" ) {
704- yield * Deferred . succeed ( replacementStarted , undefined ) ;
705- yield * Deferred . await ( releaseReplacement ) ;
706- }
707- return makeReconcileInstance ( displayName ) ;
708- } ) ,
709- } ;
710-
711- const { registry, mutator } = yield * makeProviderInstanceRegistry ( {
712- drivers : [ driver ] ,
713- configMap : configWithName ( "First" ) ,
714- } ) ;
715- expect ( ( yield * registry . getInstance ( reconcileInstanceId ) ) ?. displayName ) . toBe ( "First" ) ;
716-
717- const reconcileFiber = yield * mutator
718- . reconcile ( configWithName ( "Second" ) )
719- . pipe ( Effect . forkChild ( { startImmediately : true } ) ) ;
720- yield * Deferred . await ( replacementStarted ) ;
721-
722- expect ( yield * Ref . get ( closedNames ) ) . toEqual ( [ "First" ] ) ;
723- expect ( yield * registry . getInstance ( reconcileInstanceId ) ) . toBeUndefined ( ) ;
724- expect ( yield * registry . listInstances ) . toEqual ( [ ] ) ;
725-
726- yield * Deferred . succeed ( releaseReplacement , undefined ) ;
727- yield * Fiber . join ( reconcileFiber ) ;
728- expect ( ( yield * registry . getInstance ( reconcileInstanceId ) ) ?. displayName ) . toBe ( "Second" ) ;
729- } ) ,
730- ) ,
731- ) ;
732- } ) ;
0 commit comments