Merge branch 'esp8266-native-ninja-emission' into esp8266-arduino-toolchain

# Conflicts:
#	tests/unit_tests/test_main.py

tests/unit_tests/test_config_validation.py

@@ -3191,7 +3191,7 @@ def test_check_supported_toolchain_unresolved_is_an_ordering_bug() -> None:
 
     CORE.toolchain = None
     with pytest.raises(Invalid, match="not resolved before RP2 validation"):
-        cv.check_supported_toolchain("RP2", (Toolchain.PLATFORMIO,))
+        cv._check_supported_toolchain("RP2", (Toolchain.PLATFORMIO,))
 
 
 @pytest.mark.parametrize(

tests/unit_tests/test_main.py

@@ -7429,3 +7429,27 @@ def test_compile_program_unclaimed_native_toolchain_raises(
     CORE.toolchain = Toolchain.ARDUINO  # esp32 has no arduino-native backend
     with pytest.raises(EsphomeError, match="no platform backend claimed"):
         compile_program(MockArgs(), {})
+
+
+def test_cli_toolchain_still_refreshes_the_validated_config_cache(
+    tmp_path: Path,
+) -> None:
+    """An explicit --toolchain gates only the cache read; the freshly
+    validated config is still saved, and its sidecar records the resolved
+    toolchain for a later plain run."""
+    from esphome.__main__ import run_esphome
+
+    conf = tmp_path / "device.yaml"
+    conf.write_text("esphome:\n  name: t\n")
+    argv = ["esphome", "--toolchain", "platformio", "logs", str(conf)]
+    with (
+        patch("esphome.compiled_config.load_compiled_config") as mock_load,
+        patch("esphome.config.read_config", return_value={CONF_ESPHOME: {}}),
+        patch("esphome.compiled_config.save_compiled_config_and_sidecar") as mock_save,
+        patch.dict(
+            "esphome.__main__.POST_CONFIG_ACTIONS", {"logs": Mock(return_value=0)}
+        ),
+    ):
+        assert run_esphome(argv) == 0
+    mock_load.assert_not_called()
+    mock_save.assert_called_once()