@bleedingdev/modern-js-plugin-bff 3.4.0-ultramodern.9 → 3.5.0-ultramodern.1

package/dist/esm/runtime/effect/adapter.mjs

@@ -1,4 +1,3 @@
-import { ApiRouter } from "@modern-js/bff-core";
 import { API_DIR, compatibleRequire, findExists, fs, isProd, logger } from "@modern-js/utils";
 import { HttpApi } from "effect/unstable/httpapi";
 import path from "path";
@@ -52,43 +51,12 @@ class EffectAdapter {
         const { appDirectory, apiDirectory } = this.api.getServerContext();
         const bffConfig = this.api.getServerConfig()?.bff;
         const configuredEntry = bffConfig?.effect?.entry;
-        const defaultEntry = path.resolve(appDirectory || process.cwd(), apiDirectory || API_DIR, 'effect', 'index');
-        const entryWithoutExt = configuredEntry ? path.isAbsolute(configuredEntry) ? configuredEntry : path.resolve(appDirectory || process.cwd(), configuredEntry) : defaultEntry;
-        return resolveJsOrTsEntry(entryWithoutExt);
-    }
-    isApiRequestPath(requestPath, prefix, enableHandleWeb) {
-        if (!enableHandleWeb) return true;
-        const normalized = normalizePrefix(prefix);
-        if (!normalized) return true;
-        return requestPath === normalized || requestPath.startsWith(`${normalized}/`);
-    }
-    async collectLambdaContractSources() {
-        try {
-            const serverContext = this.api.getServerContext();
-            const appDir = serverContext.distDirectory || serverContext.appDirectory;
-            if (!appDir) return [];
-            const apiDir = 'string' == typeof serverContext.apiDirectory ? serverContext.apiDirectory : path.resolve(appDir, API_DIR);
-            const lambdaDir = 'string' == typeof serverContext.lambdaDirectory ? serverContext.lambdaDirectory : path.join(apiDir, 'lambda');
-            if (!await fs.pathExists(lambdaDir)) return [];
-            const apiRouter = new ApiRouter({
-                appDir,
-                apiDir,
-                lambdaDir,
-                prefix: this.prefix,
-                httpMethodDecider: this.api.getServerConfig()?.bff?.httpMethodDecider
-            });
-            const handlerInfos = await apiRouter.getApiHandlers();
-            return handlerInfos.map((info)=>({
-                    name: info.name,
-                    httpMethod: info.httpMethod,
-                    routePath: info.routePath,
-                    filename: info.filename,
-                    handler: info.handler
-                }));
-        } catch (error) {
-            logger.warn(`[BFF][Effect] Failed to derive lambda operation contracts for the cross-project policy: ${String(error)}`);
-            return [];
+        if (configuredEntry) {
+            const entryWithoutExt = path.isAbsolute(configuredEntry) ? configuredEntry : path.resolve(appDirectory || process.cwd(), configuredEntry);
+            return resolveJsOrTsEntry(entryWithoutExt);
         }
+        const apiRoot = path.resolve(appDirectory || process.cwd(), apiDirectory || API_DIR);
+        return resolveJsOrTsEntry(path.resolve(apiRoot, 'index'));
     }
     async refreshCrossProjectPolicy(mod) {
         let contractSources = [];
@@ -104,24 +72,15 @@ class EffectAdapter {
         } catch (error) {
             logger.warn(`[BFF][Effect] Failed to reflect HttpApi endpoints for the cross-project policy: ${String(error)}`);
         }
-        let policy = resolveAdapterCrossProjectPolicy(this.api, contractSources);
-        if (policy?.enabled) {
-            const lambdaSources = await this.collectLambdaContractSources();
-            if (lambdaSources.length > 0) {
-                contractSources = [
-                    ...contractSources,
-                    ...lambdaSources
-                ];
-                policy = resolveAdapterCrossProjectPolicy(this.api, contractSources);
-            }
-        }
+        const policy = resolveAdapterCrossProjectPolicy(this.api, contractSources);
         this.crossProjectPolicy = policy;
         if (this.crossProjectPolicy?.enabled && 0 === contractSources.length) logger.warn('[BFF][Effect] Cross-project policy is enabled but no HttpApi endpoints could be reflected; operation-contract matching is disabled for this server (envelope and operation-context checks still apply).');
     }
     async loadEffectHandlerFromModule(mod) {
+        const effectConfig = this.api.getServerConfig()?.bff?.effect;
         return resolveEffectBffModuleHandler(mod, {
-            openapi: this.api.getServerConfig()?.bff?.effect?.openapi,
-            dataPlatform: this.api.getServerConfig()?.bff?.effect?.dataPlatform,
+            openapi: effectConfig?.openapi,
+            dataPlatform: effectConfig?.dataPlatform,
             validateRequest: (request)=>checkCrossProjectPolicyForRequest(request, this.crossProjectPolicy),
             onWarning: (message)=>{
                 logger.warn(message);
@@ -155,13 +114,12 @@ class EffectAdapter {
         await this.refreshCrossProjectPolicy(mod);
         const loaded = await this.loadEffectHandlerFromModule(mod);
         if (!loaded) {
-            logger.warn(`[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export { api, layer } or handler.`);
+            logger.warn(`[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export defineEffectBff(...) or a { api, layer } HttpApi module.`);
             this.handler = null;
             return;
         }
         this.handler = loaded.handler;
         this.dispose = loaded.dispose || null;
-        this.policyEnforcedInMiddleware = !loaded.appliesRequestValidator;
     }
     async disposeCurrentHandler() {
         if (!this.dispose) return;
@@ -213,7 +171,6 @@ class EffectAdapter {
         this.handler = null;
         this.dispose = null;
         this.prefix = '/api';
-        this.policyEnforcedInMiddleware = false;
         this.registerMiddleware = async (options)=>{
             const { prefix, enableHandleWeb } = options;
             const { bffRuntimeFramework, middlewares: globalMiddlewares } = this.api.getServerContext();
@@ -224,7 +181,7 @@ class EffectAdapter {
             this.prefix = prefix || this.prefix;
             await this.reloadHandler();
             this.effectMiddleware = {
-                name: 'effect-bff-handler',
+                name: 'effect-api-handler',
                 path: enableHandleWeb ? '*' : `${prefix}/*`,
                 method: 'all',
                 order: 'post',
@@ -232,11 +189,7 @@ class EffectAdapter {
                 handler: async (c, next)=>{
                     if (!this.handler) {
                         if (enableHandleWeb) return void await next();
-                        return this.handleRuntimeError(new Error('[BFF][Effect] Missing Effect entry. Define api/effect/index or configure bff.effect.entry.'), c);
-                    }
-                    if (this.crossProjectPolicy?.enabled && this.policyEnforcedInMiddleware && this.isApiRequestPath(c.req.path, prefix, enableHandleWeb)) {
-                        const denial = checkCrossProjectPolicyForRequest(c.req.raw, this.crossProjectPolicy);
-                        if (denial) return denial;
+                        return this.handleRuntimeError(new Error('[BFF][Effect] Missing Effect entry. Define api/index or configure bff.effect.entry.'), c);
                     }
                     let response;
                     try {

package/dist/esm/runtime/effect/edge-context.mjs

@@ -0,0 +1,34 @@
+const kEffectContext = Symbol.for('modernjs.plugin-bff.edgeEffectContext');
+const kEffectContextStorage = Symbol.for('modernjs.plugin-bff.edgeEffectContextStorage');
+const globalStore = globalThis;
+const isPromiseLike = (value)=>'object' == typeof value && null !== value && 'then' in value && 'function' == typeof value.then;
+const getRuntimeStorage = ()=>{
+    if (globalStore[kEffectContextStorage]) return globalStore[kEffectContextStorage];
+    if ('function' == typeof globalStore.AsyncLocalStorage) globalStore[kEffectContextStorage] = new globalStore.AsyncLocalStorage();
+    return globalStore[kEffectContextStorage];
+};
+const runWithEffectContext = (context, cb)=>{
+    const storage = getRuntimeStorage();
+    if (storage) return storage.run(context, cb);
+    const previous = globalStore[kEffectContext];
+    globalStore[kEffectContext] = context;
+    try {
+        const result = cb();
+        if (isPromiseLike(result)) return Promise.resolve(result).finally(()=>{
+            globalStore[kEffectContext] = previous;
+        });
+        globalStore[kEffectContext] = previous;
+        return result;
+    } catch (error) {
+        globalStore[kEffectContext] = previous;
+        throw error;
+    }
+};
+const useEffectContext = ()=>{
+    const context = getRuntimeStorage()?.getStore() ?? globalStore[kEffectContext];
+    if (!context) throw new Error("Can't call useEffectContext out of Effect runtime scope");
+    return context;
+};
+const useOperationContext = ()=>useEffectContext().operationContext;
+export { createEffectOperationContext } from "./operation-context.mjs";
+export { runWithEffectContext, useEffectContext, useOperationContext };

package/dist/esm/runtime/effect/edge.mjs

@@ -1,4 +1,5 @@
 import { createSafeFailureResponse } from "../safe-failure.mjs";
+import { runWithEffectContext, useEffectContext, useOperationContext } from "./edge-context.mjs";
 import { resolveEffectBffModuleHandler } from "./module.mjs";
 import { createEffectOperationContext } from "./operation-context.mjs";
 export * from "./handler.mjs";
@@ -50,7 +51,7 @@ async function dispatchEffectBffRequest(handler, request, options = {}) {
     const effectRequest = createRequestForMountedPrefix(request, options.prefix);
     const effectContext = createEdgeEffectContext(request, effectRequest, options);
     try {
-        const response = handler.length > 1 ? await handler(effectRequest, effectContext) : await handler(effectRequest);
+        const response = await runWithEffectContext(effectContext, ()=>handler.length > 1 ? handler(effectRequest, effectContext) : handler(effectRequest));
         if (!(response instanceof Response)) throw new Error('[BFF][Effect] Effect handler must return a Response instance.');
         return new Response(response.body, response);
     } catch (error) {
@@ -62,13 +63,14 @@ async function dispatchEffectBffRequest(handler, request, options = {}) {
         return createRuntimeErrorResponse(error);
     }
 }
+const createEffectBffTestHandler = createEffectBffEdgeHandler;
 async function createEffectBffEdgeHandler(options) {
     const loaded = await resolveEffectBffModuleHandler(options.module, {
         openapi: options.openapi,
         dataPlatform: options.dataPlatform,
         onWarning: options.onWarning
     });
-    if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export { api, layer }, createHandler, or handler.');
+    if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export defineEffectBff(...) or a { api, layer } HttpApi module.');
     return {
         handler: (request, dispatchOptions = {})=>dispatchEffectBffRequest(loaded.handler, request, {
                 ...dispatchOptions,
@@ -80,4 +82,4 @@ async function createEffectBffEdgeHandler(options) {
         }
     };
 }
-export { createEffectBffEdgeHandler, createEffectOperationContext, dispatchEffectBffRequest };
+export { createEffectBffEdgeHandler, createEffectBffTestHandler, createEffectOperationContext, dispatchEffectBffRequest, runWithEffectContext, useEffectContext, useOperationContext };

package/dist/esm/runtime/effect/handler.mjs

@@ -12,6 +12,8 @@ export * from "effect/unstable/httpapi";
 export * from "effect/unstable/rpc";
 import * as __rspack_external_effect_Context_f1289ca3 from "effect/Context";
 const emptyEffectServiceContext = __rspack_external_effect_Context_f1289ca3.empty();
+const isEffectServiceContext = (context)=>'object' == typeof context && null !== context && 'mapUnsafe' in context;
+const toEffectServiceContext = (context)=>isEffectServiceContext(context) ? context : emptyEffectServiceContext;
 const EFFECT_VALIDATOR_AWARE_FACTORY = Symbol.for('modernjs.effect.validatorAware');
 function isValidatorAwareHandlerFactory(factory) {
     return 'function' == typeof factory && true === factory[EFFECT_VALIDATOR_AWARE_FACTORY];
@@ -329,7 +331,7 @@ const LOADER_CLIENT_IGNORED_KEYS = new Set([
 ]);
 function createLoaderMaterializedClientPlaceholder() {
     const explain = (property)=>{
-        throw new Error(`[BFF][Effect] effectBff.client.${String(property)} is not available here: the typed client only exists when this module is imported through the "@api/effect/*" transformed path (the BFF loader replaces it with generated client code). On the server, use HttpApiClient or call the Effect layer directly.`);
+        throw new Error(`[BFF][Effect] client.${String(property)} is not available here: the typed client only exists when the API entry is imported through the "@api/index" transformed path (the BFF loader replaces it with generated client code). On the server, use HttpApiClient or call the Effect layer directly.`);
     };
     return new Proxy(Object.create(null), {
         get (_target, property) {
@@ -370,7 +372,7 @@ function createHttpApiHandler(options) {
         if (preparedRequest instanceof Response) return preparedRequest;
         const validationError = validateDataPlatformRequestEnvelope(preparedRequest, options.dataPlatform);
         if (validationError) return validationError;
-        return httpApiHandler.handler(preparedRequest, context ?? emptyEffectServiceContext);
+        return httpApiHandler.handler(preparedRequest, toEffectServiceContext(context));
     };
     const handleBatchRequest = async (request, context)=>{
         const mountedPrefix = getMountedPrefixFromContext(request, context);
@@ -492,7 +494,7 @@ function createHttpApiHandler(options) {
             if (isRpcRequest(request, rpcPath)) {
                 const policyDenial = options.validateRequest?.(request);
                 if (policyDenial) return policyDenial;
-                return rpcHandler.handler(request, context ?? emptyEffectServiceContext);
+                return rpcHandler.handler(request, toEffectServiceContext(context));
             }
             return handleHttpApiRequest(request);
         },

package/dist/esm/runtime/effect/index.mjs

@@ -1,4 +1,5 @@
 import * as __rspack_external__effect_opentelemetry_8bbbb5af from "@effect/opentelemetry";
 export * from "./handler.mjs";
-export { createEffectOperationContext, useEffectContext, useOperationContext } from "./context.mjs";
+export { createEffectOperationContext, runWithEffectContext, useEffectContext, useOperationContext } from "./context.mjs";
+export { createEffectBffEdgeHandler, createEffectBffTestHandler, dispatchEffectBffRequest } from "./edge.mjs";
 export { __rspack_external__effect_opentelemetry_8bbbb5af as OpenTelemetry };

package/dist/esm/runtime/effect/module.mjs

@@ -17,16 +17,18 @@ function isEffectServiceContext(context) {
     return 'object' == typeof context && null !== context && 'mapUnsafe' in context;
 }
 const emptyEffectServiceContext = __rspack_external_effect_Context_f1289ca3.empty();
+const strictEffectApproachMessage = '[BFF][Effect] strictEffectApproach is enforced: Effect API entries must export defineEffectBff(...) or a { api, layer } HttpApi module. Raw handler exports, default request handlers, and unbranded custom createHandler factories are not valid Effect API entries.';
+function rejectLegacyEffectModuleShape(options, shape) {
+    options.onWarning?.(`${strictEffectApproachMessage} Rejected ${shape}.`);
+    return true;
+}
 function callEffectBffRequestHandler(handler, request, context) {
     return void 0 === context ? handler(request) : handler(request, context);
 }
-function createLoadedHandler(webHandler, appliesRequestValidator) {
+function createLoadedHandler(webHandler) {
     return {
         handler: (request, context)=>callEffectBffRequestHandler(webHandler.handler, request, context),
-        dispose: webHandler.dispose,
-        ...appliesRequestValidator ? {
-            appliesRequestValidator: true
-        } : {}
+        dispose: webHandler.dispose
     };
 }
 function createLoadedHttpApiHandler(webHandler) {
@@ -35,18 +37,23 @@ function createLoadedHttpApiHandler(webHandler) {
             const effectContext = isEffectServiceContext(context) ? context : emptyEffectServiceContext;
             return webHandler.handler(request, effectContext);
         },
-        dispose: webHandler.dispose,
-        appliesRequestValidator: true
+        dispose: webHandler.dispose
     };
 }
 function resolveNormalizedEffectBffModuleHandler(normalizedModule, options = {}) {
-    if (isRequestHandler(normalizedModule.handler)) return {
-        handler: normalizedModule.handler
-    };
+    if (isRequestHandler(normalizedModule.handler)) {
+        if (rejectLegacyEffectModuleShape(options, '`handler` export')) return null;
+        return {
+            handler: normalizedModule.handler
+        };
+    }
     const entry = normalizedModule.default;
-    if (isRequestHandler(entry)) return {
-        handler: entry
-    };
+    if (isRequestHandler(entry)) {
+        if (rejectLegacyEffectModuleShape(options, 'default request handler')) return null;
+        return {
+            handler: entry
+        };
+    }
     if (isRecord(entry)) normalizedModule = {
         ...normalizedModule,
         ...entry
@@ -58,19 +65,22 @@ function resolveNormalizedEffectBffModuleHandler(normalizedModule, options = {})
             handler: maybeHandler
         };
     }
-    if (isRequestHandler(normalizedModule.handler)) return {
-        handler: normalizedModule.handler
-    };
+    if (isRequestHandler(normalizedModule.handler)) {
+        if (rejectLegacyEffectModuleShape(options, '`handler` export')) return null;
+        return {
+            handler: normalizedModule.handler
+        };
+    }
     if ('function' == typeof normalizedModule.createHandler) {
         const factory = normalizedModule.createHandler;
         const validatorAware = isValidatorAwareHandlerFactory(factory);
-        if (!validatorAware && void 0 !== options.validateRequest) options.onWarning?.('[BFF][Effect] Custom createHandler export detected: it cannot be verified to apply validateRequest (cross-project policy), so the policy is enforced by the adapter middleware on the outer request. Batched calls will be denied at the batch POST (it carries no per-operation contract); export defineEffectBff(...) to get per-batch-item enforcement.');
+        if (!validatorAware && rejectLegacyEffectModuleShape(options, 'unbranded `createHandler` export')) return null;
         const webHandler = factory({
             openapi: options.openapi,
             dataPlatform: options.dataPlatform,
             validateRequest: options.validateRequest
         });
-        return createLoadedHandler(webHandler, validatorAware);
+        return createLoadedHandler(webHandler);
     }
     if (isEffectApiDefinition(normalizedModule)) {
         options.onWarning?.('[BFF][Effect] Detected { api, layer } export without createHandler. Prefer `defineEffectBff(...)` from @modern-js/plugin-bff/server to avoid module instance mismatch.');
@@ -94,17 +104,26 @@ function resolveEffectBffModuleHandler(mod, options = {}) {
             ...value
         };
     };
-    if (isRequestHandler(normalizedModule.handler)) return Promise.resolve({
-        handler: normalizedModule.handler
-    });
+    if (isRequestHandler(normalizedModule.handler)) {
+        if (rejectLegacyEffectModuleShape(options, '`handler` export')) return Promise.resolve(null);
+        return Promise.resolve({
+            handler: normalizedModule.handler
+        });
+    }
     const entry = normalizedModule.default;
-    if (isRequestHandler(entry)) return Promise.resolve({
-        handler: entry
-    });
+    if (isRequestHandler(entry)) {
+        if (rejectLegacyEffectModuleShape(options, 'default request handler')) return Promise.resolve(null);
+        return Promise.resolve({
+            handler: entry
+        });
+    }
     if ('function' == typeof entry && 0 === entry.length) return Promise.resolve(entry()).then((out)=>{
-        if (isRequestHandler(out)) return {
-            handler: out
-        };
+        if (isRequestHandler(out)) {
+            if (rejectLegacyEffectModuleShape(options, 'default factory returning a request handler')) return null;
+            return {
+                handler: out
+            };
+        }
         mergeRuntimeExports(out);
         return resolveNormalizedEffectBffModuleHandler(normalizedModule, options);
     });

package/dist/esm/utils/effectClientGenerator.mjs

@@ -127,14 +127,14 @@ const __generated = createGeneratedEffectClient(__manifest, __config, __requestR
 const client = __generated.client;
 const operationManifest = __generated.operationManifest;
 const createEffectRequestContext = __generated.createEffectRequestContext;
-const effectBffModule = {
+const apiModule = {
   client,
   operationManifest,
   createEffectRequestContext,
 };
 
 export { client, createEffectRequestContext, operationManifest };
-export default effectBffModule;
+export default apiModule;
 `;
 }
 function renderClientShape(endpoints, valueType) {
@@ -207,13 +207,13 @@ export declare const createEffectRequestContext: (
   requestContext: Record<string, unknown>,
 ) => EffectRequestContext;
 export declare const operationManifest: GeneratedEffectOperationManifest;
-declare const effectBffModule: {
+declare const apiModule: {
   client: GeneratedEffectClient;
   createEffectRequestContext: typeof createEffectRequestContext;
   operationManifest: GeneratedEffectOperationManifest;
 };
 
-export default effectBffModule;
+export default apiModule;
 `;
 }
 async function generateEffectClient(options) {
@@ -236,9 +236,14 @@ async function generateEffectClientCode(options) {
 }
 function resolveEffectEntryFile(options) {
     const { appDir, apiDir, effectEntry } = options;
-    const defaultEntry = path.resolve(apiDir, 'effect', 'index');
-    const entryWithoutExt = effectEntry ? path.isAbsolute(effectEntry) ? effectEntry : path.resolve(appDir, effectEntry) : defaultEntry;
-    if (path.extname(entryWithoutExt)) return fs.existsSync(entryWithoutExt) ? entryWithoutExt : void 0;
-    return findExists(JS_OR_TS_EXTS.map((ext)=>`${entryWithoutExt}${ext}`));
+    const resolveEntry = (entryWithoutExt)=>{
+        if (path.extname(entryWithoutExt)) return fs.existsSync(entryWithoutExt) ? entryWithoutExt : void 0;
+        return findExists(JS_OR_TS_EXTS.map((ext)=>`${entryWithoutExt}${ext}`));
+    };
+    if (effectEntry) {
+        const entryWithoutExt = path.isAbsolute(effectEntry) ? effectEntry : path.resolve(appDir, effectEntry);
+        return resolveEntry(entryWithoutExt);
+    }
+    return resolveEntry(path.resolve(apiDir, 'index'));
 }
 export { generateEffectClient, generateEffectClientCode, renderEffectClientDeclaration, resolveEffectEntryFile };

package/dist/esm-node/runtime/effect/adapter.mjs

@@ -1,6 +1,5 @@
 import __rslib_shim_module__ from "node:module";
 const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
-import { ApiRouter } from "@modern-js/bff-core";
 import { API_DIR, compatibleRequire, findExists, fs, isProd, logger } from "@modern-js/utils";
 import { HttpApi } from "effect/unstable/httpapi";
 import path from "path";
@@ -54,43 +53,12 @@ class EffectAdapter {
         const { appDirectory, apiDirectory } = this.api.getServerContext();
         const bffConfig = this.api.getServerConfig()?.bff;
         const configuredEntry = bffConfig?.effect?.entry;
-        const defaultEntry = path.resolve(appDirectory || process.cwd(), apiDirectory || API_DIR, 'effect', 'index');
-        const entryWithoutExt = configuredEntry ? path.isAbsolute(configuredEntry) ? configuredEntry : path.resolve(appDirectory || process.cwd(), configuredEntry) : defaultEntry;
-        return resolveJsOrTsEntry(entryWithoutExt);
-    }
-    isApiRequestPath(requestPath, prefix, enableHandleWeb) {
-        if (!enableHandleWeb) return true;
-        const normalized = normalizePrefix(prefix);
-        if (!normalized) return true;
-        return requestPath === normalized || requestPath.startsWith(`${normalized}/`);
-    }
-    async collectLambdaContractSources() {
-        try {
-            const serverContext = this.api.getServerContext();
-            const appDir = serverContext.distDirectory || serverContext.appDirectory;
-            if (!appDir) return [];
-            const apiDir = 'string' == typeof serverContext.apiDirectory ? serverContext.apiDirectory : path.resolve(appDir, API_DIR);
-            const lambdaDir = 'string' == typeof serverContext.lambdaDirectory ? serverContext.lambdaDirectory : path.join(apiDir, 'lambda');
-            if (!await fs.pathExists(lambdaDir)) return [];
-            const apiRouter = new ApiRouter({
-                appDir,
-                apiDir,
-                lambdaDir,
-                prefix: this.prefix,
-                httpMethodDecider: this.api.getServerConfig()?.bff?.httpMethodDecider
-            });
-            const handlerInfos = await apiRouter.getApiHandlers();
-            return handlerInfos.map((info)=>({
-                    name: info.name,
-                    httpMethod: info.httpMethod,
-                    routePath: info.routePath,
-                    filename: info.filename,
-                    handler: info.handler
-                }));
-        } catch (error) {
-            logger.warn(`[BFF][Effect] Failed to derive lambda operation contracts for the cross-project policy: ${String(error)}`);
-            return [];
+        if (configuredEntry) {
+            const entryWithoutExt = path.isAbsolute(configuredEntry) ? configuredEntry : path.resolve(appDirectory || process.cwd(), configuredEntry);
+            return resolveJsOrTsEntry(entryWithoutExt);
         }
+        const apiRoot = path.resolve(appDirectory || process.cwd(), apiDirectory || API_DIR);
+        return resolveJsOrTsEntry(path.resolve(apiRoot, 'index'));
     }
     async refreshCrossProjectPolicy(mod) {
         let contractSources = [];
@@ -106,24 +74,15 @@ class EffectAdapter {
         } catch (error) {
             logger.warn(`[BFF][Effect] Failed to reflect HttpApi endpoints for the cross-project policy: ${String(error)}`);
         }
-        let policy = resolveAdapterCrossProjectPolicy(this.api, contractSources);
-        if (policy?.enabled) {
-            const lambdaSources = await this.collectLambdaContractSources();
-            if (lambdaSources.length > 0) {
-                contractSources = [
-                    ...contractSources,
-                    ...lambdaSources
-                ];
-                policy = resolveAdapterCrossProjectPolicy(this.api, contractSources);
-            }
-        }
+        const policy = resolveAdapterCrossProjectPolicy(this.api, contractSources);
         this.crossProjectPolicy = policy;
         if (this.crossProjectPolicy?.enabled && 0 === contractSources.length) logger.warn('[BFF][Effect] Cross-project policy is enabled but no HttpApi endpoints could be reflected; operation-contract matching is disabled for this server (envelope and operation-context checks still apply).');
     }
     async loadEffectHandlerFromModule(mod) {
+        const effectConfig = this.api.getServerConfig()?.bff?.effect;
         return resolveEffectBffModuleHandler(mod, {
-            openapi: this.api.getServerConfig()?.bff?.effect?.openapi,
-            dataPlatform: this.api.getServerConfig()?.bff?.effect?.dataPlatform,
+            openapi: effectConfig?.openapi,
+            dataPlatform: effectConfig?.dataPlatform,
             validateRequest: (request)=>checkCrossProjectPolicyForRequest(request, this.crossProjectPolicy),
             onWarning: (message)=>{
                 logger.warn(message);
@@ -157,13 +116,12 @@ class EffectAdapter {
         await this.refreshCrossProjectPolicy(mod);
         const loaded = await this.loadEffectHandlerFromModule(mod);
         if (!loaded) {
-            logger.warn(`[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export { api, layer } or handler.`);
+            logger.warn(`[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export defineEffectBff(...) or a { api, layer } HttpApi module.`);
             this.handler = null;
             return;
         }
         this.handler = loaded.handler;
         this.dispose = loaded.dispose || null;
-        this.policyEnforcedInMiddleware = !loaded.appliesRequestValidator;
     }
     async disposeCurrentHandler() {
         if (!this.dispose) return;
@@ -215,7 +173,6 @@ class EffectAdapter {
         this.handler = null;
         this.dispose = null;
         this.prefix = '/api';
-        this.policyEnforcedInMiddleware = false;
         this.registerMiddleware = async (options)=>{
             const { prefix, enableHandleWeb } = options;
             const { bffRuntimeFramework, middlewares: globalMiddlewares } = this.api.getServerContext();
@@ -226,7 +183,7 @@ class EffectAdapter {
             this.prefix = prefix || this.prefix;
             await this.reloadHandler();
             this.effectMiddleware = {
-                name: 'effect-bff-handler',
+                name: 'effect-api-handler',
                 path: enableHandleWeb ? '*' : `${prefix}/*`,
                 method: 'all',
                 order: 'post',
@@ -234,11 +191,7 @@ class EffectAdapter {
                 handler: async (c, next)=>{
                     if (!this.handler) {
                         if (enableHandleWeb) return void await next();
-                        return this.handleRuntimeError(new Error('[BFF][Effect] Missing Effect entry. Define api/effect/index or configure bff.effect.entry.'), c);
-                    }
-                    if (this.crossProjectPolicy?.enabled && this.policyEnforcedInMiddleware && this.isApiRequestPath(c.req.path, prefix, enableHandleWeb)) {
-                        const denial = checkCrossProjectPolicyForRequest(c.req.raw, this.crossProjectPolicy);
-                        if (denial) return denial;
+                        return this.handleRuntimeError(new Error('[BFF][Effect] Missing Effect entry. Define api/index or configure bff.effect.entry.'), c);
                     }
                     let response;
                     try {

package/dist/esm-node/runtime/effect/edge-context.mjs

@@ -0,0 +1,35 @@
+import "node:module";
+const kEffectContext = Symbol.for('modernjs.plugin-bff.edgeEffectContext');
+const kEffectContextStorage = Symbol.for('modernjs.plugin-bff.edgeEffectContextStorage');
+const globalStore = globalThis;
+const isPromiseLike = (value)=>'object' == typeof value && null !== value && 'then' in value && 'function' == typeof value.then;
+const getRuntimeStorage = ()=>{
+    if (globalStore[kEffectContextStorage]) return globalStore[kEffectContextStorage];
+    if ('function' == typeof globalStore.AsyncLocalStorage) globalStore[kEffectContextStorage] = new globalStore.AsyncLocalStorage();
+    return globalStore[kEffectContextStorage];
+};
+const runWithEffectContext = (context, cb)=>{
+    const storage = getRuntimeStorage();
+    if (storage) return storage.run(context, cb);
+    const previous = globalStore[kEffectContext];
+    globalStore[kEffectContext] = context;
+    try {
+        const result = cb();
+        if (isPromiseLike(result)) return Promise.resolve(result).finally(()=>{
+            globalStore[kEffectContext] = previous;
+        });
+        globalStore[kEffectContext] = previous;
+        return result;
+    } catch (error) {
+        globalStore[kEffectContext] = previous;
+        throw error;
+    }
+};
+const useEffectContext = ()=>{
+    const context = getRuntimeStorage()?.getStore() ?? globalStore[kEffectContext];
+    if (!context) throw new Error("Can't call useEffectContext out of Effect runtime scope");
+    return context;
+};
+const useOperationContext = ()=>useEffectContext().operationContext;
+export { createEffectOperationContext } from "./operation-context.mjs";
+export { runWithEffectContext, useEffectContext, useOperationContext };

package/dist/esm-node/runtime/effect/edge.mjs

@@ -1,5 +1,6 @@
 import "node:module";
 import { createSafeFailureResponse } from "../safe-failure.mjs";
+import { runWithEffectContext, useEffectContext, useOperationContext } from "./edge-context.mjs";
 import { resolveEffectBffModuleHandler } from "./module.mjs";
 import { createEffectOperationContext } from "./operation-context.mjs";
 export * from "./handler.mjs";
@@ -51,7 +52,7 @@ async function dispatchEffectBffRequest(handler, request, options = {}) {
     const effectRequest = createRequestForMountedPrefix(request, options.prefix);
     const effectContext = createEdgeEffectContext(request, effectRequest, options);
     try {
-        const response = handler.length > 1 ? await handler(effectRequest, effectContext) : await handler(effectRequest);
+        const response = await runWithEffectContext(effectContext, ()=>handler.length > 1 ? handler(effectRequest, effectContext) : handler(effectRequest));
         if (!(response instanceof Response)) throw new Error('[BFF][Effect] Effect handler must return a Response instance.');
         return new Response(response.body, response);
     } catch (error) {
@@ -63,13 +64,14 @@ async function dispatchEffectBffRequest(handler, request, options = {}) {
         return createRuntimeErrorResponse(error);
     }
 }
+const createEffectBffTestHandler = createEffectBffEdgeHandler;
 async function createEffectBffEdgeHandler(options) {
     const loaded = await resolveEffectBffModuleHandler(options.module, {
         openapi: options.openapi,
         dataPlatform: options.dataPlatform,
         onWarning: options.onWarning
     });
-    if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export { api, layer }, createHandler, or handler.');
+    if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export defineEffectBff(...) or a { api, layer } HttpApi module.');
     return {
         handler: (request, dispatchOptions = {})=>dispatchEffectBffRequest(loaded.handler, request, {
                 ...dispatchOptions,
@@ -81,4 +83,4 @@ async function createEffectBffEdgeHandler(options) {
         }
     };
 }
-export { createEffectBffEdgeHandler, createEffectOperationContext, dispatchEffectBffRequest };
+export { createEffectBffEdgeHandler, createEffectBffTestHandler, createEffectOperationContext, dispatchEffectBffRequest, runWithEffectContext, useEffectContext, useOperationContext };