From 22e579972d46a485f1835ea47bf2bdbbb20dccc2 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Thu, 9 May 2024 14:36:01 -0700
Subject: [PATCH 1/3] Remove MV2 Dart Debug Extension

---
 dwds/debug_extension/.gitignore               |    3 +-
 dwds/debug_extension/CHANGELOG.md             |  109 --
 dwds/debug_extension/CONTRIBUTING.md          |   92 +-
 dwds/debug_extension/README.md                |   12 -
 dwds/debug_extension/build.yaml               |   18 +-
 dwds/debug_extension/pubspec.yaml             |   25 +-
 dwds/debug_extension/pubspec_overrides.yaml   |    2 -
 .../tool/build_extension.dart                 |    9 +-
 dwds/debug_extension/tool/build_extension.sh  |   38 -
 dwds/debug_extension/tool/copy_builder.dart   |   15 +-
 .../tool/update_dev_files.dart                |   60 +-
 dwds/debug_extension/web/background.dart      | 1061 ++++-------------
 dwds/debug_extension/web/chrome_api.dart      |  340 ++++--
 .../web/cider_connection.dart                 |    0
 .../web/copier.dart                           |    0
 .../web/cross_extension_communication.dart    |    0
 .../web/data_serializers.dart                 |    0
 .../web/data_serializers.g.dart               |    0
 .../web/data_types.dart                       |    0
 .../web/data_types.g.dart                     |    0
 .../web/debug_info.dart                       |    0
 .../web/debug_session.dart                    |    0
 dwds/debug_extension/web/debugger_panel.html  |   25 -
 .../web/detector.dart                         |    0
 dwds/debug_extension/web/detector.js          |   37 -
 .../web/devtools.dart                         |    0
 dwds/debug_extension/web/devtools.html        |   11 -
 dwds/debug_extension/web/devtools.js          |   67 --
 .../debug_extension/web/devtools_settings.png |  Bin 22954 -> 0 bytes
 dwds/debug_extension/web/inspector_panel.html |   21 -
 .../web/logger.dart                           |    0
 dwds/debug_extension/web/manifest.json        |   81 +-
 .../web/messaging.dart                        |    0
 dwds/debug_extension/web/panel.css            |  132 --
 .../web/panel.dart                            |    0
 dwds/debug_extension/web/panel.js             |   86 --
 .../web/popup.dart                            |    0
 .../web/{ => static_assets}/dart.png          |  Bin
 .../web/{ => static_assets}/dart_dev.png      |  Bin
 .../web/{ => static_assets}/dart_grey.png     |  Bin
 .../web/{ => static_assets}/dart_warning.png  |  Bin
 .../web/static_assets/debugger_panel.html     |    0
 .../web/static_assets/debugger_settings.png   |  Bin
 .../web/static_assets/devtools.html           |    0
 .../web/static_assets/inspect_widget.png      |  Bin
 .../web/static_assets/inspector_panel.html    |    0
 .../web/static_assets/popup.html              |    0
 .../web/static_assets/styles.css              |    0
 .../web/storage.dart                          |    0
 .../web/utils.dart                            |    0
 dwds/debug_extension/web/web_api.dart         |   50 +
 dwds/debug_extension_mv3/.gitignore           |    3 -
 dwds/debug_extension_mv3/CONTRIBUTING.md      |   92 --
 dwds/debug_extension_mv3/build.yaml           |   29 -
 dwds/debug_extension_mv3/pubspec.yaml         |   30 -
 .../pubspec_overrides.yaml                    |    3 -
 .../tool/copy_builder.dart                    |   47 -
 .../tool/update_dev_files.dart                |   92 --
 dwds/debug_extension_mv3/web/background.dart  |  297 -----
 dwds/debug_extension_mv3/web/chrome_api.dart  |  429 -------
 .../debug_extension_mv3/web/manifest_mv2.json |   41 -
 .../debug_extension_mv3/web/manifest_mv3.json |   47 -
 .../web/static_assets/dart.png                |  Bin 3062 -> 0 bytes
 .../web/static_assets/dart_dev.png            |  Bin 4743 -> 0 bytes
 .../web/static_assets/dart_grey.png           |  Bin 2814 -> 0 bytes
 .../web/static_assets/dart_warning.png        |  Bin 3611 -> 0 bytes
 dwds/debug_extension_mv3/web/web_api.dart     |   66 -
 67 files changed, 663 insertions(+), 2807 deletions(-)
 delete mode 100644 dwds/debug_extension/CHANGELOG.md
 delete mode 100644 dwds/debug_extension/README.md
 rename dwds/{debug_extension_mv3 => debug_extension}/tool/build_extension.dart (89%)
 delete mode 100755 dwds/debug_extension/tool/build_extension.sh
 rename dwds/{debug_extension_mv3 => debug_extension}/web/cider_connection.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/copier.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/cross_extension_communication.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/data_serializers.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/data_serializers.g.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/data_types.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/data_types.g.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/debug_info.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/debug_session.dart (100%)
 delete mode 100644 dwds/debug_extension/web/debugger_panel.html
 rename dwds/{debug_extension_mv3 => debug_extension}/web/detector.dart (100%)
 delete mode 100644 dwds/debug_extension/web/detector.js
 rename dwds/{debug_extension_mv3 => debug_extension}/web/devtools.dart (100%)
 delete mode 100644 dwds/debug_extension/web/devtools.html
 delete mode 100644 dwds/debug_extension/web/devtools.js
 delete mode 100644 dwds/debug_extension/web/devtools_settings.png
 delete mode 100644 dwds/debug_extension/web/inspector_panel.html
 rename dwds/{debug_extension_mv3 => debug_extension}/web/logger.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/messaging.dart (100%)
 delete mode 100644 dwds/debug_extension/web/panel.css
 rename dwds/{debug_extension_mv3 => debug_extension}/web/panel.dart (100%)
 delete mode 100644 dwds/debug_extension/web/panel.js
 rename dwds/{debug_extension_mv3 => debug_extension}/web/popup.dart (100%)
 rename dwds/debug_extension/web/{ => static_assets}/dart.png (100%)
 rename dwds/debug_extension/web/{ => static_assets}/dart_dev.png (100%)
 rename dwds/debug_extension/web/{ => static_assets}/dart_grey.png (100%)
 rename dwds/debug_extension/web/{ => static_assets}/dart_warning.png (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/static_assets/debugger_panel.html (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/static_assets/debugger_settings.png (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/static_assets/devtools.html (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/static_assets/inspect_widget.png (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/static_assets/inspector_panel.html (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/static_assets/popup.html (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/static_assets/styles.css (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/storage.dart (100%)
 rename dwds/{debug_extension_mv3 => debug_extension}/web/utils.dart (100%)
 delete mode 100644 dwds/debug_extension_mv3/.gitignore
 delete mode 100644 dwds/debug_extension_mv3/CONTRIBUTING.md
 delete mode 100644 dwds/debug_extension_mv3/build.yaml
 delete mode 100644 dwds/debug_extension_mv3/pubspec.yaml
 delete mode 100644 dwds/debug_extension_mv3/pubspec_overrides.yaml
 delete mode 100644 dwds/debug_extension_mv3/tool/copy_builder.dart
 delete mode 100644 dwds/debug_extension_mv3/tool/update_dev_files.dart
 delete mode 100644 dwds/debug_extension_mv3/web/background.dart
 delete mode 100644 dwds/debug_extension_mv3/web/chrome_api.dart
 delete mode 100644 dwds/debug_extension_mv3/web/manifest_mv2.json
 delete mode 100644 dwds/debug_extension_mv3/web/manifest_mv3.json
 delete mode 100644 dwds/debug_extension_mv3/web/static_assets/dart.png
 delete mode 100644 dwds/debug_extension_mv3/web/static_assets/dart_dev.png
 delete mode 100644 dwds/debug_extension_mv3/web/static_assets/dart_grey.png
 delete mode 100644 dwds/debug_extension_mv3/web/static_assets/dart_warning.png
 delete mode 100644 dwds/debug_extension_mv3/web/web_api.dart

diff --git a/dwds/debug_extension/.gitignore b/dwds/debug_extension/.gitignore
index 2c628c415..4878cbe8b 100644
--- a/dwds/debug_extension/.gitignore
+++ b/dwds/debug_extension/.gitignore
@@ -1,4 +1,3 @@
 build/
-prod_build/
-dev_build/
+compiled/
 extension_key.txt
diff --git a/dwds/debug_extension/CHANGELOG.md b/dwds/debug_extension/CHANGELOG.md
deleted file mode 100644
index 70604b8bf..000000000
--- a/dwds/debug_extension/CHANGELOG.md
+++ /dev/null
@@ -1,109 +0,0 @@
-## 1.30
-
-- Batch extension `Debugger.scriptParsed` events and send batches every 1000ms
-  to the server.
-- Enable null-safety.
-- Replace manual extension allowlist by configuring `externally_connectable` in
-  the `manifest.json`. See
-  https://developer.chrome.com/docs/extensions/mv3/manifest/externally_connectable/
-  for details.
-
-## 1.29
-
-- Notify the debugger and inspector panels when the debug session is
-  disconnected.
-- Provide a detailed error message when the debugger fails to connect.
-- Send an event to the server when the debugger is detached.
-- Fix compilation errors when the extension is built with DDC.
-
-## 1.28
-
-- Support Chrome 100 updates to the remote debugging protocol.
-
-## 1.27
-
-- Support embedded debugger and inspector in Chrome DevTools for Flutter Web
-  apps.
-
-## 1.26
-
-- Support embedded debugging experience in environments with no Dart app ID.
-
-## 1.25
-
-- Embed Dart DevTools in Chrome DevTools.
-
-## 1.24
-
-- Detect Dart applications in multi-app environments and show an alert.
-
-## 1.23
-
-- Depend on the latest `package:sse` to improve stability of the connection with
-  many concurrent requests.
-
-## 1.22
-
-- Detect Dart applications and update the icon accordingly.
-
-## 1.21
-
-- Detect authentication issues and prompt accordingly.
-
-## 1.20
-
-- Return response when `dwds.startDebugging` is called.
-
-## 1.19
-
-- Support cross-extension communication for use with Google specific extensions.
-
-## 1.18
-
-- Depend on the latest `package:sse`.
-
-## 1.17
-
-- Depend on the latest `package:sse`.
-
-## 1.16
-
-- Depend on the latest `package:sse`.
-
-## 1.15
-
-- No longer send script parsed events when skipLists are supported, improving
-  the IPL of Dart DevTools.
-
-## 1.14
-
-- Depend on the latest `package:sse`.
-
-## 1.13
-
-- Add support for using WebSockets for connection debug backend.
-
-## 1.12
-
-- Update error message to potentially direct users to enable debugging.
-
-## 1.11
-
-- Fix issue where the extension would provide an invalid alert when attempting
-  to launch for a non Dart application.
-
-## 1.10
-
-- Properly handle `sendCommand` errors.
-
-## 1.9
-
-- Look for Dart applications nested in iframes.
-
-## 1.8
-
-- Add support for batching scriptParsed events.
-
-## 1.7
-
-- Depend on latest `package:sse` to get retry logic.
diff --git a/dwds/debug_extension/CONTRIBUTING.md b/dwds/debug_extension/CONTRIBUTING.md
index 313f2c503..7f55d0914 100644
--- a/dwds/debug_extension/CONTRIBUTING.md
+++ b/dwds/debug_extension/CONTRIBUTING.md
@@ -1,22 +1,9 @@
 ## Building
 
-> Note: First make the script executable: `chmod +x tool/build_extension.sh`
+- For development: `dart run tool/build_extension.dart`
+- For release: ` dart run tool/build_extension.dart --prod`
 
-### With DDC (for development):
-
-```
-./tool/build_extension.sh
-```
-
-- The DDC-compiled extension will be located in the `/dev_build/web` directory.
-
-### With dart2js (for release):
-
-```
-./tool/build_extension.sh prod
-```
-
-- The dart2js-compiled extension will be located in the `/prod_build` directory.
+The dart2js-compiled extension will be located in the `/compiled` directory.
 
 ## Local Development
 
@@ -33,7 +20,7 @@
 - Visit chrome://extensions
 - Toggle "Developer mode" on
 - Click the "Load unpacked" button
-- Select the extension directory: `dev_build/web`
+- Select the extension directory: `/compiled`
 
 ### Debug your local extension
 
@@ -48,42 +35,41 @@
 
 ## Release process
 
-1. Update the version in `web/manifest.json`, `pubspec.yaml`, and in the
-   `CHANGELOG`.
-1. Follow the instructions above to build the dart2js-compiled release version
-   of the extension.
+- Update the version in `web/manifest_mv2.json`, `web/manifest_mv3.json`, `pubspec.yaml`, and in the
+  `CHANGELOG`.
+- Follow the instructions above to build the release version of the extension.
 
 > \*At this point, you should manually verify that everything is working by
 > following the steps in [Local Development](#local-development), except load
-> the extension from the `prod_build` directory. You will need to add an
-> extension key to the `manifest.json` file in `prod_build` to test locally.
+> the extension from the `compiled` directory. You will need to add an extension
+> key to the `manifest.json` file in `compiled` to test locally.
 
-3. Open a PR to submit the version change.
-1. Once submitted, pull the changes down to your local branch, and create a zip
-   of the `prod_build` directory (NOT `dev_build/web`). **Remove the Googler
-   extension key that was added by the builder to the `manifest.json` file.**
-1. Rename the zip `version_XX.XX.XX.zip` (eg, `version_1.24.0.zip`) and add it
-   to the go/dart-debug-extension-zips folder
+- Open a PR to submit the version change.
+- Once submitted, pull the changes down to your local branch, and create a zip
+  of the `compiled` directory. **Remove the Googler extension key that was added
+  by the builder to the `manifest.json` file.**
+- Rename the zip `version_XX.XX.XX.zip` (eg, `version_1.24.0.zip`) and add it to
+  the go/dart-debug-extension-zips folder
 
-> *You must be a Googler to do this. Ask for help if not.*
+> _You must be a Googler to do this. Ask for help if not._
 
-6. Go to the
-   [Chrome Web Store Developer Dashboard](https://chrome.google.com/webstore/devconsole).
-1. At the top-right, under Publisher, select dart-bat.
+- Go to the
+  [Chrome Web Store Developer Dashboard](https://chrome.google.com/webstore/devconsole).
+- At the top-right, under Publisher, select dart-bat.
 
-> *If you don’t see dart-bat as an option, you will need someone on the Dart
-> team to add you to the dart-bat Google group.*
+> _If you don’t see dart-bat as an option, you will need someone on the Dart
+> team to add you to the dart-bat Google group._
 
-7. Under Items, select the "Dart Debug Extension".
-1. Go to “Package” then select “Upload new package”.
+- Under Items, select the "Dart Debug Extension".
+- Go to “Package” then select “Upload new package”.
 
-> *The first time you do this, you will be asked to pay a $5 registration fee.
-> The registration fee can be expensed.*
+> _The first time you do this, you will be asked to pay a $5 registration fee.
+> The registration fee can be expensed._
 
-9. Upload the zip file you created in step 4.
-1. Save as draft, and verify that the new version is correct.
-1. Publish. The extension will be published immediately after going through the
-   review process.
+- Upload the zip file you created in step 4.
+- Save as draft, and verify that the new version is correct.
+- Publish. The extension will be published immediately after going through the
+  review process.
 
 ## Rollback process
 
@@ -92,15 +78,15 @@
 > still have to go through the review process, which can take anywhere from a
 > few hours (most common) to a few days.
 
-1. Find the previous version you want to rollback to in the
-   go/dart-debug-extension-zips folder.
+- Find the previous version you want to rollback to in the
+  go/dart-debug-extension-zips folder.
 
-> > *You must be a Googler to do this. Ask for help if not.*
+> _You must be a Googler to do this. Ask for help if not._
 
-2. Unzip the version you have chosen, and in `manifest.json` edit the version
-   number to be the next sequential version after the current "bad" version (eg,
-   the bad version is `1.28.0` and you are rolling back to version `1.27.0`.
-   Therefore you change `1.27.0` to `1.29.0`).
-1. Re-zip the directory and rename it to the new version number. Add it to the
-   go/dart-debug-extension-zips folder.
-1. Now, follow steps 6 - 11 in [Release process](#release-process).
+- Unzip the version you have chosen, and in `manifest.json` edit the version
+  number to be the next sequential version after the current "bad" version (eg,
+  the bad version is `1.28.0` and you are rolling back to version `1.27.0`.
+  Therefore you change `1.27.0` to `1.29.0`).
+- Re-zip the directory and rename it to the new version number. Add it to the
+  go/dart-debug-extension-zips folder.
+- Now, follow steps 6 - 11 in [Release process](#release-process).
diff --git a/dwds/debug_extension/README.md b/dwds/debug_extension/README.md
deleted file mode 100644
index b6455134e..000000000
--- a/dwds/debug_extension/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-A Chrome extension for enabling Dart application debugging over an SSE
-connection with package:dwds.
-
-## Installation
-
-The extension is available on the
-[Chrome Web Store](https://chrome.google.com/webstore/detail/dart-debug-extension/eljbmlghnomdjgdjmbdekegdkbabckhm).
-
-## Usage
-
-The extension requires disabling 'Throttle expensive background timers' in
-`chrome://flags` to ensure proper performance.
diff --git a/dwds/debug_extension/build.yaml b/dwds/debug_extension/build.yaml
index 624cdad00..3785809c2 100644
--- a/dwds/debug_extension/build.yaml
+++ b/dwds/debug_extension/build.yaml
@@ -4,28 +4,26 @@ targets:
       build_web_compilers|entrypoint:
         options:
           dart2js_args:
-            - -O4 # Note: Change to -01 for unminified JS. 
+            - -O1 # Note: Change to -04 for minified JS. 
             - --csp
         generate_for:
           - web/**.dart
-      extension|client_js_copy_builder:
+      mv3_extension|client_js_copy_builder:
         enabled: true
       
 builders:
   client_js_copy_builder:
+    required_inputs: [".js", ".png", ".html", ".css", ".json"]
     import: "tool/copy_builder.dart"
     builder_factories:
         - copyBuilder
     build_extensions:
       {
-        "web/{{}}.dart.js": ["prod_build/{{}}.js"],
-        "web/{{}}.png": ["prod_build/{{}}.png"],
-        "web/{{}}.html": ["prod_build/{{}}.html"],
-        "web/{{}}.css": ["prod_build/{{}}.css"],
-        "web/manifest.json": ["prod_build/manifest.json"],
-        "web/panel.js": ["prod_build/panel.js"],
-        "web/detector.js": ["prod_build/detector.js"],
-        "web/devtools.js": ["prod_build/devtools.js"],
+        "web/{{}}.dart.js": ["compiled/{{}}.dart.js"],
+        "web/static_assets/{{}}.png": ["compiled/static_assets/{{}}.png"],
+        "web/static_assets/{{}}.html": ["compiled/static_assets/{{}}.html"],
+        "web/static_assets/{{}}.css": ["compiled/static_assets/{{}}.css"],
+        "web/manifest.json": ["compiled/manifest.json"],
       }
     auto_apply: none
     build_to: source
diff --git a/dwds/debug_extension/pubspec.yaml b/dwds/debug_extension/pubspec.yaml
index c51aeb4ab..82d1cd109 100644
--- a/dwds/debug_extension/pubspec.yaml
+++ b/dwds/debug_extension/pubspec.yaml
@@ -1,25 +1,30 @@
-name: extension
+name: mv3_extension
 publish_to: none
-version: 1.30.0
+version: 2.1.4
 homepage: https://github.com/dart-lang/webdev
 description: >-
-  A chrome extension for Dart debugging.
+  A Chrome extension for Dart debugging.
 
 environment:
   sdk: ^3.2.0-36.0.dev
 
 dependencies:
-  async: ^2.3.0
+  built_value: ^8.3.0
   collection: ^1.15.0
   js: ^0.6.1+1
-  pub_semver: ^2.0.0
-  sse: ^4.1.0
-  web_socket_channel: ^2.0.0
 
 dev_dependencies:
+  args: ^2.3.1
   build: ^2.0.0
-  build_web_compilers: ^4.0.4
   build_runner: ^2.4.0
   built_collection: ^5.0.0
-  dwds: ^11.0.0
-  webdev: ^2.0.0
+  built_value_generator: ^8.3.0
+  build_web_compilers: ^4.0.4
+  dwds: ^16.0.0
+  path: ^1.8.1
+  sse: ^4.1.2
+  web_socket_channel: ^2.2.0
+
+dependency_overrides:
+  dwds:
+    path: ..
diff --git a/dwds/debug_extension/pubspec_overrides.yaml b/dwds/debug_extension/pubspec_overrides.yaml
index 4da474653..581552eac 100644
--- a/dwds/debug_extension/pubspec_overrides.yaml
+++ b/dwds/debug_extension/pubspec_overrides.yaml
@@ -1,5 +1,3 @@
 dependency_overrides:
-  webdev:
-    path: ../../webdev
   dwds:
     path: ..
diff --git a/dwds/debug_extension_mv3/tool/build_extension.dart b/dwds/debug_extension/tool/build_extension.dart
similarity index 89%
rename from dwds/debug_extension_mv3/tool/build_extension.dart
rename to dwds/debug_extension/tool/build_extension.dart
index 66bc1cb4c..c3425a844 100644
--- a/dwds/debug_extension_mv3/tool/build_extension.dart
+++ b/dwds/debug_extension/tool/build_extension.dart
@@ -10,7 +10,6 @@
 // Run from the extension root directory:
 //    - For dev: dart run tool/build_extension.dart
 //    - For prod: dart run tool/build_extension.dart --prod
-//    - For MV2: dart run tool/build_extension.dart --mv2
 
 import 'dart:convert';
 import 'dart:io';
@@ -23,8 +22,7 @@ const _mv2Flag = 'mv2';
 
 void main(List<String> arguments) async {
   final parser = ArgParser()
-    ..addFlag(_prodFlag, negatable: true, defaultsTo: false)
-    ..addFlag(_mv2Flag, negatable: true, defaultsTo: false);
+    ..addFlag(_prodFlag, negatable: true, defaultsTo: false);
   final argResults = parser.parse(arguments);
 
   exitCode = await run(
@@ -38,7 +36,7 @@ void main(List<String> arguments) async {
 
 Future<int> run({required bool isProd, required bool isMV2}) async {
   _logInfo(
-    'Building ${isMV2 ? 'MV2' : 'MV3'} extension for ${isProd ? 'prod' : 'dev'}',
+    'Building extension for ${isProd ? 'prod' : 'dev'}',
   );
   _logInfo('Compiling extension with dart2js to /compiled directory');
   final compileStep = await Process.start(
@@ -50,10 +48,9 @@ Future<int> run({required bool isProd, required bool isMV2}) async {
   if (compileExitCode != 0) {
     return compileExitCode;
   }
-  final manifestFileName = isMV2 ? 'manifest_mv2' : 'manifest_mv3';
   _logInfo('Copying manifest.json to /compiled directory');
   try {
-    File(p.join('web', '$manifestFileName.json')).copySync(
+    File(p.join('web', 'manifest.json')).copySync(
       p.join('compiled', 'manifest.json'),
     );
   } catch (error) {
diff --git a/dwds/debug_extension/tool/build_extension.sh b/dwds/debug_extension/tool/build_extension.sh
deleted file mode 100755
index 7afbba74c..000000000
--- a/dwds/debug_extension/tool/build_extension.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# INSTRUCTIONS:
-
-# Building DDC-compiled app (for development work):
-# ./tool/build_extension.sh
-
-# Building dart2js-compiled app (for release):
-# ./tool/build_extension.sh prod
-
-prod="false"
-
-case "$1" in
-    prod)
-        prod="true"
-        shift;;
-esac
-
-if [ $prod == true ]; then
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    echo "Building dart2js-compiled extension to /prod_build directory."
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    dart run build_runner build web --delete-conflicting-outputs --output build --release
-    exit 1
-fi
-
-echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo "Building DDC-compiled extension to dev_build/web directory."
-echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-dart run build_runner build web --delete-conflicting-outputs --output dev_build
-echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo "Updating files in dev_build/web directory to add dev-signifiers."
-echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-dart tool/update_dev_files.dart
diff --git a/dwds/debug_extension/tool/copy_builder.dart b/dwds/debug_extension/tool/copy_builder.dart
index 07abcac09..4a5e5d04f 100644
--- a/dwds/debug_extension/tool/copy_builder.dart
+++ b/dwds/debug_extension/tool/copy_builder.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
@@ -10,14 +10,11 @@ Builder copyBuilder(_) => _CopyBuilder();
 class _CopyBuilder extends Builder {
   @override
   Map<String, List<String>> get buildExtensions => {
-        "web/{{}}.dart.js": ["prod_build/{{}}.js"],
-        "web/{{}}.png": ["prod_build/{{}}.png"],
-        "web/{{}}.html": ["prod_build/{{}}.html"],
-        "web/{{}}.css": ["prod_build/{{}}.css"],
-        "web/manifest.json": ["prod_build/manifest.json"],
-        "web/panel.js": ["prod_build/panel.js"],
-        "web/detector.js": ["prod_build/detector.js"],
-        "web/devtools.js": ["prod_build/devtools.js"],
+        "web/{{}}.dart.js": ["compiled/{{}}.dart.js"],
+        "web/static_assets/{{}}.png": ["compiled/static_assets/{{}}.png"],
+        "web/static_assets/{{}}.html": ["compiled/static_assets/{{}}.html"],
+        "web/static_assets/{{}}.css": ["compiled/static_assets/{{}}.css"],
+        "web/manifest.json": ["compiled/manifest.json"],
       };
 
   @override
diff --git a/dwds/debug_extension/tool/update_dev_files.dart b/dwds/debug_extension/tool/update_dev_files.dart
index 87e2dee61..1659c5c15 100644
--- a/dwds/debug_extension/tool/update_dev_files.dart
+++ b/dwds/debug_extension/tool/update_dev_files.dart
@@ -5,13 +5,12 @@
 import 'dart:io';
 
 void main() async {
-  await Future.wait([_updateManifestJson(), _updateDevtoolsJs()]);
+  await _updateManifestJson();
 }
 
-/// Adds the Googler extension key, updates the extension icon, and prefixes the
-/// extension name with "[DEV]".
+/// Adds the Googler extension key, and prefixes the extension name with "DEV".
 Future<void> _updateManifestJson() async {
-  final manifestJson = File('dev_build/web/manifest.json');
+  final manifestJson = File('compiled/manifest.json');
   final extensionKeyTxt = File('extension_key.txt');
   final extensionKey = await extensionKeyTxt.exists()
       ? await extensionKeyTxt.readAsString()
@@ -31,22 +30,12 @@ Future<void> _updateManifestJson() async {
             newValue: extensionKey,
           ),
       ];
-    }
-    if (_matchesKey(line: line, key: 'default_icon')) {
+    } else if (_matchesKey(line: line, key: 'default_icon')) {
       return [
         _newKeyValue(
           oldLine: line,
           newKey: 'default_icon',
-          newValue: 'dart_dev.png',
-        ),
-      ];
-    }
-    if (_matchesValue(line: line, value: 'background.js')) {
-      return [
-        _newKeyValue(
-          oldLine: line,
-          newKey: null,
-          newValue: 'background.dart.js',
+          newValue: 'static_assets/dart_dev.png',
         ),
       ];
     } else {
@@ -55,28 +44,6 @@ Future<void> _updateManifestJson() async {
   });
 }
 
-/// Prefixes the names of the panels that are added to Chrome DevTools with
-/// "[DEV]".
-Future<void> _updateDevtoolsJs() async {
-  final devtoolsJs = File('dev_build/web/devtools.js');
-  return _transformDevFile(devtoolsJs, (line) {
-    final originalDebuggerLine = "const DEBUGGER_PANEL_NAME = 'Dart Debugger';";
-    final modifiedDebuggerLine =
-        "const DEBUGGER_PANEL_NAME = '[DEV] Dart Debugger';";
-    final originalInspectorLine =
-        "const INSPECTOR_PANEL_NAME = 'Flutter Inspector';";
-    final modifiedInspectorLine =
-        "const INSPECTOR_PANEL_NAME = '[DEV] Flutter Inspector';";
-    if (_matchesLine(line: line, match: originalDebuggerLine)) {
-      return [_newLine(oldLine: line, newLine: modifiedDebuggerLine)];
-    }
-    if (_matchesLine(line: line, match: originalInspectorLine)) {
-      return [_newLine(oldLine: line, newLine: modifiedInspectorLine)];
-    }
-    return [line];
-  });
-}
-
 Future<void> _transformDevFile(
   File devFile,
   List<String> Function(String) transformLine,
@@ -94,15 +61,6 @@ bool _matchesKey({required String line, required String key}) {
   return line.trimLeft().startsWith('"$key":');
 }
 
-bool _matchesValue({required String line, required String value}) {
-  return line.trimRight().endsWith('"$value"') ||
-      line.trimRight().endsWith('"$value",');
-}
-
-bool _matchesLine({required String line, required String match}) {
-  return line.trim() == match;
-}
-
 String _newKeyValue({
   required String oldLine,
   String? newKey,
@@ -115,14 +73,6 @@ String _newKeyValue({
   return '$lineStart$key$value$lineEnd';
 }
 
-String _newLine({
-  required String oldLine,
-  required String newLine,
-}) {
-  final lineStart = oldLine.leftPadding();
-  return '$lineStart$newLine';
-}
-
 extension LeftPaddingExtension on String {
   String leftPadding() {
     String padding = '';
diff --git a/dwds/debug_extension/web/background.dart b/dwds/debug_extension/web/background.dart
index 68533b191..5efd5307f 100644
--- a/dwds/debug_extension/web/background.dart
+++ b/dwds/debug_extension/web/background.dart
@@ -1,898 +1,297 @@
-// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
 @JS()
 library background;
 
-import 'dart:async';
-import 'dart:convert';
-import 'dart:html';
-
-import 'package:built_collection/built_collection.dart';
-// TODO(elliette): The format_and_analyze Github actions complains about this
-// import because it is looking for it in DWDS' pubspec, not in the extension's
-// pubspec. We should fix the Github action and / or unnest the extension from
-// the DWDS directory.
-// ignore: depend_on_referenced_packages
-import 'package:collection/collection.dart' show IterableExtension;
-import 'package:dwds/data/devtools_request.dart';
-import 'package:dwds/data/extension_request.dart';
-import 'package:dwds/data/serializers.dart';
-import 'package:dwds/shared/batched_stream.dart';
-import 'package:dwds/src/sockets.dart';
+import 'package:dwds/data/debug_info.dart';
 import 'package:js/js.dart';
-import 'package:js/js_util.dart' as js_util;
-import 'package:pub_semver/pub_semver.dart';
-import 'package:sse/client/sse_client.dart';
-import 'package:web_socket_channel/web_socket_channel.dart';
 
 import 'chrome_api.dart';
-import 'web_api.dart';
-
-const _notADartAppAlert = 'No Dart application detected.'
-    ' Are you trying to debug an application that includes a Chrome hosted app'
-    ' (an application listed in chrome://apps)? If so, debugging is disabled.'
-    ' You can fix this by removing the application from chrome://apps. Please'
-    ' see https://bugs.chromium.org/p/chromium/issues/detail?id=885025#c11.';
-
-// Extensions allowed for cross-extension communication.
-//
-// This is only used to forward outgoing messages, as incoming messages are
-// restricted by `externally_connectable` in the extension manifest.json.
-const _allowedExtensions = {
-  'nbkbficgbembimioedhceniahniffgpl', // AngularDart DevTools
-};
-
-// Events forwarded to allowed extensions.
-const _allowedEvents = {'Overlay.inspectNodeRequested'};
-
-// Map of Chrome tab ID to encoded vm service protocol URI.
-final _tabIdToEncodedUri = <int, String>{};
-
-// Map of Chrome tab ID to warnings for that tab.
-final _tabIdToWarning = <int, String>{};
-
-final _debuggableTabs = <int>{};
-
-final _tabsToAttach = <Tab>{};
-
-final _debugSessions = <DebugSession>[];
-
-final _devToolsPanelsNotifier =
-    Notifier<List<DevToolsPanel>>(<DevToolsPanel>[]);
-
-// Keeps track of the most recent Dart tab that was opened. This is a heuristic
-// to let us guess which tab the user is trying to debug if they start debugging
-// from the Chrome DevTools Dart panel (which doesn't have a tab ID).
-Tab? _mostRecentDartTab;
-
-// Keeps track of how debugging was triggered. This lets us know if we should
-// open Dart DevTools in a new window/tab or embed it in Chrome DevTools.
-DebuggerTrigger? _debuggerTrigger;
-
-class DebugSession {
-  // The tab ID that contains the running Dart application.
-  final int appTabId;
-
-  // The Dart app ID.
-  final String appId;
-
-  // The tab ID that contains the corresponding Dart DevTools.
-  int? devtoolsTabId;
-
-  // Socket client for communication with dwds extension backend.
-  final SocketClient _socketClient;
-
-  // How often to send batched events.
-  static const int _batchDelayMilliseconds = 1000;
-
-  // Collect events into batches to be send periodically to the server.
-  final _batchController =
-      BatchedStreamController<ExtensionEvent>(delay: _batchDelayMilliseconds);
-  late final StreamSubscription<List<ExtensionEvent>> _batchSubscription;
-
-  DebugSession(this._socketClient, this.appTabId, this.appId) {
-    // Collect extension events and send them periodically to the server.
-    _batchSubscription = _batchController.stream.listen((events) {
-      _socketClient.sink.add(
-        jsonEncode(
-          serializers.serialize(
-            BatchedEvents(
-              (b) => b.events = ListBuilder<ExtensionEvent>(events),
-            ),
-          ),
-        ),
-      );
-    });
-  }
-
-  void sendEvent(ExtensionEvent event) {
-    _socketClient.sink.add(jsonEncode(serializers.serialize(event)));
-  }
-
-  void sendBatchedEvent(ExtensionEvent event) {
-    _batchController.sink.add(event);
-  }
+import 'cider_connection.dart';
+import 'cross_extension_communication.dart';
+import 'data_types.dart';
+import 'debug_session.dart';
+import 'logger.dart';
+import 'messaging.dart';
+import 'storage.dart';
+import 'utils.dart';
 
-  void close() {
-    _socketClient.close();
-    _batchSubscription.cancel();
-    _batchController.close();
-  }
-}
-
-class DevToolsPanel {
-  // The Dart app ID.
-  final String? appId;
-
-  // The Chrome DevTools panel ID.
-  String? panelId;
-
-  // The URI for the embedded Dart DevTools, or an empty string if the debugger
-  // is disconnected.
-  String devToolsUri = '';
-
-  DevToolsPanel(this.appId);
+void main() {
+  _registerListeners();
 }
 
-enum DebuggerTrigger { extensionIcon, dartPanel, dwds }
-
-void main() {
-  // Start debugging when a user clicks the Dart Debug Extension:
-  chrome.browserAction.onClicked.addListener(
-    allowInterop((_) {
-      _startDebugging(DebuggerTrigger.extensionIcon);
-    }),
+void _registerListeners() {
+  chrome.runtime.onMessage.addListener(
+    allowInterop(_handleRuntimeMessages),
   );
-
-// Handles any incoming messages from the content scripts (detector, panel).
-  chrome.runtime.onMessage
-      .addListener(allowInterop(_handleMessageFromContentScripts));
-
-  // Attaches a debug session to the app when the extension receives a
-  // Runtime.executionContextCreated event from Chrome:
-  chrome.debugger.onEvent.addListener(allowInterop(_maybeAttachDebugSession));
-
-  // When a Dart application tab is closed, detach the corresponding debug
-  // session:
-  chrome.tabs.onRemoved
-      .addListener(allowInterop(_removeAndDetachDebugSessionForTab));
-
-  // When a debug session is detached, remove the reference to it:
-  chrome.debugger.onDetach.addListener(
-    allowInterop((Debuggee source, String reason) {
-      _removeDebugSessionForTab(source.tabId);
-    }),
+  // The only extension allowed to send messages to this extension is the
+  // AngularDart DevTools extension. Its permission is set in the manifest.json
+  // externally_connectable field.
+  chrome.runtime.onMessageExternal.addListener(
+    allowInterop(handleMessagesFromAngularDartDevTools),
   );
-
-  // Save the tab ID for the opened DevTools.
-  chrome.tabs.onCreated.addListener(allowInterop(_maybeSaveDevToolsTabId));
-
-  // Forward debugger events to the backend if applicable.
-  chrome.debugger.onEvent.addListener(allowInterop(_filterAndForwardToBackend));
-
-  // Maybe update the extension icon when a user clicks the tab:
+  // The only external service that sends messages to the Dart Debug Extension
+  // is Cider.
+  chrome.runtime.onConnectExternal
+      .addListener(allowInterop(handleCiderConnectRequest));
+  // Update the extension icon on tab navigation:
   chrome.tabs.onActivated.addListener(
-    allowInterop((ActiveInfo info) {
-      _updateIcon();
+    allowInterop((ActiveInfo info) async {
+      await _updateIcon(info.tabId);
     }),
   );
-
-  // Message handler enabling communication with external Chrome extensions:
-  chrome.runtime.onMessageExternal
-      .addListener(allowInterop(_handleMessageFromExternalExtensions));
-
-  // Message forwarder enabling communication with external Chrome extensions:
-  chrome.debugger.onEvent
-      .addListener(allowInterop(_forwardMessageToExternalExtensions));
-
-  // Maybe update the extension icon when the window focus changes:
   chrome.windows.onFocusChanged.addListener(
-    allowInterop((_) {
-      _updateIcon();
-    }),
-  );
-
-  // Maybe update the extension icon during tab navigation:
-  chrome.webNavigation.onCommitted
-      .addListener(allowInterop(_updateIconOnNavigation));
-
-  // Notify the panel script controlling the Dart DevTools panel in Chrome
-  // DevTools of any relevant changes so that it can update accordingly:
-  final devToolsPanelListener =
-      Listener<List<DevToolsPanel>>(_notifyPanelScriptOfChanges);
-  _devToolsPanelsNotifier.addListener(devToolsPanelListener);
-
-  /// Everything after this is for testing only.
-  /// TODO(elliette): Figure out if there is a workaround that would allow us to
-  /// remove this.
-  ///
-  /// An automated click on the extension icon is not supported by WebDriver.
-  /// We initiate a fake click from the `debug_extension_test`
-  /// after the extension is loaded.
-  onFakeClick = allowInterop(() {
-    _startDebugging(DebuggerTrigger.extensionIcon);
-  });
-
-  /// This is how we determine the extension tab to connect to during E2E tests.
-  isDartDebugExtension = true;
-}
-
-// Gets the current tab, then attaches the debugger to it:
-void _startDebugging(DebuggerTrigger debuggerTrigger) {
-  // Set how the debugging request was triggered. This will determine whether we
-  // launch Dart DevTools in a new Chrome window / tab or in the Chrome DevTools
-  // Dart panel:
-  _debuggerTrigger = debuggerTrigger;
-
-  final getCurrentTabQuery = QueryInfo(active: true, currentWindow: true);
-
-  // Sends commands to debugger attached to the current tab.
-  // Extracts the extension backend port from the injected JS.
-  final attachDebuggerToTab = allowInterop(_attachDebuggerToTab);
-
-  chrome.tabs.query(
-    getCurrentTabQuery,
-    allowInterop((List tabs) {
-      if (tabs.isNotEmpty) {
-        attachDebuggerToTab(tabs.first as Tab);
-      } else if (_mostRecentDartTab != null) {
-        attachDebuggerToTab(_mostRecentDartTab!);
-      } else {
-        window.alert('''
-          Could not find a Dart app to start debugging. 
-          The Dart Debug Extension will turn blue when 
-          a Dart application is detected.
-          ''');
+    allowInterop((_) async {
+      final currentTab = await activeTab;
+      if (currentTab?.id != null) {
+        await _updateIcon(currentTab!.id);
       }
     }),
   );
-}
-
-Future<void> _attachDebuggerToTab(Tab currentTab) async {
-  if (!_debuggableTabs.contains(currentTab.id)) return;
-
-  if (_tabIdToWarning.containsKey(currentTab.id)) {
-    window.alert(_tabIdToWarning[currentTab.id]);
-    return;
-  }
-
-  chrome.debugger.attach(
-    Debuggee(tabId: currentTab.id),
-    '1.3',
-    allowInterop(() async {
-      if (chrome.runtime.lastError != null) {
-        String alertMessage;
-        if (chrome.runtime.lastError!.message.contains('Cannot access') ||
-            chrome.runtime.lastError!.message.contains('Cannot attach')) {
-          alertMessage = _notADartAppAlert;
-        } else {
-          alertMessage = 'DevTools is already opened on a different window.';
-        }
-        window.alert(alertMessage);
-        return;
-      }
-      _tabsToAttach.add(currentTab);
-      chrome.debugger.sendCommand(
-        Debuggee(tabId: currentTab.id),
-        'Runtime.enable',
-        EmptyParam(),
-        allowInterop((e) {}),
-      );
-    }),
-  );
-}
-
-void _handleMessageFromContentScripts(
-  dynamic jsRequest,
-  MessageSender sender,
-  Function sendResponse,
-) {
-  if (jsRequest == null) return;
-  final request = jsRequest as Request;
-  switch (request.sender) {
-    case 'detector-script':
-      _maybeMarkTabAsDebuggable(request, sender, sendResponse);
-      break;
-    case 'panel-script':
-      _handleMessageFromPanelScript(request, sender);
-      break;
-  }
-}
-
-void _handleMessageFromPanelScript(Request request, MessageSender sender) {
-  switch (request.message) {
-    case 'devtools-open':
-      _updateOrCreateDevToolsPanel(request.dartAppId, (panel) {
-        panel.panelId = sender.id;
-      });
-      break;
-    case 'start-debugging':
-      _startDebugging(DebuggerTrigger.dartPanel);
-      break;
-  }
-}
-
-Future<void> _maybeMarkTabAsDebuggable(
-  Request request,
-  MessageSender sender,
-  Function sendResponse,
-) async {
-  // Register any warnings for the tab:
-  if (request.warning != '') {
-    _tabIdToWarning[sender.tab!.id] = request.warning;
-  }
-  _debuggableTabs.add(sender.tab!.id);
-  _updateIcon();
-  // TODO(grouma) - We can conditionally auto start debugging here.
-  // For example: _startDebugging(null);
-  sendResponse(true);
-}
-
-Future<void> _maybeAttachDebugSession(
-  Debuggee source,
-  String method,
-  Object? params,
-) async {
-  // Return early if it's not a Runtime.executionContextCreated event (sent from
-  // Chrome):
-  if (method != 'Runtime.executionContextCreated') return;
-  if (params == null) return;
-
-  final context = json.decode(JSON.stringify(params))['context'];
-  final tab = _tabsToAttach.firstWhereOrNull((tab) => tab.id == source.tabId);
-  final contextId = context['id'] as int?;
-  if (tab != null && contextId != null) {
-    final launchInChromeDevTools =
-        _debuggerTrigger == DebuggerTrigger.dartPanel;
-    if (await _tryAttach(contextId, tab, launchInChromeDevTools)) {
-      _tabsToAttach.remove(tab);
-    }
-  }
-}
-
-// Tries to remove the debug session for the specified tab, and detach the
-// debugger associated with that debug session.
-void _removeAndDetachDebugSessionForTab(int tabId, _) {
-  final removedTabId = _removeDebugSessionForTab(tabId);
-
-  if (removedTabId != -1) {
-    chrome.debugger.detach(Debuggee(tabId: removedTabId), allowInterop(() {}));
-  }
-}
-
-// Tries to remove the debug session for the specified tab. If no session is
-// found, returns -1. Otherwise returns the tab ID.
-int _removeDebugSessionForTab(int tabId) {
-  final session = _debugSessions.firstWhereOrNull(
-    (session) => session.appTabId == tabId || session.devtoolsTabId == tabId,
-  );
-  if (session != null) {
-    // Note: package:sse will try to keep the connection alive, even after the
-    // client has been closed. Therefore the extension sends an event to notify
-    // DWDS that we should close the connection, instead of relying on the done
-    // event sent when the client is closed. See details:
-    // https://github.com/dart-lang/webdev/pull/1595#issuecomment-1116773378
-    final event =
-        _extensionEventFor('DebugExtension.detached', js_util.jsify({}));
-    session.sendEvent(event);
-    session.close();
-    _debugSessions.remove(session);
-
-    // Notify the Dart DevTools panel that the session has been detached by
-    // setting the URI to an empty string:
-    _updateOrCreateDevToolsPanel(session.appId, (panel) {
-      panel.devToolsUri = '';
-    });
-
-    return session.appTabId;
-  } else {
-    return -1;
-  }
-}
+  chrome.webNavigation.onCommitted
+      .addListener(allowInterop(_detectNavigationAwayFromDartApp));
 
-Future<void> _maybeSaveDevToolsTabId(Tab tab) async {
-  // Remembers the ID of the DevTools tab.
-  //
-  // This assumes that the next launched tab after a session is created is the
-  // DevTools tab.
-  if (_debugSessions.isNotEmpty) _debugSessions.last.devtoolsTabId ??= tab.id;
+  chrome.commands.onCommand
+      .addListener(allowInterop(_maybeSendCopyAppIdRequest));
 }
 
-Future<void> _handleMessageFromExternalExtensions(
+Future<void> _handleRuntimeMessages(
   dynamic jsRequest,
   MessageSender sender,
   Function sendResponse,
 ) async {
-  if (jsRequest == null) return;
-  final request = jsRequest as Request;
-  if (request.name == 'chrome.debugger.sendCommand') {
-    try {
-      final options = request.options as SendCommandOptions;
-
-      void sendResponseOrError([e]) {
-        // No arguments indicate that an error occurred.
-        if (e == null) {
-          sendResponse(
-            ErrorResponse()..error = JSON.stringify(chrome.runtime.lastError),
-          );
-        } else {
-          sendResponse(e);
-        }
-      }
-
-      chrome.debugger.sendCommand(
-        Debuggee(tabId: request.tabId),
-        options.method,
-        options.commandParams,
-        allowInterop(sendResponseOrError),
-      );
-    } catch (e) {
-      sendResponse(ErrorResponse()..error = '$e');
-    }
-  } else if (request.name == 'dwds.encodedUri') {
-    sendResponse(_tabIdToEncodedUri[request.tabId] ?? '');
-  } else if (request.name == 'dwds.startDebugging') {
-    _startDebugging(DebuggerTrigger.dwds);
-    // TODO(grouma) - Actually determine if debugging initiated
-    // successfully.
-    sendResponse(true);
-  } else {
-    sendResponse(
-      ErrorResponse()..error = 'Unknown request name: ${request.name}',
-    );
-  }
-}
-
-Future<void> _forwardMessageToExternalExtensions(
-  Debuggee source,
-  String method,
-  Object? params,
-) async {
-  if (_allowedEvents.contains(method)) {
-    sendMessageToExtensions(
-      ExternalExtensionRequest(
-        name: 'chrome.debugger.event',
-        tabId: source.tabId,
-        options: DebugEvent(method: method, params: params),
-      ),
-    );
-  }
-}
-
-void _notifyPanelScriptOfChanges(List panels) {
-  final panelsList = List<DevToolsPanel>.from(panels);
-  for (final panel in panelsList) {
-    chrome.runtime.sendMessage(
-      panel.panelId,
-      SimpleMessage(recipient: 'panel-script', body: panel.devToolsUri),
-      null,
-      null,
-    );
-  }
-}
-
-void sendMessageToExtensions(ExternalExtensionRequest request) {
-  for (var extensionId in _allowedExtensions) {
-    try {
-      chrome.runtime.sendMessage(
-        extensionId,
-        request,
-        null,
-        allowInterop(([e]) {
-          if (e == null) {
-            // Error sending message. Check lastError to silently fail.
-            chrome.runtime.lastError;
-          }
-        }),
-      );
-    } catch (_) {}
-  }
-}
-
-/// Attempts to attach to the Dart application in the provided Tab and execution
-/// context.
-Future<bool> _tryAttach(
-  int contextId,
-  Tab tab,
-  bool launchInChromeDevTools,
-) async {
-  final successCompleter = Completer<bool>();
-  chrome.debugger.sendCommand(
-    Debuggee(tabId: tab.id),
-    'Runtime.evaluate',
-    InjectedParams(
-      expression:
-          '[window.\$dartExtensionUri, window.\$dartAppId, window.\$dartAppInstanceId, window.\$dwdsVersion]',
-      returnByValue: true,
-      contextId: contextId,
-    ),
-    allowInterop((dynamic response) {
-      final evalResponse = response as EvalResponse;
-      final value = evalResponse.result.value;
-      final extensionUri = value?[0];
-      final appId = value?[1];
-      final instanceId = value?[2];
-      final dwdsVersion = value?[3];
-      if (extensionUri == null || appId == null || instanceId == null) {
-        window.console.warn(
-          'Unable to debug app. Missing Dart debugging global variables',
-        );
-        successCompleter.complete(false);
+  if (jsRequest is! String) return;
+
+  interceptMessage<String>(
+    message: jsRequest,
+    expectedType: MessageType.isAuthenticated,
+    expectedSender: Script.detector,
+    expectedRecipient: Script.background,
+    sender: sender,
+    messageHandler: (String isAuthenticated) async {
+      final dartTab = sender.tab;
+      if (dartTab == null) {
+        debugWarn('Received auth info but tab is missing.');
         return;
       }
-      _startSseClient(
-        Uri.parse(extensionUri),
-        appId,
-        instanceId,
-        contextId,
-        tab,
-        dwdsVersion ?? '0.0.0',
-        launchInChromeDevTools,
+      // Save the authentication info in storage:
+      await setStorageObject<String>(
+        type: StorageObject.isAuthenticated,
+        value: isAuthenticated,
+        tabId: dartTab.id,
       );
-      successCompleter.complete(true);
-    }),
+    },
   );
-  return successCompleter.future;
-}
 
-// Starts an SSE client.
-//
-// Initiates a [DevToolsRequest], handles an [ExtensionRequest],
-// and sends an [ExtensionEvent].
-Future<void> _startSseClient(
-  Uri uri,
-  String appId,
-  String instanceId,
-  int contextId,
-  Tab currentTab,
-  String dwdsVersion,
-  bool launchInChromeDevTools,
-) async {
-  if (Version.parse(dwdsVersion) >= Version.parse('9.1.0')) {
-    var authUri = uri.replace(path: authenticationPath);
-    if (authUri.scheme == 'ws') authUri = authUri.replace(scheme: 'http');
-    if (authUri.scheme == 'wss') authUri = authUri.replace(scheme: 'https');
-    final authUrl = authUri.toString();
-    try {
-      final response = await HttpRequest.request(
-        authUrl,
-        method: 'GET',
-        withCredentials: true,
-      );
-      final responseText = response.responseText ?? '';
-      if (!responseText.contains('Dart Debug Authentication Success!')) {
-        throw Exception('Not authenticated.');
+  interceptMessage<DebugInfo>(
+    message: jsRequest,
+    expectedType: MessageType.debugInfo,
+    expectedSender: Script.detector,
+    expectedRecipient: Script.background,
+    sender: sender,
+    messageHandler: (DebugInfo debugInfo) async {
+      final dartTab = sender.tab;
+      if (dartTab == null) {
+        debugWarn('Received debug info but tab is missing.');
+        return;
       }
-    } catch (_) {
-      if (window.confirm(
-        'Authentication required.\n\nClick OK to authenticate then try again.',
-      )) {
-        // TODO(grouma) - see if we can get a callback on a successful auth
-        // and automatically reinitiate the dev workflow.
-        window.open(authUrl, 'Dart DevTools Authentication');
-        chrome.debugger
-            .detach(Debuggee(tabId: currentTab.id), allowInterop(() {}));
+      // If this is a new Dart app, we need to clear old debug session data:
+      if (!await _matchesAppInStorage(debugInfo.appId, tabId: dartTab.id)) {
+        await clearStaleDebugSession(dartTab.id);
       }
-      return;
-    }
-  }
-
-  // Specifies whether the debugger is attached.
-  //
-  // A debugger is detached if it is closed by user or the target is closed.
-  final client = uri.isScheme('ws') || uri.isScheme('wss')
-      ? WebSocketClient(WebSocketChannel.connect(uri))
-      : SseSocketClient(SseClient(uri.toString()));
-  _debugSessions.add(DebugSession(client, currentTab.id, appId));
-  print('Connected to DWDS version $dwdsVersion with appId=$appId');
-  client.stream.listen(
-    (data) {
-      final message = serializers.deserialize(jsonDecode(data));
-      if (message is ExtensionRequest) {
-        final messageParams = message.commandParams ?? '{}';
-        final params =
-            BuiltMap<String, Object>(json.decode(messageParams)).toMap();
-        chrome.debugger.sendCommand(
-          Debuggee(tabId: currentTab.id),
-          message.command,
-          js_util.jsify(params),
-          allowInterop(([e]) {
-            // No arguments indicate that an error occurred.
-            if (e == null) {
-              client.sink.add(
-                jsonEncode(
-                  serializers.serialize(
-                    ExtensionResponse(
-                      (b) => b
-                        ..id = message.id
-                        ..success = false
-                        ..result = JSON.stringify(chrome.runtime.lastError),
-                    ),
-                  ),
-                ),
-              );
-            } else {
-              client.sink.add(
-                jsonEncode(
-                  serializers.serialize(
-                    ExtensionResponse(
-                      (b) => b
-                        ..id = message.id
-                        ..success = true
-                        ..result = JSON.stringify(e),
-                    ),
-                  ),
-                ),
-              );
-            }
-          }),
-        );
-      } else if (message is ExtensionEvent) {
-        if (message.method == 'dwds.encodedUri') {
-          sendMessageToExtensions(
-            ExternalExtensionRequest(
-              name: 'dwds.encodedUri',
-              tabId: currentTab.id,
-              options: message.params,
-            ),
-          );
-          _tabIdToEncodedUri[currentTab.id] = message.params;
-        }
-
-        if (message.method == 'dwds.devtoolsUri') {
-          _updateOrCreateDevToolsPanel(appId, (panel) {
-            panel.devToolsUri = message.params;
-          });
-        }
+      // Save the debug info for the Dart app in storage:
+      await setStorageObject<DebugInfo>(
+        type: StorageObject.debugInfo,
+        value: _addTabInfo(debugInfo, tab: dartTab),
+        tabId: dartTab.id,
+      );
+      // Update the icon to show that a Dart app has been detected:
+      final currentTab = await activeTab;
+      if (currentTab?.id == dartTab.id) {
+        await _updateIcon(dartTab.id);
       }
     },
-    onDone: () {
-      _tabIdToEncodedUri.remove(currentTab.id);
-      _removeAndDetachDebugSessionForTab(currentTab.id, null);
-      return;
-    },
-    onError: (_) {
-      _tabIdToEncodedUri.remove(currentTab.id);
-      window.alert('Lost app connection.');
-      _removeAndDetachDebugSessionForTab(currentTab.id, null);
-    },
-    cancelOnError: true,
   );
 
-  client.sink.add(
-    jsonEncode(
-      serializers.serialize(
-        DevToolsRequest(
-          (b) => b
-            ..appId = appId
-            ..instanceId = instanceId
-            ..contextId = contextId
-            ..tabUrl = currentTab.url
-            ..uriOnly = launchInChromeDevTools,
-        ),
-      ),
-    ),
+  interceptMessage<DebugStateChange>(
+    message: jsRequest,
+    expectedType: MessageType.debugStateChange,
+    expectedSender: Script.debuggerPanel,
+    expectedRecipient: Script.background,
+    sender: sender,
+    messageHandler: (DebugStateChange debugStateChange) {
+      final newState = debugStateChange.newState;
+      final tabId = debugStateChange.tabId;
+      if (newState == DebugStateChange.startDebugging) {
+        attachDebugger(tabId, trigger: Trigger.extensionPanel);
+      }
+    },
   );
 
-  chrome.debugger.sendCommand(
-    Debuggee(tabId: currentTab.id),
-    'Runtime.enable',
-    EmptyParam(),
-    allowInterop((e) {}),
+  interceptMessage<DebugStateChange>(
+    message: jsRequest,
+    expectedType: MessageType.debugStateChange,
+    expectedSender: Script.popup,
+    expectedRecipient: Script.background,
+    sender: sender,
+    messageHandler: (DebugStateChange debugStateChange) {
+      final newState = debugStateChange.newState;
+      final tabId = debugStateChange.tabId;
+      if (newState == DebugStateChange.startDebugging) {
+        attachDebugger(tabId, trigger: Trigger.extensionIcon);
+      }
+    },
   );
-}
-
-void _updateOrCreateDevToolsPanel(
-  String appId,
-  void Function(DevToolsPanel panel) update,
-) {
-  final devToolsPanels =
-      List<DevToolsPanel>.from(_devToolsPanelsNotifier.value);
-  var panelAlreadyExists = false;
-  for (final panel in devToolsPanels) {
-    if (panel.appId == appId) {
-      panelAlreadyExists = true;
-      update(panel);
-    }
-  }
-  if (!panelAlreadyExists) {
-    final newPanel = DevToolsPanel(appId);
-    update(newPanel);
-    devToolsPanels.add(newPanel);
-  }
-  _devToolsPanelsNotifier.setValue(devToolsPanels);
-}
-
-void _updateIcon() {
-  final query = QueryInfo(active: true, currentWindow: true);
-  chrome.tabs.query(
-    query,
-    allowInterop((List tabs) {
-      // If tabList is empty, the user has likely navigated to a different window.
-      // Therefore, do not update the icon:
-      if (tabs.isEmpty) return;
-      final tab = tabs.first as Tab;
 
-      if (_tabIdToWarning.containsKey(tab.id)) {
-        // Set the warning icon (red):
-        chrome.browserAction.setIcon(IconInfo(path: 'dart_warning.png'), null);
-      } else if (_debuggableTabs.contains(tab.id)) {
-        // Set the debuggable icon (blue):
-        _mostRecentDartTab = tab;
-        chrome.browserAction.setIcon(IconInfo(path: 'dart.png'), null);
-      } else {
-        // Set the default icon (grey):
-        chrome.browserAction.setIcon(IconInfo(path: 'dart_grey.png'), null);
+  interceptMessage<String>(
+    message: jsRequest,
+    expectedType: MessageType.multipleAppsDetected,
+    expectedSender: Script.detector,
+    expectedRecipient: Script.background,
+    sender: sender,
+    messageHandler: (String multipleAppsDetected) async {
+      final dartTab = sender.tab;
+      if (dartTab == null) {
+        debugWarn('Received multiple apps detected but tab is missing.');
+        return;
       }
-    }),
+      // Save the multiple apps info in storage:
+      await setStorageObject<String>(
+        type: StorageObject.multipleAppsDetected,
+        value: multipleAppsDetected,
+        tabId: dartTab.id,
+      );
+      _setWarningIcon(dartTab.id);
+    },
   );
-}
-
-void _updateIconOnNavigation(NavigationInfo navigationInfo) {
-  if (navigationInfo.transitionType != 'auto_subframe' &&
-      _debuggableTabs.remove(navigationInfo.tabId)) {
-    _updateIcon();
-  }
-}
-
-/// Construct an [ExtensionEvent] from [method] and [params].
-ExtensionEvent _extensionEventFor(String method, dynamic params) =>
-    ExtensionEvent(
-      (b) => b
-        ..params = jsonEncode(json.decode(JSON.stringify(params)))
-        ..method = jsonEncode(method),
-    );
 
-/// Forward debugger events to the backend if applicable.
-void _filterAndForwardToBackend(
-  Debuggee source,
-  String method,
-  dynamic params,
-) {
-  final debugSession = _debugSessions
-      .firstWhereOrNull((session) => session.appTabId == source.tabId);
-
-  if (debugSession == null) return;
-
-  final event = _extensionEventFor(method, params);
+  interceptMessage<String>(
+    message: jsRequest,
+    expectedType: MessageType.appId,
+    expectedSender: Script.copier,
+    expectedRecipient: Script.background,
+    sender: sender,
+    messageHandler: (String appId) {
+      displayNotification('Copied app ID: $appId');
+    },
+  );
 
-  if (method == 'Debugger.scriptParsed') {
-    debugSession.sendBatchedEvent(event);
-  } else {
-    debugSession.sendEvent(event);
-  }
+  sendResponse(defaultResponse);
 }
 
-class Notifier<T> {
-  Notifier(T value) : _value = value;
-
-  T _value;
-  final List<Listener<T>> _listeners = <Listener<T>>[];
-
-  T get value => _value;
-
-  void setValue(T value) {
-    _value = value;
-    notifyListeners();
-  }
-
-  void addListener(Listener<T> listener) {
-    _listeners.add(listener);
-  }
-
-  void notifyListeners() {
-    for (final listener in _listeners) {
-      listener.onChange(_value);
-    }
+Future<void> _detectNavigationAwayFromDartApp(
+  NavigationInfo navigationInfo,
+) async {
+  // Ignore any navigation events within the page itself (e.g., opening a link,
+  // reloading the page, reloading an IFRAME, etc):
+  if (_isInternalNavigation(navigationInfo)) return;
+  final tabId = navigationInfo.tabId;
+  final debugInfo = await _fetchDebugInfo(navigationInfo.tabId);
+  if (debugInfo == null) return;
+  if (debugInfo.tabUrl != navigationInfo.url) {
+    _setDefaultIcon(navigationInfo.tabId);
+    await clearStaleDebugSession(tabId);
+    await removeStorageObject(type: StorageObject.debugInfo, tabId: tabId);
+    await detachDebugger(
+      tabId,
+      type: TabType.dartApp,
+      reason: DetachReason.navigatedAwayFromApp,
+    );
   }
 }
 
-class Listener<T> {
-  Listener(this.onChange);
-
-  void Function(T value) onChange;
-}
-
-@JS()
-@anonymous
-class SimpleMessage {
-  external String get recipient;
-  external String get body;
-  external factory SimpleMessage({
-    required String recipient,
-    required String body,
-  });
-}
-
-@JS()
-@anonymous
-class ExternalExtensionRequest {
-  external int get tabId;
-  external String get name;
-  external dynamic get options;
-  external factory ExternalExtensionRequest({
-    required int tabId,
-    required String name,
-    required dynamic options,
-  });
-}
-
-@JS()
-@anonymous
-class DebugEvent {
-  external factory DebugEvent({String method, Object? params});
+bool _isInternalNavigation(NavigationInfo navigationInfo) {
+  return [
+    'auto_subframe',
+    'form_submit',
+    'link',
+    'manual_subframe',
+    'reload',
+  ].contains(navigationInfo.transitionType);
+}
+
+DebugInfo _addTabInfo(DebugInfo debugInfo, {required Tab tab}) {
+  return DebugInfo(
+    (b) => b
+      ..appEntrypointPath = debugInfo.appEntrypointPath
+      ..appId = debugInfo.appId
+      ..appInstanceId = debugInfo.appInstanceId
+      ..appOrigin = debugInfo.appOrigin
+      ..appUrl = debugInfo.appUrl
+      ..authUrl = debugInfo.authUrl
+      ..extensionUrl = debugInfo.extensionUrl
+      ..isInternalBuild = debugInfo.isInternalBuild
+      ..isFlutterApp = debugInfo.isFlutterApp
+      ..workspaceName = debugInfo.workspaceName
+      ..tabUrl = tab.url
+      ..tabId = tab.id,
+  );
 }
 
-@JS()
-@anonymous
-class ErrorResponse {
-  external set error(String error);
+Future<bool> _maybeSendCopyAppIdRequest(String command, [Tab? tab]) async {
+  if (command != 'copyAppId') return false;
+  final tabId = (tab ?? await activeTab)?.id;
+  if (tabId == null) return false;
+  final debugInfo = await _fetchDebugInfo(tabId);
+  final workspaceName = debugInfo?.workspaceName;
+  if (workspaceName == null) return false;
+  final appId = '$workspaceName-$tabId';
+  return sendTabsMessage(
+    tabId: tabId,
+    type: MessageType.appId,
+    body: appId,
+    sender: Script.background,
+    recipient: Script.copier,
+  );
 }
 
-@JS()
-@anonymous
-class EmptyParam {
-  external factory EmptyParam();
+Future<void> _updateIcon(int activeTabId) async {
+  final debugInfo = await _fetchDebugInfo(activeTabId);
+  if (debugInfo == null) {
+    _setDefaultIcon(activeTabId);
+    return;
+  }
+  final multipleApps = await fetchStorageObject<String>(
+    type: StorageObject.multipleAppsDetected,
+    tabId: activeTabId,
+  );
+  multipleApps == null
+      ? _setDebuggableIcon(activeTabId)
+      : _setWarningIcon(activeTabId);
 }
 
-@JS()
-@anonymous
-class InjectedParams {
-  external String get expresion;
-  external bool get returnByValue;
-  external int get contextId;
-  external factory InjectedParams({
-    String? expression,
-    bool? returnByValue,
-    int? contextId,
-  });
+void _setDebuggableIcon(int tabId) {
+  setExtensionIcon(IconInfo(path: 'static_assets/dart.png'));
+  setExtensionPopup(
+    PopupDetails(popup: 'static_assets/popup.html', tabId: tabId),
+  );
 }
 
-@JS()
-@anonymous
-class SendCommandOptions {
-  external String get method;
-  external Object get commandParams;
+void _setWarningIcon(int tabId) {
+  setExtensionPopup(
+    PopupDetails(popup: 'static_assets/popup.html', tabId: tabId),
+  );
 }
 
-@JS()
-@anonymous
-class Request {
-  external String get dartAppId;
-  external String get sender;
-  external int get tabId;
-  external String get name;
-  external dynamic get options;
-  external String get warning;
-  external String get message;
-  external factory Request({
-    required int tabId,
-    required String name,
-    required dynamic options,
-  });
+void _setDefaultIcon(int tabId) {
+  final iconPath =
+      isDevMode ? 'static_assets/dart_dev.png' : 'static_assets/dart_grey.png';
+  setExtensionIcon(IconInfo(path: iconPath));
+  setExtensionPopup(
+    PopupDetails(popup: '', tabId: tabId),
+  );
 }
 
-@JS()
-@anonymous
-class EvalResponse {
-  external EvalResult get result;
+Future<DebugInfo?> _fetchDebugInfo(int tabId) {
+  return fetchStorageObject<DebugInfo>(
+    type: StorageObject.debugInfo,
+    tabId: tabId,
+  );
 }
 
-@JS()
-@anonymous
-class EvalResult {
-  external List<String?>? get value;
+Future<bool> _matchesAppInStorage(String? appId, {required int tabId}) async {
+  final debugInfo = await _fetchDebugInfo(tabId);
+  return appId != null && appId == debugInfo?.appId;
 }
-
-/// For testing only.
-//
-/// An automated click on the extension icon is not supported by WebDriver.
-/// We initiate a fake click from the `debug_extension_test`
-/// after the extension is loaded.
-@JS('fakeClick')
-external set onFakeClick(void Function() f);
-
-@JS('window.isDartDebugExtension')
-external set isDartDebugExtension(_);
diff --git a/dwds/debug_extension/web/chrome_api.dart b/dwds/debug_extension/web/chrome_api.dart
index 443287baa..bb085cf8e 100644
--- a/dwds/debug_extension/web/chrome_api.dart
+++ b/dwds/debug_extension/web/chrome_api.dart
@@ -2,6 +2,8 @@
 // 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.
 
+import 'dart:html';
+
 import 'package:js/js.dart';
 
 @JS()
@@ -10,44 +12,45 @@ external Chrome get chrome;
 @JS()
 @anonymous
 class Chrome {
-  external BrowserAction get browserAction;
+  external Commands get commands;
   external Debugger get debugger;
+  external Devtools get devtools;
+  external Notifications get notifications;
   external Runtime get runtime;
+  external Storage get storage;
   external Tabs get tabs;
   external WebNavigation get webNavigation;
   external Windows get windows;
 }
 
+/// chrome.debugger APIs:
+/// https://developer.chrome.com/docs/extensions/reference/debugger
+
 @JS()
 @anonymous
-class BrowserAction {
-  // https://developer.chrome.com/docs/extensions/reference/browserAction/#method-setIcon
-  external void setIcon(IconInfo iconInfo, Function? callback);
-
-  // https://developer.chrome.com/docs/extensions/reference/browserAction/#event-onClicked
-  external OnClickedHandler get onClicked;
+class Commands {
+  external OnCommandHandler get onCommand;
 }
 
 @JS()
 @anonymous
-class OnClickedHandler {
-  external void addListener(void Function(Tab tab) callback);
+class OnCommandHandler {
+  external void addListener(
+    void Function(String commandName, [Tab? tab]) callback,
+  );
 }
 
 @JS()
 @anonymous
 class Debugger {
-  // https://developer.chrome.com/docs/extensions/reference/debugger/#method-attach
   external void attach(
     Debuggee target,
     String requiredVersion,
     Function? callback,
   );
 
-  // https://developer.chrome.com/docs/extensions/reference/debugger/#method-detach
   external void detach(Debuggee target, Function? callback);
 
-  // https://developer.chrome.com/docs/extensions/reference/debugger/#method-sendCommand
   external void sendCommand(
     Debuggee target,
     String method,
@@ -55,10 +58,8 @@ class Debugger {
     Function? callback,
   );
 
-  // https://developer.chrome.com/docs/extensions/reference/debugger/#event-onDetach
   external OnDetachHandler get onDetach;
 
-  // https://developer.chrome.com/docs/extensions/reference/debugger/#event-onEvent
   external OnEventHandler get onEvent;
 }
 
@@ -78,10 +79,107 @@ class OnEventHandler {
   );
 }
 
+@JS()
+@anonymous
+class Debuggee {
+  external int get tabId;
+  external String get extensionId;
+  external String get targetId;
+  external factory Debuggee({int tabId, String? extensionId, String? targetId});
+}
+
+/// chrome.devtools APIs:
+
+@JS()
+@anonymous
+class Devtools {
+  // https://developer.chrome.com/docs/extensions/reference/devtools_inspectedWindow
+  external InspectedWindow get inspectedWindow;
+
+  // https://developer.chrome.com/docs/extensions/reference/devtools_panels/
+  external Panels get panels;
+}
+
+@JS()
+@anonymous
+class InspectedWindow {
+  external int get tabId;
+}
+
+@JS()
+@anonymous
+class Panels {
+  external String get themeName;
+
+  external void create(
+    String title,
+    String iconPath,
+    String pagePath,
+    void Function(ExtensionPanel)? callback,
+  );
+}
+
+@JS()
+@anonymous
+class ExtensionPanel {
+  external OnHiddenHandler get onHidden;
+  external OnShownHandler get onShown;
+}
+
+@JS()
+@anonymous
+class OnHiddenHandler {
+  external void addListener(void Function() callback);
+}
+
+@JS()
+@anonymous
+class OnShownHandler {
+  external void addListener(void Function(Window window) callback);
+}
+
+/// chrome.notification APIs:
+/// https://developer.chrome.com/docs/extensions/reference/notifications
+
+@JS()
+@anonymous
+class Notifications {
+  external void create(
+    String? notificationId,
+    NotificationOptions options,
+    Function? callback,
+  );
+
+  external OnClickedHandler get onClicked;
+}
+
+@JS()
+@anonymous
+class OnClickedHandler {
+  external void addListener(
+    void Function(String) callback,
+  );
+}
+
+@JS()
+@anonymous
+class NotificationOptions {
+  external factory NotificationOptions({
+    String title,
+    String message,
+    String iconUrl,
+    String type,
+  });
+}
+
+/// chrome.runtime APIs:
+/// https://developer.chrome.com/docs/extensions/reference/runtime
+
 @JS()
 @anonymous
 class Runtime {
-  // https://developer.chrome.com/docs/extensions/reference/runtime/#method-sendMessage
+  external void connect(String? extensionId, ConnectInfo info);
+
   external void sendMessage(
     String? id,
     Object? message,
@@ -89,87 +187,158 @@ class Runtime {
     Function? callback,
   );
 
-  // https://developer.chrome.com/docs/extensions/reference/runtime/#property-lastError
+  external Object getManifest();
+
+  external String getURL(String path);
+
+  external String get id;
+
   // Note: Not checking the lastError when one occurs throws a runtime exception.
   external ChromeError? get lastError;
 
-  // https://developer.chrome.com/docs/extensions/reference/runtime/#event-onMessage
+  external ConnectionHandler get onConnect;
+
+  external ConnectionHandler get onConnectExternal;
+
   external OnMessageHandler get onMessage;
 
-  // https://developer.chrome.com/docs/extensions/reference/runtime/#event-onMessageExternal
   external OnMessageHandler get onMessageExternal;
 }
 
+@JS()
+class ChromeError {
+  external String get message;
+}
+
 @JS()
 @anonymous
-class OnMessageHandler {
-  external void addListener(
-    void Function(dynamic, MessageSender, Function) callback,
-  );
+class ConnectInfo {
+  external String? get name;
+  external factory ConnectInfo({String? name});
 }
 
 @JS()
 @anonymous
-class Tabs {
-  // https://developer.chrome.com/docs/extensions/reference/tabs/#method-query
-  external List<Tab> query(
-    QueryInfo queryInfo,
-    void Function(List<Tab>) callback,
+class Port {
+  external String? get name;
+  external void disconnect();
+  external void postMessage(Object message);
+  external OnPortMessageHandler get onMessage;
+  external ConnectionHandler get onDisconnect;
+}
+
+@JS()
+@anonymous
+class OnPortMessageHandler {
+  external void addListener(
+    void Function(dynamic, Port) callback,
   );
+}
 
-  // https://developer.chrome.com/docs/extensions/reference/tabs/#event-onActivated
-  external OnActivatedHandler get onActivated;
+@JS()
+@anonymous
+class ConnectionHandler {
+  external void addListener(void Function(Port) callback);
+}
 
-  // https://developer.chrome.com/docs/extensions/reference/tabs/#event-onCreated
-  external OnCreatedHandler get onCreated;
+@JS()
+@anonymous
+class OnMessageHandler {
+  external void addListener(
+    dynamic Function(dynamic, MessageSender, Function) callback,
+  );
+}
 
-  // https://developer.chrome.com/docs/extensions/reference/tabs/#event-onRemoved
-  external OnRemovedHandler get onRemoved;
+@JS()
+@anonymous
+class MessageSender {
+  external String? get id;
+  external Tab? get tab;
+  external String? get url;
+  external String? get origin;
+  external factory MessageSender({String? id, String? url, Tab? tab});
 }
 
 @JS()
 @anonymous
-class OnActivatedHandler {
-  external void addListener(void Function(ActiveInfo activeInfo) callback);
+class Target {
+  external int get tabId;
+  external factory Target({int tabId});
 }
 
+/// chrome.storage APIs
+/// https://developer.chrome.com/docs/extensions/reference/storage
+
 @JS()
 @anonymous
-class OnCreatedHandler {
-  external void addListener(void Function(Tab tab) callback);
+class Storage {
+  external StorageArea get local;
+
+  external StorageArea get session;
+
+  external OnChangedHandler get onChanged;
 }
 
 @JS()
 @anonymous
-class OnRemovedHandler {
-  external void addListener(
-    void Function(int tabId, RemoveInfo removeInfo) callback,
+class StorageArea {
+  external Object get(
+    List<String>? keys,
+    void Function(Object result) callback,
   );
+
+  external Object set(Object items, void Function()? callback);
+
+  external Object remove(List<String> keys, void Function()? callback);
 }
 
 @JS()
 @anonymous
-class WebNavigation {
-  // https://developer.chrome.com/docs/extensions/reference/webNavigation/#event-onCommitted
-  external OnCommittedHandler get onCommitted;
+class OnChangedHandler {
+  external void addListener(
+    void Function(Object changes, String areaName) callback,
+  );
 }
 
+/// chrome.tabs APIs
+/// https://developer.chrome.com/docs/extensions/reference/tabs
+
 @JS()
 @anonymous
-class OnCommittedHandler {
-  external void addListener(void Function(NavigationInfo details) callback);
+class Tabs {
+  external dynamic query(
+    QueryInfo queryInfo,
+    void Function(List<Tab>) callback,
+  );
+
+  external dynamic create(TabInfo tabInfo, void Function(Tab) callback);
+
+  external dynamic get(int tabId, void Function(Tab?) callback);
+
+  external dynamic remove(int tabId, void Function()? callback);
+
+  external Object sendMessage(
+    int tabId,
+    Object? message,
+    Object? options,
+    void Function() callback,
+  );
+
+  external OnActivatedHandler get onActivated;
+
+  external OnRemovedHandler get onRemoved;
 }
 
 @JS()
 @anonymous
-class Windows {
-  external OnFocusChangedHandler get onFocusChanged;
+class OnActivatedHandler {
+  external void addListener(void Function(ActiveInfo activeInfo) callback);
 }
 
 @JS()
 @anonymous
-class OnFocusChangedHandler {
-  external void addListener(void Function(int windowId) callback);
+class OnRemovedHandler {
+  external void addListener(void Function(int tabId, dynamic info) callback);
 }
 
 @JS()
@@ -179,33 +348,44 @@ class ActiveInfo {
 }
 
 @JS()
-class ChromeError {
-  external String get message;
+@anonymous
+class TabInfo {
+  external bool? get active;
+  external bool? get pinned;
+  external String? get url;
+  external factory TabInfo({bool? active, bool? pinned, String? url});
 }
 
 @JS()
 @anonymous
-class Debuggee {
-  external int get tabId;
-  external String get extensionId;
-  external String get targetId;
-  external factory Debuggee({int tabId, String? extensionId, String? targetId});
+class QueryInfo {
+  external bool get active;
+  external bool get currentWindow;
+  external String get url;
+  external factory QueryInfo({bool? active, bool? currentWindow, String? url});
 }
 
 @JS()
 @anonymous
-class IconInfo {
-  external String get path;
-  external factory IconInfo({String path});
+class Tab {
+  external int get id;
+  external String get url;
 }
 
+/// chrome.webNavigation APIs
+/// https://developer.chrome.com/docs/extensions/reference/webNavigation
+
 @JS()
 @anonymous
-class MessageSender {
-  external String? get id;
-  external Tab? get tab;
-  external String? get url;
-  external factory MessageSender({String? id, String? url, Tab? tab});
+class WebNavigation {
+  // https://developer.chrome.com/docs/extensions/reference/webNavigation/#event-onCommitted
+  external OnCommittedHandler get onCommitted;
+}
+
+@JS()
+@anonymous
+class OnCommittedHandler {
+  external void addListener(void Function(NavigationInfo details) callback);
 }
 
 @JS()
@@ -213,35 +393,37 @@ class MessageSender {
 class NavigationInfo {
   external String get transitionType;
   external int get tabId;
+  external String get url;
 }
 
+/// chrome.windows APIs
+/// https://developer.chrome.com/docs/extensions/reference/windows
+
 @JS()
 @anonymous
-class QueryInfo {
-  external bool get active;
-  external bool get currentWindow;
-  external factory QueryInfo({bool? active, bool? currentWindow});
+class Windows {
+  external dynamic create(WindowInfo? createData, Function(WindowObj) callback);
+
+  external OnFocusChangedHandler get onFocusChanged;
 }
 
 @JS()
 @anonymous
-class RemoveInfo {
-  external int get windowId;
-  external bool get isWindowClosing;
+class OnFocusChangedHandler {
+  external void addListener(void Function(int windowId) callback);
 }
 
 @JS()
 @anonymous
-class Tab {
-  external int get id;
-  external String get url;
+class WindowInfo {
+  external bool? get focused;
+  external String? get url;
+  external factory WindowInfo({bool? focused, String? url});
 }
 
 @JS()
 @anonymous
-class UrlFilter {
-  external String? get hostContains;
-  external String? get hostEquals;
-  external String? get hostPrefix;
-  external String? get hostSuffix;
+class WindowObj {
+  external int get id;
+  external List<Tab> get tabs;
 }
diff --git a/dwds/debug_extension_mv3/web/cider_connection.dart b/dwds/debug_extension/web/cider_connection.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/cider_connection.dart
rename to dwds/debug_extension/web/cider_connection.dart
diff --git a/dwds/debug_extension_mv3/web/copier.dart b/dwds/debug_extension/web/copier.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/copier.dart
rename to dwds/debug_extension/web/copier.dart
diff --git a/dwds/debug_extension_mv3/web/cross_extension_communication.dart b/dwds/debug_extension/web/cross_extension_communication.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/cross_extension_communication.dart
rename to dwds/debug_extension/web/cross_extension_communication.dart
diff --git a/dwds/debug_extension_mv3/web/data_serializers.dart b/dwds/debug_extension/web/data_serializers.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/data_serializers.dart
rename to dwds/debug_extension/web/data_serializers.dart
diff --git a/dwds/debug_extension_mv3/web/data_serializers.g.dart b/dwds/debug_extension/web/data_serializers.g.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/data_serializers.g.dart
rename to dwds/debug_extension/web/data_serializers.g.dart
diff --git a/dwds/debug_extension_mv3/web/data_types.dart b/dwds/debug_extension/web/data_types.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/data_types.dart
rename to dwds/debug_extension/web/data_types.dart
diff --git a/dwds/debug_extension_mv3/web/data_types.g.dart b/dwds/debug_extension/web/data_types.g.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/data_types.g.dart
rename to dwds/debug_extension/web/data_types.g.dart
diff --git a/dwds/debug_extension_mv3/web/debug_info.dart b/dwds/debug_extension/web/debug_info.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/debug_info.dart
rename to dwds/debug_extension/web/debug_info.dart
diff --git a/dwds/debug_extension_mv3/web/debug_session.dart b/dwds/debug_extension/web/debug_session.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/debug_session.dart
rename to dwds/debug_extension/web/debug_session.dart
diff --git a/dwds/debug_extension/web/debugger_panel.html b/dwds/debug_extension/web/debugger_panel.html
deleted file mode 100644
index 5972b7636..000000000
--- a/dwds/debug_extension/web/debugger_panel.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <link rel="stylesheet" href="panel.css">
-</head>
-
-<body id="panelBody" data-panel="debugger">
-
-    <div class='flex-row'>
-        <div class='flex-column'>
-            <button class="material-button" id="debuggingButton" type="button" disabled>Start debugging</button>
-            <h1>Please read:</h1>
-            <p>Before debugging, please <strong>disable</strong> focus on the Sources panel for breakpoints:</p>
-            <code>Settings > Preferences > Sources > uncheck "Focus Sources panel when triggering a breakpoint"</code>
-            <img src="devtools_settings.png" alt="Picture of the setting in Chrome DevTools to disable.">
-        </div>
-        <div id="iframeContainer"></div>
-    </div>
-
-    <!-- Load script: -->
-    <script src="panel.js"></script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/dwds/debug_extension_mv3/web/detector.dart b/dwds/debug_extension/web/detector.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/detector.dart
rename to dwds/debug_extension/web/detector.dart
diff --git a/dwds/debug_extension/web/detector.js b/dwds/debug_extension/web/detector.js
deleted file mode 100644
index 174a5c457..000000000
--- a/dwds/debug_extension/web/detector.js
+++ /dev/null
@@ -1,37 +0,0 @@
-(function loadDetectorScript() {
-    const DETECTOR_SCRIPT = 'detector-script';
-    const MULTIPLE_APPS_ATTRIBUTE = 'data-multiple-dart-apps';
-
-    const MULTIPLE_APPS_WARNING = 'It appears that you are running multiple Dart apps ' +
-        'and/or sub-apps. Dart debugging is currently not supported in a multi-app ' +
-        'environment.';
-
-    function sendMessage(e) {
-        const hasMultipleApps = document
-            .documentElement
-            .getAttribute(MULTIPLE_APPS_ATTRIBUTE);
-        const warning = hasMultipleApps == 'true' ? MULTIPLE_APPS_WARNING : '';
-        chrome.runtime.sendMessage(Object.assign(e, { warning: warning, sender: DETECTOR_SCRIPT }));
-    }
-
-    document.addEventListener('dart-app-ready', function (e) {
-        sendMessage(e);
-    });
-
-    function multipleDartAppsCallback(mutationList) {
-        mutationList.forEach(function (mutation) {
-            if (mutation.type !== "attributes") return;
-            if (mutation.attributeName === MULTIPLE_APPS_ATTRIBUTE) {
-                sendMessage({});
-            }
-        });
-    };
-
-    // Watch for changes to the multiple apps data-attribute and update accordingly:
-    var multipleDartAppsObserver = new MutationObserver(multipleDartAppsCallback);
-    multipleDartAppsObserver.observe(document.documentElement, {
-        attributeFilter: [MULTIPLE_APPS_ATTRIBUTE]
-    });
-}());
-
-
diff --git a/dwds/debug_extension_mv3/web/devtools.dart b/dwds/debug_extension/web/devtools.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/devtools.dart
rename to dwds/debug_extension/web/devtools.dart
diff --git a/dwds/debug_extension/web/devtools.html b/dwds/debug_extension/web/devtools.html
deleted file mode 100644
index c7f22f4d8..000000000
--- a/dwds/debug_extension/web/devtools.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-</head>
-
-<body>
-  <script src="devtools.js"></script>
-</body>
-
-</html>
diff --git a/dwds/debug_extension/web/devtools.js b/dwds/debug_extension/web/devtools.js
deleted file mode 100644
index 4f2189a3a..000000000
--- a/dwds/debug_extension/web/devtools.js
+++ /dev/null
@@ -1,67 +0,0 @@
-(function loadDevToolsScript() {
-  const DDR_DART_APP_ATTRIBUTE = 'data-ddr-dart-app';
-  // Note: Changes to the DEBUGGER_PANEL_NAME and INSPECTOR_PANEL_NAME
-  // must be reflected in `tool/update_dev_files.dart` as well.
-  const DEBUGGER_PANEL_NAME = 'Dart Debugger';
-  const INSPECTOR_PANEL_NAME = 'Flutter Inspector';
-
-  let debuggerCreated = false;
-  let inspectorCreated = false;
-  let checkDartCount = 0;
-  let checkFlutterCount = 0;
-
-  chrome.devtools.network.onNavigated.addListener(createDebuggerPanelIfDartApp)
-  const checkDartAppInterval = setInterval(createDebuggerPanelIfDartApp, 1000)
-  createDebuggerPanelIfDartApp()
-
-  function createDebuggerPanelIfDartApp() {
-    if (debuggerCreated || checkDartCount++ > 20) {
-      clearInterval(checkDartAppInterval);
-      return;
-    }
-
-    checkIsDartApp();
-  }
-
-  function checkIsDartApp() {
-    // TODO(elliette): Remove the DDR data attribute check when we are ready to launch externally,
-    // and instead replace it with the following: !!window.$dartAppId 
-    // Note: we must remove the useContentScriptContext option as well.
-    chrome.devtools.inspectedWindow.eval(
-      `document.documentElement.hasAttribute("${DDR_DART_APP_ATTRIBUTE}")`,
-      { useContentScriptContext: true },
-      function (isDartApp) {
-        if (!isDartApp) return;
-
-        chrome.devtools.panels.create(
-          DEBUGGER_PANEL_NAME, '', 'debugger_panel.html'
-        );
-        debuggerCreated = true;
-        createInspectorPanelIfFlutterApp();
-      });
-  }
-
-  function createInspectorPanelIfFlutterApp() {
-    const checkFlutterAppInterval = setInterval(function () {
-      if (inspectorCreated || checkFlutterCount++ > 10) {
-        clearInterval(checkFlutterAppInterval);
-        return;
-      }
-
-      // The following value is loaded asynchronously, which is why
-      // we check for it every 1 second:
-      chrome.devtools.inspectedWindow.eval(
-        '!!window._flutter_web_set_location_strategy',
-        function (isFlutterWeb) {
-          if (isFlutterWeb) {
-            chrome.devtools.panels.create(
-              INSPECTOR_PANEL_NAME, '', 'inspector_panel.html'
-            );
-            inspectorCreated = true;
-          }
-        }
-      );
-    }, 1000)
-  }
-}());
-
diff --git a/dwds/debug_extension/web/devtools_settings.png b/dwds/debug_extension/web/devtools_settings.png
deleted file mode 100644
index 48b39130acb961c6b8d93748b82fdad187007876..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22954
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

diff --git a/dwds/debug_extension/web/inspector_panel.html b/dwds/debug_extension/web/inspector_panel.html
deleted file mode 100644
index d3880e5a4..000000000
--- a/dwds/debug_extension/web/inspector_panel.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <link rel="stylesheet" href="panel.css">
-</head>
-
-<body id="panelBody" data-panel="inspector">
-
-    <div class='flex-row'>
-        <div class='flex-column'>
-            <button class="material-button" id="debuggingButton" type="button" disabled>Inspect app</button>
-        </div>
-        <div id="iframeContainer"></div>
-    </div>
-
-    <!-- Load script: -->
-    <script src="panel.js"></script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/dwds/debug_extension_mv3/web/logger.dart b/dwds/debug_extension/web/logger.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/logger.dart
rename to dwds/debug_extension/web/logger.dart
diff --git a/dwds/debug_extension/web/manifest.json b/dwds/debug_extension/web/manifest.json
index 9c83bd302..83ecae394 100644
--- a/dwds/debug_extension/web/manifest.json
+++ b/dwds/debug_extension/web/manifest.json
@@ -1,38 +1,47 @@
 {
-    "name": "Dart Debug Extension",
-    "version": "1.30",
-    "minimum_chrome_version": "10.0",
-    "devtools_page": "devtools.html",
-    "externally_connectable": {
-        "ids": [
-            "nbkbficgbembimioedhceniahniffgpl"
-        ]
-    },
-    "manifest_version": 2,
-    "browser_action": {
-        "default_icon": "dart_grey.png"
-    },
-    "permissions": [
-        "debugger",
-        "tabs",
-        "webNavigation",
-        "http://*/*",
-        "https://*/*"
-    ],
-    "background": {
-        "scripts": [
-            "background.js"
-        ]
-    },
-    "content_scripts": [
-        {
-            "matches": [
-                "<all_urls>"
-            ],
-            "js": [
-                "detector.js"
-            ],
-            "run_at": "document_end"
-        }
+  "name": "Dart Debug Extension",
+  "version": "2.1.4",
+  "manifest_version": 3,
+  "devtools_page": "static_assets/devtools.html",
+  "action": {
+    "default_icon": "static_assets/dart_grey.png"
+  },
+  "externally_connectable": {
+    "ids": ["nbkbficgbembimioedhceniahniffgpl"],
+    "matches": [
+      "https://cider.corp.google.com/*",
+      "https://cider-staging.corp.google.com/*",
+      "https://cider-test.corp.google.com/*",
+      "https://cider-v.corp.google.com/*",
+      "https://cider-v-staging.corp.google.com/*",
+      "https://cider-v-test.corp.google.com/*"
     ]
-}
\ No newline at end of file
+  },
+  "permissions": ["debugger", "notifications", "storage", "webNavigation"],
+  "host_permissions": ["<all_urls>"],
+  "background": {
+    "service_worker": "background.dart.js"
+  },
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": ["detector.dart.js", "copier.dart.js"],
+      "run_at": "document_end"
+    }
+  ],
+  "commands": {
+    "copyAppId": {
+      "suggestedKey": {
+        "default": "Ctrl+Shift+7",
+        "mac": "Command+Shift+7"
+      },
+      "description": "Copy the app ID"
+    }
+  },
+  "web_accessible_resources": [
+    {
+      "matches": ["<all_urls>"],
+      "resources": ["debug_info.dart.js"]
+    }
+  ]
+}
diff --git a/dwds/debug_extension_mv3/web/messaging.dart b/dwds/debug_extension/web/messaging.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/messaging.dart
rename to dwds/debug_extension/web/messaging.dart
diff --git a/dwds/debug_extension/web/panel.css b/dwds/debug_extension/web/panel.css
deleted file mode 100644
index b9b069ceb..000000000
--- a/dwds/debug_extension/web/panel.css
+++ /dev/null
@@ -1,132 +0,0 @@
-body {
-    font-family: Arial, Helvetica, sans-serif;
-}
-
-h1 {
-    font-size: 20px;
-}
-
-p {
-    font-size: 16px;
-}
-
-code {
-    font-size: 16px;
-}
-
-img {
-    padding: 12px;
-}
-
-iframe {
-    border: 0pt none;
-    height: 100%;
-    left: 0px;
-    position: absolute;
-    top: 0px;
-    width: 100%;
-}
-
-.flex-row {
-    align-items: center;
-    display: flex;
-    justify-content: center;
-}
-
-.flex-column {
-    align-items: center;
-    display: flex;
-    flex-direction: column;
-}
-
-.material-button {
-    background-color: #2196f3;
-    border-radius: 4px;
-    border: none;
-    box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
-    box-sizing: border-box;
-    color: #ffffff;
-    cursor: pointer;
-    display: inline-block;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 14px;
-    font-weight: 500;
-    height: 36px;
-    line-height: 36px;
-    margin: 12px;
-    min-width: 64px;
-    outline: none;
-    overflow: hidden;
-    padding: 0 16px;
-    position: relative;
-    text-align: center;
-    text-overflow: ellipsis;
-    text-transform: uppercase;
-    transition: box-shadow 0.2s;
-    vertical-align: middle;
-}
-
-.material-button::-moz-focus-inner {
-    border: none;
-}
-
-.material-button::before {
-    background-color: #ffffff;
-    bottom: 0;
-    content: "";
-    left: 0;
-    opacity: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    transition: opacity 0.2s;
-}
-
-.material-button::after {
-    background-color: #ffffff;
-    border-radius: 50%;
-    content: "";
-    height: 32px;
-    left: 50%;
-    opacity: 0;
-    padding: 50%;
-    position: absolute;
-    top: 50%;
-    transform: translate(-50%, -50%) scale(1);
-    transition: opacity 1s, transform 0.5s;
-    width: 32px;
-}
-
-.material-button:hover,
-.material-button:focus {
-    box-shadow: 0 2px 4px -1px rgba(0, 0, 0, 0.2), 0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12);
-}
-
-.material-button:hover::before {
-    opacity: 0.08;
-}
-
-.material-button:focus::before {
-    opacity: 0.24;
-}
-
-.material-button:hover:focus::before {
-    opacity: 0.3;
-}
-
-.material-button:active {
-    box-shadow: 0 5px 5px -3px #4D000000, 0 8px 10px 1px #4D000000, 0 3px 14px 2px #4D000000;
-}
-
-.material-button:active::after {
-    opacity: 0.32;
-    transform: translate(-50%, -50%) scale(0);
-    transition: transform 0s;
-}
-
-.material-button:disabled {
-    background-color: #d3d3d3;
-    color: #696969;
-    box-shadow: none;
-    cursor: initial;
-}
\ No newline at end of file
diff --git a/dwds/debug_extension_mv3/web/panel.dart b/dwds/debug_extension/web/panel.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/panel.dart
rename to dwds/debug_extension/web/panel.dart
diff --git a/dwds/debug_extension/web/panel.js b/dwds/debug_extension/web/panel.js
deleted file mode 100644
index 2f82ed205..000000000
--- a/dwds/debug_extension/web/panel.js
+++ /dev/null
@@ -1,86 +0,0 @@
-(function loadPanelScript() {
-    // Variables:
-    const IFRAME_TAG = 'iframe';
-    const IFRAME_CONTAINER = 'iframeContainer';
-    const IFRAME_ID = 'dartDevToolsEmbed';
-    const DEBUGGING_BUTTON = 'debuggingButton';
-    const CHROME_DARK = 'dark';
-    const DARK_COLOR = '202125';
-    const LIGHT_COLOR = 'ffffff';
-    const PANEL_SCRIPT = 'panel-script';
-    const START_DEBUGGING = 'start-debugging';
-    const DEVTOOLS_OPEN = 'devtools-open';
-    const PANEL_BODY = 'panelBody';
-    const PANEL_ATTRIBUTE = 'data-panel';
-
-    const chromeTheme = chrome.devtools.panels.themeName;
-    const backgroundColor = chromeTheme == CHROME_DARK ? DARK_COLOR : LIGHT_COLOR;
-    const fontColor = chromeTheme == CHROME_DARK ? LIGHT_COLOR : DARK_COLOR;
-
-    let appId = null;
-    let currentDevToolsUrl = '';
-    let panel = '';
-
-    // Helper functions:
-    function sendStartDebuggingRequest() {
-        if (!appId) return;
-        document.getElementById(DEBUGGING_BUTTON).setAttribute('disabled', true);
-        chrome.runtime.sendMessage({ sender: PANEL_SCRIPT, message: START_DEBUGGING, dartAppId: appId });
-    }
-
-    window.onload = function () {
-        panel = document.getElementById(PANEL_BODY).getAttribute(PANEL_ATTRIBUTE)
-        document.getElementById(DEBUGGING_BUTTON).addEventListener('click', sendStartDebuggingRequest);
-        // Set the background and text color of the panel to match the Chrome theme:
-        document.body.style.backgroundColor = `#${backgroundColor}`;
-        document.body.style.color = `#${fontColor}`;
-    };
-
-    chrome.runtime.onMessage.addListener(function (request) {
-        // Only listen for messages meant for the panel:
-        if (request.recipient != PANEL_SCRIPT) return;
-
-        const devToolsUrl = request.body;
-        const iframeContainer = document.getElementById(IFRAME_CONTAINER);
-
-        if (devToolsUrl != currentDevToolsUrl) {
-            currentDevToolsUrl = devToolsUrl;
-
-            if (!devToolsUrl) {
-                // Debugger has been disconnected, remove the IFRAME for Dart DevTools
-                // and enable the start debugging button:
-                document.getElementById(DEBUGGING_BUTTON).removeAttribute('disabled');
-                const iframe = document.getElementById(IFRAME_ID);
-                if (!!iframe) iframeContainer.removeChild(iframe);
-            } else {
-                // Debugger has benn connected, add an IFRAME for Dart DevTools:
-                const iframe = document.createElement(IFRAME_TAG);
-                if (panel == '') return;
-                const src = `${devToolsUrl}&embed=true&page=${panel}&backgroundColor=${backgroundColor}`;
-                iframe.setAttribute('src', src);
-                iframe.setAttribute('scrolling', 'no');
-                iframe.id = IFRAME_ID;   
-                iframeContainer.appendChild(iframe);
-            }
-        }
-
-    });
-
-    chrome.devtools.inspectedWindow.eval(
-        `
-        function findDartAppId(frame) {
-            if (frame.$dartAppId) return frame.$dartAppId;
-            const frames = frame.frames;
-            for (let i = 0; i < frames.length; i++) {
-                return findDartAppId(frames[i]);
-            }
-        }
-        findDartAppId(window);
-        `,
-        function (dartAppId) {
-            appId = dartAppId;
-            document.getElementById(DEBUGGING_BUTTON).removeAttribute('disabled');
-            chrome.runtime.sendMessage({ sender: PANEL_SCRIPT, message: DEVTOOLS_OPEN, dartAppId: dartAppId });
-        },
-    );
-}());
\ No newline at end of file
diff --git a/dwds/debug_extension_mv3/web/popup.dart b/dwds/debug_extension/web/popup.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/popup.dart
rename to dwds/debug_extension/web/popup.dart
diff --git a/dwds/debug_extension/web/dart.png b/dwds/debug_extension/web/static_assets/dart.png
similarity index 100%
rename from dwds/debug_extension/web/dart.png
rename to dwds/debug_extension/web/static_assets/dart.png
diff --git a/dwds/debug_extension/web/dart_dev.png b/dwds/debug_extension/web/static_assets/dart_dev.png
similarity index 100%
rename from dwds/debug_extension/web/dart_dev.png
rename to dwds/debug_extension/web/static_assets/dart_dev.png
diff --git a/dwds/debug_extension/web/dart_grey.png b/dwds/debug_extension/web/static_assets/dart_grey.png
similarity index 100%
rename from dwds/debug_extension/web/dart_grey.png
rename to dwds/debug_extension/web/static_assets/dart_grey.png
diff --git a/dwds/debug_extension/web/dart_warning.png b/dwds/debug_extension/web/static_assets/dart_warning.png
similarity index 100%
rename from dwds/debug_extension/web/dart_warning.png
rename to dwds/debug_extension/web/static_assets/dart_warning.png
diff --git a/dwds/debug_extension_mv3/web/static_assets/debugger_panel.html b/dwds/debug_extension/web/static_assets/debugger_panel.html
similarity index 100%
rename from dwds/debug_extension_mv3/web/static_assets/debugger_panel.html
rename to dwds/debug_extension/web/static_assets/debugger_panel.html
diff --git a/dwds/debug_extension_mv3/web/static_assets/debugger_settings.png b/dwds/debug_extension/web/static_assets/debugger_settings.png
similarity index 100%
rename from dwds/debug_extension_mv3/web/static_assets/debugger_settings.png
rename to dwds/debug_extension/web/static_assets/debugger_settings.png
diff --git a/dwds/debug_extension_mv3/web/static_assets/devtools.html b/dwds/debug_extension/web/static_assets/devtools.html
similarity index 100%
rename from dwds/debug_extension_mv3/web/static_assets/devtools.html
rename to dwds/debug_extension/web/static_assets/devtools.html
diff --git a/dwds/debug_extension_mv3/web/static_assets/inspect_widget.png b/dwds/debug_extension/web/static_assets/inspect_widget.png
similarity index 100%
rename from dwds/debug_extension_mv3/web/static_assets/inspect_widget.png
rename to dwds/debug_extension/web/static_assets/inspect_widget.png
diff --git a/dwds/debug_extension_mv3/web/static_assets/inspector_panel.html b/dwds/debug_extension/web/static_assets/inspector_panel.html
similarity index 100%
rename from dwds/debug_extension_mv3/web/static_assets/inspector_panel.html
rename to dwds/debug_extension/web/static_assets/inspector_panel.html
diff --git a/dwds/debug_extension_mv3/web/static_assets/popup.html b/dwds/debug_extension/web/static_assets/popup.html
similarity index 100%
rename from dwds/debug_extension_mv3/web/static_assets/popup.html
rename to dwds/debug_extension/web/static_assets/popup.html
diff --git a/dwds/debug_extension_mv3/web/static_assets/styles.css b/dwds/debug_extension/web/static_assets/styles.css
similarity index 100%
rename from dwds/debug_extension_mv3/web/static_assets/styles.css
rename to dwds/debug_extension/web/static_assets/styles.css
diff --git a/dwds/debug_extension_mv3/web/storage.dart b/dwds/debug_extension/web/storage.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/storage.dart
rename to dwds/debug_extension/web/storage.dart
diff --git a/dwds/debug_extension_mv3/web/utils.dart b/dwds/debug_extension/web/utils.dart
similarity index 100%
rename from dwds/debug_extension_mv3/web/utils.dart
rename to dwds/debug_extension/web/utils.dart
diff --git a/dwds/debug_extension/web/web_api.dart b/dwds/debug_extension/web/web_api.dart
index 70e4b28d6..1a5134475 100644
--- a/dwds/debug_extension/web/web_api.dart
+++ b/dwds/debug_extension/web/web_api.dart
@@ -1,6 +1,8 @@
 // Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // 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.
+import 'dart:html';
+import 'dart:js_util' as js_util;
 
 import 'package:js/js.dart';
 
@@ -14,3 +16,51 @@ class Json {
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify
   external String stringify(o);
 }
+
+// Custom implementation of Fetch API until the Dart implementation supports
+// credentials. See https://github.com/dart-lang/http/issues/595.
+@JS('fetch')
+external Object _nativeJsFetch(String resourceUrl, FetchOptions options);
+
+Future<FetchResponse> fetchRequest(String resourceUrl) async {
+  try {
+    final options = FetchOptions(
+      method: 'GET',
+      credentials: 'include',
+    );
+    final response =
+        await promiseToFuture(_nativeJsFetch(resourceUrl, options));
+    final body =
+        await promiseToFuture(js_util.callMethod(response, 'text', []));
+    final ok = js_util.getProperty<bool>(response, 'ok');
+    final status = js_util.getProperty<int>(response, 'status');
+    return FetchResponse(status: status, ok: ok, body: body);
+  } catch (error) {
+    return FetchResponse(
+      status: 400,
+      ok: false,
+      body: 'Error fetching $resourceUrl: $error',
+    );
+  }
+}
+
+@JS()
+@anonymous
+class FetchOptions {
+  external factory FetchOptions({
+    required String method, // e.g., 'GET', 'POST'
+    required String credentials, // e.g., 'omit', 'same-origin', 'include'
+  });
+}
+
+class FetchResponse {
+  final int status;
+  final bool ok;
+  final String? body;
+
+  FetchResponse({
+    required this.status,
+    required this.ok,
+    required this.body,
+  });
+}
diff --git a/dwds/debug_extension_mv3/.gitignore b/dwds/debug_extension_mv3/.gitignore
deleted file mode 100644
index 4878cbe8b..000000000
--- a/dwds/debug_extension_mv3/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build/
-compiled/
-extension_key.txt
diff --git a/dwds/debug_extension_mv3/CONTRIBUTING.md b/dwds/debug_extension_mv3/CONTRIBUTING.md
deleted file mode 100644
index 7f55d0914..000000000
--- a/dwds/debug_extension_mv3/CONTRIBUTING.md
+++ /dev/null
@@ -1,92 +0,0 @@
-## Building
-
-- For development: `dart run tool/build_extension.dart`
-- For release: ` dart run tool/build_extension.dart --prod`
-
-The dart2js-compiled extension will be located in the `/compiled` directory.
-
-## Local Development
-
-### \[For Googlers\] Create an `extension_key.txt` file:
-
-- Create a `extension_key.txt` file at the root of `/debug_extension`. Paste in
-  the value of one of the whitelisted developer keys into this txt file.
-  IMPORTANT: DO NOT COMMIT THE KEY. It will be copied into the `manifest.json`
-  when you build the extension.
-
-### Build and upload your local extension
-
-- Build the extension following the instructions above
-- Visit chrome://extensions
-- Toggle "Developer mode" on
-- Click the "Load unpacked" button
-- Select the extension directory: `/compiled`
-
-### Debug your local extension
-
-- Click the Extensions puzzle piece, and pin the Dart Debug Extension with the
-  dev icon (unpin the published version so you don't confuse them)
-- You can now use the extension normally by clicking it when a local Dart web
-  application has loaded in a Chrome tab
-- To debug, visit chrome://extensions and click "Inspect view on background
-  page" to open Chrome DevTools for the extension
-- More debugging information can be found in the
-  [Chrome Developers documentation](https://developer.chrome.com/docs/extensions/mv3/devguide/)
-
-## Release process
-
-- Update the version in `web/manifest_mv2.json`, `web/manifest_mv3.json`, `pubspec.yaml`, and in the
-  `CHANGELOG`.
-- Follow the instructions above to build the release version of the extension.
-
-> \*At this point, you should manually verify that everything is working by
-> following the steps in [Local Development](#local-development), except load
-> the extension from the `compiled` directory. You will need to add an extension
-> key to the `manifest.json` file in `compiled` to test locally.
-
-- Open a PR to submit the version change.
-- Once submitted, pull the changes down to your local branch, and create a zip
-  of the `compiled` directory. **Remove the Googler extension key that was added
-  by the builder to the `manifest.json` file.**
-- Rename the zip `version_XX.XX.XX.zip` (eg, `version_1.24.0.zip`) and add it to
-  the go/dart-debug-extension-zips folder
-
-> _You must be a Googler to do this. Ask for help if not._
-
-- Go to the
-  [Chrome Web Store Developer Dashboard](https://chrome.google.com/webstore/devconsole).
-- At the top-right, under Publisher, select dart-bat.
-
-> _If you don’t see dart-bat as an option, you will need someone on the Dart
-> team to add you to the dart-bat Google group._
-
-- Under Items, select the "Dart Debug Extension".
-- Go to “Package” then select “Upload new package”.
-
-> _The first time you do this, you will be asked to pay a $5 registration fee.
-> The registration fee can be expensed._
-
-- Upload the zip file you created in step 4.
-- Save as draft, and verify that the new version is correct.
-- Publish. The extension will be published immediately after going through the
-  review process.
-
-## Rollback process
-
-> The Chrome Web Store Developer Dashboard does not support rollbacks. Instead
-> you must re-publish an earlier version. This means that the extension will
-> still have to go through the review process, which can take anywhere from a
-> few hours (most common) to a few days.
-
-- Find the previous version you want to rollback to in the
-  go/dart-debug-extension-zips folder.
-
-> _You must be a Googler to do this. Ask for help if not._
-
-- Unzip the version you have chosen, and in `manifest.json` edit the version
-  number to be the next sequential version after the current "bad" version (eg,
-  the bad version is `1.28.0` and you are rolling back to version `1.27.0`.
-  Therefore you change `1.27.0` to `1.29.0`).
-- Re-zip the directory and rename it to the new version number. Add it to the
-  go/dart-debug-extension-zips folder.
-- Now, follow steps 6 - 11 in [Release process](#release-process).
diff --git a/dwds/debug_extension_mv3/build.yaml b/dwds/debug_extension_mv3/build.yaml
deleted file mode 100644
index 3785809c2..000000000
--- a/dwds/debug_extension_mv3/build.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-targets:
-  $default:
-    builders:
-      build_web_compilers|entrypoint:
-        options:
-          dart2js_args:
-            - -O1 # Note: Change to -04 for minified JS. 
-            - --csp
-        generate_for:
-          - web/**.dart
-      mv3_extension|client_js_copy_builder:
-        enabled: true
-      
-builders:
-  client_js_copy_builder:
-    required_inputs: [".js", ".png", ".html", ".css", ".json"]
-    import: "tool/copy_builder.dart"
-    builder_factories:
-        - copyBuilder
-    build_extensions:
-      {
-        "web/{{}}.dart.js": ["compiled/{{}}.dart.js"],
-        "web/static_assets/{{}}.png": ["compiled/static_assets/{{}}.png"],
-        "web/static_assets/{{}}.html": ["compiled/static_assets/{{}}.html"],
-        "web/static_assets/{{}}.css": ["compiled/static_assets/{{}}.css"],
-        "web/manifest.json": ["compiled/manifest.json"],
-      }
-    auto_apply: none
-    build_to: source
diff --git a/dwds/debug_extension_mv3/pubspec.yaml b/dwds/debug_extension_mv3/pubspec.yaml
deleted file mode 100644
index 82d1cd109..000000000
--- a/dwds/debug_extension_mv3/pubspec.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: mv3_extension
-publish_to: none
-version: 2.1.4
-homepage: https://github.com/dart-lang/webdev
-description: >-
-  A Chrome extension for Dart debugging.
-
-environment:
-  sdk: ^3.2.0-36.0.dev
-
-dependencies:
-  built_value: ^8.3.0
-  collection: ^1.15.0
-  js: ^0.6.1+1
-
-dev_dependencies:
-  args: ^2.3.1
-  build: ^2.0.0
-  build_runner: ^2.4.0
-  built_collection: ^5.0.0
-  built_value_generator: ^8.3.0
-  build_web_compilers: ^4.0.4
-  dwds: ^16.0.0
-  path: ^1.8.1
-  sse: ^4.1.2
-  web_socket_channel: ^2.2.0
-
-dependency_overrides:
-  dwds:
-    path: ..
diff --git a/dwds/debug_extension_mv3/pubspec_overrides.yaml b/dwds/debug_extension_mv3/pubspec_overrides.yaml
deleted file mode 100644
index 581552eac..000000000
--- a/dwds/debug_extension_mv3/pubspec_overrides.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-dependency_overrides:
-  dwds:
-    path: ..
diff --git a/dwds/debug_extension_mv3/tool/copy_builder.dart b/dwds/debug_extension_mv3/tool/copy_builder.dart
deleted file mode 100644
index 4a5e5d04f..000000000
--- a/dwds/debug_extension_mv3/tool/copy_builder.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
-// 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.
-
-import 'package:build/build.dart';
-
-/// Factory for the build script.
-Builder copyBuilder(_) => _CopyBuilder();
-
-class _CopyBuilder extends Builder {
-  @override
-  Map<String, List<String>> get buildExtensions => {
-        "web/{{}}.dart.js": ["compiled/{{}}.dart.js"],
-        "web/static_assets/{{}}.png": ["compiled/static_assets/{{}}.png"],
-        "web/static_assets/{{}}.html": ["compiled/static_assets/{{}}.html"],
-        "web/static_assets/{{}}.css": ["compiled/static_assets/{{}}.css"],
-        "web/manifest.json": ["compiled/manifest.json"],
-      };
-
-  @override
-  Future<void> build(BuildStep buildStep) async {
-    final inputAsset = buildStep.inputId;
-    final allowedOutputs = buildStep.allowedOutputs;
-
-    if (allowedOutputs.length != 1) {
-      return;
-    }
-
-    final outputAsset = allowedOutputs.first;
-    await _copyBinaryFile(
-      buildStep,
-      inputAsset: inputAsset,
-      outputAsset: outputAsset,
-    );
-  }
-
-  Future<void> _copyBinaryFile(
-    BuildStep buildStep, {
-    required AssetId inputAsset,
-    required AssetId outputAsset,
-  }) {
-    return buildStep.writeAsBytes(
-      outputAsset,
-      buildStep.readAsBytes(inputAsset),
-    );
-  }
-}
diff --git a/dwds/debug_extension_mv3/tool/update_dev_files.dart b/dwds/debug_extension_mv3/tool/update_dev_files.dart
deleted file mode 100644
index 1659c5c15..000000000
--- a/dwds/debug_extension_mv3/tool/update_dev_files.dart
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
-// 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.
-
-import 'dart:io';
-
-void main() async {
-  await _updateManifestJson();
-}
-
-/// Adds the Googler extension key, and prefixes the extension name with "DEV".
-Future<void> _updateManifestJson() async {
-  final manifestJson = File('compiled/manifest.json');
-  final extensionKeyTxt = File('extension_key.txt');
-  final extensionKey = await extensionKeyTxt.exists()
-      ? await extensionKeyTxt.readAsString()
-      : null;
-  return _transformDevFile(manifestJson, (line) {
-    if (_matchesKey(line: line, key: 'name')) {
-      return [
-        _newKeyValue(
-          oldLine: line,
-          newKey: 'name',
-          newValue: '[DEV] Dart Debug Extension',
-        ),
-        if (extensionKey != null)
-          _newKeyValue(
-            oldLine: line,
-            newKey: 'key',
-            newValue: extensionKey,
-          ),
-      ];
-    } else if (_matchesKey(line: line, key: 'default_icon')) {
-      return [
-        _newKeyValue(
-          oldLine: line,
-          newKey: 'default_icon',
-          newValue: 'static_assets/dart_dev.png',
-        ),
-      ];
-    } else {
-      return [line];
-    }
-  });
-}
-
-Future<void> _transformDevFile(
-  File devFile,
-  List<String> Function(String) transformLine,
-) async {
-  final lines = devFile.readAsLinesSync();
-  final newLines = <String>[];
-  for (final line in lines) {
-    newLines.addAll(transformLine(line));
-  }
-  final content = newLines.joinWithNewLine();
-  return devFile.writeAsStringSync(content);
-}
-
-bool _matchesKey({required String line, required String key}) {
-  return line.trimLeft().startsWith('"$key":');
-}
-
-String _newKeyValue({
-  required String oldLine,
-  String? newKey,
-  String? newValue,
-}) {
-  final lineStart = oldLine.leftPadding();
-  final key = newKey != null ? '"$newKey": ' : '';
-  final value = newValue != null ? '"$newValue"' : '';
-  final lineEnd = oldLine.trim().endsWith(',') ? ',' : '';
-  return '$lineStart$key$value$lineEnd';
-}
-
-extension LeftPaddingExtension on String {
-  String leftPadding() {
-    String padding = '';
-    int idx = 0;
-    while (idx < length && this[idx] == ' ') {
-      padding += ' ';
-      idx++;
-    }
-    return padding;
-  }
-}
-
-extension JoinExtension on List<String> {
-  String joinWithNewLine() {
-    return '${join('\n')}\n';
-  }
-}
diff --git a/dwds/debug_extension_mv3/web/background.dart b/dwds/debug_extension_mv3/web/background.dart
deleted file mode 100644
index 5efd5307f..000000000
--- a/dwds/debug_extension_mv3/web/background.dart
+++ /dev/null
@@ -1,297 +0,0 @@
-// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
-// 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.
-
-@JS()
-library background;
-
-import 'package:dwds/data/debug_info.dart';
-import 'package:js/js.dart';
-
-import 'chrome_api.dart';
-import 'cider_connection.dart';
-import 'cross_extension_communication.dart';
-import 'data_types.dart';
-import 'debug_session.dart';
-import 'logger.dart';
-import 'messaging.dart';
-import 'storage.dart';
-import 'utils.dart';
-
-void main() {
-  _registerListeners();
-}
-
-void _registerListeners() {
-  chrome.runtime.onMessage.addListener(
-    allowInterop(_handleRuntimeMessages),
-  );
-  // The only extension allowed to send messages to this extension is the
-  // AngularDart DevTools extension. Its permission is set in the manifest.json
-  // externally_connectable field.
-  chrome.runtime.onMessageExternal.addListener(
-    allowInterop(handleMessagesFromAngularDartDevTools),
-  );
-  // The only external service that sends messages to the Dart Debug Extension
-  // is Cider.
-  chrome.runtime.onConnectExternal
-      .addListener(allowInterop(handleCiderConnectRequest));
-  // Update the extension icon on tab navigation:
-  chrome.tabs.onActivated.addListener(
-    allowInterop((ActiveInfo info) async {
-      await _updateIcon(info.tabId);
-    }),
-  );
-  chrome.windows.onFocusChanged.addListener(
-    allowInterop((_) async {
-      final currentTab = await activeTab;
-      if (currentTab?.id != null) {
-        await _updateIcon(currentTab!.id);
-      }
-    }),
-  );
-  chrome.webNavigation.onCommitted
-      .addListener(allowInterop(_detectNavigationAwayFromDartApp));
-
-  chrome.commands.onCommand
-      .addListener(allowInterop(_maybeSendCopyAppIdRequest));
-}
-
-Future<void> _handleRuntimeMessages(
-  dynamic jsRequest,
-  MessageSender sender,
-  Function sendResponse,
-) async {
-  if (jsRequest is! String) return;
-
-  interceptMessage<String>(
-    message: jsRequest,
-    expectedType: MessageType.isAuthenticated,
-    expectedSender: Script.detector,
-    expectedRecipient: Script.background,
-    sender: sender,
-    messageHandler: (String isAuthenticated) async {
-      final dartTab = sender.tab;
-      if (dartTab == null) {
-        debugWarn('Received auth info but tab is missing.');
-        return;
-      }
-      // Save the authentication info in storage:
-      await setStorageObject<String>(
-        type: StorageObject.isAuthenticated,
-        value: isAuthenticated,
-        tabId: dartTab.id,
-      );
-    },
-  );
-
-  interceptMessage<DebugInfo>(
-    message: jsRequest,
-    expectedType: MessageType.debugInfo,
-    expectedSender: Script.detector,
-    expectedRecipient: Script.background,
-    sender: sender,
-    messageHandler: (DebugInfo debugInfo) async {
-      final dartTab = sender.tab;
-      if (dartTab == null) {
-        debugWarn('Received debug info but tab is missing.');
-        return;
-      }
-      // If this is a new Dart app, we need to clear old debug session data:
-      if (!await _matchesAppInStorage(debugInfo.appId, tabId: dartTab.id)) {
-        await clearStaleDebugSession(dartTab.id);
-      }
-      // Save the debug info for the Dart app in storage:
-      await setStorageObject<DebugInfo>(
-        type: StorageObject.debugInfo,
-        value: _addTabInfo(debugInfo, tab: dartTab),
-        tabId: dartTab.id,
-      );
-      // Update the icon to show that a Dart app has been detected:
-      final currentTab = await activeTab;
-      if (currentTab?.id == dartTab.id) {
-        await _updateIcon(dartTab.id);
-      }
-    },
-  );
-
-  interceptMessage<DebugStateChange>(
-    message: jsRequest,
-    expectedType: MessageType.debugStateChange,
-    expectedSender: Script.debuggerPanel,
-    expectedRecipient: Script.background,
-    sender: sender,
-    messageHandler: (DebugStateChange debugStateChange) {
-      final newState = debugStateChange.newState;
-      final tabId = debugStateChange.tabId;
-      if (newState == DebugStateChange.startDebugging) {
-        attachDebugger(tabId, trigger: Trigger.extensionPanel);
-      }
-    },
-  );
-
-  interceptMessage<DebugStateChange>(
-    message: jsRequest,
-    expectedType: MessageType.debugStateChange,
-    expectedSender: Script.popup,
-    expectedRecipient: Script.background,
-    sender: sender,
-    messageHandler: (DebugStateChange debugStateChange) {
-      final newState = debugStateChange.newState;
-      final tabId = debugStateChange.tabId;
-      if (newState == DebugStateChange.startDebugging) {
-        attachDebugger(tabId, trigger: Trigger.extensionIcon);
-      }
-    },
-  );
-
-  interceptMessage<String>(
-    message: jsRequest,
-    expectedType: MessageType.multipleAppsDetected,
-    expectedSender: Script.detector,
-    expectedRecipient: Script.background,
-    sender: sender,
-    messageHandler: (String multipleAppsDetected) async {
-      final dartTab = sender.tab;
-      if (dartTab == null) {
-        debugWarn('Received multiple apps detected but tab is missing.');
-        return;
-      }
-      // Save the multiple apps info in storage:
-      await setStorageObject<String>(
-        type: StorageObject.multipleAppsDetected,
-        value: multipleAppsDetected,
-        tabId: dartTab.id,
-      );
-      _setWarningIcon(dartTab.id);
-    },
-  );
-
-  interceptMessage<String>(
-    message: jsRequest,
-    expectedType: MessageType.appId,
-    expectedSender: Script.copier,
-    expectedRecipient: Script.background,
-    sender: sender,
-    messageHandler: (String appId) {
-      displayNotification('Copied app ID: $appId');
-    },
-  );
-
-  sendResponse(defaultResponse);
-}
-
-Future<void> _detectNavigationAwayFromDartApp(
-  NavigationInfo navigationInfo,
-) async {
-  // Ignore any navigation events within the page itself (e.g., opening a link,
-  // reloading the page, reloading an IFRAME, etc):
-  if (_isInternalNavigation(navigationInfo)) return;
-  final tabId = navigationInfo.tabId;
-  final debugInfo = await _fetchDebugInfo(navigationInfo.tabId);
-  if (debugInfo == null) return;
-  if (debugInfo.tabUrl != navigationInfo.url) {
-    _setDefaultIcon(navigationInfo.tabId);
-    await clearStaleDebugSession(tabId);
-    await removeStorageObject(type: StorageObject.debugInfo, tabId: tabId);
-    await detachDebugger(
-      tabId,
-      type: TabType.dartApp,
-      reason: DetachReason.navigatedAwayFromApp,
-    );
-  }
-}
-
-bool _isInternalNavigation(NavigationInfo navigationInfo) {
-  return [
-    'auto_subframe',
-    'form_submit',
-    'link',
-    'manual_subframe',
-    'reload',
-  ].contains(navigationInfo.transitionType);
-}
-
-DebugInfo _addTabInfo(DebugInfo debugInfo, {required Tab tab}) {
-  return DebugInfo(
-    (b) => b
-      ..appEntrypointPath = debugInfo.appEntrypointPath
-      ..appId = debugInfo.appId
-      ..appInstanceId = debugInfo.appInstanceId
-      ..appOrigin = debugInfo.appOrigin
-      ..appUrl = debugInfo.appUrl
-      ..authUrl = debugInfo.authUrl
-      ..extensionUrl = debugInfo.extensionUrl
-      ..isInternalBuild = debugInfo.isInternalBuild
-      ..isFlutterApp = debugInfo.isFlutterApp
-      ..workspaceName = debugInfo.workspaceName
-      ..tabUrl = tab.url
-      ..tabId = tab.id,
-  );
-}
-
-Future<bool> _maybeSendCopyAppIdRequest(String command, [Tab? tab]) async {
-  if (command != 'copyAppId') return false;
-  final tabId = (tab ?? await activeTab)?.id;
-  if (tabId == null) return false;
-  final debugInfo = await _fetchDebugInfo(tabId);
-  final workspaceName = debugInfo?.workspaceName;
-  if (workspaceName == null) return false;
-  final appId = '$workspaceName-$tabId';
-  return sendTabsMessage(
-    tabId: tabId,
-    type: MessageType.appId,
-    body: appId,
-    sender: Script.background,
-    recipient: Script.copier,
-  );
-}
-
-Future<void> _updateIcon(int activeTabId) async {
-  final debugInfo = await _fetchDebugInfo(activeTabId);
-  if (debugInfo == null) {
-    _setDefaultIcon(activeTabId);
-    return;
-  }
-  final multipleApps = await fetchStorageObject<String>(
-    type: StorageObject.multipleAppsDetected,
-    tabId: activeTabId,
-  );
-  multipleApps == null
-      ? _setDebuggableIcon(activeTabId)
-      : _setWarningIcon(activeTabId);
-}
-
-void _setDebuggableIcon(int tabId) {
-  setExtensionIcon(IconInfo(path: 'static_assets/dart.png'));
-  setExtensionPopup(
-    PopupDetails(popup: 'static_assets/popup.html', tabId: tabId),
-  );
-}
-
-void _setWarningIcon(int tabId) {
-  setExtensionPopup(
-    PopupDetails(popup: 'static_assets/popup.html', tabId: tabId),
-  );
-}
-
-void _setDefaultIcon(int tabId) {
-  final iconPath =
-      isDevMode ? 'static_assets/dart_dev.png' : 'static_assets/dart_grey.png';
-  setExtensionIcon(IconInfo(path: iconPath));
-  setExtensionPopup(
-    PopupDetails(popup: '', tabId: tabId),
-  );
-}
-
-Future<DebugInfo?> _fetchDebugInfo(int tabId) {
-  return fetchStorageObject<DebugInfo>(
-    type: StorageObject.debugInfo,
-    tabId: tabId,
-  );
-}
-
-Future<bool> _matchesAppInStorage(String? appId, {required int tabId}) async {
-  final debugInfo = await _fetchDebugInfo(tabId);
-  return appId != null && appId == debugInfo?.appId;
-}
diff --git a/dwds/debug_extension_mv3/web/chrome_api.dart b/dwds/debug_extension_mv3/web/chrome_api.dart
deleted file mode 100644
index bb085cf8e..000000000
--- a/dwds/debug_extension_mv3/web/chrome_api.dart
+++ /dev/null
@@ -1,429 +0,0 @@
-// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
-// 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.
-
-import 'dart:html';
-
-import 'package:js/js.dart';
-
-@JS()
-external Chrome get chrome;
-
-@JS()
-@anonymous
-class Chrome {
-  external Commands get commands;
-  external Debugger get debugger;
-  external Devtools get devtools;
-  external Notifications get notifications;
-  external Runtime get runtime;
-  external Storage get storage;
-  external Tabs get tabs;
-  external WebNavigation get webNavigation;
-  external Windows get windows;
-}
-
-/// chrome.debugger APIs:
-/// https://developer.chrome.com/docs/extensions/reference/debugger
-
-@JS()
-@anonymous
-class Commands {
-  external OnCommandHandler get onCommand;
-}
-
-@JS()
-@anonymous
-class OnCommandHandler {
-  external void addListener(
-    void Function(String commandName, [Tab? tab]) callback,
-  );
-}
-
-@JS()
-@anonymous
-class Debugger {
-  external void attach(
-    Debuggee target,
-    String requiredVersion,
-    Function? callback,
-  );
-
-  external void detach(Debuggee target, Function? callback);
-
-  external void sendCommand(
-    Debuggee target,
-    String method,
-    Object? commandParams,
-    Function? callback,
-  );
-
-  external OnDetachHandler get onDetach;
-
-  external OnEventHandler get onEvent;
-}
-
-@JS()
-@anonymous
-class OnDetachHandler {
-  external void addListener(
-    void Function(Debuggee source, String reason) callback,
-  );
-}
-
-@JS()
-@anonymous
-class OnEventHandler {
-  external void addListener(
-    void Function(Debuggee source, String method, Object? params) callback,
-  );
-}
-
-@JS()
-@anonymous
-class Debuggee {
-  external int get tabId;
-  external String get extensionId;
-  external String get targetId;
-  external factory Debuggee({int tabId, String? extensionId, String? targetId});
-}
-
-/// chrome.devtools APIs:
-
-@JS()
-@anonymous
-class Devtools {
-  // https://developer.chrome.com/docs/extensions/reference/devtools_inspectedWindow
-  external InspectedWindow get inspectedWindow;
-
-  // https://developer.chrome.com/docs/extensions/reference/devtools_panels/
-  external Panels get panels;
-}
-
-@JS()
-@anonymous
-class InspectedWindow {
-  external int get tabId;
-}
-
-@JS()
-@anonymous
-class Panels {
-  external String get themeName;
-
-  external void create(
-    String title,
-    String iconPath,
-    String pagePath,
-    void Function(ExtensionPanel)? callback,
-  );
-}
-
-@JS()
-@anonymous
-class ExtensionPanel {
-  external OnHiddenHandler get onHidden;
-  external OnShownHandler get onShown;
-}
-
-@JS()
-@anonymous
-class OnHiddenHandler {
-  external void addListener(void Function() callback);
-}
-
-@JS()
-@anonymous
-class OnShownHandler {
-  external void addListener(void Function(Window window) callback);
-}
-
-/// chrome.notification APIs:
-/// https://developer.chrome.com/docs/extensions/reference/notifications
-
-@JS()
-@anonymous
-class Notifications {
-  external void create(
-    String? notificationId,
-    NotificationOptions options,
-    Function? callback,
-  );
-
-  external OnClickedHandler get onClicked;
-}
-
-@JS()
-@anonymous
-class OnClickedHandler {
-  external void addListener(
-    void Function(String) callback,
-  );
-}
-
-@JS()
-@anonymous
-class NotificationOptions {
-  external factory NotificationOptions({
-    String title,
-    String message,
-    String iconUrl,
-    String type,
-  });
-}
-
-/// chrome.runtime APIs:
-/// https://developer.chrome.com/docs/extensions/reference/runtime
-
-@JS()
-@anonymous
-class Runtime {
-  external void connect(String? extensionId, ConnectInfo info);
-
-  external void sendMessage(
-    String? id,
-    Object? message,
-    Object? options,
-    Function? callback,
-  );
-
-  external Object getManifest();
-
-  external String getURL(String path);
-
-  external String get id;
-
-  // Note: Not checking the lastError when one occurs throws a runtime exception.
-  external ChromeError? get lastError;
-
-  external ConnectionHandler get onConnect;
-
-  external ConnectionHandler get onConnectExternal;
-
-  external OnMessageHandler get onMessage;
-
-  external OnMessageHandler get onMessageExternal;
-}
-
-@JS()
-class ChromeError {
-  external String get message;
-}
-
-@JS()
-@anonymous
-class ConnectInfo {
-  external String? get name;
-  external factory ConnectInfo({String? name});
-}
-
-@JS()
-@anonymous
-class Port {
-  external String? get name;
-  external void disconnect();
-  external void postMessage(Object message);
-  external OnPortMessageHandler get onMessage;
-  external ConnectionHandler get onDisconnect;
-}
-
-@JS()
-@anonymous
-class OnPortMessageHandler {
-  external void addListener(
-    void Function(dynamic, Port) callback,
-  );
-}
-
-@JS()
-@anonymous
-class ConnectionHandler {
-  external void addListener(void Function(Port) callback);
-}
-
-@JS()
-@anonymous
-class OnMessageHandler {
-  external void addListener(
-    dynamic Function(dynamic, MessageSender, Function) callback,
-  );
-}
-
-@JS()
-@anonymous
-class MessageSender {
-  external String? get id;
-  external Tab? get tab;
-  external String? get url;
-  external String? get origin;
-  external factory MessageSender({String? id, String? url, Tab? tab});
-}
-
-@JS()
-@anonymous
-class Target {
-  external int get tabId;
-  external factory Target({int tabId});
-}
-
-/// chrome.storage APIs
-/// https://developer.chrome.com/docs/extensions/reference/storage
-
-@JS()
-@anonymous
-class Storage {
-  external StorageArea get local;
-
-  external StorageArea get session;
-
-  external OnChangedHandler get onChanged;
-}
-
-@JS()
-@anonymous
-class StorageArea {
-  external Object get(
-    List<String>? keys,
-    void Function(Object result) callback,
-  );
-
-  external Object set(Object items, void Function()? callback);
-
-  external Object remove(List<String> keys, void Function()? callback);
-}
-
-@JS()
-@anonymous
-class OnChangedHandler {
-  external void addListener(
-    void Function(Object changes, String areaName) callback,
-  );
-}
-
-/// chrome.tabs APIs
-/// https://developer.chrome.com/docs/extensions/reference/tabs
-
-@JS()
-@anonymous
-class Tabs {
-  external dynamic query(
-    QueryInfo queryInfo,
-    void Function(List<Tab>) callback,
-  );
-
-  external dynamic create(TabInfo tabInfo, void Function(Tab) callback);
-
-  external dynamic get(int tabId, void Function(Tab?) callback);
-
-  external dynamic remove(int tabId, void Function()? callback);
-
-  external Object sendMessage(
-    int tabId,
-    Object? message,
-    Object? options,
-    void Function() callback,
-  );
-
-  external OnActivatedHandler get onActivated;
-
-  external OnRemovedHandler get onRemoved;
-}
-
-@JS()
-@anonymous
-class OnActivatedHandler {
-  external void addListener(void Function(ActiveInfo activeInfo) callback);
-}
-
-@JS()
-@anonymous
-class OnRemovedHandler {
-  external void addListener(void Function(int tabId, dynamic info) callback);
-}
-
-@JS()
-@anonymous
-class ActiveInfo {
-  external int get tabId;
-}
-
-@JS()
-@anonymous
-class TabInfo {
-  external bool? get active;
-  external bool? get pinned;
-  external String? get url;
-  external factory TabInfo({bool? active, bool? pinned, String? url});
-}
-
-@JS()
-@anonymous
-class QueryInfo {
-  external bool get active;
-  external bool get currentWindow;
-  external String get url;
-  external factory QueryInfo({bool? active, bool? currentWindow, String? url});
-}
-
-@JS()
-@anonymous
-class Tab {
-  external int get id;
-  external String get url;
-}
-
-/// chrome.webNavigation APIs
-/// https://developer.chrome.com/docs/extensions/reference/webNavigation
-
-@JS()
-@anonymous
-class WebNavigation {
-  // https://developer.chrome.com/docs/extensions/reference/webNavigation/#event-onCommitted
-  external OnCommittedHandler get onCommitted;
-}
-
-@JS()
-@anonymous
-class OnCommittedHandler {
-  external void addListener(void Function(NavigationInfo details) callback);
-}
-
-@JS()
-@anonymous
-class NavigationInfo {
-  external String get transitionType;
-  external int get tabId;
-  external String get url;
-}
-
-/// chrome.windows APIs
-/// https://developer.chrome.com/docs/extensions/reference/windows
-
-@JS()
-@anonymous
-class Windows {
-  external dynamic create(WindowInfo? createData, Function(WindowObj) callback);
-
-  external OnFocusChangedHandler get onFocusChanged;
-}
-
-@JS()
-@anonymous
-class OnFocusChangedHandler {
-  external void addListener(void Function(int windowId) callback);
-}
-
-@JS()
-@anonymous
-class WindowInfo {
-  external bool? get focused;
-  external String? get url;
-  external factory WindowInfo({bool? focused, String? url});
-}
-
-@JS()
-@anonymous
-class WindowObj {
-  external int get id;
-  external List<Tab> get tabs;
-}
diff --git a/dwds/debug_extension_mv3/web/manifest_mv2.json b/dwds/debug_extension_mv3/web/manifest_mv2.json
deleted file mode 100644
index 78ce8d184..000000000
--- a/dwds/debug_extension_mv3/web/manifest_mv2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "Dart Debug Extension",
-  "version": "2.1",
-  "manifest_version": 2,
-  "devtools_page": "static_assets/devtools.html",
-  "browser_action": {
-    "default_icon": "static_assets/dart_grey.png"
-  },
-  "externally_connectable": {
-    "ids": ["nbkbficgbembimioedhceniahniffgpl"],
-    "matches": [
-      "https://cider.corp.google.com/*",
-      "https://cider-staging.corp.google.com/*",
-      "https://cider-test.corp.google.com/*",
-      "https://cider-v.corp.google.com/*",
-      "https://cider-v-staging.corp.google.com/*",
-      "https://cider-v-test.corp.google.com/*"
-    ]
-  },
-  "permissions": ["debugger", "notifications", "storage", "webNavigation"],
-  "background": {
-    "scripts": ["background.dart.js"]
-  },
-  "content_scripts": [
-    {
-      "matches": ["<all_urls>"],
-      "js": ["detector.dart.js", "copier.dart.js"],
-      "run_at": "document_end"
-    }
-  ],
-  "commands": {
-    "copyAppId": {
-      "suggestedKey": {
-        "default": "Ctrl+Shift+7",
-        "mac": "Command+Shift+7"
-      },
-      "description": "Copy the app ID"
-    }
-  },
-  "web_accessible_resources": ["debug_info.dart.js"]
-}
diff --git a/dwds/debug_extension_mv3/web/manifest_mv3.json b/dwds/debug_extension_mv3/web/manifest_mv3.json
deleted file mode 100644
index 83ecae394..000000000
--- a/dwds/debug_extension_mv3/web/manifest_mv3.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "name": "Dart Debug Extension",
-  "version": "2.1.4",
-  "manifest_version": 3,
-  "devtools_page": "static_assets/devtools.html",
-  "action": {
-    "default_icon": "static_assets/dart_grey.png"
-  },
-  "externally_connectable": {
-    "ids": ["nbkbficgbembimioedhceniahniffgpl"],
-    "matches": [
-      "https://cider.corp.google.com/*",
-      "https://cider-staging.corp.google.com/*",
-      "https://cider-test.corp.google.com/*",
-      "https://cider-v.corp.google.com/*",
-      "https://cider-v-staging.corp.google.com/*",
-      "https://cider-v-test.corp.google.com/*"
-    ]
-  },
-  "permissions": ["debugger", "notifications", "storage", "webNavigation"],
-  "host_permissions": ["<all_urls>"],
-  "background": {
-    "service_worker": "background.dart.js"
-  },
-  "content_scripts": [
-    {
-      "matches": ["<all_urls>"],
-      "js": ["detector.dart.js", "copier.dart.js"],
-      "run_at": "document_end"
-    }
-  ],
-  "commands": {
-    "copyAppId": {
-      "suggestedKey": {
-        "default": "Ctrl+Shift+7",
-        "mac": "Command+Shift+7"
-      },
-      "description": "Copy the app ID"
-    }
-  },
-  "web_accessible_resources": [
-    {
-      "matches": ["<all_urls>"],
-      "resources": ["debug_info.dart.js"]
-    }
-  ]
-}
diff --git a/dwds/debug_extension_mv3/web/static_assets/dart.png b/dwds/debug_extension_mv3/web/static_assets/dart.png
deleted file mode 100644
index 47e4b7b7d07ff239ac5f597a730ec6dd2c5f278e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3062
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
BYy1EJ

diff --git a/dwds/debug_extension_mv3/web/static_assets/dart_dev.png b/dwds/debug_extension_mv3/web/static_assets/dart_dev.png
deleted file mode 100644
index 8d0479209a0a4dbe62160bc2bafaaf34ce578470..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4743
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
HvBLikb4hKs

diff --git a/dwds/debug_extension_mv3/web/static_assets/dart_grey.png b/dwds/debug_extension_mv3/web/static_assets/dart_grey.png
deleted file mode 100644
index 3afba3fbe6b8d6f6a0bc29d792eef61aaab215a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2814
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
EKmQQ<9RL6T

diff --git a/dwds/debug_extension_mv3/web/static_assets/dart_warning.png b/dwds/debug_extension_mv3/web/static_assets/dart_warning.png
deleted file mode 100644
index 9608d0d1ecfb6597fb1c2f7fe68690621a6d8f11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3611
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
Q+4y%dF|;%&IpiMyA37-lqW}N^

diff --git a/dwds/debug_extension_mv3/web/web_api.dart b/dwds/debug_extension_mv3/web/web_api.dart
deleted file mode 100644
index 1a5134475..000000000
--- a/dwds/debug_extension_mv3/web/web_api.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
-// 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.
-import 'dart:html';
-import 'dart:js_util' as js_util;
-
-import 'package:js/js.dart';
-
-@JS()
-// ignore: non_constant_identifier_names
-external Json get JSON;
-
-@JS()
-@anonymous
-class Json {
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify
-  external String stringify(o);
-}
-
-// Custom implementation of Fetch API until the Dart implementation supports
-// credentials. See https://github.com/dart-lang/http/issues/595.
-@JS('fetch')
-external Object _nativeJsFetch(String resourceUrl, FetchOptions options);
-
-Future<FetchResponse> fetchRequest(String resourceUrl) async {
-  try {
-    final options = FetchOptions(
-      method: 'GET',
-      credentials: 'include',
-    );
-    final response =
-        await promiseToFuture(_nativeJsFetch(resourceUrl, options));
-    final body =
-        await promiseToFuture(js_util.callMethod(response, 'text', []));
-    final ok = js_util.getProperty<bool>(response, 'ok');
-    final status = js_util.getProperty<int>(response, 'status');
-    return FetchResponse(status: status, ok: ok, body: body);
-  } catch (error) {
-    return FetchResponse(
-      status: 400,
-      ok: false,
-      body: 'Error fetching $resourceUrl: $error',
-    );
-  }
-}
-
-@JS()
-@anonymous
-class FetchOptions {
-  external factory FetchOptions({
-    required String method, // e.g., 'GET', 'POST'
-    required String credentials, // e.g., 'omit', 'same-origin', 'include'
-  });
-}
-
-class FetchResponse {
-  final int status;
-  final bool ok;
-  final String? body;
-
-  FetchResponse({
-    required this.status,
-    required this.ok,
-    required this.body,
-  });
-}

From e01276c6e9b18f83985b7e76754406701f874364 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Thu, 9 May 2024 14:44:02 -0700
Subject: [PATCH 2/3] Update references to the file path

---
 .github/labeler.yml                       | 1 -
 dwds/analysis_options.yaml                | 4 ++--
 dwds/test/puppeteer/extension_common.dart | 2 +-
 dwds/test/puppeteer/test_utils.dart       | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 5dfc38faf..b8727694f 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -19,4 +19,3 @@
 'dart-debug-extension':
   - changed-files:
       - any-glob-to-any-file: 'dwds/debug_extension/**/*'
-      - any-glob-to-any-file: 'dwds/debug_extension_mv3/**/*'
diff --git a/dwds/analysis_options.yaml b/dwds/analysis_options.yaml
index 8f1017c53..3d8d4dedd 100644
--- a/dwds/analysis_options.yaml
+++ b/dwds/analysis_options.yaml
@@ -10,8 +10,8 @@ analyzer:
     # Ignore debug extension builds
     - "debug_extension/dev_build/*"
     - "debug_extension/prod_build/*"
-    - "debug_extension_mv3/dev_build/*"
-    - "debug_extension_mv3/prod_build/*"
+    - "debug_extension/dev_build/*"
+    - "debug_extension/prod_build/*"
 
 linter:
   rules:
diff --git a/dwds/test/puppeteer/extension_common.dart b/dwds/test/puppeteer/extension_common.dart
index d7597640b..28edff1e0 100644
--- a/dwds/test/puppeteer/extension_common.dart
+++ b/dwds/test/puppeteer/extension_common.dart
@@ -19,7 +19,7 @@ import 'package:test/test.dart';
 import 'package:test_common/test_sdk_configuration.dart';
 import 'package:test_common/utilities.dart';
 
-import '../../debug_extension_mv3/web/data_serializers.dart';
+import '../../debug_extension/web/data_serializers.dart';
 import '../fixtures/context.dart';
 import '../fixtures/project.dart';
 import '../fixtures/utilities.dart';
diff --git a/dwds/test/puppeteer/test_utils.dart b/dwds/test/puppeteer/test_utils.dart
index 5ef574766..906628fbf 100644
--- a/dwds/test/puppeteer/test_utils.dart
+++ b/dwds/test/puppeteer/test_utils.dart
@@ -23,7 +23,7 @@ final _devToolsLogs = [];
 final _workerLogs = [];
 
 Future<String> buildDebugExtension({required bool isMV3}) async {
-  final extensionDir = absolutePath(pathFromDwds: 'debug_extension_mv3');
+  final extensionDir = absolutePath(pathFromDwds: 'debug_extension');
   await Process.run(
     'dart',
     [

From f0305dead37a1a57b80bad423e0bed60b4c8c944 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Thu, 9 May 2024 15:15:41 -0700
Subject: [PATCH 3/3] Update paths (again)

---
 dwds/analysis_options.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dwds/analysis_options.yaml b/dwds/analysis_options.yaml
index 3d8d4dedd..e01bd3b72 100644
--- a/dwds/analysis_options.yaml
+++ b/dwds/analysis_options.yaml
@@ -8,10 +8,7 @@ analyzer:
     # Ignore generated files
     - "lib/data/*"
     # Ignore debug extension builds
-    - "debug_extension/dev_build/*"
-    - "debug_extension/prod_build/*"
-    - "debug_extension/dev_build/*"
-    - "debug_extension/prod_build/*"
+    - "debug_extension/compiled/*"
 
 linter:
   rules:
@@ -32,7 +29,7 @@ dart_code_metrics:
   metrics-exclude:
     - test/**
   rules:
-    # - arguments-ordering 
+    # - arguments-ordering
     # - avoid-banned-imports
     - avoid-cascade-after-if-null
     - avoid-collection-methods-with-unrelated-types