test: validate all benchmark scenarios and stress runs for all DI adapters

- Successfully executed all scenarios (register, chain, asyncChain, named, override, etc) for Cherrypick, GetIt, and Riverpod
- Verified correct integration of fully generic DIAdapter & universalRegistration architecture
- Ensured type-safety in all setup/registration flows after complete refactor
- All benchmarks run and pass under stress/load params for each DI adapter

benchmark_di/lib/benchmarks/universal_chain_async_benchmark.dart

@@ -1,6 +1,7 @@
+import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
+import 'package:benchmark_di/scenarios/universal_scenario.dart';
 import 'package:benchmark_harness/benchmark_harness.dart';
 import 'package:benchmark_di/di_adapters/di_adapter.dart';
-import 'package:benchmark_di/scenarios/universal_chain_module.dart';
 import 'package:benchmark_di/scenarios/universal_service.dart';
 
 class UniversalChainAsyncBenchmark<TContainer> extends AsyncBenchmarkBase {

benchmark_di/lib/benchmarks/universal_chain_benchmark.dart

@@ -1,6 +1,7 @@
+import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
+import 'package:benchmark_di/scenarios/universal_scenario.dart';
 import 'package:benchmark_harness/benchmark_harness.dart';
 import 'package:benchmark_di/di_adapters/di_adapter.dart';
-import 'package:benchmark_di/scenarios/universal_chain_module.dart';
 import 'package:benchmark_di/scenarios/universal_service.dart';
 
 class UniversalChainBenchmark<TContainer> extends BenchmarkBase {

benchmark_di/lib/cli/benchmark_cli.dart

@@ -1,11 +1,11 @@
 import 'dart:math';
 
 import 'package:benchmark_di/cli/report/markdown_report.dart';
+import 'package:benchmark_di/scenarios/universal_scenario.dart';
 import 'package:cherrypick/cherrypick.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod/riverpod.dart' as rp;
 
-import '../scenarios/universal_chain_module.dart';
 import 'report/pretty_report.dart';
 import 'report/csv_report.dart';
 import 'report/json_report.dart';

benchmark_di/lib/cli/parser.dart

@@ -1,7 +1,8 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:benchmark_di/scenarios/universal_chain_module.dart';
+import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
+import 'package:benchmark_di/scenarios/universal_scenario.dart';
 
 /// Enum describing all supported Universal DI benchmark types.
 enum UniversalBenchmark {

benchmark_di/lib/di_adapters/cherrypick_adapter.dart

@@ -1,6 +1,129 @@
+import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
+import 'package:benchmark_di/scenarios/universal_scenario.dart';
+import 'package:benchmark_di/scenarios/universal_service.dart';
 import 'package:cherrypick/cherrypick.dart';
 import 'di_adapter.dart';
-import '../scenarios/universal_chain_module.dart';
+
+
+/// Test module that generates a chain of service bindings for benchmarking.
+///
+/// Configurable by chain count, nesting depth, binding mode, and scenario
+/// to support various DI performance tests (singleton, factory, async, etc).
+class UniversalChainModule extends Module {
+  /// Number of chains to create.
+  final int chainCount;
+  /// Depth of each chain.
+  final int nestingDepth;
+  /// How modules are registered (factory/singleton/async).
+  final UniversalBindingMode bindingMode;
+  /// Which di scenario to generate (chained, named, etc).
+  final UniversalScenario scenario;
+
+  /// Constructs a configured test DI module for the benchmarks.
+  UniversalChainModule({
+    required this.chainCount,
+    required this.nestingDepth,
+    this.bindingMode = UniversalBindingMode.singletonStrategy,
+    this.scenario = UniversalScenario.chain,
+  });
+
+  @override
+  void builder(Scope currentScope) {
+    if (scenario == UniversalScenario.asyncChain) {
+      // Generate async chain with singleton async bindings.
+      for (var chainIndex = 0; chainIndex < chainCount; chainIndex++) {
+        for (var levelIndex = 0; levelIndex < nestingDepth; levelIndex++) {
+          final chain = chainIndex + 1;
+          final level = levelIndex + 1;
+          final prevDepName = '${chain}_${level - 1}';
+          final depName = '${chain}_$level';
+          bind<UniversalService>()
+            .toProvideAsync(() async {
+              final prev = level > 1
+                  ? await currentScope.resolveAsync<UniversalService>(named: prevDepName)
+                  : null;
+              return UniversalServiceImpl(
+                value: depName,
+                dependency: prev,
+              );
+            })
+            .withName(depName)
+            .singleton();
+        }
+      }
+      return;
+    }
+
+    switch (scenario) {
+      case UniversalScenario.register:
+        // Simple singleton registration.
+        bind<UniversalService>()
+            .toProvide(() => UniversalServiceImpl(value: 'reg', dependency: null))
+            .singleton();
+        break;
+      case UniversalScenario.named:
+        // Named factory registration for two distinct objects.
+        bind<UniversalService>().toProvide(() => UniversalServiceImpl(value: 'impl1')).withName('impl1');
+        bind<UniversalService>().toProvide(() => UniversalServiceImpl(value: 'impl2')).withName('impl2');
+        break;
+      case UniversalScenario.chain:
+        // Chain of nested services, with dependency on previous level by name.
+        for (var chainIndex = 0; chainIndex < chainCount; chainIndex++) {
+          for (var levelIndex = 0; levelIndex < nestingDepth; levelIndex++) {
+            final chain = chainIndex + 1;
+            final level = levelIndex + 1;
+            final prevDepName = '${chain}_${level - 1}';
+            final depName = '${chain}_$level';
+            switch (bindingMode) {
+              case UniversalBindingMode.singletonStrategy:
+                bind<UniversalService>()
+                    .toProvide(() => UniversalServiceImpl(
+                          value: depName,
+                          dependency: currentScope.tryResolve<UniversalService>(named: prevDepName),
+                        ))
+                    .withName(depName)
+                    .singleton();
+                break;
+              case UniversalBindingMode.factoryStrategy:
+                bind<UniversalService>()
+                    .toProvide(() => UniversalServiceImpl(
+                          value: depName,
+                          dependency: currentScope.tryResolve<UniversalService>(named: prevDepName),
+                        ))
+                    .withName(depName);
+                break;
+              case UniversalBindingMode.asyncStrategy:
+                bind<UniversalService>()
+                    .toProvideAsync(() async => UniversalServiceImpl(
+                          value: depName,
+                          dependency: await currentScope.resolveAsync<UniversalService>(named: prevDepName),
+                        ))
+                    .withName(depName)
+                    .singleton();
+                break;
+            }
+          }
+        }
+        // Регистрация алиаса без имени (на последний элемент цепочки)
+        final depName = '${chainCount}_$nestingDepth';
+        bind<UniversalService>()
+            .toProvide(() => currentScope.resolve<UniversalService>(named: depName))
+            .singleton();
+        break;
+      case UniversalScenario.override:
+        // handled at benchmark level, но алиас нужен прямо в этом scope!
+        final depName = '${chainCount}_$nestingDepth';
+        bind<UniversalService>()
+            .toProvide(() => currentScope.resolve<UniversalService>(named: depName))
+            .singleton();
+        break;
+      case UniversalScenario.asyncChain:
+        // already handled above
+        break;
+    }
+  }
+}
+
 
 class CherrypickDIAdapter extends DIAdapter<Scope> {
   Scope? _scope;

benchmark_di/lib/di_adapters/di_adapter.dart

@@ -1,5 +1,4 @@
-import 'package:benchmark_di/scenarios/universal_chain_module.dart';
+import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
-
 /// Универсальная абстракция для DI-адаптера с унифицированной функцией регистрации.
 /// Теперь для каждого адаптера задаём строгий generic тип контейнера.
 typedef Registration<TContainer> = void Function(TContainer);

benchmark_di/lib/di_adapters/get_it_adapter.dart

@@ -1,4 +1,5 @@
-import 'package:benchmark_di/scenarios/universal_chain_module.dart';
+import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
+import 'package:benchmark_di/scenarios/universal_scenario.dart';
 import 'package:benchmark_di/scenarios/universal_service.dart';
 import 'package:get_it/get_it.dart';
 import 'di_adapter.dart';

benchmark_di/lib/di_adapters/riverpod_adapter.dart

@@ -1,4 +1,5 @@
-import 'package:benchmark_di/scenarios/universal_chain_module.dart';
+import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
+import 'package:benchmark_di/scenarios/universal_scenario.dart';
 import 'package:benchmark_di/scenarios/universal_service.dart';
 import 'package:riverpod/riverpod.dart' as rp;
 import 'di_adapter.dart';

benchmark_di/lib/scenarios/universal_binding_mode.dart

@@ -0,0 +1,11 @@
+/// Enum to represent the DI registration/binding mode.
+enum UniversalBindingMode {
+  /// Singleton/provider binding.
+  singletonStrategy,
+
+  /// Factory-based binding.
+  factoryStrategy,
+
+  /// Async-based binding.
+  asyncStrategy,
+}

benchmark_di/lib/scenarios/universal_chain_module.dart

@@ -1,147 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-import 'universal_service.dart';
-
-/// Enum to represent the DI registration/binding mode.
-enum UniversalBindingMode {
-  /// Singleton/provider binding.
-  singletonStrategy,
-
-  /// Factory-based binding.
-  factoryStrategy,
-
-  /// Async-based binding.
-  asyncStrategy,
-}
-
-/// Enum to represent which scenario is constructed for the benchmark.
-enum UniversalScenario {
-  /// Single registration.
-  register,
-  /// Chain of dependencies.
-  chain,
-  /// Named registrations.
-  named,
-  /// Child-scope override scenario.
-  override,
-  /// Asynchronous chain scenario.
-  asyncChain,
-}
-
-/// Test module that generates a chain of service bindings for benchmarking.
-///
-/// Configurable by chain count, nesting depth, binding mode, and scenario
-/// to support various DI performance tests (singleton, factory, async, etc).
-class UniversalChainModule extends Module {
-  /// Number of chains to create.
-  final int chainCount;
-  /// Depth of each chain.
-  final int nestingDepth;
-  /// How modules are registered (factory/singleton/async).
-  final UniversalBindingMode bindingMode;
-  /// Which di scenario to generate (chained, named, etc).
-  final UniversalScenario scenario;
-
-  /// Constructs a configured test DI module for the benchmarks.
-  UniversalChainModule({
-    required this.chainCount,
-    required this.nestingDepth,
-    this.bindingMode = UniversalBindingMode.singletonStrategy,
-    this.scenario = UniversalScenario.chain,
-  });
-
-  @override
-  void builder(Scope currentScope) {
-    if (scenario == UniversalScenario.asyncChain) {
-      // Generate async chain with singleton async bindings.
-      for (var chainIndex = 0; chainIndex < chainCount; chainIndex++) {
-        for (var levelIndex = 0; levelIndex < nestingDepth; levelIndex++) {
-          final chain = chainIndex + 1;
-          final level = levelIndex + 1;
-          final prevDepName = '${chain}_${level - 1}';
-          final depName = '${chain}_$level';
-          bind<UniversalService>()
-            .toProvideAsync(() async {
-              final prev = level > 1
-                  ? await currentScope.resolveAsync<UniversalService>(named: prevDepName)
-                  : null;
-              return UniversalServiceImpl(
-                value: depName,
-                dependency: prev,
-              );
-            })
-            .withName(depName)
-            .singleton();
-        }
-      }
-      return;
-    }
-
-    switch (scenario) {
-      case UniversalScenario.register:
-        // Simple singleton registration.
-        bind<UniversalService>()
-            .toProvide(() => UniversalServiceImpl(value: 'reg', dependency: null))
-            .singleton();
-        break;
-      case UniversalScenario.named:
-        // Named factory registration for two distinct objects.
-        bind<UniversalService>().toProvide(() => UniversalServiceImpl(value: 'impl1')).withName('impl1');
-        bind<UniversalService>().toProvide(() => UniversalServiceImpl(value: 'impl2')).withName('impl2');
-        break;
-      case UniversalScenario.chain:
-        // Chain of nested services, with dependency on previous level by name.
-        for (var chainIndex = 0; chainIndex < chainCount; chainIndex++) {
-          for (var levelIndex = 0; levelIndex < nestingDepth; levelIndex++) {
-            final chain = chainIndex + 1;
-            final level = levelIndex + 1;
-            final prevDepName = '${chain}_${level - 1}';
-            final depName = '${chain}_$level';
-            switch (bindingMode) {
-              case UniversalBindingMode.singletonStrategy:
-                bind<UniversalService>()
-                    .toProvide(() => UniversalServiceImpl(
-                          value: depName,
-                          dependency: currentScope.tryResolve<UniversalService>(named: prevDepName),
-                        ))
-                    .withName(depName)
-                    .singleton();
-                break;
-              case UniversalBindingMode.factoryStrategy:
-                bind<UniversalService>()
-                    .toProvide(() => UniversalServiceImpl(
-                          value: depName,
-                          dependency: currentScope.tryResolve<UniversalService>(named: prevDepName),
-                        ))
-                    .withName(depName);
-                break;
-              case UniversalBindingMode.asyncStrategy:
-                bind<UniversalService>()
-                    .toProvideAsync(() async => UniversalServiceImpl(
-                          value: depName,
-                          dependency: await currentScope.resolveAsync<UniversalService>(named: prevDepName),
-                        ))
-                    .withName(depName)
-                    .singleton();
-                break;
-            }
-          }
-        }
-        // Регистрация алиаса без имени (на последний элемент цепочки)
-        final depName = '${chainCount}_$nestingDepth';
-        bind<UniversalService>()
-            .toProvide(() => currentScope.resolve<UniversalService>(named: depName))
-            .singleton();
-        break;
-      case UniversalScenario.override:
-        // handled at benchmark level, но алиас нужен прямо в этом scope!
-        final depName = '${chainCount}_$nestingDepth';
-        bind<UniversalService>()
-            .toProvide(() => currentScope.resolve<UniversalService>(named: depName))
-            .singleton();
-        break;
-      case UniversalScenario.asyncChain:
-        // already handled above
-        break;
-    }
-  }
-}

benchmark_di/lib/scenarios/universal_scenario.dart

@@ -0,0 +1,13 @@
+/// Enum to represent which scenario is constructed for the benchmark.
+enum UniversalScenario {
+  /// Single registration.
+  register,
+  /// Chain of dependencies.
+  chain,
+  /// Named registrations.
+  named,
+  /// Child-scope override scenario.
+  override,
+  /// Asynchronous chain scenario.
+  asyncChain,
+}