@bleedingdev/modern-js-plugin-bff-extensions 3.9.0-ultramodern.9 → 3.9.3-ultramodern.1

package/src/backend-federation-manifest/remote.ts

@@ -91,12 +91,6 @@ export function resolveBackendFederationRemoteFromManifest(
     entry: remoteEntryUrl,
     type: remoteType,
     ...(verification ? { verification } : {}),
-    ...(remoteOverride.entryGlobalName
-      ? { entryGlobalName: remoteOverride.entryGlobalName }
-      : {}),
     expose,
-    ...(remoteOverride.shareScope
-      ? { shareScope: remoteOverride.shareScope }
-      : {}),
   };
 }

package/src/backend-federation-manifest/types.ts

@@ -12,6 +12,7 @@ import type {
 import type {
   BackendFederatedEffectApiModule,
   BackendFederationRemote,
+  BackendFederationRuntimeOptions,
 } from '../backend-federation';
 import type { BackendFederationManifestAdapterError } from './errors';
 
@@ -68,6 +69,7 @@ export type BackendFederationManifestAdapterOptions = {
   plugins?: ModuleFederationRuntimePlugin[];
   remote?: Partial<BackendFederationRemote>;
   runtime?: ModuleFederation;
+  shared?: BackendFederationRuntimeOptions['shared'];
   signal?: AbortSignal;
   timeoutMs?: number;
 };

package/src/backend-federation-manifest/validation.ts

@@ -10,6 +10,11 @@ import {
   type BackendFederatedEffectApiModule,
   type BackendFederationRemote,
 } from '../backend-federation';
+import {
+  backendFederationCompatibility,
+  formatBackendFederationIdentityIssues,
+  validateBackendFederationCompatibility,
+} from '../backend-federation/identity';
 import {
   assertConsistentValue,
   assertManifestAdapter,
@@ -19,7 +24,6 @@ import {
 import {
   backendFederationMetadata,
   manifestDeliveryUnit,
-  recordField,
   stringValue,
   versionBoundaryMetadata,
 } from './metadata';
@@ -166,7 +170,7 @@ export function validateLoadedBackendFederationContract(
   const loadedContract = loaded.backendFederationContract;
   const backendFederation = backendFederationMetadata(manifest);
   const boundary = versionBoundaryMetadata(manifest);
-  const compatibility = recordField(loadedContract, 'compatibility');
+  const compatibility = backendFederationCompatibility(loaded);
 
   assertManifestAdapter(
     compatibility,
@@ -186,26 +190,6 @@ export function validateLoadedBackendFederationContract(
     remote.name,
     'expose name',
   );
-  assertVersionValue(
-    stringValue(compatibility.contractVersion),
-    stringValue(backendFederation?.contractVersion),
-    'expose contractVersion',
-  );
-  assertVersionValue(
-    stringValue(compatibility.nodeAdapterVersion),
-    stringValue(backendFederation?.nodeAdapterVersion),
-    'expose nodeAdapterVersion',
-  );
-  assertVersionValue(
-    stringValue(compatibility.packageName),
-    stringValue(boundary?.packageName),
-    'expose packageName',
-  );
-  assertVersionValue(
-    stringValue(compatibility.build),
-    stringValue(boundary?.buildVersion),
-    'expose buildVersion',
-  );
 
   const deliveryUnit = manifestDeliveryUnit(backendFederation, boundary);
   const manifestUnitId =
@@ -213,15 +197,24 @@ export function validateLoadedBackendFederationContract(
     stringValue(deliveryUnit.top?.unitId);
   const manifestBuildMarker = stringValue(deliveryUnit.boundary?.buildMarker);
 
-  assertVersionValue(
-    stringValue(compatibility.unitId),
-    manifestUnitId,
-    'deliveryUnit.unitId vs expose compatibility.unitId',
-  );
+  const issues = validateBackendFederationCompatibility(compatibility, {
+    contractVersion: stringValue(backendFederation?.contractVersion),
+    nodeAdapterVersion: stringValue(backendFederation?.nodeAdapterVersion),
+    packageName: stringValue(boundary?.packageName),
+    unitId: manifestUnitId,
+    build: manifestBuildMarker ?? stringValue(boundary?.buildVersion),
+  });
+  // Manifest validation establishes buildVersion/buildMarker consistency; the
+  // executed expose is still checked independently against that trusted record.
   assertVersionValue(
     stringValue(compatibility.build),
-    manifestBuildMarker,
-    'deliveryUnit.buildMarker vs expose compatibility.build',
+    stringValue(boundary?.buildVersion),
+    'expose buildVersion',
+  );
+  assertManifestAdapter(
+    issues.length === 0,
+    'version_mismatch',
+    `[BFF][Effect] ${formatBackendFederationIdentityIssues(issues)}.`,
   );
 }
 

package/src/cross-project-policy/node.ts

@@ -1,48 +1,17 @@
-import { readFileSync } from 'node:fs';
-import path from 'node:path';
 import '@modern-js/server-runtime-extensions/server-config';
 import type { ServerPluginAPI } from '@modern-js/server-core';
 import {
-  deriveOperationVersion,
   type OperationContractSource,
   resolveCrossProjectPolicy,
+  resolveOperationProducer,
 } from '@modern-js/server-runtime-extensions/bff-policy/node';
 
 import type { ResolvedCrossProjectPolicy } from './evaluation';
 
-const readNearestPackageVersion = (
-  startDir: string | undefined,
-): string | undefined => {
-  if (!startDir) {
-    return undefined;
-  }
-
-  let current = path.resolve(startDir);
-  for (let depth = 0; depth < 10; depth += 1) {
-    try {
-      const packageJson = JSON.parse(
-        readFileSync(path.join(current, 'package.json'), 'utf8'),
-      ) as { version?: unknown };
-      if (typeof packageJson.version === 'string') {
-        return packageJson.version;
-      }
-    } catch {
-      // The producer package may be nested below its package.json.
-    }
-
-    const parent = path.dirname(current);
-    if (parent === current) {
-      return undefined;
-    }
-    current = parent;
-  }
-
-  return undefined;
-};
-
 export const resolveAdapterCrossProjectPolicy = (
   api: ServerPluginAPI,
   handlers: OperationContractSource[],
+  producer?: ReturnType<typeof resolveOperationProducer>,
 ): ResolvedCrossProjectPolicy | undefined => {
   const bff = api.getServerConfig()?.bff;
   const { apiDirectory, appDirectory } = api.getServerContext() as {
@@ -53,11 +22,11 @@ export const resolveAdapterCrossProjectPolicy = (
   return resolveCrossProjectPolicy({
     crossProjectPolicy: bff?.crossProjectPolicy,
     handlers,
-    requestId: bff?.requestId,
     isCrossProjectServer: bff?.isCrossProjectServer,
-    operationVersion: deriveOperationVersion(
-      readNearestPackageVersion(apiDirectory) ??
-        readNearestPackageVersion(appDirectory),
-    ),
+    ...(producer ??
+      resolveOperationProducer({
+        directories: [apiDirectory, appDirectory],
+        requestId: bff?.requestId || 'default',
+      })),
   });
 };

package/src/{effect-adapter → effect-server}/cross-project-policy.ts

@@ -6,16 +6,18 @@ import {
   toOperationContractSources,
 } from '@modern-js/bff-effect/effect';
 import type { ServerPluginAPI } from '@modern-js/server-core';
+import type { resolveOperationProducer } from '@modern-js/server-runtime-extensions/bff-policy/node';
 import { logger } from '@modern-js/utils';
-import { HttpApi } from 'effect/unstable/httpapi';
+import { HttpApi } from 'effect/http-api';
 
 import { resolveAdapterCrossProjectPolicy } from '../cross-project-policy';
 import type { ResolvedCrossProjectPolicy } from '../cross-project-policy/evaluation';
 
-export function resolveEffectAdapterCrossProjectPolicy(
+export function resolveEffectServerCrossProjectPolicy(
   api: ServerPluginAPI,
   prefix: string,
   mod: EffectApiModule | null,
+  producer?: ReturnType<typeof resolveOperationProducer>,
 ): Promise<ResolvedCrossProjectPolicy | undefined> {
   const contractSourcesPromise =
     mod === null
@@ -52,7 +54,11 @@ export function resolveEffectAdapterCrossProjectPolicy(
           });
 
   return contractSourcesPromise.then(contractSources => {
-    const policy = resolveAdapterCrossProjectPolicy(api, contractSources);
+    const policy = resolveAdapterCrossProjectPolicy(
+      api,
+      contractSources,
+      producer,
+    );
     if (policy?.enabled === true && contractSources.length === 0) {
       logger.warn(
         '[BFF][Effect] Cross-project policy enabled but no HttpApi endpoints could be reflected; requests fail operation-contract matching unless allowUnknownOperations is enabled.',

package/src/effect-server/entry.ts

@@ -0,0 +1,18 @@
+// @effect-diagnostics nodeBuiltinImport:off strictBooleanExpressions:off
+import path from 'node:path';
+import '@modern-js/server-runtime-extensions/server-config';
+import type { ServerPluginAPI } from '@modern-js/server-core';
+import { API_DIR, isProd } from '@modern-js/utils';
+import { resolveEffectEntry } from '../effect-source-loader/paths';
+
+export function resolveEffectServerEntryFile(api: ServerPluginAPI) {
+  const { appDirectory, apiDirectory, distDirectory } = api.getServerContext();
+  const appDir = path.resolve(appDirectory || process.cwd());
+  return resolveEffectEntry({
+    appDir,
+    apiDir: path.resolve(appDir, apiDirectory || API_DIR),
+    effectEntry: api.getServerConfig()?.bff?.effect?.entry,
+    distDir:
+      isProd() && distDirectory ? path.resolve(distDirectory) : undefined,
+  }).path;
+}

package/src/{effect-adapter → effect-server}/error-response.ts

@@ -2,7 +2,7 @@ import { createSafeFailureResponse } from '@modern-js/runtime-extensions/safe-fa
 import type { Context, ServerPluginAPI } from '@modern-js/server-core';
 import { logger } from '@modern-js/utils';
 
-export function createEffectAdapterRuntimeErrorResponse(
+export function createEffectServerRuntimeErrorResponse(
   api: ServerPluginAPI,
   error: unknown,
   context: Context,

package/src/effect-server/index.ts

@@ -0,0 +1,242 @@
+// @effect-diagnostics anyUnknownInErrorContext:off asyncFunction:off nodeBuiltinImport:off strictBooleanExpressions:off
+
+import path from 'node:path';
+import '@modern-js/server-runtime-extensions/server-config';
+import {
+  dispatchEffectBffRequest,
+  type EffectApiModule,
+  type EffectBffRequestHandler,
+  resolveEffectBffModuleHandler,
+  useEffectContext,
+} from '@modern-js/bff-effect/effect';
+import type {
+  Context,
+  Next,
+  ServerPlugin,
+  ServerPluginAPI,
+} from '@modern-js/server-core';
+import { resolveOperationProducer } from '@modern-js/server-runtime-extensions/bff-policy/node';
+import {
+  createDisposableServerRuntimeHandle,
+  type DisposableServerRuntimeHandle,
+  registerServerRuntimeDisposer,
+} from '@modern-js/server-runtime-extensions/runtime-lifecycle';
+import { fs, isProd, logger } from '@modern-js/utils';
+
+import { checkCrossProjectPolicyForRequest } from '../cross-project-policy/evaluation';
+import {
+  loadEffectBuiltModule,
+  loadEffectSourceModule,
+} from '../effect-source-loader/loader';
+import { resolveEffectServerCrossProjectPolicy } from './cross-project-policy';
+import { resolveEffectServerEntryFile } from './entry';
+import { createEffectServerRuntimeErrorResponse } from './error-response';
+
+const EFFECT_MIDDLEWARE_BEFORE = [
+  'custom-server-hook',
+  'custom-server-middleware',
+  'render',
+];
+
+export default (): ServerPlugin => ({
+  name: '@modern-js/plugin-bff-extensions/effect-server',
+  setup(api: ServerPluginAPI) {
+    const runtimeFramework = api.getServerContext().bffRuntimeFramework;
+    if (runtimeFramework !== 'effect') {
+      throw new Error(
+        `Effect BFF server plugin requires Effect; received "${runtimeFramework}".`,
+      );
+    }
+    let handler: DisposableServerRuntimeHandle | null = null;
+    let unregisterRuntimeDisposer: (() => void) | undefined;
+    let prefix = '/api';
+    let prefixes = ['/api'];
+    let matchingPrefixes = ['/api'];
+    let retired = false;
+
+    const dispose = async () => {
+      retired = true;
+      unregisterRuntimeDisposer?.();
+      unregisterRuntimeDisposer = undefined;
+      const previous = handler;
+      handler = null;
+      await previous?.dispose();
+    };
+
+    const loadHandler = async () => {
+      const entryFile = resolveEffectServerEntryFile(api);
+      if (!entryFile || !(await fs.pathExists(entryFile))) {
+        handler = null;
+        return;
+      }
+
+      const { appDirectory } = api.getServerContext();
+      let mod: EffectApiModule;
+      try {
+        mod = (await (isProd()
+          ? loadEffectBuiltModule(entryFile)
+          : loadEffectSourceModule({
+              resourcePath: entryFile,
+              appDir: appDirectory || path.dirname(entryFile),
+            }))) as EffectApiModule;
+      } catch (error) {
+        logger.error(
+          `[BFF][Effect] Failed to load Effect entry: ${entryFile}\n${String(error)}`,
+        );
+        throw error;
+      }
+
+      const producer = resolveOperationProducer({
+        directories: [path.dirname(entryFile), appDirectory],
+        requestId: api.getServerConfig()?.bff?.requestId,
+      });
+      const crossProjectPolicies = new Map(
+        await Promise.all(
+          prefixes.map(
+            async prefix =>
+              [
+                prefix,
+                await resolveEffectServerCrossProjectPolicy(
+                  api,
+                  prefix,
+                  mod,
+                  producer,
+                ),
+              ] as const,
+          ),
+        ),
+      );
+      const effectConfig = api.getServerConfig()?.bff?.effect;
+      const loaded = await resolveEffectBffModuleHandler(mod, {
+        openapi: effectConfig?.openapi,
+        dataPlatform: effectConfig?.dataPlatform,
+        validateRequest: request => {
+          const { path: mountedPathname } = useEffectContext();
+          const prefix = matchingPrefixes.find(
+            item =>
+              item === '/' ||
+              mountedPathname === item ||
+              mountedPathname.startsWith(`${item}/`),
+          );
+          if (!prefix) return null;
+          const requestUrl = new URL(request.url);
+          if (prefix !== '/') {
+            requestUrl.pathname =
+              requestUrl.pathname === '/'
+                ? prefix
+                : `${prefix}${requestUrl.pathname}`;
+          }
+          return checkCrossProjectPolicyForRequest(
+            new Request(requestUrl, request),
+            crossProjectPolicies.get(prefix),
+          );
+        },
+        onWarning: message => logger.warn(message),
+      });
+      if (!loaded) {
+        const error = new Error(
+          `[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export defineEffectBff(...) or a { api, layer } HttpApi module.`,
+        );
+        logger.warn(error.message);
+        throw error;
+      }
+      const candidateOwner = {};
+      if (loaded.dispose)
+        registerServerRuntimeDisposer(candidateOwner, loaded.dispose);
+      const candidate = createDisposableServerRuntimeHandle(
+        candidateOwner,
+        loaded.handler,
+      );
+      if (retired) {
+        await candidate.dispose();
+        throw new Error('Cannot initialize a retired Effect server.');
+      }
+      handler = candidate;
+    };
+
+    api.onPrepare(async () => {
+      const { middlewares: globalMiddlewares } = api.getServerContext();
+      const configuredPrefix = api.getServerConfig()?.bff?.prefix;
+      const enableHandleWeb = api.getServerConfig()?.bff?.enableHandleWeb;
+      const configuredPrefixes = Array.isArray(configuredPrefix)
+        ? configuredPrefix.filter(Boolean)
+        : [configuredPrefix || '/api'];
+      prefixes = [
+        ...new Set(
+          configuredPrefixes.length > 0 ? configuredPrefixes : ['/api'],
+        ),
+      ];
+      matchingPrefixes = [...prefixes].sort(
+        (left, right) => right.length - left.length,
+      );
+      prefix = prefixes[0] || '/api';
+      const { serverBase } = api.getServerContext() as { serverBase?: object };
+      if (serverBase)
+        unregisterRuntimeDisposer = registerServerRuntimeDisposer(
+          serverBase,
+          dispose,
+        );
+      try {
+        await loadHandler();
+      } catch (error) {
+        await dispose();
+        throw error;
+      }
+
+      const middlewarePrefixes = enableHandleWeb ? [prefix] : matchingPrefixes;
+      const middlewares = middlewarePrefixes.map(middlewarePrefix => ({
+        name: 'effect-api-handler',
+        path: enableHandleWeb ? '*' : `${middlewarePrefix}/*`,
+        method: 'all' as const,
+        order: 'post' as const,
+        before: EFFECT_MIDDLEWARE_BEFORE,
+        handler: async (context: Context, next: Next) => {
+          const activeHandler = handler;
+          if (!activeHandler) {
+            if (enableHandleWeb) {
+              await next();
+              return;
+            }
+            return createEffectServerRuntimeErrorResponse(
+              api,
+              new Error(
+                '[BFF][Effect] Missing Effect entry. Define api/index or configure bff.effect.entry.',
+              ),
+              context,
+            );
+          }
+
+          const mountedPrefix = enableHandleWeb
+            ? matchingPrefixes.find(
+                item =>
+                  item === '/' ||
+                  context.req.path === item ||
+                  context.req.path.startsWith(`${item}/`),
+              ) || prefix
+            : middlewarePrefix;
+          const response = await dispatchEffectBffRequest(
+            activeHandler as EffectBffRequestHandler,
+            context.req.raw,
+            {
+              prefix: mountedPrefix,
+              env: context.env as Record<string, unknown>,
+              path: context.req.path,
+              method: context.req.method,
+              onError: error =>
+                createEffectServerRuntimeErrorResponse(api, error, context),
+            },
+          );
+
+          if (response.status === 404 && enableHandleWeb) {
+            await next();
+            return;
+          }
+
+          return new Response(response.body, response);
+        },
+      }));
+
+      globalMiddlewares.push(...middlewares);
+    });
+  },
+});

package/src/effect-source-loader/built-entry.ts

@@ -1,8 +1,10 @@
 import { fs, upath as path } from '@modern-js/utils';
 
-import { resolveEffectEntryFile } from './paths';
-
-const BUILT_ENTRY_EXT = /\.(?:[cm]?ts|tsx|jsx)$/u;
+import {
+  emittedEffectEntry,
+  relativeEffectAppPath,
+  resolveEffectEntryFile,
+} from './paths';
 
 export function resolveBuiltEffectEntry(
   appDirectory: string,
@@ -12,15 +14,15 @@ export function resolveBuiltEffectEntry(
   if (sourceEntry === undefined || sourceEntry.length === 0) {
     return undefined;
   }
-  const relativeEntry = path.relative(appDirectory, sourceEntry);
-  if (relativeEntry === '..' || relativeEntry.startsWith(`..${path.sep}`)) {
+  const relativeEntry = relativeEffectAppPath(appDirectory, sourceEntry);
+  if (relativeEntry === undefined) {
     throw new Error(
       `Effect BFF entry must be inside the application directory: ${sourceEntry}`,
     );
   }
-  const builtEntry = path
-    .resolve(distDirectory, relativeEntry)
-    .replace(BUILT_ENTRY_EXT, '.js');
+  const builtEntry = emittedEffectEntry(
+    path.resolve(distDirectory, relativeEntry),
+  );
   return fs.existsSync(builtEntry) ? builtEntry : undefined;
 }
 
@@ -62,7 +64,7 @@ export function resolveEffectEntryPaths(options: {
   });
   const relativeEffectEntry =
     sourceEffectEntry !== undefined && sourceEffectEntry.length > 0
-      ? path.relative(appDir, sourceEffectEntry).replace(BUILT_ENTRY_EXT, '.js')
+      ? emittedEffectEntry(path.relative(appDir, sourceEffectEntry))
       : '';
   return { sourceEffectEntry, relativeEffectEntry };
 }

package/src/effect-source-loader/http-api-runtime.ts

@@ -3,7 +3,7 @@ import {
   type HttpApiLike,
   type HttpApiReflect,
 } from '@modern-js/bff-effect/effect';
-import { HttpApi } from 'effect/unstable/httpapi';
+import { HttpApi } from 'effect/http-api';
 import { loadEffectSourceModule } from './loader';
 
 type HttpApiRuntime = {

package/src/effect-source-loader/loader.ts

@@ -13,7 +13,7 @@ import {
   transform,
 } from 'esbuild';
 
-const NODE_TARGET = 'node26.7';
+const NODE_TARGET = 'node26.10';
 const SOURCE_LOADERS = new Map<string, Loader>([
   ['.js', 'js'],
   ['.jsx', 'jsx'],
@@ -79,6 +79,9 @@ const nodeBuiltins = new Set([
   ...builtinModules.map(name => `node:${name}`),
 ]);
 const dependencyResolutionMarker = 'modern-js-effect-dependency-resolution';
+// The BFF server runs lambdas inside these packages' Effect context storage.
+// A bundled copy would own a second storage that the server never enters.
+const BFF_RUNTIME_PACKAGE = /^@modern-js\/(?:bff-effect|plugin-bff)(?:\/|$)/;
 
 async function isEsmOnlyFile(filename: string) {
   const extension = path.extname(filename).toLowerCase();
@@ -125,10 +128,9 @@ function isBareSpecifier(specifier: string) {
 }
 
 /**
- * Keep installed registry dependencies external while bundling symlinked
- * workspace source packages. Registry packages remain executable from the
- * deployment node_modules tree; workspace TypeScript is bundled so the
- * generated entry is relocatable and directly executable by Node 26.7.
+ * Keep installed executable dependencies external to preserve runtime identity.
+ * Source requiring compilation is bundled even when pnpm injects a workspace
+ * package into node_modules: Node does not strip types inside that directory.
  */
 function externalizeInstalledDependencies(options: {
   runtimeResolveDir: string;
@@ -137,6 +139,9 @@ function externalizeInstalledDependencies(options: {
     name: 'modern-js-effect-installed-dependencies',
     setup(buildApi) {
       buildApi.onResolve({ filter: /.*/ }, async args => {
+        if (BFF_RUNTIME_PACKAGE.test(args.path)) {
+          return { external: true, path: args.path };
+        }
         if (
           !isBareSpecifier(args.path) ||
           nodeBuiltins.has(args.path) ||
@@ -167,7 +172,13 @@ function externalizeInstalledDependencies(options: {
         const realPath = await fs.promises
           .realpath(resolution.path)
           .catch(() => resolution.path);
-        if (realPath.includes(`${path.sep}node_modules${path.sep}`)) {
+        const loader = SOURCE_LOADERS.get(path.extname(realPath).toLowerCase());
+        if (
+          realPath.includes(`${path.sep}node_modules${path.sep}`) &&
+          loader !== 'ts' &&
+          loader !== 'tsx' &&
+          loader !== 'jsx'
+        ) {
           const runtimeResolution = await buildApi.resolve(args.path, {
             importer: '',
             kind: args.kind,

package/src/effect-source-loader/operation-contracts.ts

@@ -4,42 +4,11 @@ import {
 } from '@modern-js/bff-effect/effect';
 import {
   buildOperationContractMap,
-  deriveOperationVersion,
+  resolveOperationProducer,
 } from '@modern-js/server-runtime-extensions/bff-policy/node';
-import { fs, upath as path } from '@modern-js/utils';
+import { upath as path } from '@modern-js/utils';
 import { getHttpApiRuntime, loadEffectApi } from './http-api-runtime';
 
-function getPackageInfo(
-  resourcePath: string,
-  appDir: string,
-  onDependency?: (dependency: string) => void,
-): { name?: string; version?: string } {
-  for (const startDir of [path.dirname(resourcePath), appDir]) {
-    let current = path.resolve(startDir);
-    for (let depth = 0; depth < 32; depth += 1) {
-      const packageJsonPath = path.join(current, 'package.json');
-      if (fs.existsSync(packageJsonPath)) {
-        onDependency?.(packageJsonPath);
-        try {
-          const packageJson = fs.readJSONSync(packageJsonPath) as {
-            name?: string;
-            version?: string;
-          };
-          return { name: packageJson.name, version: packageJson.version };
-        } catch {
-          return {};
-        }
-      }
-      const parent = path.dirname(current);
-      if (parent === current) {
-        break;
-      }
-      current = parent;
-    }
-  }
-  return {};
-}
-
 /** Derives server policy metadata without emitting or typing a client. */
 export async function resolveEffectOperationContracts(options: {
   appDir: string;
@@ -58,15 +27,12 @@ export async function resolveEffectOperationContracts(options: {
     api,
     options.prefix,
   );
-  const packageInfo = getPackageInfo(
-    options.resourcePath,
-    options.appDir,
-    options.onDependency,
-  );
-  const requestId = options.requestId?.trim() || packageInfo.name || 'default';
   return buildOperationContractMap({
     handlers: toOperationContractSources(endpoints),
-    requestId,
-    operationVersion: deriveOperationVersion(packageInfo.version),
+    ...resolveOperationProducer({
+      directories: [path.dirname(options.resourcePath), options.appDir],
+      requestId: options.requestId,
+      onDependency: options.onDependency,
+    }),
   });
 }