@bleedingdev/modern-js-bff-effect 3.9.0-ultramodern.8 → 3.9.3-ultramodern.1

package/dist/types/effect-client/index.d.ts

@@ -1,14 +1,14 @@
 import { type RequestContextInput } from '@modern-js/runtime-extensions/request-context';
 import * as Effect from 'effect/Effect';
+import { HttpClient } from 'effect/http';
+import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from 'effect/http-api';
 import * as Layer from 'effect/Layer';
-import { HttpClient } from 'effect/unstable/http';
-import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from 'effect/unstable/httpapi';
-import { Rpc, RpcClient, RpcGroup, RpcSchema, RpcSerialization } from 'effect/unstable/rpc';
+import { Rpc, RpcClient, RpcClientError, RpcGroup, RpcSchema, RpcSerialization } from 'effect/rpc';
 import { type EffectCrossProjectClientOptions } from './cross-project.js';
 export * as Effect from 'effect/Effect';
+export * as HttpClientError from 'effect/http/HttpClientError';
 export * as Layer from 'effect/Layer';
 export * as Schema from 'effect/Schema';
-export * as HttpClientError from 'effect/unstable/http/HttpClientError';
 export type { EffectCrossProjectClientOptions } from './cross-project.js';
 export { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup, HttpApiSchema, Rpc, RpcClient, RpcGroup, RpcSchema, RpcSerialization, };
 export type EffectHttpApiClientOptions = {
@@ -30,7 +30,7 @@ export type EffectViewSelection<T> = {
 export type EffectViewData<T, Selection> = Selection extends true ? T : Selection extends Record<string, unknown> ? {
     [K in keyof Selection & keyof T]: EffectMaskedValue<T[K], Selection[K]>;
 } : T;
-export type EffectRpcSerialization = 'json' | 'ndjson' | 'jsonRpc' | 'ndJsonRpc' | 'msgPack';
+export type EffectRpcSerialization = 'json' | 'ndjson' | 'jsonRpc' | 'ndJsonRpc';
 declare const EffectRpcClientError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
     readonly _tag: "EffectRpcClientError";
 } & Readonly<A>;
@@ -50,7 +50,7 @@ export type EffectRpcClientOptions<Rpcs extends Rpc.Any, Flatten extends boolean
     flatten?: Flatten;
     serialization?: EffectRpcSerialization;
 };
-export type EffectRpcClientHandle<Rpcs extends Rpc.Any, Flatten extends boolean = false> = (Flatten extends true ? RpcClient.RpcClient.Flat<Rpcs, unknown> : RpcClient.RpcClient<Rpcs, unknown>) & {
+export type EffectRpcClientHandle<Rpcs extends Rpc.Any, Flatten extends boolean = false> = (Flatten extends true ? RpcClient.RpcClient.Flat<Rpcs, RpcClientError.RpcClientError> : RpcClient.RpcClient<Rpcs, RpcClientError.RpcClientError>) & {
     dispose: () => Promise<void>;
 };
 export declare function view<T>(): <const Selection extends EffectViewSelection<T>>(selection: Selection) => Selection;

package/dist/types/microvertical-api.d.ts

@@ -33,13 +33,13 @@ export declare const MicroVerticalReadinessSchema: Schema.Struct<{
     readonly versionSkew: Schema.Literal<"none">;
 }>;
 export type MicroVerticalReadiness = typeof MicroVerticalReadinessSchema.Type;
-export declare const MicroVerticalOperationSourceSchema: Schema.Literals<readonly ["client", "server", "generated-client", "effect-adapter", "data-platform", "unknown"]>;
+export declare const MicroVerticalOperationSourceSchema: Schema.Literals<readonly ["client", "server", "generated-client", "effect-server", "data-platform", "unknown"]>;
 export type MicroVerticalOperationSource = typeof MicroVerticalOperationSourceSchema.Type;
 export declare const MicroVerticalOperationContextSchema: Schema.Struct<{
     readonly method: Schema.String;
     readonly operationId: Schema.compose<Schema.String, Schema.brand<Schema.String, "MicroVerticalOperationId">>;
     readonly routePath: Schema.String;
-    readonly source: Schema.Literals<readonly ["client", "server", "generated-client", "effect-adapter", "data-platform", "unknown"]>;
+    readonly source: Schema.Literals<readonly ["client", "server", "generated-client", "effect-server", "data-platform", "unknown"]>;
     readonly traceId: Schema.optionalKey<Schema.compose<Schema.String, Schema.brand<Schema.String, "MicroVerticalTraceId">>>;
 }>;
 export type MicroVerticalOperationContext = typeof MicroVerticalOperationContextSchema.Type;
@@ -55,11 +55,11 @@ export declare const microVerticalOperationAttributes: (operationContext: MicroV
     'modernjs.operation.id': string;
     'modernjs.operation.method': string;
     'modernjs.operation.route': string;
-    'modernjs.operation.source': "client" | "data-platform" | "effect-adapter" | "generated-client" | "server" | "unknown";
+    'modernjs.operation.source': "client" | "data-platform" | "effect-server" | "generated-client" | "server" | "unknown";
 } | {
     'modernjs.operation.id': string;
     'modernjs.operation.method': string;
     'modernjs.operation.route': string;
-    'modernjs.operation.source': "client" | "data-platform" | "effect-adapter" | "generated-client" | "server" | "unknown";
+    'modernjs.operation.source': "client" | "data-platform" | "effect-server" | "generated-client" | "server" | "unknown";
     'modernjs.trace.id': string;
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@bleedingdev/modern-js-bff-effect",
   "description": "Fork-owned Effect runtime, client, edge dispatcher, and data-platform primitives for UltraModern.js BFFs.",
-  "homepage": "https://github.com/BleedingDev/ultramodern.js#readme",
+  "homepage": "https://github.com/ultramodernjs/ultramodern.js#readme",
   "bugs": {
-    "url": "https://github.com/BleedingDev/ultramodern.js/issues"
+    "url": "https://github.com/ultramodernjs/ultramodern.js/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/BleedingDev/ultramodern.js.git",
+    "url": "git+https://github.com/ultramodernjs/ultramodern.js.git",
     "directory": "packages/server/bff-effect"
   },
   "license": "MIT",
@@ -18,7 +18,7 @@
     "modern.js",
     "ultramodern.js"
   ],
-  "version": "3.9.0-ultramodern.8",
+  "version": "3.9.3-ultramodern.1",
   "files": [
     "dist",
     "src"
@@ -35,62 +35,49 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./dist/types/index.d.ts",
-      "node": {
-        "import": "./dist/esm-node/index.mjs",
-        "require": "./dist/cjs/index.js"
-      },
+      "node": "./dist/esm-node/index.mjs",
+      "import": "./dist/esm/index.mjs",
       "default": "./dist/cjs/index.js"
     },
     "./effect": {
       "types": "./dist/types/effect/index.d.ts",
-      "node": {
-        "import": "./dist/esm-node/effect/index.mjs",
-        "require": "./dist/cjs/effect/index.js"
-      },
+      "node": "./dist/esm-node/effect/index.mjs",
+      "import": "./dist/esm/effect/index.mjs",
       "default": "./dist/cjs/effect/index.js"
     },
+    "./context": {
+      "types": "./dist/types/effect/context.d.ts",
+      "node": "./dist/esm-node/effect/context.mjs",
+      "import": "./dist/esm/effect/context.mjs",
+      "default": "./dist/cjs/effect/context.js"
+    },
     "./effect-edge": {
       "types": "./dist/types/effect/edge.d.ts",
-      "node": {
-        "import": "./dist/esm-node/effect/edge.mjs",
-        "require": "./dist/cjs/effect/edge.js"
-      },
+      "node": "./dist/esm-node/effect/edge.mjs",
       "import": "./dist/esm/effect/edge.mjs",
       "default": "./dist/esm/effect/edge.mjs"
     },
     "./effect-client": {
       "types": "./dist/types/effect-client/index.d.ts",
-      "node": {
-        "import": "./dist/esm-node/effect-client/index.mjs",
-        "require": "./dist/cjs/effect-client/index.js"
-      },
+      "node": "./dist/esm-node/effect-client/index.mjs",
       "import": "./dist/esm/effect-client/index.mjs",
       "default": "./dist/esm/effect-client/index.mjs"
     },
     "./microvertical-api": {
       "types": "./dist/types/microvertical-api.d.ts",
-      "node": {
-        "import": "./dist/esm-node/microvertical-api.mjs",
-        "require": "./dist/cjs/microvertical-api.js"
-      },
+      "node": "./dist/esm-node/microvertical-api.mjs",
       "import": "./dist/esm/microvertical-api.mjs",
       "default": "./dist/esm/microvertical-api.mjs"
     },
     "./data-platform": {
       "types": "./dist/types/data-platform/index.d.ts",
-      "node": {
-        "import": "./dist/esm-node/data-platform/index.mjs",
-        "require": "./dist/cjs/data-platform/index.js"
-      },
+      "node": "./dist/esm-node/data-platform/index.mjs",
       "import": "./dist/esm/data-platform/index.mjs",
       "default": "./dist/esm/data-platform/index.mjs"
     },
     "./assembly": {
       "types": "./dist/types/assembly.d.ts",
-      "node": {
-        "import": "./dist/esm-node/assembly.mjs",
-        "require": "./dist/cjs/assembly.js"
-      },
+      "node": "./dist/esm-node/assembly.mjs",
       "default": "./dist/esm/assembly.mjs"
     }
   },
@@ -104,6 +91,10 @@
         "./dist/types/effect/index.d.ts",
         "./src/effect/index.ts"
       ],
+      "context": [
+        "./dist/types/effect/context.d.ts",
+        "./src/effect/context.ts"
+      ],
       "effect-edge": [
         "./dist/types/effect/edge.d.ts",
         "./src/effect/edge.ts"
@@ -127,13 +118,13 @@
     }
   },
   "engines": {
-    "node": ">=26.7.0"
+    "node": ">=26.10.0"
   },
   "dependencies": {
-    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.0-ultramodern.8",
-    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.9.0-ultramodern.8",
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.8",
-    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.8",
+    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.3-ultramodern.1",
+    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.9.3-ultramodern.1",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.3-ultramodern.1",
+    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.3-ultramodern.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/api-logs": "0.222.0",
     "@opentelemetry/resources": "2.11.0",
@@ -145,8 +136,8 @@
     "@opentelemetry/semantic-conventions": "1.43.0"
   },
   "peerDependencies": {
-    "@effect/opentelemetry": "4.0.0-rc.112",
-    "effect": "4.0.0-rc.112"
+    "@effect/opentelemetry": "4.0.0",
+    "effect": "4.0.0"
   },
   "peerDependenciesMeta": {
     "@effect/opentelemetry": {
@@ -157,13 +148,13 @@
     }
   },
   "devDependencies": {
-    "@effect/opentelemetry": "4.0.0-rc.112",
-    "@rslib/core": "1.0.0",
+    "@effect/opentelemetry": "4.0.0",
+    "@rslib/core": "1.0.3",
     "@scripts/rstest-config": "2.66.0",
-    "@types/node": "^26.4.1",
-    "@types/react": "^19.2.18",
-    "@typescript/native-preview": "7.0.0-dev.20260707.2",
-    "effect": "4.0.0-rc.112"
+    "@types/node": "^26.6.3",
+    "@types/react": "^19.3.0",
+    "effect": "4.0.0",
+    "esbuild": "^0.28.2"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -173,5 +164,8 @@
     "dev": "rslib build --watch",
     "build": "rslib build",
     "test": "rstest"
+  },
+  "ultramodern": {
+    "sourceName": "@modern-js/bff-effect"
   }
 }

package/src/assembly.ts

@@ -1,7 +1,8 @@
 /** Server-only assembly for the invariant tail of a strict Effect BFF runtime factory. */
+
+import type { HttpApi, HttpApiGroup } from 'effect/http-api';
+import { HttpApiBuilder } from 'effect/http-api';
 import * as Layer from 'effect/Layer';
-import type { HttpApi, HttpApiGroup } from 'effect/unstable/httpapi';
-import { HttpApiBuilder } from 'effect/unstable/httpapi';
 import { defineEffectBff } from './effect/handler/definition';
 import type { EffectRuntimeRequirements } from './effect/handler/types';
 

package/src/data-platform/batch/options.ts

@@ -0,0 +1,20 @@
+import type { DataBatchTransportOptions } from '../types';
+
+/** Wire limits and method eligibility are identical on both sides. */
+export function normalizeBatchLimits(
+  options: Pick<
+    DataBatchTransportOptions,
+    'maxBatchSize' | 'maxBatchBytes' | 'allowedMethods'
+  > = {},
+) {
+  return {
+    maxBatchSize: Math.max(1, options.maxBatchSize ?? 16),
+    maxBatchBytes: Math.max(1024, options.maxBatchBytes ?? 64 * 1024),
+    allowedMethods: new Set(
+      (options.allowedMethods !== undefined && options.allowedMethods.length > 0
+        ? options.allowedMethods
+        : ['GET']
+      ).map(method => method.toUpperCase()),
+    ),
+  };
+}

package/src/data-platform/batch/queue.ts

@@ -8,6 +8,7 @@ import type {
   DataTransportRequestInfo,
 } from '../types';
 import { DEFAULT_DATA_BATCH_HEADER } from '../types';
+import { normalizeBatchLimits } from './options';
 import { decodeBatchBody, isNullBodyStatus } from './protocol';
 import {
   createBatchId,
@@ -37,6 +38,9 @@ type NormalizedBatchTransportRequest = {
   endpoint: string;
   method: string;
   headers: Record<string, string>;
+  itemHeaders: Record<string, string>;
+  bucketKey: string;
+  itemPath: string;
   credentials: RequestCredentials;
   body: BodyInit | null;
   hasOpaqueSourceBody: boolean;
@@ -76,7 +80,6 @@ type QueuedBatchRequest = {
 
 type BatchBucket = {
   items: QueuedBatchRequest[];
-  bytes: number;
   batchId: string;
   sentAt: number;
   timer: ReturnType<typeof setTimeout> | null;
@@ -185,7 +188,6 @@ export class BatchBucketRegistry {
 
     const next: BatchBucket = {
       items: [],
-      bytes: 0,
       batchId: createBatchId(),
       sentAt: Date.now(),
       timer: null,
@@ -215,15 +217,9 @@ export function createBatchTransportQueue({
   bucketRegistry,
 }: CreateBatchTransportQueueOptions) {
   const flushIntervalMs = Math.max(0, options.flushIntervalMs ?? 8);
-  const maxBatchSize = Math.max(1, options.maxBatchSize ?? 16);
-  const maxBatchBytes = Math.max(1024, options.maxBatchBytes ?? 64 * 1024);
+  const { maxBatchSize, maxBatchBytes, allowedMethods } =
+    normalizeBatchLimits(options);
   const requestTimeoutMs = options.requestTimeoutMs;
-  const allowedMethods = new Set(
-    (options.allowedMethods && options.allowedMethods.length > 0
-      ? options.allowedMethods
-      : ['GET']
-    ).map(method => method.toUpperCase()),
-  );
   const onEvent = options.onEvent;
 
   const buckets = bucketRegistry ?? new BatchBucketRegistry();
@@ -284,7 +280,6 @@ export function createBatchTransportQueue({
       return;
     }
     bucket.items.splice(index, 1);
-    bucket.bytes = measurePayload(bucket, bucket.items);
     if (bucket.items.length === 0 && bucket.timer) {
       clearTimeout(bucket.timer);
       bucket.timer = null;
@@ -347,11 +342,11 @@ export function createBatchTransportQueue({
     return runSingle(request);
   };
 
-  const settleAmbiguousBatchRequests = (
-    items: QueuedBatchRequest[],
-    reason: string,
-  ) =>
-    settleRequests(items, request => runAfterAmbiguousBatch(request, reason));
+  const finishFlush = (bucketKey: string, bucket: BatchBucket) => {
+    bucket.flushing = false;
+    if (bucket.items.length > 0 && !bucket.timer) void flushBucket(bucketKey);
+    buckets.releaseIfIdle(bucketKey, bucket);
+  };
 
   const flushBucket = async (bucketKey: string) => {
     const bucket = buckets.get(bucketKey);
@@ -379,7 +374,6 @@ export function createBatchTransportQueue({
       sentAt: bucket.sentAt,
     };
     bucket.items = [];
-    bucket.bytes = 0;
     rotatePayloadIdentity(bucket);
     const firstItem = items[0];
     if (!firstItem) {
@@ -396,17 +390,28 @@ export function createBatchTransportQueue({
         size: items.length,
         reason: disabledEndpoints.has(endpoint) ? 'batch-disabled' : undefined,
       });
-      await settleRequests(items, runSingle);
-      bucket.flushing = false;
-      if (bucket.items.length > 0 && !bucket.timer) {
-        void flushBucket(bucketKey);
+      try {
+        await settleRequests(items, runSingle);
+      } finally {
+        finishFlush(bucketKey, bucket);
       }
-      buckets.releaseIfIdle(bucketKey, bucket);
       return;
     }
 
     const payload = createPayload(payloadIdentity, items);
     const batchId = payload.batchId;
+    const settleAmbiguousBatchRequests = (reason: string) => {
+      emitDataBatchTransportEvent(onEvent, {
+        type: 'fallback',
+        endpoint,
+        batchId,
+        size: items.length,
+        reason,
+      });
+      return settleRequests(items, request =>
+        runAfterAmbiguousBatch(request, reason),
+      );
+    };
 
     emitDataBatchTransportEvent(onEvent, {
       type: 'flush',
@@ -473,20 +478,17 @@ export function createBatchTransportQueue({
             batchId,
             reason: `batch-endpoint-unavailable-${String(response.status)}`,
           });
+          await settleRequests(items, request =>
+            runAfterAmbiguousBatch(
+              request,
+              `batch-response-${String(response.status)}`,
+            ),
+          );
         } else {
-          emitDataBatchTransportEvent(onEvent, {
-            type: 'fallback',
-            endpoint,
-            batchId,
-            size: items.length,
-            reason: `batch-response-${String(response.status)}`,
-          });
+          await settleAmbiguousBatchRequests(
+            `batch-response-${String(response.status)}`,
+          );
         }
-        await settleAmbiguousBatchRequests(
-          items,
-          `batch-response-${String(response.status)}`,
-        );
-        bucket.flushing = false;
         return;
       }
 
@@ -494,28 +496,12 @@ export function createBatchTransportQueue({
         response.json(),
       );
       if (!isBatchResponsePayload(result)) {
-        emitDataBatchTransportEvent(onEvent, {
-          type: 'fallback',
-          endpoint,
-          batchId,
-          size: items.length,
-          reason: 'invalid-batch-response',
-        });
-        await settleAmbiguousBatchRequests(items, 'invalid-batch-response');
-        bucket.flushing = false;
+        await settleAmbiguousBatchRequests('invalid-batch-response');
         return;
       }
 
       if (result.batchId !== batchId) {
-        emitDataBatchTransportEvent(onEvent, {
-          type: 'fallback',
-          endpoint,
-          batchId,
-          size: items.length,
-          reason: 'mismatched-batch-id',
-        });
-        await settleAmbiguousBatchRequests(items, 'mismatched-batch-id');
-        bucket.flushing = false;
+        await settleAmbiguousBatchRequests('mismatched-batch-id');
         return;
       }
 
@@ -555,23 +541,12 @@ export function createBatchTransportQueue({
         }
         return;
       }
-      emitDataBatchTransportEvent(onEvent, {
-        type: 'fallback',
-        endpoint,
-        batchId,
-        size: items.length,
-        reason: 'batch-transport-error',
-      });
-      await settleAmbiguousBatchRequests(items, 'batch-transport-error');
+      await settleAmbiguousBatchRequests('batch-transport-error');
     } finally {
       for (const item of items) {
         item.abortBatchIfUnused = undefined;
       }
-      bucket.flushing = false;
-      if (bucket.items.length > 0 && !bucket.timer) {
-        void flushBucket(bucketKey);
-      }
-      buckets.releaseIfIdle(bucketKey, bucket);
+      finishFlush(bucketKey, bucket);
     }
   };
 
@@ -617,7 +592,18 @@ export function createBatchTransportQueue({
       options.endpoint,
     ).toString();
 
+    const itemHeaders = { ...headers };
+    delete itemHeaders.authorization;
+    delete itemHeaders.cookie;
     return {
+      itemHeaders,
+      itemPath: `${requestUrl.pathname}${requestUrl.search}`,
+      bucketKey: stableStringify({
+        endpoint,
+        authorization: headers.authorization ?? null,
+        cookie: headers.cookie ?? null,
+        credentials,
+      }),
       requestUrl,
       endpoint,
       method,
@@ -660,20 +646,11 @@ export function createBatchTransportQueue({
       return undefined;
     }
 
-    const itemHeaders = { ...request.headers };
-    delete itemHeaders.authorization;
-    delete itemHeaders.cookie;
-    const bucketKey = stableStringify({
-      endpoint: request.endpoint,
-      authorization: request.headers.authorization ?? null,
-      cookie: request.headers.cookie ?? null,
-      credentials: request.credentials,
-    });
     return stableStringify({
-      bucketKey,
-      path: `${request.requestUrl.pathname}${request.requestUrl.search}`,
+      bucketKey: request.bucketKey,
+      path: request.itemPath,
       method: request.method,
-      headers: itemHeaders,
+      headers: request.itemHeaders,
       body: null,
     });
   };
@@ -704,9 +681,7 @@ export function createBatchTransportQueue({
       .slice(2, 8)}`;
     nextItemId += 1;
 
-    const itemHeaders = { ...request.headers };
-    delete itemHeaders.authorization;
-    delete itemHeaders.cookie;
+    const itemHeaders = { ...request.itemHeaders };
     if (
       preparedBody.body &&
       preparedBody.inferredContentType &&
@@ -716,18 +691,13 @@ export function createBatchTransportQueue({
     }
     const item: DataBatchRequestItem = {
       id: itemId,
-      path: `${request.requestUrl.pathname}${request.requestUrl.search}`,
+      path: request.itemPath,
       method: request.method,
       headers: itemHeaders,
       ...(preparedBody.body ? { body: preparedBody.body } : {}),
     };
 
-    const bucketKey = stableStringify({
-      endpoint: request.endpoint,
-      authorization: request.headers.authorization ?? null,
-      cookie: request.headers.cookie ?? null,
-      credentials: request.credentials,
-    });
+    const { bucketKey } = request;
 
     const key = stableStringify({
       bucketKey,
@@ -824,14 +794,16 @@ export function createBatchTransportQueue({
     }
 
     bucket.items.push(queued);
-    bucket.bytes = measurePayload(bucket, bucket.items);
     emitDataBatchTransportEvent(onEvent, {
       type: 'enqueue',
       endpoint: request.endpoint,
       size: bucket.items.length,
     });
 
-    if (bucket.items.length >= maxBatchSize || bucket.bytes >= maxBatchBytes) {
+    if (
+      bucket.items.length >= maxBatchSize ||
+      measurePayload(bucket, bucket.items) >= maxBatchBytes
+    ) {
       void flushBucket(bucketKey);
       return queued.promise;
     }

package/src/effect/context.ts

@@ -1,10 +1,5 @@
 // @effect-diagnostics strictBooleanExpressions:off
-import { AsyncLocalStorage } from 'node:async_hooks';
-import {
-  type EffectContext,
-  type EffectContextStorage,
-  kEffectContextStorage,
-} from './operation-context';
+import type { EffectContext, EffectContextStorage } from './operation-context';
 
 export {
   type CreateEffectOperationContextOptions,
@@ -12,21 +7,51 @@ export {
   type EffectContext,
 } from './operation-context';
 
+type EffectContextStorageConstructor = new () => EffectContextStorage;
+
+// One storage for every entry: each imports this module as
+// `@modern-js/bff-effect/context`, the request that Module Federation shares
+// and that the BFF bundle keeps external, so the server and its lambdas load
+// the same instance. A backend federation container bundles its own copy and
+// adopts the host's storage in init() instead.
 const globalStore = globalThis as typeof globalThis & {
-  [kEffectContextStorage]?: EffectContextStorage;
+  process?: {
+    getBuiltinModule?: (id: string) => unknown;
+  };
 };
 
-const effectContextStorage =
-  globalStore[kEffectContextStorage] ??
-  (globalStore[kEffectContextStorage] = new AsyncLocalStorage<EffectContext>());
+const asyncHooks = globalStore.process?.getBuiltinModule?.(
+  'node:async_hooks',
+) as { AsyncLocalStorage?: EffectContextStorageConstructor } | undefined;
+const AsyncLocalStorage = asyncHooks?.AsyncLocalStorage;
+if (typeof AsyncLocalStorage !== 'function') {
+  throw new Error(
+    '[BFF][Effect] The edge runtime must provide AsyncLocalStorage. Enable Node.js compatibility or the nodejs_als compatibility flag.',
+  );
+}
+
+/**
+ * Module Federation share through which a backend federation host hands its
+ * request storage to the containers it initializes.
+ */
+export const EFFECT_BFF_CONTEXT_STORAGE_SHARE =
+  '@modern-js/bff-effect/context-storage';
+
+let effectContextStorage: EffectContextStorage = new AsyncLocalStorage();
+let effectContextStorageUsed = false;
+
+const usedEffectContextStorage = () => {
+  effectContextStorageUsed = true;
+  return effectContextStorage;
+};
 
 export const runWithEffectContext = <T>(
   context: EffectContext,
   cb: () => T,
-): T => effectContextStorage.run(context, cb);
+): T => usedEffectContextStorage().run(context, cb);
 
 export const useEffectContext = (): EffectContext => {
-  const context = effectContextStorage.getStore();
+  const context = usedEffectContextStorage().getStore();
   if (!context) {
     throw new Error(`Can't call useEffectContext out of Effect runtime scope`);
   }
@@ -34,4 +59,31 @@ export const useEffectContext = (): EffectContext => {
   return context;
 };
 
+/** @internal The storage a backend federation host shares with containers. */
+export const getEffectContextStorage = (): EffectContextStorage =>
+  effectContextStorage;
+
+/**
+ * @internal Called through `adoptEffectBffShareScope()` from a backend
+ * federation container's `init()`, so its endpoints read the context the
+ * host dispatcher enters.
+ */
+export function adoptEffectContextStorage(storage: unknown): void {
+  const candidate = storage as Partial<EffectContextStorage> | undefined;
+  if (
+    typeof candidate?.run !== 'function' ||
+    typeof candidate.getStore !== 'function'
+  ) {
+    throw new Error(
+      `[BFF][Effect] Share ${EFFECT_BFF_CONTEXT_STORAGE_SHARE} must provide an AsyncLocalStorage.`,
+    );
+  }
+  if (effectContextStorageUsed && candidate !== effectContextStorage) {
+    throw new Error(
+      '[BFF][Effect] A backend federation container received the host request storage after an Effect API already used its own. Evaluate exposes only after container init().',
+    );
+  }
+  effectContextStorage = candidate as EffectContextStorage;
+}
+
 export const useOperationContext = () => useEffectContext().operationContext;