From d5be76d7e604efe51d17871e23b95a8b6849a578 Mon Sep 17 00:00:00 2001
From: AlCalzone <dominic.griesel@nabucasa.com>
Date: Tue, 13 Jan 2026 10:39:49 +0100
Subject: [PATCH] Make integration scaffolding a bit more newbie-friendly
 (#160837)

---
 script/scaffold/gather_info.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/script/scaffold/gather_info.py b/script/scaffold/gather_info.py
index d90e01c3ebd..c9264aa660f 100644
--- a/script/scaffold/gather_info.py
+++ b/script/scaffold/gather_info.py
@@ -24,7 +24,12 @@ def gather_info(arguments) -> Info:
         info = _gather_info(
             {
                 "domain": {
-                    "prompt": "What is the domain?",
+                    "prompt": (
+                        """What is the domain?
+
+Hint: The domain is a short name consisting of characters and underscores.
+This domain has to be unique, cannot be changed, and has to match the directory name of the integration."""
+                    ),
                     "validators": [
                         CHECK_EMPTY,
                         [
@@ -72,13 +77,8 @@ def gather_new_integration(determine_auth: bool) -> Info:
         },
         "codeowner": {
             "prompt": "What is your GitHub handle?",
-            "validators": [
-                CHECK_EMPTY,
-                [
-                    'GitHub handles need to start with an "@"',
-                    lambda value: value.startswith("@"),
-                ],
-            ],
+            "validators": [CHECK_EMPTY],
+            "converter": lambda value: value if value.startswith("@") else f"@{value}",
         },
         "requirement": {
             "prompt": "What PyPI package and version do you depend on? Leave blank for none.",