@@ -29,6 +29,8 @@ import {
2929 OrchestratorThreadAboveModeLimitError ,
3030} from "../orchestration-v2/Orchestrator.ts" ;
3131import * as ProviderAdapterRegistry from "../orchestration-v2/ProviderAdapterRegistry.ts" ;
32+ import * as ThreadLaunchService from "../orchestration-v2/ThreadLaunchService.ts" ;
33+ import * as GitVcsDriver from "../vcs/GitVcsDriver.ts" ;
3234import * as ThreadManagementService from "../orchestration-v2/ThreadManagementService.ts" ;
3335import * as ProviderRegistry from "../provider/ProviderRegistry.ts" ;
3436import { buildUnavailableProviderSnapshot } from "../provider/unavailableProviderSnapshot.ts" ;
@@ -41,6 +43,11 @@ import { idleThreadProjection, liveThreadShell } from "./McpToolAccess.testkit.t
4143import * as OrchestratorMcpService from "./OrchestratorMcpService.ts" ;
4244import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter" ;
4345
46+ const layerOrchestratorService = OrchestratorMcpService . layer . pipe (
47+ Layer . provide ( Layer . mock ( ThreadLaunchService . ThreadLaunchService ) ( { } ) ) ,
48+ Layer . provide ( Layer . mock ( GitVcsDriver . GitVcsDriver ) ( { } ) ) ,
49+ ) ;
50+
4451describe ( "OrchestratorMcpService" , ( ) => {
4552 it . effect ( "retries terminal acknowledgement with a fresh command id" , ( ) =>
4653 Effect . gen ( function * ( ) {
@@ -170,7 +177,7 @@ describe("OrchestratorMcpService", () => {
170177 const commandIds = yield * Ref . get ( acknowledgementCommandIds ) ;
171178 assert . equal ( commandIds . length , 2 ) ;
172179 assert . notEqual ( commandIds [ 0 ] , commandIds [ 1 ] ) ;
173- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
180+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
174181 } ) ,
175182 ) ;
176183
@@ -267,7 +274,7 @@ describe("OrchestratorMcpService", () => {
267274 const settled = yield * service . taskStatus ( scope , taskId ) ;
268275 assert . equal ( settled . status , "cancelled" ) ;
269276 assert . equal ( yield * Ref . get ( dispatched ) , 1 ) ;
270- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
277+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
271278 } ) ,
272279 ) ;
273280
@@ -343,7 +350,7 @@ describe("OrchestratorMcpService", () => {
343350 . pipe ( Effect . flip ) ;
344351 assert . equal ( error . code , "task_not_cancellable" ) ;
345352 assert . deepEqual ( yield * Ref . get ( dispatched ) , [ ] ) ;
346- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
353+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
347354 } ) ,
348355 ) ;
349356
@@ -423,7 +430,7 @@ describe("OrchestratorMcpService", () => {
423430 ( yield * Ref . get ( dispatched ) ) . map ( ( command ) => ( command as { type : string } ) . type ) ,
424431 [ "thread.stop" ] ,
425432 ) ;
426- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
433+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
427434 } ) ,
428435 ) ;
429436
@@ -509,7 +516,7 @@ describe("OrchestratorMcpService", () => {
509516 ( yield * Ref . get ( dispatched ) ) . map ( ( command ) => ( command as { type : string } ) . type ) ,
510517 [ "thread.stop" , "delegated_task.completion-delivery.dispose" ] ,
511518 ) ;
512- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
519+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
513520 } ) ,
514521 ) ;
515522
@@ -592,7 +599,7 @@ describe("OrchestratorMcpService", () => {
592599 . pipe ( Effect . flip ) ;
593600 assert . equal ( error . code , "runtime_mode_escalation_denied" ) ;
594601 assert . deepEqual ( yield * Ref . get ( dispatched ) , [ ] ) ;
595- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
602+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
596603 } ) ,
597604 ) ;
598605
@@ -736,7 +743,7 @@ describe("OrchestratorMcpService", () => {
736743 dispatched : yield * Ref . get ( dispatched ) ,
737744 stoppedBelow : yield * Ref . get ( stoppedBelow ) ,
738745 } ;
739- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
746+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
740747 } ) ;
741748
742749 it . effect ( "refuses to cancel a task when a task under it now runs above the parent's modes" , ( ) =>
@@ -1019,9 +1026,7 @@ describe("OrchestratorMcpService provider resolution", () => {
10191026 assert . isTrue (
10201027 fork ! . constraints . includes ( "Driver 'forkOnly' is not registered in this build." ) ,
10211028 ) ;
1022- } ) . pipe (
1023- Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ,
1024- ) ;
1029+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
10251030 } ) ,
10261031 ) ;
10271032
@@ -1066,7 +1071,7 @@ describe("OrchestratorMcpService provider resolution", () => {
10661071 capabilities . providers [ 0 ] ?. models . map ( ( model ) => model . id ) ,
10671072 [ "gpt-5.4" , "my-model" ] ,
10681073 ) ;
1069- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
1074+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
10701075 } ) ,
10711076 ) ;
10721077
@@ -1166,9 +1171,7 @@ describe("OrchestratorMcpService provider resolution", () => {
11661171 assert . equal ( request . type , "delegated_task.request" ) ;
11671172 assert . equal ( request . modelSelection . instanceId , antigravityInstanceId ) ;
11681173 assert . equal ( request . modelSelection . model , "ant-model" ) ;
1169- } ) . pipe (
1170- Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ,
1171- ) ;
1174+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
11721175 } ) ,
11731176 ) ;
11741177
@@ -1264,7 +1267,7 @@ describe("OrchestratorMcpService provider resolution", () => {
12641267 } ;
12651268 assert . equal ( request . modelSelection . instanceId , antigravityInstanceId ) ;
12661269 assert . equal ( request . modelSelection . model , "ant-model" ) ;
1267- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
1270+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
12681271 } ) ,
12691272 ) ;
12701273
@@ -1323,7 +1326,7 @@ describe("OrchestratorMcpService provider resolution", () => {
13231326 assert . isTrue (
13241327 byDriver . message . includes ( "No V2 provider adapter is registered for driver forkOnly." ) ,
13251328 ) ;
1326- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
1329+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
13271330 } ) ,
13281331 ) ;
13291332
@@ -1369,7 +1372,7 @@ describe("OrchestratorMcpService provider resolution", () => {
13691372 } )
13701373 . pipe ( Effect . flip ) ;
13711374 assert . equal ( error . code , "invalid_request" ) ;
1372- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
1375+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
13731376 } ) ,
13741377 ) ;
13751378
@@ -1474,7 +1477,7 @@ describe("OrchestratorMcpService provider resolution", () => {
14741477 modelSelection : { instanceId : string ; model : string } ;
14751478 } ;
14761479 assert . equal ( request . modelSelection . instanceId , altInstanceId ) ;
1477- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
1480+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
14781481 } ) ,
14791482 ) ;
14801483
@@ -1599,9 +1602,7 @@ describe("OrchestratorMcpService provider resolution", () => {
15991602 modelSelection : { instanceId : string ; model : string } ;
16001603 } ;
16011604 assert . equal ( retryCommand . modelSelection . instanceId , codexInstanceId ) ;
1602- } ) . pipe (
1603- Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ,
1604- ) ;
1605+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
16051606 } ) ,
16061607 ) ;
16071608
@@ -1706,7 +1707,7 @@ describe("OrchestratorMcpService provider resolution", () => {
17061707 assert . equal ( result . providerInstanceId , claudeInstanceId ) ;
17071708 assert . equal ( yield * Ref . get ( probes ) , 2 ) ;
17081709 assert . equal ( yield * Ref . get ( dispatched ) , 1 ) ;
1709- } ) . pipe ( Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
1710+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
17101711 } ) ,
17111712 ) ;
17121713
@@ -1917,9 +1918,7 @@ describe("OrchestratorMcpService provider resolution", () => {
19171918 } else {
19181919 assert . equal ( request . modelSelection . model , "codex-alt-model" , testCase . name ) ;
19191920 }
1920- } ) . pipe (
1921- Effect . provide ( OrchestratorMcpService . layer . pipe ( Layer . provide ( layerDependencies ) ) ) ,
1922- ) ;
1921+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
19231922 }
19241923 } ) ,
19251924 ) ;
@@ -1972,7 +1971,7 @@ describe("OrchestratorMcpService provider resolution", () => {
19721971 boundThread : OrchestrationV2ThreadShell | null ,
19731972 upserted : Ref . Ref < number > ,
19741973 ) =>
1975- OrchestratorMcpService . layer . pipe (
1974+ layerOrchestratorService . pipe (
19761975 Layer . provide (
19771976 Layer . mergeAll (
19781977 NodeServices . layer ,
@@ -2040,7 +2039,7 @@ describe("OrchestratorMcpService provider resolution", () => {
20402039 ) ,
20412040 ) ,
20422041 Effect . provide (
2043- OrchestratorMcpService . layer . pipe (
2042+ layerOrchestratorService . pipe (
20442043 Layer . provide (
20452044 Layer . mergeAll (
20462045 NodeServices . layer ,
@@ -2123,7 +2122,7 @@ describe("OrchestratorMcpService provider resolution", () => {
21232122 // The edit's own check reads the thread; the read after the save fails.
21242123 const mcp = yield * OrchestratorMcpService . OrchestratorMcpService . pipe (
21252124 Effect . provide (
2126- OrchestratorMcpService . layer . pipe (
2125+ layerOrchestratorService . pipe (
21272126 Layer . provide (
21282127 Layer . mergeAll (
21292128 NodeServices . layer ,
0 commit comments