extension 4.0.30 → 4.0.33

package/dist/cli.cjs

@@ -169,7 +169,9 @@ var __webpack_modules__ = {
         async function printProdBannerOnce(opts) {
             const k = keyFor(opts.browser, opts.outPath);
             if (printedKeys.has(k) || (0, _helpers_messaging__rspack_import_3.VR)(baseKeyFor(opts.browser, opts.outPath))) return true;
-            const browserLabel = (0, _helpers_messaging__rspack_import_3.A6)(String(opts.browser || 'unknown'), _messages__rspack_import_5.GK(String(opts.browser || ''), opts.browserVersionLine));
+            const browserLabel = (0, _helpers_messaging__rspack_import_3.A6)(String(opts.browser || 'unknown'), _messages__rspack_import_5.GK(String(opts.browser || ''), opts.browserVersionLine, {
+                pinned: 'pinned' === opts.binaryProvenance
+            }));
             try {
                 const manifestPath = node_path__rspack_import_2.join(opts.outPath, 'manifest.json');
                 const manifest = JSON.parse(node_fs__rspack_import_1.readFileSync(manifestPath, 'utf-8'));
@@ -454,9 +456,10 @@ var __webpack_modules__ = {
         function capitalizedBrowserName(browser) {
             return `${browser.charAt(0).toUpperCase() + browser.slice(1)}`;
         }
-        function resolveBrowserVersionLine(browser, pinnedLine) {
+        function resolveBrowserVersionLine(browser, pinnedLine, opts) {
             const pinned = String(pinnedLine || '').trim();
             if (pinned) return pinned;
+            if (opts?.pinned) return '';
             try {
                 if ('chromium' === browser || 'chromium-based' === browser) {
                     const p = chromium_location__rspack_import_5_default()();
@@ -817,7 +820,9 @@ var __webpack_modules__ = {
                     return 'unknown';
                 }
             })();
-            const baseBrowserLabel = (0, _helpers_messaging__rspack_import_9.A6)(String(browser || 'unknown'), resolveBrowserVersionLine(browser, browserVersionLine));
+            const baseBrowserLabel = (0, _helpers_messaging__rspack_import_9.A6)(String(browser || 'unknown'), resolveBrowserVersionLine(browser, browserVersionLine, {
+                pinned: opts?.binaryProvenance === 'pinned'
+            }));
             const provenanceNote = binaryProvenanceNote(opts?.binaryProvenance);
             const browserLabel = provenanceNote ? `${baseBrowserLabel} ${provenanceNote}` : baseBrowserLabel;
             const binaryRowValue = provenanceNote ? collapseHomeDirInCardValue(String(opts?.binaryPath || '').trim()) : '';
@@ -1083,24 +1088,57 @@ var __webpack_modules__ = {
                 if (node_fs__rspack_import_0.existsSync(chromeNested)) scanRoots.push(chromeNested);
             }
             const versionDirPattern = /^(mac|mac_arm|win32|win64|linux)/i;
-            const candidateFiles = [];
+            const versionDirs = [];
             for (const root of scanRoots)try {
                 const entries = node_fs__rspack_import_0.readdirSync(root, {
                     withFileTypes: true
                 });
-                const versionDirs = entries.filter((entry)=>entry.isDirectory() && versionDirPattern.test(entry.name)).map((entry)=>node_path__rspack_import_1.join(root, entry.name));
-                for (const dir of versionDirs)candidateFiles.push(...buildCandidates(dir, browser));
-            } catch  {}
-            for (const candidate of candidateFiles)try {
-                if (candidate && node_fs__rspack_import_0.existsSync(candidate)) return candidate;
+                for (const entry of entries)if (entry.isDirectory() && versionDirPattern.test(entry.name)) versionDirs.push(node_path__rspack_import_1.join(root, entry.name));
             } catch  {}
+            versionDirs.sort(compareManagedBuildDirsNewestFirst);
             const names = executableNamesFor(browser);
+            for (const dir of versionDirs){
+                for (const candidate of buildCandidates(dir, browser))if (isUsableBinaryPath(candidate)) return candidate;
+                const found = findExecutableUnder(dir, names, 6);
+                if (found) return found;
+            }
             for (const root of scanRoots){
                 const found = findExecutableUnder(root, names, 6);
                 if (found) return found;
             }
             return null;
         }
+        const MANAGED_BUILD_DIR_PREFIX = /^(?:mac_arm|mac-arm|mac|win64|win32|linux64|linux)[-_]/i;
+        function parseManagedBuildId(dirName) {
+            const name = String(dirName || '');
+            const buildId = name.replace(MANAGED_BUILD_DIR_PREFIX, '');
+            return buildId.split(/[^\d]+/).filter(Boolean).map((part)=>Number(part)).filter((part)=>Number.isFinite(part));
+        }
+        function compareManagedBuildDirNames(a, b) {
+            const partsA = parseManagedBuildId(a);
+            const partsB = parseManagedBuildId(b);
+            const length = Math.max(partsA.length, partsB.length);
+            for(let i = 0; i < length; i++){
+                const na = partsA[i] ?? 0;
+                const nb = partsB[i] ?? 0;
+                if (na !== nb) return na - nb;
+            }
+            return String(a).localeCompare(String(b));
+        }
+        function compareManagedBuildDirsNewestFirst(a, b) {
+            const byBuild = compareManagedBuildDirNames(node_path__rspack_import_1.basename(b), node_path__rspack_import_1.basename(a));
+            if (0 !== byBuild) return byBuild;
+            let timeA = 0;
+            let timeB = 0;
+            try {
+                timeA = node_fs__rspack_import_0.statSync(a).mtimeMs;
+            } catch  {}
+            try {
+                timeB = node_fs__rspack_import_0.statSync(b).mtimeMs;
+            } catch  {}
+            if (timeA !== timeB) return timeB - timeA;
+            return node_path__rspack_import_1.basename(b).localeCompare(node_path__rspack_import_1.basename(a));
+        }
         function resolveChromiumFamilyFallback(compilation, requested = 'chromium') {
             const candidates = 'chrome' === requested ? [
                 'chromium',
@@ -1134,6 +1172,13 @@ var __webpack_modules__ = {
             else out.push(node_path__rspack_import_1.join(dir, 'firefox'));
             return out;
         }
+        function isUsableBinaryPath(candidate) {
+            try {
+                return Boolean(candidate) && node_fs__rspack_import_0.statSync(candidate).isFile();
+            } catch  {
+                return false;
+            }
+        }
         function executableNamesFor(browser) {
             if ('chrome' === browser) return 'win32' === process.platform ? [
                 'chrome.exe'
@@ -1152,6 +1197,7 @@ var __webpack_modules__ = {
             if ('edge' === browser) return 'win32' === process.platform ? [
                 'msedge.exe'
             ] : [
+                'Microsoft Edge',
                 'msedge',
                 'microsoft-edge'
             ];
@@ -1545,6 +1591,9 @@ var __webpack_modules__ = {
         var node_net__rspack_import_1 = __webpack_require__("node:net");
         var node_os__rspack_import_2 = __webpack_require__("node:os");
         var node_path__rspack_import_3 = __webpack_require__("node:path");
+        var chrome_location2__rspack_import_4 = __webpack_require__("chrome-location2");
+        var chromium_location__rspack_import_5 = __webpack_require__("chromium-location");
+        var edge_location__rspack_import_6 = __webpack_require__("edge-location");
         __webpack_require__("./browsers/browsers-lib/constants.ts");
         const MANAGED_EPHEMERAL_PROFILE_MARKER = '.extension-js-managed-profile';
         function shortInstanceId(instanceId) {
@@ -1563,8 +1612,12 @@ var __webpack_modules__ = {
             const finalPort = 'number' == typeof parsed && Number.isFinite(parsed) && parsed > 0 ? parsed : devServerPort;
             return 'number' == typeof finalPort && finalPort > 0 ? finalPort + 100 : defaultPort;
         }
-        function filterBrowserFlags(defaultFlags, excludeFlags = []) {
-            return defaultFlags.filter((flag)=>!excludeFlags.some((excludeFlag)=>flag === excludeFlag));
+        function filterBrowserFlags(flags, excludeFlags = []) {
+            return flags.filter((flag)=>!excludeFlags.some((excludeFlag)=>{
+                    if (!excludeFlag) return false;
+                    if (flag === excludeFlag) return true;
+                    return flag.startsWith(`${excludeFlag}=`) || flag.startsWith(`${excludeFlag},`);
+                }));
         }
         function chooseChromiumBinaryPreferringStable(opts) {
             const managed = opts.managedSnapshotBinary;
@@ -1607,6 +1660,28 @@ var __webpack_modules__ = {
             const underManagedRoot = relative.length > 0 && !relative.startsWith('..') && !node_path__rspack_import_3.isAbsolute(relative);
             return underManagedRoot ? 'managed' : 'system';
         }
+        function probeChromiumBinaryVersion(bin, browser) {
+            const target = String(browser || '');
+            const probes = [];
+            if ('edge' === target) probes.push(()=>(0, edge_location__rspack_import_6.getEdgeVersion)(bin, {
+                    allowExec: true
+                }));
+            if ('chromium' === target || 'chromium-based' === target) probes.push(()=>(0, chromium_location__rspack_import_5.getChromiumVersion)(bin, {
+                    allowExec: true
+                }));
+            probes.push(()=>(0, chrome_location2__rspack_import_4.getChromeVersion)(bin, {
+                    allowExec: true
+                }), ()=>(0, chromium_location__rspack_import_5.getChromiumVersion)(bin, {
+                    allowExec: true
+                }), ()=>(0, edge_location__rspack_import_6.getEdgeVersion)(bin, {
+                    allowExec: true
+                }));
+            for (const probe of probes)try {
+                const line = probe();
+                if (line && String(line).trim()) return String(line).trim();
+            } catch  {}
+            return '';
+        }
         function parseEnvBrowserFlags(raw) {
             return String(raw || '').split(/\s+/).map((flag)=>flag.trim()).filter(Boolean);
         }
@@ -1789,7 +1864,8 @@ var __webpack_modules__ = {
             ci: ()=>isProfileLockedError,
             jl: ()=>deriveDebugPortWithInstance,
             ov: ()=>filterBrowserFlags,
-            sW: ()=>removeManagedEphemeralProfile
+            sW: ()=>removeManagedEphemeralProfile,
+            yO: ()=>probeChromiumBinaryVersion
         });
     },
     "./browsers/browsers-lib/wsl-support.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
@@ -2529,7 +2605,7 @@ var __webpack_modules__ = {
                     '--remote-debugging-pipe'
                 ] : [],
                 ...filteredFlags,
-                ...configOptions.browserFlags || [],
+                ...(0, shared_utils.ov)(configOptions.browserFlags || [], excludeFlags),
                 ...(0, shared_utils.W0)(process.env.EXTENSION_BROWSER_FLAGS)
             ];
             if ((0, shared_utils.ZO)() && !baseFlags.some((flag)=>flag.startsWith('--headless'))) baseFlags.push('--headless=new');
@@ -2798,7 +2874,16 @@ var __webpack_modules__ = {
                 });
             }
             async launchChromium(compilation, opts) {
-                if (this.options?.dryRun || process.env.VITEST || process.env.VITEST_WORKER_ID) return void logChromiumDryRun('chromium-mock-binary', []);
+                if (this.options?.chromiumBinary) {
+                    const requested = String(this.options.chromiumBinary);
+                    const normalizedEarly = (0, wsl_support.f7)(requested);
+                    if (!normalizedEarly || !external_node_fs_.existsSync(normalizedEarly)) {
+                        (0, messaging.Gg)(messages.Sp(requested));
+                        if (process.env.VITEST || process.env.VITEST_WORKER_ID) throw new Error(`Invalid --chromium-binary path: ${requested}`);
+                        process.exit(1);
+                    }
+                }
+                if (this.options?.dryRun || process.env.VITEST || process.env.VITEST_WORKER_ID) return void logChromiumDryRun(this.options?.chromiumBinary ? (0, wsl_support.f7)(String(this.options.chromiumBinary)) : 'chromium-mock-binary', []);
                 const browser = this.options?.browser;
                 let browserBinaryLocation = null;
                 let printedGuidance = false;
@@ -2858,8 +2943,18 @@ var __webpack_modules__ = {
                     this.printEnhancedPuppeteerInstallHint(compilation, raw, browserName);
                     printedGuidance = true;
                 };
-                browserBinaryLocation = resolveManagedBinary();
-                if ('chromium' === browser && browserBinaryLocation) {
+                const requestedPin = this.options?.chromiumBinary != null ? String(this.options.chromiumBinary) : '';
+                if (requestedPin) {
+                    const normalized = normalizePath(requestedPin);
+                    if (!normalized || !isUsableBinary(normalized)) {
+                        (0, messaging.Gg)(messages.Sp(requestedPin));
+                        if (process.env.VITEST || process.env.VITEST_WORKER_ID) throw new Error(`Invalid --chromium-binary path: ${requestedPin}`);
+                        process.exit(1);
+                    }
+                    browserBinaryLocation = normalized;
+                    binaryPinnedByFlag = true;
+                } else browserBinaryLocation = resolveManagedBinary();
+                if ('chromium' === browser && browserBinaryLocation && !binaryPinnedByFlag) {
                     let systemBinary = null;
                     try {
                         const env = {
@@ -2885,7 +2980,7 @@ var __webpack_modules__ = {
                     }
                 }
                 let skipDetection = Boolean(browserBinaryLocation);
-                if (!browserBinaryLocation && (0, wsl_support.EV)()) {
+                if (!binaryPinnedByFlag && !browserBinaryLocation && (0, wsl_support.EV)()) {
                     const linuxFallback = resolveWslLinuxBinary(browser);
                     if (linuxFallback) {
                         browserBinaryLocation = linuxFallback;
@@ -2898,16 +2993,8 @@ var __webpack_modules__ = {
                         }
                     }
                 }
-                browserBinaryLocation = preferRealChromeBinary(browserBinaryLocation);
-                const getBrowserVersionLine = (bin)=>{
-                    try {
-                        if ('edge' === browser) return (0, external_edge_location_.getEdgeVersion)(bin) || '';
-                        if ('chromium' === browser || 'chromium-based' === browser) return (0, external_chromium_location_.getChromiumVersion)(bin) || '';
-                        return (0, external_chrome_location2_.getChromeVersion)(bin) || '';
-                    } catch  {
-                        return '';
-                    }
-                };
+                if (!binaryPinnedByFlag) browserBinaryLocation = preferRealChromeBinary(browserBinaryLocation);
+                const getBrowserVersionLine = (bin)=>shared_utils.yO(bin, String(browser || ''));
                 const looksOfficialChromeBinaryPath = (bin)=>{
                     const p = String(bin || '');
                     if (!p) return false;
@@ -2962,7 +3049,7 @@ var __webpack_modules__ = {
                         return null;
                     }
                 };
-                switch(browser){
+                if (!binaryPinnedByFlag) switch(browser){
                     case 'chrome':
                         if (isAuthorMode) (0, messaging._w)(messages.Gq(browser));
                         if (!skipDetection) browserBinaryLocation = resolveChromeLikeBinary();
@@ -2984,15 +3071,6 @@ var __webpack_modules__ = {
                         break;
                     case 'chromium':
                         if (isAuthorMode) (0, messaging._w)(messages.Gq(browser));
-                        if (this.options?.chromiumBinary) {
-                            const normalized = normalizePath(String(this.options.chromiumBinary));
-                            if (!normalized || !external_node_fs_.existsSync(normalized)) {
-                                (0, messaging.Gg)(messages.Sp(String(this.options.chromiumBinary)));
-                                process.exit(1);
-                            }
-                            browserBinaryLocation = normalized;
-                            binaryPinnedByFlag = true;
-                        }
                         if (!browserBinaryLocation && !skipDetection) try {
                             const env = managedEnvFor('chromium');
                             const p = external_chromium_location_default()({
@@ -3046,36 +3124,20 @@ var __webpack_modules__ = {
                         }
                         break;
                     case 'chromium-based':
-                        browserBinaryLocation = this.options?.chromiumBinary || null;
-                        if (this.options?.chromiumBinary) {
-                            const normalized = normalizePath(String(this.options.chromiumBinary));
-                            if (!normalized || !external_node_fs_.existsSync(normalized)) {
-                                (0, messaging.Gg)(messages.Sp(String(this.options.chromiumBinary)));
-                                process.exit(1);
-                            }
-                            browserBinaryLocation = normalized;
-                            binaryPinnedByFlag = true;
-                        } else {
-                            (0, messaging.Gg)(messages.ne());
-                            process.exit(1);
-                        }
-                        if (!browserBinaryLocation && !skipDetection) try {
-                            const env = managedEnvFor('chromium');
-                            const p = external_chromium_location_default()({
-                                env
-                            });
-                            const normalized = normalizePath(p || null);
-                            if (normalized && 'string' == typeof normalized) {
-                                if (external_node_fs_.existsSync(normalized)) browserBinaryLocation = normalized;
-                            }
-                        } catch  {}
-                        if (!browserBinaryLocation) browserBinaryLocation = resolveWslFallback();
+                        (0, messaging.Gg)(messages.ne());
+                        if (process.env.VITEST || process.env.VITEST_WORKER_ID) throw new Error('chromium-based requires --chromium-binary');
+                        process.exit(1);
                         break;
                     default:
                         browserBinaryLocation = resolveChromeLikeBinary();
                         break;
                 }
                 if (!browserBinaryLocation || !external_node_fs_.existsSync(browserBinaryLocation)) {
+                    if (binaryPinnedByFlag) {
+                        (0, messaging.Gg)(messages.Sp(requestedPin));
+                        if (process.env.VITEST || process.env.VITEST_WORKER_ID) throw new Error(`Invalid --chromium-binary path: ${requestedPin}`);
+                        process.exit(1);
+                    }
                     browserBinaryLocation = browserBinaryLocation || resolveManagedBinary();
                     if (!browserBinaryLocation) browserBinaryLocation = resolveWslFallback();
                     if ((!browserBinaryLocation || !external_node_fs_.existsSync(browserBinaryLocation)) && ('chrome' === browser || 'chromium' === browser)) {
@@ -3643,7 +3705,7 @@ var __webpack_modules__ = {
             const { browser, profile, browserFlags = [] } = configOptions;
             const binaryArgs = [];
             const excludeFlags = configOptions.excludeBrowserFlags || [];
-            const filteredFlags = (browserFlags || []).filter((flag)=>excludeFlags.every((ex)=>!String(flag).startsWith(ex)));
+            const filteredFlags = (0, shared_utils.ov)((browserFlags || []).map(String), excludeFlags);
             if (filteredFlags.length > 0) binaryArgs.push(...filteredFlags);
             binaryArgs.push(...(0, shared_utils.W0)(process.env.EXTENSION_BROWSER_FLAGS));
             if (configOptions.startingUrl && !configOptions.noOpen) binaryArgs.push('--url', String(configOptions.startingUrl));
@@ -5165,18 +5227,16 @@ var __webpack_modules__ = {
     },
     "./browsers/run-only.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         var node_fs__rspack_import_0 = __webpack_require__("node:fs");
-        var chrome_location2__rspack_import_1 = __webpack_require__("chrome-location2");
-        var chromium_location__rspack_import_2 = __webpack_require__("chromium-location");
-        var edge_location__rspack_import_3 = __webpack_require__("edge-location");
-        var firefox_location2__rspack_import_4 = __webpack_require__("firefox-location2");
-        var _browsers_lib_banner__rspack_import_5 = __webpack_require__("./browsers/browsers-lib/banner.ts");
-        var _browsers_lib_browser_family__rspack_import_6 = __webpack_require__("./browsers/browsers-lib/browser-family.ts");
-        var _browsers_lib_output_binaries_resolver__rspack_import_7 = __webpack_require__("./browsers/browsers-lib/output-binaries-resolver.ts");
-        var _browsers_lib_runtime_options__rspack_import_12 = __webpack_require__("./browsers/browsers-lib/runtime-options.ts");
-        var _run_chromium_chromium_context__rspack_import_10 = __webpack_require__("./browsers/run-chromium/chromium-context/index.ts");
-        var _run_chromium_chromium_launch__rspack_import_8 = __webpack_require__("./browsers/run-chromium/chromium-launch/index.ts");
-        var _run_firefox_firefox_context__rspack_import_11 = __webpack_require__("./browsers/run-firefox/firefox-context/index.ts");
-        var _run_firefox_firefox_launch__rspack_import_9 = __webpack_require__("./browsers/run-firefox/firefox-launch/index.ts");
+        var firefox_location2__rspack_import_1 = __webpack_require__("firefox-location2");
+        var _browsers_lib_banner__rspack_import_2 = __webpack_require__("./browsers/browsers-lib/banner.ts");
+        var _browsers_lib_browser_family__rspack_import_3 = __webpack_require__("./browsers/browsers-lib/browser-family.ts");
+        var _browsers_lib_output_binaries_resolver__rspack_import_4 = __webpack_require__("./browsers/browsers-lib/output-binaries-resolver.ts");
+        var _browsers_lib_runtime_options__rspack_import_10 = __webpack_require__("./browsers/browsers-lib/runtime-options.ts");
+        var _browsers_lib_shared_utils__rspack_import_5 = __webpack_require__("./browsers/browsers-lib/shared-utils.ts");
+        var _run_chromium_chromium_context__rspack_import_8 = __webpack_require__("./browsers/run-chromium/chromium-context/index.ts");
+        var _run_chromium_chromium_launch__rspack_import_6 = __webpack_require__("./browsers/run-chromium/chromium-launch/index.ts");
+        var _run_firefox_firefox_context__rspack_import_9 = __webpack_require__("./browsers/run-firefox/firefox-context/index.ts");
+        var _run_firefox_firefox_launch__rspack_import_7 = __webpack_require__("./browsers/run-firefox/firefox-launch/index.ts");
         function createPreviewCompilationLike(opts) {
             return {
                 options: {
@@ -5262,26 +5322,29 @@ var __webpack_modules__ = {
         }
         function resolvePinnedBinaryVersionLine(opts) {
             try {
-                if ((0, _browsers_lib_browser_family__rspack_import_6.M_)(opts.browser)) {
+                if ((0, _browsers_lib_browser_family__rspack_import_3.M_)(opts.browser)) {
                     if (!opts.geckoBinary || !node_fs__rspack_import_0.existsSync(opts.geckoBinary)) return;
-                    return (0, firefox_location2__rspack_import_4.getFirefoxVersion)(opts.geckoBinary) || void 0;
+                    return (0, firefox_location2__rspack_import_1.getFirefoxVersion)(opts.geckoBinary) || void 0;
                 }
                 if (!opts.chromiumBinary || !node_fs__rspack_import_0.existsSync(opts.chromiumBinary)) return;
-                if ('edge' === opts.browser) return (0, edge_location__rspack_import_3.getEdgeVersion)(opts.chromiumBinary) || void 0;
-                if ('chromium' === opts.browser || 'chromium-based' === opts.browser) return (0, chromium_location__rspack_import_2.getChromiumVersion)(opts.chromiumBinary) || void 0;
-                return (0, chrome_location2__rspack_import_1.getChromeVersion)(opts.chromiumBinary) || void 0;
+                return (0, _browsers_lib_shared_utils__rspack_import_5.yO)(opts.chromiumBinary, String(opts.browser)) || void 0;
             } catch  {
                 return;
             }
         }
         function buildPreviewBannerOptions(opts) {
+            const chromiumPinned = !(0, _browsers_lib_browser_family__rspack_import_3.M_)(opts.browser) && 'string' == typeof opts.chromiumBinary && node_fs__rspack_import_0.existsSync(opts.chromiumBinary);
             return {
                 browser: opts.browser,
                 outPath: opts.outPath,
                 includeExtensionId: true,
                 includeRunId: false,
                 readyPath: opts.readyPath,
-                browserVersionLine: resolvePinnedBinaryVersionLine(opts)
+                browserVersionLine: resolvePinnedBinaryVersionLine(opts),
+                ...chromiumPinned ? {
+                    binaryPath: opts.chromiumBinary,
+                    binaryProvenance: 'pinned'
+                } : {}
             };
         }
         async function runOnlyPreviewBrowser(opts) {
@@ -5297,21 +5360,21 @@ var __webpack_modules__ = {
             const compilationLike = createPreviewCompilationLike(opts);
             const previewPluginOptions = buildPreviewPluginOptions(opts);
             const bannerOptions = buildPreviewBannerOptions(opts);
-            (0, _browsers_lib_output_binaries_resolver__rspack_import_7.LB)(compilationLike);
-            if ((0, _browsers_lib_browser_family__rspack_import_6.rG)(opts.browser)) {
-                const ctx = (0, _run_chromium_chromium_context__rspack_import_10.g)();
-                const launcher = new _run_chromium_chromium_launch__rspack_import_8.f(buildPreviewChromiumOptions(opts), ctx);
-                await (0, _browsers_lib_banner__rspack_import_5.MK)(bannerOptions);
+            (0, _browsers_lib_output_binaries_resolver__rspack_import_4.LB)(compilationLike);
+            if ((0, _browsers_lib_browser_family__rspack_import_3.rG)(opts.browser)) {
+                const ctx = (0, _run_chromium_chromium_context__rspack_import_8.g)();
+                const launcher = new _run_chromium_chromium_launch__rspack_import_6.f(buildPreviewChromiumOptions(opts), ctx);
+                await (0, _browsers_lib_banner__rspack_import_2.MK)(bannerOptions);
                 await launcher.runOnce(compilationLike, {
                     enableCdpPostLaunch: false
                 });
                 return;
             }
-            if ((0, _browsers_lib_browser_family__rspack_import_6.M_)(opts.browser)) {
-                const ctx = (0, _run_firefox_firefox_context__rspack_import_11.D)();
-                const launcher = new _run_firefox_firefox_launch__rspack_import_9.c(buildPreviewFirefoxOptions(opts), ctx);
-                await (0, _browsers_lib_banner__rspack_import_5.MK)(bannerOptions);
-                await launcher.runOnce(compilationLike, (0, _browsers_lib_runtime_options__rspack_import_12.zU)(previewPluginOptions, 'production', {
+            if ((0, _browsers_lib_browser_family__rspack_import_3.M_)(opts.browser)) {
+                const ctx = (0, _run_firefox_firefox_context__rspack_import_9.D)();
+                const launcher = new _run_firefox_firefox_launch__rspack_import_7.c(buildPreviewFirefoxOptions(opts), ctx);
+                await (0, _browsers_lib_banner__rspack_import_2.MK)(bannerOptions);
+                await launcher.runOnce(compilationLike, (0, _browsers_lib_runtime_options__rspack_import_10.zU)(previewPluginOptions, 'production', {
                     persistProfile: previewPluginOptions.persistProfile,
                     geckoBinary: previewPluginOptions.geckoBinary
                 }));
@@ -6185,7 +6248,7 @@ var __webpack_modules__ = {
         const DEFAULT_SAMPLE_RATE = Number(process.env.EXTENSION_TELEMETRY_SAMPLE_RATE || 0.2);
         const DEFAULT_MAX_EVENTS = Number(process.env.EXTENSION_TELEMETRY_MAX_EVENTS || 3);
         const DEFAULT_DEBOUNCE_MS = Number(process.env.EXTENSION_TELEMETRY_DEBOUNCE_MS || 60000);
-        const DEFAULT_TIMEOUT_MS = Number(process.env.EXTENSION_TELEMETRY_TIMEOUT_MS || 300);
+        const DEFAULT_TIMEOUT_MS = Number(process.env.EXTENSION_TELEMETRY_TIMEOUT_MS || 2000);
         const DEFAULT_AUDIT_MAX_BYTES = 1048576;
         function auditMaxBytes() {
             const raw = Number(process.env.EXTENSION_TELEMETRY_AUDIT_MAX_BYTES);
@@ -6762,9 +6825,68 @@ var __webpack_modules__ = {
             return await import(bridgeSpecifier);
         }
         var messaging = __webpack_require__("./helpers/messaging.ts");
+        const TEMPLATE_CORPUS_REPO = 'extension-js/examples';
+        const TEMPLATE_CORPUS_REF = 'f7f4e6efb56a7e5ae08d58dbff3972d94af7d021';
+        const TEMPLATE_CORPUS_SLUGS = [
+            'action',
+            'action-locales',
+            'ai-chatgpt',
+            'ai-claude',
+            'ai-gemini',
+            'ai-perplexity',
+            'content',
+            'content-css-modules',
+            'content-custom-font',
+            'content-env',
+            'content-less',
+            'content-less-modules',
+            'content-main-world',
+            'content-multi-one-entry',
+            'content-multi-three-entries',
+            'content-preact',
+            'content-react',
+            'content-sass',
+            'content-sass-modules',
+            'content-svelte',
+            "content-typescript",
+            'content-vue',
+            'init',
+            "javascript",
+            'new',
+            'new-browser-flags',
+            'new-config-eslint',
+            'new-config-prettier',
+            'new-config-stylelint',
+            'new-crypto',
+            'new-env',
+            'new-less',
+            'new-preact',
+            'new-react',
+            'new-react-router',
+            'new-sass',
+            'new-svelte',
+            "new-typescript",
+            'new-vue',
+            'playwright',
+            'preact',
+            'react',
+            'sidebar',
+            'sidebar-antd',
+            'sidebar-monorepo-turborepo',
+            'sidebar-shadcn',
+            'special-folders-pages',
+            "special-folders-scripts",
+            'svelte',
+            'transformers-js',
+            "typescript",
+            'vue'
+        ];
         const DEFAULT_TEMPLATE = "javascript";
-        const TEMPLATE_CATALOG_URL = 'https://github.com/extension-js/examples/tree/main/examples';
-        const TEMPLATE_GROUPS = [
+        const BUNDLED_TEMPLATES = [
+            "javascript"
+        ];
+        const TEMPLATE_CATALOG_URL = `https://github.com/${TEMPLATE_CORPUS_REPO}/tree/${TEMPLATE_CORPUS_REF}/examples`;
+        const CURATED_GROUPS = [
             {
                 title: 'Starters',
                 summary: 'a bare manifest, or one language or framework with sidebar UI',
@@ -6854,6 +6976,33 @@ var __webpack_modules__ = {
                 ]
             }
         ];
+        const UNCURATED_GROUP_TITLE = 'More templates';
+        function buildTemplateGroups() {
+            const published = new Set(TEMPLATE_CORPUS_SLUGS);
+            const claimed = new Set();
+            const groups = [];
+            for (const group of CURATED_GROUPS){
+                const templates = group.templates.filter((name)=>{
+                    if (!published.has(name) || claimed.has(name)) return false;
+                    claimed.add(name);
+                    return true;
+                });
+                if (templates.length) groups.push({
+                    ...group,
+                    templates
+                });
+            }
+            const uncurated = TEMPLATE_CORPUS_SLUGS.filter((name)=>!claimed.has(name));
+            if (uncurated.length) groups.push({
+                title: UNCURATED_GROUP_TITLE,
+                summary: 'published in the catalog, not yet grouped',
+                templates: [
+                    ...uncurated
+                ]
+            });
+            return groups;
+        }
+        const TEMPLATE_GROUPS = buildTemplateGroups();
         const TEMPLATE_ALIASES = [];
         function listTemplates() {
             return TEMPLATE_GROUPS.flatMap((group)=>group.templates);
@@ -6897,14 +7046,19 @@ var __webpack_modules__ = {
         function renderCreateTemplateHelp() {
             const total = listTemplates().length;
             const dim = (text)=>external_pintor_default().gray(text);
+            const defaultIsBundled = BUNDLED_TEMPLATES.includes(DEFAULT_TEMPLATE);
             return [
                 '',
                 external_pintor_default().underline(external_pintor_default().blue(`Templates (${total})`)),
                 renderTemplateList(),
                 '',
                 `  ${external_pintor_default().green('Default')}`,
-                `    ${external_pintor_default().blue(DEFAULT_TEMPLATE)} ${dim('is used when --template is omitted. It ships inside the CLI,')}`,
-                dim('    so it scaffolds with no network call.'),
+                `    ${external_pintor_default().blue(DEFAULT_TEMPLATE)} ${dim('is used when --template is omitted.')}`,
+                ...defaultIsBundled ? [
+                    dim('    It ships inside the CLI, so it scaffolds with no network.')
+                ] : [
+                    dim('    It downloads the catalog archive like every other name.')
+                ],
                 '',
                 `  ${external_pintor_default().green('Everything else')}`,
                 dim('    downloads the catalog archive at create time, so it needs the'),
@@ -7097,7 +7251,7 @@ var __webpack_modules__ = {
                 notes: [
                     {
                         usage: '--browser <chrome|chromium|edge|firefox|chromium-based|gecko-based|firefox-based|all>',
-                        description: 'Install multiple browsers, browser families, or all'
+                        description: 'Install one or more managed browsers (comma-separated) or all'
                     },
                     {
                         usage: '--where',
@@ -7116,13 +7270,17 @@ var __webpack_modules__ = {
                 description: 'Remove managed browser binaries from the Extension.js cache',
                 supportsSourceInspection: false,
                 notes: [
+                    {
+                        usage: '--browser <chrome|chromium|edge|firefox|chromium-based|gecko-based|firefox-based|all>',
+                        description: 'Remove one or more managed browsers (comma-separated), same names as install'
+                    },
                     {
                         usage: '--all',
                         description: 'Remove every managed browser binary'
                     },
                     {
                         usage: '--where',
-                        description: 'Print the managed browser cache root (or browser install path(s) when --browser/--all is provided)'
+                        description: 'Print the managed browser cache root (or browser install path(s) when a browser name, --browser, or --all is provided)'
                     }
                 ]
             },
@@ -7268,6 +7426,23 @@ AI assistants
         function unsupportedBrowserFlag(value, supported) {
             return `${getLoggingPrefix('error')} Unsupported --browser value: ${value}.\n${external_pintor_default().red('Choose one of:')} ${supported.join(', ')}${external_pintor_default().red('.')}`;
         }
+        function browserNotInstallablePlain(value) {
+            const name = String(value || '').trim().toLowerCase();
+            if ('safari' === name || 'webkit-based' === name || name.includes('safari') || name.includes('webkit')) return "There is no Safari binary to install. Safari ships with macOS. Safari builds need the full Xcode app instead (Mac App Store), then run `extension build --browser safari`.";
+            const display = name || String(value || 'browser');
+            return `${display} cannot be installed by Extension.js. This CLI never downloads it. It is located from the system when present. Install it yourself, then run with --browser=${display}. Managed installs cover: chrome, chromium, edge, firefox.`;
+        }
+        function browserNotInstallable(value) {
+            const name = String(value || '').trim().toLowerCase();
+            if ('safari' === name || 'webkit-based' === name || name.includes('safari') || name.includes('webkit')) return `${getLoggingPrefix('error')} There is no Safari binary to install.\n${external_pintor_default().red('Safari ships with macOS. Safari builds need the full Xcode app')} ${external_pintor_default().red('(Mac App Store), then run')} ${messages_code('extension build --browser safari')}${external_pintor_default().red('.')}`;
+            const display = name || String(value || 'browser');
+            return `${getLoggingPrefix('error')} ${external_pintor_default().blue(display)} cannot be installed by Extension.js.\n${external_pintor_default().red('This CLI never downloads it. It is located from the system when present.')}\n${external_pintor_default().red('Install it yourself, then run with')} ${messages_code(`--browser=${display}`)}${external_pintor_default().red('.')}\n${external_pintor_default().red('Managed installs cover:')} chrome, chromium, edge, firefox${external_pintor_default().red('.')}`;
+        }
+        function browserDownloadFailed(browser, detail) {
+            const name = String(browser || 'browser').trim() || 'browser';
+            const body = String(detail || '').trim();
+            return `${getLoggingPrefix('error')} Couldn't download ${external_pintor_default().blue(name)}.\n` + (body ? `${external_pintor_default().red(body)}\n` : '') + `${external_pintor_default().red('Retry, or install')} ${external_pintor_default().blue(name)} ${external_pintor_default().red('manually.')}`;
+        }
         function safariOnlyOption(flags) {
             return `${getLoggingPrefix('error')} ${flags.map(messages_code).join(', ')} only appl${1 === flags.length ? 'ies' : 'y'} to Safari targets.\nAdd ${messages_code('--browser safari')} (or ${messages_code('webkit-based')}).`;
         }
@@ -7330,7 +7505,7 @@ Environment variables
 
 Available templates
 ${TEMPLATE_GROUPS.map((group)=>`- ${external_pintor_default().green(group.title)} ${messages_arg(`(${group.summary})`)}: ${group.templates.map((template)=>messages_code(template)).join(', ')}`).join('\n')}${TEMPLATE_ALIASES.length > 0 ? `\n- ${external_pintor_default().green('Alias')}: ${TEMPLATE_ALIASES.map((alias)=>`${messages_code(alias.name)} ${messages_arg(alias.note)}`).join(', ')}` : ''}
-- ${messages_code(DEFAULT_TEMPLATE)} is the default when ${messages_code('--template')} is omitted. It ships inside the CLI and needs no network.
+- ${messages_code(DEFAULT_TEMPLATE)} is the default when ${messages_code('--template')} is omitted.${BUNDLED_TEMPLATES.includes(DEFAULT_TEMPLATE) ? ' It ships inside the CLI and needs no network.' : ''}
 - Every other name is downloaded from ${messages_code(TEMPLATE_CATALOG_URL)} at create time. A GitHub or ZIP URL works in place of a name.
 - A name that is not on this list fails with ${messages_code('TemplateNotFoundError')}. Run ${messages_code('extension create --help')} for the same list.
 
@@ -7467,9 +7642,13 @@ Cross-browser compatibility
                 templates: {
                     default: DEFAULT_TEMPLATE,
                     bundled: [
-                        DEFAULT_TEMPLATE
+                        ...BUNDLED_TEMPLATES
                     ],
                     catalogUrl: TEMPLATE_CATALOG_URL,
+                    corpus: {
+                        repo: TEMPLATE_CORPUS_REPO,
+                        ref: TEMPLATE_CORPUS_REF
+                    },
                     names: listTemplates(),
                     groups: TEMPLATE_GROUPS.map((group)=>({
                             title: group.title,
@@ -7485,10 +7664,10 @@ Cross-browser compatibility
                     },
                     notes: [
                         `extension create <name> with no --template scaffolds ${DEFAULT_TEMPLATE}`,
-                        `${DEFAULT_TEMPLATE} is bundled with the CLI and scaffolds offline. Every other name downloads the examples archive at create time`,
+                        'every name in bundled[] ships inside the CLI package and scaffolds offline. Every other name downloads the examples archive at create time',
                         'a GitHub URL or a ZIP URL is accepted in place of a catalog name',
                         'a name outside names[] fails with TemplateNotFoundError and creates nothing',
-                        'this list ships with the CLI, so it is the list this CLI version can scaffold, not necessarily the current contents of the catalog repository'
+                        `names[] is generated from ${TEMPLATE_CORPUS_REPO} at corpus.ref, the exact commit this CLI version downloads, so it is what this version can scaffold and not the current contents of the catalog repository`
                     ]
                 },
                 capabilities: {
@@ -7676,6 +7855,7 @@ Cross-browser compatibility
                 const browser = options.browser || 'chromium';
                 const format = resolveFormat(options);
                 const matches = makeFilter(options);
+                if (options.signalsOnly) console.error("extension logs --signals-only: no signals emitter ships in this build, so dev sessions record no dx.signal events and this filter will print nothing.");
                 if (options.follow) return void await followLogs(projectPath, browser, format, matches);
                 const file = logsFilePath(projectPath, browser);
                 if (!external_node_fs_default().existsSync(file)) {
@@ -8123,13 +8303,29 @@ Cross-browser compatibility
                 'chrome',
                 'edge',
                 'firefox'
-            ] : String(value).split(',');
+            ] : String(value).split(',').map((part)=>part.trim()).filter(Boolean);
         };
+        const MANAGED_INSTALL_TARGETS = [
+            'chrome',
+            'chromium',
+            'edge',
+            'firefox',
+            'chromium-based',
+            'gecko-based',
+            'firefox-based'
+        ];
+        const MANAGED_INSTALL_TARGETS_HELP = [
+            ...MANAGED_INSTALL_TARGETS,
+            'all'
+        ].join(' | ');
+        const MANAGED_INSTALL_BINARIES = [
+            'chrome',
+            'chromium',
+            'edge',
+            'firefox'
+        ];
         const installTargets = (browser)=>'all' === browser ? [
-                'chrome',
-                'chromium',
-                'edge',
-                'firefox'
+                ...MANAGED_INSTALL_BINARIES
             ] : vendors(browser);
         function validateVendors(vendorsList, onInvalid) {
             const supported = SUPPORTED_BROWSER_TARGETS;
@@ -8139,6 +8335,25 @@ Cross-browser compatibility
             }
             return true;
         }
+        const MANAGED_INSTALL_TARGET_SET = new Set(MANAGED_INSTALL_TARGETS);
+        const SUPPORTED_BROWSER_TARGET_SET = new Set(SUPPORTED_BROWSER_TARGETS);
+        function classifyManagedInstallTarget(name) {
+            const value = String(name || '').trim().toLowerCase();
+            if (!value) return 'unknown';
+            if (MANAGED_INSTALL_TARGET_SET.has(value)) return 'managed';
+            if (SUPPORTED_BROWSER_TARGET_SET.has(value)) return 'not-installable';
+            return 'unknown';
+        }
+        function firstNonManagedInstallTarget(targetsList) {
+            for (const name of targetsList){
+                const kind = classifyManagedInstallTarget(name);
+                if ('managed' !== kind) return {
+                    name,
+                    kind
+                };
+            }
+            return null;
+        }
         function registerBuildCommand(program) {
             program.command('build').arguments('[project-name]').usage('[path-to-remote-extension] [options]').description(commandDescriptions.build).option(`--browser <${BROWSER_TARGETS_HELP}>`, '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`', parseOptionalBoolean).option('--no-polyfill', 'disable the cross-browser polyfill').option('--zip [boolean]', 'whether or not to compress the extension into a ZIP file. Defaults to `false`', parseOptionalBoolean).option('--zip-source [boolean]', 'whether or not to include the source files in the ZIP file. Defaults to `false`', parseOptionalBoolean).option('--zip-filename <string>', 'specify the name of the ZIP file. Defaults to the extension name and version').option('--silent [boolean]', 'suppress the build summary output. Defaults to `false`', parseOptionalBoolean).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('--open [boolean]', 'open the built Safari app after packaging (safari targets only). Defaults to `false`', parseOptionalBoolean).option('--app-name <name>', 'override the Safari app name (safari targets only). Defaults to the manifest `name`').option('--bundle-id <reverse.dns>', 'set a user-owned Safari bundle identifier (safari targets only). Defaults to a generated dev.extensionjs.* id').option('--macos-only [boolean]', 'generate a macOS-only Safari Xcode project (safari targets only). Pass `false` for a universal macOS + iOS project. Defaults to `true`', parseOptionalBoolean).option('--force-regenerate', 'regenerate the Safari Xcode project even when up to date (safari targets only)').option('--output <pretty|json>', 'result format. Use json for a schema-1 envelope on stdout').addOption(new external_commander_namespaceObject.Option('--debug', 'print maintainer diagnostics alongside normal output')).addOption(new external_commander_namespaceObject.Option('--author, --author-mode', 'deprecated alias for --debug').hideHelp()).action(async (pathOrRemoteUrl, { browser = 'chromium', ...buildOptions })=>{
                 if (buildOptions.debug || buildOptions.author || buildOptions.authorMode) {
@@ -9217,31 +9432,75 @@ Cross-browser compatibility
         function install_emit(frame) {
             console.log(JSON.stringify(frame));
         }
+        function errorText(error) {
+            return error instanceof Error ? error.message : String(error);
+        }
+        function isNotInstallableRefusal(error) {
+            return Boolean(error && 'object' == typeof error && ('BrowserNotInstallableError' === error.name || 'BROWSER_NOT_INSTALLABLE' === error.code));
+        }
+        async function refuseNotInstallable(command, error, asJson) {
+            const message = errorText(error);
+            if (asJson) install_emit(messaging.Pr.fail(command, 'usage', {
+                code: messaging.Lp.E_BROWSER_NOT_INSTALLABLE,
+                message
+            }));
+            else console.error(message);
+            await exitAfterDrain(1);
+        }
+        async function refuseIfNotManagedTarget(command, browserList, asJson) {
+            const bad = firstNonManagedInstallTarget(browserList);
+            if (!bad) return false;
+            if ('not-installable' === bad.kind) {
+                const message = browserNotInstallablePlain(bad.name);
+                if (asJson) install_emit(messaging.Pr.fail(command, 'usage', {
+                    code: messaging.Lp.E_BROWSER_NOT_INSTALLABLE,
+                    message
+                }));
+                else console.error(browserNotInstallable(bad.name));
+                await exitAfterDrain(1);
+                return true;
+            }
+            if (asJson) install_emit(messaging.Pr.fail(command, 'usage', {
+                code: messaging.Lp.E_UNSUPPORTED_BROWSER,
+                message: `Unsupported browser: ${bad.name}.`
+            }));
+            else console.error(unsupportedBrowserFlag(bad.name, [
+                ...MANAGED_INSTALL_TARGETS
+            ]));
+            await exitAfterDrain(1);
+            return true;
+        }
+        async function refuseDownloadFailed(browser, error, asJson) {
+            const detail = errorText(error);
+            if (asJson) install_emit(messaging.Pr.fail('install', 'failed', {
+                code: messaging.Lp.E_BROWSER_DOWNLOAD,
+                message: detail
+            }, {
+                hint: `Retry, or install ${browser} manually.`
+            }));
+            else console.error(browserDownloadFailed(browser, detail));
+            await exitAfterDrain(1);
+        }
         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').option('--output <pretty|json>', 'result format. Use json for a schema-1 envelope on stdout').action(async (browserArg, options)=>{
+            program.command('install').arguments('[browser-name]').usage('[browser-name] [options]').description(commandDescriptions.install).option(`--browser <${MANAGED_INSTALL_TARGETS_HELP}>`, 'override the positional browser name. Supports comma-separated values and `all`.').option('--where', 'print the resolved managed browser cache root').option('--output <pretty|json>', 'result format. Use json for a schema-1 envelope on stdout').action(async (browserArg, options)=>{
                 const asJson = 'json' === options.output;
+                const named = Boolean(options.browser || browserArg);
                 const selectedBrowser = options.browser || browserArg || 'chromium';
                 const browserList = installTargets(selectedBrowser);
-                let unsupported = '';
-                const vendorsAreSupported = validateVendors(browserList, (invalid, supported)=>{
-                    unsupported = invalid;
-                    if (asJson) return;
-                    console.error(unsupportedBrowserFlag(invalid, supported));
-                });
-                if (!vendorsAreSupported) {
-                    if (asJson) install_emit(messaging.Pr.fail('install', 'usage', {
-                        code: messaging.Lp.E_UNSUPPORTED_BROWSER,
-                        message: `Unsupported browser: ${unsupported}.`
-                    }));
-                    await exitAfterDrain(1);
-                    return;
+                if (!(options.where && !named)) {
+                    if (await refuseIfNotManagedTarget('install', browserList, asJson)) return;
                 }
                 const { extensionInstall, getManagedBrowsersCacheRoot, getManagedBrowserInstallDir } = await import("extension-install");
                 if (options.where) {
-                    const named = Boolean(options.browser || browserArg);
-                    const paths = named ? browserList.map((browser)=>getManagedBrowserInstallDir(browser)) : [
-                        getManagedBrowsersCacheRoot()
-                    ];
+                    let paths;
+                    try {
+                        paths = named ? browserList.map((browser)=>getManagedBrowserInstallDir(browser)) : [
+                            getManagedBrowsersCacheRoot()
+                        ];
+                    } catch (error) {
+                        await refuseNotInstallable('install', error, asJson);
+                        return;
+                    }
                     if (asJson) install_emit(messaging.Pr.ok('install', 'located', {
                         paths
                     }));
@@ -9255,45 +9514,21 @@ Cross-browser compatibility
                     });
                     installed.push(browser);
                 } catch (error) {
-                    if (!asJson) throw error;
-                    install_emit(messaging.Pr.fail('install', 'failed', {
-                        code: messaging.Lp.E_BROWSER_DOWNLOAD,
-                        message: error instanceof Error ? error.message : String(error)
-                    }, {
-                        hint: `Retry, or install ${browser} manually.`
-                    }));
-                    await exitAfterDrain(1);
+                    if (isNotInstallableRefusal(error)) return void await refuseNotInstallable('install', error, asJson);
+                    await refuseDownloadFailed(browser, error, asJson);
                     return;
                 }
                 if (asJson) install_emit(messaging.Pr.ok('install', 'installed', {
                     browsers: installed
                 }));
             });
-            program.command('uninstall').usage('<browser-name> | --all | --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').option('--output <pretty|json>', 'result format. Use json for a schema-1 envelope on stdout').argument('[browser-name]').action(async (browserArg, { browser, all, where, output })=>{
+            program.command('uninstall').usage('<browser-name> | --all | --where').description(commandDescriptions.uninstall).option(`--browser <${MANAGED_INSTALL_TARGETS_HELP}>`, 'browser(s) to uninstall. Supports comma-separated values and `all`.').option('--all', 'remove all managed browser binaries').option('--where', 'print the resolved managed browser cache root').option('--output <pretty|json>', 'result format. Use json for a schema-1 envelope on stdout').argument('[browser-name]').action(async (browserArg, { browser, all, where, output })=>{
                 const asJson = 'json' === output;
-                const target = browserArg || browser;
+                const named = Boolean(browserArg || browser);
+                const selected = all || 'all' === browserArg || 'all' === browser ? 'all' : browser || browserArg;
                 const { extensionUninstall, getManagedBrowsersCacheRoot, getManagedBrowserInstallDir } = await import("extension-install");
-                if (where) {
-                    let paths;
-                    if (all) paths = installTargets('all').map((name)=>getManagedBrowserInstallDir(name));
-                    else if (target) {
-                        const list = vendors(target);
-                        let unsupported = '';
-                        const vendorsAreSupported = validateVendors(list, (invalid, supported)=>{
-                            unsupported = invalid;
-                            if (asJson) return;
-                            console.error(unsupportedBrowserFlag(invalid, supported));
-                        });
-                        if (!vendorsAreSupported) {
-                            if (asJson) install_emit(messaging.Pr.fail('uninstall', 'usage', {
-                                code: messaging.Lp.E_UNSUPPORTED_BROWSER,
-                                message: `Unsupported browser: ${unsupported}.`
-                            }));
-                            await exitAfterDrain(1);
-                            return;
-                        }
-                        paths = list.map((name)=>getManagedBrowserInstallDir(name));
-                    } else paths = [
+                if (where && !named && !all) {
+                    const paths = [
                         getManagedBrowsersCacheRoot()
                     ];
                     if (asJson) install_emit(messaging.Pr.ok('uninstall', 'located', {
@@ -9302,23 +9537,51 @@ Cross-browser compatibility
                     else for (const location of paths)console.log(location);
                     return;
                 }
+                if (!selected) {
+                    const message = 'A browser target is required. Pass a browser name, --browser <name>, or --all.';
+                    if (asJson) install_emit(messaging.Pr.fail('uninstall', 'usage', {
+                        code: messaging.Lp.E_ARGS,
+                        message
+                    }));
+                    else console.error(message);
+                    await exitAfterDrain(1);
+                    return;
+                }
+                const browserList = installTargets(selected);
+                if (await refuseIfNotManagedTarget('uninstall', browserList, asJson)) return;
+                if (where) {
+                    let paths;
+                    try {
+                        paths = browserList.map((name)=>getManagedBrowserInstallDir(name));
+                    } catch (error) {
+                        await refuseNotInstallable('uninstall', error, asJson);
+                        return;
+                    }
+                    if (asJson) install_emit(messaging.Pr.ok('uninstall', 'located', {
+                        paths
+                    }));
+                    else for (const location of paths)console.log(location);
+                    return;
+                }
+                const removeAll = Boolean(all || 'all' === selected);
                 try {
                     await extensionUninstall({
-                        browser: target,
-                        all
+                        browser: removeAll ? void 0 : browserList.join(','),
+                        all: removeAll
                     });
                 } catch (error) {
-                    if (!asJson) throw error;
-                    install_emit(messaging.Pr.fail('uninstall', 'failed', {
+                    if (isNotInstallableRefusal(error)) return void await refuseNotInstallable('uninstall', error, asJson);
+                    if (asJson) install_emit(messaging.Pr.fail('uninstall', 'failed', {
                         code: messaging.Lp.E_BROWSER_UNINSTALL,
-                        message: error instanceof Error ? error.message : String(error)
+                        message: errorText(error)
                     }));
+                    else console.error(errorText(error));
                     await exitAfterDrain(1);
                     return;
                 }
                 if (asJson) install_emit(messaging.Pr.ok('uninstall', 'uninstalled', {
-                    browser: target,
-                    all
+                    browsers: browserList,
+                    all: removeAll
                 }));
             });
         }
@@ -9328,7 +9591,7 @@ Cross-browser compatibility
             'Manifest file not found'
         ];
         function registerPreviewCommand(program) {
-            program.command('preview').arguments('[project-name]').usage('[path-to-remote-extension] [options]').description(commandDescriptions.preview).addHelpText('after', '\nAdditional option:\n  --no-browser    do not launch the browser\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(`--browser <${NO_SAFARI_BROWSER_TARGETS_HELP}>`, '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('--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('--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('--extensions <list>', 'comma-separated list of companion extensions or store URLs to load').option('--output <pretty|json>', 'result format. Use json for a schema-1 envelope on stdout').addOption(new external_commander_namespaceObject.Option('--debug', 'print maintainer diagnostics alongside normal output')).addOption(new external_commander_namespaceObject.Option('--author, --author-mode', 'deprecated alias for --debug').hideHelp()).action(async (pathOrRemoteUrl, options, command)=>{
+            program.command('preview').arguments('[project-name]').usage('[path-to-remote-extension] [options]').description(commandDescriptions.preview).addHelpText('after', '\nAdditional option:\n  --no-browser    do not launch the browser\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(`--browser <${NO_SAFARI_BROWSER_TARGETS_HELP}>`, '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('--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('--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('--extensions <list>', 'comma-separated list of companion extensions or store URLs to load').option('--output-path <dir>', 'path to an existing unpacked extension directory. Defaults to dist/<browser> when available').option('--output <pretty|json>', 'result format. Use json for a schema-1 envelope on stdout').addOption(new external_commander_namespaceObject.Option('--debug', 'print maintainer diagnostics alongside normal output')).addOption(new external_commander_namespaceObject.Option('--author, --author-mode', 'deprecated alias for --debug').hideHelp()).action(async (pathOrRemoteUrl, options, command)=>{
                 const { browser = 'chromium', ...previewOptions } = options;
                 if (previewOptions.debug || previewOptions.author || previewOptions.authorMode) {
                     process.env.EXTENSION_DEBUG = '1';
@@ -9336,6 +9599,7 @@ Cross-browser compatibility
                     if (!process.env.EXTENSION_VERBOSE) process.env.EXTENSION_VERBOSE = '1';
                 }
                 const asJson = 'json' === previewOptions.output;
+                if (asJson) process.env.EXTENSION_OUTPUT = 'json';
                 const emit = (frame)=>{
                     console.log(JSON.stringify(frame));
                 };
@@ -9384,6 +9648,7 @@ Cross-browser compatibility
                             port: previewOptions.port,
                             noBrowser: await resolveNoBrowser(pathOrRemoteUrl || process.cwd(), 'preview'),
                             extensions: parseExtensionsList(previewOptions.extensions),
+                            outputPath: previewOptions.outputPath,
                             logLevel: logsOption || previewOptions.logLevel || void 0,
                             logContexts,
                             logFormat: previewOptions.logFormat,
@@ -9587,10 +9852,12 @@ Cross-browser compatibility
                     if (!process.env.EXTENSION_VERBOSE) process.env.EXTENSION_VERBOSE = '1';
                 }
                 const asJson = 'json' === resolveOutputFormat(startOptions);
+                if (asJson) process.env.EXTENSION_OUTPUT = 'json';
                 const list = vendors(browser);
                 let unsupportedBrowser = '';
                 const vendorsAreSupported = validateVendors(list, (invalid, supported)=>{
                     unsupportedBrowser = invalid;
+                    if (asJson) return;
                     console.error(unsupportedBrowserFlag(invalid, supported));
                 });
                 if (!vendorsAreSupported) start_failAndExit(asJson, 'usage', {
@@ -9598,10 +9865,10 @@ Cross-browser compatibility
                     message: `Unsupported browser: ${unsupportedBrowser}`
                 });
                 if (list.some(isSafariVendor)) {
-                    console.error(safariCommandNotSupported('start'));
+                    if (!asJson) console.error(safariCommandNotSupported('start'));
                     start_failAndExit(asJson, 'usage', {
-                        code: messaging.Lp.E_UNSUPPORTED_BROWSER,
-                        message: 'Safari targets are not supported by start.'
+                        code: messaging.Lp.E_COMMAND_UNSUPPORTED_FOR_TARGET,
+                        message: 'Safari is not supported by start.'
                     });
                 }
                 if (startOptions.wait) {