Merge branch 'dev' into feature/web-test-runner

.claude/skills/form-compile/SKILL.md

@@ -62,8 +62,10 @@ powershell.exe -NoProfile -File .claude/skills/form-compile/scripts/form-compile
 | DSL ключ     | XML элемент       | Значение ключа                                    |
 |--------------|-------------------|---------------------------------------------------|
 | `"group"`    | UsualGroup        | `"horizontal"` / `"vertical"` / `"alwaysHorizontal"` / `"alwaysVertical"` / `"collapsible"` |
+| `"columnGroup"` | ColumnGroup    | `"horizontal"` / `"vertical"` / `"inCell"` — только внутри `columns` таблицы |
 | `"input"`    | InputField        | имя элемента                                      |
 | `"check"`    | CheckBoxField     | имя                                               |
+| `"radio"`    | RadioButtonField  | имя                                               |
 | `"label"`    | LabelDecoration   | имя (текст задаётся через `title`)                |
 | `"labelField"` | LabelField      | имя                                               |
 | `"table"`    | Table             | имя                                               |
@@ -97,7 +99,7 @@ powershell.exe -NoProfile -File .claude/skills/form-compile/scripts/form-compile
 
 **input / picField**: `OnChange`, `StartChoice`, `ChoiceProcessing`, `AutoComplete`, `TextEditEnd`, `Clearing`, `Creating`, `EditTextChange`
 
-**check**: `OnChange`
+**check / radio**: `OnChange`
 
 **table**: `OnStartEdit`, `OnEditEnd`, `OnChange`, `Selection`, `ValueChoice`, `BeforeAddRow`, `BeforeDeleteRow`, `AfterDeleteRow`, `BeforeRowChange`, `BeforeEditEnd`, `OnActivateRow`, `OnActivateCell`, `Drag`, `DragStart`, `DragCheck`, `DragEnd`
 
@@ -125,7 +127,8 @@ powershell.exe -NoProfile -File .claude/skills/form-compile/scripts/form-compile
 | `skipOnInput: true` | Пропускать при обходе Tab | |
 | `inputHint` | Подсказка в пустом поле | `"Введите наименование..."` |
 | `width` / `height` | Размер | числа |
-| `autoMaxWidth: false` | Отключить авто-ширину | для фиксированных полей |
+| `autoMaxWidth: false` | Снять авто-ограничение ширины (поле растянется) | |
+| `maxWidth` / `maxHeight` | Жёсткое ограничение размера | числа; обычно вместе с `autoMaxWidth: false` |
 | `horizontalStretch: true` | Растягивать по ширине | |
 
 ### Чекбокс (check)
@@ -135,6 +138,37 @@ powershell.exe -NoProfile -File .claude/skills/form-compile/scripts/form-compile
 | `path` | DataPath |
 | `titleLocation` | Размещение заголовка |
 
+### Поле переключателя (radio)
+
+Радиокнопки или тумблер для выбора одного значения из списка.
+
+| Ключ | Описание | Пример |
+|------|----------|--------|
+| `path` | DataPath — привязка к реквизиту | `"СпособКурса"` |
+| `radioButtonType` | Вид переключателя | `"Auto"` (по умолчанию), `"RadioButtons"`, `"Tumbler"` |
+| `columnsCount` | Число колонок раскладки | `1`, `2`, ... |
+| `titleLocation` | Размещение заголовка | по умолчанию `"none"` |
+| `choiceList` | Список вариантов: массив `{value, presentation}` | см. ниже |
+
+`choiceList[*]`:
+
+| Ключ | Описание |
+|------|----------|
+| `value` | Значение варианта. Строка/число/булево; для перечисления — `"Enum.ИмяТипа.EnumValue.ИмяЗначения"` |
+| `presentation` | Текст рядом с переключателем. Строка (русский) либо объект `{ru, en, ...}` для мультиязычности |
+
+```json
+{
+  "radio": "СпособКурса",
+  "path": "Объект.СпособУстановкиКурса",
+  "radioButtonType": "Auto",
+  "choiceList": [
+    { "value": "Enum.СпособыКурса.EnumValue.Авто",   "presentation": { "ru": "Автоматически", "en": "Automatic" } },
+    { "value": "Enum.СпособыКурса.EnumValue.Ручной", "presentation": "вручную" }
+  ]
+}
+```
+
 ### Надпись-декорация (label)
 
 | Ключ | Описание |
@@ -150,7 +184,8 @@ powershell.exe -NoProfile -File .claude/skills/form-compile/scripts/form-compile
 | Ключ | Описание |
 |------|----------|
 | `showTitle: true` | Показывать заголовок группы |
-| `united: false` | Не объединять рамку |
+| `united: false` | Левый край полей ввода выравнивается только в пределах этой группы (по умолчанию `true` — сквозное выравнивание по самому длинному заголовку, в т.ч. с соседними группами) |
+| `collapsed: true` | Только для `"group": "collapsible"` — группа создаётся свёрнутой |
 | `representation` | `"none"`, `"normal"`, `"weak"`, `"strong"` |
 | `children: [...]` | Вложенные элементы |
 
@@ -176,6 +211,35 @@ powershell.exe -NoProfile -File .claude/skills/form-compile/scripts/form-compile
 | `rowPictureDataPath` | Путь к картинке строки (напр. `"Список.DefaultPicture"`) |
 | `tableAutofill: false` | Управление Autofill внутреннего AutoCommandBar |
 
+Колонки можно группировать через `columnGroup` (см. ниже).
+
+### Группа колонок (columnGroup)
+
+Используется только внутри `columns` таблицы. Значение ключа задаёт ориентацию: `"horizontal"`, `"vertical"`, `"inCell"` (склеивает колонки в одну ячейку шапки). Допускается вложение `columnGroup` в `columnGroup`.
+
+| Ключ | Описание |
+|------|----------|
+| `name` | Имя элемента (рекомендуется задавать явно) |
+| `title` | Заголовок группы |
+| `showTitle: false` | Скрыть заголовок |
+| `showInHeader: true/false` | Показывать ли группу в шапке таблицы |
+| `width` | Ширина |
+| `horizontalStretch: false` | Растягивание |
+| `children: [...]` | Колонки внутри группы (`input`, `labelField`, `picField`, вложенный `columnGroup` …) |
+
+```json
+{ "table": "Список", "path": "Список", "columns": [
+    { "columnGroup": "horizontal", "name": "ГруппаДата", "title": "Срок", "children": [
+        { "input": "СрокИсполнения", "path": "Список.СрокИсполнения" },
+        { "labelField": "Просрочено", "path": "Список.Просрочено" }
+    ]},
+    { "columnGroup": "inCell", "name": "ГруппаИсполнитель", "showInHeader": true, "children": [
+        { "input": "Исполнитель", "path": "Список.Исполнитель" }
+    ]},
+    { "input": "Комментарий", "path": "Список.Комментарий" }
+]}
+```
+
 ### Страницы (pages + page)
 
 | Ключ (pages) | Описание |
@@ -196,7 +260,7 @@ powershell.exe -NoProfile -File .claude/skills/form-compile/scripts/form-compile
 | `command` | Имя команды формы → `Form.Command.Имя` |
 | `stdCommand` | Стандартная команда: `"Close"` → `Form.StandardCommand.Close`; с точкой: `"Товары.Add"` → `Form.Item.Товары.StandardCommand.Add` |
 | `defaultButton: true` | Кнопка по умолчанию |
-| `type` | `"usual"`, `"hyperlink"`, `"commandBar"` |
+| `type` | `"usual"`, `"hyperlink"`. По умолчанию `"usual"`. Конкретный XML-вид (UsualButton/Hyperlink/CommandBarButton/CommandBarHyperlink) подставляется автоматически по контексту |
 | `picture` | Картинка кнопки |
 | `representation` | `"Auto"`, `"Text"`, `"Picture"`, `"PictureAndText"` |
 | `locationInCommandBar` | `"Auto"`, `"InCommandBar"`, `"InAdditionalSubmenu"` |
@@ -227,6 +291,8 @@ powershell.exe -NoProfile -File .claude/skills/form-compile/scripts/form-compile
 ]}
 ```
 
+Кнопки основных действий формы и подменю размещают здесь, а не в отдельной группе на форме. Отдельной кнопкой в layout — только если она логически привязана к конкретному полю или группе.
+
 ### Выпадающее меню (popup)
 
 | Ключ | Описание |
@@ -369,9 +435,9 @@ powershell.exe -NoProfile -File .claude/skills/form-compile/scripts/form-compile
       { "check": "ПерваяСтрокаЗаголовок", "path": "ПерваяСтрокаЗаголовок" }
     ]},
     { "input": "Результат", "path": "Результат", "multiLine": true, "height": 8, "readOnly": true, "title": "Лог" },
-    { "group": "horizontal", "name": "ГруппаКнопок", "children": [
+    { "autoCmdBar": "ФормаКоманднаяПанель", "children": [
       { "button": "Загрузить", "command": "Загрузить", "defaultButton": true },
-      { "button": "Закрыть", "stdCommand": "Close" }
+      { "button": "Закрыть",   "stdCommand": "Close" }
     ]}
   ],
   "attributes": [

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

@@ -1,4 +1,4 @@
-# form-compile v1.15 — Compile 1C managed form from JSON or object metadata
+# form-compile v1.20 — Compile 1C managed form from JSON or object metadata
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 param(
 	[string]$JsonPath,
@@ -1774,6 +1774,7 @@ function Get-ElementName {
 $script:knownEvents = @{
 	"input"     = @("OnChange","StartChoice","ChoiceProcessing","AutoComplete","TextEditEnd","Clearing","Creating","EditTextChange")
 	"check"     = @("OnChange")
+	"radio"     = @("OnChange")
 	"label"     = @("Click","URLProcessing")
 	"labelField"= @("OnChange","StartChoice","ChoiceProcessing","Click","URLProcessing","Clearing")
 	"table"     = @("Selection","BeforeAddRow","AfterDeleteRow","BeforeDeleteRow","OnActivateRow","OnEditEnd","OnStartEdit","BeforeRowChange","BeforeEditEnd","ValueChoice","OnActivateCell","OnActivateField","Drag","DragStart","DragCheck","DragEnd","OnGetDataAtServer","BeforeLoadUserSettingsAtServer","OnUpdateUserSettingSetAtServer","OnChange")
@@ -1824,11 +1825,47 @@ function Emit-Companion {
 }
 
 function Emit-Element {
-	param($el, [string]$indent)
+	param($el, [string]$indent, [bool]$inCmdBar = $false)
 
-	# Silent synonyms: commandBar -> cmdBar, autoCommandBar -> autoCmdBar
-	# (autoCmdBar inside def.elements is normally extracted in pre-pass; this is a safety net for nested cases)
-	$synonyms = @{ "commandBar" = "cmdBar"; "autoCommandBar" = "autoCmdBar" }
+	# Silent synonyms: model often writes XML name or Russian (ПолеПереключателя/RadioButtonField → radio).
+	# Maps any synonym to canonical short DSL key.
+	$synonyms = @{
+		"commandBar"        = "cmdBar"
+		"autoCommandBar"    = "autoCmdBar"
+		"КоманднаяПанель"   = "cmdBar"
+		"InputField"        = "input"
+		"ПолеВвода"         = "input"
+		"CheckBoxField"     = "check"
+		"ПолеФлажка"        = "check"
+		"RadioButtonField"  = "radio"
+		"ПолеПереключателя" = "radio"
+		"radioButton"       = "radio"
+		"PictureField"      = "picField"
+		"ПолеКартинки"      = "picField"
+		"LabelField"        = "labelField"
+		"ПолеНадписи"       = "labelField"
+		"CalendarField"     = "calendar"
+		"ПолеКалендаря"     = "calendar"
+		"LabelDecoration"   = "label"
+		"Надпись"           = "label"
+		"PictureDecoration" = "picture"
+		"Картинка"          = "picture"
+		"UsualGroup"        = "group"
+		"Группа"            = "group"
+		"ОбычнаяГруппа"     = "group"
+		"ColumnGroup"       = "columnGroup"
+		"ГруппаКолонок"     = "columnGroup"
+		"Pages"             = "pages"
+		"ГруппаСтраниц"     = "pages"
+		"Page"              = "page"
+		"Страница"          = "page"
+		"Table"             = "table"
+		"Таблица"           = "table"
+		"Button"            = "button"
+		"Кнопка"            = "button"
+		"Popup"             = "popup"
+		"ВсплывающееМеню"   = "popup"
+	}
 	foreach ($pair in $synonyms.GetEnumerator()) {
 		if ($null -ne $el.PSObject.Properties[$pair.Key] -and $null -eq $el.PSObject.Properties[$pair.Value]) {
 			$val = $el.($pair.Key)
@@ -1841,7 +1878,7 @@ function Emit-Element {
 	$typeKey = $null
 	$xmlTag = $null
 
-	foreach ($key in @("group","input","check","label","labelField","table","pages","page","button","picture","picField","calendar","cmdBar","popup")) {
+	foreach ($key in @("columnGroup","group","input","check","radio","label","labelField","table","pages","page","button","picture","picField","calendar","cmdBar","popup")) {
 		if ($el.$key -ne $null) {
 			$typeKey = $key
 			break
@@ -1856,8 +1893,12 @@ function Emit-Element {
 	# Validate known keys — warn about typos and unknown properties
 	$knownKeys = @{
 		# type keys
-		"group"=1;"input"=1;"check"=1;"label"=1;"labelField"=1;"table"=1;"pages"=1;"page"=1
+		"group"=1;"columnGroup"=1;"input"=1;"check"=1;"radio"=1;"label"=1;"labelField"=1;"table"=1;"pages"=1;"page"=1
 		"button"=1;"picture"=1;"picField"=1;"calendar"=1;"cmdBar"=1;"popup"=1
+		# columnGroup-specific
+		"showInHeader"=1
+		# radio-specific
+		"radioButtonType"=1;"choiceList"=1;"columnsCount"=1
 		# naming & binding
 		"name"=1;"path"=1;"title"=1
 		# visibility & state
@@ -1867,13 +1908,14 @@ function Emit-Element {
 		# layout
 		"titleLocation"=1;"representation"=1;"width"=1;"height"=1
 		"horizontalStretch"=1;"verticalStretch"=1;"autoMaxWidth"=1;"autoMaxHeight"=1
+		"maxWidth"=1;"maxHeight"=1
 		# input-specific
 		"multiLine"=1;"passwordMode"=1;"choiceButton"=1;"clearButton"=1
 		"spinButton"=1;"dropListButton"=1;"markIncomplete"=1;"skipOnInput"=1;"inputHint"=1
 		# label/hyperlink
 		"hyperlink"=1
 		# group-specific
-		"showTitle"=1;"united"=1
+		"showTitle"=1;"united"=1;"collapsed"=1
 		# hierarchy
 		"children"=1;"columns"=1
 		# table-specific
@@ -1901,14 +1943,16 @@ function Emit-Element {
 
 	switch ($typeKey) {
 		"group"    { Emit-Group -el $el -name $name -id $id -indent $indent }
+		"columnGroup" { Emit-ColumnGroup -el $el -name $name -id $id -indent $indent }
 		"input"    { Emit-Input -el $el -name $name -id $id -indent $indent }
 		"check"    { Emit-Check -el $el -name $name -id $id -indent $indent }
+		"radio"    { Emit-Radio -el $el -name $name -id $id -indent $indent }
 		"label"    { Emit-Label -el $el -name $name -id $id -indent $indent }
 		"labelField" { Emit-LabelField -el $el -name $name -id $id -indent $indent }
 		"table"    { Emit-Table -el $el -name $name -id $id -indent $indent }
 		"pages"    { Emit-Pages -el $el -name $name -id $id -indent $indent }
 		"page"     { Emit-Page -el $el -name $name -id $id -indent $indent }
-		"button"   { Emit-Button -el $el -name $name -id $id -indent $indent }
+		"button"   { Emit-Button -el $el -name $name -id $id -indent $indent -inCmdBar $inCmdBar }
 		"picture"  { Emit-PictureDecoration -el $el -name $name -id $id -indent $indent }
 		"picField" { Emit-PictureField -el $el -name $name -id $id -indent $indent }
 		"calendar" { Emit-Calendar -el $el -name $name -id $id -indent $indent }
@@ -1983,6 +2027,7 @@ function Emit-Group {
 	if ($groupVal -eq "collapsible") {
 		X "$inner<Group>Vertical</Group>"
 		X "$inner<Behavior>Collapsible</Behavior>"
+		if ($el.collapsed -eq $true) { X "$inner<Collapsed>true</Collapsed>" }
 	}
 
 	# Representation
@@ -2020,6 +2065,48 @@ function Emit-Group {
 	X "$indent</UsualGroup>"
 }
 
+function Emit-ColumnGroup {
+	param($el, [string]$name, [int]$id, [string]$indent)
+
+	X "$indent<ColumnGroup name=`"$name`" id=`"$id`">"
+	$inner = "$indent`t"
+
+	Emit-Title -el $el -name $name -indent $inner
+
+	# Group orientation (horizontal / vertical / inCell — последнее только здесь)
+	$groupVal = "$($el.columnGroup)"
+	$orientation = switch ($groupVal) {
+		"horizontal" { "Horizontal" }
+		"vertical"   { "Vertical" }
+		"inCell"     { "InCell" }
+		default      { $null }
+	}
+	if ($orientation) { X "$inner<Group>$orientation</Group>" }
+
+	if ($el.showTitle -eq $false) { X "$inner<ShowTitle>false</ShowTitle>" }
+	if ($null -ne $el.showInHeader) {
+		$shVal = if ($el.showInHeader) { "true" } else { "false" }
+		X "$inner<ShowInHeader>$shVal</ShowInHeader>"
+	}
+	if ($el.width) { X "$inner<Width>$($el.width)</Width>" }
+
+	Emit-CommonFlags -el $el -indent $inner
+
+	# Companion: ExtendedTooltip
+	Emit-Companion -tag "ExtendedTooltip" -name "${name}РасширеннаяПодсказка" -indent $inner
+
+	# Children
+	if ($el.children -and $el.children.Count -gt 0) {
+		X "$inner<ChildItems>"
+		foreach ($child in $el.children) {
+			Emit-Element -el $child -indent "$inner`t"
+		}
+		X "$inner</ChildItems>"
+	}
+
+	X "$indent</ColumnGroup>"
+}
+
 function Emit-Input {
 	param($el, [string]$name, [int]$id, [string]$indent)
 
@@ -2057,7 +2144,9 @@ function Emit-Input {
 	} elseif ($el.multiLine -eq $true) {
 		X "$inner<AutoMaxWidth>false</AutoMaxWidth>"
 	}
+	if ($null -ne $el.maxWidth) { X "$inner<MaxWidth>$($el.maxWidth)</MaxWidth>" }
 	if ($el.autoMaxHeight -eq $false) { X "$inner<AutoMaxHeight>false</AutoMaxHeight>" }
+	if ($null -ne $el.maxHeight) { X "$inner<MaxHeight>$($el.maxHeight)</MaxHeight>" }
 	if ($el.width) { X "$inner<Width>$($el.width)</Width>" }
 	if ($el.height) { X "$inner<Height>$($el.height)</Height>" }
 	if ($el.horizontalStretch -eq $true) { X "$inner<HorizontalStretch>true</HorizontalStretch>" }
@@ -2099,6 +2188,224 @@ function Emit-Check {
 	X "$indent</CheckBoxField>"
 }
 
+# Maps Russian/English root of a typed reference path to canonical English root.
+# Used to normalize ChoiceList values like "Перечисление.X.Y" → "Enum.X.EnumValue.Y".
+$script:refRootSynonyms = @{
+	"Перечисление"            = "Enum"
+	"Справочник"              = "Catalog"
+	"Документ"                = "Document"
+	"ПланСчетов"              = "ChartOfAccounts"
+	"ПланВидовХарактеристик"  = "ChartOfCharacteristicTypes"
+	"ПланВидовРасчета"        = "ChartOfCalculationTypes"
+	"ПланВидовРасчёта"        = "ChartOfCalculationTypes"
+	"ПланОбмена"              = "ExchangePlan"
+	"БизнесПроцесс"           = "BusinessProcess"
+	"Задача"                  = "Task"
+	"РегистрСведений"         = "InformationRegister"
+	"РегистрНакопления"       = "AccumulationRegister"
+	"РегистрБухгалтерии"      = "AccountingRegister"
+	"РегистрРасчета"          = "CalculationRegister"
+	"РегистрРасчёта"          = "CalculationRegister"
+}
+$script:enumValueSynonyms = @("EnumValue","ЗначениеПеречисления")
+
+# Normalize a choiceList item value: returns @{ XsiType = "..."; Text = "..." }
+function Normalize-ChoiceValue {
+	param($value)
+
+	# Booleans
+	if ($value -is [bool]) {
+		return @{ XsiType = "xs:boolean"; Text = if ($value) { "true" } else { "false" } }
+	}
+	# Numbers (int / decimal / double)
+	if ($value -is [int] -or $value -is [long] -or $value -is [double] -or $value -is [decimal]) {
+		return @{ XsiType = "xs:decimal"; Text = "$value" }
+	}
+
+	$s = "$value"
+	if ([string]::IsNullOrEmpty($s)) {
+		return @{ XsiType = "xs:string"; Text = "" }
+	}
+
+	# Try to detect typed reference path: "<Root>.<Type>[.<Member>.<Value>]"
+	$parts = $s -split '\.'
+	if ($parts.Count -ge 2) {
+		$root = $parts[0]
+		$canonRoot = $null
+		if ($script:refRootSynonyms.ContainsKey($root)) { $canonRoot = $script:refRootSynonyms[$root] }
+		elseif ($script:refRootSynonyms.Values -contains $root) { $canonRoot = $root }
+
+		if ($canonRoot) {
+			$typeName = $parts[1]
+			$normalized = $null
+
+			if ($canonRoot -eq "Enum") {
+				if ($parts.Count -eq 2) {
+					# "Enum.X" alone — not a value, treat as string
+				} elseif ($parts.Count -eq 3) {
+					# "Enum.X.Y" — insert .EnumValue.
+					$normalized = "Enum.$typeName.EnumValue.$($parts[2])"
+				} else {
+					# "Enum.X.<member>.Y..."  — replace member with EnumValue (handles ЗначениеПеречисления too)
+					$member = $parts[2]
+					if ($script:enumValueSynonyms -contains $member) {
+						$rest = $parts[3..($parts.Count-1)] -join '.'
+						$normalized = "Enum.$typeName.EnumValue.$rest"
+					} else {
+						$rest = $parts[2..($parts.Count-1)] -join '.'
+						$normalized = "Enum.$typeName.EnumValue.$rest"
+					}
+				}
+			} else {
+				# Other ref roots: just translate root, keep tail as-is
+				if ($parts.Count -ge 3) {
+					$tail = $parts[1..($parts.Count-1)] -join '.'
+					$normalized = "$canonRoot.$tail"
+				}
+			}
+
+			if ($normalized) {
+				return @{ XsiType = "xr:DesignTimeRef"; Text = $normalized }
+			}
+		}
+	}
+
+	return @{ XsiType = "xs:string"; Text = $s }
+}
+
+# Emit Presentation block for a choiceList item.
+# Accepts string (ru only), or hashtable/PSCustomObject {ru, en, ...}.
+# Empty/null → emits empty <Presentation/>.
+function Emit-ChoicePresentation {
+	param($pres, [string]$indent)
+	if ($null -eq $pres -or ($pres -is [string] -and [string]::IsNullOrEmpty($pres))) {
+		X "$indent<Presentation/>"
+		return
+	}
+
+	$pairs = @()
+	if ($pres -is [string]) {
+		$pairs += ,@("ru", $pres)
+	} elseif ($pres -is [hashtable] -or $pres -is [System.Collections.IDictionary]) {
+		foreach ($k in $pres.Keys) { $pairs += ,@("$k", "$($pres[$k])") }
+	} elseif ($pres.PSObject -and $pres.PSObject.Properties) {
+		foreach ($p in $pres.PSObject.Properties) { $pairs += ,@("$($p.Name)", "$($p.Value)") }
+	} else {
+		$pairs += ,@("ru", "$pres")
+	}
+
+	X "$indent<Presentation>"
+	foreach ($pair in $pairs) {
+		X "$indent`t<v8:item>"
+		X "$indent`t`t<v8:lang>$($pair[0])</v8:lang>"
+		X "$indent`t`t<v8:content>$(Esc-Xml $pair[1])</v8:content>"
+		X "$indent`t</v8:item>"
+	}
+	X "$indent</Presentation>"
+}
+
+function Emit-Radio {
+	param($el, [string]$name, [int]$id, [string]$indent)
+
+	X "$indent<RadioButtonField name=`"$name`" id=`"$id`">"
+	$inner = "$indent`t"
+
+	if ($el.path) { X "$inner<DataPath>$($el.path)</DataPath>" }
+
+	Emit-Title -el $el -name $name -indent $inner -auto:(-not $el.path)
+	Emit-CommonFlags -el $el -indent $inner
+
+	# TitleLocation default is None for radio (matches typical configurator behavior)
+	$tl = if ($el.titleLocation) {
+		switch ("$($el.titleLocation)") {
+			"none"   { "None" }
+			"left"   { "Left" }
+			"right"  { "Right" }
+			"top"    { "Top" }
+			"bottom" { "Bottom" }
+			default  { "$($el.titleLocation)" }
+		}
+	} else { "None" }
+	X "$inner<TitleLocation>$tl</TitleLocation>"
+
+	# RadioButtonType: Auto | RadioButtons | Tumbler. Accept synonyms.
+	$rbtRaw = if ($el.radioButtonType) { "$($el.radioButtonType)".Trim() } else { "Auto" }
+	$rbt = switch -Regex ($rbtRaw.ToLower()) {
+		'^(auto|авто)$'                        { "Auto"; break }
+		'^(radiobuttons?|переключатель|радио)$' { "RadioButtons"; break }
+		'^(tumbler|тумблер)$'                  { "Tumbler"; break }
+		default                                { $rbtRaw }
+	}
+	X "$inner<RadioButtonType>$rbt</RadioButtonType>"
+
+	if ($null -ne $el.columnsCount) {
+		X "$inner<ColumnsCount>$($el.columnsCount)</ColumnsCount>"
+	}
+
+	# ChoiceList
+	if ($el.choiceList -and $el.choiceList.Count -gt 0) {
+		X "$inner<ChoiceList>"
+		$itemIndent = "$inner`t"
+		foreach ($item in $el.choiceList) {
+			# Pull value (and tolerate Russian synonym "значение")
+			$valRaw = $null
+			if ($item -is [hashtable] -or $item -is [System.Collections.IDictionary]) {
+				if ($item.Contains("value")) { $valRaw = $item["value"] }
+				elseif ($item.Contains("значение")) { $valRaw = $item["значение"] }
+			} else {
+				if ($item.PSObject.Properties["value"])    { $valRaw = $item.value }
+				elseif ($item.PSObject.Properties["значение"]) { $valRaw = $item."значение" }
+			}
+
+			# Pull presentation (presentation OR title synonym)
+			$presRaw = $null
+			$hasPres = $false
+			if ($item -is [hashtable] -or $item -is [System.Collections.IDictionary]) {
+				if ($item.Contains("presentation")) { $presRaw = $item["presentation"]; $hasPres = $true }
+				elseif ($item.Contains("представление")) { $presRaw = $item["представление"]; $hasPres = $true }
+				elseif ($item.Contains("title")) { $presRaw = $item["title"]; $hasPres = $true }
+			} else {
+				if ($item.PSObject.Properties["presentation"]) { $presRaw = $item.presentation; $hasPres = $true }
+				elseif ($item.PSObject.Properties["представление"]) { $presRaw = $item."представление"; $hasPres = $true }
+				elseif ($item.PSObject.Properties["title"]) { $presRaw = $item.title; $hasPres = $true }
+			}
+
+			$norm = Normalize-ChoiceValue -value $valRaw
+
+			# Auto-derive presentation if missing
+			if (-not $hasPres) {
+				if ($norm.XsiType -eq "xr:DesignTimeRef") {
+					$tail = ($norm.Text -split '\.')[-1]
+					$presRaw = Title-FromName -name $tail
+				} elseif ($norm.XsiType -eq "xs:string") {
+					$presRaw = $norm.Text
+				} else {
+					$presRaw = $norm.Text
+				}
+			}
+
+			X "$itemIndent<xr:Item>"
+			$valIndent = "$itemIndent`t"
+			X "$valIndent<xr:Presentation/>"
+			X "$valIndent<xr:CheckState>0</xr:CheckState>"
+			X "$valIndent<xr:Value xsi:type=`"FormChoiceListDesTimeValue`">"
+			Emit-ChoicePresentation -pres $presRaw -indent "$valIndent`t"
+			X "$valIndent`t<Value xsi:type=`"$($norm.XsiType)`">$(Esc-Xml $norm.Text)</Value>"
+			X "$valIndent</xr:Value>"
+			X "$itemIndent</xr:Item>"
+		}
+		X "$inner</ChoiceList>"
+	}
+
+	# Companions
+	Emit-Companion -tag "ContextMenu" -name "${name}КонтекстноеМеню" -indent $inner
+	Emit-Companion -tag "ExtendedTooltip" -name "${name}РасширеннаяПодсказка" -indent $inner
+
+	Emit-Events -el $el -elementName $name -indent $inner -typeKey "radio"
+
+	X "$indent</RadioButtonField>"
+}
+
 function Emit-Label {
 	param($el, [string]$name, [int]$id, [string]$indent)
 
@@ -2120,7 +2427,9 @@ function Emit-Label {
 
 	if ($el.hyperlink -eq $true) { X "$inner<Hyperlink>true</Hyperlink>" }
 	if ($el.autoMaxWidth -eq $false) { X "$inner<AutoMaxWidth>false</AutoMaxWidth>" }
+	if ($null -ne $el.maxWidth) { X "$inner<MaxWidth>$($el.maxWidth)</MaxWidth>" }
 	if ($el.autoMaxHeight -eq $false) { X "$inner<AutoMaxHeight>false</AutoMaxHeight>" }
+	if ($null -ne $el.maxHeight) { X "$inner<MaxHeight>$($el.maxHeight)</MaxHeight>" }
 	if ($el.width) { X "$inner<Width>$($el.width)</Width>" }
 	if ($el.height) { X "$inner<Height>$($el.height)</Height>" }
 
@@ -2282,19 +2591,48 @@ function Emit-Page {
 }
 
 function Emit-Button {
-	param($el, [string]$name, [int]$id, [string]$indent)
+	param($el, [string]$name, [int]$id, [string]$indent, [bool]$inCmdBar = $false)
 
 	X "$indent<Button name=`"$name`" id=`"$id`">"
 	$inner = "$indent`t"
 
-	# Type
+	# Type — context-aware:
+	# Inside command bar (cmdBar/autoCmdBar/popup) only CommandBarButton/CommandBarHyperlink are valid.
+	# UsualButton/Hyperlink would be silently ignored by 1C.
+	$btnType = $null
 	if ($el.type) {
-		$btnType = switch ("$($el.type)") {
-			"usual"      { "UsualButton" }
-			"hyperlink"  { "Hyperlink" }
-			"commandBar" { "CommandBarButton" }
-			default      { "$($el.type)" }
+		$rawType = "$($el.type)"
+		if ($inCmdBar) {
+			# Be forgiving: any "ordinary button" hint resolves to CommandBarButton,
+			# any "hyperlink" hint resolves to CommandBarHyperlink. The model can pass
+			# either DSL ("usual"/"hyperlink") or XML names — all map to the right kind.
+			switch ($rawType) {
+				"usual"                { $btnType = "CommandBarButton" }
+				"UsualButton"          { $btnType = "CommandBarButton" }
+				"commandBar"           { $btnType = "CommandBarButton" }
+				"CommandBarButton"     { $btnType = "CommandBarButton" }
+				"hyperlink"            { $btnType = "CommandBarHyperlink" }
+				"Hyperlink"            { $btnType = "CommandBarHyperlink" }
+				"CommandBarHyperlink"  { $btnType = "CommandBarHyperlink" }
+				default                { $btnType = $rawType }
+			}
+		} else {
+			# Symmetric: any "ordinary button" hint → UsualButton, any "hyperlink" → Hyperlink.
+			switch ($rawType) {
+				"usual"                { $btnType = "UsualButton" }
+				"UsualButton"          { $btnType = "UsualButton" }
+				"commandBar"           { $btnType = "UsualButton" }
+				"CommandBarButton"     { $btnType = "UsualButton" }
+				"hyperlink"            { $btnType = "Hyperlink" }
+				"Hyperlink"            { $btnType = "Hyperlink" }
+				"CommandBarHyperlink"  { $btnType = "Hyperlink" }
+				default                { $btnType = $rawType }
+			}
 		}
+	} elseif ($inCmdBar) {
+		$btnType = "CommandBarButton"
+	}
+	if ($btnType) {
 		X "$inner<Type>$btnType</Type>"
 	}
 
@@ -2428,7 +2766,7 @@ function Emit-CommandBar {
 	if ($el.children -and $el.children.Count -gt 0) {
 		X "$inner<ChildItems>"
 		foreach ($child in $el.children) {
-			Emit-Element -el $child -indent "$inner`t"
+			Emit-Element -el $child -indent "$inner`t" -inCmdBar $true
 		}
 		X "$inner</ChildItems>"
 	}
@@ -2460,7 +2798,7 @@ function Emit-Popup {
 	if ($el.children -and $el.children.Count -gt 0) {
 		X "$inner<ChildItems>"
 		foreach ($child in $el.children) {
-			Emit-Element -el $child -indent "$inner`t"
+			Emit-Element -el $child -indent "$inner`t" -inCmdBar $true
 		}
 		X "$inner</ChildItems>"
 	}
@@ -2908,7 +3246,7 @@ if ($acbHasInner) {
 	if ($hasAcbChildren) {
 		X "`t`t<ChildItems>"
 		foreach ($child in $script:mainAcbDef.children) {
-			Emit-Element -el $child -indent "`t`t`t"
+			Emit-Element -el $child -indent "`t`t`t" -inCmdBar $true
 		}
 		X "`t`t</ChildItems>"
 	}

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

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# form-compile v1.15 — Compile 1C managed form from JSON or object metadata
+# form-compile v1.20 — Compile 1C managed form from JSON or object metadata
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 import argparse
 import copy
@@ -1314,6 +1314,7 @@ EVENT_SUFFIX_MAP = {
 KNOWN_EVENTS = {
     "input": ["OnChange", "StartChoice", "ChoiceProcessing", "AutoComplete", "TextEditEnd", "Clearing", "Creating", "EditTextChange"],
     "check": ["OnChange"],
+    "radio": ["OnChange"],
     "label": ["Click", "URLProcessing"],
     "labelField": ["OnChange", "StartChoice", "ChoiceProcessing", "Click", "URLProcessing", "Clearing"],
     "table": ["Selection", "BeforeAddRow", "AfterDeleteRow", "BeforeDeleteRow", "OnActivateRow", "OnEditEnd", "OnStartEdit", "BeforeRowChange", "BeforeEditEnd", "ValueChoice", "OnActivateCell", "OnActivateField", "Drag", "DragStart", "DragCheck", "DragEnd", "OnGetDataAtServer", "BeforeLoadUserSettingsAtServer", "OnUpdateUserSettingSetAtServer", "OnChange"],
@@ -1337,17 +1338,20 @@ KNOWN_FORM_EVENTS = [
 ]
 
 KNOWN_KEYS = {
-    "group", "input", "check", "label", "labelField", "table", "pages", "page",
+    "group", "columnGroup", "input", "check", "radio", "label", "labelField", "table", "pages", "page",
     "button", "picture", "picField", "calendar", "cmdBar", "popup",
+    "showInHeader",
+    "radioButtonType", "choiceList", "columnsCount",
     "name", "path", "title",
     "visible", "hidden", "enabled", "disabled", "readOnly", "userVisible",
     "on", "handlers",
     "titleLocation", "representation", "width", "height",
     "horizontalStretch", "verticalStretch", "autoMaxWidth", "autoMaxHeight",
+    "maxWidth", "maxHeight",
     "multiLine", "passwordMode", "choiceButton", "clearButton",
     "spinButton", "dropListButton", "markIncomplete", "skipOnInput", "inputHint",
     "hyperlink",
-    "showTitle", "united",
+    "showTitle", "united", "collapsed",
     "children", "columns",
     "changeRowSet", "changeRowOrder", "header", "footer",
     "commandBarLocation", "searchStringLocation",
@@ -1359,9 +1363,147 @@ KNOWN_KEYS = {
     "rowPictureDataPath", "tableAutofill",
 }
 
-TYPE_KEYS = ["group", "input", "check", "label", "labelField", "table", "pages", "page",
+TYPE_KEYS = ["columnGroup", "group", "input", "check", "radio", "label", "labelField", "table", "pages", "page",
              "button", "picture", "picField", "calendar", "cmdBar", "popup"]
 
+# Synonyms: model often writes XML name or Russian (ПолеПереключателя/RadioButtonField → radio)
+ELEMENT_TYPE_SYNONYMS = {
+    "commandBar": "cmdBar",
+    "autoCommandBar": "autoCmdBar",
+    "КоманднаяПанель": "cmdBar",
+    "InputField": "input",
+    "ПолеВвода": "input",
+    "CheckBoxField": "check",
+    "ПолеФлажка": "check",
+    "RadioButtonField": "radio",
+    "ПолеПереключателя": "radio",
+    "radioButton": "radio",
+    "PictureField": "picField",
+    "ПолеКартинки": "picField",
+    "LabelField": "labelField",
+    "ПолеНадписи": "labelField",
+    "CalendarField": "calendar",
+    "ПолеКалендаря": "calendar",
+    "LabelDecoration": "label",
+    "Надпись": "label",
+    "PictureDecoration": "picture",
+    "Картинка": "picture",
+    "UsualGroup": "group",
+    "Группа": "group",
+    "ОбычнаяГруппа": "group",
+    "ColumnGroup": "columnGroup",
+    "ГруппаКолонок": "columnGroup",
+    "Pages": "pages",
+    "ГруппаСтраниц": "pages",
+    "Page": "page",
+    "Страница": "page",
+    "Table": "table",
+    "Таблица": "table",
+    "Button": "button",
+    "Кнопка": "button",
+    "Popup": "popup",
+    "ВсплывающееМеню": "popup",
+}
+
+# Maps Russian/English root of typed reference path to canonical English root
+REF_ROOT_SYNONYMS = {
+    "Перечисление": "Enum",
+    "Справочник": "Catalog",
+    "Документ": "Document",
+    "ПланСчетов": "ChartOfAccounts",
+    "ПланВидовХарактеристик": "ChartOfCharacteristicTypes",
+    "ПланВидовРасчета": "ChartOfCalculationTypes",
+    "ПланВидовРасчёта": "ChartOfCalculationTypes",
+    "ПланОбмена": "ExchangePlan",
+    "БизнесПроцесс": "BusinessProcess",
+    "Задача": "Task",
+    "РегистрСведений": "InformationRegister",
+    "РегистрНакопления": "AccumulationRegister",
+    "РегистрБухгалтерии": "AccountingRegister",
+    "РегистрРасчета": "CalculationRegister",
+    "РегистрРасчёта": "CalculationRegister",
+}
+ENUM_VALUE_SYNONYMS = {"EnumValue", "ЗначениеПеречисления"}
+
+
+def normalize_choice_value(value):
+    """Returns dict {xsi_type, text} for a choiceList item value."""
+    if isinstance(value, bool):
+        return {"xsi_type": "xs:boolean", "text": "true" if value else "false"}
+    if isinstance(value, (int, float)):
+        return {"xsi_type": "xs:decimal", "text": str(value)}
+
+    s = "" if value is None else str(value)
+    if not s:
+        return {"xsi_type": "xs:string", "text": ""}
+
+    parts = s.split(".")
+    if len(parts) >= 2:
+        root = parts[0]
+        canon_root = None
+        if root in REF_ROOT_SYNONYMS:
+            canon_root = REF_ROOT_SYNONYMS[root]
+        elif root in REF_ROOT_SYNONYMS.values():
+            canon_root = root
+
+        if canon_root:
+            type_name = parts[1]
+            normalized = None
+            if canon_root == "Enum":
+                if len(parts) == 3:
+                    normalized = f"Enum.{type_name}.EnumValue.{parts[2]}"
+                elif len(parts) >= 4:
+                    member = parts[2]
+                    if member in ENUM_VALUE_SYNONYMS:
+                        rest = ".".join(parts[3:])
+                    else:
+                        rest = ".".join(parts[2:])
+                    normalized = f"Enum.{type_name}.EnumValue.{rest}"
+            else:
+                if len(parts) >= 3:
+                    tail = ".".join(parts[1:])
+                    normalized = f"{canon_root}.{tail}"
+
+            if normalized:
+                return {"xsi_type": "xr:DesignTimeRef", "text": normalized}
+
+    return {"xsi_type": "xs:string", "text": s}
+
+
+def emit_choice_presentation(lines, pres, indent):
+    """Accepts None/empty → <Presentation/>; str → ru only; dict → multi-lang."""
+    if pres is None or (isinstance(pres, str) and pres == ""):
+        lines.append(f"{indent}<Presentation/>")
+        return
+
+    if isinstance(pres, str):
+        pairs = [("ru", pres)]
+    elif isinstance(pres, dict):
+        pairs = [(str(k), str(v)) for k, v in pres.items()]
+    else:
+        pairs = [("ru", str(pres))]
+
+    lines.append(f"{indent}<Presentation>")
+    for lang, content in pairs:
+        lines.append(f"{indent}\t<v8:item>")
+        lines.append(f"{indent}\t\t<v8:lang>{lang}</v8:lang>")
+        lines.append(f"{indent}\t\t<v8:content>{esc_xml(content)}</v8:content>")
+        lines.append(f"{indent}\t</v8:item>")
+    lines.append(f"{indent}</Presentation>")
+
+
+def normalize_radio_button_type(raw):
+    if not raw:
+        return "Auto"
+    s = str(raw).strip().lower()
+    if s in ("auto", "авто"):
+        return "Auto"
+    if s in ("radiobutton", "radiobuttons", "переключатель", "радио"):
+        return "RadioButtons"
+    if s in ("tumbler", "тумблер"):
+        return "Tumbler"
+    return str(raw).strip()
+
 
 def get_handler_name(element_name, event_name):
     suffix = EVENT_SUFFIX_MAP.get(event_name)
@@ -1622,10 +1764,9 @@ def emit_type(lines, type_str, indent):
 
 # --- Element emitters ---
 
-def emit_element(lines, el, indent):
-    # Silent synonyms (safety net; top-level autoCmdBar is normally extracted in pre-pass)
-    _synonyms = {'commandBar': 'cmdBar', 'autoCommandBar': 'autoCmdBar'}
-    for src, dst in _synonyms.items():
+def emit_element(lines, el, indent, in_cmd_bar=False):
+    # Silent synonyms: model often writes XML name or Russian (ПолеПереключателя/RadioButtonField → radio)
+    for src, dst in ELEMENT_TYPE_SYNONYMS.items():
         if src in el and dst not in el:
             el[dst] = el.pop(src)
 
@@ -1649,8 +1790,10 @@ def emit_element(lines, el, indent):
 
     emitters = {
         'group': emit_group,
+        'columnGroup': emit_column_group,
         'input': emit_input,
         'check': emit_check,
+        'radio': emit_radio_button_field,
         'label': emit_label,
         'labelField': emit_label_field,
         'table': emit_table,
@@ -1666,7 +1809,10 @@ def emit_element(lines, el, indent):
 
     emitter = emitters.get(type_key)
     if emitter:
-        emitter(lines, el, name, eid, indent)
+        if type_key == 'button':
+            emitter(lines, el, name, eid, indent, in_cmd_bar=in_cmd_bar)
+        else:
+            emitter(lines, el, name, eid, indent)
 
 
 def emit_group(lines, el, name, eid, indent):
@@ -1691,6 +1837,8 @@ def emit_group(lines, el, name, eid, indent):
     if group_val == 'collapsible':
         lines.append(f'{inner}<Group>Vertical</Group>')
         lines.append(f'{inner}<Behavior>Collapsible</Behavior>')
+        if el.get('collapsed') is True:
+            lines.append(f'{inner}<Collapsed>true</Collapsed>')
 
     # Representation
     if el.get('representation'):
@@ -1726,6 +1874,43 @@ def emit_group(lines, el, name, eid, indent):
     lines.append(f'{indent}</UsualGroup>')
 
 
+def emit_column_group(lines, el, name, eid, indent):
+    lines.append(f'{indent}<ColumnGroup name="{name}" id="{eid}">')
+    inner = f'{indent}\t'
+
+    emit_title(lines, el, name, inner)
+
+    group_val = str(el.get('columnGroup', ''))
+    orientation_map = {
+        'horizontal': 'Horizontal',
+        'vertical': 'Vertical',
+        'inCell': 'InCell',
+    }
+    orientation = orientation_map.get(group_val)
+    if orientation:
+        lines.append(f'{inner}<Group>{orientation}</Group>')
+
+    if el.get('showTitle') is False:
+        lines.append(f'{inner}<ShowTitle>false</ShowTitle>')
+    if el.get('showInHeader') is not None:
+        sh_val = 'true' if el['showInHeader'] else 'false'
+        lines.append(f'{inner}<ShowInHeader>{sh_val}</ShowInHeader>')
+    if el.get('width'):
+        lines.append(f'{inner}<Width>{el["width"]}</Width>')
+
+    emit_common_flags(lines, el, inner)
+
+    emit_companion(lines, 'ExtendedTooltip', f'{name}РасширеннаяПодсказка', inner)
+
+    if el.get('children') and len(el['children']) > 0:
+        lines.append(f'{inner}<ChildItems>')
+        for child in el['children']:
+            emit_element(lines, child, f'{inner}\t')
+        lines.append(f'{inner}</ChildItems>')
+
+    lines.append(f'{indent}</ColumnGroup>')
+
+
 def emit_input(lines, el, name, eid, indent):
     lines.append(f'{indent}<InputField name="{name}" id="{eid}">')
     inner = f'{indent}\t'
@@ -1762,8 +1947,12 @@ def emit_input(lines, el, name, eid, indent):
             lines.append(f'{inner}<AutoMaxWidth>false</AutoMaxWidth>')
     elif el.get('multiLine') is True:
         lines.append(f'{inner}<AutoMaxWidth>false</AutoMaxWidth>')
+    if el.get('maxWidth') is not None:
+        lines.append(f'{inner}<MaxWidth>{el["maxWidth"]}</MaxWidth>')
     if el.get('autoMaxHeight') is False:
         lines.append(f'{inner}<AutoMaxHeight>false</AutoMaxHeight>')
+    if el.get('maxHeight') is not None:
+        lines.append(f'{inner}<MaxHeight>{el["maxHeight"]}</MaxHeight>')
     if el.get('width'):
         lines.append(f'{inner}<Width>{el["width"]}</Width>')
     if el.get('height'):
@@ -1807,6 +1996,69 @@ def emit_check(lines, el, name, eid, indent):
     lines.append(f'{indent}</CheckBoxField>')
 
 
+def emit_radio_button_field(lines, el, name, eid, indent):
+    lines.append(f'{indent}<RadioButtonField name="{name}" id="{eid}">')
+    inner = f'{indent}\t'
+
+    if el.get('path'):
+        lines.append(f'{inner}<DataPath>{el["path"]}</DataPath>')
+
+    emit_title(lines, el, name, inner, auto=not el.get('path'))
+    emit_common_flags(lines, el, inner)
+
+    tl_raw = el.get('titleLocation')
+    if tl_raw:
+        loc_map = {'none': 'None', 'left': 'Left', 'right': 'Right', 'top': 'Top', 'bottom': 'Bottom'}
+        tl = loc_map.get(str(tl_raw), str(tl_raw))
+    else:
+        tl = 'None'
+    lines.append(f'{inner}<TitleLocation>{tl}</TitleLocation>')
+
+    rbt = normalize_radio_button_type(el.get('radioButtonType'))
+    lines.append(f'{inner}<RadioButtonType>{rbt}</RadioButtonType>')
+
+    if el.get('columnsCount') is not None:
+        lines.append(f'{inner}<ColumnsCount>{el["columnsCount"]}</ColumnsCount>')
+
+    choice_list = el.get('choiceList') or []
+    if choice_list:
+        lines.append(f'{inner}<ChoiceList>')
+        item_indent = f'{inner}\t'
+        for item in choice_list:
+            if not isinstance(item, dict):
+                continue
+            val_raw = item.get('value', item.get('значение'))
+            has_pres = any(k in item for k in ('presentation', 'представление', 'title'))
+            pres_raw = item.get('presentation', item.get('представление', item.get('title')))
+
+            norm = normalize_choice_value(val_raw)
+
+            if not has_pres:
+                if norm['xsi_type'] == 'xr:DesignTimeRef':
+                    tail = norm['text'].split('.')[-1]
+                    pres_raw = title_from_name(tail)
+                else:
+                    pres_raw = norm['text']
+
+            lines.append(f'{item_indent}<xr:Item>')
+            val_indent = f'{item_indent}\t'
+            lines.append(f'{val_indent}<xr:Presentation/>')
+            lines.append(f'{val_indent}<xr:CheckState>0</xr:CheckState>')
+            lines.append(f'{val_indent}<xr:Value xsi:type="FormChoiceListDesTimeValue">')
+            emit_choice_presentation(lines, pres_raw, f'{val_indent}\t')
+            lines.append(f'{val_indent}\t<Value xsi:type="{norm["xsi_type"]}">{esc_xml(norm["text"])}</Value>')
+            lines.append(f'{val_indent}</xr:Value>')
+            lines.append(f'{item_indent}</xr:Item>')
+        lines.append(f'{inner}</ChoiceList>')
+
+    emit_companion(lines, 'ContextMenu', f'{name}КонтекстноеМеню', inner)
+    emit_companion(lines, 'ExtendedTooltip', f'{name}РасширеннаяПодсказка', inner)
+
+    emit_events(lines, el, name, inner, 'radio')
+
+    lines.append(f'{indent}</RadioButtonField>')
+
+
 def emit_label(lines, el, name, eid, indent):
     lines.append(f'{indent}<LabelDecoration name="{name}" id="{eid}">')
     inner = f'{indent}\t'
@@ -1827,8 +2079,12 @@ def emit_label(lines, el, name, eid, indent):
         lines.append(f'{inner}<Hyperlink>true</Hyperlink>')
     if el.get('autoMaxWidth') is False:
         lines.append(f'{inner}<AutoMaxWidth>false</AutoMaxWidth>')
+    if el.get('maxWidth') is not None:
+        lines.append(f'{inner}<MaxWidth>{el["maxWidth"]}</MaxWidth>')
     if el.get('autoMaxHeight') is False:
         lines.append(f'{inner}<AutoMaxHeight>false</AutoMaxHeight>')
+    if el.get('maxHeight') is not None:
+        lines.append(f'{inner}<MaxHeight>{el["maxHeight"]}</MaxHeight>')
     if el.get('width'):
         lines.append(f'{inner}<Width>{el["width"]}</Width>')
     if el.get('height'):
@@ -1987,14 +2243,42 @@ def emit_page(lines, el, name, eid, indent):
     lines.append(f'{indent}</Page>')
 
 
-def emit_button(lines, el, name, eid, indent):
+def emit_button(lines, el, name, eid, indent, in_cmd_bar=False):
     lines.append(f'{indent}<Button name="{name}" id="{eid}">')
     inner = f'{indent}\t'
 
-    # Type
+    # Type — context-aware. Inside command bars (cmdBar/autoCmdBar/popup) only
+    # CommandBarButton/CommandBarHyperlink are valid; UsualButton/Hyperlink would be ignored.
+    # Forgiving resolver: any "ordinary button" hint resolves to UsualButton/CommandBarButton,
+    # any "hyperlink" hint resolves to Hyperlink/CommandBarHyperlink — depending on context.
+    btn_type = None
     if el.get('type'):
-        btn_type_map = {'usual': 'UsualButton', 'hyperlink': 'Hyperlink', 'commandBar': 'CommandBarButton'}
-        btn_type = btn_type_map.get(str(el['type']), str(el['type']))
+        raw = str(el['type'])
+        if in_cmd_bar:
+            cmd_bar_map = {
+                'usual': 'CommandBarButton',
+                'UsualButton': 'CommandBarButton',
+                'commandBar': 'CommandBarButton',
+                'CommandBarButton': 'CommandBarButton',
+                'hyperlink': 'CommandBarHyperlink',
+                'Hyperlink': 'CommandBarHyperlink',
+                'CommandBarHyperlink': 'CommandBarHyperlink',
+            }
+            btn_type = cmd_bar_map.get(raw, raw)
+        else:
+            normal_map = {
+                'usual': 'UsualButton',
+                'UsualButton': 'UsualButton',
+                'commandBar': 'UsualButton',
+                'CommandBarButton': 'UsualButton',
+                'hyperlink': 'Hyperlink',
+                'Hyperlink': 'Hyperlink',
+                'CommandBarHyperlink': 'Hyperlink',
+            }
+            btn_type = normal_map.get(raw, raw)
+    elif in_cmd_bar:
+        btn_type = 'CommandBarButton'
+    if btn_type:
         lines.append(f'{inner}<Type>{btn_type}</Type>')
 
     # CommandName
@@ -2121,7 +2405,7 @@ def emit_command_bar(lines, el, name, eid, indent):
     if el.get('children') and len(el['children']) > 0:
         lines.append(f'{inner}<ChildItems>')
         for child in el['children']:
-            emit_element(lines, child, f'{inner}\t')
+            emit_element(lines, child, f'{inner}\t', in_cmd_bar=True)
         lines.append(f'{inner}</ChildItems>')
 
     lines.append(f'{indent}</CommandBar>')
@@ -2147,7 +2431,7 @@ def emit_popup(lines, el, name, eid, indent):
     if el.get('children') and len(el['children']) > 0:
         lines.append(f'{inner}<ChildItems>')
         for child in el['children']:
-            emit_element(lines, child, f'{inner}\t')
+            emit_element(lines, child, f'{inner}\t', in_cmd_bar=True)
         lines.append(f'{inner}</ChildItems>')
 
     lines.append(f'{indent}</Popup>')
@@ -2756,7 +3040,7 @@ def main():
         if has_acb_children:
             lines.append('\t\t<ChildItems>')
             for child in main_acb_def['children']:
-                emit_element(lines, child, '\t\t\t')
+                emit_element(lines, child, '\t\t\t', in_cmd_bar=True)
             lines.append('\t\t</ChildItems>')
         lines.append('\t</AutoCommandBar>')
     else:

.claude/skills/form-patterns/SKILL.md

@@ -41,9 +41,9 @@ allowed-tools: []
 ├─ Информационные надписи (label, hyperlink)
 Рабочая область
 ├─ Таблица данных или Pages с вкладками
-Кнопки действий
-├─ Выполнить / Применить (defaultButton)
-├─ Закрыть (stdCommand: Close)
+Главная АКП формы (autoCmdBar)
+├─ Выполнить / Применить (defaultButton: true)
+└─ Закрыть (stdCommand: Close)
 ```
 
 **События:** OnCreateAtServer, OnOpen, NotificationProcessing
@@ -90,12 +90,12 @@ allowed-tools: []
 ├─ Шаг1: описание + параметры
 ├─ Шаг2: основная работа
 └─ Шаг3: результат
-Кнопки (horizontal)
-├─ Назад (command), Далее (command, defaultButton), Выполнить (command)
+Главная АКП формы (autoCmdBar)
+├─ Назад, Далее (defaultButton: true), Выполнить
 └─ Закрыть (stdCommand: Close)
 ```
 
-**Свойства:** windowOpeningMode=LockOwnerWindow, commandBarLocation=None
+**Свойства:** windowOpeningMode=LockOwnerWindow
 
 ---
 
@@ -111,7 +111,7 @@ allowed-tools: []
 | Номер+Дата | `ГруппаНомерДата` | horizontal |
 | Подвал | `ГруппаПодвал` | vertical |
 | Итоги | `ГруппаИтоги` | horizontal |
-| Кнопки | `ГруппаКнопок` | horizontal |
+| Главная АКП формы | `ФормаКоманднаяПанель` | autoCmdBar |
 | Страницы | `ГруппаСтраницы` / `Страницы` | pages |
 | Предупреждение | `ГруппаПредупреждение` | horizontal, visible:false |
 | Доп. секция | `ГруппаДополнительно` / `ГруппаПрочее` | vertical, collapse |
@@ -150,7 +150,7 @@ allowed-tools: []
 
 1. **Порядок чтения.** Сверху вниз, слева направо. Самое важное — вверху.
 2. **Двухколоночная шапка.** Основные реквизиты слева (контрагент, склад), организационные справа (организация, подразделение).
-3. **Кнопки действий внизу.** Главная кнопка — `defaultButton: true`. Закрыть — всегда последняя.
+3. **Кнопки действий — на главной АКП формы** (`autoCmdBar`), не в отдельной группе на форме. Главная кнопка — `defaultButton: true`. Закрыть — всегда последняя.
 4. **Таблицы — основная область.** Табличные части занимают большую часть формы, обычно на Pages.
 5. **Итоги рядом с таблицей.** В подвале, горизонтальная группа, все поля readOnly.
 6. **Фильтры — отдельная зона.** Над списком, alwaysHorizontal, пара «флажок + поле» на каждый фильтр.
@@ -166,8 +166,8 @@ allowed-tools: []
 Для необязательных секций (подписи, дополнительно, прочее):
 
 ```json
-{ "group": "vertical", "name": "ГруппаПодписи", "title": "Подписи",
-  "behavior": "Collapsible", "collapsed": true, "children": [...] }
+{ "group": "collapsible", "name": "ГруппаПодписи", "title": "Подписи",
+  "collapsed": true, "children": [...] }
 ```
 
 ### Баннер-предупреждение
@@ -233,7 +233,7 @@ allowed-tools: []
       { "input": "ДанныеКоличество", "path": "Объект.Данные.Количество", "on": ["OnChange"] },
       { "input": "ДанныеСумма", "path": "Объект.Данные.Сумма", "readOnly": true }
     ]},
-    { "group": "horizontal", "name": "ГруппаКнопок", "children": [
+    { "autoCmdBar": "ФормаКоманднаяПанель", "children": [
       { "button": "Загрузить", "command": "Загрузить", "title": "Загрузить из файла", "defaultButton": true },
       { "button": "Очистить", "command": "Очистить", "title": "Очистить таблицу" },
       { "button": "Закрыть", "stdCommand": "Close" }

.claude/skills/meta-compile/reference/types-basic.md

@@ -18,7 +18,7 @@
 | `checkUnique` | `false` | CheckUnique |
 | `defaultPresentation` | `AsDescription` | DefaultPresentation |
 | `subordinationUse` | `ToItems` | SubordinationUse |
-| `quickChoice` | `true` | QuickChoice |
+| `quickChoice` | `false` | QuickChoice |
 | `choiceMode` | `BothWays` | ChoiceMode |
 | `owners` | `[]` | Owners |
 | `attributes` | `[]` | → Attribute в ChildObjects |

.claude/skills/meta-compile/scripts/meta-compile.ps1

@@ -1,4 +1,4 @@
-# meta-compile v1.10 — Compile 1C metadata object from JSON
+# meta-compile v1.11 — Compile 1C metadata object from JSON
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 param(
 	[Parameter(Mandatory)]
@@ -1129,7 +1129,7 @@ function Emit-CatalogProperties {
 	X "$i<Characteristics/>"
 	X "$i<PredefinedDataUpdate>Auto</PredefinedDataUpdate>"
 	X "$i<EditType>InDialog</EditType>"
-	$quickChoice = if ($def.quickChoice -eq $false) { "false" } else { "true" }
+	$quickChoice = if ($def.quickChoice -eq $true) { "true" } else { "false" }
 	$choiceMode = Get-EnumProp "ChoiceMode" "choiceMode" "BothWays"
 	X "$i<QuickChoice>$quickChoice</QuickChoice>"
 	X "$i<ChoiceMode>$choiceMode</ChoiceMode>"
@@ -1292,7 +1292,8 @@ function Emit-EnumProperties {
 	Emit-StandardAttributes $i "Enum"
 	X "$i<Characteristics/>"
 
-	X "$i<QuickChoice>true</QuickChoice>"
+	$quickChoice = if ($def.quickChoice -eq $false) { "false" } else { "true" }
+	X "$i<QuickChoice>$quickChoice</QuickChoice>"
 	X "$i<ChoiceMode>BothWays</ChoiceMode>"
 	X "$i<DefaultListForm/>"
 	X "$i<DefaultChoiceForm/>"
@@ -1663,7 +1664,8 @@ function Emit-ExchangePlanProperties {
 	X "$i<IncludeConfigurationExtensions>$includeExt</IncludeConfigurationExtensions>"
 
 	X "$i<BasedOn/>"
-	X "$i<QuickChoice>true</QuickChoice>"
+	$quickChoice = if ($def.quickChoice -eq $true) { "true" } else { "false" }
+	X "$i<QuickChoice>$quickChoice</QuickChoice>"
 	X "$i<ChoiceMode>BothWays</ChoiceMode>"
 	X "$i<InputByString>"
 	X "$i`t<xr:Field>ExchangePlan.$objName.StandardAttribute.Description</xr:Field>"
@@ -1764,7 +1766,8 @@ function Emit-ChartOfCharacteristicTypesProperties {
 	X "$i<Characteristics/>"
 	X "$i<PredefinedDataUpdate>Auto</PredefinedDataUpdate>"
 	X "$i<EditType>InDialog</EditType>"
-	X "$i<QuickChoice>true</QuickChoice>"
+	$quickChoice = if ($def.quickChoice -eq $true) { "true" } else { "false" }
+	X "$i<QuickChoice>$quickChoice</QuickChoice>"
 	X "$i<ChoiceMode>BothWays</ChoiceMode>"
 	X "$i<InputByString>"
 	X "$i`t<xr:Field>ChartOfCharacteristicTypes.$objName.StandardAttribute.Description</xr:Field>"
@@ -1905,7 +1908,8 @@ function Emit-ChartOfAccountsProperties {
 
 	X "$i<Characteristics/>"
 	X "$i<PredefinedDataUpdate>Auto</PredefinedDataUpdate>"
-	X "$i<QuickChoice>true</QuickChoice>"
+	$quickChoice = if ($def.quickChoice -eq $true) { "true" } else { "false" }
+	X "$i<QuickChoice>$quickChoice</QuickChoice>"
 	X "$i<ChoiceMode>BothWays</ChoiceMode>"
 	X "$i<InputByString>"
 	X "$i`t<xr:Field>ChartOfAccounts.$objName.StandardAttribute.Description</xr:Field>"
@@ -2021,7 +2025,8 @@ function Emit-ChartOfCalculationTypesProperties {
 	X "$i<Characteristics/>"
 	X "$i<PredefinedDataUpdate>Auto</PredefinedDataUpdate>"
 	X "$i<EditType>InDialog</EditType>"
-	X "$i<QuickChoice>true</QuickChoice>"
+	$quickChoice = if ($def.quickChoice -eq $true) { "true" } else { "false" }
+	X "$i<QuickChoice>$quickChoice</QuickChoice>"
 	X "$i<ChoiceMode>BothWays</ChoiceMode>"
 	X "$i<InputByString>"
 	X "$i`t<xr:Field>ChartOfCalculationTypes.$objName.StandardAttribute.Description</xr:Field>"

.claude/skills/meta-compile/scripts/meta-compile.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# meta-compile v1.10 — Compile 1C metadata object from JSON
+# meta-compile v1.11 — Compile 1C metadata object from JSON
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 
 import argparse
@@ -1024,7 +1024,7 @@ def emit_catalog_properties(indent):
     X(f'{i}<Characteristics/>')
     X(f'{i}<PredefinedDataUpdate>Auto</PredefinedDataUpdate>')
     X(f'{i}<EditType>InDialog</EditType>')
-    quick_choice = 'false' if defn.get('quickChoice') is False else 'true'
+    quick_choice = 'true' if defn.get('quickChoice') is True else 'false'
     choice_mode = get_enum_prop('ChoiceMode', 'choiceMode', 'BothWays')
     X(f'{i}<QuickChoice>{quick_choice}</QuickChoice>')
     X(f'{i}<ChoiceMode>{choice_mode}</ChoiceMode>')
@@ -1157,7 +1157,8 @@ def emit_enum_properties(indent):
     X(f'{i}<UseStandardCommands>false</UseStandardCommands>')
     emit_standard_attributes(i, 'Enum')
     X(f'{i}<Characteristics/>')
-    X(f'{i}<QuickChoice>true</QuickChoice>')
+    quick_choice = 'false' if defn.get('quickChoice') is False else 'true'
+    X(f'{i}<QuickChoice>{quick_choice}</QuickChoice>')
     X(f'{i}<ChoiceMode>BothWays</ChoiceMode>')
     X(f'{i}<DefaultListForm/>')
     X(f'{i}<DefaultChoiceForm/>')
@@ -1471,7 +1472,8 @@ def emit_exchange_plan_properties(indent):
     X(f'{i}<DistributedInfoBase>{distributed}</DistributedInfoBase>')
     X(f'{i}<IncludeConfigurationExtensions>{include_ext}</IncludeConfigurationExtensions>')
     X(f'{i}<BasedOn/>')
-    X(f'{i}<QuickChoice>true</QuickChoice>')
+    quick_choice = 'true' if defn.get('quickChoice') is True else 'false'
+    X(f'{i}<QuickChoice>{quick_choice}</QuickChoice>')
     X(f'{i}<ChoiceMode>BothWays</ChoiceMode>')
     X(f'{i}<InputByString>')
     X(f'{i}\t<xr:Field>ExchangePlan.{obj_name}.StandardAttribute.Description</xr:Field>')
@@ -1557,7 +1559,8 @@ def emit_chart_of_characteristic_types_properties(indent):
     X(f'{i}<Characteristics/>')
     X(f'{i}<PredefinedDataUpdate>Auto</PredefinedDataUpdate>')
     X(f'{i}<EditType>InDialog</EditType>')
-    X(f'{i}<QuickChoice>true</QuickChoice>')
+    quick_choice = 'true' if defn.get('quickChoice') is True else 'false'
+    X(f'{i}<QuickChoice>{quick_choice}</QuickChoice>')
     X(f'{i}<ChoiceMode>BothWays</ChoiceMode>')
     X(f'{i}<InputByString>')
     X(f'{i}\t<xr:Field>ChartOfCharacteristicTypes.{obj_name}.StandardAttribute.Description</xr:Field>')
@@ -1673,7 +1676,8 @@ def emit_chart_of_accounts_properties(indent):
     X(f'{i}</StandardTabularSections>')
     X(f'{i}<Characteristics/>')
     X(f'{i}<PredefinedDataUpdate>Auto</PredefinedDataUpdate>')
-    X(f'{i}<QuickChoice>true</QuickChoice>')
+    quick_choice = 'true' if defn.get('quickChoice') is True else 'false'
+    X(f'{i}<QuickChoice>{quick_choice}</QuickChoice>')
     X(f'{i}<ChoiceMode>BothWays</ChoiceMode>')
     X(f'{i}<InputByString>')
     X(f'{i}\t<xr:Field>ChartOfAccounts.{obj_name}.StandardAttribute.Description</xr:Field>')
@@ -1764,7 +1768,8 @@ def emit_chart_of_calculation_types_properties(indent):
     X(f'{i}<Characteristics/>')
     X(f'{i}<PredefinedDataUpdate>Auto</PredefinedDataUpdate>')
     X(f'{i}<EditType>InDialog</EditType>')
-    X(f'{i}<QuickChoice>true</QuickChoice>')
+    quick_choice = 'true' if defn.get('quickChoice') is True else 'false'
+    X(f'{i}<QuickChoice>{quick_choice}</QuickChoice>')
     X(f'{i}<ChoiceMode>BothWays</ChoiceMode>')
     X(f'{i}<InputByString>')
     X(f'{i}\t<xr:Field>ChartOfCalculationTypes.{obj_name}.StandardAttribute.Description</xr:Field>')