claude-dev-env 8.12.0 → 8.14.0

package/scripts/tests/test_rules.py

@@ -1,81 +1,10 @@
-"""Tests for discovered Claude-to-Cursor rule mappings."""
+"""Tests that shipped instruction surfaces carry the comment and word policies."""
 
 from __future__ import annotations
 
-import sys
 from pathlib import Path
 
-_SCRIPTS_DIR = Path(__file__).resolve().parent.parent
-if str(_SCRIPTS_DIR) not in sys.path:
-    sys.path.insert(0, str(_SCRIPTS_DIR))
-
-from sync_to_cursor.rules import build_mappings, merge_code_standards
-
-_PACKAGE_ROOT = _SCRIPTS_DIR.parent
-_SKIPPED_RULE_FILE_NAMES = frozenset({"CLAUDE.md", "AGENTS.md"})
-
-
-def _write_minimal_curated_rules(rules_directory: Path) -> None:
-    rules_directory.mkdir(parents=True, exist_ok=True)
-    (rules_directory / "code-standards.md").write_text(
-        "# Code standards stub\n", encoding="utf-8"
-    )
-    (rules_directory / "tasklings-preferences.md").write_text(
-        '---\npaths:\n  - "Y:/x/**"\n---\n\n# Tasklings\n',
-        encoding="utf-8",
-    )
-    (rules_directory / "bdd.md").write_text("# BDD\n", encoding="utf-8")
-    (rules_directory / "testing.md").write_text(
-        '---\npaths:\n  - "**/test_*.py"\n---\n\n# Testing\n',
-        encoding="utf-8",
-    )
-    (rules_directory / "research-mode.md").write_text("# RM\n", encoding="utf-8")
-    (rules_directory / "explore-thoroughly.md").write_text("# ET\n", encoding="utf-8")
-
-
-def test_build_mappings_emits_stem_mdc_for_remaining_claude_rules(
-    tmp_path: Path,
-) -> None:
-    claude = tmp_path / ".claude"
-    _write_minimal_curated_rules(claude / "rules")
-    (claude / "docs").mkdir(parents=True, exist_ok=True)
-    (claude / "rules" / "asd-ste100-language.md").write_text(
-        "# ASD-STE100 Language Policy\n\nBe brief.\n",
-        encoding="utf-8",
-    )
-    (claude / "rules" / "CLAUDE.md").write_text(
-        "# Package inventory\n", encoding="utf-8"
-    )
-    (claude / "rules" / "AGENTS.md").write_text("# Agent inventory\n", encoding="utf-8")
-    mappings = build_mappings(claude)
-    output_by_key = {each_mapping.key: each_mapping for each_mapping in mappings}
-    discovered = output_by_key["asd-ste100-language"]
-    assert discovered.output_name == "asd-ste100-language.mdc"
-    assert discovered.always_apply is True
-    assert discovered.description == "ASD-STE100 Language Policy"
-    assert "CLAUDE.md" not in {
-        each_source.name
-        for each_mapping in mappings
-        for each_source in each_mapping.sources
-    }
-    assert "AGENTS.md" not in {
-        each_source.name
-        for each_mapping in mappings
-        for each_source in each_mapping.sources
-    }
-
-
-def test_every_shipped_claude_rule_maps_to_an_mdc() -> None:
-    mappings = build_mappings(_PACKAGE_ROOT)
-    output_name_by_rule_file = {}
-    for each_mapping in mappings:
-        for each_source in each_mapping.sources:
-            if each_source.parent.name == "rules" and each_source.suffix == ".md":
-                output_name_by_rule_file[each_source.name] = each_mapping.output_name
-    for each_rule_file in sorted((_PACKAGE_ROOT / "rules").glob("*.md")):
-        if each_rule_file.name in _SKIPPED_RULE_FILE_NAMES:
-            continue
-        assert each_rule_file.name in output_name_by_rule_file, each_rule_file.name
+_PACKAGE_ROOT = Path(__file__).resolve().parents[2]
 
 
 def _comment_policy_phrases() -> tuple[str, ...]:
@@ -226,13 +155,3 @@ def test_comment_policy_removes_directive_justification_guidance() -> None:
     assert "changed `# noqa` directives are removed or resolved" in category_e_prompt
     assert "every `# noqa` on an import line must be justified" not in category_e_prompt
 
-
-def test_merge_code_standards_resolves_every_heading_it_names() -> None:
-    merged_text = merge_code_standards(
-        (
-            _PACKAGE_ROOT / "rules" / "code-standards.md",
-            _PACKAGE_ROOT / "docs" / "CODE_RULES.md",
-        )
-    )
-    assert "## Reference (full text:" in merged_text
-    assert "## COMMENT PRESERVATION" in merged_text

package/scripts/tests/test_tracked_private_terms.py

@@ -60,6 +60,21 @@ def test_should_flag_a_tracked_file_naming_a_private_organization(
     assert "Acme" not in stdout_text
 
 
+def test_should_skip_a_changelog_that_names_a_private_organization(
+    tmp_path: Path,
+) -> None:
+    repository_root = tmp_path / "repo"
+    initialize_repository(repository_root)
+    write_text(
+        repository_root / "packages" / "tool" / "CHANGELOG.md",
+        "* Built by Acme Widgets.\n",
+    )
+    commit_tracked_files(repository_root)
+    exit_code, stdout_text, _stderr_text = run_policy(repository_root)
+    assert exit_code == SUCCESS_EXIT_CODE
+    assert stdout_text == ""
+
+
 def test_should_pass_a_tree_that_names_no_private_organization(
     tmp_path: Path,
 ) -> None:

package/scripts/tests/test_verification_notice.py

@@ -10,16 +10,23 @@ from pathlib import Path
 HOOKS_DIRECTORY = Path(__file__).resolve().parents[2] / "hooks" / "git-hooks"
 NOTICE_SCRIPT = HOOKS_DIRECTORY / "verification_notice.py"
 ALL_REMOTE_URLS = (
-    "https://github.com/JonEcho/python-automation.git",
-    "git@github.com:JonEcho/python-automation.git",
-    "ssh://git@github.com/JonEcho/python-automation.git",
+    "https://github.com/example-owner/example-repo.git",
+    "git@github.com:example-owner/example-repo.git",
+    "ssh://git@github.com/example-owner/example-repo.git",
 )
+TARGET_REPOSITORY_SETTING = "CLAUDE_VERIFICATION_TARGET_REPOSITORY"
+EXAMPLE_TARGET_REPOSITORY = "example-owner/example-repo"
 
 
 def run_notice(
     repository_path: Path,
     event_name: str = "commit",
+    target_repository: str | None = EXAMPLE_TARGET_REPOSITORY,
 ) -> subprocess.CompletedProcess[str]:
+    notice_environment = {**os.environ, "PYTHONIOENCODING": "utf-8"}
+    notice_environment.pop(TARGET_REPOSITORY_SETTING, None)
+    if target_repository is not None:
+        notice_environment[TARGET_REPOSITORY_SETTING] = target_repository
     return subprocess.run(
         [
             sys.executable,
@@ -33,7 +40,7 @@ def run_notice(
         capture_output=True,
         text=True,
         encoding="utf-8",
-        env={**os.environ, "PYTHONIOENCODING": "utf-8"},
+        env=notice_environment,
     )
 
 
@@ -41,7 +48,7 @@ def create_target_repository(
     temporary_directory: Path,
     remote_url: str,
 ) -> tuple[Path, str]:
-    repository_path = temporary_directory / "Jon Echo project with spaces Ω"
+    repository_path = temporary_directory / "Example project with spaces Ω"
     repository_path.mkdir(parents=True)
     run_git(repository_path, "init", "--quiet")
     run_git(repository_path, "config", "user.email", "test@example.invalid")
@@ -173,7 +180,7 @@ def test_notice_reports_pending_when_manifest_exists_without_report(
 ) -> None:
     repository_path, _ = create_target_repository(
         tmp_path,
-        "https://github.com/JonEcho/python-automation.git",
+        "https://github.com/example-owner/example-repo.git",
     )
     write_report(repository_path, {})
     (repository_path / ".git" / "local-verification" / "report.json").unlink()
@@ -199,7 +206,7 @@ def test_notice_ignores_unrelated_remote(tmp_path: Path) -> None:
 def test_notice_reports_failed_checks_without_pass_label(tmp_path: Path) -> None:
     repository_path, current_head = create_target_repository(
         tmp_path,
-        "https://github.com/JonEcho/python-automation.git",
+        "https://github.com/example-owner/example-repo.git",
     )
     write_report(repository_path, {"head": current_head, "status": "failed"})
     completed_notice = run_notice(repository_path)
@@ -213,7 +220,7 @@ def test_notice_reports_failed_checks_without_pass_label(tmp_path: Path) -> None
 def test_notice_reports_pass_only_for_complete_current_revision(tmp_path: Path) -> None:
     repository_path, _ = create_target_repository(
         tmp_path,
-        "https://github.com/JonEcho/python-automation.git",
+        "https://github.com/example-owner/example-repo.git",
     )
     current_head = write_passing_report(repository_path)
     completed_notice = run_notice(repository_path)
@@ -229,7 +236,7 @@ def test_notice_reports_pass_only_for_complete_current_revision(tmp_path: Path)
 def test_notice_handles_malformed_report_and_missing_repository(tmp_path: Path) -> None:
     repository_path, _ = create_target_repository(
         tmp_path,
-        "https://github.com/JonEcho/python-automation.git",
+        "https://github.com/example-owner/example-repo.git",
     )
     manifest_path = repository_path / "config" / "local-verification.json"
     manifest_path.parent.mkdir(exist_ok=True)
@@ -261,7 +268,7 @@ def test_notice_handles_malformed_report_and_missing_repository(tmp_path: Path)
 def test_notice_uses_worktree_specific_report_path(tmp_path: Path) -> None:
     repository_path, _ = create_target_repository(
         tmp_path / "main",
-        "https://github.com/JonEcho/python-automation.git",
+        "https://github.com/example-owner/example-repo.git",
     )
     linked_worktree_path = tmp_path / "linked worktree Ω"
     run_git(repository_path, "worktree", "add", "--detach", str(linked_worktree_path))
@@ -281,7 +288,7 @@ def test_notice_uses_worktree_specific_report_path(tmp_path: Path) -> None:
 def test_notice_accepts_complete_report_in_worktree_metadata(tmp_path: Path) -> None:
     repository_path, _ = create_target_repository(
         tmp_path / "main",
-        "https://github.com/JonEcho/python-automation.git",
+        "https://github.com/example-owner/example-repo.git",
     )
     current_head = write_passing_report(repository_path)
     linked_worktree_path = tmp_path / "linked worktree Ω"
@@ -312,7 +319,7 @@ def test_notice_accepts_complete_report_in_worktree_metadata(tmp_path: Path) ->
 def test_notice_invalidates_pass_after_worktree_edit(tmp_path: Path) -> None:
     repository_path, _ = create_target_repository(
         tmp_path,
-        "https://github.com/JonEcho/python-automation.git",
+        "https://github.com/example-owner/example-repo.git",
     )
     current_head = write_passing_report(repository_path)
     passed_notice = run_notice(repository_path)
@@ -329,7 +336,7 @@ def test_notice_invalidates_pass_after_worktree_edit(tmp_path: Path) -> None:
 def test_notice_invalidates_pass_after_origin_base_moves(tmp_path: Path) -> None:
     repository_path, _ = create_target_repository(
         tmp_path,
-        "https://github.com/JonEcho/python-automation.git",
+        "https://github.com/example-owner/example-repo.git",
     )
     current_head = write_passing_report(repository_path)
     passed_notice = run_notice(repository_path)
@@ -345,3 +352,12 @@ def test_notice_invalidates_pass_after_origin_base_moves(tmp_path: Path) -> None
     assert "State: passed" in passed_notice.stdout
     assert "Verified SHA: none" in moved_base_notice.stdout
     assert "State: unverified" in moved_base_notice.stdout
+
+
+def test_notice_stays_silent_without_a_configured_target(tmp_path: Path) -> None:
+    repository_path, _ = create_target_repository(tmp_path, ALL_REMOTE_URLS[0])
+
+    completed_process = run_notice(repository_path, target_repository=None)
+
+    assert completed_process.returncode == 0
+    assert completed_process.stdout == ""

package/.agents/skills/cert-classification-rule/SKILL.md

@@ -1,224 +0,0 @@
----
-name: cert-classification-rule
-description: Add or change a Samsung cert-failure classification rule (fixable, unfixable, mixed). Use when the user says add a fixable item, add an unfixable item, mark this rejection unfixable, add a mixed item, classify this cert rejection, or add a cert rule. Covers the unfixable pattern config, the paired production-path test, and the re-sort recipe for already-filed folders.
----
-
-# Cert-Failure Classification Rule
-
-Add or change how a Samsung Galaxy Store certification rejection is sorted into one of four
-buckets: `Fold`, `unfixable`, `mixed`, or `fixable`. A rejection lands in a bucket from its
-must-fix issue titles plus a Fold device check, and the bucket decides which subfolder holds
-the theme folder.
-
-## Contents
-
-- [When to use](#when-to-use)
-- [Procedure checklist](#procedure-checklist)
-- [The classification model](#the-classification-model)
-- [How to add an unfixable title pattern](#how-to-add-an-unfixable-title-pattern)
-- [How to add the paired production-path test](#how-to-add-the-paired-production-path-test)
-- [Re-sort already-filed folders for a day](#re-sort-already-filed-folders-for-a-day)
-- [Gotchas](#gotchas)
-- [File index](#file-index)
-- [Folder map](#folder-map)
-
-## When to use
-
-Use this skill when the user asks to:
-
-- add a fixable item, add an unfixable item, or add a mixed item
-- mark a rejection unfixable, or classify a cert rejection
-- add a cert rule
-
-Almost every such request is one new unfixable title pattern plus its paired test. The
-`fixable` and `mixed` buckets are not configured by hand (see the model below), so a request
-to "add a fixable item" usually means "stop treating this title as unfixable" or "confirm
-this title stays fixable with a guard test".
-
-### When a title pattern cannot help
-
-If the rejection's only unfixable cue lives in the report description (the `L_TESTRESULT`
-text, for example `*Not Identifiable`) and no must-fix title carries it, stop and tell the
-user this exact point:
-
-> This rejection's only unfixable signal is in the report description, not a must-fix title.
-> The classifier reads titles only, so no pattern here will catch it — teaching it to read
-> the description is a code change to the classifier, not a config rule.
-
-## Procedure checklist
-
-Copy this and check each item off as you go:
-
-- [ ] Confirm the unfixable cue is in a must-fix **title**, not only the description (see Gotchas).
-- [ ] Append the new `{pattern, label, review_note}` after the Gallery entry in `unfixable_patterns.json`.
-- [ ] Add a paired production-path test: the live title classifies as `unfixable`, plus a negative guard for an out-of-scope title.
-- [ ] Run the tests from the `shared_utils` directory and confirm green.
-- [ ] Re-sort the affected day folders with the re-sort recipe (dry run first, then `--apply`).
-
-## The classification model
-
-`classify_failure(issue_titles, unfixable_patterns)` in
-`shared_utils/samsung_utils/cert_failure_classifier.py:71` decides the bucket from the
-must-fix issue titles:
-
-- **unfixable** — every title matches an unfixable pattern.
-- **mixed** — some titles match, some do not. This bucket is **derived**, never configured.
-  The classifier returns it once at least one title matches an unfixable pattern and at least
-  one does not.
-- **fixable** — no title matches any unfixable pattern. This is the **default**: a rejection
-  needs no pattern to be fixable.
-- **None** — there are no must-fix titles at all.
-
-Only the `unfixable_patterns` list is authored. Adding an unfixable pattern is the only way to
-move a title out of the default `fixable` bucket.
-
-**Visibility auto-fix (Stage 1) also gates on these patterns.**
-`classify_visibility_failure_title` in `visibility_failure_classifier.py` calls
-`get_matched_unfixable_patterns` / `load_unfixable_patterns` so a title that maps to a
-curated colour slot still sets `is_blocked_from_auto_fix=True` (and
-`can_auto_fix(record)` is False) when it matches Gallery, Clock system-UI, lock-screen
-video wallpaper crop, Quick-panel preview mismatch, or any other unfixable pattern.
-Changing a pattern here therefore changes both folder sorting and visibility auto-fix
-eligibility.
-
-**Lock-screen video wallpaper crop stays UNFIXABLE.** Pad-to-canvas (`lock_wallpaper_cover`,
-#1449) and tall-aspect image-gen outpaint (`lock_aspect_regen`, #1454) were tried and
-abandoned; Themes Studio automation for this class was cancelled. Do not reopen a crop,
-outpaint, pad, or Primary/color autofix for Blue Edge-style "cut on both side(s)" titles.
-
-The categorizer (`FailureCategorizer.categorize_and_move` in
-`shared_utils/samsung_utils/cert_failure_processor/failure_categorizer.py:65`) runs the Fold
-device check and the classifier, then resolves a single bucket in
-`_resolve_category_priority` (`failure_categorizer.py:105`):
-
-- An `unfixable` or `mixed` classification overrides the detector — these are the
-  `severity_priority_buckets` in
-  `shared_utils/samsung_utils/config/cert_failure.py:76` (`("unfixable", "mixed")`).
-- A `Fold` detector category is kept only when the classification is `fixable`.
-- A `fixable` classification applies only when no detector matched.
-
-`FoldDetector` (`failure_categorizer.py:37`) matches the device regex `SM-F[79]\d{2}[A-Z]?` or
-the keyword `fold` (config in `cert_failure.py:52`).
-
-## How to add an unfixable title pattern
-
-Patterns live in `shared_utils/samsung_utils/config/unfixable_patterns.json` as a JSON list
-under the `unfixable_patterns` key. Each entry is `{pattern, label, review_note}`.
-
-**The Gallery entry stays first (index 0).** The tests in
-`test_cert_failure_classifier.py::TestDefaultConfigPath` assert `result[0]` is the Gallery
-pattern. Append every new pattern after it; never insert ahead of it.
-
-Live pattern shape, anchored on the rejected surface (Gallery is the shipped example):
-
-```json
-{
-  "pattern": "(?i)<surface>.*poor visibility|poor visibility.*<surface>",
-  "label": "<Surface> visibility",
-  "review_note": "<honest note about the issue>"
-}
-```
-
-`(?i)` is case-insensitive. The two-sided alternation matches the surface either before or
-after the "poor visibility" phrase, because Samsung phrases the same title both ways. Replace
-`<surface>` with the lowercase app or screen name (`settings`, `clock`, `calculator`). Match
-against the **title** text the report shows, not the description.
-
-### Writing the review_note honestly
-
-`review_note` is the message the per-pattern explanation would carry in a review reply.
-`DEFAULT_THEME_REVIEW_NOTES` still calls `compose_review_notes` with an empty matched-pattern
-list. Devices-only, Quick-panel, and sound-preview labels in `cert_portal_notes_update_config.all_labels`
-are the exception: `resubmit_via_notes_only_update` APPENDs those `review_note` sentences on
-the existing ThemeUpdateProcessor path (search → Re-register → Certification Notes). Write a
-truthful note, because it becomes the pasted sentence for those classes.
-
-Do **not** fabricate a "Samsung confirmed" claim. State only what is true. The shipped Gallery
-note is true because Samsung Support did confirm that issue; a new pattern for a different
-issue must not borrow that wording unless the confirmation happened.
-
-## How to add the paired production-path test
-
-Every new unfixable pattern gets a paired test in
-`shared_utils/samsung_utils/tests/test_cert_failure_classifier.py` that drives the production
-path:
-
-1. Load the patterns with `load_unfixable_patterns()` (no path argument, so it reads the
-   shipped config).
-2. Build the report HTML with the live must-fix title text, run it through
-   `extract_issue_titles`, then `classify_failure`, and assert the result is `unfixable`.
-3. Add a negative guard: an out-of-scope "poor visibility" title (a surface with no pattern)
-   classifies as `fixable`, so a future broad regex cannot silently swallow unrelated
-   rejections.
-
-Use the exact title strings Samsung's report produces. The existing
-`TestClassifyFailure::test_gallery_regex_matches_all_known_variants` shows the shape: a list of
-title variants, each asserted as `unfixable` through `classify_failure`.
-
-Run the tests from the `shared_utils` directory (its pytest config is anchored there):
-
-```bash
-cd shared_utils && C:\Python313\python.exe -m pytest samsung_utils/tests/test_cert_failure_classifier.py -q
-```
-
-## Re-sort already-filed folders for a day
-
-After adding a pattern, theme folders filed for an earlier day still sit in their old bucket.
-Run `scripts/resort_cert_folders.py` to recompute each theme's bucket with the new patterns and
-move any folder whose current bucket differs from the computed one. The script reuses the
-production `FailureCategorizer` decision helpers (`_parse_rejection_text`, `_detect_category`,
-`_classify_from_html`, `_resolve_category_priority`), so it stays in step with the live
-categorizer. It runs dry by default and moves only on `--apply`.
-
-Set `PYTHONPATH` to the repo root so the import resolves the edited `shared_utils` tree rather
-than a pip-editable install:
-
-```bash
-set PYTHONPATH=Y:\Information Technology\Scripts\Automation\Python
-C:\Python313\python.exe .claude\skills\cert-classification-rule\scripts\resort_cert_folders.py "<cert base path>" June 18 PRIMARY
-C:\Python313\python.exe .claude\skills\cert-classification-rule\scripts\resort_cert_folders.py "<cert base path>" June 18 PRIMARY --apply
-```
-
-Cert-failure folders live at `<base>\<Month>\<day>\<account_folder>\<bucket>\<theme>`, where
-`<account_folder>` is `Themes` for PRIMARY and `Theme Editor Themes` for SECONDARY
-(`AccountFolderConfig` in `shared_utils/web_automation/config/account.py:91`).
-
-`scripts/resort_cert_folders.py` passes the repo `code_rules_enforcer` Write hook: output goes
-through a `logger` with %-style format strings (no bare `print()`), the base path is an
-argument, every named value is a typed `dataclass` field rather than a module-level
-`UPPER_SNAKE` constant, and loop variables carry the `each_` prefix.
-
-## Gotchas
-
-- **Only titles are matched, never the description.** The classifier reads the must-fix issue
-  **titles** via the `L_TITLE` regex in `extract_issue_titles`
-  (`cert_failure_classifier.py:40`). The rejection description text — the `L_TESTRESULT` span,
-  for example a `*Not Identifiable` note — is **not** read by the classifier. A signal that
-  lives only in the description will not flag a title unless that title also matches a pattern.
-  When a rejection's only "unfixable" cue is in the description, no title pattern can catch it.
-- **Do not reopen crop autofix.** Lock-screen video wallpaper "cut on both side(s)" is
-  UNFIXABLE. Closed #1449 (pad-to-canvas) and #1454 (tall outpaint) must stay closed.
-- **The Gallery entry stays at index 0** of `unfixable_patterns.json`. Tests assert
-  `result[0]` is Gallery; append new patterns after it.
-- **"-" placeholders are excluded.** Recommended-table rows show a `-` title; `extract_issue_titles`
-  drops them, so they never count toward a classification.
-- **Run tests from the `shared_utils` directory.** Its pytest config (`testpaths`,
-  `asyncio_mode`) is anchored there. A run from the repo root will not collect the tests
-  correctly.
-- **Use `C:\Python313\python.exe`.** The repo-root `.venv` is a Linux/NAS virtual environment
-  with no `Scripts\python.exe` on Windows.
-- **Set `PYTHONPATH` to the repo root for the re-sort.** Without it, the import can resolve a
-  pip-editable install of `shared_utils` whose config lacks the freshly added pattern, so the
-  new pattern does not take effect.
-
-## File index
-
-| File | Purpose |
-|------|---------|
-| `SKILL.md` | This hub — the classification model, the add-a-rule procedure, the test recipe, and gotchas. |
-| `scripts/resort_cert_folders.py` | Re-sorts already-filed cert-failure folders for a day after a pattern change. Execute it (see the re-sort section); set `PYTHONPATH` to the repo root first. Dry-run by default, moves on `--apply`. |
-
-## Folder map
-
-- `SKILL.md` — hub.
-- `scripts/` — the re-sort utility, executed rather than read into context.

package/.agents/skills/cert-classification-rule/scripts/resort_cert_folders.py

@@ -1,158 +0,0 @@
-"""Re-sort already-filed cert-failure theme folders after the unfixable patterns change.
-
-Recomputes each theme's bucket from its HTML report using the production
-FailureCategorizer decision helpers, then moves folders whose current bucket no
-longer matches. Dry-run by default; pass --apply to move folders.
-"""
-
-import argparse
-import logging
-import shutil
-from dataclasses import dataclass
-from pathlib import Path
-
-from shared_utils.samsung_utils.cert_failure_processor.failure_categorizer import (
-    FailureCategorizer,
-)
-from shared_utils.web_automation.config.account import (
-    AccountType,
-    account_folder_config,
-)
-
-logger = logging.getLogger("resort_cert_folders")
-
-
-@dataclass(frozen=True)
-class ResortConfig:
-    """Naming and discovery constants for the re-sort pass."""
-
-    report_glob: str = "*_Report.html"
-    log_format: str = "%(message)s"
-
-
-@dataclass(frozen=True)
-class FolderMove:
-    """A single planned move from a theme's current bucket to its computed bucket."""
-
-    theme_folder: Path
-    current_bucket: str
-    computed_bucket: str
-
-
-def compute_bucket(categorizer: FailureCategorizer, theme_folder: Path, resort_config: ResortConfig) -> str | None:
-    """Compute the bucket a theme folder belongs in from its HTML report.
-
-    Args:
-        categorizer: The production categorizer holding the loaded unfixable patterns.
-        theme_folder: The theme folder containing the cert-failure HTML report.
-        resort_config: Discovery and logging constants for this pass.
-
-    Returns:
-        The computed bucket name, or None when no report is present or no bucket applies.
-    """
-    all_reports = list(theme_folder.glob(resort_config.report_glob))
-    if not all_reports:
-        logger.warning("No report for '%s' - skipping", theme_folder.name)
-        return None
-    html_content = all_reports[0].read_text(encoding="utf-8", errors="ignore")
-    rejection_text = categorizer._parse_rejection_text(html_content)
-    detector_category = categorizer._detect_category(html_content, rejection_text)
-    classification = categorizer._classify_from_html(html_content)
-    return categorizer._resolve_category_priority(detector_category, classification)
-
-
-def plan_moves(account_root: Path, categorizer: FailureCategorizer, resort_config: ResortConfig) -> list[FolderMove]:
-    """Plan every move needed to bring a day's account folder into line with the patterns.
-
-    Args:
-        account_root: The <base>/<Month>/<day>/<account_folder> directory to scan.
-        categorizer: The production categorizer holding the loaded unfixable patterns.
-        resort_config: Discovery and logging constants for this pass.
-
-    Returns:
-        One FolderMove per theme whose current bucket differs from its computed bucket.
-    """
-    planned_moves: list[FolderMove] = []
-    for each_bucket_dir in sorted(path for path in account_root.iterdir() if path.is_dir()):
-        current_bucket = each_bucket_dir.name
-        for each_theme in sorted(path for path in each_bucket_dir.iterdir() if path.is_dir()):
-            computed_bucket = compute_bucket(categorizer, each_theme, resort_config)
-            if computed_bucket is not None and computed_bucket != current_bucket:
-                planned_moves.append(
-                    FolderMove(
-                        theme_folder=each_theme,
-                        current_bucket=current_bucket,
-                        computed_bucket=computed_bucket,
-                    )
-                )
-    return planned_moves
-
-
-def apply_move(account_root: Path, folder_move: FolderMove) -> None:
-    """Move one theme folder into its computed bucket directory.
-
-    Args:
-        account_root: The <base>/<Month>/<day>/<account_folder> directory.
-        folder_move: The planned move to carry out.
-    """
-    target_dir = account_root / folder_move.computed_bucket
-    target_dir.mkdir(parents=True, exist_ok=True)
-    target_path = target_dir / folder_move.theme_folder.name
-    if target_path.exists():
-        logger.warning("Target exists for '%s' - skipping", folder_move.theme_folder.name)
-        return
-    shutil.move(str(folder_move.theme_folder), str(target_path))
-
-
-def run_resort(base_path: str, month: str, day: str, account_label: str, should_apply: bool) -> None:
-    """Plan and optionally apply a re-sort of one day's cert-failure folders.
-
-    Args:
-        base_path: The cert-failure base directory.
-        month: The month folder name (for example "June").
-        day: The day folder name (for example "18").
-        account_label: "PRIMARY" or "SECONDARY".
-        should_apply: When True, move folders; when False, only log the plan.
-    """
-    resort_config = ResortConfig()
-    logging.basicConfig(level=logging.INFO, format=resort_config.log_format)
-    account_type = AccountType[account_label]
-    account_folder = account_folder_config.get_folder_name(account_type)
-    account_root = Path(base_path) / month / day / account_folder
-    categorizer = FailureCategorizer(base_path)
-    planned_moves = plan_moves(account_root, categorizer, resort_config)
-    if not planned_moves:
-        logger.info("Nothing to re-sort in %s", account_root)
-        return
-    for each_move in planned_moves:
-        logger.info(
-            "%s: %s -> %s",
-            each_move.theme_folder.name,
-            each_move.current_bucket,
-            each_move.computed_bucket,
-        )
-        if should_apply:
-            apply_move(account_root, each_move)
-    logger.info("%d folder(s) %s", len(planned_moves), "moved" if should_apply else "planned (dry run)")
-
-
-def main() -> None:
-    """Parse arguments and run the re-sort pass."""
-    parser = argparse.ArgumentParser(description="Re-sort cert-failure folders after a pattern change.")
-    parser.add_argument("base_path", help="Cert-failure base directory.")
-    parser.add_argument("month", help='Month folder name, for example "June".')
-    parser.add_argument("day", help='Day folder name, for example "18".')
-    parser.add_argument("account", choices=["PRIMARY", "SECONDARY"], help="Account type.")
-    parser.add_argument("--apply", action="store_true", help="Move folders instead of dry-running.")
-    parsed_arguments = parser.parse_args()
-    run_resort(
-        parsed_arguments.base_path,
-        parsed_arguments.month,
-        parsed_arguments.day,
-        parsed_arguments.account,
-        parsed_arguments.apply,
-    )
-
-
-if __name__ == "__main__":
-    main()