extension 3.17.0 → 3.18.0

package/dist/cli.cjs

@@ -455,8 +455,10 @@ var __webpack_modules__ = {
             $wD: ()=>bestEffortBannerPrintFailed,
             A9Y: ()=>firefoxLaunchCalled,
             AGJ: ()=>enhancedProcessManagementForceKill,
+            Ajw: ()=>safariDryRunXcodebuild,
             CYH: ()=>devChromiumDebugPort,
             Cny: ()=>chromeProcessError,
+            Csg: ()=>safariToolchainMissing,
             DhR: ()=>invalidGeckoBinaryPath,
             DyD: ()=>firefoxRdpRuntimeReinjectionResult,
             E8B: ()=>chromiumDryRunFlags,
@@ -465,10 +467,12 @@ var __webpack_modules__ = {
             F41: ()=>enhancedProcessManagementUncaughtException,
             FFz: ()=>cdpClientFoundTargets,
             FmF: ()=>connectionClosedError,
+            G3E: ()=>safariRequiresMacOS,
             GqE: ()=>locatingBrowser,
             HHw: ()=>messageWithoutSenderError,
             IhA: ()=>browserNotInstalledError,
             KK1: ()=>cdpProtocolEventHandlerError,
+            KP6: ()=>safariBuildCalled,
             LDU: ()=>firefoxDryRunBinary,
             M3V: ()=>cdpClientConnected,
             MGf: ()=>prettyPuppeteerInstallGuidance,
@@ -479,6 +483,8 @@ var __webpack_modules__ = {
             Nk3: ()=>chromiumDryRunNotLaunching,
             Q0p: ()=>chromiumDryRunBinary,
             Qiq: ()=>cdpClientLoadEventTimeout,
+            Qrh: ()=>safariFailed,
+            Rl_: ()=>safariBuilt,
             Spm: ()=>invalidChromiumBinaryPath,
             TFX: ()=>enhancedProcessManagementCleanupError,
             Ter: ()=>cdpClientTargetWebSocketUrlStored,
@@ -487,43 +493,54 @@ var __webpack_modules__ = {
             WVu: ()=>addonInstallError,
             XHr: ()=>enhancedProcessManagementTerminating,
             XOv: ()=>firefoxRdpClientTestingEvaluation,
+            Xiv: ()=>safariXcodeRequired,
             Z5i: ()=>cdpClientExtensionInfoFailed,
             _D4: ()=>browserLaunchError,
             aIt: ()=>devChromeProfilePath,
             bvI: ()=>cdpUnifiedExtensionLog,
             cD1: ()=>targetActorHasActiveRequestError,
+            cFJ: ()=>safariRebuilt,
             ccn: ()=>cdpClientExtensionReloadFailed,
             dNY: ()=>firefoxNoBinaryArgsFound,
             dkE: ()=>generalBrowserError,
             dwQ: ()=>devFirefoxProfilePath,
             eO_: ()=>firefoxInspectSourceNonFatal,
             e_P: ()=>runningInDevelopment,
+            fLj: ()=>safariDryRunConverter,
+            fOJ: ()=>safariNextSteps,
             fRy: ()=>cdpClientConnectionError,
+            fdc: ()=>safariRegistered,
+            fwU: ()=>safariOpening,
             hE8: ()=>cdpClientConnectionClosed,
             io8: ()=>emptyLine,
             ivb: ()=>firefoxBinaryArgsExtracted,
             jPE: ()=>rdpInvalidRequestPayload,
+            jRH: ()=>safariBuilding,
             jk4: ()=>requireGeckoBinaryForGeckoBased,
             k6b: ()=>firefoxDryRunConfig,
             l9J: ()=>parsingPacketError,
             lID: ()=>firefoxRdpReloadCapabilitySummary,
+            l_B: ()=>safariConverted,
             nek: ()=>requireChromiumBinaryForChromiumBased,
             nnm: ()=>chromeProcessExited,
             p8m: ()=>cdpClientAttachedToTarget,
             pdv: ()=>devFirefoxDebugPort,
             qNy: ()=>messagingClientClosedError,
+            qYJ: ()=>safariNotYetRegistered,
             qnG: ()=>firefoxDryRunNotLaunching,
             r0s: ()=>cdpPendingRejectFailed,
             sYQ: ()=>creatingUserProfile,
             sew: ()=>separatorLine,
             tUu: ()=>firefoxRdpClientFailedToGetMainHTML,
+            uKN: ()=>safariConverting,
             wXK: ()=>cdpAutoAttachSetupFailed,
             wk1: ()=>chromeFailedToSpawn,
             xlM: ()=>cdpClientExtensionLoadFailed,
             xxG: ()=>cdpFailedToHandleMessage,
             xyq: ()=>chromeInitializingEnhancedReload,
             y7j: ()=>skippingBrowserLaunchDueToCompileErrors,
-            yEr: ()=>cdpClientExtensionUnloadFailed
+            yEr: ()=>cdpClientExtensionUnloadFailed,
+            ycc: ()=>safariDryRunNotBuilding
         });
         var path__rspack_import_0 = __webpack_require__("path");
         var fs__rspack_import_1 = __webpack_require__("fs");
@@ -787,6 +804,63 @@ var __webpack_modules__ = {
         function firefoxDryRunConfig(cfg) {
             return `${getLoggingPrefix('info')} [browser] Config: ${pintor__rspack_import_4_default().gray(cfg)}`;
         }
+        function safariBuildCalled() {
+            return `${getLoggingPrefix('info')} Safari build requested.`;
+        }
+        function prettyPlatform(platform) {
+            if ('win32' === platform) return 'Windows';
+            if ('linux' === platform) return 'Linux';
+            return platform;
+        }
+        function safariRequiresMacOS(platform) {
+            return `${getLoggingPrefix('warn')} Safari extensions can only be built on macOS.\nDetected ${pintor__rspack_import_4_default().gray(prettyPlatform(platform))} — skipping Safari packaging. The web-extension build in ${pintor__rspack_import_4_default().yellow('dist/safari')} is still complete and can be packaged later on a Mac with Xcode.`;
+        }
+        function safariXcodeRequired(developerDir) {
+            const current = developerDir ? `${pintor__rspack_import_4_default().gray('Active toolchain:')} ${pintor__rspack_import_4_default().underline(developerDir)}` : `${pintor__rspack_import_4_default().gray('No active developer directory was found.')}`;
+            return `${getLoggingPrefix('error')} Safari packaging needs the full Xcode app (not just the Command Line Tools).\n${pintor__rspack_import_4_default().red('NOT FOUND')} ${pintor__rspack_import_4_default().underline('safari-web-extension-converter')}\n${current}\n\nTo enable Safari builds:\n- Install ${pintor__rspack_import_4_default().yellow('Xcode')} from the Mac App Store, then\n- Point the toolchain at it: ${pintor__rspack_import_4_default().blue('sudo xcode-select --switch')} ${pintor__rspack_import_4_default().gray('/Applications/Xcode.app')}\n- Finish setup once: ${pintor__rspack_import_4_default().blue('xcodebuild -runFirstLaunch')}\n\nPrefer to keep building now? Target another browser via ${pintor__rspack_import_4_default().blue('--browser')} ${pintor__rspack_import_4_default().gray('<chrome|edge|firefox>')}.`;
+        }
+        function safariToolchainMissing(tool) {
+            return `${getLoggingPrefix('error')} Safari packaging tool not found: ${pintor__rspack_import_4_default().underline(tool)}\nYour Xcode install looks incomplete. Try ${pintor__rspack_import_4_default().blue('xcodebuild -runFirstLaunch')}, or reinstall Xcode from the Mac App Store.`;
+        }
+        function safariConverting(extensionDir) {
+            return `${getLoggingPrefix('info')} Converting web extension into a Safari app project from ${pintor__rspack_import_4_default().underline(extensionDir)}`;
+        }
+        function safariConverted(projectDir) {
+            return `${getLoggingPrefix('success')} Generated Safari Xcode project at ${pintor__rspack_import_4_default().underline(projectDir)}`;
+        }
+        function safariBuilding(scheme) {
+            return `${getLoggingPrefix('info')} Building Safari app with xcodebuild (scheme: ${pintor__rspack_import_4_default().gray(scheme)})`;
+        }
+        function safariBuilt(appPath) {
+            return `${getLoggingPrefix('success')} Built Safari app at ${pintor__rspack_import_4_default().underline(appPath)}`;
+        }
+        function safariOpening(target) {
+            return `${getLoggingPrefix('info')} Opening ${pintor__rspack_import_4_default().underline(target)}`;
+        }
+        function safariFailed(error) {
+            return `${getLoggingPrefix('error')} Safari build failed:\n${pintor__rspack_import_4_default().red(errorDetail(error))}`;
+        }
+        function safariDryRunNotBuilding() {
+            return `${getLoggingPrefix('info')} [browser] Dry run: not building Safari app`;
+        }
+        function safariDryRunConverter(cmd) {
+            return `${getLoggingPrefix('info')} [browser] Converter: ${pintor__rspack_import_4_default().gray(cmd)}`;
+        }
+        function safariDryRunXcodebuild(cmd) {
+            return `${getLoggingPrefix('info')} [browser] xcodebuild: ${pintor__rspack_import_4_default().gray(cmd)}`;
+        }
+        function safariNextSteps(appName) {
+            return `${getLoggingPrefix('info')} One-time setup to load ${pintor__rspack_import_4_default().brightBlue(appName)} in Safari:\n  ${pintor__rspack_import_4_default().gray('1.')} Safari ▸ Settings ▸ Advanced ▸ check ${pintor__rspack_import_4_default().yellow('“Show features for web developers”')}\n  ${pintor__rspack_import_4_default().gray('2.')} Safari ▸ Develop ▸ ${pintor__rspack_import_4_default().yellow('Allow Unsigned Extensions')} ${pintor__rspack_import_4_default().gray('(resets each launch)')}\n  ${pintor__rspack_import_4_default().gray('3.')} Safari ▸ Settings ▸ Extensions ▸ turn on ${pintor__rspack_import_4_default().yellow(appName)}\n  ${pintor__rspack_import_4_default().gray('→')} The app window that just opened can also take you there.`;
+        }
+        function safariRegistered(appName) {
+            return `${getLoggingPrefix('success')} Safari recognizes ${pintor__rspack_import_4_default().brightBlue(appName)} — finish enabling it with the steps above.`;
+        }
+        function safariNotYetRegistered(appName) {
+            return `${getLoggingPrefix('warn')} Safari hasn't picked up ${pintor__rspack_import_4_default().brightBlue(appName)} yet. Open the app once, then check Safari ▸ Settings ▸ Extensions.`;
+        }
+        function safariRebuilt(appName) {
+            return `${getLoggingPrefix('success')} Rebuilt ${pintor__rspack_import_4_default().brightBlue(appName)} — reload the page (or toggle the extension) in Safari to see changes.`;
+        }
         function cdpClientFoundTargets(count) {
             return `${getLoggingPrefix('info')} Chrome found ${pintor__rspack_import_4_default().gray(count.toString())} targets`;
         }
@@ -999,6 +1073,7 @@ var __webpack_modules__ = {
         function managedBrowserCacheEnv(cacheRoot, browser) {
             const root = String(cacheRoot || '').trim();
             if (!root) return {};
+            if ('safari' === browser || 'webkit-based' === browser) return {};
             if ('chrome' === browser) return {
                 PUPPETEER_CACHE_DIR: path__rspack_import_1.join(root, 'chrome', 'chrome')
             };
@@ -1034,19 +1109,13 @@ var __webpack_modules__ = {
                 const versionDirs = entries.filter((entry)=>entry.isDirectory() && versionDirPattern.test(entry.name)).map((entry)=>path__rspack_import_1.join(root, entry.name));
                 for (const dir of versionDirs)candidateFiles.push(...buildCandidates(dir, browser));
             } catch  {}
-            let matched = false;
             for (const candidate of candidateFiles)try {
-                if (candidate && fs__rspack_import_0.existsSync(candidate)) {
-                    matched = true;
-                    return candidate;
-                }
+                if (candidate && fs__rspack_import_0.existsSync(candidate)) return candidate;
             } catch  {}
-            if (!matched) {
-                const names = executableNamesFor(browser);
-                for (const root of scanRoots){
-                    const found = findExecutableUnder(root, names, 6);
-                    if (found) return found;
-                }
+            const names = executableNamesFor(browser);
+            for (const root of scanRoots){
+                const found = findExecutableUnder(root, names, 6);
+                if (found) return found;
             }
             return null;
         }
@@ -1224,7 +1293,8 @@ var __webpack_modules__ = {
             RE: ()=>markManagedEphemeralProfile,
             aY: ()=>findAvailablePortNear,
             jl: ()=>deriveDebugPortWithInstance,
-            ov: ()=>filterBrowserFlags
+            ov: ()=>filterBrowserFlags,
+            sW: ()=>removeManagedEphemeralProfile
         });
         var fs__rspack_import_0 = __webpack_require__("fs");
         var os__rspack_import_1 = __webpack_require__("os");
@@ -1342,6 +1412,18 @@ var __webpack_modules__ = {
                 fs__rspack_import_0.writeFileSync(path__rspack_import_2.join(profilePath, MANAGED_EPHEMERAL_PROFILE_MARKER), 'managed-ephemeral-profile\n', 'utf8');
             } catch  {}
         }
+        function removeManagedEphemeralProfile(profilePath) {
+            try {
+                if (!profilePath) return;
+                if ('dev' === path__rspack_import_2.basename(profilePath)) return;
+                const markerPath = path__rspack_import_2.join(profilePath, MANAGED_EPHEMERAL_PROFILE_MARKER);
+                if (!fs__rspack_import_0.existsSync(markerPath)) return;
+                fs__rspack_import_0.rmSync(profilePath, {
+                    recursive: true,
+                    force: true
+                });
+            } catch  {}
+        }
         function cleanupOldTempProfiles(baseDir, excludeBasename, maxAgeHours = 12) {
             try {
                 if (!fs__rspack_import_0.existsSync(baseDir)) return;
@@ -1372,6 +1454,37 @@ var __webpack_modules__ = {
             } catch  {}
         }
     },
+    "./browsers/browsers-lib/wsl-support.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+        __webpack_require__.d(__webpack_exports__, {
+            EV: ()=>isWslEnv,
+            f7: ()=>normalizeBinaryPathForWsl,
+            qc: ()=>hasGuiDisplay
+        });
+        var os__rspack_import_0 = __webpack_require__("os");
+        function isWslEnv() {
+            if ('linux' !== process.platform) return false;
+            const hasWslEnv = Boolean(String(process.env.WSL_DISTRO_NAME || '').trim() || String(process.env.WSL_INTEROP || '').trim() || String(process.env.WSLENV || '').trim());
+            if (hasWslEnv) return true;
+            return /microsoft/i.test(os__rspack_import_0.release());
+        }
+        function hasGuiDisplay() {
+            const display = String(process.env.DISPLAY || '').trim();
+            const waylandDisplay = String(process.env.WAYLAND_DISPLAY || '').trim();
+            return display.length > 0 || waylandDisplay.length > 0;
+        }
+        function normalizeBinaryPathForWsl(input) {
+            let value = String(input || '').trim();
+            if (!value) return value;
+            if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
+            if (!isWslEnv()) return value;
+            if (/^[a-zA-Z]:[\\/]/.test(value)) {
+                const drive = value[0].toLowerCase();
+                const rest = value.slice(2).replace(/\\/g, '/').replace(/^\/+/, '');
+                return `/mnt/${drive}/${rest}`;
+            }
+            return value;
+        }
+    },
     "./browsers/index.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
             launchBrowser: ()=>launchBrowser
@@ -1897,7 +2010,9 @@ var __webpack_modules__ = {
                 '--disable-dev-shm-usage'
             ];
             const baseFlags = [
-                `--load-extension=${extensionsToLoad.join()}`,
+                ...extensionsToLoad.length ? [
+                    `--load-extension=${extensionsToLoad.join()}`
+                ] : [],
                 ...userProfilePath ? [
                     `--user-data-dir=${userProfilePath}`
                 ] : [],
@@ -1914,53 +2029,81 @@ var __webpack_modules__ = {
             return baseFlags;
         }
         var external_child_process_ = __webpack_require__("child_process");
-        function setupProcessSignalHandlers(browser, child, cleanupInstance) {
-            const cleanup = ()=>{
-                try {
-                    if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.VkK(browser));
-                    if (child && !child.killed) {
-                        if ('win32' === process.platform) try {
-                            (0, external_child_process_.spawn)('taskkill', [
-                                '/PID',
-                                String(child.pid),
-                                '/T',
-                                '/F'
-                            ], {
-                                stdio: 'ignore',
-                                windowsHide: true
-                            }).on('error', ()=>{});
-                        } catch  {}
-                        if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.XHr(browser));
-                        child.kill('SIGTERM');
-                        setTimeout(()=>{
-                            if (child && !child.killed) {
-                                if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.AGJ(browser));
-                                child.kill('SIGKILL');
-                            }
-                        }, 5000);
-                    }
-                    cleanupInstance();
-                } catch (error) {
-                    console.error(messages.TFX(browser, error));
+        const activeInstances = new Set();
+        let globalHandlersInstalled = false;
+        function cleanupOne(instance) {
+            if (instance.isCleaningUp) return;
+            instance.isCleaningUp = true;
+            const { browser, child, cleanupInstance } = instance;
+            try {
+                if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.VkK(browser));
+                if (child && !child.killed) {
+                    if ('win32' === process.platform) try {
+                        (0, external_child_process_.spawn)('taskkill', [
+                            '/PID',
+                            String(child.pid),
+                            '/T',
+                            '/F'
+                        ], {
+                            stdio: 'ignore',
+                            windowsHide: true
+                        }).on('error', ()=>{});
+                    } catch  {}
+                    if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.XHr(browser));
+                    child.kill('SIGTERM');
+                    const killTimer = setTimeout(()=>{
+                        if (child && !child.killed) {
+                            if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.AGJ(browser));
+                            child.kill('SIGKILL');
+                        }
+                    }, 5000);
+                    killTimer.unref?.();
                 }
-            };
-            process.on('SIGINT', cleanup);
-            process.on('SIGTERM', cleanup);
-            process.on('SIGHUP', cleanup);
-            process.on('exit', cleanup);
+                cleanupInstance();
+            } catch (error) {
+                console.error(messages.TFX(browser, error));
+            }
+        }
+        function cleanupAll() {
+            for (const instance of activeInstances)cleanupOne(instance);
+        }
+        function firstBrowserLabel() {
+            for (const instance of activeInstances)return instance.browser;
+            return 'chrome';
+        }
+        function installGlobalHandlersOnce() {
+            if (globalHandlersInstalled) return;
+            globalHandlersInstalled = true;
+            process.on('SIGINT', cleanupAll);
+            process.on('SIGTERM', cleanupAll);
+            process.on('SIGHUP', cleanupAll);
+            process.on('exit', cleanupAll);
             process.on('uncaughtException', (error)=>{
                 if (isBenignSocketTeardown(error)) return;
-                console.error(messages.F41(browser, error));
-                cleanup();
+                console.error(messages.F41(firstBrowserLabel(), error));
+                cleanupAll();
                 process.exit(1);
             });
             process.on('unhandledRejection', (reason)=>{
                 if (isBenignSocketTeardown(reason)) return;
-                console.error(messages.N4O(browser, reason));
-                cleanup();
+                console.error(messages.N4O(firstBrowserLabel(), reason));
+                cleanupAll();
                 process.exit(1);
             });
         }
+        function setupProcessSignalHandlers(browser, child, cleanupInstance) {
+            const instance = {
+                browser,
+                child,
+                cleanupInstance,
+                isCleaningUp: false
+            };
+            activeInstances.add(instance);
+            installGlobalHandlersOnce();
+            return ()=>{
+                activeInstances.delete(instance);
+            };
+        }
         const BENIGN_SOCKET_ERROR_CODES = new Set([
             'ECONNRESET',
             'EPIPE',
@@ -1980,18 +2123,7 @@ var __webpack_modules__ = {
         }
         var extension_output_path = __webpack_require__("./browsers/run-chromium/chromium-launch/extension-output-path.ts");
         var manifest_readiness = __webpack_require__("./browsers/run-chromium/manifest-readiness.ts");
-        var external_os_ = __webpack_require__("os");
-        function isWslEnv() {
-            if ('linux' !== process.platform) return false;
-            const hasWslEnv = Boolean(String(process.env.WSL_DISTRO_NAME || '').trim() || String(process.env.WSL_INTEROP || '').trim() || String(process.env.WSLENV || '').trim());
-            if (hasWslEnv) return true;
-            return /microsoft/i.test(external_os_.release());
-        }
-        function hasGuiDisplay() {
-            const display = String(process.env.DISPLAY || '').trim();
-            const waylandDisplay = String(process.env.WAYLAND_DISPLAY || '').trim();
-            return display.length > 0 || waylandDisplay.length > 0;
-        }
+        var wsl_support = __webpack_require__("./browsers/browsers-lib/wsl-support.ts");
         const LINUX_BROWSER_PATHS = {
             chrome: [
                 '/opt/google/chrome/chrome',
@@ -2014,7 +2146,7 @@ var __webpack_modules__ = {
             ]
         };
         function resolveWslLinuxBinary(browser) {
-            if (!isWslEnv() || !hasGuiDisplay()) return null;
+            if (!(0, wsl_support.EV)() || !(0, wsl_support.qc)()) return null;
             const candidates = LINUX_BROWSER_PATHS[browser] || LINUX_BROWSER_PATHS['chrome'];
             for (const candidate of candidates)if (external_fs_.existsSync(candidate)) return candidate;
             return null;
@@ -2036,26 +2168,14 @@ var __webpack_modules__ = {
         }
         function preferRealChromeBinary(binary) {
             if (!binary) return binary || null;
-            if (!isWslEnv() || !hasGuiDisplay()) return binary;
+            if (!(0, wsl_support.EV)() || !(0, wsl_support.qc)()) return binary;
             if (!looksLikeChromeWrapperScript(binary)) return binary;
             const realBinary = '/opt/google/chrome/chrome';
             if (external_fs_.existsSync(realBinary)) return realBinary;
             return binary;
         }
-        function normalizeBinaryPathForWsl(input) {
-            let value = String(input || '').trim();
-            if (!value) return value;
-            if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
-            if (!isWslEnv()) return value;
-            if (/^[a-zA-Z]:[\\/]/.test(value)) {
-                const drive = value[0].toLowerCase();
-                const rest = value.slice(2).replace(/\\/g, '/').replace(/^\/+/, '');
-                return `/mnt/${drive}/${rest}`;
-            }
-            return value;
-        }
         function resolveWslWindowsBinary(browser) {
-            if (!isWslEnv()) return null;
+            if (!(0, wsl_support.EV)()) return null;
             const chromeCandidates = [
                 '/mnt/c/Program Files/Google/Chrome/Application/chrome.exe',
                 '/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe'
@@ -2106,7 +2226,7 @@ var __webpack_modules__ = {
             try {
                 return await spawnOnce(binary);
             } catch (error) {
-                if (isWslEnv()) {
+                if ((0, wsl_support.EV)()) {
                     const fallback = resolveWslWindowsBinary(browser);
                     if (fallback && fallback !== binary) {
                         logger?.warn?.('[browser] WSL detected: retrying with Windows browser binary.');
@@ -2185,7 +2305,7 @@ var __webpack_modules__ = {
                 let printedGuidance = false;
                 const normalizePath = (p)=>{
                     if (!p) return null;
-                    const normalized = normalizeBinaryPathForWsl(p);
+                    const normalized = (0, wsl_support.f7)(p);
                     return normalized || null;
                 };
                 const isUsableBinary = (p)=>Boolean(p && external_fs_.existsSync(p));
@@ -2214,7 +2334,7 @@ var __webpack_modules__ = {
                 };
                 browserBinaryLocation = resolveManagedBinary();
                 let skipDetection = Boolean(browserBinaryLocation);
-                if (!browserBinaryLocation && isWslEnv()) {
+                if (!browserBinaryLocation && (0, wsl_support.EV)()) {
                     const linuxFallback = resolveWslLinuxBinary(browser);
                     if (linuxFallback) {
                         browserBinaryLocation = linuxFallback;
@@ -2262,7 +2382,7 @@ var __webpack_modules__ = {
                             if (!located) throw new Error(getInstallGuidanceText('chrome'));
                             const normalized = normalizePath(located || null);
                             if (isUsableBinary(normalized)) {
-                                if (looksOfficialChromeBinaryPath(normalized) && !isWslEnv()) {
+                                if (looksOfficialChromeBinaryPath(normalized) && !(0, wsl_support.EV)()) {
                                     printInstallGuidance(getInstallGuidanceText('chrome'), browser);
                                     return null;
                                 }
@@ -2276,7 +2396,7 @@ var __webpack_modules__ = {
                             }) || null;
                             const normalized = normalizePath(candidate || null);
                             if (normalized) {
-                                if (looksOfficialChromeBinaryPath(normalized) && !isWslEnv()) {
+                                if (looksOfficialChromeBinaryPath(normalized) && !(0, wsl_support.EV)()) {
                                     printInstallGuidance(getInstallGuidanceText('chrome'), browser);
                                     candidate = null;
                                 }
@@ -2500,7 +2620,7 @@ var __webpack_modules__ = {
                     'pipe',
                     'pipe'
                 ] : 'ignore';
-                const normalizedBinary = normalizeBinaryPathForWsl(binary);
+                const normalizedBinary = (0, wsl_support.f7)(binary);
                 try {
                     const child = await spawnChromiumProcess({
                         binary: normalizedBinary,
@@ -2510,13 +2630,17 @@ var __webpack_modules__ = {
                         logger: this.logger
                     });
                     if ('true' === process.env.EXTENSION_AUTHOR_MODE) this.logger.debug?.('[browser] Final Chrome flags:', launchArgs.join(' '));
+                    let disposeSignalHandlers;
                     child.on('close', (code)=>{
                         if ('true' === process.env.EXTENSION_AUTHOR_MODE) this.logger.info(messages.nnm(code || 0));
+                        disposeSignalHandlers?.();
+                        const userDataDir = launchArgs.find((arg)=>arg.startsWith('--user-data-dir='))?.slice('--user-data-dir='.length).replace(/^"|"$/g, '');
+                        shared_utils.sW(userDataDir);
                     });
                     child.on('error', (error)=>{
                         this.logger.error(messages.Cny(error));
                     });
-                    setupProcessSignalHandlers(this.options?.browser, child, ()=>{});
+                    disposeSignalHandlers = setupProcessSignalHandlers(this.options?.browser, child, ()=>{});
                     return child;
                 } catch (error) {
                     this.logger.error(messages.wk1(error));
@@ -2830,65 +2954,88 @@ var __webpack_modules__ = {
         var ready_message = __webpack_require__("./browsers/browsers-lib/ready-message.ts");
         var runtime_options = __webpack_require__("./browsers/browsers-lib/runtime-options.ts");
         var external_child_process_ = __webpack_require__("child_process");
-        function setupFirefoxProcessHandlers(browser, childRef, cleanupInstance) {
-            let isCleaningUp = false;
-            const attemptCleanup = async ()=>{
-                if (isCleaningUp) return;
-                isCleaningUp = true;
-                try {
-                    if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.VkK(browser));
-                    const child = childRef();
-                    if (child && !child.killed) {
-                        if ('win32' === process.platform) try {
-                            (0, external_child_process_.spawn)('taskkill', [
-                                '/PID',
-                                String(child.pid),
-                                '/T',
-                                '/F'
-                            ], {
-                                stdio: 'ignore',
-                                windowsHide: true
-                            }).on('error', ()=>{});
-                        } catch  {}
-                        if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.XHr(browser));
-                        child.kill('SIGTERM');
-                        setTimeout(()=>{
-                            if (child && !child.killed) {
-                                if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.AGJ(browser));
-                                child.kill('SIGKILL');
-                            }
-                        }, 5000);
-                    }
-                    await cleanupInstance();
-                } catch (error) {
-                    console.error(messages.TFX(browser, error));
+        const activeInstances = new Set();
+        let globalHandlersInstalled = false;
+        async function attemptCleanup(instance) {
+            if (instance.isCleaningUp) return;
+            instance.isCleaningUp = true;
+            const { browser, childRef, cleanupInstance } = instance;
+            try {
+                if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.VkK(browser));
+                const child = childRef();
+                if (child && !child.killed) {
+                    if ('win32' === process.platform) try {
+                        (0, external_child_process_.spawn)('taskkill', [
+                            '/PID',
+                            String(child.pid),
+                            '/T',
+                            '/F'
+                        ], {
+                            stdio: 'ignore',
+                            windowsHide: true
+                        }).on('error', ()=>{});
+                    } catch  {}
+                    if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.XHr(browser));
+                    child.kill('SIGTERM');
+                    const killTimer = setTimeout(()=>{
+                        if (child && !child.killed) {
+                            if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.AGJ(browser));
+                            child.kill('SIGKILL');
+                        }
+                    }, 5000);
+                    killTimer.unref?.();
                 }
-            };
-            const onExit = ()=>{
-                attemptCleanup();
-            };
-            process.on('exit', onExit);
-            const onSignal = ()=>{
-                attemptCleanup();
-            };
-            process.on('SIGINT', onSignal);
-            process.on('SIGTERM', onSignal);
-            process.on('SIGHUP', onSignal);
-            process.on('SIGBREAK', onSignal);
-            process.on('beforeExit', onSignal);
+                await cleanupInstance();
+            } catch (error) {
+                console.error(messages.TFX(browser, error));
+            }
+        }
+        function cleanupAllInstances() {
+            for (const instance of activeInstances)attemptCleanup(instance);
+        }
+        function firstBrowserLabel() {
+            for (const instance of activeInstances)return instance.browser;
+            return 'firefox';
+        }
+        function installGlobalHandlersOnce() {
+            if (globalHandlersInstalled) return;
+            globalHandlersInstalled = true;
+            process.on('exit', cleanupAllInstances);
+            process.on('SIGINT', cleanupAllInstances);
+            process.on('SIGTERM', cleanupAllInstances);
+            process.on('SIGHUP', cleanupAllInstances);
+            process.on('SIGBREAK', cleanupAllInstances);
+            process.on('beforeExit', cleanupAllInstances);
             process.on('uncaughtException', async (error)=>{
                 if (isBenignSocketTeardown(error)) return;
-                console.error(messages.F41(browser, error));
-                await attemptCleanup();
+                console.error(messages.F41(firstBrowserLabel(), error));
+                await Promise.all([
+                    ...activeInstances
+                ].map((i)=>attemptCleanup(i)));
                 process.exit(1);
             });
             process.on('unhandledRejection', async (reason)=>{
                 if (isBenignSocketTeardown(reason)) return;
-                console.error(messages.N4O(browser, reason));
-                await attemptCleanup();
+                console.error(messages.N4O(firstBrowserLabel(), reason));
+                await Promise.all([
+                    ...activeInstances
+                ].map((i)=>attemptCleanup(i)));
                 process.exit(1);
             });
         }
+        function setupFirefoxProcessHandlers(browser, childRef, cleanupInstance) {
+            const instance = {
+                browser,
+                childRef,
+                cleanupInstance,
+                isCleaningUp: false
+            };
+            activeInstances.add(instance);
+            installGlobalHandlersOnce();
+            return ()=>{
+                activeInstances.delete(instance);
+            };
+        }
         const BENIGN_SOCKET_ERROR_CODES = new Set([
             'ECONNRESET',
             'EPIPE',
@@ -2951,6 +3098,10 @@ var __webpack_modules__ = {
             else obj[key] = value;
             return obj;
         }
+        function rdpRequestTimeoutMs() {
+            const raw = parseInt(String(process.env.EXTENSION_RDP_REQUEST_TIMEOUT_MS || ''), 10);
+            return Number.isFinite(raw) && raw > 0 ? raw : 30000;
+        }
         class RdpTransport extends external_events_default() {
             async connect(port, host = '127.0.0.1') {
                 await new Promise((resolve, reject)=>{
@@ -2980,7 +3131,10 @@ var __webpack_modules__ = {
                 this.rejectAll(err);
             }
             rejectAll(error) {
-                for (const d of this.active.values())d.reject(error);
+                for (const entry of this.active.values()){
+                    if (entry.timer) clearTimeout(entry.timer);
+                    entry.deferred.reject(error);
+                }
                 this.active.clear();
                 for (const { deferred } of this.pending)deferred.reject(error);
                 this.pending = [];
@@ -3006,7 +3160,10 @@ var __webpack_modules__ = {
             flush() {
                 this.pending = this.pending.filter(({ to, payload, deferred })=>{
                     if (this.active.has(to)) return true;
-                    if (!this.conn) throw new Error(messages.FmF('firefox'));
+                    if (!this.conn) {
+                        deferred.reject(new Error(messages.FmF('firefox')));
+                        return false;
+                    }
                     try {
                         this.conn.write(buildRdpFrame(payload));
                         this.expectReply(to, deferred);
@@ -3018,7 +3175,19 @@ var __webpack_modules__ = {
             }
             expectReply(to, deferred) {
                 if (this.active.has(to)) throw new Error(messages.cD1('firefox', to));
-                this.active.set(to, deferred);
+                const timeoutMs = rdpRequestTimeoutMs();
+                const timer = setTimeout(()=>{
+                    const entry = this.active.get(to);
+                    if (!entry) return;
+                    this.active.delete(to);
+                    entry.deferred.reject(new Error(`RDP request to "${to}" timed out after ${timeoutMs}ms`));
+                    this.flush();
+                }, timeoutMs);
+                timer.unref?.();
+                this.active.set(to, {
+                    deferred,
+                    timer
+                });
             }
             onData(buf) {
                 this.incoming = Buffer.concat([
@@ -3041,17 +3210,19 @@ var __webpack_modules__ = {
             }
             handleMessage(message) {
                 if (!message.from) return void this.emit('error', new Error(messages.HHw('firefox', message)));
-                const deferred = this.active.get(message.from);
-                if (deferred) {
+                const entry = this.active.get(message.from);
+                if (entry) {
                     this.active.delete(message.from);
-                    if (message.error) deferred.reject(message);
-                    else deferred.resolve(message);
+                    if (entry.timer) clearTimeout(entry.timer);
+                    if (message.error) entry.deferred.reject(message);
+                    else entry.deferred.resolve(message);
                     this.flush();
                     return;
                 }
                 this.emit('message', message);
             }
             onEnd() {
+                this.rejectAll(new Error(messages.qNy('firefox')));
                 this.emit('end');
             }
             onTimeout() {
@@ -3473,6 +3644,7 @@ var __webpack_modules__ = {
             } catch  {}
             return merged;
         }
+        const GET_PAGE_HTML_WITH_SHADOW_EXPRESSION = "(() => { try { var selector = '#extension-root,[data-extension-root]:not([data-extension-root=\"extension-js-devtools\"])'; var serializeShadowRoot = function(shadowRoot, serializer) { if (!shadowRoot) return ''; var stylesheetCss = Array.from(shadowRoot.styleSheets || []).map(function(sheet) { try { return Array.from(sheet.cssRules || []).map(function(rule) { return String(rule.cssText || ''); }).join('\\n'); } catch (e) { return ''; } }).filter(Boolean).join('\\n'); var adoptedCss = Array.from(shadowRoot.adoptedStyleSheets || []).map(function(sheet) { try { return Array.from(sheet.cssRules || []).map(function(rule) { return String(rule.cssText || ''); }).join('\\n'); } catch (e) { return ''; } }).filter(Boolean).join('\\n'); var stylesheetMarkup = stylesheetCss ? '<style>' + stylesheetCss + '</style>' : ''; var adoptedMarkup = adoptedCss ? '<style>' + adoptedCss + '</style>' : ''; var childMarkup = Array.from(shadowRoot.childNodes || []).map(function(node) { try { if (node && node.nodeType === 1 && String(node.nodeName || '').toLowerCase() === 'style') { return '<style>' + String(node.textContent || '') + '</style>'; } return serializer.serializeToString(node); } catch (e) { return ''; } }).join(''); return stylesheetMarkup + adoptedMarkup + childMarkup; }; var cloned = document.documentElement.cloneNode(true); var clonedHosts = Array.from(cloned.querySelectorAll(selector)); var liveHosts = Array.from(document.querySelectorAll(selector)); if (!clonedHosts.length) { var body = cloned.querySelector('body') || cloned; var newRoot = document.createElement('div'); newRoot.id='extension-root'; body.appendChild(newRoot); clonedHosts = [newRoot]; } var s = new XMLSerializer(); for (var i = 0; i < clonedHosts.length; i++) { var host = clonedHosts[i]; var live = liveHosts[i]; var shadow = ''; try { if (live && live.shadowRoot) { shadow = serializeShadowRoot(live.shadowRoot, s); } } catch (e) {} try { host.innerHTML = shadow; } catch (e) {} } return String('<!DOCTYPE html>' + (cloned.outerHTML || document.documentElement.outerHTML)); } catch(e) { try { return String(document.documentElement.outerHTML); } catch(_) { return '' } } })()";
         function messaging_client_define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -3562,11 +3734,7 @@ var __webpack_modules__ = {
                 }
             }
             async addTab(url) {
-                try {
-                    return await addTab(this.transport, url);
-                } catch (e) {
-                    throw e;
-                }
+                return addTab(this.transport, url);
             }
             async navigateViaScript(consoleActor, url) {
                 await navigateViaScript(this.transport, consoleActor, url);
@@ -3624,7 +3792,7 @@ var __webpack_modules__ = {
                 const shadowContent = await this.extractShadowContent(actorToUse);
                 if (!shadowContent) return mainHTML;
                 try {
-                    const mergedResp = await this.evaluateRaw(actorToUse, "(() => { try { var selector = '#extension-root,[data-extension-root]:not([data-extension-root=\"extension-js-devtools\"])'; var serializeShadowRoot = function(shadowRoot, serializer) { if (!shadowRoot) return ''; var stylesheetCss = Array.from(shadowRoot.styleSheets || []).map(function(sheet) { try { return Array.from(sheet.cssRules || []).map(function(rule) { return String(rule.cssText || ''); }).join('\\n'); } catch (e) { return ''; } }).filter(Boolean).join('\\n'); var adoptedCss = Array.from(shadowRoot.adoptedStyleSheets || []).map(function(sheet) { try { return Array.from(sheet.cssRules || []).map(function(rule) { return String(rule.cssText || ''); }).join('\\n'); } catch (e) { return ''; } }).filter(Boolean).join('\\n'); var stylesheetMarkup = stylesheetCss ? '<style>' + stylesheetCss + '</style>' : ''; var adoptedMarkup = adoptedCss ? '<style>' + adoptedCss + '</style>' : ''; var childMarkup = Array.from(shadowRoot.childNodes || []).map(function(node) { try { if (node && node.nodeType === 1 && String(node.nodeName || '').toLowerCase() === 'style') { return '<style>' + String(node.textContent || '') + '</style>'; } return serializer.serializeToString(node); } catch (e) { return ''; } }).join(''); return stylesheetMarkup + adoptedMarkup + childMarkup; }; var cloned = document.documentElement.cloneNode(true); var clonedHosts = Array.from(cloned.querySelectorAll(selector)); var liveHosts = Array.from(document.querySelectorAll(selector)); if (!clonedHosts.length) { var body = cloned.querySelector('body') || cloned; var newRoot = document.createElement('div'); newRoot.id='extension-root'; body.appendChild(newRoot); clonedHosts = [newRoot]; } var s = new XMLSerializer(); for (var i = 0; i < clonedHosts.length; i++) { var host = clonedHosts[i]; var live = liveHosts[i]; var shadow = ''; try { if (live && live.shadowRoot) { shadow = serializeShadowRoot(live.shadowRoot, s); } } catch (e) {} try { host.innerHTML = shadow; } catch (e) {} } return String('<!DOCTYPE html>' + (cloned.outerHTML || document.documentElement.outerHTML)); } catch(e) { try { return String(document.documentElement.outerHTML); } catch(_) { return '' } } })()");
+                    const mergedResp = await this.evaluateRaw(actorToUse, GET_PAGE_HTML_WITH_SHADOW_EXPRESSION);
                     const mergedHtml = await this.coerceResponseToString(actorToUse, mergedResp, {
                         fallbackToFullDocument: false
                     });
@@ -3736,7 +3904,8 @@ var __webpack_modules__ = {
             console.log(JSON.stringify(event));
         }
         function resolveAddonDirectory(baseDir, inputPath) {
-            let candidate = inputPath.replace(/\"/g, '');
+            let candidate = inputPath.trim();
+            if (candidate.startsWith('"') && candidate.endsWith('"') || candidate.startsWith("'") && candidate.endsWith("'")) candidate = candidate.slice(1, -1);
             if (!external_path_.isAbsolute(candidate)) candidate = external_path_.resolve(baseDir, candidate);
             try {
                 const stat = external_fs_.statSync(candidate);
@@ -3978,7 +4147,7 @@ var __webpack_modules__ = {
             const shadowContent = await client.extractShadowContent?.(descriptorActor);
             if (!shadowContent) return mainHTML;
             try {
-                const mergedResp = await client.evaluateRaw(descriptorActor, "(() => { try { var selector = '#extension-root,[data-extension-root]:not([data-extension-root=\"extension-js-devtools\"])'; var serializeShadowRoot = function(shadowRoot, serializer) { if (!shadowRoot) return ''; var stylesheetCss = Array.from(shadowRoot.styleSheets || []).map(function(sheet) { try { return Array.from(sheet.cssRules || []).map(function(rule) { return String(rule.cssText || ''); }).join('\\n'); } catch (e) { return ''; } }).filter(Boolean).join('\\n'); var adoptedCss = Array.from(shadowRoot.adoptedStyleSheets || []).map(function(sheet) { try { return Array.from(sheet.cssRules || []).map(function(rule) { return String(rule.cssText || ''); }).join('\\n'); } catch (e) { return ''; } }).filter(Boolean).join('\\n'); var stylesheetMarkup = stylesheetCss ? '<style>' + stylesheetCss + '</style>' : ''; var adoptedMarkup = adoptedCss ? '<style>' + adoptedCss + '</style>' : ''; var childMarkup = Array.from(shadowRoot.childNodes || []).map(function(node) { try { if (node && node.nodeType === 1 && String(node.nodeName || '').toLowerCase() === 'style') { return '<style>' + String(node.textContent || '') + '</style>'; } return serializer.serializeToString(node); } catch (e) { return ''; } }).join(''); return stylesheetMarkup + adoptedMarkup + childMarkup; }; var cloned = document.documentElement.cloneNode(true); var clonedHosts = Array.from(cloned.querySelectorAll(selector)); var liveHosts = Array.from(document.querySelectorAll(selector)); if (!clonedHosts.length) { var body = cloned.querySelector('body') || cloned; var newRoot = document.createElement('div'); newRoot.id='extension-root'; body.appendChild(newRoot); clonedHosts = [newRoot]; } var s = new XMLSerializer(); for (var i = 0; i < clonedHosts.length; i++) { var host = clonedHosts[i]; var live = liveHosts[i]; var shadow = ''; try { if (live && live.shadowRoot) { shadow = serializeShadowRoot(live.shadowRoot, s); } } catch (e) {} try { host.innerHTML = shadow; } catch (e) {} } return String('<!DOCTYPE html>' + (cloned.outerHTML || document.documentElement.outerHTML)); } catch(e) { try { return String(document.documentElement.outerHTML); } catch(_) { return '' } } })()");
+                const mergedResp = await client.evaluateRaw(descriptorActor, GET_PAGE_HTML_WITH_SHADOW_EXPRESSION);
                 const mergedHtml = await client.coerceResponseToString?.(descriptorActor, mergedResp, {
                     fallbackToFullDocument: false
                 });
@@ -4694,8 +4863,6 @@ var __webpack_modules__ = {
             if (profilePath) parts.splice(1, 0, `--profile="${profilePath}"`);
             return parts.join(' ');
         }
-        const external_util_namespaceObject = require("util");
-        const execFile = (0, external_util_namespaceObject.promisify)(external_child_process_.execFile);
         function parseFlatpakBinary(binary) {
             if (!binary || !binary.startsWith('flatpak:')) return null;
             const appId = binary.substring(8).trim();
@@ -4747,57 +4914,20 @@ var __webpack_modules__ = {
                     args
                 };
             }
-            static async validateFirefoxBinary(binaryPath) {
-                try {
-                    const { stdout } = await execFile(binaryPath, [
-                        '--version'
-                    ]);
-                    const version = stdout.trim();
-                    return {
-                        version,
-                        path: binaryPath
-                    };
-                } catch (error) {
-                    throw new Error(`Failed to validate Firefox binary: ${error}`);
-                }
-            }
-        }
-        var external_os_ = __webpack_require__("os");
-        function isWslEnv() {
-            if ('linux' !== process.platform) return false;
-            const hasWslEnv = Boolean(String(process.env.WSL_DISTRO_NAME || '').trim() || String(process.env.WSL_INTEROP || '').trim() || String(process.env.WSLENV || '').trim());
-            if (hasWslEnv) return true;
-            return /microsoft/i.test(external_os_.release());
-        }
-        function hasGuiDisplay() {
-            const display = String(process.env.DISPLAY || '').trim();
-            const waylandDisplay = String(process.env.WAYLAND_DISPLAY || '').trim();
-            return display.length > 0 || waylandDisplay.length > 0;
         }
+        var wsl_support = __webpack_require__("./browsers/browsers-lib/wsl-support.ts");
         const LINUX_FIREFOX_PATHS = [
             '/usr/bin/firefox',
             '/snap/bin/firefox',
             '/opt/firefox/firefox'
         ];
         function resolveWslLinuxBinary() {
-            if (!isWslEnv() || !hasGuiDisplay()) return null;
+            if (!(0, wsl_support.EV)() || !(0, wsl_support.qc)()) return null;
             for (const candidate of LINUX_FIREFOX_PATHS)if (external_fs_.existsSync(candidate)) return candidate;
             return null;
         }
-        function normalizeBinaryPathForWsl(input) {
-            let value = String(input || '').trim();
-            if (!value) return value;
-            if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
-            if (!isWslEnv()) return value;
-            if (/^[a-zA-Z]:[\\/]/.test(value)) {
-                const drive = value[0].toLowerCase();
-                const rest = value.slice(2).replace(/\\/g, '/').replace(/^\/+/, '');
-                return `/mnt/${drive}/${rest}`;
-            }
-            return value;
-        }
         function resolveWslWindowsBinary() {
-            if (!isWslEnv()) return null;
+            if (!(0, wsl_support.EV)()) return null;
             const candidates = [
                 '/mnt/c/Program Files/Mozilla Firefox/firefox.exe',
                 '/mnt/c/Program Files (x86)/Mozilla Firefox/firefox.exe'
@@ -4838,7 +4968,7 @@ var __webpack_modules__ = {
             try {
                 return await spawnOnce(binary);
             } catch (error) {
-                if (isWslEnv() && fallbackBinary && fallbackBinary !== binary) {
+                if ((0, wsl_support.EV)() && fallbackBinary && fallbackBinary !== binary) {
                     logger?.warn?.('[browser] WSL detected: retrying with Windows Firefox binary.');
                     return await spawnOnce(fallbackBinary);
                 }
@@ -4899,7 +5029,7 @@ var __webpack_modules__ = {
                 if (compilationErrors.length > 0) return void this.ctx.logger?.info?.(messages.y7j());
                 if ('true' === process.env.EXTENSION_AUTHOR_MODE) this.ctx.logger?.info?.(messages.A9Y());
                 const normalizePath = (value)=>{
-                    const normalized = value ? normalizeBinaryPathForWsl(value) : null;
+                    const normalized = value ? (0, wsl_support.f7)(value) : null;
                     return normalized && external_fs_.existsSync(normalized) ? normalized : null;
                 };
                 const resolveManagedBinary = ()=>normalizePath((0, output_binaries_resolver.kI)(compilation, 'firefox') || null);
@@ -4930,7 +5060,7 @@ var __webpack_modules__ = {
                 let browserBinaryLocation = resolveManagedBinary();
                 let skipDetection = Boolean(browserBinaryLocation);
                 const engineBased = 'gecko-based' === this.host.browser || 'firefox-based' === this.host.browser;
-                if (!browserBinaryLocation && !engineBased && isWslEnv()) {
+                if (!browserBinaryLocation && !engineBased && (0, wsl_support.EV)()) {
                     const linuxFallback = resolveWslLinuxBinary();
                     if (linuxFallback) {
                         browserBinaryLocation = linuxFallback;
@@ -4987,17 +5117,12 @@ var __webpack_modules__ = {
                     }
                 }
                 const binaryPath = browserBinaryLocation;
-                const wslFallbackBinary = isWslEnv() && !engineBased ? resolveWslFallback() : null;
-                if (!isFlatpak) {
-                    try {
-                        this.host.browserVersionLine = (0, external_firefox_location2_.getFirefoxVersion)(binaryPath, {
-                            allowExec: true
-                        }) || '';
-                    } catch  {}
-                    try {
-                        await FirefoxBinaryDetector.validateFirefoxBinary(binaryPath);
-                    } catch  {}
-                }
+                const wslFallbackBinary = (0, wsl_support.EV)() && !engineBased ? resolveWslFallback() : null;
+                if (!isFlatpak) try {
+                    this.host.browserVersionLine = (0, external_firefox_location2_.getFirefoxVersion)(binaryPath, {
+                        allowExec: true
+                    }) || '';
+                } catch  {}
                 const extensionsToLoad = (0, runtime_options.fT)(this.host.extension);
                 (0, runtime_options.sl)(extensionsToLoad, 'function' == typeof this.ctx.setExtensionRoot ? this.ctx.setExtensionRoot : void 0);
                 const desiredDebugPort = (0, shared_utils.jl)(this.host.port, this.host.instanceId);
@@ -5026,6 +5151,9 @@ var __webpack_modules__ = {
                     const profilePath = profileMatch[1];
                     const { binary, args } = FirefoxBinaryDetector.generateFirefoxArgs(binaryPath, profilePath, debugPort, firefoxArgs);
                     this.child = await this.spawnFirefoxChild(binary, args, wslFallbackBinary);
+                    this.child.on('close', ()=>{
+                        (0, shared_utils.sW)(profilePath);
+                    });
                     this.wireChildLifecycle();
                     const ctrl = await setupRdpAfterLaunch(this.host, compilation, debugPort);
                     this.host.rdpController = ctrl;
@@ -5093,6 +5221,7 @@ var __webpack_modules__ = {
                     if (process.env.VITEST || process.env.VITEST_WORKER_ID) throw new Error('Firefox startup timed out');
                     process.exit(1);
                 });
+                let disposeProcessHandlers;
                 child.on('close', (_code)=>{
                     if (this.watchTimeout) {
                         clearTimeout(this.watchTimeout);
@@ -5102,9 +5231,10 @@ var __webpack_modules__ = {
                     this.cleanupInstance().catch((err)=>{
                         if ('true' === process.env.EXTENSION_AUTHOR_MODE) this.ctx.logger?.error?.(`[browser] Cleanup error on child close: ${err?.message || err}`);
                     });
+                    disposeProcessHandlers?.();
                 });
                 this.pipeChildOutput(child);
-                setupFirefoxProcessHandlers(this.host.browser, ()=>this.child, ()=>this.cleanupInstance());
+                disposeProcessHandlers = setupFirefoxProcessHandlers(this.host.browser, ()=>this.child, ()=>this.cleanupInstance());
             }
             async cleanupInstance() {
                 try {
@@ -5112,11 +5242,12 @@ var __webpack_modules__ = {
                         try {
                             this.child.kill('SIGTERM');
                         } catch  {}
-                        setTimeout(()=>{
+                        const killTimer = setTimeout(()=>{
                             try {
                                 if (this.child && !this.child.killed) this.child.kill('SIGKILL');
                             } catch  {}
                         }, 2000);
+                        killTimer.unref?.();
                     }
                 } catch  {}
             }
@@ -5637,7 +5768,7 @@ var __webpack_modules__ = {
             if ('info' === type) return external_pintor_default().gray('⏵⏵⏵');
             return external_pintor_default().green('⏵⏵⏵');
         }
-        const code = (text)=>external_pintor_default().blue(text);
+        const messages_code = (text)=>external_pintor_default().blue(text);
         const messages_arg = (text)=>external_pintor_default().gray(text);
         const fmt = {
             heading: (title)=>external_pintor_default().underline(external_pintor_default().blue(title)),
@@ -5667,6 +5798,13 @@ var __webpack_modules__ = {
             start: 'Builds and starts the extension in production mode',
             preview: 'Previews the extension in production mode without building',
             build: 'Builds the extension for packaging/distribution',
+            logs: 'Prints or streams logs from every context of a running dev session',
+            eval: 'Evaluates an expression in a running extension context (requires --allow-eval)',
+            storage: 'Reads or writes chrome.storage in a running extension (requires --allow-control)',
+            reload: 'Reloads a running extension or tab (requires --allow-control)',
+            open: 'Opens an extension surface — popup, options, or sidebar (requires --allow-control)',
+            inspect: 'Inspects a page/content DOM via the agent bridge (CDP-free; requires --allow-control)',
+            publish: 'Publishes to extension.dev and prints a shareable URL (requires EXTENSION_DEV_TOKEN)',
             install: 'Installs a managed browser binary into Extension.js cache',
             uninstall: 'Removes managed browser binaries from Extension.js cache',
             telemetry: 'Manage anonymous telemetry consent (enable, disable, or show status)'
@@ -5693,111 +5831,132 @@ Usage: extension [command] [options]
 
 Notes
 - All high-level commands offer their own \`--help\` with usage and flag lists.
-- Telemetry is anonymous and privacy-safe by default; see ${code('docs/TELEMETRY.md')} for the full contract.
+- Telemetry is anonymous and privacy-safe by default; see ${messages_code('docs/TELEMETRY.md')} for the full contract.
 
 Example
-- ${code('extension create --help')} outputs information about the "create" command.
+- ${messages_code('extension create --help')} outputs information about the "create" command.
 
 Available Commands
-- ${code('extension create ' + messages_arg('<project-name|project-path>'))}
+- ${messages_code('extension create ' + messages_arg('<project-name|project-path>'))}
   ${commandDescriptions.create}
 
-- ${code('extension dev ' + messages_arg('[project-path|remote-url]'))}
+- ${messages_code('extension dev ' + messages_arg('[project-path|remote-url]'))}
   ${commandDescriptions.dev}
 
-- ${code('extension start ' + messages_arg('[project-path|remote-url]'))}
+- ${messages_code('extension start ' + messages_arg('[project-path|remote-url]'))}
   ${commandDescriptions.start}
 
-- ${code('extension preview ' + messages_arg('[project-path|remote-url]'))}
+- ${messages_code('extension preview ' + messages_arg('[project-path|remote-url]'))}
   ${commandDescriptions.preview}
 
-- ${code('extension build ' + messages_arg('[project-path|remote-url]'))}
+- ${messages_code('extension build ' + messages_arg('[project-path|remote-url]'))}
   ${commandDescriptions.build}
 
-- ${code('extension install ' + messages_arg('<chrome|chromium|edge|firefox>'))}
+- ${messages_code('extension logs ' + messages_arg('[project-path]'))}
+  ${commandDescriptions.logs}
+
+- ${messages_code('extension eval ' + messages_arg('<expression> [project-path]'))}
+  ${commandDescriptions.eval}
+
+- ${messages_code('extension storage ' + messages_arg('<get|set> [key] [value] [project-path]'))}
+  ${commandDescriptions.storage}
+
+- ${messages_code('extension reload ' + messages_arg('[project-path]'))}
+  ${commandDescriptions.reload}
+
+- ${messages_code('extension open ' + messages_arg('<popup|options|sidebar> [project-path]'))}
+  ${commandDescriptions.open}
+
+- ${messages_code('extension inspect ' + messages_arg('[project-path] --tab <id>'))}
+  ${commandDescriptions.inspect}
+
+- ${messages_code('extension publish ' + messages_arg('[project-path]'))}
+  ${commandDescriptions.publish}
+
+- ${messages_code('extension install ' + messages_arg('<chrome|chromium|edge|firefox>'))}
   ${commandDescriptions.install}
 
-- ${code('extension install ' + messages_arg('--browser <chrome|chromium|edge|firefox|chromium-based|gecko-based|firefox-based|all>'))}
-  Install multiple browsers, browser families, or ${code('all')}
+- ${messages_code('extension install ' + messages_arg('--browser <chrome|chromium|edge|firefox|chromium-based|gecko-based|firefox-based|all>'))}
+  Install multiple browsers, browser families, or ${messages_code('all')}
 
-- ${code('extension install --where')}
-  Prints the managed browser cache root (or browser install path(s) when a browser name or ${code('--browser')} is provided)
+- ${messages_code('extension install --where')}
+  Prints the managed browser cache root (or browser install path(s) when a browser name or ${messages_code('--browser')} is provided)
 
-- ${code('extension uninstall ' + messages_arg('<chrome|chromium|edge|firefox> | --all'))}
+- ${messages_code('extension uninstall ' + messages_arg('<chrome|chromium|edge|firefox> | --all'))}
   ${commandDescriptions.uninstall}
 
-- ${code('extension uninstall --where')}
+- ${messages_code('extension uninstall --where')}
   Prints the managed browser cache root (or browser install path(s) when --browser/--all is provided)
 
-- ${code('extension telemetry ' + messages_arg('<enable|disable|status>'))}
+- ${messages_code('extension telemetry ' + messages_arg('<enable|disable|status>'))}
   ${commandDescriptions.telemetry}
 
 Common Options
-- ${code('--browser')} ${messages_arg('<chrome|edge|firefox|chromium|chromium-based|gecko-based|firefox-based>')} Target browser/engine (default: chromium)
-- ${code('--profile')} ${messages_arg('<path|boolean>')}        Browser profile configuration
-- ${code('--polyfill')} ${messages_arg('[boolean]')}            Enable/disable cross-browser polyfill
-- ${code('--no-telemetry')}                            Disable anonymous telemetry for this run (persistent toggle: ${code('extension telemetry disable')}, or ${code('EXTENSION_TELEMETRY=0')})
-- ${code('--ai-help')}                                 Show AI-assistant oriented help and tips
-- ${code('--format')} ${messages_arg('<pretty|json>')}          Output format for ${code('--ai-help')} (default: pretty)
-- ${code('--help')}                                    Show help output
-- ${code('--port')} ${messages_arg('<number>')}                 Development server port (default: 8080; use 0 for OS-assigned)
-- ${code('--host')} ${messages_arg('<address>')}               Dev server host (default: 127.0.0.1; use 0.0.0.0 for Docker/devcontainers)
-- ${code('--starting-url')} ${messages_arg('<url>')}            Initial URL to load in browser
-- ${code('--silent')} ${messages_arg('[boolean]')}              Suppress console output during build
+- ${messages_code('--browser')} ${messages_arg('<chrome|edge|firefox|chromium|chromium-based|gecko-based|firefox-based>')} Target browser/engine (default: chromium)
+- ${messages_code('--profile')} ${messages_arg('<path|boolean>')}        Browser profile configuration
+- ${messages_code('--polyfill')} ${messages_arg('[boolean]')}            Enable/disable cross-browser polyfill
+- ${messages_code('--no-telemetry')}                            Disable anonymous telemetry for this run (persistent toggle: ${messages_code('extension telemetry disable')}, or ${messages_code('EXTENSION_TELEMETRY=0')})
+- ${messages_code('--ai-help')}                                 Show AI-assistant oriented help and tips
+- ${messages_code('--format')} ${messages_arg('<pretty|json>')}          Output format for ${messages_code('--ai-help')} (default: pretty)
+- ${messages_code('--help')}                                    Show help output
+- ${messages_code('--port')} ${messages_arg('<number>')}                 Development server port (default: 8080; use 0 for OS-assigned)
+- ${messages_code('--host')} ${messages_arg('<address>')}               Dev server host (default: 127.0.0.1; use 0.0.0.0 for Docker/devcontainers)
+- ${messages_code('--starting-url')} ${messages_arg('<url>')}            Initial URL to load in browser
+- ${messages_code('--silent')} ${messages_arg('[boolean]')}              Suppress console output during build
 
 Source Inspection (dev command)
-- ${code('--source')} ${messages_arg('<url|boolean>')}         Open URL and print HTML after content scripts inject (dev only)
+- ${messages_code('--source')} ${messages_arg('<url|boolean>')}         Open URL and print HTML after content scripts inject (dev only)
   - When provided without a URL, falls back to ${messages_arg('--starting-url')} or ${messages_arg('https://example.com')}
-  - For ${code('extension dev')}, watch mode is enabled by default when ${code('--source')} is present
-- ${messages_arg('Note:')} ${code('extension preview')} and ${code('extension start')} do not run source inspection in run-only preview mode.
-- ${messages_arg('Automation sync:')} when using ${code('extension dev --no-browser')} or ${code('extension start --no-browser')}, run ${code('extension <dev|start> --wait --browser=<browser>')} in a second process to gate on ${code('ready.json')} (add ${code('--wait-format=json')} for machine-readable output).
-- ${code('--watch-source')} ${messages_arg('[boolean]')}       Re-print HTML on rebuilds or file changes
-- ${code('--source-format')} ${messages_arg('<pretty|json|ndjson>')} Output format for page HTML (defaults to ${code('--log-format')} when present)
-- ${code('--source-summary')} ${messages_arg('[boolean]')}     Output a compact summary instead of full HTML
-- ${code('--source-meta')} ${messages_arg('[boolean]')}        Output page metadata (readyState, viewport, frames)
-- ${code('--source-probe')} ${messages_arg('<selectors>')}     Comma-separated CSS selectors to probe
-- ${code('--source-tree')} ${messages_arg('<off|root-only>')}  Output a compact extension root tree
-- ${code('--source-console')} ${messages_arg('[boolean]')}     Output console summary (best-effort)
-- ${code('--source-dom')} ${messages_arg('[boolean]')}         Output DOM snapshots and diffs
-- ${code('--source-max-bytes')} ${messages_arg('<bytes>')}      Limit HTML output size (0 disables truncation)
-- ${code('--source-redact')} ${messages_arg('<off|safe|strict>')} Redact sensitive HTML content (default: safe for JSON/NDJSON)
-- ${code('--source-include-shadow')} ${messages_arg('<off|open-only|all>')} Control Shadow DOM inclusion (default: open-only)
-- ${code('--source-diff')} ${messages_arg('[boolean]')}        Include diff metadata on watch updates
+  - For ${messages_code('extension dev')}, watch mode is enabled by default when ${messages_code('--source')} is present
+- ${messages_arg('Note:')} ${messages_code('extension preview')} and ${messages_code('extension start')} do not run source inspection in run-only preview mode.
+- ${messages_arg('Automation sync:')} when using ${messages_code('extension dev --no-browser')} or ${messages_code('extension start --no-browser')}, run ${messages_code('extension <dev|start> --wait --browser=<browser>')} in a second process to gate on ${messages_code('ready.json')} (add ${messages_code('--wait-format=json')} for machine-readable output).
+- ${messages_code('--watch-source')} ${messages_arg('[boolean]')}       Re-print HTML on rebuilds or file changes
+- ${messages_code('--source-format')} ${messages_arg('<pretty|json|ndjson>')} Output format for page HTML (defaults to ${messages_code('--log-format')} when present)
+- ${messages_code('--source-summary')} ${messages_arg('[boolean]')}     Output a compact summary instead of full HTML
+- ${messages_code('--source-meta')} ${messages_arg('[boolean]')}        Output page metadata (readyState, viewport, frames)
+- ${messages_code('--source-probe')} ${messages_arg('<selectors>')}     Comma-separated CSS selectors to probe
+- ${messages_code('--source-tree')} ${messages_arg('<off|root-only>')}  Output a compact extension root tree
+- ${messages_code('--source-console')} ${messages_arg('[boolean]')}     Output console summary (best-effort)
+- ${messages_code('--source-dom')} ${messages_arg('[boolean]')}         Output DOM snapshots and diffs
+- ${messages_code('--source-max-bytes')} ${messages_arg('<bytes>')}      Limit HTML output size (0 disables truncation)
+- ${messages_code('--source-redact')} ${messages_arg('<off|safe|strict>')} Redact sensitive HTML content (default: safe for JSON/NDJSON)
+- ${messages_code('--source-include-shadow')} ${messages_arg('<off|open-only|all>')} Control Shadow DOM inclusion (default: open-only)
+- ${messages_code('--source-diff')} ${messages_arg('[boolean]')}        Include diff metadata on watch updates
 
 Browser-Specific Options
-- ${code('--chromium-binary')} ${messages_arg('<path>')}        Custom Chromium binary path
-- ${code('--gecko-binary')}/${code('--firefox-binary')} ${messages_arg('<path>')}           Custom Firefox/Gecko binary path
-  Use ${code('flatpak:org.mozilla.firefox')} as the path to launch a Flatpak-installed Firefox
+- ${messages_code('--chromium-binary')} ${messages_arg('<path>')}        Custom Chromium binary path
+- ${messages_code('--gecko-binary')}/${messages_code('--firefox-binary')} ${messages_arg('<path>')}           Custom Firefox/Gecko binary path
+  Use ${messages_code('flatpak:org.mozilla.firefox')} as the path to launch a Flatpak-installed Firefox
 
 Build Options
-- ${code('--zip')} ${messages_arg('[boolean]')}                 Create ZIP archive of built extension
-- ${code('--zip-source')} ${messages_arg('[boolean]')}          Include source files in ZIP
-- ${code('--zip-filename')} ${messages_arg('<name>')}           Custom ZIP filename
+- ${messages_code('--zip')} ${messages_arg('[boolean]')}                 Create ZIP archive of built extension
+- ${messages_code('--zip-source')} ${messages_arg('[boolean]')}          Include source files in ZIP
+- ${messages_code('--zip-filename')} ${messages_arg('<name>')}           Custom ZIP filename
 
 ${external_pintor_default().underline('Centralized Logger (terminal output)')}
 - The manager extension embeds a centralized logger that streams events to the CLI.
-- Enable and filter logs directly via ${code('extension dev')} flags:
-  - ${code('--logs')} ${messages_arg('<off|error|warn|info|debug|trace>')}    Minimum level (default: off)
-  - ${code('--log-context')} ${messages_arg('<list|all>')}                     Contexts: background,content,page,sidebar,popup,options,devtools
-  - ${code('--log-format')} ${messages_arg('<pretty|json|ndjson>')}            Output format (default: pretty)
-  - ${code('--no-log-timestamps')}                                   Hide ISO timestamps in pretty output
-  - ${code('--no-log-color')}                                        Disable color in pretty output
-  - ${code('--log-url')} ${messages_arg('<substring|/regex/>')}                Filter by event.url
-  - ${code('--log-tab')} ${messages_arg('<id>')}                               Filter by tabId
-- Example: ${code('extension dev ./my-ext --logs=debug --log-context=all --log-format=pretty')}
+- Enable and filter logs directly via ${messages_code('extension dev')} flags:
+  - ${messages_code('--logs')} ${messages_arg('<off|error|warn|info|debug|trace>')}    Minimum level (default: off)
+  - ${messages_code('--log-context')} ${messages_arg('<list|all>')}                     Contexts: background,content,page,sidebar,popup,options,devtools
+  - ${messages_code('--log-format')} ${messages_arg('<pretty|json|ndjson>')}            Output format (default: pretty)
+  - ${messages_code('--no-log-timestamps')}                                   Hide ISO timestamps in pretty output
+  - ${messages_code('--no-log-color')}                                        Disable color in pretty output
+  - ${messages_code('--log-url')} ${messages_arg('<substring|/regex/>')}                Filter by event.url
+  - ${messages_code('--log-tab')} ${messages_arg('<id>')}                               Filter by tabId
+- Example: ${messages_code('extension dev ./my-ext --logs=debug --log-context=all --log-format=pretty')}
 
-${code('extension --help')}
+${messages_code('extension --help')}
 This command outputs a help file with key command options.
 
 ${external_pintor_default().underline('Path Resolution (important)')}
-- Leading ${code('/')} in manifest/HTML means extension root (the directory containing ${code('manifest.json')}).
-- Relative paths resolve from the ${code('manifest.json')} directory.
+- Leading ${messages_code('/')} in manifest/HTML means extension root (the directory containing ${messages_code('manifest.json')}).
+- Relative paths resolve from the ${messages_code('manifest.json')} directory.
 - Absolute OS paths are used as-is.
 
 
 AI Assistants
-- For AI-oriented guidance and deeper tips, run ${code('extension --ai-help')}
-- For machine-readable AI guidance, run ${code('extension --ai-help --format json')}
+- For AI-oriented guidance and deeper tips, run ${messages_code('extension --ai-help')}
+- For machine-readable AI guidance, run ${messages_code('extension --ai-help --format json')}
 
  Report issues
  - ${external_pintor_default().underline('https://github.com/cezaraugusto/extension/issues/new')}`;
@@ -5805,99 +5964,102 @@ AI Assistants
         function unsupportedBrowserFlag(value, supported) {
             return `${getLoggingPrefix('error')} Unsupported --browser value: ${value}. Supported: ${supported.join(', ')}.`;
         }
+        function safariCommandNotSupported(command) {
+            return `${getLoggingPrefix('error')} ${messages_code(command)} can't load an extension into Safari automatically.\nSafari extensions ship inside a signed app and are enabled by hand, so there's no live browser session to load into — unlike Chromium and Firefox.\nBuild the Safari app instead: ${messages_code('extension build --browser safari')}\nThen open the generated app and enable it in Safari → Settings → Extensions.`;
+        }
         function programAIHelp() {
             return `\n${getLoggingPrefix('info')} ${external_pintor_default().gray('Development tips for extension developers and AI assistants')}
 
 Browser-Specific Configuration
 - Use browser prefixes in manifest.json for browser-specific fields:
-  ${code('{"firefox:manifest": 2, "chrome:manifest": 3}')}
+  ${messages_code('{"firefox:manifest": 2, "chrome:manifest": 3}')}
   This applies manifest v2 to Firefox only, v3 to Chrome/Edge.
 
 Centralized Logger (for AI & CI)
 - Logs from all contexts are centralized by the manager extension and streamed to the CLI.
-- Prefer these flags to control terminal logs during ${code('extension dev')}:
-  - ${code('--logs')} ${messages_arg('<off|error|warn|info|debug|trace>')}    Minimum level
-  - ${code('--log-context')} ${messages_arg('<list|all>')}                     Contexts to include
-  - ${code('--log-format')} ${messages_arg('<pretty|json|ndjson>')}            Pretty for humans; JSON for machines/NDJSON pipelines
-  - ${code('--no-log-timestamps')} ${messages_arg(' ')}                        Disable timestamps (pretty)
-  - ${code('--no-log-color')} ${messages_arg(' ')}                             Disable ANSI colors (pretty)
-  - ${code('--log-url')} ${messages_arg('<substring|/regex/>')}                Filter by URL
-  - ${code('--log-tab')} ${messages_arg('<id>')}                               Filter by tabId
-- Good CI pattern: ${code('EXTENSION_AUTHOR_MODE=development EXTENSION_AUTO_EXIT_MS=6000 extension dev ./ext --logs=info --log-format=json')}
+- Prefer these flags to control terminal logs during ${messages_code('extension dev')}:
+  - ${messages_code('--logs')} ${messages_arg('<off|error|warn|info|debug|trace>')}    Minimum level
+  - ${messages_code('--log-context')} ${messages_arg('<list|all>')}                     Contexts to include
+  - ${messages_code('--log-format')} ${messages_arg('<pretty|json|ndjson>')}            Pretty for humans; JSON for machines/NDJSON pipelines
+  - ${messages_code('--no-log-timestamps')} ${messages_arg(' ')}                        Disable timestamps (pretty)
+  - ${messages_code('--no-log-color')} ${messages_arg(' ')}                             Disable ANSI colors (pretty)
+  - ${messages_code('--log-url')} ${messages_arg('<substring|/regex/>')}                Filter by URL
+  - ${messages_code('--log-tab')} ${messages_arg('<id>')}                               Filter by tabId
+- Good CI pattern: ${messages_code('EXTENSION_AUTHOR_MODE=development EXTENSION_AUTO_EXIT_MS=6000 extension dev ./ext --logs=info --log-format=json')}
 
 Special Folders for Entrypoints
 - Use special folders to handle entrypoints and assets not declared in manifest.json:
-- ${external_pintor_default().underline(code('public/'))}  - Static assets automatically copied to build (resolves to output root)
-- ${external_pintor_default().underline(code('pages/'))}   - HTML files not declared in manifest (e.g., welcome pages)
-- ${external_pintor_default().underline(code("scripts/"))} - JavaScript files not declared in manifest (e.g., executable scripts)
+- ${external_pintor_default().underline(messages_code('public/'))}  - Static assets automatically copied to build (resolves to output root)
+- ${external_pintor_default().underline(messages_code('pages/'))}   - HTML files not declared in manifest (e.g., welcome pages)
+- ${external_pintor_default().underline(messages_code("scripts/"))} - JavaScript files not declared in manifest (e.g., executable scripts)
 
 Predictable Output Paths
 - Core HTML destinations are standardized across browsers so you can reference them safely in code/tests:
-  - ${code('devtools_page')} → ${code('devtools/index.html')}
-  - ${code('sidebar_action.default_panel')} (MV2) and ${code('side_panel.default_path')} (MV3) → ${code('sidebar/index.html')}
-  - ${code('options_ui.page')} and ${code('options_page')} → ${code('options/index.html')}
-  - ${code('background.page')} → ${code('background/index.html')}
-  - ${code('action.default_popup')}, ${code('browser_action.default_popup')}, ${code('page_action.default_popup')} → ${code('action/index.html')}
+  - ${messages_code('devtools_page')} → ${messages_code('devtools/index.html')}
+  - ${messages_code('sidebar_action.default_panel')} (MV2) and ${messages_code('side_panel.default_path')} (MV3) → ${messages_code('sidebar/index.html')}
+  - ${messages_code('options_ui.page')} and ${messages_code('options_page')} → ${messages_code('options/index.html')}
+  - ${messages_code('background.page')} → ${messages_code('background/index.html')}
+  - ${messages_code('action.default_popup')}, ${messages_code('browser_action.default_popup')}, ${messages_code('page_action.default_popup')} → ${messages_code('action/index.html')}
 - Other predictable outputs:
-  - ${code('chrome_url_overrides.*')} → ${code('chrome_url_overrides/<key>.html')}
-  - ${code("content_scripts[n].js/css")} → ${code("content_scripts/content-<n>.{js,css}")}
-  - ${code('sandbox.pages[]')} → ${code('sandbox/page-<n>.html')}
-  - ${code("user_scripts.api_script")} → ${code("user_scripts/api_script.js")}
-  - ${code('icons/*')} → ${code('icons/')} (feature-specific icon folders preserved where applicable)
+  - ${messages_code('chrome_url_overrides.*')} → ${messages_code('chrome_url_overrides/<key>.html')}
+  - ${messages_code("content_scripts[n].js/css")} → ${messages_code("content_scripts/content-<n>.{js,css}")}
+  - ${messages_code('sandbox.pages[]')} → ${messages_code('sandbox/page-<n>.html')}
+  - ${messages_code("user_scripts.api_script")} → ${messages_code("user_scripts/api_script.js")}
+  - ${messages_code('icons/*')} → ${messages_code('icons/')} (feature-specific icon folders preserved where applicable)
 
 Public & Special Folders (Output Behavior)
-- ${external_pintor_default().underline(code('public/'))} is the web root in output. Authors can use ${code('/foo')}, ${code('/public/foo')}, ${code('public/foo')}, or ${code('./public/foo')} and they all emit as ${code('dist/<browser>/foo')}.
-- ${external_pintor_default().underline(code('pages/'))} files emit as ${code('pages/<name>.html')}. Relative assets referenced inside page HTML are emitted under ${code('assets/')} preserving relative structure; public-root URLs are preserved.
-- ${external_pintor_default().underline(code("scripts/"))} files emit as ${code("scripts/<name>.js")} with extracted CSS when applicable.
+- ${external_pintor_default().underline(messages_code('public/'))} is the web root in output. Authors can use ${messages_code('/foo')}, ${messages_code('/public/foo')}, ${messages_code('public/foo')}, or ${messages_code('./public/foo')} and they all emit as ${messages_code('dist/<browser>/foo')}.
+- ${external_pintor_default().underline(messages_code('pages/'))} files emit as ${messages_code('pages/<name>.html')}. Relative assets referenced inside page HTML are emitted under ${messages_code('assets/')} preserving relative structure; public-root URLs are preserved.
+- ${external_pintor_default().underline(messages_code("scripts/"))} files emit as ${messages_code("scripts/<name>.js")} with extracted CSS when applicable.
 
 Shadow DOM for Content Scripts
-- Add ${code('use shadow-dom')} directive to content scripts for style isolation
-- Automatically creates ${code('#extension-root')} element with shadow DOM
+- Add ${messages_code('use shadow-dom')} directive to content scripts for style isolation
+- Automatically creates ${messages_code('#extension-root')} element with shadow DOM
 - All CSS imports are automatically injected into shadow DOM
 - Prevents style conflicts with host page
 
 Environment Variables
-- Use ${code(messages_arg('EXTENSION_PUBLIC_*'))} prefix for variables accessible in extension code
-- Supported in both ${code('process.env')} and ${code('import.meta.env')}
-- Environment file priority: ${external_pintor_default().underline(code(messages_arg('.env.{browser}.{mode}')))} > ${external_pintor_default().underline(code(messages_arg('.env.{browser}')))} > ${external_pintor_default().underline(code(messages_arg('.env.{mode}')))} > ${external_pintor_default().underline(code(messages_arg('.env')))}
-- Example: ${code(messages_arg('EXTENSION_PUBLIC_API_KEY=your_key'))}
+- Use ${messages_code(messages_arg('EXTENSION_PUBLIC_*'))} prefix for variables accessible in extension code
+- Supported in both ${messages_code('process.env')} and ${messages_code('import.meta.env')}
+- Environment file priority: ${external_pintor_default().underline(messages_code(messages_arg('.env.{browser}.{mode}')))} > ${external_pintor_default().underline(messages_code(messages_arg('.env.{browser}')))} > ${external_pintor_default().underline(messages_code(messages_arg('.env.{mode}')))} > ${external_pintor_default().underline(messages_code(messages_arg('.env')))}
+- Example: ${messages_code(messages_arg('EXTENSION_PUBLIC_API_KEY=your_key'))}
 
 Available Templates
-- ${external_pintor_default().green('Frameworks')}: ${code(messages_arg('react'))}, ${code(messages_arg('preact'))}, ${code(messages_arg('vue'))}, ${code(messages_arg('svelte'))}
-- ${external_pintor_default().green('Languages')}: ${code(messages_arg("javascript"))}, ${code(messages_arg("typescript"))}
-- ${external_pintor_default().green('Contexts')}: ${code(messages_arg('content'))} (content scripts), ${code(messages_arg('new'))} (new tab), ${code(messages_arg('action'))} (popup)
-- ${external_pintor_default().green('Styling')}: ${code(messages_arg('tailwind'))}, ${code(messages_arg('sass'))}, ${code(messages_arg('less'))}
-- ${external_pintor_default().green('Configs')}: ${code(messages_arg('eslint'))}, ${code(messages_arg('prettier'))}, ${code(messages_arg('stylelint'))}
+- ${external_pintor_default().green('Frameworks')}: ${messages_code(messages_arg('react'))}, ${messages_code(messages_arg('preact'))}, ${messages_code(messages_arg('vue'))}, ${messages_code(messages_arg('svelte'))}
+- ${external_pintor_default().green('Languages')}: ${messages_code(messages_arg("javascript"))}, ${messages_code(messages_arg("typescript"))}
+- ${external_pintor_default().green('Contexts')}: ${messages_code(messages_arg('content'))} (content scripts), ${messages_code(messages_arg('new'))} (new tab), ${messages_code(messages_arg('action'))} (popup)
+- ${external_pintor_default().green('Styling')}: ${messages_code(messages_arg('tailwind'))}, ${messages_code(messages_arg('sass'))}, ${messages_code(messages_arg('less'))}
+- ${external_pintor_default().green('Configs')}: ${messages_code(messages_arg('eslint'))}, ${messages_code(messages_arg('prettier'))}, ${messages_code(messages_arg('stylelint'))}
 
 Webpack/Rspack Configuration
-- Create ${external_pintor_default().underline(code(messages_arg('extension.config.js')))} for custom webpack configuration
+- Create ${external_pintor_default().underline(messages_code(messages_arg('extension.config.js')))} for custom webpack configuration
 - Function receives base config, return modified config
 - Supports all webpack/rspack loaders and plugins
 - Example:
-  ${code('export default {')}
-  ${code('  config: (config) => {')}
-  ${code("    config.module.rules.push({ test: /\\.svg$/, use: ['@svgr/webpack'] })")}
-  ${code('    return config')}
-  ${code('  }')}
-  ${code('}')}
+  ${messages_code('export default {')}
+  ${messages_code('  config: (config) => {')}
+  ${messages_code("    config.module.rules.push({ test: /\\.svg$/, use: ['@svgr/webpack'] })")}
+  ${messages_code('    return config')}
+  ${messages_code('  }')}
+  ${messages_code('}')}
 
 Managed Dependencies (Important)
 - ${external_pintor_default().green('Do not add')} packages that ${external_pintor_default().blue('Extension.js')} already ships in its own toolchain.
-- The guard only triggers when a managed package is declared in your ${code('package.json')} ${external_pintor_default().gray('and')} is referenced in your ${external_pintor_default().underline(code('extension.config.js'))}.
+- The guard only triggers when a managed package is declared in your ${messages_code('package.json')} ${external_pintor_default().gray('and')} is imported (as a module specifier) in your ${external_pintor_default().underline(messages_code('extension.config.js'))}.
 - In that case, the program will ${external_pintor_default().red('print an error and abort')} to avoid version conflicts.
-- Remove the duplicate from your project ${code('package.json')} or avoid referencing it in ${external_pintor_default().underline(code('extension.config.js'))} and rely on the built-in version instead.
+- Remove the duplicate from your project ${messages_code('package.json')} or avoid referencing it in ${external_pintor_default().underline(messages_code('extension.config.js'))} and rely on the built-in version instead.
 - If you truly need a different version, open an issue so we can evaluate a safe upgrade.
 
 Framework-Specific Configuration
-- Create ${external_pintor_default().underline(code(messages_arg('vue.loader.js')))} for Vue-specific loader configuration
-- Create ${external_pintor_default().underline(code(messages_arg('svelte.loader.js')))} for Svelte-specific loader configuration
+- Create ${external_pintor_default().underline(messages_code(messages_arg('vue.loader.js')))} for Vue-specific loader configuration
+- Create ${external_pintor_default().underline(messages_code(messages_arg('svelte.loader.js')))} for Svelte-specific loader configuration
 - Automatically detected and used by Extension.js
 - Example svelte.loader.js:
-  ${code('module.exports = {')}
-  ${code('  preprocess: require("svelte-preprocess")({')}
-  ${code("    typescript: true")}
-  ${code('  })')}
-  ${code('}')}
+  ${messages_code('module.exports = {')}
+  ${messages_code('  preprocess: require("svelte-preprocess")({')}
+  ${messages_code("    typescript: true")}
+  ${messages_code('  })')}
+  ${messages_code('}')}
 
 Hot Module Replacement (HMR)
 - Automatically enabled in development mode
@@ -5907,63 +6069,63 @@ Hot Module Replacement (HMR)
 - Service workers, _locales and manifest changes reload the extension
 
 Source Inspection & Real-Time Monitoring
-- Use ${code('extension dev --source')} ${messages_arg('<url|boolean>')} to inspect page HTML after content script injection
+- Use ${messages_code('extension dev --source')} ${messages_arg('<url|boolean>')} to inspect page HTML after content script injection
   - When no URL is provided, falls back to ${messages_arg('--starting-url')} or ${messages_arg('https://example.com')}
-  - Watch mode is enabled by default when ${code('--source')} is present
-- Use ${code('--watch-source')} to re-print HTML on rebuilds or file changes
-- Use ${code('--source-format')} ${messages_arg('<pretty|json|ndjson>')} for machine-friendly HTML output
-- Use ${code('--source-summary')} to emit a compact JSON summary instead of full HTML
-- Use ${code('--source-meta')} to emit page metadata (readyState, viewport, frames)
-- Use ${code('--source-probe')} to probe CSS selectors for quick validation
-- Use ${code('--source-tree')} to emit a compact extension root tree
-- Use ${code('--source-console')} to emit a console summary (best-effort)
-- Use ${code('--source-dom')} to emit DOM snapshots and diffs
-- Use ${code('--source-redact')} ${messages_arg('<off|safe|strict>')} to redact sensitive content
-- Use ${code('--source-max-bytes')} ${messages_arg('<bytes>')} to limit output size
-- Use ${code('--source-diff')} ${messages_arg('[boolean]')} to emit diff metadata for watch updates
+  - Watch mode is enabled by default when ${messages_code('--source')} is present
+- Use ${messages_code('--watch-source')} to re-print HTML on rebuilds or file changes
+- Use ${messages_code('--source-format')} ${messages_arg('<pretty|json|ndjson>')} for machine-friendly HTML output
+- Use ${messages_code('--source-summary')} to emit a compact JSON summary instead of full HTML
+- Use ${messages_code('--source-meta')} to emit page metadata (readyState, viewport, frames)
+- Use ${messages_code('--source-probe')} to probe CSS selectors for quick validation
+- Use ${messages_code('--source-tree')} to emit a compact extension root tree
+- Use ${messages_code('--source-console')} to emit a console summary (best-effort)
+- Use ${messages_code('--source-dom')} to emit DOM snapshots and diffs
+- Use ${messages_code('--source-redact')} ${messages_arg('<off|safe|strict>')} to redact sensitive content
+- Use ${messages_code('--source-max-bytes')} ${messages_arg('<bytes>')} to limit output size
+- Use ${messages_code('--source-diff')} ${messages_arg('[boolean]')} to emit diff metadata for watch updates
 - Source events include frame context (frameId/frameUrl), and console summaries include best-effort script URLs.
-- Action timeline events ${code('action_event')} report navigation, injection, rebuilds, snapshots, and reloads.
+- Action timeline events ${messages_code('action_event')} report navigation, injection, rebuilds, snapshots, and reloads.
 - Automatically enables Chrome remote debugging (port 9222) when source inspection is active
-- Extracts Shadow DOM content from ${code('#extension-root')} or ${code('[data-extension-root=\"true\"]')} elements
+- Extracts Shadow DOM content from ${messages_code('#extension-root')} or ${messages_code('[data-extension-root=\"true\"]')} elements
 - Useful for debugging content script behavior and style injection
-- Example: ${code('extension dev --source=' + messages_arg('https://example.com'))}
-- ${messages_arg('Note:')} ${code('preview/start')} run in run-only mode and do not perform source inspection.
-- For machine synchronization with ${code('--no-browser')}, use ${code('extension dev --wait --browser=<browser>')} or ${code('extension start --wait --browser=<browser>')} in a second process (use ${code('--wait-format=json')} when a parser consumes stdout).
+- Example: ${messages_code('extension dev --source=' + messages_arg('https://example.com'))}
+- ${messages_arg('Note:')} ${messages_code('preview/start')} run in run-only mode and do not perform source inspection.
+- For machine synchronization with ${messages_code('--no-browser')}, use ${messages_code('extension dev --wait --browser=<browser>')} or ${messages_code('extension start --wait --browser=<browser>')} in a second process (use ${messages_code('--wait-format=json')} when a parser consumes stdout).
 
 Non-Destructive Testing in CI
-- Prefer ${code('EXTENSION_AUTHOR_MODE=development')} to copy local templates and avoid network.
-- Reuse Playwright's Chromium via ${code('--chromium-binary')} path when available.
-- Set ${code(messages_arg('EXTENSION_AUTO_EXIT_MS'))} and ${code(messages_arg('EXTENSION_FORCE_KILL_MS'))} for non-interactive dev sessions.
+- Prefer ${messages_code('EXTENSION_AUTHOR_MODE=development')} to copy local templates and avoid network.
+- Reuse Playwright's Chromium via ${messages_code('--chromium-binary')} path when available.
+- Set ${messages_code(messages_arg('EXTENSION_AUTO_EXIT_MS'))} and ${messages_code(messages_arg('EXTENSION_FORCE_KILL_MS'))} for non-interactive dev sessions.
 
 File Watching & HMR Examples
 - Content script JS/TS changes trigger reinjection; CSS changes update styles live.
-- For watch-source HTML prints, update a visible string in ${code("content/scripts.*")} and assert it appears in stdout.
+- For watch-source HTML prints, update a visible string in ${messages_code("content/scripts.*")} and assert it appears in stdout.
 
 Troubleshooting
-- If HTML is not printed, ensure ${code('--source')} is provided and browser launched with debugging port.
-- Use ${code('--silent true')} during builds to reduce noise; logs still surface errors.
-- When ports conflict, pass ${code('--port 0')} to auto-select an available port.
-- In Docker/devcontainers, pass ${code('--host 0.0.0.0')} so the dev server is reachable from the host.
+- If HTML is not printed, ensure ${messages_code('--source')} is provided and browser launched with debugging port.
+- Use ${messages_code('--silent true')} during builds to reduce noise; logs still surface errors.
+- When ports conflict, pass ${messages_code('--port 0')} to auto-select an available port.
+- In Docker/devcontainers, pass ${messages_code('--host 0.0.0.0')} so the dev server is reachable from the host.
 
 Non-Interactive / Auto Mode (CI)
-- Set ${code(messages_arg('EXTENSION_AUTO_EXIT_MS'))} to enable self-termination after N milliseconds.
-  Useful when ${code('pnpm extension dev')} would otherwise hang under Rspack watch.
-  Example: ${code(messages_arg('EXTENSION_AUTO_EXIT_MS=6000'))} pnpm extension dev ./templates/react --browser chrome --source ${messages_arg('https://example.com')}
-- Optional: ${code(messages_arg('EXTENSION_FORCE_KILL_MS'))} to hard-exit after N ms as a fallback (defaults to auto-exit + 4000).
+- Set ${messages_code(messages_arg('EXTENSION_AUTO_EXIT_MS'))} to enable self-termination after N milliseconds.
+  Useful when ${messages_code('pnpm extension dev')} would otherwise hang under Rspack watch.
+  Example: ${messages_code(messages_arg('EXTENSION_AUTO_EXIT_MS=6000'))} pnpm extension dev ./templates/react --browser chrome --source ${messages_arg('https://example.com')}
+- Optional: ${messages_code(messages_arg('EXTENSION_FORCE_KILL_MS'))} to hard-exit after N ms as a fallback (defaults to auto-exit + 4000).
 
 Docker / Devcontainers / Codespaces
-- Use ${code('--host 0.0.0.0')} to bind the dev server on all interfaces so HMR is reachable from the host.
-- Use ${code('--no-browser')} inside the container and load the extension manually from ${code('dist/<browser>/')} in your host browser.
-- Chromium sandbox flags (${code('--no-sandbox')}) are added automatically when Docker, Podman, devcontainers, or Codespaces are detected.
+- Use ${messages_code('--host 0.0.0.0')} to bind the dev server on all interfaces so HMR is reachable from the host.
+- Use ${messages_code('--no-browser')} inside the container and load the extension manually from ${messages_code('dist/<browser>/')} in your host browser.
+- Chromium sandbox flags (${messages_code('--no-sandbox')}) are added automatically when Docker, Podman, devcontainers, or Codespaces are detected.
 - File watching uses polling by default (1 s interval), which works across bind-mounted volumes.
-- Example: ${code('extension dev ./my-ext --host 0.0.0.0 --no-browser --port 8080')}
+- Example: ${messages_code('extension dev ./my-ext --host 0.0.0.0 --no-browser --port 8080')}
 
 Flatpak Firefox
-- Use ${code('--gecko-binary flatpak:org.mozilla.firefox')} (or ${code('--firefox-binary')}) to launch a Flatpak-installed Firefox.
-- Extension.js rewrites the binary path to ${code('flatpak run')} with the correct filesystem grants automatically.
+- Use ${messages_code('--gecko-binary flatpak:org.mozilla.firefox')} (or ${messages_code('--firefox-binary')}) to launch a Flatpak-installed Firefox.
+- Extension.js rewrites the binary path to ${messages_code('flatpak run')} with the correct filesystem grants automatically.
 
 Cross-Browser Compatibility
-- Use ${code('--polyfill')} flag to enable webextension-polyfill
+- Use ${messages_code('--polyfill')} flag to enable webextension-polyfill
 - Automatically handles browser API differences
 - Supports Chrome, Edge, Firefox with single codebase`;
         }
@@ -5996,6 +6158,41 @@ Cross-Browser Compatibility
                         summary: commandDescriptions.build,
                         supportsSourceInspection: false
                     },
+                    {
+                        name: 'logs',
+                        summary: commandDescriptions.logs,
+                        supportsSourceInspection: false
+                    },
+                    {
+                        name: 'eval',
+                        summary: commandDescriptions.eval,
+                        supportsSourceInspection: false
+                    },
+                    {
+                        name: 'storage',
+                        summary: commandDescriptions.storage,
+                        supportsSourceInspection: false
+                    },
+                    {
+                        name: 'reload',
+                        summary: commandDescriptions.reload,
+                        supportsSourceInspection: false
+                    },
+                    {
+                        name: 'open',
+                        summary: commandDescriptions.open,
+                        supportsSourceInspection: false
+                    },
+                    {
+                        name: 'inspect',
+                        summary: commandDescriptions.inspect,
+                        supportsSourceInspection: true
+                    },
+                    {
+                        name: 'publish',
+                        summary: commandDescriptions.publish,
+                        supportsSourceInspection: false
+                    },
                     {
                         name: 'install',
                         summary: commandDescriptions.install,
@@ -6095,9 +6292,45 @@ Cross-Browser Compatibility
                     },
                     managedDependencies: {
                         enforcement: 'guarded',
-                        trigger: 'when managed packages are declared in package.json and referenced in extension.config',
+                        trigger: 'when managed packages are declared in package.json and imported as a module specifier in extension.config',
                         action: 'print an error and abort'
                     },
+                    readyContract: {
+                        readyPath: 'dist/extension-js/<browser>/ready.json',
+                        eventsPath: 'dist/extension-js/<browser>/events.ndjson',
+                        waitFlag: '--wait blocks until ready.json reports ready (or error) then exits; pair with --wait-format=json for machine output',
+                        statuses: [
+                            'starting',
+                            'ready',
+                            'error'
+                        ],
+                        readyFields: [
+                            'status',
+                            'command',
+                            'browser',
+                            'runId',
+                            'startedAt',
+                            'distPath',
+                            'manifestPath',
+                            'port',
+                            'pid',
+                            'ts',
+                            'compiledAt',
+                            'errors'
+                        ],
+                        eventTypes: [
+                            'compile_start',
+                            'compile_success',
+                            'compile_error',
+                            'shutdown'
+                        ],
+                        notes: [
+                            'ready.json is written atomically by the build (dev/start) on each compile',
+                            'events.ndjson is an append-only build timeline with durationMs and errorCount per entry',
+                            '--wait requires a local project path (remote URLs are not supported)',
+                            'consumers should verify pid liveness and recency before trusting a contract'
+                        ]
+                    },
                     dockerAndContainers: {
                         hostFlag: '--host 0.0.0.0 binds the dev server to all interfaces',
                         sandboxDetection: [
@@ -6131,22 +6364,22 @@ Cross-Browser Compatibility
             };
         }
         function invalidAIHelpFormat(value) {
-            return `${getLoggingPrefix('error')} Invalid value for ${code('--format')}: ${external_pintor_default().red(String(value))}\nAllowed values: ${messages_arg('pretty, json')}. Example: ${code('extension --ai-help --format json')}`;
+            return `${getLoggingPrefix('error')} Invalid value for ${messages_code('--format')}: ${external_pintor_default().red(String(value))}\nAllowed values: ${messages_arg('pretty, json')}. Example: ${messages_code('extension --ai-help --format json')}`;
         }
         function sourceInspectionNotSupported(command) {
-            return `${getLoggingPrefix('error')} ${code(`extension ${command}`)} currently runs in run-only preview mode and does not support source inspection.\nUse ${code('extension dev --source <url>')} for source inspection features.`;
+            return `${getLoggingPrefix('error')} ${messages_code(`extension ${command}`)} currently runs in run-only preview mode and does not support source inspection.\nUse ${messages_code('extension dev --source <url>')} for source inspection features.`;
         }
         function removedNoRunnerFlag() {
-            return `${getLoggingPrefix('error')} ${code('--no-runner')} was removed.\nUse ${code('--no-browser')} instead.`;
+            return `${getLoggingPrefix('error')} ${messages_code('--no-runner')} was removed.\nUse ${messages_code('--no-browser')} instead.`;
         }
         function noBrowserNotSupportedForCommand(command) {
-            return `${getLoggingPrefix('error')} ${code('--no-browser')} is only supported for ${code('dev')}, ${code('start')}, and ${code('preview')}.\nReceived command: ${code(command || '(none)')}`;
+            return `${getLoggingPrefix('error')} ${messages_code('--no-browser')} is only supported for ${messages_code('dev')}, ${messages_code('start')}, and ${messages_code('preview')}.\nReceived command: ${messages_code(command || '(none)')}`;
         }
         function sourceIncompatibleWithWait() {
-            return `${getLoggingPrefix('error')} ${code('--source')} cannot be combined with ${code('--wait')}.\nSource inspection requires a live browser session; ${code('--wait')} exits as soon as the ready contract is satisfied.\nRun them separately: ${code('extension dev --wait')} for the readiness gate, then ${code('extension dev --source <url>')} for inspection.`;
+            return `${getLoggingPrefix('error')} ${messages_code('--source')} cannot be combined with ${messages_code('--wait')}.\nSource inspection requires a live browser session; ${messages_code('--wait')} exits as soon as the ready contract is satisfied.\nRun them separately: ${messages_code('extension dev --wait')} for the readiness gate, then ${messages_code('extension dev --source <url>')} for inspection.`;
         }
         function sourceIncompatibleWithNoBrowser() {
-            return `${getLoggingPrefix('error')} ${code('--source')} cannot be combined with ${code('--no-browser')}.\nSource inspection drives a real browser via CDP/RDP and cannot run headlessly against the dev server alone.\nDrop ${code('--no-browser')} or omit the ${code('--source')} flags to continue.`;
+            return `${getLoggingPrefix('error')} ${messages_code('--source')} cannot be combined with ${messages_code('--no-browser')}.\nSource inspection drives a real browser via CDP/RDP and cannot run headlessly against the dev server alone.\nDrop ${messages_code('--no-browser')} or omit the ${messages_code('--source')} flags to continue.`;
         }
         const external_semver_namespaceObject = require("semver");
         const external_node_fs_namespaceObject = require("node:fs");
@@ -6303,6 +6536,15 @@ Cross-Browser Compatibility
             if ('workspace' === source) throw new Error(`Local extension-develop runtime is not built at ${external_path_default().join(root, 'dist')}. Run \`pnpm --filter extension-develop compile\` before invoking the local CLI.`);
             return await import("extension-develop/preview");
         }
+        async function loadExtensionDevelopBridgeModule(startDir = __dirname) {
+            const root = resolveExtensionDevelopRoot(startDir);
+            const { source } = resolvePreferredDevelopRoot(startDir);
+            const bridgeEntry = resolveDevelopDistEntry(root, 'bridge');
+            if (bridgeEntry) return importModule(bridgeEntry);
+            if ('workspace' === source) throw new Error(`Local extension-develop runtime is not built at ${external_path_default().join(root, 'dist')}. Run \`pnpm --filter extension-develop compile\` before invoking the local CLI.`);
+            const bridgeSpecifier = 'extension-develop/bridge';
+            return await import(bridgeSpecifier);
+        }
         const external_node_os_namespaceObject = require("node:os");
         var external_node_os_default = /*#__PURE__*/ __webpack_require__.n(external_node_os_namespaceObject);
         const external_node_crypto_namespaceObject = require("node:crypto");
@@ -6645,6 +6887,9 @@ Cross-Browser Compatibility
                 markCommandFailure();
             });
         }
+        function isSafariVendor(value) {
+            return 'safari' === value || 'webkit-based' === value;
+        }
         function parseOptionalBoolean(value) {
             if (void 0 === value) return true;
             const normalized = String(value).trim().toLowerCase();
@@ -6671,7 +6916,9 @@ Cross-Browser Compatibility
                 'chromium',
                 'chromium-based',
                 'gecko-based',
-                'firefox-based'
+                'firefox-based',
+                'safari',
+                'webkit-based'
             ];
             for (const v of vendorsList)if (!supported.includes(v)) {
                 onInvalid(v, supported);
@@ -6702,6 +6949,7 @@ Cross-Browser Compatibility
                 });
             });
         }
+        const READY_CONTRACT_FRESHNESS_MS = 60000;
         function isHttpUrl(value) {
             if (!value) return false;
             return /^https?:\/\//i.test(value);
@@ -6731,7 +6979,7 @@ Cross-Browser Compatibility
                 return false;
             }
         }
-        function isFreshContractPayload(payload, maxAgeMs) {
+        function isFreshContractPayload(payload) {
             const candidates = [
                 payload.ts,
                 payload.compiledAt,
@@ -6740,7 +6988,7 @@ Cross-Browser Compatibility
             for (const candidate of candidates){
                 if (!candidate) continue;
                 const stamp = Date.parse(candidate);
-                if (Number.isFinite(stamp)) return Date.now() - stamp <= maxAgeMs;
+                if (Number.isFinite(stamp)) return Date.now() - stamp <= READY_CONTRACT_FRESHNESS_MS;
             }
             return false;
         }
@@ -6751,7 +6999,7 @@ Cross-Browser Compatibility
                 if (external_node_fs_namespaceObject.existsSync(readyPath)) try {
                     const payload = JSON.parse(external_node_fs_namespaceObject.readFileSync(readyPath, 'utf8'));
                     const isLive = isProcessLikelyAlive(payload.pid);
-                    const isFresh = isFreshContractPayload(payload, options.timeoutMs);
+                    const isFresh = isFreshContractPayload(payload);
                     if (payload.command !== options.command) {
                         await new Promise((resolve)=>setTimeout(resolve, 250));
                         continue;
@@ -6807,6 +7055,272 @@ Cross-Browser Compatibility
             };
         }
         var browsers = __webpack_require__("./browsers/index.ts");
+        var external_child_process_ = __webpack_require__("child_process");
+        var messages = __webpack_require__("./browsers/browsers-lib/messages.ts");
+        function isMacOS() {
+            return 'darwin' === process.platform;
+        }
+        function activeDeveloperDir() {
+            try {
+                const result = (0, external_child_process_.spawnSync)('xcode-select', [
+                    '-p'
+                ], {
+                    encoding: 'utf8',
+                    timeout: 15000
+                });
+                if (0 !== result.status) return null;
+                const resolved = String(result.stdout || '').trim();
+                return resolved.length > 0 ? resolved : null;
+            } catch  {
+                return null;
+            }
+        }
+        function findWithXcrun(tool) {
+            try {
+                const result = (0, external_child_process_.spawnSync)('xcrun', [
+                    '--find',
+                    tool
+                ], {
+                    encoding: 'utf8',
+                    timeout: 15000
+                });
+                if (0 !== result.status) return null;
+                const resolved = String(result.stdout || '').trim();
+                return resolved.length > 0 ? resolved : null;
+            } catch  {
+                return null;
+            }
+        }
+        function detectSafariToolchain() {
+            const platformOk = isMacOS();
+            if (!platformOk) return {
+                platformOk: false,
+                developerDir: null,
+                needsFullXcode: false,
+                converter: null,
+                xcodebuild: null,
+                ok: false
+            };
+            const developerDir = activeDeveloperDir();
+            const needsFullXcode = !developerDir || /CommandLineTools/i.test(developerDir);
+            const converter = findWithXcrun('safari-web-extension-converter');
+            const xcodebuild = findWithXcrun('xcodebuild');
+            return {
+                platformOk,
+                developerDir,
+                needsFullXcode,
+                converter,
+                xcodebuild,
+                ok: Boolean(converter && xcodebuild)
+            };
+        }
+        function logSafariDryRun(converterCmd, xcodebuildCmd) {
+            console.log(messages.KP6());
+            console.log(messages.ycc());
+            console.log(messages.fLj(converterCmd));
+            console.log(messages.Ajw(xcodebuildCmd));
+        }
+        function sanitizeAppName(value) {
+            const cleaned = String(value || '').replace(/[\\/:*?"<>|]+/g, ' ').replace(/\s+/g, ' ').trim();
+            return cleaned.length > 0 ? cleaned : 'Extension';
+        }
+        function bundleSegment(appName) {
+            return String(appName || '').replace(/[^A-Za-z0-9]+/g, '-').replace(/^-+|-+$/g, '') || 'extension';
+        }
+        function deriveBundleId(appName) {
+            return `dev.extensionjs.${bundleSegment(appName)}`;
+        }
+        function readManifest(extensionDir) {
+            try {
+                const manifestPath = external_path_.join(extensionDir, 'manifest.json');
+                if (external_fs_.existsSync(manifestPath)) return JSON.parse(external_fs_.readFileSync(manifestPath, 'utf8')) || {};
+            } catch  {}
+            return {};
+        }
+        function resolveSafariBuildConfig(compilation, host) {
+            const extensionDir = String(compilation?.options?.output?.path || '');
+            const manifest = readManifest(extensionDir);
+            const appName = sanitizeAppName(String(host.appName || manifest?.name || 'Extension'));
+            const bundleIdentifier = deriveBundleId(appName);
+            const projectLocation = `${extensionDir.replace(/[\\/]+$/, '')}-xcode`;
+            return {
+                extensionDir,
+                projectLocation,
+                appName,
+                bundleIdentifier,
+                macOsOnly: false !== host.macOsOnly,
+                language: 'swift',
+                open: !host.noOpen,
+                safariBinary: host.safariBinary
+            };
+        }
+        function composeConverterArgs(config) {
+            const args = [
+                'safari-web-extension-converter',
+                config.extensionDir,
+                '--project-location',
+                config.projectLocation,
+                '--app-name',
+                config.appName,
+                '--bundle-identifier',
+                config.bundleIdentifier,
+                '--no-prompt',
+                '--no-open',
+                '--force',
+                'objc' === config.language ? '--objc' : '--swift'
+            ];
+            if (config.macOsOnly) args.push('--macos-only');
+            return args;
+        }
+        function macOsSchemeName(config) {
+            return config.macOsOnly ? config.appName : `${config.appName} (macOS)`;
+        }
+        function xcodeProjectPath(config) {
+            return external_path_.join(config.projectLocation, config.appName, `${config.appName}.xcodeproj`);
+        }
+        function derivedDataPath(config) {
+            return external_path_.join(config.projectLocation, '.derived');
+        }
+        function builtAppPath(config) {
+            return external_path_.join(derivedDataPath(config), 'Build', 'Products', 'Release', `${config.appName}.app`);
+        }
+        function composeXcodebuildArgs(config) {
+            return [
+                '-project',
+                xcodeProjectPath(config),
+                '-scheme',
+                macOsSchemeName(config),
+                '-configuration',
+                'Release',
+                '-derivedDataPath',
+                derivedDataPath(config),
+                'CODE_SIGN_IDENTITY=-',
+                'CODE_SIGNING_REQUIRED=NO',
+                'CODE_SIGNING_ALLOWED=YES',
+                'build'
+            ];
+        }
+        function fallbackLogger() {
+            return {
+                info: (...a)=>console.log(...a),
+                warn: (...a)=>console.warn(...a),
+                error: (...a)=>console.error(...a),
+                debug: (...a)=>console?.debug?.(...a)
+            };
+        }
+        function isTestEnv() {
+            return Boolean(process.env.VITEST || process.env.VITEST_WORKER_ID);
+        }
+        function delay(ms) {
+            return new Promise((resolve)=>setTimeout(resolve, ms));
+        }
+        function runTool(bin, args) {
+            const inheritOutput = 'true' === process.env.EXTENSION_AUTHOR_MODE;
+            return new Promise((resolve)=>{
+                const child = (0, external_child_process_.spawn)(bin, args, {
+                    stdio: inheritOutput ? 'inherit' : 'ignore'
+                });
+                child.on('error', ()=>resolve(false));
+                child.on('close', (code)=>resolve(0 === code));
+            });
+        }
+        function runToolCapture(bin, args) {
+            return new Promise((resolve)=>{
+                let stdout = '';
+                const child = (0, external_child_process_.spawn)(bin, args, {
+                    stdio: [
+                        'ignore',
+                        'pipe',
+                        'pipe'
+                    ]
+                });
+                child.stdout?.on('data', (chunk)=>{
+                    stdout += String(chunk);
+                });
+                child.on('error', ()=>resolve({
+                        ok: false,
+                        stdout
+                    }));
+                child.on('close', (code)=>resolve({
+                        ok: 0 === code,
+                        stdout
+                    }));
+            });
+        }
+        async function confirmRegisteredWithSafari(bundleIdentifier) {
+            const needle = `${bundleIdentifier}.Extension`;
+            for(let attempt = 0; attempt < 6; attempt += 1){
+                const { ok, stdout } = await runToolCapture('pluginkit', [
+                    '-m'
+                ]);
+                if (ok && stdout.includes(needle)) return true;
+                await delay(800);
+            }
+            return false;
+        }
+        function safariPreflightError() {
+            const tc = detectSafariToolchain();
+            if (!tc.platformOk) return messages.G3E(process.platform);
+            if (!tc.ok) {
+                if (tc.needsFullXcode) return messages.Xiv(tc.developerDir);
+                return messages.Csg(tc.converter ? 'xcodebuild' : 'safari-web-extension-converter');
+            }
+            return null;
+        }
+        async function runSafariPipeline(compilation, host, logger, mode) {
+            const config = resolveSafariBuildConfig(compilation, host);
+            const converterArgs = composeConverterArgs(config);
+            const xcodebuildArgs = composeXcodebuildArgs(config);
+            if (host.dryRun || isTestEnv()) return void logSafariDryRun(`xcrun ${converterArgs.join(' ')}`, `xcodebuild ${xcodebuildArgs.join(' ')}`);
+            const toolchain = detectSafariToolchain();
+            if (!toolchain.platformOk) return void logger.warn?.(messages.G3E(process.platform));
+            if (!toolchain.ok) {
+                if (toolchain.needsFullXcode) logger.error?.(messages.Xiv(toolchain.developerDir));
+                else {
+                    const missing = toolchain.converter ? 'xcodebuild' : 'safari-web-extension-converter';
+                    logger.error?.(messages.Csg(missing));
+                }
+                return;
+            }
+            const projectExists = external_fs_.existsSync(xcodeProjectPath(config));
+            if (!projectExists || host.forceRegenerate) {
+                logger.info?.(messages.uKN(config.extensionDir));
+                if (!await runTool('xcrun', converterArgs)) return void logger.error?.(messages.Qrh(new Error('safari-web-extension-converter failed')));
+                logger.info?.(messages.l_B(config.projectLocation));
+            }
+            if ('full' === mode) logger.info?.(messages.jRH(macOsSchemeName(config)));
+            if (!await runTool('xcodebuild', xcodebuildArgs)) return void logger.error?.(messages.Qrh(new Error('xcodebuild failed')));
+            const appPath = builtAppPath(config);
+            if ('resync' === mode) return void logger.info?.(messages.cFJ(config.appName));
+            logger.info?.(messages.Rl_(appPath));
+            if (config.open) {
+                const target = external_fs_.existsSync(appPath) ? appPath : xcodeProjectPath(config);
+                logger.info?.(messages.fwU(target));
+                await runTool('open', [
+                    target
+                ]);
+                if (config.safariBinary) await runTool('open', [
+                    '-a',
+                    config.safariBinary
+                ]);
+            }
+            logger.info?.(messages.fOJ(config.appName));
+            if (await confirmRegisteredWithSafari(config.bundleIdentifier)) logger.info?.(messages.fdc(config.appName));
+            else logger.warn?.(messages.qYJ(config.appName));
+        }
+        async function packageSafariExtension(host, outputPath, logger, mode = 'full') {
+            const compilation = {
+                options: {
+                    output: {
+                        path: outputPath
+                    }
+                },
+                outputOptions: {
+                    path: outputPath
+                }
+            };
+            await runSafariPipeline(compilation, host, logger || fallbackLogger(), mode);
+        }
         function normalizeSourceOption(source, startingUrl) {
             if (!source) return;
             const hasExplicitSourceString = 'string' == typeof source && 'true' !== String(source).trim().toLowerCase();
@@ -6913,7 +7427,7 @@ Cross-Browser Compatibility
             return values.length > 0 ? values : void 0;
         }
         function registerDevCommand(program) {
-            program.command('dev').arguments('[project-path|remote-url]').usage('dev [project-path|remote-url] [options]').description(commandDescriptions.dev).addHelpText('after', "\nAdditional options:\n  --no-browser    do not launch the browser (dev server still starts)\n  --no-reload     emit a dev-mode dist without the content-script reload runtime; tabs need manual reload to see changes\n  --wait          wait for ready contract and exit\n  --wait-format   pretty|json output for wait mode\n").option('--profile <path-to-file | boolean>', 'what path to use for the browser profile. A boolean value of false sets the profile to the default user profile. Defaults to a fresh profile').option('-b, --browser <chrome | chromium | edge | firefox | chromium-based | gecko-based | firefox-based>', 'specify a browser/engine to run. Defaults to `chromium`').option('--chromium-binary <path-to-binary>', 'specify a path to the Chromium binary. This option overrides the --browser setting. Defaults to the system default').option('--gecko-binary, --firefox-binary <path-to-binary>', 'specify a path to the Gecko binary. This option overrides the --browser setting. Defaults to the system default').option('--polyfill [boolean]', 'whether or not to apply the cross-browser polyfill. Defaults to `false`').option('--no-open', 'do not open the browser automatically (default: open)').option('--starting-url <url>', 'specify the starting URL for the browser. Defaults to `undefined`').option('--port <port>', 'specify the port to use for the development server. Defaults to `8080`').option('--host <host>', 'specify the host to bind the dev server to. Use 0.0.0.0 for Docker/devcontainers. Defaults to `127.0.0.1`').option('--log-context <list>', '[experimental] comma-separated contexts to include (background,content,page,sidebar,popup,options,devtools). Use `all` to include all contexts (default)').option('--logs <off|error|warn|info|debug|trace|all>', '[experimental] minimum centralized logger level to display in terminal (default: off)').option('--log-format <pretty|json|ndjson>', '[experimental] output format for logger events. Defaults to `pretty`').option('--no-log-timestamps', 'disable ISO timestamps in pretty output').option('--no-log-color', 'disable color in pretty output').option('--log-url <pattern>', '[experimental] only show logs where event.url matches this substring or regex (/re/i)').option('--log-tab <id>', 'only show logs for a specific tabId (number)').option('--source [url]', "[experimental] opens the provided URL in Chrome and prints the full, live HTML of the page after content scripts are injected").option('--watch-source [boolean]', '[experimental] re-print HTML on rebuilds or file changes (defaults to true when --source is present)', parseOptionalBoolean).option('--source-format <pretty|json|ndjson>', '[experimental] output format for source HTML (defaults to --log-format when present, otherwise JSON when --source is used)').option('--source-summary [boolean]', '[experimental] output a compact summary instead of full HTML', parseOptionalBoolean).option('--source-meta [boolean]', '[experimental] output page metadata (readyState, viewport, frames)', parseOptionalBoolean).option('--source-probe <selectors>', '[experimental] comma-separated CSS selectors to probe').option('--source-tree <off|root-only>', '[experimental] output a compact extension root tree').option('--source-console [boolean]', '[experimental] output console summary (best-effort)', parseOptionalBoolean).option('--source-dom [boolean]', '[experimental] output DOM snapshots and diffs (default: true when watch is enabled)', parseOptionalBoolean).option('--source-max-bytes <bytes>', '[experimental] limit HTML output size in bytes (0 disables truncation)').option('--source-redact <off|safe|strict>', '[experimental] redact sensitive content in HTML output (default: safe for JSON/NDJSON)').option('--source-include-shadow <off|open-only|all>', '[experimental] control Shadow DOM inclusion in HTML output (default: open-only)').option('--source-diff [boolean]', '[experimental] include diff metadata on watch updates (default: true when watch is enabled)', parseOptionalBoolean).option('--extensions <list>', 'comma-separated list of companion extensions or store URLs to load').option('--install [boolean]', '[internal] install project dependencies when missing', parseOptionalBoolean).option('--wait [boolean]', 'wait for dist/extension-js/<browser>/ready.json and exit', parseOptionalBoolean).option('--wait-timeout <ms>', 'timeout in milliseconds when using --wait (default: 60000)').option('--wait-format <pretty|json>', 'output format for --wait results (default: pretty)').option('--author, --author-mode', '[internal] enable maintainer diagnostics (does not affect user runtime logs)').action(async function(pathOrRemoteUrl, { browser = 'chromium', ...devOptions }) {
+            program.command('dev').arguments('[project-path|remote-url]').usage('dev [project-path|remote-url] [options]').description(commandDescriptions.dev).addHelpText('after', "\nAdditional options:\n  --no-browser    do not launch the browser (dev server still starts)\n  --no-reload     emit a dev-mode dist without the content-script reload runtime; tabs need manual reload to see changes\n  --wait          wait for ready contract and exit\n  --wait-format   pretty|json output for wait mode\n").option('--profile <path-to-file | boolean>', 'what path to use for the browser profile. A boolean value of false sets the profile to the default user profile. Defaults to a fresh profile').option('-b, --browser <chrome | chromium | edge | firefox | chromium-based | gecko-based | firefox-based | safari | webkit-based>', 'specify a browser/engine to run. Defaults to `chromium`. `safari` builds and opens a Safari app via Xcode (macOS only; no live reload)').option('--chromium-binary <path-to-binary>', 'specify a path to the Chromium binary. This option overrides the --browser setting. Defaults to the system default').option('--gecko-binary, --firefox-binary <path-to-binary>', 'specify a path to the Gecko binary. This option overrides the --browser setting. Defaults to the system default').option('--polyfill [boolean]', 'whether or not to apply the cross-browser polyfill. Defaults to `true`').option('--no-open', 'do not open the browser automatically (default: open)').option('--starting-url <url>', 'specify the starting URL for the browser. Defaults to `undefined`').option('--port <port>', 'specify the port to use for the development server. Defaults to `8080`').option('--host <host>', 'specify the host to bind the dev server to. Use 0.0.0.0 for Docker/devcontainers. Defaults to `127.0.0.1`').option('--log-context <list>', '[experimental] comma-separated contexts to include (background,content,page,sidebar,popup,options,devtools). Use `all` to include all contexts (default)').option('--logs <off|error|warn|info|debug|trace|all>', '[experimental] minimum centralized logger level to display in terminal (default: off)').option('--log-format <pretty|json|ndjson>', '[experimental] output format for logger events. Defaults to `pretty`').option('--no-log-timestamps', 'disable ISO timestamps in pretty output').option('--no-log-color', 'disable color in pretty output').option('--log-url <pattern>', '[experimental] only show logs where event.url matches this substring or regex (/re/i)').option('--log-tab <id>', 'only show logs for a specific tabId (number)').option('--source [url]', "[experimental] opens the provided URL in Chrome and prints the full, live HTML of the page after content scripts are injected").option('--watch-source [boolean]', '[experimental] re-print HTML on rebuilds or file changes (defaults to true when --source is present)', parseOptionalBoolean).option('--source-format <pretty|json|ndjson>', '[experimental] output format for source HTML (defaults to --log-format when present, otherwise JSON when --source is used)').option('--source-summary [boolean]', '[experimental] output a compact summary instead of full HTML', parseOptionalBoolean).option('--source-meta [boolean]', '[experimental] output page metadata (readyState, viewport, frames)', parseOptionalBoolean).option('--source-probe <selectors>', '[experimental] comma-separated CSS selectors to probe').option('--source-tree <off|root-only>', '[experimental] output a compact extension root tree').option('--source-console [boolean]', '[experimental] output console summary (best-effort)', parseOptionalBoolean).option('--source-dom [boolean]', '[experimental] output DOM snapshots and diffs (default: true when watch is enabled)', parseOptionalBoolean).option('--source-max-bytes <bytes>', '[experimental] limit HTML output size in bytes (0 disables truncation)').option('--source-redact <off|safe|strict>', '[experimental] redact sensitive content in HTML output (default: safe for JSON/NDJSON)').option('--source-include-shadow <off|open-only|all>', '[experimental] control Shadow DOM inclusion in HTML output (default: open-only)').option('--source-diff [boolean]', '[experimental] include diff metadata on watch updates (default: true when watch is enabled)', parseOptionalBoolean).option('--extensions <list>', 'comma-separated list of companion extensions or store URLs to load').option('--install [boolean]', '[internal] install project dependencies when missing', parseOptionalBoolean).option('--wait [boolean]', 'wait for dist/extension-js/<browser>/ready.json and exit', parseOptionalBoolean).option('--wait-timeout <ms>', 'timeout in milliseconds when using --wait (default: 60000)').option('--wait-format <pretty|json>', 'output format for --wait results (default: pretty)').option('--author, --author-mode', '[internal] enable maintainer diagnostics (does not affect user runtime logs)').option('--allow-control', 'enable the agent-bridge control channel for bounded act (storage/reload/open): see `extension reload|storage|open`').option('--allow-eval', 'additionally enable `extension eval` (runs arbitrary code in a context; writes a 0600 session token)').action(async function(pathOrRemoteUrl, { browser = 'chromium', ...devOptions }) {
                 if (devOptions.author || devOptions['authorMode']) {
                     process.env.EXTENSION_AUTHOR_MODE = 'true';
                     if (!process.env.EXTENSION_VERBOSE) process.env.EXTENSION_VERBOSE = '1';
@@ -6922,6 +7436,13 @@ Cross-Browser Compatibility
                 validateVendorsOrExit(list, (invalid, supported)=>{
                     console.error(unsupportedBrowserFlag(invalid, supported));
                 });
+                if (list.some(isSafariVendor)) {
+                    const issue = safariPreflightError();
+                    if (issue) {
+                        console.error(issue);
+                        process.exit(1);
+                    }
+                }
                 if (devOptions.wait) {
                     const waitResult = await runWaitMode({
                         command: 'dev',
@@ -7000,7 +7521,17 @@ Cross-Browser Compatibility
                         logColor: false !== devOptions.logColor,
                         logUrl: devOptions.logUrl,
                         logTab: devOptions.logTab,
-                        launcher: noBrowser ? void 0 : browsers.launchBrowser
+                        launcher: noBrowser ? void 0 : browsers.launchBrowser,
+                        safariPackager: async (distPath, mode)=>{
+                            await packageSafariExtension({
+                                extension: [
+                                    distPath
+                                ],
+                                browser: vendor,
+                                noOpen: false === devOptions.open,
+                                dryRun: false
+                            }, distPath, void 0, mode);
+                        }
                     };
                     await extensionDev(pathOrRemoteUrl, devArgs);
                 }
@@ -7017,6 +7548,10 @@ Cross-Browser Compatibility
                 validateVendorsOrExit(list, (invalid, supported)=>{
                     console.error(unsupportedBrowserFlag(invalid, supported));
                 });
+                if (list.some(isSafariVendor)) {
+                    console.error(safariCommandNotSupported('start'));
+                    process.exit(1);
+                }
                 if (startOptions.wait) {
                     const waitResult = await runWaitMode({
                         command: 'start',
@@ -7058,6 +7593,7 @@ Cross-Browser Compatibility
                         geckoBinary: startOptions.geckoBinary,
                         startingUrl: startOptions.startingUrl,
                         port: startOptions.port,
+                        host: startOptions.host,
                         noBrowser: false,
                         extensions: parseExtensionsList(startOptions.extensions),
                         metadataCommand: 'start',
@@ -7082,6 +7618,10 @@ Cross-Browser Compatibility
                 validateVendorsOrExit(list, (invalid, supported)=>{
                     console.error(unsupportedBrowserFlag(invalid, supported));
                 });
+                if (list.some(isSafariVendor)) {
+                    console.error(safariCommandNotSupported('preview'));
+                    process.exit(1);
+                }
                 if (!process.env.EXTJS_LIGHT) {
                     const isRemote = 'string' == typeof pathOrRemoteUrl && /^https?:/i.test(pathOrRemoteUrl);
                     if (isRemote) process.env.EXTJS_LIGHT = '1';
@@ -7113,7 +7653,7 @@ Cross-Browser Compatibility
             });
         }
         function registerBuildCommand(program) {
-            program.command('build').arguments('[project-name]').usage('build [path-to-remote-extension] [options]').description(commandDescriptions.build).option('--browser <chrome | chromium | edge | firefox | chromium-based | gecko-based | firefox-based>', 'specify a browser/engine to run. Defaults to `chromium`').option('--polyfill [boolean]', 'whether or not to apply the cross-browser polyfill. Defaults to `false`').option('--zip [boolean]', 'whether or not to compress the extension into a ZIP file. Defaults to `false`').option('--zip-source [boolean]', 'whether or not to include the source files in the ZIP file. Defaults to `false`').option('--zip-filename <string>', 'specify the name of the ZIP file. Defaults to the extension name and version').option('--silent [boolean]', 'whether or not to open the browser automatically. Defaults to `false`').option('--install [boolean]', '[internal] install project dependencies when missing', parseOptionalBoolean).option('--extensions <list>', 'comma-separated list of companion extensions or store URLs to load').option('--mode <development|production|none>', 'bundler mode override (also sets NODE_ENV). Defaults to `production`').option('--author, --author-mode', '[internal] enable maintainer diagnostics (does not affect user runtime logs)').action(async function(pathOrRemoteUrl, { browser = 'chromium', ...buildOptions }) {
+            program.command('build').arguments('[project-name]').usage('build [path-to-remote-extension] [options]').description(commandDescriptions.build).option('--browser <chrome | chromium | edge | firefox | chromium-based | gecko-based | firefox-based | safari | webkit-based>', 'specify a browser/engine to run. Defaults to `chromium`. `safari` builds a Safari app via Xcode (macOS only)').option('--polyfill [boolean]', 'whether or not to apply the cross-browser polyfill. Defaults to `false`').option('--zip [boolean]', 'whether or not to compress the extension into a ZIP file. Defaults to `false`').option('--zip-source [boolean]', 'whether or not to include the source files in the ZIP file. Defaults to `false`').option('--zip-filename <string>', 'specify the name of the ZIP file. Defaults to the extension name and version').option('--silent [boolean]', 'whether or not to open the browser automatically. Defaults to `false`').option('--install [boolean]', '[internal] install project dependencies when missing', parseOptionalBoolean).option('--extensions <list>', 'comma-separated list of companion extensions or store URLs to load').option('--mode <development|production|none>', 'bundler mode override (also sets NODE_ENV). Defaults to `production`').option('--author, --author-mode', '[internal] enable maintainer diagnostics (does not affect user runtime logs)').action(async function(pathOrRemoteUrl, { browser = 'chromium', ...buildOptions }) {
                 if (buildOptions.author || buildOptions['authorMode']) {
                     process.env.EXTENSION_AUTHOR_MODE = 'true';
                     if (!process.env.EXTENSION_VERBOSE) process.env.EXTENSION_VERBOSE = '1';
@@ -7131,6 +7671,13 @@ Cross-Browser Compatibility
                         process.exit(1);
                     }
                 }
+                if (list.some(isSafariVendor)) {
+                    const issue = safariPreflightError();
+                    if (issue) {
+                        console.error(issue);
+                        process.exit(1);
+                    }
+                }
                 const { extensionBuild } = await loadExtensionDevelopModule();
                 for (const vendor of list)await extensionBuild(pathOrRemoteUrl, {
                     browser: vendor,
@@ -7141,39 +7688,388 @@ Cross-Browser Compatibility
                     silent: buildOptions.silent,
                     install: buildOptions.install,
                     extensions: parseExtensionsList(buildOptions.extensions),
-                    mode
+                    mode,
+                    safariPackager: async (distPath, packagerMode)=>{
+                        await packageSafariExtension({
+                            extension: [
+                                distPath
+                            ],
+                            browser: vendor,
+                            noOpen: !!buildOptions.silent,
+                            dryRun: false
+                        }, distPath, void 0, packagerMode);
+                    }
                 });
             });
         }
-        function resolveManagedBrowsersCacheRoot() {
-            const explicit = String(process.env.EXT_BROWSERS_CACHE_DIR || '').trim();
-            if (explicit) return external_node_path_default().resolve(explicit);
-            const isWin = 'win32' === process.platform;
-            const isMac = 'darwin' === process.platform;
-            if (isWin) {
-                const local = String(process.env.LOCALAPPDATA || '').trim();
-                if (local) return external_node_path_default().join(local, 'extension.js', 'browsers');
-                const userProfile = String(process.env.USERPROFILE || '').trim();
-                if (userProfile) return external_node_path_default().join(userProfile, 'AppData', 'Local', 'extension.js', 'browsers');
-                return external_node_path_default().resolve(process.cwd(), '.cache', 'extension.js', 'browsers');
+        const LEVEL_ORDER = [
+            'error',
+            'warn',
+            'info',
+            'debug',
+            'trace'
+        ];
+        function levelRank(level) {
+            const l = 'log' === level ? 'info' : level;
+            const i = LEVEL_ORDER.indexOf(l);
+            return -1 === i ? LEVEL_ORDER.length : i;
+        }
+        function makeUrlMatcher(pattern) {
+            const hasGlob = pattern.includes('*');
+            let re = null;
+            if (hasGlob) {
+                const escaped = pattern.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+                re = new RegExp(escaped);
+            }
+            return (event)=>{
+                const candidates = [
+                    event.url,
+                    event.hostname
+                ].filter((v)=>'string' == typeof v);
+                if (0 === candidates.length) return false;
+                return candidates.some((c)=>re ? re.test(c) : c.includes(pattern));
+            };
+        }
+        function makeFilter(opts) {
+            const minLevel = String(opts.level || 'all').toLowerCase();
+            const contexts = opts.context && 'all' !== opts.context.toLowerCase() ? new Set(opts.context.split(',').map((c)=>c.trim())) : null;
+            const sinceSeq = null != opts.since ? Number(opts.since) : null;
+            const urlMatches = opts.url ? makeUrlMatcher(opts.url) : null;
+            const tabId = null != opts.tab && '' !== opts.tab ? Number(opts.tab) : null;
+            return (event)=>{
+                if (!event || 'object' != typeof event) return false;
+                if ('header' === event.type) return false;
+                if (opts.signalsOnly && 'dx.signal' !== event.eventType) return false;
+                if (contexts && !contexts.has(event.context)) return false;
+                if ('all' !== minLevel && 'off' !== minLevel) {
+                    if (levelRank(event.level) > levelRank(minLevel)) return false;
+                }
+                if (null != sinceSeq && Number.isFinite(sinceSeq) && 'number' == typeof event.seq && event.seq <= sinceSeq) return false;
+                if (urlMatches && !urlMatches(event)) return false;
+                if (null != tabId && Number.isFinite(tabId) && event.tabId !== tabId) return false;
+                return true;
+            };
+        }
+        function resolveFormat(opts) {
+            if (opts.output) return opts.output;
+            return process.stdout.isTTY ? 'pretty' : 'ndjson';
+        }
+        function printEvent(event, format) {
+            if ('ndjson' === format) return void console.log(JSON.stringify(event));
+            if ('json' === format) return void console.log(JSON.stringify(event, null, 2));
+            const parts = Array.isArray(event.messageParts) ? event.messageParts.map((p)=>'string' == typeof p ? p : JSON.stringify(p)).join(' ') : '';
+            const code = event.code ? ` ${event.code}` : '';
+            const remediation = event.remediation ? `\n    ↳ ${event.remediation}` : '';
+            console.log(`[${event.seq ?? '-'}] ${String(event.level || 'log').toUpperCase()} (${event.context})${code} ${parts}${remediation}`);
+        }
+        function logsFilePath(projectPath, browser) {
+            return external_path_default().resolve(projectPath, 'dist', 'extension-js', browser, 'logs.ndjson');
+        }
+        function registerLogsCommand(program) {
+            program.command('logs').arguments('[project-path]').usage('logs [project-path] [options]').description('Print or stream logs from every context of a running dev session (agent bridge)').option('--browser <chrome | chromium | edge | firefox>', 'which dist/extension-js/<browser> to read. Defaults to `chromium`').option('--follow', 'stream live via the control channel instead of printing and exiting').option('--context <list>', 'comma-separated contexts (background, content, popup, options, sidebar, devtools, page)').option('--level <off|error|warn|info|debug|trace|all>', 'minimum severity to show. Defaults to `all`').option('--signals-only', 'show only structured dx.signal diagnostics').option('--since <seq|iso>', 'only show events after this sequence number').option('--url <glob|substring>', 'only events whose url/hostname matches (glob with * or plain substring)').option('--tab <id>', 'only events from this tab id').option('--output <pretty|json|ndjson>', 'output format. Defaults to pretty on a TTY, ndjson when piped').action(async function(projectPathArg, options) {
+                const projectPath = external_path_default().resolve(projectPathArg || process.cwd());
+                const browser = options.browser || 'chromium';
+                const format = resolveFormat(options);
+                const matches = makeFilter(options);
+                if (options.follow) return void await followLogs(projectPath, browser, format, matches);
+                const file = logsFilePath(projectPath, browser);
+                if (!external_fs_default().existsSync(file)) {
+                    console.error(`No logs found at ${file}. Start a dev session (extension dev) first, or pass --browser to match it.`);
+                    process.exit(1);
+                }
+                const lines = external_fs_default().readFileSync(file, 'utf-8').split('\n').filter(Boolean);
+                for (const line of lines){
+                    let event;
+                    try {
+                        event = JSON.parse(line);
+                    } catch  {
+                        continue;
+                    }
+                    if (matches(event)) printEvent(event, format);
+                }
+            });
+        }
+        async function followLogs(projectPath, browser, format, matches) {
+            const { BridgeConsumer, readReadyContract } = await loadExtensionDevelopBridgeModule();
+            const ready = readReadyContract(projectPath, browser);
+            if (!ready) {
+                console.error(`No active dev session control channel found for ${browser}. Run \`extension dev --browser=${browser}\` first.`);
+                process.exit(1);
             }
-            if (isMac) {
-                const home = String(process.env.HOME || '').trim();
-                if (home) return external_node_path_default().join(home, 'Library', 'Caches', 'extension.js', 'browsers');
-                return external_node_path_default().resolve(process.cwd(), '.cache', 'extension.js', 'browsers');
+            const consumer = new BridgeConsumer({
+                controlPort: ready.controlPort,
+                instanceId: ready.instanceId,
+                reconnect: true,
+                onLog: (event)=>{
+                    if (matches(event)) printEvent(event, format);
+                },
+                onGap: (gap)=>{
+                    console.error(`… ${gap.dropped} event(s) dropped (${gap.reason}) — stream is behind`);
+                }
+            });
+            const shutdown = ()=>{
+                consumer.close();
+                process.exit(0);
+            };
+            process.on('SIGINT', shutdown);
+            process.on('SIGTERM', shutdown);
+            consumer.start();
+            await new Promise(()=>{});
+        }
+        function readRecentConsole(projectPath, browser, target, limit) {
+            const file = external_path_default().resolve(projectPath, 'dist', 'extension-js', browser, 'logs.ndjson');
+            let lines;
+            try {
+                lines = external_fs_default().readFileSync(file, 'utf-8').split('\n').filter(Boolean);
+            } catch  {
+                return [];
             }
-            const xdg = String(process.env.XDG_CACHE_HOME || '').trim();
-            if (xdg) return external_node_path_default().join(xdg, 'extension.js', 'browsers');
-            const home = String(process.env.HOME || '').trim();
-            if (home) return external_node_path_default().join(home, '.cache', 'extension.js', 'browsers');
-            return external_node_path_default().resolve(process.cwd(), '.cache', 'extension.js', 'browsers');
+            const out = [];
+            for (const line of lines){
+                let e;
+                try {
+                    e = JSON.parse(line);
+                } catch  {
+                    continue;
+                }
+                if (e && 'header' !== e.type) {
+                    if (!target.context || e.context === target.context) {
+                        if (null == target.tabId || e.tabId === target.tabId) out.push({
+                            seq: e.seq,
+                            level: e.level,
+                            context: e.context,
+                            messageParts: e.messageParts,
+                            eventType: e.eventType,
+                            code: e.code,
+                            tabId: e.tabId
+                        });
+                    }
+                }
+            }
+            return out.slice(Math.max(0, out.length - limit));
+        }
+        function fail(message) {
+            console.error(message);
+            process.exit(1);
+        }
+        function printResult(result, output) {
+            if ('json' === output) return void console.log(JSON.stringify(result));
+            if (result.ok) {
+                const value = result.value;
+                console.log('string' == typeof value ? value : JSON.stringify(value, null, 2));
+                if (result.truncated) console.error('… result truncated (byte cap)');
+                return;
+            }
+            const err = result.error || {
+                name: 'Error',
+                message: 'command failed'
+            };
+            console.error(`${err.name}: ${err.message}${err.engine ? ` (engine: ${err.engine})` : ''}`);
+        }
+        async function runCommand(input) {
+            const projectPath = external_path_default().resolve(input.projectPathArg || process.cwd());
+            const browser = input.opts.browser || 'chromium';
+            const { BridgeController, readReadyContract, readControlToken } = await loadExtensionDevelopBridgeModule();
+            const ready = readReadyContract(projectPath, browser);
+            if (!ready) fail(`No active control channel found for ${browser}. Run \`extension dev --browser=${browser} --allow-control\` first.`);
+            const token = input.needsToken ? readControlToken(projectPath) : void 0;
+            const controller = new BridgeController({
+                controlPort: ready.controlPort,
+                instanceId: ready.instanceId,
+                token: token ?? void 0
+            });
+            try {
+                await controller.connect();
+            } catch (err) {
+                controller.close();
+                fail(err?.message || 'could not connect to the control channel');
+            }
+            const timeoutMs = input.opts.timeout ? Number(input.opts.timeout) : 5000;
+            let result;
+            try {
+                result = await controller.command({
+                    op: input.op,
+                    target: input.target,
+                    args: input.args,
+                    timeoutMs
+                });
+            } catch (err) {
+                controller.close();
+                fail(err?.message || 'command failed');
+            } finally{
+                controller.close();
+            }
+            if (result && result.ok && input.augment) try {
+                Object.assign(result, input.augment(projectPath, browser, result));
+            } catch  {}
+            printResult(result, input.opts.output);
+            process.exit(result.ok ? 0 : 1);
         }
-        function normalizeInstallVendor(vendor) {
-            const value = String(vendor).trim().toLowerCase();
-            if ('chromium-based' === value) return 'chromium';
-            if ('gecko-based' === value || 'firefox-based' === value) return 'firefox';
-            if ('chrome' === value || 'chromium' === value || 'edge' === value || 'firefox' === value) return value;
-            return 'chromium';
+        function targetFrom(opts, fallback = 'background') {
+            const context = opts.context || fallback;
+            const target = {
+                context
+            };
+            if (opts.url) target.url = opts.url;
+            if (null != opts.tab && '' !== opts.tab) target.tabId = Number(opts.tab);
+            return target;
+        }
+        const commonOptions = (cmd)=>cmd.option('--browser <chrome | chromium | edge | firefox>', 'which session to target (default chromium)').option('--timeout <ms>', 'command timeout in milliseconds (default 5000)').option('--output <pretty|json>', 'output format (default pretty)');
+        function registerActCommands(program) {
+            commonOptions(program.command('eval').arguments('<expression> [project-path]').description('Evaluate an expression in a running extension context (requires --allow-eval)').option('--context <background|popup|options|sidebar|devtools|content|page>', 'target context (default background)').option('--url <glob|substring>', 'for content/page: document(s) to target').option('--tab <id>', 'for content/page: a specific tab')).action(async function(expression, projectPathArg, opts) {
+                await runCommand({
+                    projectPathArg,
+                    op: 'eval',
+                    target: targetFrom(opts),
+                    args: {
+                        expression
+                    },
+                    needsToken: true,
+                    opts
+                });
+            });
+            commonOptions(program.command('storage').arguments('<action> [project-path]').description('Read or write chrome.storage in a running extension (requires --allow-control)').option('--area <local|sync|session|managed>', 'storage area (default local)').option('--key <key>', 'key to get or set').option('--value <json>', 'JSON value to set (with set)').option('--context <background|popup|options|sidebar|content>', 'target context (default background)')).action(async function(action, projectPathArg, opts) {
+                const area = opts.area || 'local';
+                if ('get' === action) return void await runCommand({
+                    projectPathArg,
+                    op: 'storage.get',
+                    target: targetFrom(opts),
+                    args: opts.key ? {
+                        area,
+                        key: opts.key
+                    } : {
+                        area
+                    },
+                    opts
+                });
+                if ('set' === action) {
+                    if (!opts.key || null == opts.value) fail('storage set requires --key and --value');
+                    let parsed;
+                    try {
+                        parsed = JSON.parse(opts.value);
+                    } catch  {
+                        parsed = opts.value;
+                    }
+                    await runCommand({
+                        projectPathArg,
+                        op: 'storage.set',
+                        target: targetFrom(opts),
+                        args: {
+                            area,
+                            items: {
+                                [opts.key]: parsed
+                            }
+                        },
+                        opts
+                    });
+                    return;
+                }
+                fail(`unknown storage action: ${action} (use get or set)`);
+            });
+            commonOptions(program.command('reload').arguments('[project-path]').description('Reload a running extension or tab (requires --allow-control)').option('--context <background|content|page>', 'target context (default background)').option('--tab <id>', 'for content/page: a specific tab')).action(async function(projectPathArg, opts) {
+                await runCommand({
+                    projectPathArg,
+                    op: 'reload',
+                    target: targetFrom(opts),
+                    opts
+                });
+            });
+            commonOptions(program.command('inspect').arguments('[project-path]').description('Inspect a page/content DOM via the agent bridge (CDP-free; requires --allow-control). For closed shadow roots use dev --source --deep-dom.').option('--context <content|page|popup|options|sidebar|devtools>', 'what to inspect: content/page (needs --tab) or an open surface (default content)').option('--tab <id>', 'tab id to inspect (required for content/page)').option('--include <list>', 'comma-separated: html,summary (default summary)').option('--max-bytes <n>', 'cap on returned HTML bytes (default 262144)').option('--with-console [n]', 'also include the last n console lines for the target (default 20)')).action(async function(projectPathArg, opts) {
+                const include = opts.include ? opts.include.split(',').map((s)=>s.trim()).filter(Boolean) : [
+                    'summary'
+                ];
+                const target = targetFrom(opts, 'content');
+                await runCommand({
+                    projectPathArg,
+                    op: 'inspect',
+                    target,
+                    args: {
+                        include,
+                        maxBytes: opts.maxBytes ? Number(opts.maxBytes) : void 0
+                    },
+                    opts,
+                    augment: opts.withConsole ? (projectPath, browser)=>{
+                        const n = 'string' == typeof opts.withConsole && '' !== opts.withConsole ? Number(opts.withConsole) : 20;
+                        return {
+                            console: readRecentConsole(projectPath, browser, target, Number.isFinite(n) && n > 0 ? n : 20)
+                        };
+                    } : void 0
+                });
+            });
+            commonOptions(program.command('open').arguments('<surface> [project-path]').description('Open an extension surface — popup, options, or sidebar (requires --allow-control)')).action(async function(surface, projectPathArg, opts) {
+                const allowed = [
+                    'popup',
+                    'options',
+                    'sidebar'
+                ];
+                if (!allowed.includes(surface)) fail(`unknown surface: ${surface} (use popup, options, or sidebar)`);
+                await runCommand({
+                    projectPathArg,
+                    op: 'open',
+                    target: {
+                        context: surface
+                    },
+                    args: {
+                        surface
+                    },
+                    opts
+                });
+            });
+        }
+        const DEFAULT_API = 'https://www.extension.dev';
+        function buildPublishRequest(opts) {
+            const token = String(opts.token || process.env.EXTENSION_DEV_TOKEN || '').trim();
+            if (!token) throw new Error("No token. Set EXTENSION_DEV_TOKEN (create one in the extension.dev dashboard, or via the project access-tokens API) or pass --token.");
+            const base = String(opts.api || process.env.EXTENSION_DEV_API_URL || DEFAULT_API).replace(/\/+$/, '');
+            const body = {};
+            if (null != opts.ttl && '' !== opts.ttl) body.ttlHours = Number(opts.ttl);
+            if (opts.buildSha) body.buildSha = opts.buildSha;
+            return {
+                url: `${base}/api/cli/publish`,
+                headers: {
+                    authorization: `Bearer ${token}`,
+                    'content-type': 'application/json'
+                },
+                body: JSON.stringify(body)
+            };
+        }
+        function registerPublishCommand(program) {
+            program.command('publish').arguments('[project-path]').usage('publish [project-path] [options]').description('Publish to extension.dev and print a shareable URL (requires EXTENSION_DEV_TOKEN)').option('--token <token>', 'extension.dev access token (or EXTENSION_DEV_TOKEN)').option('--api <url>', 'platform base URL (or EXTENSION_DEV_API_URL)').option('--ttl <hours>', 'share-link lifetime in hours (1–168, default 24)').option('--build-sha <sha>', 'pin the share URL to a specific build').option('--output <pretty|json>', 'output format (default pretty)').action(async function(_projectPathArg, opts) {
+                let req;
+                try {
+                    req = buildPublishRequest(opts);
+                } catch (err) {
+                    console.error(err?.message || 'publish failed');
+                    process.exit(1);
+                }
+                let res;
+                try {
+                    res = await fetch(req.url, {
+                        method: 'POST',
+                        headers: req.headers,
+                        body: req.body
+                    });
+                } catch (err) {
+                    console.error(`Could not reach ${req.url}: ${err?.message || err}`);
+                    process.exit(1);
+                }
+                const text = await res.text();
+                let data;
+                try {
+                    data = JSON.parse(text);
+                } catch  {
+                    data = {
+                        message: text
+                    };
+                }
+                if (!res.ok) {
+                    console.error(`publish failed (${res.status}): ${data?.message || text || 'unknown error'}`);
+                    process.exit(1);
+                }
+                if ('json' === opts.output) console.log(JSON.stringify(data));
+                else console.log(data.shareUrl || JSON.stringify(data));
+                process.exit(0);
+            });
         }
         function registerInstallCommand(program) {
             program.command('install').arguments('[browser-name]').usage('[browser-name] [options]').description(commandDescriptions.install).option('--browser <chrome | chromium | edge | firefox | chromium-based | gecko-based | firefox-based | all>', 'override the positional browser name. Supports comma-separated values and `all`.').option('--where', 'print the resolved managed browser cache root').action(async function(browserArg, options) {
@@ -7182,37 +8078,35 @@ Cross-Browser Compatibility
                 validateVendorsOrExit(browserList, (invalid, supported)=>{
                     console.error(unsupportedBrowserFlag(invalid, supported));
                 });
+                const { extensionInstall, getManagedBrowsersCacheRoot, getManagedBrowserInstallDir } = await import("extension-install");
                 if (options.where) {
-                    const root = resolveManagedBrowsersCacheRoot();
-                    if (options.browser || browserArg) for (const browser of browserList)console.log(external_node_path_default().join(root, normalizeInstallVendor(browser)));
-                    else console.log(root);
+                    if (options.browser || browserArg) for (const browser of browserList)console.log(getManagedBrowserInstallDir(browser));
+                    else console.log(getManagedBrowsersCacheRoot());
                     return;
                 }
-                const { extensionInstall } = await import("extension-install");
                 for (const browser of browserList)await extensionInstall({
                     browser
                 });
             });
             program.command('uninstall').usage('uninstall <browser-name> | uninstall --all | uninstall --where').description(commandDescriptions.uninstall).option('--browser <browser-name>', 'browser to uninstall').option('--all', 'remove all managed browser binaries').option('--where', 'print the resolved managed browser cache root').argument('[browser-name]').action(async function(browserArg, { browser, all, where }) {
                 const target = browserArg || browser;
+                const { extensionUninstall, getManagedBrowsersCacheRoot, getManagedBrowserInstallDir } = await import("extension-install");
                 if (where) {
-                    const root = resolveManagedBrowsersCacheRoot();
                     if (all) for (const browser of [
                         'chrome',
                         'chromium',
                         'edge',
                         'firefox'
-                    ])console.log(external_node_path_default().join(root, browser));
+                    ])console.log(getManagedBrowserInstallDir(browser));
                     else if (target) {
                         const list = vendors(target);
                         validateVendorsOrExit(list, (invalid, supported)=>{
                             console.error(unsupportedBrowserFlag(invalid, supported));
                         });
-                        for (const browser of list)console.log(external_node_path_default().join(root, normalizeInstallVendor(browser)));
-                    } else console.log(root);
+                        for (const browser of list)console.log(getManagedBrowserInstallDir(browser));
+                    } else console.log(getManagedBrowsersCacheRoot());
                     return;
                 }
-                const { extensionUninstall } = await import("extension-install");
                 await extensionUninstall({
                     browser: target,
                     all
@@ -7358,6 +8252,9 @@ Cross-Browser Compatibility
         registerStartCommand(extensionJs);
         registerPreviewCommand(extensionJs);
         registerBuildCommand(extensionJs);
+        registerLogsCommand(extensionJs);
+        registerActCommands(extensionJs);
+        registerPublishCommand(extensionJs);
         registerInstallCommand(extensionJs);
         registerTelemetryCommand(extensionJs);
         extensionJs.on('option:ai-help', function() {