Fix linter issues with StrEnum and parameters

Author: djm81

src/specfact_cli/generators/report_generator.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import json
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 
 from beartype import beartype
@@ -14,7 +14,7 @@
 from specfact_cli.utils.structured_io import StructuredFormat, dump_structured_file
 
 
-class ReportFormat(str, Enum):
+class ReportFormat(StrEnum):
     """Report output format."""
 
     MARKDOWN = "markdown"

src/specfact_cli/merge/resolver.py

@@ -8,7 +8,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from beartype import beartype
@@ -17,7 +17,7 @@
 from specfact_cli.models.project import BundleManifest, ProjectBundle
 
 
-class MergeStrategy(str, Enum):
+class MergeStrategy(StrEnum):
     """Merge resolution strategy."""
 
     AUTO = "auto"  # Automatic resolution based on persona ownership
@@ -102,7 +102,7 @@ def resolve(
         if self._sections_disjoint(ours, theirs):
             # No conflicts - merge all changes
             merged = self._merge_sections(base, ours, theirs)
-            return MergeResolution(merged_bundle=merged, conflicts=[], auto_resolved=0, manual_resolved=0, unresolved=0)
+            return MergeResolution(merged, [], 0, 0, 0)
 
         # Rule 2: Find conflicts and resolve based on persona ownership
         field_conflicts = self._find_conflicts(base, ours, theirs)
@@ -161,11 +161,11 @@ def resolve(
             conflicts.append(conflict)
 
         return MergeResolution(
-            merged_bundle=merged,
-            conflicts=conflicts,
-            auto_resolved=auto_resolved,
-            manual_resolved=manual_resolved,
-            unresolved=unresolved,
+            merged,
+            conflicts,
+            auto_resolved,
+            manual_resolved,
+            unresolved,
         )
 
     @beartype

src/specfact_cli/models/bridge.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 
 from beartype import beartype
@@ -19,7 +19,7 @@
 from specfact_cli.utils.structured_io import StructuredFormat, dump_structured_file, load_structured_file
 
 
-class AdapterType(str, Enum):
+class AdapterType(StrEnum):
     """Supported adapter types."""
 
     SPECKIT = "speckit"

src/specfact_cli/models/change.py

@@ -12,7 +12,7 @@
 
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from icontract import ensure, require
@@ -22,7 +22,7 @@
 from specfact_cli.models.source_tracking import SourceTracking
 
 
-class ChangeType(str, Enum):
+class ChangeType(StrEnum):
     """Change type for delta specs (tool-agnostic)."""
 
     ADDED = "added"

src/specfact_cli/models/contract.py

@@ -17,7 +17,7 @@
 
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 from typing import Any
 
@@ -26,7 +26,7 @@
 from pydantic import BaseModel, Field
 
 
-class ContractStatus(str, Enum):
+class ContractStatus(StrEnum):
     """Contract status levels."""
 
     DRAFT = "draft"  # Initial contract, not validated

src/specfact_cli/models/deviation.py

@@ -7,22 +7,22 @@
 
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 
 from beartype import beartype
 from icontract import ensure, require
 from pydantic import BaseModel, Field
 
 
-class DeviationSeverity(str, Enum):
+class DeviationSeverity(StrEnum):
     """Deviation severity level."""
 
     HIGH = "HIGH"
     MEDIUM = "MEDIUM"
     LOW = "LOW"
 
 
-class DeviationType(str, Enum):
+class DeviationType(StrEnum):
     """Type of deviation."""
 
     MISSING_FEATURE = "missing_feature"

src/specfact_cli/models/enforcement.py

@@ -1,21 +1,21 @@
 """Enforcement configuration models for quality gates."""
 
-from enum import Enum
+from enum import StrEnum
 
 from beartype import beartype
 from icontract import ensure, require
 from pydantic import BaseModel, Field
 
 
-class EnforcementAction(str, Enum):
+class EnforcementAction(StrEnum):
     """Actions that can be taken when a deviation is detected."""
 
     BLOCK = "BLOCK"  # Fail the validation (exit code 1)
     WARN = "WARN"  # Show warning but continue (exit code 0)
     LOG = "LOG"  # Only log, no warning (exit code 0)
 
 
-class EnforcementPreset(str, Enum):
+class EnforcementPreset(StrEnum):
     """Predefined enforcement presets."""
 
     MINIMAL = "minimal"  # Log everything, never block

src/specfact_cli/models/persona_template.py

@@ -8,15 +8,15 @@
 
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from beartype import beartype
 from icontract import ensure, require
 from pydantic import BaseModel, Field
 
 
-class SectionType(str, Enum):
+class SectionType(StrEnum):
     """Section type classification."""
 
     REQUIRED = "required"  # Must be present in export/import

src/specfact_cli/models/project.py

@@ -13,7 +13,7 @@
 from collections.abc import Callable
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from datetime import UTC, datetime
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 from typing import Any
 
@@ -33,7 +33,7 @@
 )
 
 
-class BundleFormat(str, Enum):
+class BundleFormat(StrEnum):
     """Bundle format types."""
 
     MONOLITHIC = "monolithic"  # Single file with all aspects

src/specfact_cli/models/task.py

@@ -7,14 +7,14 @@
 
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 
 from beartype import beartype
 from icontract import ensure, require
 from pydantic import BaseModel, Field
 
 
-class TaskPhase(str, Enum):
+class TaskPhase(StrEnum):
     """Task execution phases."""
 
     SETUP = "setup"  # Project structure, dependencies, config
@@ -23,7 +23,7 @@ class TaskPhase(str, Enum):
     POLISH = "polish"  # Tests, docs, optimization
 
 
-class TaskStatus(str, Enum):
+class TaskStatus(StrEnum):
     """Task completion status."""
 
     PENDING = "pending"