crucible-mcp 0.1.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

crucible/server.py

@@ -7,8 +7,13 @@ from mcp.server import Server
 from mcp.server.stdio import stdio_server
 from mcp.types import TextContent, Tool
 
-from crucible.knowledge.loader import load_principles
-from crucible.models import Domain, Severity, ToolFinding
+from crucible.knowledge.loader import (
+    get_custom_knowledge_files,
+    load_all_knowledge,
+    load_principles,
+)
+from crucible.models import Domain, FullReviewResult, Severity, ToolFinding
+from crucible.skills import get_knowledge_for_skills, load_skill, match_skills_for_domain
 from crucible.tools.delegation import (
     check_all_tools,
     delegate_bandit,
@@ -17,6 +22,15 @@ from crucible.tools.delegation import (
     delegate_slither,
     get_semgrep_config,
 )
+from crucible.tools.git import (
+    GitContext,
+    get_branch_diff,
+    get_changed_files,
+    get_recent_commits,
+    get_repo_root,
+    get_staged_changes,
+    get_unstaged_changes,
+)
 
 server = Server("crucible")
 
@@ -47,13 +61,86 @@ def _format_findings(findings: list[ToolFinding]) -> str:
     return "\n".join(parts) if parts else "No findings."
 
 
+def _deduplicate_findings(findings: list[ToolFinding]) -> list[ToolFinding]:
+    """Deduplicate findings by location and message.
+
+    When multiple tools report the same issue at the same location,
+    keep only the highest severity finding.
+    """
+    # Group by (location, normalized_message)
+    seen: dict[tuple[str, str], ToolFinding] = {}
+
+    for f in findings:
+        # Normalize the message for comparison (lowercase, strip whitespace)
+        norm_msg = f.message.lower().strip()
+        key = (f.location, norm_msg)
+
+        if key not in seen:
+            seen[key] = f
+        else:
+            # Keep the higher severity finding
+            existing = seen[key]
+            severity_order = [
+                Severity.CRITICAL,
+                Severity.HIGH,
+                Severity.MEDIUM,
+                Severity.LOW,
+                Severity.INFO,
+            ]
+            if severity_order.index(f.severity) < severity_order.index(existing.severity):
+                seen[key] = f
+
+    return list(seen.values())
+
+
 @server.list_tools()  # type: ignore[misc]
 async def list_tools() -> list[Tool]:
     """List available tools."""
     return [
+        Tool(
+            name="review",
+            description="Unified code review tool. Supports path-based review OR git-aware review. Runs static analysis, matches skills, loads knowledge.",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "path": {
+                        "type": "string",
+                        "description": "File or directory path to review. If not provided, uses git mode.",
+                    },
+                    "mode": {
+                        "type": "string",
+                        "enum": ["staged", "unstaged", "branch", "commits"],
+                        "description": "Git mode: staged (about to commit), unstaged (working dir), branch (PR diff), commits (recent N)",
+                    },
+                    "base": {
+                        "type": "string",
+                        "description": "Base branch for 'branch' mode (default: main) or commit count for 'commits' mode (default: 1)",
+                    },
+                    "include_context": {
+                        "type": "boolean",
+                        "description": "For git modes: include findings near (within 5 lines of) changes (default: false)",
+                    },
+                    "skills": {
+                        "type": "array",
+                        "items": {"type": "string"},
+                        "description": "Override skill selection (default: auto-detect based on domain)",
+                    },
+                    "include_skills": {
+                        "type": "boolean",
+                        "description": "Load skills and checklists (default: true). Set false for quick analysis only.",
+                        "default": True,
+                    },
+                    "include_knowledge": {
+                        "type": "boolean",
+                        "description": "Load knowledge files (default: true). Set false for quick analysis only.",
+                        "default": True,
+                    },
+                },
+            },
+        ),
         Tool(
             name="quick_review",
-            description="Run static analysis tools on code. Returns findings with domain metadata for skill selection.",
+            description="[DEPRECATED: use review(path, include_skills=false)] Run static analysis only.",
             inputSchema={
                 "type": "object",
                 "properties": {
@@ -70,6 +157,57 @@ async def list_tools() -> list[Tool]:
                 "required": ["path"],
             },
         ),
+        Tool(
+            name="full_review",
+            description="[DEPRECATED: use review(path)] Comprehensive code review with skills and knowledge.",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "path": {
+                        "type": "string",
+                        "description": "File or directory path to review",
+                    },
+                    "skills": {
+                        "type": "array",
+                        "items": {"type": "string"},
+                        "description": "Override skill selection (default: auto-detect based on domain)",
+                    },
+                    "include_sage": {
+                        "type": "boolean",
+                        "description": "Include Sage knowledge recall (not yet implemented)",
+                        "default": True,
+                    },
+                },
+                "required": ["path"],
+            },
+        ),
+        Tool(
+            name="review_changes",
+            description="[DEPRECATED: use review(mode='staged')] Review git changes.",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "mode": {
+                        "type": "string",
+                        "enum": ["staged", "unstaged", "branch", "commits"],
+                        "description": "What changes to review",
+                    },
+                    "base": {
+                        "type": "string",
+                        "description": "Base branch for 'branch' mode or commit count for 'commits' mode",
+                    },
+                    "path": {
+                        "type": "string",
+                        "description": "Repository path (default: current directory)",
+                    },
+                    "include_context": {
+                        "type": "boolean",
+                        "description": "Include findings near changes (default: false)",
+                    },
+                },
+                "required": ["mode"],
+            },
+        ),
         Tool(
             name="get_principles",
             description="Load engineering principles by topic",
@@ -157,9 +295,368 @@ async def list_tools() -> list[Tool]:
                 "properties": {},
             },
         ),
+        Tool(
+            name="load_knowledge",
+            description="Load knowledge/principles files without running static analysis. Useful for getting guidance on patterns, best practices, or domain-specific knowledge. Automatically includes project and user knowledge files.",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "files": {
+                        "type": "array",
+                        "items": {"type": "string"},
+                        "description": "Specific knowledge files to load (e.g., ['SECURITY.md', 'SMART_CONTRACT.md']). If not specified, loads all project/user knowledge files.",
+                    },
+                    "include_bundled": {
+                        "type": "boolean",
+                        "description": "Include bundled knowledge files in addition to project/user files (default: false)",
+                        "default": False,
+                    },
+                    "topic": {
+                        "type": "string",
+                        "description": "Load by topic instead of files: 'security', 'engineering', 'smart_contract', 'checklist', 'repo_hygiene'",
+                    },
+                },
+            },
+        ),
     ]
 
 
+def _run_static_analysis(
+    path: str,
+    domain: Domain,
+    domain_tags: list[str],
+) -> tuple[list[ToolFinding], list[str]]:
+    """Run static analysis tools based on domain.
+
+    Returns (findings, tool_errors).
+    """
+    # Select tools based on domain
+    if domain == Domain.SMART_CONTRACT:
+        tools = ["slither", "semgrep"]
+    elif domain == Domain.BACKEND and "python" in domain_tags:
+        tools = ["ruff", "bandit", "semgrep"]
+    elif domain == Domain.FRONTEND:
+        tools = ["semgrep"]
+    else:
+        tools = ["semgrep"]
+
+    all_findings: list[ToolFinding] = []
+    tool_errors: list[str] = []
+
+    if "semgrep" in tools:
+        config = get_semgrep_config(domain)
+        result = delegate_semgrep(path, config)
+        if result.is_ok:
+            all_findings.extend(result.value)
+        elif result.is_err:
+            tool_errors.append(f"semgrep: {result.error}")
+
+    if "ruff" in tools:
+        result = delegate_ruff(path)
+        if result.is_ok:
+            all_findings.extend(result.value)
+        elif result.is_err:
+            tool_errors.append(f"ruff: {result.error}")
+
+    if "slither" in tools:
+        result = delegate_slither(path)
+        if result.is_ok:
+            all_findings.extend(result.value)
+        elif result.is_err:
+            tool_errors.append(f"slither: {result.error}")
+
+    if "bandit" in tools:
+        result = delegate_bandit(path)
+        if result.is_ok:
+            all_findings.extend(result.value)
+        elif result.is_err:
+            tool_errors.append(f"bandit: {result.error}")
+
+    return all_findings, tool_errors
+
+
+def _load_skills_and_knowledge(
+    domain: Domain,
+    domain_tags: list[str],
+    skills_override: list[str] | None = None,
+) -> tuple[list[tuple[str, list[str]]], dict[str, str], set[str], dict[str, str]]:
+    """Load matched skills and linked knowledge.
+
+    Returns (matched_skills, skill_content, knowledge_files, knowledge_content).
+    """
+    from crucible.knowledge.loader import load_knowledge_file
+    from crucible.skills.loader import (
+        get_knowledge_for_skills,
+        load_skill,
+        match_skills_for_domain,
+    )
+
+    matched_skills = match_skills_for_domain(domain, domain_tags, skills_override)
+    skill_names = [name for name, _ in matched_skills]
+
+    # Load skill content
+    skill_content: dict[str, str] = {}
+    for skill_name, _ in matched_skills:
+        result = load_skill(skill_name)
+        if result.is_ok:
+            _, content = result.value
+            # Extract content after frontmatter
+            if "\n---\n" in content:
+                skill_content[skill_name] = content.split("\n---\n", 1)[1].strip()
+            else:
+                skill_content[skill_name] = content
+
+    # Load knowledge from skills + custom project/user knowledge
+    knowledge_files = get_knowledge_for_skills(skill_names)
+    custom_knowledge = get_custom_knowledge_files()
+    knowledge_files = knowledge_files | custom_knowledge
+
+    knowledge_content: dict[str, str] = {}
+    for filename in knowledge_files:
+        result = load_knowledge_file(filename)
+        if result.is_ok:
+            knowledge_content[filename] = result.value
+
+    return matched_skills, skill_content, knowledge_files, knowledge_content
+
+
+def _format_review_output(
+    path: str | None,
+    git_context: GitContext | None,
+    domains: list[str],
+    severity_counts: dict[str, int],
+    findings: list[ToolFinding],
+    tool_errors: list[str],
+    matched_skills: list[tuple[str, list[str]]] | None,
+    skill_content: dict[str, str] | None,
+    knowledge_files: set[str] | None,
+    knowledge_content: dict[str, str] | None,
+) -> str:
+    """Format unified review output."""
+    parts: list[str] = ["# Code Review\n"]
+
+    # Header based on mode
+    if git_context:
+        parts.append(f"**Mode:** {git_context.mode}")
+        if git_context.base_ref:
+            parts.append(f"**Base:** {git_context.base_ref}")
+    elif path:
+        parts.append(f"**Path:** `{path}`")
+
+    parts.append(f"**Domains:** {', '.join(domains)}")
+    parts.append(f"**Severity summary:** {severity_counts or 'No findings'}\n")
+
+    # Files changed (git mode)
+    if git_context and git_context.changes:
+        added = [c for c in git_context.changes if c.status == "A"]
+        modified = [c for c in git_context.changes if c.status == "M"]
+        deleted = [c for c in git_context.changes if c.status == "D"]
+        renamed = [c for c in git_context.changes if c.status == "R"]
+
+        total = len(git_context.changes)
+        parts.append(f"## Files Changed ({total})")
+        for c in added:
+            parts.append(f"- `+` {c.path}")
+        for c in modified:
+            parts.append(f"- `~` {c.path}")
+        for c in renamed:
+            parts.append(f"- `R` {c.old_path} -> {c.path}")
+        for c in deleted:
+            parts.append(f"- `-` {c.path}")
+        parts.append("")
+
+        # Commit messages
+        if git_context.commit_messages:
+            parts.append("## Commits")
+            for msg in git_context.commit_messages:
+                parts.append(f"- {msg}")
+            parts.append("")
+
+    # Tool errors
+    if tool_errors:
+        parts.append("## Tool Errors\n")
+        for error in tool_errors:
+            parts.append(f"- {error}")
+        parts.append("")
+
+    # Applicable skills
+    if matched_skills:
+        parts.append("## Applicable Skills\n")
+        for skill_name, triggers in matched_skills:
+            parts.append(f"- **{skill_name}**: matched on {', '.join(triggers)}")
+        parts.append("")
+
+    # Knowledge loaded
+    if knowledge_files:
+        parts.append("## Knowledge Loaded\n")
+        parts.append(f"Files: {', '.join(sorted(knowledge_files))}")
+        parts.append("")
+
+    # Findings
+    parts.append("## Static Analysis Findings\n")
+    if findings:
+        parts.append(_format_findings(findings))
+    else:
+        parts.append("No issues found.")
+    parts.append("")
+
+    # Review checklists from skills
+    if skill_content:
+        parts.append("---\n")
+        parts.append("## Review Checklists\n")
+        for skill_name, content in skill_content.items():
+            parts.append(f"### {skill_name}\n")
+            parts.append(content)
+            parts.append("")
+
+    # Knowledge reference
+    if knowledge_content:
+        parts.append("---\n")
+        parts.append("## Principles Reference\n")
+        for filename, content in sorted(knowledge_content.items()):
+            parts.append(f"### {filename}\n")
+            parts.append(content)
+            parts.append("")
+
+    return "\n".join(parts)
+
+
+def _handle_review(arguments: dict[str, Any]) -> list[TextContent]:
+    """Handle unified review tool."""
+    import os
+
+    path = arguments.get("path")
+    mode = arguments.get("mode")
+    base = arguments.get("base")
+    include_context = arguments.get("include_context", False)
+    skills_override = arguments.get("skills")
+    include_skills = arguments.get("include_skills", True)
+    include_knowledge = arguments.get("include_knowledge", True)
+
+    # Determine if this is path-based or git-based review
+    git_context: GitContext | None = None
+    changed_files: list[str] = []
+
+    if mode:
+        # Git-based review
+        repo_path = path if path else os.getcwd()
+        root_result = get_repo_root(repo_path)
+        if root_result.is_err:
+            return [TextContent(type="text", text=f"Error: {root_result.error}")]
+        repo_path = root_result.value
+
+        # Get git context based on mode
+        if mode == "staged":
+            context_result = get_staged_changes(repo_path)
+        elif mode == "unstaged":
+            context_result = get_unstaged_changes(repo_path)
+        elif mode == "branch":
+            base_branch = base if base else "main"
+            context_result = get_branch_diff(repo_path, base_branch)
+        elif mode == "commits":
+            try:
+                count = int(base) if base else 1
+            except ValueError:
+                return [TextContent(type="text", text=f"Error: Invalid commit count '{base}'")]
+            context_result = get_recent_commits(repo_path, count)
+        else:
+            return [TextContent(type="text", text=f"Error: Unknown mode '{mode}'")]
+
+        if context_result.is_err:
+            return [TextContent(type="text", text=f"Error: {context_result.error}")]
+
+        git_context = context_result.value
+
+        if not git_context.changes:
+            if mode == "staged":
+                return [TextContent(type="text", text="No changes to review. Stage files with `git add` first.")]
+            elif mode == "unstaged":
+                return [TextContent(type="text", text="No unstaged changes to review.")]
+            else:
+                return [TextContent(type="text", text="No changes found.")]
+
+        changed_files = get_changed_files(git_context)
+        if not changed_files:
+            return [TextContent(type="text", text="No files to analyze (only deletions).")]
+
+    elif not path:
+        return [TextContent(type="text", text="Error: Either 'path' or 'mode' is required.")]
+
+    # Detect domains and run analysis
+    all_findings: list[ToolFinding] = []
+    tool_errors: list[str] = []
+    domains_detected: set[Domain] = set()
+    all_domain_tags: set[str] = set()
+
+    if git_context:
+        # Git mode: analyze each changed file
+        repo_path = get_repo_root(path if path else os.getcwd()).value
+        for file_path in changed_files:
+            full_path = f"{repo_path}/{file_path}"
+            domain, domain_tags = _detect_domain(file_path)
+            domains_detected.add(domain)
+            all_domain_tags.update(domain_tags)
+
+            findings, errors = _run_static_analysis(full_path, domain, domain_tags)
+            all_findings.extend(findings)
+            tool_errors.extend([f"{e} ({file_path})" for e in errors])
+
+        # Filter findings to changed lines
+        all_findings = _filter_findings_to_changes(all_findings, git_context, include_context)
+    else:
+        # Path mode: analyze the path directly
+        domain, domain_tags = _detect_domain(path)
+        domains_detected.add(domain)
+        all_domain_tags.update(domain_tags)
+
+        findings, errors = _run_static_analysis(path, domain, domain_tags)
+        all_findings.extend(findings)
+        tool_errors.extend(errors)
+
+    # Deduplicate findings
+    all_findings = _deduplicate_findings(all_findings)
+
+    # Compute severity summary
+    severity_counts: dict[str, int] = {}
+    for f in all_findings:
+        sev = f.severity.value
+        severity_counts[sev] = severity_counts.get(sev, 0) + 1
+
+    # Load skills and knowledge
+    matched_skills: list[tuple[str, list[str]]] | None = None
+    skill_content: dict[str, str] | None = None
+    knowledge_files: set[str] | None = None
+    knowledge_content: dict[str, str] | None = None
+
+    if include_skills or include_knowledge:
+        primary_domain = next(iter(domains_detected)) if domains_detected else Domain.UNKNOWN
+        matched, s_content, k_files, k_content = _load_skills_and_knowledge(
+            primary_domain, list(all_domain_tags), skills_override
+        )
+        if include_skills:
+            matched_skills = matched
+            skill_content = s_content
+        if include_knowledge:
+            knowledge_files = k_files
+            knowledge_content = k_content
+
+    # Format output
+    output = _format_review_output(
+        path,
+        git_context,
+        list(all_domain_tags) if all_domain_tags else ["unknown"],
+        severity_counts,
+        all_findings,
+        tool_errors,
+        matched_skills,
+        skill_content,
+        knowledge_files,
+        knowledge_content,
+    )
+
+    return [TextContent(type="text", text=output)]
+
+
 def _handle_get_principles(arguments: dict[str, Any]) -> list[TextContent]:
     """Handle get_principles tool."""
     topic = arguments.get("topic")
@@ -170,6 +667,41 @@ def _handle_get_principles(arguments: dict[str, Any]) -> list[TextContent]:
     return [TextContent(type="text", text=f"Error: {result.error}")]
 
 
+def _handle_load_knowledge(arguments: dict[str, Any]) -> list[TextContent]:
+    """Handle load_knowledge tool."""
+    files = arguments.get("files")
+    include_bundled = arguments.get("include_bundled", False)
+    topic = arguments.get("topic")
+
+    # If topic specified, use load_principles
+    if topic:
+        result = load_principles(topic)
+        if result.is_ok:
+            return [TextContent(type="text", text=result.value)]
+        return [TextContent(type="text", text=f"Error: {result.error}")]
+
+    # Otherwise load by files
+    filenames = set(files) if files else None
+    loaded, content = load_all_knowledge(
+        include_bundled=include_bundled,
+        filenames=filenames,
+    )
+
+    if not loaded:
+        if filenames:
+            return [TextContent(type="text", text=f"No knowledge files found matching: {', '.join(sorted(filenames))}")]
+        return [TextContent(type="text", text="No knowledge files found. Add files to .crucible/knowledge/ or ~/.claude/crucible/knowledge/")]
+
+    output_parts = [
+        "# Knowledge Loaded\n",
+        f"**Files:** {', '.join(loaded)}\n",
+        "---\n",
+        content,
+    ]
+
+    return [TextContent(type="text", text="\n".join(output_parts))]
+
+
 def _handle_delegate_semgrep(arguments: dict[str, Any]) -> list[TextContent]:
     """Handle delegate_semgrep tool."""
     path = arguments.get("path", "")
@@ -241,8 +773,8 @@ def _handle_check_tools(arguments: dict[str, Any]) -> list[TextContent]:
     return [TextContent(type="text", text="\n".join(parts))]
 
 
-def _detect_domain(path: str) -> tuple[Domain, list[str]]:
-    """Internal domain detection from file path.
+def _detect_domain_for_file(path: str) -> tuple[Domain, list[str]]:
+    """Detect domain from a single file path.
 
     Returns (domain, list of domain tags for skill matching).
     """
@@ -263,8 +795,59 @@ def _detect_domain(path: str) -> tuple[Domain, list[str]]:
     elif path.endswith((".tf", ".yaml", ".yml")):
         return Domain.INFRASTRUCTURE, ["infrastructure", "devops"]
     else:
+        return Domain.UNKNOWN, []
+
+
+def _detect_domain(path: str) -> tuple[Domain, list[str]]:
+    """Detect domain from file or directory path.
+
+    For directories, scans contained files and aggregates domains.
+    Returns (primary_domain, list of all domain tags).
+    """
+    from collections import Counter
+    from pathlib import Path
+
+    p = Path(path)
+
+    # Single file - use direct detection
+    if p.is_file():
+        return _detect_domain_for_file(path)
+
+    # Directory - scan and aggregate
+    if not p.is_dir():
+        return Domain.UNKNOWN, ["unknown"]
+
+    domain_counts: Counter[Domain] = Counter()
+    all_tags: set[str] = set()
+
+    # Scan files in directory (up to 1000 to avoid huge repos)
+    file_count = 0
+    max_files = 1000
+
+    for file_path in p.rglob("*"):
+        if file_count >= max_files:
+            break
+        if not file_path.is_file():
+            continue
+        # Skip hidden files and common non-code directories
+        if any(part.startswith(".") for part in file_path.parts):
+            continue
+        if any(part in ("node_modules", "__pycache__", "venv", ".venv", "dist", "build") for part in file_path.parts):
+            continue
+
+        domain, tags = _detect_domain_for_file(str(file_path))
+        if domain != Domain.UNKNOWN:
+            domain_counts[domain] += 1
+            all_tags.update(tags)
+        file_count += 1
+
+    # Return most common domain, or UNKNOWN if none found
+    if not domain_counts:
         return Domain.UNKNOWN, ["unknown"]
 
+    primary_domain = domain_counts.most_common(1)[0][0]
+    return primary_domain, sorted(all_tags) if all_tags else ["unknown"]
+
 
 def _handle_quick_review(arguments: dict[str, Any]) -> list[TextContent]:
     """Handle quick_review tool - returns findings with domain metadata."""
@@ -324,6 +907,9 @@ def _handle_quick_review(arguments: dict[str, Any]) -> list[TextContent]:
         else:
             tool_results.append(f"## Bandit\nError: {result.error}")
 
+    # Deduplicate findings
+    all_findings = _deduplicate_findings(all_findings)
+
     # Compute severity summary
     severity_counts: dict[str, int] = {}
     for f in all_findings:
@@ -341,16 +927,483 @@ def _handle_quick_review(arguments: dict[str, Any]) -> list[TextContent]:
     return [TextContent(type="text", text="\n".join(output_parts))]
 
 
+def _filter_findings_to_changes(
+    findings: list[ToolFinding],
+    context: GitContext,
+    include_context: bool = False,
+) -> list[ToolFinding]:
+    """Filter findings to only those in changed lines."""
+    # Build a lookup of file -> changed line ranges
+    changed_ranges: dict[str, list[tuple[int, int]]] = {}
+    for change in context.changes:
+        if change.status == "D":
+            continue  # Skip deleted files
+        ranges = [(r.start, r.end) for r in change.added_lines]
+        changed_ranges[change.path] = ranges
+
+    context_lines = 5 if include_context else 0
+    filtered: list[ToolFinding] = []
+
+    for finding in findings:
+        # Parse location: "path:line" or "path:line:col"
+        parts = finding.location.split(":")
+        if len(parts) < 2:
+            continue
+
+        file_path = parts[0]
+        try:
+            line_num = int(parts[1])
+        except ValueError:
+            continue
+
+        # Check if file is in changes
+        # Handle both absolute and relative paths
+        matching_file = None
+        for changed_file in changed_ranges:
+            if file_path.endswith(changed_file) or changed_file.endswith(file_path):
+                matching_file = changed_file
+                break
+
+        if not matching_file:
+            continue
+
+        # Check if line is in changed ranges
+        ranges = changed_ranges[matching_file]
+        in_range = False
+        for start, end in ranges:
+            if start - context_lines <= line_num <= end + context_lines:
+                in_range = True
+                break
+
+        if in_range:
+            filtered.append(finding)
+
+    return filtered
+
+
+def _format_change_review(
+    context: GitContext,
+    findings: list[ToolFinding],
+    severity_counts: dict[str, int],
+    tool_errors: list[str] | None = None,
+    matched_skills: list[tuple[str, list[str]]] | None = None,
+    skill_content: dict[str, str] | None = None,
+    knowledge_files: set[str] | None = None,
+    knowledge_content: dict[str, str] | None = None,
+) -> str:
+    """Format change review output."""
+    parts: list[str] = ["# Change Review\n"]
+    parts.append(f"**Mode:** {context.mode}")
+    if context.base_ref:
+        parts.append(f"**Base:** {context.base_ref}")
+    parts.append("")
+
+    # Files changed
+    added = [c for c in context.changes if c.status == "A"]
+    modified = [c for c in context.changes if c.status == "M"]
+    deleted = [c for c in context.changes if c.status == "D"]
+    renamed = [c for c in context.changes if c.status == "R"]
+
+    total = len(context.changes)
+    parts.append(f"## Files Changed ({total})")
+    for c in added:
+        parts.append(f"- `+` {c.path}")
+    for c in modified:
+        parts.append(f"- `~` {c.path}")
+    for c in renamed:
+        parts.append(f"- `R` {c.old_path} -> {c.path}")
+    for c in deleted:
+        parts.append(f"- `-` {c.path}")
+    parts.append("")
+
+    # Commit messages (if available)
+    if context.commit_messages:
+        parts.append("## Commits")
+        for msg in context.commit_messages:
+            parts.append(f"- {msg}")
+        parts.append("")
+
+    # Applicable skills
+    if matched_skills:
+        parts.append("## Applicable Skills\n")
+        for skill_name, triggers in matched_skills:
+            parts.append(f"- **{skill_name}**: matched on {', '.join(triggers)}")
+        parts.append("")
+
+    # Knowledge loaded
+    if knowledge_files:
+        parts.append("## Knowledge Loaded\n")
+        parts.append(f"Files: {', '.join(sorted(knowledge_files))}")
+        parts.append("")
+
+    # Tool errors (if any)
+    if tool_errors:
+        parts.append("## Tool Errors\n")
+        for error in tool_errors:
+            parts.append(f"- {error}")
+        parts.append("")
+
+    # Findings
+    if findings:
+        parts.append("## Findings in Changed Code\n")
+        parts.append(f"**Summary:** {severity_counts}\n")
+        parts.append(_format_findings(findings))
+    else:
+        parts.append("## Findings in Changed Code\n")
+        parts.append("No issues found in changed code.")
+    parts.append("")
+
+    # Review checklists from skills
+    if skill_content:
+        parts.append("---\n")
+        parts.append("## Review Checklists\n")
+        for skill_name, content in skill_content.items():
+            parts.append(f"### {skill_name}\n")
+            parts.append(content)
+            parts.append("")
+
+    # Knowledge reference
+    if knowledge_content:
+        parts.append("---\n")
+        parts.append("## Principles Reference\n")
+        for filename, content in sorted(knowledge_content.items()):
+            parts.append(f"### {filename}\n")
+            parts.append(content)
+            parts.append("")
+
+    return "\n".join(parts)
+
+
+def _handle_review_changes(arguments: dict[str, Any]) -> list[TextContent]:
+    """Handle review_changes tool - review git changes."""
+    import os
+
+    mode = arguments.get("mode", "staged")
+    base = arguments.get("base")
+    path = arguments.get("path", os.getcwd())
+    include_context = arguments.get("include_context", False)
+
+    # Get repo root
+    root_result = get_repo_root(path)
+    if root_result.is_err:
+        return [TextContent(type="text", text=f"Error: {root_result.error}")]
+
+    repo_path = root_result.value
+
+    # Get git context based on mode
+    if mode == "staged":
+        context_result = get_staged_changes(repo_path)
+    elif mode == "unstaged":
+        context_result = get_unstaged_changes(repo_path)
+    elif mode == "branch":
+        base_branch = base if base else "main"
+        context_result = get_branch_diff(repo_path, base_branch)
+    elif mode == "commits":
+        try:
+            count = int(base) if base else 1
+        except ValueError:
+            return [TextContent(type="text", text=f"Error: Invalid commit count '{base}'")]
+        context_result = get_recent_commits(repo_path, count)
+    else:
+        return [TextContent(type="text", text=f"Error: Unknown mode '{mode}'")]
+
+    if context_result.is_err:
+        return [TextContent(type="text", text=f"Error: {context_result.error}")]
+
+    context = context_result.value
+
+    # Check if there are any changes
+    if not context.changes:
+        if mode == "staged":
+            return [TextContent(type="text", text="No changes to review. Stage files with `git add` first.")]
+        elif mode == "unstaged":
+            return [TextContent(type="text", text="No unstaged changes to review.")]
+        else:
+            return [TextContent(type="text", text="No changes found.")]
+
+    # Get changed files (excluding deleted)
+    changed_files = get_changed_files(context)
+    if not changed_files:
+        return [TextContent(type="text", text="No files to analyze (only deletions).")]
+
+    # Run analysis on changed files
+    all_findings: list[ToolFinding] = []
+    tool_errors: list[str] = []
+    domains_detected: set[Domain] = set()
+    all_domain_tags: set[str] = set()
+
+    for file_path in changed_files:
+        full_path = f"{repo_path}/{file_path}"
+
+        # Detect domain for this file
+        domain, domain_tags = _detect_domain(file_path)
+        domains_detected.add(domain)
+        all_domain_tags.update(domain_tags)
+
+        # Select tools based on domain
+        if domain == Domain.SMART_CONTRACT:
+            tools = ["slither", "semgrep"]
+        elif domain == Domain.BACKEND and "python" in domain_tags:
+            tools = ["ruff", "bandit", "semgrep"]
+        elif domain == Domain.FRONTEND:
+            tools = ["semgrep"]
+        else:
+            tools = ["semgrep"]
+
+        # Run tools
+        if "semgrep" in tools:
+            config = get_semgrep_config(domain)
+            result = delegate_semgrep(full_path, config)
+            if result.is_ok:
+                all_findings.extend(result.value)
+            elif result.is_err:
+                tool_errors.append(f"semgrep ({file_path}): {result.error}")
+
+        if "ruff" in tools:
+            result = delegate_ruff(full_path)
+            if result.is_ok:
+                all_findings.extend(result.value)
+            elif result.is_err:
+                tool_errors.append(f"ruff ({file_path}): {result.error}")
+
+        if "slither" in tools:
+            result = delegate_slither(full_path)
+            if result.is_ok:
+                all_findings.extend(result.value)
+            elif result.is_err:
+                tool_errors.append(f"slither ({file_path}): {result.error}")
+
+        if "bandit" in tools:
+            result = delegate_bandit(full_path)
+            if result.is_ok:
+                all_findings.extend(result.value)
+            elif result.is_err:
+                tool_errors.append(f"bandit ({file_path}): {result.error}")
+
+    # Filter findings to changed lines
+    filtered_findings = _filter_findings_to_changes(all_findings, context, include_context)
+
+    # Deduplicate findings
+    filtered_findings = _deduplicate_findings(filtered_findings)
+
+    # Compute severity summary
+    severity_counts: dict[str, int] = {}
+    for f in filtered_findings:
+        sev = f.severity.value
+        severity_counts[sev] = severity_counts.get(sev, 0) + 1
+
+    # Match skills and load knowledge based on detected domains
+    from crucible.knowledge.loader import load_knowledge_file
+    from crucible.skills.loader import (
+        get_knowledge_for_skills,
+        load_skill,
+        match_skills_for_domain,
+    )
+
+    primary_domain = next(iter(domains_detected)) if domains_detected else Domain.UNKNOWN
+    matched_skills = match_skills_for_domain(
+        primary_domain, list(all_domain_tags), override=None
+    )
+
+    skill_names = [name for name, _ in matched_skills]
+    skill_content: dict[str, str] = {}
+    for skill_name, _triggers in matched_skills:
+        result = load_skill(skill_name)
+        if result.is_ok:
+            _, content = result.value
+            skill_content[skill_name] = content
+
+    knowledge_files = get_knowledge_for_skills(skill_names)
+    knowledge_content: dict[str, str] = {}
+    for filename in knowledge_files:
+        result = load_knowledge_file(filename)
+        if result.is_ok:
+            knowledge_content[filename] = result.value
+
+    # Format output
+    output = _format_change_review(
+        context,
+        filtered_findings,
+        severity_counts,
+        tool_errors,
+        matched_skills,
+        skill_content,
+        knowledge_files,
+        knowledge_content,
+    )
+    return [TextContent(type="text", text=output)]
+
+
+def _handle_full_review(arguments: dict[str, Any]) -> list[TextContent]:
+    """Handle full_review tool - comprehensive code review."""
+    path = arguments.get("path", "")
+    skills_override = arguments.get("skills")
+    # include_sage is accepted but not yet implemented
+    # _ = arguments.get("include_sage", True)
+
+    # 1. Detect domain
+    domain, domain_tags = _detect_domain(path)
+
+    # 2. Run static analysis (reuse quick_review logic)
+    if domain == Domain.SMART_CONTRACT:
+        default_tools = ["slither", "semgrep"]
+    elif domain == Domain.BACKEND and "python" in domain_tags:
+        default_tools = ["ruff", "bandit", "semgrep"]
+    elif domain == Domain.FRONTEND:
+        default_tools = ["semgrep"]
+    else:
+        default_tools = ["semgrep"]
+
+    all_findings: list[ToolFinding] = []
+    tool_errors: list[str] = []
+
+    if "semgrep" in default_tools:
+        config = get_semgrep_config(domain)
+        result = delegate_semgrep(path, config)
+        if result.is_ok:
+            all_findings.extend(result.value)
+        elif result.is_err:
+            tool_errors.append(f"semgrep: {result.error}")
+
+    if "ruff" in default_tools:
+        result = delegate_ruff(path)
+        if result.is_ok:
+            all_findings.extend(result.value)
+        elif result.is_err:
+            tool_errors.append(f"ruff: {result.error}")
+
+    if "slither" in default_tools:
+        result = delegate_slither(path)
+        if result.is_ok:
+            all_findings.extend(result.value)
+        elif result.is_err:
+            tool_errors.append(f"slither: {result.error}")
+
+    if "bandit" in default_tools:
+        result = delegate_bandit(path)
+        if result.is_ok:
+            all_findings.extend(result.value)
+        elif result.is_err:
+            tool_errors.append(f"bandit: {result.error}")
+
+    # 3. Match applicable skills
+    matched_skills = match_skills_for_domain(domain, domain_tags, skills_override)
+    skill_names = [name for name, _ in matched_skills]
+    skill_triggers: dict[str, tuple[str, ...]] = {
+        name: tuple(triggers) for name, triggers in matched_skills
+    }
+
+    # 4. Load skill content (checklists/prompts)
+    skill_contents: dict[str, str] = {}
+    for skill_name in skill_names:
+        result = load_skill(skill_name)
+        if result.is_ok:
+            _, content = result.value
+            # Extract content after frontmatter
+            if "\n---\n" in content:
+                skill_contents[skill_name] = content.split("\n---\n", 1)[1].strip()
+            else:
+                skill_contents[skill_name] = content
+
+    # 5. Collect knowledge files from matched skills + custom project/user knowledge
+    skill_knowledge = get_knowledge_for_skills(skill_names)
+    custom_knowledge = get_custom_knowledge_files()
+    # Merge: custom knowledge always included, plus skill-referenced files
+    knowledge_files = skill_knowledge | custom_knowledge
+
+    # 6. Load knowledge content
+    loaded_files, principles_content = load_all_knowledge(
+        include_bundled=False,
+        filenames=knowledge_files,
+    )
+
+    # 7. Deduplicate findings
+    all_findings = _deduplicate_findings(all_findings)
+
+    # 8. Compute severity summary
+    severity_counts: dict[str, int] = {}
+    for f in all_findings:
+        sev = f.severity.value
+        severity_counts[sev] = severity_counts.get(sev, 0) + 1
+
+    # 8. Build result
+    review_result = FullReviewResult(
+        domains_detected=tuple(domain_tags),
+        severity_summary=severity_counts,
+        findings=tuple(all_findings),
+        applicable_skills=tuple(skill_names),
+        skill_triggers_matched=skill_triggers,
+        principles_loaded=tuple(loaded_files),
+        principles_content=principles_content,
+        sage_knowledge=None,  # Not implemented yet
+        sage_query_used=None,  # Not implemented yet
+    )
+
+    # 8. Format output
+    output_parts = [
+        "# Full Review Results\n",
+        f"**Path:** `{path}`",
+        f"**Domains detected:** {', '.join(review_result.domains_detected)}",
+        f"**Severity summary:** {review_result.severity_summary or 'No findings'}\n",
+    ]
+
+    if tool_errors:
+        output_parts.append("## Tool Errors\n")
+        for error in tool_errors:
+            output_parts.append(f"- {error}")
+        output_parts.append("")
+
+    output_parts.append("## Applicable Skills\n")
+    if review_result.applicable_skills:
+        for skill in review_result.applicable_skills:
+            triggers = review_result.skill_triggers_matched.get(skill, ())
+            output_parts.append(f"- **{skill}**: matched on {', '.join(triggers)}")
+    else:
+        output_parts.append("- No skills matched")
+    output_parts.append("")
+
+    # Include skill checklists
+    if skill_contents:
+        output_parts.append("## Review Checklists\n")
+        for skill_name, content in skill_contents.items():
+            output_parts.append(f"### {skill_name}\n")
+            output_parts.append(content)
+            output_parts.append("")
+
+    output_parts.append("## Knowledge Loaded\n")
+    if review_result.principles_loaded:
+        output_parts.append(f"Files: {', '.join(review_result.principles_loaded)}\n")
+    else:
+        output_parts.append("No knowledge files loaded.\n")
+
+    output_parts.append("## Static Analysis Findings\n")
+    output_parts.append(_format_findings(list(review_result.findings)))
+
+    if review_result.principles_content:
+        output_parts.append("\n---\n")
+        output_parts.append("## Principles Reference\n")
+        output_parts.append(review_result.principles_content)
+
+    return [TextContent(type="text", text="\n".join(output_parts))]
+
+
 @server.call_tool()  # type: ignore[misc]
 async def call_tool(name: str, arguments: dict[str, Any]) -> list[TextContent]:
     """Handle tool calls."""
     handlers = {
+        # Unified review tool
+        "review": _handle_review,
+        # Deprecated tools (kept for backwards compatibility)
+        "quick_review": _handle_quick_review,
+        "full_review": _handle_full_review,
+        "review_changes": _handle_review_changes,
+        # Other tools
         "get_principles": _handle_get_principles,
+        "load_knowledge": _handle_load_knowledge,
         "delegate_semgrep": _handle_delegate_semgrep,
         "delegate_ruff": _handle_delegate_ruff,
         "delegate_slither": _handle_delegate_slither,
         "delegate_bandit": _handle_delegate_bandit,
-        "quick_review": _handle_quick_review,
         "check_tools": _handle_check_tools,
     }