extension 4.1.21 → 4.1.22

package/dist/{84.cjs → 597.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 exports.ids = [
-    84
+    597
 ];
 exports.modules = {
     "./browsers/run-chromium/cdp/cdp-extension-controller/ensure.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
@@ -483,6 +483,73 @@ exports.modules = {
                 this.host = host;
             }
         }
+        const EXTENSIONS_PAGE = 'chrome://extensions';
+        const READ_DEVELOPER_MODE = "new Promise((resolve) => chrome.developerPrivate.getProfileConfiguration((config) => resolve(!!config.inDeveloperMode)))";
+        const ENABLE_DEVELOPER_MODE = "new Promise((resolve) => chrome.developerPrivate.updateProfileConfiguration({inDeveloperMode: true}, () => resolve(!chrome.runtime.lastError)))";
+        function developerModeFromProfile(profilePath) {
+            try {
+                const securePath = external_node_path_.join(profilePath, 'Default', 'Secure Preferences');
+                const parsed = JSON.parse(external_node_fs_.readFileSync(securePath, 'utf-8'));
+                return parsed?.extensions?.ui?.developer_mode === true;
+            } catch  {
+                return false;
+            }
+        }
+        function developerModeFlipIsSafe(browserArgs) {
+            return !browserArgs.some((arg)=>arg.startsWith('--no-startup-window'));
+        }
+        async function evaluateBoolean(transport, sessionId, expression) {
+            try {
+                const response = await transport.sendCommand('Runtime.evaluate', {
+                    expression,
+                    awaitPromise: true,
+                    returnByValue: true
+                }, sessionId);
+                const value = response?.result?.value;
+                return 'boolean' == typeof value ? value : void 0;
+            } catch  {
+                return;
+            }
+        }
+        async function ensureDeveloperMode(options) {
+            const { transport } = options;
+            const attempts = options.attempts ?? 10;
+            const delayMs = options.delayMs ?? 200;
+            const sleep = options.sleep ?? ((ms)=>new Promise((r)=>setTimeout(r, ms)));
+            let targetId = '';
+            try {
+                const created = await transport.sendCommand('Target.createTarget', {
+                    url: EXTENSIONS_PAGE,
+                    background: true
+                });
+                targetId = created?.targetId ?? '';
+                if (!targetId) return 'unavailable';
+                const attached = await transport.sendCommand('Target.attachToTarget', {
+                    targetId,
+                    flatten: true
+                });
+                const sessionId = attached?.sessionId ?? '';
+                if (!sessionId) return 'unavailable';
+                for(let attempt = 0; attempt < attempts; attempt++){
+                    const current = await evaluateBoolean(transport, sessionId, READ_DEVELOPER_MODE);
+                    if (true === current) return 'already-on';
+                    if (false === current) {
+                        const enabled = await evaluateBoolean(transport, sessionId, ENABLE_DEVELOPER_MODE);
+                        return true === enabled ? 'enabled' : 'unavailable';
+                    }
+                    await sleep(delayMs);
+                }
+                return 'unavailable';
+            } catch  {
+                return 'unavailable';
+            } finally{
+                if (targetId) try {
+                    await transport.sendCommand('Target.closeTarget', {
+                        targetId
+                    });
+                } catch  {}
+            }
+        }
         function isRecoverableBootstrapError(error) {
             const msg = String(error?.message || error || '').toLowerCase();
             return msg.includes('econnreset') || msg.includes('websocket is not open') || msg.includes('cdp transport is not open') || msg.includes('cdp connection closed') || msg.includes('cdp pipe closed') || msg.includes('socket hang up') || msg.includes('timed out') || msg.includes('no cdp websocket url');
@@ -784,6 +851,12 @@ exports.modules = {
                 if (this.cdp) return;
                 await this.connectFreshClient();
             }
+            async ensureDeveloperMode() {
+                if (!this.cdp) return 'unavailable';
+                return ensureDeveloperMode({
+                    transport: this.cdp
+                });
+            }
             async openTab(url) {
                 if (!this.cdp) return;
                 await this.cdp.sendCommand('Target.createTarget', {
@@ -1110,6 +1183,10 @@ exports.modules = {
             });
             await cdpExtensionController.connect();
             if ((0, messaging._o)()) (0, messaging._w)(messages.M3('127.0.0.1', chromeRemoteDebugPort));
+            if (userDataDir && developerModeFlipIsSafe(chromiumArgs) && !developerModeFromProfile(userDataDir)) {
+                const developerMode = await cdpExtensionController.ensureDeveloperMode();
+                if ((0, messaging._o)()) (0, messaging._w)(`[CDP] developer mode: ${developerMode}`);
+            }
             try {
                 if (extensionOutputPath && Number.isFinite(chromeRemoteDebugPort)) {
                     const readyPath = external_node_path_.join(external_node_path_.dirname(extensionOutputPath), 'extension-js', external_node_path_.basename(extensionOutputPath), 'ready.json');

package/dist/browsers.cjs

@@ -229,7 +229,7 @@ var __webpack_modules__ = {
                     (0, _helpers_messaging__rspack_import_3._w)(_messages__rspack_import_5.io());
                 }
             } catch  {
-                const provenanceNote = _messages__rspack_import_5.xX(opts.binaryProvenance);
+                const provenanceNote = _messages__rspack_import_5.xX(opts.binaryProvenance, opts.browser);
                 (0, _helpers_messaging__rspack_import_3._w)(_messages__rspack_import_5.io());
                 (0, _helpers_messaging__rspack_import_3._w)((0, _helpers_messaging__rspack_import_3.Nr)({
                     rows: [
@@ -420,6 +420,7 @@ var __webpack_modules__ = {
         var pintor__rspack_import_8 = __webpack_require__("pintor");
         var pintor__rspack_import_8_default = /*#__PURE__*/ __webpack_require__.n(pintor__rspack_import_8);
         var _helpers_messaging__rspack_import_9 = __webpack_require__("./helpers/messaging.ts");
+        var _browser_family__rspack_import_10 = __webpack_require__("./browsers/browsers-lib/browser-family.ts");
         const require1 = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__);
         function getLoggingPrefix(type) {
             return (0, _helpers_messaging__rspack_import_9.Pl)(type);
@@ -828,9 +829,15 @@ var __webpack_modules__ = {
             if (rest.startsWith(node_path__rspack_import_3.sep) || rest.startsWith('/')) return `~${rest}`;
             return raw;
         }
-        function binaryProvenanceNote(provenance) {
-            if ('pinned' === provenance) return '(pinned with --chromium-binary)';
-            return '';
+        function binaryProvenanceNote(provenance, browser) {
+            if ('pinned' !== provenance) return '';
+            return `(pinned with ${pinnedBinaryFlag(browser)})`;
+        }
+        function pinnedBinaryFlag(browser) {
+            const name = String(browser || '');
+            if ((0, _browser_family__rspack_import_10.M_)(name)) return '--gecko-binary';
+            if ('safari' === name || 'webkit-based' === name) return '--safari-binary';
+            return '--chromium-binary';
         }
         function runningInDevelopment(manifest, browser, message, browserVersionLine, updateSuffix, opts) {
             const capitalize = (str)=>str.charAt(0).toUpperCase() + str.slice(1);
@@ -866,7 +873,7 @@ var __webpack_modules__ = {
             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 provenanceNote = binaryProvenanceNote(opts?.binaryProvenance, browser);
             const browserLabel = provenanceNote ? `${baseBrowserLabel} ${provenanceNote}` : baseBrowserLabel;
             const cleanId = String(id || '').trim();
             const includeExtensionId = opts?.includeExtensionId !== false;
@@ -1325,17 +1332,21 @@ var __webpack_modules__ = {
         var _messages__rspack_import_2 = __webpack_require__("./browsers/browsers-lib/messages.ts");
         const FORCE_KILL_GRACE_MS = 5000;
         const terminatedByUs = new WeakSet();
+        const terminatedPids = new Set();
         function wasTerminatedByUs(child) {
             return !!child && terminatedByUs.has(child);
         }
+        function wasPidTerminatedByUs(pid) {
+            return 'number' == typeof pid && terminatedPids.has(pid);
+        }
         function authorLog(line) {
             if (line && (0, _helpers_messaging__rspack_import_1._o)()) (0, _helpers_messaging__rspack_import_1._w)(line);
         }
-        function killWindowsTree(child, sync) {
-            if ('win32' !== process.platform) return;
+        function killWindowsTree(pid, sync) {
+            if ('win32' !== process.platform || !pid) return;
             const args = [
                 '/PID',
-                String(child.pid),
+                String(pid),
                 '/T',
                 '/F'
             ];
@@ -1350,10 +1361,37 @@ var __webpack_modules__ = {
                 }).on('error', ()=>{});
             } catch  {}
         }
+        function signalPid(pid, signal) {
+            try {
+                process.kill(pid, signal);
+                return true;
+            } catch  {
+                return false;
+            }
+        }
+        function gracefulTerminatePid(pid, browser) {
+            if (!pid || terminatedPids.has(pid)) return;
+            terminatedPids.add(pid);
+            killWindowsTree(pid, false);
+            authorLog(_messages__rspack_import_2.XH(browser));
+            signalPid(pid, 'SIGTERM');
+            const killTimer = setTimeout(()=>{
+                authorLog(_messages__rspack_import_2.AG(browser));
+                signalPid(pid, 'SIGKILL');
+            }, FORCE_KILL_GRACE_MS);
+            killTimer.unref?.();
+        }
+        function forceKillPidOnExit(pid, browser) {
+            if (!pid) return;
+            terminatedPids.add(pid);
+            killWindowsTree(pid, true);
+            authorLog(_messages__rspack_import_2.AG(browser));
+            signalPid(pid, 'SIGKILL');
+        }
         function gracefulTerminateChild(child, browser) {
             if (!child || child.killed) return;
             terminatedByUs.add(child);
-            killWindowsTree(child, false);
+            killWindowsTree(child.pid, false);
             authorLog(_messages__rspack_import_2.XH(browser));
             child.kill('SIGTERM');
             const killTimer = setTimeout(()=>{
@@ -1367,7 +1405,7 @@ var __webpack_modules__ = {
         function forceKillChildOnExit(child, browser) {
             if (!child) return;
             terminatedByUs.add(child);
-            killWindowsTree(child, true);
+            killWindowsTree(child.pid, true);
             try {
                 authorLog(_messages__rspack_import_2.AG(browser));
                 child.kill('SIGKILL');
@@ -1388,7 +1426,10 @@ var __webpack_modules__ = {
             $Y: ()=>forceKillChildOnExit,
             Df: ()=>gracefulTerminateChild,
             FA: ()=>isBenignSocketTeardown,
-            Op: ()=>wasTerminatedByUs
+            Op: ()=>wasTerminatedByUs,
+            PU: ()=>wasPidTerminatedByUs,
+            Qx: ()=>forceKillPidOnExit,
+            _T: ()=>gracefulTerminatePid
         });
     },
     "./browsers/browsers-lib/ready-message.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
@@ -1432,6 +1473,7 @@ var __webpack_modules__ = {
                 const profilePath = String(details?.profilePath || '').trim();
                 if (profilePath) ready.profilePath = profilePath;
                 if ('number' == typeof details?.browserPid && Number.isFinite(details.browserPid)) ready.browserPid = details.browserPid;
+                if ('number' == typeof details?.launcherPid && Number.isFinite(details.launcherPid)) ready.launcherPid = details.launcherPid;
                 const extensionId = String(details?.extensionId || '').trim();
                 if (extensionId) ready.extensionId = extensionId;
                 const binary = String(details?.binary || '').trim();
@@ -2695,6 +2737,7 @@ var __webpack_modules__ = {
             '--enable-features=SidePanelUpdates',
             '--disable-features=DisableLoadExtensionCommandLineSwitch',
             '--disable-features=ExtensionDisableUnsupportedDeveloper',
+            '--disable-features=SafetyHubExtensionsOffStoreTrigger',
             '--enable-unsafe-extension-debugging',
             '--silent-debugger-extension-api'
         ];
@@ -3523,7 +3566,7 @@ var __webpack_modules__ = {
                         binaryProvenance
                     };
                     if (enableCdp) {
-                        const mod = await __webpack_require__.e(84).then(__webpack_require__.bind(__webpack_require__, "./browsers/run-chromium/chromium-launch/setup-cdp-after-launch.ts"));
+                        const mod = await __webpack_require__.e(597).then(__webpack_require__.bind(__webpack_require__, "./browsers/run-chromium/chromium-launch/setup-cdp-after-launch.ts"));
                         const CDP_SETUP_TIMEOUT_MS = 45000;
                         await Promise.race([
                             mod.setupCdpAfterLaunch(compilation, cdpConfig, chromiumConfig, pipeStreams),
@@ -3814,6 +3857,150 @@ var __webpack_modules__ = {
         var process_teardown = __webpack_require__("./browsers/browsers-lib/process-teardown.ts");
         var ready_message = __webpack_require__("./browsers/browsers-lib/ready-message.ts");
         var ready_stamp = __webpack_require__("./browsers/browsers-lib/ready-stamp.ts");
+        var external_node_child_process_ = __webpack_require__("node:child_process");
+        const PS_ROW = /^\s*(\d+)\s+(\d+)\s+(.*)$/;
+        const HELPER_PROCESS = /plugin-container|(^|\s)-contentproc(\s|$)|(^|\s)-childID(\s|$)|--type=/;
+        function runQuiet(bin, args) {
+            try {
+                const result = (0, external_node_child_process_.spawnSync)(bin, args, {
+                    encoding: 'utf-8',
+                    stdio: [
+                        'ignore',
+                        'pipe',
+                        'ignore'
+                    ],
+                    windowsHide: true,
+                    maxBuffer: 67108864
+                });
+                if (result.error || 0 !== result.status) return null;
+                return String(result.stdout || '');
+            } catch  {
+                return null;
+            }
+        }
+        function parseProcessRows(output) {
+            const rows = [];
+            for (const line of String(output || '').split(/\r?\n/)){
+                const match = PS_ROW.exec(line.replace(/\r$/, ''));
+                if (!match) continue;
+                const pid = Number(match[1]);
+                const ppid = Number(match[2]);
+                if (Number.isFinite(pid) && Number.isFinite(ppid)) rows.push({
+                    pid,
+                    ppid,
+                    command: match[3].trim()
+                });
+            }
+            return rows;
+        }
+        function appendLinuxProfileEnv(rows) {
+            return rows.map((row)=>{
+                try {
+                    const environ = external_node_fs_.readFileSync(`/proc/${row.pid}/environ`, 'utf-8');
+                    const entry = environ.split('\0').find((pair)=>pair.startsWith('XRE_PROFILE_PATH='));
+                    return entry ? {
+                        ...row,
+                        command: `${row.command} ${entry}`
+                    } : row;
+                } catch  {
+                    return row;
+                }
+            });
+        }
+        function listProcesses(platform = process.platform) {
+            if ('win32' === platform) {
+                const script = 'Get-CimInstance Win32_Process | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId) $($_.CommandLine)" }';
+                const output = runQuiet('powershell.exe', [
+                    '-NoProfile',
+                    '-NonInteractive',
+                    '-Command',
+                    script
+                ]);
+                return output ? parseProcessRows(output) : [];
+            }
+            if ('darwin' === platform) {
+                const output = runQuiet('ps', [
+                    '-axEo',
+                    'pid=,ppid=,command='
+                ]);
+                return output ? parseProcessRows(output) : [];
+            }
+            const output = runQuiet('ps', [
+                '-axo',
+                'pid=,ppid=,command='
+            ]);
+            const rows = output ? parseProcessRows(output) : [];
+            return 'linux' === platform ? appendLinuxProfileEnv(rows) : rows;
+        }
+        function resolve_live_pid_normalizePath(value) {
+            return String(value || '').replace(/\\/g, '/').toLowerCase();
+        }
+        function carriesProfile(command, profilePath) {
+            const haystack = resolve_live_pid_normalizePath(command);
+            const needle = resolve_live_pid_normalizePath(profilePath);
+            let from = 0;
+            for(;;){
+                const at = haystack.indexOf(needle, from);
+                if (at < 0) return false;
+                const before = 0 === at ? ' ' : haystack[at - 1];
+                const after = haystack[at + needle.length] ?? ' ';
+                if (/[\s="']/.test(before) && /[\s"']/.test(after)) return true;
+                from = at + 1;
+            }
+        }
+        function executableOf(command) {
+            const trimmed = resolve_live_pid_normalizePath(command).trim();
+            if (trimmed.startsWith('"')) {
+                const end = trimmed.indexOf('"', 1);
+                return end > 0 ? trimmed.slice(1, end) : trimmed;
+            }
+            const cut = trimmed.search(/\s(-|[a-z_][a-z0-9_]*=)/);
+            return cut > 0 ? trimmed.slice(0, cut) : trimmed;
+        }
+        function findLiveBrowserPid(input) {
+            const profilePath = String(input.profilePath || '').trim();
+            const binary = resolve_live_pid_normalizePath(input.binary).trim();
+            if (!profilePath || !binary) return null;
+            const candidates = input.rows.filter((row)=>executableOf(row.command) === binary && carriesProfile(row.command, profilePath) && !HELPER_PROCESS.test(row.command));
+            if (0 === candidates.length) return null;
+            const launcher = input.launcherPid ? candidates.find((row)=>row.pid === input.launcherPid) : void 0;
+            if (launcher) {
+                const twin = candidates.find((row)=>row.pid !== launcher.pid);
+                return twin ? twin.pid : launcher.pid;
+            }
+            const pids = new Set(candidates.map((row)=>row.pid));
+            const roots = candidates.filter((row)=>!pids.has(row.ppid));
+            return (roots[0] || candidates[0]).pid;
+        }
+        function isPidAlive(pid) {
+            if (!pid || !Number.isFinite(pid)) return false;
+            try {
+                process.kill(pid, 0);
+                return true;
+            } catch (error) {
+                return error?.code === 'EPERM';
+            }
+        }
+        async function resolveLiveBrowserPid(input) {
+            const list = input.list || listProcesses;
+            const attempts = Math.max(1, input.attempts ?? 6);
+            const intervalMs = input.intervalMs ?? 500;
+            const sleep = input.sleep || ((ms)=>new Promise((r)=>{
+                    setTimeout(r, ms).unref?.();
+                }));
+            let last = null;
+            for(let attempt = 0; attempt < attempts; attempt += 1){
+                last = findLiveBrowserPid({
+                    profilePath: input.profilePath,
+                    binary: input.binary,
+                    launcherPid: input.launcherPid,
+                    rows: list()
+                });
+                if (last && last !== input.launcherPid) break;
+                if (attempt < attempts - 1) await sleep(intervalMs);
+            }
+            return last;
+        }
         var runtime_options = __webpack_require__("./browsers/browsers-lib/runtime-options.ts");
         var shared_utils = __webpack_require__("./browsers/browsers-lib/shared-utils.ts");
         function parseFlatpakBinary(binary) {
@@ -4091,7 +4278,12 @@ var __webpack_modules__ = {
             for (const instance of activeInstances)attemptCleanup(instance);
         }
         function forceKillAllOnExit() {
-            for (const instance of activeInstances)(0, process_teardown.$Y)(instance.childRef(), instance.browser);
+            for (const instance of activeInstances){
+                const child = instance.childRef();
+                const livePid = instance.livePidRef();
+                (0, process_teardown.$Y)(child, instance.browser);
+                if (livePid && livePid !== child?.pid) (0, process_teardown.Qx)(livePid, instance.browser);
+            }
         }
         function firstBrowserLabel() {
             for (const instance of activeInstances)return instance.browser;
@@ -4123,10 +4315,11 @@ var __webpack_modules__ = {
                 process.exit(1);
             });
         }
-        function setupFirefoxProcessHandlers(browser, childRef, cleanupInstance) {
+        function setupFirefoxProcessHandlers(browser, childRef, cleanupInstance, livePidRef = ()=>null) {
             const instance = {
                 browser,
                 childRef,
+                livePidRef,
                 cleanupInstance,
                 isCleaningUp: false
             };
@@ -5212,7 +5405,6 @@ var __webpack_modules__ = {
             } catch  {}
             return controller;
         }
-        var external_node_child_process_ = __webpack_require__("node:child_process");
         var wsl_support = __webpack_require__("./browsers/browsers-lib/wsl-support.ts");
         const LINUX_FIREFOX_PATHS = [
             '/usr/bin/firefox',
@@ -5482,13 +5674,12 @@ var __webpack_modules__ = {
                         browserPid: this.child?.pid,
                         extensionId: this.extensionOutputPath ? (0, banner.MT)(this.extensionOutputPath) : void 0
                     });
-                    this.child.on('close', ()=>{
-                        (0, shared_utils.sW)(profilePath);
-                    });
                     this.wireChildLifecycle();
+                    this.trackLiveBrowserPid();
                     let ctrl;
                     try {
                         ctrl = await setupRdpAfterLaunch(this.host, compilation, debugPort);
+                        this.trackLiveBrowserPid(1);
                     } catch (error) {
                         const reason = error?.extensionLoadRefusedReason;
                         if (!reason) {
@@ -5583,24 +5774,89 @@ 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);
-                        this.watchTimeout = void 0;
-                    }
-                    if ((0, messaging._o)()) this.ctx.logger?.info?.(messages.Th(this.host.browser));
-                    if (!(0, process_teardown.Op)(child)) {
-                        this.ctx.logger?.error?.(`[browser] ${this.host.browser} exited (code ${code ?? 'unknown'}) without being asked to. The add-on may have been rejected or the browser crashed; the session cannot be driven.`);
-                        (0, ready_stamp.Wi)(this.extensionOutputPath, code);
-                    }
-                    this.cleanupInstance().catch((err)=>{
-                        if ((0, messaging._o)()) this.ctx.logger?.error?.(`[browser] Cleanup error on child close: ${err?.message || err}`);
-                    });
-                    disposeProcessHandlers?.();
+                    const expected = (0, process_teardown.Op)(child);
+                    if (!expected && this.adoptHandedOffBrowser()) return;
+                    this.onBrowserGone(code, expected);
                 });
                 this.pipeChildOutput(child);
-                disposeProcessHandlers = setupFirefoxProcessHandlers(this.host.browser, ()=>this.child, ()=>this.cleanupInstance());
+                this.disposeProcessHandlers = setupFirefoxProcessHandlers(this.host.browser, ()=>this.child, ()=>this.cleanupInstance(), ()=>this.livePid);
+            }
+            onBrowserGone(code, expected) {
+                if (this.browserGone) return;
+                this.browserGone = true;
+                if (this.watchTimeout) {
+                    clearTimeout(this.watchTimeout);
+                    this.watchTimeout = void 0;
+                }
+                if (this.liveExitWatcher) {
+                    clearInterval(this.liveExitWatcher);
+                    this.liveExitWatcher = void 0;
+                }
+                if (this.host.launchProfilePath) (0, shared_utils.sW)(this.host.launchProfilePath);
+                if ((0, messaging._o)()) this.ctx.logger?.info?.(messages.Th(this.host.browser));
+                if (!expected) {
+                    this.ctx.logger?.error?.(`[browser] ${this.host.browser} exited (code ${code ?? 'unknown'}) without being asked to. The add-on may have been rejected or the browser crashed; the session cannot be driven.`);
+                    (0, ready_stamp.Wi)(this.extensionOutputPath, code);
+                }
+                this.cleanupInstance().catch((err)=>{
+                    if ((0, messaging._o)()) this.ctx.logger?.error?.(`[browser] Cleanup error on child close: ${err?.message || err}`);
+                });
+                this.disposeProcessHandlers?.();
+                this.disposeProcessHandlers = void 0;
+            }
+            async trackLiveBrowserPid(attempts) {
+                const child = this.child;
+                const profilePath = this.host.launchProfilePath;
+                if (!child?.pid || !profilePath || this.browserGone) return;
+                try {
+                    const pid = await resolveLiveBrowserPid({
+                        profilePath,
+                        binary: child.spawnfile,
+                        launcherPid: child.pid,
+                        attempts
+                    });
+                    if (pid && pid !== child.pid && this.child === child) this.adoptLivePid(pid);
+                } catch  {}
+            }
+            adoptHandedOffBrowser() {
+                const profilePath = this.host.launchProfilePath;
+                const child = this.child;
+                if (!profilePath || !child || this.browserGone) return false;
+                try {
+                    const pid = this.livePid || findLiveBrowserPid({
+                        profilePath,
+                        binary: child.spawnfile,
+                        launcherPid: child.pid,
+                        rows: listProcesses()
+                    });
+                    if (!pid || pid === this.child?.pid || !isPidAlive(pid)) return false;
+                    this.adoptLivePid(pid);
+                    return true;
+                } catch  {
+                    return false;
+                }
+            }
+            adoptLivePid(pid) {
+                if (this.livePid === pid) return;
+                this.livePid = pid;
+                (0, ready_stamp.M)(this.extensionOutputPath, {
+                    browserPid: pid,
+                    launcherPid: this.child?.pid
+                });
+                if ((0, messaging._o)()) this.ctx.logger?.info?.(`[browser] ${this.host.browser} handed the session to pid ${pid} (launcher pid ${this.child?.pid}).`);
+                this.watchLivePidExit();
+            }
+            watchLivePidExit() {
+                if (this.liveExitWatcher) clearInterval(this.liveExitWatcher);
+                this.liveExitWatcher = setInterval(()=>{
+                    const pid = this.livePid;
+                    if (!pid || isPidAlive(pid)) return;
+                    clearInterval(this.liveExitWatcher);
+                    this.liveExitWatcher = void 0;
+                    this.onBrowserGone(null, (0, process_teardown.PU)(pid));
+                }, 1000);
+                this.liveExitWatcher.unref?.();
             }
             async retryAddonInstall(compilation, debugPort) {
                 try {
@@ -5635,6 +5891,7 @@ var __webpack_modules__ = {
             }
             async cleanupInstance() {
                 (0, process_teardown.Df)(this.child, this.host.browser);
+                if (this.livePid && this.livePid !== this.child?.pid) (0, process_teardown._T)(this.livePid, this.host.browser);
             }
             scheduleWatchTimeout() {
                 if (this.watchTimeout) return;
@@ -5669,6 +5926,10 @@ var __webpack_modules__ = {
                 firefox_launch_define_property(this, "child", null);
                 firefox_launch_define_property(this, "watchTimeout", void 0);
                 firefox_launch_define_property(this, "extensionOutputPath", void 0);
+                firefox_launch_define_property(this, "livePid", null);
+                firefox_launch_define_property(this, "liveExitWatcher", void 0);
+                firefox_launch_define_property(this, "browserGone", false);
+                firefox_launch_define_property(this, "disposeProcessHandlers", void 0);
                 this.host = host;
                 this.ctx = ctx;
             }

package/dist/cli.cjs

@@ -230,7 +230,7 @@ var __webpack_modules__ = {
                     (0, _helpers_messaging__rspack_import_3._w)(_messages__rspack_import_5.io());
                 }
             } catch  {
-                const provenanceNote = _messages__rspack_import_5.xX(opts.binaryProvenance);
+                const provenanceNote = _messages__rspack_import_5.xX(opts.binaryProvenance, opts.browser);
                 (0, _helpers_messaging__rspack_import_3._w)(_messages__rspack_import_5.io());
                 (0, _helpers_messaging__rspack_import_3._w)((0, _helpers_messaging__rspack_import_3.Nr)({
                     rows: [
@@ -421,6 +421,7 @@ var __webpack_modules__ = {
         var pintor__rspack_import_8 = __webpack_require__("pintor");
         var pintor__rspack_import_8_default = /*#__PURE__*/ __webpack_require__.n(pintor__rspack_import_8);
         var _helpers_messaging__rspack_import_9 = __webpack_require__("./helpers/messaging.ts");
+        var _browser_family__rspack_import_10 = __webpack_require__("./browsers/browsers-lib/browser-family.ts");
         const require1 = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__);
         function getLoggingPrefix(type) {
             return (0, _helpers_messaging__rspack_import_9.Pl)(type);
@@ -829,9 +830,15 @@ var __webpack_modules__ = {
             if (rest.startsWith(node_path__rspack_import_3.sep) || rest.startsWith('/')) return `~${rest}`;
             return raw;
         }
-        function binaryProvenanceNote(provenance) {
-            if ('pinned' === provenance) return '(pinned with --chromium-binary)';
-            return '';
+        function binaryProvenanceNote(provenance, browser) {
+            if ('pinned' !== provenance) return '';
+            return `(pinned with ${pinnedBinaryFlag(browser)})`;
+        }
+        function pinnedBinaryFlag(browser) {
+            const name = String(browser || '');
+            if ((0, _browser_family__rspack_import_10.M_)(name)) return '--gecko-binary';
+            if ('safari' === name || 'webkit-based' === name) return '--safari-binary';
+            return '--chromium-binary';
         }
         function runningInDevelopment(manifest, browser, message, browserVersionLine, updateSuffix, opts) {
             const capitalize = (str)=>str.charAt(0).toUpperCase() + str.slice(1);
@@ -867,7 +874,7 @@ var __webpack_modules__ = {
             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 provenanceNote = binaryProvenanceNote(opts?.binaryProvenance, browser);
             const browserLabel = provenanceNote ? `${baseBrowserLabel} ${provenanceNote}` : baseBrowserLabel;
             const cleanId = String(id || '').trim();
             const includeExtensionId = opts?.includeExtensionId !== false;
@@ -1326,17 +1333,21 @@ var __webpack_modules__ = {
         var _messages__rspack_import_2 = __webpack_require__("./browsers/browsers-lib/messages.ts");
         const FORCE_KILL_GRACE_MS = 5000;
         const terminatedByUs = new WeakSet();
+        const terminatedPids = new Set();
         function wasTerminatedByUs(child) {
             return !!child && terminatedByUs.has(child);
         }
+        function wasPidTerminatedByUs(pid) {
+            return 'number' == typeof pid && terminatedPids.has(pid);
+        }
         function authorLog(line) {
             if (line && (0, _helpers_messaging__rspack_import_1._o)()) (0, _helpers_messaging__rspack_import_1._w)(line);
         }
-        function killWindowsTree(child, sync) {
-            if ('win32' !== process.platform) return;
+        function killWindowsTree(pid, sync) {
+            if ('win32' !== process.platform || !pid) return;
             const args = [
                 '/PID',
-                String(child.pid),
+                String(pid),
                 '/T',
                 '/F'
             ];
@@ -1351,10 +1362,37 @@ var __webpack_modules__ = {
                 }).on('error', ()=>{});
             } catch  {}
         }
+        function signalPid(pid, signal) {
+            try {
+                process.kill(pid, signal);
+                return true;
+            } catch  {
+                return false;
+            }
+        }
+        function gracefulTerminatePid(pid, browser) {
+            if (!pid || terminatedPids.has(pid)) return;
+            terminatedPids.add(pid);
+            killWindowsTree(pid, false);
+            authorLog(_messages__rspack_import_2.XH(browser));
+            signalPid(pid, 'SIGTERM');
+            const killTimer = setTimeout(()=>{
+                authorLog(_messages__rspack_import_2.AG(browser));
+                signalPid(pid, 'SIGKILL');
+            }, FORCE_KILL_GRACE_MS);
+            killTimer.unref?.();
+        }
+        function forceKillPidOnExit(pid, browser) {
+            if (!pid) return;
+            terminatedPids.add(pid);
+            killWindowsTree(pid, true);
+            authorLog(_messages__rspack_import_2.AG(browser));
+            signalPid(pid, 'SIGKILL');
+        }
         function gracefulTerminateChild(child, browser) {
             if (!child || child.killed) return;
             terminatedByUs.add(child);
-            killWindowsTree(child, false);
+            killWindowsTree(child.pid, false);
             authorLog(_messages__rspack_import_2.XH(browser));
             child.kill('SIGTERM');
             const killTimer = setTimeout(()=>{
@@ -1368,7 +1406,7 @@ var __webpack_modules__ = {
         function forceKillChildOnExit(child, browser) {
             if (!child) return;
             terminatedByUs.add(child);
-            killWindowsTree(child, true);
+            killWindowsTree(child.pid, true);
             try {
                 authorLog(_messages__rspack_import_2.AG(browser));
                 child.kill('SIGKILL');
@@ -1389,7 +1427,10 @@ var __webpack_modules__ = {
             $Y: ()=>forceKillChildOnExit,
             Df: ()=>gracefulTerminateChild,
             FA: ()=>isBenignSocketTeardown,
-            Op: ()=>wasTerminatedByUs
+            Op: ()=>wasTerminatedByUs,
+            PU: ()=>wasPidTerminatedByUs,
+            Qx: ()=>forceKillPidOnExit,
+            _T: ()=>gracefulTerminatePid
         });
     },
     "./browsers/browsers-lib/ready-message.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
@@ -1433,6 +1474,7 @@ var __webpack_modules__ = {
                 const profilePath = String(details?.profilePath || '').trim();
                 if (profilePath) ready.profilePath = profilePath;
                 if ('number' == typeof details?.browserPid && Number.isFinite(details.browserPid)) ready.browserPid = details.browserPid;
+                if ('number' == typeof details?.launcherPid && Number.isFinite(details.launcherPid)) ready.launcherPid = details.launcherPid;
                 const extensionId = String(details?.extensionId || '').trim();
                 if (extensionId) ready.extensionId = extensionId;
                 const binary = String(details?.binary || '').trim();
@@ -2686,6 +2728,7 @@ var __webpack_modules__ = {
             '--enable-features=SidePanelUpdates',
             '--disable-features=DisableLoadExtensionCommandLineSwitch',
             '--disable-features=ExtensionDisableUnsupportedDeveloper',
+            '--disable-features=SafetyHubExtensionsOffStoreTrigger',
             '--enable-unsafe-extension-debugging',
             '--silent-debugger-extension-api'
         ];
@@ -3514,7 +3557,7 @@ var __webpack_modules__ = {
                         binaryProvenance
                     };
                     if (enableCdp) {
-                        const mod = await __webpack_require__.e(84).then(__webpack_require__.bind(__webpack_require__, "./browsers/run-chromium/chromium-launch/setup-cdp-after-launch.ts"));
+                        const mod = await __webpack_require__.e(597).then(__webpack_require__.bind(__webpack_require__, "./browsers/run-chromium/chromium-launch/setup-cdp-after-launch.ts"));
                         const CDP_SETUP_TIMEOUT_MS = 45000;
                         await Promise.race([
                             mod.setupCdpAfterLaunch(compilation, cdpConfig, chromiumConfig, pipeStreams),
@@ -3805,6 +3848,150 @@ var __webpack_modules__ = {
         var process_teardown = __webpack_require__("./browsers/browsers-lib/process-teardown.ts");
         var ready_message = __webpack_require__("./browsers/browsers-lib/ready-message.ts");
         var ready_stamp = __webpack_require__("./browsers/browsers-lib/ready-stamp.ts");
+        var external_node_child_process_ = __webpack_require__("node:child_process");
+        const PS_ROW = /^\s*(\d+)\s+(\d+)\s+(.*)$/;
+        const HELPER_PROCESS = /plugin-container|(^|\s)-contentproc(\s|$)|(^|\s)-childID(\s|$)|--type=/;
+        function runQuiet(bin, args) {
+            try {
+                const result = (0, external_node_child_process_.spawnSync)(bin, args, {
+                    encoding: 'utf-8',
+                    stdio: [
+                        'ignore',
+                        'pipe',
+                        'ignore'
+                    ],
+                    windowsHide: true,
+                    maxBuffer: 67108864
+                });
+                if (result.error || 0 !== result.status) return null;
+                return String(result.stdout || '');
+            } catch  {
+                return null;
+            }
+        }
+        function parseProcessRows(output) {
+            const rows = [];
+            for (const line of String(output || '').split(/\r?\n/)){
+                const match = PS_ROW.exec(line.replace(/\r$/, ''));
+                if (!match) continue;
+                const pid = Number(match[1]);
+                const ppid = Number(match[2]);
+                if (Number.isFinite(pid) && Number.isFinite(ppid)) rows.push({
+                    pid,
+                    ppid,
+                    command: match[3].trim()
+                });
+            }
+            return rows;
+        }
+        function appendLinuxProfileEnv(rows) {
+            return rows.map((row)=>{
+                try {
+                    const environ = external_node_fs_.readFileSync(`/proc/${row.pid}/environ`, 'utf-8');
+                    const entry = environ.split('\0').find((pair)=>pair.startsWith('XRE_PROFILE_PATH='));
+                    return entry ? {
+                        ...row,
+                        command: `${row.command} ${entry}`
+                    } : row;
+                } catch  {
+                    return row;
+                }
+            });
+        }
+        function listProcesses(platform = process.platform) {
+            if ('win32' === platform) {
+                const script = 'Get-CimInstance Win32_Process | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId) $($_.CommandLine)" }';
+                const output = runQuiet('powershell.exe', [
+                    '-NoProfile',
+                    '-NonInteractive',
+                    '-Command',
+                    script
+                ]);
+                return output ? parseProcessRows(output) : [];
+            }
+            if ('darwin' === platform) {
+                const output = runQuiet('ps', [
+                    '-axEo',
+                    'pid=,ppid=,command='
+                ]);
+                return output ? parseProcessRows(output) : [];
+            }
+            const output = runQuiet('ps', [
+                '-axo',
+                'pid=,ppid=,command='
+            ]);
+            const rows = output ? parseProcessRows(output) : [];
+            return 'linux' === platform ? appendLinuxProfileEnv(rows) : rows;
+        }
+        function resolve_live_pid_normalizePath(value) {
+            return String(value || '').replace(/\\/g, '/').toLowerCase();
+        }
+        function carriesProfile(command, profilePath) {
+            const haystack = resolve_live_pid_normalizePath(command);
+            const needle = resolve_live_pid_normalizePath(profilePath);
+            let from = 0;
+            for(;;){
+                const at = haystack.indexOf(needle, from);
+                if (at < 0) return false;
+                const before = 0 === at ? ' ' : haystack[at - 1];
+                const after = haystack[at + needle.length] ?? ' ';
+                if (/[\s="']/.test(before) && /[\s"']/.test(after)) return true;
+                from = at + 1;
+            }
+        }
+        function executableOf(command) {
+            const trimmed = resolve_live_pid_normalizePath(command).trim();
+            if (trimmed.startsWith('"')) {
+                const end = trimmed.indexOf('"', 1);
+                return end > 0 ? trimmed.slice(1, end) : trimmed;
+            }
+            const cut = trimmed.search(/\s(-|[a-z_][a-z0-9_]*=)/);
+            return cut > 0 ? trimmed.slice(0, cut) : trimmed;
+        }
+        function findLiveBrowserPid(input) {
+            const profilePath = String(input.profilePath || '').trim();
+            const binary = resolve_live_pid_normalizePath(input.binary).trim();
+            if (!profilePath || !binary) return null;
+            const candidates = input.rows.filter((row)=>executableOf(row.command) === binary && carriesProfile(row.command, profilePath) && !HELPER_PROCESS.test(row.command));
+            if (0 === candidates.length) return null;
+            const launcher = input.launcherPid ? candidates.find((row)=>row.pid === input.launcherPid) : void 0;
+            if (launcher) {
+                const twin = candidates.find((row)=>row.pid !== launcher.pid);
+                return twin ? twin.pid : launcher.pid;
+            }
+            const pids = new Set(candidates.map((row)=>row.pid));
+            const roots = candidates.filter((row)=>!pids.has(row.ppid));
+            return (roots[0] || candidates[0]).pid;
+        }
+        function isPidAlive(pid) {
+            if (!pid || !Number.isFinite(pid)) return false;
+            try {
+                process.kill(pid, 0);
+                return true;
+            } catch (error) {
+                return error?.code === 'EPERM';
+            }
+        }
+        async function resolveLiveBrowserPid(input) {
+            const list = input.list || listProcesses;
+            const attempts = Math.max(1, input.attempts ?? 6);
+            const intervalMs = input.intervalMs ?? 500;
+            const sleep = input.sleep || ((ms)=>new Promise((r)=>{
+                    setTimeout(r, ms).unref?.();
+                }));
+            let last = null;
+            for(let attempt = 0; attempt < attempts; attempt += 1){
+                last = findLiveBrowserPid({
+                    profilePath: input.profilePath,
+                    binary: input.binary,
+                    launcherPid: input.launcherPid,
+                    rows: list()
+                });
+                if (last && last !== input.launcherPid) break;
+                if (attempt < attempts - 1) await sleep(intervalMs);
+            }
+            return last;
+        }
         var runtime_options = __webpack_require__("./browsers/browsers-lib/runtime-options.ts");
         var shared_utils = __webpack_require__("./browsers/browsers-lib/shared-utils.ts");
         function parseFlatpakBinary(binary) {
@@ -4082,7 +4269,12 @@ var __webpack_modules__ = {
             for (const instance of activeInstances)attemptCleanup(instance);
         }
         function forceKillAllOnExit() {
-            for (const instance of activeInstances)(0, process_teardown.$Y)(instance.childRef(), instance.browser);
+            for (const instance of activeInstances){
+                const child = instance.childRef();
+                const livePid = instance.livePidRef();
+                (0, process_teardown.$Y)(child, instance.browser);
+                if (livePid && livePid !== child?.pid) (0, process_teardown.Qx)(livePid, instance.browser);
+            }
         }
         function firstBrowserLabel() {
             for (const instance of activeInstances)return instance.browser;
@@ -4114,10 +4306,11 @@ var __webpack_modules__ = {
                 process.exit(1);
             });
         }
-        function setupFirefoxProcessHandlers(browser, childRef, cleanupInstance) {
+        function setupFirefoxProcessHandlers(browser, childRef, cleanupInstance, livePidRef = ()=>null) {
             const instance = {
                 browser,
                 childRef,
+                livePidRef,
                 cleanupInstance,
                 isCleaningUp: false
             };
@@ -5203,7 +5396,6 @@ var __webpack_modules__ = {
             } catch  {}
             return controller;
         }
-        var external_node_child_process_ = __webpack_require__("node:child_process");
         var wsl_support = __webpack_require__("./browsers/browsers-lib/wsl-support.ts");
         const LINUX_FIREFOX_PATHS = [
             '/usr/bin/firefox',
@@ -5473,13 +5665,12 @@ var __webpack_modules__ = {
                         browserPid: this.child?.pid,
                         extensionId: this.extensionOutputPath ? (0, banner.MT)(this.extensionOutputPath) : void 0
                     });
-                    this.child.on('close', ()=>{
-                        (0, shared_utils.sW)(profilePath);
-                    });
                     this.wireChildLifecycle();
+                    this.trackLiveBrowserPid();
                     let ctrl;
                     try {
                         ctrl = await setupRdpAfterLaunch(this.host, compilation, debugPort);
+                        this.trackLiveBrowserPid(1);
                     } catch (error) {
                         const reason = error?.extensionLoadRefusedReason;
                         if (!reason) {
@@ -5574,24 +5765,89 @@ 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);
-                        this.watchTimeout = void 0;
-                    }
-                    if ((0, messaging._o)()) this.ctx.logger?.info?.(messages.Th(this.host.browser));
-                    if (!(0, process_teardown.Op)(child)) {
-                        this.ctx.logger?.error?.(`[browser] ${this.host.browser} exited (code ${code ?? 'unknown'}) without being asked to. The add-on may have been rejected or the browser crashed; the session cannot be driven.`);
-                        (0, ready_stamp.Wi)(this.extensionOutputPath, code);
-                    }
-                    this.cleanupInstance().catch((err)=>{
-                        if ((0, messaging._o)()) this.ctx.logger?.error?.(`[browser] Cleanup error on child close: ${err?.message || err}`);
-                    });
-                    disposeProcessHandlers?.();
+                    const expected = (0, process_teardown.Op)(child);
+                    if (!expected && this.adoptHandedOffBrowser()) return;
+                    this.onBrowserGone(code, expected);
                 });
                 this.pipeChildOutput(child);
-                disposeProcessHandlers = setupFirefoxProcessHandlers(this.host.browser, ()=>this.child, ()=>this.cleanupInstance());
+                this.disposeProcessHandlers = setupFirefoxProcessHandlers(this.host.browser, ()=>this.child, ()=>this.cleanupInstance(), ()=>this.livePid);
+            }
+            onBrowserGone(code, expected) {
+                if (this.browserGone) return;
+                this.browserGone = true;
+                if (this.watchTimeout) {
+                    clearTimeout(this.watchTimeout);
+                    this.watchTimeout = void 0;
+                }
+                if (this.liveExitWatcher) {
+                    clearInterval(this.liveExitWatcher);
+                    this.liveExitWatcher = void 0;
+                }
+                if (this.host.launchProfilePath) (0, shared_utils.sW)(this.host.launchProfilePath);
+                if ((0, messaging._o)()) this.ctx.logger?.info?.(messages.Th(this.host.browser));
+                if (!expected) {
+                    this.ctx.logger?.error?.(`[browser] ${this.host.browser} exited (code ${code ?? 'unknown'}) without being asked to. The add-on may have been rejected or the browser crashed; the session cannot be driven.`);
+                    (0, ready_stamp.Wi)(this.extensionOutputPath, code);
+                }
+                this.cleanupInstance().catch((err)=>{
+                    if ((0, messaging._o)()) this.ctx.logger?.error?.(`[browser] Cleanup error on child close: ${err?.message || err}`);
+                });
+                this.disposeProcessHandlers?.();
+                this.disposeProcessHandlers = void 0;
+            }
+            async trackLiveBrowserPid(attempts) {
+                const child = this.child;
+                const profilePath = this.host.launchProfilePath;
+                if (!child?.pid || !profilePath || this.browserGone) return;
+                try {
+                    const pid = await resolveLiveBrowserPid({
+                        profilePath,
+                        binary: child.spawnfile,
+                        launcherPid: child.pid,
+                        attempts
+                    });
+                    if (pid && pid !== child.pid && this.child === child) this.adoptLivePid(pid);
+                } catch  {}
+            }
+            adoptHandedOffBrowser() {
+                const profilePath = this.host.launchProfilePath;
+                const child = this.child;
+                if (!profilePath || !child || this.browserGone) return false;
+                try {
+                    const pid = this.livePid || findLiveBrowserPid({
+                        profilePath,
+                        binary: child.spawnfile,
+                        launcherPid: child.pid,
+                        rows: listProcesses()
+                    });
+                    if (!pid || pid === this.child?.pid || !isPidAlive(pid)) return false;
+                    this.adoptLivePid(pid);
+                    return true;
+                } catch  {
+                    return false;
+                }
+            }
+            adoptLivePid(pid) {
+                if (this.livePid === pid) return;
+                this.livePid = pid;
+                (0, ready_stamp.M)(this.extensionOutputPath, {
+                    browserPid: pid,
+                    launcherPid: this.child?.pid
+                });
+                if ((0, messaging._o)()) this.ctx.logger?.info?.(`[browser] ${this.host.browser} handed the session to pid ${pid} (launcher pid ${this.child?.pid}).`);
+                this.watchLivePidExit();
+            }
+            watchLivePidExit() {
+                if (this.liveExitWatcher) clearInterval(this.liveExitWatcher);
+                this.liveExitWatcher = setInterval(()=>{
+                    const pid = this.livePid;
+                    if (!pid || isPidAlive(pid)) return;
+                    clearInterval(this.liveExitWatcher);
+                    this.liveExitWatcher = void 0;
+                    this.onBrowserGone(null, (0, process_teardown.PU)(pid));
+                }, 1000);
+                this.liveExitWatcher.unref?.();
             }
             async retryAddonInstall(compilation, debugPort) {
                 try {
@@ -5626,6 +5882,7 @@ var __webpack_modules__ = {
             }
             async cleanupInstance() {
                 (0, process_teardown.Df)(this.child, this.host.browser);
+                if (this.livePid && this.livePid !== this.child?.pid) (0, process_teardown._T)(this.livePid, this.host.browser);
             }
             scheduleWatchTimeout() {
                 if (this.watchTimeout) return;
@@ -5660,6 +5917,10 @@ var __webpack_modules__ = {
                 firefox_launch_define_property(this, "child", null);
                 firefox_launch_define_property(this, "watchTimeout", void 0);
                 firefox_launch_define_property(this, "extensionOutputPath", void 0);
+                firefox_launch_define_property(this, "livePid", null);
+                firefox_launch_define_property(this, "liveExitWatcher", void 0);
+                firefox_launch_define_property(this, "browserGone", false);
+                firefox_launch_define_property(this, "disposeProcessHandlers", void 0);
                 this.host = host;
                 this.ctx = ctx;
             }
@@ -7198,7 +7459,7 @@ var __webpack_modules__ = {
             return Math.min(Math.max(n, min), max);
         }
         const TEMPLATE_CORPUS_REPO = 'extension-js/examples';
-        const TEMPLATE_CORPUS_REF = '06d33e35894516a460409dca06d1614e291e6252';
+        const TEMPLATE_CORPUS_REF = 'f8087f012cf195cba9aa2e3c32fd5a6729da33f0';
         const TEMPLATE_CORPUS_SLUGS = [
             'action',
             'action-locales',

package/dist/extension/browsers/browsers-lib/messages.d.ts

@@ -120,7 +120,7 @@ export interface DevClientMessage {
     };
 }
 export declare function collapseHomeDirInCardValue(value: string): string;
-export declare function binaryProvenanceNote(provenance?: 'managed' | 'pinned' | 'system' | 'snapshot'): string;
+export declare function binaryProvenanceNote(provenance?: 'managed' | 'pinned' | 'system' | 'snapshot', browser?: BrowserType | string): string;
 export declare function runningInDevelopment(manifest: DevManifestInfo, browser: BrowserType, message: DevClientMessage, browserVersionLine?: string, updateSuffix?: string, opts?: {
     includeExtensionId?: boolean;
     runLabel?: string;

package/dist/extension/browsers/browsers-lib/process-teardown.d.ts

@@ -2,6 +2,9 @@ import { type ChildProcess } from 'node:child_process';
 import type { BrowserType } from '../browsers-types.js';
 export declare const FORCE_KILL_GRACE_MS = 5000;
 export declare function wasTerminatedByUs(child: ChildProcess | null): boolean;
+export declare function wasPidTerminatedByUs(pid: number | null | undefined): boolean;
+export declare function gracefulTerminatePid(pid: number | null | undefined, browser: BrowserType): void;
+export declare function forceKillPidOnExit(pid: number | null | undefined, browser: BrowserType): void;
 export declare function gracefulTerminateChild(child: ChildProcess | null, browser: BrowserType): void;
 export declare function forceKillChildOnExit(child: ChildProcess | null, browser: BrowserType): void;
 export declare function isBenignSocketTeardown(value: unknown): boolean;

package/dist/extension/browsers/browsers-lib/ready-stamp.d.ts

@@ -2,6 +2,7 @@ export declare function stampReadyRdpPort(extensionOutputPath: string | undefine
 export declare function stampReadyBrowserLaunch(extensionOutputPath: string | undefined, details: {
     profilePath?: string;
     browserPid?: number;
+    launcherPid?: number;
     extensionId?: string;
     binary?: string;
     binaryProvenance?: 'managed' | 'pinned' | 'system' | 'snapshot';

package/dist/extension/browsers/browsers-lib/resolve-live-pid.d.ts

@@ -0,0 +1,25 @@
+export interface ProcessRow {
+    pid: number;
+    ppid: number;
+    command: string;
+}
+export type ProcessLister = () => ProcessRow[];
+export declare function parseProcessRows(output: string): ProcessRow[];
+export declare function listProcesses(platform?: NodeJS.Platform): ProcessRow[];
+export declare function executableOf(command: string): string;
+export declare function findLiveBrowserPid(input: {
+    profilePath: string;
+    binary: string;
+    launcherPid?: number;
+    rows: ProcessRow[];
+}): number | null;
+export declare function isPidAlive(pid: number | null | undefined): boolean;
+export declare function resolveLiveBrowserPid(input: {
+    profilePath: string;
+    binary: string;
+    launcherPid?: number;
+    list?: ProcessLister;
+    attempts?: number;
+    intervalMs?: number;
+    sleep?: (ms: number) => Promise<void>;
+}): Promise<number | null>;

package/dist/extension/browsers/browsers-types.d.ts

@@ -29,7 +29,7 @@ export interface BrowserConfig {
     browserFlags: string[];
     startingUrl: string | undefined;
 }
-export type DefaultBrowserFlags = '--no-first-run' | '--disable-client-side-phishing-detection' | '--disable-component-extensions-with-background-pages' | '--disable-default-apps' | '--disable-features=InterestFeedContentSuggestions' | '--disable-features=Translate' | '--hide-scrollbars' | '--mute-audio' | '--no-default-browser-check' | '--ash-no-nudges' | '--disable-search-engine-choice-screen' | '--disable-features=MediaRoute' | '--use-mock-keychain' | '--disable-background-networking' | '--disable-breakpad' | '--disable-component-update' | '--disable-domain-reliability' | '--disable-features=AutofillServerCommunicatio' | '--disable-features=CertificateTransparencyComponentUpdate' | '--disable-sync' | '--disable-features=OptimizationHints' | '--disable-features=DialMediaRouteProvider' | '--no-pings' | '--enable-features=SidePanelUpdates' | '--disable-features=DisableLoadExtensionCommandLineSwitch' | '--disable-features=ExtensionDisableUnsupportedDeveloper' | '--enable-unsafe-extension-debugging' | '--silent-debugger-extension-api';
+export type DefaultBrowserFlags = '--no-first-run' | '--disable-client-side-phishing-detection' | '--disable-component-extensions-with-background-pages' | '--disable-default-apps' | '--disable-features=InterestFeedContentSuggestions' | '--disable-features=Translate' | '--hide-scrollbars' | '--mute-audio' | '--no-default-browser-check' | '--ash-no-nudges' | '--disable-search-engine-choice-screen' | '--disable-features=MediaRoute' | '--use-mock-keychain' | '--disable-background-networking' | '--disable-breakpad' | '--disable-component-update' | '--disable-domain-reliability' | '--disable-features=AutofillServerCommunicatio' | '--disable-features=CertificateTransparencyComponentUpdate' | '--disable-sync' | '--disable-features=OptimizationHints' | '--disable-features=DialMediaRouteProvider' | '--no-pings' | '--enable-features=SidePanelUpdates' | '--disable-features=DisableLoadExtensionCommandLineSwitch' | '--disable-features=ExtensionDisableUnsupportedDeveloper' | '--disable-features=SafetyHubExtensionsOffStoreTrigger' | '--enable-unsafe-extension-debugging' | '--silent-debugger-extension-api';
 export interface PluginOptions {
     /**
      * @default false

package/dist/extension/browsers/run-chromium/cdp/cdp-extension-controller/index.d.ts

@@ -1,6 +1,7 @@
 import type { Readable, Writable } from 'node:stream';
 import type { BrowserLogSink } from '../../../browsers-types.js';
 import type { CdpProtocolMessage } from '../../chromium-types.js';
+import { type DeveloperModeOutcome } from '../ensure-developer-mode.js';
 import { type LoadUnpackedOutcome } from './ensure.js';
 interface ExtensionInfoResult {
     extensionId: string;
@@ -29,6 +30,7 @@ export declare class CDPExtensionController {
         logSink?: BrowserLogSink;
     });
     connect(): Promise<void>;
+    ensureDeveloperMode(): Promise<DeveloperModeOutcome>;
     openTab(url: string): Promise<void>;
     closeSelfOpenedTabs(): Promise<number>;
     verifyGuestLoaded(): Promise<LoadUnpackedOutcome>;

package/dist/extension/browsers/run-chromium/cdp/ensure-developer-mode.d.ts

@@ -0,0 +1,12 @@
+export type DeveloperModeOutcome = 'already-on' | 'enabled' | 'skipped' | 'unavailable';
+export interface DeveloperModeTransport {
+    sendCommand(method: string, params?: Record<string, unknown>, sessionId?: string): Promise<unknown>;
+}
+export declare function developerModeFromProfile(profilePath: string): boolean;
+export declare function developerModeFlipIsSafe(browserArgs: string[]): boolean;
+export declare function ensureDeveloperMode(options: {
+    transport: DeveloperModeTransport;
+    attempts?: number;
+    delayMs?: number;
+    sleep?: (ms: number) => Promise<void>;
+}): Promise<DeveloperModeOutcome>;

package/dist/extension/browsers/run-firefox/firefox-launch/index.d.ts

@@ -18,6 +18,10 @@ export declare class FirefoxLaunchPlugin {
     private child;
     private watchTimeout?;
     private extensionOutputPath?;
+    private livePid;
+    private liveExitWatcher?;
+    private browserGone;
+    private disposeProcessHandlers?;
     constructor(host: FirefoxPluginRuntime, ctx: FirefoxContext);
     runOnce(compilation: CompilationLike, options: LaunchOptions): Promise<void>;
     apply(compiler: unknown): void;
@@ -27,6 +31,11 @@ export declare class FirefoxLaunchPlugin {
     private spawnFirefoxChild;
     private pipeChildOutput;
     private wireChildLifecycle;
+    private onBrowserGone;
+    private trackLiveBrowserPid;
+    private adoptHandedOffBrowser;
+    private adoptLivePid;
+    private watchLivePidExit;
     private retryAddonInstall;
     private reportAddonLoadRefused;
     private cleanupInstance;

package/dist/extension/browsers/run-firefox/firefox-launch/process-handlers.d.ts

@@ -2,4 +2,4 @@ import type { ChildProcess } from 'node:child_process';
 export type FirefoxBrowserKind = 'firefox' | 'chrome' | 'edge' | 'chromium-based';
 export declare function __activeFirefoxInstanceCount(): number;
 export declare function __resetFirefoxProcessHandlersForTest(): void;
-export declare function setupFirefoxProcessHandlers(browser: FirefoxBrowserKind, childRef: () => ChildProcess | null, cleanupInstance: () => Promise<void>): () => void;
+export declare function setupFirefoxProcessHandlers(browser: FirefoxBrowserKind, childRef: () => ChildProcess | null, cleanupInstance: () => Promise<void>, livePidRef?: () => number | null): () => void;

package/dist/extension/helpers/messaging.d.ts

@@ -1,6 +1,7 @@
 export type Channel = 'info' | 'success' | 'warn' | 'error' | 'debug';
 export declare function isDebug(): boolean;
 export declare function prefix(type: Channel): string;
+export declare function hasChannelPrefix(text: string): boolean;
 export declare function isMachineOutput(): boolean;
 export declare function humanLine(...parts: unknown[]): void;
 export declare function humanWarn(...parts: unknown[]): void;

package/dist/extension/helpers/template-catalog.d.ts

@@ -1,6 +1,6 @@
 export declare const DEFAULT_TEMPLATE = "typescript";
 export declare const BUNDLED_TEMPLATES: readonly string[];
-export declare const TEMPLATE_CATALOG_URL = "https://github.com/extension-js/examples/tree/06d33e35894516a460409dca06d1614e291e6252/examples";
+export declare const TEMPLATE_CATALOG_URL = "https://github.com/extension-js/examples/tree/f8087f012cf195cba9aa2e3c32fd5a6729da33f0/examples";
 export interface TemplateGroup {
     title: string;
     summary: string;

package/dist/extension/helpers/template-corpus.generated.d.ts

@@ -1,3 +1,3 @@
 export declare const TEMPLATE_CORPUS_REPO = "extension-js/examples";
-export declare const TEMPLATE_CORPUS_REF = "06d33e35894516a460409dca06d1614e291e6252";
+export declare const TEMPLATE_CORPUS_REF = "f8087f012cf195cba9aa2e3c32fd5a6729da33f0";
 export declare const TEMPLATE_CORPUS_SLUGS: readonly string[];

package/package.json

@@ -38,7 +38,7 @@
     "extension": "./bin/extension.cjs"
   },
   "name": "extension",
-  "version": "4.1.21",
+  "version": "4.1.22",
   "description": "The cross-browser extension framework. Build Chrome, Edge, Firefox, and Safari extensions with no build configuration.",
   "homepage": "https://extension.js.org/",
   "bugs": {
@@ -54,7 +54,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "scripts": {
-    "pretest": "pnpm run compile",
+    "pretest": "node ../../scripts/ensure-workspace-deps.mjs && pnpm run compile",
     "prepublishOnly": "pnpm run compile",
     "compile": "rslib build",
     "watch": "rslib build --watch",
@@ -105,9 +105,9 @@
     "vivaldi-location2": "2.1.1",
     "waterfox-location": "2.1.1",
     "yandex-location": "2.1.1",
-    "extension-create": "4.1.21",
-    "extension-develop": "4.1.21",
-    "extension-install": "4.1.21",
+    "extension-create": "4.1.22",
+    "extension-develop": "4.1.22",
+    "extension-install": "4.1.22",
     "commander": "^15.0.0",
     "pintor": "0.3.0",
     "semver": "^7.7.3",