@@ -46,6 +46,7 @@ const refuseOutsideConstruction = (token: symbol) => {
4646let declare : < P , A , E , R > (
4747 handle : ( params : P ) => Effect . Effect < A , E , R > ,
4848 remote : RemoteCheck < P > | undefined ,
49+ forwarded ?: Forwarded < P , A , E , R > ,
4950) => Declaration < ( params : P ) => Effect . Effect < A , E , R > > ;
5051
5152/**
@@ -58,6 +59,16 @@ type RemoteCheck<P> = (
5859) => Effect . Effect < unknown , OrchestratorMcpFailure , Effect . Services < typeof writingCaller > > ;
5960let remoteCheckOf : < Handler > ( declaration : Declaration < Handler > ) => RemoteCheck < never > | undefined ;
6061
62+ /** What a call answered in a linked environment does here before it returns. */
63+ type Forwarded < P , A , E , R > = (
64+ params : P ,
65+ environmentId : EnvironmentId ,
66+ result : A ,
67+ ) => Effect . Effect < A , E , R > ;
68+ let forwardedOf : < Handler > (
69+ declaration : Declaration < Handler > ,
70+ ) => Forwarded < never , unknown , unknown , unknown > | undefined ;
71+
6172type CheckedHandlerOf < D > = D extends Declaration < infer Handler > ? Handler : never ;
6273
6374interface CheckedHandler extends Struct . Lambda {
@@ -74,19 +85,29 @@ let handlersLayer: <Tools extends Record<string, Tool.Any>, EX, RX>(
7485export class Declaration < out Handler > {
7586 readonly #handle: Handler ;
7687 readonly #remote: RemoteCheck < never > | undefined ;
88+ readonly #forwarded: Forwarded < never , unknown , unknown , unknown > | undefined ;
7789 private constructor (
7890 token : typeof builtHere ,
7991 handle : Handler ,
8092 remote : RemoteCheck < never > | undefined ,
93+ forwarded : Forwarded < never , unknown , unknown , unknown > | undefined ,
8194 ) {
8295 refuseOutsideConstruction ( token ) ;
8396 this . #handle = handle ;
8497 this . #remote = remote ;
98+ this . #forwarded = forwarded ;
8599 }
86100 static {
87- declare = ( handle , remote ) => new Declaration ( builtHere , handle , remote ) ;
101+ declare = ( handle , remote , forwarded ) =>
102+ new Declaration (
103+ builtHere ,
104+ handle ,
105+ remote ,
106+ forwarded as Forwarded < never , unknown , unknown , unknown > | undefined ,
107+ ) ;
88108 checkedHandler = Struct . lambda < CheckedHandler > ( ( declaration ) => declaration . #handle) ;
89109 remoteCheckOf = ( declaration ) => declaration . #remote;
110+ forwardedOf = ( declaration ) => declaration . #forwarded;
90111 }
91112}
92113
@@ -281,6 +302,20 @@ export const either = <P, A, E, R, A2, E2, R2>(
281302 ) ;
282303} ;
283304
305+ /**
306+ * `declaration`, whose result from a linked environment then goes through
307+ * `forwarded` here, for what this environment records about the call.
308+ */
309+ export const afterForwarding = < P , A , E , R , E2 , R2 > (
310+ declaration : Declaration < ( params : P ) => Effect . Effect < A , E , R > > ,
311+ forwarded : Forwarded < P , A , E2 , R2 > ,
312+ ) =>
313+ declare (
314+ checkedHandler ( declaration ) as ( params : P ) => Effect . Effect < A , E | E2 , R | R2 > ,
315+ remoteCheckOf ( declaration ) as RemoteCheck < P > | undefined ,
316+ forwarded ,
317+ ) ;
318+
284319const fullAccessRequired =
285320 "Changing projects or environment settings needs a live full-access/default calling thread or a full-access client." ;
286321
@@ -387,6 +422,9 @@ const routed = Effect.fn("McpToolAccess.routed")(function* <Tools extends Record
387422 const tool = toolkit . tools [ name ] ;
388423 if ( tool === undefined || ! takesLinkedEnvironment ( tool ) ) continue ;
389424 const remote = remoteCheckOf ( declaration ) ;
425+ const forwarded = forwardedOf ( declaration ) as
426+ | Forwarded < object , unknown , Tool . Failure < Tools [ keyof Tools ] > , never >
427+ | undefined ;
390428 if ( remote === undefined )
391429 return yield * Effect . die (
392430 `${ name } takes a linked environment, but it acts as its calling thread, which is here.` ,
@@ -402,7 +440,11 @@ const routed = Effect.fn("McpToolAccess.routed")(function* <Tools extends Record
402440 if ( scope . linkedEnvironments === false ) return yield * PeerForwarding . linkedEnvironmentsOff ;
403441 yield * ( remote as RemoteCheck < typeof params > ) ( params ) ;
404442 if ( Option . isNone ( forwarding ) ) return yield * linksUnavailable ;
405- return yield * forwarding . value . call ( scope , tool , target , { ...params , environmentId } ) ;
443+ const result = yield * forwarding . value . call ( scope , tool , target , {
444+ ...params ,
445+ environmentId,
446+ } ) ;
447+ return forwarded === undefined ? result : yield * forwarded ( params , target , result ) ;
406448 } ) ;
407449 }
408450 return handlers as Toolkit . HandlersFrom < Tools > ;
0 commit comments