crucible-mcp 0.2.0__tar.gz → 0.3.0__tar.gz

{crucible_mcp-0.2.0 → crucible_mcp-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crucible-mcp
-Version: 0.2.0
+Version: 0.3.0
 Summary: Code review MCP server for Claude. Not affiliated with Atlassian.
 Author: be.nvy
 License-Expression: MIT
@@ -73,20 +73,33 @@ Code → Detect Domain → Load Personas + Knowledge → Claude with YOUR patter
 
 | Tool | Purpose |
 |------|---------|
-| `quick_review(path)` | Run analysis, return findings + domains |
-| `get_principles(topic)` | Load engineering knowledge |
+| `review(path)` | Full review: analysis + skills + knowledge |
+| `review(mode='staged')` | Review git changes with skills + knowledge |
+| `load_knowledge(files)` | Load specific knowledge files |
+| `get_principles(topic)` | Load engineering knowledge by topic |
 | `delegate_*` | Direct tool access (semgrep, ruff, slither, bandit) |
 | `check_tools()` | Show installed analysis tools |
 
+The unified `review` tool supports:
+- **Path-based**: `review(path="src/")` - analyze files/directories
+- **Git-aware**: `review(mode="staged")` - analyze changes (staged, unstaged, branch, commits)
+- **Quick mode**: `review(path, include_skills=false)` - analysis only, no skills/knowledge
+
 ## CLI
 
 ```bash
+crucible init                     # Initialize .crucible/ for your project
+crucible review                   # Review staged changes
+crucible review --mode branch     # Review current branch vs main
+crucible ci generate              # Generate GitHub Actions workflow
+
 crucible skills list              # List all skills
-crucible skills show <skill>      # Show which version is active
 crucible skills init <skill>      # Copy to .crucible/ for customization
 
 crucible knowledge list           # List all knowledge files
 crucible knowledge init <file>    # Copy for customization
+
+crucible hooks install            # Install pre-commit hook
 ```
 
 See [ARCHITECTURE.md](docs/ARCHITECTURE.md) for the full flow.
@@ -135,6 +148,6 @@ See [KNOWLEDGE.md](docs/KNOWLEDGE.md) for topics covered.
 
 ```bash
 pip install -e ".[dev]"
-pytest                    # Run tests (494 tests)
+pytest                    # Run tests (509 tests)
 ruff check src/ --fix     # Lint
 ```

{crucible_mcp-0.2.0 → crucible_mcp-0.3.0}/README.md

@@ -56,20 +56,33 @@ Code → Detect Domain → Load Personas + Knowledge → Claude with YOUR patter
 
 | Tool | Purpose |
 |------|---------|
-| `quick_review(path)` | Run analysis, return findings + domains |
-| `get_principles(topic)` | Load engineering knowledge |
+| `review(path)` | Full review: analysis + skills + knowledge |
+| `review(mode='staged')` | Review git changes with skills + knowledge |
+| `load_knowledge(files)` | Load specific knowledge files |
+| `get_principles(topic)` | Load engineering knowledge by topic |
 | `delegate_*` | Direct tool access (semgrep, ruff, slither, bandit) |
 | `check_tools()` | Show installed analysis tools |
 
+The unified `review` tool supports:
+- **Path-based**: `review(path="src/")` - analyze files/directories
+- **Git-aware**: `review(mode="staged")` - analyze changes (staged, unstaged, branch, commits)
+- **Quick mode**: `review(path, include_skills=false)` - analysis only, no skills/knowledge
+
 ## CLI
 
 ```bash
+crucible init                     # Initialize .crucible/ for your project
+crucible review                   # Review staged changes
+crucible review --mode branch     # Review current branch vs main
+crucible ci generate              # Generate GitHub Actions workflow
+
 crucible skills list              # List all skills
-crucible skills show <skill>      # Show which version is active
 crucible skills init <skill>      # Copy to .crucible/ for customization
 
 crucible knowledge list           # List all knowledge files
 crucible knowledge init <file>    # Copy for customization
+
+crucible hooks install            # Install pre-commit hook
 ```
 
 See [ARCHITECTURE.md](docs/ARCHITECTURE.md) for the full flow.
@@ -118,6 +131,6 @@ See [KNOWLEDGE.md](docs/KNOWLEDGE.md) for topics covered.
 
 ```bash
 pip install -e ".[dev]"
-pytest                    # Run tests (494 tests)
+pytest                    # Run tests (509 tests)
 ruff check src/ --fix     # Lint
 ```

{crucible_mcp-0.2.0 → crucible_mcp-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "crucible-mcp"
-version = "0.2.0"
+version = "0.3.0"
 description = "Code review MCP server for Claude. Not affiliated with Atlassian."
 readme = "README.md"
 requires-python = ">=3.11"

{crucible_mcp-0.2.0 → crucible_mcp-0.3.0}/src/crucible/cli.py

@@ -652,11 +652,13 @@ def cmd_review(args: argparse.Namespace) -> int:
 
     # Track domains detected for per-domain threshold checking
     domains_detected: set[Domain] = set()
+    all_domain_tags: set[str] = set()
 
     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)
 
         # Select tools based on domain
         if domain == Domain.SMART_CONTRACT:
@@ -727,6 +729,37 @@ def cmd_review(args: argparse.Namespace) -> int:
 
     filtered_findings = deduplicate_findings(filtered_findings)
 
+    # 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,
+    )
+
+    # Use first domain for primary matching (most files determine this)
+    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
+    )
+
+    # Load skill content
+    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
+
+    # Load linked knowledge
+    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
+
     # Compute severity summary
     severity_counts: dict[str, int] = {}
     for f in filtered_findings:
@@ -767,6 +800,8 @@ def cmd_review(args: argparse.Namespace) -> int:
             "mode": mode,
             "files_changed": len(changed_files),
             "domains_detected": [d.value for d in domains_detected],
+            "skills_matched": dict(matched_skills),
+            "knowledge_loaded": list(knowledge_files),
             "findings": [
                 {
                     "tool": f.tool,
@@ -817,6 +852,19 @@ def cmd_review(args: argparse.Namespace) -> int:
             print(f"- `{c.path}` ({status_char})")
         print()
 
+        # Skills matched
+        if matched_skills:
+            print("## Applicable Skills\n")
+            for skill_name, triggers in matched_skills:
+                print(f"- **{skill_name}**: matched on {', '.join(triggers)}")
+            print()
+
+        # Knowledge loaded
+        if knowledge_files:
+            print("## Knowledge Loaded\n")
+            print(f"Files: {', '.join(sorted(knowledge_files))}")
+            print()
+
         # Findings by severity
         if filtered_findings:
             print("## Findings\n")
@@ -849,6 +897,23 @@ def cmd_review(args: argparse.Namespace) -> int:
                 print(f"- {error}")
             print()
 
+        # Review checklists from skills
+        if skill_content:
+            print("## Review Checklists\n")
+            for skill_name, content in skill_content.items():
+                print(f"### {skill_name}\n")
+                # Print the skill content (already markdown)
+                print(content)
+                print()
+
+        # Knowledge reference
+        if knowledge_content:
+            print("## Principles Reference\n")
+            for filename, content in sorted(knowledge_content.items()):
+                print(f"### {filename}\n")
+                print(content)
+                print()
+
         # Result
         print("## Result\n")
         if effective_threshold:

{crucible_mcp-0.2.0 → crucible_mcp-0.3.0}/src/crucible/server.py

@@ -97,9 +97,50 @@ def _deduplicate_findings(findings: list[ToolFinding]) -> list[ToolFinding]:
 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": {
@@ -116,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",
@@ -203,57 +295,6 @@ async def list_tools() -> list[Tool]:
                 "properties": {},
             },
         ),
-        Tool(
-            name="review_changes",
-            description="Review git changes (staged, unstaged, branch diff, commits). Runs analysis on changed files and filters findings to changed lines only.",
-            inputSchema={
-                "type": "object",
-                "properties": {
-                    "mode": {
-                        "type": "string",
-                        "enum": ["staged", "unstaged", "branch", "commits"],
-                        "description": "What changes to review: staged (about to commit), unstaged (working dir), branch (PR diff vs base), commits (recent N commits)",
-                    },
-                    "base": {
-                        "type": "string",
-                        "description": "Base branch for 'branch' mode (default: main) or commit count for 'commits' mode (default: 1)",
-                    },
-                    "path": {
-                        "type": "string",
-                        "description": "Repository path (default: current directory)",
-                    },
-                    "include_context": {
-                        "type": "boolean",
-                        "description": "Include findings near (within 5 lines of) changes, not just in changed lines (default: false)",
-                    },
-                },
-                "required": ["mode"],
-            },
-        ),
-        Tool(
-            name="full_review",
-            description="Comprehensive code review: runs static analysis, matches applicable skills based on domain, loads linked knowledge. Returns unified report for synthesis.",
-            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="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.",
@@ -280,6 +321,342 @@ async def list_tools() -> list[Tool]:
     ]
 
 
+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")
@@ -609,6 +986,10 @@ def _format_change_review(
     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"]
@@ -642,6 +1023,19 @@ def _format_change_review(
             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")
@@ -657,6 +1051,25 @@ def _format_change_review(
     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)
 
@@ -716,12 +1129,16 @@ def _handle_review_changes(arguments: dict[str, Any]) -> list[TextContent]:
     # 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:
@@ -775,8 +1192,45 @@ def _handle_review_changes(arguments: dict[str, Any]) -> list[TextContent]:
         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)
+    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)]
 
 
@@ -937,16 +1391,20 @@ def _handle_full_review(arguments: dict[str, Any]) -> list[TextContent]:
 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,
-        "review_changes": _handle_review_changes,
-        "full_review": _handle_full_review,
     }
 
     handler = handlers.get(name)

{crucible_mcp-0.2.0 → crucible_mcp-0.3.0}/src/crucible_mcp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crucible-mcp
-Version: 0.2.0
+Version: 0.3.0
 Summary: Code review MCP server for Claude. Not affiliated with Atlassian.
 Author: be.nvy
 License-Expression: MIT
@@ -73,20 +73,33 @@ Code → Detect Domain → Load Personas + Knowledge → Claude with YOUR patter
 
 | Tool | Purpose |
 |------|---------|
-| `quick_review(path)` | Run analysis, return findings + domains |
-| `get_principles(topic)` | Load engineering knowledge |
+| `review(path)` | Full review: analysis + skills + knowledge |
+| `review(mode='staged')` | Review git changes with skills + knowledge |
+| `load_knowledge(files)` | Load specific knowledge files |
+| `get_principles(topic)` | Load engineering knowledge by topic |
 | `delegate_*` | Direct tool access (semgrep, ruff, slither, bandit) |
 | `check_tools()` | Show installed analysis tools |
 
+The unified `review` tool supports:
+- **Path-based**: `review(path="src/")` - analyze files/directories
+- **Git-aware**: `review(mode="staged")` - analyze changes (staged, unstaged, branch, commits)
+- **Quick mode**: `review(path, include_skills=false)` - analysis only, no skills/knowledge
+
 ## CLI
 
 ```bash
+crucible init                     # Initialize .crucible/ for your project
+crucible review                   # Review staged changes
+crucible review --mode branch     # Review current branch vs main
+crucible ci generate              # Generate GitHub Actions workflow
+
 crucible skills list              # List all skills
-crucible skills show <skill>      # Show which version is active
 crucible skills init <skill>      # Copy to .crucible/ for customization
 
 crucible knowledge list           # List all knowledge files
 crucible knowledge init <file>    # Copy for customization
+
+crucible hooks install            # Install pre-commit hook
 ```
 
 See [ARCHITECTURE.md](docs/ARCHITECTURE.md) for the full flow.
@@ -135,6 +148,6 @@ See [KNOWLEDGE.md](docs/KNOWLEDGE.md) for topics covered.
 
 ```bash
 pip install -e ".[dev]"
-pytest                    # Run tests (494 tests)
+pytest                    # Run tests (509 tests)
 ruff check src/ --fix     # Lint
 ```

{crucible_mcp-0.2.0 → crucible_mcp-0.3.0}/tests/test_full_review.py

@@ -1,4 +1,4 @@
-"""Tests for full_review MCP tool."""
+"""Tests for unified review MCP tool and deprecated full_review."""
 
 from pathlib import Path
 from unittest.mock import patch
@@ -7,7 +7,12 @@ import pytest
 
 from crucible.errors import ok
 from crucible.models import Domain, FullReviewResult, Severity, ToolFinding
-from crucible.server import _detect_domain_for_file, _handle_full_review, _handle_load_knowledge
+from crucible.server import (
+    _detect_domain_for_file,
+    _handle_full_review,
+    _handle_load_knowledge,
+    _handle_review,
+)
 
 
 class TestFullReviewResult:
@@ -349,3 +354,131 @@ class TestFullReviewIncludesCustomKnowledge:
             result = _handle_full_review({"path": str(test_file)})
             text = result[0].text
             assert "PROJECT_PATTERNS.md" in text
+
+
+class TestUnifiedReview:
+    """Test unified _handle_review handler."""
+
+    def test_path_based_review(self, tmp_path: Path) -> None:
+        """Path-based review should work like full_review."""
+        test_file = tmp_path / "test.py"
+        test_file.write_text("x = 1\n")
+
+        with (
+            patch("crucible.skills.loader.SKILLS_PROJECT", tmp_path / "nonexistent-project"),
+            patch("crucible.skills.loader.SKILLS_USER", tmp_path / "nonexistent-user"),
+            patch("crucible.server.delegate_semgrep", return_value=ok([])),
+            patch("crucible.server.delegate_ruff", return_value=ok([])),
+            patch("crucible.server.delegate_bandit", return_value=ok([])),
+        ):
+            result = _handle_review({"path": str(test_file)})
+            text = result[0].text
+            assert "Code Review" in text
+            assert "python" in text.lower()
+            assert "security-engineer" in text
+
+    def test_path_based_quick_review(self, tmp_path: Path) -> None:
+        """Path-based review with include_skills=false should be quick."""
+        test_file = tmp_path / "test.py"
+        test_file.write_text("x = 1\n")
+
+        with (
+            patch("crucible.skills.loader.SKILLS_PROJECT", tmp_path / "nonexistent-project"),
+            patch("crucible.skills.loader.SKILLS_USER", tmp_path / "nonexistent-user"),
+            patch("crucible.server.delegate_semgrep", return_value=ok([])),
+            patch("crucible.server.delegate_ruff", return_value=ok([])),
+            patch("crucible.server.delegate_bandit", return_value=ok([])),
+        ):
+            result = _handle_review({
+                "path": str(test_file),
+                "include_skills": False,
+                "include_knowledge": False,
+            })
+            text = result[0].text
+            assert "Code Review" in text
+            # Should NOT have skills section
+            assert "Applicable Skills" not in text
+            # Should NOT have knowledge section
+            assert "Knowledge Loaded" not in text
+
+    def test_requires_path_or_mode(self) -> None:
+        """Should error if neither path nor mode provided."""
+        result = _handle_review({})
+        text = result[0].text
+        assert "Error" in text
+        assert "path" in text.lower() or "mode" in text.lower()
+
+    def test_skill_override(self, tmp_path: Path) -> None:
+        """Should respect skill override."""
+        test_file = tmp_path / "test.py"
+        test_file.write_text("x = 1\n")
+
+        with (
+            patch("crucible.skills.loader.SKILLS_PROJECT", tmp_path / "nonexistent-project"),
+            patch("crucible.skills.loader.SKILLS_USER", tmp_path / "nonexistent-user"),
+            patch("crucible.server.delegate_semgrep", return_value=ok([])),
+            patch("crucible.server.delegate_ruff", return_value=ok([])),
+            patch("crucible.server.delegate_bandit", return_value=ok([])),
+        ):
+            result = _handle_review({
+                "path": str(test_file),
+                "skills": ["web3-engineer"],
+            })
+            text = result[0].text
+            assert "web3-engineer" in text
+
+    def test_findings_included(self, tmp_path: Path) -> None:
+        """Should include static analysis findings."""
+        test_file = tmp_path / "test.py"
+        test_file.write_text("x = 1\n")
+
+        mock_findings = [
+            ToolFinding(
+                tool="ruff",
+                rule="E501",
+                severity=Severity.LOW,
+                message="Line too long",
+                location="test.py:1",
+            ),
+        ]
+
+        with (
+            patch("crucible.skills.loader.SKILLS_PROJECT", tmp_path / "nonexistent-project"),
+            patch("crucible.skills.loader.SKILLS_USER", tmp_path / "nonexistent-user"),
+            patch("crucible.server.delegate_semgrep", return_value=ok([])),
+            patch("crucible.server.delegate_ruff", return_value=ok(mock_findings)),
+            patch("crucible.server.delegate_bandit", return_value=ok([])),
+        ):
+            result = _handle_review({"path": str(test_file)})
+            text = result[0].text
+            assert "E501" in text
+            assert "Line too long" in text
+
+
+class TestUnifiedReviewGitMode:
+    """Test unified review in git mode."""
+
+    def test_staged_mode_no_changes(self, tmp_path: Path) -> None:
+        """Should handle no staged changes gracefully."""
+        from crucible.errors import ok as ok_result
+        from crucible.tools.git import GitContext
+
+        with (
+            patch("crucible.server.get_repo_root", return_value=ok_result(str(tmp_path))),
+            patch("crucible.server.get_staged_changes", return_value=ok_result(
+                GitContext(mode="staged", base_ref=None, changes=[], commit_messages=[])
+            )),
+        ):
+            result = _handle_review({"mode": "staged"})
+            text = result[0].text
+            assert "No changes" in text or "Stage files" in text
+
+    def test_invalid_mode(self) -> None:
+        """Should error on invalid mode."""
+        from crucible.errors import ok as ok_result
+
+        with patch("crucible.server.get_repo_root", return_value=ok_result("/tmp")):
+            result = _handle_review({"mode": "invalid"})
+            text = result[0].text
+            assert "Error" in text
+            assert "invalid" in text.lower()