diff --git a/packages/dart_frog_cli/analysis_options.yaml b/packages/dart_frog_cli/analysis_options.yaml
index 17fe72a76..34f3e6872 100644
--- a/packages/dart_frog_cli/analysis_options.yaml
+++ b/packages/dart_frog_cli/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
 analyzer:
   exclude:
     - lib/src/version.dart
diff --git a/packages/dart_frog_cli/e2e/analysis_options.yaml b/packages/dart_frog_cli/e2e/analysis_options.yaml
index bb7209144..c2f4cbbca 100644
--- a/packages/dart_frog_cli/e2e/analysis_options.yaml
+++ b/packages/dart_frog_cli/e2e/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
diff --git a/packages/dart_frog_cli/e2e/pubspec.yaml b/packages/dart_frog_cli/e2e/pubspec.yaml
index 3349f4732..954555c5d 100644
--- a/packages/dart_frog_cli/e2e/pubspec.yaml
+++ b/packages/dart_frog_cli/e2e/pubspec.yaml
@@ -14,4 +14,4 @@ dev_dependencies:
   meta: ^1.7.0
   path: ^1.8.2
   test: ^1.19.2
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/packages/dart_frog_cli/lib/dart_frog_cli.dart b/packages/dart_frog_cli/lib/dart_frog_cli.dart
index 95bfc8bba..d55e0f9ce 100644
--- a/packages/dart_frog_cli/lib/dart_frog_cli.dart
+++ b/packages/dart_frog_cli/lib/dart_frog_cli.dart
@@ -7,4 +7,4 @@
 /// # 👀 See usage
 /// dart_frog --help
 /// ```
-library dart_frog_cli;
+library;
diff --git a/packages/dart_frog_cli/lib/src/command_runner.dart b/packages/dart_frog_cli/lib/src/command_runner.dart
index ed670ef6d..80fecf471 100644
--- a/packages/dart_frog_cli/lib/src/command_runner.dart
+++ b/packages/dart_frog_cli/lib/src/command_runner.dart
@@ -73,7 +73,7 @@ class DartFrogCommandRunner extends CompletionCommandRunner<int> {
     late final int exitCode;
     try {
       exitCode = await runCommand(argResults) ?? ExitCode.success.code;
-    } catch (error) {
+    } on Exception catch (error) {
       _logger.err('$error');
       exitCode = ExitCode.software.code;
     }
@@ -123,7 +123,7 @@ ${lightYellow.wrap('Changelog:')} $changelogLink
 Run ${lightCyan.wrap('$executableName update')} to update''',
           );
       }
-    } catch (error, stackTrace) {
+    } on Exception catch (error, stackTrace) {
       _logger.detail(
         '[updater] update check error.\n$error\n$stackTrace',
       );
diff --git a/packages/dart_frog_cli/lib/src/commands/build/build.dart b/packages/dart_frog_cli/lib/src/commands/build/build.dart
index a6de875a2..cde13ba07 100644
--- a/packages/dart_frog_cli/lib/src/commands/build/build.dart
+++ b/packages/dart_frog_cli/lib/src/commands/build/build.dart
@@ -49,7 +49,7 @@ class BuildCommand extends DartFrogCommand {
 
     try {
       return (await builder.build()).code;
-    } catch (e) {
+    } on Exception catch (e) {
       logger.err(e.toString());
       return ExitCode.software.code;
     }
diff --git a/packages/dart_frog_cli/lib/src/commands/dev/dev.dart b/packages/dart_frog_cli/lib/src/commands/dev/dev.dart
index 80f60cd90..cc78c277b 100644
--- a/packages/dart_frog_cli/lib/src/commands/dev/dev.dart
+++ b/packages/dart_frog_cli/lib/src/commands/dev/dev.dart
@@ -133,7 +133,7 @@ class DevCommand extends DartFrogCommand {
     try {
       await _devServerRunner.start();
       return (await _devServerRunner.exitCode).code;
-    } catch (e) {
+    } on Exception catch (e) {
       logger.err(e.toString());
       return ExitCode.software.code;
     } finally {
diff --git a/packages/dart_frog_cli/lib/src/commands/update/update.dart b/packages/dart_frog_cli/lib/src/commands/update/update.dart
index c1c2c115f..532ceddab 100644
--- a/packages/dart_frog_cli/lib/src/commands/update/update.dart
+++ b/packages/dart_frog_cli/lib/src/commands/update/update.dart
@@ -43,7 +43,7 @@ class UpdateCommand extends DartFrogCommand {
     late final String latestVersion;
     try {
       latestVersion = await _pubUpdater.getLatestVersion(packageName);
-    } catch (error) {
+    } on Exception catch (error) {
       updateCheckProgress.fail();
       _logger.err('$error');
       return ExitCode.software.code;
@@ -70,7 +70,7 @@ class UpdateCommand extends DartFrogCommand {
         packageName: packageName,
         versionConstraint: latestVersion,
       );
-    } catch (error) {
+    } on Exception catch (error) {
       updateProgress.fail();
       _logger.err('$error');
       return ExitCode.software.code;
diff --git a/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart b/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart
index d9b9e2dd6..1a6fd7027 100644
--- a/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart
+++ b/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart
@@ -115,7 +115,7 @@ class DevServerDomain extends DomainBase {
           'applicationId': applicationId,
         },
       );
-    } catch (e) {
+    } on Exception catch (e) {
       return DaemonResponse.error(
         id: request.id,
         error: {
@@ -149,7 +149,7 @@ class DevServerDomain extends DomainBase {
           'applicationId': applicationId,
         },
       );
-    } catch (e) {
+    } on Exception catch (e) {
       return DaemonResponse.error(
         id: request.id,
         error: {
@@ -186,7 +186,7 @@ class DevServerDomain extends DomainBase {
           'exitCode': exitCode.code,
         },
       );
-    } catch (e) {
+    } on Exception catch (e) {
       if (!runner.isCompleted) {
         _devServerRunners[applicationId] = runner;
       }
diff --git a/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart b/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart
index 131eb2d0d..bb7b8e3da 100644
--- a/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart
+++ b/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart
@@ -83,7 +83,7 @@ class RouteConfigurationDomain extends DomainBase {
           },
         ),
       );
-    } catch (e) {
+    } on Exception catch (e) {
       return DaemonResponse.error(
         id: request.id,
         error: {
@@ -183,7 +183,7 @@ class RouteConfigurationDomain extends DomainBase {
           'exitCode': exitCode.code,
         },
       );
-    } catch (e) {
+    } on Exception catch (e) {
       if (!watcher.isCompleted) {
         _routeConfigurationWatchers[watcherId] = watcher;
       }
diff --git a/packages/dart_frog_cli/lib/src/route_configuration_watcher/route_configuration_watcher.dart b/packages/dart_frog_cli/lib/src/route_configuration_watcher/route_configuration_watcher.dart
index 32b4bb55a..c57a3f397 100644
--- a/packages/dart_frog_cli/lib/src/route_configuration_watcher/route_configuration_watcher.dart
+++ b/packages/dart_frog_cli/lib/src/route_configuration_watcher/route_configuration_watcher.dart
@@ -152,7 +152,7 @@ class RouteConfigurationWatcher {
     final projectDirectory = workingDirectory;
     try {
       routeConfiguration = _routeConfigurationBuilder(projectDirectory);
-    } catch (error) {
+    } on Exception catch (error) {
       logger.err('$error');
       return null;
     }
diff --git a/packages/dart_frog_cli/pubspec.yaml b/packages/dart_frog_cli/pubspec.yaml
index 23083323b..be0cc90fb 100644
--- a/packages/dart_frog_cli/pubspec.yaml
+++ b/packages/dart_frog_cli/pubspec.yaml
@@ -8,7 +8,7 @@ documentation: https://dartfrog.vgv.dev/docs/overview
 topics: [server, backend, shelf, dart-frog, cli]
 
 screenshots:
-  - description: 'Dart Frog logo.'
+  - description: "Dart Frog logo."
     path: assets/logo.png
 
 environment:
@@ -34,7 +34,7 @@ dev_dependencies:
   build_version: ^2.1.1
   mocktail: ^1.0.4
   test: ^1.25.8
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
 
 executables:
   dart_frog:
diff --git a/packages/dart_frog_cli/test/src/runtime_compatibility_test.dart b/packages/dart_frog_cli/test/src/runtime_compatibility_test.dart
index 387ae1367..204f18d1d 100644
--- a/packages/dart_frog_cli/test/src/runtime_compatibility_test.dart
+++ b/packages/dart_frog_cli/test/src/runtime_compatibility_test.dart
@@ -55,7 +55,7 @@ void main() {
     tearDown(() {
       try {
         tempDir.deleteSync(recursive: true);
-      } catch (_) {}
+      } on Exception catch (_) {}
     });
 
     test('throws when a pubspec.yaml does not exist', () {