@@ -1605,6 +1605,97 @@ describe("OrchestratorMcpService provider resolution", () => {
16051605 } ) ,
16061606 ) ;
16071607
1608+ it . effect (
1609+ "retrying an accepted thread creation replays even after the project disables every candidate" ,
1610+ ( ) =>
1611+ Effect . gen ( function * ( ) {
1612+ const altInstanceId = ProviderInstanceId . make ( "codex-alt" ) ;
1613+ const dispatched = yield * Ref . make < ReadonlyArray < unknown > > ( [ ] ) ;
1614+ const accepted = yield * Ref . make ( false ) ;
1615+ const everyCandidateDisabled = yield * Ref . make ( false ) ;
1616+ const layerDependencies = Layer . mergeAll (
1617+ NodeServices . layer ,
1618+ Layer . mock ( ThreadManagementService . ThreadManagementService ) ( {
1619+ getThreadRecords : ( threadId ) =>
1620+ Effect . succeed ( threadId === parentThreadId ? parentProjection ( [ ] ) : childProjection ) ,
1621+ // A command id already accepted once, even if the project later
1622+ // disables every candidate: its retry must replay, not re-resolve.
1623+ hasReceipt : ( ) => Ref . get ( accepted ) ,
1624+ // Effective settings once the project turns every instance off,
1625+ // ignoring the already-accepted command's replay exemption.
1626+ isProviderInstanceEnabledForProject : ( ) =>
1627+ Ref . get ( everyCandidateDisabled ) . pipe ( Effect . map ( ( disabled ) => ! disabled ) ) ,
1628+ assertProviderInstanceEnabled : ( { projectId, instanceId } ) =>
1629+ Effect . all ( [ Ref . get ( accepted ) , Ref . get ( everyCandidateDisabled ) ] ) . pipe (
1630+ Effect . flatMap ( ( [ isAccepted , disabled ] ) =>
1631+ isAccepted || ! disabled
1632+ ? Effect . void
1633+ : Effect . fail (
1634+ new ThreadManagementService . ThreadManagementProviderInstanceDisabledError ( {
1635+ projectId,
1636+ instanceId,
1637+ } ) ,
1638+ ) ,
1639+ ) ,
1640+ ) ,
1641+ dispatch : ( command ) =>
1642+ Ref . update ( dispatched , ( commands ) => [ ...commands , command ] ) . pipe (
1643+ Effect . andThen (
1644+ command . type === "thread.create" ? Ref . set ( accepted , true ) : Effect . void ,
1645+ ) ,
1646+ Effect . as ( { sequence : 1 , storedEvents : [ ] } as never ) ,
1647+ ) ,
1648+ } ) ,
1649+ providerRegistryLayer ( [
1650+ providerSnapshot ( {
1651+ instanceId : codexInstanceId ,
1652+ driver : ProviderDriverKind . make ( "codex" ) ,
1653+ model : "gpt-5.4" ,
1654+ } ) ,
1655+ providerSnapshot ( {
1656+ instanceId : altInstanceId ,
1657+ driver : ProviderDriverKind . make ( "codex" ) ,
1658+ model : "gpt-5.4" ,
1659+ } ) ,
1660+ ] ) ,
1661+ adapterRegistryLayer ( [ codexInstanceId , altInstanceId ] ) ,
1662+ Layer . mock ( ProjectService . ProjectService ) ( { } ) ,
1663+ Layer . mock ( SecretRequests . SecretRequests ) ( { } ) ,
1664+ Layer . mock ( ScheduledTaskService . ScheduledTaskService ) ( { } ) ,
1665+ ServerSettings . layerTest ( ) ,
1666+ ) ;
1667+
1668+ yield * Effect . gen ( function * ( ) {
1669+ const service = yield * OrchestratorMcpService . OrchestratorMcpService ;
1670+ const first = yield * service . createThreads ( scope , {
1671+ threads : [ { target : { driverKind : ProviderDriverKind . make ( "codex" ) } } ] ,
1672+ clientRequestId : "create-thread-retry-after-disable-1" ,
1673+ } ) ;
1674+ assert . equal ( first . threads . length , 1 ) ;
1675+
1676+ // The project turns off every instance of this driver only after
1677+ // the thread creation above was already accepted.
1678+ yield * Ref . set ( everyCandidateDisabled , true ) ;
1679+
1680+ const retry = yield * service . createThreads ( scope , {
1681+ threads : [ { target : { driverKind : ProviderDriverKind . make ( "codex" ) } } ] ,
1682+ clientRequestId : "create-thread-retry-after-disable-1" ,
1683+ } ) ;
1684+ assert . equal ( retry . threads . length , 1 ) ;
1685+
1686+ const commands = yield * Ref . get ( dispatched ) ;
1687+ const createCommands = commands . filter (
1688+ ( command ) : command is { type : string ; modelSelection : { instanceId : string } } =>
1689+ ( command as { type : string } ) . type === "thread.create" ,
1690+ ) ;
1691+ assert . equal ( createCommands . length , 2 ) ;
1692+ assert . equal ( createCommands [ 1 ] ?. modelSelection . instanceId , codexInstanceId ) ;
1693+ } ) . pipe (
1694+ Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ,
1695+ ) ;
1696+ } ) ,
1697+ ) ;
1698+
16081699 it . effect ( "re-probes an unavailable target once before refusing it" , ( ) =>
16091700 Effect . gen ( function * ( ) {
16101701 const claudeInstanceId = ProviderInstanceId . make ( "claudeAgent" ) ;
0 commit comments