extension 4.1.20 → 4.1.22

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);
@@ -749,7 +750,7 @@ var __webpack_modules__ = {
             return `${getLoggingPrefix('warn')} safari-web-extension-converter reported ${pintor__rspack_import_8_default().yellow(String(warnings.length))} ${1 === warnings.length ? 'warning' : 'warnings'}, some manifest keys/APIs may not be supported by Safari:\n` + warnings.map((line)=>`  ${pintor__rspack_import_8_default().gray('•')} ${line}`).join('\n') + (kept.length ? `\nExtension.js kept ${1 === kept.length ? 'one of these keys' : 'some of these keys'} on purpose:\n${keptLines}` : '');
         }
         function safariDefaultBundleIdNote(bundleId) {
-            return `${getLoggingPrefix('warn')} The bundle id ${pintor__rspack_import_8_default().gray(bundleId)} is generated from the app name.\nEvery project built from the same source shares this id, and the first team to register it takes it.\nSet your own with ${pintor__rspack_import_8_default().blue('--bundle-id')} before your first submission.\nAfter a submission, a new id is a new extension with none of your users.`;
+            return `${getLoggingPrefix('info')} Bundle id ${pintor__rspack_import_8_default().gray(bundleId)} (generated, set ${pintor__rspack_import_8_default().blue('--bundle-id')} to own it).`;
         }
         function safariOpenHint(appPath, appName) {
             return `${getLoggingPrefix('info')} Launch it once to register with Safari: ${pintor__rspack_import_8_default().blue('open')} ${pintor__rspack_import_8_default().underline(`"${appPath}"`)}\nThen turn on ${pintor__rspack_import_8_default().yellow(appName)} in Safari ▸ Settings ▸ Extensions.`;
@@ -771,6 +772,9 @@ var __webpack_modules__ = {
         function safariRegistered(appName) {
             return `${getLoggingPrefix('success')} Safari recognizes ${pintor__rspack_import_8_default().yellow(appName)}, finish enabling it with the steps above.`;
         }
+        function safariPidUnresolved(appName) {
+            return `${getLoggingPrefix('warn')} Opened ${pintor__rspack_import_8_default().yellow(appName)} but could not find its process id.\nThe session's ready.json names the app and the extension without a ${pintor__rspack_import_8_default().gray('browserPid')}.`;
+        }
         function safariNotYetRegistered(appName) {
             return `${getLoggingPrefix('info')} Safari hasn't picked up ${pintor__rspack_import_8_default().yellow(appName)} yet.\nOpen the app once, then check Safari ▸ Settings ▸ Extensions.`;
         }
@@ -825,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);
@@ -863,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;
@@ -1032,6 +1042,7 @@ var __webpack_modules__ = {
             jR: ()=>safariBuilding,
             jc: ()=>safariProjectStale,
             jk: ()=>requireGeckoBinaryForGeckoBased,
+            jn: ()=>safariPidUnresolved,
             kK: ()=>preferringSystemBrowserOverSnapshot,
             l9: ()=>parsingPacketError,
             lO: ()=>firefoxDryRunArgs,
@@ -1321,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'
             ];
@@ -1346,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(()=>{
@@ -1363,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');
@@ -1384,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__) {
@@ -1404,6 +1449,7 @@ var __webpack_modules__ = {
     "./browsers/browsers-lib/ready-stamp.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         var node_fs__rspack_import_0 = __webpack_require__("node:fs");
         var node_path__rspack_import_1 = __webpack_require__("node:path");
+        var _write_json_atomic__rspack_import_2 = __webpack_require__("./browsers/browsers-lib/write-json-atomic.ts");
         function readyPathFor(extensionOutputPath) {
             return node_path__rspack_import_1.join(node_path__rspack_import_1.dirname(extensionOutputPath), 'extension-js', node_path__rspack_import_1.basename(extensionOutputPath), 'ready.json');
         }
@@ -1415,7 +1461,7 @@ var __webpack_modules__ = {
                 const ready = JSON.parse(node_fs__rspack_import_0.readFileSync(readyPath, 'utf-8'));
                 if (ready.rdpPort === rdpPort) return;
                 ready.rdpPort = rdpPort;
-                node_fs__rspack_import_0.writeFileSync(readyPath, JSON.stringify(ready, null, 2));
+                (0, _write_json_atomic__rspack_import_2.Z)(readyPath, ready);
             } catch  {}
         }
         function stampReadyBrowserLaunch(extensionOutputPath, details) {
@@ -1427,13 +1473,14 @@ 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();
                 if (binary) ready.binary = binary;
                 const provenance = String(details?.binaryProvenance || '').trim();
                 if (provenance) ready.binaryProvenance = provenance;
-                node_fs__rspack_import_0.writeFileSync(readyPath, JSON.stringify(ready, null, 2));
+                (0, _write_json_atomic__rspack_import_2.Z)(readyPath, ready);
             } catch  {}
         }
         function stampReadyExtensionId(extensionOutputPath, extensionId) {
@@ -1445,7 +1492,7 @@ var __webpack_modules__ = {
                 const ready = JSON.parse(node_fs__rspack_import_0.readFileSync(readyPath, 'utf-8'));
                 if (ready.extensionId === id) return;
                 ready.extensionId = id;
-                node_fs__rspack_import_0.writeFileSync(readyPath, JSON.stringify(ready, null, 2));
+                (0, _write_json_atomic__rspack_import_2.Z)(readyPath, ready);
             } catch  {}
         }
         function stampReadyExtensionLoadRefused(extensionOutputPath, reason) {
@@ -1460,7 +1507,7 @@ var __webpack_modules__ = {
                 ready.message = `${browserLabel.charAt(0).toUpperCase() + browserLabel.slice(1)} refused to load the extension at ${extensionOutputPath}${reason ? `: ${reason}` : ''}`;
                 ready.extensionLoadRefusedAt = new Date().toISOString();
                 if (reason) ready.extensionLoadRefusedReason = reason;
-                node_fs__rspack_import_0.writeFileSync(readyPath, JSON.stringify(ready, null, 2));
+                (0, _write_json_atomic__rspack_import_2.Z)(readyPath, ready);
             } catch  {}
         }
         function stampReadyProfileLocked(extensionOutputPath, details) {
@@ -1474,7 +1521,7 @@ var __webpack_modules__ = {
                 ready.message = String(details?.message || '').trim() || 'the browser profile is already in use by another session';
                 ready.profileLockedAt = new Date().toISOString();
                 if (details?.owner) ready.profileLockOwner = details.owner;
-                node_fs__rspack_import_0.writeFileSync(readyPath, JSON.stringify(ready, null, 2));
+                (0, _write_json_atomic__rspack_import_2.Z)(readyPath, ready);
             } catch  {}
         }
         function stampReadyBrowserExited(extensionOutputPath, code) {
@@ -1490,7 +1537,7 @@ var __webpack_modules__ = {
                     ready.code = 'browser_exited';
                     ready.message = `the ${ready.browser || 'browser'} process exited (code ${code ?? 'unknown'}); nothing is running`;
                 }
-                node_fs__rspack_import_0.writeFileSync(readyPath, JSON.stringify(ready, null, 2));
+                (0, _write_json_atomic__rspack_import_2.Z)(readyPath, ready);
             } catch  {}
         }
         __webpack_require__.d(__webpack_exports__, {
@@ -1953,6 +2000,27 @@ var __webpack_modules__ = {
             yO: ()=>probeChromiumBinaryVersion
         });
     },
+    "./browsers/browsers-lib/write-json-atomic.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+        var node_fs__rspack_import_0 = __webpack_require__("node:fs");
+        function writeJsonAtomic(filePath, value) {
+            const tmpPath = `${filePath}.tmp-${process.pid}`;
+            try {
+                node_fs__rspack_import_0.writeFileSync(tmpPath, JSON.stringify(value, null, 2), 'utf-8');
+                node_fs__rspack_import_0.renameSync(tmpPath, filePath);
+                return true;
+            } catch  {
+                try {
+                    node_fs__rspack_import_0.rmSync(tmpPath, {
+                        force: true
+                    });
+                } catch  {}
+                return false;
+            }
+        }
+        __webpack_require__.d(__webpack_exports__, {
+            Z: ()=>writeJsonAtomic
+        });
+    },
     "./browsers/browsers-lib/wsl-support.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
             qc: ()=>external_wsl_support_namespaceObject.hasGuiDisplay,
@@ -2669,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'
         ];
@@ -3497,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),
@@ -3788,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) {
@@ -4065,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;
@@ -4097,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
             };
@@ -5186,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',
@@ -5456,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) {
@@ -5557,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 {
@@ -5609,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;
@@ -5643,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;
             }
@@ -5816,7 +6103,6 @@ var __webpack_modules__ = {
             QW: ()=>safariBuildPreflight,
             iF: ()=>safariPreflightError
         });
-        var external_node_child_process_ = __webpack_require__("node:child_process");
         var external_node_fs_ = __webpack_require__("node:fs");
         var messaging = __webpack_require__("./helpers/messaging.ts");
         var banner = __webpack_require__("./browsers/browsers-lib/banner.ts");
@@ -5830,6 +6116,7 @@ var __webpack_modules__ = {
             (0, messaging._w)(messages.Aj(xcodebuildCmd));
         }
         var safari_config = __webpack_require__("./browsers/run-safari/safari-launch/safari-config.ts");
+        var external_node_child_process_ = __webpack_require__("node:child_process");
         function isMacOS() {
             return 'darwin' === process.platform;
         }
@@ -5887,20 +6174,6 @@ var __webpack_modules__ = {
                 ok: Boolean(converter && xcodebuild)
             };
         }
-        function fallbackLogger() {
-            return {
-                info: (...a)=>(0, messaging._w)(...a),
-                warn: (...a)=>(0, messaging.mR)(...a),
-                error: (...a)=>(0, messaging.Gg)(...a),
-                debug: (...a)=>console?.debug?.(...a)
-            };
-        }
-        function isTestEnv() {
-            return Boolean(process.env.VITEST || process.env.VITEST_WORKER_ID);
-        }
-        function delay(ms) {
-            return new Promise((resolve)=>setTimeout(resolve, ms));
-        }
         const TOOL_TAIL_LINES = 50;
         const TOOL_TAIL_BYTES = 8192;
         function toolOutputTail(output) {
@@ -5939,6 +6212,60 @@ var __webpack_modules__ = {
                     }));
             });
         }
+        async function resolvePidForBundle(bundleId) {
+            for(let attempt = 0; attempt < 10; attempt += 1){
+                const pid = await new Promise((resolve)=>{
+                    const child = (0, external_node_child_process_.spawn)("osascript", [
+                        '-e',
+                        `tell application "System Events" to get unix id of first process whose bundle identifier is "${bundleId}"`
+                    ]);
+                    let out = '';
+                    child.stdout.on('data', (d)=>out += String(d));
+                    child.on('error', ()=>resolve(null));
+                    child.on('close', ()=>{
+                        const n = Number(String(out).trim());
+                        resolve(Number.isFinite(n) && n > 0 ? n : null);
+                    });
+                });
+                if (pid) return pid;
+                await new Promise((r)=>setTimeout(r, 500));
+            }
+            return null;
+        }
+        function createSafariTools() {
+            return {
+                detectToolchain: ()=>detectSafariToolchain(),
+                runConverter: (args)=>runTool('xcrun', args),
+                runXcodebuild: (args)=>runTool('xcodebuild', args),
+                openApp: (target)=>runTool('open', [
+                        target
+                    ]),
+                openSafari: (binary)=>runTool('open', [
+                        '-a',
+                        binary
+                    ]),
+                resolvePid: (bundleId)=>resolvePidForBundle(bundleId),
+                pluginkitList: async ()=>{
+                    const { ok, output } = await runTool('pluginkit', [
+                        '-m'
+                    ], {
+                        quiet: true
+                    });
+                    return ok ? output : '';
+                }
+            };
+        }
+        function fallbackLogger() {
+            return {
+                info: (...a)=>(0, messaging._w)(...a),
+                warn: (...a)=>(0, messaging.mR)(...a),
+                error: (...a)=>(0, messaging.Gg)(...a),
+                debug: (...a)=>console?.debug?.(...a)
+            };
+        }
+        function delay(ms) {
+            return new Promise((resolve)=>setTimeout(resolve, ms));
+        }
         function converterWarnings(output) {
             const lines = output.split(/\r?\n/);
             const collected = [];
@@ -5959,15 +6286,11 @@ var __webpack_modules__ = {
             }
             return collected;
         }
-        async function confirmRegisteredWithSafari(bundleIdentifier) {
+        async function confirmRegisteredWithSafari(tools, bundleIdentifier) {
             const needle = `${bundleIdentifier}.Extension`;
             for(let attempt = 0; attempt < 6; attempt += 1){
-                const { ok, output } = await runTool('pluginkit', [
-                    '-m'
-                ], {
-                    quiet: true
-                });
-                if (ok && output.includes(needle)) return true;
+                const listing = await tools.pluginkitList();
+                if (listing.includes(needle)) return true;
                 await delay(800);
             }
             return false;
@@ -5982,6 +6305,10 @@ var __webpack_modules__ = {
                 macOsOnly: config.macOsOnly
             };
         }
+        function completePackage(config, logger, mode) {
+            if ('full' === mode && config.bundleIdDerived) logger.info?.(messages.$q(config.bundleIdentifier));
+            return describePackage(config);
+        }
         function safariPreflightError() {
             const tc = detectSafariToolchain();
             if (!tc.platformOk) return messages.G3(process.platform);
@@ -6005,26 +6332,6 @@ var __webpack_modules__ = {
                 severity: 'ok'
             };
         }
-        async function resolvePidForBundle(bundleId) {
-            for(let attempt = 0; attempt < 10; attempt += 1){
-                const pid = await new Promise((resolve)=>{
-                    const child = (0, external_node_child_process_.spawn)("osascript", [
-                        '-e',
-                        `tell application "System Events" to get unix id of first process whose bundle identifier is "${bundleId}"`
-                    ]);
-                    let out = '';
-                    child.stdout.on('data', (d)=>out += String(d));
-                    child.on('error', ()=>resolve(null));
-                    child.on('close', ()=>{
-                        const n = Number(String(out).trim());
-                        resolve(Number.isFinite(n) && n > 0 ? n : null);
-                    });
-                });
-                if (pid) return pid;
-                await new Promise((r)=>setTimeout(r, 500));
-            }
-            return null;
-        }
         async function announceSafariDevSession(host, config, appPath) {
             try {
                 await (0, banner.ai)({
@@ -6040,16 +6347,16 @@ var __webpack_modules__ = {
             } catch  {}
         }
         async function runSafariPipeline(compilation, host, logger, mode) {
+            const tools = host.tools || createSafariTools();
             const config = (0, safari_config.F7)(compilation, host);
             const converterArgs = (0, safari_config.w7)(config);
             const xcodebuildArgs = (0, safari_config.vx)(config);
             const isSigned = Boolean(config.developmentTeam);
-            if ('full' === mode && config.bundleIdDerived) logger.warn?.(messages.$q(config.bundleIdentifier));
-            if (host.dryRun || isTestEnv()) {
+            if (host.dryRun) {
                 logSafariDryRun(`xcrun ${converterArgs.join(' ')}`, `xcodebuild ${xcodebuildArgs.join(' ')}`);
-                return describePackage(config);
+                return completePackage(config, logger, mode);
             }
-            const toolchain = detectSafariToolchain();
+            const toolchain = tools.detectToolchain();
             if (!toolchain.platformOk) {
                 logger.warn?.(messages.G3(process.platform));
                 return describePackage(config);
@@ -6073,7 +6380,7 @@ var __webpack_modules__ = {
                 }
                 const { saved, restore } = (0, safari_config._D)(config);
                 logger.info?.(messages.uK(config.extensionDir));
-                const converted = await runTool('xcrun', converterArgs);
+                const converted = await tools.runConverter(converterArgs);
                 if (!converted.ok) {
                     const tail = toolOutputTail(converted.output);
                     logger.error?.(messages.A('safari-web-extension-converter', converted.code, tail));
@@ -6090,7 +6397,7 @@ var __webpack_modules__ = {
                 logger.info?.(messages.l_(config.projectLocation));
             } else if ('full' === mode) logger.info?.(messages.oM());
             if ('full' === mode) logger.info?.(messages.jR((0, safari_config.aD)(config)));
-            const built = await runTool('xcodebuild', xcodebuildArgs);
+            const built = await tools.runXcodebuild(xcodebuildArgs);
             if (!built.ok) {
                 const tail = toolOutputTail(built.output);
                 logger.error?.(messages.A('xcodebuild', built.code, tail));
@@ -6105,30 +6412,26 @@ var __webpack_modules__ = {
             if (!config.open) {
                 logger.info?.(messages.aO(appPath, config.appName));
                 if (host.announceDevReady) await announceSafariDevSession(host, config, appPath);
-                return describePackage(config);
+                return completePackage(config, logger, mode);
             }
             const target = external_node_fs_.existsSync(appPath) ? appPath : (0, safari_config.Gi)(config);
             logger.info?.(messages.fw(target));
-            await runTool('open', [
-                target
-            ]);
-            if (config.safariBinary) await runTool('open', [
-                '-a',
-                config.safariBinary
-            ]);
+            await tools.openApp(target);
+            if (config.safariBinary) await tools.openSafari(config.safariBinary);
             const raisedBundleId = config.safariBinary ? 'com.apple.Safari' : config.bundleIdentifier;
-            const browserPid = await resolvePidForBundle(raisedBundleId);
-            if (browserPid) (0, ready_stamp.M)(config.extensionDir, {
-                browserPid,
+            const browserPid = await tools.resolvePid(raisedBundleId);
+            (0, ready_stamp.M)(config.extensionDir, {
+                browserPid: browserPid || void 0,
                 binary: config.safariBinary || appPath,
                 binaryProvenance: config.safariBinary ? 'pinned' : 'system',
                 extensionId: `${config.bundleIdentifier}.Extension`
             });
+            if (!browserPid) logger.warn?.(messages.jn(config.appName));
             logger.info?.(messages.fO(config.appName, isSigned));
-            if (await confirmRegisteredWithSafari(config.bundleIdentifier)) logger.info?.(messages.fd(config.appName));
+            if (await confirmRegisteredWithSafari(tools, config.bundleIdentifier)) logger.info?.(messages.fd(config.appName));
             else logger.info?.(messages.qY(config.appName));
             if (host.announceDevReady) await announceSafariDevSession(host, config, appPath);
-            return describePackage(config);
+            return completePackage(config, logger, mode);
         }
         async function packageSafariExtension(host, outputPath, logger, mode = 'full') {
             const compilation = {
@@ -6248,9 +6551,10 @@ var __webpack_modules__ = {
         function manifestFingerprintPath(config) {
             return node_path__rspack_import_1.join(config.projectLocation, '.manifest-fingerprint');
         }
+        const HOT_UPDATE_DIR = 'hot';
         function topLevelEntries(extensionDir) {
             try {
-                return node_fs__rspack_import_0.readdirSync(extensionDir).sort();
+                return node_fs__rspack_import_0.readdirSync(extensionDir).filter((entry)=>entry !== HOT_UPDATE_DIR).sort();
             } catch  {
                 return [];
             }
@@ -6379,7 +6683,7 @@ var __webpack_modules__ = {
             return Object.fromEntries(Object.entries(input).filter(([, value])=>void 0 !== value));
         }
         function createSafariPackager(options = {}) {
-            const { browser = 'safari', noOpen = true, dryRun = false, logger, ...identity } = options;
+            const { browser = 'safari', noOpen = true, dryRun = false, logger, tools, ...identity } = options;
             return async (distPath, mode = 'full', overrides)=>await (0, _safari_launch__rspack_import_0.Ah)({
                     extension: [
                         distPath
@@ -6387,6 +6691,7 @@ var __webpack_modules__ = {
                     browser,
                     noOpen,
                     dryRun,
+                    tools,
                     ...withoutUndefined(identity),
                     ...withoutUndefined(overrides)
                 }, distPath, logger, mode);