fix: address Copilot review round 5 findings

- Add 'Required Extensions' and 'Number of Scripts' fields to preset
  issue template and wire through label mapping, validation, and builder
  so new submissions can express requires.extensions and provides.scripts
- Make 'Templates Provided' optional in preset validation — require at
  least one of templates or commands (supports command-only presets)
- Fix bot comment matching: use marker-only search instead of
  c.user.type === 'Bot' since RELEASE_PAT creates comments as a User
- Preserve provides.scripts on preset updates

Author: mnriem

.github/ISSUE_TEMPLATE/preset_submission.yml

@@ -95,17 +95,22 @@ body:
     validations:
       required: true
 
+  - type: input
+    id: required-extensions
+    attributes:
+      label: Required Extensions (optional)
+      description: Comma-separated list of required extension IDs (e.g., aide)
+      placeholder: "e.g., aide, canon"
+
   - type: textarea
     id: templates-provided
     attributes:
       label: Templates Provided
-      description: List the template overrides your preset provides
+      description: List the template overrides your preset provides (leave empty for command-only presets)
       placeholder: |
         - spec-template.md — adds compliance section
         - plan-template.md — includes audit checkpoints
         - checklist-template.md — HIPAA compliance checklist
-    validations:
-      required: true
 
   - type: textarea
     id: commands-provided
@@ -115,6 +120,13 @@ body:
       placeholder: |
         - speckit.specify.md — customized for compliance workflows
 
+  - type: input
+    id: scripts-count
+    attributes:
+      label: Number of Scripts (optional)
+      description: How many scripts does your preset provide? (leave empty if none)
+      placeholder: "e.g., 1"
+
   - type: textarea
     id: tags
     attributes:

.github/scripts/catalog-validate.py

@@ -100,8 +100,10 @@ def parse_issue_body(body: str) -> dict[str, str]:
     "Download URL": "download_url",
     "License": "license",
     "Required Spec Kit Version": "speckit_version",
+    "Required Extensions (optional)": "required_extensions",
     "Templates Provided": "templates_provided",
     "Commands Provided (optional)": "commands_provided",
+    "Number of Scripts (optional)": "scripts_count",
     "Tags": "tags",
     "Key Features": "features",
     "Testing Checklist": "testing_checklist",
@@ -503,10 +505,13 @@ def _add(field: str, ok: bool, msg: str, *, severity: str = "error") -> None:
         ok, msg = validate_hooks_count(fields.get("hooks_count", ""))
         _add("Number of Hooks", ok, msg)
     elif catalog_type == "preset":
-        ok, msg = validate_required_text(
-            fields.get("templates_provided", ""), "Templates Provided",
-        )
-        _add("Templates Provided", ok, msg)
+        templates_provided = fields.get("templates_provided", "").strip()
+        commands_provided = fields.get("commands_provided", "").strip()
+        if templates_provided or commands_provided:
+            _add("Preset Provides", True, "Templates and/or commands provided.")
+        else:
+            _add("Preset Provides", False,
+                 "At least one of Templates Provided or Commands Provided is required.")
         # Commands Provided is optional for presets
 
     # --- Tags ---
@@ -702,11 +707,23 @@ def _build_preset_entry(
     if is_update and catalog:
         existing = catalog.get("presets", {}).get(item_id, {})
 
-    # Build requires — preserve existing extensions on updates
+    # Build requires — include extensions from form or preserve on updates
     requires: dict = {
         "speckit_version": fields["speckit_version"].strip(),
     }
-    if is_update and "extensions" in existing.get("requires", {}):
+    extensions_raw = _clean(fields.get("required_extensions", ""))
+    if extensions_raw:
+        # Parse comma-separated or bullet-list extension IDs
+        ext_list = []
+        for line in extensions_raw.splitlines():
+            line = line.strip().lstrip("-*").strip()
+            for part in line.split(","):
+                part = part.strip()
+                if part:
+                    ext_list.append(part)
+        if ext_list:
+            requires["extensions"] = ext_list
+    elif is_update and "extensions" in existing.get("requires", {}):
         requires["extensions"] = existing["requires"]["extensions"]
 
     # Documentation URL: use existing on update, fall back to repo/blob/main/README.md
@@ -716,6 +733,21 @@ def _build_preset_entry(
     if not documentation:
         documentation = repo + "/blob/main/README.md"
 
+    # Scripts count from form or preserve on updates
+    scripts_count = 0
+    scripts_raw = _clean(fields.get("scripts_count", ""))
+    if scripts_raw and scripts_raw.isdigit():
+        scripts_count = int(scripts_raw)
+    elif is_update:
+        scripts_count = existing.get("provides", {}).get("scripts", 0)
+
+    provides: dict = {
+        "templates": templates_count,
+        "commands": commands_count,
+    }
+    if scripts_count:
+        provides["scripts"] = scripts_count
+
     return {
         "name": _clean(fields.get("item_name")),
         "id": item_id,
@@ -728,10 +760,7 @@ def _build_preset_entry(
         "documentation": documentation,
         "license": fields["license"].strip(),
         "requires": requires,
-        "provides": {
-            "templates": templates_count,
-            "commands": commands_count,
-        },
+        "provides": provides,
         "tags": parse_tags(fields["tags"]),
         "created_at": existing.get("created_at", now),
         "updated_at": now,

.github/workflows/catalog-validate.yml

@@ -53,7 +53,7 @@ jobs:
             );
             const marker = '<!-- catalog-submission-bot -->';
             const botComment = allComments.find(c =>
-              c.user.type === 'Bot' && c.body.includes(marker)
+              c.body && c.body.includes(marker)
             );
 
             const body = marker + '\n\n' + report;
@@ -157,7 +157,7 @@ jobs:
             );
             const marker = '<!-- catalog-submission-bot -->';
             const botComment = allComments.find(c =>
-              c.user.type === 'Bot' && c.body.includes(marker)
+              c.body && c.body.includes(marker)
             );
 
             const body = marker + '\n\n' + report;