Migrate to the connected app service

.github/workflows/dart_mcp_server.yaml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         flutterSdk:
-          - stable
+          - beta
           - master
         os:
           - ubuntu-latest

pkgs/dart_mcp_server/CHANGELOG.md

@@ -42,6 +42,8 @@
 * Add `--log-file` argument to log all protocol traffic to a file.
 * Improve error text for failed DTD connections as well as the tool description.
 * Add support for injecting an `Analytics` instance to track usage.
+* Listen to the new DTD `ConnectedApp` service instead of the `Editor.DebugSessions`
+  service, when available.
 * Screenshot tool disabled until
   https://github.com/flutter/flutter/issues/170357 is resolved.
 * Add `arg_parser.dart` public library with minimal deps to be used by the dart tool.

pkgs/dart_mcp_server/lib/src/arg_parser.dart

@@ -4,38 +4,37 @@
 
 import 'package:args/args.dart';
 
-final argParser =
-    ArgParser(allowTrailingOptions: false)
-      ..addOption(
-        dartSdkOption,
-        help:
-            'The path to the root of the desired Dart SDK. Defaults to the '
-            'DART_SDK environment variable.',
-      )
-      ..addOption(
-        flutterSdkOption,
-        help:
-            'The path to the root of the desired Flutter SDK. Defaults to '
-            'the FLUTTER_SDK environment variable, then searching up from '
-            'the Dart SDK.',
-      )
-      ..addFlag(
-        forceRootsFallbackFlag,
-        negatable: true,
-        defaultsTo: false,
-        help:
-            'Forces a behavior for project roots which uses MCP tools '
-            'instead of the native MCP roots. This can be helpful for '
-            'clients like cursor which claim to have roots support but do '
-            'not actually support it.',
-      )
-      ..addOption(
-        logFileOption,
-        help:
-            'Path to a file to log all MPC protocol traffic to. File will be '
-            'overwritten if it exists.',
-      )
-      ..addFlag(helpFlag, abbr: 'h', help: 'Show usage text');
+final argParser = ArgParser(allowTrailingOptions: false)
+  ..addOption(
+    dartSdkOption,
+    help:
+        'The path to the root of the desired Dart SDK. Defaults to the '
+        'DART_SDK environment variable.',
+  )
+  ..addOption(
+    flutterSdkOption,
+    help:
+        'The path to the root of the desired Flutter SDK. Defaults to '
+        'the FLUTTER_SDK environment variable, then searching up from '
+        'the Dart SDK.',
+  )
+  ..addFlag(
+    forceRootsFallbackFlag,
+    negatable: true,
+    defaultsTo: false,
+    help:
+        'Forces a behavior for project roots which uses MCP tools '
+        'instead of the native MCP roots. This can be helpful for '
+        'clients like cursor which claim to have roots support but do '
+        'not actually support it.',
+  )
+  ..addOption(
+    logFileOption,
+    help:
+        'Path to a file to log all MPC protocol traffic to. File will be '
+        'overwritten if it exists.',
+  )
+  ..addFlag(helpFlag, abbr: 'h', help: 'Show usage text');
 
 const dartSdkOption = 'dart-sdk';
 const flutterSdkOption = 'flutter-sdk';

pkgs/dart_mcp_server/lib/src/mixins/analyzer.dart

@@ -110,19 +110,18 @@ base mixin DartAnalyzerSupport
           log(LoggingLevel.warning, line, logger: 'DartLanguageServer');
         });
 
-    final lspConnection =
-        Peer(lspChannel(lspServer.stdout, lspServer.stdin))
-          ..registerMethod(
-            lsp.Method.textDocument_publishDiagnostics.toString(),
-            _handleDiagnostics,
-          )
-          ..registerMethod(r'$/analyzerStatus', _handleAnalyzerStatus)
-          ..registerFallback((Parameters params) {
-            log(
-              LoggingLevel.debug,
-              () => 'Unhandled LSP message: ${params.method} - ${params.asMap}',
-            );
-          });
+    final lspConnection = Peer(lspChannel(lspServer.stdout, lspServer.stdin))
+      ..registerMethod(
+        lsp.Method.textDocument_publishDiagnostics.toString(),
+        _handleDiagnostics,
+      )
+      ..registerMethod(r'$/analyzerStatus', _handleAnalyzerStatus)
+      ..registerFallback((Parameters params) {
+        log(
+          LoggingLevel.debug,
+          () => 'Unhandled LSP message: ${params.method} - ${params.asMap}',
+        );
+      });
     _lspConnection = lspConnection;
 
     unawaited(lspConnection.listen());
@@ -357,8 +356,9 @@ base mixin DartAnalyzerSupport
     diagnostics[diagnosticParams.uri] = diagnosticParams.diagnostics;
     log(LoggingLevel.debug, {
       ParameterNames.uri: diagnosticParams.uri,
-      'diagnostics':
-          diagnosticParams.diagnostics.map((d) => d.toJson()).toList(),
+      'diagnostics': diagnosticParams.diagnostics
+          .map((d) => d.toJson())
+          .toList(),
     });
   }
 
@@ -370,16 +370,18 @@ base mixin DartAnalyzerSupport
       final newRoots = await roots;
 
       final oldWorkspaceFolders = _currentWorkspaceFolders;
-      final newWorkspaceFolders =
-          _currentWorkspaceFolders = HashSet<lsp.WorkspaceFolder>(
+      final newWorkspaceFolders = _currentWorkspaceFolders =
+          HashSet<lsp.WorkspaceFolder>(
             equals: (a, b) => a.uri == b.uri,
             hashCode: (a) => a.uri.hashCode,
           )..addAll(newRoots.map((r) => r.asWorkspaceFolder));
 
-      final added =
-          newWorkspaceFolders.difference(oldWorkspaceFolders).toList();
-      final removed =
-          oldWorkspaceFolders.difference(newWorkspaceFolders).toList();
+      final added = newWorkspaceFolders
+          .difference(oldWorkspaceFolders)
+          .toList();
+      final removed = oldWorkspaceFolders
+          .difference(newWorkspaceFolders)
+          .toList();
 
       // This can happen in the case of multiple notifications in quick
       // succession, the `roots` future will complete only after the state has

pkgs/dart_mcp_server/lib/src/mixins/dash_cli.dart

@@ -119,10 +119,9 @@ base mixin DashCliSupport on ToolsSupport, LoggingSupport, RootsTrackingSupport
       // Platforms are ignored for Dart, so no need to validate them.
       final invalidPlatforms = platforms.difference(_allowedFlutterPlatforms);
       if (invalidPlatforms.isNotEmpty) {
-        final plural =
-            invalidPlatforms.length > 1
-                ? 'are not valid platforms'
-                : 'is not a valid platform';
+        final plural = invalidPlatforms.length > 1
+            ? 'are not valid platforms'
+            : 'is not a valid platform';
         errors.add(
           ValidationError(
             ValidationErrorType.custom,
@@ -163,14 +162,13 @@ base mixin DashCliSupport on ToolsSupport, LoggingSupport, RootsTrackingSupport
     return runCommandInRoot(
       request,
       arguments: commandArgs,
-      commandForRoot:
-          (_, _, sdk) =>
-              switch (projectType) {
-                    'dart' => sdk.dartExecutablePath,
-                    'flutter' => sdk.flutterExecutablePath,
-                    _ => StateError('Unknown project type: $projectType'),
-                  }
-                  as String,
+      commandForRoot: (_, _, sdk) =>
+          switch (projectType) {
+                'dart' => sdk.dartExecutablePath,
+                'flutter' => sdk.flutterExecutablePath,
+                _ => StateError('Unknown project type: $projectType'),
+              }
+              as String,
       commandDescription: '$projectType create',
       fileSystem: fileSystem,
       processManager: processManager,