cicada-mcp 0.1.7__py3-none-any.whl → 0.2.0__py3-none-any.whl

cicada/utils/hash_utils.py

@@ -10,7 +10,6 @@ import json
 import os
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Dict, List, Tuple
 
 
 def compute_file_hash(file_path: str) -> str:
@@ -38,12 +37,12 @@ def compute_file_hash(file_path: str) -> str:
                 hash_md5.update(chunk)
         return hash_md5.hexdigest()
     except FileNotFoundError:
-        raise FileNotFoundError(f"File not found: {file_path}")
+        raise FileNotFoundError(f"File not found: {file_path}") from None
     except Exception as e:
-        raise IOError(f"Error reading file {file_path}: {e}")
+        raise OSError(f"Error reading file {file_path}: {e}") from e
 
 
-def load_file_hashes(cicada_dir: str) -> Dict[str, str]:
+def load_file_hashes(cicada_dir: str) -> dict[str, str]:
     """
     Load file hashes from .cicada/hashes.json.
 
@@ -60,15 +59,15 @@ def load_file_hashes(cicada_dir: str) -> Dict[str, str]:
         return {}
 
     try:
-        with open(hashes_path, "r", encoding="utf-8") as f:
+        with open(hashes_path, encoding="utf-8") as f:
             data = json.load(f)
             return data.get("hashes", {})
-    except (json.JSONDecodeError, IOError) as e:
+    except (OSError, json.JSONDecodeError) as e:
         print(f"Warning: Could not load hashes.json: {e}")
         return {}
 
 
-def save_file_hashes(cicada_dir: str, hashes: Dict[str, str]) -> None:
+def save_file_hashes(cicada_dir: str, hashes: dict[str, str]) -> None:
     """
     Save file hashes to .cicada/hashes.json.
 
@@ -90,13 +89,13 @@ def save_file_hashes(cicada_dir: str, hashes: Dict[str, str]) -> None:
     try:
         with open(hashes_path, "w", encoding="utf-8") as f:
             json.dump(data, f, indent=2)
-    except IOError as e:
+    except OSError as e:
         print(f"Warning: Could not save hashes.json: {e}")
 
 
 def detect_file_changes(
-    files: List[str], old_hashes: Dict[str, str], repo_path: str | None = None
-) -> Tuple[List[str], List[str], List[str]]:
+    files: list[str], old_hashes: dict[str, str], repo_path: str | None = None
+) -> tuple[list[str], list[str], list[str]]:
     """
     Detect new, modified, and deleted files by comparing hashes.
 
@@ -137,7 +136,7 @@ def detect_file_changes(
                 current_hash = compute_file_hash(full_path)
                 if current_hash != old_hashes[file_path]:
                     modified_files.append(file_path)
-            except (FileNotFoundError, IOError) as e:
+            except (OSError, FileNotFoundError) as e:
                 # File might have been deleted after listing
                 print(f"Warning: Could not hash {file_path}: {e}")
                 deleted_files.append(file_path)
@@ -145,9 +144,7 @@ def detect_file_changes(
     return new_files, modified_files, deleted_files
 
 
-def compute_hashes_for_files(
-    files: List[str], repo_path: str | None = None
-) -> Dict[str, str]:
+def compute_hashes_for_files(files: list[str], repo_path: str | None = None) -> dict[str, str]:
     """
     Compute MD5 hashes for a list of files.
 
@@ -167,7 +164,7 @@ def compute_hashes_for_files(
 
         try:
             hashes[file_path] = compute_file_hash(full_path)
-        except (FileNotFoundError, IOError) as e:
+        except (OSError, FileNotFoundError) as e:
             print(f"Warning: Could not hash {file_path}: {e}")
 
     return hashes

cicada/utils/index_utils.py

@@ -8,14 +8,14 @@ JSON index files with consistent error handling.
 import json
 import sys
 from pathlib import Path
-from typing import Optional, Dict, Any, Union
+from typing import Any
 
 
 def load_index(
-    index_path: Union[str, Path],
+    index_path: str | Path,
     verbose: bool = False,
     raise_on_error: bool = False,
-) -> Optional[Dict[str, Any]]:
+) -> dict[str, Any] | None:
     """
     Load a JSON index file.
 
@@ -42,7 +42,7 @@ def load_index(
         return None
 
     try:
-        with open(index_file, "r") as f:
+        with open(index_file) as f:
             return json.load(f)
     except json.JSONDecodeError as e:
         if raise_on_error:
@@ -50,7 +50,7 @@ def load_index(
         if verbose:
             print(f"Warning: Could not parse index: {e}", file=sys.stderr)
         return None
-    except IOError as e:
+    except OSError as e:
         if raise_on_error:
             raise
         if verbose:
@@ -59,8 +59,8 @@ def load_index(
 
 
 def save_index(
-    index: Dict[str, Any],
-    output_path: Union[str, Path],
+    index: dict[str, Any],
+    output_path: str | Path,
     indent: int = 2,
     create_dirs: bool = True,
     verbose: bool = False,
@@ -93,8 +93,8 @@ def save_index(
 
 def validate_index_structure(
     index: Any,
-    required_keys: Optional[list[str]] = None,
-) -> tuple[bool, Optional[str]]:
+    required_keys: list[str] | None = None,
+) -> tuple[bool, str | None]:
     """
     Validate the structure of an index dictionary.
 
@@ -133,9 +133,9 @@ def validate_index_structure(
 
 
 def merge_indexes(
-    *indexes: Dict[str, Any],
+    *indexes: dict[str, Any],
     strategy: str = "last_wins",
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     """
     Merge multiple index dictionaries.
 
@@ -180,7 +180,7 @@ def merge_indexes(
     return merged
 
 
-def get_index_stats(index: Dict[str, Any]) -> Dict[str, Any]:
+def get_index_stats(index: dict[str, Any]) -> dict[str, Any]:
     """
     Get statistics about an index.
 
@@ -226,10 +226,10 @@ def get_index_stats(index: Dict[str, Any]) -> Dict[str, Any]:
 
 
 def merge_indexes_incremental(
-    old_index: Dict[str, Any],
-    new_index: Dict[str, Any],
+    old_index: dict[str, Any],
+    new_index: dict[str, Any],
     deleted_files: list[str],
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     """
     Merge old and new indexes for incremental reindexing.
 

cicada/utils/path_utils.py

@@ -6,11 +6,10 @@ functions used throughout the codebase.
 """
 
 from pathlib import Path
-from typing import Optional, Union
 
 
 def normalize_file_path(
-    file_path: Union[str, Path],
+    file_path: str | Path,
     strip_leading_dot: bool = True,
     strip_trailing_whitespace: bool = True,
 ) -> str:
@@ -43,8 +42,8 @@ def normalize_file_path(
 
 
 def resolve_to_repo_root(
-    file_path: Union[str, Path],
-    repo_root: Union[str, Path],
+    file_path: str | Path,
+    repo_root: str | Path,
 ) -> Path:
     """
     Resolve a file path relative to repository root.
@@ -77,12 +76,12 @@ def resolve_to_repo_root(
     try:
         return file_path_obj.relative_to(repo_root_obj)
     except ValueError:
-        raise ValueError(f"File path {file_path} is not within repository {repo_root}")
+        raise ValueError(f"File path {file_path} is not within repository {repo_root}") from None
 
 
 def match_file_path(
-    candidate: Union[str, Path],
-    target: Union[str, Path],
+    candidate: str | Path,
+    target: str | Path,
     normalize: bool = True,
 ) -> bool:
     """
@@ -122,13 +121,10 @@ def match_file_path(
         return True
 
     # Target ends with candidate (partial path provided)
-    if target_str.endswith(candidate_str):
-        return True
-
-    return False
+    return bool(target_str.endswith(candidate_str))
 
 
-def find_repo_root(start_path: Optional[Union[str, Path]] = None) -> Optional[Path]:
+def find_repo_root(start_path: str | Path | None = None) -> Path | None:
     """
     Find the git repository root starting from a given path.
 
@@ -142,10 +138,7 @@ def find_repo_root(start_path: Optional[Union[str, Path]] = None) -> Optional[Pa
         find_repo_root('/repo/lib/user') -> Path('/repo')
         find_repo_root('/not/a/repo') -> None
     """
-    if start_path is None:
-        current = Path.cwd()
-    else:
-        current = Path(start_path).resolve()
+    current = Path.cwd() if start_path is None else Path(start_path).resolve()
 
     # Walk up the directory tree looking for .git
     for parent in [current] + list(current.parents):
@@ -156,8 +149,8 @@ def find_repo_root(start_path: Optional[Union[str, Path]] = None) -> Optional[Pa
 
 
 def ensure_relative_to_repo(
-    file_path: Union[str, Path],
-    repo_root: Union[str, Path],
+    file_path: str | Path,
+    repo_root: str | Path,
 ) -> str:
     """
     Ensure a file path is relative to the repository root.
@@ -181,7 +174,7 @@ def ensure_relative_to_repo(
     return normalize_file_path(resolved)
 
 
-def ensure_gitignore_has_cicada(repo_root: Union[str, Path]) -> bool:
+def ensure_gitignore_has_cicada(repo_root: str | Path) -> bool:
     """
     Ensure .gitignore contains .cicada/ directory entry.
 
@@ -207,7 +200,7 @@ def ensure_gitignore_has_cicada(repo_root: Union[str, Path]) -> bool:
 
     try:
         # Read existing .gitignore
-        with open(gitignore_path, "r") as f:
+        with open(gitignore_path) as f:
             content = f.read()
 
         # Check if .cicada/ is already present in actual gitignore patterns
@@ -215,15 +208,17 @@ def ensure_gitignore_has_cicada(repo_root: Union[str, Path]) -> bool:
         for line in content.splitlines():
             # Strip whitespace and skip empty lines and comments
             stripped = line.strip()
-            if stripped and not stripped.startswith("#"):
-                # Check if this line contains .cicada as a gitignore pattern
-                # Valid patterns: .cicada, .cicada/, /.cicada, /.cicada/, **/.cicada/, etc.
-                if (
+            # Check if this line contains .cicada as a gitignore pattern
+            # Valid patterns: .cicada, .cicada/, /.cicada, /.cicada/, **/.cicada/, etc.
+            if (
+                stripped
+                and not stripped.startswith("#")
+                and (
                     stripped in (".cicada", ".cicada/")
-                    or stripped.endswith("/.cicada")
-                    or stripped.endswith("/.cicada/")
-                ):
-                    return False
+                    or stripped.endswith(("/.cicada", "/.cicada/"))
+                )
+            ):
+                return False
 
         # Add .cicada/ to .gitignore
         with open(gitignore_path, "a") as f:
@@ -235,6 +230,6 @@ def ensure_gitignore_has_cicada(repo_root: Union[str, Path]) -> bool:
 
         return True
 
-    except (IOError, OSError):
+    except OSError:
         # Fail silently if we can't read/write the file
         return False

cicada/utils/signature_builder.py

@@ -5,7 +5,7 @@ This module provides utilities for formatting function signatures,
 eliminating duplication across the formatter module.
 """
 
-from typing import Dict, List, Any
+from typing import Any
 
 
 class SignatureBuilder:
@@ -17,7 +17,7 @@ class SignatureBuilder:
     """
 
     @staticmethod
-    def build(func: Dict[str, Any]) -> str:
+    def build(func: dict[str, Any]) -> str:
         """
         Build a formatted function signature.
 
@@ -78,7 +78,7 @@ class SignatureBuilder:
         return signature
 
     @staticmethod
-    def _format_args_with_types(args_with_types: List[Dict[str, str]]) -> str:
+    def _format_args_with_types(args_with_types: list[dict[str, str]]) -> str:
         """
         Format arguments with type annotations.
 

cicada/utils/subprocess_runner.py

@@ -5,10 +5,10 @@ This module provides centralized subprocess execution with consistent
 error handling and logging patterns.
 """
 
+import shlex
 import subprocess
 import sys
 from pathlib import Path
-from typing import Optional, List, Union
 
 
 class SubprocessRunner:
@@ -20,7 +20,7 @@ class SubprocessRunner:
     error handling.
     """
 
-    def __init__(self, cwd: Optional[Union[str, Path]] = None, verbose: bool = False):
+    def __init__(self, cwd: str | Path | None = None, verbose: bool = False):
         """
         Initialize the subprocess runner.
 
@@ -33,11 +33,11 @@ class SubprocessRunner:
 
     def run(
         self,
-        cmd: Union[str, List[str]],
+        cmd: str | list[str],
         capture_output: bool = True,
         text: bool = True,
         check: bool = True,
-        timeout: Optional[int] = None,
+        timeout: int | None = None,
     ) -> subprocess.CompletedProcess:
         """
         Run a subprocess command with error handling.
@@ -56,6 +56,10 @@ class SubprocessRunner:
             subprocess.CalledProcessError: If command fails and check=True
             subprocess.TimeoutExpired: If timeout is reached
         """
+        # Convert string commands to list for safety and compatibility
+        if isinstance(cmd, str):
+            cmd = shlex.split(cmd)
+
         try:
             result = subprocess.run(
                 cmd,
@@ -77,14 +81,14 @@ class SubprocessRunner:
                 if e.stderr:
                     print(f"Error: {e.stderr}", file=sys.stderr)
             raise
-        except subprocess.TimeoutExpired as e:
+        except subprocess.TimeoutExpired:
             if self.verbose:
                 print(f"Command timed out: {cmd}", file=sys.stderr)
             raise
 
     def run_git_command(
         self,
-        args: Union[str, List[str]],
+        args: str | list[str],
         check: bool = True,
     ) -> subprocess.CompletedProcess:
         """
@@ -101,16 +105,13 @@ class SubprocessRunner:
             runner.run_git_command(['status', '--short'])
             runner.run_git_command('log --oneline -n 5')
         """
-        if isinstance(args, str):
-            cmd = f"git {args}"
-        else:
-            cmd = ["git"] + args
+        cmd = f"git {args}" if isinstance(args, str) else ["git"] + args
 
         return self.run(cmd, check=check)
 
     def run_gh_command(
         self,
-        args: Union[str, List[str]],
+        args: str | list[str],
         check: bool = True,
     ) -> subprocess.CompletedProcess:
         """
@@ -127,10 +128,7 @@ class SubprocessRunner:
             runner.run_gh_command(['pr', 'list'])
             runner.run_gh_command('api repos/owner/repo/pulls')
         """
-        if isinstance(args, str):
-            cmd = f"gh {args}"
-        else:
-            cmd = ["gh"] + args
+        cmd = f"gh {args}" if isinstance(args, str) else ["gh"] + args
 
         return self.run(cmd, check=check)
 
@@ -139,8 +137,8 @@ class SubprocessRunner:
 
 
 def run_git_command(
-    args: Union[str, List[str]],
-    cwd: Optional[Union[str, Path]] = None,
+    args: str | list[str],
+    cwd: str | Path | None = None,
     check: bool = True,
     verbose: bool = False,
 ) -> subprocess.CompletedProcess:
@@ -161,8 +159,8 @@ def run_git_command(
 
 
 def run_gh_command(
-    args: Union[str, List[str]],
-    cwd: Optional[Union[str, Path]] = None,
+    args: str | list[str],
+    cwd: str | Path | None = None,
     check: bool = True,
     verbose: bool = False,
 ) -> subprocess.CompletedProcess:

cicada/utils/text_utils.py

@@ -6,10 +6,9 @@ including splitting camelCase, PascalCase, and snake_case identifiers.
 """
 
 import re
-from typing import List
 
 
-def split_identifier(identifier: str, lowercase: bool = True) -> List[str]:
+def split_identifier(identifier: str, lowercase: bool = True) -> list[str]:
     """
     Split an identifier by camelCase, PascalCase, and snake_case.
 

cicada/version_check.py

@@ -5,7 +5,6 @@ Checks if a newer version of cicada is available on GitHub.
 """
 
 import subprocess
-from typing import Optional
 
 
 def get_current_version() -> str:
@@ -20,7 +19,7 @@ def get_current_version() -> str:
     return __version__
 
 
-def get_latest_github_tag(repo: str = "wende/cicada") -> Optional[str]:
+def get_latest_github_tag(repo: str = "wende/cicada") -> str | None:
     """
     Get the latest tag from GitHub repository.
 
@@ -106,9 +105,7 @@ def check_for_updates() -> None:
                 f"{yellow}⚠️  A newer version of cicada is available: v{latest} (current: v{current}){reset}"
             )
             print(f"{yellow}   To update, run:{reset}")
-            print(
-                f"{yellow}   uv tool install git+https://github.com/wende/cicada.git{reset}"
-            )
+            print(f"{yellow}   uv tool install git+https://github.com/wende/cicada.git{reset}")
             print()
 
     except Exception: