fix(setup): fill the CV and cover-letter template contact blocks; guard CHANGELOG structure (#433)

/setup Step 3 personalised cv/main_example.tex but never the LaTeX contact
blocks embedded in 05-cv-templates.md and 06-cover-letter-templates.md, the
two files /apply actually compiles from; 06 was not a Step 3 target at all.
Step 3.5 now names the 05 contact tokens, a new Step 3.6 covers the 06
contact line and signature, the completion summary lists 06, and /reset
restores both blocks instead of listing 06 as framework-only (the existing
/reset coverage test forced that half).

tests/test_changelog_structure.py checks [Unreleased] on every PR for
duplicate headings, unknown headings, orphan entries and conflict markers -
the #425 duplicate-heading shape that was fixed by hand at merge time.


Claude-Session: https://claude.ai/code/session_013fqqLgQSnwgWkv98twQhHi

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>

tests/test_changelog_structure.py

@@ -0,0 +1,124 @@
+"""Structural guard for CHANGELOG.md's [Unreleased] section.
+
+Contributors edit one shared file by hand, and every PR inserts its entry near
+the same line. Two failure shapes have reached master or a merge queue:
+
+- a second `### Fixed` heading added directly under `## [Unreleased]` because
+  the author did not see the existing one further down (#425, fixed by hand at
+  merge time), and
+- entries placed above any `###` heading, or under a heading Keep a Changelog
+  does not define.
+
+`lint_skills.py` does not read the changelog, so nothing caught either. This
+test does, on every PR. It only inspects [Unreleased]; released sections are
+history and stay as they are.
+"""
+import unittest
+from pathlib import Path
+
+REPO = Path(__file__).resolve().parent.parent
+CHANGELOG = REPO / "CHANGELOG.md"
+
+KNOWN_HEADINGS = {"Added", "Changed", "Deprecated", "Removed", "Fixed", "Security"}
+CONFLICT_MARKERS = ("<<<<<<< ", "=======", ">>>>>>> ")
+
+
+def unreleased_block(text: str) -> str:
+    """The lines between `## [Unreleased]` and the next `## [` heading."""
+    start = text.index("## [Unreleased]")
+    end = text.find("\n## [", start + 1)
+    return text[start:] if end == -1 else text[start:end]
+
+
+def unreleased_problems(text: str) -> list[str]:
+    """Return a human-readable problem per structural defect in [Unreleased]."""
+    problems: list[str] = []
+    seen: list[str] = []
+    current: str | None = None
+    for lineno, line in enumerate(unreleased_block(text).splitlines(), 1):
+        if any(line.startswith(marker) for marker in CONFLICT_MARKERS):
+            problems.append(f"conflict marker on [Unreleased] line {lineno}: {line.strip()}")
+            continue
+        if line.startswith("### "):
+            name = line[4:].strip()
+            if name not in KNOWN_HEADINGS:
+                problems.append(
+                    f"unknown heading '### {name}' in [Unreleased]; use one of {sorted(KNOWN_HEADINGS)}"
+                )
+            if name in seen:
+                problems.append(
+                    f"'### {name}' appears twice in [Unreleased] - fold the entry into the existing section"
+                )
+            seen.append(name)
+            current = name
+        elif line.startswith("- ") and current is None:
+            problems.append(f"entry above any '###' heading in [Unreleased]: {line.strip()[:70]}")
+    return problems
+
+
+CLEAN = """# Changelog
+
+## [Unreleased]
+
+### Added
+
+- **A new thing** - described.
+
+### Fixed
+
+- **A fixed thing** - described.
+
+## [1.0.0] - 2026-01-01
+
+### Fixed
+
+- old entry
+"""
+
+
+class UnreleasedProblemsTests(unittest.TestCase):
+    def test_clean_section_reports_nothing(self):
+        self.assertEqual(unreleased_problems(CLEAN), [])
+
+    def test_duplicate_heading_is_reported(self):
+        # The exact #425 shape: a second "### Fixed" inserted directly under
+        # [Unreleased], above "### Added", while "### Fixed" already exists below.
+        text = CLEAN.replace(
+            "## [Unreleased]\n\n### Added",
+            "## [Unreleased]\n\n### Fixed\n\n- **Entry in the wrong place** - described.\n\n### Added",
+        )
+        problems = unreleased_problems(text)
+        self.assertTrue(any("Fixed" in p and "twice" in p for p in problems), problems)
+
+    def test_unknown_heading_is_reported(self):
+        text = CLEAN.replace("### Fixed", "### Fixes")
+        problems = unreleased_problems(text)
+        self.assertTrue(any("Fixes" in p for p in problems), problems)
+
+    def test_entry_above_any_heading_is_reported(self):
+        text = CLEAN.replace(
+            "## [Unreleased]\n\n### Added",
+            "## [Unreleased]\n\n- **Orphan entry** - no heading above it.\n\n### Added",
+        )
+        problems = unreleased_problems(text)
+        self.assertTrue(any("Orphan entry" in p for p in problems), problems)
+
+    def test_conflict_markers_are_reported(self):
+        text = CLEAN.replace("### Fixed", "<<<<<<< HEAD\n### Fixed")
+        problems = unreleased_problems(text)
+        self.assertTrue(any("conflict marker" in p for p in problems), problems)
+
+    def test_released_sections_are_not_inspected(self):
+        # A duplicate heading in an old release is history, not a defect here.
+        text = CLEAN + "\n### Fixed\n\n- another old entry\n"
+        self.assertEqual(unreleased_problems(text), [])
+
+
+class RealChangelogTests(unittest.TestCase):
+    def test_unreleased_section_is_well_formed(self):
+        text = CHANGELOG.read_text(encoding="utf-8")
+        self.assertEqual(unreleased_problems(text), [])
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_placeholder_integrity.py

@@ -32,7 +32,7 @@ PROFILE_SENTINEL = "[YOUR_EMAIL]"
 
 
 def personalize_cv(text: str) -> str:
-    """Apply /setup Step 3.7's documented edit: replace placeholder personal
+    """Apply /setup Step 3.8's documented edit: replace placeholder personal
     data with a real name and contact info. Header comments and hyperref
     metadata are not personal data, so they are deliberately left alone -
     that is exactly why a comment-located sentinel guards nothing."""

tests/test_setup_command.py

@@ -0,0 +1,87 @@
+"""Guards for the /setup command spec.
+
+The command is a markdown spec (the spec IS the implementation). These tests pin
+one invariant that broke silently: Step 3 must personalise every contact block
+that `/apply` later compiles into a document. `cv/main_example.tex` was covered;
+the LaTeX blocks embedded in `05-cv-templates.md` and `06-cover-letter-templates.md`
+were not, so a full Path B/C run left `[YOUR_NAME]`, `[YOUR_EMAIL]` and
+`[YOUR_PHONE]` in both, and whether they reached a compiled cover letter depended
+on the drafter noticing. A real user (#420) ran `/setup` and then hand-edited both
+files to close the gap.
+"""
+import unittest
+from pathlib import Path
+
+REPO = Path(__file__).resolve().parent.parent
+COMMAND = REPO / ".claude" / "commands" / "setup.md"
+SKILL_DIR = REPO / ".claude" / "skills" / "job-application-assistant"
+CV_TEMPLATES = SKILL_DIR / "05-cv-templates.md"
+COVER_TEMPLATES = SKILL_DIR / "06-cover-letter-templates.md"
+
+
+def _sections(text: str) -> dict[str, str]:
+    """Split a command spec into {heading: body} by '## ' headers."""
+    parts = text.split("\n## ")
+    result = {}
+    for part in parts[1:]:
+        heading, _, body = part.partition("\n")
+        result[heading.strip()] = body
+    return result
+
+
+def _substeps(step_body: str) -> dict[str, str]:
+    """Split a step body into {'### N. ...' heading: body}."""
+    parts = step_body.split("\n### ")
+    result = {}
+    for part in parts[1:]:
+        heading, _, body = part.partition("\n")
+        result[heading.strip()] = body
+    return result
+
+
+class SetupStep3ContactBlocks(unittest.TestCase):
+    def setUp(self):
+        self.step3 = _sections(COMMAND.read_text(encoding="utf-8"))["Step 3: Generate Profile Files"]
+        self.substeps = _substeps(self.step3)
+
+    def _substep_for(self, filename: str) -> str:
+        matches = [body for heading, body in self.substeps.items() if filename in heading]
+        self.assertEqual(len(matches), 1, f"expected exactly one Step 3 substep for {filename}, got {len(matches)}")
+        return matches[0]
+
+    def test_cv_templates_substep_fills_the_contact_block(self):
+        body = self._substep_for("05-cv-templates.md")
+        self.assertIn("contact", body.lower())
+        for token in ("[FIRST_NAME]", "[YOUR_EMAIL]", "[YOUR_PHONE]"):
+            self.assertIn(token, body, f"the 05 substep must name {token} as something to replace")
+
+    def test_cover_letter_templates_get_their_own_substep(self):
+        body = self._substep_for("06-cover-letter-templates.md")
+        self.assertIn("signature", body.lower())
+        for token in ("[YOUR_NAME]", "[YOUR_EMAIL]", "[YOUR_PHONE]", "[YOUR_LINKEDIN_URL]"):
+            self.assertIn(token, body, f"the 06 substep must name {token} as something to replace")
+
+    def test_completion_summary_lists_the_cover_letter_templates(self):
+        step4 = _sections(COMMAND.read_text(encoding="utf-8"))["Step 4: Confirm & Next Steps"]
+        summary = step4.split("**Privacy note:**")[0]
+        self.assertIn("06-cover-letter-templates.md", summary)
+
+
+class TemplatesStillCarryThePlaceholders(unittest.TestCase):
+    """The instructions above target real tokens; if a template renames them,
+    the instruction and this test must move together."""
+
+    def test_cv_templates_contact_block_tokens(self):
+        text = CV_TEMPLATES.read_text(encoding="utf-8")
+        for token in ("[FIRST_NAME]", "[LAST_NAME]", "[YOUR_EMAIL]", "[YOUR_PHONE]"):
+            self.assertIn(token, text)
+
+    def test_cover_letter_templates_contact_and_signature_tokens(self):
+        text = COVER_TEMPLATES.read_text(encoding="utf-8")
+        for token in ("[YOUR_NAME]", "[YOUR_EMAIL]", "[YOUR_PHONE]", "[YOUR_LINKEDIN_URL]"):
+            self.assertIn(token, text)
+        self.assertIn("\\signature{[YOUR_NAME]}", text)
+
+
+if __name__ == "__main__":
+    unittest.main()