extension 4.1.19 → 4.1.21

package/README.md

@@ -6,12 +6,10 @@
 [action-url]: https://github.com/extension-js/extension.js/actions
 [discord-image]: https://img.shields.io/discord/1253608412890271755?label=Discord&logo=discord&style=flat&color=0971fe
 [discord-url]: https://discord.gg/v9h2RgeTSN
-[snyk-image]: https://snyk.io/test/github/extension-js/extension.js/badge.svg?color=0971fe
-[snyk-url]: https://snyk.io/test/github/extension-js/extension.js
-[scorecard-image]: https://img.shields.io/ossf-scorecard/github.com/extension-js/extension.js?label=OpenSSF%20Scorecard&style=flat&color=0971fe
-[scorecard-url]: https://scorecard.dev/viewer/?uri=github.com/extension-js/extension.js
+[bestpractices-image]: https://img.shields.io/cii/level/14662?label=Best%20Practices&style=flat&color=0971fe
+[bestpractices-url]: https://www.bestpractices.dev/projects/14662
 
-# Extension.js [![Version][npm-version-image]][npm-version-url] [![Stars][stars-image]][stars-url] [![CI][action-image]][action-url] [![Discord][discord-image]][discord-url] [![OpenSSF Scorecard][scorecard-image]][scorecard-url]
+# Extension.js [![Version][npm-version-image]][npm-version-url] [![Stars][stars-image]][stars-url] [![CI][action-image]][action-url] [![Discord][discord-image]][discord-url] [![Best Practices][bestpractices-image]][bestpractices-url]
 
 > The cross-browser extension framework. Build for Chrome, Edge, Firefox, and Safari with no build config required.
 
@@ -25,7 +23,9 @@ npm run dev
 
 Works with `npm`, `pnpm`, `yarn`, `bun`, and `deno`.
 
-[Documentation](https://extension.js.org) · [Templates](https://templates.extension.dev) · [Examples](https://github.com/extension-js/examples) · [Discord](https://discord.gg/v9h2RgeTSN)
+The CLI itself runs on Node.js 22.12+, Deno 2.5+, and Bun 1.2+.
+
+[Documentation](https://extension.js.org/docs) · [Templates](https://templates.extension.dev/?utm_source=readme&utm_campaign=nav-templates) · [YouTube](https://www.youtube.com/@BrowserExtension) · [Showcase](https://extension.js.org/showcase) · [Blog](https://extension.js.org/blog)
 
 ## Why Extension.js
 
@@ -173,13 +173,25 @@ npx extension@latest dev https://github.com/GoogleChrome/chrome-extensions-sampl
 
 ## Package managers
 
-<div align="center">
+Add Extension.js to a project, or run it once without installing, with the package manager you already use.
 
-| <img alt="npm" src="https://media.extension.land/logos/package-managers/npm.svg" width="70"> | <img alt="pnpm" src="https://media.extension.land/logos/package-managers/pnpm.svg" width="70"> | <img alt="Yarn" src="https://media.extension.land/logos/package-managers/yarn.svg" width="70"> | <img alt="Bun" src="https://media.extension.land/logos/package-managers/bun.svg" width="70"> | <picture><source media="(prefers-color-scheme: dark)" srcset="https://media.extension.land/logos/package-managers/deno-dark.svg"><img alt="Deno" src="https://media.extension.land/logos/package-managers/deno.svg" width="70"></picture> |
-| :-: | :-: | :-: | :-: | :-: |
-| npm<br>✅ Supported | pnpm<br>✅ Supported | Yarn<br>✅ Supported | Bun<br>✅ Supported | Deno<br>✅ Supported |
+| Package manager | Add to a project | Run without installing |
+| :-- | :-- | :-- |
+| npm | `npm install extension@latest --save-dev` | `npx extension@latest create my-extension` |
+| pnpm | `pnpm add extension@latest --save-dev` | `pnpm dlx extension@latest create my-extension` |
+| Yarn | `yarn add extension@latest --dev` | `yarn dlx extension@latest create my-extension` |
+| Bun | `bun add --dev extension@latest` | `bunx extension@latest create my-extension` |
+| Deno | `deno add npm:extension@latest` | `deno run -A npm:extension@latest create my-extension` |
 
-</div>
+Which runtime the CLI then executes on is a separate question, answered below.
+
+## Runtimes
+
+| | Runtime | Status | Notes |
+| :-: | :-- | :-- | :-- |
+| <img alt="Node.js" src="https://media.extension.land/logos/package-managers/node.svg" width="28"> | Node.js | ✅ 22.12 and newer | The default. `npx`, `pnpm dlx`, `yarn dlx` and `bunx` all land here through the published bin |
+| <picture><source media="(prefers-color-scheme: dark)" srcset="https://media.extension.land/logos/package-managers/deno-dark.svg"><img alt="Deno" src="https://media.extension.land/logos/package-managers/deno.svg" width="28"></picture> | Deno | ✅ 2.5 and newer | `deno run -A npm:extension@latest`. Deno 2.8.0 is refused because it cannot load `node:querystring`, fixed in 2.8.1 |
+| <img alt="Bun" src="https://media.extension.land/logos/package-managers/bun.svg" width="28"> | Bun | ✅ 1.2 and newer | `bunx --bun extension` and `bun run --bun`. Plain `bunx` runs the CLI on Node.js instead, through the published bin |
 
 ## Community
 
@@ -193,15 +205,6 @@ npx extension@latest dev https://github.com/GoogleChrome/chrome-extensions-sampl
 Sponsors help the project ship faster releases, better developer experience, and long-term reliability for extension teams.
 
 <div align="center">
-  <p>
-    <a href="https://www.testmuai.com/?utm_medium=sponsor&utm_source=extensionjs" target="_blank" rel="noopener noreferrer">
-      <picture>
-        <source media="(prefers-color-scheme: dark)" srcset="https://extension.js.org/images/sponsors/testmuai_dark.svg" />
-        <source media="(prefers-color-scheme: light)" srcset="https://extension.js.org/images/sponsors/testmuai.svg" />
-        <img src="https://extension.js.org/images/sponsors/testmuai.svg" width="220" alt="TestMu AI" />
-      </picture>
-    </a>
-  </p>
   <p>
     <a href="https://extension.dev/?utm_medium=sponsor&utm_source=extensionjs" target="_blank" rel="noopener noreferrer">
       <picture>

package/bin/extension.cjs

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 //  ██████╗██╗     ██╗
 // ██╔════╝██║     ██║
 // ██║     ██║     ██║
@@ -38,6 +39,7 @@ if (fs.existsSync(distCjsEntry)) {
     console.error(
       '[Extension.js] CLI not built. Run "pnpm --filter extension compile".'
     )
+
     process.exit(1)
   }
 } else {

package/dist/84.cjs

@@ -197,6 +197,7 @@ exports.modules = {
         var newtab_override = __webpack_require__("./browsers/browsers-lib/newtab-override.ts");
         var ready_stamp = __webpack_require__("./browsers/browsers-lib/ready-stamp.ts");
         var shared_utils = __webpack_require__("./browsers/browsers-lib/shared-utils.ts");
+        var write_json_atomic = __webpack_require__("./browsers/browsers-lib/write-json-atomic.ts");
         var external_ws_ = __webpack_require__("ws");
         var external_ws_default = /*#__PURE__*/ __webpack_require__.n(external_ws_);
         var constants = __webpack_require__("./browsers/browsers-lib/constants.ts");
@@ -1116,7 +1117,7 @@ exports.modules = {
                         const ready = JSON.parse(external_node_fs_.readFileSync(readyPath, 'utf-8'));
                         if (ready.cdpPort !== chromeRemoteDebugPort) {
                             ready.cdpPort = chromeRemoteDebugPort;
-                            external_node_fs_.writeFileSync(readyPath, JSON.stringify(ready, null, 2));
+                            (0, write_json_atomic.Z)(readyPath, ready);
                         }
                     }
                 }

package/dist/browsers.cjs

@@ -740,16 +740,19 @@ var __webpack_modules__ = {
             const tail = outputTail.trim().length ? `\n${pintor__rspack_import_8_default().gray('── last output ──')}\n${outputTail}` : `\n${pintor__rspack_import_8_default().gray('(no output captured)')}`;
             return `${getLoggingPrefix('error')} Safari packaging tool ${pintor__rspack_import_8_default().underline(tool)} failed (${pintor__rspack_import_8_default().red(code)}).${tail}`;
         }
+        const SAFARI_KEPT_ON_PURPOSE = {
+            world: 'Safari has honored the MAIN world since Safari 18, so the key stays'
+        };
         function safariConverterWarnings(warnings) {
-            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');
+            const kept = warnings.map((line)=>line.trim()).filter((line)=>line in SAFARI_KEPT_ON_PURPOSE);
+            const keptLines = kept.map((line)=>`  ${pintor__rspack_import_8_default().yellow(line)} ${pintor__rspack_import_8_default().gray(SAFARI_KEPT_ON_PURPOSE[line])}`).join('\n');
+            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, signed) {
-            const launch = `${getLoggingPrefix('info')} Launch it once to register with Safari: ${pintor__rspack_import_8_default().blue('open')} ${pintor__rspack_import_8_default().underline(`"${appPath}"`)}\n`;
-            if (signed) return launch + `Then turn on ${pintor__rspack_import_8_default().yellow(appName)} in Safari ▸ Settings ▸ Extensions.`;
-            return launch + `Then enable ${pintor__rspack_import_8_default().yellow(appName)} via Safari ▸ Develop ▸ ` + `${pintor__rspack_import_8_default().yellow('Allow Unsigned Extensions')} and Safari ▸ Settings ▸ Extensions.`;
+        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.`;
         }
         function safariDryRunNotBuilding() {
             return `${getLoggingPrefix('info')} Dry run: skip the Safari app build.`;
@@ -761,17 +764,21 @@ var __webpack_modules__ = {
             return `${getLoggingPrefix('info')} xcodebuild: ${pintor__rspack_import_8_default().gray(cmd)}.`;
         }
         function safariNextSteps(appName, signed) {
-            if (signed) return `${getLoggingPrefix('info')} One-time setup to load ${pintor__rspack_import_8_default().yellow(appName)} in Safari:\n  ${pintor__rspack_import_8_default().gray('1.')} Safari ▸ Settings ▸ Extensions ▸ turn on ${pintor__rspack_import_8_default().yellow(appName)}\n  ${pintor__rspack_import_8_default().gray('→')} Signed with your team id, so this survives a restart.`;
-            return `${getLoggingPrefix('info')} One-time setup to load ${pintor__rspack_import_8_default().yellow(appName)} in Safari:\n  ${pintor__rspack_import_8_default().gray('1.')} Safari ▸ Settings ▸ Advanced ▸ check ${pintor__rspack_import_8_default().yellow('“Show features for web developers”')}\n  ${pintor__rspack_import_8_default().gray('2.')} Safari ▸ Develop ▸ ${pintor__rspack_import_8_default().yellow('Allow Unsigned Extensions')} ${pintor__rspack_import_8_default().gray('(resets each launch)')}\n  ${pintor__rspack_import_8_default().gray('3.')} Safari ▸ Settings ▸ Extensions ▸ turn on ${pintor__rspack_import_8_default().yellow(appName)}\n  ${pintor__rspack_import_8_default().gray('→')} The app window that just opened can also take you there.`;
+            const steps = `${getLoggingPrefix('info')} One-time setup to load ${pintor__rspack_import_8_default().yellow(appName)} in Safari:\n  ${pintor__rspack_import_8_default().gray('1.')} Safari ▸ Settings ▸ Extensions ▸ turn on ${pintor__rspack_import_8_default().yellow(appName)}\n`;
+            if (signed) return steps + `  ${pintor__rspack_import_8_default().gray('→')} Signed with your team id, so the identity is stable for distribution.`;
+            return steps + `  ${pintor__rspack_import_8_default().gray('→')} Ad-hoc signed, so it stays enabled across restarts.`;
         }
         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.`;
         }
         function safariRebuilt(appName) {
-            return `${getLoggingPrefix('success')} Rebuilt ${pintor__rspack_import_8_default().yellow(appName)}, reload the page (or toggle the extension) in Safari to see changes.`;
+            return `${getLoggingPrefix('success')} Rebuilt ${pintor__rspack_import_8_default().yellow(appName)}.`;
         }
         function safariProjectStale() {
             return `${getLoggingPrefix('info')} Regenerating the Xcode project, manifest.json or identity options changed since it was generated.`;
@@ -1028,6 +1035,7 @@ var __webpack_modules__ = {
             jR: ()=>safariBuilding,
             jc: ()=>safariProjectStale,
             jk: ()=>requireGeckoBinaryForGeckoBased,
+            jn: ()=>safariPidUnresolved,
             kK: ()=>preferringSystemBrowserOverSnapshot,
             l9: ()=>parsingPacketError,
             lO: ()=>firefoxDryRunArgs,
@@ -1400,6 +1408,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');
         }
@@ -1411,7 +1420,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) {
@@ -1429,7 +1438,7 @@ var __webpack_modules__ = {
                 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) {
@@ -1441,7 +1450,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) {
@@ -1456,7 +1465,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) {
@@ -1470,7 +1479,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) {
@@ -1486,7 +1495,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__, {
@@ -1949,6 +1958,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,
@@ -5812,7 +5842,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");
@@ -5826,6 +5855,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;
         }
@@ -5883,20 +5913,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) {
@@ -5935,18 +5951,85 @@ 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) {
-            return output.split(/\r?\n/).filter((line)=>/warning/i.test(line)).map((line)=>line.trim()).filter((line)=>line.length > 0);
+            const lines = output.split(/\r?\n/);
+            const collected = [];
+            let inWarning = false;
+            for (const line of lines){
+                const trimmed = line.trim();
+                if (/warning/i.test(line)) {
+                    inWarning = true;
+                    if (trimmed.length > 0) collected.push(trimmed);
+                    continue;
+                }
+                const isContinuation = inWarning && /^\s/.test(line) && trimmed.length > 0;
+                if (isContinuation) {
+                    collected.push(trimmed);
+                    continue;
+                }
+                inWarning = false;
+            }
+            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;
@@ -5961,6 +6044,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);
@@ -5984,26 +6071,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)({
@@ -6019,16 +6086,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);
@@ -6052,7 +6119,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));
@@ -6067,9 +6134,9 @@ var __webpack_modules__ = {
                 if (preservedKeys.length > 0) logger.info?.(messages.oB(preservedKeys));
                 (0, safari_config.x7)(config);
                 logger.info?.(messages.l_(config.projectLocation));
-            } else logger.info?.(messages.oM());
+            } 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));
@@ -6082,32 +6149,28 @@ var __webpack_modules__ = {
             }
             logger.info?.(messages.Rl(appPath));
             if (!config.open) {
-                logger.info?.(messages.aO(appPath, config.appName, isSigned));
+                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 = {
@@ -6227,36 +6290,56 @@ var __webpack_modules__ = {
         function manifestFingerprintPath(config) {
             return node_path__rspack_import_1.join(config.projectLocation, '.manifest-fingerprint');
         }
-        function stableStringify(obj) {
-            if (null == obj) return JSON.stringify(obj);
-            if ('object' != typeof obj) return JSON.stringify(obj);
-            if (Array.isArray(obj)) return `[${obj.map(stableStringify).join(',')}]`;
-            const keys = Object.keys(obj).sort();
-            return `{${keys.map((k)=>`${JSON.stringify(k)}:${stableStringify(obj[k])}`).join(',')}}`;
-        }
-        function readManifestRaw(extensionDir) {
+        const HOT_UPDATE_DIR = 'hot';
+        function topLevelEntries(extensionDir) {
             try {
-                return node_fs__rspack_import_0.readFileSync(node_path__rspack_import_1.join(extensionDir, 'manifest.json'), 'utf8');
+                return node_fs__rspack_import_0.readdirSync(extensionDir).filter((entry)=>entry !== HOT_UPDATE_DIR).sort();
             } catch  {
-                return '';
+                return [];
             }
         }
-        function normalizeManifest(raw) {
+        function iconsFingerprint(extensionDir) {
             try {
-                return stableStringify(JSON.parse(raw));
+                const raw = node_fs__rspack_import_0.readFileSync(node_path__rspack_import_1.join(extensionDir, 'manifest.json'), 'utf8');
+                const icons = JSON.parse(raw).icons;
+                if (!icons || 'object' != typeof icons) return '';
+                return Object.keys(icons).sort().map((size)=>`${size}:${String(icons[size])}`).join(',');
             } catch  {
-                return raw;
+                return '';
+            }
+        }
+        function asRecord(value) {
+            return value && 'object' == typeof value && !Array.isArray(value) ? value : {};
+        }
+        function judgedManifestSurface(extensionDir) {
+            const manifest = readManifest(extensionDir);
+            const parts = [
+                Object.keys(manifest).sort().join(',')
+            ];
+            for (const listName of [
+                'permissions',
+                'optional_permissions'
+            ]){
+                const list = manifest[listName];
+                const names = Array.isArray(list) ? list.filter((entry)=>'string' == typeof entry).sort() : [];
+                parts.push(`${listName}:${names.join(',')}`);
             }
+            const contentScripts = manifest.content_scripts;
+            if (Array.isArray(contentScripts)) parts.push(contentScripts.map((entry)=>Object.keys(asRecord(entry)).sort().join('+')).join(';'));
+            parts.push(Object.keys(asRecord(manifest.options_ui)).sort().join(','));
+            return parts.join('|');
         }
         function composeProjectFingerprint(config) {
             return JSON.stringify({
-                v: 2,
+                v: 4,
                 identity: {
                     appName: config.appName,
                     bundleId: config.bundleIdentifier,
                     macOsOnly: config.macOsOnly
                 },
-                manifest: normalizeManifest(readManifestRaw(config.extensionDir))
+                entries: topLevelEntries(config.extensionDir),
+                icons: iconsFingerprint(config.extensionDir),
+                judged: judgedManifestSurface(config.extensionDir)
             });
         }
         function saveManifestFingerprint(config) {
@@ -6339,7 +6422,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
@@ -6347,6 +6430,7 @@ var __webpack_modules__ = {
                     browser,
                     noOpen,
                     dryRun,
+                    tools,
                     ...withoutUndefined(identity),
                     ...withoutUndefined(overrides)
                 }, distPath, logger, mode);