Make sure that extensions are bundled with the package they claim to be.

packages/devtools_app/lib/src/extensions/extension_screen.dart

@@ -112,7 +112,9 @@ class ExtensionView extends StatelessWidget {
         const SizedBox(height: intermediateSpacing),
         Expanded(
           child: ValueListenableBuilder<ExtensionEnabledState>(
-            valueListenable: extensionService.enabledStateListenable(ext.name),
+            valueListenable: extensionService.enabledStateListenable(
+              ext.packageName,
+            ),
             builder: (context, activationState, _) {
               if (activationState == ExtensionEnabledState.enabled) {
                 return KeepAliveWrapper(

packages/devtools_app/lib/src/extensions/extension_screen_controls.dart

@@ -29,7 +29,7 @@ class EmbeddedExtensionHeader extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final extensionName = ext.displayName;
+    final extensionPackage = ext.packageName;
     return SizedBox(
       width: double.infinity,
       child: Wrap(
@@ -40,7 +40,7 @@ class EmbeddedExtensionHeader extends StatelessWidget {
             padding: const EdgeInsets.only(left: borderPadding),
             child: RichText(
               text: TextSpan(
-                text: 'package:$extensionName extension',
+                text: 'package:$extensionPackage extension',
                 style: theme.regularTextStyle.copyWith(
                   fontWeight: FontWeight.bold,
                 ),
@@ -96,7 +96,7 @@ class _ExtensionContextMenuButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ValueListenableBuilder<ExtensionEnabledState>(
-      valueListenable: extensionService.enabledStateListenable(ext.displayName),
+      valueListenable: extensionService.enabledStateListenable(ext.packageName),
       builder: (context, activationState, _) {
         if (activationState != ExtensionEnabledState.enabled) {
           return const SizedBox.shrink();
@@ -168,7 +168,10 @@ class DisableExtensionDialog extends StatelessWidget {
               text: 'Are you sure you want to disable the ',
               style: theme.regularTextStyle,
               children: [
-                TextSpan(text: ext.displayName, style: theme.fixedFontStyle),
+                TextSpan(
+                  text: 'package:${ext.packageName}',
+                  style: theme.fixedFontStyle,
+                ),
                 const TextSpan(text: ' extension?'),
               ],
             ),
@@ -233,7 +236,10 @@ class EnableExtensionPrompt extends StatelessWidget {
               text: 'The ',
               style: theme.regularTextStyle,
               children: [
-                TextSpan(text: ext.name, style: theme.fixedFontStyle),
+                TextSpan(
+                  text: 'package:${ext.packageName}',
+                  style: theme.fixedFontStyle,
+                ),
                 const TextSpan(
                   text:
                       ' extension has not been enabled. Do you want to enable'

packages/devtools_app/lib/src/extensions/extension_service.dart

@@ -111,12 +111,12 @@ class ExtensionService extends DisposableController
   final _ignoredStaticExtensionsByHashCode = <int>{};
 
   /// Returns the [ValueListenable] that stores the [ExtensionEnabledState] for
-  /// the DevTools Extension with [extensionName].
+  /// the DevTools Extension provided by [extensionPackageName].
   ValueListenable<ExtensionEnabledState> enabledStateListenable(
-    String extensionName,
+    String extensionPackageName,
   ) {
     return _extensionEnabledStates.putIfAbsent(
-      extensionName.toLowerCase(),
+      extensionPackageName.toLowerCase(),
       () => ValueNotifier<ExtensionEnabledState>(ExtensionEnabledState.none),
     );
   }
@@ -232,7 +232,7 @@ class ExtensionService extends DisposableController
       // not always be true for extensions that are not published on pub or
       // extensions that do not follow best practices for naming.
       final isRuntimeDuplicate = runtimeExtensions.any(
-        (ext) => ext.name == staticExtension.name,
+        (ext) => ext.packageName == staticExtension.packageName,
       );
       if (isRuntimeDuplicate) {
         _log.fine(
@@ -256,9 +256,10 @@ class ExtensionService extends DisposableController
       final stateFromOptionsFile = await server.extensionEnabledState(
         devtoolsOptionsFileUri: extension.devtoolsOptionsUri,
         extensionName: extension.name,
+        extensionPackage: extension.packageName,
       );
       final stateNotifier = _extensionEnabledStates.putIfAbsent(
-        extension.name,
+        extension.packageName.toLowerCase(),
         () => ValueNotifier<ExtensionEnabledState>(stateFromOptionsFile),
       );
       stateNotifier.value = stateFromOptionsFile;
@@ -295,12 +296,13 @@ class ExtensionService extends DisposableController
     final allMatchingExtensions = [
       ...runtimeExtensions,
       ...staticExtensions,
-    ].where((e) => e.name == extension.name);
+    ].where((e) => e.packageName == extension.packageName);
     await [
       for (final ext in allMatchingExtensions)
         server.extensionEnabledState(
           devtoolsOptionsFileUri: ext.devtoolsOptionsUri,
           extensionName: ext.name,
+          extensionPackage: ext.packageName,
           enable: enable,
         ),
     ].wait;

packages/devtools_app/lib/src/extensions/extension_service_helpers.dart

@@ -19,14 +19,17 @@ void deduplicateExtensionsAndTakeLatest(
 }) {
   final deduped = <String>{};
   for (final ext in extensions) {
-    if (deduped.contains(ext.name)) continue;
-    deduped.add(ext.name);
+    final dedupeKey = ext.packageName;
+    if (deduped.contains(dedupeKey)) continue;
+    deduped.add(dedupeKey);
 
     // This includes [ext] itself.
-    final matchingExtensions = extensions.where((e) => e.name == ext.name);
+    final matchingExtensions = extensions.where(
+      (e) => e.packageName == ext.packageName,
+    );
     if (matchingExtensions.length > 1) {
       logger?.fine(
-        'detected duplicate $extensionType extensions for ${ext.name}',
+        'detected duplicate $extensionType extensions for package:${ext.packageName}',
       );
 
       // Ignore all matching extensions and then mark the [latest] as
@@ -45,7 +48,7 @@ void deduplicateExtensionsAndTakeLatest(
       );
     } else {
       logger?.fine(
-        'no duplicates found for $extensionType extension ${ext.name}',
+        'no duplicates found for $extensionType extension package:${ext.packageName}',
       );
     }
   }

packages/devtools_app/lib/src/extensions/extension_settings.dart

@@ -172,17 +172,17 @@ class ExtensionSetting extends StatelessWidget {
       ),
     ];
     final theme = Theme.of(context);
-    final extensionName = extension.name.toLowerCase();
+    final packageName = extension.packageName.toLowerCase();
     return ValueListenableBuilder(
-      valueListenable: extensionService.enabledStateListenable(extensionName),
+      valueListenable: extensionService.enabledStateListenable(packageName),
       builder: (context, enabledState, _) {
         return Padding(
           padding: const EdgeInsets.only(bottom: denseSpacing),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Text(
-                'package:$extensionName',
+                'package:$packageName',
                 overflow: TextOverflow.ellipsis,
                 style: theme.fixedFontStyle,
               ),

packages/devtools_app/lib/src/shared/development_helpers.dart

@@ -91,6 +91,7 @@ extension StubDevToolsExtensions on Never {
   /// connected app.
   static final fooExtension = DevToolsExtensionConfig.parse({
     DevToolsExtensionConfig.nameKey: 'foo',
+    DevToolsExtensionConfig.packageNameKey: 'foo',
     DevToolsExtensionConfig.issueTrackerKey: 'www.google.com',
     DevToolsExtensionConfig.versionKey: '1.0.0',
     DevToolsExtensionConfig.materialIconCodePointKey: '0xe0b1',
@@ -105,6 +106,7 @@ extension StubDevToolsExtensions on Never {
   /// connected app.
   static final providerExtension = DevToolsExtensionConfig.parse({
     DevToolsExtensionConfig.nameKey: 'provider',
+    DevToolsExtensionConfig.packageNameKey: 'provider',
     DevToolsExtensionConfig.issueTrackerKey:
         'https://github.com/rrousselGit/provider/issues',
     DevToolsExtensionConfig.versionKey: '3.0.0',
@@ -121,6 +123,7 @@ extension StubDevToolsExtensions on Never {
   /// not require a connected app.
   static final someToolExtension = DevToolsExtensionConfig.parse({
     DevToolsExtensionConfig.nameKey: 'some_tool',
+    DevToolsExtensionConfig.packageNameKey: 'some_tool',
     DevToolsExtensionConfig.issueTrackerKey: 'www.google.com',
     DevToolsExtensionConfig.versionKey: '1.0.0',
     DevToolsExtensionConfig.materialIconCodePointKey: '0xe00c',
@@ -137,6 +140,7 @@ extension StubDevToolsExtensions on Never {
   /// require a connected app.
   static final barExtension = DevToolsExtensionConfig.parse({
     DevToolsExtensionConfig.nameKey: 'bar',
+    DevToolsExtensionConfig.packageNameKey: 'bar',
     DevToolsExtensionConfig.issueTrackerKey: 'www.google.com',
     DevToolsExtensionConfig.versionKey: '2.0.0',
     DevToolsExtensionConfig.materialIconCodePointKey: 0xe638,
@@ -153,6 +157,7 @@ extension StubDevToolsExtensions on Never {
   /// extension.
   static final newerBarExtension = DevToolsExtensionConfig.parse({
     DevToolsExtensionConfig.nameKey: 'bar',
+    DevToolsExtensionConfig.packageNameKey: 'bar',
     DevToolsExtensionConfig.issueTrackerKey: 'www.google.com',
     DevToolsExtensionConfig.versionKey: '2.1.0', // Newer version.
     DevToolsExtensionConfig.materialIconCodePointKey: 0xe638,
@@ -168,6 +173,7 @@ extension StubDevToolsExtensions on Never {
   /// connected app.
   static final bazExtension = DevToolsExtensionConfig.parse({
     DevToolsExtensionConfig.nameKey: 'baz',
+    DevToolsExtensionConfig.packageNameKey: 'baz',
     DevToolsExtensionConfig.issueTrackerKey: 'www.google.com',
     DevToolsExtensionConfig.versionKey: '1.0.0',
     DevToolsExtensionConfig.materialIconCodePointKey: 0xe716,
@@ -182,6 +188,7 @@ extension StubDevToolsExtensions on Never {
   /// of a runtime extension [fooExtension], which requires a connected app.
   static final duplicateFooExtension = DevToolsExtensionConfig.parse({
     DevToolsExtensionConfig.nameKey: 'foo',
+    DevToolsExtensionConfig.packageNameKey: 'foo',
     DevToolsExtensionConfig.issueTrackerKey: 'www.google.com',
     DevToolsExtensionConfig.versionKey: '1.0.0',
     DevToolsExtensionConfig.materialIconCodePointKey: '0xe0b1',

packages/devtools_app/lib/src/shared/server/_extensions_api.dart

@@ -74,11 +74,12 @@ Future<List<DevToolsExtensionConfig>> refreshAvailableExtensions(
 Future<ExtensionEnabledState> extensionEnabledState({
   required String devtoolsOptionsFileUri,
   required String extensionName,
+  required String extensionPackage,
   bool? enable,
 }) async {
   _log.fine(
     '${enable != null ? 'setting' : 'getting'} extensionEnabledState for '
-    '$extensionName in options file ($devtoolsOptionsFileUri)',
+    '$extensionName (package: $extensionPackage) in options file ($devtoolsOptionsFileUri)',
   );
   if (debugDevToolsExtensions) {
     return debugHandleExtensionEnabledState(
@@ -92,6 +93,7 @@ Future<ExtensionEnabledState> extensionEnabledState({
       queryParameters: {
         ExtensionsApi.devtoolsOptionsUriPropertyName: devtoolsOptionsFileUri,
         ExtensionsApi.extensionNamePropertyName: extensionName,
+        ExtensionsApi.extensionPackagePropertyName: extensionPackage,
         if (enable != null)
           ExtensionsApi.enabledStatePropertyName: enable.toString(),
       },

packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md

@@ -93,6 +93,9 @@ TODO: Remove this section if there are not any updates.
   [#8507](https://github.com/flutter/devtools/issues/8507)
 * Added iframe sandboxing for embedded DevTools extensions to enforce origin
   isolation. [#9967](https://github.com/flutter/devtools/pull/9967)
+* Improved DevTools extension isolation by tracking the providing package name for
+  enablement, deduplication, and asset loading.
+  [#9981](https://github.com/flutter/devtools/pull/9981)
 
 ## Advanced developer mode updates
 

packages/devtools_app/test/extensions/extension_screen_test.dart

@@ -79,34 +79,76 @@ void main() {
       await tester.pumpWidget(wrap(Builder(builder: fooScreen.build)));
       expect(find.byType(ExtensionView), findsOneWidget);
       expect(find.byType(EmbeddedExtensionHeader), findsOneWidget);
-      expect(find.richTextContaining('package:foo extension'), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byType(EmbeddedExtensionHeader),
+          matching: find.richTextContaining('package:foo extension'),
+        ),
+        findsOneWidget,
+      );
       expect(find.richTextContaining('(v1.0.0)'), findsOneWidget);
       expect(find.richTextContaining('Report an issue'), findsOneWidget);
       expect(_extensionContextMenuFinder, findsNothing);
       expect(find.byType(EnableExtensionPrompt), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byType(EnableExtensionPrompt),
+          matching: find.richTextContaining(
+            'The package:foo extension has not been enabled',
+          ),
+        ),
+        findsOneWidget,
+      );
       expect(find.byType(EmbeddedExtensionView), findsNothing);
 
       await tester.pumpWidget(wrap(Builder(builder: barScreen.build)));
       expect(find.byType(ExtensionView), findsOneWidget);
       expect(find.byType(EmbeddedExtensionHeader), findsOneWidget);
-      expect(find.richTextContaining('package:bar extension'), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byType(EmbeddedExtensionHeader),
+          matching: find.richTextContaining('package:bar extension'),
+        ),
+        findsOneWidget,
+      );
       expect(find.richTextContaining('(v2.0.0)'), findsOneWidget);
       expect(find.richTextContaining('Report an issue'), findsOneWidget);
       expect(_extensionContextMenuFinder, findsNothing);
       expect(find.byType(EnableExtensionPrompt), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byType(EnableExtensionPrompt),
+          matching: find.richTextContaining(
+            'The package:bar extension has not been enabled',
+          ),
+        ),
+        findsOneWidget,
+      );
       expect(find.byType(EmbeddedExtensionView), findsNothing);
 
       await tester.pumpWidget(wrap(Builder(builder: providerScreen.build)));
       expect(find.byType(ExtensionView), findsOneWidget);
       expect(find.byType(EmbeddedExtensionHeader), findsOneWidget);
       expect(
-        find.richTextContaining('package:provider extension'),
+        find.descendant(
+          of: find.byType(EmbeddedExtensionHeader),
+          matching: find.richTextContaining('package:provider extension'),
+        ),
         findsOneWidget,
       );
       expect(find.richTextContaining('(v3.0.0)'), findsOneWidget);
       expect(find.richTextContaining('Report an issue'), findsOneWidget);
       expect(_extensionContextMenuFinder, findsNothing);
       expect(find.byType(EnableExtensionPrompt), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byType(EnableExtensionPrompt),
+          matching: find.richTextContaining(
+            'The package:provider extension has not been enabled',
+          ),
+        ),
+        findsOneWidget,
+      );
       expect(find.byType(EmbeddedExtensionView), findsNothing);
     });
 
@@ -141,11 +183,26 @@ void main() {
       await tester.pumpWidget(wrap(Builder(builder: fooScreen.build)));
       expect(find.byType(ExtensionView), findsOneWidget);
       expect(find.byType(EmbeddedExtensionHeader), findsOneWidget);
-      expect(find.richTextContaining('package:foo extension'), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byType(EmbeddedExtensionHeader),
+          matching: find.richTextContaining('package:foo extension'),
+        ),
+        findsOneWidget,
+      );
       expect(find.richTextContaining('(v1.0.0)'), findsOneWidget);
       expect(find.richTextContaining('Report an issue'), findsOneWidget);
       expect(_extensionContextMenuFinder, findsNothing);
       expect(find.byType(EnableExtensionPrompt), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byType(EnableExtensionPrompt),
+          matching: find.richTextContaining(
+            'The package:foo extension has not been enabled',
+          ),
+        ),
+        findsOneWidget,
+      );
       expect(find.byType(EmbeddedExtensionView), findsNothing);
     });