diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a45d66..bb3c326 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,51 +10,42 @@ on:
 
 jobs:
     dart_format:
-        name: Dart format
+        name: Dart format check
         strategy:
+            fail-fast: false
             matrix:
-                dart: [3.3, 3.6]
+                dart: [3.3, 3.9]
                 package: [cli_tools, config]
         runs-on: ubuntu-latest
+        defaults:
+          run:
+            working-directory: packages/${{ matrix.package }}
         steps:
             - uses: actions/checkout@v4
             - uses: dart-lang/setup-dart@v1.7.1
               with:
                 sdk: ${{ matrix.dart }}
-            - name: Verify formatting ${{ matrix.package }}
-              run: dart format --output=none --set-exit-if-changed .
-              working-directory: packages/${{ matrix.package }}
 
-    dart_analyze:
-        name: Dart Analyze
-        strategy:
-            matrix:
-                dart: [3.3, 3.6]
-                package: [cli_tools, config]
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-            - uses: dart-lang/setup-dart@v1.7.1
-              with:
-                sdk: ${{ matrix.dart }}
-            - name: Dart get and analyze ${{ matrix.package }}
-              run: |
-                dart pub get
-                dart analyze --fatal-infos
-              working-directory: packages/${{ matrix.package }}
+            - run: dart pub get
+            - run: dart format --output=none --set-exit-if-changed .
 
-    dart_test:
-        name: Dart Test
+    dart_analyze_test:
+        name: Dart Analyze and Test
         strategy:
+            fail-fast: false
             matrix:
-                dart: [3.3, 3.6]
+                dart: [3.3, 3.9]
                 package: [cli_tools, config]
         runs-on: ubuntu-latest
+        defaults:
+          run:
+            working-directory: packages/${{ matrix.package }}
         steps:
             - uses: actions/checkout@v4
             - uses: dart-lang/setup-dart@v1.7.1
               with:
                 sdk: ${{ matrix.dart }}
-            - name: Dart test ${{ matrix.package }}
-              run: dart test
-              working-directory: packages/${{ matrix.package }}
+
+            - run: dart pub get
+            - run: dart analyze --fatal-infos
+            - run: dart test
diff --git a/.github/workflows/publish-cli_tools.yaml b/.github/workflows/publish-cli_tools.yaml
index 97342f5..b0878fb 100644
--- a/.github/workflows/publish-cli_tools.yaml
+++ b/.github/workflows/publish-cli_tools.yaml
@@ -4,7 +4,8 @@ on:
     push:
         tags:
             # Matches tags like cli_tools-v1.2.3 and cli_tools-v1.2.3-pre.1
-            - 'cli_tools-v[0-9]+.[0-9]+.[0-9]+*'
+            - 'cli_tools-v[0-9]+.[0-9]+.[0-9]+'
+            - 'cli_tools-v[0-9]+.[0-9]+.[0-9]+-*'
 
 jobs:
     publish:
diff --git a/.github/workflows/publish-config.yaml b/.github/workflows/publish-config.yaml
index 8e33bdd..31fedb3 100644
--- a/.github/workflows/publish-config.yaml
+++ b/.github/workflows/publish-config.yaml
@@ -4,7 +4,8 @@ on:
     push:
         tags:
             # Matches tags like config-v1.2.3 and config-v1.2.3-pre.1
-            - 'config-v[0-9]+.[0-9]+.[0-9]+*'
+            - 'config-v[0-9]+.[0-9]+.[0-9]+'
+            - 'config-v[0-9]+.[0-9]+.[0-9]+-*'
 
 jobs:
     publish:
diff --git a/README.md b/README.md
index e4213b8..c1a18ab 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,11 @@ They are actively maintained and used by the Serverpod team.
 
 ### cli_tools
 
-The [cli_tools package](packages/cli_tools/README.md) offers several utilities for CLI development, for example: terminal logging, user-input prompting, and usage-analytics collection.
+The [cli_tools package](packages/cli_tools/) offers several utilities for CLI development, for example: terminal logging, user-input prompting, and usage-analytics collection.
 
 ### config
 
-The [config package](packages/config/README.md) provides comprehensive
+The [config package](packages/config/) provides comprehensive
 configuration ingestion and validation, including typed command line options,
 environment variables, and configuration files as input, and better error
 reporting.
diff --git a/packages/cli_tools/analysis_options.yaml b/packages/cli_tools/analysis_options.yaml
index 3ce6aff..bcc9d5b 100644
--- a/packages/cli_tools/analysis_options.yaml
+++ b/packages/cli_tools/analysis_options.yaml
@@ -1,12 +1,5 @@
 include: package:serverpod_lints/cli.yaml
 
-analyzer:
-  language:
-    strict-raw-types: false
-  errors:
-    inference_failure_on_instance_creation: ignore
-    inference_failure_on_function_invocation: ignore
-
 linter:
   rules:
     prefer_relative_imports: true
diff --git a/packages/cli_tools/example/main.dart b/packages/cli_tools/example/main.dart
index 7b44ac4..d91ba8b 100644
--- a/packages/cli_tools/example/main.dart
+++ b/packages/cli_tools/example/main.dart
@@ -2,7 +2,7 @@ import 'package:cli_tools/cli_tools.dart';
 import 'package:config/config.dart';
 
 Future<int> main(final List<String> args) async {
-  final commandRunner = BetterCommandRunner(
+  final commandRunner = BetterCommandRunner<OptionDefinition<Object>, void>(
     'example',
     'Example CLI command',
     globalOptions: [
@@ -47,7 +47,7 @@ Future<int> main(final List<String> args) async {
 ///
 /// The enum approach is more distinct and type safe.
 /// The list approach is more dynamic and permits non-const initialization.
-enum TimeSeriesOption<V> implements OptionDefinition<V> {
+enum TimeSeriesOption<V extends Object> implements OptionDefinition<V> {
   until(DateTimeOption(
     argName: 'until',
     envName: 'SERIES_UNTIL', // can also be specified as environment variable
diff --git a/packages/cli_tools/example/simple_command_example.dart b/packages/cli_tools/example/simple_command_example.dart
index 95b4fe2..2787cb8 100644
--- a/packages/cli_tools/example/simple_command_example.dart
+++ b/packages/cli_tools/example/simple_command_example.dart
@@ -14,7 +14,7 @@ import 'package:config/config.dart';
 /// INTERVAL=1s dart run example/simple_command_example.dart show
 /// ```
 Future<int> main(final List<String> args) async {
-  final commandRunner = BetterCommandRunner(
+  final commandRunner = BetterCommandRunner<OptionDefinition<Object>, void>(
     'example',
     'Example CLI command',
   );
@@ -29,7 +29,7 @@ Future<int> main(final List<String> args) async {
   return 0;
 }
 
-enum ShowOption<V> implements OptionDefinition<V> {
+enum ShowOption<V extends Object> implements OptionDefinition<V> {
   interval(DurationOption(
     argName: 'interval',
     argAbbrev: 'i',
diff --git a/packages/cli_tools/lib/src/better_command_runner/better_command_runner.dart b/packages/cli_tools/lib/src/better_command_runner/better_command_runner.dart
index 0397b3e..21f65b8 100644
--- a/packages/cli_tools/lib/src/better_command_runner/better_command_runner.dart
+++ b/packages/cli_tools/lib/src/better_command_runner/better_command_runner.dart
@@ -6,7 +6,8 @@ import 'package:args/command_runner.dart';
 import 'package:config/config.dart';
 
 /// A function type for executing code before running a command.
-typedef OnBeforeRunCommand = Future<void> Function(BetterCommandRunner runner);
+typedef OnBeforeRunCommand<O extends OptionDefinition<Object>, T> = Future<void>
+    Function(BetterCommandRunner<O, T> runner);
 
 /// A proxy for user-provided functions for passing specific log messages.
 ///
@@ -54,7 +55,7 @@ typedef OnAnalyticsEvent = void Function(String event);
 /// The [BetterCommandRunner] class uses the config library to provide
 /// a more enhanced command line interface for running commands and handling
 /// command line arguments, environment variables, and configuration.
-class BetterCommandRunner<O extends OptionDefinition, T>
+class BetterCommandRunner<O extends OptionDefinition<Object>, T>
     extends CommandRunner<T> {
   /// Process exit code value for command not found -
   /// The specified command was not found or couldn't be located.
@@ -62,7 +63,7 @@ class BetterCommandRunner<O extends OptionDefinition, T>
 
   final MessageOutput? _messageOutput;
   final SetLogLevel? _setLogLevel;
-  final OnBeforeRunCommand? _onBeforeRunCommand;
+  final OnBeforeRunCommand<O, T>? _onBeforeRunCommand;
   OnAnalyticsEvent? _onAnalyticsEvent;
 
   /// The environment variables used for configuration resolution.
@@ -143,7 +144,7 @@ class BetterCommandRunner<O extends OptionDefinition, T>
     final MessageOutput? messageOutput =
         const MessageOutput(usageLogger: print),
     final SetLogLevel? setLogLevel,
-    final OnBeforeRunCommand? onBeforeRunCommand,
+    final OnBeforeRunCommand<O, T>? onBeforeRunCommand,
     final OnAnalyticsEvent? onAnalyticsEvent,
     final int? wrapTextColumn,
     final List<O>? globalOptions,
@@ -360,7 +361,7 @@ abstract class BetterCommandRunnerFlags {
   );
 }
 
-enum StandardGlobalOption<V> implements OptionDefinition<V> {
+enum StandardGlobalOption<V extends Object> implements OptionDefinition<V> {
   quiet(BetterCommandRunnerFlags.quietOption),
   verbose(BetterCommandRunnerFlags.verboseOption),
   analytics(BetterCommandRunnerFlags.analyticsOption);
diff --git a/packages/cli_tools/lib/src/documentation_generator/documentation_generator.dart b/packages/cli_tools/lib/src/documentation_generator/documentation_generator.dart
index e0143ed..b9447c2 100644
--- a/packages/cli_tools/lib/src/documentation_generator/documentation_generator.dart
+++ b/packages/cli_tools/lib/src/documentation_generator/documentation_generator.dart
@@ -1,7 +1,9 @@
+import 'package:config/config.dart' show OptionDefinition;
+
 import '../../better_command_runner.dart' show BetterCommandRunner;
 
 class CommandDocumentationGenerator {
-  final BetterCommandRunner commandRunner;
+  final BetterCommandRunner<OptionDefinition<Object>, void> commandRunner;
 
   CommandDocumentationGenerator(this.commandRunner);
 
diff --git a/packages/cli_tools/pubspec.yaml b/packages/cli_tools/pubspec.yaml
index 5153d0e..0576fbe 100644
--- a/packages/cli_tools/pubspec.yaml
+++ b/packages/cli_tools/pubspec.yaml
@@ -25,6 +25,6 @@ dependencies:
   super_string: ^1.0.3
 
 dev_dependencies:
-  serverpod_lints: '>=1.2.6'
-  test: ^1.24.0
-  test_descriptor: ^2.0.2
+  serverpod_lints: '>=2.7.0'
+  test: ^1.25.0
+  test_descriptor: ^2.0.0
diff --git a/packages/cli_tools/test/better_command_runner/analytics_test.dart b/packages/cli_tools/test/better_command_runner/analytics_test.dart
index fc99d82..5a3f23c 100644
--- a/packages/cli_tools/test/better_command_runner/analytics_test.dart
+++ b/packages/cli_tools/test/better_command_runner/analytics_test.dart
@@ -2,11 +2,12 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:cli_tools/better_command_runner.dart';
+import 'package:config/config.dart' show OptionDefinition;
 import 'package:test/test.dart';
 
 import '../test_utils/test_utils.dart' show flushEventQueue;
 
-class MockCommand extends Command {
+class MockCommand extends Command<void> {
   static String commandName = 'mock-command';
 
   @override
@@ -27,7 +28,7 @@ class MockCommand extends Command {
   }
 }
 
-class CompletableMockCommand extends Command {
+class CompletableMockCommand extends Command<void> {
   static String commandName = 'completable-mock-command';
 
   @override
@@ -53,9 +54,9 @@ class CompletableMockCommand extends Command {
 }
 
 void main() {
-  late BetterCommandRunner runner;
+  late BetterCommandRunner<OptionDefinition<Object>, void> runner;
   group('Given runner with null onAnalyticsEvent callback', () {
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'this is a test cli',
       onAnalyticsEvent: null,
@@ -75,7 +76,7 @@ void main() {
   });
 
   group('Given runner with onAnalyticsEvent callback defined', () {
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'this is a test cli',
       onAnalyticsEvent: (final event) {},
@@ -94,7 +95,7 @@ void main() {
   group('Given runner with analytics enabled', () {
     List<String> events = [];
     setUp(() {
-      runner = BetterCommandRunner(
+      runner = BetterCommandRunner<OptionDefinition<Object>, void>(
         'test',
         'this is a test cli',
         onAnalyticsEvent: (final event) => events.add(event),
@@ -207,7 +208,7 @@ void main() {
   group('Given runner with registered command and analytics enabled', () {
     List<String> events = [];
     setUp(() {
-      runner = BetterCommandRunner(
+      runner = BetterCommandRunner<OptionDefinition<Object>, void>(
         'test',
         'this is a test cli',
         onAnalyticsEvent: (final event) => events.add(event),
@@ -272,7 +273,7 @@ void main() {
     late CompletableMockCommand command;
     setUp(() {
       command = CompletableMockCommand();
-      runner = BetterCommandRunner(
+      runner = BetterCommandRunner<OptionDefinition<Object>, void>(
         'test',
         'this is a test cli',
         onAnalyticsEvent: (final event) => events.add(event),
diff --git a/packages/cli_tools/test/better_command_runner/better_command_test.dart b/packages/cli_tools/test/better_command_runner/better_command_test.dart
index 5dfb8fc..c4d8663 100644
--- a/packages/cli_tools/test/better_command_runner/better_command_test.dart
+++ b/packages/cli_tools/test/better_command_runner/better_command_test.dart
@@ -4,7 +4,7 @@ import 'package:cli_tools/better_command_runner.dart';
 import 'package:config/config.dart';
 import 'package:test/test.dart';
 
-enum BespokeGlobalOption<V> implements OptionDefinition<V> {
+enum BespokeGlobalOption<V extends Object> implements OptionDefinition<V> {
   quiet(BetterCommandRunnerFlags.quietOption),
   verbose(BetterCommandRunnerFlags.verboseOption),
   analytics(BetterCommandRunnerFlags.analyticsOption),
@@ -16,7 +16,7 @@ enum BespokeGlobalOption<V> implements OptionDefinition<V> {
   final ConfigOptionBase<V> option;
 }
 
-class MockCommand extends BetterCommand {
+class MockCommand extends BetterCommand<OptionDefinition<Object>, void> {
   static String commandName = 'mock-command';
 
   MockCommand({super.messageOutput})
@@ -38,7 +38,9 @@ class MockCommand extends BetterCommand {
   Future<void> run() async {}
 
   @override
-  FutureOr? runWithConfig(final Configuration<OptionDefinition> commandConfig) {
+  FutureOr<void>? runWithConfig(
+    final Configuration<OptionDefinition<Object>> commandConfig,
+  ) {
     throw UnimplementedError();
   }
 }
@@ -56,7 +58,7 @@ void main() {
     final betterCommand = MockCommand(
       messageOutput: messageOutput,
     );
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'test project',
       onAnalyticsEvent: (final e) => analyticsEvents.add(e),
@@ -97,7 +99,7 @@ void main() {
         'then help analytics is sent', () async {
       await runner.run(['--help']);
 
-      await Future.delayed(const Duration(milliseconds: 100));
+      await Future<void>.delayed(const Duration(milliseconds: 100));
       expect(analyticsEvents, hasLength(1));
       expect(analyticsEvents.single, 'help');
     });
@@ -107,7 +109,7 @@ void main() {
         'then help analytics is sent', () async {
       await runner.run(['help']);
 
-      await Future.delayed(const Duration(milliseconds: 100));
+      await Future<void>.delayed(const Duration(milliseconds: 100));
       expect(analyticsEvents, hasLength(1));
       expect(analyticsEvents.single, 'help');
     });
@@ -117,7 +119,7 @@ void main() {
         'then subcommand analytics is sent', () async {
       await runner.run([MockCommand.commandName]);
 
-      await Future.delayed(const Duration(milliseconds: 100));
+      await Future<void>.delayed(const Duration(milliseconds: 100));
       expect(analyticsEvents, hasLength(1));
       expect(analyticsEvents.single, 'mock-command');
     });
@@ -127,7 +129,7 @@ void main() {
         'then invalid command analytics is sent', () async {
       await runner.run(['no-such-command']).catchError((final _) {});
 
-      await Future.delayed(const Duration(milliseconds: 100));
+      await Future<void>.delayed(const Duration(milliseconds: 100));
       expect(analyticsEvents, hasLength(1));
       expect(analyticsEvents.single, 'invalid');
     });
@@ -138,7 +140,7 @@ void main() {
         'then subcommand analytics is not sent', () async {
       await runner.run([MockCommand.commandName, '--no-analytics']);
 
-      await Future.delayed(const Duration(milliseconds: 100));
+      await Future<void>.delayed(const Duration(milliseconds: 100));
       expect(analyticsEvents, isEmpty);
     });
   });
@@ -155,7 +157,7 @@ void main() {
     final betterCommand = MockCommand(
       messageOutput: messageOutput,
     );
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'test project',
       onAnalyticsEvent: (final e) => analyticsEvents.add(e),
@@ -205,7 +207,7 @@ void main() {
     final betterCommand = MockCommand(
       messageOutput: messageOutput,
     );
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'test project',
       messageOutput: messageOutput,
@@ -254,7 +256,7 @@ void main() {
     final betterCommand = MockCommand(
       messageOutput: messageOutput,
     );
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'test project',
       globalOptions: BespokeGlobalOption.values,
diff --git a/packages/cli_tools/test/better_command_runner/command_test.dart b/packages/cli_tools/test/better_command_runner/command_test.dart
index 49a9958..aa065ca 100644
--- a/packages/cli_tools/test/better_command_runner/command_test.dart
+++ b/packages/cli_tools/test/better_command_runner/command_test.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:cli_tools/better_command_runner.dart';
+import 'package:config/config.dart' show OptionDefinition;
 import 'package:test/test.dart';
 
 class MockCommand extends Command<void> {
@@ -33,7 +34,7 @@ class MockCommand extends Command<void> {
 }
 
 void main() {
-  late BetterCommandRunner runner;
+  late BetterCommandRunner<OptionDefinition<Object>, void> runner;
   late MockCommand mockCommand;
   group('Given runner with registered command', () {
     setUp(() {
diff --git a/packages/cli_tools/test/better_command_runner/default_flags_test.dart b/packages/cli_tools/test/better_command_runner/default_flags_test.dart
index 6a8fbcd..471497d 100644
--- a/packages/cli_tools/test/better_command_runner/default_flags_test.dart
+++ b/packages/cli_tools/test/better_command_runner/default_flags_test.dart
@@ -1,9 +1,10 @@
 import 'package:cli_tools/better_command_runner.dart';
+import 'package:config/config.dart' show OptionDefinition;
 import 'package:test/test.dart';
 
 void main() {
   group('Given BetterCommandRunner runner with onAnalyticsEvent', () {
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'test description',
       onAnalyticsEvent: (final event) {},
diff --git a/packages/cli_tools/test/better_command_runner/exit_exceptions_test.dart b/packages/cli_tools/test/better_command_runner/exit_exceptions_test.dart
index eecbe87..52b2276 100644
--- a/packages/cli_tools/test/better_command_runner/exit_exceptions_test.dart
+++ b/packages/cli_tools/test/better_command_runner/exit_exceptions_test.dart
@@ -1,8 +1,9 @@
 import 'package:args/command_runner.dart';
 import 'package:cli_tools/better_command_runner.dart';
+import 'package:config/config.dart' show OptionDefinition;
 import 'package:test/test.dart';
 
-class MockCommand extends Command {
+class MockCommand extends Command<void> {
   static String commandName = 'mock-command';
 
   @override
@@ -28,8 +29,10 @@ class MockCommand extends Command {
 
 void main() {
   group('Given runner with registered command', () {
-    final runner = BetterCommandRunner('test', 'this is a test cli')
-      ..addCommand(MockCommand());
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
+      'test',
+      'this is a test cli',
+    )..addCommand(MockCommand());
 
     test(
       'when running with unknown command then UsageException is thrown.',
diff --git a/packages/cli_tools/test/better_command_runner/logging_test.dart b/packages/cli_tools/test/better_command_runner/logging_test.dart
index 7a08aaf..7a8b86a 100644
--- a/packages/cli_tools/test/better_command_runner/logging_test.dart
+++ b/packages/cli_tools/test/better_command_runner/logging_test.dart
@@ -1,8 +1,9 @@
 import 'package:args/command_runner.dart';
 import 'package:cli_tools/better_command_runner.dart';
+import 'package:config/config.dart' show OptionDefinition;
 import 'package:test/test.dart';
 
-class MockCommand extends Command {
+class MockCommand extends Command<void> {
   static String commandName = 'mock-command';
 
   @override
@@ -30,7 +31,7 @@ void main() {
   group('Given runner with registered command and logging monitor', () {
     final errors = <String>[];
     final infos = <String>[];
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'this is a test cli',
       messageOutput: MessageOutput(
diff --git a/packages/cli_tools/test/better_command_runner/parse_log_level_test.dart b/packages/cli_tools/test/better_command_runner/parse_log_level_test.dart
index dd133fc..53e9167 100644
--- a/packages/cli_tools/test/better_command_runner/parse_log_level_test.dart
+++ b/packages/cli_tools/test/better_command_runner/parse_log_level_test.dart
@@ -1,8 +1,9 @@
 import 'package:args/command_runner.dart';
 import 'package:cli_tools/better_command_runner.dart';
+import 'package:config/config.dart' show OptionDefinition;
 import 'package:test/test.dart';
 
-class MockCommand extends Command {
+class MockCommand extends Command<void> {
   static String commandName = 'mock-command';
 
   @override
@@ -24,7 +25,7 @@ void main() {
     logLevel = null;
   });
   group('Given runner with setLogLevel callback', () {
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'this is a test cli',
       messageOutput: const MessageOutput(),
@@ -92,7 +93,7 @@ void main() {
   });
 
   group('Given runner with setLogLevel callback and registered command', () {
-    final runner = BetterCommandRunner(
+    final runner = BetterCommandRunner<OptionDefinition<Object>, void>(
       'test',
       'this is a test cli',
       setLogLevel: ({
diff --git a/packages/cli_tools/test/documentation_generator/generate_markdown_test.dart b/packages/cli_tools/test/documentation_generator/generate_markdown_test.dart
index b2bd4df..c51c7f5 100644
--- a/packages/cli_tools/test/documentation_generator/generate_markdown_test.dart
+++ b/packages/cli_tools/test/documentation_generator/generate_markdown_test.dart
@@ -5,7 +5,7 @@ import 'package:cli_tools/cli_tools.dart';
 import 'package:config/config.dart' show Configuration, OptionDefinition;
 import 'package:test/test.dart';
 
-class AddSpiceCommand extends Command {
+class AddSpiceCommand extends Command<void> {
   @override
   final String name = 'add';
 
@@ -21,7 +21,7 @@ class AddSpiceCommand extends Command {
   void run() {}
 }
 
-class RemoveSpiceCommand extends Command {
+class RemoveSpiceCommand extends Command<void> {
   @override
   final String name = 'remove';
 
@@ -37,7 +37,7 @@ class RemoveSpiceCommand extends Command {
   void run() {}
 }
 
-class AddVegetableCommand extends Command {
+class AddVegetableCommand extends Command<void> {
   @override
   final String name = 'add';
 
@@ -52,7 +52,7 @@ class AddVegetableCommand extends Command {
   void run() {}
 }
 
-class SpiceCommand extends BetterCommand {
+class SpiceCommand extends BetterCommand<OptionDefinition<Object>, void> {
   @override
   final String name = 'spice';
 
@@ -68,12 +68,14 @@ class SpiceCommand extends BetterCommand {
   void run() {}
 
   @override
-  FutureOr? runWithConfig(final Configuration<OptionDefinition> commandConfig) {
+  FutureOr<void>? runWithConfig(
+    final Configuration<OptionDefinition<Object>> commandConfig,
+  ) {
     throw UnimplementedError();
   }
 }
 
-class VegetableCommand extends BetterCommand {
+class VegetableCommand extends BetterCommand<OptionDefinition<Object>, void> {
   @override
   final String name = 'vegetable';
 
@@ -88,7 +90,9 @@ class VegetableCommand extends BetterCommand {
   void run() {}
 
   @override
-  FutureOr? runWithConfig(final Configuration<OptionDefinition> commandConfig) {
+  FutureOr<void>? runWithConfig(
+    final Configuration<OptionDefinition<Object>> commandConfig,
+  ) {
     throw UnimplementedError();
   }
 }
@@ -98,10 +102,12 @@ void main() {
     late Map<String, String> output;
 
     setUpAll(() async {
-      final commandRunner =
-          BetterCommandRunner('cookcli', 'A cli to create wonderful dishes.')
-            ..addCommand(SpiceCommand())
-            ..addCommand(VegetableCommand());
+      final commandRunner = BetterCommandRunner<OptionDefinition<Object>, void>(
+        'cookcli',
+        'A cli to create wonderful dishes.',
+      )
+        ..addCommand(SpiceCommand())
+        ..addCommand(VegetableCommand());
       final generator = CommandDocumentationGenerator(commandRunner);
       output = generator.generateMarkdown();
     });
diff --git a/packages/cli_tools/test/pub_api_client_test.dart b/packages/cli_tools/test/pub_api_client_test.dart
index 315c7de..ec98897 100644
--- a/packages/cli_tools/test/pub_api_client_test.dart
+++ b/packages/cli_tools/test/pub_api_client_test.dart
@@ -14,7 +14,7 @@ MockClient createMockClient({
   return MockClient((final request) {
     if (request.method != 'GET') throw NoSuchMethodError;
     return Future<http.Response>(() async {
-      await Future.delayed(responseDelay);
+      await Future<void>.delayed(responseDelay);
       return http.Response(body, status);
     });
   });
diff --git a/packages/cli_tools/test/test_utils/mock_stdin.dart b/packages/cli_tools/test/test_utils/mock_stdin.dart
index 2561620..ee6f965 100644
--- a/packages/cli_tools/test/test_utils/mock_stdin.dart
+++ b/packages/cli_tools/test/test_utils/mock_stdin.dart
@@ -159,7 +159,7 @@ class MockStdin implements Stdin {
   }
 
   @override
-  Future pipe(final StreamConsumer<List<int>> streamConsumer) {
+  Future<dynamic> pipe(final StreamConsumer<List<int>> streamConsumer) {
     throw UnimplementedError();
   }
 
diff --git a/packages/cli_tools/test/test_utils/mock_stdout.dart b/packages/cli_tools/test/test_utils/mock_stdout.dart
index 6bb4a94..aab6bdc 100644
--- a/packages/cli_tools/test/test_utils/mock_stdout.dart
+++ b/packages/cli_tools/test/test_utils/mock_stdout.dart
@@ -25,20 +25,20 @@ class MockStdout implements Stdout {
   }
 
   @override
-  Future addStream(final Stream<List<int>> stream) {
+  Future<dynamic> addStream(final Stream<List<int>> stream) {
     throw UnimplementedError();
   }
 
   @override
-  Future close() {
+  Future<dynamic> close() {
     return Future.value();
   }
 
   @override
-  Future get done => Future.value();
+  Future<dynamic> get done => Future.value();
 
   @override
-  Future flush() {
+  Future<dynamic> flush() {
     return Future.value();
   }
 
@@ -67,7 +67,7 @@ class MockStdout implements Stdout {
   }
 
   @override
-  void writeAll(final Iterable objects, [final String sep = '']) {
+  void writeAll(final Iterable<Object?> objects, [final String sep = '']) {
     _buffer.writeAll(objects, sep);
   }
 
diff --git a/packages/cli_tools/test/test_utils/prompts/option_matcher.dart b/packages/cli_tools/test/test_utils/prompts/option_matcher.dart
index 7e31985..df4332f 100644
--- a/packages/cli_tools/test/test_utils/prompts/option_matcher.dart
+++ b/packages/cli_tools/test/test_utils/prompts/option_matcher.dart
@@ -12,7 +12,7 @@ class _EqualsAllOptionsMatcher extends Matcher {
   _EqualsAllOptionsMatcher(this._expected);
 
   @override
-  bool matches(final dynamic item, final Map matchState) {
+  bool matches(final dynamic item, final Map<dynamic, dynamic> matchState) {
     if (item is! List<Option>) {
       return false;
     }
@@ -39,7 +39,7 @@ class _EqualsAllOptionsMatcher extends Matcher {
   Description describeMismatch(
     final dynamic item,
     final Description mismatchDescription,
-    final Map matchState,
+    final Map<dynamic, dynamic> matchState,
     final bool verbose,
   ) {
     if (item is! List<Option>) {
@@ -68,7 +68,7 @@ class _EqualsOptionMatcher extends Matcher {
   _EqualsOptionMatcher(this._expected);
 
   @override
-  bool matches(final dynamic item, final Map matchState) {
+  bool matches(final dynamic item, final Map<dynamic, dynamic> matchState) {
     if (item is! Option) {
       return false;
     }
@@ -85,7 +85,7 @@ class _EqualsOptionMatcher extends Matcher {
   Description describeMismatch(
     final dynamic item,
     final Description mismatchDescription,
-    final Map matchState,
+    final Map<dynamic, dynamic> matchState,
     final bool verbose,
   ) {
     if (item is! Option) {
diff --git a/packages/config/README.md b/packages/config/README.md
index 409843a..415e71f 100644
--- a/packages/config/README.md
+++ b/packages/config/README.md
@@ -90,7 +90,7 @@ that shows how to create a set of options for a particular command as an _enum_.
 ```dart
 import 'package:config/config.dart';
 
-enum LogOption<V> implements OptionDefinition<V> {
+enum LogOption<V extends Object> implements OptionDefinition<V> {
   limit(IntOption(
     argName: 'limit',
     helpText: 'The maximum number of log records to fetch.',
diff --git a/packages/config/analysis_options.yaml b/packages/config/analysis_options.yaml
index 29b3ba4..bcc9d5b 100644
--- a/packages/config/analysis_options.yaml
+++ b/packages/config/analysis_options.yaml
@@ -1,13 +1,5 @@
 include: package:serverpod_lints/cli.yaml
 
-analyzer:
-  language:
-    strict-raw-types: false
-  errors:
-    inference_failure_on_instance_creation: ignore
-    inference_failure_on_function_invocation: ignore
-    inference_failure_on_untyped_parameter: ignore
-
 linter:
   rules:
     prefer_relative_imports: true
diff --git a/packages/config/example/config_file_example.dart b/packages/config/example/config_file_example.dart
index 8b781c8..b40cb70 100644
--- a/packages/config/example/config_file_example.dart
+++ b/packages/config/example/config_file_example.dart
@@ -40,7 +40,7 @@ Future<int> main(final List<String> args) async {
   return 0;
 }
 
-enum TimeSeriesOption<V> implements OptionDefinition<V> {
+enum TimeSeriesOption<V extends Object> implements OptionDefinition<V> {
   configFile(FileOption(
     argName: 'config',
     envName: 'CONFIG_FILE',
diff --git a/packages/config/example/main.dart b/packages/config/example/main.dart
index bdd283e..efaaa4d 100644
--- a/packages/config/example/main.dart
+++ b/packages/config/example/main.dart
@@ -41,7 +41,7 @@ int main(final List<String> args) {
 ///
 /// The enum approach is more distinct and type safe.
 /// The list approach is more dynamic and permits non-const initialization.
-enum TimeSeriesOption<V> implements OptionDefinition<V> {
+enum TimeSeriesOption<V extends Object> implements OptionDefinition<V> {
   until(DateTimeOption(
     argName: 'until',
     envName: 'SERIES_UNTIL', // can also be specified as environment variable
diff --git a/packages/config/lib/src/config/configuration.dart b/packages/config/lib/src/config/configuration.dart
index 54ab1c3..55808b0 100644
--- a/packages/config/lib/src/config/configuration.dart
+++ b/packages/config/lib/src/config/configuration.dart
@@ -17,7 +17,7 @@ import 'source_type.dart';
 /// import 'dart:io' show Platform;
 /// import 'package:config/config.dart';
 ///
-/// enum MyAppOption<V> implements OptionDefinition<V> {
+/// enum MyAppOption<V extends Object> implements OptionDefinition<V> {
 ///   username(StringOption(
 ///     argName: 'username',
 ///     envName: 'USERNAME',
@@ -201,7 +201,7 @@ class Configuration<O extends OptionDefinition> {
   /// identified by name, position, or key.
   ///
   /// Returns `null` if the option is not found or is not set.
-  V? findValueOf<V>({
+  V? findValueOf<V extends Object>({
     final String? enumName,
     final String? argName,
     final int? argPos,
@@ -238,7 +238,7 @@ class Configuration<O extends OptionDefinition> {
   /// [StateError] is thrown. See also [optionalValue].
   ///
   /// Throws [ArgumentError] if the option is unknown.
-  V value<V>(final OptionDefinition<V> option) {
+  V value<V extends Object>(final OptionDefinition<V> option) {
     if (!(option.option.mandatory ||
         option.option.fromDefault != null ||
         option.option.defaultsTo != null)) {
@@ -257,7 +257,7 @@ class Configuration<O extends OptionDefinition> {
   /// Returns `null` if the option is not set.
   ///
   /// Throws [ArgumentError] if the option is unknown.
-  V? optionalValue<V>(final OptionDefinition<V> option) {
+  V? optionalValue<V extends Object>(final OptionDefinition<V> option) {
     final resolution = _getOptionResolution(option);
 
     return resolution.value as V?;
@@ -270,7 +270,9 @@ class Configuration<O extends OptionDefinition> {
     return resolution.source;
   }
 
-  OptionResolution _getOptionResolution<V>(final OptionDefinition<V> option) {
+  OptionResolution _getOptionResolution<V extends Object>(
+    final OptionDefinition<V> option,
+  ) {
     if (!_options.contains(option)) {
       throw ArgumentError(
           '${option.qualifiedString()} is not part of this configuration');
diff --git a/packages/config/lib/src/config/option_resolution.dart b/packages/config/lib/src/config/option_resolution.dart
index bba7af4..27920b7 100644
--- a/packages/config/lib/src/config/option_resolution.dart
+++ b/packages/config/lib/src/config/option_resolution.dart
@@ -1,6 +1,6 @@
 import 'source_type.dart';
 
-final class OptionResolution<V> {
+final class OptionResolution<V extends Object> {
   final String? stringValue;
   final V? value;
   final String? error;
diff --git a/packages/config/lib/src/config/option_types.dart b/packages/config/lib/src/config/option_types.dart
index 5387459..7d2aea2 100644
--- a/packages/config/lib/src/config/option_types.dart
+++ b/packages/config/lib/src/config/option_types.dart
@@ -161,7 +161,8 @@ class EnumOption<E extends Enum> extends ConfigOptionBase<E> {
 ///
 /// If the input is outside the specified limits
 /// the validation throws a [FormatException].
-class ComparableValueOption<V extends Comparable> extends ConfigOptionBase<V> {
+class ComparableValueOption<V extends Comparable<Object>>
+    extends ConfigOptionBase<V> {
   final V? min;
   final V? max;
 
diff --git a/packages/config/lib/src/config/options.dart b/packages/config/lib/src/config/options.dart
index 88be5a3..8c84936 100644
--- a/packages/config/lib/src/config/options.dart
+++ b/packages/config/lib/src/config/options.dart
@@ -19,7 +19,7 @@ import 'source_type.dart';
 /// The typical usage pattern is to use an enum with the options
 /// and implement this interface like so:
 /// ```dart
-/// enum MyAppOption<V> implements OptionDefinition<V> {
+/// enum MyAppOption<V extends Object> implements OptionDefinition<V> {
 ///   username(StringOption(
 ///     argName: 'username',
 ///     envName: 'USERNAME',
@@ -34,7 +34,7 @@ import 'source_type.dart';
 ///
 /// See [ConfigOptionBase] for more information on options,
 /// and [Configuration] on how to initialize the configuration.
-abstract interface class OptionDefinition<V> {
+abstract interface class OptionDefinition<V extends Object> {
   ConfigOptionBase<V> get option;
 }
 
@@ -162,7 +162,7 @@ abstract class ValueParser<V> {
 /// The typical usage pattern is to use an enum with the options
 /// and instantiate subclasses of [ConfigOptionBase] like so:
 /// ```dart
-/// enum MyAppOption<V> implements OptionDefinition<V> {
+/// enum MyAppOption<V extends Object> implements OptionDefinition<V> {
 ///   username(StringOption(
 ///     argName: 'username',
 ///     envName: 'USERNAME',
@@ -176,7 +176,8 @@ abstract class ValueParser<V> {
 /// ```
 ///
 /// See [Configuration] on how to initialize the configuration.
-abstract class ConfigOptionBase<V> implements OptionDefinition<V> {
+abstract class ConfigOptionBase<V extends Object>
+    implements OptionDefinition<V> {
   final ValueParser<V> valueParser;
 
   final String? argName;
@@ -449,7 +450,7 @@ abstract class ConfigOptionBase<V> implements OptionDefinition<V> {
     }
     if (value is V) {
       return OptionResolution(
-        value: value as V,
+        value: value,
         source: ValueSourceType.config,
       );
     }
diff --git a/packages/config/pubspec.yaml b/packages/config/pubspec.yaml
index d121fa3..d6531d1 100644
--- a/packages/config/pubspec.yaml
+++ b/packages/config/pubspec.yaml
@@ -24,6 +24,6 @@ dependencies:
   yaml: ^3.1.2
 
 dev_dependencies:
-  serverpod_lints: '>=1.2.6'
-  test: ^1.24.0
-  test_descriptor: ^2.0.2
+  serverpod_lints: '>=2.7.0'
+  test: ^1.25.0
+  test_descriptor: ^2.0.0
diff --git a/packages/config/test/config/args_compatibility/command_runner_test.dart b/packages/config/test/config/args_compatibility/command_runner_test.dart
index 17def75..2b9fb71 100644
--- a/packages/config/test/config/args_compatibility/command_runner_test.dart
+++ b/packages/config/test/config/args_compatibility/command_runner_test.dart
@@ -1,4 +1,4 @@
-// ignore_for_file: avoid_escaping_inner_quotes, prefer_final_locals, prefer_final_in_for_each, prefer_final_parameters
+// ignore_for_file: avoid_escaping_inner_quotes, prefer_final_locals, prefer_final_in_for_each, prefer_final_parameters, strict_raw_type
 
 @Skip('CommandRunner not supported')
 library;
diff --git a/packages/config/test/config/args_compatibility/test_utils.dart b/packages/config/test/config/args_compatibility/test_utils.dart
index 20d424f..015a6e2 100644
--- a/packages/config/test/config/args_compatibility/test_utils.dart
+++ b/packages/config/test/config/args_compatibility/test_utils.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: prefer_final_parameters
+// ignore_for_file: prefer_final_parameters, strict_raw_type
 
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
diff --git a/packages/config/test/config/configuration_test.dart b/packages/config/test/config/configuration_test.dart
index 3611f10..7a68ec5 100644
--- a/packages/config/test/config/configuration_test.dart
+++ b/packages/config/test/config/configuration_test.dart
@@ -12,11 +12,10 @@ void main() async {
     test('when preparing for parsing then throws exception', () async {
       expect(
         () => [projectIdOpt].prepareForParsing(parser),
-        throwsA(allOf(
-          isA<OptionDefinitionError>(),
-          (final e) => e.toString().contains(
-                "An argument option can't have an abbreviation but not a full name",
-              ),
+        throwsA(isA<OptionDefinitionError>().having(
+          (final e) => e.message,
+          'message',
+          "An argument option can't have an abbreviation but not a full name",
         )),
       );
     });
@@ -32,11 +31,10 @@ void main() async {
     test('when preparing for parsing then throws exception', () async {
       expect(
         () => [projectIdOpt].prepareForParsing(parser),
-        throwsA(allOf(
-          isA<OptionDefinitionError>(),
-          (final e) => e
-              .toString()
-              .contains("Mandatory options can't have default values"),
+        throwsA(isA<OptionDefinitionError>().having(
+          (final e) => e.message,
+          'message',
+          "Mandatory options can't have default values",
         )),
       );
     });
@@ -55,11 +53,10 @@ void main() async {
     test('when preparing for parsing then throws exception', () async {
       expect(
         () => [projectIdOpt].prepareForParsing(parser),
-        throwsA(allOf(
-          isA<OptionDefinitionError>(),
-          (final e) => e
-              .toString()
-              .contains("Mandatory options can't have default values"),
+        throwsA(isA<OptionDefinitionError>().having(
+          (final e) => e.message,
+          'message',
+          "Mandatory options can't have default values",
         )),
       );
     });
@@ -1625,7 +1622,7 @@ void main() async {
   });
 }
 
-enum _TestOption<V> implements OptionDefinition<V> {
+enum _TestOption<V extends Object> implements OptionDefinition<V> {
   stringOpt(
     StringOption(
       argName: 'string',
diff --git a/pubspec.yaml b/pubspec.yaml
index dd0b03c..125a892 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,4 +16,5 @@ environment:
   sdk: ">=3.3.0 <4.0.0"
 
 dev_dependencies:
-  melos: ^6.3.3
+  melos: '>=6.3.3 <7.1.0'
+  serverpod_lints: '>=2.7.0'