88 RuntimeMode ,
99 ThreadId ,
1010} from "@t3tools/contracts" ;
11- import * as Cause from "effect/Cause" ;
1211import * as Effect from "effect/Effect" ;
13- import * as Exit from "effect/Exit" ;
1412import * as Layer from "effect/Layer" ;
1513import * as Schema from "effect/Schema" ;
1614import { McpSchema , McpServer , Tool , Toolkit } from "effect/ai" ;
@@ -350,38 +348,22 @@ it.effect("refuses a change when the calling thread cannot be read", () =>
350348 ) ,
351349) ;
352350
353- const box = EnvironmentId . make ( "environment-box" ) ;
354- const here = EnvironmentId . make ( "environment" ) ;
355- const linkedProbe = {
356- ...probe ,
357- parameters : Schema . Struct ( {
358- environmentId : OrchestratorMcpEnvironmentTarget ,
359- threadId : Schema . optional ( ThreadId ) ,
360- runtimeMode : Schema . optional ( RuntimeMode ) ,
361- interactionMode : Schema . optional ( ProviderInteractionMode ) ,
362- } ) ,
363- } ;
364351const LinkedProbeToolkit = Toolkit . make (
365- Tool . make ( "reads" , linkedProbe ) ,
366- Tool . make ( "writes" , linkedProbe ) ,
367- Tool . make ( "writes_with_capability" , linkedProbe ) ,
368- Tool . make ( "writes_threads" , linkedProbe ) ,
369- Tool . make ( "starts_threads" , linkedProbe ) ,
370- Tool . make ( "writes_environment" , linkedProbe ) ,
352+ Tool . make ( "writes_threads" , {
353+ ...probe ,
354+ parameters : Schema . Struct ( {
355+ environmentId : OrchestratorMcpEnvironmentTarget ,
356+ threadId : Schema . optional ( ThreadId ) ,
357+ } ) ,
358+ } ) ,
371359) ;
372- /** Runs here, and tells whether `environmentId` reached the handler. */
373- const ranHere = < P extends object > ( params : P ) =>
374- Effect . succeed ( { ran : "environmentId" in params ? "saw environmentId" : "here" } ) ;
375-
376360const linkedProbeServer = McpHttpServer . toolkitRegistration (
377361 LinkedProbeToolkit ,
378362 McpToolAccess . toLayer ( LinkedProbeToolkit , {
379- reads : McpToolAccess . reads ( ranHere ) ,
380- writes : McpToolAccess . writes ( ranHere ) ,
381- writes_with_capability : McpToolAccess . writesWithCapability ( ranHere ) ,
382- writes_threads : McpToolAccess . writesThreads ( ( input ) => [ input . threadId ] , ranHere ) ,
383- starts_threads : McpToolAccess . startsThreads ( ( input ) => input , ranHere ) ,
384- writes_environment : McpToolAccess . writesEnvironment ( ranHere ) ,
363+ writes_threads : McpToolAccess . writesThreads (
364+ ( input ) => [ input . threadId ] ,
365+ ( params ) => Effect . succeed ( { ran : "environmentId" in params ? "leaked target" : "here" } ) ,
366+ ) ,
385367 } ) ,
386368) . pipe (
387369 Layer . provideMerge ( McpServer . McpServer . layer ) ,
@@ -390,71 +372,32 @@ const linkedProbeServer = McpHttpServer.toolkitRegistration(
390372 getThreadShell : ( threadId ) => Effect . succeed ( shells . get ( threadId ) ?? null ) ,
391373 } ) ,
392374 ) ,
393- // Stands in for the linked environment, answering with where the call went.
394375 Layer . provide (
395376 Layer . mock ( PeerForwarding . PeerForwarding ) ( {
396- call : ( _scope , tool , environmentId ) =>
397- Effect . succeed ( { ran : `${ tool . name } in ${ environmentId } ` } as never ) ,
377+ call : ( ) => Effect . succeed ( { ran : "there" } as never ) ,
398378 } ) ,
399379 ) ,
400380) ;
401381
402- it . effect . each ( [
403- [ "reads" , supervised , { environmentId : box } , "reads in environment-box" ] ,
404- [ "reads" , supervised , { environmentId : here } , "here" ] ,
405- [ "reads" , supervised , { } , "here" ] ,
406-
407- // The caller is checked here before anything goes.
408- [ "writes" , readOnlyClient , { environmentId : box } , "capability_denied" ] ,
409- [ "writes" , ended , { environmentId : box } , "parent_not_active" ] ,
410- [ "writes" , supervised , { environmentId : box } , "writes in environment-box" ] ,
411- [ "writes_with_capability" , readOnlyClient , { environmentId : box } , "capability_denied" ] ,
412- [
413- "starts_threads" ,
414- plan ,
415- { environmentId : box , interactionMode : "default" } ,
416- "interaction_mode_escalation_denied" ,
417- ] ,
418- [ "starts_threads" , plan , { environmentId : box } , "starts_threads in environment-box" ] ,
419- [ "writes_environment" , supervised , { environmentId : box } , "capability_denied" ] ,
420- [
421- "writes_environment" ,
422- fullAccess ,
423- { environmentId : box } ,
424- "writes_environment in environment-box" ,
425- ] ,
426- [ "writes_environment" , fullAccess , { environmentId : here } , "here" ] ,
427-
428- // A thread id names a thread where the call runs, and is checked there.
429- [
430- "writes_threads" ,
431- supervised ,
432- { environmentId : box , threadId : fullAccessThreadId } ,
433- "writes_threads in environment-box" ,
434- ] ,
435- [
436- "writes_threads" ,
437- supervised ,
438- { environmentId : here , threadId : fullAccessThreadId } ,
439- "runtime_mode_escalation_denied" ,
440- ] ,
441- ] as const ) ( "a linked %s from %o with %o: %s" , ( [ tool , scope , args , expected ] ) =>
442- call ( tool , scope , args ) . pipe (
443- Effect . map ( ( outcome ) => expect ( outcome ) . toBe ( expected ) ) ,
444- Effect . provide ( linkedProbeServer ) ,
445- ) ,
446- ) ;
382+ it . effect (
383+ "checks the caller here and the target where it lives, even when thread IDs collide" ,
384+ ( ) =>
385+ Effect . gen ( function * ( ) {
386+ const there = {
387+ environmentId : EnvironmentId . make ( "environment-box" ) ,
388+ threadId : fullAccessThreadId ,
389+ } ;
390+ expect ( yield * call ( "writes_threads" , supervised , there ) ) . toBe ( "there" ) ;
391+ expect ( yield * call ( "writes_threads" , readOnlyClient , there ) ) . toBe ( "capability_denied" ) ;
392+ expect ( yield * call ( "writes_threads" , ended , there ) ) . toBe ( "parent_not_active" ) ;
447393
448- it . effect ( "refuses a linked environment to a tool that acts as its calling thread" , ( ) =>
449- Effect . gen ( function * ( ) {
450- const CallerToolkit = Toolkit . make ( Tool . make ( "acts_as_caller" , linkedProbe ) ) ;
451- const built = yield * Layer . build (
452- McpToolAccess . HandlersLayer . layer (
453- McpToolAccess . toLayer ( CallerToolkit , {
454- acts_as_caller : McpToolAccess . actsAsCaller ( ranHere ) ,
455- } ) ,
456- ) ,
457- ) . pipe ( Effect . scoped , Effect . exit ) ;
458- expect ( Exit . isFailure ( built ) && Cause . hasDies ( built . cause ) ) . toBe ( true ) ;
459- } ) ,
394+ const here = { ...there , environmentId : supervised . environmentId } ;
395+ expect ( yield * call ( "writes_threads" , supervised , here ) ) . toBe (
396+ "runtime_mode_escalation_denied" ,
397+ ) ;
398+ expect ( yield * call ( "writes_threads" , fullAccess , here ) ) . toBe ( "here" ) ;
399+ expect ( yield * call ( "writes_threads" , fullAccess , { threadId : fullAccessThreadId } ) ) . toBe (
400+ "here" ,
401+ ) ;
402+ } ) . pipe ( Effect . provide ( linkedProbeServer ) ) ,
460403) ;
0 commit comments