@hominis/fireforge 0.44.4 → 0.46.0

package/dist/src/core/mach-resource-shim.d.ts

@@ -71,7 +71,7 @@
  * regression test (mach-resource-shim.python.test.ts), which asserts the
  * degraded readings' runtime behavior rather than string-matching the source.
  */
-export declare const GUARD_PYTHON_SOURCE = "# Generated by FireForge - do not edit.\n# Degrades the broken host resource monitor family (psutil vs Darwin) from\n# fatal startup errors into non-fatal warnings, so mach builds and tests\n# proceed. Installed into the mach virtualenv site-packages via a .pth file\n# (survives mach's venv re-exec, which drops PYTHONPATH).\nimport builtins\nimport collections\nimport sys\nimport warnings\n\n# Any psutil degradation observed in this process. Once set, monitors are\n# kept inert (start never spawns the collector child) \u2014 on a flapping host a\n# healthy-looking moment must not be trusted to start a sample stream that a\n# later degraded reading could malform.\n_fireforge_host_degraded = [False]\n\n\ndef _fireforge_degraded_notice(exc):\n    _fireforge_host_degraded[0] = True\n    warnings.warn(\n        \"FireForge: host resource monitor degraded (%s); continuing without resource monitoring.\" % exc\n    )\n\n\nclass _DegradedReading(object):\n    # Last-resort duck type of psutil's namedtuple results (svmem field\n    # order): mozsystemmonitor subscripts, iterates, and unpacks readings,\n    # so the degraded fallback must survive r[0], list(r), len(r), r._fields\n    # and r._asdict(), not just attribute access. The parent also reconstructs\n    # readings via type(reading)(*values), so the constructor must tolerate\n    # the full positional field list. Normal\n    # degraded paths use the per-function namedtuple fallbacks below; this\n    # class only backstops a fallback that itself raised.\n    _fields = (\"total\", \"available\", \"percent\", \"used\", \"free\", \"active\", \"inactive\", \"wired\")\n    total = available = used = free = active = inactive = wired = 0\n    percent = 0.0\n\n    def __init__(self, *_args, **_kwargs):\n        pass\n\n    def __getattr__(self, _name):\n        return 0\n\n    def _values(self):\n        return tuple(getattr(self, _field) for _field in self._fields)\n\n    def __getitem__(self, index):\n        return self._values()[index]\n\n    def __iter__(self):\n        return iter(self._values())\n\n    def __len__(self):\n        return len(self._fields)\n\n    def _asdict(self):\n        return dict(zip(self._fields, self._values()))\n\n\n# Per-function fallback result classes with the exact macOS field\n# orders/arities. Module-level on purpose: readings cross the\n# mozsystemmonitor collector pipe via pickle (by reference), and the parent\n# rebuilds each sample with type(reading)(*values) \u2014 so a swap fallback must\n# be 6-field sswap-shaped in every position. An svmem-shaped fallback there\n# makes the parent reject every sample, fill the pipe, block the collector\n# child in send(), and wedge mach's atexit join forever.\n_FallbackVmem = collections.namedtuple(\n    \"_FallbackVmem\",\n    (\"total\", \"available\", \"percent\", \"used\", \"free\", \"active\", \"inactive\", \"wired\"),\n)\n_FallbackSwap = collections.namedtuple(\n    \"_FallbackSwap\", (\"total\", \"used\", \"free\", \"percent\", \"sin\", \"sout\")\n)\n_FallbackCpuTimes = collections.namedtuple(\"_FallbackCpuTimes\", (\"user\", \"nice\", \"system\", \"idle\"))\n_FallbackDiskIO = collections.namedtuple(\n    \"_FallbackDiskIO\",\n    (\"read_count\", \"write_count\", \"read_bytes\", \"write_bytes\", \"read_time\", \"write_time\"),\n)\n\n_FALLBACK_CLASSES = {\n    \"virtual_memory\": _FallbackVmem,\n    \"swap_memory\": _FallbackSwap,\n    \"cpu_times\": _FallbackCpuTimes,\n    \"disk_io_counters\": _FallbackDiskIO,\n}\n\n# psutil result namedtuple per wrapped function, resolvable via getattr from\n# the platform module / _common without invoking the failing syscall.\n_PSUTIL_RESULT_CLASSES = {\n    \"virtual_memory\": \"svmem\",\n    \"swap_memory\": \"sswap\",\n    \"cpu_times\": \"scputimes\",\n    \"disk_io_counters\": \"sdiskio\",\n}\n\n\ndef _zeroed(cls):\n    return cls(*([0] * len(cls._fields)))\n\n\ndef _percpu_requested(args, kwargs, positional_index):\n    if \"percpu\" in kwargs:\n        return bool(kwargs[\"percpu\"])\n    return len(args) > positional_index and bool(args[positional_index])\n\n\ndef _degraded_result_factory(psutil, name):\n    # cpu_percent returns a plain float (or a per-CPU list) callers do\n    # arithmetic on.\n    if name == \"cpu_percent\":\n        def _cpu_percent_fallback(*args, **kwargs):\n            # cpu_percent(interval=None, percpu=False)\n            if _percpu_requested(args, kwargs, 1):\n                return []\n            return 0.0\n\n        return _cpu_percent_fallback\n    # The guard-owned class is always shape-correct for this function;\n    # psutil's own result namedtuple is still preferred when resolvable so\n    # type() captures stay identical to real readings on a flapping host.\n    _cls = _FALLBACK_CLASSES.get(name, _DegradedReading)\n    _cls_name = _PSUTIL_RESULT_CLASSES.get(name)\n    if _cls_name is not None:\n        for _mod in (getattr(psutil, \"_psplatform\", None), getattr(psutil, \"_common\", None)):\n            _real = getattr(_mod, _cls_name, None) if _mod is not None else None\n            if _real is not None and getattr(_real, \"_fields\", None):\n                _cls = _real\n                break\n    if name == \"cpu_times\":\n        def _cpu_times_fallback(*args, **kwargs):\n            # cpu_times(percpu=False); the collector child samples per-CPU.\n            if _percpu_requested(args, kwargs, 0):\n                return []\n            return _zeroed(_cls)\n\n        return _cpu_times_fallback\n\n    def _reading_fallback(*_args, **_kwargs):\n        return _zeroed(_cls)\n\n    return _reading_fallback\n\n\ndef _guard_psutil():\n    try:\n        import psutil\n    except Exception:\n        return\n\n    def _wrap(orig, fallback):\n        def wrapper(*args, **kwargs):\n            try:\n                return orig(*args, **kwargs)\n            except Exception as exc:  # noqa: BLE001\n                _fireforge_degraded_notice(exc)\n                try:\n                    return fallback(*args, **kwargs)\n                except Exception:  # noqa: BLE001\n                    return _DegradedReading()\n\n        return wrapper\n\n    for _name in (\"virtual_memory\", \"swap_memory\", \"cpu_percent\", \"cpu_times\", \"disk_io_counters\"):\n        _orig = getattr(psutil, _name, None)\n        if _orig is not None and not getattr(_orig, \"_fireforge_guarded\", False):\n            try:\n                _fallback = _degraded_result_factory(psutil, _name)\n            except Exception:  # noqa: BLE001\n                _fallback = _DegradedReading\n            _wrapped = _wrap(_orig, _fallback)\n            _wrapped._fireforge_guarded = True\n            setattr(psutil, _name, _wrapped)\n\n\n_MONITOR_METHOD_NAMES = (\n    \"start\",\n    \"stop\",\n    \"record_event\",\n    \"record_marker\",\n    \"begin_phase\",\n    \"finish_phase\",\n    \"aggregate_cpu_percent\",\n    \"aggregate_cpu_times\",\n    \"aggregate_io\",\n    \"min_memory_available\",\n    \"as_dict\",\n)\n\n\ndef _fireforge_stop_collector(monitor):\n    # Best-effort: terminate a live collector child and drain the parent end\n    # of the pipe, so a child blocked in send() on a full pipe can never\n    # keep mach's atexit join (os.waitpid) waiting forever. Attribute names\n    # follow upstream resourcemonitor.py (self._process / self._pipe); a\n    # miss on a refactored upstream is harmless \u2014 the shape-correct\n    # fallbacks above still keep the sample stream well-formed.\n    try:\n        proc = getattr(monitor, \"_process\", None)\n        if proc is not None and getattr(proc, \"is_alive\", lambda: False)():\n            proc.terminate()\n            proc.join(1)\n    except Exception:  # noqa: BLE001\n        pass\n    try:\n        pipe = getattr(monitor, \"_pipe\", None)\n        if pipe is not None:\n            while pipe.poll(0):\n                pipe.recv()\n    except Exception:  # noqa: BLE001\n        pass\n\n\ndef _monitor_per_cpu_requested(args, kwargs):\n    # aggregate_cpu_percent/aggregate_cpu_times(start=None, end=None,\n    # phase=None, per_cpu=True) \u2014 self already stripped from args.\n    if \"per_cpu\" in kwargs:\n        return bool(kwargs[\"per_cpu\"])\n    if len(args) > 3:\n        return bool(args[3])\n    return True\n\n\ndef _monitor_degraded_result(name, args, kwargs):\n    # Degraded aggregate methods return zeroed shapes, not None, where\n    # callers subscript the result: mozbuild's log_resource_usage does\n    # usage[\"io\"].read_bytes after a successful compile, so None there fails\n    # the build with complete artifacts already on disk.\n    if name == \"aggregate_io\":\n        return _zeroed(_FallbackDiskIO)\n    if name == \"aggregate_cpu_percent\":\n        return [] if _monitor_per_cpu_requested(args, kwargs) else 0.0\n    if name == \"aggregate_cpu_times\":\n        return [] if _monitor_per_cpu_requested(args, kwargs) else _zeroed(_FallbackCpuTimes)\n    return None\n\n\ndef _patch_monitor_class(cls):\n    if cls is None or getattr(cls, \"_fireforge_guarded\", False):\n        return\n    orig_init = cls.__init__\n\n    def guarded_init(self, *args, **kwargs):\n        # Pre-populate the attributes a partially-constructed instance is\n        # later polled for, so a failing __init__ can never surface\n        # AttributeError: poll_interval.\n        self.poll_interval = kwargs.get(\"poll_interval\") or 1.0\n        self._fireforge_degraded = False\n        try:\n            orig_init(self, *args, **kwargs)\n        except Exception as exc:  # noqa: BLE001\n            self._fireforge_degraded = True\n            _fireforge_degraded_notice(exc)\n        if _fireforge_host_degraded[0] and not self._fireforge_degraded:\n            # Host already degraded once: keep the monitor inert so the\n            # collector child never spawns on a flapping host.\n            self._fireforge_degraded = True\n        if self._fireforge_degraded:\n            _fireforge_stop_collector(self)\n\n    cls.__init__ = guarded_init\n\n    def _wrap_method(name, orig):\n        def wrapper(self, *args, **kwargs):\n            if (\n                name == \"start\"\n                and _fireforge_host_degraded[0]\n                and not getattr(self, \"_fireforge_degraded\", False)\n            ):\n                self._fireforge_degraded = True\n                _fireforge_stop_collector(self)\n            if getattr(self, \"_fireforge_degraded\", False):\n                if name == \"stop\":\n                    _fireforge_stop_collector(self)\n                return _monitor_degraded_result(name, args, kwargs)\n            try:\n                return orig(self, *args, **kwargs)\n            except Exception as exc:  # noqa: BLE001\n                self._fireforge_degraded = True\n                _fireforge_degraded_notice(exc)\n                # A raising stop (or any degraded transition) must still\n                # take the collector child down, or the parent's atexit\n                # join hangs on a child blocked writing to a full pipe.\n                _fireforge_stop_collector(self)\n                return _monitor_degraded_result(name, args, kwargs)\n\n        return wrapper\n\n    for _name in _MONITOR_METHOD_NAMES:\n        _orig = getattr(cls, _name, None)\n        if _orig is not None:\n            setattr(cls, _name, _wrap_method(_name, _orig))\n    cls._fireforge_guarded = True\n\n\ndef _patch_build_monitor_class(cls):\n    # mozbuild's BuildMonitor is not a SystemResourceMonitor; only\n    # log_resource_usage needs guarding \u2014 end-of-build resource reporting\n    # must never fail a build whose artifacts are complete. No __init__\n    # replacement, no degraded-instance gating.\n    if cls is None or getattr(cls, \"_fireforge_guarded\", False):\n        return\n    _orig = getattr(cls, \"log_resource_usage\", None)\n    if _orig is not None:\n        def _guarded_log_resource_usage(self, *args, **kwargs):\n            try:\n                return _orig(self, *args, **kwargs)\n            except Exception as exc:  # noqa: BLE001\n                _fireforge_degraded_notice(exc)\n                return None\n\n        cls.log_resource_usage = _guarded_log_resource_usage\n    cls._fireforge_guarded = True\n\n\n_MONITOR_CLASS_PATCHES = (\n    (\"mozsystemmonitor.resourcemonitor\", \"SystemResourceMonitor\", _patch_monitor_class),\n    (\"mozbuild.resources\", \"SystemResourceMonitor\", _patch_monitor_class),\n    (\"mozbuild.controller.building\", \"BuildMonitor\", _patch_build_monitor_class),\n)\n\n\ndef _patch_loaded_monitor_modules():\n    for _mod_name, _cls_name, _patcher in _MONITOR_CLASS_PATCHES:\n        _mod = sys.modules.get(_mod_name)\n        if _mod is not None:\n            try:\n                _patcher(getattr(_mod, _cls_name, None))\n            except Exception:  # noqa: BLE001\n                pass\n\n\ndef _install_import_hook():\n    _orig_import = builtins.__import__\n    if getattr(_orig_import, \"_fireforge_guarded\", False):\n        return\n\n    def _guarding_import(name, *args, **kwargs):\n        _module = _orig_import(name, *args, **kwargs)\n        try:\n            _patch_loaded_monitor_modules()\n        except Exception:  # noqa: BLE001\n            pass\n        return _module\n\n    _guarding_import._fireforge_guarded = True\n    builtins.__import__ = _guarding_import\n\n\ntry:\n    _guard_psutil()\n    _patch_loaded_monitor_modules()\n    _install_import_hook()\nexcept Exception:  # noqa: BLE001\n    pass\n";
+export declare const GUARD_PYTHON_SOURCE = "# Generated by FireForge - do not edit.\n# Degrades the broken host resource monitor family (psutil vs Darwin) from\n# fatal startup errors into non-fatal warnings, so mach builds and tests\n# proceed. Installed into the mach virtualenv site-packages via a .pth file\n# (survives mach's venv re-exec, which drops PYTHONPATH).\nimport builtins\nimport collections\nimport inspect\nimport sys\nimport warnings\n\n# Any psutil degradation observed in this process. Once set, monitors are\n# kept inert (start never spawns the collector child) \u2014 on a flapping host a\n# healthy-looking moment must not be trusted to start a sample stream that a\n# later degraded reading could malform.\n_fireforge_host_degraded = [False]\n\n\ndef _fireforge_degraded_notice(exc):\n    _fireforge_host_degraded[0] = True\n    warnings.warn(\n        \"FireForge: host resource monitor degraded (%s); continuing without resource monitoring.\" % exc\n    )\n\n\nclass _DegradedReading(object):\n    # Last-resort duck type of psutil's namedtuple results (svmem field\n    # order): mozsystemmonitor subscripts, iterates, and unpacks readings,\n    # so the degraded fallback must survive r[0], list(r), len(r), r._fields\n    # and r._asdict(), not just attribute access. The parent also reconstructs\n    # readings via type(reading)(*values), so the constructor must tolerate\n    # the full positional field list. Normal\n    # degraded paths use the per-function namedtuple fallbacks below; this\n    # class only backstops a fallback that itself raised.\n    _fields = (\"total\", \"available\", \"percent\", \"used\", \"free\", \"active\", \"inactive\", \"wired\")\n    total = available = used = free = active = inactive = wired = 0\n    percent = 0.0\n\n    def __init__(self, *_args, **_kwargs):\n        pass\n\n    def __getattr__(self, _name):\n        return 0\n\n    def _values(self):\n        return tuple(getattr(self, _field) for _field in self._fields)\n\n    def __getitem__(self, index):\n        return self._values()[index]\n\n    def __iter__(self):\n        return iter(self._values())\n\n    def __len__(self):\n        return len(self._fields)\n\n    def _asdict(self):\n        return dict(zip(self._fields, self._values()))\n\n\n# Per-function fallback result classes with the exact macOS field\n# orders/arities. Module-level on purpose: readings cross the\n# mozsystemmonitor collector pipe via pickle (by reference), and the parent\n# rebuilds each sample with type(reading)(*values) \u2014 so a swap fallback must\n# be 6-field sswap-shaped in every position. An svmem-shaped fallback there\n# makes the parent reject every sample, fill the pipe, block the collector\n# child in send(), and wedge mach's atexit join forever.\n_FallbackVmem = collections.namedtuple(\n    \"_FallbackVmem\",\n    (\"total\", \"available\", \"percent\", \"used\", \"free\", \"active\", \"inactive\", \"wired\"),\n)\n_FallbackSwap = collections.namedtuple(\n    \"_FallbackSwap\", (\"total\", \"used\", \"free\", \"percent\", \"sin\", \"sout\")\n)\n_FallbackCpuTimes = collections.namedtuple(\"_FallbackCpuTimes\", (\"user\", \"nice\", \"system\", \"idle\"))\n_FallbackDiskIO = collections.namedtuple(\n    \"_FallbackDiskIO\",\n    (\"read_count\", \"write_count\", \"read_bytes\", \"write_bytes\", \"read_time\", \"write_time\"),\n)\n\n_FALLBACK_CLASSES = {\n    \"virtual_memory\": _FallbackVmem,\n    \"swap_memory\": _FallbackSwap,\n    \"cpu_times\": _FallbackCpuTimes,\n    \"disk_io_counters\": _FallbackDiskIO,\n}\n\n# psutil result namedtuple per wrapped function, resolvable via getattr from\n# the platform module / _common without invoking the failing syscall.\n_PSUTIL_RESULT_CLASSES = {\n    \"virtual_memory\": \"svmem\",\n    \"swap_memory\": \"sswap\",\n    \"cpu_times\": \"scputimes\",\n    \"disk_io_counters\": \"sdiskio\",\n}\n\n\ndef _zeroed(cls):\n    return cls(*([0] * len(cls._fields)))\n\n\ndef _percpu_requested(args, kwargs, positional_index):\n    if \"percpu\" in kwargs:\n        return bool(kwargs[\"percpu\"])\n    return len(args) > positional_index and bool(args[positional_index])\n\n\ndef _degraded_result_factory(psutil, name):\n    # cpu_percent returns a plain float (or a per-CPU list) callers do\n    # arithmetic on.\n    if name == \"cpu_percent\":\n        def _cpu_percent_fallback(*args, **kwargs):\n            # cpu_percent(interval=None, percpu=False)\n            if _percpu_requested(args, kwargs, 1):\n                return []\n            return 0.0\n\n        return _cpu_percent_fallback\n    # The guard-owned class is always shape-correct for this function;\n    # psutil's own result namedtuple is still preferred when resolvable so\n    # type() captures stay identical to real readings on a flapping host.\n    _cls = _FALLBACK_CLASSES.get(name, _DegradedReading)\n    _cls_name = _PSUTIL_RESULT_CLASSES.get(name)\n    if _cls_name is not None:\n        for _mod in (getattr(psutil, \"_psplatform\", None), getattr(psutil, \"_common\", None)):\n            _real = getattr(_mod, _cls_name, None) if _mod is not None else None\n            if _real is not None and getattr(_real, \"_fields\", None):\n                _cls = _real\n                break\n    if name == \"cpu_times\":\n        def _cpu_times_fallback(*args, **kwargs):\n            # cpu_times(percpu=False); the collector child samples per-CPU.\n            if _percpu_requested(args, kwargs, 0):\n                return []\n            return _zeroed(_cls)\n\n        return _cpu_times_fallback\n\n    def _reading_fallback(*_args, **_kwargs):\n        return _zeroed(_cls)\n\n    return _reading_fallback\n\n\ndef _guard_psutil():\n    try:\n        import psutil\n    except Exception:\n        return\n\n    def _wrap(orig, fallback):\n        def wrapper(*args, **kwargs):\n            try:\n                return orig(*args, **kwargs)\n            except Exception as exc:  # noqa: BLE001\n                _fireforge_degraded_notice(exc)\n                try:\n                    return fallback(*args, **kwargs)\n                except Exception:  # noqa: BLE001\n                    return _DegradedReading()\n\n        return wrapper\n\n    for _name in (\"virtual_memory\", \"swap_memory\", \"cpu_percent\", \"cpu_times\", \"disk_io_counters\"):\n        _orig = getattr(psutil, _name, None)\n        if _orig is not None and not getattr(_orig, \"_fireforge_guarded\", False):\n            try:\n                _fallback = _degraded_result_factory(psutil, _name)\n            except Exception:  # noqa: BLE001\n                _fallback = _DegradedReading\n            _wrapped = _wrap(_orig, _fallback)\n            _wrapped._fireforge_guarded = True\n            setattr(psutil, _name, _wrapped)\n\n\n_MONITOR_METHOD_NAMES = (\n    \"start\",\n    \"stop\",\n    \"record_event\",\n    \"record_marker\",\n    \"begin_phase\",\n    \"finish_phase\",\n    \"aggregate_cpu_percent\",\n    \"aggregate_cpu_times\",\n    \"aggregate_io\",\n    \"min_memory_available\",\n    \"as_dict\",\n)\n\n\ndef _fireforge_stop_collector(monitor):\n    # Best-effort: terminate a live collector child and drain the parent end\n    # of the pipe, so a child blocked in send() on a full pipe can never\n    # keep mach's atexit join (os.waitpid) waiting forever. Attribute names\n    # follow upstream resourcemonitor.py (self._process / self._pipe); a\n    # miss on a refactored upstream is harmless \u2014 the shape-correct\n    # fallbacks above still keep the sample stream well-formed.\n    try:\n        proc = getattr(monitor, \"_process\", None)\n        if proc is not None and getattr(proc, \"is_alive\", lambda: False)():\n            proc.terminate()\n            proc.join(1)\n    except Exception:  # noqa: BLE001\n        pass\n    try:\n        pipe = getattr(monitor, \"_pipe\", None)\n        if pipe is not None:\n            while pipe.poll(0):\n                pipe.recv()\n    except Exception:  # noqa: BLE001\n        pass\n\n\ndef _monitor_per_cpu_requested(args, kwargs):\n    # aggregate_cpu_percent/aggregate_cpu_times(start=None, end=None,\n    # phase=None, per_cpu=True) \u2014 self already stripped from args.\n    if \"per_cpu\" in kwargs:\n        return bool(kwargs[\"per_cpu\"])\n    if len(args) > 3:\n        return bool(args[3])\n    return True\n\n\ndef _monitor_degraded_result(name, args, kwargs):\n    # Degraded aggregate methods return zeroed shapes, not None, where\n    # callers subscript the result: mozbuild's log_resource_usage does\n    # usage[\"io\"].read_bytes after a successful compile, so None there fails\n    # the build with complete artifacts already on disk.\n    if name == \"aggregate_io\":\n        return _zeroed(_FallbackDiskIO)\n    if name == \"aggregate_cpu_percent\":\n        return [] if _monitor_per_cpu_requested(args, kwargs) else 0.0\n    if name == \"aggregate_cpu_times\":\n        return [] if _monitor_per_cpu_requested(args, kwargs) else _zeroed(_FallbackCpuTimes)\n    return None\n\n\ndef _patch_monitor_class(cls):\n    if cls is None or getattr(cls, \"_fireforge_guarded\", False):\n        return\n    orig_init = cls.__init__\n\n    def guarded_init(self, *args, **kwargs):\n        # Pre-populate the attributes a partially-constructed instance is\n        # later polled for, so a failing __init__ can never surface\n        # AttributeError: poll_interval.\n        self.poll_interval = kwargs.get(\"poll_interval\") or 1.0\n        self._fireforge_degraded = False\n        try:\n            orig_init(self, *args, **kwargs)\n        except Exception as exc:  # noqa: BLE001\n            self._fireforge_degraded = True\n            _fireforge_degraded_notice(exc)\n        if _fireforge_host_degraded[0] and not self._fireforge_degraded:\n            # Host already degraded once: keep the monitor inert so the\n            # collector child never spawns on a flapping host.\n            self._fireforge_degraded = True\n        if self._fireforge_degraded:\n            _fireforge_stop_collector(self)\n\n    cls.__init__ = guarded_init\n\n    def _wrap_method(name, orig):\n        def wrapper(self, *args, **kwargs):\n            if (\n                name == \"start\"\n                and _fireforge_host_degraded[0]\n                and not getattr(self, \"_fireforge_degraded\", False)\n            ):\n                self._fireforge_degraded = True\n                _fireforge_stop_collector(self)\n            if getattr(self, \"_fireforge_degraded\", False):\n                if name == \"stop\":\n                    _fireforge_stop_collector(self)\n                return _monitor_degraded_result(name, args, kwargs)\n            try:\n                return orig(self, *args, **kwargs)\n            except Exception as exc:  # noqa: BLE001\n                self._fireforge_degraded = True\n                _fireforge_degraded_notice(exc)\n                # A raising stop (or any degraded transition) must still\n                # take the collector child down, or the parent's atexit\n                # join hangs on a child blocked writing to a full pipe.\n                _fireforge_stop_collector(self)\n                return _monitor_degraded_result(name, args, kwargs)\n\n        return wrapper\n\n    def _wrap_unbound(name, func):\n        # Upstream declares record_event/record_marker as @staticmethods (and\n        # may declare others as @classmethods). Those take no receiver, so\n        # they cannot use the per-instance degraded flag and must not have one\n        # threaded in \u2014 see the descriptor dispatch below.\n        def wrapper(*args, **kwargs):\n            if _fireforge_host_degraded[0]:\n                return _monitor_degraded_result(name, args, kwargs)\n            try:\n                return func(*args, **kwargs)\n            except Exception as exc:  # noqa: BLE001\n                _fireforge_degraded_notice(exc)\n                return _monitor_degraded_result(name, args, kwargs)\n\n        return wrapper\n\n    for _name in _MONITOR_METHOD_NAMES:\n        # getattr_static returns the raw class attribute, so a staticmethod\n        # is still a staticmethod object here. Plain getattr would hand back\n        # the underlying function, and re-setting THAT on the class rebinds\n        # it as an instance method: the receiver is then passed through as an\n        # extra leading positional and every call raises\n        # \"takes N positional arguments but N+1 were given\". Re-apply the\n        # descriptor the attribute actually had.\n        try:\n            _raw = inspect.getattr_static(cls, _name)\n        except AttributeError:\n            continue\n        if isinstance(_raw, staticmethod):\n            setattr(cls, _name, staticmethod(_wrap_unbound(_name, _raw.__func__)))\n            continue\n        if isinstance(_raw, classmethod):\n            setattr(cls, _name, classmethod(_wrap_unbound(_name, _raw.__func__)))\n            continue\n        _orig = getattr(cls, _name, None)\n        if _orig is not None:\n            setattr(cls, _name, _wrap_method(_name, _orig))\n    cls._fireforge_guarded = True\n\n\ndef _patch_build_monitor_class(cls):\n    # mozbuild's BuildMonitor is not a SystemResourceMonitor; only\n    # log_resource_usage needs guarding \u2014 end-of-build resource reporting\n    # must never fail a build whose artifacts are complete. No __init__\n    # replacement, no degraded-instance gating.\n    if cls is None or getattr(cls, \"_fireforge_guarded\", False):\n        return\n    _orig = getattr(cls, \"log_resource_usage\", None)\n    if _orig is not None:\n        def _guarded_log_resource_usage(self, *args, **kwargs):\n            try:\n                return _orig(self, *args, **kwargs)\n            except Exception as exc:  # noqa: BLE001\n                _fireforge_degraded_notice(exc)\n                return None\n\n        cls.log_resource_usage = _guarded_log_resource_usage\n    cls._fireforge_guarded = True\n\n\n_MONITOR_CLASS_PATCHES = (\n    (\"mozsystemmonitor.resourcemonitor\", \"SystemResourceMonitor\", _patch_monitor_class),\n    (\"mozbuild.resources\", \"SystemResourceMonitor\", _patch_monitor_class),\n    (\"mozbuild.controller.building\", \"BuildMonitor\", _patch_build_monitor_class),\n)\n\n\ndef _patch_loaded_monitor_modules():\n    for _mod_name, _cls_name, _patcher in _MONITOR_CLASS_PATCHES:\n        _mod = sys.modules.get(_mod_name)\n        if _mod is not None:\n            try:\n                _patcher(getattr(_mod, _cls_name, None))\n            except Exception:  # noqa: BLE001\n                pass\n\n\ndef _install_import_hook():\n    _orig_import = builtins.__import__\n    if getattr(_orig_import, \"_fireforge_guarded\", False):\n        return\n\n    def _guarding_import(name, *args, **kwargs):\n        _module = _orig_import(name, *args, **kwargs)\n        try:\n            _patch_loaded_monitor_modules()\n        except Exception:  # noqa: BLE001\n            pass\n        return _module\n\n    _guarding_import._fireforge_guarded = True\n    builtins.__import__ = _guarding_import\n\n\ntry:\n    _guard_psutil()\n    _patch_loaded_monitor_modules()\n    _install_import_hook()\nexcept Exception:  # noqa: BLE001\n    pass\n";
 /** Result of installing the mach resource guard before a dispatch. */
 export interface MachResourceGuardInstallation {
     /**
@@ -83,6 +83,18 @@ export interface MachResourceGuardInstallation {
     /** site-packages directories the in-venv guard was written into. */
     sitePackagesDirs: string[];
 }
+/**
+ * Refuses a shim directory that is not a private directory of the current
+ * user. `lstat`, not `stat`: a symlink planted at the path would otherwise
+ * be followed and the check would describe its target. On Windows only the
+ * "is a real directory" half applies — there is no POSIX owner or mode bit
+ * to read, and the per-user name is the isolation.
+ *
+ * @param dir - Shim directory that {@link ensureSitecustomizeFallback} created
+ * @throws BuildError when the directory is a symlink/file, owned by another
+ *   uid, or group/world-writable
+ */
+export declare function assertPrivateShimDir(dir: string): Promise<void>;
 /**
  * Installs the resource-monitor degrade guard for a mach dispatch:
  * `fireforge_mach_guard.pth` + `fireforge_mach_guard.py` into every

package/dist/src/core/mach-resource-shim.js

@@ -63,13 +63,20 @@
  *    warn-and-continue on any exception, so end-of-build resource reporting
  *    can never fail a build whose artifacts are complete.
  */
-import { readdir } from 'node:fs/promises';
-import { homedir, tmpdir } from 'node:os';
+import { lstat, mkdir, readdir } from 'node:fs/promises';
+import { homedir, tmpdir, userInfo } from 'node:os';
 import { delimiter, join } from 'node:path';
+import { BuildError } from '../errors/build.js';
 import { toError } from '../utils/errors.js';
-import { ensureDir, pathExists, writeText } from '../utils/fs.js';
+import { pathExists, writeText } from '../utils/fs.js';
 import { verbose } from '../utils/logger.js';
-/** Directory name (under the OS temp dir) holding the PYTHONPATH fallback. */
+/**
+ * Prefix of the per-user directory (under the OS temp dir) holding the
+ * PYTHONPATH fallback. The uid (or, on Windows, the username) is appended:
+ * a FIXED name under a shared `/tmp` lets any other local account pre-create
+ * the directory and own the `sitecustomize.py` that every mach dispatch
+ * then imports.
+ */
 const RESOURCE_SHIM_DIRNAME = 'fireforge-mach-resource-shim';
 /** Basename (sans extension) of the in-venv guard module. */
 const GUARD_MODULE_NAME = 'fireforge_mach_guard';
@@ -89,6 +96,7 @@ export const GUARD_PYTHON_SOURCE = `# Generated by FireForge - do not edit.
 # (survives mach's venv re-exec, which drops PYTHONPATH).
 import builtins
 import collections
+import inspect
 import sys
 import warnings
 
@@ -369,7 +377,40 @@ def _patch_monitor_class(cls):
 
         return wrapper
 
+    def _wrap_unbound(name, func):
+        # Upstream declares record_event/record_marker as @staticmethods (and
+        # may declare others as @classmethods). Those take no receiver, so
+        # they cannot use the per-instance degraded flag and must not have one
+        # threaded in — see the descriptor dispatch below.
+        def wrapper(*args, **kwargs):
+            if _fireforge_host_degraded[0]:
+                return _monitor_degraded_result(name, args, kwargs)
+            try:
+                return func(*args, **kwargs)
+            except Exception as exc:  # noqa: BLE001
+                _fireforge_degraded_notice(exc)
+                return _monitor_degraded_result(name, args, kwargs)
+
+        return wrapper
+
     for _name in _MONITOR_METHOD_NAMES:
+        # getattr_static returns the raw class attribute, so a staticmethod
+        # is still a staticmethod object here. Plain getattr would hand back
+        # the underlying function, and re-setting THAT on the class rebinds
+        # it as an instance method: the receiver is then passed through as an
+        # extra leading positional and every call raises
+        # "takes N positional arguments but N+1 were given". Re-apply the
+        # descriptor the attribute actually had.
+        try:
+            _raw = inspect.getattr_static(cls, _name)
+        except AttributeError:
+            continue
+        if isinstance(_raw, staticmethod):
+            setattr(cls, _name, staticmethod(_wrap_unbound(_name, _raw.__func__)))
+            continue
+        if isinstance(_raw, classmethod):
+            setattr(cls, _name, classmethod(_wrap_unbound(_name, _raw.__func__)))
+            continue
         _orig = getattr(cls, _name, None)
         if _orig is not None:
             setattr(cls, _name, _wrap_method(_name, _orig))
@@ -488,13 +529,75 @@ async function discoverMachSitePackages(engineDir) {
     return found;
 }
 /**
- * Writes the PYTHONPATH `sitecustomize.py` fallback into a stable
- * FireForge-owned temp directory and returns that directory. Idempotent —
- * overwriting each call keeps it in sync with this source across upgrades.
+ * Per-user discriminator for the shim directory name. The numeric uid on
+ * POSIX, read via `process.getuid` rather than `os.userInfo()`: the latter
+ * resolves the passwd entry and THROWS (`ERR_SYSTEM_ERROR`) for a uid that
+ * has none — `docker --user 1001:1001`, OpenShift's random uids, many CI
+ * agents — which would take every build and test dispatch down with a raw
+ * system error. On Windows there is no uid; the username is the
+ * discriminator, with `userInfo()` still guarded because the same lookup
+ * can fail there for a service account, falling back to the environment.
+ */
+function shimDirOwner() {
+    const uid = process.getuid?.();
+    if (uid !== undefined)
+        return String(uid);
+    let username;
+    try {
+        username = userInfo().username;
+    }
+    catch {
+        username = process.env['USERNAME'] ?? process.env['USER'];
+    }
+    return (username ?? 'unknown-user').replace(/[^A-Za-z0-9_.-]/g, '_');
+}
+/** Per-user shim directory: `<tmpdir>/fireforge-mach-resource-shim-<uid>`. */
+function resourceShimDir() {
+    return join(tmpdir(), `${RESOURCE_SHIM_DIRNAME}-${shimDirOwner()}`);
+}
+/**
+ * Refuses a shim directory that is not a private directory of the current
+ * user. `lstat`, not `stat`: a symlink planted at the path would otherwise
+ * be followed and the check would describe its target. On Windows only the
+ * "is a real directory" half applies — there is no POSIX owner or mode bit
+ * to read, and the per-user name is the isolation.
+ *
+ * @param dir - Shim directory that {@link ensureSitecustomizeFallback} created
+ * @throws BuildError when the directory is a symlink/file, owned by another
+ *   uid, or group/world-writable
+ */
+export async function assertPrivateShimDir(dir) {
+    const stats = await lstat(dir);
+    const refuse = (reason) => {
+        throw new BuildError(`Refusing to use mach resource shim directory ${dir}: ${reason}. ` +
+            'Another local account may have planted it; remove or fix it and retry.');
+    };
+    if (!stats.isDirectory()) {
+        refuse('not a directory (symlink or file)');
+    }
+    if (process.platform === 'win32')
+        return;
+    const uid = process.getuid?.();
+    if (uid !== undefined && stats.uid !== uid) {
+        refuse(`owned by uid ${stats.uid}, not the current user (uid ${uid})`);
+    }
+    if ((stats.mode & 0o022) !== 0) {
+        refuse(`mode ${(stats.mode & 0o777).toString(8)} is group/world-writable`);
+    }
+}
+/**
+ * Writes the PYTHONPATH `sitecustomize.py` fallback into a per-user,
+ * mode-0700 FireForge-owned temp directory, verified private before the
+ * write, and returns that directory. Idempotent — overwriting each call
+ * keeps it in sync with this source across upgrades.
  */
 async function ensureSitecustomizeFallback() {
-    const dir = join(tmpdir(), RESOURCE_SHIM_DIRNAME);
-    await ensureDir(dir);
+    const dir = resourceShimDir();
+    // `mode` only applies when mkdir creates the directory (and is masked by
+    // the umask); a pre-existing one keeps whatever it had, which is exactly
+    // what the assertion below refuses if it is not private.
+    await mkdir(dir, { recursive: true, mode: 0o700 });
+    await assertPrivateShimDir(dir);
     await writeText(join(dir, 'sitecustomize.py'), GUARD_PYTHON_SOURCE);
     return dir;
 }

package/dist/src/core/mach.d.ts

@@ -2,7 +2,7 @@ import { type SmokeLineCallback, type SmokeRunResult } from '../utils/process.js
 import { type HarnessCrashSignature } from './test-harness-crash.js';
 export { attemptMozinfoRewrite, buildArtifactMismatchMessage, hasBuildArtifacts, hasRunnableBundle, } from './mach-build-artifacts.js';
 export { generateMozconfig } from './mach-mozconfig.js';
-export { ensurePython, resetResolvedPython } from './mach-python.js';
+export { ensurePython } from './mach-python.js';
 /**
  * Ensures mach is available in the engine directory.
  * @param engineDir - Path to the engine directory
@@ -23,6 +23,13 @@ export interface MachOptions {
      * stdout/stderr stay raw — the harness classifier depends on the raw
      * traceback. Unrecognized tracebacks always echo verbatim. Opted into by
      * the test dispatchers only.
+     *
+     * Consumed by {@link runMachCapture} ALONE. `runMachInheritCapture` accepts
+     * it in the type and ignores it — the inherit path has no per-chunk hook,
+     * only a mirror stream that feeds the terminal and the run log the same
+     * string, so filtering there would strip the traceback from the raw log
+     * too. The build path uses the recognition NOTE instead; see
+     * `mach-known-noise-filter.ts`.
      */
     annotateKnownTeardownNoise?: boolean;
     /**
@@ -59,12 +66,6 @@ export declare function runMachCapture(args: string[], engineDir: string, option
  * capturing stdout/stderr for post-run diagnostics.
  */
 export declare function runMachInheritCapture(args: string[], engineDir: string, options?: Omit<MachOptions, 'inherit'>): Promise<MachCommandResult>;
-/**
- * Runs mach bootstrap to install build dependencies.
- * @param engineDir - Path to the engine directory
- * @returns Exit code
- */
-export declare function bootstrap(engineDir: string): Promise<number>;
 /**
  * Runs mach bootstrap while preserving stdin and capturing the emitted output.
  * @param engineDir - Path to the engine directory
@@ -190,29 +191,15 @@ export interface RunMachSmokeOptions {
  * the runner to chrome-specific pattern logic.
  */
 export declare function runMachSmoke(args: string[], engineDir: string, options: RunMachSmokeOptions): Promise<SmokeRunResult>;
-/**
- * Creates a distribution package.
- * @param engineDir - Path to the engine directory
- * @returns Exit code
- */
-export declare function machPackage(engineDir: string): Promise<number>;
 /**
  * Creates a distribution package while streaming output to the terminal
- * and capturing the stderr tail for post-run diagnostics. Callers that
- * want to consult {@link explainMachError} on failure should use this
- * variant; the inherit-only `machPackage` above remains for callers that
- * just need an exit code.
+ * and capturing the stderr tail for post-run diagnostics, so callers can
+ * consult {@link explainMachError} on failure.
  *
  * @param engineDir - Path to the engine directory
  * @returns Captured mach result (stdout tail, stderr tail, exit code)
  */
 export declare function machPackageCapture(engineDir: string): Promise<MachCommandResult>;
-/**
- * Runs mach watch for auto-rebuilding.
- * @param engineDir - Path to the engine directory
- * @returns Exit code
- */
-export declare function watch(engineDir: string): Promise<number>;
 /**
  * Runs mach watch while preserving stdin and capturing emitted output.
  *
@@ -231,38 +218,44 @@ export declare function watchWithOutput(engineDir: string, options?: {
     env?: Record<string, string>;
 }): Promise<MachCommandResult>;
 /**
- * Runs mach test with the given test paths.
- * @param engineDir - Path to the engine directory
- * @param testPaths - Test file or directory paths (relative to engine)
- * @param args - Additional arguments to pass to mach test
- * @returns Exit code
- */
-export declare function test(engineDir: string, testPaths?: string[], args?: string[]): Promise<number>;
-/**
- * Runs mach test while capturing streamed output for better diagnostics.
+ * Which mach test command a capturing test dispatch runs.
  *
- * @param engineDir - Absolute path to the engine checkout
- * @param testPaths - Test paths to pass to `mach test`; empty runs the default set
- * @param args - Extra `mach test` arguments appended after the paths
- * @param env - Optional extra environment variables for the mach process
- *   (merged over `process.env` by the exec layer). Used by
- *   `fireforge test --perf-samples` to publish the artifact-path contract.
+ * - `test`: the generic `mach test` (mixed/all-tests runs, or the
+ *   `--generic-mach-test` opt-out).
+ * - `xpcshell-test` / `mochitest`: the suite-specific commands. Unlike the
+ *   generic `mach test`, these degrade a broken mozlog resource monitor to a
+ *   warning instead of crashing at startup, so `fireforge test` dispatches
+ *   single-suite runs to them to stay resilient to the host psutil failure.
  */
-export declare function testWithOutput(engineDir: string, testPaths?: string[], args?: string[], env?: Record<string, string>, fullOutput?: boolean): Promise<MachCommandResult>;
+export type MachTestSuiteKind = 'test' | 'xpcshell-test' | 'mochitest';
+/** Options for {@link runMachTestSuite}. */
+export interface MachTestSuiteOptions {
+    /** Absolute path to the engine checkout. */
+    engineDir: string;
+    /** Test paths to pass to the mach command; empty runs the default set. */
+    testPaths?: string[];
+    /** Extra mach arguments appended after the paths. */
+    args?: string[];
+    /**
+     * Extra environment variables for the mach process (merged over
+     * `process.env` by the exec layer). Used by `fireforge test
+     * --perf-samples` to publish the artifact-path contract.
+     */
+    env?: Record<string, string> | undefined;
+    /**
+     * Pass full mozbuild verbosity through by unsetting the coding-agent
+     * markers that quiet it. See {@link CODING_AGENT_ENV_MARKERS}.
+     */
+    fullOutput?: boolean | undefined;
+}
 /**
- * Runs `mach xpcshell-test` (the suite-specific xpcshell command) while
- * capturing output. Unlike the generic `mach test`, the suite-specific
- * commands degrade a broken mozlog resource monitor to a warning instead of
- * crashing at startup, so `fireforge test` dispatches single-suite runs here
- * to stay resilient to the host psutil failure.
+ * Runs one mach test command (`mach test` / `mach xpcshell-test` / `mach
+ * mochitest`) while capturing streamed output for better diagnostics. The
+ * three commands share every other detail of the dispatch — resource guard,
+ * verbosity env, teardown-noise annotation — so they share one entry point
+ * keyed by `kind` rather than three copies that drift.
  *
- * Signature mirrors {@link testWithOutput} so the two are interchangeable in
- * the dispatch path.
- */
-export declare function xpcshellTestWithOutput(engineDir: string, testPaths?: string[], args?: string[], env?: Record<string, string>, fullOutput?: boolean): Promise<MachCommandResult>;
-/**
- * Runs `mach mochitest` (covers browser-chrome / mochitest flavors) while
- * capturing output. The suite-specific counterpart to {@link testWithOutput}
- * for non-xpcshell single-suite runs — see {@link xpcshellTestWithOutput}.
+ * @param kind - Which mach command to run
+ * @param options - Engine checkout, test paths, extra args, env, verbosity
  */
-export declare function mochitestWithOutput(engineDir: string, testPaths?: string[], args?: string[], env?: Record<string, string>, fullOutput?: boolean): Promise<MachCommandResult>;
+export declare function runMachTestSuite(kind: MachTestSuiteKind, options: MachTestSuiteOptions): Promise<MachCommandResult>;

package/dist/src/core/mach.js

@@ -2,12 +2,12 @@
 import { basename, join } from 'node:path';
 import { MachNotFoundError } from '../errors/build.js';
 import { pathExists } from '../utils/fs.js';
-import { warn } from '../utils/logger.js';
+import { info, warn } from '../utils/logger.js';
 import { exec, execInherit, execInheritCapture, execSmokeRun, execStream, } from '../utils/process.js';
 import { createSiblingLockPath, withFileLock } from './file-lock.js';
 import { ensureFirefoxIgnorefileCompatibility } from './firefox-ignorefile.js';
 import { explainMachError } from './mach-error-hints.js';
-import { createKnownTeardownNoiseFilter, createTeardownNoiseContext, } from './mach-known-noise-filter.js';
+import { createKnownTeardownNoiseFilter, createTeardownNoiseContext, hasKnownTeardownNoise, KNOWN_TEARDOWN_NOISE_BUILD_NOTE, } from './mach-known-noise-filter.js';
 import { getPython } from './mach-python.js';
 import { installMachResourceGuard } from './mach-resource-shim.js';
 import { teeToRunLog, writeToActiveRunLog } from './run-log.js';
@@ -20,7 +20,7 @@ import { detectHarnessCrashSignature } from './test-harness-crash.js';
 // that mocks `mach.js`.
 export { attemptMozinfoRewrite, buildArtifactMismatchMessage, hasBuildArtifacts, hasRunnableBundle, } from './mach-build-artifacts.js';
 export { generateMozconfig } from './mach-mozconfig.js';
-export { ensurePython, resetResolvedPython } from './mach-python.js';
+export { ensurePython } from './mach-python.js';
 /**
  * Ensures mach is available in the engine directory.
  * @param engineDir - Path to the engine directory
@@ -149,14 +149,6 @@ export async function runMachInheritCapture(args, engineDir, options = {}) {
         processGroup: true,
     });
 }
-/**
- * Runs mach bootstrap to install build dependencies.
- * @param engineDir - Path to the engine directory
- * @returns Exit code
- */
-export async function bootstrap(engineDir) {
-    return runMach(['bootstrap', '--application-choice', 'browser'], engineDir, { inherit: true });
-}
 /**
  * Runs mach bootstrap while preserving stdin and capturing the emitted output.
  * @param engineDir - Path to the engine directory
@@ -193,6 +185,20 @@ function surfaceMachErrorHints(result) {
  * the same crash family the same number of times.
  */
 const DEFAULT_BUILD_CRASH_RETRIES = 2;
+/**
+ * Names the known mozsystemmonitor teardown traceback when a BUILD carried
+ * it. The test path collapses this signature in the echo; a build cannot
+ * (see `mach-known-noise-filter.ts`), so it reached operators as an
+ * unexplained traceback in a build log — a recognized, documented upstream
+ * defect wearing the appearance of a new one. The output is left verbatim
+ * and this one line is added beside it, so the same signature reads the same
+ * in both phases.
+ */
+function noteKnownTeardownNoiseInBuild(result) {
+    if (!hasKnownTeardownNoise(`${result.stdout}\n${result.stderr}`))
+        return;
+    info(KNOWN_TEARDOWN_NOISE_BUILD_NOTE);
+}
 /**
  * The single protected path every FireForge mach build dispatch routes
  * through — `build`, `build --ui`, and the pre-test `--build` step all use
@@ -222,6 +228,7 @@ export async function runProtectedMachBuild(kind, engineDir, options = {}) {
         const { env } = await installMachResourceGuard(engineDir);
         const result = await runMachInheritCapture(args, engineDir, { env });
         if (result.exitCode === 0) {
+            noteKnownTeardownNoiseInBuild(result);
             return { ...result, attempts: attempt };
         }
         const signature = detectHarnessCrashSignature(`${result.stdout}\n${result.stderr}`);
@@ -233,6 +240,7 @@ export async function runProtectedMachBuild(kind, engineDir, options = {}) {
             continue;
         }
         surfaceMachErrorHints(result);
+        noteKnownTeardownNoiseInBuild(result);
         return { ...result, attempts: attempt, ...(signature ? { crashSignature: signature } : {}) };
     }
 }
@@ -335,20 +343,10 @@ export async function runMachSmoke(args, engineDir, options) {
         ...(options.mirror ? { mirror: options.mirror } : {}),
     });
 }
-/**
- * Creates a distribution package.
- * @param engineDir - Path to the engine directory
- * @returns Exit code
- */
-export async function machPackage(engineDir) {
-    return runMach(['package'], engineDir, { inherit: true });
-}
 /**
  * Creates a distribution package while streaming output to the terminal
- * and capturing the stderr tail for post-run diagnostics. Callers that
- * want to consult {@link explainMachError} on failure should use this
- * variant; the inherit-only `machPackage` above remains for callers that
- * just need an exit code.
+ * and capturing the stderr tail for post-run diagnostics, so callers can
+ * consult {@link explainMachError} on failure.
  *
  * @param engineDir - Path to the engine directory
  * @returns Captured mach result (stdout tail, stderr tail, exit code)
@@ -356,14 +354,6 @@ export async function machPackage(engineDir) {
 export async function machPackageCapture(engineDir) {
     return runMachCapture(['package'], engineDir);
 }
-/**
- * Runs mach watch for auto-rebuilding.
- * @param engineDir - Path to the engine directory
- * @returns Exit code
- */
-export async function watch(engineDir) {
-    return runMach(['watch'], engineDir, { inherit: true });
-}
 /**
  * Runs mach watch while preserving stdin and capturing emitted output.
  *
@@ -381,16 +371,6 @@ export async function watch(engineDir) {
 export async function watchWithOutput(engineDir, options = {}) {
     return runMachInheritCapture(['watch'], engineDir, options.env ? { env: options.env } : {});
 }
-/**
- * Runs mach test with the given test paths.
- * @param engineDir - Path to the engine directory
- * @param testPaths - Test file or directory paths (relative to engine)
- * @param args - Additional arguments to pass to mach test
- * @returns Exit code
- */
-export async function test(engineDir, testPaths = [], args = []) {
-    return runMach(['test', ...testPaths, ...args], engineDir, { inherit: true });
-}
 /**
  * Environment markers mozbuild reads to decide it is running under a coding
  * agent (`mozbuild.util.is_running_under_coding_agent`), which quiets
@@ -417,52 +397,20 @@ function testVerbosityEnvUnset(fullOutput) {
     return fullOutput === true ? CODING_AGENT_ENV_MARKERS : undefined;
 }
 /**
- * Runs mach test while capturing streamed output for better diagnostics.
+ * Runs one mach test command (`mach test` / `mach xpcshell-test` / `mach
+ * mochitest`) while capturing streamed output for better diagnostics. The
+ * three commands share every other detail of the dispatch — resource guard,
+ * verbosity env, teardown-noise annotation — so they share one entry point
+ * keyed by `kind` rather than three copies that drift.
  *
- * @param engineDir - Absolute path to the engine checkout
- * @param testPaths - Test paths to pass to `mach test`; empty runs the default set
- * @param args - Extra `mach test` arguments appended after the paths
- * @param env - Optional extra environment variables for the mach process
- *   (merged over `process.env` by the exec layer). Used by
- *   `fireforge test --perf-samples` to publish the artifact-path contract.
- */
-export async function testWithOutput(engineDir, testPaths = [], args = [], env, fullOutput) {
-    const guard = await installMachResourceGuard(engineDir);
-    const envUnset = testVerbosityEnvUnset(fullOutput);
-    return runMachCapture(['test', ...testPaths, ...args], engineDir, {
-        env: { ...guard.env, ...env },
-        ...(envUnset ? { envUnset } : {}),
-        annotateKnownTeardownNoise: true,
-    });
-}
-/**
- * Runs `mach xpcshell-test` (the suite-specific xpcshell command) while
- * capturing output. Unlike the generic `mach test`, the suite-specific
- * commands degrade a broken mozlog resource monitor to a warning instead of
- * crashing at startup, so `fireforge test` dispatches single-suite runs here
- * to stay resilient to the host psutil failure.
- *
- * Signature mirrors {@link testWithOutput} so the two are interchangeable in
- * the dispatch path.
- */
-export async function xpcshellTestWithOutput(engineDir, testPaths = [], args = [], env, fullOutput) {
-    const guard = await installMachResourceGuard(engineDir);
-    const envUnset = testVerbosityEnvUnset(fullOutput);
-    return runMachCapture(['xpcshell-test', ...testPaths, ...args], engineDir, {
-        env: { ...guard.env, ...env },
-        ...(envUnset ? { envUnset } : {}),
-        annotateKnownTeardownNoise: true,
-    });
-}
-/**
- * Runs `mach mochitest` (covers browser-chrome / mochitest flavors) while
- * capturing output. The suite-specific counterpart to {@link testWithOutput}
- * for non-xpcshell single-suite runs — see {@link xpcshellTestWithOutput}.
+ * @param kind - Which mach command to run
+ * @param options - Engine checkout, test paths, extra args, env, verbosity
  */
-export async function mochitestWithOutput(engineDir, testPaths = [], args = [], env, fullOutput) {
+export async function runMachTestSuite(kind, options) {
+    const { engineDir, testPaths = [], args = [], env, fullOutput } = options;
     const guard = await installMachResourceGuard(engineDir);
     const envUnset = testVerbosityEnvUnset(fullOutput);
-    return runMachCapture(['mochitest', ...testPaths, ...args], engineDir, {
+    return runMachCapture([kind, ...testPaths, ...args], engineDir, {
         env: { ...guard.env, ...env },
         ...(envUnset ? { envUnset } : {}),
         annotateKnownTeardownNoise: true,

package/dist/src/core/marionette-port.d.ts

@@ -147,20 +147,3 @@ export declare function hasExplicitXpcshellFlavor(machArgs: string[]): boolean;
  * Marionette-driven browser).
  */
 export declare function shouldAutoForwardMarionettePortToMach(machArgs: string[]): boolean;
-/**
- * Heuristic: do the test paths or forwarded mach args indicate a flavour
- * that actually launches a Marionette-driven browser? Browser-chrome and
- * mochitest do; xpcshell does not. A no-paths invocation (the default "run
- * all tests" shape) is treated as marionette-relevant since it includes
- * browser-chrome.
- *
- * Note: `fireforge test` auto-forward of `--marionette-port` to mach uses
- * {@link shouldAutoForwardMarionettePortToMach} (mach-arg flavor gate) rather
- * than this function alone, so toolkit paths without `/mochitest/` still get
- * the listener pref and harness `--marionette=127.0.0.1:<n>` when appropriate.
- *
- * @param testPaths - Engine-relative paths after `stripEnginePrefix`.
- * @param machArgs - Forwarded mach args (post-`--mach-arg`).
- * @returns `true` when the run is likely to bind a Marionette listener.
- */
-export declare function isMarionetteFlavor(testPaths: string[], machArgs: string[]): boolean;