@voodocs/cli 0.3.2 → 0.4.0

package/lib/darkarts/context/commands.py

@@ -1,27 +1,10 @@
-"""@voodocs
-module_purpose: "Core context system commands (init, generate, check, diagram, validate, etc.)"
-dependencies: [
-    "yaml_utils: YAML parsing and serialization",
-    "models: Data structures for context",
-    "ai_integrations: AI assistant integration",
-    "checker: Invariant checking system",
-    "diagram: Architecture diagram generation"
-]
-assumptions: [
-    "Context file (.voodocs.context) is in project root",
-    "Git is available for commit/author detection",
-    "Python 3.11+ is installed",
-    "Project root is current working directory"
-]
-invariants: [
-    "Context file must be valid YAML",
-    "Version numbers must follow semver (major.minor)",
-    "All commands must return 0 (success) or 1 (error) exit code",
-    "Context updates must increment version number",
-    "Generated files must be UTF-8 encoded"
-]
-security_model: "Read context from disk, write only with user confirmation for init"
-performance_model: "O(1) for most commands, O(n) for generate where n=number of source files"
+"""@darkarts
+⊢commands:ctx.cli
+∂{yaml_utils,models,ai_integrations,checker,diagram}
+⚠{.voodocs.context∈root,git:available,py≥3.11,cwd=root}
+⊨{ctx:yaml,v∈semver,exit∈{0,1},∀update→v++,files:utf8}
+🔒{read:ctx,write⊳confirm}
+⚡{O(1)|most-cmds,O(n)|generate:n=src-files}
 
 Context System Commands
 
@@ -39,6 +22,26 @@ from .yaml_utils import (
     add_to_gitignore,
     format_context_as_markdown
 )
+from .errors import (
+    ContextFileNotFoundError,
+    InvalidContextError,
+    GitNotAvailableError,
+    UserInterruptError,
+    InvalidProjectNameError,
+    InvalidVersionError
+)
+from .validation import (
+    validate_project_name,
+    validate_version,
+    validate_path,
+    validate_context_structure
+)
+from .ui import (
+    success, error, warning, info, step, debug,
+    confirm, prompt, progress,
+    print_header, print_section, print_key_value
+)
+from .module_utils import extract_modules_from_results
 
 
 def get_project_root() -> Path:
@@ -206,63 +209,76 @@ def cmd_context_init(force: bool = False) -> int:
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    print("🎯 VooDocs Context Initialization")
-    print()
-    
-    # Check if context file already exists
-    if context_file_exists() and not force:
-        print("❌ Error: .voodocs.context already exists in this directory.")
-        print("   Use --force to overwrite the existing file.")
-        return 1
-    
-    # Detect project information
-    detected_version = detect_code_version()
-    detected_repo = detect_repository()
-    
-    print("Let's set up your project context. This will create a .voodocs.context file.")
-    print()
-    
-    # Prompt for project information
-    project_name = prompt_user("Project name")
-    
-    project_purpose = prompt_user("Project purpose (one sentence)")
-    
-    if detected_version:
-        code_version = prompt_user("Current code version", detected_version)
-    else:
-        code_version = prompt_user("Current code version", "1.0.0")
-    
-    # Validate version format
-    if not code_version.count('.') >= 2:
-        print(f"⚠️  Warning: '{code_version}' doesn't look like semantic versioning (MAJOR.MINOR.PATCH)")
-        if not prompt_yes_no("Continue anyway?", default=False):
-            print("Aborted.")
-            return 1
-    
-    if detected_repo:
-        repository = prompt_user("Repository URL (leave empty to skip)", detected_repo, required=False)
-    else:
-        repository = prompt_user("Repository URL (leave empty to skip)", "", required=False)
-    
-    license_name = prompt_user("License (leave empty to skip)", "", required=False)
-    
-    print()
-    print("📝 Configuration Summary:")
-    print(f"  Project Name:    {project_name}")
-    print(f"  Purpose:         {project_purpose}")
-    print(f"  Code Version:    {code_version}")
-    if repository:
-        print(f"  Repository:      {repository}")
-    if license_name:
-        print(f"  License:         {license_name}")
-    print()
-    
-    if not prompt_yes_no("Create context file?", default=True):
-        print("Aborted.")
-        return 1
-    
-    # Create context file
     try:
+        print_header("VooDocs Context Initialization")
+        
+        # Check if context file already exists
+        context_path = get_context_file_path()
+        if context_file_exists() and not force:
+            error(f"Context file already exists: {context_path}")
+            info("Use --force to overwrite, or 'voodocs context update' to modify")
+            return 1
+        
+        # Warn if overwriting
+        if context_file_exists() and force:
+            if not confirm(f"Overwrite existing context file at {context_path}?", default=False):
+                raise UserInterruptError("Initialization")
+        
+        step("Initializing VooDocs context...")
+        print()
+        
+        # Detect project information
+        detected_version = detect_code_version()
+        detected_repo = detect_repository()
+        
+        info("Let's set up your project context. This will create a .voodocs.context file.")
+        print()
+        
+        # Collect and validate user input
+        try:
+            # Project name with validation
+            default_name = get_project_root().name
+            name_input = prompt("Project name", default=default_name)
+            project_name = validate_project_name(name_input)
+            
+            # Project purpose
+            project_purpose = prompt("Project purpose (one sentence)", required=True)
+            
+            # Code version with validation
+            version_default = detected_version or "1.0.0"
+            version_input = prompt("Current code version", default=version_default)
+            code_version = validate_version(version_input) or "1.0.0"
+            
+            # Repository (optional)
+            repository = prompt(
+                "Repository URL (leave empty to skip)",
+                default=detected_repo or "",
+                required=False
+            )
+            
+            # License (optional)
+            license_name = prompt("License (leave empty to skip)", default="", required=False)
+            
+        except KeyboardInterrupt:
+            raise UserInterruptError("Initialization")
+        
+        # Show configuration summary
+        print()
+        print_section("Configuration Summary")
+        print_key_value("Project Name", project_name)
+        print_key_value("Purpose", project_purpose)
+        print_key_value("Code Version", code_version)
+        if repository:
+            print_key_value("Repository", repository)
+        if license_name:
+            print_key_value("License", license_name)
+        print()
+        
+        if not confirm("Create context file?", default=True):
+            raise UserInterruptError("Initialization")
+        
+        # Create context file
+        step("Creating context structure...")
         context = create_minimal_context(
             project_name=project_name,
             project_purpose=project_purpose,
@@ -271,20 +287,20 @@ def cmd_context_init(force: bool = False) -> int:
             license=license_name if license_name else None
         )
         
-        context_path = get_context_file_path()
+        step(f"Writing context file to {context_path}...")
         write_context_yaml(context, context_path)
         
         print()
-        print(f"✅ Created .voodocs.context")
-        print(f"   Context version: {context.versioning.context_version}")
+        success("Context file created successfully!")
+        info(f"Context version: {context.versioning.context_version}")
         print()
         
         # Ask about .gitignore
-        if prompt_yes_no("Add .voodocs.context to .gitignore? (recommended for private projects)", default=True):
+        if confirm("Add .voodocs.context to .gitignore? (recommended for private projects)", default=True):
             if add_to_gitignore(get_project_root()):
-                print("✅ Added to .gitignore")
+                success("Added to .gitignore")
             else:
-                print("ℹ️  Already in .gitignore")
+                info("Already in .gitignore")
         
         print()
         
@@ -368,9 +384,9 @@ def cmd_context_init(force: bool = False) -> int:
                 print("ℹ️  Skipped AI integration")
         
         print()
-        print("🎉 Context initialized successfully!")
+        success("🎉 Context initialized successfully!")
         print()
-        print("Next steps:")
+        info("Next steps:")
         print("  1. Review the context file: voodocs context view")
         print("  2. Auto-generate from code: voodocs context generate --update")
         print("  3. Check invariants: voodocs context check")
@@ -380,8 +396,18 @@ def cmd_context_init(force: bool = False) -> int:
         
         return 0
         
+    except UserInterruptError as e:
+        print()  # New line after interrupt
+        error(str(e))
+        return 1
+    except (InvalidProjectNameError, InvalidVersionError) as e:
+        print()
+        error(str(e))
+        return 1
     except Exception as e:
-        print(f"❌ Error creating context file: {e}")
+        print()
+        error(f"Failed to initialize context: {e}")
+        warning("Run with --debug for full stack trace")
         return 1
 
 
@@ -395,19 +421,17 @@ def cmd_context_view(output_file: Optional[str] = None) -> int:
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    if not context_file_exists():
-        print("❌ Error: No .voodocs.context file found in this directory.")
-        print("   Run 'voodocs context init' to create one.")
-        return 1
-    
     try:
-        # Read context file
+        # Check if context file exists
         context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
+        # Read and parse context file
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 1
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
         # Parse and format as Markdown
         from .yaml_utils import parse_context_file
@@ -417,17 +441,25 @@ def cmd_context_view(output_file: Optional[str] = None) -> int:
         if output_file:
             # Write to file
             output_path = Path(output_file)
+            output_path.parent.mkdir(parents=True, exist_ok=True)
             with open(output_path, 'w', encoding='utf-8') as f:
                 f.write(markdown)
-            print(f"✅ Context exported to {output_file}")
+            success(f"Context exported to {output_file}")
             return 0
         else:
             # Print to console
             print(markdown)
             return 0
             
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 1
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
     except Exception as e:
-        print(f"❌ Error viewing context: {e}")
+        error(f"Failed to view context: {e}")
+        warning("Run with --debug for full stack trace")
         return 1
 
 
@@ -438,19 +470,17 @@ def cmd_context_status() -> int:
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    if not context_file_exists():
-        print("❌ No context file found")
-        print("   Run 'voodocs context init' to create one.")
-        return 1
-    
     try:
-        # Read context file
+        # Check if context file exists
         context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
+        # Read context file
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 1
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
         # Extract key information
         versioning = data.get('versioning', {})
@@ -479,12 +509,19 @@ def cmd_context_status() -> int:
         print(f"Known Issues:          {len(known_issues)}")
         
         print()
-        print("Use 'voodocs context view' to see the full context.")
+        info("Use 'voodocs context view' to see the full context.")
         
         return 0
         
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 1
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
     except Exception as e:
-        print(f"❌ Error reading context: {e}")
+        error(f"Failed to read context status: {e}")
+        warning("Run with --debug for full stack trace")
         return 1
 
 
@@ -498,22 +535,20 @@ def cmd_context_update(description: Optional[str] = None) -> int:
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    if not context_file_exists():
-        print("❌ Error: No .voodocs.context file found in this directory.")
-        print("   Run 'voodocs context init' to create one.")
-        return 1
-    
     try:
+        # Check if context file exists
+        context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
         from datetime import date
         from .models import Change
         
         # Read current context
-        context_path = get_context_file_path()
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 1
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
         # Get current versions
         versioning = data.get('versioning', {})
@@ -523,14 +558,13 @@ def cmd_context_update(description: Optional[str] = None) -> int:
         # Parse context version
         parts = current_context_version.split('.')
         if len(parts) != 2:
-            print(f"❌ Error: Invalid context version format: {current_context_version}")
-            return 1
+            raise ValueError(f"Invalid context version format: {current_context_version}. Expected MAJOR.MINOR format.")
         
         major, minor = parts
         new_minor = int(minor) + 1
         new_context_version = f"{major}.{new_minor}"
         
-        print(f"📝 Updating Context")
+        step("Updating context...")
         print()
         print(f"Current version: {current_context_version}")
         print(f"New version:     {new_context_version}")
@@ -538,9 +572,10 @@ def cmd_context_update(description: Optional[str] = None) -> int:
         
         # Prompt for description if not provided
         if not description:
-            description = prompt_user("Change description", "", required=False)
-            if not description:
-                description = "Context updated"
+            try:
+                description = prompt("Change description", default="Context updated", required=False)
+            except KeyboardInterrupt:
+                raise UserInterruptError("Context update")
         
         # Update versioning
         today = date.today().isoformat()
@@ -571,20 +606,34 @@ def cmd_context_update(description: Optional[str] = None) -> int:
         data['changes'].append(change_entry)
         
         # Write updated context
+        step("Writing updated context...")
         from .yaml_utils import parse_context_file
         context = parse_context_file(data)
         write_context_yaml(context, context_path)
         
-        print(f"✅ Context updated to version {new_context_version}")
-        print(f"   Description: {description}")
+        print()
+        success(f"Context updated to version {new_context_version}")
+        info(f"Description: {description}")
         print()
         
         return 0
         
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 1
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
+    except UserInterruptError as e:
+        print()
+        error(str(e))
+        return 1
+    except ValueError as e:
+        error(str(e))
+        return 1
     except Exception as e:
-        print(f"❌ Error updating context: {e}")
-        import traceback
-        traceback.print_exc()
+        error(f"Failed to update context: {e}")
+        warning("Run with --debug for full stack trace")
         return 1
 
 
@@ -599,21 +648,19 @@ def cmd_context_sync(code_version: Optional[str] = None, force: bool = False) ->
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    if not context_file_exists():
-        print("❌ Error: No .voodocs.context file found in this directory.")
-        print("   Run 'voodocs context init' to create one.")
-        return 1
-    
     try:
+        # Check if context file exists
+        context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
         from datetime import date
         
         # Read current context
-        context_path = get_context_file_path()
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 1
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
         # Get current versions
         versioning = data.get('versioning', {})
@@ -623,30 +670,33 @@ def cmd_context_sync(code_version: Optional[str] = None, force: bool = False) ->
         # If no code version provided, try to detect it
         if not code_version:
             detected_version = detect_code_version()
-            if detected_version:
-                code_version = prompt_user(
-                    "New code version",
-                    detected_version,
-                    required=True
-                )
-            else:
-                code_version = prompt_user(
-                    "New code version",
-                    required=True
-                )
+            try:
+                if detected_version:
+                    code_version = prompt(
+                        "New code version",
+                        default=detected_version,
+                        required=True
+                    )
+                else:
+                    code_version = prompt(
+                        "New code version",
+                        required=True
+                    )
+            except KeyboardInterrupt:
+                raise UserInterruptError("Context sync")
         
         # Validate version format
-        if code_version.count('.') < 2:
-            print(f"❌ Error: Invalid version format: {code_version}")
-            print("   Expected: MAJOR.MINOR.PATCH (e.g., 2.0.0)")
-            return 1
+        try:
+            code_version = validate_version(code_version, allow_empty=False)
+        except InvalidVersionError as e:
+            raise InvalidVersionError(code_version)
         
         # Extract major versions
         current_major = current_code_version.split('.')[0]
         new_major = code_version.split('.')[0]
         context_major = current_context_version.split('.')[0]
         
-        print(f"🔄 Syncing Context with Code Version")
+        step("Syncing context with code version...")
         print()
         print(f"Current code version:    {current_code_version}")
         print(f"New code version:        {code_version}")
@@ -663,9 +713,8 @@ def cmd_context_sync(code_version: Optional[str] = None, force: bool = False) ->
             print()
             
             if not force:
-                if not prompt_yes_no("Continue with reset?", default=True):
-                    print("Aborted.")
-                    return 1
+                if not confirm("Continue with reset?", default=True):
+                    raise UserInterruptError("Context sync")
             
             # Update versions
             today = date.today().isoformat()
@@ -701,8 +750,8 @@ def cmd_context_sync(code_version: Optional[str] = None, force: bool = False) ->
             context = parse_context_file(data)
             write_context_yaml(context, context_path)
             
-            print(f"✅ Context version reset to {new_context_version}")
-            print(f"   Code version updated to {code_version}")
+            success(f"Context version reset to {new_context_version}")
+            info(f"Code version updated to {code_version}")
             print()
             
         elif context_major != new_major:
@@ -746,8 +795,8 @@ def cmd_context_sync(code_version: Optional[str] = None, force: bool = False) ->
             context = parse_context_file(data)
             write_context_yaml(context, context_path)
             
-            print(f"✅ Context synced to {new_context_version}")
-            print(f"   Code version updated to {code_version}")
+            success(f"Context synced to {new_context_version}")
+            info(f"Code version updated to {code_version}")
             print()
             
         else:
@@ -760,16 +809,28 @@ def cmd_context_sync(code_version: Optional[str] = None, force: bool = False) ->
             context = parse_context_file(data)
             write_context_yaml(context, context_path)
             
-            print(f"✅ Code version updated to {code_version}")
-            print(f"   Context version unchanged: {current_context_version}")
+            success(f"Code version updated to {code_version}")
+            info(f"Context version unchanged: {current_context_version}")
             print()
         
         return 0
         
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 1
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
+    except InvalidVersionError as e:
+        error(str(e))
+        return 1
+    except UserInterruptError as e:
+        print()
+        error(str(e))
+        return 1
     except Exception as e:
-        print(f"❌ Error syncing context: {e}")
-        import traceback
-        traceback.print_exc()
+        error(f"Failed to sync context: {e}")
+        warning("Run with --debug for full stack trace")
         return 1
 
 
@@ -780,26 +841,24 @@ def cmd_context_history() -> int:
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    if not context_file_exists():
-        print("❌ Error: No .voodocs.context file found in this directory.")
-        print("   Run 'voodocs context init' to create one.")
-        return 1
-    
     try:
-        # Read current context
+        # Check if context file exists
         context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
+        # Read current context
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 1
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
         # Get changes
         changes = data.get('changes', [])
         
         if not changes:
-            print("📜 No change history found.")
-            print("   Changes will be recorded when you run 'voodocs context update'.")
+            warning("No change history found.")
+            info("Changes will be recorded when you run 'voodocs context update'.")
             return 0
         
         print("📜 Context Version History")
@@ -830,8 +889,15 @@ def cmd_context_history() -> int:
         
         return 0
         
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 1
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
     except Exception as e:
-        print(f"❌ Error reading history: {e}")
+        error(f"Failed to read history: {e}")
+        warning("Run with --debug for full stack trace")
         return 1
 
 
@@ -846,19 +912,17 @@ def cmd_context_diff(version1: Optional[str] = None, version2: Optional[str] = N
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    if not context_file_exists():
-        print("❌ Error: No .voodocs.context file found in this directory.")
-        print("   Run 'voodocs context init' to create one.")
-        return 1
-    
     try:
-        # Read current context
+        # Check if context file exists
         context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
+        # Read current context
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 1
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
         # Get current version
         versioning = data.get('versioning', {})
@@ -872,8 +936,8 @@ def cmd_context_diff(version1: Optional[str] = None, version2: Optional[str] = N
         if not version1:
             changes = data.get('changes', [])
             if len(changes) < 2:
-                print("📊 Not enough version history to compare.")
-                print("   Need at least 2 versions. Run 'voodocs context history' to see available versions.")
+                warning("Not enough version history to compare.")
+                info("Need at least 2 versions. Run 'voodocs context history' to see available versions.")
                 return 0
             
             # Get the two most recent versions
@@ -905,7 +969,7 @@ def cmd_context_diff(version1: Optional[str] = None, version2: Optional[str] = N
                 continue
         
         if not relevant_changes:
-            print(f"No changes found between v{version1} and v{version2}")
+            info(f"No changes found between v{version1} and v{version2}")
             return 0
         
         print(f"Changes ({len(relevant_changes)}):")
@@ -924,14 +988,19 @@ def cmd_context_diff(version1: Optional[str] = None, version2: Optional[str] = N
                 print(f"    Code: v{code_version}")
             print()
         
-        print(f"💡 Tip: Use 'voodocs context history' to see the full timeline.")
+        info("Tip: Use 'voodocs context history' to see the full timeline.")
         
         return 0
         
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 1
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
     except Exception as e:
-        print(f"❌ Error comparing versions: {e}")
-        import traceback
-        traceback.print_exc()
+        error(f"Failed to compare versions: {e}")
+        warning("Run with --debug for full stack trace")
         return 1
 
 
@@ -946,21 +1015,19 @@ def cmd_context_validate(check_version: bool = False, check_invariants: bool = F
     Returns:
         Exit code (0 for success, 1 for warnings, 2 for errors)
     """
-    if not context_file_exists():
-        print("❌ Error: No .voodocs.context file found in this directory.")
-        print("   Run 'voodocs context init' to create one.")
-        return 2
-    
     try:
-        # Read current context
+        # Check if context file exists
         context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
+        # Read current context
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 2
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
-        print("🔍 Validating Context File")
+        step("Validating context file...")
         print()
         
         errors = []
@@ -1080,7 +1147,7 @@ def cmd_context_validate(check_version: bool = False, check_invariants: bool = F
                         break
         
         if not errors and not warnings:
-            print("✅ Context file is valid!")
+            success("Context file is valid!")
             print()
             
             # Show summary
@@ -1093,23 +1160,28 @@ def cmd_context_validate(check_version: bool = False, check_invariants: bool = F
             
             # Show suggestions if any
             if suggestions:
-                print("💡 Suggestions:")
+                info("Suggestions:")
                 for suggestion in suggestions[:5]:  # Limit to 5
                     print(f"   • {suggestion}")
                 print()
             
             return 0
         elif errors:
-            print(f"❌ Validation failed with {len(errors)} error(s) and {len(warnings)} warning(s)")
+            error(f"Validation failed with {len(errors)} error(s) and {len(warnings)} warning(s)")
             return 2
         else:
-            print(f"⚠️  Validation passed with {len(warnings)} warning(s)")
+            warning(f"Validation passed with {len(warnings)} warning(s)")
             return 1
         
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 2
+    except InvalidContextError as e:
+        error(str(e))
+        return 2
     except Exception as e:
-        print(f"❌ Error validating context: {e}")
-        import traceback
-        traceback.print_exc()
+        error(f"Failed to validate context: {e}")
+        warning("Run with --debug for full stack trace")
         return 2
 
 
@@ -1127,20 +1199,16 @@ def cmd_context_generate(source_dir: Optional[str] = None, update_existing: bool
     from pathlib import Path
     import sys
     
-    # Determine source directory
-    if source_dir:
-        scan_path = Path(source_dir).resolve()
-    else:
-        scan_path = Path.cwd()
-    
-    if not scan_path.exists():
-        print(f"❌ Error: Directory not found: {scan_path}")
-        return 1
-    
-    print(f"🔍 Scanning for @voodocs annotations in: {scan_path}")
-    print()
-    
     try:
+        # Determine source directory
+        if source_dir:
+            scan_path = validate_path(source_dir, must_exist=True, must_be_dir=True)
+        else:
+            scan_path = Path.cwd()
+        
+        step(f"Scanning for @voodocs annotations in: {scan_path}")
+        print()
+        
         # Import the annotation parser
         sys.path.insert(0, str(Path(__file__).parent.parent))
         from annotations.parser import AnnotationParser
@@ -1150,14 +1218,16 @@ def cmd_context_generate(source_dir: Optional[str] = None, update_existing: bool
         results = parser.parse_directory(scan_path)
         
         if not results:
-            print("⚠️  No @voodocs annotations found.")
-            print("   Add @voodocs annotations to your code first.")
+            warning("No @voodocs annotations found.")
+            info("Add @voodocs annotations to your code first.")
             return 1
         
         # Extract global invariants from all annotations
         global_invariants = set()
         assumptions = []
-        modules_info = {}
+        
+        # Extract modules using helper function
+        modules_info = extract_modules_from_results(results, scan_path)
         
         for parsed in results:
             # Get module annotation
@@ -1176,14 +1246,6 @@ def cmd_context_generate(source_dir: Optional[str] = None, update_existing: bool
                         'source': Path(parsed.source_file).relative_to(scan_path).as_posix()
                     })
             
-            # Store module info
-            if hasattr(module_ann, 'module_purpose') and module_ann.module_purpose:
-                rel_path = Path(parsed.source_file).relative_to(scan_path).as_posix()
-                modules_info[rel_path] = {
-                    'purpose': module_ann.module_purpose,
-                    'dependencies': getattr(module_ann, 'dependencies', [])
-                }
-            
             # Extract function-level invariants that might be global
             for func_ann in module_ann.functions:
                 if hasattr(func_ann, 'invariants') and func_ann.invariants:
@@ -1270,28 +1332,37 @@ def cmd_context_generate(source_dir: Optional[str] = None, update_existing: bool
             context = parse_context_file(data)
             write_context_yaml(context, context_path)
             
-            print(f"✅ Context updated from code annotations")
-            print(f"   Added {len(new_invs)} new invariants")
-            print(f"   Added {len(assumptions) - len(existing_assumption_texts)} new assumptions")
             print()
-            print("💡 Tip: Run 'voodocs context view' to see the updated context")
+            success("Context updated from code annotations")
+            info(f"Added {len(new_invs)} new invariants")
+            info(f"Added {len(assumptions) - len(existing_assumption_texts)} new assumptions")
+            print()
+            info("Tip: Run 'voodocs context view' to see the updated context")
             
         else:
             # Create new context (should not reach here, but handle gracefully)
-            print("❌ Error: Context generation requires an existing context file.")
-            print("   Run 'voodocs context init' first, then use 'voodocs context generate --from-code'")
+            error("Context generation requires an existing context file.")
+            info("Run 'voodocs context init' first, then use 'voodocs context generate --update'")
             return 1
         
         return 0
         
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 1
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
     except ImportError as e:
-        print(f"❌ Error: Failed to import annotation parser: {e}")
-        print("   Make sure VooDocs is properly installed.")
+        error(f"Failed to import annotation parser: {e}")
+        warning("Make sure VooDocs is properly installed")
         return 1
     except Exception as e:
-        print(f"❌ Error generating context: {e}")
-        import traceback
-        traceback.print_exc()
+        error(f"Failed to generate context: {e}")
+        warning("Run with --debug for full stack trace")
         return 1
 
 
@@ -1307,29 +1378,26 @@ def cmd_context_query(query: str, section: Optional[str] = None, format: str = '
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    if not context_file_exists():
-        print("❌ Error: No .voodocs.context file found in this directory.")
-        print("   Run 'voodocs context init' to create one.")
-        return 1
-    
     try:
+        # Check if context file exists
+        context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
         import re
         import json
         
         # Read context
-        context_path = get_context_file_path()
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 1
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
         # Compile regex pattern (case-insensitive)
         try:
             pattern = re.compile(query, re.IGNORECASE)
         except re.error as e:
-            print(f"❌ Error: Invalid regex pattern: {e}")
-            return 1
+            raise ValueError(f"Invalid regex pattern: {e}")
         
         # Define searchable sections
         searchable_sections = {
@@ -1351,8 +1419,8 @@ def cmd_context_query(query: str, section: Optional[str] = None, format: str = '
         # Filter by section if specified
         if section:
             if section not in searchable_sections:
-                print(f"❌ Error: Unknown section '{section}'")
-                print(f"   Available sections: {', '.join(searchable_sections.keys())}")
+                error(f"Unknown section '{section}'")
+                info(f"Available sections: {', '.join(searchable_sections.keys())}")
                 return 1
             searchable_sections = {section: searchable_sections[section]}
         
@@ -1382,9 +1450,9 @@ def cmd_context_query(query: str, section: Optional[str] = None, format: str = '
         
         # Display results
         if not all_results:
-            print(f"🔍 No results found for: {query}")
+            info(f"No results found for: {query}")
             if section:
-                print(f"   (searched in: {section})")
+                info(f"(searched in: {section})")
             return 0
         
         if format == 'json':
@@ -1425,10 +1493,18 @@ def cmd_context_query(query: str, section: Optional[str] = None, format: str = '
         
         return 0
         
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 1
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
+    except ValueError as e:
+        error(str(e))
+        return 1
     except Exception as e:
-        print(f"❌ Error querying context: {e}")
-        import traceback
-        traceback.print_exc()
+        error(f"Failed to query context: {e}")
+        warning("Run with --debug for full stack trace")
         return 1
 
 
@@ -1523,30 +1599,28 @@ def cmd_context_check(
     Returns:
         Exit code (0 for all passed, 1 for violations found, 2 for error)
     """
-    if not context_file_exists():
-        print("❌ Error: No .voodocs.context file found in this directory.")
-        print("   Run 'voodocs context init' to create one.")
-        return 2
-    
     try:
+        # Check if context file exists
+        context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
         from .checker import InvariantChecker, ViolationSeverity
         import json
         
         # Read context
-        context_path = get_context_file_path()
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 2
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
         # Get invariants
         invariants_data = data.get('invariants', {})
         global_invariants = invariants_data.get('global', [])
         
         if not global_invariants:
-            print("⚠️  No invariants found in context file.")
-            print("   Add invariants to the 'invariants.global' section.")
+            warning("No invariants found in context file.")
+            info("Add invariants to the 'invariants.global' section.")
             return 0
         
         # Filter invariants if specified
@@ -1661,13 +1735,19 @@ def cmd_context_check(
             return 1
         return 0
         
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 2
+    except InvalidContextError as e:
+        error(str(e))
+        return 2
     except ImportError as e:
-        print(f"❌ Error: Failed to import checker: {e}")
+        error(f"Failed to import checker: {e}")
+        warning("Make sure all dependencies are installed")
         return 2
     except Exception as e:
-        print(f"❌ Error checking invariants: {e}")
-        import traceback
-        traceback.print_exc()
+        error(f"Failed to check invariants: {e}")
+        warning("Run with --debug for full stack trace")
         return 2
 
 
@@ -1690,21 +1770,19 @@ def cmd_context_diagram(
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    if not context_file_exists():
-        print("❌ Error: No .voodocs.context file found in this directory.")
-        print("   Run 'voodocs context init' to create one.")
-        return 1
-    
     try:
+        # Check if context file exists
+        context_path = get_context_file_path()
+        if not context_file_exists():
+            raise ContextFileNotFoundError(str(context_path))
+        
         from .diagram import DiagramGenerator
         
         # Read context
-        context_path = get_context_file_path()
         data = read_context_yaml(context_path)
         
         if not data:
-            print("❌ Error: Failed to read .voodocs.context file.")
-            return 1
+            raise InvalidContextError(str(context_path), "Failed to read YAML data")
         
         # Initialize generator
         generator = DiagramGenerator()
@@ -1713,20 +1791,20 @@ def cmd_context_diagram(
         diagrams = {}
         
         if diagram_type in ['modules', 'all']:
-            print(f"📊 Generating module diagram...")
+            step("Generating module diagram...")
             diagrams['modules'] = generator.generate_module_diagram(data, output_format)
         
         if diagram_type in ['dependencies', 'all']:
-            print(f"📊 Generating dependency diagram...")
+            step("Generating dependency diagram...")
             diagrams['dependencies'] = generator.generate_dependency_diagram(data, output_format)
         
         if diagram_type in ['flow', 'all']:
-            print(f"📊 Generating flow diagram...")
+            step("Generating flow diagram...")
             diagrams['flow'] = generator.generate_flow_diagram(data, output_format)
         
         if not diagrams:
-            print(f"❌ Error: Unknown diagram type: {diagram_type}")
-            print("   Valid types: modules, dependencies, flow, all")
+            error(f"Unknown diagram type: {diagram_type}")
+            info("Valid types: modules, dependencies, flow, all")
             return 1
         
         # Output diagrams
@@ -1771,7 +1849,7 @@ def cmd_context_diagram(
                 else:
                     # Save source only
                     output_path.write_text(diagrams[diagram_type])
-                    print(f"✅ Diagram saved to: {output_path}")
+                    success(f"Diagram saved to: {output_path}")
         else:
             # Print to console
             for dtype, diagram_source in diagrams.items():
@@ -1784,11 +1862,17 @@ def cmd_context_diagram(
         
         return 0
         
+    except ContextFileNotFoundError as e:
+        error(str(e))
+        return 1
+    except InvalidContextError as e:
+        error(str(e))
+        return 1
     except ImportError as e:
-        print(f"❌ Error: Failed to import diagram generator: {e}")
+        error(f"Failed to import diagram generator: {e}")
+        warning("Make sure all dependencies are installed")
         return 1
     except Exception as e:
-        print(f"❌ Error generating diagram: {e}")
-        import traceback
-        traceback.print_exc()
+        error(f"Failed to generate diagram: {e}")
+        warning("Run with --debug for full stack trace")
         return 1