@@ -12,6 +12,7 @@ import {
1212 OrchestratorMcpEnvironmentTarget ,
1313 OrchestratorMcpFailure ,
1414 PreviewTabId ,
15+ ProjectId ,
1516 ProviderInstanceId ,
1617 ProviderInteractionMode ,
1718 RuntimeMode ,
@@ -1510,96 +1511,122 @@ it.effect("hides tools for links and refuses another environment while the beta
15101511 ) . pipe ( Effect . provide ( NodeHttpServer . layerTest ) ) ,
15111512) ;
15121513
1513- it . effect ( "lists pull request watch tools only to threads that are not delegated children" , ( ) =>
1514- Effect . scoped (
1515- Effect . gen ( function * ( ) {
1516- const scopeFor = (
1517- token : string ,
1518- subagent : boolean ,
1519- ) : McpInvocationContext . McpThreadInvocationScope => ( {
1520- environmentId,
1521- requestNamespace : token ,
1522- thread : {
1523- threadId : ThreadId . make ( `thread-${ token } ` ) ,
1524- providerSessionId : token ,
1525- providerInstanceId : ProviderInstanceId . make ( "codex" ) ,
1526- subagent,
1527- } ,
1528- client : undefined ,
1529- capabilities : new Set ( [ "pull-requests" ] ) ,
1530- issuedAt : 1 ,
1531- } ) ;
1532- const scopes = new Map ( [
1533- [ "parentToken" , scopeFor ( "parentToken" , false ) ] ,
1534- [ "childToken" , scopeFor ( "childToken" , true ) ] ,
1535- ] ) ;
1536- const serverLayer = McpHttpServer . layerMcpTransport (
1537- McpHttpServer . layerPullRequestsToolkit ,
1538- ) . pipe (
1539- Layer . provide ( ServerSettings . layerTest ( ) ) ,
1540- Layer . provide (
1541- Layer . mock ( McpSessionRegistry . McpSessionRegistry ) ( {
1542- resolve : ( token ) => Effect . succeed ( scopes . get ( token ) ) ,
1543- } ) ,
1544- ) ,
1545- Layer . provide (
1546- Layer . mergeAll (
1547- McpToolAccessTestkit . liveThreadsLayer ,
1548- Layer . mock ( ProjectService . ProjectService ) ( { } ) ,
1549- Layer . mock ( PullRequestReviewGuideService . PullRequestReviewGuideService ) ( { } ) ,
1550- Layer . mock ( PullRequestService . PullRequestService ) ( { } ) ,
1551- Layer . mock ( GitManager . GitManager ) ( { } ) ,
1552- Layer . mock ( Orchestrator . OrchestratorV2 ) ( { } ) ,
1553- Layer . mock ( ProjectionStore . ProjectionStoreV2 ) ( { } ) ,
1554- NodeServices . layer ,
1555- NodeCrypto . layer ,
1514+ it . effect (
1515+ "lists watch tools only to threads that are not delegated children, and forge tools only where the project has a forge" ,
1516+ ( ) =>
1517+ Effect . scoped (
1518+ Effect . gen ( function * ( ) {
1519+ const scopeFor = (
1520+ token : string ,
1521+ subagent : boolean ,
1522+ ) : McpInvocationContext . McpThreadInvocationScope => ( {
1523+ environmentId,
1524+ requestNamespace : token ,
1525+ thread : {
1526+ threadId : ThreadId . make ( `thread-${ token } ` ) ,
1527+ providerSessionId : token ,
1528+ providerInstanceId : ProviderInstanceId . make ( "codex" ) ,
1529+ subagent,
1530+ } ,
1531+ client : undefined ,
1532+ capabilities : new Set ( [ "pull-requests" ] ) ,
1533+ issuedAt : 1 ,
1534+ } ) ;
1535+ const scopes = new Map ( [
1536+ [ "parentToken" , scopeFor ( "parentToken" , false ) ] ,
1537+ [ "childToken" , scopeFor ( "childToken" , true ) ] ,
1538+ [ "noForgeToken" , scopeFor ( "noForgeToken" , false ) ] ,
1539+ ] ) ;
1540+ const serverLayer = McpHttpServer . layerMcpTransport (
1541+ McpHttpServer . layerPullRequestsToolkit ,
1542+ ) . pipe (
1543+ Layer . provide ( ServerSettings . layerTest ( ) ) ,
1544+ Layer . provide (
1545+ Layer . mock ( McpSessionRegistry . McpSessionRegistry ) ( {
1546+ resolve : ( token ) => Effect . succeed ( scopes . get ( token ) ) ,
1547+ } ) ,
15561548 ) ,
1557- ) ,
1558- ) ;
1559- yield * HttpRouter . serve ( serverLayer , { disableListenLog : true , disableLogger : true } ) . pipe (
1560- Layer . build ,
1561- ) ;
1562- const httpClient = yield * HttpClient . HttpClient ;
1563- const listedTools = ( token : string ) =>
1564- Effect . gen ( function * ( ) {
1565- const headers = {
1566- accept : "application/json, text/event-stream" ,
1567- authorization : `Bearer ${ token } ` ,
1568- } ;
1569- const initialize = yield * httpClient . post ( "/mcp" , {
1570- headers,
1571- body : HttpBody . text (
1572- `{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-06-18","capabilities":{},"clientInfo":{"name":"probe","version":"1.0.0"}}}` ,
1573- "application/json" ,
1574- ) ,
1575- } ) ;
1576- const listed = yield * httpClient . post ( "/mcp" , {
1577- headers : {
1578- ...headers ,
1579- "mcp-session-id" : initialize . headers [ "mcp-session-id" ] ! ,
1580- "mcp-protocol-version" : "2025-06-18" ,
1581- } ,
1582- body : HttpBody . text (
1583- `{"jsonrpc":"2.0","id":2,"method":"tools/list","params":{}}` ,
1584- "application/json" ,
1549+ Layer . provide (
1550+ Layer . mergeAll (
1551+ McpToolAccessTestkit . liveThreadsLayer ,
1552+ Layer . mock ( ProjectService . ProjectService ) ( { } ) ,
1553+ Layer . mock ( PullRequestReviewGuideService . PullRequestReviewGuideService ) ( { } ) ,
1554+ Layer . mock ( PullRequestService . PullRequestService ) ( {
1555+ servesProject : ( projectId ) => Effect . succeed ( projectId !== "project-noForgeToken" ) ,
1556+ } ) ,
1557+ Layer . mock ( GitManager . GitManager ) ( { } ) ,
1558+ Layer . mock ( Orchestrator . OrchestratorV2 ) ( { } ) ,
1559+ Layer . mock ( ProjectionStore . ProjectionStoreV2 ) ( {
1560+ getThreadShell : ( threadId ) =>
1561+ Effect . succeed ( {
1562+ projectId : ProjectId . make ( threadId . replace ( "thread-" , "project-" ) ) ,
1563+ } as never ) ,
1564+ } ) ,
1565+ NodeServices . layer ,
1566+ NodeCrypto . layer ,
15851567 ) ,
1568+ ) ,
1569+ ) ;
1570+ yield * HttpRouter . serve ( serverLayer , { disableListenLog : true , disableLogger : true } ) . pipe (
1571+ Layer . build ,
1572+ ) ;
1573+ const httpClient = yield * HttpClient . HttpClient ;
1574+ const listedTools = ( token : string ) =>
1575+ Effect . gen ( function * ( ) {
1576+ const headers = {
1577+ accept : "application/json, text/event-stream" ,
1578+ authorization : `Bearer ${ token } ` ,
1579+ } ;
1580+ const initialize = yield * httpClient . post ( "/mcp" , {
1581+ headers,
1582+ body : HttpBody . text (
1583+ `{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-06-18","capabilities":{},"clientInfo":{"name":"probe","version":"1.0.0"}}}` ,
1584+ "application/json" ,
1585+ ) ,
1586+ } ) ;
1587+ const listed = yield * httpClient . post ( "/mcp" , {
1588+ headers : {
1589+ ...headers ,
1590+ "mcp-session-id" : initialize . headers [ "mcp-session-id" ] ! ,
1591+ "mcp-protocol-version" : "2025-06-18" ,
1592+ } ,
1593+ body : HttpBody . text (
1594+ `{"jsonrpc":"2.0","id":2,"method":"tools/list","params":{}}` ,
1595+ "application/json" ,
1596+ ) ,
1597+ } ) ;
1598+ const body = ( yield * listed . json ) as {
1599+ readonly result : { readonly tools : ReadonlyArray < { readonly name : string } > } ;
1600+ } ;
1601+ return body . result . tools . map ( ( tool ) => tool . name ) ;
15861602 } ) ;
1587- const body = ( yield * listed . json ) as {
1588- readonly result : { readonly tools : ReadonlyArray < { readonly name : string } > } ;
1589- } ;
1590- return body . result . tools . map ( ( tool ) => tool . name ) ;
1591- } ) ;
15921603
1593- const parentTools = yield * listedTools ( "parentToken" ) ;
1594- const childTools = yield * listedTools ( "childToken" ) ;
1595- expect ( parentTools ) . toEqual (
1596- expect . arrayContaining ( [ "link_pull_request" , "watch_pull_request" , "unwatch_pull_request" ] ) ,
1597- ) ;
1598- expect ( childTools ) . toContain ( "link_pull_request" ) ;
1599- expect ( childTools ) . not . toContain ( "watch_pull_request" ) ;
1600- expect ( childTools ) . not . toContain ( "unwatch_pull_request" ) ;
1601- } ) ,
1602- ) . pipe ( Effect . provide ( NodeHttpServer . layerTest ) ) ,
1604+ const parentTools = yield * listedTools ( "parentToken" ) ;
1605+ const childTools = yield * listedTools ( "childToken" ) ;
1606+ expect ( parentTools ) . toEqual (
1607+ expect . arrayContaining ( [
1608+ "link_pull_request" ,
1609+ "watch_pull_request" ,
1610+ "unwatch_pull_request" ,
1611+ ] ) ,
1612+ ) ;
1613+ expect ( childTools ) . toContain ( "link_pull_request" ) ;
1614+ expect ( childTools ) . not . toContain ( "watch_pull_request" ) ;
1615+ expect ( childTools ) . not . toContain ( "unwatch_pull_request" ) ;
1616+ expect ( parentTools ) . toEqual (
1617+ expect . arrayContaining ( [
1618+ "pull_request_read" ,
1619+ "pull_request_review" ,
1620+ "pull_request_merge" ,
1621+ ] ) ,
1622+ ) ;
1623+ const noForgeTools = yield * listedTools ( "noForgeToken" ) ;
1624+ expect ( noForgeTools ) . toEqual (
1625+ expect . arrayContaining ( [ "link_pull_request" , "watch_pull_request" ] ) ,
1626+ ) ;
1627+ expect ( noForgeTools . filter ( ( name ) => name . startsWith ( "pull_request_" ) ) ) . toEqual ( [ ] ) ;
1628+ } ) ,
1629+ ) . pipe ( Effect . provide ( NodeHttpServer . layerTest ) ) ,
16031630) ;
16041631
16051632it . effect (
0 commit comments