extension-develop 2.0.3 → 2.1.0

package/dist/module.js

@@ -32,9 +32,10 @@ var __webpack_modules__ = {
             f: ()=>DynamicExtensionManager
         });
         var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fs/promises");
-        var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
-        var crypto__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("crypto");
-        var _webpack_lib_messages__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./webpack/webpack-lib/messages.ts");
+        var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("fs");
+        var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("path");
+        var crypto__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("crypto");
+        var _webpack_lib_messages__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./webpack/webpack-lib/messages.ts");
         function _define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -47,7 +48,7 @@ var __webpack_modules__ = {
         }
         class DynamicExtensionManager {
             generateExtensionKey() {
-                const keyData = crypto__WEBPACK_IMPORTED_MODULE_2__.randomBytes(128);
+                const keyData = crypto__WEBPACK_IMPORTED_MODULE_3__.randomBytes(128);
                 return keyData.toString('base64');
             }
             getBaseExtensionPath(browser) {
@@ -59,17 +60,17 @@ var __webpack_modules__ = {
                     'gecko-based': 'gecko-based-manager-extension'
                 };
                 const extensionName = browserMap[browser] || 'chrome-manager-extension';
-                return path__WEBPACK_IMPORTED_MODULE_1__.join(this.baseExtensionPath, extensionName);
+                return path__WEBPACK_IMPORTED_MODULE_2__.join(this.baseExtensionPath, extensionName);
             }
             async readBaseManifest(browser) {
                 const basePath = this.getBaseExtensionPath(browser);
-                const manifestPath = path__WEBPACK_IMPORTED_MODULE_1__.join(basePath, 'manifest.json');
+                const manifestPath = path__WEBPACK_IMPORTED_MODULE_2__.join(basePath, 'manifest.json');
                 const manifestContent = await fs_promises__WEBPACK_IMPORTED_MODULE_0__.readFile(manifestPath, 'utf-8');
                 return JSON.parse(manifestContent);
             }
             async readBaseServiceWorker(browser) {
                 const basePath = this.getBaseExtensionPath(browser);
-                const serviceWorkerPath = path__WEBPACK_IMPORTED_MODULE_1__.join(basePath, 'reload-service.js');
+                const serviceWorkerPath = path__WEBPACK_IMPORTED_MODULE_2__.join(basePath, 'reload-service.js');
                 return await fs_promises__WEBPACK_IMPORTED_MODULE_0__.readFile(serviceWorkerPath, 'utf-8');
             }
             async generateExtension(instance) {
@@ -87,14 +88,14 @@ var __webpack_modules__ = {
                 };
                 const serviceWorkerContent = baseServiceWorker.replace(/const\s+port\s*=\s*['"](__RELOAD_PORT__|\d+)['"]/, `const port = '${instance.webSocketPort}'`).replace(/const\s+instanceId\s*=\s*['"](__INSTANCE_ID__|\w+)['"]/, `const instanceId = '${instance.instanceId}'`);
                 const enhancedServiceWorker = `// Instance: ${instanceId}\n// Generated: ${new Date().toISOString()}\n// Cache-buster: ${Date.now()}\n\n${serviceWorkerContent}\n\n// Instance-specific logging\n${'development' === process.env.EXTENSION_ENV ? `console.log('[Extension.js DevTools] Instance ${instanceId} initialized on port ${instance.webSocketPort}');` : ''}\n`;
-                const extensionPath = path__WEBPACK_IMPORTED_MODULE_1__.join(this.userExtensionsPath, `${instance.browser}-manager-${instance.port}`);
+                const extensionPath = path__WEBPACK_IMPORTED_MODULE_2__.join(this.userExtensionsPath, `${instance.browser}-manager-${instance.port}`);
                 await fs_promises__WEBPACK_IMPORTED_MODULE_0__.mkdir(extensionPath, {
                     recursive: true
                 });
-                const manifestPath = path__WEBPACK_IMPORTED_MODULE_1__.join(extensionPath, 'manifest.json');
+                const manifestPath = path__WEBPACK_IMPORTED_MODULE_2__.join(extensionPath, 'manifest.json');
                 const manifestContent = JSON.stringify(manifest, null, 2).replace(/__INSTANCE_ID__/g, instance.instanceId);
                 await fs_promises__WEBPACK_IMPORTED_MODULE_0__.writeFile(manifestPath, manifestContent);
-                const serviceWorkerPath = path__WEBPACK_IMPORTED_MODULE_1__.join(extensionPath, 'reload-service.js');
+                const serviceWorkerPath = path__WEBPACK_IMPORTED_MODULE_2__.join(extensionPath, 'reload-service.js');
                 await fs_promises__WEBPACK_IMPORTED_MODULE_0__.writeFile(serviceWorkerPath, enhancedServiceWorker);
                 await this.copyExtensionFiles(instance.browser, extensionPath);
                 return {
@@ -111,8 +112,8 @@ var __webpack_modules__ = {
                         withFileTypes: true
                     });
                     for (const entry of entries)if (entry.isDirectory() && 'images' === entry.name) {
-                        const sourceImagesPath = path__WEBPACK_IMPORTED_MODULE_1__.join(basePath, 'images');
-                        const targetImagesPath = path__WEBPACK_IMPORTED_MODULE_1__.join(targetPath, 'images');
+                        const sourceImagesPath = path__WEBPACK_IMPORTED_MODULE_2__.join(basePath, 'images');
+                        const targetImagesPath = path__WEBPACK_IMPORTED_MODULE_2__.join(targetPath, 'images');
                         await fs_promises__WEBPACK_IMPORTED_MODULE_0__.mkdir(targetImagesPath, {
                             recursive: true
                         });
@@ -120,13 +121,13 @@ var __webpack_modules__ = {
                             withFileTypes: true
                         });
                         for (const imageEntry of imageEntries)if (imageEntry.isFile()) {
-                            const sourceImagePath = path__WEBPACK_IMPORTED_MODULE_1__.join(sourceImagesPath, imageEntry.name);
-                            const targetImagePath = path__WEBPACK_IMPORTED_MODULE_1__.join(targetImagesPath, imageEntry.name);
+                            const sourceImagePath = path__WEBPACK_IMPORTED_MODULE_2__.join(sourceImagesPath, imageEntry.name);
+                            const targetImagePath = path__WEBPACK_IMPORTED_MODULE_2__.join(targetImagesPath, imageEntry.name);
                             await fs_promises__WEBPACK_IMPORTED_MODULE_0__.copyFile(sourceImagePath, targetImagePath);
                         }
                     } else if (entry.isDirectory() && 'pages' === entry.name) {
-                        const sourcePagesPath = path__WEBPACK_IMPORTED_MODULE_1__.join(basePath, 'pages');
-                        const targetPagesPath = path__WEBPACK_IMPORTED_MODULE_1__.join(targetPath, 'pages');
+                        const sourcePagesPath = path__WEBPACK_IMPORTED_MODULE_2__.join(basePath, 'pages');
+                        const targetPagesPath = path__WEBPACK_IMPORTED_MODULE_2__.join(targetPath, 'pages');
                         await fs_promises__WEBPACK_IMPORTED_MODULE_0__.mkdir(targetPagesPath, {
                             recursive: true
                         });
@@ -134,17 +135,17 @@ var __webpack_modules__ = {
                             withFileTypes: true
                         });
                         for (const pageEntry of pageEntries)if (pageEntry.isFile()) {
-                            const sourcePagePath = path__WEBPACK_IMPORTED_MODULE_1__.join(sourcePagesPath, pageEntry.name);
-                            const targetPagePath = path__WEBPACK_IMPORTED_MODULE_1__.join(targetPagesPath, pageEntry.name);
+                            const sourcePagePath = path__WEBPACK_IMPORTED_MODULE_2__.join(sourcePagesPath, pageEntry.name);
+                            const targetPagePath = path__WEBPACK_IMPORTED_MODULE_2__.join(targetPagesPath, pageEntry.name);
                             await fs_promises__WEBPACK_IMPORTED_MODULE_0__.copyFile(sourcePagePath, targetPagePath);
                         }
                     } else if (entry.isFile() && 'manifest.json' !== entry.name && 'reload-service.js' !== entry.name) {
-                        const sourceFilePath = path__WEBPACK_IMPORTED_MODULE_1__.join(basePath, entry.name);
-                        const targetFilePath = path__WEBPACK_IMPORTED_MODULE_1__.join(targetPath, entry.name);
+                        const sourceFilePath = path__WEBPACK_IMPORTED_MODULE_2__.join(basePath, entry.name);
+                        const targetFilePath = path__WEBPACK_IMPORTED_MODULE_2__.join(targetPath, entry.name);
                         await fs_promises__WEBPACK_IMPORTED_MODULE_0__.copyFile(sourceFilePath, targetFilePath);
                     }
                 } catch (error) {
-                    if ('development' === process.env.EXTENSION_ENV) console.warn(_webpack_lib_messages__WEBPACK_IMPORTED_MODULE_3__.O3(error));
+                    if ('development' === process.env.EXTENSION_ENV) console.warn(_webpack_lib_messages__WEBPACK_IMPORTED_MODULE_4__.O3(error));
                 }
             }
             async cleanupExtension(instanceId) {
@@ -152,10 +153,10 @@ var __webpack_modules__ = {
                 const instanceManager = new InstanceManager(this.projectPath);
                 const instance = await instanceManager.getInstance(instanceId);
                 if (!instance) {
-                    if ('development' === process.env.EXTENSION_ENV) console.warn(_webpack_lib_messages__WEBPACK_IMPORTED_MODULE_3__.ej(instanceId));
+                    if ('development' === process.env.EXTENSION_ENV) console.warn(_webpack_lib_messages__WEBPACK_IMPORTED_MODULE_4__.ej(instanceId));
                     return;
                 }
-                const extensionPath = path__WEBPACK_IMPORTED_MODULE_1__.join(this.userExtensionsPath, `${instance.browser}-manager-${instance.port}`);
+                const extensionPath = path__WEBPACK_IMPORTED_MODULE_2__.join(this.userExtensionsPath, `${instance.browser}-manager-${instance.port}`);
                 try {
                     await fs_promises__WEBPACK_IMPORTED_MODULE_0__.rm(extensionPath, {
                         recursive: true,
@@ -172,18 +173,30 @@ var __webpack_modules__ = {
                         force: true
                     });
                 } catch (error) {
-                    if ('development' === process.env.EXTENSION_ENV) console.warn(_webpack_lib_messages__WEBPACK_IMPORTED_MODULE_3__.rH(error));
+                    if ('development' === process.env.EXTENSION_ENV) console.warn(_webpack_lib_messages__WEBPACK_IMPORTED_MODULE_4__.rH(error));
                 }
             }
             getExtensionPath(instanceId) {
-                return path__WEBPACK_IMPORTED_MODULE_1__.join(this.userExtensionsPath, `manager-port-${instanceId}`);
+                try {
+                    const InstanceManager = __webpack_require__("./webpack/plugin-browsers/browsers-lib/instance-manager.ts").InstanceManager;
+                    new InstanceManager(this.projectPath);
+                    const registryPath = path__WEBPACK_IMPORTED_MODULE_2__.join(__webpack_require__("os").homedir(), 'Library', 'Application Support', 'extension-js', 'instances.json');
+                    if (fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(registryPath)) try {
+                        var _data_instances;
+                        const raw = fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync(registryPath, 'utf-8');
+                        const data = JSON.parse(raw);
+                        const info = null == (_data_instances = data.instances) ? void 0 : _data_instances[instanceId];
+                        if (info && info.browser && 'number' == typeof info.port) return path__WEBPACK_IMPORTED_MODULE_2__.join(this.userExtensionsPath, `${info.browser}-manager-${info.port}`);
+                    } catch  {}
+                } catch  {}
+                return path__WEBPACK_IMPORTED_MODULE_2__.join(this.userExtensionsPath, `manager-port-${instanceId}`);
             }
             async extensionExists(instanceId) {
                 const { InstanceManager } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "./webpack/plugin-browsers/browsers-lib/instance-manager.ts"));
                 const instanceManager = new InstanceManager(this.projectPath);
                 const instance = await instanceManager.getInstance(instanceId);
                 if (!instance) return false;
-                const extensionPath = path__WEBPACK_IMPORTED_MODULE_1__.join(this.userExtensionsPath, `${instance.browser}-manager-${instance.port}`);
+                const extensionPath = path__WEBPACK_IMPORTED_MODULE_2__.join(this.userExtensionsPath, `${instance.browser}-manager-${instance.port}`);
                 try {
                     await fs_promises__WEBPACK_IMPORTED_MODULE_0__.access(extensionPath);
                     return true;
@@ -194,8 +207,8 @@ var __webpack_modules__ = {
             async regenerateExtensionIfNeeded(instance) {
                 const exists = await this.extensionExists(instance.instanceId);
                 if (!exists) return await this.generateExtension(instance);
-                const extensionPath = this.getExtensionPath(instance.instanceId);
-                const serviceWorkerPath = path__WEBPACK_IMPORTED_MODULE_1__.join(extensionPath, 'reload-service.js');
+                const extensionPath = path__WEBPACK_IMPORTED_MODULE_2__.join(this.userExtensionsPath, `${instance.browser}-manager-${instance.port}`);
+                const serviceWorkerPath = path__WEBPACK_IMPORTED_MODULE_2__.join(extensionPath, 'reload-service.js');
                 try {
                     const content = await fs_promises__WEBPACK_IMPORTED_MODULE_0__.readFile(serviceWorkerPath, 'utf-8');
                     const portMatch = content.match(/const\s+port\s*=\s*['"](\d+)['"]/);
@@ -211,7 +224,7 @@ var __webpack_modules__ = {
                 return {
                     extensionId: instance.managerExtensionId,
                     manifest,
-                    serviceWorkerPath: path__WEBPACK_IMPORTED_MODULE_1__.join(extensionPath, 'reload-service.js'),
+                    serviceWorkerPath: path__WEBPACK_IMPORTED_MODULE_2__.join(extensionPath, 'reload-service.js'),
                     extensionPath
                 };
             }
@@ -219,9 +232,27 @@ var __webpack_modules__ = {
                 _define_property(this, "baseExtensionPath", void 0);
                 _define_property(this, "projectPath", void 0);
                 _define_property(this, "userExtensionsPath", void 0);
-                this.baseExtensionPath = path__WEBPACK_IMPORTED_MODULE_1__.join(__dirname, '../webpack/plugin-reload/extensions');
+                const candidateBasePaths = [];
+                try {
+                    const entryPath = require.resolve('extension-develop');
+                    const distDir = path__WEBPACK_IMPORTED_MODULE_2__.dirname(entryPath);
+                    candidateBasePaths.push(path__WEBPACK_IMPORTED_MODULE_2__.join(distDir, 'extensions'));
+                } catch  {}
+                candidateBasePaths.push(path__WEBPACK_IMPORTED_MODULE_2__.join(__dirname, 'extensions'));
+                candidateBasePaths.push(path__WEBPACK_IMPORTED_MODULE_2__.join(__dirname, 'dist', 'extensions'));
+                candidateBasePaths.push(path__WEBPACK_IMPORTED_MODULE_2__.join(__dirname, 'programs', 'develop', 'dist', 'extensions'));
+                candidateBasePaths.push(path__WEBPACK_IMPORTED_MODULE_2__.join(process.cwd(), 'node_modules', 'extension-develop', 'dist', 'extensions'));
+                candidateBasePaths.push(path__WEBPACK_IMPORTED_MODULE_2__.join(__dirname, '..', '..', 'plugin-reload', 'extensions'));
+                let resolvedBasePath = candidateBasePaths[0];
+                for (const candidate of candidateBasePaths)try {
+                    if (fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(candidate)) {
+                        resolvedBasePath = candidate;
+                        break;
+                    }
+                } catch  {}
+                this.baseExtensionPath = resolvedBasePath;
                 this.projectPath = projectPath || process.cwd();
-                this.userExtensionsPath = path__WEBPACK_IMPORTED_MODULE_1__.join(this.projectPath, 'dist', 'extension-js', 'extensions');
+                this.userExtensionsPath = path__WEBPACK_IMPORTED_MODULE_2__.join(this.projectPath, 'dist', 'extension-js', 'extensions');
             }
         }
     },
@@ -464,6 +495,18 @@ var __webpack_modules__ = {
                 if ('development' === process.env.EXTENSION_ENV) console.log(_webpack_webpack_lib_messages__WEBPACK_IMPORTED_MODULE_5__.JJ());
             }
             async createInstance(browser, projectPath, requestedPort) {
+                const lockPath = path__WEBPACK_IMPORTED_MODULE_1__.join(this.getDataDirectory(), 'instances.lock');
+                let lockHandle = null;
+                for(let attempt = 0; attempt < 10; attempt++)try {
+                    lockHandle = await (await Promise.resolve().then(__webpack_require__.t.bind(__webpack_require__, "fs/promises", 23))).open(lockPath, 'wx');
+                    break;
+                } catch (err) {
+                    if (err && 'EEXIST' === err.code) {
+                        await new Promise((r)=>setTimeout(r, 25 * (attempt + 1)));
+                        continue;
+                    }
+                    throw err;
+                }
                 if ('development' === process.env.EXTENSION_ENV) console.log(_webpack_webpack_lib_messages__WEBPACK_IMPORTED_MODULE_5__.jE({
                     browser,
                     projectPath,
@@ -490,6 +533,10 @@ var __webpack_modules__ = {
                 await this.saveRegistry(registry);
                 await this.monitorProcessHealth(instanceId);
                 if ('development' === process.env.EXTENSION_ENV) console.log(_webpack_webpack_lib_messages__WEBPACK_IMPORTED_MODULE_5__.pU(registry));
+                try {
+                    if (lockHandle && 'function' == typeof lockHandle.close) await lockHandle.close();
+                    await (await Promise.resolve().then(__webpack_require__.t.bind(__webpack_require__, "fs/promises", 23))).unlink(lockPath);
+                } catch  {}
                 return instance;
             }
             async updateInstance(instanceId, updates) {
@@ -594,6 +641,7 @@ var __webpack_modules__ = {
             ET: ()=>sourceInspectorFileChanged,
             El: ()=>firefoxFailedToStart,
             F0: ()=>sourceInspectorUsingExistingTarget,
+            G$: ()=>devFirefoxProfilePath,
             G9: ()=>sourceInspectorStartingWatchMode,
             GB: ()=>cdpClientExtensionReloadFailed,
             GR: ()=>sourceInspectorAttachedToTarget,
@@ -643,6 +691,7 @@ var __webpack_modules__ = {
             Ym: ()=>sourceInspectorUrlRequired,
             Yw: ()=>sourceInspectorChromeNotReadyYet,
             ZM: ()=>firefoxBinaryArgsExtracted,
+            ZZ: ()=>devFirefoxDebugPort,
             Zk: ()=>sourceInspectorOpeningUrl,
             _A: ()=>enhancedProcessManagementTerminating,
             _C: ()=>cdpClientCheckingShadowDOM,
@@ -691,6 +740,7 @@ var __webpack_modules__ = {
             uc: ()=>enhancedProcessManagementInstanceCleanupComplete,
             v5: ()=>sourceInspectorCreatingTarget,
             w4: ()=>sourceInspectorReconnectionFailed,
+            x: ()=>devChromiumDebugPort,
             xQ: ()=>runningInDevelopment,
             xR: ()=>sourceInspectorEnablingPageDomain,
             y4: ()=>sourceInspectorSetupFailed,
@@ -1084,13 +1134,21 @@ var __webpack_modules__ = {
         function emptyLine() {
             return '';
         }
+        function devChromiumDebugPort(finalPort, requestedPort) {
+            return `${pintor__WEBPACK_IMPORTED_MODULE_0___default().brightMagenta("\u25BA\u25BA\u25BA")} ${pintor__WEBPACK_IMPORTED_MODULE_0___default().brightMagenta('Dev')} Chromium debug port: ${pintor__WEBPACK_IMPORTED_MODULE_0___default().gray(finalPort.toString())} (requested ${pintor__WEBPACK_IMPORTED_MODULE_0___default().gray(requestedPort.toString())})`;
+        }
+        function devFirefoxDebugPort(finalPort, requestedPort) {
+            return `${pintor__WEBPACK_IMPORTED_MODULE_0___default().brightMagenta("\u25BA\u25BA\u25BA")} ${pintor__WEBPACK_IMPORTED_MODULE_0___default().brightMagenta('Dev')} Firefox debug port: ${pintor__WEBPACK_IMPORTED_MODULE_0___default().gray(finalPort.toString())} (requested ${pintor__WEBPACK_IMPORTED_MODULE_0___default().gray(requestedPort.toString())})`;
+        }
+        function devFirefoxProfilePath(profilePath) {
+            return `${pintor__WEBPACK_IMPORTED_MODULE_0___default().brightMagenta("\u25BA\u25BA\u25BA")} ${pintor__WEBPACK_IMPORTED_MODULE_0___default().brightMagenta('Dev')} Firefox profile: ${pintor__WEBPACK_IMPORTED_MODULE_0___default().underline(profilePath)}`;
+        }
     },
     "./webpack/plugin-browsers/browsers-lib/shared-utils.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
-            c5: ()=>calculateDebugPort,
             gB: ()=>filterBrowserFlags,
-            tu: ()=>chooseEffectiveInstanceId,
             rX: ()=>isChromiumProfileLocked,
+            tu: ()=>chooseEffectiveInstanceId,
             _v: ()=>mergePreferences,
             x$: ()=>validateProfilePath,
             km: ()=>findAvailablePortNear,
@@ -1192,7 +1250,7 @@ var __webpack_modules__ = {
         }
         function chooseEffectiveInstanceId(reuseRequested, _concurrent, lockPresent, instanceId) {
             const reuse = void 0 === reuseRequested ? true : !!reuseRequested;
-            const canShare = reuse && !lockPresent;
+            const canShare = reuse && !_concurrent && !lockPresent;
             return canShare ? void 0 : instanceId;
         }
         function calculateDebugPort(portFromConfig, devServerPort, defaultPort = DEFAULT_DEBUG_PORT) {
@@ -1368,11 +1426,27 @@ var __webpack_modules__ = {
             const shortId = instanceId ? String(instanceId).slice(0, 8) : void 0;
             const instanceAwareProfilePath = shortId ? external_path_.join(defaultProfilePath, shortId) : defaultProfilePath;
             (0, shared_utils.x$)(browser, instanceAwareProfilePath);
+            const preferencesPath = external_path_.join(instanceAwareProfilePath, 'Default', 'Preferences');
             try {
-                if (external_fs_.existsSync(instanceAwareProfilePath)) return instanceAwareProfilePath;
+                if (external_fs_.existsSync(instanceAwareProfilePath)) {
+                    if (!external_fs_.existsSync(preferencesPath)) {
+                        if (!(0, shared_utils.rX)(instanceAwareProfilePath)) {
+                            const basePrefs = 'chrome' === browser ? chromeMasterPreferences : edgeMasterPreferences;
+                            const mergedPrefs = {
+                                ...basePrefs,
+                                ...configPreferences
+                            };
+                            try {
+                                external_fs_.mkdirSync(external_path_.dirname(preferencesPath), {
+                                    recursive: true
+                                });
+                            } catch  {}
+                            external_fs_.writeFileSync(preferencesPath, JSON.stringify(mergedPrefs), 'utf8');
+                        }
+                    }
+                    return instanceAwareProfilePath;
+                }
             } catch  {}
-            const preferencesPath = external_path_.join(instanceAwareProfilePath, 'Default', 'Preferences');
-            if (external_fs_.existsSync(preferencesPath)) return instanceAwareProfilePath;
             const preferences = 'chrome' === browser ? chromeMasterPreferences : edgeMasterPreferences;
             const userProfile = {
                 ...preferences,
@@ -1460,7 +1534,7 @@ var __webpack_modules__ = {
                 ...aiOptimizedFlags,
                 ...sourceEnabled ? [
                     `--remote-debugging-port=${cdpPort}`,
-                    '--remote-debugging-address=localhost'
+                    '--remote-debugging-address=127.0.0.1'
                 ] : [],
                 ...filteredFlags,
                 ...configOptions.browserFlags || []
@@ -1488,7 +1562,12 @@ var __webpack_modules__ = {
                         browserBinaryLocation = external_chrome_location2_default()();
                         break;
                     case 'edge':
-                        browserBinaryLocation = external_edge_location_default()();
+                        try {
+                            browserBinaryLocation = external_edge_location_default()();
+                        } catch (e) {
+                            console.error(messages.iv(browser, 'edge binary not found'));
+                            process.exit(1);
+                        }
                         break;
                     case 'chromium-based':
                         browserBinaryLocation = external_path_.normalize(this.chromiumBinary);
@@ -1533,8 +1612,10 @@ var __webpack_modules__ = {
                 }
                 let chromiumConfig;
                 try {
+                    const profileForConfig = false === this.profile && (await instanceManager.getRunningInstances()).some((i)=>'running' === i.status && i.browser === this.browser) ? void 0 : this.profile;
                     chromiumConfig = browserConfig(compilation, {
                         ...this,
+                        profile: profileForConfig,
                         instanceId: effectiveInstanceId,
                         extension: extensionsToLoad
                     });
@@ -1552,6 +1633,14 @@ var __webpack_modules__ = {
                     const desiredPort = (0, shared_utils.Zb)(this.port, this.instanceId);
                     const freePort = await (0, shared_utils.km)(desiredPort);
                     if (freePort !== desiredPort) chromiumConfig = chromiumConfig.map((flag)=>flag.startsWith('--remote-debugging-port=') ? `--remote-debugging-port=${freePort}` : flag);
+                    try {
+                        if (this.instanceId) {
+                            await instanceManager.updateInstance(this.instanceId, {
+                                debugPort: freePort
+                            });
+                            if ('development' === process.env.EXTENSION_ENV) console.log(messages.x(freePort, desiredPort));
+                        }
+                    } catch  {}
                 }
                 if (this.dryRun) {
                     console.log(messages.Lh());
@@ -2257,9 +2346,11 @@ var __webpack_modules__ = {
                 }
                 let firefoxConfig;
                 try {
+                    const hasConcurrent = (await instanceManager.getRunningInstances()).some((i)=>'running' === i.status && i.browser === this.browser);
+                    const profileForConfig = false === this.profile && hasConcurrent ? void 0 : this.profile;
                     firefoxConfig = await browserConfig(compilation, {
                         ...options,
-                        profile: this.profile,
+                        profile: profileForConfig,
                         preferences: this.preferences,
                         keepProfileChanges: this.keepProfileChanges,
                         copyFromProfile: this.copyFromProfile,
@@ -2345,6 +2436,18 @@ var __webpack_modules__ = {
                         console.error(messages.Q(this.browser, error));
                         process.exit(1);
                     }
+                    try {
+                        if (this.instanceId && profileMatch) {
+                            await instanceManager.updateInstance(this.instanceId, {
+                                debugPort,
+                                effectiveProfilePath: profileMatch[1]
+                            });
+                            if ('development' === process.env.EXTENSION_ENV) {
+                                console.log(messages.ZZ(debugPort, desiredDebugPort));
+                                console.log(messages.G$(profileMatch[1]));
+                            }
+                        }
+                    } catch  {}
                 } else {
                     const args = [
                         ...debugPort > 0 ? [
@@ -3325,7 +3428,7 @@ var __webpack_modules__ = {
         module.exports = require("util");
     },
     "./package.json": function(module) {
-        module.exports = JSON.parse('{"i8":"2.0.3","HO":{"@rspack/core":"^1.4.8","@rspack/dev-server":"^1.1.3","@swc/helpers":"^0.5.15","@types/webextension-polyfill":"0.12.3","@vue/compiler-sfc":"^3.5.13","adm-zip":"^0.5.16","axios":"^1.9.0","case-sensitive-paths-webpack-plugin":"^2.4.0","chokidar":"^4.0.1","chrome-location2":"2.0.0","content-security-policy-parser":"^0.6.0","cross-spawn":"^7.0.6","dotenv":"^16.4.7","dotenv-webpack":"^8.1.0","edge-location":"^1.1.1","firefox-location2":"1.0.0","firefox-profile":"^4.7.0","go-git-it":"^5.0.0","ignore":"^6.0.2","loader-utils":"^3.3.1","locate-path":"^7.2.0","micromatch":"^4.0.8","package-manager-detector":"^0.2.7","parse5":"^7.2.1","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"^8.4.49","preact":"^10.22.0","progress":"^2.0.3","schema-utils":"^4.2.0","slugify":"^1.6.6","tiny-glob":"^0.2.9","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.18.0"},"Lq":{"@prefresh/core":"^1.5.2","@prefresh/utils":"^1.2.0","@prefresh/webpack":"^4.0.1","@rspack/plugin-preact-refresh":"^1.1.2","@rspack/plugin-react-refresh":"^1.0.1","babel-loader":"^9.2.1","less-loader":"^12.2.0","postcss-loader":"^8.1.1","postcss-preset-env":"^10.1.1","react-refresh":"^0.14.2","sass-loader":"^16.0.4","svelte-loader":"^3.2.4","vue-loader":"^17.4.2","vue-style-loader":"^4.1.3"}}');
+        module.exports = JSON.parse('{"i8":"2.1.0","HO":{"@rspack/core":"^1.4.8","@rspack/dev-server":"^1.1.3","@swc/helpers":"^0.5.15","@types/webextension-polyfill":"0.12.3","@vue/compiler-sfc":"^3.5.13","adm-zip":"^0.5.16","axios":"^1.9.0","case-sensitive-paths-webpack-plugin":"^2.4.0","chokidar":"^4.0.1","chrome-location2":"2.0.0","content-security-policy-parser":"^0.6.0","cross-spawn":"^7.0.6","dotenv":"^16.4.7","dotenv-webpack":"^8.1.0","edge-location":"^1.1.1","firefox-location2":"1.0.0","firefox-profile":"^4.7.0","go-git-it":"^5.0.0","ignore":"^6.0.2","loader-utils":"^3.3.1","locate-path":"^7.2.0","micromatch":"^4.0.8","package-manager-detector":"^0.2.7","parse5":"^7.2.1","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"^8.4.49","preact":"^10.22.0","progress":"^2.0.3","schema-utils":"^4.2.0","slugify":"^1.6.6","tiny-glob":"^0.2.9","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.18.0"},"Lq":{"@prefresh/core":"^1.5.2","@prefresh/utils":"^1.2.0","@prefresh/webpack":"^4.0.1","@rspack/plugin-preact-refresh":"^1.1.2","@rspack/plugin-react-refresh":"^1.0.1","babel-loader":"^9.2.1","less-loader":"^12.2.0","postcss-loader":"^8.1.1","postcss-preset-env":"^10.1.1","react-refresh":"^0.14.2","sass-loader":"^16.0.4","svelte-loader":"^3.2.4","vue-loader":"^17.4.2","vue-style-loader":"^4.1.3"}}');
     }
 };
 var __webpack_module_cache__ = {};
@@ -3347,6 +3450,33 @@ function __webpack_require__(moduleId) {
         return getter;
     };
 })();
+(()=>{
+    var getProto = Object.getPrototypeOf ? (obj)=>Object.getPrototypeOf(obj) : (obj)=>obj.__proto__;
+    var leafPrototypes;
+    __webpack_require__.t = function(value, mode) {
+        if (1 & mode) value = this(value);
+        if (8 & mode) return value;
+        if ('object' == typeof value && value) {
+            if (4 & mode && value.__esModule) return value;
+            if (16 & mode && 'function' == typeof value.then) return value;
+        }
+        var ns = Object.create(null);
+        __webpack_require__.r(ns);
+        var def = {};
+        leafPrototypes = leafPrototypes || [
+            null,
+            getProto({}),
+            getProto([]),
+            getProto(getProto)
+        ];
+        for(var current = 2 & mode && value; 'object' == typeof current && !~leafPrototypes.indexOf(current); current = getProto(current))Object.getOwnPropertyNames(current).forEach((key)=>{
+            def[key] = ()=>value[key];
+        });
+        def['default'] = ()=>value;
+        __webpack_require__.d(ns, def);
+        return ns;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -7934,6 +8064,7 @@ var __webpack_exports__ = {};
                     browser: this.browser,
                     mode: compiler.options.mode || 'development'
                 });
+                compiler.options.webSocketServer = this.webSocketServer;
                 this.isServerInitialized = true;
                 if ('development' === process.env.EXTENSION_ENV) console.log(webSocketServerInitialized());
             } catch (error) {
@@ -8396,10 +8527,7 @@ var __webpack_exports__ = {};
         }
     }
     const setup_reload_strategy = SetupReloadStrategy;
-    var browsers_lib_messages = __webpack_require__("./webpack/plugin-browsers/browsers-lib/messages.ts");
-    var messaging_client = __webpack_require__("./webpack/plugin-browsers/run-firefox/remote-firefox/messaging-client.ts");
-    var shared_utils = __webpack_require__("./webpack/plugin-browsers/browsers-lib/shared-utils.ts");
-    function setup_firefox_inspection_define_property(obj, key, value) {
+    function plugin_reload_define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
             value: value,
             enumerable: true,
@@ -8409,269 +8537,113 @@ var __webpack_exports__ = {};
         else obj[key] = value;
         return obj;
     }
-    const MAX_CONNECT_RETRIES = 60;
-    const CONNECT_RETRY_INTERVAL_MS = 500;
-    const PAGE_READY_TIMEOUT_MS = 8000;
-    const TARGET_SCAN_INTERVAL_MS = 250;
-    const CHANGE_DEBOUNCE_MS = 300;
-    function wait(ms) {
-        return new Promise((resolve)=>setTimeout(resolve, ms));
-    }
-    class SetupFirefoxInspectionStep {
-        getRdpPort() {
-            return (0, shared_utils.Zb)(this.devOptions.port, this.devOptions.instanceId);
+    class ReloadPlugin {
+        apply(compiler) {
+            if (this.instanceId) compiler.options.currentInstance = {
+                instanceId: this.instanceId
+            };
+            if ('development' !== compiler.options.mode) return;
+            new CreateWebSocketServer({
+                manifestPath: this.manifestPath,
+                browser: this.browser,
+                port: this.port,
+                stats: this.stats,
+                instanceId: this.instanceId
+            }).apply(compiler);
+            new setup_reload_strategy({
+                manifestPath: this.manifestPath,
+                browser: this.browser,
+                autoReload: this.autoReload,
+                stats: this.stats,
+                port: this.port,
+                instanceId: this.instanceId
+            }).apply(compiler);
         }
-        async initialize() {
-            if (this.initialized) return;
-            const client = new messaging_client.v();
-            const port = this.getRdpPort();
+        constructor(options){
+            plugin_reload_define_property(this, "manifestPath", void 0);
+            plugin_reload_define_property(this, "browser", void 0);
+            plugin_reload_define_property(this, "port", void 0);
+            plugin_reload_define_property(this, "stats", void 0);
+            plugin_reload_define_property(this, "autoReload", void 0);
+            plugin_reload_define_property(this, "instanceId", void 0);
+            this.manifestPath = options.manifestPath;
+            this.browser = options.browser || 'chrome';
+            this.port = parseInt(options.port, 10);
+            this.stats = options.stats;
+            this.autoReload = options.autoReload;
+            this.instanceId = options.instanceId;
+        }
+    }
+    plugin_reload_define_property(ReloadPlugin, "name", 'plugin-reload');
+    function feature_polyfill_define_property(obj, key, value) {
+        if (key in obj) Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+        else obj[key] = value;
+        return obj;
+    }
+    class PolyfillPlugin {
+        apply(compiler) {
             try {
-                console.log(browsers_lib_messages.l());
-            } catch  {}
-            let retries = 0;
-            while(retries < MAX_CONNECT_RETRIES)try {
-                await client.connect(port);
-                this.client = client;
-                this.initialized = true;
-                try {
-                    console.log(browsers_lib_messages.Xy());
-                    console.log(browsers_lib_messages.Qe());
-                } catch  {}
-                return;
-            } catch (err) {
-                retries++;
-                if (retries % 10 === 0) try {
-                    console.log(browsers_lib_messages.X_(retries, MAX_CONNECT_RETRIES));
-                } catch  {}
-                await wait(CONNECT_RETRY_INTERVAL_MS);
+                const context = compiler.options.context;
+                const polyfillPath = require.resolve('webextension-polyfill/dist/browser-polyfill.js', {
+                    paths: [
+                        context
+                    ]
+                });
+                new (core_default()).ProvidePlugin({
+                    browser: polyfillPath
+                }).apply(compiler);
+            } catch (error) {
+                console.warn(webpack_lib_messages.or());
             }
-            throw new Error(browsers_lib_messages.V9(port));
         }
-        resolveUrlToInspect() {
-            if (this.devOptions.source && 'string' == typeof this.devOptions.source && 'true' !== this.devOptions.source) return this.devOptions.source;
-            if (this.devOptions.startingUrl) return this.devOptions.startingUrl;
-            throw new Error(browsers_lib_messages.Ym());
+        constructor(options){
+            feature_polyfill_define_property(this, "manifestPath", void 0);
+            feature_polyfill_define_property(this, "browser", void 0);
+            this.manifestPath = options.manifestPath;
+            this.browser = options.browser;
         }
-        async selectActors(urlToInspect) {
-            if (!this.client) throw new Error(browsers_lib_messages.pl());
-            const deadline = Date.now() + 10000;
-            let triedAddTab = false;
-            while(Date.now() < deadline){
-                const allTargets = await this.client.getTargets() || [];
-                for (const target of allTargets)if (target && 'string' == typeof target.url && target.url === urlToInspect && target.actor) return {
-                    tabActor: target.actor,
-                    consoleActor: target.consoleActor || target.actor
-                };
-                if (!triedAddTab && urlToInspect) {
-                    triedAddTab = true;
-                    try {
-                        await this.client.addTab(urlToInspect);
-                        await wait(300);
-                        continue;
-                    } catch  {}
-                }
-                for (const target of allTargets)if (target && (target.actor || target.outerWindowID)) return {
-                    tabActor: target.actor,
-                    consoleActor: target.consoleActor || target.actor
-                };
-                await wait(TARGET_SCAN_INTERVAL_MS);
-            }
-            throw new Error(browsers_lib_messages.qP());
+    }
+    function feature_browser_specific_fields_define_property(obj, key, value) {
+        if (key in obj) Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+        else obj[key] = value;
+        return obj;
+    }
+    class BrowserSpecificFieldsPlugin {
+        patchManifest(manifest) {
+            const patchedManifest = filterKeysForThisBrowser(manifest, this.browser);
+            return JSON.stringify(patchedManifest, null, 2);
         }
-        async ensureNavigatedAndLoaded(urlToInspect, tabActor) {
-            if (!this.client) throw new Error(browsers_lib_messages.pl());
-            if (!tabActor) throw new Error(browsers_lib_messages.Do());
-            let consoleActor = tabActor;
-            let frameActor = tabActor;
-            try {
-                const detail = await this.client.getTargetFromDescriptor(tabActor);
-                if (detail.consoleActor) consoleActor = detail.consoleActor;
-                if (detail.targetActor) frameActor = detail.targetActor;
-            } catch  {}
-            try {
-                await this.client.attach(frameActor);
-            } catch  {}
-            try {
-                await this.client.navigateViaScript(consoleActor, urlToInspect);
-                await this.client.waitForPageReady(consoleActor, urlToInspect, PAGE_READY_TIMEOUT_MS);
-                return;
-            } catch  {}
-            try {
-                const detail = await this.client.getTargetFromDescriptor(tabActor);
-                const targetActor = detail.targetActor || tabActor;
-                try {
-                    await this.client.attach(targetActor);
-                } catch  {}
-                await this.client.navigate(targetActor, urlToInspect);
-                await this.client.waitForLoadEvent(targetActor);
-            } catch  {}
+        apply(compiler) {
+            compiler.hooks.compilation.tap('compatibility:browser-specific-fields', (compilation)=>{
+                compilation.hooks.processAssets.tap({
+                    name: 'compatibility:browser-specific-fields',
+                    stage: core_namespaceObject.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE
+                }, ()=>{
+                    const manifest = getManifestContent(compilation, this.manifestPath);
+                    const patchedSource = this.patchManifest(manifest);
+                    const rawSource = new core_namespaceObject.sources.RawSource(patchedSource);
+                    compilation.updateAsset('manifest.json', rawSource);
+                });
+            });
         }
-        async ensureUrlAndReady(consoleActor, urlToInspect) {
-            if (!this.client) return;
-            try {
-                const href = await this.client.evaluate(consoleActor, 'String(location.href)');
-                if ('string' != typeof href || !href.startsWith(urlToInspect)) await this.client.navigateViaScript(consoleActor, urlToInspect);
-            } catch  {}
-            await this.client.waitForPageReady(consoleActor, urlToInspect, PAGE_READY_TIMEOUT_MS);
-        }
-        async resolveConsoleActor(tabActor, urlToInspect) {
-            if (!this.client) throw new Error(browsers_lib_messages.pl());
-            const start = Date.now();
-            while(Date.now() - start < PAGE_READY_TIMEOUT_MS){
-                try {
-                    const targets = await this.client.getTargets();
-                    const byActor = targets.find((t)=>t && t.actor === tabActor);
-                    const byUrl = targets.find((t)=>t && t.url === urlToInspect);
-                    const match = byActor || byUrl;
-                    const ca = (null == match ? void 0 : match.consoleActor) || (null == match ? void 0 : match.webConsoleActor);
-                    if ('string' == typeof ca && ca.length > 0) return ca;
-                    try {
-                        const detail = await this.client.getTargetFromDescriptor(tabActor);
-                        const guessed = detail.consoleActor;
-                        if ('string' == typeof guessed && guessed.length > 0) return guessed;
-                    } catch  {}
-                } catch  {}
-                await wait(200);
-            }
-            return tabActor;
-        }
-        async printHTML(consoleActor) {
-            if (!this.client) throw new Error('RDP client not initialized');
-            let lastError = null;
-            for(let attempt = 0; attempt < 3; attempt++){
-                let actorToUse = consoleActor;
-                try {
-                    if (this.currentTabActor && this.lastUrlToInspect) {
-                        const fresh = await this.resolveConsoleActor(this.currentTabActor, this.lastUrlToInspect);
-                        if (fresh) actorToUse = fresh;
-                    }
-                } catch  {}
-                try {
-                    const descriptor = this.currentTabActor || actorToUse;
-                    if (this.lastUrlToInspect) await this.ensureUrlAndReady(actorToUse, this.lastUrlToInspect);
-                    try {
-                        const currentUrl = await this.client.evaluate(actorToUse, 'String(location.href)');
-                        const currentTitle = await this.client.evaluate(actorToUse, 'String(document.title)');
-                        console.log(browsers_lib_messages.dI());
-                        console.log(browsers_lib_messages.Hd(`URL: ${currentUrl} | TITLE: ${currentTitle}`));
-                    } catch  {}
-                    const html = await this.client.getPageHTML(descriptor, actorToUse) || '';
-                    console.log(html);
-                    console.log(browsers_lib_messages.qX());
-                    return;
-                } catch (err) {
-                    lastError = err;
-                }
-                await wait(200);
-            }
-            throw lastError || new Error(browsers_lib_messages.Cn());
-        }
-        async waitForContentScriptInjection(consoleActor) {
-            if (!this.client) return;
-            const deadline = Date.now() + PAGE_READY_TIMEOUT_MS;
-            while(Date.now() < deadline){
-                try {
-                    const injected = await this.client.evaluate(consoleActor, `(() => {
-            const root = document.getElementById('extension-root');
-            if (!root || !root.shadowRoot) return false;
-            const html = root.shadowRoot.innerHTML || '';
-            return html.length > 0;
-          })()`);
-                    if (injected) return;
-                } catch  {}
-                await wait(200);
-            }
-        }
-        setupWebSocketHandler(websocketServer) {
-            if (!websocketServer || !websocketServer.clients) return;
-            websocketServer.clients.forEach((ws)=>{
-                this.attachConnection(ws);
-            });
-            websocketServer.on('connection', (ws)=>{
-                this.attachConnection(ws);
-            });
-        }
-        attachConnection(ws) {
-            ws.on('message', async (data)=>{
-                try {
-                    const message = JSON.parse(data);
-                    if ('changedFile' === message.type && this.isWatching) await this.handleFileChange();
-                } catch  {}
-            });
-        }
-        async handleFileChange() {
-            if (!this.client || !this.currentConsoleActor) return;
-            if (this.debounceTimer) clearTimeout(this.debounceTimer);
-            this.debounceTimer = setTimeout(async ()=>{
-                try {
-                    if (this.currentTabActor && this.lastUrlToInspect) {
-                        const freshConsole = await this.resolveConsoleActor(this.currentTabActor, this.lastUrlToInspect);
-                        if (freshConsole) this.currentConsoleActor = freshConsole;
-                    }
-                    if (this.lastUrlToInspect) await this.ensureUrlAndReady(this.currentConsoleActor, this.lastUrlToInspect);
-                    await this.waitForContentScriptInjection(this.currentConsoleActor);
-                    let lastError = null;
-                    for(let attempt = 0; attempt < 3; attempt++){
-                        try {
-                            const descriptor = this.currentTabActor || this.currentConsoleActor;
-                            const html = await this.client.getPageHTML(descriptor, this.currentConsoleActor);
-                            console.log(browsers_lib_messages.dI());
-                            console.log(browsers_lib_messages.Hd("UPDATED - after content script injection"));
-                            console.log(html);
-                            console.log(browsers_lib_messages.qX());
-                            return;
-                        } catch (err) {
-                            lastError = err;
-                        }
-                        await wait(200);
-                    }
-                    throw lastError || new Error('Failed to update HTML after retries');
-                } catch (err) {
-                    console.error(browsers_lib_messages.QB(err.message));
-                }
-            }, CHANGE_DEBOUNCE_MS);
-        }
-        apply(compiler) {
-            if (!this.devOptions.source && !this.devOptions.watchSource) return;
-            compiler.hooks.done.tapAsync('plugin-reload:setup-firefox-inspection', async (_stats, done)=>{
-                try {
-                    if (!this.initialized) await this.initialize();
-                    const urlToInspect = this.resolveUrlToInspect();
-                    this.lastUrlToInspect = urlToInspect;
-                    console.log(browsers_lib_messages.hm(urlToInspect));
-                    const { tabActor, consoleActor } = await this.selectActors(urlToInspect);
-                    this.currentTabActor = tabActor;
-                    await this.ensureNavigatedAndLoaded(urlToInspect, tabActor);
-                    const resolvedConsoleActor = await this.resolveConsoleActor(tabActor, urlToInspect);
-                    this.currentConsoleActor = resolvedConsoleActor || consoleActor;
-                    if (this.currentConsoleActor) {
-                        await this.waitForContentScriptInjection(this.currentConsoleActor);
-                        await this.printHTML(this.currentConsoleActor);
-                    }
-                    const webSocketServer = compiler.options.webSocketServer;
-                    if (this.devOptions.watchSource && webSocketServer && !this.isWatching) {
-                        this.isWatching = true;
-                        this.setupWebSocketHandler(webSocketServer);
-                    }
-                } catch (error) {
-                    console.error(browsers_lib_messages.y4(error.message));
-                }
-                done();
-            });
-        }
-        constructor(devOptions){
-            setup_firefox_inspection_define_property(this, "devOptions", void 0);
-            setup_firefox_inspection_define_property(this, "client", null);
-            setup_firefox_inspection_define_property(this, "currentConsoleActor", null);
-            setup_firefox_inspection_define_property(this, "currentTabActor", null);
-            setup_firefox_inspection_define_property(this, "isWatching", false);
-            setup_firefox_inspection_define_property(this, "debounceTimer", null);
-            setup_firefox_inspection_define_property(this, "initialized", false);
-            setup_firefox_inspection_define_property(this, "lastUrlToInspect", null);
-            this.devOptions = devOptions;
+        constructor(options){
+            feature_browser_specific_fields_define_property(this, "browser", void 0);
+            feature_browser_specific_fields_define_property(this, "manifestPath", void 0);
+            this.manifestPath = options.manifestPath;
+            this.browser = options.browser || 'chrome';
         }
     }
-    function plugin_reload_define_property(obj, key, value) {
+    function plugin_compatibility_define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
             value: value,
             enumerable: true,
@@ -8681,169 +8653,48 @@ var __webpack_exports__ = {};
         else obj[key] = value;
         return obj;
     }
-    class ReloadPlugin {
-        apply(compiler) {
-            if (this.instanceId) compiler.options.currentInstance = {
-                instanceId: this.instanceId
-            };
-            if ('development' !== compiler.options.mode) return;
-            new CreateWebSocketServer({
-                manifestPath: this.manifestPath,
-                browser: this.browser,
-                port: this.port,
-                stats: this.stats,
-                instanceId: this.instanceId
-            }).apply(compiler);
-            new setup_reload_strategy({
+    class CompatibilityPlugin {
+        async apply(compiler) {
+            if (this.polyfill) {
+                if ('firefox' !== this.browser) new PolyfillPlugin({
+                    manifestPath: this.manifestPath,
+                    browser: this.browser || 'chrome'
+                }).apply(compiler);
+            }
+            new BrowserSpecificFieldsPlugin({
                 manifestPath: this.manifestPath,
-                browser: this.browser,
-                autoReload: this.autoReload,
-                stats: this.stats,
-                port: this.port,
-                instanceId: this.instanceId
-            }).apply(compiler);
-            if ('firefox' === this.browser || 'gecko-based' === this.browser) new SetupFirefoxInspectionStep({
-                browser: this.browser,
-                mode: compiler.options.mode || 'development',
-                port: this.port,
-                instanceId: this.instanceId
+                browser: this.browser || 'chrome'
             }).apply(compiler);
         }
         constructor(options){
-            plugin_reload_define_property(this, "manifestPath", void 0);
-            plugin_reload_define_property(this, "browser", void 0);
-            plugin_reload_define_property(this, "port", void 0);
-            plugin_reload_define_property(this, "stats", void 0);
-            plugin_reload_define_property(this, "autoReload", void 0);
-            plugin_reload_define_property(this, "instanceId", void 0);
+            plugin_compatibility_define_property(this, "manifestPath", void 0);
+            plugin_compatibility_define_property(this, "browser", void 0);
+            plugin_compatibility_define_property(this, "polyfill", void 0);
             this.manifestPath = options.manifestPath;
             this.browser = options.browser || 'chrome';
-            this.port = parseInt(options.port, 10);
-            this.stats = options.stats;
-            this.autoReload = options.autoReload;
-            this.instanceId = options.instanceId;
+            this.polyfill = options.polyfill || false;
         }
     }
-    plugin_reload_define_property(ReloadPlugin, "name", 'plugin-reload');
-    function feature_polyfill_define_property(obj, key, value) {
-        if (key in obj) Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-        else obj[key] = value;
-        return obj;
-    }
-    class PolyfillPlugin {
-        apply(compiler) {
-            try {
-                const context = compiler.options.context;
-                const polyfillPath = require.resolve('webextension-polyfill/dist/browser-polyfill.js', {
-                    paths: [
-                        context
-                    ]
-                });
-                new (core_default()).ProvidePlugin({
-                    browser: polyfillPath
-                }).apply(compiler);
-            } catch (error) {
-                console.warn(webpack_lib_messages.or());
+    plugin_compatibility_define_property(CompatibilityPlugin, "name", 'plugin-compatibility');
+    var external_net_ = __webpack_require__("net");
+    var browsers_lib_messages = __webpack_require__("./webpack/plugin-browsers/browsers-lib/messages.ts");
+    function mergeShadowIntoDocument(mainHTML, shadowContent) {
+        try {
+            if (!mainHTML) return '';
+            const hasRoot = /<div id=(["'])extension-root\1/i.test(mainHTML);
+            if (hasRoot) {
+                const emptyRoot = /<div id=(["'])extension-root\1[^>]*><\/div>/i;
+                const replacedEmpty = mainHTML.replace(emptyRoot, `<div id="extension-root">${shadowContent}</div>`);
+                if (replacedEmpty !== mainHTML) return replacedEmpty;
+                return mainHTML.replace(/<div id=(["'])extension-root\1[^>]*>[\s\S]*?<\/div>/i, `<div id="extension-root">${shadowContent}</div>`);
             }
-        }
-        constructor(options){
-            feature_polyfill_define_property(this, "manifestPath", void 0);
-            feature_polyfill_define_property(this, "browser", void 0);
-            this.manifestPath = options.manifestPath;
-            this.browser = options.browser;
+            if (/<\/body>/i.test(mainHTML)) return mainHTML.replace(/<\/body>/i, `<div id="extension-root">${shadowContent}</div></body>`);
+            return `${mainHTML}\n<div id="extension-root">${shadowContent}</div>`;
+        } catch  {
+            return mainHTML;
         }
     }
-    function feature_browser_specific_fields_define_property(obj, key, value) {
-        if (key in obj) Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-        else obj[key] = value;
-        return obj;
-    }
-    class BrowserSpecificFieldsPlugin {
-        patchManifest(manifest) {
-            const patchedManifest = filterKeysForThisBrowser(manifest, this.browser);
-            return JSON.stringify(patchedManifest, null, 2);
-        }
-        apply(compiler) {
-            compiler.hooks.compilation.tap('compatibility:browser-specific-fields', (compilation)=>{
-                compilation.hooks.processAssets.tap({
-                    name: 'compatibility:browser-specific-fields',
-                    stage: core_namespaceObject.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE
-                }, ()=>{
-                    const manifest = getManifestContent(compilation, this.manifestPath);
-                    const patchedSource = this.patchManifest(manifest);
-                    const rawSource = new core_namespaceObject.sources.RawSource(patchedSource);
-                    compilation.updateAsset('manifest.json', rawSource);
-                });
-            });
-        }
-        constructor(options){
-            feature_browser_specific_fields_define_property(this, "browser", void 0);
-            feature_browser_specific_fields_define_property(this, "manifestPath", void 0);
-            this.manifestPath = options.manifestPath;
-            this.browser = options.browser || 'chrome';
-        }
-    }
-    function plugin_compatibility_define_property(obj, key, value) {
-        if (key in obj) Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-        else obj[key] = value;
-        return obj;
-    }
-    class CompatibilityPlugin {
-        async apply(compiler) {
-            if (this.polyfill) {
-                if ('firefox' !== this.browser) new PolyfillPlugin({
-                    manifestPath: this.manifestPath,
-                    browser: this.browser || 'chrome'
-                }).apply(compiler);
-            }
-            new BrowserSpecificFieldsPlugin({
-                manifestPath: this.manifestPath,
-                browser: this.browser || 'chrome'
-            }).apply(compiler);
-        }
-        constructor(options){
-            plugin_compatibility_define_property(this, "manifestPath", void 0);
-            plugin_compatibility_define_property(this, "browser", void 0);
-            plugin_compatibility_define_property(this, "polyfill", void 0);
-            this.manifestPath = options.manifestPath;
-            this.browser = options.browser || 'chrome';
-            this.polyfill = options.polyfill || false;
-        }
-    }
-    plugin_compatibility_define_property(CompatibilityPlugin, "name", 'plugin-compatibility');
-    var external_net_ = __webpack_require__("net");
-    function mergeShadowIntoDocument(mainHTML, shadowContent) {
-        try {
-            if (!mainHTML) return '';
-            const hasRoot = /<div id=(["'])extension-root\1/i.test(mainHTML);
-            if (hasRoot) {
-                const emptyRoot = /<div id=(["'])extension-root\1[^>]*><\/div>/i;
-                const replacedEmpty = mainHTML.replace(emptyRoot, `<div id="extension-root">${shadowContent}</div>`);
-                if (replacedEmpty !== mainHTML) return replacedEmpty;
-                return mainHTML.replace(/<div id=(["'])extension-root\1[^>]*>[\s\S]*?<\/div>/i, `<div id="extension-root">${shadowContent}</div>`);
-            }
-            if (/<\/body>/i.test(mainHTML)) return mainHTML.replace(/<\/body>/i, `<div id="extension-root">${shadowContent}</div></body>`);
-            return `${mainHTML}\n<div id="extension-root">${shadowContent}</div>`;
-        } catch  {
-            return mainHTML;
-        }
-    }
-    function cdp_client_define_property(obj, key, value) {
+    function cdp_client_define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
             value: value,
             enumerable: true,
@@ -9154,6 +9005,7 @@ var __webpack_exports__ = {};
             socket.connect(port, 'localhost');
         });
     }
+    var shared_utils = __webpack_require__("./webpack/plugin-browsers/browsers-lib/shared-utils.ts");
     function setup_chrome_inspection_define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
             value: value,
@@ -9165,11 +9017,18 @@ var __webpack_exports__ = {};
         return obj;
     }
     class SetupChromeInspectionStep {
-        getCdpPort() {
-            return (0, shared_utils.c5)(this.devOptions.port, void 0);
+        async getCdpPort() {
+            const instanceId = this.devOptions.instanceId;
+            if (instanceId) try {
+                const instanceManager = new instance_manager.InstanceManager(process.cwd());
+                const instance = await instanceManager.getInstance(instanceId);
+                if ((null == instance ? void 0 : instance.debugPort) && Number.isFinite(instance.debugPort)) return instance.debugPort;
+            } catch  {}
+            return (0, shared_utils.Zb)(this.devOptions.port, instanceId);
         }
-        async initialize(port = this.getCdpPort()) {
+        async initialize(port) {
             try {
+                if (!port) port = await this.getCdpPort();
                 if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.Ro());
                 let retries = 0;
                 const maxRetries = 60;
@@ -9194,160 +9053,439 @@ var __webpack_exports__ = {};
                 throw error;
             }
         }
-        async inspectSource(url) {
-            if (!this.cdpClient) throw new Error(browsers_lib_messages.mO());
+        async inspectSource(url) {
+            if (!this.cdpClient) throw new Error(browsers_lib_messages.mO());
+            try {
+                if ('development' === process.env.EXTENSION_ENV) {
+                    console.log(browsers_lib_messages.Zk(url));
+                    console.log(browsers_lib_messages.Tz());
+                }
+                const targets = await this.cdpClient.getTargets();
+                const existingTarget = targets.find((target)=>target.url === url && 'page' === target.type);
+                if (existingTarget) {
+                    if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.F0(existingTarget.targetId));
+                    this.currentTargetId = existingTarget.targetId;
+                } else {
+                    if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.v5());
+                    this.currentTargetId = await this.cdpClient.createTarget(url);
+                    if ('development' === process.env.EXTENSION_ENV) {
+                        console.log(browsers_lib_messages.N_(this.currentTargetId));
+                        console.log(browsers_lib_messages.Ac());
+                    }
+                    await this.cdpClient.navigateToUrl(this.currentTargetId, url);
+                }
+                if (!this.currentTargetId) throw new Error('Failed to get or create target');
+                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.tX());
+                this.currentSessionId = await this.cdpClient.attachToTarget(this.currentTargetId);
+                if ('development' === process.env.EXTENSION_ENV) {
+                    console.log(browsers_lib_messages.GR(this.currentSessionId));
+                    console.log(browsers_lib_messages.xR());
+                }
+                await this.cdpClient.sendCommand('Page.enable', {}, this.currentSessionId);
+                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages._y());
+                await this.cdpClient.waitForLoadEvent(this.currentSessionId);
+                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.Ak());
+                await this.cdpClient.waitForContentScriptInjection(this.currentSessionId);
+                const html = await this.cdpClient.getPageHTML(this.currentSessionId);
+                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.tg());
+                return html;
+            } catch (error) {
+                if ('development' === process.env.EXTENSION_ENV) console.error(browsers_lib_messages.L7(error.message));
+                throw error;
+            }
+        }
+        async startWatching(websocketServer) {
+            if ('development' !== process.env.EXTENSION_ENV) return;
+            if (this.isWatching) return void console.log(browsers_lib_messages.Li());
+            this.isWatching = true;
+            console.log(browsers_lib_messages.G9());
+            this.setupWebSocketHandler(websocketServer);
+            console.log(browsers_lib_messages.A4());
+        }
+        setupWebSocketHandler(websocketServer) {
+            if ('development' !== process.env.EXTENSION_ENV) return;
+            if (!websocketServer || !websocketServer.clients) return void console.warn(browsers_lib_messages.c9());
+            websocketServer.clients.forEach((ws)=>{
+                this.setupConnectionHandler(ws);
+            });
+            websocketServer.on('connection', (ws)=>{
+                this.setupConnectionHandler(ws);
+            });
+        }
+        setupConnectionHandler(ws) {
+            if ('development' !== process.env.EXTENSION_ENV) return;
+            ws.on('message', async (data)=>{
+                try {
+                    const message = JSON.parse(data);
+                    if ('changedFile' === message.type && this.isWatching) await this.handleFileChange();
+                } catch (error) {}
+            });
+        }
+        stopWatching() {
+            if ('development' !== process.env.EXTENSION_ENV) return;
+            this.isWatching = false;
+            console.log(browsers_lib_messages.aW());
+        }
+        async handleFileChange() {
+            if ('development' !== process.env.EXTENSION_ENV) return;
+            if (!this.cdpClient || !this.currentSessionId) return void console.warn(browsers_lib_messages.ln());
+            if (this.debounceTimer) clearTimeout(this.debounceTimer);
+            this.debounceTimer = setTimeout(async ()=>{
+                try {
+                    console.log(browsers_lib_messages.ET());
+                    console.log(browsers_lib_messages.Tq());
+                    await this.cdpClient.waitForContentScriptInjection(this.currentSessionId);
+                    console.log(browsers_lib_messages.ov());
+                    const html = await this.cdpClient.getPageHTML(this.currentSessionId);
+                    this.printUpdatedHTML(html);
+                } catch (error) {
+                    console.error(browsers_lib_messages.QB(error.message));
+                    if (error.message.includes('session') || error.message.includes('target')) {
+                        console.log(browsers_lib_messages.Lf());
+                        await this.reconnectToTarget();
+                    }
+                }
+            }, 300);
+        }
+        async reconnectToTarget() {
+            if ('development' !== process.env.EXTENSION_ENV) return;
+            try {
+                if (!this.cdpClient || !this.currentTargetId) return void console.warn(browsers_lib_messages.DQ());
+                console.log(browsers_lib_messages.S6());
+                this.currentSessionId = await this.cdpClient.attachToTarget(this.currentTargetId);
+                console.log(browsers_lib_messages.BK(this.currentSessionId));
+            } catch (error) {
+                console.error(browsers_lib_messages.w4(error.message));
+            }
+        }
+        printHTML(html) {
+            console.log(browsers_lib_messages.dI());
+            console.log(html);
+            console.log(browsers_lib_messages.qX());
+        }
+        printUpdatedHTML(html) {
+            if ('development' !== process.env.EXTENSION_ENV) return;
+            console.log(browsers_lib_messages.dI());
+            console.log(browsers_lib_messages.Hd("UPDATED - after content script injection"));
+            console.log(browsers_lib_messages.dI());
+            console.log(html);
+            console.log(browsers_lib_messages.qX());
+        }
+        async cleanup() {
+            try {
+                if ('development' === process.env.EXTENSION_ENV) this.stopWatching();
+                if (this.cdpClient && this.currentTargetId) await this.cdpClient.closeTarget(this.currentTargetId);
+                if (this.cdpClient) this.cdpClient.disconnect();
+                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.S5());
+            } catch (error) {
+                if ('development' === process.env.EXTENSION_ENV) console.error(browsers_lib_messages.oP(error.message));
+            }
+        }
+        apply(compiler) {
+            if (!this.devOptions.source && !this.devOptions.watchSource) return;
+            compiler.hooks.done.tapAsync('plugin-reload:setup-chrome-inspection', async (stats, done)=>{
+                try {
+                    if (!this.isInitialized) await this.initialize();
+                    let urlToInspect;
+                    if (this.devOptions.source && 'string' == typeof this.devOptions.source && 'true' !== this.devOptions.source) urlToInspect = this.devOptions.source;
+                    else if (this.devOptions.startingUrl) urlToInspect = this.devOptions.startingUrl;
+                    else throw new Error(browsers_lib_messages.Ym());
+                    const html = await this.inspectSource(urlToInspect);
+                    this.printHTML(html);
+                    const webSocketServer = compiler.options.webSocketServer;
+                    if (this.devOptions.watchSource && webSocketServer && 'development' === process.env.EXTENSION_ENV) this.startWatching(webSocketServer);
+                    done();
+                } catch (error) {
+                    if ('development' === process.env.EXTENSION_ENV) console.error(browsers_lib_messages.y4(error.message));
+                    done();
+                }
+            });
+        }
+        constructor(devOptions){
+            setup_chrome_inspection_define_property(this, "devOptions", void 0);
+            setup_chrome_inspection_define_property(this, "cdpClient", null);
+            setup_chrome_inspection_define_property(this, "currentTargetId", null);
+            setup_chrome_inspection_define_property(this, "currentSessionId", null);
+            setup_chrome_inspection_define_property(this, "isInitialized", false);
+            this.devOptions = devOptions;
+        }
+    }
+    var messaging_client = __webpack_require__("./webpack/plugin-browsers/run-firefox/remote-firefox/messaging-client.ts");
+    function setup_firefox_inspection_define_property(obj, key, value) {
+        if (key in obj) Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+        else obj[key] = value;
+        return obj;
+    }
+    const MAX_CONNECT_RETRIES = 60;
+    const CONNECT_RETRY_INTERVAL_MS = 500;
+    const PAGE_READY_TIMEOUT_MS = 8000;
+    const TARGET_SCAN_INTERVAL_MS = 250;
+    const CHANGE_DEBOUNCE_MS = 300;
+    function wait(ms) {
+        return new Promise((resolve)=>setTimeout(resolve, ms));
+    }
+    class SetupFirefoxInspectionStep {
+        async getRdpPort() {
+            const instanceId = this.devOptions.instanceId;
+            if (instanceId) try {
+                const instanceManager = new instance_manager.InstanceManager(process.cwd());
+                const instance = await instanceManager.getInstance(instanceId);
+                if ((null == instance ? void 0 : instance.debugPort) && Number.isFinite(instance.debugPort)) return instance.debugPort;
+            } catch  {}
+            return (0, shared_utils.Zb)(this.devOptions.port, instanceId);
+        }
+        async initialize() {
+            if (this.initialized) return;
+            const client = new messaging_client.v();
+            const port = await this.getRdpPort();
+            try {
+                console.log(browsers_lib_messages.l());
+            } catch  {}
+            let retries = 0;
+            while(retries < MAX_CONNECT_RETRIES)try {
+                await client.connect(port);
+                this.client = client;
+                this.initialized = true;
+                try {
+                    console.log(browsers_lib_messages.Xy());
+                    console.log(browsers_lib_messages.Qe());
+                } catch  {}
+                return;
+            } catch (err) {
+                retries++;
+                if (retries % 10 === 0) try {
+                    console.log(browsers_lib_messages.X_(retries, MAX_CONNECT_RETRIES));
+                } catch  {}
+                await wait(CONNECT_RETRY_INTERVAL_MS);
+            }
+            throw new Error(browsers_lib_messages.V9(port));
+        }
+        resolveUrlToInspect() {
+            if (this.devOptions.source && 'string' == typeof this.devOptions.source && 'true' !== this.devOptions.source) return this.devOptions.source;
+            if (this.devOptions.startingUrl) return this.devOptions.startingUrl;
+            throw new Error(browsers_lib_messages.Ym());
+        }
+        async selectActors(urlToInspect) {
+            if (!this.client) throw new Error(browsers_lib_messages.pl());
+            const deadline = Date.now() + 10000;
+            let triedAddTab = false;
+            while(Date.now() < deadline){
+                const allTargets = await this.client.getTargets() || [];
+                for (const target of allTargets)if (target && 'string' == typeof target.url && target.url === urlToInspect && target.actor) return {
+                    tabActor: target.actor,
+                    consoleActor: target.consoleActor || target.actor
+                };
+                if (!triedAddTab && urlToInspect) {
+                    triedAddTab = true;
+                    try {
+                        await this.client.addTab(urlToInspect);
+                        await wait(300);
+                        continue;
+                    } catch  {}
+                }
+                for (const target of allTargets)if (target && (target.actor || target.outerWindowID)) return {
+                    tabActor: target.actor,
+                    consoleActor: target.consoleActor || target.actor
+                };
+                await wait(TARGET_SCAN_INTERVAL_MS);
+            }
+            throw new Error(browsers_lib_messages.qP());
+        }
+        async ensureNavigatedAndLoaded(urlToInspect, tabActor) {
+            if (!this.client) throw new Error(browsers_lib_messages.pl());
+            if (!tabActor) throw new Error(browsers_lib_messages.Do());
+            let consoleActor = tabActor;
+            let frameActor = tabActor;
+            try {
+                const detail = await this.client.getTargetFromDescriptor(tabActor);
+                if (detail.consoleActor) consoleActor = detail.consoleActor;
+                if (detail.targetActor) frameActor = detail.targetActor;
+            } catch  {}
+            try {
+                await this.client.attach(frameActor);
+            } catch  {}
+            try {
+                await this.client.navigateViaScript(consoleActor, urlToInspect);
+                await this.client.waitForPageReady(consoleActor, urlToInspect, PAGE_READY_TIMEOUT_MS);
+                return;
+            } catch  {}
+            try {
+                const detail = await this.client.getTargetFromDescriptor(tabActor);
+                const targetActor = detail.targetActor || tabActor;
+                try {
+                    await this.client.attach(targetActor);
+                } catch  {}
+                await this.client.navigate(targetActor, urlToInspect);
+                await this.client.waitForLoadEvent(targetActor);
+            } catch  {}
+        }
+        async ensureUrlAndReady(consoleActor, urlToInspect) {
+            if (!this.client) return;
             try {
-                if ('development' === process.env.EXTENSION_ENV) {
-                    console.log(browsers_lib_messages.Zk(url));
-                    console.log(browsers_lib_messages.Tz());
-                }
-                const targets = await this.cdpClient.getTargets();
-                const existingTarget = targets.find((target)=>target.url === url && 'page' === target.type);
-                if (existingTarget) {
-                    if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.F0(existingTarget.targetId));
-                    this.currentTargetId = existingTarget.targetId;
-                } else {
-                    if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.v5());
-                    this.currentTargetId = await this.cdpClient.createTarget(url);
-                    if ('development' === process.env.EXTENSION_ENV) {
-                        console.log(browsers_lib_messages.N_(this.currentTargetId));
-                        console.log(browsers_lib_messages.Ac());
+                const href = await this.client.evaluate(consoleActor, 'String(location.href)');
+                if ('string' != typeof href || !href.startsWith(urlToInspect)) await this.client.navigateViaScript(consoleActor, urlToInspect);
+            } catch  {}
+            await this.client.waitForPageReady(consoleActor, urlToInspect, PAGE_READY_TIMEOUT_MS);
+        }
+        async resolveConsoleActor(tabActor, urlToInspect) {
+            if (!this.client) throw new Error(browsers_lib_messages.pl());
+            const start = Date.now();
+            while(Date.now() - start < PAGE_READY_TIMEOUT_MS){
+                try {
+                    const targets = await this.client.getTargets();
+                    const byActor = targets.find((t)=>t && t.actor === tabActor);
+                    const byUrl = targets.find((t)=>t && t.url === urlToInspect);
+                    const match = byActor || byUrl;
+                    const ca = (null == match ? void 0 : match.consoleActor) || (null == match ? void 0 : match.webConsoleActor);
+                    if ('string' == typeof ca && ca.length > 0) return ca;
+                    try {
+                        const detail = await this.client.getTargetFromDescriptor(tabActor);
+                        const guessed = detail.consoleActor;
+                        if ('string' == typeof guessed && guessed.length > 0) return guessed;
+                    } catch  {}
+                } catch  {}
+                await wait(200);
+            }
+            return tabActor;
+        }
+        async printHTML(consoleActor) {
+            if (!this.client) throw new Error('RDP client not initialized');
+            let lastError = null;
+            for(let attempt = 0; attempt < 3; attempt++){
+                let actorToUse = consoleActor;
+                try {
+                    if (this.currentTabActor && this.lastUrlToInspect) {
+                        const fresh = await this.resolveConsoleActor(this.currentTabActor, this.lastUrlToInspect);
+                        if (fresh) actorToUse = fresh;
                     }
-                    await this.cdpClient.navigateToUrl(this.currentTargetId, url);
-                }
-                if (!this.currentTargetId) throw new Error('Failed to get or create target');
-                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.tX());
-                this.currentSessionId = await this.cdpClient.attachToTarget(this.currentTargetId);
-                if ('development' === process.env.EXTENSION_ENV) {
-                    console.log(browsers_lib_messages.GR(this.currentSessionId));
-                    console.log(browsers_lib_messages.xR());
+                } catch  {}
+                try {
+                    const descriptor = this.currentTabActor || actorToUse;
+                    if (this.lastUrlToInspect) await this.ensureUrlAndReady(actorToUse, this.lastUrlToInspect);
+                    try {
+                        const currentUrl = await this.client.evaluate(actorToUse, 'String(location.href)');
+                        const currentTitle = await this.client.evaluate(actorToUse, 'String(document.title)');
+                        console.log(browsers_lib_messages.dI());
+                        console.log(browsers_lib_messages.Hd(`URL: ${currentUrl} | TITLE: ${currentTitle}`));
+                    } catch  {}
+                    const html = await this.client.getPageHTML(descriptor, actorToUse) || '';
+                    console.log(html);
+                    console.log(browsers_lib_messages.qX());
+                    return;
+                } catch (err) {
+                    lastError = err;
                 }
-                await this.cdpClient.sendCommand('Page.enable', {}, this.currentSessionId);
-                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages._y());
-                await this.cdpClient.waitForLoadEvent(this.currentSessionId);
-                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.Ak());
-                await this.cdpClient.waitForContentScriptInjection(this.currentSessionId);
-                const html = await this.cdpClient.getPageHTML(this.currentSessionId);
-                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.tg());
-                return html;
-            } catch (error) {
-                if ('development' === process.env.EXTENSION_ENV) console.error(browsers_lib_messages.L7(error.message));
-                throw error;
+                await wait(200);
             }
+            throw lastError || new Error(browsers_lib_messages.Cn());
         }
-        async startWatching(websocketServer) {
-            if ('development' !== process.env.EXTENSION_ENV) return;
-            if (this.isWatching) return void console.log(browsers_lib_messages.Li());
-            this.isWatching = true;
-            console.log(browsers_lib_messages.G9());
-            this.setupWebSocketHandler(websocketServer);
-            console.log(browsers_lib_messages.A4());
+        async waitForContentScriptInjection(consoleActor) {
+            if (!this.client) return;
+            const deadline = Date.now() + PAGE_READY_TIMEOUT_MS;
+            while(Date.now() < deadline){
+                try {
+                    const injected = await this.client.evaluate(consoleActor, `(() => {
+            const root = document.getElementById('extension-root');
+            if (!root || !root.shadowRoot) return false;
+            const html = root.shadowRoot.innerHTML || '';
+            return html.length > 0;
+          })()`);
+                    if (injected) return;
+                } catch  {}
+                await wait(200);
+            }
         }
         setupWebSocketHandler(websocketServer) {
-            if ('development' !== process.env.EXTENSION_ENV) return;
-            if (!websocketServer || !websocketServer.clients) return void console.warn(browsers_lib_messages.c9());
+            if (!websocketServer || !websocketServer.clients) return;
             websocketServer.clients.forEach((ws)=>{
-                this.setupConnectionHandler(ws);
+                this.attachConnection(ws);
             });
             websocketServer.on('connection', (ws)=>{
-                this.setupConnectionHandler(ws);
+                this.attachConnection(ws);
             });
         }
-        setupConnectionHandler(ws) {
-            if ('development' !== process.env.EXTENSION_ENV) return;
+        attachConnection(ws) {
             ws.on('message', async (data)=>{
                 try {
                     const message = JSON.parse(data);
                     if ('changedFile' === message.type && this.isWatching) await this.handleFileChange();
-                } catch (error) {}
+                } catch  {}
             });
         }
-        stopWatching() {
-            if ('development' !== process.env.EXTENSION_ENV) return;
-            this.isWatching = false;
-            console.log(browsers_lib_messages.aW());
-        }
         async handleFileChange() {
-            if ('development' !== process.env.EXTENSION_ENV) return;
-            if (!this.cdpClient || !this.currentSessionId) return void console.warn(browsers_lib_messages.ln());
+            if (!this.client || !this.currentConsoleActor) return;
             if (this.debounceTimer) clearTimeout(this.debounceTimer);
             this.debounceTimer = setTimeout(async ()=>{
                 try {
-                    console.log(browsers_lib_messages.ET());
-                    console.log(browsers_lib_messages.Tq());
-                    await this.cdpClient.waitForContentScriptInjection(this.currentSessionId);
-                    console.log(browsers_lib_messages.ov());
-                    const html = await this.cdpClient.getPageHTML(this.currentSessionId);
-                    this.printUpdatedHTML(html);
-                } catch (error) {
-                    console.error(browsers_lib_messages.QB(error.message));
-                    if (error.message.includes('session') || error.message.includes('target')) {
-                        console.log(browsers_lib_messages.Lf());
-                        await this.reconnectToTarget();
+                    if (this.currentTabActor && this.lastUrlToInspect) {
+                        const freshConsole = await this.resolveConsoleActor(this.currentTabActor, this.lastUrlToInspect);
+                        if (freshConsole) this.currentConsoleActor = freshConsole;
+                    }
+                    if (this.lastUrlToInspect) await this.ensureUrlAndReady(this.currentConsoleActor, this.lastUrlToInspect);
+                    await this.waitForContentScriptInjection(this.currentConsoleActor);
+                    let lastError = null;
+                    for(let attempt = 0; attempt < 3; attempt++){
+                        try {
+                            const descriptor = this.currentTabActor || this.currentConsoleActor;
+                            const html = await this.client.getPageHTML(descriptor, this.currentConsoleActor);
+                            console.log(browsers_lib_messages.dI());
+                            console.log(browsers_lib_messages.Hd("UPDATED - after content script injection"));
+                            console.log(html);
+                            console.log(browsers_lib_messages.qX());
+                            return;
+                        } catch (err) {
+                            lastError = err;
+                        }
+                        await wait(200);
                     }
+                    throw lastError || new Error('Failed to update HTML after retries');
+                } catch (err) {
+                    console.error(browsers_lib_messages.QB(err.message));
                 }
-            }, 300);
-        }
-        async reconnectToTarget() {
-            if ('development' !== process.env.EXTENSION_ENV) return;
-            try {
-                if (!this.cdpClient || !this.currentTargetId) return void console.warn(browsers_lib_messages.DQ());
-                console.log(browsers_lib_messages.S6());
-                this.currentSessionId = await this.cdpClient.attachToTarget(this.currentTargetId);
-                console.log(browsers_lib_messages.BK(this.currentSessionId));
-            } catch (error) {
-                console.error(browsers_lib_messages.w4(error.message));
-            }
-        }
-        printHTML(html) {
-            console.log(browsers_lib_messages.dI());
-            console.log(html);
-            console.log(browsers_lib_messages.qX());
-        }
-        printUpdatedHTML(html) {
-            if ('development' !== process.env.EXTENSION_ENV) return;
-            console.log(browsers_lib_messages.dI());
-            console.log(browsers_lib_messages.Hd("UPDATED - after content script injection"));
-            console.log(browsers_lib_messages.dI());
-            console.log(html);
-            console.log(browsers_lib_messages.qX());
-        }
-        async cleanup() {
-            try {
-                if ('development' === process.env.EXTENSION_ENV) this.stopWatching();
-                if (this.cdpClient && this.currentTargetId) await this.cdpClient.closeTarget(this.currentTargetId);
-                if (this.cdpClient) this.cdpClient.disconnect();
-                if ('development' === process.env.EXTENSION_ENV) console.log(browsers_lib_messages.S5());
-            } catch (error) {
-                if ('development' === process.env.EXTENSION_ENV) console.error(browsers_lib_messages.oP(error.message));
-            }
+            }, CHANGE_DEBOUNCE_MS);
         }
         apply(compiler) {
             if (!this.devOptions.source && !this.devOptions.watchSource) return;
-            compiler.hooks.done.tapAsync('plugin-reload:setup-chrome-inspection', async (stats, done)=>{
+            compiler.hooks.done.tapAsync('plugin-reload:setup-firefox-inspection', async (_stats, done)=>{
                 try {
-                    if (!this.isInitialized) await this.initialize();
-                    let urlToInspect;
-                    if (this.devOptions.source && 'string' == typeof this.devOptions.source && 'true' !== this.devOptions.source) urlToInspect = this.devOptions.source;
-                    else if (this.devOptions.startingUrl) urlToInspect = this.devOptions.startingUrl;
-                    else throw new Error(browsers_lib_messages.Ym());
-                    const html = await this.inspectSource(urlToInspect);
-                    this.printHTML(html);
+                    if (!this.initialized) await this.initialize();
+                    const urlToInspect = this.resolveUrlToInspect();
+                    this.lastUrlToInspect = urlToInspect;
+                    console.log(browsers_lib_messages.hm(urlToInspect));
+                    const { tabActor, consoleActor } = await this.selectActors(urlToInspect);
+                    this.currentTabActor = tabActor;
+                    await this.ensureNavigatedAndLoaded(urlToInspect, tabActor);
+                    const resolvedConsoleActor = await this.resolveConsoleActor(tabActor, urlToInspect);
+                    this.currentConsoleActor = resolvedConsoleActor || consoleActor;
+                    if (this.currentConsoleActor) {
+                        await this.waitForContentScriptInjection(this.currentConsoleActor);
+                        await this.printHTML(this.currentConsoleActor);
+                    }
                     const webSocketServer = compiler.options.webSocketServer;
-                    if (this.devOptions.watchSource && webSocketServer && 'development' === process.env.EXTENSION_ENV) this.startWatching(webSocketServer);
-                    done();
+                    if (this.devOptions.watchSource && webSocketServer && !this.isWatching) {
+                        this.isWatching = true;
+                        this.setupWebSocketHandler(webSocketServer);
+                    }
                 } catch (error) {
-                    if ('development' === process.env.EXTENSION_ENV) console.error(browsers_lib_messages.y4(error.message));
-                    done();
+                    console.error(browsers_lib_messages.y4(error.message));
                 }
+                done();
             });
         }
         constructor(devOptions){
-            setup_chrome_inspection_define_property(this, "devOptions", void 0);
-            setup_chrome_inspection_define_property(this, "cdpClient", null);
-            setup_chrome_inspection_define_property(this, "currentTargetId", null);
-            setup_chrome_inspection_define_property(this, "currentSessionId", null);
-            setup_chrome_inspection_define_property(this, "isInitialized", false);
+            setup_firefox_inspection_define_property(this, "devOptions", void 0);
+            setup_firefox_inspection_define_property(this, "client", null);
+            setup_firefox_inspection_define_property(this, "currentConsoleActor", null);
+            setup_firefox_inspection_define_property(this, "currentTabActor", null);
+            setup_firefox_inspection_define_property(this, "isWatching", false);
+            setup_firefox_inspection_define_property(this, "debounceTimer", null);
+            setup_firefox_inspection_define_property(this, "initialized", false);
+            setup_firefox_inspection_define_property(this, "lastUrlToInspect", null);
             this.devOptions = devOptions;
         }
     }