fix: use typing module for Python 3.9 compatible type hints

Author: Test User

src/ab_cli/commands/changelog.py

@@ -7,6 +7,7 @@
 import argparse
 import subprocess
 import sys
+from typing import Dict, List
 
 from ab_cli.core.config import get_language
 from ab_cli.utils import (
@@ -42,7 +43,7 @@ def get_commit_count(range_spec: str) -> int:
         return 0
 
 
-def parse_commits(commits_str: str) -> list[dict]:
+def parse_commits(commits_str: str) -> List[Dict]:
     """Parse commits into structured format."""
     commits = []
     for line in commits_str.split('\n'):
@@ -59,7 +60,7 @@ def parse_commits(commits_str: str) -> list[dict]:
     return commits
 
 
-def categorize_commits(commits: list[dict]) -> dict[str, list[dict]]:
+def categorize_commits(commits: List[Dict]) -> Dict[str, List[Dict]]:
     """Categorize commits by type (feat, fix, etc.)."""
     categories = {
         'features': [],

src/ab_cli/commands/gen_script.py

@@ -12,6 +12,7 @@
 import sys
 import tempfile
 from pathlib import Path
+from typing import List
 
 from ab_cli.core.config import get_language
 from ab_cli.utils import (
@@ -25,8 +26,34 @@
 )
 
 
-def run_cmd(cmd: list[str], default: str = "unknown") -> str:
-    """Run a command and return stdout, or default on failure."""
+def run_cmd(cmd: List[str], default: str = "unknown") -> str:
+    """Execute a shell command and return its stdout output.
+
+    Runs the specified command as a subprocess, capturing its output.
+    Returns the default value if the command fails or the executable
+    is not found, making it safe to use for optional system information
+    gathering.
+
+    Args:
+        cmd: The command to execute as a list of strings, where the first
+            element is the executable and subsequent elements are arguments.
+            Example: ['uname', '-srm'] or ['python3', '--version'].
+        default: The value to return if the command fails or the executable
+            is not found. Defaults to "unknown".
+
+    Returns:
+        The stripped stdout output of the command on success, or the
+        default value if the command returns a non-zero exit code or
+        the executable is not found.
+
+    Examples:
+        >>> run_cmd(['uname', '-s'])
+        'Linux'
+        >>> run_cmd(['nonexistent-command'], default='N/A')
+        'N/A'
+        >>> run_cmd(['python3', '--version'])
+        'Python 3.12.0'
+    """
     try:
         result = subprocess.run(cmd, capture_output=True, text=True, check=True)
         return result.stdout.strip()

src/ab_cli/commands/resolve_conflict.py

@@ -8,7 +8,7 @@
 import os
 import subprocess
 import sys
-from typing import Optional
+from typing import Dict, List, Optional, Tuple
 
 from ab_cli.core.config import get_language
 from ab_cli.utils import (
@@ -32,8 +32,50 @@ def has_conflict_markers(content: str) -> bool:
     return '<<<<<<<' in content and '=======' in content and '>>>>>>>' in content
 
 
-def parse_conflicts(content: str) -> list[dict]:
-    """Parse conflict sections from file content."""
+def parse_conflicts(content: str) -> List[Dict]:
+    """Parse git merge conflict sections from file content.
+
+    Scans the file content for git conflict markers and extracts each
+    conflict block into a structured dictionary containing both versions
+    of the conflicting code and their locations.
+
+    Conflict markers follow the standard git format:
+        <<<<<<< HEAD (or branch name)
+        ... our version ...
+        =======
+        ... their version ...
+        >>>>>>> branch-name
+
+    Args:
+        content: The full file content as a string, potentially containing
+            one or more merge conflicts with standard git conflict markers.
+
+    Returns:
+        A list of dictionaries, one per conflict found. Each dictionary
+        contains:
+        - 'start_line' (int): 1-indexed line number of the "<<<<<<" marker
+        - 'ours_marker' (str): The full "<<<<<<" line including branch name
+        - 'ours' (list[str]): Lines from our version (between <<<< and ====)
+        - 'theirs' (list[str]): Lines from their version (between ==== and >>>>)
+        - 'theirs_marker' (str): The full ">>>>>>>" line including branch name
+        - 'end_line' (int): 1-indexed line number of the ">>>>>>>" marker
+
+        Returns an empty list if no conflicts are found.
+
+    Examples:
+        >>> content = '''<<<<<<< HEAD
+        ... x = 1
+        ... =======
+        ... x = 2
+        ... >>>>>>> feature'''
+        >>> conflicts = parse_conflicts(content)
+        >>> len(conflicts)
+        1
+        >>> conflicts[0]['ours']
+        ['x = 1']
+        >>> conflicts[0]['theirs']
+        ['x = 2']
+    """
     conflicts = []
     lines = content.split('\n')
 
@@ -75,7 +117,7 @@ def parse_conflicts(content: str) -> list[dict]:
     return conflicts
 
 
-def get_file_context(filepath: str, conflict: dict, context_lines: int = 10) -> tuple[str, str]:
+def get_file_context(filepath: str, conflict: Dict, context_lines: int = 10) -> Tuple[str, str]:
     """Get context before and after the conflict."""
     try:
         with open(filepath, 'r') as f:

src/ab_cli/utils/llm_helpers.py

@@ -3,7 +3,7 @@
 Provides simplified interface for LLM API calls with automatic
 model selection based on token count.
 """
-from typing import Optional
+from typing import Dict, Optional, Tuple
 
 from ab_cli.core.config import get_config, estimate_tokens
 from ab_cli.commands.prompt import send_to_openrouter
@@ -61,7 +61,7 @@ def call_llm_with_model_info(
     lang: str = "en",
     specialist: Optional[str] = None,
     max_completion_tokens: int = -1,
-) -> tuple[Optional[dict], str, int]:
+) -> Tuple[Optional[Dict], str, int]:
     """Call LLM and return response with model info.
 
     Same as call_llm but also returns the selected model name