monoco-toolkit 0.2.8__py3-none-any.whl → 0.3.1__py3-none-any.whl

monoco/features/issue/linter.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional
 from pathlib import Path
 from rich.console import Console
 from rich.table import Table
@@ -11,6 +11,7 @@ from monoco.core.lsp import Diagnostic, DiagnosticSeverity
 
 console = Console()
 
+
 def check_environment_policy(project_root: Path):
     """
     Guardrail: Prevent direct modifications on protected branches (main/master).
@@ -26,28 +27,33 @@ def check_environment_policy(project_root: Path):
             # Check if dirty (uncommitted changes)
             changed_files = git.get_git_status(project_root)
             if changed_files:
-                console.print(f"\n[bold red]🛑 Environment Policy Violation[/bold red]")
-                console.print(f"You are modifying code directly on protected branch: [bold cyan]{current_branch}[/bold cyan]")
+                console.print("\n[bold red]🛑 Environment Policy Violation[/bold red]")
+                console.print(
+                    f"You are modifying code directly on protected branch: [bold cyan]{current_branch}[/bold cyan]"
+                )
                 console.print(f"Found {len(changed_files)} uncommitted changes.")
-                console.print(f"[yellow]Action Required:[/yellow] Please stash your changes and switch to a feature branch.")
-                console.print(f"  > git stash")
-                console.print(f"  > monoco issue start <ID> --branch")
-                console.print(f"  > git stash pop")
+                console.print(
+                    "[yellow]Action Required:[/yellow] Please stash your changes and switch to a feature branch."
+                )
+                console.print("  > git stash")
+                console.print("  > monoco issue start <ID> --branch")
+                console.print("  > git stash pop")
                 raise typer.Exit(code=1)
     except Exception:
         # Fail safe: Do not block linting if git check fails unexpectedly
         pass
 
+
 def check_integrity(issues_root: Path, recursive: bool = False) -> List[Diagnostic]:
     """
     Verify the integrity of the Issues directory using LSP Validator.
     """
     diagnostics = []
     validator = IssueValidator(issues_root)
-    
+
     all_issue_ids = set()
     all_issues = []
-    
+
     # 1. Collection Phase (Build Index)
     # Helper to collect issues from a project
     def collect_project_issues(project_issues_root: Path, project_name: str = "local"):
@@ -66,16 +72,17 @@ def check_integrity(issues_root: Path, recursive: bool = False) -> List[Diagnost
                     if meta:
                         local_id = meta.id
                         full_id = f"{project_name}::{local_id}"
-                        
+
                         all_issue_ids.add(local_id)
                         all_issue_ids.add(full_id)
-                        
+
                         project_issues.append((f, meta))
         return project_issues
 
     from monoco.core.config import get_config
+
     conf = get_config(str(issues_root.parent))
-    
+
     # Identify local project name
     local_project_name = "local"
     if conf and conf.project and conf.project.name:
@@ -84,183 +91,217 @@ def check_integrity(issues_root: Path, recursive: bool = False) -> List[Diagnost
     # Find Topmost Workspace Root
     workspace_root = issues_root.parent
     for parent in [workspace_root] + list(workspace_root.parents):
-        if (parent / ".monoco" / "workspace.yaml").exists() or (parent / ".monoco" / "project.yaml").exists():
+        if (parent / ".monoco" / "workspace.yaml").exists() or (
+            parent / ".monoco" / "project.yaml"
+        ).exists():
             workspace_root = parent
-            
+
     # Collect from local issues_root
     all_issues.extend(collect_project_issues(issues_root, local_project_name))
-    
+
     if recursive:
         try:
             # Re-read config from workspace root to get all members
             ws_conf = get_config(str(workspace_root))
-            
+
             # Index Root project if different from current
             if workspace_root != issues_root.parent:
                 root_issues_dir = workspace_root / "Issues"
                 if root_issues_dir.exists():
-                    all_issues.extend(collect_project_issues(root_issues_dir, ws_conf.project.name.lower()))
+                    all_issues.extend(
+                        collect_project_issues(
+                            root_issues_dir, ws_conf.project.name.lower()
+                        )
+                    )
 
             # Index all members
             for member_name, rel_path in ws_conf.project.members.items():
                 member_root = (workspace_root / rel_path).resolve()
                 member_issues_dir = member_root / "Issues"
                 if member_issues_dir.exists() and member_issues_dir != issues_root:
-                    all_issues.extend(collect_project_issues(member_issues_dir, member_name.lower()))
+                    all_issues.extend(
+                        collect_project_issues(member_issues_dir, member_name.lower())
+                    )
         except Exception:
             pass
 
     # 2. Validation Phase
     for path, meta in all_issues:
-        content = path.read_text() # Re-read content for validation
-        
+        content = path.read_text()  # Re-read content for validation
+
         # A. Run Core Validator
         file_diagnostics = validator.validate(meta, content, all_issue_ids)
-        
+
         # Add context to diagnostics (Path)
         for d in file_diagnostics:
-             d.source = f"{meta.id}" # Use ID as source context
-             d.data = {'path': path} # Attach path for potential fixers
-             diagnostics.append(d)
-             
+            d.source = f"{meta.id}"  # Use ID as source context
+            d.data = {"path": path}  # Attach path for potential fixers
+            diagnostics.append(d)
+
     return diagnostics
 
 
-def run_lint(issues_root: Path, recursive: bool = False, fix: bool = False, format: str = "table", file_path: Optional[str] = None):
+def run_lint(
+    issues_root: Path,
+    recursive: bool = False,
+    fix: bool = False,
+    format: str = "table",
+    file_paths: Optional[List[str]] = None,
+):
     """
     Run lint with optional auto-fix and format selection.
-    
+
     Args:
         issues_root: Root directory of issues
         recursive: Recursively scan workspace members
         fix: Apply auto-fixes
         format: Output format (table, json)
-        file_path: Optional path to a single file to validate (LSP mode)
+        file_paths: Optional list of paths to files to validate (LSP/Pre-commit mode)
     """
     # 0. Environment Policy Check (Guardrail)
     # We assume issues_root.parent is the project root or close enough for git context
     check_environment_policy(issues_root.parent)
 
-    # Single-file mode (for LSP integration)
-    if file_path:
-        file = Path(file_path).resolve()
-        if not file.exists():
-            console.print(f"[red]Error:[/red] File not found: {file_path}")
-            raise typer.Exit(code=1)
-        
-        # Parse and validate single file
-        try:
-            meta = core.parse_issue(file)
-            if not meta:
-                console.print(f"[red]Error:[/red] Failed to parse issue metadata from {file_path}")
-                raise typer.Exit(code=1)
-            
-            content = file.read_text()
-            validator = IssueValidator(issues_root)
-            
-            # For single-file mode, we need to build a minimal index
-            # We'll scan the entire workspace to get all issue IDs for reference validation
-            all_issue_ids = set()
-            for subdir in ["Epics", "Features", "Chores", "Fixes"]:
-                d = issues_root / subdir
-                if d.exists():
-                    for status in ["open", "closed", "backlog"]:
-                        status_dir = d / status
-                        if status_dir.exists():
-                            for f in status_dir.rglob("*.md"):
-                                try:
-                                    m = core.parse_issue(f)
-                                    if m:
-                                        all_issue_ids.add(m.id)
-                                except Exception:
-                                    pass
-            
-            diagnostics = validator.validate(meta, content, all_issue_ids)
-            
-            # Add context
-            for d in diagnostics:
-                d.source = meta.id
-                d.data = {'path': file}
-                
-        except Exception as e:
-            console.print(f"[red]Error:[/red] Validation failed: {e}")
-            raise typer.Exit(code=1)
+    diagnostics = []
+
+    # File list mode (for LSP integration or pre-commit)
+    if file_paths:
+        # Pre-scan entire workspace to get all issue IDs for reference validation
+        # We need this context even when validating a single file
+        all_issue_ids = set()
+        for subdir in ["Epics", "Features", "Chores", "Fixes"]:
+            d = issues_root / subdir
+            if d.exists():
+                for status in ["open", "closed", "backlog"]:
+                    status_dir = d / status
+                    if status_dir.exists():
+                        for f in status_dir.rglob("*.md"):
+                            try:
+                                m = core.parse_issue(f)
+                                if m:
+                                    all_issue_ids.add(m.id)
+                            except Exception:
+                                pass
+
+        validator = IssueValidator(issues_root)
+
+        for file_path in file_paths:
+            file = Path(file_path).resolve()
+            if not file.exists():
+                console.print(f"[red]Error:[/red] File not found: {file_path}")
+                continue  # Skip missing files but continue linting others
+
+            # Parse and validate file
+            try:
+                meta = core.parse_issue(file)
+                if not meta:
+                    console.print(
+                        f"[yellow]Warning:[/yellow] Failed to parse issue metadata from {file_path}. Skipping."
+                    )
+                    continue
+
+                content = file.read_text()
+                file_diagnostics = validator.validate(meta, content, all_issue_ids)
+
+                # Add context
+                for d in file_diagnostics:
+                    d.source = meta.id
+                    d.data = {"path": file}
+                    diagnostics.append(d)
+
+            except Exception as e:
+                console.print(
+                    f"[red]Error:[/red] Validation failed for {file_path}: {e}"
+                )
+                # We don't exit here, we collect errors
     else:
         # Full workspace scan mode
         diagnostics = check_integrity(issues_root, recursive)
-    
+
     # Filter only Warnings and Errors
     issues = [d for d in diagnostics if d.severity <= DiagnosticSeverity.Warning]
-    
+
     if fix:
         fixed_count = 0
         console.print("[dim]Attempting auto-fixes...[/dim]")
-        
+
         # We must track processed paths to avoid redundant writes if multiple errors exist
         processed_paths = set()
-        
-        for d in issues:
-            path = d.data.get('path')
-            if not path: continue
-            
-            # Read fresh content iteration
-            pass
 
         # Group diagnostics by file path
         from collections import defaultdict
+
         file_diags = defaultdict(list)
         for d in issues:
-            if d.data.get('path'):
-                file_diags[d.data['path']].append(d)
-        
+            if d.data.get("path"):
+                file_diags[d.data["path"]].append(d)
+
         for path, diags in file_diags.items():
             try:
                 content = path.read_text()
                 new_content = content
                 has_changes = False
-                
+
                 # Parse meta once for the file
                 try:
                     meta = core.parse_issue(path)
                 except Exception:
-                    console.print(f"[yellow]Skipping fix for {path.name}: Cannot parse metadata[/yellow]")
+                    console.print(
+                        f"[yellow]Skipping fix for {path.name}: Cannot parse metadata[/yellow]"
+                    )
                     continue
 
                 # Apply fixes for this file
                 for d in diags:
                     if "Structure Error" in d.message:
                         expected_header = f"## {meta.id}: {meta.title}"
-                        
+
                         # Check if strictly present
                         if expected_header in new_content:
                             continue
-                            
+
                         # Strategy: Look for existing heading with same ID to replace
                         # Matches: "## ID..." or "## ID ..."
                         # Regex: ^##\s+ID\b.*$
                         # We use meta.id which is safe.
-                        heading_regex = re.compile(rf"^##\s+{re.escape(meta.id)}.*$", re.MULTILINE)
-                        
+                        heading_regex = re.compile(
+                            rf"^##\s+{re.escape(meta.id)}.*$", re.MULTILINE
+                        )
+
                         match_existing = heading_regex.search(new_content)
-                        
+
                         if match_existing:
                             # Replace existing incorrect heading
                             # We use sub to replace just the first occurrence
-                            new_content = heading_regex.sub(expected_header, new_content, count=1)
+                            new_content = heading_regex.sub(
+                                expected_header, new_content, count=1
+                            )
                             has_changes = True
                         else:
                             # Insert after frontmatter
-                            fm_match = re.search(r"^---(.*?)---", new_content, re.DOTALL | re.MULTILINE)
+                            fm_match = re.search(
+                                r"^---(.*?)---", new_content, re.DOTALL | re.MULTILINE
+                            )
                             if fm_match:
                                 end_pos = fm_match.end()
                                 header_block = f"\n\n{expected_header}\n"
-                                new_content = new_content[:end_pos] + header_block + new_content[end_pos:].lstrip()
+                                new_content = (
+                                    new_content[:end_pos]
+                                    + header_block
+                                    + new_content[end_pos:].lstrip()
+                                )
                                 has_changes = True
 
-                    if "Review Requirement: Missing '## Review Comments' section" in d.message:
-                         if "## Review Comments" not in new_content:
-                             new_content = new_content.rstrip() + "\n\n## Review Comments\n\n- [ ] Self-Review\n"
-                             has_changes = True
+                    if (
+                        "Review Requirement: Missing '## Review Comments' section"
+                        in d.message
+                    ):
+                        if "## Review Comments" not in new_content:
+                            new_content = (
+                                new_content.rstrip()
+                                + "\n\n## Review Comments\n\n- [ ] Self-Review\n"
+                            )
+                            has_changes = True
 
                     if "Malformed ID" in d.message:
                         lines = new_content.splitlines()
@@ -273,44 +314,56 @@ def run_lint(issues_root: Path, recursive: bool = False, fix: bool = False, form
                                 lines[line_idx] = new_line
                                 new_content = "\n".join(lines) + "\n"
                                 has_changes = True
-                    
+
                     if "Tag Check: Missing required context tags" in d.message:
-                         # Extract missing tags from message
-                         # Message format: "Tag Check: Missing required context tags: #TAG1, #TAG2"
-                         try:
-                             parts = d.message.split(": ")
-                             if len(parts) >= 3:
-                                 tags_str = parts[-1]
-                                 missing_tags = [t.strip() for t in tags_str.split(",")]
-                                 
-                                 # We need to update content via core.update_issue logic effectively
-                                 # But we are in a loop potentially with other string edits.
-                                 # IMPORTANT: Mixed strategy (Regex vs Object Update) is risky.
-                                 # However, tags are in YAML frontmatter.
-                                 # Since we might have modified new_content already (string), using core.update_issue on file is dangerous (race condition with memory).
-                                 # Better to append to tags list in YAML via regex or yaml parser on new_content.
-                                 
-                                 # Parsing Frontmatter from new_content
-                                 fm_match = re.search(r"^---(.*?)---", new_content, re.DOTALL | re.MULTILINE)
-                                 if fm_match:
-                                      import yaml
-                                      fm_text = fm_match.group(1)
-                                      data = yaml.safe_load(fm_text) or {}
-                                      current_tags = data.get('tags', [])
-                                      if not isinstance(current_tags, list): current_tags = []
-                                      
-                                      # Add missing
-                                      updated_tags = sorted(list(set(current_tags) | set(missing_tags)))
-                                      data['tags'] = updated_tags
-                                      
-                                      # Dump back
-                                      new_fm_text = yaml.dump(data, sort_keys=False, allow_unicode=True)
-                                      
-                                      # Replace FM block
-                                      new_content = new_content.replace(fm_match.group(1), "\n" + new_fm_text)
-                                      has_changes = True
-                         except Exception as ex:
-                             console.print(f"[red]Failed to fix tags: {ex}[/red]")
+                        # Extract missing tags from message
+                        # Message format: "Tag Check: Missing required context tags: #TAG1, #TAG2"
+                        try:
+                            parts = d.message.split(": ")
+                            if len(parts) >= 3:
+                                tags_str = parts[-1]
+                                missing_tags = [t.strip() for t in tags_str.split(",")]
+
+                                # We need to update content via core.update_issue logic effectively
+                                # But we are in a loop potentially with other string edits.
+                                # IMPORTANT: Mixed strategy (Regex vs Object Update) is risky.
+                                # However, tags are in YAML frontmatter.
+                                # Since we might have modified new_content already (string), using core.update_issue on file is dangerous (race condition with memory).
+                                # Better to append to tags list in YAML via regex or yaml parser on new_content.
+
+                                # Parsing Frontmatter from new_content
+                                fm_match = re.search(
+                                    r"^---(.*?)---",
+                                    new_content,
+                                    re.DOTALL | re.MULTILINE,
+                                )
+                                if fm_match:
+                                    import yaml
+
+                                    fm_text = fm_match.group(1)
+                                    data = yaml.safe_load(fm_text) or {}
+                                    current_tags = data.get("tags", [])
+                                    if not isinstance(current_tags, list):
+                                        current_tags = []
+
+                                    # Add missing
+                                    updated_tags = sorted(
+                                        list(set(current_tags) | set(missing_tags))
+                                    )
+                                    data["tags"] = updated_tags
+
+                                    # Dump back
+                                    new_fm_text = yaml.dump(
+                                        data, sort_keys=False, allow_unicode=True
+                                    )
+
+                                    # Replace FM block
+                                    new_content = new_content.replace(
+                                        fm_match.group(1), "\n" + new_fm_text
+                                    )
+                                    has_changes = True
+                        except Exception as ex:
+                            console.print(f"[red]Failed to fix tags: {ex}[/red]")
 
                 if has_changes:
                     path.write_text(new_content)
@@ -319,27 +372,94 @@ def run_lint(issues_root: Path, recursive: bool = False, fix: bool = False, form
             except Exception as e:
                 console.print(f"[red]Failed to fix {path.name}: {e}[/red]")
 
+            # Separate Try-Block for Domains Fix to avoid nesting logic too deep
+            try:
+                content = path.read_text()
+                new_content = content
+                has_changes = False
+
+                # Check diagnostics again for this file
+                current_file_diags = file_diags.get(path, [])
+
+                needs_domain_fix = any(
+                    "Missing 'domains' field" in d.message for d in current_file_diags
+                )
+
+                if needs_domain_fix:
+                    # Add 'domains: []' to frontmatter
+                    # We insert it before 'tags:' if possible, or at end of keys
+                    fm_match = re.search(
+                        r"^---(.*?)---", new_content, re.DOTALL | re.MULTILINE
+                    )
+                    if fm_match:
+                        import yaml
+
+                        fm_text = fm_match.group(1)
+                        # We prefer to edit text directly to preserve comments if possible,
+                        # but for adding a key, robust way is ensuring it's in.
+                        pass
+
+                        # Simple Regex Insertion: find "tags:" and insert before it
+                        if "tags:" in fm_text:
+                            new_fm_text = fm_text.replace("tags:", "domains: []\ntags:")
+                            new_content = new_content.replace(
+                                fm_match.group(1), new_fm_text
+                            )
+                            has_changes = True
+                        else:
+                            # Append to end
+                            new_fm_text = fm_text.rstrip() + "\ndomains: []\n"
+                            new_content = new_content.replace(
+                                fm_match.group(1), new_fm_text
+                            )
+                            has_changes = True
+
+                if has_changes:
+                    path.write_text(new_content)
+                    if not any(
+                        path == p for p in processed_paths
+                    ):  # count once per file
+                        fixed_count += 1
+                        processed_paths.add(path)
+                    console.print(f"[dim]Fixed (Domains): {path.name}[/dim]")
+
+            except Exception as e:
+                console.print(f"[red]Failed to fix domains for {path.name}: {e}[/red]")
+
         console.print(f"[green]Applied auto-fixes to {fixed_count} files.[/green]")
-        
+
         # Re-run validation to verify
-        if file_path:
-            # Re-validate single file
-            file = Path(file_path).resolve()
-            meta = core.parse_issue(file)
-            content = file.read_text()
+        if file_paths:
+            diagnostics = []  # Reset
+            # Re-validate file list
             validator = IssueValidator(issues_root)
-            diagnostics = validator.validate(meta, content, all_issue_ids)
-            for d in diagnostics:
-                d.source = meta.id
-                d.data = {'path': file}
+            # We assume all_issue_ids is already populated from the first pass if it was needed
+            # But let's be safe and assume we might need to re-scan if IDs changed (unlikely during lint)
+            # For simplicity, we reuse the validator instance but might need fresh content
+
+            for file_path in file_paths:
+                file = Path(file_path).resolve()
+                if not file.exists():
+                    continue
+
+                try:
+                    meta = core.parse_issue(file)
+                    content = file.read_text()
+                    file_diagnostics = validator.validate(meta, content, all_issue_ids)
+                    for d in file_diagnostics:
+                        d.source = meta.id
+                        d.data = {"path": file}
+                        diagnostics.append(d)
+                except Exception:
+                    pass
         else:
             diagnostics = check_integrity(issues_root, recursive)
         issues = [d for d in diagnostics if d.severity <= DiagnosticSeverity.Warning]
 
     # Output formatting
     if format == "json":
-        import json
         from pydantic import RootModel
+
         # Use RootModel to export a list of models
         print(RootModel(issues).model_dump_json(indent=2))
         if any(d.severity == DiagnosticSeverity.Error for d in issues):
@@ -347,14 +467,21 @@ def run_lint(issues_root: Path, recursive: bool = False, fix: bool = False, form
         return
 
     if not issues:
-        console.print("[green]✔[/green] Issue integrity check passed. No integrity errors found.")
+        console.print(
+            "[green]✔[/green] Issue integrity check passed. No integrity errors found."
+        )
     else:
-        table = Table(title="Issue Integrity Report", show_header=True, header_style="bold magenta", border_style="red")
+        table = Table(
+            title="Issue Integrity Report",
+            show_header=True,
+            header_style="bold magenta",
+            border_style="red",
+        )
         table.add_column("Issue", style="cyan")
         table.add_column("Severity", justify="center")
         table.add_column("Line", justify="right", style="dim")
         table.add_column("Message")
-        
+
         for d in issues:
             sev_style = "red" if d.severity == DiagnosticSeverity.Error else "yellow"
             sev_label = "ERROR" if d.severity == DiagnosticSeverity.Error else "WARN"
@@ -363,15 +490,18 @@ def run_lint(issues_root: Path, recursive: bool = False, fix: bool = False, form
                 d.source or "Unknown",
                 f"[{sev_style}]{sev_label}[/{sev_style}]",
                 line_str,
-                d.message
+                d.message,
             )
-            
+
         console.print(table)
-        
+
         if any(d.severity == DiagnosticSeverity.Error for d in issues):
-            console.print("\n[yellow]Tip: Run 'monoco issue lint --fix' to attempt automatic repairs.[/yellow]")
+            console.print(
+                "\n[yellow]Tip: Run 'monoco issue lint --fix' to attempt automatic repairs.[/yellow]"
+            )
             raise typer.Exit(code=1)
-        
-        if issues:
-             console.print("\n[yellow]Tip: Run 'monoco issue lint --fix' to attempt automatic repairs.[/yellow]")
 
+        if issues:
+            console.print(
+                "\n[yellow]Tip: Run 'monoco issue lint --fix' to attempt automatic repairs.[/yellow]"
+            )