elspais 0.11.0__py3-none-any.whl → 0.11.2__py3-none-any.whl

elspais/trace_view/review/status.py

@@ -28,22 +28,20 @@ VALID_STATUSES = {"Draft", "Active", "Deprecated"}
 # Regex pattern to match the status line in a requirement
 # Matches: **Level**: Dev | **Status**: Draft | **Implements**: REQ-xxx
 STATUS_LINE_PATTERN = re.compile(
-    r'^(\*\*Level\*\*:\s+(?:PRD|Ops|Dev)\s+\|\s+'
-    r'\*\*Status\*\*:\s+)(Draft|Active|Deprecated)'
-    r'(\s+\|\s+\*\*Implements\*\*:\s+[^\n]*?)$',
-    re.MULTILINE
+    r"^(\*\*Level\*\*:\s+(?:PRD|Ops|Dev)\s+\|\s+"
+    r"\*\*Status\*\*:\s+)(Draft|Active|Deprecated)"
+    r"(\s+\|\s+\*\*Implements\*\*:\s+[^\n]*?)$",
+    re.MULTILINE,
 )
 
 # Pattern to find a REQ header (supports both REQ-tv-xxx and REQ-SPONSOR-xxx formats)
 REQ_HEADER_PATTERN = re.compile(
-    r'^#{1,6}\s+REQ-(?:([A-Za-z]{2,4})-)?([pod]\d{5}):\s+(.+)$',
-    re.MULTILINE
+    r"^#{1,6}\s+REQ-(?:([A-Za-z]{2,4})-)?([pod]\d{5}):\s+(.+)$", re.MULTILINE
 )
 
 # Pattern to find the End footer with hash
 REQ_FOOTER_PATTERN = re.compile(
-    r'^\*End\* \*([^*]+)\* \| \*\*Hash\*\*: ([a-f0-9]{8})$',
-    re.MULTILINE
+    r"^\*End\* \*([^*]+)\* \| \*\*Hash\*\*: ([a-f0-9]{8})$", re.MULTILINE
 )
 
 
@@ -52,9 +50,11 @@ REQ_FOOTER_PATTERN = re.compile(
 # REQ-tv-d00015-A: Return structured location information
 # =============================================================================
 
+
 @dataclass
 class ReqLocation:
     """Location of a requirement in a spec file."""
+
     file_path: Path
     line_number: int  # 1-based line number of status line
     current_status: str
@@ -66,6 +66,7 @@ class ReqLocation:
 # REQ-tv-d00015-F: Content hash computation and update
 # =============================================================================
 
+
 def compute_req_hash(content: str) -> str:
     """
     Compute an 8-character hex hash of requirement content.
@@ -79,7 +80,7 @@ def compute_req_hash(content: str) -> str:
     Returns:
         8-character lowercase hex string
     """
-    return hashlib.sha256(content.encode('utf-8')).hexdigest()[:8]
+    return hashlib.sha256(content.encode("utf-8")).hexdigest()[:8]
 
 
 def _extract_req_content(file_content: str, req_id: str) -> Optional[Tuple[str, int, int]]:
@@ -96,18 +97,16 @@ def _extract_req_content(file_content: str, req_id: str) -> Optional[Tuple[str,
 
     # Build pattern for this specific requirement
     # Handle both "tv-d00010" and "HHT-d00001" formats
-    if '-' in normalized_id:
-        parts = normalized_id.split('-', 1)
+    if "-" in normalized_id:
+        parts = normalized_id.split("-", 1)
         prefix = parts[0]
         base_id = parts[1]
         header_pattern = re.compile(
-            rf'^#{{1,6}}\s+REQ-{re.escape(prefix)}-{re.escape(base_id)}:\s+(.+)$',
-            re.MULTILINE
+            rf"^#{{1,6}}\s+REQ-{re.escape(prefix)}-{re.escape(base_id)}:\s+(.+)$", re.MULTILINE
         )
     else:
         header_pattern = re.compile(
-            rf'^#{{1,6}}\s+REQ-{re.escape(normalized_id)}:\s+(.+)$',
-            re.MULTILINE
+            rf"^#{{1,6}}\s+REQ-{re.escape(normalized_id)}:\s+(.+)$", re.MULTILINE
         )
 
     header_match = header_pattern.search(file_content)
@@ -120,8 +119,7 @@ def _extract_req_content(file_content: str, req_id: str) -> Optional[Tuple[str,
     # Find the footer for this requirement
     # The footer format is: *End* *{title}* | **Hash**: {hash}
     footer_pattern = re.compile(
-        rf'^\*End\* \*{re.escape(req_title)}\* \| \*\*Hash\*\*: ([a-f0-9]{{8}})$',
-        re.MULTILINE
+        rf"^\*End\* \*{re.escape(req_title)}\* \| \*\*Hash\*\*: ([a-f0-9]{{8}})$", re.MULTILINE
     )
 
     # Search from after the header
@@ -155,8 +153,8 @@ def update_req_hash(file_path: Path, req_id: str) -> bool:
         True if hash was updated, False if requirement not found
     """
     try:
-        content = file_path.read_text(encoding='utf-8')
-    except (FileNotFoundError, IOError):
+        content = file_path.read_text(encoding="utf-8")
+    except (OSError, FileNotFoundError):
         return False
 
     result = _extract_req_content(content, req_id)
@@ -185,6 +183,7 @@ def update_req_hash(file_path: Path, req_id: str) -> bool:
 # REQ-tv-d00015-A: find_req_in_file() SHALL locate a requirement
 # =============================================================================
 
+
 def find_req_in_file(file_path: Path, req_id: str) -> Optional[ReqLocation]:
     """
     Find a requirement in a spec file and return its position info.
@@ -201,8 +200,8 @@ def find_req_in_file(file_path: Path, req_id: str) -> Optional[ReqLocation]:
         ReqLocation with req info if found, None otherwise
     """
     try:
-        content = file_path.read_text(encoding='utf-8')
-    except (FileNotFoundError, IOError):
+        content = file_path.read_text(encoding="utf-8")
+    except (OSError, FileNotFoundError):
         return None
 
     # Normalize req_id (remove REQ- prefix if present)
@@ -212,18 +211,16 @@ def find_req_in_file(file_path: Path, req_id: str) -> Optional[ReqLocation]:
 
     # Build pattern for this specific requirement
     # Handle both "tv-d00010" and "HHT-d00001" formats
-    if '-' in normalized_id:
-        parts = normalized_id.split('-', 1)
+    if "-" in normalized_id:
+        parts = normalized_id.split("-", 1)
         prefix = parts[0]
         base_id = parts[1]
         header_pattern = re.compile(
-            rf'^#{{1,6}}\s+REQ-{re.escape(prefix)}-{re.escape(base_id)}:\s+.+$',
-            re.MULTILINE
+            rf"^#{{1,6}}\s+REQ-{re.escape(prefix)}-{re.escape(base_id)}:\s+.+$", re.MULTILINE
         )
     else:
         header_pattern = re.compile(
-            rf'^#{{1,6}}\s+REQ-{re.escape(normalized_id)}:\s+.+$',
-            re.MULTILINE
+            rf"^#{{1,6}}\s+REQ-{re.escape(normalized_id)}:\s+.+$", re.MULTILINE
         )
 
     header_match = header_pattern.search(content)
@@ -246,13 +243,13 @@ def find_req_in_file(file_path: Path, req_id: str) -> Optional[ReqLocation]:
     current_status = status_match.group(2)
 
     # Calculate 1-based line number
-    line_number = content[:status_match.start()].count('\n') + 1
+    line_number = content[: status_match.start()].count("\n") + 1
 
     return ReqLocation(
         file_path=file_path,
         line_number=line_number,
         current_status=current_status,
-        req_id=normalized_id
+        req_id=normalized_id,
     )
 
 
@@ -273,7 +270,7 @@ def find_req_in_spec_dir(repo_root: Path, req_id: str) -> Optional[ReqLocation]:
     spec_dir = repo_root / "spec"
     if spec_dir.exists():
         for spec_file in spec_dir.glob("*.md"):
-            if spec_file.name in ('INDEX.md', 'README.md', 'requirements-format.md'):
+            if spec_file.name in ("INDEX.md", "README.md", "requirements-format.md"):
                 continue
             location = find_req_in_file(spec_file, req_id)
             if location:
@@ -287,7 +284,7 @@ def find_req_in_spec_dir(repo_root: Path, req_id: str) -> Optional[ReqLocation]:
                 sponsor_spec = sponsor / "spec"
                 if sponsor_spec.exists():
                     for spec_file in sponsor_spec.glob("*.md"):
-                        if spec_file.name in ('INDEX.md', 'README.md', 'requirements-format.md'):
+                        if spec_file.name in ("INDEX.md", "README.md", "requirements-format.md"):
                             continue
                         location = find_req_in_file(spec_file, req_id)
                         if location:
@@ -301,6 +298,7 @@ def find_req_in_spec_dir(repo_root: Path, req_id: str) -> Optional[ReqLocation]:
 # REQ-tv-d00015-B: get_req_status() SHALL read and return current status
 # =============================================================================
 
+
 def get_req_status(repo_root: Path, req_id: str) -> Optional[str]:
     """
     Get the current status of a requirement.
@@ -326,6 +324,7 @@ def get_req_status(repo_root: Path, req_id: str) -> Optional[str]:
 # REQ-tv-d00015-G: Failed status changes SHALL NOT corrupt the file
 # =============================================================================
 
+
 def _atomic_write_file(file_path: Path, content: str) -> None:
     """
     Atomically write content to a file.
@@ -341,13 +340,9 @@ def _atomic_write_file(file_path: Path, content: str) -> None:
     file_path.parent.mkdir(parents=True, exist_ok=True)
 
     # Write to temp file in same directory (for atomic rename)
-    fd, temp_path = tempfile.mkstemp(
-        suffix='.md',
-        prefix='.tmp_',
-        dir=file_path.parent
-    )
+    fd, temp_path = tempfile.mkstemp(suffix=".md", prefix=".tmp_", dir=file_path.parent)
     try:
-        with os.fdopen(fd, 'w', encoding='utf-8') as f:
+        with os.fdopen(fd, "w", encoding="utf-8") as f:
             f.write(content)
         # Atomic rename
         os.rename(temp_path, file_path)
@@ -363,12 +358,8 @@ def _atomic_write_file(file_path: Path, content: str) -> None:
 # REQ-tv-d00015-C: change_req_status() SHALL update status atomically
 # =============================================================================
 
-def change_req_status(
-    repo_root: Path,
-    req_id: str,
-    new_status: str,
-    user: str
-) -> Tuple[bool, str]:
+
+def change_req_status(repo_root: Path, req_id: str, new_status: str, user: str) -> Tuple[bool, str]:
     """
     Change the status of a requirement in its spec file.
 
@@ -396,7 +387,7 @@ def change_req_status(
     """
     # Validate new_status (REQ-tv-d00015-D)
     if new_status not in VALID_STATUSES:
-        valid_list = ', '.join(sorted(VALID_STATUSES))
+        valid_list = ", ".join(sorted(VALID_STATUSES))
         return (False, f"Invalid status '{new_status}'. Valid statuses: {valid_list}")
 
     # Find the requirement
@@ -410,8 +401,8 @@ def change_req_status(
 
     # Read the file content
     try:
-        content = location.file_path.read_text(encoding='utf-8')
-    except IOError as e:
+        content = location.file_path.read_text(encoding="utf-8")
+    except OSError as e:
         return (False, f"Failed to read spec file: {e}")
 
     # Normalize req_id for pattern matching
@@ -420,18 +411,16 @@ def change_req_status(
         normalized_id = normalized_id[4:]
 
     # Build pattern for this specific requirement header
-    if '-' in normalized_id:
-        parts = normalized_id.split('-', 1)
+    if "-" in normalized_id:
+        parts = normalized_id.split("-", 1)
         prefix = parts[0]
         base_id = parts[1]
         header_pattern = re.compile(
-            rf'^#{{1,6}}\s+REQ-{re.escape(prefix)}-{re.escape(base_id)}:\s+.+$',
-            re.MULTILINE
+            rf"^#{{1,6}}\s+REQ-{re.escape(prefix)}-{re.escape(base_id)}:\s+.+$", re.MULTILINE
         )
     else:
         header_pattern = re.compile(
-            rf'^#{{1,6}}\s+REQ-{re.escape(normalized_id)}:\s+.+$',
-            re.MULTILINE
+            rf"^#{{1,6}}\s+REQ-{re.escape(normalized_id)}:\s+.+$", re.MULTILINE
         )
 
     header_match = header_pattern.search(content)
@@ -451,16 +440,12 @@ def change_req_status(
     new_line = status_match.group(1) + new_status + status_match.group(3)
 
     # Replace the status line in content
-    new_content = (
-        content[:status_match.start()] +
-        new_line +
-        content[status_match.end():]
-    )
+    new_content = content[: status_match.start()] + new_line + content[status_match.end() :]
 
     # Write atomically (REQ-tv-d00015-G)
     try:
         _atomic_write_file(location.file_path, new_content)
-    except IOError as e:
+    except OSError as e:
         return (False, f"Failed to write spec file: {e}")
 
     # Update the hash (REQ-tv-d00015-F)

elspais/trace_view/review/storage.py

@@ -22,25 +22,25 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from .models import (
+    Approval,
+    Comment,
+    PackagesFile,
     ReviewConfig,
     ReviewFlag,
-    Thread,
-    Comment,
-    ThreadsFile,
+    ReviewPackage,
     StatusFile,
     StatusRequest,
-    Approval,
-    ReviewPackage,
-    PackagesFile,
+    Thread,
+    ThreadsFile,
     parse_iso_datetime,
 )
 
-
 # =============================================================================
 # Helper Functions
 # REQ-tv-d00011-A: Atomic write operations
 # =============================================================================
 
+
 def atomic_write_json(path: Path, data: Dict[str, Any]) -> None:
     """
     Atomically write JSON data to a file.
@@ -56,13 +56,9 @@ def atomic_write_json(path: Path, data: Dict[str, Any]) -> None:
     path.parent.mkdir(parents=True, exist_ok=True)
 
     # Write to temp file in same directory (for atomic rename)
-    fd, temp_path = tempfile.mkstemp(
-        suffix='.json',
-        prefix='.tmp_',
-        dir=path.parent
-    )
+    fd, temp_path = tempfile.mkstemp(suffix=".json", prefix=".tmp_", dir=path.parent)
     try:
-        with os.fdopen(fd, 'w') as f:
+        with os.fdopen(fd, "w") as f:
             json.dump(data, f, indent=2)
         # Atomic rename
         os.rename(temp_path, path)
@@ -87,7 +83,7 @@ def read_json(path: Path) -> Dict[str, Any]:
         FileNotFoundError: If file doesn't exist
         json.JSONDecodeError: If file contains invalid JSON
     """
-    with open(path, 'r') as f:
+    with open(path) as f:
         return json.load(f)
 
 
@@ -97,6 +93,7 @@ def read_json(path: Path) -> Dict[str, Any]:
 # REQ-tv-d00011-I: Requirement ID normalization
 # =============================================================================
 
+
 def normalize_req_id(req_id: str) -> str:
     """
     Normalize requirement ID for use in file paths.
@@ -109,7 +106,7 @@ def normalize_req_id(req_id: str) -> str:
     Returns:
         Normalized requirement ID safe for file paths
     """
-    return re.sub(r'[:/]', '_', req_id)
+    return re.sub(r"[:/]", "_", req_id)
 
 
 def get_reviews_root(repo_root: Path) -> Path:
@@ -124,7 +121,7 @@ def get_reviews_root(repo_root: Path) -> Path:
     Returns:
         Path to .reviews directory
     """
-    return repo_root / '.reviews'
+    return repo_root / ".reviews"
 
 
 def get_req_dir(repo_root: Path, req_id: str) -> Path:
@@ -141,7 +138,7 @@ def get_req_dir(repo_root: Path, req_id: str) -> Path:
         Path to requirement's review directory
     """
     normalized = normalize_req_id(req_id)
-    return get_reviews_root(repo_root) / 'reqs' / normalized
+    return get_reviews_root(repo_root) / "reqs" / normalized
 
 
 def get_threads_path(repo_root: Path, req_id: str) -> Path:
@@ -157,7 +154,7 @@ def get_threads_path(repo_root: Path, req_id: str) -> Path:
     Returns:
         Path to threads.json
     """
-    return get_req_dir(repo_root, req_id) / 'threads.json'
+    return get_req_dir(repo_root, req_id) / "threads.json"
 
 
 def get_status_path(repo_root: Path, req_id: str) -> Path:
@@ -173,7 +170,7 @@ def get_status_path(repo_root: Path, req_id: str) -> Path:
     Returns:
         Path to status.json
     """
-    return get_req_dir(repo_root, req_id) / 'status.json'
+    return get_req_dir(repo_root, req_id) / "status.json"
 
 
 def get_review_flag_path(repo_root: Path, req_id: str) -> Path:
@@ -189,7 +186,7 @@ def get_review_flag_path(repo_root: Path, req_id: str) -> Path:
     Returns:
         Path to flag.json
     """
-    return get_req_dir(repo_root, req_id) / 'flag.json'
+    return get_req_dir(repo_root, req_id) / "flag.json"
 
 
 def get_config_path(repo_root: Path) -> Path:
@@ -204,7 +201,7 @@ def get_config_path(repo_root: Path) -> Path:
     Returns:
         Path to config.json
     """
-    return get_reviews_root(repo_root) / 'config.json'
+    return get_reviews_root(repo_root) / "config.json"
 
 
 def get_packages_path(repo_root: Path) -> Path:
@@ -219,7 +216,7 @@ def get_packages_path(repo_root: Path) -> Path:
     Returns:
         Path to packages.json
     """
-    return get_reviews_root(repo_root) / 'packages.json'
+    return get_reviews_root(repo_root) / "packages.json"
 
 
 # =============================================================================
@@ -227,6 +224,7 @@ def get_packages_path(repo_root: Path) -> Path:
 # REQ-d00096: Review Storage Architecture
 # =============================================================================
 
+
 def get_index_path(repo_root: Path) -> Path:
     """
     Get path to index.json file (v2 format).
@@ -239,7 +237,7 @@ def get_index_path(repo_root: Path) -> Path:
     Returns:
         Path to index.json
     """
-    return get_reviews_root(repo_root) / 'index.json'
+    return get_reviews_root(repo_root) / "index.json"
 
 
 def get_package_dir(repo_root: Path, package_id: str) -> Path:
@@ -255,7 +253,7 @@ def get_package_dir(repo_root: Path, package_id: str) -> Path:
     Returns:
         Path to package directory
     """
-    return get_reviews_root(repo_root) / 'packages' / package_id
+    return get_reviews_root(repo_root) / "packages" / package_id
 
 
 def get_package_metadata_path(repo_root: Path, package_id: str) -> Path:
@@ -271,7 +269,7 @@ def get_package_metadata_path(repo_root: Path, package_id: str) -> Path:
     Returns:
         Path to package.json
     """
-    return get_package_dir(repo_root, package_id) / 'package.json'
+    return get_package_dir(repo_root, package_id) / "package.json"
 
 
 def get_package_threads_path(repo_root: Path, package_id: str, req_id: str) -> Path:
@@ -289,7 +287,7 @@ def get_package_threads_path(repo_root: Path, package_id: str, req_id: str) -> P
         Path to threads.json
     """
     normalized = normalize_req_id(req_id)
-    return get_package_dir(repo_root, package_id) / 'reqs' / normalized / 'threads.json'
+    return get_package_dir(repo_root, package_id) / "reqs" / normalized / "threads.json"
 
 
 def get_archive_dir(repo_root: Path) -> Path:
@@ -304,7 +302,7 @@ def get_archive_dir(repo_root: Path) -> Path:
     Returns:
         Path to archive directory
     """
-    return get_reviews_root(repo_root) / 'archive'
+    return get_reviews_root(repo_root) / "archive"
 
 
 def get_archived_package_dir(repo_root: Path, package_id: str) -> Path:
@@ -336,14 +334,10 @@ def get_archived_package_metadata_path(repo_root: Path, package_id: str) -> Path
     Returns:
         Path to archived package.json
     """
-    return get_archived_package_dir(repo_root, package_id) / 'package.json'
+    return get_archived_package_dir(repo_root, package_id) / "package.json"
 
 
-def get_archived_package_threads_path(
-    repo_root: Path,
-    package_id: str,
-    req_id: str
-) -> Path:
+def get_archived_package_threads_path(repo_root: Path, package_id: str, req_id: str) -> Path:
     """
     Get path to threads.json file for a requirement within an archived package.
 
@@ -358,7 +352,7 @@ def get_archived_package_threads_path(
         Path to archived threads.json
     """
     normalized = normalize_req_id(req_id)
-    return get_archived_package_dir(repo_root, package_id) / 'reqs' / normalized / 'threads.json'
+    return get_archived_package_dir(repo_root, package_id) / "reqs" / normalized / "threads.json"
 
 
 # =============================================================================
@@ -366,6 +360,7 @@ def get_archived_package_threads_path(
 # REQ-tv-d00011-F: Config storage operations
 # =============================================================================
 
+
 def load_config(repo_root: Path) -> ReviewConfig:
     """
     Load review system configuration.
@@ -404,6 +399,7 @@ def save_config(repo_root: Path, config: ReviewConfig) -> None:
 # REQ-tv-d00011-D: Review flag storage operations
 # =============================================================================
 
+
 def load_review_flag(repo_root: Path, req_id: str) -> ReviewFlag:
     """
     Load review flag for a requirement.
@@ -444,6 +440,7 @@ def save_review_flag(repo_root: Path, req_id: str, flag: ReviewFlag) -> None:
 # REQ-tv-d00011-B: Thread storage operations
 # =============================================================================
 
+
 def load_threads(repo_root: Path, req_id: str) -> ThreadsFile:
     """
     Load threads for a requirement.
@@ -501,11 +498,7 @@ def add_thread(repo_root: Path, req_id: str, thread: Thread) -> Thread:
 
 
 def add_comment_to_thread(
-    repo_root: Path,
-    req_id: str,
-    thread_id: str,
-    author: str,
-    body: str
+    repo_root: Path, req_id: str, thread_id: str, author: str, body: str
 ) -> Comment:
     """
     Add a comment to an existing thread.
@@ -542,12 +535,7 @@ def add_comment_to_thread(
     return comment
 
 
-def resolve_thread(
-    repo_root: Path,
-    req_id: str,
-    thread_id: str,
-    user: str
-) -> bool:
+def resolve_thread(repo_root: Path, req_id: str, thread_id: str, user: str) -> bool:
     """
     Mark a thread as resolved.
 
@@ -603,6 +591,7 @@ def unresolve_thread(repo_root: Path, req_id: str, thread_id: str) -> bool:
 # REQ-tv-d00011-C: Status request storage operations
 # =============================================================================
 
+
 def load_status_requests(repo_root: Path, req_id: str) -> StatusFile:
     """
     Load status requests for a requirement.
@@ -639,11 +628,7 @@ def save_status_requests(repo_root: Path, req_id: str, status_file: StatusFile)
     atomic_write_json(status_path, status_file.to_dict())
 
 
-def create_status_request(
-    repo_root: Path,
-    req_id: str,
-    request: StatusRequest
-) -> StatusRequest:
+def create_status_request(repo_root: Path, req_id: str, request: StatusRequest) -> StatusRequest:
     """
     Create a new status change request.
 
@@ -669,7 +654,7 @@ def add_approval(
     request_id: str,
     user: str,
     decision: str,
-    comment: Optional[str] = None
+    comment: Optional[str] = None,
 ) -> Approval:
     """
     Add an approval to a status request.
@@ -740,6 +725,7 @@ def mark_request_applied(repo_root: Path, req_id: str, request_id: str) -> bool:
 # REQ-tv-d00011-E: Package storage operations
 # =============================================================================
 
+
 def load_packages(repo_root: Path) -> PackagesFile:
     """
     Load packages file.
@@ -907,6 +893,7 @@ def remove_req_from_package(repo_root: Path, package_id: str, req_id: str) -> bo
 # REQ-tv-d00011-J: Deduplication and timestamp-based conflict resolution
 # =============================================================================
 
+
 def merge_threads(local: ThreadsFile, remote: ThreadsFile) -> ThreadsFile:
     """
     Merge thread files from local and remote.
@@ -985,7 +972,7 @@ def _merge_single_thread(local: Thread, remote: Thread) -> Thread:
         resolved=resolved,
         resolvedBy=resolved_by,
         resolvedAt=resolved_at,
-        comments=merged_comments
+        comments=merged_comments,
     )
 
 
@@ -1073,7 +1060,7 @@ def _merge_single_request(local: StatusRequest, remote: StatusRequest) -> Status
         justification=local.justification,
         approvals=merged_approvals,
         requiredApprovers=local.requiredApprovers,
-        state=local.state  # Will be recalculated
+        state=local.state,  # Will be recalculated
     )
 
     # Recalculate state based on merged approvals
@@ -1125,7 +1112,7 @@ def merge_review_flags(local: ReviewFlag, remote: ReviewFlag) -> ReviewFlag:
             flaggedBy=remote.flaggedBy,
             flaggedAt=remote.flaggedAt,
             reason=remote.reason,
-            scope=merged_scope
+            scope=merged_scope,
         )
     else:
         # Local is newer
@@ -1134,7 +1121,7 @@ def merge_review_flags(local: ReviewFlag, remote: ReviewFlag) -> ReviewFlag:
             flaggedBy=local.flaggedBy,
             flaggedAt=local.flaggedAt,
             reason=local.reason,
-            scope=merged_scope
+            scope=merged_scope,
         )
 
 
@@ -1143,12 +1130,8 @@ def merge_review_flags(local: ReviewFlag, remote: ReviewFlag) -> ReviewFlag:
 # REQ-d00097: Review Package Archival
 # =============================================================================
 
-def archive_package(
-    repo_root: Path,
-    package_id: str,
-    reason: str,
-    user: str
-) -> bool:
+
+def archive_package(repo_root: Path, package_id: str, reason: str, user: str) -> bool:
     """
     Archive a package by moving it to the archive directory.
 
@@ -1169,9 +1152,9 @@ def archive_package(
         ValueError: If reason is not valid
     """
     from .models import (
-        ARCHIVE_REASON_RESOLVED,
         ARCHIVE_REASON_DELETED,
         ARCHIVE_REASON_MANUAL,
+        ARCHIVE_REASON_RESOLVED,
     )
 
     valid_reasons = {ARCHIVE_REASON_RESOLVED, ARCHIVE_REASON_DELETED, ARCHIVE_REASON_MANUAL}
@@ -1239,7 +1222,7 @@ def list_archived_packages(repo_root: Path) -> List[ReviewPackage]:
     packages = []
     for pkg_dir in archive_root.iterdir():
         if pkg_dir.is_dir():
-            metadata_path = pkg_dir / 'package.json'
+            metadata_path = pkg_dir / "package.json"
             if metadata_path.exists():
                 try:
                     data = read_json(metadata_path)
@@ -1250,10 +1233,7 @@ def list_archived_packages(repo_root: Path) -> List[ReviewPackage]:
                     continue
 
     # Sort by archive date (most recent first)
-    packages.sort(
-        key=lambda p: p.archivedAt or '',
-        reverse=True
-    )
+    packages.sort(key=lambda p: p.archivedAt or "", reverse=True)
 
     return packages
 
@@ -1282,11 +1262,7 @@ def get_archived_package(repo_root: Path, package_id: str) -> Optional[ReviewPac
         return None
 
 
-def load_archived_threads(
-    repo_root: Path,
-    package_id: str,
-    req_id: str
-) -> Optional[ThreadsFile]:
+def load_archived_threads(repo_root: Path, package_id: str, req_id: str) -> Optional[ThreadsFile]:
     """
     Load threads for a requirement from an archived package.