rename custom provider to bash

Author: pirate

abx_plugins/plugins/apt/tests/test_apt_provider.py

@@ -73,7 +73,7 @@ def test_hook_detects_apt(self):
         if apt_available():
             assert "apt not available" not in result.stderr
         else:
-            assert result.returncode == 1
+            assert result.returncode == 0
             assert (
                 "AptProvider.INSTALLER_BIN is not available on this host"
                 in result.stderr
@@ -114,7 +114,7 @@ def test_detect_existing_binary(self):
         )
 
         if not apt_available():
-            assert result.returncode == 1
+            assert result.returncode == 0
             assert (
                 "AptProvider.INSTALLER_BIN is not available on this host"
                 in result.stderr

abx_plugins/plugins/bash/on_BinaryRequest__14_bash.py

@@ -10,12 +10,12 @@
 # ]
 # ///
 #
-# Install a binary using a custom shell command defined in overrides.
+# Install a binary using a bash shell command defined in overrides.
 # This provider runs arbitrary shell commands to install binaries that don't fit
 # into standard package managers, outputting a Binary JSONL record to stdout.
 #
 # Usage:
-#     ./on_BinaryRequest__14_custom.py [...] > events.jsonl
+#     ./on_BinaryRequest__14_bash.py [...] > events.jsonl
 
 import sys
 import json
@@ -46,25 +46,19 @@ def main(
     """Install binary using bash shell commands defined in overrides."""
 
     allowed_providers = {provider.strip() for provider in binproviders.split(",")}
-    if (
-        binproviders != "*"
-        and "custom" not in allowed_providers
-        and "bash" not in allowed_providers
-    ):
-        click.echo(f"custom provider not allowed for {name}", err=True)
+    if binproviders != "*" and "bash" not in allowed_providers:
+        click.echo(f"bash provider not allowed for {name}", err=True)
         sys.exit(0)
 
     context = click.get_current_context(silent=True)
     extra_kwargs = parse_extra_hook_args(context.args if context else [])
     raw_overrides = json.loads(overrides)
     if not isinstance(raw_overrides, dict):
         click.echo(
-            "custom provider requires overrides to decode to an object",
+            "bash provider requires overrides to decode to an object",
             err=True,
         )
         sys.exit(1)
-    if "bash" not in raw_overrides and "custom" in raw_overrides:
-        raw_overrides = {**raw_overrides, "bash": raw_overrides["custom"]}
 
     provider = BashProvider()
     binary = Binary.model_validate(
@@ -79,19 +73,19 @@ def main(
     bash_overrides = binary.overrides.get("bash", {})
     if "install" not in bash_overrides:
         click.echo(
-            "custom provider requires overrides.custom.install or overrides.bash.install",
+            "bash provider requires overrides.bash.install",
             err=True,
         )
         sys.exit(1)
 
     try:
         binary = binary.load_or_install()
     except Exception as e:
-        click.echo(f"custom install failed: {e}", err=True)
+        click.echo(f"bash install failed: {e}", err=True)
         sys.exit(1)
 
     if not binary.abspath:
-        click.echo(f"{name} not found after custom install", err=True)
+        click.echo(f"{name} not found after bash install", err=True)
         sys.exit(1)
 
     # Output Binary JSONL record to stdout
@@ -100,7 +94,7 @@ def main(
         abspath=str(binary.abspath),
         version=str(binary.version) if binary.version else "",
         sha256=binary.sha256 or "",
-        binprovider="custom",
+        binprovider="bash",
     )
 
     # Log human-readable info to stderr

abx_plugins/plugins/bash/templates/icon.html

@@ -1 +1 @@
-<span class="abx-output-icon abx-output-icon--custom" title="Custom"><svg width="16" height="16" viewBox="0 0 24 24" aria-hidden="true" focusable="false" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M5 7h14"/><path d="M5 12h14"/><path d="M5 17h14"/><circle cx="9" cy="7" r="1.5"/><circle cx="15" cy="12" r="1.5"/><circle cx="11" cy="17" r="1.5"/></svg></span>
+<span class="abx-output-icon abx-output-icon--bash" title="Bash"><svg width="16" height="16" viewBox="0 0 24 24" aria-hidden="true" focusable="false" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M5 7h14"/><path d="M5 12h14"/><path d="M5 17h14"/><circle cx="9" cy="7" r="1.5"/><circle cx="15" cy="12" r="1.5"/><circle cx="11" cy="17" r="1.5"/></svg></span>

abx_plugins/plugins/bash/tests/test_bash_provider.py

@@ -1,25 +1,30 @@
 """
-Tests for the custom binary provider plugin.
+Tests for the bash binary provider plugin.
 
-Tests the custom bash binary installer with safe commands.
+Tests the bash command installer with safe commands.
 """
 
 import json
 import os
+import shutil
 import subprocess
 import tempfile
 from pathlib import Path
 
 import pytest
 
 
-# Get the path to the custom provider hook
+# Get the path to the bash provider hook
 PLUGIN_DIR = Path(__file__).parent.parent
-INSTALL_HOOK = next(PLUGIN_DIR.glob("on_BinaryRequest__*_custom.py"), None)
+INSTALL_HOOK = next(PLUGIN_DIR.glob("on_BinaryRequest__*_bash.py"), None)
+BASH_ZX_INSTALL = (
+    'npm install --quiet --prefix "$INSTALL_ROOT/npm" zx '
+    '&& ln -sf "$INSTALL_ROOT/npm/node_modules/.bin/zx" "$BIN_DIR/bash-zx"'
+)
 
 
-class TestCustomProviderHook:
-    """Test the custom binary provider hook."""
+class TestBashProviderHook:
+    """Test the bash binary provider hook."""
 
     def setup_method(self, _method=None):
         """Set up test environment."""
@@ -35,17 +40,17 @@ def test_hook_script_exists(self):
         """Hook script should exist."""
         assert INSTALL_HOOK and INSTALL_HOOK.exists(), f"Hook not found: {INSTALL_HOOK}"
 
-    def test_hook_skips_when_custom_not_allowed(self):
-        """Hook should skip when custom not in allowed binproviders."""
+    def test_hook_skips_when_bash_not_allowed(self):
+        """Hook should skip when bash not in allowed binproviders."""
         env = os.environ.copy()
         env["SNAP_DIR"] = self.temp_dir
-        overrides = json.dumps({"custom": {"install": "echo hello"}})
+        overrides = json.dumps({"bash": {"install": "echo hello"}})
 
         result = subprocess.run(
             [
                 str(INSTALL_HOOK),
                 "--name=echo",
-                "--binproviders=pip,apt",  # custom not allowed
+                "--binproviders=pip,apt",  # bash not allowed
                 f"--overrides={overrides}",
             ],
             capture_output=True,
@@ -54,33 +59,34 @@ def test_hook_skips_when_custom_not_allowed(self):
             env=env,
         )
 
-        # Should exit cleanly (code 0) when custom not allowed
+        # Should exit cleanly (code 0) when bash not allowed
         assert result.returncode == 0
-        assert "custom provider not allowed" in result.stderr
+        assert "bash provider not allowed" in result.stderr
+
+    def test_hook_runs_bash_command_and_finds_binary(self):
+        """Hook should run a real bash install command and emit the installed binary."""
+        if not shutil.which("npm"):
+            pytest.skip("npm is required for the real bash provider install test")
 
-    def test_hook_runs_custom_command_and_finds_binary(self):
-        """Hook should run custom command and find the binary in PATH."""
         env = os.environ.copy()
         env["SNAP_DIR"] = self.temp_dir
+        env["HOME"] = self.temp_dir
         overrides = json.dumps(
-            {"custom": {"install": 'echo "custom install simulation"'}},
+            {"bash": {"install": BASH_ZX_INSTALL}},
         )
 
-        # Use a simple echo command that doesn't actually install anything
-        # Then check for 'echo' which is already in PATH
         result = subprocess.run(
             [
                 str(INSTALL_HOOK),
-                "--name=echo",
+                "--name=bash-zx",
                 f"--overrides={overrides}",
             ],
             capture_output=True,
             text=True,
-            timeout=30,
+            timeout=120,
             env=env,
         )
 
-        # Should succeed since echo is in PATH
         assert result.returncode == 0, f"Hook failed: {result.stderr}"
 
         # Parse JSONL output
@@ -89,20 +95,24 @@ def test_hook_runs_custom_command_and_finds_binary(self):
             if line.startswith("{"):
                 try:
                     record = json.loads(line)
-                    if record.get("type") == "Binary" and record.get("name") == "echo":
-                        assert record["binprovider"] == "custom"
+                    if (
+                        record.get("type") == "Binary"
+                        and record.get("name") == "bash-zx"
+                    ):
+                        assert record["binprovider"] == "bash"
                         assert record["abspath"]
+                        assert Path(record["abspath"]).exists()
                         return
                 except json.JSONDecodeError:
                     continue
 
         pytest.fail("No Binary JSONL record found in output")
 
     def test_hook_fails_for_missing_binary_after_command(self):
-        """Hook should fail if binary not found after running custom command."""
+        """Hook should fail if binary not found after running bash command."""
         env = os.environ.copy()
         env["SNAP_DIR"] = self.temp_dir
-        overrides = json.dumps({"custom": {"install": 'echo "failed install"'}})
+        overrides = json.dumps({"bash": {"install": 'echo "failed install"'}})
 
         result = subprocess.run(
             [
@@ -118,13 +128,15 @@ def test_hook_fails_for_missing_binary_after_command(self):
 
         # Should fail since binary not found after command
         assert result.returncode == 1
-        assert "not found" in result.stderr.lower()
+        assert "unable to load or install binary nonexistent_binary_xyz123" in (
+            result.stderr.lower()
+        )
 
     def test_hook_fails_for_failing_command(self):
-        """Hook should fail if custom command returns non-zero exit code."""
+        """Hook should fail if bash command returns non-zero exit code."""
         env = os.environ.copy()
         env["SNAP_DIR"] = self.temp_dir
-        overrides = json.dumps({"custom": {"install": "exit 1"}})
+        overrides = json.dumps({"bash": {"install": "exit 1"}})
 
         result = subprocess.run(
             [

abx_plugins/plugins/chrome/chrome_utils.js

@@ -1899,12 +1899,56 @@ function getExtensionTargets(browser) {
 function findChromium() {
     const { execFileSync } = require('child_process');
 
+    const resolveWrappedBinaryTarget = (binaryPath) => {
+        if (!binaryPath || !fs.existsSync(binaryPath)) return binaryPath;
+        try {
+            const stat = fs.statSync(binaryPath);
+            if (!stat.isFile() || stat.size > 4096) return binaryPath;
+            const contents = fs.readFileSync(binaryPath, 'utf8');
+            if (!contents.startsWith('#!')) return binaryPath;
+            const execMatch = contents.match(/^exec\s+(.+?)\s+"\$@"\s*$/m);
+            if (!execMatch) return binaryPath;
+            const rawTarget = execMatch[1].trim();
+            const unquotedTarget = rawTarget.replace(/^['"]|['"]$/g, '');
+            return unquotedTarget || binaryPath;
+        } catch (e) {
+            return binaryPath;
+        }
+    };
+
+    const resolveMacAppBundle = (binaryPath) => {
+        const targetPath = resolveWrappedBinaryTarget(binaryPath);
+        if (!targetPath) return null;
+        const appMarker = `.app${path.sep}`;
+        const appIndex = targetPath.indexOf(appMarker);
+        if (appIndex === -1) return null;
+        return targetPath.slice(0, appIndex + 4);
+    };
+
+    const validateMacBrowserBundle = (binaryPath) => {
+        if (process.platform !== 'darwin') return true;
+        const appBundle = resolveMacAppBundle(binaryPath);
+        if (!appBundle) return true;
+        try {
+            execFileSync('spctl', ['-a', '-vv', appBundle], {
+                encoding: 'utf8',
+                timeout: 5000,
+                stdio: 'pipe',
+            });
+            return true;
+        } catch (e) {
+            const targetPath = resolveWrappedBinaryTarget(binaryPath);
+            console.error(`[!] Warning: rejecting unusable macOS browser bundle: ${targetPath}`);
+            return false;
+        }
+    };
+
     // Helper to validate a binary by running --version
     const validateBinary = (binaryPath) => {
         if (!binaryPath) return false;
         try {
             execFileSync(binaryPath, ['--version'], { encoding: 'utf8', timeout: 5000, stdio: 'pipe' });
-            return true;
+            return validateMacBrowserBundle(binaryPath);
         } catch (e) {
             return false;
         }
@@ -1973,11 +2017,8 @@ function findChromium() {
                     const versionDir = path.join(versionRoot, version);
                     const candidates = [
                         path.join(versionDir, 'chrome-mac-arm64/Chromium.app/Contents/MacOS/Chromium'),
-                        path.join(versionDir, 'chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing'),
                         path.join(versionDir, 'chrome-mac/Chromium.app/Contents/MacOS/Chromium'),
-                        path.join(versionDir, 'chrome-mac/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing'),
                         path.join(versionDir, 'chrome-mac-x64/Chromium.app/Contents/MacOS/Chromium'),
-                        path.join(versionDir, 'chrome-mac-x64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing'),
                         path.join(versionDir, 'chrome-linux64/chrome'),
                         path.join(versionDir, 'chrome-linux/chrome'),
                     ];
@@ -2017,6 +2058,10 @@ function findChromium() {
     const fallbackLocations = [
         // System Chromium
         '/Applications/Chromium.app/Contents/MacOS/Chromium',
+        // Last-resort system Chrome-family fallbacks for macOS when
+        // Puppeteer-managed Chromium builds are present but unusable.
+        '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+        '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
         '/usr/bin/chromium',
         '/usr/bin/chromium-browser',
         // Puppeteer cache

abx_plugins/plugins/chrome/tests/chrome_test_helpers.py

@@ -1089,8 +1089,13 @@ def install_chromium_with_hooks(env: dict, timeout: int = 300) -> str:
                 f"Chromium binary not found after install: {chromium_path}",
             )
 
-        env["CHROME_BINARY"] = chromium_path
         apply_machine_updates(records, env)
+        env["CHROME_BINARY"] = chromium_path
+
+        resolved = _resolve_existing_chromium(env)
+        if resolved:
+            env["CHROME_BINARY"] = resolved
+            return resolved
         return chromium_path
 
 
@@ -1529,6 +1534,7 @@ def chrome_session(
     test_url: str = "about:blank",
     navigate: bool = True,
     timeout: int = 15,
+    env_overrides: dict[str, str] | None = None,
 ):
     """Context manager for the full crawl -> snapshot -> optional navigate flow.
 
@@ -1556,6 +1562,7 @@ def chrome_session(
         test_url: URL to navigate to (if navigate=True)
         navigate: Whether to navigate to the URL after creating tab
         timeout: Seconds to wait for Chrome to start
+        env_overrides: Runtime env values to preserve from caller setup
 
     Yields:
         Tuple of (chrome_launch_process, chrome_pid, snapshot_chrome_dir, env)
@@ -1589,6 +1596,8 @@ def chrome_session(
         xdg_cache_home = home_dir / ".cache"
         xdg_data_home = home_dir / ".local" / "share"
         env = os.environ.copy()
+        if env_overrides:
+            env.update(env_overrides)
 
         # Prefer an already-provisioned NODE_MODULES_DIR (set by session-level chrome fixture)
         # so we don't force per-test reinstall under tmp LIB_DIR paths.

abx_plugins/plugins/env/tests/test_env_provider.py

@@ -39,7 +39,7 @@ def test_hook_runs_before_other_binary_provider_hooks(self):
         """Env discovery should sort before install-capable provider hooks."""
         other_provider_hooks = [
             next((PLUGIN_DIR.parent / provider).glob("on_BinaryRequest__*.py"), None)
-            for provider in ("npm", "pip", "brew", "apt", "custom")
+            for provider in ("npm", "pip", "brew", "apt", "bash")
         ]
 
         assert INSTALL_HOOK is not None, "Env hook should exist"

abx_plugins/plugins/redirects/tests/test_redirects.py

@@ -88,6 +88,19 @@ def test_redirects_captures_navigation(self, chrome_test_urls):
                     env=env,
                 )
 
+                marker_path = Path(env["SNAP_DIR"]) / "redirects" / "prenav.json"
+                for _ in range(50):
+                    if marker_path.exists():
+                        marker = json.loads(marker_path.read_text())
+                        if marker.get("status") == "ready":
+                            break
+                    time.sleep(0.1)
+                else:
+                    stdout, stderr = result.communicate(timeout=20)
+                    pytest.fail(
+                        f"redirects hook never became ready\nstdout:\n{stdout}\nstderr:\n{stderr}",
+                    )
+
                 nav_result = subprocess.run(
                     [
                         str(CHROME_NAVIGATE_HOOK),