From de7f081799d1788d6403cbc01579c4651bb2be14 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 7 Apr 2026 15:52:37 -1000
Subject: [PATCH 1/3] [emontx] Fix uart package name in tests (#15546)

---
 tests/components/emontx/test.esp32-idf.yaml   | 2 +-
 tests/components/emontx/test.esp8266-ard.yaml | 2 +-
 tests/components/emontx/test.rp2040-ard.yaml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/components/emontx/test.esp32-idf.yaml b/tests/components/emontx/test.esp32-idf.yaml
index 3a3747f3a5..a0784fcd53 100644
--- a/tests/components/emontx/test.esp32-idf.yaml
+++ b/tests/components/emontx/test.esp32-idf.yaml
@@ -1,4 +1,4 @@
 packages:
-  uart: !include ../../test_build_components/common/uart_115200/esp32-idf.yaml
+  uart_115200: !include ../../test_build_components/common/uart_115200/esp32-idf.yaml
 
 <<: !include common.yaml
diff --git a/tests/components/emontx/test.esp8266-ard.yaml b/tests/components/emontx/test.esp8266-ard.yaml
index 31c5731589..80a2cb2fc0 100644
--- a/tests/components/emontx/test.esp8266-ard.yaml
+++ b/tests/components/emontx/test.esp8266-ard.yaml
@@ -1,4 +1,4 @@
 packages:
-  uart: !include ../../test_build_components/common/uart_115200/esp8266-ard.yaml
+  uart_115200: !include ../../test_build_components/common/uart_115200/esp8266-ard.yaml
 
 <<: !include common.yaml
diff --git a/tests/components/emontx/test.rp2040-ard.yaml b/tests/components/emontx/test.rp2040-ard.yaml
index ff55e8263d..410c579d4b 100644
--- a/tests/components/emontx/test.rp2040-ard.yaml
+++ b/tests/components/emontx/test.rp2040-ard.yaml
@@ -1,4 +1,4 @@
 packages:
-  uart: !include ../../test_build_components/common/uart_115200/rp2040-ard.yaml
+  uart_115200: !include ../../test_build_components/common/uart_115200/rp2040-ard.yaml
 
 <<: !include common.yaml

From c7513b926219bc668e935829371559c182c9cb5e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 7 Apr 2026 16:01:18 -1000
Subject: [PATCH 2/3] [ci] Add lint check for test package key matching bus
 directory (#15547)

---
 script/ci-custom.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/script/ci-custom.py b/script/ci-custom.py
index ad39f92005..1ec3eab3a9 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -1006,6 +1006,38 @@ def lint_log_in_header(fname, line, col, content):
     )
 
 
+PACKAGE_BUS_RE = re.compile(
+    r"^\s+(\w+):\s*!include\s+\S*test_build_components/common/(\w+)/",
+    re.MULTILINE,
+)
+
+
+@lint_content_check(include=["tests/components/*/test.*.yaml"])
+def lint_test_package_key_matches_bus(fname, content):
+    """Ensure package keys match the common bus directory name.
+
+    For example, a package using uart_115200 includes must use
+    'uart_115200' as the key, not 'uart'.
+    """
+    errs: list[tuple[int, int, str]] = []
+    for match in PACKAGE_BUS_RE.finditer(content):
+        pkg_key = match.group(1)
+        bus_dir = match.group(2)
+        if pkg_key != bus_dir:
+            lineno = content.count("\n", 0, match.start()) + 1
+            errs.append(
+                (
+                    lineno,
+                    1,
+                    f"Package key {highlight(pkg_key)} does not match bus directory "
+                    f"{highlight(bus_dir)}. The package key must match the directory "
+                    f"name under tests/test_build_components/common/. "
+                    f"Change {highlight(pkg_key)} to {highlight(bus_dir)}.",
+                )
+            )
+    return errs
+
+
 @lint_content_find_check(
     "FINAL_VALIDATE_SCHEMA",
     include=["esphome/core/*.py"],

From 8ffe0f5e31d9816eea26046e05f7b7b3b05a4748 Mon Sep 17 00:00:00 2001
From: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
Date: Tue, 7 Apr 2026 22:02:36 -0400
Subject: [PATCH 3/3] [core] Fix ANSI codes for secret text hiding (#15521)

---
 esphome/__main__.py | 2 +-
 esphome/core/log.h  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index a696cceffb..25b404ae45 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -1083,7 +1083,7 @@ def command_config(args: ArgsProtocol, config: ConfigType) -> int | None:
     # add the console decoration so the front-end can hide the secrets
     if not args.show_secrets:
         output = re.sub(
-            r"(password|key|psk|ssid)\: (.+)", r"\1: \\033[5m\2\\033[6m", output
+            r"(password|key|psk|ssid)\: (.+)", r"\1: \\033[8m\2\\033[28m", output
         )
     if not CORE.quiet:
         safe_print(output)
diff --git a/esphome/core/log.h b/esphome/core/log.h
index ff39633142..72e06cabac 100644
--- a/esphome/core/log.h
+++ b/esphome/core/log.h
@@ -54,8 +54,8 @@ namespace esphome {
 #define ESPHOME_LOG_COLOR_CYAN "36"     // DEBUG
 #define ESPHOME_LOG_COLOR_GRAY "37"     // VERBOSE
 #define ESPHOME_LOG_COLOR_WHITE "38"
-#define ESPHOME_LOG_SECRET_BEGIN "\033[5m"
-#define ESPHOME_LOG_SECRET_END "\033[6m"
+#define ESPHOME_LOG_SECRET_BEGIN "\033[8m"
+#define ESPHOME_LOG_SECRET_END "\033[28m"
 #define LOG_SECRET(x) ESPHOME_LOG_SECRET_BEGIN x ESPHOME_LOG_SECRET_END
 
 #define ESPHOME_LOG_COLOR(COLOR) "\033[0;" COLOR "m"