fix(form-add): идемпотентная регистрация <Form>/<Template> в ChildObjects

form-add и template-add вставляли запись в ChildObjects безусловно.
Если форма/макет уже зарегистрированы (например, form-compile
регистрирует <Form>, не создавая файл метаданных, а затем вызывается
form-add) — возникал дубль <Form>/<Template>, ломавший валидацию.

Приведено к идемпотентной модели, уже применённой в form-compile и
meta-compile: перед вставкой ищем существующую запись по имени; при
наличии — пропускаем и печатаем "Already registered ... (skipped
duplicate)". Зеркально в ps1 и py, регрессионный тест-кейс.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.claude/skills/form-add/scripts/form-add.ps1

@@ -1,4 +1,4 @@
-# form-add v1.10 — Add managed form to 1C config object
+# form-add v1.11 — Add managed form to 1C config object
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 param(
 	[Parameter(Mandatory)]
@@ -484,7 +484,10 @@ if (-not $childObjects) {
 	exit 1
 }
 
-# Добавить <Form>$FormName</Form>
+# Добавить <Form>$FormName</Form> — идемпотентно (не дублировать уже зарегистрированную)
+$alreadyRegistered = [bool]$childObjects.SelectSingleNode("md:Form[text()='$FormName']", $nsMgr)
+
+if (-not $alreadyRegistered) {
 $formElem = $xmlDoc.CreateElement("Form", "http://v8.1c.ru/8.3/MDClasses")
 $formElem.InnerText = $FormName
 
@@ -538,6 +541,7 @@ if ($insertBefore) {
 		}
 	}
 }
+}
 
 # --- SetDefault ---
 
@@ -603,7 +607,11 @@ Write-Host "  Metadata: $objDirName\$objBaseName\Forms\$FormName.xml"
 Write-Host "  Form:     $objDirName\$objBaseName\Forms\$FormName\Ext\Form.xml"
 Write-Host "  Module:   $objDirName\$objBaseName\Forms\$FormName\Ext\Form\Module.bsl"
 Write-Host ""
-Write-Host "Registered: <Form>$FormName</Form> in ChildObjects"
+if ($alreadyRegistered) {
+	Write-Host "Already registered: <Form>$FormName</Form> in ChildObjects (skipped duplicate)"
+} else {
+	Write-Host "Registered: <Form>$FormName</Form> in ChildObjects"
+}
 if ($defaultUpdated) {
 	Write-Host "${defaultPropName}: $defaultValue"
 }

.claude/skills/form-add/scripts/form-add.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# form-add v1.10 — Add managed form to 1C config object
+# form-add v1.11 — Add managed form to 1C config object
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 
 import argparse
@@ -592,47 +592,50 @@ def main():
         print(f"Не найден элемент ChildObjects в {object_path}", file=sys.stderr)
         sys.exit(1)
 
-    # Add <Form>$FormName</Form>
-    form_elem = etree.Element(f"{{{ns}}}Form")
-    form_elem.text = form_name
+    # Add <Form>$FormName</Form> — idempotent (do not duplicate already-registered form)
+    already_registered = child_objects.find(f"md:Form[.='{form_name}']", NSMAP) is not None
 
-    # Find first <Template> to insert before it
-    first_template = child_objects.find("md:Template", NSMAP)
-    # Find first <TabularSection> to insert before it (if no Template)
-    first_tabular = child_objects.find("md:TabularSection", NSMAP)
+    if not already_registered:
+        form_elem = etree.Element(f"{{{ns}}}Form")
+        form_elem.text = form_name
 
-    # Determine insertion point: before Template, before TabularSection, or at end
-    insert_before = None
-    if first_template is not None:
-        insert_before = first_template
-    elif first_tabular is not None:
-        insert_before = first_tabular
+        # Find first <Template> to insert before it
+        first_template = child_objects.find("md:Template", NSMAP)
+        # Find first <TabularSection> to insert before it (if no Template)
+        first_tabular = child_objects.find("md:TabularSection", NSMAP)
 
-    if insert_before is not None:
-        # Insert before the found element
-        idx = list(child_objects).index(insert_before)
-        child_objects.insert(idx, form_elem)
-        # Whitespace: form_elem gets "\n\t\t\t" as tail (indent before insert_before)
-        form_elem.tail = "\n\t\t\t"
-    else:
-        # Add to end of ChildObjects
-        children = list(child_objects)
-        if len(children) == 0 and (child_objects.text is None or child_objects.text.strip() == ""):
-            # Empty ChildObjects (self-closing)
-            child_objects.text = "\n\t\t\t"
-            child_objects.append(form_elem)
-            form_elem.tail = "\n\t\t"
+        # Determine insertion point: before Template, before TabularSection, or at end
+        insert_before = None
+        if first_template is not None:
+            insert_before = first_template
+        elif first_tabular is not None:
+            insert_before = first_tabular
+
+        if insert_before is not None:
+            # Insert before the found element
+            idx = list(child_objects).index(insert_before)
+            child_objects.insert(idx, form_elem)
+            # Whitespace: form_elem gets "\n\t\t\t" as tail (indent before insert_before)
+            form_elem.tail = "\n\t\t\t"
         else:
-            if len(children) > 0:
-                last_child = children[-1]
-                old_tail = last_child.tail
-                last_child.tail = "\n\t\t\t"
-                child_objects.append(form_elem)
-                form_elem.tail = old_tail if old_tail else "\n\t\t"
-            else:
-                child_objects.text = (child_objects.text or "") + "\n\t\t\t"
+            # Add to end of ChildObjects
+            children = list(child_objects)
+            if len(children) == 0 and (child_objects.text is None or child_objects.text.strip() == ""):
+                # Empty ChildObjects (self-closing)
+                child_objects.text = "\n\t\t\t"
                 child_objects.append(form_elem)
                 form_elem.tail = "\n\t\t"
+            else:
+                if len(children) > 0:
+                    last_child = children[-1]
+                    old_tail = last_child.tail
+                    last_child.tail = "\n\t\t\t"
+                    child_objects.append(form_elem)
+                    form_elem.tail = old_tail if old_tail else "\n\t\t"
+                else:
+                    child_objects.text = (child_objects.text or "") + "\n\t\t\t"
+                    child_objects.append(form_elem)
+                    form_elem.tail = "\n\t\t"
 
     # --- SetDefault ---
 
@@ -677,7 +680,10 @@ def main():
     print(f"  Form:     {obj_dir_name}\\{obj_base_name}\\Forms\\{form_name}\\Ext\\Form.xml")
     print(f"  Module:   {obj_dir_name}\\{obj_base_name}\\Forms\\{form_name}\\Ext\\Form\\Module.bsl")
     print()
-    print(f"Registered: <Form>{form_name}</Form> in ChildObjects")
+    if already_registered:
+        print(f"Already registered: <Form>{form_name}</Form> in ChildObjects (skipped duplicate)")
+    else:
+        print(f"Registered: <Form>{form_name}</Form> in ChildObjects")
     if default_updated:
         print(f"{default_prop_name}: {default_value}")
     print()

.claude/skills/template-add/scripts/add-template.ps1

@@ -1,4 +1,4 @@
-# template-add v1.9 — Add template to 1C object
+# template-add v1.10 — Add template to 1C object
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 param(
 	[Parameter(Mandatory)]
@@ -329,7 +329,10 @@ if (-not $childObjects) {
 	exit 1
 }
 
-# Добавить <Template> в конец ChildObjects
+# Добавить <Template> в конец ChildObjects — идемпотентно (не дублировать уже зарегистрированный)
+$alreadyRegistered = [bool]$childObjects.SelectSingleNode("md:Template[text()='$TemplateName']", $nsMgr)
+
+if (-not $alreadyRegistered) {
 $templateElem = $xmlDoc.CreateElement("Template", "http://v8.1c.ru/8.3/MDClasses")
 $templateElem.InnerText = $TemplateName
 
@@ -349,6 +352,7 @@ if ($childObjects.ChildNodes.Count -eq 0) {
 		$childObjects.AppendChild($xmlDoc.CreateWhitespace("`n`t`t")) | Out-Null
 	}
 }
+}
 
 # --- 4. MainDataCompositionSchema (для ExternalReport / Report) ---
 
@@ -392,6 +396,9 @@ $writer.Close()
 $stream.Close()
 
 Write-Host "[OK] Создан макет: $TemplateName ($TemplateType)"
+if ($alreadyRegistered) {
+	Write-Host "     Already registered: <Template>$TemplateName</Template> in ChildObjects (skipped duplicate)"
+}
 Write-Host "     Метаданные: $templateMetaPath"
 Write-Host "     Содержимое: $templateFilePath"
 if ($mainDCSUpdated) {

.claude/skills/template-add/scripts/add-template.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# add-template v1.9 — Add template to 1C object
+# add-template v1.10 — Add template to 1C object
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 
 import argparse
@@ -446,31 +446,34 @@ def main():
         print(f"Не найден элемент ChildObjects в {root_xml_path}", file=sys.stderr)
         sys.exit(1)
 
-    # Add <Template> to end of ChildObjects
-    template_elem = etree.SubElement(child_objects, f"{{{ns}}}Template")
-    template_elem.text = template_name
-    # Remove auto-appended element to reinsert with proper whitespace
-    child_objects.remove(template_elem)
+    # Add <Template> to end of ChildObjects — idempotent (do not duplicate already-registered template)
+    already_registered = child_objects.find(f"md:Template[.='{template_name}']", NSMAP) is not None
 
-    children = list(child_objects)
-    if len(children) == 0 and (child_objects.text is None or child_objects.text.strip() == ""):
-        # Empty ChildObjects (self-closing)
-        child_objects.text = "\n\t\t\t"
-        child_objects.append(template_elem)
-        template_elem.tail = "\n\t\t"
-    else:
-        if len(children) > 0:
-            last_child = children[-1]
-            # last_child.tail is the trailing whitespace before </ChildObjects>
-            old_tail = last_child.tail
-            last_child.tail = "\n\t\t\t"
-            child_objects.append(template_elem)
-            template_elem.tail = old_tail if old_tail else "\n\t\t"
-        else:
-            # Has text content but no element children
-            child_objects.text = (child_objects.text or "") + "\n\t\t\t"
+    if not already_registered:
+        template_elem = etree.SubElement(child_objects, f"{{{ns}}}Template")
+        template_elem.text = template_name
+        # Remove auto-appended element to reinsert with proper whitespace
+        child_objects.remove(template_elem)
+
+        children = list(child_objects)
+        if len(children) == 0 and (child_objects.text is None or child_objects.text.strip() == ""):
+            # Empty ChildObjects (self-closing)
+            child_objects.text = "\n\t\t\t"
             child_objects.append(template_elem)
             template_elem.tail = "\n\t\t"
+        else:
+            if len(children) > 0:
+                last_child = children[-1]
+                # last_child.tail is the trailing whitespace before </ChildObjects>
+                old_tail = last_child.tail
+                last_child.tail = "\n\t\t\t"
+                child_objects.append(template_elem)
+                template_elem.tail = old_tail if old_tail else "\n\t\t"
+            else:
+                # Has text content but no element children
+                child_objects.text = (child_objects.text or "") + "\n\t\t\t"
+                child_objects.append(template_elem)
+                template_elem.tail = "\n\t\t"
 
     # --- 4. MainDataCompositionSchema (for ExternalReport / Report) ---
 
@@ -500,6 +503,8 @@ def main():
     save_xml_with_bom(tree, root_xml_full)
 
     print(f"[OK] Создан макет: {template_name} ({template_type})")
+    if already_registered:
+        print(f"     Already registered: <Template>{template_name}</Template> in ChildObjects (skipped duplicate)")
     print(f"     Метаданные: {template_meta_path}")
     print(f"     Содержимое: {template_file_path}")
     if main_dcs_updated:

tests/skills/cases/form-add/epf-compile-then-add.json

@@ -0,0 +1,21 @@
+{
+  "name": "form-compile затем form-add не дублирует регистрацию формы в ChildObjects",
+  "setup": "none",
+  "preRun": [
+    {
+      "script": "epf-init/scripts/init",
+      "args": { "-Name": "КонсольКода", "-SrcDir": "{workDir}" }
+    },
+    {
+      "script": "form-compile/scripts/form-compile",
+      "input": {
+        "title": "Форма",
+        "attributes": [{ "name": "Объект", "type": "ExternalDataProcessorObject.КонсольКода", "main": true }]
+      },
+      "args": { "-JsonPath": "{inputFile}", "-OutputPath": "{workDir}/КонсольКода/Forms/Форма/Ext/Form.xml" }
+    }
+  ],
+  "params": { "objectPath": "КонсольКода.xml", "formName": "Форма" },
+  "expect": { "stdoutContains": "Already registered" },
+  "validatePath": "КонсольКода/Forms/Форма"
+}

tests/skills/cases/form-add/snapshots/epf-compile-then-add/КонсольКода.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.17">
+	<ExternalDataProcessor uuid="UUID-001">
+		<InternalInfo>
+			<xr:ContainedObject>
+				<xr:ClassId>UUID-002</xr:ClassId>
+				<xr:ObjectId>UUID-003</xr:ObjectId>
+			</xr:ContainedObject>
+			<xr:GeneratedType name="ExternalDataProcessorObject.КонсольКода" category="Object">
+				<xr:TypeId>UUID-004</xr:TypeId>
+				<xr:ValueId>UUID-005</xr:ValueId>
+			</xr:GeneratedType>
+		</InternalInfo>
+		<Properties>
+			<Name>КонсольКода</Name>
+			<Synonym>
+				<v8:item>
+					<v8:lang>ru</v8:lang>
+					<v8:content>КонсольКода</v8:content>
+				</v8:item>
+			</Synonym>
+			<Comment />
+			<DefaultForm>ExternalDataProcessor.КонсольКода.Form.Форма</DefaultForm>
+			<AuxiliaryForm />
+		</Properties>
+		<ChildObjects>
+			<Form>Форма</Form>
+		</ChildObjects>
+	</ExternalDataProcessor>
+</MetaDataObject>

tests/skills/cases/form-add/snapshots/epf-compile-then-add/КонсольКода/Ext/ObjectModule.bsl

@@ -0,0 +1,11 @@
+#Область ОписаниеПеременных
+
+#КонецОбласти
+
+#Область ПрограммныйИнтерфейс
+
+#КонецОбласти
+
+#Область СлужебныеПроцедурыИФункции
+
+#КонецОбласти

tests/skills/cases/form-add/snapshots/epf-compile-then-add/КонсольКода/Forms/Форма.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.17">
+	<Form uuid="UUID-001">
+		<Properties>
+			<Name>Форма</Name>
+			<Synonym>
+				<v8:item>
+					<v8:lang>ru</v8:lang>
+					<v8:content>Форма</v8:content>
+				</v8:item>
+			</Synonym>
+			<Comment/>
+			<FormType>Managed</FormType>
+			<IncludeHelpInContents>false</IncludeHelpInContents>
+			<UsePurposes>
+				<v8:Value xsi:type="app:ApplicationUsePurpose">PlatformApplication</v8:Value>
+				<v8:Value xsi:type="app:ApplicationUsePurpose">MobilePlatformApplication</v8:Value>
+			</UsePurposes>
+			<ExtendedPresentation/>
+		</Properties>
+	</Form>
+</MetaDataObject>

tests/skills/cases/form-add/snapshots/epf-compile-then-add/КонсольКода/Forms/Форма/Ext/Form.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Form xmlns="http://v8.1c.ru/8.3/xcf/logform" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcssch="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.17">
+	<Title>
+		<v8:item>
+			<v8:lang>ru</v8:lang>
+			<v8:content>Форма</v8:content>
+		</v8:item>
+	</Title>
+	<AutoTitle>false</AutoTitle>
+	<AutoCommandBar name="ФормаКоманднаяПанель" id="-1"/>
+	<Attributes>
+		<Attribute name="Объект" id="1">
+			<Type>
+				<v8:Type>cfg:ExternalDataProcessorObject.КонсольКода</v8:Type>
+			</Type>
+			<MainAttribute>true</MainAttribute>
+		</Attribute>
+	</Attributes>
+</Form>

tests/skills/cases/form-add/snapshots/epf-compile-then-add/КонсольКода/Forms/Форма/Ext/Form/Module.bsl

@@ -0,0 +1,19 @@
+#Область ОбработчикиСобытийФормы
+
+#КонецОбласти
+
+#Область ОбработчикиСобытийЭлементовФормы
+
+#КонецОбласти
+
+#Область ОбработчикиКомандФормы
+
+#КонецОбласти
+
+#Область ОбработчикиОповещений
+
+#КонецОбласти
+
+#Область СлужебныеПроцедурыИФункции
+
+#КонецОбласти