fix(post-update): clear Claude plugin cache on update

The Claude plugin cache at ~/.claude/plugins/cache/leo-claude-mktplace/ holds versioned copies of .mcp.json files. When we update .mcp.json to use run.sh instead of direct python paths, the cache retains old versions, causing MCP servers to fail. Now post-update.sh clears this cache, forcing Claude to read fresh configs from the installed marketplace on next session start. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-27 14:51:21 -05:00
296 changed files with 12355 additions and 20022 deletions
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -6,12 +6,12 @@
  },
  "metadata": {
    "description": "Project management plugins with Gitea and NetBox integrations",
-    "version": "5.8.0"
+    "version": "5.1.0"
  },
  "plugins": [
    {
      "name": "projman",
-      "version": "3.4.0",
+      "version": "3.2.0",
      "description": "Sprint planning and project management with Gitea integration",
      "source": "./plugins/projman",
      "author": {
@@ -20,14 +20,14 @@
      },
      "homepage": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/src/branch/main/plugins/projman/README.md",
      "repository": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git",
-      "hooks": ["./hooks/hooks.json"],
+      "mcpServers": ["./.mcp.json"],
      "category": "development",
      "tags": ["sprint", "agile", "gitea", "project-management"],
      "license": "MIT"
    },
    {
      "name": "doc-guardian",
-      "version": "1.1.0",
+      "version": "1.0.0",
      "description": "Automatic documentation drift detection and synchronization",
      "source": "./plugins/doc-guardian",
      "author": {
@@ -43,7 +43,7 @@
    },
    {
      "name": "code-sentinel",
-      "version": "1.0.1",
+      "version": "1.0.0",
      "description": "Security scanning and code refactoring tools",
      "source": "./plugins/code-sentinel",
      "author": {
@@ -75,7 +75,7 @@
    },
    {
      "name": "cmdb-assistant",
-      "version": "1.2.0",
+      "version": "1.1.0",
      "description": "NetBox CMDB integration with data quality validation and machine registration",
      "source": "./plugins/cmdb-assistant",
      "author": {
@@ -84,14 +84,14 @@
      },
      "homepage": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/src/branch/main/plugins/cmdb-assistant/README.md",
      "repository": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git",
-      "hooks": ["./hooks/hooks.json"],
+      "mcpServers": ["./.mcp.json"],
      "category": "infrastructure",
      "tags": ["cmdb", "netbox", "dcim", "ipam", "data-quality", "validation"],
      "license": "MIT"
    },
    {
      "name": "claude-config-maintainer",
-      "version": "1.1.0",
+      "version": "1.0.0",
      "description": "CLAUDE.md optimization and maintenance for Claude Code projects",
      "source": "./plugins/claude-config-maintainer",
      "author": {
@@ -100,14 +100,13 @@
      },
      "homepage": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/src/branch/main/plugins/claude-config-maintainer/README.md",
      "repository": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git",
      "hooks": ["./hooks/hooks.json"],
      "category": "development",
      "tags": ["claude-md", "configuration", "optimization"],
      "license": "MIT"
    },
    {
      "name": "clarity-assist",
-      "version": "1.2.0",
+      "version": "1.0.0",
      "description": "Prompt optimization and requirement clarification with ND-friendly accommodations",
      "source": "./plugins/clarity-assist",
      "author": {
@@ -116,14 +115,13 @@
      },
      "homepage": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/src/branch/main/plugins/clarity-assist/README.md",
      "repository": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git",
      "hooks": ["./hooks/hooks.json"],
      "category": "productivity",
      "tags": ["prompts", "requirements", "clarification", "nd-friendly"],
      "license": "MIT"
    },
    {
      "name": "git-flow",
-      "version": "1.2.0",
+      "version": "1.0.0",
      "description": "Git workflow automation with intelligent commit messages and branch management",
      "source": "./plugins/git-flow",
      "author": {
@@ -132,14 +130,13 @@
      },
      "homepage": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/src/branch/main/plugins/git-flow/README.md",
      "repository": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git",
      "hooks": ["./hooks/hooks.json"],
      "category": "development",
      "tags": ["git", "workflow", "commits", "branching"],
      "license": "MIT"
    },
    {
      "name": "pr-review",
-      "version": "1.1.0",
+      "version": "1.0.0",
      "description": "Multi-agent pull request review with confidence scoring and actionable feedback",
      "source": "./plugins/pr-review",
      "author": {
@@ -148,14 +145,14 @@
      },
      "homepage": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/src/branch/main/plugins/pr-review/README.md",
      "repository": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git",
-      "hooks": ["./hooks/hooks.json"],
+      "mcpServers": ["./.mcp.json"],
      "category": "development",
      "tags": ["code-review", "pull-requests", "security", "quality"],
      "license": "MIT"
    },
    {
      "name": "data-platform",
-      "version": "1.3.0",
+      "version": "1.0.0",
      "description": "Data engineering tools with pandas, PostgreSQL/PostGIS, and dbt integration",
      "source": "./plugins/data-platform",
      "author": {
@@ -164,14 +161,14 @@
      },
      "homepage": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/src/branch/main/plugins/data-platform/README.md",
      "repository": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git",
-      "hooks": ["./hooks/hooks.json"],
+      "mcpServers": ["./.mcp.json"],
      "category": "data",
      "tags": ["pandas", "postgresql", "postgis", "dbt", "data-engineering", "etl"],
      "license": "MIT"
    },
    {
      "name": "viz-platform",
-      "version": "1.1.0",
+      "version": "1.0.0",
      "description": "Visualization tools with Dash Mantine Components validation, Plotly charts, and theming",
      "source": "./plugins/viz-platform",
      "author": {
@@ -180,14 +177,14 @@
      },
      "homepage": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/src/branch/main/plugins/viz-platform/README.md",
      "repository": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git",
-      "hooks": ["./hooks/hooks.json"],
+      "mcpServers": ["./.mcp.json"],
      "category": "visualization",
      "tags": ["dash", "plotly", "mantine", "charts", "dashboards", "theming", "dmc"],
      "license": "MIT"
    },
    {
      "name": "contract-validator",
-      "version": "1.2.0",
+      "version": "1.0.0",
      "description": "Cross-plugin compatibility validation and Claude.md agent verification",
      "source": "./plugins/contract-validator",
      "author": {
@@ -196,7 +193,7 @@
      },
      "homepage": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/src/branch/main/plugins/contract-validator/README.md",
      "repository": "https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git",
-      "hooks": ["./hooks/hooks.json"],
+      "mcpServers": ["./.mcp.json"],
      "category": "development",
      "tags": ["validation", "contracts", "compatibility", "agents", "interfaces", "cross-plugin"],
      "license": "MIT"
--- a/.claude/backups/CLAUDE.md.2026-01-22_132037
+++ b/.claude/backups/CLAUDE.md.2026-01-22_132037
@@ -1,249 +0,0 @@
 # CLAUDE.md
 This file provides guidance to Claude Code when working with code in this repository.
 ## Project Overview
 **Repository:** leo-claude-mktplace
 **Version:** 3.0.1
 **Status:** Production Ready
 A plugin marketplace for Claude Code containing:
 | Plugin | Description | Version |
 |--------|-------------|---------|
 | `projman` | Sprint planning and project management with Gitea integration | 3.0.0 |
 | `git-flow` | Git workflow automation with smart commits and branch management | 1.0.0 |
 | `pr-review` | Multi-agent PR review with confidence scoring | 1.0.0 |
 | `clarity-assist` | Prompt optimization with ND-friendly accommodations | 1.0.0 |
 | `doc-guardian` | Automatic documentation drift detection and synchronization | 1.0.0 |
 | `code-sentinel` | Security scanning and code refactoring tools | 1.0.0 |
 | `claude-config-maintainer` | CLAUDE.md optimization and maintenance | 1.0.0 |
 | `cmdb-assistant` | NetBox CMDB integration for infrastructure management | 1.0.0 |
 | `project-hygiene` | Post-task cleanup automation via hooks | 0.1.0 |
 ## Quick Start
 ```bash
 # Validate marketplace compliance
 ./scripts/validate-marketplace.sh
 # Setup commands (in a target project with plugin installed)
 /initial-setup    # First time: full setup wizard
 /project-init     # New project: quick config
 /project-sync     # After repo move: sync config
 # Run projman commands
 /sprint-plan      # Start sprint planning
 /sprint-status    # Check progress
 /review           # Pre-close code quality review
 /test-check       # Verify tests before close
 /sprint-close     # Complete sprint
 ```
 ## Repository Structure
 ```
 leo-claude-mktplace/
 ├── .claude-plugin/
 │   └── marketplace.json          # Marketplace manifest
 ├── mcp-servers/                  # SHARED MCP servers (v3.0.0+)
 │   ├── gitea/                    # Gitea MCP (issues, PRs, wiki)
 │   └── netbox/                   # NetBox MCP (CMDB)
 ├── plugins/
 │   ├── projman/                  # Sprint management
 │   │   ├── .claude-plugin/plugin.json
 │   │   ├── .mcp.json
 │   │   ├── mcp-servers/gitea -> ../../../mcp-servers/gitea  # SYMLINK
 │   │   ├── commands/             # 12 commands (incl. setup)
 │   │   ├── hooks/                # SessionStart mismatch detection
 │   │   ├── agents/               # 4 agents
 │   │   └── skills/label-taxonomy/
 │   ├── git-flow/                 # Git workflow automation
 │   │   ├── .claude-plugin/plugin.json
 │   │   ├── commands/             # 8 commands
 │   │   └── agents/
 │   ├── pr-review/                # Multi-agent PR review
 │   │   ├── .claude-plugin/plugin.json
 │   │   ├── .mcp.json
 │   │   ├── mcp-servers/gitea -> ../../../mcp-servers/gitea  # SYMLINK
 │   │   ├── commands/             # 6 commands (incl. setup)
 │   │   ├── hooks/                # SessionStart mismatch detection
 │   │   └── agents/               # 5 agents
 │   ├── clarity-assist/           # Prompt optimization (NEW v3.0.0)
 │   │   ├── .claude-plugin/plugin.json
 │   │   ├── commands/             # 2 commands
 │   │   └── agents/
 │   ├── doc-guardian/             # Documentation drift detection
 │   ├── code-sentinel/            # Security scanning & refactoring
 │   ├── claude-config-maintainer/
 │   ├── cmdb-assistant/
 │   └── project-hygiene/
 ├── scripts/
 │   ├── setup.sh, post-update.sh
 │   └── validate-marketplace.sh   # Marketplace compliance validation
 └── docs/
    ├── CANONICAL-PATHS.md        # Single source of truth for paths
    └── CONFIGURATION.md          # Centralized configuration guide
 ```
 ## CRITICAL: Rules You MUST Follow
 ### File Operations
 - **NEVER** create files in repository root unless listed in "Allowed Root Files"
 - **NEVER** modify `.gitignore` without explicit permission
 - **ALWAYS** use `.scratch/` for temporary/exploratory work
 - **ALWAYS** verify paths against `docs/CANONICAL-PATHS.md` before creating files
 ### Plugin Development
 - **plugin.json MUST be in `.claude-plugin/` directory** (not plugin root)
 - **Every plugin MUST be listed in marketplace.json**
 - **MCP servers are SHARED at root** with symlinks from plugins
 - **MCP server venv path**: `${CLAUDE_PLUGIN_ROOT}/mcp-servers/{name}/.venv/bin/python`
 - **CLI tools forbidden** - Use MCP tools exclusively (never `tea`, `gh`, etc.)
 ### Hooks (Valid Events Only)
 `PreToolUse`, `PostToolUse`, `UserPromptSubmit`, `SessionStart`, `SessionEnd`, `Notification`, `Stop`, `SubagentStop`, `PreCompact`
 **INVALID:** `task-completed`, `file-changed`, `git-commit-msg-needed`
 ### Allowed Root Files
 `CLAUDE.md`, `README.md`, `LICENSE`, `CHANGELOG.md`, `.gitignore`, `.env.example`
 ### Allowed Root Directories
 `.claude/`, `.claude-plugin/`, `.claude-plugins/`, `.scratch/`, `docs/`, `hooks/`, `mcp-servers/`, `plugins/`, `scripts/`
 ## Architecture
 ### Four-Agent Model (projman)
 | Agent | Personality | Responsibilities |
 |-------|-------------|------------------|
 | **Planner** | Thoughtful, methodical | Sprint planning, architecture analysis, issue creation, lesson search |
 | **Orchestrator** | Concise, action-oriented | Sprint execution, parallel batching, Git operations, lesson capture |
 | **Executor** | Implementation-focused | Code implementation, branch management, MR creation |
 | **Code Reviewer** | Thorough, practical | Pre-close quality review, security scan, test verification |
 ### MCP Server Tools (Gitea)
 | Category | Tools |
 |----------|-------|
 | Issues | `list_issues`, `get_issue`, `create_issue`, `update_issue`, `add_comment` |
 | Labels | `get_labels`, `suggest_labels`, `create_label` |
 | Milestones | `list_milestones`, `get_milestone`, `create_milestone`, `update_milestone` |
 | Dependencies | `list_issue_dependencies`, `create_issue_dependency`, `get_execution_order` |
 | Wiki | `list_wiki_pages`, `get_wiki_page`, `create_wiki_page`, `create_lesson`, `search_lessons` |
 | **Pull Requests** | `list_pull_requests`, `get_pull_request`, `get_pr_diff`, `get_pr_comments`, `create_pr_review`, `add_pr_comment` *(NEW v3.0.0)* |
 | Validation | `validate_repo_org`, `get_branch_protection` |
 ### Hybrid Configuration
 | Level | Location | Purpose |
 |-------|----------|---------|
 | System | `~/.config/claude/gitea.env` | Credentials (GITEA_API_URL, GITEA_API_TOKEN) |
 | Project | `.env` in project root | Repository specification (GITEA_ORG, GITEA_REPO) |
 **Note:** `GITEA_ORG` is at project level since different projects may belong to different organizations.
 ### Branch-Aware Security
 | Branch Pattern | Mode | Capabilities |
 |----------------|------|--------------|
 | `development`, `feat/*` | Development | Full access |
 | `staging` | Staging | Read-only code, can create issues |
 | `main`, `master` | Production | Read-only, emergency only |
 ## Label Taxonomy
 43 labels total: 27 organization + 16 repository
 **Organization:** Agent/2, Complexity/3, Efforts/5, Priority/4, Risk/3, Source/4, Type/6
 **Repository:** Component/9, Tech/7
 Sync with `/labels-sync` command.
 ## Lessons Learned System
 Stored in Gitea Wiki under `lessons-learned/sprints/`.
 **Workflow:**
 1. Orchestrator captures at sprint close via MCP tools
 2. Planner searches at sprint start using `search_lessons`
 3. Tags enable cross-project discovery
 ## Common Operations
 ### Adding a New Plugin
 1. Create `plugins/{name}/.claude-plugin/plugin.json`
 2. Add entry to `.claude-plugin/marketplace.json` with category, tags, license
 3. Create `README.md` and `claude-md-integration.md`
 4. If using MCP server, create symlink: `ln -s ../../../mcp-servers/{server} plugins/{name}/mcp-servers/{server}`
 5. Run `./scripts/validate-marketplace.sh`
 6. Update `CHANGELOG.md`
 ### Adding a Command to projman
 1. Create `plugins/projman/commands/{name}.md`
 2. Update `plugins/projman/README.md`
 3. Update marketplace description if significant
 ### Validation
 ```bash
 ./scripts/validate-marketplace.sh  # Validates all manifests
 ```
 ## Path Verification Protocol
 **Before creating any file:**
 1. Read `docs/CANONICAL-PATHS.md`
 2. List all paths to be created/modified
 3. Verify each against canonical paths
 4. If not in canonical paths, STOP and ask
 ## Documentation Index
 | Document | Purpose |
 |----------|---------|
 | `docs/CANONICAL-PATHS.md` | **Single source of truth** for paths |
 | `docs/COMMANDS-CHEATSHEET.md` | All commands quick reference with workflow examples |
 | `docs/CONFIGURATION.md` | Centralized setup guide |
 | `docs/UPDATING.md` | Update guide for the marketplace |
 | `plugins/projman/CONFIGURATION.md` | Quick reference (links to central) |
 | `plugins/projman/README.md` | Projman full documentation |
 ## Versioning and Changelog Rules
 ### Version Display
 **The marketplace version is displayed ONLY in the main `README.md` title.**
 - Format: `# Leo Claude Marketplace - vX.Y.Z`
 - Do NOT add version numbers to individual plugin documentation titles
 - Do NOT add version numbers to configuration guides
 - Do NOT add version numbers to CLAUDE.md or other docs
 ### Changelog Maintenance (MANDATORY)
 **`CHANGELOG.md` is the authoritative source for version history.**
 When releasing a new version:
 1. Update main `README.md` title with new version
 2. Update `CHANGELOG.md` with:
   - Version number and date: `## [X.Y.Z] - YYYY-MM-DD`
   - **Added**: New features, commands, files
   - **Changed**: Modifications to existing functionality
   - **Fixed**: Bug fixes
   - **Removed**: Deleted features, files, deprecated items
 3. Update `marketplace.json` metadata version
 4. Update plugin `plugin.json` versions if plugin-specific changes
 ### Version Format
 - Follow [Semantic Versioning](https://semver.org/): MAJOR.MINOR.PATCH
 - MAJOR: Breaking changes
 - MINOR: New features, backward compatible
 - PATCH: Bug fixes, minor improvements
 ---
 **Last Updated:** 2026-01-20
--- a/.doc-guardian-queue
+++ b/.doc-guardian-queue
@@ -1,27 +0,0 @@
 # Doc Guardian Queue - cleared after sync on 2026-02-02
 2026-02-02T11:41:00 | .claude-plugin | /home/lmiranda/claude-plugins-work/.claude-plugin/marketplace.json | CLAUDE.md .claude-plugin/marketplace.json
 2026-02-02T13:35:48 | skills | /home/lmiranda/claude-plugins-work/plugins/projman/skills/sprint-approval.md | README.md
 2026-02-02T13:36:03 | commands | /home/lmiranda/claude-plugins-work/plugins/projman/commands/sprint-start.md | docs/COMMANDS-CHEATSHEET.md README.md
 2026-02-02T13:36:16 | agents | /home/lmiranda/claude-plugins-work/plugins/projman/agents/orchestrator.md | README.md CLAUDE.md
 2026-02-02T13:39:07 | commands | /home/lmiranda/claude-plugins-work/plugins/projman/commands/rfc.md | docs/COMMANDS-CHEATSHEET.md README.md
 2026-02-02T13:39:15 | commands | /home/lmiranda/claude-plugins-work/plugins/projman/commands/setup.md | docs/COMMANDS-CHEATSHEET.md README.md
 2026-02-02T13:39:32 | skills | /home/lmiranda/claude-plugins-work/plugins/projman/skills/rfc-workflow.md | README.md
 2026-02-02T13:43:14 | skills | /home/lmiranda/claude-plugins-work/plugins/projman/skills/rfc-templates.md | README.md
 2026-02-02T13:44:55 | skills | /home/lmiranda/claude-plugins-work/plugins/projman/skills/sprint-lifecycle.md | README.md
 2026-02-02T13:45:04 | skills | /home/lmiranda/claude-plugins-work/plugins/projman/skills/label-taxonomy/labels-reference.md | README.md
 2026-02-02T13:45:14 | commands | /home/lmiranda/claude-plugins-work/plugins/projman/commands/sprint-plan.md | docs/COMMANDS-CHEATSHEET.md README.md
 2026-02-02T13:45:48 | commands | /home/lmiranda/claude-plugins-work/plugins/projman/commands/review.md | docs/COMMANDS-CHEATSHEET.md README.md
 2026-02-02T13:46:07 | commands | /home/lmiranda/claude-plugins-work/plugins/projman/commands/sprint-close.md | docs/COMMANDS-CHEATSHEET.md README.md
 2026-02-02T13:46:21 | commands | /home/lmiranda/claude-plugins-work/plugins/projman/commands/sprint-status.md | docs/COMMANDS-CHEATSHEET.md README.md
 2026-02-02T13:46:38 | agents | /home/lmiranda/claude-plugins-work/plugins/projman/agents/planner.md | README.md CLAUDE.md
 2026-02-02T13:46:57 | agents | /home/lmiranda/claude-plugins-work/plugins/projman/agents/code-reviewer.md | README.md CLAUDE.md
 2026-02-02T13:49:13 | commands | /home/lmiranda/claude-plugins-work/plugins/viz-platform/commands/design-gate.md | docs/COMMANDS-CHEATSHEET.md README.md
 2026-02-02T13:49:24 | commands | /home/lmiranda/claude-plugins-work/plugins/data-platform/commands/data-gate.md | docs/COMMANDS-CHEATSHEET.md README.md
 2026-02-02T13:49:35 | skills | /home/lmiranda/claude-plugins-work/plugins/projman/skills/domain-consultation.md | README.md
 2026-02-02T13:50:04 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/validation_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-02-02T13:50:59 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/server.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-02-02T13:51:32 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/tests/test_validation_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-02-02T13:51:49 | skills | /home/lmiranda/claude-plugins-work/plugins/contract-validator/skills/validation-rules.md | README.md
 2026-02-02T13:52:07 | skills | /home/lmiranda/claude-plugins-work/plugins/contract-validator/skills/mcp-tools-reference.md | README.md
 2026-02-02T13:59:09 | skills | /home/lmiranda/claude-plugins-work/plugins/projman/skills/progress-tracking.md | README.md
 2026-02-02T14:01:34 | commands | /home/lmiranda/claude-plugins-work/plugins/projman/commands/test.md | docs/COMMANDS-CHEATSHEET.md README.md
--- a/.env
+++ b/.env
@@ -1 +0,0 @@
 GITEA_REPO=personal-projects/leo-claude-mktplace
--- a/.mcp.json
+++ b/.mcp.json
@@ -1,24 +0,0 @@
 {
  "mcpServers": {
    "gitea": {
      "command": "./mcp-servers/gitea/run.sh",
      "args": []
    },
    "netbox": {
      "command": "./mcp-servers/netbox/run.sh",
      "args": []
    },
    "viz-platform": {
      "command": "./mcp-servers/viz-platform/run.sh",
      "args": []
    },
    "data-platform": {
      "command": "./mcp-servers/data-platform/run.sh",
      "args": []
    },
    "contract-validator": {
      "command": "./mcp-servers/contract-validator/run.sh",
      "args": []
    }
  }
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,345 +4,10 @@ All notable changes to the Leo Claude Marketplace will be documented in this fil
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-## [5.8.0] - 2026-02-02
+## [Unreleased]
 ### Added
 #### Projman Hardening Sprint
 Targeted improvements to safety gates, command structure, lifecycle tracking, and cross-plugin contracts.
 **Sprint Lifecycle State Machine:**
 - New `skills/sprint-lifecycle.md` - defines valid states and transitions via milestone metadata
 - States: idle -> Sprint/Planning -> Sprint/Executing -> Sprint/Reviewing -> idle
 - All sprint commands check and set lifecycle state on entry/exit
 - Out-of-order calls produce warnings with guidance, `--force` override available
 **Sprint Dispatch Log:**
 - Orchestrator now maintains a structured dispatch log during execution
 - Records task dispatch, completion, failure, gate checks, and resume events
 - Enables timeline reconstruction after interrupted sessions
 **Gate Contract Versioning:**
 - Gate commands (`/design-gate`, `/data-gate`) declare `gate_contract: v1` in frontmatter
 - `domain-consultation.md` Gate Command Reference includes expected contract version
 - `validate_workflow_integration` now checks contract version compatibility
 - Mismatch produces WARNING, missing contract produces INFO suggestion
 **Shared Visual Output Skill:**
 - New `skills/visual-output.md` - single source of truth for projman visual headers
 - All 4 agent files reference the skill instead of inline templates
 - Phase Registry maps agents to emoji and phase names
 ### Changed
 **Sprint Approval Gate Hardened:**
 - Approval is now a hard block, not a warning (was "recommended", now required)
 - `--force` flag added to bypass in emergencies (logged to milestone)
 - Consistent language across sprint-approval.md, sprint-start.md, and orchestrator.md
 **RFC Commands Normalized:**
 - 5 individual commands (`/rfc-create`, `/rfc-list`, `/rfc-review`, `/rfc-approve`, `/rfc-reject`) consolidated into `/rfc create|list|review|approve|reject`
 - `/clear-cache` absorbed into `/setup --clear-cache`
 - Command count reduced from 17 to 12
 **`/test` Command Documentation Expanded:**
 - Sprint integration section (pre-close verification workflow)
 - Concrete usage examples for all modes
 - Edge cases table
 - DO NOT rules for both modes
 ### Removed
 - `plugins/projman/commands/rfc-create.md` (replaced by `/rfc create`)
 - `plugins/projman/commands/rfc-list.md` (replaced by `/rfc list`)
 - `plugins/projman/commands/rfc-review.md` (replaced by `/rfc review`)
 - `plugins/projman/commands/rfc-approve.md` (replaced by `/rfc approve`)
 - `plugins/projman/commands/rfc-reject.md` (replaced by `/rfc reject`)
 - `plugins/projman/commands/clear-cache.md` (replaced by `/setup --clear-cache`)
 ---
 ## [5.7.1] - 2026-02-02
 ### Added
 - **contract-validator**: New `validate_workflow_integration` MCP tool — validates domain plugins expose required advisory interfaces (gate command, review command, advisory agent)
 - **contract-validator**: New `MISSING_INTEGRATION` issue type for workflow integration validation
 ### Fixed
 - `scripts/setup.sh` banner version updated from v5.1.0 to v5.7.1
 ### Reverted
 - **marketplace.json**: Removed `integrates_with` field — Claude Code schema does not support custom plugin fields (causes marketplace load failure)
 ---
 ## [5.7.0] - 2026-02-02
 ### Added
 - **data-platform**: New `data-advisor` agent for data integrity, schema, and dbt compliance validation
 - **data-platform**: New `data-integrity-audit.md` skill defining audit rules, severity levels, and scanning strategies
 - **data-platform**: New `/data-gate` command for binary pass/fail data integrity gates (projman integration)
 - **data-platform**: New `/data-review` command for comprehensive data integrity audits
 ### Changed
 - Domain Advisory Pattern now fully operational for both Viz and Data domains
 - projman orchestrator `Domain/Data` gates now resolve to live `/data-gate` command (previously fell through to "gate unavailable" warning)
 ---
 ## [5.6.0] - 2026-02-01
 ### Added
 - **Domain Advisory Pattern**: Cross-plugin integration enabling projman to consult domain-specific plugins during sprint lifecycle
 - **projman**: New `domain-consultation.md` skill for domain detection and gate protocols
 - **viz-platform**: New `design-reviewer` agent for design system compliance auditing
 - **viz-platform**: New `design-system-audit.md` skill defining audit rules and severity levels
 - **viz-platform**: New `/design-review` command for detailed design system audits
 - **viz-platform**: New `/design-gate` command for binary pass/fail validation gates
 - **Labels**: New `Domain/Viz` and `Domain/Data` labels for domain routing
 ### Changed
 - **projman planner**: Now loads domain-consultation skill and performs domain detection during planning
 - **projman orchestrator**: Now runs domain gates before marking Domain/* labeled issues as complete
 ---
 ## [5.5.0] - 2026-02-01
 ### Added
 #### RFC System for Feature Tracking
 Wiki-based Request for Comments (RFC) system for capturing, reviewing, and tracking feature ideas through their lifecycle.
 **New Commands (projman):**
 - `/rfc-create` - Create new RFC from conversation or clarified specification
 - `/rfc-list` - List all RFCs grouped by status (Draft, Review, Approved, Implementing, Implemented, Rejected, Stale)
 - `/rfc-review` - Submit Draft RFC for maintainer review
 - `/rfc-approve` - Approve RFC, making it available for sprint planning
 - `/rfc-reject` - Reject RFC with documented reason
 **RFC Lifecycle:**
 - Draft → Review → Approved → Implementing → Implemented
 - Terminal states: Rejected, Superseded
 - Stale: Drafts with no activity >90 days
 **Sprint Integration:**
 - `/sprint-plan` now detects approved RFCs and offers selection
 - `/sprint-close` updates RFC status to Implemented on completion
 - RFC-Index wiki page auto-maintained with status sections
 **Clarity-Assist Integration:**
 - Vagueness hook now detects feature request patterns
 - Suggests `/rfc-create` for feature ideas
 - `/clarify` offers RFC creation after delivering clarified spec
 **New MCP Tool:**
 - `allocate_rfc_number` - Allocates next sequential RFC number
 **New Skills:**
 - `skills/rfc-workflow.md` - RFC lifecycle and state transitions
 - `skills/rfc-templates.md` - RFC page template specifications
 ### Changed
 #### Sprint 8: Hook Efficiency Quick Wins
 Performance optimizations for plugin hooks to reduce overhead on every command.
 **Changes:**
 - **viz-platform:** Remove SessionStart hook that only echoed "loaded" (zero value)
 - **git-flow:** Add early exit to `branch-check.sh` for non-git commands (skip JSON parsing)
 - **git-flow:** Add early exit to `commit-msg-check.sh` for non-git commands (skip Python spawn)
 - **project-hygiene:** Add 60-second cooldown to `cleanup.sh` (reduce find operations)
 **Impact:** Hooks now exit immediately for 90%+ of Bash commands that don't need processing.
 **Issues:** #321, #322, #323, #324
 **PR:** #334
 ---
 ## [5.4.1] - 2026-01-30
 ### Removed
 #### Multi-Model Agent Support (REVERTED)
 **Reason:** Claude Code does not support `defaultModel` in plugin.json or `model` in agent frontmatter. The schema validation rejects these as "Unrecognized key".
 **Removed:**
 - `defaultModel` field from all plugin.json files (6 plugins)
 - `model` field references from agent frontmatter
 - `docs/MODEL-RECOMMENDATIONS.md` - Deleted entirely
 - Model configuration sections from `docs/CONFIGURATION.md` and `CLAUDE.md`
 **Lesson:** Do not implement features without verifying they are supported by Claude Code's plugin schema.
 ---
 ## [5.4.0] - 2026-01-28 [REVERTED]
 ### Added (NOW REMOVED - See 5.4.1)
 #### Sprint 7: Multi-Model Agent Support
 ~~Configurable model selection for agents with inheritance chain.~~
 **This feature was reverted in 5.4.1 - Claude Code does not support these fields.**
 Original sprint work:
 - Issues: #302, #303, #304, #305, #306
 - PRs: #307, #308
 ---
 ## [5.3.0] - 2026-01-28
 ### Added
 #### Sprint 6: Visual Branding Overhaul
 Consistent visual headers and progress tracking across all plugins.
 **Visual Output Headers (109 files):**
 - **Projman**: Double-line headers (╔═╗) with phase indicators (🎯 PLANNING, ⚡ EXECUTION, 🏁 CLOSING)
 - **Other Plugins**: Single-line headers (┌─┐) with plugin icons
 - **All 23 agents** updated with Visual Output Requirements section
 - **All 86 commands** updated with Visual Output section and header templates
 **Plugin Icon Registry:**
 | Plugin | Icon |
 |--------|------|
 | projman | 📋 |
 | code-sentinel | 🔒 |
 | doc-guardian | 📝 |
 | pr-review | 🔍 |
 | clarity-assist | 💬 |
 | git-flow | 🔀 |
 | cmdb-assistant | 🖥️ |
 | data-platform | 📊 |
 | viz-platform | 🎨 |
 | contract-validator | ✅ |
 | claude-config-maintainer | ⚙️ |
 **Wiki Branding Specification (4 pages):**
 - [branding/visual-spec](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/branding%2Fvisual-spec) - Central specification
 - [branding/plugin-registry](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/branding%2Fplugin-registry) - Icons and styles
 - [branding/header-templates](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/branding%2Fheader-templates) - Copy-paste templates
 - [branding/progress-templates](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/branding%2Fprogress-templates) - Sprint progress blocks
 ### Fixed
 - **Docs:** Version sync - CLAUDE.md, marketplace.json, README.md now consistent
 - **Docs:** Added 18 missing commands from Sprint 4 & 5 to README.md and COMMANDS-CHEATSHEET.md
 - **MCP:** Registered `/sprint-diagram` as invokable skill
 **Sprint Completed:**
 - Milestone: Sprint 6 - Visual Branding Overhaul (closed 2026-01-28)
 - Issues: #272, #273, #274, #275, #276, #277, #278
 - PRs: #284, #285
 - Wiki: [Sprint 6 Lessons](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/lessons/sprints/sprint-6---visual-branding-and-documentation-maintenance)
 ---
 ## [5.2.0] - 2026-01-28
 ### Added
 #### Sprint 5: Documentation (V5.2.0 Plugin Enhancements)
 Documentation and guides for the plugin enhancements initiative.
 **git-flow v1.2.0:**
 - **Branching Strategy Guide** (`docs/BRANCHING-STRATEGY.md`) - Complete documentation of `development -> staging -> main` promotion flow with Mermaid diagrams
 **clarity-assist v1.2.0:**
 - **ND Support Guide** (`docs/ND-SUPPORT.md`) - Documentation of neurodivergent accommodations, features, and usage examples
 **Gitea MCP Server:**
 - **`update_issue` milestone parameter** - Can now assign/change milestones programmatically
 **Sprint Completed:**
 - Milestone: Sprint 5 - Documentation (closed 2026-01-28)
 - Issues: #266, #267, #268, #269
 - Wiki: [Change V5.2.0: Plugin Enhancements (Sprint 5 Documentation)](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/Change-V5.2.0%3A-Plugin-Enhancements-%28Sprint-5-Documentation%29)
 ---
 #### Sprint 4: Commands (V5.2.0 Plugin Enhancements)
 Implementation of 18 new user-facing commands across 8 plugins.
 **projman v3.3.0:**
 - **`/sprint-diagram`** - Generate Mermaid diagram of sprint issues with dependencies and status
 **pr-review v1.1.0:**
 - **`/pr-diff`** - Formatted diff with inline review comments and annotations
 - **Confidence threshold config** - `PR_REVIEW_CONFIDENCE_THRESHOLD` env var (default: 0.7)
 **data-platform v1.2.0:**
 - **`/data-quality`** - DataFrame quality checks (nulls, duplicates, types, outliers) with pass/warn/fail scoring
 - **`/lineage-viz`** - dbt lineage visualization as Mermaid diagrams
 - **`/dbt-test`** - Formatted dbt test runner with summary and failure details
 **viz-platform v1.1.0:**
 - **`/chart-export`** - Export charts to PNG, SVG, PDF via kaleido
 - **`/accessibility-check`** - Color blind validation (WCAG contrast ratios)
 - **`/breakpoints`** - Responsive layout breakpoint configuration
 - **New MCP tools**: `chart_export`, `accessibility_validate_colors`, `accessibility_validate_theme`, `accessibility_suggest_alternative`, `layout_set_breakpoints`
 - **New dependency**: kaleido>=0.2.1 for chart rendering
 **contract-validator v1.2.0:**
 - **`/dependency-graph`** - Mermaid visualization of plugin dependencies with data flow
 **doc-guardian v1.1.0:**
 - **`/changelog-gen`** - Generate changelog from conventional commits
 - **`/doc-coverage`** - Documentation coverage metrics by function/class
 - **`/stale-docs`** - Flag documentation behind code changes
 **claude-config-maintainer v1.1.0:**
 - **`/config-diff`** - Track CLAUDE.md changes over time with behavioral impact analysis
 - **`/config-lint`** - 31 lint rules for CLAUDE.md (security, structure, content, format, best practices)
 **cmdb-assistant v1.2.0:**
 - **`/cmdb-topology`** - Infrastructure topology diagrams (rack, network, site views)
 - **`/change-audit`** - NetBox audit trail queries with filtering
 - **`/ip-conflicts`** - Detect IP conflicts and overlapping prefixes
 **Sprint Completed:**
 - Milestone: Sprint 4 - Commands (closed 2026-01-28)
 - Issues: #241-#258 (18/18 closed)
 - Wiki: [Change V5.2.0: Plugin Enhancements (Sprint 4 Commands)](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/Change-V5.2.0%3A-Plugin-Enhancements-%28Sprint-4-Commands%29)
 - Lessons: [Sprint 4 - Plugin Commands Implementation](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/lessons/sprints/sprint-4---plugin-commands-implementation)
 ### Fixed
 - **MCP:** Project directory detection - all run.sh scripts now capture `CLAUDE_PROJECT_DIR` from PWD before changing directories
 - **Docs:** Added Gitea auto-close behavior and MCP session restart notes to DEBUGGING-CHECKLIST.md
 ---
 #### Sprint 3: Hooks (V5.2.0 Plugin Enhancements)
 Implementation of 6 foundational hooks across 4 plugins.
 **git-flow v1.1.0:**
 - **Commit message enforcement hook** - PreToolUse hook validates conventional commit format on all `git commit` commands (not just `/commit`). Blocks invalid commits with format guidance.
 - **Branch name validation hook** - PreToolUse hook validates branch naming on `git checkout -b` and `git switch -c`. Enforces `type/description` format, lowercase, max 50 chars.
 **clarity-assist v1.1.0:**
 - **Vagueness detection hook** - UserPromptSubmit hook detects vague prompts and suggests `/clarify` when ambiguity, missing context, or unclear scope detected.
 **data-platform v1.1.0:**
 - **Schema diff detection hook** - PostToolUse hook monitors edits to schema files (dbt models, SQL migrations). Warns on breaking changes (column removal, type narrowing, constraint addition).
 **contract-validator v1.1.0:**
 - **SessionStart auto-validate hook** - Smart validation that only runs when plugin files changed since last check. Detects interface compatibility issues at session start.
 - **Breaking change detection hook** - PostToolUse hook monitors plugin interface files (README.md, plugin.json). Warns when changes would break consumers.
 **Sprint Completed:**
 - Milestone: Sprint 3 - Hooks (closed 2026-01-28)
 - Issues: #225, #226, #227, #228, #229, #230
 - Wiki: [Change V5.2.0: Plugin Enhancements Proposal](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/Change-V5.2.0:-Plugin-Enhancements-Proposal)
 - Lessons: Background agent permissions, agent runaway detection, MCP branch detection bug
 ### Known Issues
 - **MCP Bug #231:** Branch detection in Gitea MCP runs from installed plugin directory, not user's project directory. Workaround: close issues via Gitea web UI.
 ---
 #### Gitea MCP Server - create_pull_request Tool
 - **`create_pull_request`**: Create new pull requests via MCP
  - Parameters: title, body, head (source branch), base (target branch), labels
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,5 +1,6 @@
 # CLAUDE.md
 This file provides guidance to Claude Code when working with code in this repository.
 ## ⛔ MANDATORY BEHAVIOR RULES - READ FIRST
 **These rules are NON-NEGOTIABLE. Violating them wastes the user's time and money.**
@@ -8,162 +9,65 @@
 - Search ALL locations, not just where you think it is
 - Check cache directories: `~/.claude/plugins/cache/`
 - Check installed: `~/.claude/plugins/marketplaces/`
- Check source directories
+- Check source: `~/claude-plugins-work/`
 - **NEVER say "no" or "that's not the issue" without exhaustive verification**
 ### 2. WHEN USER SAYS SOMETHING IS WRONG - BELIEVE THEM
 - The user knows their system better than you
 - Investigate thoroughly before disagreeing
 - If user suspects cache, CHECK THE CACHE
 - If user suspects a file, READ THE FILE
 - **Your confidence is often wrong. User's instincts are often right.**
 ### 3. NEVER SAY "DONE" WITHOUT VERIFICATION
 - Run the actual command/script to verify
 - Show the output to the user
 - Check ALL affected locations
 - **"Done" means VERIFIED WORKING, not "I made changes"**
 ### 4. SHOW EXACTLY WHAT USER ASKS FOR
 - If user asks for messages, show the MESSAGES
 - If user asks for code, show the CODE
- **Do not interpret or summarize unless asked**
+- If user asks for output, show the OUTPUT
 - **Don't interpret or summarize unless asked**
 ### 5. AFTER PLUGIN UPDATES - VERIFY AND RESTART
 **⚠️ DO NOT clear cache mid-session** - this breaks MCP tools that are already loaded.
 1. Run `./scripts/verify-hooks.sh` to check hook types
 2. If changes affect MCP servers or hooks, inform the user:
   > "Plugin changes require a session restart to take effect. Please restart Claude Code."
 3. Cache clearing is ONLY safe **before** starting a new session (not during)
 See `docs/DEBUGGING-CHECKLIST.md` for details on cache timing.
 **FAILURE TO FOLLOW THESE RULES = WASTED USER TIME = UNACCEPTABLE**
 ---
 This file provides guidance to Claude Code when working with code in this repository.
 ## ⛔ RULES - READ FIRST
 ### Behavioral Rules
 | Rule | Summary |
 |------|---------|
 | **Check everything** | Search cache (`~/.claude/plugins/cache/`), installed (`~/.claude/plugins/marketplaces/`), and source (`~/claude-plugins-work/`) |
 | **Believe the user** | User knows their system. Investigate before disagreeing. |
 | **Verify before "done"** | Run commands, show output, check all locations. "Done" = verified working. |
 | **Show what's asked** | Don't interpret or summarize unless asked. |
 ### After Plugin Updates
 Run `./scripts/verify-hooks.sh`. If changes affect MCP servers or hooks, inform user to restart session.
 **DO NOT clear cache mid-session** - breaks loaded MCP tools.
 ### NEVER USE CLI TOOLS FOR EXTERNAL SERVICES
 - **FORBIDDEN:** `gh`, `tea`, `curl` to APIs, any CLI that talks to Gitea/GitHub/external services
 - **REQUIRED:** Use MCP tools exclusively (`mcp__plugin_projman_gitea__*`, `mcp__plugin_pr-review_gitea__*`)
 - **NO EXCEPTIONS.** Don't try CLI first. Don't fall back to CLI. MCP ONLY.
 ### NEVER PUSH DIRECTLY TO PROTECTED BRANCHES
 - **FORBIDDEN:** `git push origin development`, `git push origin main`, `git push origin master`
 - **REQUIRED:** Create feature branch → push feature branch → create PR via MCP
 - If you accidentally commit to a protected branch locally: `git checkout -b fix/branch-name` then reset the protected branch
 ### Repository Rules
 | Rule | Details |
 |------|---------|
 | **File creation** | Only in allowed paths. Use `.scratch/` for temp work. Verify against `docs/CANONICAL-PATHS.md` |
 | **plugin.json location** | Must be in `.claude-plugin/` directory |
 | **Hooks** | Use `hooks/hooks.json` (auto-discovered). Never inline in plugin.json |
 | **MCP servers** | Defined in root `.mcp.json`. Use MCP tools, never CLI (`tea`, `gh`) |
 | **Allowed root files** | `CLAUDE.md`, `README.md`, `LICENSE`, `CHANGELOG.md`, `.gitignore`, `.env.example` |
 **Valid hook events:** `PreToolUse`, `PostToolUse`, `UserPromptSubmit`, `SessionStart`, `SessionEnd`, `Notification`, `Stop`, `SubagentStop`, `PreCompact`
 ### ⛔ MANDATORY: Before Any Code Change
 **Claude MUST show this checklist BEFORE editing any file:**
 #### 1. Impact Search Results
 Run and show output of:
 ```bash
 grep -rn "PATTERN" --include="*.sh" --include="*.md" --include="*.json" --include="*.py" | grep -v ".git"
 ```
 #### 2. Files That Will Be Affected
 Numbered list of every file to be modified, with the specific change for each.
 #### 3. Files Searched But Not Changed (and why)
 Proof that related files were checked and determined unchanged.
 #### 4. Documentation That References This
 List of docs that mention this feature/script/function.
 **User verifies this list before Claude proceeds. If Claude skips this, STOP IMMEDIATELY.**
 #### After Changes
 Run the same grep and show results proving no references remain unaddressed.
 ---
 ## ⚠️ Development Context: We Build AND Use These Plugins
 **This is a self-referential project.** We are:
 1. **BUILDING** a plugin marketplace (source code in `plugins/`)
 2. **USING** the installed marketplace to build it (dogfooding)
 ### Plugins ACTIVELY USED in This Project
 These plugins are installed and should be used during development:
 | Plugin | Used For |
 |--------|----------|
 | **projman** | Sprint planning, issue management, lessons learned |
 | **git-flow** | Commits, branch management |
 | **pr-review** | Pull request reviews |
 | **doc-guardian** | Documentation drift detection |
 | **code-sentinel** | Security scanning, refactoring |
 | **clarity-assist** | Prompt clarification |
 | **claude-config-maintainer** | CLAUDE.md optimization |
 | **contract-validator** | Cross-plugin compatibility |
 ### Plugins NOT Used Here (Development Only)
 These plugins exist in source but are **NOT relevant** to this project's workflow:
 | Plugin | Why Not Used |
 |--------|--------------|
 | **data-platform** | For data engineering projects (pandas, PostgreSQL, dbt) |
 | **viz-platform** | For dashboard projects (Dash, Plotly) |
 | **cmdb-assistant** | For infrastructure projects (NetBox) |
 **Do NOT suggest** `/ingest`, `/profile`, `/chart`, `/cmdb-*` commands - they don't apply here.
 ### Key Distinction
 | Context | Path | What To Do |
 |---------|------|------------|
 | **Editing plugin source** | `~/claude-plugins-work/plugins/` | Modify code, add features |
 | **Using installed plugins** | `~/.claude/plugins/marketplaces/` | Run commands like `/sprint-plan` |
 When user says "run /sprint-plan", use the INSTALLED plugin.
 When user says "fix the sprint-plan command", edit the SOURCE code.
 ---
 ## Project Overview
 **Repository:** leo-claude-mktplace
-**Version:** 5.4.0
+**Version:** 5.0.0
 **Status:** Production Ready
 A plugin marketplace for Claude Code containing:
 | Plugin | Description | Version |
 |--------|-------------|---------|
-| `projman` | Sprint planning and project management with Gitea integration | 3.3.0 |
+| `projman` | Sprint planning and project management with Gitea integration | 3.2.0 |
 | `git-flow` | Git workflow automation with smart commits and branch management | 1.0.0 |
-| `pr-review` | Multi-agent PR review with confidence scoring | 1.1.0 |
+| `pr-review` | Multi-agent PR review with confidence scoring | 1.0.0 |
 | `clarity-assist` | Prompt optimization with ND-friendly accommodations | 1.0.0 |
 | `doc-guardian` | Automatic documentation drift detection and synchronization | 1.0.0 |
-| `code-sentinel` | Security scanning and code refactoring tools | 1.0.1 |
+| `code-sentinel` | Security scanning and code refactoring tools | 1.0.0 |
 | `claude-config-maintainer` | CLAUDE.md optimization and maintenance | 1.0.0 |
-| `cmdb-assistant` | NetBox CMDB integration for infrastructure management | 1.2.0 |
+| `cmdb-assistant` | NetBox CMDB integration for infrastructure management | 1.0.0 |
-| `data-platform` | pandas, PostgreSQL, and dbt integration for data engineering | 1.1.0 |
+| `data-platform` | pandas, PostgreSQL, and dbt integration for data engineering | 1.0.0 |
-| `viz-platform` | DMC validation, Plotly charts, and theming for dashboards | 1.1.0 |
+| `viz-platform` | DMC validation, Plotly charts, and theming for dashboards | 1.0.0 |
-| `contract-validator` | Cross-plugin compatibility validation and agent verification | 1.1.0 |
+| `contract-validator` | Cross-plugin compatibility validation and agent verification | 1.0.0 |
 | `project-hygiene` | Post-task cleanup automation via hooks | 0.1.0 |
 ## Quick Start
@@ -173,33 +77,25 @@ A plugin marketplace for Claude Code containing:
 ./scripts/validate-marketplace.sh
 # After updates
-./scripts/post-update.sh   # Rebuild venvs
+./scripts/post-update.sh   # Rebuild venvs, verify symlinks
 ```
-### Plugin Commands - USE THESE in This Project
+### Plugin Commands by Category
 | Category | Commands |
 |----------|----------|
-| **Setup** | `/setup` (modes: `--full`, `--quick`, `--sync`) |
+| **Setup** | `/initial-setup`, `/project-init`, `/project-sync` |
-| **Sprint** | `/sprint-plan`, `/sprint-start`, `/sprint-status` (with `--diagram`), `/sprint-close` |
+| **Sprint** | `/sprint-plan`, `/sprint-start`, `/sprint-status`, `/sprint-close` |
-| **Quality** | `/review`, `/test` (modes: `run`, `gen`) |
+| **Quality** | `/review`, `/test-check`, `/test-gen` |
 | **Versioning** | `/suggest-version` |
-| **PR Review** | `/pr-review`, `/pr-summary`, `/pr-findings`, `/pr-diff` |
+| **PR Review** | `/pr-review:initial-setup`, `/pr-review:project-init` |
-| **Docs** | `/doc-audit`, `/doc-sync`, `/changelog-gen`, `/doc-coverage`, `/stale-docs` |
+| **Docs** | `/doc-audit`, `/doc-sync` |
 | **Security** | `/security-scan`, `/refactor`, `/refactor-dry` |
-| **Config** | `/config-analyze`, `/config-optimize`, `/config-diff`, `/config-lint` |
+| **Config** | `/config-analyze`, `/config-optimize` |
-| **Validation** | `/validate-contracts`, `/check-agent`, `/list-interfaces`, `/dependency-graph` |
+| **Data** | `/ingest`, `/profile`, `/schema`, `/explain`, `/lineage`, `/run` |
-| **Debug** | `/debug` (modes: `report`, `review`) |
+| **Visualization** | `/component`, `/chart`, `/dashboard`, `/theme`, `/theme-new`, `/theme-css` |
-
+| **Validation** | `/validate-contracts`, `/check-agent`, `/list-interfaces` |
-### Plugin Commands - NOT RELEVANT to This Project
+| **Debug** | `/debug-report`, `/debug-review` |
 These commands are being developed but don't apply to this project's workflow:
 | Category | Commands | For Projects Using |
 |----------|----------|-------------------|
 | **Data** | `/ingest`, `/profile`, `/schema`, `/lineage`, `/dbt-test` | pandas, PostgreSQL, dbt |
 | **Visualization** | `/component`, `/chart`, `/dashboard`, `/theme` | Dash, Plotly dashboards |
 | **CMDB** | `/cmdb-search`, `/cmdb-device`, `/cmdb-sync` | NetBox infrastructure |
 ## Repository Structure
@@ -207,40 +103,46 @@ These commands are being developed but don't apply to this project's workflow:
 leo-claude-mktplace/
 ├── .claude-plugin/
 │   └── marketplace.json          # Marketplace manifest
-├── .mcp.json                     # MCP server configuration (all servers)
+├── mcp-servers/                  # SHARED MCP servers (v3.0.0+)
 ├── mcp-servers/                  # SHARED MCP servers
 │   ├── gitea/                    # Gitea MCP (issues, PRs, wiki)
 │   ├── netbox/                   # NetBox MCP (CMDB)
 │   ├── data-platform/            # pandas, PostgreSQL, dbt
-│   ├── viz-platform/             # DMC validation, charts, themes
+│   └── viz-platform/             # DMC validation, charts, themes
 │   └── contract-validator/       # Plugin compatibility validation
 ├── plugins/
 │   ├── projman/                  # Sprint management
 │   │   ├── .claude-plugin/plugin.json
-│   │   ├── commands/             # 12 commands
+│   │   ├── .mcp.json
-│   │   ├── hooks/                # SessionStart: mismatch detection
+│   │   ├── mcp-servers/gitea -> ../../../mcp-servers/gitea  # SYMLINK
 │   │   ├── commands/             # 14 commands (incl. setup, debug, suggest-version)
 │   │   ├── hooks/                # SessionStart: mismatch detection + sprint suggestions
 │   │   ├── agents/               # 4 agents
-│   │   └── skills/               # 17 reusable skill files
+│   │   └── skills/label-taxonomy/
 │   ├── git-flow/                 # Git workflow automation
 │   │   ├── .claude-plugin/plugin.json
 │   │   ├── commands/             # 8 commands
 │   │   └── agents/
 │   ├── pr-review/                # Multi-agent PR review
 │   │   ├── .claude-plugin/plugin.json
-│   │   ├── commands/             # 6 commands
+│   │   ├── .mcp.json
 │   │   ├── mcp-servers/gitea -> ../../../mcp-servers/gitea  # SYMLINK
 │   │   ├── commands/             # 6 commands (incl. setup)
 │   │   ├── hooks/                # SessionStart mismatch detection
 │   │   └── agents/               # 5 agents
 │   ├── clarity-assist/           # Prompt optimization
 │   │   ├── .claude-plugin/plugin.json
 │   │   ├── commands/             # 2 commands
 │   │   └── agents/
-│   ├── data-platform/            # Data engineering
+│   ├── data-platform/            # Data engineering (NEW v4.0.0)
 │   │   ├── .claude-plugin/plugin.json
 │   │   ├── .mcp.json
 │   │   ├── mcp-servers/          # pandas, postgresql, dbt MCPs
 │   │   ├── commands/             # 7 commands
 │   │   ├── hooks/                # SessionStart PostgreSQL check
 │   │   └── agents/               # 2 agents
-│   ├── viz-platform/             # Visualization
+│   ├── viz-platform/             # Visualization (NEW v4.0.0)
 │   │   ├── .claude-plugin/plugin.json
 │   │   ├── .mcp.json
 │   │   ├── mcp-servers/          # viz-platform MCP
 │   │   ├── commands/             # 7 commands
 │   │   ├── hooks/                # SessionStart DMC check
 │   │   └── agents/               # 3 agents
@@ -248,7 +150,6 @@ leo-claude-mktplace/
 │   ├── code-sentinel/            # Security scanning & refactoring
 │   ├── claude-config-maintainer/
 │   ├── cmdb-assistant/
 │   ├── contract-validator/
 │   └── project-hygiene/
 ├── scripts/
 │   ├── setup.sh, post-update.sh
@@ -260,6 +161,40 @@ leo-claude-mktplace/
    └── CONFIGURATION.md          # Centralized configuration guide
 ```
 ## CRITICAL: Rules You MUST Follow
 ### File Operations
 - **NEVER** create files in repository root unless listed in "Allowed Root Files"
 - **NEVER** modify `.gitignore` without explicit permission
 - **ALWAYS** use `.scratch/` for temporary/exploratory work
 - **ALWAYS** verify paths against `docs/CANONICAL-PATHS.md` before creating files
 ### Plugin Development
 - **plugin.json MUST be in `.claude-plugin/` directory** (not plugin root)
 - **Every plugin MUST be listed in marketplace.json**
 - **MCP servers are SHARED at root** with symlinks from plugins
 - **MCP server venv path**: `${CLAUDE_PLUGIN_ROOT}/mcp-servers/{name}/.venv/bin/python`
 - **CLI tools forbidden** - Use MCP tools exclusively (never `tea`, `gh`, etc.)
 #### ⚠️ plugin.json Format Rules (CRITICAL)
 - **Hooks in separate file** - Use `hooks/hooks.json` (auto-discovered), NOT inline in plugin.json
 - **NEVER reference hooks** - Don't add `"hooks": "..."` field to plugin.json at all
 - **Agents auto-discover** - NEVER add `"agents": ["./agents/"]` - .md files found automatically
 - **Always validate** - Run `./scripts/validate-marketplace.sh` before committing
 - **Working examples:** projman, pr-review, claude-config-maintainer all use `hooks/hooks.json`
 - See lesson: `lessons/patterns/plugin-manifest-validation---hooks-and-agents-format-requirements`
 ### Hooks (Valid Events Only)
 `PreToolUse`, `PostToolUse`, `UserPromptSubmit`, `SessionStart`, `SessionEnd`, `Notification`, `Stop`, `SubagentStop`, `PreCompact`
 **INVALID:** `task-completed`, `file-changed`, `git-commit-msg-needed`
 ### Allowed Root Files
 `CLAUDE.md`, `README.md`, `LICENSE`, `CHANGELOG.md`, `.gitignore`, `.env.example`
 ### Allowed Root Directories
 `.claude/`, `.claude-plugin/`, `.claude-plugins/`, `.scratch/`, `docs/`, `hooks/`, `mcp-servers/`, `plugins/`, `scripts/`
 ## Architecture
 ### Four-Agent Model (projman)
@@ -279,7 +214,7 @@ leo-claude-mktplace/
 | Labels | `get_labels`, `suggest_labels`, `create_label`, `create_label_smart` |
 | Milestones | `list_milestones`, `get_milestone`, `create_milestone`, `update_milestone`, `delete_milestone` |
 | Dependencies | `list_issue_dependencies`, `create_issue_dependency`, `remove_issue_dependency`, `get_execution_order` |
-| Wiki | `list_wiki_pages`, `get_wiki_page`, `create_wiki_page`, `update_wiki_page`, `create_lesson`, `search_lessons`, `allocate_rfc_number` |
+| Wiki | `list_wiki_pages`, `get_wiki_page`, `create_wiki_page`, `update_wiki_page`, `create_lesson`, `search_lessons` |
 | **Pull Requests** | `list_pull_requests`, `get_pull_request`, `get_pr_diff`, `get_pr_comments`, `create_pr_review`, `add_pr_comment` |
 | Validation | `validate_repo_org`, `get_branch_protection` |
@@ -300,20 +235,6 @@ leo-claude-mktplace/
 | `staging` | Staging | Read-only code, can create issues |
 | `main`, `master` | Production | Read-only, emergency only |
 ### RFC System
 Wiki-based Request for Comments system for tracking feature ideas from proposal through implementation.
 **RFC Wiki Naming:**
 - RFC pages: `RFC-NNNN: Short Title` (4-digit zero-padded)
 - Index page: `RFC-Index` (auto-maintained)
 **Lifecycle:** Draft → Review → Approved → Implementing → Implemented
 **Integration with Sprint Planning:**
 - `/sprint-plan` detects approved RFCs and offers selection
 - `/sprint-close` updates RFC status on completion
 ## Label Taxonomy
 43 labels total: 27 organization + 16 repository
@@ -338,15 +259,16 @@ Stored in Gitea Wiki under `lessons-learned/sprints/`.
 1. Create `plugins/{name}/.claude-plugin/plugin.json`
 2. Add entry to `.claude-plugin/marketplace.json` with category, tags, license
-3. Create `claude-md-integration.md`
+3. Create `README.md` and `claude-md-integration.md`
-4. If using new MCP server, add to root `mcp-servers/` and update `.mcp.json`
+4. If using MCP server, create symlink: `ln -s ../../../mcp-servers/{server} plugins/{name}/mcp-servers/{server}`
 5. Run `./scripts/validate-marketplace.sh`
 6. Update `CHANGELOG.md`
 ### Adding a Command to projman
 1. Create `plugins/projman/commands/{name}.md`
-2. Update marketplace description if significant
+2. Update `plugins/projman/README.md`
 3. Update marketplace description if significant
 ### Validation
@@ -373,6 +295,7 @@ Stored in Gitea Wiki under `lessons-learned/sprints/`.
 | `docs/DEBUGGING-CHECKLIST.md` | Systematic troubleshooting guide |
 | `docs/UPDATING.md` | Update guide for the marketplace |
 | `plugins/projman/CONFIGURATION.md` | Projman quick reference (links to central) |
 | `plugins/projman/README.md` | Projman full documentation |
 ## Installation Paths
@@ -394,12 +317,12 @@ See `docs/DEBUGGING-CHECKLIST.md` for systematic troubleshooting.
 | Symptom | Likely Cause | Fix |
 |---------|--------------|-----|
 | "X MCP servers failed" | Missing venv in installed path | `cd ~/.claude/plugins/marketplaces/leo-claude-mktplace && ./scripts/setup.sh` |
-| MCP tools not available | Venv missing or .mcp.json misconfigured | Run `/debug report` to diagnose |
+| MCP tools not available | Symlink broken or venv missing | Run `/debug-report` to diagnose |
 | Changes not taking effect | Editing source, not installed | Reinstall plugin or edit installed path |
 **Debug Commands:**
- `/debug report` - Run full diagnostics, create issue if needed
+- `/debug-report` - Run full diagnostics, create issue if needed
- `/debug review` - Investigate and propose fixes
+- `/debug-review` - Investigate and propose fixes
 ## Versioning Workflow
@@ -453,4 +376,4 @@ The script will:
 ---
-**Last Updated:** 2026-01-30
+**Last Updated:** 2026-01-24
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Leo Claude Marketplace - v5.8.0
+# Leo Claude Marketplace - v5.1.0
 A collection of Claude Code plugins for project management, infrastructure automation, and development workflows.
@@ -6,7 +6,7 @@ A collection of Claude Code plugins for project management, infrastructure autom
 ### Development & Project Management
-#### [projman](./plugins/projman)
+#### [projman](./plugins/projman/README.md)
 **Sprint Planning and Project Management**
 AI-guided sprint planning with full Gitea integration. Transforms a proven 15-sprint workflow into a distributable plugin.
@@ -19,9 +19,9 @@ AI-guided sprint planning with full Gitea integration. Transforms a proven 15-sp
 - Branch-aware security (development/staging/production)
 - Pre-sprint-close code quality review and test verification
-**Commands:** `/sprint-plan`, `/sprint-start`, `/sprint-status`, `/sprint-close`, `/labels-sync`, `/setup`, `/review`, `/test`, `/debug`, `/suggest-version`, `/proposal-status`, `/rfc`
+**Commands:** `/sprint-plan`, `/sprint-start`, `/sprint-status`, `/sprint-close`, `/labels-sync`, `/initial-setup`, `/project-init`, `/project-sync`, `/review`, `/test-check`, `/test-gen`, `/debug-report`, `/debug-review`
-#### [git-flow](./plugins/git-flow) *NEW in v3.0.0*
+#### [git-flow](./plugins/git-flow/README.md) *NEW in v3.0.0*
 **Git Workflow Automation**
 Smart git operations with intelligent commit messages and branch management.
@@ -34,7 +34,7 @@ Smart git operations with intelligent commit messages and branch management.
 **Commands:** `/commit`, `/commit-push`, `/commit-merge`, `/commit-sync`, `/branch-start`, `/branch-cleanup`, `/git-status`, `/git-config`
-#### [pr-review](./plugins/pr-review) *NEW in v3.0.0*
+#### [pr-review](./plugins/pr-review/README.md) *NEW in v3.0.0*
 **Multi-Agent PR Review**
 Comprehensive pull request review using specialized agents.
@@ -44,16 +44,16 @@ Comprehensive pull request review using specialized agents.
 - Actionable feedback with suggested fixes
 - Gitea integration for automated review submission
-**Commands:** `/pr-review`, `/pr-summary`, `/pr-findings`, `/pr-diff`, `/initial-setup`, `/project-init`, `/project-sync`
+**Commands:** `/pr-review`, `/pr-summary`, `/pr-findings`, `/initial-setup`, `/project-init`, `/project-sync`
-#### [claude-config-maintainer](./plugins/claude-config-maintainer)
+#### [claude-config-maintainer](./plugins/claude-config-maintainer/README.md)
 **CLAUDE.md Optimization and Maintenance**
 Analyze, optimize, and create CLAUDE.md configuration files for Claude Code projects.
-**Commands:** `/config-analyze`, `/config-optimize`, `/config-init`, `/config-diff`, `/config-lint`
+**Commands:** `/config-analyze`, `/config-optimize`, `/config-init`
-#### [contract-validator](./plugins/contract-validator) *NEW in v5.0.0*
+#### [contract-validator](./plugins/contract-validator/README.md) *NEW in v5.0.0*
 **Cross-Plugin Compatibility Validation**
 Validate plugin marketplaces for command conflicts, tool overlaps, and broken agent references.
@@ -64,11 +64,11 @@ Validate plugin marketplaces for command conflicts, tool overlaps, and broken ag
 - Data flow validation for agent sequences
 - Markdown or JSON reports with actionable suggestions
-**Commands:** `/validate-contracts`, `/check-agent`, `/list-interfaces`, `/dependency-graph`, `/initial-setup`
+**Commands:** `/validate-contracts`, `/check-agent`, `/list-interfaces`, `/initial-setup`
 ### Productivity
-#### [clarity-assist](./plugins/clarity-assist) *NEW in v3.0.0*
+#### [clarity-assist](./plugins/clarity-assist/README.md) *NEW in v3.0.0*
 **Prompt Optimization with ND Accommodations**
 Transform vague requests into clear specifications using structured methodology.
@@ -79,21 +79,21 @@ Transform vague requests into clear specifications using structured methodology.
 **Commands:** `/clarify`, `/quick-clarify`
-#### [doc-guardian](./plugins/doc-guardian)
+#### [doc-guardian](./plugins/doc-guardian/README.md)
 **Documentation Lifecycle Management**
 Automatic documentation drift detection and synchronization.
-**Commands:** `/doc-audit`, `/doc-sync`, `/changelog-gen`, `/doc-coverage`, `/stale-docs`
+**Commands:** `/doc-audit`, `/doc-sync`
-#### [project-hygiene](./plugins/project-hygiene)
+#### [project-hygiene](./plugins/project-hygiene/README.md)
 **Post-Task Cleanup Automation**
 Hook-based cleanup that runs after Claude completes work.
 ### Security
-#### [code-sentinel](./plugins/code-sentinel)
+#### [code-sentinel](./plugins/code-sentinel/README.md)
 **Security Scanning & Refactoring**
 Security vulnerability detection and code refactoring tools.
@@ -102,16 +102,16 @@ Security vulnerability detection and code refactoring tools.
 ### Infrastructure
-#### [cmdb-assistant](./plugins/cmdb-assistant)
+#### [cmdb-assistant](./plugins/cmdb-assistant/README.md)
 **NetBox CMDB Integration**
 Full CRUD operations for network infrastructure management directly from Claude Code.
-**Commands:** `/initial-setup`, `/cmdb-search`, `/cmdb-device`, `/cmdb-ip`, `/cmdb-site`, `/cmdb-audit`, `/cmdb-register`, `/cmdb-sync`, `/cmdb-topology`, `/change-audit`, `/ip-conflicts`
+**Commands:** `/initial-setup`, `/cmdb-search`, `/cmdb-device`, `/cmdb-ip`, `/cmdb-site`
 ### Data Engineering
-#### [data-platform](./plugins/data-platform) *NEW in v4.0.0*
+#### [data-platform](./plugins/data-platform/README.md) *NEW in v4.0.0*
 **pandas, PostgreSQL/PostGIS, and dbt Integration**
 Comprehensive data engineering toolkit with persistent DataFrame storage.
@@ -122,11 +122,11 @@ Comprehensive data engineering toolkit with persistent DataFrame storage.
 - 100k row limit with chunking support
 - Auto-detection of dbt projects
-**Commands:** `/ingest`, `/profile`, `/schema`, `/explain`, `/lineage`, `/lineage-viz`, `/run`, `/dbt-test`, `/data-quality`, `/initial-setup`
+**Commands:** `/ingest`, `/profile`, `/schema`, `/explain`, `/lineage`, `/run`
 ### Visualization
-#### [viz-platform](./plugins/viz-platform) *NEW in v4.0.0*
+#### [viz-platform](./plugins/viz-platform/README.md) *NEW in v4.0.0*
 **Dash Mantine Components Validation and Theming**
 Visualization toolkit with version-locked component validation and design token theming.
@@ -138,26 +138,11 @@ Visualization toolkit with version-locked component validation and design token
 - 5 Page tools for multi-page app structure
 - Dual theme storage: user-level and project-level
-**Commands:** `/chart`, `/chart-export`, `/dashboard`, `/theme`, `/theme-new`, `/theme-css`, `/component`, `/accessibility-check`, `/breakpoints`, `/design-review`, `/design-gate`, `/initial-setup`
+**Commands:** `/chart`, `/dashboard`, `/theme`, `/theme-new`, `/theme-css`, `/component`, `/initial-setup`
 ## Domain Advisory Pattern
 The marketplace supports cross-plugin domain advisory integration:
 - **Domain Detection**: projman automatically detects when issues involve specialized domains (frontend/viz, data engineering)
 - **Acceptance Criteria**: Domain-specific acceptance criteria are added to issues during planning
 - **Execution Gates**: Domain validation gates (`/design-gate`, `/data-gate`) run before issue completion
 - **Extensible**: New domains can be added by creating advisory agents and gate commands
 **Current Domains:**
 | Domain | Plugin | Gate Command |
 |--------|--------|--------------|
 | Visualization | viz-platform | `/design-gate` |
 | Data | data-platform | `/data-gate` |
 ## MCP Servers
-MCP servers are **shared at repository root** and configured in `.mcp.json`.
+MCP servers are **shared at repository root** with **symlinks** from plugins that use them.
 ### Gitea MCP Server (shared)
@@ -215,7 +200,7 @@ Cross-plugin compatibility validation tools.
 | Category | Tools |
 |----------|-------|
 | Parse | `parse_plugin_interface`, `parse_claude_md_agents` |
-| Validation | `validate_compatibility`, `validate_agent_refs`, `validate_data_flow`, `validate_workflow_integration` |
+| Validation | `validate_compatibility`, `validate_agent_refs`, `validate_data_flow` |
 | Report | `generate_compatibility_report`, `list_issues` |
 ## Installation
--- a/docs/CANONICAL-PATHS.md
+++ b/docs/CANONICAL-PATHS.md
@@ -2,7 +2,7 @@
 **This file defines ALL valid paths in this repository. No exceptions. No inference. No assumptions.**
-Last Updated: 2026-01-30 (v5.4.1)
+Last Updated: 2026-01-26 (v5.0.0)
 ---
@@ -76,6 +76,9 @@ leo-claude-mktplace/
 ├── plugins/                    # ALL plugins
 │   ├── projman/                # Sprint management
 │   │   ├── .claude-plugin/
 │   │   ├── .mcp.json
 │   │   ├── mcp-servers/
 │   │   │   └── gitea -> ../../../mcp-servers/gitea  # SYMLINK
 │   │   ├── commands/
 │   │   ├── agents/
 │   │   ├── skills/
@@ -96,6 +99,9 @@ leo-claude-mktplace/
 │   │   └── claude-md-integration.md
 │   ├── cmdb-assistant/         # NetBox CMDB integration
 │   │   ├── .claude-plugin/
 │   │   ├── .mcp.json
 │   │   ├── mcp-servers/
 │   │   │   └── netbox -> ../../../mcp-servers/netbox  # SYMLINK
 │   │   ├── commands/
 │   │   ├── agents/
 │   │   └── claude-md-integration.md
@@ -108,49 +114,58 @@ leo-claude-mktplace/
 │   │   ├── .claude-plugin/
 │   │   ├── hooks/
 │   │   └── claude-md-integration.md
-│   ├── clarity-assist/
+│   ├── clarity-assist/         # NEW in v3.0.0
 │   │   ├── .claude-plugin/
 │   │   ├── commands/
 │   │   ├── agents/
 │   │   ├── skills/
 │   │   └── claude-md-integration.md
-│   ├── git-flow/
+│   ├── git-flow/               # NEW in v3.0.0
 │   │   ├── .claude-plugin/
 │   │   ├── commands/
 │   │   ├── agents/
 │   │   ├── skills/
 │   │   └── claude-md-integration.md
-│   ├── pr-review/
+│   ├── pr-review/              # NEW in v3.0.0
 │   │   ├── .claude-plugin/
 │   │   ├── .mcp.json
 │   │   ├── mcp-servers/
 │   │   │   └── gitea -> ../../../mcp-servers/gitea  # SYMLINK
 │   │   ├── commands/
 │   │   ├── agents/
 │   │   ├── skills/
 │   │   └── claude-md-integration.md
-│   ├── data-platform/
+│   ├── data-platform/          # NEW in v4.0.0
 │   │   ├── .claude-plugin/
 │   │   ├── .mcp.json
 │   │   ├── mcp-servers/
 │   │   │   └── data-platform -> ../../../mcp-servers/data-platform  # SYMLINK
 │   │   ├── commands/
 │   │   ├── agents/
 │   │   ├── hooks/
 │   │   └── claude-md-integration.md
-│   ├── contract-validator/
+│   ├── contract-validator/     # NEW in v5.0.0
 │   │   ├── .claude-plugin/
 │   │   ├── .mcp.json
 │   │   ├── mcp-servers/
 │   │   │   └── contract-validator -> ../../../mcp-servers/contract-validator  # SYMLINK
 │   │   ├── commands/
 │   │   ├── agents/
 │   │   └── claude-md-integration.md
-│   └── viz-platform/
+│   └── viz-platform/           # NEW in v4.1.0
 │       ├── .claude-plugin/
 │       ├── .mcp.json
 │       ├── mcp-servers/
 │       │   └── viz-platform -> ../../../mcp-servers/viz-platform  # SYMLINK
 │       ├── commands/
 │       ├── agents/
 │       ├── hooks/
 │       └── claude-md-integration.md
 ├── scripts/                    # Setup and maintenance scripts
 │   ├── setup.sh                # Initial setup (create venvs, config templates)
-│   ├── post-update.sh          # Post-update (clear cache, show changelog)
+│   ├── post-update.sh          # Post-update (rebuild venvs, verify symlinks)
-│   ├── check-venv.sh           # Check if venvs exist (read-only)
+│   ├── check-venv.sh           # Check if venvs exist (for hooks)
-│   ├── validate-marketplace.sh # Marketplace compliance validation
+│   └── validate-marketplace.sh # Marketplace compliance validation
 │   ├── verify-hooks.sh         # Verify all hooks use correct event types
 │   ├── setup-venvs.sh          # Setup MCP server venvs (create only, never delete)
 │   └── release.sh              # Release automation with version bumping
 ├── CLAUDE.md
 ├── README.md
 ├── LICENSE
@@ -170,21 +185,29 @@ leo-claude-mktplace/
 | Plugin manifest | `plugins/{plugin-name}/.claude-plugin/plugin.json` | `plugins/projman/.claude-plugin/plugin.json` |
 | Plugin commands | `plugins/{plugin-name}/commands/` | `plugins/projman/commands/` |
 | Plugin agents | `plugins/{plugin-name}/agents/` | `plugins/projman/agents/` |
-| Plugin skills | `plugins/{plugin-name}/skills/` | `plugins/projman/skills/` |
+| Plugin .mcp.json | `plugins/{plugin-name}/.mcp.json` | `plugins/projman/.mcp.json` |
 | Plugin integration snippet | `plugins/{plugin-name}/claude-md-integration.md` | `plugins/projman/claude-md-integration.md` |
-### MCP Server Paths
+### MCP Server Paths (v3.0.0 Architecture)
-MCP servers are **shared at repository root** and configured in `.mcp.json`.
+MCP servers are **shared at repository root** with **symlinks** from plugins.
 | Context | Pattern | Example |
 |---------|---------|---------|
 | MCP configuration | `.mcp.json` | `.mcp.json` (at repo root) |
 | Shared MCP server | `mcp-servers/{server}/` | `mcp-servers/gitea/` |
 | MCP server code | `mcp-servers/{server}/mcp_server/` | `mcp-servers/gitea/mcp_server/` |
 | MCP venv | `mcp-servers/{server}/.venv/` | `mcp-servers/gitea/.venv/` |
 | Plugin symlink | `plugins/{plugin}/mcp-servers/{server}` | `plugins/projman/mcp-servers/gitea` |
-**Note:** Plugins do NOT have their own `mcp-servers/` directories. All MCP servers are shared at root and configured via `.mcp.json`.
+### Symlink Pattern
 Plugins that use MCP servers create symlinks:
 ```bash
 # From plugin directory
 ln -s ../../../mcp-servers/gitea plugins/projman/mcp-servers/gitea
 ```
 The symlink target is relative: `../../../mcp-servers/{server}`
 ### Documentation Paths
@@ -213,12 +236,15 @@ MCP servers are **shared at repository root** and configured in `.mcp.json`.
 2. Verify each path against patterns in this file
 3. Show verification to user before proceeding
-### Relative Path Calculation
+### Relative Path Calculation (v3.0.0)
-From `.mcp.json` (at root) to `mcp-servers/gitea/`:
+From `plugins/projman/.mcp.json` to shared `mcp-servers/gitea/`:
 ```
-.mcp.json (at repository root)
+plugins/projman/.mcp.json
-  → Uses absolute installed path: ~/.claude/plugins/marketplaces/.../mcp-servers/gitea/run.sh
+  → Uses ${CLAUDE_PLUGIN_ROOT}/mcp-servers/gitea/
  → Symlink at plugins/projman/mcp-servers/gitea points to ../../../mcp-servers/gitea
 Result in .mcp.json: ${CLAUDE_PLUGIN_ROOT}/mcp-servers/gitea/.venv/bin/python
 ```
 From `.claude-plugin/marketplace.json` to `plugins/projman/`:
@@ -237,34 +263,30 @@ Result: ./plugins/projman
 | Wrong | Why | Correct |
 |-------|-----|---------|
 | `projman/` at root | Plugins go in `plugins/` | `plugins/projman/` |
-| `mcp-servers/` inside plugins | MCP servers are shared at root | Use root `mcp-servers/` |
+| Direct path in .mcp.json to root mcp-servers | Use symlink | Symlink at `plugins/{plugin}/mcp-servers/` |
-| Plugin-level `.mcp.json` | MCP config is at root | Use root `.mcp.json` |
+| Creating new mcp-servers inside plugins | Use shared + symlink | Symlink to `mcp-servers/` |
-| Hardcoding absolute paths in source | Breaks portability | Use relative paths or `${CLAUDE_PLUGIN_ROOT}` |
+| Hardcoding absolute paths | Breaks portability | Use `${CLAUDE_PLUGIN_ROOT}` |
 ---
-## Architecture Note
+## Architecture Note (v3.0.0)
-MCP servers are **shared at repository root** and configured in a single `.mcp.json` file.
+MCP servers are now **shared at repository root** with **symlinks** from plugins:
 **Benefits:**
 - Single source of truth for each MCP server
 - Updates apply to all plugins automatically
- No duplication - clean plugin structure
+- Reduced duplication
- Simple configuration in one place
+- Symlinks work with Claude Code caching
-**Configuration:**
+**Symlink Pattern:**
-All MCP servers are defined in `.mcp.json` at repository root:
+```
-```json
+plugins/projman/mcp-servers/gitea -> ../../../mcp-servers/gitea
-{
+plugins/cmdb-assistant/mcp-servers/netbox -> ../../../mcp-servers/netbox
-  "mcpServers": {
+plugins/pr-review/mcp-servers/gitea -> ../../../mcp-servers/gitea
-    "gitea": { "command": ".../mcp-servers/gitea/run.sh" },
+plugins/data-platform/mcp-servers/data-platform -> ../../../mcp-servers/data-platform
-    "netbox": { "command": ".../mcp-servers/netbox/run.sh" },
+plugins/viz-platform/mcp-servers/viz-platform -> ../../../mcp-servers/viz-platform
-    "data-platform": { "command": ".../mcp-servers/data-platform/run.sh" },
+plugins/contract-validator/mcp-servers/contract-validator -> ../../../mcp-servers/contract-validator
    "viz-platform": { "command": ".../mcp-servers/viz-platform/run.sh" },
    "contract-validator": { "command": ".../mcp-servers/contract-validator/run.sh" }
  }
 }
 ```
 ---
@@ -273,7 +295,6 @@ All MCP servers are defined in `.mcp.json` at repository root:
 | Date | Change | By |
 |------|--------|-----|
 | 2026-01-30 | v5.5.0: Removed plugin-level mcp-servers symlinks - all MCP config now in root .mcp.json | Claude Code |
 | 2026-01-26 | v5.0.0: Added contract-validator plugin and MCP server | Claude Code |
 | 2026-01-26 | v4.1.0: Added viz-platform plugin and MCP server | Claude Code |
 | 2026-01-25 | v4.0.0: Added data-platform plugin and MCP server | Claude Code |
--- a/docs/COMMANDS-CHEATSHEET.md
+++ b/docs/COMMANDS-CHEATSHEET.md
@@ -9,18 +9,20 @@ Quick reference for all commands in the Leo Claude Marketplace.
 | Plugin | Command | Auto | Manual | Description |
 |--------|---------|:----:|:------:|-------------|
 | **projman** | `/sprint-plan` | | X | Start sprint planning with AI-guided architecture analysis and issue creation |
-| **projman** | `/sprint-start` | | X | Begin sprint execution with dependency analysis and parallel task coordination (requires approval or `--force`) |
+| **projman** | `/sprint-start` | | X | Begin sprint execution with dependency analysis and parallel task coordination |
-| **projman** | `/sprint-status` | | X | Check current sprint progress (add `--diagram` for Mermaid visualization) |
+| **projman** | `/sprint-status` | | X | Check current sprint progress and identify blockers |
 | **projman** | `/review` | | X | Pre-sprint-close code quality review (debug artifacts, security, error handling) |
-| **projman** | `/test` | | X | Run tests (`/test run`) or generate tests (`/test gen <target>`) |
+| **projman** | `/test-check` | | X | Run tests and verify coverage before sprint close |
 | **projman** | `/sprint-close` | | X | Complete sprint and capture lessons learned to Gitea Wiki |
 | **projman** | `/labels-sync` | | X | Synchronize label taxonomy from Gitea |
-| **projman** | `/setup` | | X | Auto-detect mode or use `--full`, `--quick`, `--sync`, `--clear-cache` |
+| **projman** | `/initial-setup` | | X | Full setup wizard: MCP server + system config + project config |
-| **projman** | *SessionStart hook* | X | | Detects git remote vs .env mismatch, warns to run `/setup --sync` |
+| **projman** | `/project-init` | | X | Quick project setup (assumes system config exists) |
-| **projman** | `/debug` | | X | Diagnostics (`/debug report`) or investigate (`/debug review`) |
+| **projman** | `/project-sync` | | X | Sync config with git remote after repo move/rename |
 | **projman** | *SessionStart hook* | X | | Detects git remote vs .env mismatch, warns to run /project-sync |
 | **projman** | `/test-gen` | | X | Generate comprehensive tests for specified code |
 | **projman** | `/debug-report` | | X | Run diagnostics and create structured issue in marketplace |
 | **projman** | `/debug-review` | | X | Investigate diagnostic issues and propose fixes with approval gates |
 | **projman** | `/suggest-version` | | X | Analyze CHANGELOG and recommend semantic version bump |
 | **projman** | `/proposal-status` | | X | View proposal and implementation hierarchy with status |
 | **projman** | `/rfc` | | X | RFC lifecycle management (`/rfc create\|list\|review\|approve\|reject`) |
 | **git-flow** | `/commit` | | X | Create commit with auto-generated conventional message |
 | **git-flow** | `/commit-push` | | X | Commit and push to remote in one operation |
 | **git-flow** | `/commit-merge` | | X | Commit current changes, then merge into target branch |
@@ -36,14 +38,10 @@ Quick reference for all commands in the Leo Claude Marketplace.
 | **pr-review** | `/pr-review` | | X | Full multi-agent PR review with confidence scoring |
 | **pr-review** | `/pr-summary` | | X | Quick summary of PR changes |
 | **pr-review** | `/pr-findings` | | X | List and filter review findings by category/severity |
 | **pr-review** | `/pr-diff` | | X | Formatted diff with inline review comments and annotations |
 | **clarity-assist** | `/clarify` | | X | Full 4-D prompt optimization with ND accommodations |
 | **clarity-assist** | `/quick-clarify` | | X | Rapid single-pass clarification for simple requests |
 | **doc-guardian** | `/doc-audit` | | X | Full documentation audit - scans for doc drift |
 | **doc-guardian** | `/doc-sync` | | X | Synchronize pending documentation updates |
 | **doc-guardian** | `/changelog-gen` | | X | Generate changelog from conventional commits |
 | **doc-guardian** | `/doc-coverage` | | X | Documentation coverage metrics by function/class |
 | **doc-guardian** | `/stale-docs` | | X | Flag documentation behind code changes |
 | **doc-guardian** | *PostToolUse hook* | X | | Silently detects doc drift on Write/Edit |
 | **code-sentinel** | `/security-scan` | | X | Full security audit (SQL injection, XSS, secrets, etc.) |
 | **code-sentinel** | `/refactor` | | X | Apply refactoring patterns to improve code |
@@ -52,19 +50,11 @@ Quick reference for all commands in the Leo Claude Marketplace.
 | **claude-config-maintainer** | `/config-analyze` | | X | Analyze CLAUDE.md for optimization opportunities |
 | **claude-config-maintainer** | `/config-optimize` | | X | Optimize CLAUDE.md structure with preview/backup |
 | **claude-config-maintainer** | `/config-init` | | X | Initialize new CLAUDE.md for a project |
 | **claude-config-maintainer** | `/config-diff` | | X | Track CLAUDE.md changes over time with behavioral impact |
 | **claude-config-maintainer** | `/config-lint` | | X | Lint CLAUDE.md for anti-patterns and best practices |
 | **cmdb-assistant** | `/initial-setup` | | X | Setup wizard for NetBox MCP server |
 | **cmdb-assistant** | `/cmdb-search` | | X | Search NetBox for devices, IPs, sites |
 | **cmdb-assistant** | `/cmdb-device` | | X | Manage network devices (create, view, update, delete) |
 | **cmdb-assistant** | `/cmdb-ip` | | X | Manage IP addresses and prefixes |
 | **cmdb-assistant** | `/cmdb-site` | | X | Manage sites, locations, racks, and regions |
 | **cmdb-assistant** | `/cmdb-audit` | | X | Data quality analysis (VMs, devices, naming, roles) |
 | **cmdb-assistant** | `/cmdb-register` | | X | Register current machine into NetBox with running apps |
 | **cmdb-assistant** | `/cmdb-sync` | | X | Sync machine state with NetBox (detect drift, update) |
 | **cmdb-assistant** | `/cmdb-topology` | | X | Infrastructure topology diagrams (rack, network, site views) |
 | **cmdb-assistant** | `/change-audit` | | X | NetBox audit trail queries with filtering |
 | **cmdb-assistant** | `/ip-conflicts` | | X | Detect IP conflicts and overlapping prefixes |
 | **project-hygiene** | *PostToolUse hook* | X | | Removes temp files, warns about unexpected root files |
 | **data-platform** | `/ingest` | | X | Load data from CSV, Parquet, JSON into DataFrame |
 | **data-platform** | `/profile` | | X | Generate data profiling report with statistics |
@@ -72,9 +62,6 @@ Quick reference for all commands in the Leo Claude Marketplace.
 | **data-platform** | `/explain` | | X | Explain query execution plan |
 | **data-platform** | `/lineage` | | X | Show dbt model lineage and dependencies |
 | **data-platform** | `/run` | | X | Run dbt models with validation |
 | **data-platform** | `/lineage-viz` | | X | dbt lineage visualization as Mermaid diagrams |
 | **data-platform** | `/dbt-test` | | X | Formatted dbt test runner with summary and failure details |
 | **data-platform** | `/data-quality` | | X | DataFrame quality checks (nulls, duplicates, types, outliers) |
 | **data-platform** | `/initial-setup` | | X | Setup wizard for data-platform MCP servers |
 | **data-platform** | *SessionStart hook* | X | | Checks PostgreSQL connection (non-blocking warning) |
 | **viz-platform** | `/initial-setup` | | X | Setup wizard for viz-platform MCP server |
@@ -84,19 +71,7 @@ Quick reference for all commands in the Leo Claude Marketplace.
 | **viz-platform** | `/theme-new` | | X | Create new custom theme with design tokens |
 | **viz-platform** | `/theme-css` | | X | Export theme as CSS custom properties |
 | **viz-platform** | `/component` | | X | Inspect DMC component props and validation |
 | **viz-platform** | `/chart-export` | | X | Export charts to PNG, SVG, PDF via kaleido |
 | **viz-platform** | `/accessibility-check` | | X | Color blind validation (WCAG contrast ratios) |
 | **viz-platform** | `/breakpoints` | | X | Configure responsive layout breakpoints |
 | **viz-platform** | `/design-review` | | X | Detailed design system audits |
 | **viz-platform** | `/design-gate` | | X | Binary pass/fail design system validation gates |
 | **viz-platform** | *SessionStart hook* | X | | Checks DMC version (non-blocking warning) |
 | **data-platform** | `/data-review` | | X | Comprehensive data integrity audits |
 | **data-platform** | `/data-gate` | | X | Binary pass/fail data integrity gates |
 | **contract-validator** | `/validate-contracts` | | X | Full marketplace compatibility validation |
 | **contract-validator** | `/check-agent` | | X | Validate single agent definition |
 | **contract-validator** | `/list-interfaces` | | X | Show all plugin interfaces |
 | **contract-validator** | `/dependency-graph` | | X | Mermaid visualization of plugin dependencies |
 | **contract-validator** | `/initial-setup` | | X | Setup wizard for contract-validator MCP |
 ---
@@ -104,7 +79,7 @@ Quick reference for all commands in the Leo Claude Marketplace.
 | Category | Plugins | Primary Use |
 |----------|---------|-------------|
-| **Setup** | projman, pr-review, cmdb-assistant, data-platform | `/setup`, `/initial-setup` |
+| **Setup** | projman, pr-review, cmdb-assistant, data-platform | `/initial-setup`, `/project-init` |
 | **Task Planning** | projman, clarity-assist | Sprint management, requirement clarification |
 | **Code Quality** | code-sentinel, pr-review | Security scanning, PR reviews |
 | **Documentation** | doc-guardian, claude-config-maintainer | Doc sync, CLAUDE.md maintenance |
@@ -112,7 +87,6 @@ Quick reference for all commands in the Leo Claude Marketplace.
 | **Infrastructure** | cmdb-assistant | NetBox CMDB management |
 | **Data Engineering** | data-platform | pandas, PostgreSQL, dbt operations |
 | **Visualization** | viz-platform | DMC validation, Plotly charts, theming |
 | **Validation** | contract-validator | Cross-plugin compatibility checks |
 | **Maintenance** | project-hygiene | Automatic cleanup |
 ---
@@ -133,22 +107,6 @@ Quick reference for all commands in the Leo Claude Marketplace.
 ## Dev Workflow Examples
 ### Example 0: RFC-Driven Feature Development
 Full workflow from idea to implementation using RFCs:
 ```
 1. /clarify                  # Clarify the feature idea
 2. /rfc create               # Create RFC from clarified spec
   ... refine RFC content ...
 3. /rfc review 0001          # Submit RFC for review
   ... review discussion ...
 4. /rfc approve 0001         # Approve RFC for implementation
 5. /sprint-plan              # Select approved RFC for sprint
   ... implement feature ...
 6. /sprint-close             # Complete sprint, RFC marked Implemented
 ```
 ### Example 1: Starting a New Feature Sprint
 A typical workflow for planning and executing a feature sprint:
@@ -161,9 +119,9 @@ A typical workflow for planning and executing a feature sprint:
 5. /branch-start feat/...    # Create feature branch
   ... implement features ...
 6. /commit                   # Commit with conventional message
-7. /sprint-status --diagram  # Check progress with visualization
+7. /sprint-status            # Check progress mid-sprint
 8. /review                   # Pre-close quality review
-9. /test run                 # Verify test coverage
+9. /test-check               # Verify test coverage
 10. /sprint-close            # Capture lessons learned
 ```
@@ -210,7 +168,7 @@ Safe refactoring with preview:
 1. /refactor-dry             # Preview opportunities
 2. /security-scan            # Baseline security check
 3. /refactor                 # Apply improvements
-4. /test run                 # Verify nothing broke
+4. /test-check               # Verify nothing broke
 5. /commit                   # Commit with descriptive message
 ```
@@ -243,7 +201,7 @@ Working with data pipelines:
 Setting up the marketplace for the first time:
 ```
-1. /setup --full             # Full setup: MCP + system config + project
+1. /initial-setup            # Full setup: MCP + system config + project
   # → Follow prompts for Gitea URL, org
   # → Add token manually when prompted
   # → Confirm repository name
@@ -257,7 +215,7 @@ Setting up the marketplace for the first time:
 Adding a new project when system config exists:
 ```
-1. /setup --quick            # Quick project setup (auto-detected)
+1. /project-init             # Quick project setup
   # → Confirms detected repo name
   # → Creates .env
 2. /labels-sync              # Sync Gitea labels
@@ -287,10 +245,9 @@ Some plugins require MCP server connectivity:
 | cmdb-assistant | NetBox | Infrastructure CMDB |
 | data-platform | pandas, PostgreSQL, dbt | DataFrames, database queries, dbt builds |
 | viz-platform | viz-platform | DMC validation, charts, layouts, themes, pages |
 | contract-validator | contract-validator | Plugin interface parsing, compatibility validation |
 Ensure credentials are configured in `~/.config/claude/gitea.env`, `~/.config/claude/netbox.env`, or `~/.config/claude/postgres.env`.
 ---
-*Last Updated: 2026-02-02*
+*Last Updated: 2026-01-26*
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -9,10 +9,10 @@ Centralized configuration documentation for all plugins and MCP servers in the L
 **After installing the marketplace and plugins via Claude Code:**
 ```
-/setup
+/initial-setup
 ```
-The interactive wizard auto-detects what's needed and handles everything except manually adding your API tokens.
+The interactive wizard handles everything except manually adding your API tokens.
 ---
@@ -25,8 +25,7 @@ The interactive wizard auto-detects what's needed and handles everything except
 └─────────────────────────────────────────────────────────────────────────────┘
                                    │
                                    ▼
-                              /setup --full
+                            /initial-setup
                          (or /setup auto-detects)
                                    │
     ┌──────────────────────────────┼──────────────────────────────┐
     ▼                              ▼                              ▼
@@ -79,8 +78,8 @@ The interactive wizard auto-detects what's needed and handles everything except
                                    │
                    ┌───────────────┴───────────────┐
                    ▼                               ▼
-             /setup --quick                     /setup
+             /project-init                   /initial-setup
-             (explicit mode)               (auto-detects mode)
+             (direct path)                   (smart detection)
                    │                               │
                    │                    ┌──────────┴──────────┐
                    │                    ▼                     ▼
@@ -109,7 +108,7 @@ The interactive wizard auto-detects what's needed and handles everything except
 ## What Runs Automatically vs User Interaction
-### `/setup --full` - Full Setup
+### `/initial-setup` - Full Setup
 | Phase | Type | What Happens |
 |-------|------|--------------|
@@ -121,7 +120,7 @@ The interactive wizard auto-detects what's needed and handles everything except
 | **6. Project Config** | Automated | Creates `.env` file, checks `.gitignore` |
 | **7. Validation** | Automated | Tests API connectivity, shows summary |
-### `/setup --quick` - Quick Project Setup
+### `/project-init` - Quick Project Setup
 | Phase | Type | What Happens |
 |-------|------|--------------|
@@ -132,25 +131,23 @@ The interactive wizard auto-detects what's needed and handles everything except
 ---
-## One Command, Three Modes
+## Three Commands for Different Scenarios
-| Mode | When to Use | What It Does |
+| Command | When to Use | What It Does |
-|------|-------------|--------------|
+|---------|-------------|--------------|
-| `/setup` | Any time | Auto-detects: runs full, quick, or sync as needed |
+| `/initial-setup` | First time on a machine | Full setup: MCP server + system config + project config |
-| `/setup --full` | First time on a machine | Full setup: MCP server + system config + project config |
+| `/project-init` | Starting a new project | Quick setup: project config only (assumes system is ready) |
-| `/setup --quick` | Starting a new project | Quick setup: project config only (assumes system is ready) |
+| `/project-sync` | After repo move/rename | Updates .env to match current git remote |
 | `/setup --sync` | After repo move/rename | Updates .env to match current git remote |
 **Auto-detection logic:**
 1. No system config → **full** mode
 2. System config exists, no project config → **quick** mode
 3. Both exist, git remote differs → **sync** mode
 4. Both exist, match → already configured, offer to reconfigure
 **Typical workflow:**
-1. Install plugin → run `/setup` (auto-runs full mode)
+1. Install plugin → run `/initial-setup` (once per machine)
-2. Start new project → run `/setup` (auto-runs quick mode)
+2. Start new project → run `/project-init` (once per project)
-3. Repository moved? → run `/setup` (auto-runs sync mode)
+3. Repository moved? → run `/project-sync` (updates config)
 **Smart features:**
 - `/initial-setup` detects existing system config and offers quick project setup
 - All commands validate org/repo via Gitea API before saving (auto-fills if verified)
 - SessionStart hook automatically detects git remote vs .env mismatches
 ---
@@ -174,7 +171,8 @@ This marketplace uses a **hybrid configuration** approach:
 │                  PROJECT-LEVEL (once per project)              │
 │                  <project-root>/.env                            │
 ├─────────────────────────────────────────────────────────────────┤
-│  GITEA_REPO              │  Repository as owner/repo format    │
+│  GITEA_ORG               │  Organization for this project      │
 │  GITEA_REPO              │  Repository name for this project   │
 │  GIT_WORKFLOW_STYLE      │  (optional) Override system default │
 │  PR_REVIEW_*             │  (optional) PR review settings      │
 └─────────────────────────────────────────────────────────────────┘
@@ -182,7 +180,7 @@ This marketplace uses a **hybrid configuration** approach:
 **Benefits:**
 - Single token per service (update once, use everywhere)
- Easy multi-project setup (just run `/setup` in each project)
+- Easy multi-project setup (just run `/project-init` in each project)
 - Security (tokens never committed to git, never typed into AI chat)
 - Project isolation (each project can override defaults)
@@ -190,7 +188,7 @@ This marketplace uses a **hybrid configuration** approach:
 ## Prerequisites
-Before running `/setup`:
+Before running `/initial-setup`:
 1. **Python 3.10+** installed
   ```bash
@@ -213,10 +211,10 @@ Before running `/setup`:
 Run the setup wizard in Claude Code:
 ```
-/setup
+/initial-setup
 ```
-The wizard will guide you through each step interactively and auto-detect the appropriate mode.
+The wizard will guide you through each step interactively.
 **Note:** After first-time setup, you'll need to restart your Claude Code session for MCP tools to become available.
@@ -264,7 +262,8 @@ In each project root:
 ```bash
 cat > .env << 'EOF'
-GITEA_REPO=your-organization/your-repo-name
+GITEA_ORG=your-organization
 GITEA_REPO=your-repo-name
 EOF
 ```
@@ -308,7 +307,7 @@ GITEA_API_TOKEN=your_gitea_token_here
 | `GITEA_API_URL` | Gitea API endpoint (with `/api/v1`) | `https://gitea.example.com/api/v1` |
 | `GITEA_API_TOKEN` | Personal access token | `abc123...` |
-**Note:** `GITEA_REPO` is configured at the project level in `owner/repo` format since different projects may belong to different organizations.
+**Note:** `GITEA_ORG` is configured at the project level (see below) since different projects may belong to different organizations.
 **Generating a Gitea Token:**
 1. Log into Gitea → **User Icon** → **Settings**
@@ -363,8 +362,9 @@ GIT_CO_AUTHOR=true
 Create `.env` in each project root:
 ```bash
-# Required for projman, pr-review (use owner/repo format)
+# Required for projman, pr-review
-GITEA_REPO=your-organization/your-repo-name
+GITEA_ORG=your-organization
 GITEA_REPO=your-repo-name
 # Optional: Override git-flow defaults
 GIT_WORKFLOW_STYLE=pr-required
@@ -377,7 +377,8 @@ PR_REVIEW_AUTO_SUBMIT=false
 | Variable | Required | Description |
 |----------|----------|-------------|
-| `GITEA_REPO` | Yes | Repository in `owner/repo` format (e.g., `my-org/my-repo`) |
+| `GITEA_ORG` | Yes | Gitea organization for this project |
 | `GITEA_REPO` | Yes | Repository name (must match Gitea exactly) |
 | `GIT_WORKFLOW_STYLE` | No | Override system default |
 | `PR_REVIEW_*` | No | PR review settings |
@@ -385,10 +386,10 @@ PR_REVIEW_AUTO_SUBMIT=false
 ## Plugin Configuration Summary
-| Plugin | System Config | Project Config | Setup Command |
+| Plugin | System Config | Project Config | Setup Commands |
-|--------|---------------|----------------|---------------|
+|--------|---------------|----------------|----------------|
-| **projman** | gitea.env | .env (GITEA_REPO=owner/repo) | `/setup` |
+| **projman** | gitea.env | .env (GITEA_ORG, GITEA_REPO) | `/initial-setup`, `/project-init`, `/project-sync` |
-| **pr-review** | gitea.env | .env (GITEA_REPO=owner/repo) | `/initial-setup` |
+| **pr-review** | gitea.env | .env (GITEA_ORG, GITEA_REPO) | `/initial-setup`, `/project-init`, `/project-sync` |
 | **git-flow** | git-flow.env (optional) | .env (optional) | None needed |
 | **clarity-assist** | None | None | None needed |
 | **cmdb-assistant** | netbox.env | None | `/initial-setup` |
@@ -398,7 +399,6 @@ PR_REVIEW_AUTO_SUBMIT=false
 | **code-sentinel** | None | None | None needed |
 | **project-hygiene** | None | None | None needed |
 | **claude-config-maintainer** | None | None | None needed |
 | **contract-validator** | None | None | `/initial-setup` |
 ---
@@ -406,12 +406,21 @@ PR_REVIEW_AUTO_SUBMIT=false
 Once system-level config is set up, adding new projects is simple:
 **Option 1: Use `/project-init` (faster)**
 ```
 cd ~/projects/new-project
-/setup
+/project-init
 ```
-The command auto-detects that system config exists and runs quick project setup.
+**Option 2: Use `/initial-setup` (auto-detects)**
 ```
 cd ~/projects/new-project
 /initial-setup
 # → Detects system config exists
 # → Offers "Quick project setup" option
 ```
 Both approaches work. Use `/project-init` when you know the system is already configured.
 ---
@@ -419,12 +428,12 @@ The command auto-detects that system config exists and runs quick project setup.
 ### API Validation
-When running `/setup`, the command:
+When running `/initial-setup`, `/project-init`, or `/project-sync`, the commands:
-1. **Detects** organization and repository from git remote URL
+1. **Detect** organization and repository from git remote URL
-2. **Validates** via Gitea API: `GET /api/v1/repos/{org}/{repo}`
+2. **Validate** via Gitea API: `GET /api/v1/repos/{org}/{repo}`
-3. **Auto-fills** if repository exists and is accessible (no confirmation needed)
+3. **Auto-fill** if repository exists and is accessible (no confirmation needed)
-4. **Asks for confirmation** only if validation fails (404 or permission error)
+4. **Ask for confirmation** only if validation fails (404 or permission error)
 This catches typos and permission issues before saving configuration.
@@ -432,9 +441,9 @@ This catches typos and permission issues before saving configuration.
 When you start a Claude Code session, a hook automatically:
-1. Reads `GITEA_REPO` (in `owner/repo` format) from `.env`
+1. Reads `GITEA_ORG` and `GITEA_REPO` from `.env`
 2. Compares with current `git remote get-url origin`
-3. **Warns** if mismatch detected: "Repository location mismatch. Run `/setup --sync` to update."
+3. **Warns** if mismatch detected: "Repository location mismatch. Run `/project-sync` to update."
 This helps when you:
 - Move a repository to a different organization
@@ -496,8 +505,9 @@ If you get 401, regenerate your token in Gitea.
 # Check venv exists
 ls /path/to/mcp-servers/gitea/.venv
-# If missing, create venv (do NOT delete existing venvs)
+# Reinstall if missing
 cd /path/to/mcp-servers/gitea
 rm -rf .venv
 python3 -m venv .venv
 source .venv/bin/activate
 pip install -r requirements.txt
@@ -510,8 +520,7 @@ deactivate
 # Check project .env
 cat .env
-# Verify GITEA_REPO is in owner/repo format and matches Gitea exactly
+# Verify GITEA_REPO matches the Gitea repository name exactly
 # Example: GITEA_REPO=my-org/my-repo
 ```
 ---
@@ -529,7 +538,7 @@ cat .env
 3. **Never type tokens into AI chat**
   - Always edit config files directly in your editor
-   - The `/setup` wizard respects this
+   - The `/initial-setup` wizard respects this
 4. **Rotate tokens periodically**
   - Every 6-12 months
--- a/docs/DEBUGGING-CHECKLIST.md
+++ b/docs/DEBUGGING-CHECKLIST.md
@@ -2,7 +2,7 @@
 **Purpose:** Systematic approach to diagnose and fix plugin loading issues.
-Last Updated: 2026-01-28
+Last Updated: 2026-01-22
 ---
@@ -73,19 +73,25 @@ cd $RUNTIME && ./scripts/setup.sh
 ---
-## Step 4: Verify MCP Configuration
+## Step 4: Verify Symlink Resolution
-Check `.mcp.json` at marketplace root is correctly configured:
+Plugins use symlinks to shared MCP servers. Verify they resolve correctly:
 ```bash
 RUNTIME=~/.claude/plugins/marketplaces/leo-claude-mktplace
-# Check .mcp.json exists and has valid content
+# Check symlinks exist and resolve
-cat $RUNTIME/.mcp.json | jq '.mcpServers | keys'
+readlink -f $RUNTIME/plugins/projman/mcp-servers/gitea
 readlink -f $RUNTIME/plugins/pr-review/mcp-servers/gitea
 readlink -f $RUNTIME/plugins/cmdb-assistant/mcp-servers/netbox
-# Should list: gitea, netbox, data-platform, viz-platform, contract-validator
+# Should resolve to:
 # $RUNTIME/mcp-servers/gitea
 # $RUNTIME/mcp-servers/netbox
 ```
 **If broken:** Symlinks are relative. If directory structure differs, they'll break.
 ---
 ## Step 5: Test MCP Server Startup
@@ -122,7 +128,7 @@ cat ~/.config/claude/netbox.env
 # Project-level config (in target project)
 cat /path/to/project/.env
-# Should contain: GITEA_REPO=owner/repo (e.g., my-org/my-repo)
+# Should contain: GITEA_ORG, GITEA_REPO
 ```
 ---
@@ -159,8 +165,10 @@ echo -e "\n=== Virtual Environments ==="
 [ -f "$RUNTIME/mcp-servers/gitea/.venv/bin/python" ] && echo "Gitea venv: OK" || echo "Gitea venv: MISSING"
 [ -f "$RUNTIME/mcp-servers/netbox/.venv/bin/python" ] && echo "NetBox venv: OK" || echo "NetBox venv: MISSING"
-echo -e "\n=== MCP Configuration ==="
+echo -e "\n=== Symlinks ==="
-[ -f "$RUNTIME/.mcp.json" ] && echo ".mcp.json: OK" || echo ".mcp.json: MISSING"
+[ -L "$RUNTIME/plugins/projman/mcp-servers/gitea" ] && echo "projman->gitea: OK" || echo "projman->gitea: MISSING"
 [ -L "$RUNTIME/plugins/pr-review/mcp-servers/gitea" ] && echo "pr-review->gitea: OK" || echo "pr-review->gitea: MISSING"
 [ -L "$RUNTIME/plugins/cmdb-assistant/mcp-servers/netbox" ] && echo "cmdb-assistant->netbox: OK" || echo "cmdb-assistant->netbox: MISSING"
 echo -e "\n=== Config Files ==="
 [ -f ~/.config/claude/gitea.env ] && echo "gitea.env: OK" || echo "gitea.env: MISSING"
@@ -174,51 +182,10 @@ echo -e "\n=== Config Files ==="
 | Issue | Symptom | Fix |
 |-------|---------|-----|
 | Missing venvs | "X MCP servers failed" | `cd ~/.claude/plugins/marketplaces/leo-claude-mktplace && ./scripts/setup.sh` |
-| Missing .mcp.json | MCP tools not available | Check `.mcp.json` exists at marketplace root |
+| Broken symlinks | MCP tools not available | Reinstall marketplace or manually recreate symlinks |
 | Wrong path edits | Changes don't take effect | Edit installed path or reinstall after source changes |
 | Missing credentials | MCP connection errors | Create `~/.config/claude/gitea.env` with API credentials |
 | Invalid hook events | Hooks don't fire | Use only valid event names (see Step 7) |
 | Gitea issues not closing | Merged to non-default branch | Manually close issues (see below) |
 | MCP changes not taking effect | Session caching | Restart Claude Code session (see below) |
 ### Gitea Auto-Close Behavior
 **Issue:** Using `Closes #XX` or `Fixes #XX` in commit/PR messages does NOT auto-close issues when merging to `development`.
 **Root Cause:** Gitea only auto-closes issues when merging to the **default branch** (typically `main` or `master`). Merging to `development`, `staging`, or any other branch will NOT trigger auto-close.
 **Workaround:**
 1. Use the Gitea MCP tool to manually close issues after merging to development:
   ```
   mcp__plugin_projman_gitea__update_issue(issue_number=XX, state="closed")
   ```
 2. Or close issues via the Gitea web UI
 3. The auto-close keywords will still work when the changes are eventually merged to `main`
 **Recommendation:** Include the `Closes #XX` keywords in commits anyway - they'll work when the final merge to `main` happens.
 ### MCP Session Restart Requirement
 **Issue:** Changes to MCP servers, hooks, or plugin configuration don't take effect immediately.
 **Root Cause:** Claude Code loads MCP tools and plugin configuration at session start. These are cached in session memory and not reloaded dynamically.
 **What requires a session restart:**
 - MCP server code changes (Python files in `mcp-servers/`)
 - Changes to `.mcp.json` files
 - Changes to `hooks/hooks.json`
 - Changes to `plugin.json`
 - Adding new MCP tools or modifying tool signatures
 **What does NOT require a restart:**
 - Command/skill markdown files (`.md`) - these are read on invocation
 - Agent markdown files - read when agent is invoked
 **Correct workflow after plugin changes:**
 1. Make changes to source files
 2. Run `./scripts/verify-hooks.sh` to validate
 3. Inform user: "Please restart Claude Code for changes to take effect"
 4. **Do NOT clear cache mid-session** - see "Cache Clearing" section
 ---
@@ -279,8 +246,8 @@ Error: Could not find a suitable TLS CA certificate bundle, invalid path:
 Use these commands for automated checking:
- `/debug report` - Run full diagnostics, create issue if problems found
+- `/debug-report` - Run full diagnostics, create issue if problems found
- `/debug review` - Investigate existing diagnostic issues and propose fixes
+- `/debug-review` - Investigate existing diagnostic issues and propose fixes
 ---
--- a/docs/UPDATING.md
+++ b/docs/UPDATING.md
@@ -132,8 +132,10 @@ When updating, review if changes affect the setup workflow:
 ### Dependencies fail to install
 ```bash
-# Install missing dependencies (do NOT delete .venv)
+# Rebuild virtual environment
 cd mcp-servers/gitea
 rm -rf .venv
 python3 -m venv .venv
 source .venv/bin/activate
 pip install -r requirements.txt
 deactivate
@@ -162,7 +164,7 @@ If that doesn't work:
   ls ~/.claude/plugins/marketplaces/leo-claude-mktplace/mcp-servers/gitea/.venv
   ls ~/.claude/plugins/marketplaces/leo-claude-mktplace/mcp-servers/netbox/.venv
   ```
-3. If missing, run setup.sh as shown above.
+3. If missing, the symlinks won't resolve. Run setup.sh as shown above.
 4. Restart Claude Code session
 5. Check logs for specific errors
--- a/mcp-servers/contract-validator/.doc-guardian-queue
+++ b/mcp-servers/contract-validator/.doc-guardian-queue
@@ -1,20 +0,0 @@
 2026-01-26T14:36:42 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/parse_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T14:37:38 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/parse_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T14:37:48 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/parse_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T14:38:05 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/parse_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T14:38:55 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/parse_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T14:39:35 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/parse_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T14:40:19 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/parse_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T15:02:30 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/tests/test_parse_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T15:02:37 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/tests/test_parse_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T15:03:41 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/tests/test_report_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-02-02T10:56:19 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/mcp_server/validation_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-02-02T10:57:49 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/contract-validator/tests/test_validation_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-02-02T10:58:22 | skills | /home/lmiranda/claude-plugins-work/plugins/contract-validator/skills/mcp-tools-reference.md | README.md
 2026-02-02T10:58:38 | skills | /home/lmiranda/claude-plugins-work/plugins/contract-validator/skills/validation-rules.md | README.md
 2026-02-02T10:59:13 | .claude-plugin | /home/lmiranda/claude-plugins-work/.claude-plugin/marketplace.json | CLAUDE.md .claude-plugin/marketplace.json
 2026-02-02T13:55:33 | skills | /home/lmiranda/claude-plugins-work/plugins/projman/skills/visual-output.md | README.md
 2026-02-02T13:55:41 | agents | /home/lmiranda/claude-plugins-work/plugins/projman/agents/planner.md | README.md CLAUDE.md
 2026-02-02T13:55:55 | agents | /home/lmiranda/claude-plugins-work/plugins/projman/agents/orchestrator.md | README.md CLAUDE.md
 2026-02-02T13:56:14 | agents | /home/lmiranda/claude-plugins-work/plugins/projman/agents/executor.md | README.md CLAUDE.md
 2026-02-02T13:56:34 | agents | /home/lmiranda/claude-plugins-work/plugins/projman/agents/code-reviewer.md | README.md CLAUDE.md
--- a/mcp-servers/contract-validator/mcp_server/server.py
+++ b/mcp-servers/contract-validator/mcp_server/server.py
@@ -131,28 +131,6 @@ class ContractValidatorMCPServer:
                        "required": ["agent_name", "claude_md_path"]
                    }
                ),
                Tool(
                    name="validate_workflow_integration",
                    description="Validate that a domain plugin exposes the required advisory interfaces (gate command, review command, advisory agent) expected by projman's domain-consultation skill. Also checks gate contract version compatibility.",
                    inputSchema={
                        "type": "object",
                        "properties": {
                            "plugin_path": {
                                "type": "string",
                                "description": "Path to the domain plugin directory"
                            },
                            "domain_label": {
                                "type": "string",
                                "description": "The Domain/* label it claims to handle, e.g. Domain/Viz"
                            },
                            "expected_contract": {
                                "type": "string",
                                "description": "Expected contract version (e.g., 'v1'). If provided, validates the gate command's contract matches."
                            }
                        },
                        "required": ["plugin_path", "domain_label"]
                    }
                ),
                # Report tools (to be implemented in #188)
                Tool(
                    name="generate_compatibility_report",
@@ -220,8 +198,6 @@ class ContractValidatorMCPServer:
                    result = await self._validate_agent_refs(**arguments)
                elif name == "validate_data_flow":
                    result = await self._validate_data_flow(**arguments)
                elif name == "validate_workflow_integration":
                    result = await self._validate_workflow_integration(**arguments)
                elif name == "generate_compatibility_report":
                    result = await self._generate_compatibility_report(**arguments)
                elif name == "list_issues":
@@ -265,17 +241,6 @@ class ContractValidatorMCPServer:
        """Validate agent data flow"""
        return await self.validation_tools.validate_data_flow(agent_name, claude_md_path)
    async def _validate_workflow_integration(
        self,
        plugin_path: str,
        domain_label: str,
        expected_contract: str = None
    ) -> dict:
        """Validate domain plugin exposes required advisory interfaces"""
        return await self.validation_tools.validate_workflow_integration(
            plugin_path, domain_label, expected_contract
        )
    # Report tool implementations (Issue #188)
    async def _generate_compatibility_report(self, marketplace_path: str, format: str = "markdown") -> dict:
--- a/mcp-servers/contract-validator/mcp_server/validation_tools.py
+++ b/mcp-servers/contract-validator/mcp_server/validation_tools.py
@@ -26,7 +26,6 @@ class IssueType(str, Enum):
    OPTIONAL_DEPENDENCY = "optional_dependency"
    UNDECLARED_OUTPUT = "undeclared_output"
    INVALID_SEQUENCE = "invalid_sequence"
    MISSING_INTEGRATION = "missing_integration"
 class ValidationIssue(BaseModel):
@@ -66,18 +65,6 @@ class DataFlowResult(BaseModel):
    issues: list[ValidationIssue] = []
 class WorkflowIntegrationResult(BaseModel):
    """Result of workflow integration validation for domain plugins"""
    plugin_name: str
    domain_label: str
    valid: bool
    gate_command_found: bool
    gate_contract: Optional[str] = None  # Contract version declared by gate command
    review_command_found: bool
    advisory_agent_found: bool
    issues: list[ValidationIssue] = []
 class ValidationTools:
    """Tools for validating plugin compatibility and agent references"""
@@ -349,145 +336,3 @@ class ValidationTools:
        )
        return result.model_dump()
    async def validate_workflow_integration(
        self,
        plugin_path: str,
        domain_label: str,
        expected_contract: Optional[str] = None
    ) -> dict:
        """
        Validate that a domain plugin exposes required advisory interfaces.
        Checks for:
        - Gate command (e.g., /design-gate, /data-gate) - REQUIRED
        - Gate contract version (gate_contract in frontmatter) - INFO if missing
        - Review command (e.g., /design-review, /data-review) - recommended
        - Advisory agent referencing the domain label - recommended
        Args:
            plugin_path: Path to the domain plugin directory
            domain_label: The Domain/* label it claims to handle (e.g., Domain/Viz)
            expected_contract: Expected contract version (e.g., 'v1'). If provided,
                              validates the gate command's contract matches.
        Returns:
            Validation result with found interfaces and issues
        """
        import re
        plugin_path_obj = Path(plugin_path)
        issues = []
        # Extract plugin name from path
        plugin_name = plugin_path_obj.name
        if not plugin_path_obj.exists():
            return {
                "error": f"Plugin directory not found: {plugin_path}",
                "plugin_path": plugin_path,
                "domain_label": domain_label
            }
        # Extract domain short name from label (e.g., "Domain/Viz" -> "viz", "Domain/Data" -> "data")
        domain_short = domain_label.split("/")[-1].lower() if "/" in domain_label else domain_label.lower()
        # Check for gate command
        commands_dir = plugin_path_obj / "commands"
        gate_command_found = False
        gate_contract = None
        gate_patterns = ["pass", "fail", "PASS", "FAIL", "Binary pass/fail", "gate"]
        if commands_dir.exists():
            for cmd_file in commands_dir.glob("*.md"):
                if "gate" in cmd_file.name.lower():
                    # Verify it's actually a gate command by checking content
                    content = cmd_file.read_text()
                    if any(pattern in content for pattern in gate_patterns):
                        gate_command_found = True
                        # Parse frontmatter for gate_contract
                        frontmatter_match = re.match(r'^---\n(.*?)\n---', content, re.DOTALL)
                        if frontmatter_match:
                            frontmatter = frontmatter_match.group(1)
                            contract_match = re.search(r'gate_contract:\s*(\S+)', frontmatter)
                            if contract_match:
                                gate_contract = contract_match.group(1)
                        break
        if not gate_command_found:
            issues.append(ValidationIssue(
                severity=IssueSeverity.ERROR,
                issue_type=IssueType.MISSING_INTEGRATION,
                message=f"Plugin '{plugin_name}' lacks a gate command for domain '{domain_label}'",
                location=str(commands_dir),
                suggestion=f"Create commands/{domain_short}-gate.md with binary PASS/FAIL output"
            ))
        # Check for review command
        review_command_found = False
        if commands_dir.exists():
            for cmd_file in commands_dir.glob("*.md"):
                if "review" in cmd_file.name.lower() and "gate" not in cmd_file.name.lower():
                    review_command_found = True
                    break
        if not review_command_found:
            issues.append(ValidationIssue(
                severity=IssueSeverity.WARNING,
                issue_type=IssueType.MISSING_INTEGRATION,
                message=f"Plugin '{plugin_name}' lacks a review command for domain '{domain_label}'",
                location=str(commands_dir),
                suggestion=f"Create commands/{domain_short}-review.md for detailed audits"
            ))
        # Check for advisory agent
        agents_dir = plugin_path_obj / "agents"
        advisory_agent_found = False
        if agents_dir.exists():
            for agent_file in agents_dir.glob("*.md"):
                content = agent_file.read_text()
                # Check if agent references the domain label or gate command
                if domain_label in content or f"{domain_short}-gate" in content.lower() or "advisor" in agent_file.name.lower() or "reviewer" in agent_file.name.lower():
                    advisory_agent_found = True
                    break
        if not advisory_agent_found:
            issues.append(ValidationIssue(
                severity=IssueSeverity.WARNING,
                issue_type=IssueType.MISSING_INTEGRATION,
                message=f"Plugin '{plugin_name}' lacks an advisory agent for domain '{domain_label}'",
                location=str(agents_dir) if agents_dir.exists() else str(plugin_path_obj),
                suggestion=f"Create agents/{domain_short}-advisor.md referencing '{domain_label}'"
            ))
        # Check gate contract version
        if gate_command_found:
            if not gate_contract:
                issues.append(ValidationIssue(
                    severity=IssueSeverity.INFO,
                    issue_type=IssueType.MISSING_INTEGRATION,
                    message=f"Gate command does not declare a contract version",
                    location=str(commands_dir),
                    suggestion="Consider adding `gate_contract: v1` to frontmatter for version tracking"
                ))
            elif expected_contract and gate_contract != expected_contract:
                issues.append(ValidationIssue(
                    severity=IssueSeverity.WARNING,
                    issue_type=IssueType.INTERFACE_MISMATCH,
                    message=f"Contract version mismatch: gate declares {gate_contract}, projman expects {expected_contract}",
                    location=str(commands_dir),
                    suggestion=f"Update domain-consultation.md Gate Command Reference table to {gate_contract}, or update gate command to {expected_contract}"
                ))
        result = WorkflowIntegrationResult(
            plugin_name=plugin_name,
            domain_label=domain_label,
            valid=gate_command_found,  # Only gate is required for validity
            gate_command_found=gate_command_found,
            gate_contract=gate_contract,
            review_command_found=review_command_found,
            advisory_agent_found=advisory_agent_found,
            issues=issues
        )
        return result.model_dump()
--- a/mcp-servers/contract-validator/run.sh
+++ b/mcp-servers/contract-validator/run.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 # Capture original working directory before any cd operations
 # This should be the user's project directory when launched by Claude Code
 export CLAUDE_PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$PWD}"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CACHE_VENV="$HOME/.cache/claude-mcp-venvs/leo-claude-mktplace/contract-validator/.venv"
 LOCAL_VENV="$SCRIPT_DIR/.venv"
--- a/mcp-servers/contract-validator/tests/test_validation_tools.py
+++ b/mcp-servers/contract-validator/tests/test_validation_tools.py
@@ -254,261 +254,3 @@ async def test_validate_data_flow_missing_producer(validation_tools, tmp_path):
    # Should have warning about missing producer
    warning_issues = [i for i in result["issues"] if i["severity"].value == "warning"]
    assert len(warning_issues) > 0
 # --- Workflow Integration Tests ---
@pytest.fixture
 def domain_plugin_complete(tmp_path):
    """Create a complete domain plugin with gate, review, and advisory agent"""
    plugin_dir = tmp_path / "viz-platform"
    plugin_dir.mkdir()
    (plugin_dir / ".claude-plugin").mkdir()
    (plugin_dir / "commands").mkdir()
    (plugin_dir / "agents").mkdir()
    # Gate command with PASS/FAIL pattern
    gate_cmd = plugin_dir / "commands" / "design-gate.md"
    gate_cmd.write_text("""# /design-gate
 Binary pass/fail validation gate for design system compliance.
 ## Output
 - **PASS**: All design system checks passed
 - **FAIL**: Design system violations detected
 """)
    # Review command
    review_cmd = plugin_dir / "commands" / "design-review.md"
    review_cmd.write_text("""# /design-review
 Comprehensive design system audit.
 """)
    # Advisory agent
    agent = plugin_dir / "agents" / "design-reviewer.md"
    agent.write_text("""# design-reviewer
 Design system compliance auditor.
 Handles issues with `Domain/Viz` label.
 """)
    return str(plugin_dir)
@pytest.fixture
 def domain_plugin_missing_gate(tmp_path):
    """Create domain plugin with review and agent but no gate command"""
    plugin_dir = tmp_path / "data-platform"
    plugin_dir.mkdir()
    (plugin_dir / ".claude-plugin").mkdir()
    (plugin_dir / "commands").mkdir()
    (plugin_dir / "agents").mkdir()
    # Review command (but no gate)
    review_cmd = plugin_dir / "commands" / "data-review.md"
    review_cmd.write_text("""# /data-review
 Data integrity audit.
 """)
    # Advisory agent
    agent = plugin_dir / "agents" / "data-advisor.md"
    agent.write_text("""# data-advisor
 Data integrity advisor for Domain/Data issues.
 """)
    return str(plugin_dir)
@pytest.fixture
 def domain_plugin_minimal(tmp_path):
    """Create minimal plugin with no commands or agents"""
    plugin_dir = tmp_path / "minimal-plugin"
    plugin_dir.mkdir()
    (plugin_dir / ".claude-plugin").mkdir()
    readme = plugin_dir / "README.md"
    readme.write_text("# Minimal Plugin\n\nNo commands or agents.")
    return str(plugin_dir)
@pytest.mark.asyncio
 async def test_validate_workflow_integration_complete(validation_tools, domain_plugin_complete):
    """Test complete domain plugin returns valid with all interfaces found"""
    result = await validation_tools.validate_workflow_integration(
        domain_plugin_complete,
        "Domain/Viz"
    )
    assert "error" not in result
    assert result["valid"] is True
    assert result["gate_command_found"] is True
    assert result["review_command_found"] is True
    assert result["advisory_agent_found"] is True
    # May have INFO issue about missing contract version (not an error/warning)
    error_or_warning = [i for i in result["issues"]
                        if i["severity"].value in ("error", "warning")]
    assert len(error_or_warning) == 0
@pytest.mark.asyncio
 async def test_validate_workflow_integration_missing_gate(validation_tools, domain_plugin_missing_gate):
    """Test plugin missing gate command returns invalid with ERROR"""
    result = await validation_tools.validate_workflow_integration(
        domain_plugin_missing_gate,
        "Domain/Data"
    )
    assert "error" not in result
    assert result["valid"] is False
    assert result["gate_command_found"] is False
    assert result["review_command_found"] is True
    assert result["advisory_agent_found"] is True
    # Should have one ERROR for missing gate
    error_issues = [i for i in result["issues"] if i["severity"].value == "error"]
    assert len(error_issues) == 1
    assert "gate" in error_issues[0]["message"].lower()
@pytest.mark.asyncio
 async def test_validate_workflow_integration_minimal(validation_tools, domain_plugin_minimal):
    """Test minimal plugin returns invalid with multiple issues"""
    result = await validation_tools.validate_workflow_integration(
        domain_plugin_minimal,
        "Domain/Test"
    )
    assert "error" not in result
    assert result["valid"] is False
    assert result["gate_command_found"] is False
    assert result["review_command_found"] is False
    assert result["advisory_agent_found"] is False
    # Should have one ERROR (gate) and two WARNINGs (review, agent)
    error_issues = [i for i in result["issues"] if i["severity"].value == "error"]
    warning_issues = [i for i in result["issues"] if i["severity"].value == "warning"]
    assert len(error_issues) == 1
    assert len(warning_issues) == 2
@pytest.mark.asyncio
 async def test_validate_workflow_integration_nonexistent_plugin(validation_tools, tmp_path):
    """Test error when plugin directory doesn't exist"""
    result = await validation_tools.validate_workflow_integration(
        str(tmp_path / "nonexistent"),
        "Domain/Test"
    )
    assert "error" in result
    assert "not found" in result["error"].lower()
 # --- Gate Contract Version Tests ---
@pytest.fixture
 def domain_plugin_with_contract(tmp_path):
    """Create domain plugin with gate_contract: v1 in frontmatter"""
    plugin_dir = tmp_path / "viz-platform-versioned"
    plugin_dir.mkdir()
    (plugin_dir / ".claude-plugin").mkdir()
    (plugin_dir / "commands").mkdir()
    (plugin_dir / "agents").mkdir()
    # Gate command with gate_contract in frontmatter
    gate_cmd = plugin_dir / "commands" / "design-gate.md"
    gate_cmd.write_text("""---
 description: Design system compliance gate (pass/fail)
 gate_contract: v1
 ---
 # /design-gate
 Binary pass/fail validation gate for design system compliance.
 ## Output
 - **PASS**: All design system checks passed
 - **FAIL**: Design system violations detected
 """)
    # Review command
    review_cmd = plugin_dir / "commands" / "design-review.md"
    review_cmd.write_text("""# /design-review
 Comprehensive design system audit.
 """)
    # Advisory agent
    agent = plugin_dir / "agents" / "design-reviewer.md"
    agent.write_text("""# design-reviewer
 Design system compliance auditor for Domain/Viz issues.
 """)
    return str(plugin_dir)
@pytest.mark.asyncio
 async def test_validate_workflow_contract_match(validation_tools, domain_plugin_with_contract):
    """Test that matching expected_contract produces no warning"""
    result = await validation_tools.validate_workflow_integration(
        domain_plugin_with_contract,
        "Domain/Viz",
        expected_contract="v1"
    )
    assert "error" not in result
    assert result["valid"] is True
    assert result["gate_contract"] == "v1"
    # Should have no warnings about contract mismatch
    warning_issues = [i for i in result["issues"] if i["severity"].value == "warning"]
    contract_warnings = [i for i in warning_issues if "contract" in i["message"].lower()]
    assert len(contract_warnings) == 0
@pytest.mark.asyncio
 async def test_validate_workflow_contract_mismatch(validation_tools, domain_plugin_with_contract):
    """Test that mismatched expected_contract produces WARNING"""
    result = await validation_tools.validate_workflow_integration(
        domain_plugin_with_contract,
        "Domain/Viz",
        expected_contract="v2"  # Gate has v1
    )
    assert "error" not in result
    assert result["valid"] is True  # Contract mismatch doesn't affect validity
    assert result["gate_contract"] == "v1"
    # Should have warning about contract mismatch
    warning_issues = [i for i in result["issues"] if i["severity"].value == "warning"]
    contract_warnings = [i for i in warning_issues if "contract" in i["message"].lower()]
    assert len(contract_warnings) == 1
    assert "mismatch" in contract_warnings[0]["message"].lower()
    assert "v1" in contract_warnings[0]["message"]
    assert "v2" in contract_warnings[0]["message"]
@pytest.mark.asyncio
 async def test_validate_workflow_no_contract(validation_tools, domain_plugin_complete):
    """Test that missing gate_contract produces INFO suggestion"""
    result = await validation_tools.validate_workflow_integration(
        domain_plugin_complete,
        "Domain/Viz"
    )
    assert "error" not in result
    assert result["valid"] is True
    assert result["gate_contract"] is None
    # Should have info issue about missing contract
    info_issues = [i for i in result["issues"] if i["severity"].value == "info"]
    contract_info = [i for i in info_issues if "contract" in i["message"].lower()]
    assert len(contract_info) == 1
    assert "does not declare" in contract_info[0]["message"].lower()
--- a/mcp-servers/data-platform/run.sh
+++ b/mcp-servers/data-platform/run.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 # Capture original working directory before any cd operations
 # This should be the user's project directory when launched by Claude Code
 export CLAUDE_PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$PWD}"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CACHE_VENV="$HOME/.cache/claude-mcp-venvs/leo-claude-mktplace/data-platform/.venv"
 LOCAL_VENV="$SCRIPT_DIR/.venv"
--- a/mcp-servers/gitea/mcp_server/gitea_client.py
+++ b/mcp-servers/gitea/mcp_server/gitea_client.py
@@ -53,7 +53,6 @@ class GiteaClient:
        self,
        state: str = 'open',
        labels: Optional[List[str]] = None,
        milestone: Optional[str] = None,
        repo: Optional[str] = None
    ) -> List[Dict]:
        """
@@ -62,7 +61,6 @@ class GiteaClient:
        Args:
            state: Issue state (open, closed, all)
            labels: Filter by labels
            milestone: Filter by milestone title (exact match)
            repo: Repository in 'owner/repo' format
        Returns:
@@ -73,8 +71,6 @@ class GiteaClient:
        params = {'state': state}
        if labels:
            params['labels'] = ','.join(labels)
        if milestone:
            params['milestones'] = milestone
        logger.info(f"Listing issues from {owner}/{target_repo} with state={state}")
        response = self.session.get(url, params=params)
        response.raise_for_status()
@@ -139,24 +135,9 @@ class GiteaClient:
        body: Optional[str] = None,
        state: Optional[str] = None,
        labels: Optional[List[str]] = None,
        milestone: Optional[int] = None,
        repo: Optional[str] = None
    ) -> Dict:
-        """
+        """Update existing issue. Repo must be 'owner/repo' format."""
        Update existing issue.
        Args:
            issue_number: Issue number to update
            title: New title (optional)
            body: New body (optional)
            state: New state - 'open' or 'closed' (optional)
            labels: New labels (optional)
            milestone: Milestone ID to assign (optional)
            repo: Repository in 'owner/repo' format
        Returns:
            Updated issue dictionary
        """
        owner, target_repo = self._parse_repo(repo)
        url = f"{self.base_url}/repos/{owner}/{target_repo}/issues/{issue_number}"
        data = {}
@@ -168,8 +149,6 @@ class GiteaClient:
            data['state'] = state
        if labels is not None:
            data['labels'] = labels
        if milestone is not None:
            data['milestone'] = milestone
        logger.info(f"Updating issue #{issue_number} in {owner}/{target_repo}")
        response = self.session.patch(url, json=data)
        response.raise_for_status()
--- a/mcp-servers/gitea/mcp_server/server.py
+++ b/mcp-servers/gitea/mcp_server/server.py
@@ -26,44 +26,6 @@ logging.getLogger("mcp").setLevel(logging.ERROR)
 logger = logging.getLogger(__name__)
 def _coerce_types(arguments: dict) -> dict:
    """
    Coerce argument types to handle MCP serialization quirks.
    MCP sometimes passes integers as strings and arrays as JSON strings.
    This function normalizes them to the expected Python types.
    """
    coerced = {}
    for key, value in arguments.items():
        if value is None:
            coerced[key] = value
            continue
        # Coerce integer fields
        int_fields = {'issue_number', 'milestone_id', 'pr_number', 'depends_on', 'milestone', 'limit'}
        if key in int_fields and isinstance(value, str):
            try:
                coerced[key] = int(value)
                continue
            except ValueError:
                pass
        # Coerce array fields that might be JSON strings
        array_fields = {'labels', 'tags', 'issue_numbers', 'comments'}
        if key in array_fields and isinstance(value, str):
            try:
                parsed = json.loads(value)
                if isinstance(parsed, list):
                    coerced[key] = parsed
                    continue
            except json.JSONDecodeError:
                pass
        coerced[key] = value
    return coerced
 class GiteaMCPServer:
    """MCP Server for Gitea integration"""
@@ -126,10 +88,6 @@ class GiteaMCPServer:
                                "items": {"type": "string"},
                                "description": "Filter by labels"
                            },
                            "milestone": {
                                "type": "string",
                                "description": "Filter by milestone title (exact match)"
                            },
                            "repo": {
                                "type": "string",
                                "description": "Repository name (for PMO mode)"
@@ -144,7 +102,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "issue_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Issue number"
                            },
                            "repo": {
@@ -189,7 +147,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "issue_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Issue number"
                            },
                            "title": {
@@ -210,10 +168,6 @@ class GiteaMCPServer:
                                "items": {"type": "string"},
                                "description": "New labels"
                            },
                            "milestone": {
                                "type": ["integer", "string"],
                                "description": "Milestone ID to assign"
                            },
                            "repo": {
                                "type": "string",
                                "description": "Repository name (for PMO mode)"
@@ -229,7 +183,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "issue_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Issue number"
                            },
                            "comment": {
@@ -424,7 +378,7 @@ class GiteaMCPServer:
                                "description": "Tags to filter by (optional)"
                            },
                            "limit": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "default": 20,
                                "description": "Maximum results"
                            },
@@ -435,19 +389,6 @@ class GiteaMCPServer:
                        }
                    }
                ),
                Tool(
                    name="allocate_rfc_number",
                    description="Allocate the next available RFC number by scanning existing RFC wiki pages",
                    inputSchema={
                        "type": "object",
                        "properties": {
                            "repo": {
                                "type": "string",
                                "description": "Repository name (owner/repo format)"
                            }
                        }
                    }
                ),
                # Milestone Tools
                Tool(
                    name="list_milestones",
@@ -475,7 +416,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "milestone_id": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Milestone ID"
                            },
                            "repo": {
@@ -519,7 +460,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "milestone_id": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Milestone ID"
                            },
                            "title": {
@@ -554,7 +495,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "milestone_id": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Milestone ID"
                            },
                            "repo": {
@@ -573,7 +514,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "issue_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Issue number"
                            },
                            "repo": {
@@ -591,11 +532,11 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "issue_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Issue that will depend on another"
                            },
                            "depends_on": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Issue that blocks issue_number"
                            },
                            "repo": {
@@ -613,11 +554,11 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "issue_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Issue that depends on another"
                            },
                            "depends_on": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Issue being depended on"
                            },
                            "repo": {
@@ -795,7 +736,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "pr_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Pull request number"
                            },
                            "repo": {
@@ -813,7 +754,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "pr_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Pull request number"
                            },
                            "repo": {
@@ -831,7 +772,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "pr_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Pull request number"
                            },
                            "repo": {
@@ -849,7 +790,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "pr_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Pull request number"
                            },
                            "body": {
@@ -868,7 +809,7 @@ class GiteaMCPServer:
                                    "type": "object",
                                    "properties": {
                                        "path": {"type": "string"},
-                                        "position": {"type": ["integer", "string"]},
+                                        "position": {"type": "integer"},
                                        "body": {"type": "string"}
                                    }
                                },
@@ -889,7 +830,7 @@ class GiteaMCPServer:
                        "type": "object",
                        "properties": {
                            "pr_number": {
-                                "type": ["integer", "string"],
+                                "type": "integer",
                                "description": "Pull request number"
                            },
                            "body": {
@@ -954,9 +895,6 @@ class GiteaMCPServer:
                List of TextContent with results
            """
            try:
                # Coerce types to handle MCP serialization quirks
                arguments = _coerce_types(arguments)
                # Route to appropriate tool handler
                if name == "list_issues":
                    result = await self.issue_tools.list_issues(**arguments)
@@ -993,10 +931,6 @@ class GiteaMCPServer:
                        limit=arguments.get('limit', 20),
                        repo=arguments.get('repo')
                    )
                elif name == "allocate_rfc_number":
                    result = await self.wiki_tools.allocate_rfc_number(
                        repo=arguments.get('repo')
                    )
                # Milestone tools
                elif name == "list_milestones":
                    result = await self.milestone_tools.list_milestones(**arguments)
--- a/mcp-servers/gitea/mcp_server/tools/issues.py
+++ b/mcp-servers/gitea/mcp_server/tools/issues.py
@@ -7,7 +7,6 @@ Provides async wrappers for issue CRUD operations with:
 - Comprehensive error handling
 """
 import asyncio
 import os
 import subprocess
 import logging
 from typing import List, Dict, Optional
@@ -28,34 +27,19 @@ class IssueTools:
        """
        self.gitea = gitea_client
    def _get_project_directory(self) -> Optional[str]:
        """
        Get the user's project directory from environment.
        Returns:
            Project directory path or None if not set
        """
        return os.environ.get('CLAUDE_PROJECT_DIR')
    def _get_current_branch(self) -> str:
        """
-        Get current git branch from user's project directory.
+        Get current git branch.
        Uses CLAUDE_PROJECT_DIR environment variable to determine the correct
        directory for git operations, avoiding the bug where git runs from
        the installed plugin directory instead of the user's project.
        Returns:
            Current branch name or 'unknown' if not in a git repo
        """
        try:
            project_dir = self._get_project_directory()
            result = subprocess.run(
                ['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
                capture_output=True,
                text=True,
-                check=True,
+                check=True
                cwd=project_dir  # Run git in project directory, not plugin directory
            )
            return result.stdout.strip()
        except subprocess.CalledProcessError:
@@ -98,7 +82,6 @@ class IssueTools:
        self,
        state: str = 'open',
        labels: Optional[List[str]] = None,
        milestone: Optional[str] = None,
        repo: Optional[str] = None
    ) -> List[Dict]:
        """
@@ -107,7 +90,6 @@ class IssueTools:
        Args:
            state: Issue state (open, closed, all)
            labels: Filter by labels
            milestone: Filter by milestone title (exact match)
            repo: Override configured repo (for PMO multi-repo)
        Returns:
@@ -126,7 +108,7 @@ class IssueTools:
        loop = asyncio.get_event_loop()
        return await loop.run_in_executor(
            None,
-            lambda: self.gitea.list_issues(state, labels, milestone, repo)
+            lambda: self.gitea.list_issues(state, labels, repo)
        )
    async def get_issue(
@@ -202,7 +184,6 @@ class IssueTools:
        body: Optional[str] = None,
        state: Optional[str] = None,
        labels: Optional[List[str]] = None,
        milestone: Optional[int] = None,
        repo: Optional[str] = None
    ) -> Dict:
        """
@@ -214,7 +195,6 @@ class IssueTools:
            body: New body (optional)
            state: New state - 'open' or 'closed' (optional)
            labels: New labels (optional)
            milestone: Milestone ID to assign (optional)
            repo: Override configured repo (for PMO multi-repo)
        Returns:
@@ -233,7 +213,7 @@ class IssueTools:
        loop = asyncio.get_event_loop()
        return await loop.run_in_executor(
            None,
-            lambda: self.gitea.update_issue(issue_number, title, body, state, labels, milestone, repo)
+            lambda: self.gitea.update_issue(issue_number, title, body, state, labels, repo)
        )
    async def add_comment(
--- a/mcp-servers/gitea/mcp_server/tools/pull_requests.py
+++ b/mcp-servers/gitea/mcp_server/tools/pull_requests.py
@@ -7,7 +7,6 @@ Provides async wrappers for PR operations with:
 - Comprehensive error handling
 """
 import asyncio
 import os
 import subprocess
 import logging
 from typing import List, Dict, Optional
@@ -28,34 +27,19 @@ class PullRequestTools:
        """
        self.gitea = gitea_client
    def _get_project_directory(self) -> Optional[str]:
        """
        Get the user's project directory from environment.
        Returns:
            Project directory path or None if not set
        """
        return os.environ.get('CLAUDE_PROJECT_DIR')
    def _get_current_branch(self) -> str:
        """
-        Get current git branch from user's project directory.
+        Get current git branch.
        Uses CLAUDE_PROJECT_DIR environment variable to determine the correct
        directory for git operations, avoiding the bug where git runs from
        the installed plugin directory instead of the user's project.
        Returns:
            Current branch name or 'unknown' if not in a git repo
        """
        try:
            project_dir = self._get_project_directory()
            result = subprocess.run(
                ['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
                capture_output=True,
                text=True,
-                check=True,
+                check=True
                cwd=project_dir  # Run git in project directory, not plugin directory
            )
            return result.stdout.strip()
        except subprocess.CalledProcessError:
--- a/mcp-servers/gitea/mcp_server/tools/wiki.py
+++ b/mcp-servers/gitea/mcp_server/tools/wiki.py
@@ -4,11 +4,9 @@ Wiki management tools for MCP server.
 Provides async wrappers for wiki operations to support lessons learned:
 - Page CRUD operations
 - Lessons learned creation and search
 - RFC number allocation
 """
 import asyncio
 import logging
 import re
 from typing import List, Dict, Optional
 logging.basicConfig(level=logging.INFO)
@@ -149,39 +147,3 @@ class WikiTools:
            lambda: self.gitea.search_lessons(query, tags, repo)
        )
        return results[:limit]
    async def allocate_rfc_number(self, repo: Optional[str] = None) -> Dict:
        """
        Allocate the next available RFC number.
        Scans existing wiki pages for RFC-NNNN pattern and returns
        the next sequential number.
        Args:
            repo: Repository in owner/repo format
        Returns:
            Dict with 'next_number' (int) and 'formatted' (str like 'RFC-0001')
        """
        pages = await self.list_wiki_pages(repo)
        # Extract RFC numbers from page titles
        rfc_numbers = []
        rfc_pattern = re.compile(r'^RFC-(\d{4})')
        for page in pages:
            title = page.get('title', '')
            match = rfc_pattern.match(title)
            if match:
                rfc_numbers.append(int(match.group(1)))
        # Calculate next number
        if rfc_numbers:
            next_num = max(rfc_numbers) + 1
        else:
            next_num = 1
        return {
            'next_number': next_num,
            'formatted': f'RFC-{next_num:04d}'
        }
--- a/mcp-servers/gitea/run.sh
+++ b/mcp-servers/gitea/run.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 # Capture original working directory before any cd operations
 # This should be the user's project directory when launched by Claude Code
 export CLAUDE_PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$PWD}"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CACHE_VENV="$HOME/.cache/claude-mcp-venvs/leo-claude-mktplace/gitea/.venv"
 LOCAL_VENV="$SCRIPT_DIR/.venv"
--- a/mcp-servers/netbox/run.sh
+++ b/mcp-servers/netbox/run.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 # Capture original working directory before any cd operations
 # This should be the user's project directory when launched by Claude Code
 export CLAUDE_PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$PWD}"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CACHE_VENV="$HOME/.cache/claude-mcp-venvs/leo-claude-mktplace/netbox/.venv"
 LOCAL_VENV="$SCRIPT_DIR/.venv"
--- a/mcp-servers/viz-platform/.doc-guardian-queue
+++ b/mcp-servers/viz-platform/.doc-guardian-queue
@@ -1,5 +0,0 @@
 2026-01-26T11:40:11 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/viz-platform/registry/dmc_2_5.json | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T13:46:31 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/viz-platform/tests/test_chart_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T13:46:32 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/viz-platform/tests/test_theme_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T13:46:34 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/viz-platform/tests/test_theme_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
 2026-01-26T13:46:35 | mcp-servers | /home/lmiranda/claude-plugins-work/mcp-servers/viz-platform/tests/test_theme_tools.py | docs/COMMANDS-CHEATSHEET.md CLAUDE.md
--- a/mcp-servers/viz-platform/README.md
+++ b/mcp-servers/viz-platform/README.md
@@ -112,4 +112,4 @@ pytest tests/ -v
 ## Usage
-This MCP server is used by the `viz-platform` plugin. See the plugin's commands in `plugins/viz-platform/commands/` for usage.
+This MCP server is used by the `viz-platform` plugin. See [plugins/viz-platform/README.md](../../plugins/viz-platform/README.md) for usage instructions.
--- a/mcp-servers/viz-platform/mcp_server/accessibility_tools.py
+++ b/mcp-servers/viz-platform/mcp_server/accessibility_tools.py
@@ -1,479 +0,0 @@
 """
 Accessibility validation tools for color blindness and WCAG compliance.
 Provides tools for validating color palettes against color blindness
 simulations and WCAG contrast requirements.
 """
 import logging
 import math
 from typing import Dict, List, Optional, Any, Tuple
 logger = logging.getLogger(__name__)
 # Color-blind safe palettes
 SAFE_PALETTES = {
    "categorical": {
        "name": "Paul Tol's Qualitative",
        "colors": ["#4477AA", "#EE6677", "#228833", "#CCBB44", "#66CCEE", "#AA3377", "#BBBBBB"],
        "description": "Distinguishable for all types of color blindness"
    },
    "ibm": {
        "name": "IBM Design",
        "colors": ["#648FFF", "#785EF0", "#DC267F", "#FE6100", "#FFB000"],
        "description": "IBM's accessible color palette"
    },
    "okabe_ito": {
        "name": "Okabe-Ito",
        "colors": ["#E69F00", "#56B4E9", "#009E73", "#F0E442", "#0072B2", "#D55E00", "#CC79A7", "#000000"],
        "description": "Optimized for all color vision deficiencies"
    },
    "tableau_colorblind": {
        "name": "Tableau Colorblind 10",
        "colors": ["#006BA4", "#FF800E", "#ABABAB", "#595959", "#5F9ED1",
                   "#C85200", "#898989", "#A2C8EC", "#FFBC79", "#CFCFCF"],
        "description": "Industry-standard accessible palette"
    }
 }
 # Simulation matrices for color blindness (LMS color space transformation)
 # These approximate how colors appear to people with different types of color blindness
 SIMULATION_MATRICES = {
    "deuteranopia": {
        # Green-blind (most common)
        "severity": "common",
        "population": "6% males, 0.4% females",
        "description": "Difficulty distinguishing red from green (green-blind)",
        "matrix": [
            [0.625, 0.375, 0.0],
            [0.700, 0.300, 0.0],
            [0.0, 0.300, 0.700]
        ]
    },
    "protanopia": {
        # Red-blind
        "severity": "common",
        "population": "2.5% males, 0.05% females",
        "description": "Difficulty distinguishing red from green (red-blind)",
        "matrix": [
            [0.567, 0.433, 0.0],
            [0.558, 0.442, 0.0],
            [0.0, 0.242, 0.758]
        ]
    },
    "tritanopia": {
        # Blue-blind (rare)
        "severity": "rare",
        "population": "0.01% total",
        "description": "Difficulty distinguishing blue from yellow",
        "matrix": [
            [0.950, 0.050, 0.0],
            [0.0, 0.433, 0.567],
            [0.0, 0.475, 0.525]
        ]
    }
 }
 class AccessibilityTools:
    """
    Color accessibility validation tools.
    Validates colors for WCAG compliance and color blindness accessibility.
    """
    def __init__(self, theme_store=None):
        """
        Initialize accessibility tools.
        Args:
            theme_store: Optional ThemeStore for theme color extraction
        """
        self.theme_store = theme_store
    def _hex_to_rgb(self, hex_color: str) -> Tuple[int, int, int]:
        """Convert hex color to RGB tuple."""
        hex_color = hex_color.lstrip('#')
        if len(hex_color) == 3:
            hex_color = ''.join([c * 2 for c in hex_color])
        return tuple(int(hex_color[i:i+2], 16) for i in (0, 2, 4))
    def _rgb_to_hex(self, rgb: Tuple[int, int, int]) -> str:
        """Convert RGB tuple to hex color."""
        return '#{:02x}{:02x}{:02x}'.format(
            max(0, min(255, int(rgb[0]))),
            max(0, min(255, int(rgb[1]))),
            max(0, min(255, int(rgb[2])))
        )
    def _get_relative_luminance(self, rgb: Tuple[int, int, int]) -> float:
        """
        Calculate relative luminance per WCAG 2.1.
        https://www.w3.org/WAI/GL/wiki/Relative_luminance
        """
        def channel_luminance(value: int) -> float:
            v = value / 255
            return v / 12.92 if v <= 0.03928 else ((v + 0.055) / 1.055) ** 2.4
        r, g, b = rgb
        return (
            0.2126 * channel_luminance(r) +
            0.7152 * channel_luminance(g) +
            0.0722 * channel_luminance(b)
        )
    def _get_contrast_ratio(self, color1: str, color2: str) -> float:
        """
        Calculate contrast ratio between two colors per WCAG 2.1.
        Returns ratio between 1:1 and 21:1.
        """
        rgb1 = self._hex_to_rgb(color1)
        rgb2 = self._hex_to_rgb(color2)
        l1 = self._get_relative_luminance(rgb1)
        l2 = self._get_relative_luminance(rgb2)
        lighter = max(l1, l2)
        darker = min(l1, l2)
        return (lighter + 0.05) / (darker + 0.05)
    def _simulate_color_blindness(
        self,
        hex_color: str,
        deficiency_type: str
    ) -> str:
        """
        Simulate how a color appears with a specific color blindness type.
        Uses linear RGB transformation approximation.
        """
        if deficiency_type not in SIMULATION_MATRICES:
            return hex_color
        rgb = self._hex_to_rgb(hex_color)
        matrix = SIMULATION_MATRICES[deficiency_type]["matrix"]
        # Apply transformation matrix
        r = rgb[0] * matrix[0][0] + rgb[1] * matrix[0][1] + rgb[2] * matrix[0][2]
        g = rgb[0] * matrix[1][0] + rgb[1] * matrix[1][1] + rgb[2] * matrix[1][2]
        b = rgb[0] * matrix[2][0] + rgb[1] * matrix[2][1] + rgb[2] * matrix[2][2]
        return self._rgb_to_hex((r, g, b))
    def _get_color_distance(self, color1: str, color2: str) -> float:
        """
        Calculate perceptual color distance (CIE76 approximation).
        Returns a value where < 20 means colors may be hard to distinguish.
        """
        rgb1 = self._hex_to_rgb(color1)
        rgb2 = self._hex_to_rgb(color2)
        # Simple Euclidean distance in RGB space (approximation)
        # For production, should use CIEDE2000
        return math.sqrt(
            (rgb1[0] - rgb2[0]) ** 2 +
            (rgb1[1] - rgb2[1]) ** 2 +
            (rgb1[2] - rgb2[2]) ** 2
        )
    async def accessibility_validate_colors(
        self,
        colors: List[str],
        check_types: Optional[List[str]] = None,
        min_contrast_ratio: float = 4.5
    ) -> Dict[str, Any]:
        """
        Validate a list of colors for accessibility.
        Args:
            colors: List of hex colors to validate
            check_types: Color blindness types to check (default: all)
            min_contrast_ratio: Minimum WCAG contrast ratio (default: 4.5 for AA)
        Returns:
            Dict with:
                - issues: List of accessibility issues found
                - simulations: How colors appear under each deficiency
                - recommendations: Suggestions for improvement
                - safe_palettes: Color-blind safe palette suggestions
        """
        check_types = check_types or list(SIMULATION_MATRICES.keys())
        issues = []
        simulations = {}
        # Normalize colors
        normalized_colors = [c.upper() if c.startswith('#') else f'#{c.upper()}' for c in colors]
        # Simulate each color blindness type
        for deficiency in check_types:
            if deficiency not in SIMULATION_MATRICES:
                continue
            simulated = [self._simulate_color_blindness(c, deficiency) for c in normalized_colors]
            simulations[deficiency] = {
                "original": normalized_colors,
                "simulated": simulated,
                "info": SIMULATION_MATRICES[deficiency]
            }
            # Check if any color pairs become indistinguishable
            for i in range(len(normalized_colors)):
                for j in range(i + 1, len(normalized_colors)):
                    distance = self._get_color_distance(simulated[i], simulated[j])
                    if distance < 30:  # Threshold for distinguishability
                        issues.append({
                            "type": "distinguishability",
                            "severity": "warning" if distance > 15 else "error",
                            "colors": [normalized_colors[i], normalized_colors[j]],
                            "affected_by": [deficiency],
                            "simulated_colors": [simulated[i], simulated[j]],
                            "distance": round(distance, 1),
                            "message": f"Colors may be hard to distinguish for {deficiency} ({SIMULATION_MATRICES[deficiency]['description']})"
                        })
        # Check contrast ratios against white and black backgrounds
        for color in normalized_colors:
            white_contrast = self._get_contrast_ratio(color, "#FFFFFF")
            black_contrast = self._get_contrast_ratio(color, "#000000")
            if white_contrast < min_contrast_ratio and black_contrast < min_contrast_ratio:
                issues.append({
                    "type": "contrast_ratio",
                    "severity": "error",
                    "colors": [color],
                    "white_contrast": round(white_contrast, 2),
                    "black_contrast": round(black_contrast, 2),
                    "required": min_contrast_ratio,
                    "message": f"Insufficient contrast against both white ({white_contrast:.1f}:1) and black ({black_contrast:.1f}:1) backgrounds"
                })
        # Generate recommendations
        recommendations = self._generate_recommendations(issues)
        # Calculate overall score
        error_count = sum(1 for i in issues if i["severity"] == "error")
        warning_count = sum(1 for i in issues if i["severity"] == "warning")
        if error_count == 0 and warning_count == 0:
            score = "A"
        elif error_count == 0 and warning_count <= 2:
            score = "B"
        elif error_count <= 2:
            score = "C"
        else:
            score = "D"
        return {
            "colors_checked": normalized_colors,
            "overall_score": score,
            "issue_count": len(issues),
            "issues": issues,
            "simulations": simulations,
            "recommendations": recommendations,
            "safe_palettes": SAFE_PALETTES
        }
    async def accessibility_validate_theme(
        self,
        theme_name: str
    ) -> Dict[str, Any]:
        """
        Validate a theme's colors for accessibility.
        Args:
            theme_name: Theme name to validate
        Returns:
            Dict with accessibility validation results
        """
        if not self.theme_store:
            return {
                "error": "Theme store not configured",
                "theme_name": theme_name
            }
        theme = self.theme_store.get_theme(theme_name)
        if not theme:
            available = self.theme_store.list_themes()
            return {
                "error": f"Theme '{theme_name}' not found. Available: {available}",
                "theme_name": theme_name
            }
        # Extract colors from theme
        colors = []
        tokens = theme.get("tokens", {})
        color_tokens = tokens.get("colors", {})
        def extract_colors(obj, prefix=""):
            """Recursively extract color values."""
            if isinstance(obj, str) and (obj.startswith('#') or len(obj) == 6):
                colors.append(obj if obj.startswith('#') else f'#{obj}')
            elif isinstance(obj, dict):
                for key, value in obj.items():
                    extract_colors(value, f"{prefix}.{key}")
            elif isinstance(obj, list):
                for item in obj:
                    extract_colors(item, prefix)
        extract_colors(color_tokens)
        # Validate extracted colors
        result = await self.accessibility_validate_colors(colors)
        result["theme_name"] = theme_name
        # Add theme-specific checks
        primary = color_tokens.get("primary")
        background = color_tokens.get("background", {})
        text = color_tokens.get("text", {})
        if primary and background:
            bg_color = background.get("base") if isinstance(background, dict) else background
            if bg_color:
                contrast = self._get_contrast_ratio(primary, bg_color)
                if contrast < 4.5:
                    result["issues"].append({
                        "type": "primary_contrast",
                        "severity": "error",
                        "colors": [primary, bg_color],
                        "ratio": round(contrast, 2),
                        "required": 4.5,
                        "message": f"Primary color has insufficient contrast ({contrast:.1f}:1) against background"
                    })
        return result
    async def accessibility_suggest_alternative(
        self,
        color: str,
        deficiency_type: str
    ) -> Dict[str, Any]:
        """
        Suggest accessible alternative colors.
        Args:
            color: Original hex color
            deficiency_type: Type of color blindness to optimize for
        Returns:
            Dict with alternative color suggestions
        """
        rgb = self._hex_to_rgb(color)
        suggestions = []
        # Suggest shifting hue while maintaining saturation and brightness
        # For red-green deficiency, shift toward blue or yellow
        if deficiency_type in ["deuteranopia", "protanopia"]:
            # Shift toward blue
            blue_shift = self._rgb_to_hex((
                max(0, rgb[0] - 50),
                max(0, rgb[1] - 30),
                min(255, rgb[2] + 80)
            ))
            suggestions.append({
                "color": blue_shift,
                "description": "Blue-shifted alternative",
                "preserves": "approximate brightness"
            })
            # Shift toward yellow/orange
            yellow_shift = self._rgb_to_hex((
                min(255, rgb[0] + 50),
                min(255, rgb[1] + 30),
                max(0, rgb[2] - 80)
            ))
            suggestions.append({
                "color": yellow_shift,
                "description": "Yellow-shifted alternative",
                "preserves": "approximate brightness"
            })
        elif deficiency_type == "tritanopia":
            # For blue-yellow deficiency, shift toward red or green
            red_shift = self._rgb_to_hex((
                min(255, rgb[0] + 60),
                max(0, rgb[1] - 20),
                max(0, rgb[2] - 40)
            ))
            suggestions.append({
                "color": red_shift,
                "description": "Red-shifted alternative",
                "preserves": "approximate brightness"
            })
        # Add safe palette suggestions
        for palette_name, palette in SAFE_PALETTES.items():
            # Find closest color in safe palette
            min_distance = float('inf')
            closest = None
            for safe_color in palette["colors"]:
                distance = self._get_color_distance(color, safe_color)
                if distance < min_distance:
                    min_distance = distance
                    closest = safe_color
            if closest:
                suggestions.append({
                    "color": closest,
                    "description": f"From {palette['name']} palette",
                    "palette": palette_name
                })
        return {
            "original_color": color,
            "deficiency_type": deficiency_type,
            "suggestions": suggestions[:5]  # Limit to 5 suggestions
        }
    def _generate_recommendations(self, issues: List[Dict[str, Any]]) -> List[str]:
        """Generate actionable recommendations based on issues."""
        recommendations = []
        # Check for distinguishability issues
        distinguishability_issues = [i for i in issues if i["type"] == "distinguishability"]
        if distinguishability_issues:
            affected_types = set()
            for issue in distinguishability_issues:
                affected_types.update(issue.get("affected_by", []))
            if "deuteranopia" in affected_types or "protanopia" in affected_types:
                recommendations.append(
                    "Avoid using red and green as the only differentiators - "
                    "add patterns, shapes, or labels"
                )
            recommendations.append(
                "Consider using a color-blind safe palette like Okabe-Ito or IBM Design"
            )
        # Check for contrast issues
        contrast_issues = [i for i in issues if i["type"] in ["contrast_ratio", "primary_contrast"]]
        if contrast_issues:
            recommendations.append(
                "Increase contrast by darkening colors for light backgrounds "
                "or lightening for dark backgrounds"
            )
            recommendations.append(
                "Use WCAG contrast checker tools to verify text readability"
            )
        # General recommendations
        if len(issues) > 0:
            recommendations.append(
                "Add secondary visual cues (icons, patterns, labels) "
                "to not rely solely on color"
            )
        if not recommendations:
            recommendations.append(
                "Color palette appears accessible! Consider adding patterns "
                "for additional distinguishability"
            )
        return recommendations
--- a/mcp-servers/viz-platform/mcp_server/chart_tools.py
+++ b/mcp-servers/viz-platform/mcp_server/chart_tools.py
@@ -3,21 +3,11 @@ Chart creation tools using Plotly.
 Provides tools for creating data visualizations with automatic theme integration.
 """
 import base64
 import logging
 import os
 from typing import Dict, List, Optional, Any, Union
 logger = logging.getLogger(__name__)
 # Check for kaleido availability
 KALEIDO_AVAILABLE = False
 try:
    import kaleido
    KALEIDO_AVAILABLE = True
 except ImportError:
    logger.debug("kaleido not installed - chart export will be unavailable")
 # Default color palette based on Mantine theme
 DEFAULT_COLORS = [
@@ -405,129 +395,3 @@ class ChartTools:
                "figure": figure,
                "interactions_added": []
            }
    async def chart_export(
        self,
        figure: Dict[str, Any],
        format: str = "png",
        width: Optional[int] = None,
        height: Optional[int] = None,
        scale: float = 2.0,
        output_path: Optional[str] = None
    ) -> Dict[str, Any]:
        """
        Export a Plotly chart to a static image format.
        Args:
            figure: Plotly figure JSON to export
            format: Output format - png, svg, or pdf
            width: Image width in pixels (default: from figure or 1200)
            height: Image height in pixels (default: from figure or 800)
            scale: Resolution scale factor (default: 2 for retina)
            output_path: Optional file path to save the image
        Returns:
            Dict with:
                - image_data: Base64-encoded image (if no output_path)
                - file_path: Path to saved file (if output_path provided)
                - format: Export format used
                - dimensions: {width, height, scale}
                - error: Error message if export failed
        """
        # Validate format
        valid_formats = ['png', 'svg', 'pdf']
        format = format.lower()
        if format not in valid_formats:
            return {
                "error": f"Invalid format '{format}'. Must be one of: {valid_formats}",
                "format": format,
                "image_data": None
            }
        # Check kaleido availability
        if not KALEIDO_AVAILABLE:
            return {
                "error": "kaleido package not installed. Install with: pip install kaleido",
                "format": format,
                "image_data": None,
                "install_hint": "pip install kaleido"
            }
        # Validate figure
        if not figure or 'data' not in figure:
            return {
                "error": "Invalid figure: must contain 'data' key",
                "format": format,
                "image_data": None
            }
        try:
            import plotly.graph_objects as go
            import plotly.io as pio
            # Create Plotly figure object
            fig = go.Figure(figure)
            # Determine dimensions
            layout = figure.get('layout', {})
            export_width = width or layout.get('width') or 1200
            export_height = height or layout.get('height') or 800
            # Export to bytes
            image_bytes = pio.to_image(
                fig,
                format=format,
                width=export_width,
                height=export_height,
                scale=scale
            )
            result = {
                "format": format,
                "dimensions": {
                    "width": export_width,
                    "height": export_height,
                    "scale": scale,
                    "effective_width": int(export_width * scale),
                    "effective_height": int(export_height * scale)
                }
            }
            # Save to file or return base64
            if output_path:
                # Ensure directory exists
                output_dir = os.path.dirname(output_path)
                if output_dir and not os.path.exists(output_dir):
                    os.makedirs(output_dir, exist_ok=True)
                # Add extension if missing
                if not output_path.endswith(f'.{format}'):
                    output_path = f"{output_path}.{format}"
                with open(output_path, 'wb') as f:
                    f.write(image_bytes)
                result["file_path"] = output_path
                result["file_size_bytes"] = len(image_bytes)
            else:
                # Return as base64
                result["image_data"] = base64.b64encode(image_bytes).decode('utf-8')
                result["data_uri"] = f"data:image/{format};base64,{result['image_data']}"
            return result
        except ImportError as e:
            logger.error(f"Chart export failed - missing dependency: {e}")
            return {
                "error": f"Missing dependency for export: {e}",
                "format": format,
                "image_data": None,
                "install_hint": "pip install plotly kaleido"
            }
        except Exception as e:
            logger.error(f"Chart export failed: {e}")
            return {
                "error": str(e),
                "format": format,
                "image_data": None
            }
--- a/mcp-servers/viz-platform/mcp_server/layout_tools.py
+++ b/mcp-servers/viz-platform/mcp_server/layout_tools.py
@@ -10,46 +10,6 @@ from uuid import uuid4
 logger = logging.getLogger(__name__)
 # Standard responsive breakpoints (Mantine/Bootstrap-aligned)
 DEFAULT_BREAKPOINTS = {
    "xs": {
        "min_width": "0px",
        "max_width": "575px",
        "cols": 1,
        "spacing": "xs",
        "description": "Extra small devices (phones, portrait)"
    },
    "sm": {
        "min_width": "576px",
        "max_width": "767px",
        "cols": 2,
        "spacing": "sm",
        "description": "Small devices (phones, landscape)"
    },
    "md": {
        "min_width": "768px",
        "max_width": "991px",
        "cols": 6,
        "spacing": "md",
        "description": "Medium devices (tablets)"
    },
    "lg": {
        "min_width": "992px",
        "max_width": "1199px",
        "cols": 12,
        "spacing": "md",
        "description": "Large devices (desktops)"
    },
    "xl": {
        "min_width": "1200px",
        "max_width": None,
        "cols": 12,
        "spacing": "lg",
        "description": "Extra large devices (large desktops)"
    }
 }
 # Layout templates
 TEMPLATES = {
    "dashboard": {
@@ -405,149 +365,3 @@ class LayoutTools:
            }
            for name, config in FILTER_TYPES.items()
        }
    async def layout_set_breakpoints(
        self,
        layout_ref: str,
        breakpoints: Dict[str, Dict[str, Any]],
        mobile_first: bool = True
    ) -> Dict[str, Any]:
        """
        Configure responsive breakpoints for a layout.
        Args:
            layout_ref: Layout name to configure
            breakpoints: Breakpoint configuration dict:
                {
                    "xs": {"cols": 1, "spacing": "xs"},
                    "sm": {"cols": 2, "spacing": "sm"},
                    "md": {"cols": 6, "spacing": "md"},
                    "lg": {"cols": 12, "spacing": "md"},
                    "xl": {"cols": 12, "spacing": "lg"}
                }
            mobile_first: If True, use min-width media queries (default)
        Returns:
            Dict with:
                - breakpoints: Complete breakpoint configuration
                - css_media_queries: Generated CSS media queries
                - mobile_first: Whether mobile-first approach is used
        """
        # Validate layout exists
        if layout_ref not in self._layouts:
            return {
                "error": f"Layout '{layout_ref}' not found. Create it first with layout_create.",
                "breakpoints": None
            }
        layout = self._layouts[layout_ref]
        # Validate breakpoint names
        valid_breakpoints = ["xs", "sm", "md", "lg", "xl"]
        for bp_name in breakpoints.keys():
            if bp_name not in valid_breakpoints:
                return {
                    "error": f"Invalid breakpoint '{bp_name}'. Must be one of: {valid_breakpoints}",
                    "breakpoints": layout.get("breakpoints")
                }
        # Merge with defaults
        merged_breakpoints = {}
        for bp_name in valid_breakpoints:
            default = DEFAULT_BREAKPOINTS[bp_name].copy()
            if bp_name in breakpoints:
                default.update(breakpoints[bp_name])
            merged_breakpoints[bp_name] = default
        # Validate spacing values
        valid_spacing = ["xs", "sm", "md", "lg", "xl"]
        for bp_name, bp_config in merged_breakpoints.items():
            if "spacing" in bp_config and bp_config["spacing"] not in valid_spacing:
                return {
                    "error": f"Invalid spacing '{bp_config['spacing']}' for breakpoint '{bp_name}'. Must be one of: {valid_spacing}",
                    "breakpoints": layout.get("breakpoints")
                }
        # Validate column counts
        for bp_name, bp_config in merged_breakpoints.items():
            if "cols" in bp_config:
                cols = bp_config["cols"]
                if not isinstance(cols, int) or cols < 1 or cols > 24:
                    return {
                        "error": f"Invalid cols '{cols}' for breakpoint '{bp_name}'. Must be integer between 1 and 24.",
                        "breakpoints": layout.get("breakpoints")
                    }
        # Generate CSS media queries
        css_queries = self._generate_media_queries(merged_breakpoints, mobile_first)
        # Store in layout
        layout["breakpoints"] = merged_breakpoints
        layout["mobile_first"] = mobile_first
        layout["responsive_css"] = css_queries
        return {
            "layout_ref": layout_ref,
            "breakpoints": merged_breakpoints,
            "mobile_first": mobile_first,
            "css_media_queries": css_queries
        }
    def _generate_media_queries(
        self,
        breakpoints: Dict[str, Dict[str, Any]],
        mobile_first: bool
    ) -> List[str]:
        """Generate CSS media queries for breakpoints."""
        queries = []
        bp_order = ["xs", "sm", "md", "lg", "xl"]
        if mobile_first:
            # Use min-width queries (mobile-first)
            for bp_name in bp_order[1:]:  # Skip xs (base styles)
                bp = breakpoints[bp_name]
                min_width = bp.get("min_width", DEFAULT_BREAKPOINTS[bp_name]["min_width"])
                if min_width and min_width != "0px":
                    queries.append(f"@media (min-width: {min_width}) {{ /* {bp_name} styles */ }}")
        else:
            # Use max-width queries (desktop-first)
            for bp_name in reversed(bp_order[:-1]):  # Skip xl (base styles)
                bp = breakpoints[bp_name]
                max_width = bp.get("max_width", DEFAULT_BREAKPOINTS[bp_name]["max_width"])
                if max_width:
                    queries.append(f"@media (max-width: {max_width}) {{ /* {bp_name} styles */ }}")
        return queries
    async def layout_get_breakpoints(self, layout_ref: str) -> Dict[str, Any]:
        """
        Get the breakpoint configuration for a layout.
        Args:
            layout_ref: Layout name
        Returns:
            Dict with breakpoint configuration
        """
        if layout_ref not in self._layouts:
            return {
                "error": f"Layout '{layout_ref}' not found.",
                "breakpoints": None
            }
        layout = self._layouts[layout_ref]
        return {
            "layout_ref": layout_ref,
            "breakpoints": layout.get("breakpoints", DEFAULT_BREAKPOINTS.copy()),
            "mobile_first": layout.get("mobile_first", True),
            "css_media_queries": layout.get("responsive_css", [])
        }
    def get_default_breakpoints(self) -> Dict[str, Any]:
        """Get the default breakpoint configuration."""
        return {
            "breakpoints": DEFAULT_BREAKPOINTS.copy(),
            "description": "Standard responsive breakpoints aligned with Mantine/Bootstrap",
            "mobile_first": True
        }
--- a/mcp-servers/viz-platform/mcp_server/server.py
+++ b/mcp-servers/viz-platform/mcp_server/server.py
@@ -17,7 +17,6 @@ from .chart_tools import ChartTools
 from .layout_tools import LayoutTools
 from .theme_tools import ThemeTools
 from .page_tools import PageTools
 from .accessibility_tools import AccessibilityTools
 # Suppress noisy MCP validation warnings on stderr
 logging.basicConfig(level=logging.INFO)
@@ -37,7 +36,6 @@ class VizPlatformMCPServer:
        self.layout_tools = LayoutTools()
        self.theme_tools = ThemeTools()
        self.page_tools = PageTools()
        self.accessibility_tools = AccessibilityTools(theme_store=self.theme_tools.store)
    async def initialize(self):
        """Initialize server and load configuration."""
@@ -200,46 +198,6 @@ class VizPlatformMCPServer:
                }
            ))
            # Chart export tool (Issue #247)
            tools.append(Tool(
                name="chart_export",
                description=(
                    "Export a Plotly chart to static image format (PNG, SVG, PDF). "
                    "Requires kaleido package. Returns base64 image data or saves to file."
                ),
                inputSchema={
                    "type": "object",
                    "properties": {
                        "figure": {
                            "type": "object",
                            "description": "Plotly figure JSON to export"
                        },
                        "format": {
                            "type": "string",
                            "enum": ["png", "svg", "pdf"],
                            "description": "Output format (default: png)"
                        },
                        "width": {
                            "type": "integer",
                            "description": "Image width in pixels (default: 1200)"
                        },
                        "height": {
                            "type": "integer",
                            "description": "Image height in pixels (default: 800)"
                        },
                        "scale": {
                            "type": "number",
                            "description": "Resolution scale factor (default: 2 for retina)"
                        },
                        "output_path": {
                            "type": "string",
                            "description": "Optional file path to save image"
                        }
                    },
                    "required": ["figure"]
                }
            ))
            # Layout tools (Issue #174)
            tools.append(Tool(
                name="layout_create",
@@ -322,36 +280,6 @@ class VizPlatformMCPServer:
                }
            ))
            # Responsive breakpoints tool (Issue #249)
            tools.append(Tool(
                name="layout_set_breakpoints",
                description=(
                    "Configure responsive breakpoints for a layout. "
                    "Supports xs, sm, md, lg, xl breakpoints with mobile-first approach. "
                    "Each breakpoint can define cols, spacing, and other grid properties."
                ),
                inputSchema={
                    "type": "object",
                    "properties": {
                        "layout_ref": {
                            "type": "string",
                            "description": "Layout name to configure"
                        },
                        "breakpoints": {
                            "type": "object",
                            "description": (
                                "Breakpoint config: {xs: {cols, spacing}, sm: {...}, md: {...}, lg: {...}, xl: {...}}"
                            )
                        },
                        "mobile_first": {
                            "type": "boolean",
                            "description": "Use mobile-first (min-width) media queries (default: true)"
                        }
                    },
                    "required": ["layout_ref", "breakpoints"]
                }
            ))
            # Theme tools (Issue #175)
            tools.append(Tool(
                name="theme_create",
@@ -523,77 +451,6 @@ class VizPlatformMCPServer:
                }
            ))
            # Accessibility tools (Issue #248)
            tools.append(Tool(
                name="accessibility_validate_colors",
                description=(
                    "Validate colors for color blind accessibility. "
                    "Checks contrast ratios for deuteranopia, protanopia, tritanopia. "
                    "Returns issues, simulations, and accessible palette suggestions."
                ),
                inputSchema={
                    "type": "object",
                    "properties": {
                        "colors": {
                            "type": "array",
                            "items": {"type": "string"},
                            "description": "List of hex colors to validate (e.g., ['#228be6', '#40c057'])"
                        },
                        "check_types": {
                            "type": "array",
                            "items": {"type": "string"},
                            "description": "Color blindness types to check: deuteranopia, protanopia, tritanopia (default: all)"
                        },
                        "min_contrast_ratio": {
                            "type": "number",
                            "description": "Minimum WCAG contrast ratio (default: 4.5 for AA)"
                        }
                    },
                    "required": ["colors"]
                }
            ))
            tools.append(Tool(
                name="accessibility_validate_theme",
                description=(
                    "Validate a theme's colors for accessibility. "
                    "Extracts all colors from theme tokens and checks for color blind safety."
                ),
                inputSchema={
                    "type": "object",
                    "properties": {
                        "theme_name": {
                            "type": "string",
                            "description": "Theme name to validate"
                        }
                    },
                    "required": ["theme_name"]
                }
            ))
            tools.append(Tool(
                name="accessibility_suggest_alternative",
                description=(
                    "Suggest accessible alternative colors for a given color. "
                    "Provides alternatives optimized for specific color blindness types."
                ),
                inputSchema={
                    "type": "object",
                    "properties": {
                        "color": {
                            "type": "string",
                            "description": "Hex color to find alternatives for"
                        },
                        "deficiency_type": {
                            "type": "string",
                            "enum": ["deuteranopia", "protanopia", "tritanopia"],
                            "description": "Color blindness type to optimize for"
                        }
                    },
                    "required": ["color", "deficiency_type"]
                }
            ))
            return tools
        @self.server.call_tool()
@@ -667,26 +524,6 @@ class VizPlatformMCPServer:
                        text=json.dumps(result, indent=2)
                    )]
                elif name == "chart_export":
                    figure = arguments.get('figure')
                    if not figure:
                        return [TextContent(
                            type="text",
                            text=json.dumps({"error": "figure is required"}, indent=2)
                        )]
                    result = await self.chart_tools.chart_export(
                        figure=figure,
                        format=arguments.get('format', 'png'),
                        width=arguments.get('width'),
                        height=arguments.get('height'),
                        scale=arguments.get('scale', 2.0),
                        output_path=arguments.get('output_path')
                    )
                    return [TextContent(
                        type="text",
                        text=json.dumps(result, indent=2)
                    )]
                # Layout tools
                elif name == "layout_create":
                    layout_name = arguments.get('name')
@@ -731,23 +568,6 @@ class VizPlatformMCPServer:
                        text=json.dumps(result, indent=2)
                    )]
                elif name == "layout_set_breakpoints":
                    layout_ref = arguments.get('layout_ref')
                    breakpoints = arguments.get('breakpoints', {})
                    mobile_first = arguments.get('mobile_first', True)
                    if not layout_ref:
                        return [TextContent(
                            type="text",
                            text=json.dumps({"error": "layout_ref is required"}, indent=2)
                        )]
                    result = await self.layout_tools.layout_set_breakpoints(
                        layout_ref, breakpoints, mobile_first
                    )
                    return [TextContent(
                        type="text",
                        text=json.dumps(result, indent=2)
                    )]
                # Theme tools
                elif name == "theme_create":
                    theme_name = arguments.get('name')
@@ -849,53 +669,6 @@ class VizPlatformMCPServer:
                        text=json.dumps(result, indent=2)
                    )]
                # Accessibility tools
                elif name == "accessibility_validate_colors":
                    colors = arguments.get('colors')
                    if not colors:
                        return [TextContent(
                            type="text",
                            text=json.dumps({"error": "colors list is required"}, indent=2)
                        )]
                    result = await self.accessibility_tools.accessibility_validate_colors(
                        colors=colors,
                        check_types=arguments.get('check_types'),
                        min_contrast_ratio=arguments.get('min_contrast_ratio', 4.5)
                    )
                    return [TextContent(
                        type="text",
                        text=json.dumps(result, indent=2)
                    )]
                elif name == "accessibility_validate_theme":
                    theme_name = arguments.get('theme_name')
                    if not theme_name:
                        return [TextContent(
                            type="text",
                            text=json.dumps({"error": "theme_name is required"}, indent=2)
                        )]
                    result = await self.accessibility_tools.accessibility_validate_theme(theme_name)
                    return [TextContent(
                        type="text",
                        text=json.dumps(result, indent=2)
                    )]
                elif name == "accessibility_suggest_alternative":
                    color = arguments.get('color')
                    deficiency_type = arguments.get('deficiency_type')
                    if not color or not deficiency_type:
                        return [TextContent(
                            type="text",
                            text=json.dumps({"error": "color and deficiency_type are required"}, indent=2)
                        )]
                    result = await self.accessibility_tools.accessibility_suggest_alternative(
                        color, deficiency_type
                    )
                    return [TextContent(
                        type="text",
                        text=json.dumps(result, indent=2)
                    )]
                raise ValueError(f"Unknown tool: {name}")
            except Exception as e:
--- a/mcp-servers/viz-platform/requirements.txt
+++ b/mcp-servers/viz-platform/requirements.txt
@@ -5,7 +5,6 @@ mcp>=0.9.0
 plotly>=5.18.0
 dash>=2.14.0
 dash-mantine-components>=2.0.0
 kaleido>=0.2.1  # For chart export (PNG, SVG, PDF)
 # Utilities
 python-dotenv>=1.0.0
--- a/mcp-servers/viz-platform/run.sh
+++ b/mcp-servers/viz-platform/run.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 # Capture original working directory before any cd operations
 # This should be the user's project directory when launched by Claude Code
 export CLAUDE_PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$PWD}"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CACHE_VENV="$HOME/.cache/claude-mcp-venvs/leo-claude-mktplace/viz-platform/.venv"
 LOCAL_VENV="$SCRIPT_DIR/.venv"
--- a/mcp-servers/viz-platform/tests/test_accessibility_tools.py
+++ b/mcp-servers/viz-platform/tests/test_accessibility_tools.py
@@ -1,195 +0,0 @@
 """
 Tests for accessibility validation tools.
 """
 import pytest
 from mcp_server.accessibility_tools import AccessibilityTools
@pytest.fixture
 def tools():
    """Create AccessibilityTools instance."""
    return AccessibilityTools()
 class TestHexToRgb:
    """Tests for _hex_to_rgb method."""
    def test_hex_to_rgb_6_digit(self, tools):
        """Test 6-digit hex conversion."""
        assert tools._hex_to_rgb("#FF0000") == (255, 0, 0)
        assert tools._hex_to_rgb("#00FF00") == (0, 255, 0)
        assert tools._hex_to_rgb("#0000FF") == (0, 0, 255)
    def test_hex_to_rgb_3_digit(self, tools):
        """Test 3-digit hex conversion."""
        assert tools._hex_to_rgb("#F00") == (255, 0, 0)
        assert tools._hex_to_rgb("#0F0") == (0, 255, 0)
        assert tools._hex_to_rgb("#00F") == (0, 0, 255)
    def test_hex_to_rgb_lowercase(self, tools):
        """Test lowercase hex conversion."""
        assert tools._hex_to_rgb("#ff0000") == (255, 0, 0)
 class TestContrastRatio:
    """Tests for _get_contrast_ratio method."""
    def test_black_white_contrast(self, tools):
        """Test black on white has maximum contrast."""
        ratio = tools._get_contrast_ratio("#000000", "#FFFFFF")
        assert ratio == pytest.approx(21.0, rel=0.01)
    def test_same_color_contrast(self, tools):
        """Test same color has minimum contrast."""
        ratio = tools._get_contrast_ratio("#FF0000", "#FF0000")
        assert ratio == pytest.approx(1.0, rel=0.01)
    def test_symmetric_contrast(self, tools):
        """Test contrast ratio is symmetric."""
        ratio1 = tools._get_contrast_ratio("#228be6", "#FFFFFF")
        ratio2 = tools._get_contrast_ratio("#FFFFFF", "#228be6")
        assert ratio1 == pytest.approx(ratio2, rel=0.01)
 class TestColorBlindnessSimulation:
    """Tests for _simulate_color_blindness method."""
    def test_deuteranopia_simulation(self, tools):
        """Test deuteranopia (green-blind) simulation."""
        # Red and green should appear more similar
        original_red = "#FF0000"
        original_green = "#00FF00"
        simulated_red = tools._simulate_color_blindness(original_red, "deuteranopia")
        simulated_green = tools._simulate_color_blindness(original_green, "deuteranopia")
        # They should be different from originals
        assert simulated_red != original_red or simulated_green != original_green
    def test_protanopia_simulation(self, tools):
        """Test protanopia (red-blind) simulation."""
        simulated = tools._simulate_color_blindness("#FF0000", "protanopia")
        # Should return a modified color
        assert simulated.startswith("#")
        assert len(simulated) == 7
    def test_tritanopia_simulation(self, tools):
        """Test tritanopia (blue-blind) simulation."""
        simulated = tools._simulate_color_blindness("#0000FF", "tritanopia")
        # Should return a modified color
        assert simulated.startswith("#")
        assert len(simulated) == 7
    def test_unknown_deficiency_returns_original(self, tools):
        """Test unknown deficiency type returns original color."""
        color = "#FF0000"
        simulated = tools._simulate_color_blindness(color, "unknown")
        assert simulated == color
 class TestAccessibilityValidateColors:
    """Tests for accessibility_validate_colors method."""
    @pytest.mark.asyncio
    async def test_validate_single_color(self, tools):
        """Test validating a single color."""
        result = await tools.accessibility_validate_colors(["#228be6"])
        assert "colors_checked" in result
        assert "overall_score" in result
        assert "issues" in result
        assert "safe_palettes" in result
    @pytest.mark.asyncio
    async def test_validate_problematic_colors(self, tools):
        """Test similar colors trigger warnings."""
        # Use colors that are very close in hue, which should be harder to distinguish
        result = await tools.accessibility_validate_colors(["#FF5555", "#FF6666"])
        # Similar colors should trigger distinguishability warnings
        assert "issues" in result
        # The validation should at least run without errors
        assert "colors_checked" in result
        assert len(result["colors_checked"]) == 2
    @pytest.mark.asyncio
    async def test_validate_contrast_issue(self, tools):
        """Test low contrast colors trigger contrast warnings."""
        # Yellow on white has poor contrast
        result = await tools.accessibility_validate_colors(["#FFFF00"])
        # Check for contrast issues (yellow may have issues with both black and white)
        assert "issues" in result
    @pytest.mark.asyncio
    async def test_validate_with_specific_types(self, tools):
        """Test validating for specific color blindness types."""
        result = await tools.accessibility_validate_colors(
            ["#FF0000", "#00FF00"],
            check_types=["deuteranopia"]
        )
        assert "simulations" in result
        assert "deuteranopia" in result["simulations"]
        assert "protanopia" not in result["simulations"]
    @pytest.mark.asyncio
    async def test_overall_score(self, tools):
        """Test overall score is calculated."""
        result = await tools.accessibility_validate_colors(["#228be6", "#ffffff"])
        assert result["overall_score"] in ["A", "B", "C", "D"]
    @pytest.mark.asyncio
    async def test_recommendations_generated(self, tools):
        """Test recommendations are generated for issues."""
        result = await tools.accessibility_validate_colors(["#FF0000", "#00FF00"])
        assert "recommendations" in result
        assert len(result["recommendations"]) > 0
 class TestAccessibilitySuggestAlternative:
    """Tests for accessibility_suggest_alternative method."""
    @pytest.mark.asyncio
    async def test_suggest_alternative_deuteranopia(self, tools):
        """Test suggesting alternatives for deuteranopia."""
        result = await tools.accessibility_suggest_alternative("#FF0000", "deuteranopia")
        assert "original_color" in result
        assert result["deficiency_type"] == "deuteranopia"
        assert "suggestions" in result
        assert len(result["suggestions"]) > 0
    @pytest.mark.asyncio
    async def test_suggest_alternative_tritanopia(self, tools):
        """Test suggesting alternatives for tritanopia."""
        result = await tools.accessibility_suggest_alternative("#0000FF", "tritanopia")
        assert "suggestions" in result
        assert len(result["suggestions"]) > 0
    @pytest.mark.asyncio
    async def test_suggestions_include_safe_palettes(self, tools):
        """Test suggestions include colors from safe palettes."""
        result = await tools.accessibility_suggest_alternative("#FF0000", "deuteranopia")
        palette_suggestions = [
            s for s in result["suggestions"]
            if "palette" in s
        ]
        assert len(palette_suggestions) > 0
 class TestSafePalettes:
    """Tests for safe palette constants."""
    def test_safe_palettes_exist(self, tools):
        """Test that safe palettes are defined."""
        from mcp_server.accessibility_tools import SAFE_PALETTES
        assert "categorical" in SAFE_PALETTES
        assert "ibm" in SAFE_PALETTES
        assert "okabe_ito" in SAFE_PALETTES
        assert "tableau_colorblind" in SAFE_PALETTES
    def test_safe_palettes_have_colors(self, tools):
        """Test that safe palettes have color lists."""
        from mcp_server.accessibility_tools import SAFE_PALETTES
        for palette_name, palette in SAFE_PALETTES.items():
            assert "colors" in palette
            assert len(palette["colors"]) > 0
            # All colors should be valid hex
            for color in palette["colors"]:
                assert color.startswith("#")
--- a/plugins/clarity-assist/README.md
+++ b/plugins/clarity-assist/README.md
@@ -0,0 +1,99 @@
 # clarity-assist
 Prompt optimization and requirement clarification plugin with neurodivergent-friendly accommodations.
 ## Overview
 clarity-assist helps transform vague, incomplete, or ambiguous requests into clear, actionable specifications. It uses a structured 4-D methodology (Deconstruct, Diagnose, Develop, Deliver) and ND-friendly communication patterns.
 ## Commands
 | Command | Description |
 |---------|-------------|
 | `/clarify` | Full 4-D prompt optimization for complex requests |
 | `/quick-clarify` | Rapid single-pass clarification for simple requests |
 ## Features
 ### 4-D Methodology
 1. **Deconstruct** - Break down the request into components
 2. **Diagnose** - Analyze gaps and potential issues
 3. **Develop** - Gather clarifications through structured questions
 4. **Deliver** - Produce refined specification
 ### ND-Friendly Design
 - **Option-based questioning** - Always provide 2-4 concrete choices
 - **Chunked questions** - Ask 1-2 questions at a time
 - **Context for questions** - Explain why you're asking
 - **Conflict detection** - Check previous answers before new questions
 - **Progress acknowledgment** - Summarize frequently
 ### Escalation Protocol
 When requests are complex or users seem overwhelmed:
 - Acknowledge complexity
 - Offer to focus on one aspect at a time
 - Build incrementally
 ## Installation
 Add to your project's `.claude/settings.json`:
 ```json
 {
  "plugins": ["clarity-assist"]
 }
 ```
 ## Usage
 ### Full Clarification
 ```
 /clarify
 [Your vague or complex request here]
 ```
 ### Quick Clarification
 ```
 /quick-clarify
 [Your mostly-clear request here]
 ```
 ## Configuration
 No configuration required. The plugin uses sensible defaults.
 ## Output Format
 After clarification, you receive a structured specification:
 ```markdown
 ## Clarified Request
 ### Summary
 [Description of what will be built]
 ### Scope
 **In Scope:** [items]
 **Out of Scope:** [items]
 ### Requirements
 [Prioritized table]
 ### Assumptions
 [List of assumptions]
 ```
 ## Integration
 For CLAUDE.md integration instructions, see `claude-md-integration.md`.
 ## License
 MIT
--- a/plugins/clarity-assist/agents/clarity-coach.md
+++ b/plugins/clarity-assist/agents/clarity-coach.md
@@ -1,15 +1,5 @@
 # Clarity Coach Agent
 ## Visual Output Requirements
 **MANDATORY: Display header at start of every response.**
 ```
 ┌──────────────────────────────────────────────────────────────────┐
 │  💬 CLARITY-ASSIST · Clarity Coach                               │
 └──────────────────────────────────────────────────────────────────┘
 ```
 ## Role
 You are a patient, structured coach specializing in helping users articulate their requirements clearly. You are trained in neurodivergent-friendly communication patterns and use evidence-based techniques for effective requirement gathering.
--- a/plugins/clarity-assist/commands/clarify.md
+++ b/plugins/clarity-assist/commands/clarify.md
@@ -1,13 +1,5 @@
 # /clarify - Full Prompt Optimization
 ## Visual Output
 ```
 +----------------------------------------------------------------------+
 |  CLARITY-ASSIST - Prompt Optimization                                |
 +----------------------------------------------------------------------+
 ```
 ## Purpose
 Transform vague, incomplete, or ambiguous requests into clear, actionable specifications using the 4-D methodology with neurodivergent-friendly accommodations.
@@ -19,46 +11,127 @@ Transform vague, incomplete, or ambiguous requests into clear, actionable specif
 - Tasks requiring significant context gathering
 - When user seems uncertain about what they want
-## Skills to Load
+## 4-D Methodology
-Load these skills before proceeding:
+### Phase 1: Deconstruct
- `skills/4d-methodology.md` - Core 4-phase process
+Break down the user's request into components:
 - `skills/nd-accommodations.md` - ND-friendly question patterns
 - `skills/clarification-techniques.md` - Anti-patterns and templates
 - `skills/escalation-patterns.md` - When to adjust approach
-## Workflow
+1. **Extract explicit requirements** - What was directly stated
 2. **Identify implicit assumptions** - What seems assumed but not stated
 3. **Note ambiguities** - Points that could go multiple ways
 4. **List dependencies** - External factors that might affect implementation
-1. **Deconstruct** - Break down request into components
+### Phase 2: Diagnose
-2. **Diagnose** - Identify gaps and conflicts
+
-3. **Develop** - Gather clarifications via structured questions
+Analyze gaps and potential issues:
-4. **Deliver** - Present refined specification
+
-5. **Offer RFC Creation** - For feature work, offer to save as RFC
+1. **Missing information** - What do we need to know?
 2. **Conflicting requirements** - Do any stated goals contradict?
 3. **Scope boundaries** - What's in/out of scope?
 4. **Technical constraints** - Platform, language, architecture limits
 ### Phase 3: Develop
 Gather clarifications through structured questioning:
 **ND-Friendly Question Rules:**
 - Present 2-4 concrete options (never open-ended alone)
 - Include "Other" for custom responses
 - Ask 1-2 questions at a time maximum
 - Provide brief context for why you're asking
 - Check for conflicts with previous answers
 **Example Format:**
 ```
 To help me understand the scope better:
 **How should errors be handled?**
 1. Silent logging (user sees nothing)
 2. Toast notifications (brief, dismissible)
 3. Modal dialogs (requires user action)
 4. Other
 [Context: This affects both UX and how much error-handling code we need]
 ```
 ### Phase 4: Deliver
 Produce the refined specification:
 ```markdown
 ## Clarified Request
 ### Summary
 [1-2 sentence description of what will be built]
 ### Scope
 **In Scope:**
 - [Item 1]
 - [Item 2]
 **Out of Scope:**
 - [Item 1]
 ### Requirements
 | # | Requirement | Priority | Notes |
 |---|-------------|----------|-------|
 | 1 | ... | Must | ... |
 | 2 | ... | Should | ... |
 ### Assumptions
 - [Assumption made based on conversation]
 ### Open Questions
 - [Any remaining ambiguities, if any]
 ```
 ## Conflict Detection
 Before each question, review previous answers for conflicts:
 ```
 [Internal check]
 Previous: User said "keep it simple"
 Current question about: Adding configuration options
 Potential conflict: More options = more complexity
 → Acknowledge: "Earlier you mentioned keeping it simple. With that in mind..."
 ```
 ## Escalation Protocol
 If the request is particularly messy or the user seems overwhelmed:
 1. Acknowledge the complexity
 2. Offer to start with just ONE aspect
 3. Build incrementally
 ```
 "This touches a lot of areas. Rather than tackle everything at once,
 let's start with [most critical piece]. Once that's clear, we can
 add the other parts. Sound good?"
 ```
 ## Example Interaction
 **User:** Make the app faster
 **Clarify Response:**
 ```
 Let me help clarify what kind of performance improvements you're looking for.
 **What type of slowness are you experiencing?**
 1. Initial page load takes too long
 2. Interactions feel sluggish (clicking, typing)
 3. API calls are slow
 4. All of the above
 5. Other
 [I'm asking because each has very different solutions]
 ```
 ## Output Format
-Use the Deliver phase template from `skills/4d-methodology.md` to present the clarified specification for user confirmation.
+After gathering all necessary information, use the Deliver phase format to present the clarified specification for user confirmation.
 ## RFC Creation Offer (Step 5)
 After presenting the clarified specification, if the request appears to be a feature or enhancement:
 ```
 ---
 Would you like to save this as an RFC for formal tracking?
 An RFC (Request for Comments) provides:
 - Structured documentation of the proposal
 - Review workflow before implementation
 - Integration with sprint planning
 [1] Yes, create RFC from this specification
 [2] No, proceed with implementation directly
 ```
 If user selects [1]:
 - Pass clarified specification to `/rfc-create`
 - The Summary, Motivation, and Design sections will be populated from the clarified spec
 - User can then refine the RFC and submit for review
--- a/plugins/clarity-assist/commands/quick-clarify.md
+++ b/plugins/clarity-assist/commands/quick-clarify.md
@@ -1,13 +1,5 @@
 # /quick-clarify - Rapid Clarification Mode
 ## Visual Output
 ```
 +----------------------------------------------------------------------+
 |  CLARITY-ASSIST - Quick Clarify                                      |
 +----------------------------------------------------------------------+
 ```
 ## Purpose
 Single-pass clarification for requests that are mostly clear but need minor disambiguation.
@@ -19,27 +11,74 @@ Single-pass clarification for requests that are mostly clear but need minor disa
 - Follow-up to an already-clarified request
 - Simple feature additions or bug fixes
-## Skills to Load
+## Process
- `skills/nd-accommodations.md` - ND-friendly question patterns
+### Step 1: Echo Understanding
 - `skills/clarification-techniques.md` - Echo and micro-summary techniques
 - `skills/escalation-patterns.md` - When to escalate to full /clarify
-## Workflow
+Restate what you understood in a single sentence:
-1. **Echo Understanding** - Restate in a single sentence
+```
-2. **Quick Disambiguation** - Ask ONE multiple-choice question if needed
+"I understand you want [X] that does [Y]."
-3. **Proceed or Confirm** - Start work or offer micro-summary
+```
 ### Step 2: Quick Disambiguation
 If needed, ask ONE multiple-choice question:
 ```
 **Just to confirm:** Should this [A] or [B]?
 1. [Option A with brief description]
 2. [Option B with brief description]
 3. Both
 4. Neither / Other approach
 ```
 ### Step 3: Proceed or Confirm
 If confident (>90%), proceed with a brief confirmation:
 ```
 "Got it. I'll implement [X with chosen option]. Starting now."
 ```
 If less confident, offer a micro-summary:
 ```
 "Quick summary before I start:
 - [Key point 1]
 - [Key point 2]
 - [Assumption made]
 Proceed? (Or clarify anything)"
 ```
 ## Example Interaction
 **User:** Add a delete button to the user list
 **Quick-Clarify Response:**
 ```
 I'll add a delete button to each row in the user list.
 **Should deletion require confirmation?**
 1. Yes - show confirmation dialog (Recommended)
 2. No - delete immediately
 3. Soft delete - mark as deleted but keep data
 [Asking because accidental deletions can be problematic]
 ```
 ## Escalation to Full /clarify
 If quick-clarify reveals complexity:
 ```
 "This is more involved than it first appeared - there are
 several decisions to make. Want me to switch to a more
 thorough clarification process? (Just say 'yes' or 'clarify')"
 ```
 ## Output Format
-No formal specification document needed. Proceed after brief confirmation, documenting assumptions inline with the work.
+For quick-clarify, no formal specification document is needed. Just proceed with the task after brief confirmation, documenting assumptions inline with the work.
 ## Escalation
 If complexity emerges, offer to switch to full `/clarify`:
 ```
 "This is more involved than it first appeared. Want me to switch
 to a more thorough clarification process?"
 ```
--- a/plugins/clarity-assist/docs/ND-SUPPORT.md
+++ b/plugins/clarity-assist/docs/ND-SUPPORT.md
@@ -1,328 +0,0 @@
 # Neurodivergent Support in clarity-assist
 This document describes how clarity-assist is designed to support users with neurodivergent traits, including ADHD, autism, anxiety, and other conditions that affect executive function, sensory processing, or cognitive style.
 ## Overview
 ### Purpose
 clarity-assist exists to help all users transform vague or incomplete requests into clear, actionable specifications. For neurodivergent users specifically, it addresses common challenges:
 - **Executive function difficulties** - Breaking down complex tasks, getting started, managing scope
 - **Working memory limitations** - Keeping track of context across long conversations
 - **Decision fatigue** - Facing too many open-ended choices
 - **Processing style differences** - Preferring structured, predictable interactions
 - **Anxiety around uncertainty** - Needing clear expectations and explicit confirmation
 ### Philosophy
 Our design philosophy centers on three principles:
 1. **Reduce cognitive load** - Never force the user to hold too much in their head at once
 2. **Provide structure** - Use consistent, predictable patterns for all interactions
 3. **Respect different communication styles** - Accommodate rather than assume one "right" way to think
 ## Features for ND Users
 ### 1. Reduced Cognitive Load
 **Prompt Simplification**
 - The 4-D methodology (Deconstruct, Diagnose, Develop, Deliver) breaks down complex requests into manageable phases
 - Users never need to specify everything upfront - clarification happens incrementally
 **Task Breakdown**
 - Large requests are decomposed into explicit components
 - Dependencies and relationships are surfaced rather than left implicit
 - Scope boundaries are clearly defined (in-scope vs. out-of-scope)
 ### 2. Structured Output
 **Consistent Formatting**
 - Every clarification session produces the same structured specification:
  - Summary (1-2 sentences)
  - Scope (In/Out)
  - Requirements table (numbered, prioritized)
  - Assumptions list
 - This predictability reduces the mental effort of parsing responses
 **Predictable Patterns**
 - Questions always follow the same format
 - Progress summaries appear at regular intervals
 - Escalation (simple to complex) is always offered, never forced
 **Bulleted Lists Over Prose**
 - Requirements are presented as scannable lists, not paragraphs
 - Options are numbered for easy reference
 - Key information is highlighted with bold labels
 ### 3. Customizable Verbosity
 **Detail Levels**
 - `/clarify` - Full methodology for complex requests (more thorough, more questions)
 - `/quick-clarify` - Rapid mode for simple disambiguation (fewer questions, faster)
 **User Control**
 - Users can always say "that's enough detail" to end questioning early
 - The plugin offers to break sessions into smaller parts
 - "Good enough for now" is explicitly validated as an acceptable outcome
 ### 4. Vagueness Detection
 The `UserPromptSubmit` hook automatically detects prompts that might benefit from clarification and gently suggests using `/clarify`.
 **Detection Signals**
 - Short prompts (< 10 words) without specific technical terms
 - Vague action phrases: "help me", "fix this", "make it better"
 - Ambiguous scope words: "somehow", "something", "stuff", "etc."
 - Open questions without context
 **Non-Blocking Approach**
 - The hook never prevents you from proceeding
 - It provides a suggestion with a vagueness score (percentage)
 - You can disable auto-suggestions entirely via environment variable
 ### 5. Focus Aids
 **Task Prioritization**
 - Requirements are tagged as Must/Should/Could/Won't (MoSCoW)
 - Critical items are separated from nice-to-haves
 - Scope creep is explicitly called out and deferred
 **Context Switching Warnings**
 - When questions touch multiple areas, the plugin acknowledges the complexity
 - Offers to focus on one aspect at a time
 - Summarizes frequently to rebuild context after interruptions
 ## How It Works
 ### The UserPromptSubmit Hook
 When you submit a prompt, the vagueness detection hook (`hooks/vagueness-check.sh`) runs automatically:
 ```
 User submits prompt
       |
       v
 Hook reads prompt from stdin
       |
       v
 Skip if: empty, starts with /, or contains file paths
       |
       v
 Calculate vagueness score (0.0 - 1.0)
  - Short prompts: +0.3
  - Vague action phrases: +0.2
  - Ambiguous scope words: +0.15
  - Missing technical specifics: +0.2
  - Short questions without context: +0.15
       |
       v
 If score >= threshold (default 0.6):
  - Output gentle suggestion with [clarity-assist] prefix
  - Show vagueness percentage
       |
       v
 Exit 0 (always non-blocking)
 ```
 ### Example Hook Output
 ```
 [clarity-assist] Your prompt could benefit from more clarity.
 [clarity-assist] Consider running /clarity-assist to refine your request.
 [clarity-assist] (Vagueness score: 65% - this is a suggestion, not a block)
 ```
 ### The 4-D Methodology
 | Phase | What Happens | ND Benefit |
 |-------|--------------|------------|
 | **Deconstruct** | Break request into components | Shows the full picture without overwhelming |
 | **Diagnose** | Identify gaps and conflicts | Surfaces hidden assumptions |
 | **Develop** | Ask structured questions | Option-based, chunked, contextual |
 | **Deliver** | Produce specification | Consistent, scannable format |
 ## Usage Examples
 ### Before: Vague Request
 ```
 User: Make the app faster
 ```
 This triggers vagueness detection because:
 - Short (4 words)
 - Vague action ("make")
 - No specific technical context
 - No measurable outcome
 ### After: Clarified with /clarify
 ```
 User: /clarify Make the app faster
 Claude: Let me help clarify what kind of performance improvements you're looking for.
 **What type of slowness are you experiencing?**
 1. Initial page load takes too long
 2. Interactions feel sluggish (clicking, typing)
 3. API calls are slow
 4. All of the above
 5. Other
 [I'm asking because each has very different solutions]
 ```
 ```
 User: 1
 Claude: Initial page load - got it.
 **What's an acceptable load time for you?**
 1. Under 1 second (aggressive)
 2. Under 2 seconds (standard)
 3. Under 3 seconds (relaxed)
 4. I don't have a specific target
 [This helps me know whether to suggest quick wins or a major optimization effort]
 ```
 After 2-3 more questions, the user receives:
 ```markdown
 ## Clarified Request
 ### Summary
 Optimize initial page load time to under 2 seconds by addressing bundle size and initial render blocking resources.
 ### Scope
 **In Scope:**
 - Bundle analysis and splitting
 - Lazy loading non-critical components
 - Image optimization
 - CSS/JS minification check
 **Out of Scope:**
 - Backend API optimization
 - Database query performance
 - CDN setup
 ### Requirements
 | # | Requirement | Priority | Notes |
 |---|-------------|----------|-------|
 | 1 | Page loads in < 2s on 4G | Must | Measured via Lighthouse |
 | 2 | Largest contentful paint < 1.5s | Should | Core Web Vital |
 | 3 | No layout shift after load | Should | CLS < 0.1 |
 ### Assumptions
 - Current load time is > 3 seconds (based on "too long" description)
 - Target browsers: modern evergreen (Chrome, Firefox, Safari)
 - Build tooling already configured (webpack/vite)
 ```
 ### Common Patterns Detected
 | Pattern | Example | What It Triggers |
 |---------|---------|------------------|
 | Missing context | "Fix the bug" | "Which bug? In which file or feature?" |
 | Ambiguous scope | "Update the user stuff" | "What specifically needs updating?" |
 | Unclear goals | "Make it better" | "Better in what way? Faster? Cleaner? More features?" |
 | Implicit knowledge | "Do it like last time" | "I don't have context from previous sessions" |
 | Conflicting requests | "Keep it simple but add everything" | "Which matters more: simplicity or completeness?" |
 ### Quick-Clarify Example
 For simpler requests that just need minor disambiguation:
 ```
 User: /quick-clarify Add a delete button to the user list
 Claude: I'll add a delete button to each row in the user list.
 **Should deletion require confirmation?**
 1. Yes - show confirmation dialog (Recommended)
 2. No - delete immediately
 3. Soft delete - mark as deleted but keep data
 [Asking because accidental deletions can be problematic]
 ```
 ```
 User: 1
 Claude: Got it. I'll implement a delete button with confirmation dialog. Starting now.
 ```
 ## Configuration Options
 ### Environment Variables
 | Variable | Default | Description |
 |----------|---------|-------------|
 | `CLARITY_ASSIST_AUTO_SUGGEST` | `true` | Enable/disable automatic vagueness detection |
 | `CLARITY_ASSIST_VAGUENESS_THRESHOLD` | `0.6` | Score threshold to trigger suggestion (0.0-1.0) |
 ### Disabling Auto-Suggestions
 If you find the vagueness detection unhelpful, disable it in your shell profile or `.env`:
 ```bash
 export CLARITY_ASSIST_AUTO_SUGGEST=false
 ```
 ### Adjusting Sensitivity
 To make detection more or less sensitive:
 ```bash
 # More sensitive (suggests more often)
 export CLARITY_ASSIST_VAGUENESS_THRESHOLD=0.4
 # Less sensitive (only very vague prompts)
 export CLARITY_ASSIST_VAGUENESS_THRESHOLD=0.8
 ```
 ## Tips for ND Users
 ### If You're Feeling Overwhelmed
 - Use `/quick-clarify` instead of `/clarify` for faster interactions
 - Say "let's focus on just one thing" to narrow scope
 - Ask to "pause and summarize" at any point
 - It's OK to say "I don't know" - the plugin will offer concrete alternatives
 ### If You Have Executive Function Challenges
 - Start with `/clarify` even for tasks you think are simple - it helps with planning
 - The structured specification can serve as a checklist
 - Use the scope boundaries to prevent scope creep
 ### If You Prefer Detailed Structure
 - The 4-D methodology provides a predictable framework
 - All output follows consistent formatting
 - Questions always offer numbered options
 ### If You Have Anxiety About Getting It Right
 - The plugin validates "good enough for now" as acceptable
 - You can always revisit and change earlier answers
 - Assumptions are explicitly listed - nothing is hidden
 ## Accessibility Notes
 - All output uses standard markdown that works with screen readers
 - No time pressure - take as long as you need between responses
 - Questions are designed to be answerable without deep context retrieval
 - Visual patterns (bold, bullets, tables) create scannable structure
 ## Feedback
 If you have suggestions for improving neurodivergent support in clarity-assist, please open an issue at:
 https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/issues
 Include the label `clarity-assist` and describe:
 - What challenge you faced
 - What would have helped
 - Any specific accommodations you'd like to see
--- a/plugins/clarity-assist/hooks/hooks.json
+++ b/plugins/clarity-assist/hooks/hooks.json
@@ -1,15 +0,0 @@
 {
  "hooks": {
    "UserPromptSubmit": [
      {
        "matcher": "",
        "hooks": [
          {
            "type": "command",
            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/vagueness-check.sh"
          }
        ]
      }
    ]
  }
 }
--- a/plugins/clarity-assist/hooks/vagueness-check.sh
+++ b/plugins/clarity-assist/hooks/vagueness-check.sh
@@ -1,256 +0,0 @@
 #!/bin/bash
 # clarity-assist vagueness detection hook
 # Analyzes user prompts for vagueness and suggests /clarity-assist when beneficial
 # All output MUST have [clarity-assist] prefix
 # This is a NON-BLOCKING hook - always exits 0
 PREFIX="[clarity-assist]"
 # Check if auto-suggest is enabled (default: true)
 AUTO_SUGGEST="${CLARITY_ASSIST_AUTO_SUGGEST:-true}"
 if [[ "$AUTO_SUGGEST" != "true" ]]; then
    exit 0
 fi
 # Threshold for vagueness score (default: 0.6)
 THRESHOLD="${CLARITY_ASSIST_VAGUENESS_THRESHOLD:-0.6}"
 # Read user prompt from stdin
 PROMPT=""
 if [[ -t 0 ]]; then
    # No stdin available
    exit 0
 else
    PROMPT=$(cat)
 fi
 # Skip empty prompts
 if [[ -z "$PROMPT" ]]; then
    exit 0
 fi
 # Skip if prompt is a command (starts with /)
 if [[ "$PROMPT" =~ ^[[:space:]]*/[a-zA-Z] ]]; then
    exit 0
 fi
 # Skip if prompt mentions specific files or paths
 if [[ "$PROMPT" =~ \.(py|js|ts|sh|md|json|yaml|yml|txt|css|html|go|rs|java|c|cpp|h)([[:space:]]|$|[^a-zA-Z]) ]] || \
   [[ "$PROMPT" =~ [/\\][a-zA-Z0-9_-]+[/\\] ]] || \
   [[ "$PROMPT" =~ (src|lib|test|docs|plugins|hooks|commands)/ ]]; then
    exit 0
 fi
 # Initialize vagueness score
 SCORE=0
 # Count words in the prompt
 WORD_COUNT=$(echo "$PROMPT" | wc -w | tr -d ' ')
 # ============================================================================
 # Vagueness Signal Detection
 # ============================================================================
 # Signal 1: Very short prompts (< 10 words) are often vague
 if [[ "$WORD_COUNT" -lt 10 ]]; then
    # But very short specific commands are OK
    if [[ "$WORD_COUNT" -lt 3 ]]; then
        # Extremely short - probably intentional or a command
        :
    else
        SCORE=$(echo "$SCORE + 0.3" | bc)
    fi
 fi
 # Signal 2: Vague action phrases (no specific outcome)
 VAGUE_ACTIONS=(
    "help me"
    "help with"
    "do something"
    "work on"
    "look at"
    "check this"
    "fix it"
    "fix this"
    "make it better"
    "make this better"
    "improve it"
    "improve this"
    "update this"
    "update it"
    "change it"
    "change this"
    "can you"
    "could you"
    "would you"
    "please help"
 )
 PROMPT_LOWER=$(echo "$PROMPT" | tr '[:upper:]' '[:lower:]')
 for phrase in "${VAGUE_ACTIONS[@]}"; do
    if [[ "$PROMPT_LOWER" == *"$phrase"* ]]; then
        SCORE=$(echo "$SCORE + 0.2" | bc)
        break
    fi
 done
 # Signal 3: Ambiguous scope indicators
 AMBIGUOUS_SCOPE=(
    "somehow"
    "something"
    "somewhere"
    "anything"
    "whatever"
    "stuff"
    "things"
    "etc"
    "and so on"
 )
 for word in "${AMBIGUOUS_SCOPE[@]}"; do
    if [[ "$PROMPT_LOWER" == *"$word"* ]]; then
        SCORE=$(echo "$SCORE + 0.15" | bc)
        break
    fi
 done
 # Signal 4: Missing context indicators (no reference to what/where)
 # Check if prompt lacks specificity markers
 HAS_SPECIFICS=false
 # Specific technical terms suggest clarity
 SPECIFIC_MARKERS=(
    "function"
    "class"
    "method"
    "variable"
    "error"
    "bug"
    "test"
    "api"
    "endpoint"
    "database"
    "query"
    "component"
    "module"
    "service"
    "config"
    "install"
    "deploy"
    "build"
    "run"
    "execute"
    "create"
    "delete"
    "add"
    "remove"
    "implement"
    "refactor"
    "migrate"
    "upgrade"
    "debug"
    "log"
    "exception"
    "stack"
    "memory"
    "performance"
    "security"
    "auth"
    "token"
    "session"
    "route"
    "controller"
    "model"
    "view"
    "template"
    "schema"
    "migration"
    "commit"
    "branch"
    "merge"
    "pull"
    "push"
 )
 for marker in "${SPECIFIC_MARKERS[@]}"; do
    if [[ "$PROMPT_LOWER" == *"$marker"* ]]; then
        HAS_SPECIFICS=true
        break
    fi
 done
 if [[ "$HAS_SPECIFICS" == false ]] && [[ "$WORD_COUNT" -gt 3 ]]; then
    SCORE=$(echo "$SCORE + 0.2" | bc)
 fi
 # Signal 5: Question without context
 if [[ "$PROMPT" =~ \?$ ]] && [[ "$WORD_COUNT" -lt 8 ]]; then
    # Short questions without specifics are often vague
    if [[ "$HAS_SPECIFICS" == false ]]; then
        SCORE=$(echo "$SCORE + 0.15" | bc)
    fi
 fi
 # Cap score at 1.0
 if (( $(echo "$SCORE > 1.0" | bc -l) )); then
    SCORE="1.0"
 fi
 # ============================================================================
 # Feature Request Detection (for RFC suggestion)
 # ============================================================================
 FEATURE_REQUEST=false
 # Feature request phrases
 FEATURE_PHRASES=(
    "we should"
    "it would be nice"
    "feature request"
    "idea:"
    "suggestion:"
    "what if we"
    "wouldn't it be great"
    "i think we need"
    "we need to add"
    "we could add"
    "how about adding"
    "can we add"
    "new feature"
    "enhancement"
    "proposal"
 )
 for phrase in "${FEATURE_PHRASES[@]}"; do
    if [[ "$PROMPT_LOWER" == *"$phrase"* ]]; then
        FEATURE_REQUEST=true
        break
    fi
 done
 # ============================================================================
 # Output suggestion if score exceeds threshold
 # ============================================================================
 # Compare score to threshold using bc
 if (( $(echo "$SCORE >= $THRESHOLD" | bc -l) )); then
    # Format score as percentage for display
    SCORE_PCT=$(echo "$SCORE * 100" | bc | cut -d'.' -f1)
    # Gentle, non-blocking suggestion
    echo "$PREFIX Your prompt could benefit from more clarity."
    echo "$PREFIX Consider running /clarify to refine your request."
    echo "$PREFIX (Vagueness score: ${SCORE_PCT}% - this is a suggestion, not a block)"
    # Additional RFC suggestion if feature request detected
    if [[ "$FEATURE_REQUEST" == true ]]; then
        echo "$PREFIX This looks like a feature idea. Consider /rfc-create to track it formally."
    fi
 elif [[ "$FEATURE_REQUEST" == true ]]; then
    # Feature request detected but not vague - still suggest RFC
    echo "$PREFIX This looks like a feature idea. Consider /rfc-create to track it formally."
 fi
 # Always exit 0 - this hook is non-blocking
 exit 0
--- a/plugins/clarity-assist/skills/4d-methodology.md
+++ b/plugins/clarity-assist/skills/4d-methodology.md
@@ -1,76 +0,0 @@
 # 4-D Methodology for Prompt Clarification
 The 4-D methodology transforms vague requests into actionable specifications.
 ## Phase 1: Deconstruct
 Break down the user's request into components:
 1. **Extract explicit requirements** - What was directly stated
 2. **Identify implicit assumptions** - What seems assumed but not stated
 3. **Note ambiguities** - Points that could go multiple ways
 4. **List dependencies** - External factors that might affect implementation
 ## Phase 2: Diagnose
 Analyze gaps and potential issues:
 1. **Missing information** - What do we need to know?
 2. **Conflicting requirements** - Do any stated goals contradict?
 3. **Scope boundaries** - What is in/out of scope?
 4. **Technical constraints** - Platform, language, architecture limits
 ## Phase 3: Develop
 Gather clarifications through structured questioning:
 - Present 2-4 concrete options (never open-ended alone)
 - Include "Other" for custom responses
 - Ask 1-2 questions at a time maximum
 - Provide brief context for why you are asking
 - Check for conflicts with previous answers
 **Example Format:**
 ```
 To help me understand the scope better:
 **How should errors be handled?**
 1. Silent logging (user sees nothing)
 2. Toast notifications (brief, dismissible)
 3. Modal dialogs (requires user action)
 4. Other
 [Context: This affects both UX and how much error-handling code we need]
 ```
 ## Phase 4: Deliver
 Produce the refined specification:
 ```markdown
 ## Clarified Request
 ### Summary
 [1-2 sentence description of what will be built]
 ### Scope
 **In Scope:**
 - [Item 1]
 - [Item 2]
 **Out of Scope:**
 - [Item 1]
 ### Requirements
 | # | Requirement | Priority | Notes |
 |---|-------------|----------|-------|
 | 1 | ... | Must | ... |
 | 2 | ... | Should | ... |
 ### Assumptions
 - [Assumption made based on conversation]
 ### Open Questions
 - [Any remaining ambiguities, if any]
 ```
--- a/plugins/clarity-assist/skills/clarification-techniques.md
+++ b/plugins/clarity-assist/skills/clarification-techniques.md
@@ -1,86 +0,0 @@
 # Clarification Techniques
 Structured approaches for disambiguating user requests.
 ## Anti-Patterns to Detect
 ### Vague Requests
 **Triggers:** "improve", "fix", "update", "change", "better", "faster", "cleaner"
 **Response:** Ask for specific metrics or outcomes
 ### Scope Creep Signals
 **Triggers:** "while you're at it", "also", "might as well", "and another thing"
 **Response:** Acknowledge, then isolate: "I'll note that for after the main task"
 ### Assumption Gaps
 **Triggers:** References to "the" thing (which thing?), "it" (what?), "there" (where?)
 **Response:** Echo back specific understanding
 ### Conflicting Requirements
 **Triggers:** "Simple but comprehensive", "Fast but thorough", "Minimal but complete"
 **Response:** Prioritize: "Which matters more: simplicity or completeness?"
 ## Question Templates
 ### For Unclear Purpose
 ```
 **What problem does this solve?**
 1. [Specific problem A]
 2. [Specific problem B]
 3. Combination
 4. Different problem: ____
 ```
 ### For Missing Scope
 ```
 **What should this include?**
 - [ ] Feature A
 - [ ] Feature B
 - [ ] Feature C
 - [ ] Other: ____
 ```
 ### For Ambiguous Behavior
 ```
 **When [trigger event], what should happen?**
 1. [Behavior option A]
 2. [Behavior option B]
 3. Nothing (ignore)
 4. Depends on: ____
 ```
 ### For Technical Decisions
 ```
 **Implementation approach:**
 1. [Approach A] - pros: X, cons: Y
 2. [Approach B] - pros: X, cons: Y
 3. Let me decide based on codebase
 4. Need more info about: ____
 ```
 ## Echo Understanding Technique
 Before diving into questions, restate understanding:
 ```
 "I understand you want [X] that does [Y]."
 ```
 This validates comprehension and gives user a chance to correct early.
 ## Micro-Summary Technique
 For quick confirmations before proceeding:
 ```
 "Quick summary before I start:
 - [Key point 1]
 - [Key point 2]
 - [Assumption made]
 Proceed? (Or clarify anything)"
 ```
--- a/plugins/clarity-assist/skills/escalation-patterns.md
+++ b/plugins/clarity-assist/skills/escalation-patterns.md
@@ -1,57 +0,0 @@
 # Escalation Patterns
 Guidelines for when to escalate between clarification modes.
 ## Quick-Clarify to Full Clarify
 Escalate when quick-clarify reveals unexpected complexity:
 ```
 "This is more involved than it first appeared - there are
 several decisions to make. Want me to switch to a more
 thorough clarification process? (Just say 'yes' or 'clarify')"
 ```
 ### Triggers for Escalation
 - Multiple ambiguities discovered during quick pass
 - User's answer reveals hidden dependencies
 - Scope expands beyond original understanding
 - Technical constraints emerge that need discussion
 - Conflicting requirements surface
 ## Full Clarify to Incremental
 When user is overwhelmed by full 4-D process:
 ```
 "This touches a lot of areas. Rather than tackle everything at once,
 let's start with [most critical piece]. Once that's clear, we can
 add the other parts. Sound good?"
 ```
 ### Signs of Overwhelm
 - Long pauses or hesitation
 - "I don't know" responses
 - Requesting breaks
 - Contradicting earlier answers
 - Expressing frustration
 ## Choosing Initial Mode
 ### Use /quick-clarify When
 - Request is fairly clear, just one or two ambiguities
 - User is in a hurry
 - Follow-up to an already-clarified request
 - Simple feature additions or bug fixes
 - Confidence is high (>90%)
 ### Use /clarify When
 - Complex multi-step requests
 - Requirements with multiple possible interpretations
 - Tasks requiring significant context gathering
 - User seems uncertain about what they want
 - First time working on this feature/area
--- a/plugins/clarity-assist/skills/nd-accommodations.md
+++ b/plugins/clarity-assist/skills/nd-accommodations.md
@@ -1,74 +0,0 @@
 # Neurodivergent-Friendly Accommodations
 Guidelines for making clarification interactions accessible and comfortable for neurodivergent users.
 ## Core Principles
 ### Reduce Cognitive Load
 - Maximum 4 options per question
 - Always include "Other" escape hatch
 - Provide examples, not just descriptions
 - Use numbered lists for easy reference
 ### Support Working Memory
 - Summarize frequently
 - Reference earlier decisions explicitly
 - Do not assume user remembers context from many turns ago
 - Echo back understanding before proceeding
 ### Allow Processing Time
 - Do not rapid-fire questions
 - Validate answers before moving on
 - Offer to revisit or change earlier answers
 - One question block at a time
 ### Manage Overwhelm
 - Offer to break into smaller sessions
 - Prioritize must-haves vs nice-to-haves
 - Provide "good enough for now" options
 - Acknowledge complexity openly
 ## Question Formatting Rules
 **Always do:**
 ```
 **How should errors be handled?**
 1. Silent logging (user sees nothing)
 2. Toast notifications (brief, dismissible)
 3. Modal dialogs (requires user action)
 4. Other
 [Context: This affects both UX and error-handling complexity]
 ```
 **Never do:**
 ```
 How do you want to handle errors? There are many approaches...
 ```
 ## Conflict Acknowledgment
 Before asking about something that might conflict with a previous answer:
 ```
 [Internal check]
 Previous: User said "keep it simple"
 Current question about: Adding configuration options
 Potential conflict: More options = more complexity
 ```
 Then acknowledge: "Earlier you mentioned keeping it simple. With that in mind..."
 ## Escalation for Overwhelm
 If the request is particularly complex or user seems overwhelmed:
 1. Acknowledge the complexity openly
 2. Offer to start with just ONE aspect
 3. Build incrementally
 ```
 "This touches a lot of areas. Rather than tackle everything at once,
 let's start with [most critical piece]. Once that's clear, we can
 add the other parts. Sound good?"
 ```
--- a/plugins/claude-config-maintainer/README.md
+++ b/plugins/claude-config-maintainer/README.md
@@ -0,0 +1,99 @@
 # Claude Config Maintainer
 A Claude Code plugin for creating and maintaining optimized CLAUDE.md configuration files.
 ## Overview
 CLAUDE.md files provide instructions to Claude Code when working with a project. This plugin helps you:
 - **Analyze** existing CLAUDE.md files for improvement opportunities
 - **Optimize** structure, clarity, and conciseness
 - **Initialize** new CLAUDE.md files with project-specific content
 ## Installation
 This plugin is part of the Leo Claude Marketplace. Install the marketplace and the plugin will be available.
 ## Commands
 ### `/config-analyze`
 Analyze your CLAUDE.md and get a detailed report with scores and recommendations.
 ```
 /config-analyze
 ```
 ### `/config-optimize`
 Automatically optimize your CLAUDE.md based on best practices.
 ```
 /config-optimize
 ```
 ### `/config-init`
 Create a new CLAUDE.md tailored to your project.
 ```
 /config-init
 ```
 ## Best Practices
 A good CLAUDE.md should be:
 - **Clear** - Easy to understand at a glance
 - **Concise** - No unnecessary content
 - **Complete** - All essential information included
 - **Current** - Up to date with the project
 ### Recommended Structure
 ```markdown
 # CLAUDE.md
 ## Project Overview
 What does this project do?
 ## Quick Start
 Essential build/test/run commands.
 ## Critical Rules
 What must Claude NEVER do?
 ## Architecture (optional)
 Key technical decisions.
 ## Common Operations (optional)
 Frequent tasks and workflows.
 ```
 ### Length Guidelines
 | Project Size | Recommended Lines |
 |-------------|------------------|
 | Small | 50-100 |
 | Medium | 100-200 |
 | Large | 200-400 |
 ## Scoring System
 The analyzer scores CLAUDE.md files on:
 - **Structure** (25 pts) - Organization and navigation
 - **Clarity** (25 pts) - Clear, unambiguous instructions
 - **Completeness** (25 pts) - Essential sections present
 - **Conciseness** (25 pts) - Efficient information density
 Target score: **70+** for effective Claude Code usage.
 ## Tips
 1. Run `/config-analyze` periodically to maintain quality
 2. Update CLAUDE.md when adding major features
 3. Keep critical rules prominent and clear
 4. Include examples where they add clarity
 5. Remove generic advice that applies to all projects
 ## Contributing
 This plugin is part of the personal-projects/leo-claude-mktplace repository.
--- a/plugins/claude-config-maintainer/agents/maintainer.md
+++ b/plugins/claude-config-maintainer/agents/maintainer.md
@@ -7,16 +7,6 @@ description: CLAUDE.md optimization and maintenance agent
 You are the **Maintainer Agent** - a specialist in creating and optimizing CLAUDE.md configuration files for Claude Code projects. Your role is to ensure CLAUDE.md files are clear, concise, well-structured, and follow best practices.
 ## Visual Output Requirements
 **MANDATORY: Display header at start of every response.**
 ```
 ┌──────────────────────────────────────────────────────────────────┐
 │  ⚙️ CONFIG-MAINTAINER · CLAUDE.md Optimization                   │
 └──────────────────────────────────────────────────────────────────┘
 ```
 ## Your Personality
 **Optimization-Focused:**
@@ -277,39 +267,6 @@ Every CLAUDE.md should have:
 1. **Project Overview** - What is this?
 2. **Quick Start** - How do I build/test/run?
 3. **Important Rules** - What must I NOT do?
 4. **Pre-Change Protocol** - Mandatory dependency check before code changes
 ### Pre-Change Protocol Section (MANDATORY)
 **This section is REQUIRED in every CLAUDE.md.** It ensures Claude performs comprehensive dependency analysis before making any code changes.
 ```markdown
 ## ⛔ MANDATORY: Before Any Code Change
 **Claude MUST show this checklist BEFORE editing any file:**
 ### 1. Impact Search Results
 Run and show output of:
 ```bash
 grep -rn "PATTERN" --include="*.sh" --include="*.md" --include="*.json" --include="*.py" | grep -v ".git"
 ```
 ### 2. Files That Will Be Affected
 Numbered list of every file to be modified, with the specific change for each.
 ### 3. Files Searched But Not Changed (and why)
 Proof that related files were checked and determined unchanged.
 ### 4. Documentation That References This
 List of docs that mention this feature/script/function.
 **User verifies this list before Claude proceeds. If Claude skips this, stop immediately.**
 ### After Changes
 Run the same grep and show results proving no references remain unaddressed.
 ```
 **When analyzing a CLAUDE.md, flag as HIGH priority issue if this section is missing.**
 ### Optional Sections (as needed)
--- a/plugins/claude-config-maintainer/commands/analyze.md
+++ b/plugins/claude-config-maintainer/commands/analyze.md
@@ -4,18 +4,17 @@ description: Analyze CLAUDE.md for optimization opportunities and plugin integra
 # Analyze CLAUDE.md
-Analyze your CLAUDE.md and provide a scored report with recommendations.
+This command analyzes your project's CLAUDE.md file and provides a detailed report on optimization opportunities and plugin integration status.
-## Skills to Load
+## What This Command Does
- skills/visual-header.md
+1. **Read CLAUDE.md** - Locates and reads the project's CLAUDE.md file
- skills/analysis-workflow.md
+2. **Analyze Structure** - Evaluates organization, headers, and flow
- skills/optimization-patterns.md
+3. **Check Content** - Reviews clarity, completeness, and conciseness
- skills/pre-change-protocol.md
+4. **Identify Issues** - Finds redundancy, verbosity, and missing sections
-
+5. **Detect Active Plugins** - Identifies marketplace plugins enabled in the project
-## Visual Output
+6. **Check Plugin Integration** - Verifies CLAUDE.md references active plugins
-
+7. **Generate Report** - Provides scored assessment with recommendations
 Display: `CONFIG-MAINTAINER - CLAUDE.md Analysis`
 ## Usage
@@ -23,27 +22,165 @@ Display: `CONFIG-MAINTAINER - CLAUDE.md Analysis`
 /config-analyze
 ```
-## Workflow
+Or invoke the maintainer agent directly:
-1. Locate and parse CLAUDE.md
+```
-2. Evaluate structure, clarity, completeness, conciseness
+Analyze the CLAUDE.md file in this project
-3. Find redundancy, verbosity, missing sections
+```
 4. Detect active marketplace plugins
 5. Verify plugin integration in CLAUDE.md
 6. Generate scored report with recommendations
-## Scoring (100 points)
+## Analysis Criteria
-| Category | Points |
+### Structure (25 points)
-|----------|--------|
+- Logical section ordering
-| Structure | 25 |
+- Clear header hierarchy
-| Clarity | 25 |
+- Easy navigation
-| Completeness | 25 |
+- Appropriate grouping
-| Conciseness | 25 |
+
 ### Clarity (25 points)
 - Clear instructions
 - Good examples
 - Unambiguous language
 - Appropriate detail level
 ### Completeness (25 points)
 - Project overview present
 - Quick start commands documented
 - Critical rules highlighted
 - Key workflows covered
 ### Conciseness (25 points)
 - No unnecessary repetition
 - Efficient information density
 - Appropriate length for project size
 - No generic filler content
 ## Plugin Integration Analysis
 After the content analysis, the command detects and analyzes marketplace plugin integration:
 ### Detection Method
 1. **Read `.claude/settings.local.json`** - Check for enabled MCP servers
 2. **Map MCP servers to plugins** - Use marketplace registry to identify active plugins:
   - `gitea` → projman
   - `netbox` → cmdb-assistant
 3. **Check for hooks** - Identify hook-based plugins (project-hygiene)
 4. **Scan CLAUDE.md** - Look for plugin integration content
 ### Plugin Coverage Scoring
 For each detected plugin, verify CLAUDE.md contains:
 - Plugin section header or mention
 - Available commands documentation
 - MCP tools reference (if applicable)
 - Usage guidelines
 Coverage is reported as percentage: `(plugins referenced / plugins detected) * 100`
 ## Expected Output
 ```
 CLAUDE.md Analysis Report
 =========================
 File: /path/to/project/CLAUDE.md
 Lines: 245
 Last Modified: 2025-01-18
 Overall Score: 72/100
 Category Scores:
 - Structure:    20/25 (Good)
 - Clarity:      18/25 (Good)
 - Completeness: 22/25 (Excellent)
 - Conciseness:  12/25 (Needs Work)
 Strengths:
 + Clear project overview with good context
 + Critical rules prominently displayed
 + Comprehensive coverage of workflows
 Issues Found:
 1. [HIGH] Verbose explanations (lines 45-78)
   Section "Running Tests" has 34 lines that could be 8 lines.
   Impact: Harder to scan, important info buried
 2. [MEDIUM] Duplicate content (lines 102-115, 189-200)
   Same git workflow documented twice.
   Impact: Maintenance burden, inconsistency risk
 3. [MEDIUM] Missing Quick Start section
   No clear "how to get started" instructions.
   Impact: Slower onboarding for Claude
 4. [LOW] Inconsistent header formatting
   Mix of "## Title" and "## Title:" styles.
   Impact: Minor readability issue
 Recommendations:
 1. Add Quick Start section at top (priority: high)
 2. Condense Testing section to essentials (priority: high)
 3. Remove duplicate git workflow (priority: medium)
 4. Standardize header formatting (priority: low)
 Estimated improvement: 15-20 points after changes
 ---
 Plugin Integration Analysis
 ===========================
 Detected Active Plugins:
  ✓ projman (via gitea MCP server)
  ✓ cmdb-assistant (via netbox MCP server)
  ✓ project-hygiene (via PostToolUse hook)
 Plugin Coverage: 33% (1/3 plugins referenced)
  ✓ projman - Referenced in CLAUDE.md
  ✗ cmdb-assistant - NOT referenced
  ✗ project-hygiene - NOT referenced
 Missing Integration Content:
 1. cmdb-assistant
   Add infrastructure management commands and NetBox MCP tools reference.
 2. project-hygiene
   Add cleanup hook documentation and configuration options.
 ---
 Would you like me to:
 [1] Implement all content recommendations
 [2] Add missing plugin integrations to CLAUDE.md
 [3] Do both (recommended)
 [4] Show preview of changes first
 ```
 ## When to Use
 Run `/config-analyze` when:
 - Setting up a new project with existing CLAUDE.md
 - CLAUDE.md feels too long or hard to use
 - Claude seems to miss instructions
 - Before major project changes
 - Periodic maintenance (quarterly)
 - After installing new marketplace plugins
 - When Claude doesn't seem to use available plugin tools
 ## Follow-Up Actions
-1. Implement content recommendations
+After analysis, you can:
-2. Add missing plugin integrations
+- Run `/config-optimize` to automatically improve the file
-3. Do both (recommended)
+- Manually address specific issues
-4. Show preview first
+- Request detailed recommendations for any section
 - Compare with best practice templates
 ## Tips
 - Run analysis after significant project changes
 - Address HIGH priority issues first
 - Keep scores above 70/100 for best results
 - Re-analyze after making changes to verify improvement
--- a/plugins/claude-config-maintainer/commands/config-diff.md
+++ b/plugins/claude-config-maintainer/commands/config-diff.md
@@ -1,48 +0,0 @@
 ---
 description: Show diff between current CLAUDE.md and last commit
 ---
 # Compare CLAUDE.md Changes
 Show differences between CLAUDE.md versions to track configuration drift.
 ## Skills to Load
 - skills/visual-header.md
 - skills/diff-analysis.md
 ## Visual Output
 Display: `CONFIG-MAINTAINER - CLAUDE.md Diff`
 ## Usage
 ```
 /config-diff                           # Working vs last commit
 /config-diff --commit=abc1234          # Working vs specific commit
 /config-diff --from=v1.0 --to=v2.0     # Compare two commits
 /config-diff --section="Critical Rules"  # Specific section only
 ```
 ## Workflow
 1. Find project's CLAUDE.md file
 2. Show diff against target revision
 3. Group changes by affected sections
 4. Explain behavioral implications
 ## Options
 | Option | Description |
 |--------|-------------|
 | `--commit=REF` | Compare against specific commit |
 | `--from=REF` | Starting point |
 | `--to=REF` | Ending point (default: HEAD) |
 | `--section=NAME` | Show only specific section |
 | `--stat` | Statistics only |
 ## When to Use
 - Before committing CLAUDE.md changes
 - Reviewing changes after pull
 - Debugging unexpected behavior
--- a/plugins/claude-config-maintainer/commands/config-lint.md
+++ b/plugins/claude-config-maintainer/commands/config-lint.md
@@ -1,48 +0,0 @@
 ---
 description: Lint CLAUDE.md for common anti-patterns and best practices
 ---
 # Lint CLAUDE.md
 Check CLAUDE.md against best practices and detect common anti-patterns.
 ## Skills to Load
 - skills/visual-header.md
 - skills/lint-rules.md
 ## Visual Output
 Display: `CONFIG-MAINTAINER - CLAUDE.md Lint`
 ## Usage
 ```
 /config-lint                         # Full lint
 /config-lint --fix                   # Auto-fix issues
 /config-lint --rules=security        # Check specific category
 ```
 ## Workflow
 1. Parse markdown structure and hierarchy
 2. Check for hardcoded paths, secrets, sensitive data
 3. Identify content anti-patterns
 4. Verify consistent formatting
 5. Generate report with fix suggestions
 ## Options
 | Option | Description |
 |--------|-------------|
 | `--fix` | Auto-fix issues |
 | `--rules=LIST` | Check specific categories |
 | `--ignore=LIST` | Skip specified rules |
 | `--severity=LEVEL` | Filter by severity |
 | `--strict` | Treat warnings as errors |
 ## When to Use
 - Before committing CLAUDE.md changes
 - During code review
 - Periodically as maintenance
--- a/plugins/claude-config-maintainer/commands/init.md
+++ b/plugins/claude-config-maintainer/commands/init.md
@@ -4,46 +4,208 @@ description: Initialize a new CLAUDE.md file for a project
 # Initialize CLAUDE.md
-Create a new CLAUDE.md file tailored to your project.
+This command creates a new CLAUDE.md file tailored to your project, gathering context and generating appropriate content.
-## Skills to Load
+## What This Command Does
- skills/visual-header.md
+1. **Gather Context** - Analyzes project structure and asks clarifying questions
- skills/claude-md-structure.md
+2. **Detect Stack** - Identifies technologies, frameworks, and tools
- skills/pre-change-protocol.md
+3. **Generate Content** - Creates tailored CLAUDE.md sections
-
+4. **Review & Refine** - Allows customization before saving
-## Visual Output
+5. **Save File** - Creates the CLAUDE.md in project root
 Display: `CONFIG-MAINTAINER - CLAUDE.md Initialization`
 ## Usage
 ```
-/config-init                    # Interactive
+/config-init
 /config-init --minimal          # Minimal version
 /config-init --comprehensive    # Detailed version
 ```
-## Workflow
+Or with options:
-1. Analyze project structure, ask clarifying questions
+```
-2. Detect technologies, frameworks, tools
+/config-init --template=api        # Use API project template
-3. Generate tailored CLAUDE.md sections
+/config-init --minimal             # Create minimal version
-4. Allow review and customization
+/config-init --comprehensive       # Create detailed version
-5. Save file in project root
+```
 ## Initialization Workflow
 ```
 CLAUDE.md Initialization
 ========================
 Step 1: Project Analysis
 ------------------------
 Scanning project structure...
 Detected:
 - Language: Python 3.11
 - Framework: FastAPI
 - Package Manager: pip (requirements.txt found)
 - Testing: pytest
 - Docker: Yes (Dockerfile found)
 - Git: Yes (.git directory)
 Step 2: Clarifying Questions
 ----------------------------
 1. Project Description:
   What does this project do? (1-2 sentences)
   > [User provides description]
 2. Build/Run Commands:
   Detected commands - are these correct?
   - Install: pip install -r requirements.txt
   - Test: pytest
   - Run: uvicorn main:app --reload
   [Y/n/edit]
 3. Critical Rules:
   Any rules Claude MUST follow?
   Examples: "Never modify migrations", "Always use type hints"
   > [User provides rules]
 4. Sensitive Areas:
   Any files/directories Claude should be careful with?
   > [User provides or skips]
 Step 3: Generate CLAUDE.md
 --------------------------
 Generating content based on:
 - Project type: FastAPI web API
 - Detected technologies
 - Your provided context
 Preview:
 ---
 # CLAUDE.md
 ## Project Overview
 [Generated description]
 ## Quick Start
 ```bash
 pip install -r requirements.txt  # Install dependencies
 pytest                           # Run tests
 uvicorn main:app --reload        # Start dev server
 ```
 ## Architecture
 [Generated based on structure]
 ## Critical Rules
 [Your provided rules]
 ## File Structure
 [Generated from analysis]
 ---
 Save this CLAUDE.md? [Y/n/edit]
 Step 4: Complete
 ----------------
 CLAUDE.md created successfully!
 Location: /path/to/project/CLAUDE.md
 Lines: 87
 Score: 85/100 (following best practices)
 Recommendations:
 - Run /config-analyze periodically to maintain quality
 - Update when adding major features
 - Add troubleshooting section as issues are discovered
 ```
 ## Templates
-| Template | Sections |
+### Minimal Template
-|----------|----------|
+For small projects or when starting fresh:
-| Minimal | Overview, Quick Start, Critical Rules, Pre-Change Protocol |
+- Project Overview (required)
-| Standard | + Architecture, Common Operations, File Structure |
+- Quick Start (required)
-| Comprehensive | + Troubleshooting, Integration Points, Workflow |
+- Critical Rules (required)
-**Note:** Pre-Change Protocol is MANDATORY in all templates.
+### Standard Template (default)
 For typical projects:
 - Project Overview
 - Quick Start
 - Architecture
 - Critical Rules
 - Common Operations
 - File Structure
 ### Comprehensive Template
 For large or complex projects:
 - All standard sections plus:
 - Detailed Architecture
 - Troubleshooting
 - Integration Points
 - Development Workflow
 - Deployment Notes
 ## Auto-Detection
 The command automatically detects:
 | What | How |
 |------|-----|
 | Language | File extensions, config files |
 | Framework | package.json, requirements.txt, etc. |
 | Build system | Makefile, package.json scripts, etc. |
 | Testing | pytest.ini, jest.config, etc. |
 | Docker | Dockerfile, docker-compose.yml |
 | Database | Connection strings, ORM configs |
 ## Customization
 After generation, you can:
 - Edit any section before saving
 - Add additional sections
 - Remove unnecessary sections
 - Adjust detail level
 - Add project-specific content
 ## When to Use
 Run `/config-init` when:
 - Starting a new project
 - Project lacks CLAUDE.md
- Taking over unfamiliar project
+- Existing CLAUDE.md is outdated/poor quality
 - Taking over an unfamiliar project
 ## Tips
 1. **Provide accurate description** - This shapes the whole file
 2. **Include critical rules** - What must Claude never do?
 3. **Review generated content** - Auto-detection isn't perfect
 4. **Start minimal, grow as needed** - Add sections when required
 5. **Keep it current** - Update when project changes significantly
 ## Examples
 ### For a CLI Tool
 ```
 /config-init
 > Description: CLI tool for managing cloud infrastructure
 > Critical rules: Never delete resources without confirmation, always show dry-run first
 ```
 ### For a Web App
 ```
 /config-init
 > Description: E-commerce platform with React frontend and Node.js backend
 > Critical rules: Never expose API keys, always validate user input, follow the existing component patterns
 ```
 ### For a Library
 ```
 /config-init --template=minimal
 > Description: Python library for parsing log files
 > Critical rules: Maintain backward compatibility, all public functions need docstrings
 ```
--- a/plugins/claude-config-maintainer/commands/optimize.md
+++ b/plugins/claude-config-maintainer/commands/optimize.md
@@ -4,47 +4,175 @@ description: Optimize CLAUDE.md structure and content
 # Optimize CLAUDE.md
-Automatically optimize CLAUDE.md based on best practices.
+This command automatically optimizes your project's CLAUDE.md file based on best practices and identified issues.
-## Skills to Load
+## What This Command Does
- skills/visual-header.md
+1. **Analyze Current File** - Identifies all optimization opportunities
- skills/optimization-patterns.md
+2. **Plan Changes** - Determines what to restructure, condense, or add
- skills/pre-change-protocol.md
+3. **Show Preview** - Displays before/after comparison
- skills/claude-md-structure.md
+4. **Apply Changes** - Updates the file with your approval
-
+5. **Verify Results** - Confirms improvements achieved
 ## Visual Output
 Display: `CONFIG-MAINTAINER - CLAUDE.md Optimization`
 ## Usage
 ```
-/config-optimize                # Full optimization
+/config-optimize
 /config-optimize --condense     # Reduce verbosity
 /config-optimize --dry-run      # Preview only
 ```
-## Workflow
+Or specify specific optimizations:
-1. Identify optimization opportunities
+```
-2. Plan restructure, condense, or add actions
+/config-optimize --condense        # Focus on reducing verbosity
-3. Show before/after preview
+/config-optimize --restructure     # Focus on reorganization
-4. Apply changes with approval
+/config-optimize --add-missing     # Focus on adding missing sections
-5. Verify improvements
+```
 ## Optimization Actions
 ### Restructure
 - Reorder sections by importance
 - Group related content together
 - Improve header hierarchy
 - Add navigation aids
 ### Condense
 - Remove redundant explanations
 - Convert verbose text to bullet points
 - Eliminate duplicate content
 - Shorten overly detailed sections
 ### Enhance
 - Add missing essential sections
 - Improve unclear instructions
 - Add helpful examples
 - Highlight critical rules
 ### Format
 - Standardize header styles
 - Fix code block formatting
 - Align list formatting
 - Improve table layouts
 ## Expected Output
 ```
 CLAUDE.md Optimization
 ======================
 Current Analysis:
 - Score: 72/100
 - Lines: 245
 - Issues: 4
 Planned Optimizations:
 1. ADD: Quick Start section (new, ~15 lines)
   + Build command
   + Test command
   + Run command
 2. CONDENSE: Testing section (34 → 8 lines)
   Before: Verbose explanation with redundant setup info
   After: Concise command reference with comments
 3. REMOVE: Duplicate git workflow (lines 189-200)
   Keeping: Original at lines 102-115
 4. FORMAT: Standardize headers
   Changing 12 headers from "## Title:" to "## Title"
 Preview Changes? [Y/n] y
 --- CLAUDE.md (before)
 +++ CLAUDE.md (after)
@@ -1,5 +1,20 @@
 # CLAUDE.md
 +## Quick Start
 +
 +```bash
 +# Install dependencies
 +pip install -r requirements.txt
 +
 +# Run tests
 +pytest
 +
 +# Start development server
 +python manage.py runserver
 +```
 +
 ## Project Overview
 ...
 [Full diff shown]
 Apply these changes? [Y/n] y
 Optimization Complete!
 - Previous score: 72/100
 - New score: 89/100
 - Lines reduced: 245 → 198 (-19%)
 - Issues resolved: 4/4
 Backup saved to: .claude/backups/CLAUDE.md.2025-01-18
 ```
 ## Safety Features
 ### Backup Creation
 - Automatic backup before changes
 - Stored in `.claude/backups/`
 - Easy restoration if needed
 ### Preview Mode
 - All changes shown before applying
 - Diff format for easy review
 - Option to approve/reject
 ### Selective Application
 - Can apply individual changes
 - Skip specific optimizations
 - Iterative refinement
 ## Options
 | Option | Description |
 |--------|-------------|
-| `--dry-run` | Preview without applying |
+| `--dry-run` | Show changes without applying |
-| `--no-backup` | Skip backup |
+| `--no-backup` | Skip backup creation |
 | `--aggressive` | Maximum condensation |
-| `--section=NAME` | Optimize specific section |
+| `--preserve-comments` | Keep all existing comments |
 | `--section=NAME` | Optimize specific section only |
-**Priority:** Add Pre-Change Protocol if missing.
+## When to Use
-## Safety
+Run `/config-optimize` when:
 - Analysis shows score below 70
 - File has grown too long
 - Structure needs reorganization
 - Missing critical sections
 - After major refactoring
- Auto backup to `.claude/backups/`
+## Best Practices
- Preview before applying
+
 1. **Run analysis first** - Understand current state
 2. **Review preview carefully** - Ensure nothing important lost
 3. **Test after changes** - Verify Claude follows instructions
 4. **Keep backups** - Restore if issues arise
 5. **Iterate** - Multiple small optimizations beat one large one
 ## Rollback
 If optimization causes issues:
 ```bash
 # Restore from backup
 cp .claude/backups/CLAUDE.md.TIMESTAMP ./CLAUDE.md
 ```
 Or ask:
 ```
 Restore CLAUDE.md from the most recent backup
 ```
--- a/plugins/claude-config-maintainer/hooks/hooks.json
+++ b/plugins/claude-config-maintainer/hooks/hooks.json
@@ -2,13 +2,8 @@
  "hooks": {
    "SessionStart": [
      {
-        "matcher": "",
+        "type": "command",
-        "hooks": [
+        "command": "${CLAUDE_PLUGIN_ROOT}/hooks/enforce-rules.sh"
          {
            "type": "command",
            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/enforce-rules.sh"
          }
        ]
      }
    ]
  }
--- a/plugins/claude-config-maintainer/skills/analysis-workflow.md
+++ b/plugins/claude-config-maintainer/skills/analysis-workflow.md
@@ -1,112 +0,0 @@
 # CLAUDE.md Analysis Workflow
 This skill defines the workflow for analyzing CLAUDE.md files.
 ## Analysis Steps
 1. **Locate File** - Find CLAUDE.md in project root
 2. **Parse Structure** - Extract headers and sections
 3. **Evaluate Content** - Score against criteria
 4. **Detect Plugins** - Identify active marketplace plugins
 5. **Check Integration** - Verify plugin references
 6. **Generate Report** - Provide scored assessment
 ## Content Analysis
 ### What to Check
 | Area | Check For |
 |------|-----------|
 | Structure | Header hierarchy, section ordering, grouping |
 | Clarity | Clear instructions, examples, unambiguous language |
 | Completeness | Required sections present, workflows documented |
 | Conciseness | No redundancy, efficient density, appropriate length |
 ### Required Sections Check
 1. Project Overview - present?
 2. Quick Start - present with commands?
 3. Critical Rules - present?
 4. **Pre-Change Protocol** - present? (HIGH PRIORITY if missing)
 ## Plugin Integration Analysis
 ### Detection Method
 1. Read `.claude/settings.local.json` for enabled MCP servers
 2. Map MCP servers to plugins:
   - `gitea` -> projman
   - `netbox` -> cmdb-assistant
 3. Check for hook-based plugins (project-hygiene)
 4. Scan CLAUDE.md for plugin references
 ### Coverage Scoring
 For each detected plugin, verify CLAUDE.md contains:
 - Plugin section header or mention
 - Available commands documentation
 - MCP tools reference (if applicable)
 - Usage guidelines
 Coverage = (plugins referenced / plugins detected) * 100%
 ## Report Format
 ```
 CLAUDE.md Analysis Report
 =========================
 File: /path/to/project/CLAUDE.md
 Lines: N
 Last Modified: YYYY-MM-DD
 Overall Score: NN/100
 Category Scores:
 - Structure:    NN/25 (Rating)
 - Clarity:      NN/25 (Rating)
 - Completeness: NN/25 (Rating)
 - Conciseness:  NN/25 (Rating)
 Strengths:
 + [Positive finding]
 Issues Found:
 N. [SEVERITY] Issue description (location)
   Context explaining the problem.
   Impact: What happens if not fixed.
 Recommendations:
 N. Action to take (priority: high/medium/low)
 ---
 Plugin Integration Analysis
 ===========================
 Detected Active Plugins:
  [check] plugin-name (via detection method)
 Plugin Coverage: NN% (N/N plugins referenced)
 Missing Integration Content:
 N. plugin-name
   What to add.
 ```
 ## Issue Severity
 | Level | When to Use |
 |-------|-------------|
 | HIGH | Missing mandatory sections, security issues |
 | MEDIUM | Missing recommended content, duplicate content |
 | LOW | Formatting issues, minor improvements |
 ## Follow-Up Actions
 After analysis, offer:
 1. Implement all content recommendations
 2. Add missing plugin integrations
 3. Do both (recommended)
 4. Show preview of changes first
--- a/plugins/claude-config-maintainer/skills/claude-md-structure.md
+++ b/plugins/claude-config-maintainer/skills/claude-md-structure.md
@@ -1,113 +0,0 @@
 # CLAUDE.md Structure Reference
 This skill defines the standard structure, required sections, and templates for CLAUDE.md files.
 ## Required Sections
 Every CLAUDE.md MUST have these sections:
 | Section | Purpose | Priority |
 |---------|---------|----------|
 | Project Overview | What the project does | Required |
 | Quick Start | Build/test/run commands | Required |
 | Critical Rules | Must-follow constraints | Required |
 | Pre-Change Protocol | Dependency check before edits | **MANDATORY** |
 ## Recommended Sections
 | Section | When to Include |
 |---------|-----------------|
 | Architecture | Complex projects with multiple components |
 | Common Operations | Projects with repetitive tasks |
 | File Structure | Large codebases |
 | Troubleshooting | Projects with known gotchas |
 | Integration Points | Projects with external dependencies |
 ## Header Hierarchy
 ```
 # CLAUDE.md (H1 - only one)
 ## Section (H2 - main sections)
 ### Subsection (H3 - within sections)
 #### Detail (H4 - rarely needed)
 ```
 **Rules:**
 - Never skip levels (no H3 before H2)
 - Maximum depth: 4 levels
 - No orphaned content before first header
 ## Templates
 ### Minimal Template
 For small projects:
 ```markdown
 # CLAUDE.md
 ## Project Overview
 [Description]
 ## Quick Start
 [Commands]
 ## Critical Rules
 [Constraints]
 ## Pre-Change Protocol
 [Mandatory section - see pre-change-protocol.md]
 ```
 ### Standard Template (Default)
 ```markdown
 # CLAUDE.md
 ## Project Overview
 ## Quick Start
 ## Architecture
 ## Critical Rules
 ## Pre-Change Protocol
 ## Common Operations
 ## File Structure
 ```
 ### Comprehensive Template
 For large projects - adds:
 - Detailed Architecture
 - Troubleshooting
 - Integration Points
 - Development Workflow
 - Deployment Notes
 ## Auto-Detection Signals
 | Technology | Detection Method |
 |------------|------------------|
 | Language | File extensions, config files |
 | Framework | package.json, requirements.txt, Cargo.toml |
 | Build system | Makefile, scripts in package.json |
 | Testing | pytest.ini, jest.config.js, go.mod |
 | Docker | Dockerfile, docker-compose.yml |
 | Database | ORM configs, connection strings |
 ## Section Content Guidelines
 ### Project Overview
 - 1-3 sentences describing purpose
 - Target audience if relevant
 - Key technologies used
 ### Quick Start
 - Install command
 - Test command
 - Run command
 - Each with brief inline comment
 ### Critical Rules
 - Numbered or bulleted list
 - Specific, actionable constraints
 - Include rationale for non-obvious rules
 ### Architecture
 - High-level component diagram (ASCII or description)
 - Data flow explanation
 - Key file/directory purposes
--- a/plugins/claude-config-maintainer/skills/diff-analysis.md
+++ b/plugins/claude-config-maintainer/skills/diff-analysis.md
@@ -1,97 +0,0 @@
 # CLAUDE.md Diff Analysis
 This skill defines how to analyze and present CLAUDE.md differences.
 ## Comparison Modes
 | Mode | Command | Description |
 |------|---------|-------------|
 | Working vs HEAD | `/config-diff` | Uncommitted changes |
 | Working vs Commit | `--commit=REF` | Changes since specific point |
 | Commit to Commit | `--from=X --to=Y` | Historical comparison |
 | Branch Comparison | `--branch=NAME` | Cross-branch differences |
 ## Change Indicators
 | Symbol | Meaning |
 |--------|---------|
 | `+` | Line added |
 | `-` | Line removed |
 | `@@` | Location marker (line numbers) |
 | `[MODIFIED]` | Section has changes |
 | `[ADDED]` | New section created |
 | `[REMOVED]` | Section deleted |
 | `[UNCHANGED]` | No changes to section |
 ## Impact Categories
 | Category | Meaning |
 |----------|---------|
 | NEW REQUIREMENT | Claude will need to do something new |
 | REMOVED REQUIREMENT | Claude no longer needs to do something |
 | MODIFIED | Existing behavior changed |
 | NEW RULE | New constraint added |
 | RELAXED RULE | Constraint removed or softened |
 ## Report Format
 ```
 CLAUDE.md Diff Report
 =====================
 File: /path/to/project/CLAUDE.md
 Comparing: [mode description]
 Commit: [ref] "[message]" (time ago)
 Summary:
 - Lines added: N
 - Lines removed: N
 - Net change: +/-N lines
 - Sections affected: N
 Section Changes:
 ----------------
 ## Section Name [STATUS]
  +/- Change description
 Detailed Diff:
 --------------
 --- CLAUDE.md (before)
 +++ CLAUDE.md (after)
@@ -N,M +N,M @@
 context
 -removed
 +added
 context
 Behavioral Impact:
 ------------------
 These changes will affect Claude's behavior:
 N. [CATEGORY] Description of impact
 ```
 ## Section-Focused View
 When using `--section=NAME`:
 - Filter diff to only that section
 - Show section-specific statistics
 - Highlight behavioral impact for that area
 ## Troubleshooting
 ### No changes detected
 - File matches comparison target
 - Verify comparing correct commits
 ### File not found in commit
 - CLAUDE.md didn't exist at that point
 - Use `git log -- CLAUDE.md` to find creation
 ### Not a git repository
 - Command requires git history
 - Initialize git or use file backup comparison
--- a/plugins/claude-config-maintainer/skills/lint-rules.md
+++ b/plugins/claude-config-maintainer/skills/lint-rules.md
@@ -1,136 +0,0 @@
 # CLAUDE.md Lint Rules
 This skill defines all linting rules for validating CLAUDE.md files.
 ## Rule Categories
 ### Security Rules (SEC)
 | Rule | Description | Severity | Auto-fix |
 |------|-------------|----------|----------|
 | SEC001 | Hardcoded absolute paths | Warning | Yes |
 | SEC002 | Potential secrets/API keys | Error | No |
 | SEC003 | Hardcoded IP addresses | Warning | No |
 | SEC004 | Exposed credentials patterns | Error | No |
 | SEC005 | Hardcoded URLs with tokens | Error | No |
 | SEC006 | Environment variable values (not names) | Warning | No |
 ### Structure Rules (STR)
 | Rule | Description | Severity | Auto-fix |
 |------|-------------|----------|----------|
 | STR001 | Missing required sections | Error | Yes |
 | STR002 | Invalid header hierarchy (h3 before h2) | Warning | Yes |
 | STR003 | Orphaned content before first header | Info | No |
 | STR004 | Excessive nesting depth (>4 levels) | Warning | No |
 | STR005 | Empty sections | Warning | Yes |
 | STR006 | Missing section content | Warning | No |
 ### Content Rules (CNT)
 | Rule | Description | Severity | Auto-fix |
 |------|-------------|----------|----------|
 | CNT001 | Contradictory instructions | Error | No |
 | CNT002 | Vague or ambiguous rules | Warning | No |
 | CNT003 | Overly long sections (>100 lines) | Info | No |
 | CNT004 | Duplicate content | Warning | No |
 | CNT005 | TODO/FIXME in production config | Warning | No |
 | CNT006 | Outdated version references | Info | No |
 | CNT007 | Broken internal links | Warning | No |
 ### Format Rules (FMT)
 | Rule | Description | Severity | Auto-fix |
 |------|-------------|----------|----------|
 | FMT001 | Inconsistent header styles | Info | Yes |
 | FMT002 | Inconsistent list markers | Info | Yes |
 | FMT003 | Missing code block language | Info | Yes |
 | FMT004 | Trailing whitespace | Info | Yes |
 | FMT005 | Missing blank lines around headers | Info | Yes |
 | FMT006 | Inconsistent indentation | Info | Yes |
 ### Best Practice Rules (BPR)
 | Rule | Description | Severity | Auto-fix |
 |------|-------------|----------|----------|
 | BPR001 | No Quick Start section | Warning | No |
 | BPR002 | No Critical Rules section | Warning | No |
 | BPR003 | Instructions without examples | Info | No |
 | BPR004 | Commands without explanation | Info | No |
 | BPR005 | Rules without rationale | Info | No |
 | BPR006 | Missing plugin integration docs | Info | No |
 ## Anti-Pattern Examples
 ### SEC002: Hardcoded Secrets
 ```markdown
 # BAD
 API_KEY=sk-1234567890abcdef
 # GOOD
 API_KEY=$OPENAI_API_KEY  # Set via environment
 ```
 ### SEC001: Hardcoded Paths
 ```markdown
 # BAD
 Config file: /home/john/projects/myapp/config.yml
 # GOOD
 Config file: ./config.yml
 Config file: $PROJECT_ROOT/config.yml
 ```
 ### CNT001: Contradictory Rules
 ```markdown
 # BAD
 - Always use TypeScript
 - JavaScript files are acceptable for scripts
 # GOOD
 - Always use TypeScript for source code
 - JavaScript (.js) is acceptable only for config files and scripts
 ```
 ### CNT002: Vague Instructions
 ```markdown
 # BAD
 - Be careful with the database
 # GOOD
 - Never run DELETE without WHERE clause
 - Always backup before migrations
 ```
 ### STR002: Invalid Hierarchy
 ```markdown
 # BAD
 # Main Title
 ### Skipped Level
 # GOOD
 # Main Title
 ## Section
 ### Subsection
 ```
 ## Output Format
 ```
 [SEVERITY] RULE_ID: Description (line N)
  | Context line showing issue
  |          ^^^^^^ indicator
  +-- Explanation of problem
  Suggested fix:
  - old line
  + new line
 ```
 ## Severity Levels
 | Level | Meaning | Action |
 |-------|---------|--------|
 | Error | Must fix | Blocks commit |
 | Warning | Should fix | Review recommended |
 | Info | Consider fixing | Optional improvement |
--- a/plugins/claude-config-maintainer/skills/optimization-patterns.md
+++ b/plugins/claude-config-maintainer/skills/optimization-patterns.md
@@ -1,136 +0,0 @@
 # CLAUDE.md Optimization Patterns
 This skill defines patterns for optimizing CLAUDE.md files.
 ## Optimization Categories
 ### Restructure
 - Reorder sections by importance (Quick Start near top)
 - Group related content together
 - Improve header hierarchy
 - Add navigation aids (TOC for long files)
 ### Condense
 - Remove redundant explanations
 - Convert verbose text to bullet points
 - Eliminate duplicate content
 - Shorten overly detailed sections
 ### Enhance
 - Add missing essential sections
 - **Add Pre-Change Protocol if missing (HIGH PRIORITY)**
 - Improve unclear instructions
 - Add helpful examples
 - Highlight critical rules
 ### Format
 - Standardize header styles (no trailing colons)
 - Fix code block formatting (add language tags)
 - Align list formatting (consistent markers)
 - Improve table layouts
 ## Scoring Criteria
 ### Structure (25 points)
 - Logical section ordering
 - Clear header hierarchy
 - Easy navigation
 - Appropriate grouping
 ### Clarity (25 points)
 - Clear instructions
 - Good examples
 - Unambiguous language
 - Appropriate detail level
 ### Completeness (25 points)
 - Project overview present
 - Quick start commands documented
 - Critical rules highlighted
 - Key workflows covered
 - Pre-Change Protocol present (MANDATORY)
 ### Conciseness (25 points)
 - No unnecessary repetition
 - Efficient information density
 - Appropriate length for project size
 - No generic filler content
 ## Score Interpretation
 | Score | Rating | Action |
 |-------|--------|--------|
 | 90-100 | Excellent | Maintenance only |
 | 70-89 | Good | Minor improvements |
 | 50-69 | Needs Work | Optimization recommended |
 | Below 50 | Poor | Major restructuring needed |
 ## Common Optimizations
 ### Verbose to Concise
 ```markdown
 # Before (34 lines)
 ## Running Tests
 To run the tests, you first need to make sure you have all the
 dependencies installed. The dependencies are listed in requirements.txt.
 Once you have installed the dependencies, you can run the tests using
 pytest. Pytest will automatically discover all test files...
 # After (8 lines)
 ## Running Tests
 ```bash
 pip install -r requirements.txt  # Install dependencies
 pytest                           # Run all tests
 pytest -v                        # Verbose output
 pytest tests/unit/               # Run specific directory
 ```
 ```
 ### Duplicate Removal
 - Keep first occurrence
 - Add cross-reference if needed: "See [Section Name] above"
 ### Header Standardization
 ```markdown
 # Before
 ## Quick Start:
 ## Architecture
 ## Testing:
 # After
 ## Quick Start
 ## Architecture
 ## Testing
 ```
 ### Code Block Enhancement
 ```markdown
 # Before
 ```
 npm install
 npm test
 ```
 # After
 ```bash
 npm install  # Install dependencies
 npm test     # Run test suite
 ```
 ```
 ## Safety Features
 ### Backup Creation
 - Always backup before changes
 - Store in `.claude/backups/CLAUDE.md.TIMESTAMP`
 - Easy restoration if needed
 ### Preview Mode
 - Show all changes before applying
 - Use diff format for easy review
 - Allow approve/reject per change
 ### Selective Application
 - Can apply individual changes
 - Skip specific optimizations
 - Iterative refinement supported
--- a/plugins/claude-config-maintainer/skills/pre-change-protocol.md
+++ b/plugins/claude-config-maintainer/skills/pre-change-protocol.md
@@ -1,83 +0,0 @@
 # Pre-Change Protocol
 This skill defines the mandatory Pre-Change Protocol section that MUST be included in every CLAUDE.md file.
 ## Why This Is Mandatory
 The Pre-Change Protocol prevents the #1 cause of bugs from AI-assisted coding: **incomplete changes where Claude modifies some files but misses others that reference the same code**.
 Without this protocol:
 - Claude may rename a function but miss callers
 - Claude may modify a config but miss documentation
 - Claude may update a schema but miss dependent code
 ## Detection
 Search CLAUDE.md for these indicators:
 - Header containing "Pre-Change" or "Before Any Code Change"
 - References to `grep -rn` or impact search
 - Checklist with "Files That Will Be Affected"
 - User verification checkpoint
 ## Required Section Content
 ```markdown
 ## MANDATORY: Before Any Code Change
 **Claude MUST show this checklist BEFORE editing any file:**
 ### 1. Impact Search Results
 Run and show output of:
 ```bash
 grep -rn "PATTERN" --include="*.sh" --include="*.md" --include="*.json" --include="*.py" | grep -v ".git"
 ```
 ### 2. Files That Will Be Affected
 Numbered list of every file to be modified, with the specific change for each.
 ### 3. Files Searched But Not Changed (and why)
 Proof that related files were checked and determined unchanged.
 ### 4. Documentation That References This
 List of docs that mention this feature/script/function.
 **User verifies this list before Claude proceeds. If Claude skips this, stop immediately.**
 ### After Changes
 Run the same grep and show results proving no references remain unaddressed.
 ```
 ## Placement
 Insert Pre-Change Protocol section:
 - **After:** Critical Rules section
 - **Before:** Common Operations section
 ## If Missing During Analysis
 Flag as **HIGH PRIORITY** issue:
 ```
 1. [HIGH] Missing Pre-Change Protocol section
   CLAUDE.md lacks mandatory dependency-check protocol.
   Impact: Claude may miss file references when making changes,
   leading to broken dependencies and incomplete updates.
   Recommendation: Add Pre-Change Protocol section immediately.
   This is the #1 cause of cascading bugs from incomplete changes.
 ```
 ## If Missing During Optimization
 **Automatically add the section** at the correct position. This is the highest priority enhancement.
 ## Variations
 The exact wording can vary, but these elements are required:
 1. **Search requirement** - Must run grep/search before changes
 2. **Affected files list** - Must enumerate all files to modify
 3. **Non-affected files proof** - Must show what was checked but unchanged
 4. **Documentation check** - Must list referencing docs
 5. **User checkpoint** - Must pause for user verification
 6. **Post-change verification** - Must verify after changes
--- a/plugins/claude-config-maintainer/skills/visual-header.md
+++ b/plugins/claude-config-maintainer/skills/visual-header.md
@@ -1,52 +0,0 @@
 # Visual Header Display
 This skill defines the standard visual header for claude-config-maintainer commands.
 ## Header Format
 ```
 +-----------------------------------------------------------------+
 |  CONFIG-MAINTAINER - [Command Name]                              |
 +-----------------------------------------------------------------+
 ```
 ## Command-Specific Headers
 ### /config-analyze
 ```
 +-----------------------------------------------------------------+
 |  CONFIG-MAINTAINER - CLAUDE.md Analysis                          |
 +-----------------------------------------------------------------+
 ```
 ### /config-optimize
 ```
 +-----------------------------------------------------------------+
 |  CONFIG-MAINTAINER - CLAUDE.md Optimization                      |
 +-----------------------------------------------------------------+
 ```
 ### /config-lint
 ```
 +-----------------------------------------------------------------+
 |  CONFIG-MAINTAINER - CLAUDE.md Lint                              |
 +-----------------------------------------------------------------+
 ```
 ### /config-diff
 ```
 +-----------------------------------------------------------------+
 |  CONFIG-MAINTAINER - CLAUDE.md Diff                              |
 +-----------------------------------------------------------------+
 ```
 ### /config-init
 ```
 +-----------------------------------------------------------------+
 |  CONFIG-MAINTAINER - CLAUDE.md Initialization                    |
 +-----------------------------------------------------------------+
 ```
 ## Usage
 Display the header at the start of command execution, before any analysis or output.
--- a/plugins/cmdb-assistant/.claude-plugin/plugin.json
+++ b/plugins/cmdb-assistant/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
  "name": "cmdb-assistant",
-  "version": "1.2.0",
+  "version": "1.1.0",
  "description": "NetBox CMDB integration with data quality validation - query, create, update, and manage network devices, IP addresses, sites, and more with best practices enforcement",
  "author": {
    "name": "Leo Miranda",
@@ -19,5 +19,6 @@
    "data-quality",
    "validation"
  ],
-  "commands": ["./commands/"]
+  "commands": ["./commands/"],
  "mcpServers": ["./.mcp.json"]
 }
--- a/plugins/cmdb-assistant/.mcp.json
+++ b/plugins/cmdb-assistant/.mcp.json
@@ -0,0 +1,8 @@
 {
  "mcpServers": {
    "netbox": {
      "command": "${CLAUDE_PLUGIN_ROOT}/mcp-servers/netbox/run.sh",
      "args": []
    }
  }
 }
--- a/plugins/cmdb-assistant/README.md
+++ b/plugins/cmdb-assistant/README.md
@@ -0,0 +1,205 @@
 # CMDB Assistant
 A Claude Code plugin for NetBox CMDB integration - query, create, update, and manage your network infrastructure directly from Claude Code.
 ## What's New in v1.1.0
 - **Data Quality Validation**: Hooks for SessionStart and PreToolUse that check data quality and warn about missing fields
 - **Best Practices Skill**: Reference documentation for NetBox patterns (naming conventions, dependency order, role management)
 - **`/cmdb-audit`**: Analyze data quality across VMs, devices, naming conventions, and roles
 - **`/cmdb-register`**: Register the current machine into NetBox with all running applications (Docker containers, systemd services)
 - **`/cmdb-sync`**: Synchronize existing machine state with NetBox (detect drift, update with confirmation)
 ## Features
 - **Full CRUD Operations**: Create, read, update, and delete across all NetBox modules
 - **Smart Search**: Find devices, IPs, sites, and more with natural language queries
 - **IP Management**: Allocate IPs, manage prefixes, track VLANs
 - **Infrastructure Documentation**: Document servers, network devices, and connections
 - **Audit Trail**: Review changes and maintain infrastructure history
 - **Data Quality Validation**: Proactive checks for missing site, tenant, platform assignments
 - **Machine Registration**: Auto-discover and register servers with running applications
 - **Drift Detection**: Sync machine state and detect changes over time
 ## Installation
 ### Prerequisites
 1. A running NetBox instance (v4.x recommended)
 2. NetBox API token with appropriate permissions
 3. The NetBox MCP server configured (see below)
 ### Configure NetBox Credentials
 Create the configuration file:
 ```bash
 mkdir -p ~/.config/claude
 cat > ~/.config/claude/netbox.env << 'EOF'
 NETBOX_API_URL=https://your-netbox-instance/api
 NETBOX_API_TOKEN=your-api-token-here
 NETBOX_VERIFY_SSL=true
 NETBOX_TIMEOUT=30
 EOF
 ```
 ### Install the Plugin
 Add to your Claude Code plugins or marketplace configuration.
 ## Commands
 | Command | Description |
 |---------|-------------|
 | `/initial-setup` | Interactive setup wizard for NetBox MCP server |
 | `/cmdb-search <query>` | Search for devices, IPs, sites, or any CMDB object |
 | `/cmdb-device <action>` | Manage network devices (list, create, update, delete) |
 | `/cmdb-ip <action>` | Manage IP addresses and prefixes |
 | `/cmdb-site <action>` | Manage sites and locations |
 | `/cmdb-audit [scope]` | Data quality analysis (all, vms, devices, naming, roles) |
 | `/cmdb-register` | Register current machine into NetBox with running apps |
 | `/cmdb-sync` | Sync machine state with NetBox (detect drift, update) |
 ## Agent
 The **cmdb-assistant** agent provides conversational infrastructure management:
 ```
@cmdb-assistant Show me all devices at the headquarters site
@cmdb-assistant Allocate the next available IP from 10.0.1.0/24 for the new web server
@cmdb-assistant What changes were made to the network today?
 ```
 ## Usage Examples
 ### Search for Infrastructure
 ```
 /cmdb-search router
 /cmdb-search 10.0.1.0/24
 /cmdb-search datacenter
 ```
 ### Device Management
 ```
 /cmdb-device list
 /cmdb-device show core-router-01
 /cmdb-device create web-server-03
 /cmdb-device at headquarters
 ```
 ### IP Address Management
 ```
 /cmdb-ip prefixes
 /cmdb-ip available in 10.0.1.0/24
 /cmdb-ip allocate from 10.0.1.0/24
 ```
 ### Site Management
 ```
 /cmdb-site list
 /cmdb-site show headquarters
 /cmdb-site racks at datacenter-east
 ```
 ## NetBox Coverage
 This plugin provides access to the full NetBox API:
 - **DCIM**: Sites, Locations, Racks, Devices, Interfaces, Cables, Power
 - **IPAM**: IP Addresses, Prefixes, VLANs, VRFs, ASNs, Services
 - **Circuits**: Providers, Circuits, Terminations
 - **Virtualization**: Clusters, Virtual Machines, VM Interfaces
 - **Tenancy**: Tenants, Contacts
 - **VPN**: Tunnels, L2VPNs, IKE/IPSec Policies
 - **Wireless**: WLANs, Wireless Links
 - **Extras**: Tags, Custom Fields, Journal Entries, Audit Log
 ## Hooks
 | Event | Purpose |
 |-------|---------|
 | `SessionStart` | Test NetBox connectivity, report data quality issues |
 | `PreToolUse` | Validate VM/device parameters before create/update |
 Hooks are **non-blocking** - they emit warnings but never prevent operations.
 ## Architecture
 ```
 cmdb-assistant/
 ├── .claude-plugin/
 │   └── plugin.json          # Plugin manifest
 ├── .mcp.json                 # MCP server configuration
 ├── commands/
 │   ├── initial-setup.md     # Setup wizard
 │   ├── cmdb-search.md       # Search command
 │   ├── cmdb-device.md       # Device management
 │   ├── cmdb-ip.md           # IP management
 │   ├── cmdb-site.md         # Site management
 │   ├── cmdb-audit.md        # Data quality audit (NEW)
 │   ├── cmdb-register.md     # Machine registration (NEW)
 │   └── cmdb-sync.md         # Machine sync (NEW)
 ├── hooks/
 │   ├── hooks.json           # Hook configuration
 │   ├── startup-check.sh     # SessionStart validation
 │   └── validate-input.sh    # PreToolUse validation
 ├── skills/
 │   └── netbox-patterns/
 │       └── SKILL.md         # NetBox best practices reference
 ├── agents/
 │   └── cmdb-assistant.md    # Main assistant agent
 └── README.md
 ```
 The plugin uses the shared NetBox MCP server at `mcp-servers/netbox/`.
 ## Configuration
 ### Required Environment Variables
 | Variable | Description |
 |----------|-------------|
 | `NETBOX_API_URL` | Full URL to NetBox API (e.g., `https://netbox.example.com/api`) |
 | `NETBOX_API_TOKEN` | API authentication token |
 ### Optional Environment Variables
 | Variable | Default | Description |
 |----------|---------|-------------|
 | `NETBOX_VERIFY_SSL` | `true` | Verify SSL certificates |
 | `NETBOX_TIMEOUT` | `30` | Request timeout in seconds |
 ## Getting a NetBox API Token
 1. Log into your NetBox instance
 2. Navigate to your profile (top-right menu)
 3. Go to "API Tokens"
 4. Click "Add a token"
 5. Set appropriate permissions (read-only or read-write)
 6. Copy the generated token
 ## Troubleshooting
 ### Connection Issues
 - Verify `NETBOX_API_URL` is correct and accessible
 - Check firewall rules allow access to NetBox
 - For self-signed certificates, set `NETBOX_VERIFY_SSL=false`
 ### Authentication Errors
 - Ensure API token is valid and not expired
 - Check token has required permissions for the operation
 ### Timeout Errors
 - Increase `NETBOX_TIMEOUT` for slow connections
 - Check network latency to NetBox instance
 ## License
 MIT License - Part of the Leo Claude Marketplace.
--- a/plugins/cmdb-assistant/agents/cmdb-assistant.md
+++ b/plugins/cmdb-assistant/agents/cmdb-assistant.md
@@ -1,20 +1,11 @@
 # CMDB Assistant Agent
-You are an infrastructure management assistant specialized in NetBox CMDB operations.
+You are an infrastructure management assistant specialized in NetBox CMDB operations. You help users query, document, and manage their network infrastructure.
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/netbox-patterns/SKILL.md`
 - `skills/mcp-tools-reference.md`
 ## Visual Output
 Execute `skills/visual-header.md` with context "Infrastructure Management".
 ## Capabilities
-Full access to NetBox via MCP tools covering:
+You have full access to NetBox via MCP tools covering:
 - **DCIM**: Sites, locations, racks, devices, interfaces, cables, power
 - **IPAM**: IP addresses, prefixes, VLANs, VRFs, ASNs, services
 - **Circuits**: Providers, circuits, terminations
@@ -28,66 +19,183 @@ Full access to NetBox via MCP tools covering:
 ### Query Operations
 - Start with list operations to find objects
- Use filters to narrow results
+- Use filters to narrow results (name, status, site_id, etc.)
- Follow up with get operations for details
+- Follow up with get operations for detailed information
 - Present results in clear, organized format
 ### Create Operations
- Confirm required fields before creating
+- Always confirm required fields with user before creating
- Look up related object IDs first
+- Look up related object IDs (device_type, role, site) first
- Suggest follow-up actions after success
+- Provide the created object details after success
 - Suggest follow-up actions (add interfaces, assign IPs, etc.)
 ### Update Operations
 - Show current values before updating
 - Confirm changes with user
 - Report what was changed after success
 ### Delete Operations
- ALWAYS ask for explicit confirmation
+- ALWAYS ask for explicit confirmation before deleting
- Warn about dependent objects
+- Show what will be deleted
 - Warn about dependent objects that may be affected
 ## Common Workflows
 ### Document a New Server
 1. Create device with `dcim_create_device`
 2. Add interfaces with `dcim_create_interface`
 3. Assign IPs with `ipam_create_ip_address`
 4. Add journal entry with `extras_create_journal_entry`
 ### Allocate IP Space
 1. Find available prefixes with `ipam_list_available_prefixes`
 2. Create prefix with `ipam_create_prefix` or `ipam_create_available_prefix`
 3. Allocate IPs with `ipam_create_available_ip`
 ### Audit Infrastructure
 1. List recent changes with `extras_list_object_changes`
 2. Review devices by site with `dcim_list_devices`
 3. Check IP utilization with prefix operations
 ### Cable Management
 1. List interfaces with `dcim_list_interfaces`
 2. Create cable with `dcim_create_cable`
 3. Verify connectivity
 ## Response Format
 When presenting data:
 - Use tables for lists
 - Highlight key fields (name, status, IPs)
 - Include IDs for reference in follow-up operations
 - Suggest next steps when appropriate
 ## Error Handling
 - If an operation fails, explain why clearly
 - Suggest corrective actions
 - For permission errors, note what access is needed
 - For validation errors, explain required fields/formats
 ## Data Quality Validation
-Reference `skills/netbox-patterns/SKILL.md` for best practices:
+**IMPORTANT:** Load the `netbox-patterns` skill for best practice reference.
-### Before VM Operations
+Before ANY create or update operation, validate against NetBox best practices:
 1. Cluster/Site assignment required
 2. Recommend tenant if not provided
 3. Check naming convention
-### Before Device Operations
+### VM Operations
 1. Site is REQUIRED
 2. Recommend platform
 3. Check naming convention
 4. Offer to set primary IP after creation
-### Before Creating Roles
+**Required checks before `virt_create_vm` or `virt_update_vm`:**
 1. List existing roles first
 2. Recommend consolidation if >10 specific roles
-## Dependency Order
+1. **Cluster/Site Assignment** - VMs must have either cluster or site
 2. **Tenant Assignment** - Recommend if not provided
 3. **Platform Assignment** - Recommend for OS tracking
 4. **Naming Convention** - Check against `{env}-{app}-{number}` pattern
 5. **Role Assignment** - Recommend appropriate role
 **If user provides no site/tenant, ASK:**
 > "This VM has no site or tenant assigned. NetBox best practices recommend:
 > - **Site**: For location-based queries and power budgeting
 > - **Tenant**: For resource isolation and ownership tracking
 >
 > Would you like me to:
 > 1. Assign to an existing site/tenant (list available)
 > 2. Create new site/tenant first
 > 3. Proceed without (not recommended for production use)"
 ### Device Operations
 **Required checks before `dcim_create_device` or `dcim_update_device`:**
 1. **Site is REQUIRED** - Fail without it
 2. **Platform Assignment** - Recommend for OS tracking
 3. **Naming Convention** - Check against `{role}-{location}-{number}` pattern
 4. **Role Assignment** - Ensure appropriate role selected
 5. **After Creation** - Offer to set primary IP
 ### Cluster Operations
 **Required checks before `virt_create_cluster`:**
 1. **Site Scope** - Recommend assigning to site
 2. **Cluster Type** - Ensure appropriate type selected
 3. **Device Association** - Recommend linking to host device
 ### Role Management
 **Before creating a new device role:**
 1. List existing roles with `dcim_list_device_roles`
 2. Check if a more general role already exists
 3. Recommend role consolidation if >10 specific roles exist
 **Example guidance:**
 > "You're creating role 'nginx-web-server'. An existing 'web-server' role exists.
 > Consider using 'web-server' and tracking nginx via the platform field instead.
 > This reduces role fragmentation and improves maintainability."
 ## Dependency Order Enforcement
 When creating multiple objects, follow this order:
 Follow order from `skills/netbox-patterns/SKILL.md`:
 ```
-1. Regions -> Sites -> Locations -> Racks
+1. Regions → Sites → Locations → Racks
-2. Tenant Groups -> Tenants
+2. Tenant Groups → Tenants
-3. Manufacturers -> Device Types
+3. Manufacturers → Device Types
 4. Device Roles, Platforms
 5. Devices (with site, role, type)
 6. Clusters (with type, optional site)
 7. VMs (with cluster)
-8. Interfaces -> IP Addresses -> Primary IP
+8. Interfaces → IP Addresses → Primary IP assignment
 ```
 **CRITICAL Rules:**
 - NEVER create a VM before its cluster exists
 - NEVER create a device before its site exists
 - NEVER create an interface before its device exists
 - NEVER create an IP before its interface exists (if assigning)
 ## Naming Convention Enforcement
 When user provides a name, check against patterns:
 | Object Type | Pattern | Example |
 |-------------|---------|---------|
 | Device | `{role}-{site}-{number}` | `web-dc1-01` |
 | VM | `{env}-{app}-{number}` or `{prefix}_{service}` | `prod-api-01` |
 | Cluster | `{site}-{type}` | `dc1-vmware`, `home-docker` |
 | Prefix | Include purpose in description | "Production /24 for web tier" |
 **If name doesn't match patterns, warn:**
 > "The name 'HotServ' doesn't follow naming conventions.
 > Suggested: `prod-hotserv-01` or `hotserv-cloud-01`.
 > Consistent naming improves searchability and automation compatibility.
 > Proceed with original name? [Y/n]"
 ## Duplicate Prevention
-Before creating, check for existing:
+Before creating objects, always check for existing duplicates:
 ```
 # Before creating device
 dcim_list_devices name=<proposed-name>
 # Before creating VM
 virt_list_vms name=<proposed-name>
 # Before creating prefix
 ipam_list_prefixes prefix=<proposed-prefix>
 ```
 If duplicate found, inform user and suggest update instead of create.
 ## Available Commands
 Users can invoke these commands for structured workflows:
 | Command | Purpose |
 |---------|---------|
 | `/cmdb-search <query>` | Search across all CMDB objects |
@@ -97,6 +205,3 @@ ipam_list_prefixes prefix=<proposed-prefix>
 | `/cmdb-audit [scope]` | Data quality analysis |
 | `/cmdb-register` | Register current machine |
 | `/cmdb-sync` | Sync machine state with NetBox |
 | `/cmdb-topology <view>` | Generate infrastructure diagrams |
 | `/change-audit [filters]` | Audit NetBox changes |
 | `/ip-conflicts [scope]` | Detect IP conflicts |
--- a/plugins/cmdb-assistant/commands/change-audit.md
+++ b/plugins/cmdb-assistant/commands/change-audit.md
@@ -1,57 +0,0 @@
 ---
 description: Audit NetBox changes with filtering by date, user, or object type
 ---
 # CMDB Change Audit
 Query and analyze the NetBox audit log for change tracking and compliance.
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/change-audit.md`
 - `skills/mcp-tools-reference.md`
 ## Usage
 ```
 /change-audit [filters]
 ```
 **Filters:**
 - `last <N> days/hours` - Changes within time period
 - `by <username>` - Changes by specific user
 - `type <object-type>` - Changes to specific object type
 - `action <create|update|delete>` - Filter by action type
 - `object <name>` - Search for changes to specific object
 ## Instructions
 Execute `skills/visual-header.md` with context "Change Audit".
 Execute `skills/change-audit.md` which covers:
 1. Parse user request for filters
 2. Query object changes via MCP
 3. Enrich data with detailed records
 4. Analyze patterns
 5. Generate report
 ## Security Audit Mode
 If user asks for "security audit" or "compliance report":
 - Focus on deletions and permission-sensitive changes
 - Highlight changes to critical objects (firewalls, VRFs, prefixes)
 - Flag changes outside business hours
 - Identify users with high change counts
 ## Examples
 - `/change-audit` - Recent changes (last 24 hours)
 - `/change-audit last 7 days` - Past week
 - `/change-audit by admin` - All changes by admin
 - `/change-audit type dcim.device` - Device changes only
 - `/change-audit action delete` - All deletions
 ## User Request
 $ARGUMENTS
--- a/plugins/cmdb-assistant/commands/cmdb-audit.md
+++ b/plugins/cmdb-assistant/commands/cmdb-audit.md
@@ -6,13 +6,6 @@ description: Audit NetBox data quality and identify consistency issues
 Analyze NetBox data for quality issues and best practice violations.
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/audit-workflow.md`
 - `skills/netbox-patterns/SKILL.md`
 - `skills/mcp-tools-reference.md`
 ## Usage
 ```
@@ -28,30 +21,174 @@ Analyze NetBox data for quality issues and best practice violations.
 ## Instructions
-Execute `skills/visual-header.md` with context "Data Quality Audit".
+You are a data quality auditor for NetBox. Your job is to identify consistency issues and best practice violations.
-Execute `skills/audit-workflow.md` which covers:
+**IMPORTANT:** Load the `netbox-patterns` skill for best practice reference.
 1. Data collection via MCP
 2. Quality checks by severity (CRITICAL, HIGH, MEDIUM, LOW)
 3. Naming convention analysis
 4. Role fragmentation analysis
 5. Report generation with recommendations
-## Scope-Specific Focus
+### Phase 1: Data Collection
-| Scope | Focus |
+Run these MCP tool calls to gather data for analysis:
 |-------|-------|
 | `all` | Full audit across all categories |
 | `vms` | Virtual Machine checks only |
 | `devices` | Device checks only |
 | `naming` | Naming convention analysis |
 | `roles` | Role fragmentation analysis |
-## Examples
+```
 1. virt_list_vms (no filters - get all)
 2. dcim_list_devices (no filters - get all)
 3. virt_list_clusters (no filters)
 4. dcim_list_sites
 5. tenancy_list_tenants
 6. dcim_list_device_roles
 7. dcim_list_platforms
 ```
- `/cmdb-audit` - Full audit
+Store the results for analysis.
- `/cmdb-audit vms` - VM-specific checks
+
- `/cmdb-audit naming` - Naming conventions
+### Phase 2: Quality Checks
 Analyze collected data for these issues by severity:
 #### CRITICAL Issues (must fix immediately)
 | Check | Detection |
 |-------|-----------|
 | VMs without cluster | `cluster` field is null AND `site` field is null |
 | Devices without site | `site` field is null |
 | Active devices without primary IP | `status=active` AND `primary_ip4` is null AND `primary_ip6` is null |
 #### HIGH Issues (should fix soon)
 | Check | Detection |
 |-------|-----------|
 | VMs without site | VM has no site (neither direct nor via cluster.site) |
 | VMs without tenant | `tenant` field is null |
 | Devices without platform | `platform` field is null |
 | Clusters not scoped to site | `site` field is null on cluster |
 | VMs without role | `role` field is null |
 #### MEDIUM Issues (plan to address)
 | Check | Detection |
 |-------|-----------|
 | Inconsistent naming | Names don't match patterns: devices=`{role}-{site}-{num}`, VMs=`{env}-{app}-{num}` |
 | Role fragmentation | More than 10 device roles with <3 assignments each |
 | Missing tags on production | Active resources without any tags |
 | Mixed naming separators | Some names use `_`, others use `-` |
 #### LOW Issues (informational)
 | Check | Detection |
 |-------|-----------|
 | Docker containers as VMs | Cluster type is "Docker Compose" - document this modeling choice |
 | VMs without description | `description` field is empty |
 | Sites without physical address | `physical_address` is empty |
 | Devices without serial | `serial` field is empty |
 ### Phase 3: Naming Convention Analysis
 For naming scope, analyze patterns:
 1. **Extract naming patterns** from existing objects
 2. **Identify dominant patterns** (most common conventions)
 3. **Flag outliers** that don't match dominant patterns
 4. **Suggest standardization** based on best practices
 **Expected Patterns:**
 - Devices: `{role}-{location}-{number}` (e.g., `web-dc1-01`)
 - VMs: `{prefix}_{service}` or `{env}-{app}-{number}` (e.g., `prod-api-01`)
 - Clusters: `{site}-{type}` (e.g., `home-docker`)
 ### Phase 4: Role Analysis
 For roles scope, analyze fragmentation:
 1. **List all device roles** with assignment counts
 2. **Identify single-use roles** (only 1 device/VM)
 3. **Identify similar roles** that could be consolidated
 4. **Suggest consolidation** based on patterns
 **Red Flags:**
 - More than 15 highly specific roles
 - Roles with technology in name (use platform instead)
 - Roles that duplicate functionality
 ### Phase 5: Report Generation
 Present findings in this structure:
 ```markdown
 ## CMDB Data Quality Audit Report
 **Generated:** [timestamp]
 **Scope:** [scope parameter]
 ### Summary
 | Metric | Count |
 |--------|-------|
 | Total VMs | X |
 | Total Devices | Y |
 | Total Clusters | Z |
 | **Total Issues** | **N** |
 | Severity | Count |
 |----------|-------|
 | Critical | A |
 | High | B |
 | Medium | C |
 | Low | D |
 ### Critical Issues
 [List each with specific object names and IDs]
 **Example:**
 - VM `HotServ` (ID: 1) - No cluster or site assignment
 - Device `server-01` (ID: 5) - No site assignment
 ### High Issues
 [List each with specific object names]
 ### Medium Issues
 [Grouped by category with counts]
 ### Recommendations
 1. **[Most impactful fix]** - affects N objects
 2. **[Second priority]** - affects M objects
 ...
 ### Quick Fixes
 Commands to fix common issues:
 ```
 # Assign site to VM
 virt_update_vm id=X site=Y
 # Assign platform to device
 dcim_update_device id=X platform=Y
 ```
 ### Next Steps
 - Run `/cmdb-register` to properly register new machines
 - Use `/cmdb-sync` to update existing registrations
 - Consider bulk updates via NetBox web UI for >10 items
 ```
 ## Scope-Specific Instructions
 ### For `vms` scope:
 Focus only on Virtual Machine checks. Skip device and role analysis.
 ### For `devices` scope:
 Focus only on Device checks. Skip VM and cluster analysis.
 ### For `naming` scope:
 Focus on naming convention analysis across all objects. Generate detailed pattern report.
 ### For `roles` scope:
 Focus on role fragmentation analysis. Generate consolidation recommendations.
 ## User Request
--- a/plugins/cmdb-assistant/commands/cmdb-device.md
+++ b/plugins/cmdb-assistant/commands/cmdb-device.md
@@ -1,11 +1,6 @@
 # CMDB Device Management
-Manage network devices in NetBox.
+Manage network devices in NetBox - create, view, update, or delete.
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/mcp-tools-reference.md`
 ## Usage
@@ -15,40 +10,42 @@ Manage network devices in NetBox.
 ## Instructions
-Execute `skills/visual-header.md` with context "Device Management".
+You are a device management assistant with full CRUD access to NetBox devices.
 ### Actions
 **List/View:**
- `list` or `show all` - List all devices: `dcim_list_devices`
+- `list` or `show all` - List all devices using `dcim_list_devices`
- `show <name>` - Get device details: `dcim_get_device`
+- `show <name>` - Get device details using `dcim_list_devices` with name filter, then `dcim_get_device`
- `at <site>` - List devices at site
+- `at <site>` - List devices at a specific site
 **Create:**
- `create <name>` - Create new device
+- `create <name>` - Create a new device
 - Required: name, device_type, role, site
- Use `dcim_list_device_types`, `dcim_list_device_roles`, `dcim_list_sites` to find IDs
+- Use `dcim_list_device_types`, `dcim_list_device_roles`, `dcim_list_sites` to help user find IDs
 - Then use `dcim_create_device`
 **Update:**
 - `update <name>` - Update device properties
- Get device ID first, then use `dcim_update_device`
+- First get the device ID, then use `dcim_update_device`
 **Delete:**
- `delete <name>` - Delete device (ask confirmation first)
+- `delete <name>` - Delete a device (ask for confirmation first)
 - Use `dcim_delete_device`
 ### Related Operations
 After creating a device, offer to:
- Add interfaces: `dcim_create_interface`
+- Add interfaces with `dcim_create_interface`
- Assign IP addresses: `ipam_create_ip_address`
+- Assign IP addresses with `ipam_create_ip_address`
- Add to rack: `dcim_update_device`
+- Add to a rack with `dcim_update_device`
 ## Examples
- `/cmdb-device list`
+- `/cmdb-device list` - Show all devices
- `/cmdb-device show core-router-01`
+- `/cmdb-device show core-router-01` - Get details for specific device
- `/cmdb-device create web-server-03`
+- `/cmdb-device create web-server-03` - Create a new device
- `/cmdb-device at headquarters`
+- `/cmdb-device at headquarters` - List devices at headquarters site
 ## User Request
--- a/plugins/cmdb-assistant/commands/cmdb-ip.md
+++ b/plugins/cmdb-assistant/commands/cmdb-ip.md
@@ -2,12 +2,6 @@
 Manage IP addresses and prefixes in NetBox.
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/ip-management.md`
 - `skills/mcp-tools-reference.md`
 ## Usage
 ```
@@ -16,36 +10,43 @@ Manage IP addresses and prefixes in NetBox.
 ## Instructions
-Execute `skills/visual-header.md` with context "IP Management".
+You are an IP address management (IPAM) assistant with access to NetBox.
 Execute operations from `skills/ip-management.md`.
 ### Actions
 **Prefixes:**
- `prefixes` - List all prefixes
+- `prefixes` - List all prefixes using `ipam_list_prefixes`
- `prefix <cidr>` - Get prefix details
+- `prefix <cidr>` - Get prefix details or find prefix containing address
- `available in <prefix>` - Show available IPs
+- `available in <prefix>` - Show available IPs in a prefix using `ipam_list_available_ips`
- `create prefix <cidr>` - Create new prefix
+- `create prefix <cidr>` - Create new prefix using `ipam_create_prefix`
 **IP Addresses:**
- `list` - List all IP addresses
+- `list` - List all IP addresses using `ipam_list_ip_addresses`
 - `show <address>` - Get IP details
- `allocate from <prefix>` - Auto-allocate next available
+- `allocate from <prefix>` - Auto-allocate next available IP using `ipam_create_available_ip`
- `create <address>` - Create specific IP
+- `create <address>` - Create specific IP using `ipam_create_ip_address`
- `assign <ip> to <device> <interface>` - Assign IP to interface
+- `assign <ip> to <device>` - Assign IP to device interface
-**VLANs and VRFs:**
+**VLANs:**
- `vlans` - List VLANs
+- `vlans` - List VLANs using `ipam_list_vlans`
 - `vlan <id>` - Get VLAN details
- `vrfs` - List VRFs
+
 **VRFs:**
 - `vrfs` - List VRFs using `ipam_list_vrfs`
 ### Workflow Examples
 **Allocate IP to new server:**
 1. Find available IPs in target prefix
 2. Create the IP address
 3. Assign to device interface
 ## Examples
- `/cmdb-ip prefixes`
+- `/cmdb-ip prefixes` - List all prefixes
- `/cmdb-ip available in 10.0.1.0/24`
+- `/cmdb-ip available in 10.0.1.0/24` - Show available IPs
- `/cmdb-ip allocate from 10.0.1.0/24`
+- `/cmdb-ip allocate from 10.0.1.0/24` - Get next available IP
- `/cmdb-ip assign 10.0.1.50/24 to web-server-01 eth0`
+- `/cmdb-ip assign 10.0.1.50/24 to web-server-01 eth0` - Assign IP to interface
 ## User Request
--- a/plugins/cmdb-assistant/commands/cmdb-register.md
+++ b/plugins/cmdb-assistant/commands/cmdb-register.md
@@ -4,15 +4,7 @@ description: Register the current machine into NetBox with all running applicati
 # CMDB Machine Registration
-Register the current machine into NetBox, including hardware info, network interfaces, and running applications.
+Register the current machine into NetBox, including hardware info, network interfaces, and running applications (Docker containers, services).
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/device-registration.md`
 - `skills/system-discovery.md`
 - `skills/netbox-patterns/SKILL.md`
 - `skills/mcp-tools-reference.md`
 ## Usage
@@ -27,24 +19,303 @@ Register the current machine into NetBox, including hardware info, network inter
 ## Instructions
-Execute `skills/visual-header.md` with context "Machine Registration".
+You are registering the current machine into NetBox. This is a multi-phase process that discovers local system information and creates corresponding NetBox objects.
-Execute `skills/device-registration.md` which covers:
+**IMPORTANT:** Load the `netbox-patterns` skill for best practice reference.
-1. System discovery via Bash (use `skills/system-discovery.md`)
+
-2. Pre-registration checks (device exists?, site?, platform?, role?)
+### Phase 1: System Discovery (via Bash)
-3. Device creation via MCP
+
-4. Interface and IP creation
+Gather system information using these commands:
-5. Container registration (if Docker found)
+
-6. Journal entry documentation
+#### 1.1 Basic Device Info
 ```bash
 # Hostname
 hostname
 # OS/Platform info
 cat /etc/os-release 2>/dev/null || uname -a
 # Hardware model (varies by system)
 # Raspberry Pi:
 cat /proc/device-tree/model 2>/dev/null || echo "Unknown"
 # x86 systems:
 cat /sys/class/dmi/id/product_name 2>/dev/null || echo "Unknown"
 # Serial number
 # Raspberry Pi:
 cat /proc/device-tree/serial-number 2>/dev/null || cat /proc/cpuinfo | grep Serial | cut -d: -f2 | tr -d ' ' 2>/dev/null
 # x86 systems:
 cat /sys/class/dmi/id/product_serial 2>/dev/null || echo "Unknown"
 # CPU info
 nproc
 # Memory (MB)
 free -m | awk '/Mem:/ {print $2}'
 # Disk (GB, root filesystem)
 df -BG / | awk 'NR==2 {print $2}' | tr -d 'G'
 ```
 #### 1.2 Network Interfaces
 ```bash
 # Get interfaces with IPs (JSON format)
 ip -j addr show 2>/dev/null || ip addr show
 # Get default gateway interface
 ip route | grep default | awk '{print $5}' | head -1
 # Get MAC addresses
 ip -j link show 2>/dev/null || ip link show
 ```
 #### 1.3 Running Applications
 ```bash
 # Docker containers (if docker available)
 docker ps --format '{"name":"{{.Names}}","image":"{{.Image}}","status":"{{.Status}}","ports":"{{.Ports}}"}' 2>/dev/null || echo "Docker not available"
 # Docker Compose projects (check common locations)
 find ~/apps /home/*/apps -name "docker-compose.yml" -o -name "docker-compose.yaml" 2>/dev/null | head -20
 # Systemd services (running)
 systemctl list-units --type=service --state=running --no-pager --plain 2>/dev/null | grep -v "^UNIT" | head -30
 ```
 ### Phase 2: Pre-Registration Checks (via MCP)
 Before creating objects, verify prerequisites:
 #### 2.1 Check if Device Already Exists
 ```
 dcim_list_devices name=<hostname>
 ```
 **If device exists:**
 - Inform user and suggest `/cmdb-sync` instead
 - Ask if they want to proceed with re-registration (will update existing)
 #### 2.2 Verify/Create Site
 If `--site` provided:
 ```
 dcim_list_sites name=<site-name>
 ```
 If site doesn't exist, ask user if they want to create it.
 If no site provided, list available sites and ask user to choose:
 ```
 dcim_list_sites
 ```
 #### 2.3 Verify/Create Platform
 Based on OS detected, check if platform exists:
 ```
 dcim_list_platforms name=<platform-name>
 ```
 **Platform naming:**
 - `Raspberry Pi OS (Bookworm)` for Raspberry Pi
 - `Ubuntu 24.04 LTS` for Ubuntu
 - `Debian 12` for Debian
 - Use format: `{OS Name} {Version}`
 If platform doesn't exist, create it:
 ```
 dcim_create_platform name=<platform-name> slug=<slug>
 ```
 #### 2.4 Verify/Create Device Role
 Based on detected services:
 - If Docker containers found → `Docker Host`
 - If only basic services → `Server`
 - If specific role specified → Use that
 ```
 dcim_list_device_roles name=<role-name>
 ```
 ### Phase 3: Device Registration (via MCP)
 #### 3.1 Get/Create Manufacturer and Device Type
 For Raspberry Pi:
 ```
 dcim_list_manufacturers name="Raspberry Pi Foundation"
 dcim_list_device_types manufacturer_id=X model="Raspberry Pi 4 Model B"
 ```
 Create if not exists.
 For generic x86:
 ```
 dcim_list_manufacturers name=<detected-manufacturer>
 ```
 #### 3.2 Create Device
 ```
 dcim_create_device
  name=<hostname>
  device_type=<device_type_id>
  role=<role_id>
  site=<site_id>
  platform=<platform_id>
  tenant=<tenant_id>  # if provided
  serial=<serial>
  description="Registered via cmdb-assistant"
 ```
 #### 3.3 Create Interfaces
 For each network interface discovered:
 ```
 dcim_create_interface
  device=<device_id>
  name=<interface_name>  # eth0, wlan0, tailscale0, etc.
  type=<type>            # 1000base-t, virtual, other
  mac_address=<mac>
  enabled=true
 ```
 **Interface type mapping:**
 - `eth*`, `enp*` → `1000base-t`
 - `wlan*` → `ieee802.11ax` (or appropriate wifi type)
 - `tailscale*`, `docker*`, `br-*` → `virtual`
 - `lo` → skip (loopback)
 #### 3.4 Create IP Addresses
 For each IP on each interface:
 ```
 ipam_create_ip_address
  address=<ip/prefix>    # e.g., "192.168.1.100/24"
  assigned_object_type="dcim.interface"
  assigned_object_id=<interface_id>
  status="active"
  description="Discovered via cmdb-register"
 ```
 #### 3.5 Set Primary IP
 Identify primary IP (interface with default route):
 ```
 dcim_update_device
  id=<device_id>
  primary_ip4=<primary_ip_id>
 ```
 ### Phase 4: Container Registration (via MCP)
 If Docker containers were discovered:
 #### 4.1 Create/Get Cluster Type
 ```
 virt_list_cluster_types name="Docker Compose"
 ```
 Create if not exists:
 ```
 virt_create_cluster_type name="Docker Compose" slug="docker-compose"
 ```
 #### 4.2 Create Cluster
 For each Docker Compose project directory found:
 ```
 virt_create_cluster
  name=<project-name>  # e.g., "apps-hotport"
  type=<cluster_type_id>
  site=<site_id>
  description="Docker Compose stack on <hostname>"
 ```
 #### 4.3 Create VMs for Containers
 For each running container:
 ```
 virt_create_vm
  name=<container_name>
  cluster=<cluster_id>
  site=<site_id>
  role=<role_id>        # Map container function to role
  status="active"
  vcpus=<cpu_shares>    # Default 1.0 if unknown
  memory=<memory_mb>    # Default 256 if unknown
  disk=<disk_gb>        # Default 5 if unknown
  description=<container purpose>
  comments=<image, ports, volumes info>
 ```
 **Container role mapping:**
 - `*caddy*`, `*nginx*`, `*traefik*` → "Reverse Proxy"
 - `*db*`, `*postgres*`, `*mysql*`, `*redis*` → "Database"
 - `*webui*`, `*frontend*` → "Web Application"
 - Others → Infer from image name or use generic "Container"
 ### Phase 5: Documentation
 #### 5.1 Add Journal Entry
 ```
 extras_create_journal_entry
  assigned_object_type="dcim.device"
  assigned_object_id=<device_id>
  comments="Device registered via /cmdb-register command\n\nDiscovered:\n- X network interfaces\n- Y IP addresses\n- Z Docker containers"
 ```
 ### Phase 6: Summary Report
 Present registration summary:
 ```markdown
 ## Machine Registration Complete
 ### Device Created
 - **Name:** <hostname>
 - **Site:** <site>
 - **Platform:** <platform>
 - **Role:** <role>
 - **ID:** <device_id>
 - **URL:** https://netbox.example.com/dcim/devices/<id>/
 ### Network Interfaces
 | Interface | Type | MAC | IP Address |
 |-----------|------|-----|------------|
 | eth0 | 1000base-t | aa:bb:cc:dd:ee:ff | 192.168.1.100/24 |
 | tailscale0 | virtual | - | 100.x.x.x/32 |
 ### Primary IP: 192.168.1.100
 ### Docker Containers Registered (if applicable)
 **Cluster:** <cluster_name> (ID: <cluster_id>)
 | Container | Role | vCPUs | Memory | Status |
 |-----------|------|-------|--------|--------|
 | media_jellyfin | Media Server | 2.0 | 2048MB | Active |
 | media_sonarr | Media Management | 1.0 | 512MB | Active |
 ### Next Steps
 - Run `/cmdb-sync` periodically to keep data current
 - Run `/cmdb-audit` to check data quality
 - Add tags for classification (env:*, team:*, etc.)
 ```
 ## Error Handling
-| Error | Action |
+- **Device already exists:** Suggest `/cmdb-sync` or ask to proceed
-|-------|--------|
+- **Site not found:** List available sites, offer to create new
-| Device already exists | Suggest `/cmdb-sync` or ask to proceed |
+- **Docker not available:** Skip container registration, note in summary
-| Site not found | List available sites, offer to create new |
+- **Permission denied:** Note which operations failed, suggest fixes
 | Docker not available | Skip container registration, note in summary |
 | Permission denied | Note which operations failed, suggest fixes |
 ## User Request
--- a/plugins/cmdb-assistant/commands/cmdb-search.md
+++ b/plugins/cmdb-assistant/commands/cmdb-search.md
@@ -1,17 +1,5 @@
 # CMDB Search
 ## Visual Output
 When executing this command, display the plugin header:
 ```
 ┌──────────────────────────────────────────────────────────────────┐
 │  🖥️ CMDB-ASSISTANT · Search                                      │
 └──────────────────────────────────────────────────────────────────┘
 ```
 Then proceed with the search.
 Search NetBox for devices, IPs, sites, or any CMDB object.
 ## Usage
--- a/plugins/cmdb-assistant/commands/cmdb-site.md
+++ b/plugins/cmdb-assistant/commands/cmdb-site.md
@@ -2,11 +2,6 @@
 Manage sites and locations in NetBox.
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/mcp-tools-reference.md`
 ## Usage
 ```
@@ -15,35 +10,46 @@ Manage sites and locations in NetBox.
 ## Instructions
-Execute `skills/visual-header.md` with context "Site Management".
+You are a site/location management assistant with access to NetBox.
 ### Actions
 **Sites:**
- `list` - List all sites: `dcim_list_sites`
+- `list` - List all sites using `dcim_list_sites`
- `show <name>` - Get site details: `dcim_get_site`
+- `show <name>` - Get site details using `dcim_get_site`
- `create <name>` - Create new site: `dcim_create_site`
+- `create <name>` - Create new site using `dcim_create_site`
- `update <name>` - Update site: `dcim_update_site`
+- `update <name>` - Update site using `dcim_update_site`
 - `delete <name>` - Delete site (with confirmation)
-**Locations:**
+**Locations (within sites):**
- `locations at <site>` - List locations: `dcim_list_locations`
+- `locations at <site>` - List locations using `dcim_list_locations`
- `create location <name> at <site>` - Create location
+- `create location <name> at <site>` - Create location using `dcim_create_location`
 **Racks:**
- `racks at <site>` - List racks: `dcim_list_racks`
+- `racks at <site>` - List racks using `dcim_list_racks`
- `create rack <name> at <site>` - Create rack
+- `create rack <name> at <site>` - Create rack using `dcim_create_rack`
 **Regions:**
- `regions` - List regions: `dcim_list_regions`
+- `regions` - List regions using `dcim_list_regions`
- `create region <name>` - Create region
+- `create region <name>` - Create region using `dcim_create_region`
 ### Site Properties
 When creating/updating sites:
 - name (required)
 - slug (required, auto-generated if not provided)
 - status: active, planned, staging, decommissioning, retired
 - region: parent region ID
 - facility: datacenter/building name
 - physical_address, shipping_address
 - time_zone
 ## Examples
- `/cmdb-site list`
+- `/cmdb-site list` - Show all sites
- `/cmdb-site show headquarters`
+- `/cmdb-site show headquarters` - Get HQ site details
- `/cmdb-site create branch-office-nyc`
+- `/cmdb-site create branch-office-nyc` - Create new site
- `/cmdb-site racks at headquarters`
+- `/cmdb-site racks at headquarters` - List racks at HQ
 ## User Request
--- a/plugins/cmdb-assistant/commands/cmdb-sync.md
+++ b/plugins/cmdb-assistant/commands/cmdb-sync.md
@@ -4,14 +4,7 @@ description: Synchronize current machine state with existing NetBox record
 # CMDB Machine Sync
-Update an existing NetBox device record with the current machine state.
+Update an existing NetBox device record with the current machine state. Compares local system information with NetBox and applies changes.
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/sync-workflow.md`
 - `skills/system-discovery.md`
 - `skills/mcp-tools-reference.md`
 ## Usage
@@ -25,32 +18,318 @@ Update an existing NetBox device record with the current machine state.
 ## Instructions
-Execute `skills/visual-header.md` with context "Machine Sync".
+You are synchronizing the current machine's state with its NetBox record. This involves comparing current system state with stored data and updating differences.
-Execute `skills/sync-workflow.md` which covers:
+**IMPORTANT:** Load the `netbox-patterns` skill for best practice reference.
 1. Device lookup via MCP
 2. Current state discovery via Bash
 3. Comparison of NetBox vs local state
 4. Diff report generation
 5. User confirmation (unless dry-run)
 6. Apply updates via MCP
 7. Journal entry creation
-## Modes
+### Phase 1: Device Lookup (via MCP)
-| Mode | Behavior |
+First, find the existing device record:
-|------|----------|
+
-| Default | Show diff, ask confirmation, apply changes |
+```bash
-| `--dry-run` | Show diff only, no changes applied |
+# Get current hostname
-| `--full` | Skip confirmation, update all fields |
+hostname
 ```
 ```
 dcim_list_devices name=<hostname>
 ```
 **If device not found:**
 - Inform user: "Device '<hostname>' not found in NetBox"
 - Suggest: "Run `/cmdb-register` to register this machine first"
 - Exit sync
 **If device found:**
 - Store device ID and all current field values
 - Fetch interfaces: `dcim_list_interfaces device_id=<device_id>`
 - Fetch IPs: `ipam_list_ip_addresses device_id=<device_id>`
 Also check for associated clusters/VMs:
 ```
 virt_list_clusters  # Look for cluster associated with this device
 virt_list_vms cluster=<cluster_id>  # If cluster found
 ```
 ### Phase 2: Current State Discovery (via Bash)
 Gather current system information (same as `/cmdb-register`):
 ```bash
 # Device info
 hostname
 cat /etc/os-release 2>/dev/null || uname -a
 nproc
 free -m | awk '/Mem:/ {print $2}'
 df -BG / | awk 'NR==2 {print $2}' | tr -d 'G'
 # Network interfaces with IPs
 ip -j addr show 2>/dev/null || ip addr show
 # Docker containers
 docker ps --format '{"name":"{{.Names}}","image":"{{.Image}}","status":"{{.Status}}"}' 2>/dev/null || echo "[]"
 ```
 ### Phase 3: Comparison
 Compare discovered state with NetBox record:
 #### 3.1 Device Attributes
 | Field | Compare |
 |-------|---------|
 | Platform | OS version changed? |
 | Status | Still active? |
 | Serial | Match? |
 | Description | Keep existing |
 #### 3.2 Network Interfaces
 | Change Type | Detection |
 |-------------|-----------|
 | New interface | Interface exists locally but not in NetBox |
 | Removed interface | Interface in NetBox but not locally |
 | Changed MAC | MAC address different |
 | Interface type | Type mismatch |
 #### 3.3 IP Addresses
 | Change Type | Detection |
 |-------------|-----------|
 | New IP | IP exists locally but not in NetBox |
 | Removed IP | IP in NetBox but not locally (on this device) |
 | Primary IP changed | Default route interface changed |
 #### 3.4 Docker Containers
 | Change Type | Detection |
 |-------------|-----------|
 | New container | Container running locally but no VM in cluster |
 | Stopped container | VM exists but container not running |
 | Resource change | vCPUs/memory different (if trackable) |
 ### Phase 4: Diff Report
 Present changes to user:
 ```markdown
 ## Sync Diff Report
 **Device:** <hostname> (ID: <device_id>)
 **NetBox URL:** https://netbox.example.com/dcim/devices/<id>/
 ### Device Attributes
 | Field | NetBox Value | Current Value | Action |
 |-------|--------------|---------------|--------|
 | Platform | Ubuntu 22.04 | Ubuntu 24.04 | UPDATE |
 | Status | active | active | - |
 ### Network Interfaces
 #### New Interfaces (will create)
 | Interface | Type | MAC | IPs |
 |-----------|------|-----|-----|
 | tailscale0 | virtual | - | 100.x.x.x/32 |
 #### Removed Interfaces (will mark offline)
 | Interface | Type | Reason |
 |-----------|------|--------|
 | eth1 | 1000base-t | Not found locally |
 #### Changed Interfaces
 | Interface | Field | Old | New |
 |-----------|-------|-----|-----|
 | eth0 | mac_address | aa:bb:cc:00:00:00 | aa:bb:cc:11:11:11 |
 ### IP Addresses
 #### New IPs (will create)
 - 192.168.1.150/24 on eth0
 #### Removed IPs (will unassign)
 - 192.168.1.100/24 from eth0
 ### Docker Containers
 #### New Containers (will create VMs)
 | Container | Image | Role |
 |-----------|-------|------|
 | media_lidarr | linuxserver/lidarr | Media Management |
 #### Stopped Containers (will mark offline)
 | Container | Last Status |
 |-----------|-------------|
 | media_bazarr | Exited |
 ### Summary
 - **Updates:** X
 - **Creates:** Y
 - **Removals/Offline:** Z
 ```
 ### Phase 5: User Confirmation
 If not `--dry-run`:
 ```
 The following changes will be applied:
 - Update device platform to "Ubuntu 24.04"
 - Create interface "tailscale0"
 - Create IP "100.x.x.x/32" on tailscale0
 - Create VM "media_lidarr" in cluster
 - Mark VM "media_bazarr" as offline
 Proceed with sync? [Y/n]
 ```
 **Use AskUserQuestion** to get confirmation.
 ### Phase 6: Apply Updates (via MCP)
 Only if user confirms (or `--full` specified):
 #### 6.1 Device Updates
 ```
 dcim_update_device
  id=<device_id>
  platform=<new_platform_id>
  # ... other changed fields
 ```
 #### 6.2 Interface Updates
 **For new interfaces:**
 ```
 dcim_create_interface
  device=<device_id>
  name=<interface_name>
  type=<type>
  mac_address=<mac>
  enabled=true
 ```
 **For removed interfaces:**
 ```
 dcim_update_interface
  id=<interface_id>
  enabled=false
  description="Marked offline by cmdb-sync - interface no longer present"
 ```
 **For changed interfaces:**
 ```
 dcim_update_interface
  id=<interface_id>
  mac_address=<new_mac>
 ```
 #### 6.3 IP Address Updates
 **For new IPs:**
 ```
 ipam_create_ip_address
  address=<ip/prefix>
  assigned_object_type="dcim.interface"
  assigned_object_id=<interface_id>
  status="active"
 ```
 **For removed IPs:**
 ```
 ipam_update_ip_address
  id=<ip_id>
  assigned_object_type=null
  assigned_object_id=null
  description="Unassigned by cmdb-sync"
 ```
 #### 6.4 Primary IP Update
 If primary IP changed:
 ```
 dcim_update_device
  id=<device_id>
  primary_ip4=<new_primary_ip_id>
 ```
 #### 6.5 Container/VM Updates
 **For new containers:**
 ```
 virt_create_vm
  name=<container_name>
  cluster=<cluster_id>
  status="active"
  # ... other fields
 ```
 **For stopped containers:**
 ```
 virt_update_vm
  id=<vm_id>
  status="offline"
  description="Container stopped - detected by cmdb-sync"
 ```
 ### Phase 7: Journal Entry
 Document the sync:
 ```
 extras_create_journal_entry
  assigned_object_type="dcim.device"
  assigned_object_id=<device_id>
  comments="Device synced via /cmdb-sync command\n\nChanges applied:\n- <list of changes>"
 ```
 ### Phase 8: Summary Report
 ```markdown
 ## Sync Complete
 **Device:** <hostname>
 **Sync Time:** <timestamp>
 ### Changes Applied
 - Updated platform: Ubuntu 22.04 → Ubuntu 24.04
 - Created interface: tailscale0 (ID: X)
 - Created IP: 100.x.x.x/32 (ID: Y)
 - Created VM: media_lidarr (ID: Z)
 - Marked VM offline: media_bazarr (ID: W)
 ### Current State
 - **Interfaces:** 4 (3 active, 1 offline)
 - **IP Addresses:** 5
 - **Containers/VMs:** 8 (7 active, 1 offline)
 ### Next Sync
 Run `/cmdb-sync` again after:
 - Adding/removing Docker containers
 - Changing network configuration
 - OS upgrades
 ```
 ## Dry Run Mode
 If `--dry-run` specified:
 - Complete Phase 1-4 (lookup, discovery, compare, diff report)
 - Skip Phase 5-8 (no confirmation, no updates, no journal)
 - End with: "Dry run complete. No changes applied. Run without --dry-run to apply."
 ## Full Sync Mode
 If `--full` specified:
 - Skip user confirmation
 - Update all fields even if unchanged (force refresh)
 - Useful for ensuring NetBox matches current state exactly
 ## Error Handling
-| Error | Action |
+- **Device not found:** Suggest `/cmdb-register`
-|-------|--------|
+- **Permission denied on updates:** Note which failed, continue with others
-| Device not found | Suggest `/cmdb-register` |
+- **Cluster not found:** Offer to create or skip container sync
-| Permission denied | Note which failed, continue others |
+- **API errors:** Log error, continue with remaining updates
 | Cluster not found | Offer to create or skip container sync |
 ## User Request
--- a/plugins/cmdb-assistant/commands/cmdb-topology.md
+++ b/plugins/cmdb-assistant/commands/cmdb-topology.md
@@ -1,54 +0,0 @@
 ---
 description: Generate infrastructure topology diagrams from NetBox data
 ---
 # CMDB Topology Visualization
 Generate Mermaid diagrams showing infrastructure topology from NetBox.
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/topology-generation.md`
 - `skills/mcp-tools-reference.md`
 ## Usage
 ```
 /cmdb-topology <view> [scope]
 ```
 **Views:**
 - `rack <rack-name>` - Rack elevation showing devices and positions
 - `network [site]` - Network topology showing device connections
 - `site <site-name>` - Site overview with racks and device counts
 - `full` - Full infrastructure overview
 ## Instructions
 Execute `skills/visual-header.md` with context "Topology".
 Execute `skills/topology-generation.md` which covers:
 - Data collection via MCP for each view type
 - Mermaid diagram generation with proper shapes
 - Legend and data notes
 ## Output Format
 Always provide:
 1. **Summary** - Brief description
 2. **Mermaid Code Block** - The diagram
 3. **Legend** - Shape explanations
 4. **Data Notes** - Quality issues found
 ## Examples
 - `/cmdb-topology rack server-rack-01` - Rack elevation
 - `/cmdb-topology network` - All network connections
 - `/cmdb-topology network Home` - Network for Home site
 - `/cmdb-topology site Headquarters` - Site overview
 - `/cmdb-topology full` - Full infrastructure
 ## User Request
 $ARGUMENTS
--- a/plugins/cmdb-assistant/commands/initial-setup.md
+++ b/plugins/cmdb-assistant/commands/initial-setup.md
@@ -1,74 +1,164 @@
 ---
-description: Interactive setup wizard for cmdb-assistant plugin
+description: Interactive setup wizard for cmdb-assistant plugin - configures NetBox MCP server
 ---
 # CMDB Assistant Setup Wizard
-Configure the cmdb-assistant plugin with NetBox integration.
+This command sets up the cmdb-assistant plugin with NetBox integration.
 ## Skills to Load
 - `skills/visual-header.md`
 ## Important Context
- **Uses Bash, Read, Write, AskUserQuestion tools** - NOT MCP tools
+- **This command uses Bash, Read, Write, and AskUserQuestion tools** - NOT MCP tools
- **MCP tools unavailable until after setup + session restart**
+- **MCP tools won't work until after setup + session restart**
 - **Uses NetBox MCP server (separate from Gitea MCP)**
-## Usage
+---
-```
+## Phase 1: Environment Validation
 /initial-setup
 ```
-## Instructions
+### Step 1.1: Check Python Version
 Execute `skills/visual-header.md` with context "Setup Wizard".
 ### Phase 1: Environment Validation
 ```bash
 python3 --version
 ```
 If below 3.10, stop and inform user.
-### Phase 2: MCP Server Setup
+If below 3.10, stop setup and inform user.
-1. Locate NetBox MCP server in marketplace
+---
 2. Check virtual environment exists
 3. Create venv if missing: `python3 -m venv .venv && pip install -r requirements.txt`
-### Phase 3: System Configuration
+## Phase 2: MCP Server Setup
-1. Create config directory: `mkdir -p ~/.config/claude`
+### Step 2.1: Locate NetBox MCP Server
 2. Check `~/.config/claude/netbox.env` exists
 3. If missing, ask user for NetBox API URL (must include `/api`)
 4. Create config file with placeholder token
 5. Instruct user to add API token manually
-### Phase 4: Validation
+```bash
-
+find ~/.claude ~/.config/claude -name "mcp_server" -path "*netbox*" 2>/dev/null | head -5
 1. Test API connection if token was added
 2. Report result (200=success, 403=invalid token)
 3. Display completion summary
 4. Remind user to restart session for MCP tools
 ## Completion Summary
 ```
 CMDB-ASSISTANT SETUP COMPLETE
 MCP Server (NetBox):   Ready
 System Config:         ~/.config/claude/netbox.env
 Restart your Claude Code session for MCP tools.
 After restart, try:
 - /cmdb-device <hostname>
 - /cmdb-ip <address>
 - /cmdb-site <name>
 - /cmdb-search <query>
 ```
-## User Request
+If not found, ask user for marketplace location.
-$ARGUMENTS
+### Step 2.2: Check Virtual Environment
 ```bash
 ls -la /path/to/mcp-servers/netbox/.venv/bin/python 2>/dev/null && echo "VENV_EXISTS" || echo "VENV_MISSING"
 ```
 ### Step 2.3: Create Virtual Environment (if missing)
 ```bash
 cd /path/to/mcp-servers/netbox && python3 -m venv .venv && source .venv/bin/activate && pip install --upgrade pip && pip install -r requirements.txt && deactivate
 ```
 ---
 ## Phase 3: System Configuration
 ### Step 3.1: Create Config Directory
 ```bash
 mkdir -p ~/.config/claude
 ```
 ### Step 3.2: Check NetBox Configuration
 ```bash
 cat ~/.config/claude/netbox.env 2>/dev/null || echo "FILE_NOT_FOUND"
 ```
 **If file exists with valid values:** Skip to Phase 4.
 **If missing or has placeholders:** Continue.
 ### Step 3.3: Gather NetBox Information
 Use AskUserQuestion:
 - Question: "What is your NetBox API URL? (e.g., https://netbox.company.com/api)"
 - Header: "NetBox URL"
 - Options:
  - "Other (I'll provide the URL)"
 Ask user to provide the URL.
 **Important:** The URL must include `/api` at the end. If the user provides a URL without `/api`, append it automatically.
 ### Step 3.4: Create Configuration File
 ```bash
 cat > ~/.config/claude/netbox.env << 'EOF'
 # NetBox API Configuration
 # Generated by cmdb-assistant /initial-setup
 NETBOX_API_URL=<USER_PROVIDED_URL>
 NETBOX_API_TOKEN=PASTE_YOUR_TOKEN_HERE
 EOF
 chmod 600 ~/.config/claude/netbox.env
 ```
 ### Step 3.5: Token Instructions
 ---
 **Action Required: Add Your NetBox API Token**
 I've created `~/.config/claude/netbox.env` but you need to add your API token manually.
 **Steps:**
 1. Open: `nano ~/.config/claude/netbox.env`
 2. Generate token in NetBox: Admin → API Tokens → Add Token
 3. Replace `PASTE_YOUR_TOKEN_HERE` with your token
 4. Save the file
 ---
 Use AskUserQuestion:
 - Question: "Have you added your NetBox token?"
 - Header: "Token"
 - Options:
  - "Yes, I've added the token"
  - "Skip for now"
 ---
 ## Phase 4: Validation
 ### Step 4.1: Test Configuration (if token was added)
 ```bash
 source ~/.config/claude/netbox.env && curl -s -o /dev/null -w "%{http_code}" -H "Authorization: Token $NETBOX_API_TOKEN" "$NETBOX_API_URL/"
 ```
 **Note:** The URL already includes `/api`, so we just append `/` for the root API endpoint.
 Report result:
 - 200: Success
 - 403: Invalid token
 - Other: Connection issue
 ### Step 4.2: Summary
 ```
 ╔════════════════════════════════════════════════════════════╗
 ║              CMDB-ASSISTANT SETUP COMPLETE                 ║
 ╠════════════════════════════════════════════════════════════╣
 ║ MCP Server (NetBox):   ✓ Ready                             ║
 ║ System Config:         ✓ ~/.config/claude/netbox.env       ║
 ╚════════════════════════════════════════════════════════════╝
 ```
 ### Step 4.3: Session Restart Notice
 ---
 **⚠️ Session Restart Required**
 Restart your Claude Code session for MCP tools to become available.
 **After restart, you can:**
 - Run `/cmdb-device <hostname>` to look up a device
 - Run `/cmdb-ip <address>` to look up an IP address
 - Run `/cmdb-site <name>` to look up a site
 - Run `/cmdb-search <query>` for general search
 ---
 ## Note on Project Configuration
 cmdb-assistant does not require project-level configuration. The NetBox connection is system-wide and not tied to specific repositories.
--- a/plugins/cmdb-assistant/commands/ip-conflicts.md
+++ b/plugins/cmdb-assistant/commands/ip-conflicts.md
@@ -1,58 +0,0 @@
 ---
 description: Detect IP address conflicts and overlapping prefixes in NetBox
 ---
 # CMDB IP Conflict Detection
 Scan NetBox IPAM data to identify IP address conflicts and overlapping prefixes.
 ## Skills to Load
 - `skills/visual-header.md`
 - `skills/ip-management.md`
 - `skills/mcp-tools-reference.md`
 ## Usage
 ```
 /ip-conflicts [scope]
 ```
 **Scopes:**
 - `all` (default) - Full scan of all IP data
 - `addresses` - Check for duplicate IP addresses only
 - `prefixes` - Check for overlapping prefixes only
 - `vrf <name>` - Scan specific VRF only
 - `prefix <cidr>` - Scan within specific prefix
 ## Instructions
 Execute `skills/visual-header.md` with context "IP Conflict Detection".
 Execute conflict detection from `skills/ip-management.md`:
 1. **Data Collection** - Fetch IPs, prefixes, VRFs via MCP
 2. **Duplicate Detection** - Group by address+VRF, flag >1 record
 3. **Overlap Detection** - Compare prefixes pairwise using CIDR math
 4. **Orphan IP Detection** - Find IPs without containing prefix
 5. **Generate Report** - Use template from skill
 ## Conflict Types
 | Type | Severity |
 |------|----------|
 | Duplicate IP (same interface type) | CRITICAL |
 | Duplicate IP (different roles) | HIGH |
 | Overlapping prefixes (same status) | HIGH |
 | Overlapping prefixes (container ok) | LOW |
 | Orphan IP | MEDIUM |
 ## Examples
 - `/ip-conflicts` - Full scan
 - `/ip-conflicts addresses` - Duplicate IPs only
 - `/ip-conflicts vrf Production` - Scan specific VRF
 ## User Request
 $ARGUMENTS
--- a/plugins/cmdb-assistant/hooks/hooks.json
+++ b/plugins/cmdb-assistant/hooks/hooks.json
@@ -2,13 +2,8 @@
  "hooks": {
    "SessionStart": [
      {
-        "matcher": "",
+        "type": "command",
-        "hooks": [
+        "command": "${CLAUDE_PLUGIN_ROOT}/hooks/startup-check.sh"
          {
            "type": "command",
            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/startup-check.sh"
          }
        ]
      }
    ],
    "PreToolUse": [
--- a/plugins/cmdb-assistant/hooks/startup-check.sh
+++ b/plugins/cmdb-assistant/hooks/startup-check.sh
@@ -25,24 +25,11 @@ if [[ -z "${NETBOX_API_URL:-}" ]] || [[ -z "${NETBOX_API_TOKEN:-}" ]]; then
    exit 0
 fi
 # Helper function to make authenticated API calls
 # Token passed via curl config to avoid exposure in process listings
 netbox_curl() {
    local url="$1"
    curl -s -K - <<EOF 2>/dev/null
 -H "Authorization: Token ${NETBOX_API_TOKEN}"
 -H "Accept: application/json"
 url = "${url}"
 EOF
 }
 # Quick API connectivity test (5s timeout)
-HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" -m 5 -K - <<EOF 2>/dev/null || echo "000"
+HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" -m 5 \
-H "Authorization: Token ${NETBOX_API_TOKEN}"
+    -H "Authorization: Token $NETBOX_API_TOKEN" \
-H "Accept: application/json"
+    -H "Accept: application/json" \
-url = "${NETBOX_API_URL}/"
+    "${NETBOX_API_URL}/" 2>/dev/null || echo "000")
 EOF
 )
 if [[ "$HTTP_CODE" == "000" ]]; then
    echo "$PREFIX NetBox API unreachable (timeout/connection error)"
@@ -53,12 +40,10 @@ elif [[ "$HTTP_CODE" != "200" ]]; then
 fi
 # Check for VMs without site assignment (data quality)
-VMS_RESPONSE=$(curl -s -m 5 -K - <<EOF 2>/dev/null || echo '{"count":0}'
+VMS_RESPONSE=$(curl -s -m 5 \
-H "Authorization: Token ${NETBOX_API_TOKEN}"
+    -H "Authorization: Token $NETBOX_API_TOKEN" \
-H "Accept: application/json"
+    -H "Accept: application/json" \
-url = "${NETBOX_API_URL}/virtualization/virtual-machines/?site__isnull=true&limit=1"
+    "${NETBOX_API_URL}/virtualization/virtual-machines/?site__isnull=true&limit=1" 2>/dev/null || echo '{"count":0}')
 EOF
 )
 VMS_NO_SITE=$(echo "$VMS_RESPONSE" | grep -o '"count":[0-9]*' | cut -d: -f2 || echo "0")
@@ -67,12 +52,10 @@ if [[ "$VMS_NO_SITE" -gt 0 ]]; then
 fi
 # Check for devices without platform
-DEVICES_RESPONSE=$(curl -s -m 5 -K - <<EOF 2>/dev/null || echo '{"count":0}'
+DEVICES_RESPONSE=$(curl -s -m 5 \
-H "Authorization: Token ${NETBOX_API_TOKEN}"
+    -H "Authorization: Token $NETBOX_API_TOKEN" \
-H "Accept: application/json"
+    -H "Accept: application/json" \
-url = "${NETBOX_API_URL}/dcim/devices/?platform__isnull=true&limit=1"
+    "${NETBOX_API_URL}/dcim/devices/?platform__isnull=true&limit=1" 2>/dev/null || echo '{"count":0}')
 EOF
 )
 DEVICES_NO_PLATFORM=$(echo "$DEVICES_RESPONSE" | grep -o '"count":[0-9]*' | cut -d: -f2 || echo "0")
--- a/plugins/cmdb-assistant/mcp-servers/netbox
+++ b/plugins/cmdb-assistant/mcp-servers/netbox
@@ -0,0 +1 @@
 ../../../mcp-servers/netbox
--- a/plugins/cmdb-assistant/skills/audit-workflow.md
+++ b/plugins/cmdb-assistant/skills/audit-workflow.md
@@ -1,163 +0,0 @@
 # Audit Workflow Skill
 How to audit NetBox data quality.
 ## Prerequisites
 Load these skills:
 - `netbox-patterns` - Best practices reference
 - `mcp-tools-reference` - MCP tool reference
 ## Data Collection
 ```
 virt_list_vms
 dcim_list_devices
 virt_list_clusters
 dcim_list_sites
 tenancy_list_tenants
 dcim_list_device_roles
 dcim_list_platforms
 ```
 ## Quality Checks by Severity
 ### CRITICAL (must fix immediately)
 | Check | Detection |
 |-------|-----------|
 | VMs without cluster | `cluster` is null AND `site` is null |
 | Devices without site | `site` is null |
 | Active devices without primary IP | `status=active` AND `primary_ip4` is null AND `primary_ip6` is null |
 ### HIGH (should fix soon)
 | Check | Detection |
 |-------|-----------|
 | VMs without site | No site (neither direct nor via cluster.site) |
 | VMs without tenant | `tenant` is null |
 | Devices without platform | `platform` is null |
 | Clusters not scoped to site | `site` is null on cluster |
 | VMs without role | `role` is null |
 ### MEDIUM (plan to address)
 | Check | Detection |
 |-------|-----------|
 | Inconsistent naming | Names don't match patterns |
 | Role fragmentation | >10 device roles with <3 assignments each |
 | Missing tags on production | Active resources without tags |
 | Mixed naming separators | Some `_`, others `-` |
 ### LOW (informational)
 | Check | Detection |
 |-------|-----------|
 | Docker containers as VMs | Cluster type is "Docker Compose" |
 | VMs without description | `description` is empty |
 | Sites without physical address | `physical_address` is empty |
 | Devices without serial | `serial` is empty |
 ## Naming Convention Analysis
 ### Expected Patterns
 | Object Type | Pattern | Example |
 |-------------|---------|---------|
 | Devices | `{role}-{location}-{number}` | `web-dc1-01` |
 | VMs | `{env}-{app}-{number}` | `prod-api-01` |
 | Clusters | `{site}-{type}` | `home-docker` |
 ### Analysis Steps
 1. Extract naming patterns from existing objects
 2. Identify dominant patterns (most common)
 3. Flag outliers that don't match
 4. Suggest standardization
 ## Role Fragmentation Analysis
 ### Red Flags
 - More than 15 highly specific roles
 - Roles with technology in name (use platform instead)
 - Roles that duplicate functionality
 - Single-use roles (only 1 device/VM)
 ### Recommended Consolidation
 Use general roles + platform/tags for specificity:
 - Instead of `nginx-web-server`, use `web-server` + platform `nginx`
 ## Report Template
 ```markdown
 ## CMDB Data Quality Audit Report
 **Generated:** [timestamp]
 **Scope:** [scope parameter]
 ### Summary
 | Metric | Count |
 |--------|-------|
 | Total VMs | X |
 | Total Devices | Y |
 | Total Clusters | Z |
 | **Total Issues** | **N** |
 | Severity | Count |
 |----------|-------|
 | Critical | A |
 | High | B |
 | Medium | C |
 | Low | D |
 ### Critical Issues
 [List each with specific object names and IDs]
 - VM `HotServ` (ID: 1) - No cluster or site assignment
 - Device `server-01` (ID: 5) - No site assignment
 ### High Issues
 [List each with specific object names]
 ### Medium Issues
 [Grouped by category with counts]
 ### Recommendations
 1. **[Most impactful fix]** - affects N objects
 2. **[Second priority]** - affects M objects
 ### Quick Fixes
 Commands to fix common issues:
 ```
 # Assign site to VM
 virt_update_vm id=X site=Y
 # Assign platform to device
 dcim_update_device id=X platform=Y
 ```
 ### Next Steps
 - Run `/cmdb-register` to properly register new machines
 - Use `/cmdb-sync` to update existing registrations
 - Consider bulk updates via NetBox web UI for >10 items
 ```
 ## Scope-Specific Focus
 | Scope | Focus |
 |-------|-------|
 | `all` | Full audit across all categories |
 | `vms` | Virtual Machine checks only |
 | `devices` | Device checks only |
 | `naming` | Naming convention analysis |
 | `roles` | Role fragmentation analysis |
--- a/plugins/cmdb-assistant/skills/change-audit.md
+++ b/plugins/cmdb-assistant/skills/change-audit.md
@@ -1,130 +0,0 @@
 # Change Audit Skill
 Audit NetBox changes for tracking and compliance.
 ## Prerequisites
 Load skill: `mcp-tools-reference`
 ## MCP Tools
 | Tool | Purpose | Parameters |
 |------|---------|------------|
 | `extras_list_object_changes` | List changes | `user_id`, `changed_object_type`, `action` |
 | `extras_get_object_change` | Get change details | `id` |
 ## Common Object Types
 | Category | Object Types |
 |----------|--------------|
 | DCIM | `dcim.device`, `dcim.interface`, `dcim.site`, `dcim.rack`, `dcim.cable` |
 | IPAM | `ipam.ipaddress`, `ipam.prefix`, `ipam.vlan`, `ipam.vrf` |
 | Virtualization | `virtualization.virtualmachine`, `virtualization.cluster` |
 | Tenancy | `tenancy.tenant`, `tenancy.contact` |
 ## Audit Workflow
 1. **Parse user request** - Determine filters
 2. **Query object changes** - `extras_list_object_changes`
 3. **Enrich data** - Fetch detailed records if needed
 4. **Analyze patterns** - Identify bulk operations, unusual activity
 5. **Generate report** - Structured format
 ## Report Template
 ```markdown
 ## NetBox Change Audit Report
 **Generated:** [timestamp]
 **Period:** [date range or "All time"]
 **Filters:** [applied filters]
 ### Summary
 | Metric | Count |
 |--------|-------|
 | Total Changes | X |
 | Creates | Y |
 | Updates | Z |
 | Deletes | W |
 | Unique Users | N |
 | Object Types | M |
 ### Changes by Action
 #### Created Objects (Y)
 | Time | User | Object Type | Object | Details |
 |------|------|-------------|--------|---------|
 | 2024-01-15 14:30 | admin | dcim.device | server-01 | Created device |
 #### Updated Objects (Z)
 | Time | User | Object Type | Object | Changed Fields |
 |------|------|-------------|--------|----------------|
 | 2024-01-15 15:00 | john | ipam.ipaddress | 10.0.1.50/24 | status, description |
 #### Deleted Objects (W)
 | Time | User | Object Type | Object | Details |
 |------|------|-------------|--------|---------|
 | 2024-01-14 09:00 | admin | dcim.interface | eth2 | Removed from server-01 |
 ### Changes by User
 | User | Creates | Updates | Deletes | Total |
 |------|---------|---------|---------|-------|
 | admin | 5 | 10 | 2 | 17 |
 | john | 3 | 8 | 0 | 11 |
 ### Changes by Object Type
 | Object Type | Creates | Updates | Deletes | Total |
 |-------------|---------|---------|---------|-------|
 | dcim.device | 2 | 5 | 0 | 7 |
 | ipam.ipaddress | 4 | 3 | 1 | 8 |
 ### Timeline
 ```
 2024-01-15: ######## 8 changes
 2024-01-14: ####     4 changes
 2024-01-13: ##       2 changes
 ```
 ### Notable Patterns
 - **Bulk operations:** [Many changes in short time]
 - **Unusual activity:** [Unexpected deletions, after-hours changes]
 - **Missing audit trail:** [Expected changes not logged]
 ### Recommendations
 1. [Security or process recommendations based on findings]
 ```
 ## Enriching Change Details
 For detailed audit, use `extras_get_object_change` to see:
 - `prechange_data` - Object state before change
 - `postchange_data` - Object state after change
 - `request_id` - Links related changes in same request
 ## Security Audit Mode
 When user asks for "security audit" or "compliance report":
 1. Focus on deletions and permission-sensitive changes
 2. Highlight changes to critical objects (firewalls, VRFs, prefixes)
 3. Flag changes outside business hours
 4. Identify users with high change counts
 ## Filter Examples
 | Request | Filter |
 |---------|--------|
 | Recent changes | None (last 24 hours default) |
 | Last 7 days | Filter by `time` field |
 | By user | `user_id=<id>` |
 | Device changes | `changed_object_type=dcim.device` |
 | All deletions | `action=delete` |
--- a/plugins/cmdb-assistant/skills/device-registration.md
+++ b/plugins/cmdb-assistant/skills/device-registration.md
@@ -1,177 +0,0 @@
 # Device Registration Skill
 How to register devices into NetBox.
 ## Prerequisites
 Load these skills:
 - `system-discovery` - Bash commands for gathering system info
 - `netbox-patterns` - Best practices for data quality
 - `mcp-tools-reference` - MCP tool reference
 ## Registration Workflow
 ### Phase 1: System Discovery
 Use commands from `system-discovery` skill to gather:
 - Hostname, OS, hardware model, serial number
 - CPU, memory, disk
 - Network interfaces with IPs
 - Running Docker containers
 ### Phase 2: Pre-Registration Checks
 1. **Check if device exists:**
   ```
   dcim_list_devices name=<hostname>
   ```
   If exists, suggest `/cmdb-sync` instead.
 2. **Verify/Create site:**
   ```
   dcim_list_sites name=<site-name>
   ```
   If not found, list available sites or offer to create.
 3. **Verify/Create platform:**
   ```
   dcim_list_platforms name=<platform-name>
   ```
   Create if not exists with `dcim_create_platform`.
 4. **Verify/Create device role:**
   ```
   dcim_list_device_roles name=<role-name>
   ```
 ### Phase 3: Device Creation
 1. **Get/Create manufacturer and device type:**
   ```
   dcim_list_manufacturers name="<manufacturer>"
   dcim_list_device_types manufacturer_id=X model="<model>"
   ```
 2. **Create device:**
   ```
   dcim_create_device
     name=<hostname>
     device_type=<device_type_id>
     role=<role_id>
     site=<site_id>
     platform=<platform_id>
     tenant=<tenant_id>  # if provided
     serial=<serial>
     description="Registered via cmdb-assistant"
   ```
 3. **Create interfaces:**
   For each network interface:
   ```
   dcim_create_interface
     device=<device_id>
     name=<interface_name>
     type=<type>
     mac_address=<mac>
     enabled=true
   ```
 4. **Create IP addresses:**
   For each IP:
   ```
   ipam_create_ip_address
     address=<ip/prefix>
     assigned_object_type="dcim.interface"
     assigned_object_id=<interface_id>
     status="active"
   ```
 5. **Set primary IP:**
   ```
   dcim_update_device
     id=<device_id>
     primary_ip4=<primary_ip_id>
   ```
 ### Phase 4: Container Registration (if Docker)
 1. **Create/Get cluster type:**
   ```
   virt_list_cluster_types name="Docker Compose"
   virt_create_cluster_type name="Docker Compose" slug="docker-compose"
   ```
 2. **Create cluster:**
   ```
   virt_create_cluster
     name=<project-name>
     type=<cluster_type_id>
     site=<site_id>
     description="Docker Compose stack on <hostname>"
   ```
 3. **Create VMs for containers:**
   For each running container:
   ```
   virt_create_vm
     name=<container_name>
     cluster=<cluster_id>
     site=<site_id>
     role=<role_id>
     status="active"
     vcpus=<cpu_shares>
     memory=<memory_mb>
     disk=<disk_gb>
   ```
 ### Phase 5: Documentation
 Add journal entry:
 ```
 extras_create_journal_entry
  assigned_object_type="dcim.device"
  assigned_object_id=<device_id>
  comments="Device registered via /cmdb-register command\n\nDiscovered:\n- X network interfaces\n- Y IP addresses\n- Z Docker containers"
 ```
 ## Summary Report Template
 ```markdown
 ## Machine Registration Complete
 ### Device Created
 - **Name:** <hostname>
 - **Site:** <site>
 - **Platform:** <platform>
 - **Role:** <role>
 - **ID:** <device_id>
 - **URL:** https://netbox.example.com/dcim/devices/<id>/
 ### Network Interfaces
 | Interface | Type | MAC | IP Address |
 |-----------|------|-----|------------|
 | eth0 | 1000base-t | aa:bb:cc:dd:ee:ff | 192.168.1.100/24 |
 ### Primary IP: 192.168.1.100
 ### Docker Containers Registered (if applicable)
 **Cluster:** <cluster_name> (ID: <cluster_id>)
 | Container | Role | vCPUs | Memory | Status |
 |-----------|------|-------|--------|--------|
 | media_jellyfin | Media Server | 2.0 | 2048MB | Active |
 ### Next Steps
 - Run `/cmdb-sync` periodically to keep data current
 - Run `/cmdb-audit` to check data quality
 - Add tags for classification
 ```
 ## Error Handling
 | Error | Action |
 |-------|--------|
 | Device already exists | Suggest `/cmdb-sync` or ask to proceed |
 | Site not found | List available sites, offer to create new |
 | Docker not available | Skip container registration, note in summary |
 | Permission denied | Note which operations failed, suggest fixes |
--- a/plugins/cmdb-assistant/skills/ip-management.md
+++ b/plugins/cmdb-assistant/skills/ip-management.md
@@ -1,162 +0,0 @@
 # IP Management Skill
 IP address and prefix management in NetBox.
 ## Prerequisites
 Load skill: `mcp-tools-reference`
 ## IPAM Operations
 ### Prefix Management
 | Action | Tool | Key Parameters |
 |--------|------|----------------|
 | List prefixes | `ipam_list_prefixes` | `prefix`, `vrf_id`, `within`, `contains` |
 | Get details | `ipam_get_prefix` | `id` |
 | Find available child | `ipam_list_available_prefixes` | `prefix_id` |
 | Create prefix | `ipam_create_prefix` | `prefix`, `status`, `site`, `vrf` |
 | Allocate child | `ipam_create_available_prefix` | `prefix_id`, `prefix_length` |
 ### IP Address Management
 | Action | Tool | Key Parameters |
 |--------|------|----------------|
 | List IPs | `ipam_list_ip_addresses` | `address`, `vrf_id`, `device_id` |
 | Get details | `ipam_get_ip_address` | `id` |
 | Find available | `ipam_list_available_ips` | `prefix_id` |
 | Create IP | `ipam_create_ip_address` | `address`, `assigned_object_type`, `assigned_object_id` |
 | Allocate next | `ipam_create_available_ip` | `prefix_id` |
 | Assign to interface | `ipam_update_ip_address` | `id`, `assigned_object_id` |
 ### VLAN and VRF
 | Action | Tool |
 |--------|------|
 | List VLANs | `ipam_list_vlans` |
 | Get VLAN | `ipam_get_vlan` |
 | Create VLAN | `ipam_create_vlan` |
 | List VRFs | `ipam_list_vrfs` |
 | Get VRF | `ipam_get_vrf` |
 ## IP Allocation Workflow
 1. **Find available IPs in target prefix:**
   ```
   ipam_list_available_ips prefix_id=<id>
   ```
 2. **Create the IP address:**
   ```
   ipam_create_ip_address
     address=<ip/prefix>
     assigned_object_type="dcim.interface"
     assigned_object_id=<interface_id>
     status="active"
   ```
 3. **Set as primary (if needed):**
   ```
   dcim_update_device id=<device_id> primary_ip4=<ip_id>
   ```
 ## IP Conflict Detection
 ### Conflict Types
 1. **Duplicate IP Addresses**
   - Multiple records with same address in same VRF
   - Exception: Anycast addresses (check `role` field)
 2. **Overlapping Prefixes**
   - Prefixes containing same address space in same VRF
   - Legitimate: Parent/child hierarchy, different VRFs, "container" status
 3. **IPs Outside Prefix**
   - IP addresses not within any defined prefix
 4. **Same Prefix in Multiple VRFs** (informational)
 ### Detection Workflow
 1. **Duplicate Detection:**
   - Get all addresses: `ipam_list_ip_addresses`
   - Group by address + VRF
   - Flag groups with >1 record
 2. **Overlap Detection:**
   - Get all prefixes: `ipam_list_prefixes`
   - For each VRF, compare prefixes pairwise
   - Check if prefix A contains prefix B or vice versa
   - Ignore legitimate hierarchies (status=container)
 3. **Orphan IP Detection:**
   - For each IP, find containing prefix
   - Flag IPs with no prefix match
 ### CIDR Math Rules
 - Prefix A **contains** Prefix B if: `A.network <= B.network AND A.broadcast >= B.broadcast`
 - Two prefixes **overlap** if: `A.network <= B.broadcast AND B.network <= A.broadcast`
 ### Severity Levels
 | Issue | Severity |
 |-------|----------|
 | Duplicate IP (same interface type) | CRITICAL |
 | Duplicate IP (different roles) | HIGH |
 | Overlapping prefixes (same status) | HIGH |
 | Overlapping prefixes (container ok) | LOW |
 | Orphan IP | MEDIUM |
 ## Conflict Report Template
 ```markdown
 ## IP Conflict Detection Report
 **Generated:** [timestamp]
 **Scope:** [scope parameter]
 ### Summary
 | Check | Status | Count |
 |-------|--------|-------|
 | Duplicate IPs | [PASS/FAIL] | X |
 | Overlapping Prefixes | [PASS/FAIL] | Y |
 | Orphan IPs | [PASS/FAIL] | Z |
 ### Critical Issues
 #### Duplicate IP Addresses
 | Address | VRF | Count | Assigned To |
 |---------|-----|-------|-------------|
 | 10.0.1.50/24 | Global | 2 | server-01, server-02 |
 **Resolution:**
 - Determine which device should have the IP
 - Update or remove the duplicate
 #### Overlapping Prefixes
 | Prefix 1 | Prefix 2 | VRF | Type |
 |----------|----------|-----|------|
 | 10.0.0.0/24 | 10.0.0.0/25 | Global | Unstructured |
 **Resolution:**
 - For legitimate hierarchies: Mark parent as status="container"
 - For accidental: Consolidate or re-address
 ### Remediation Commands
 ```
 # Remove duplicate IP
 ipam_delete_ip_address id=123
 # Mark prefix as container
 ipam_update_prefix id=456 status=container
 # Create missing prefix
 ipam_create_prefix prefix=172.16.5.0/24 status=active
 ```
 ```
--- a/plugins/cmdb-assistant/skills/mcp-tools-reference.md
+++ b/plugins/cmdb-assistant/skills/mcp-tools-reference.md
@@ -1,281 +0,0 @@
 # NetBox MCP Tools Reference
 Complete reference for NetBox MCP tools organized by category.
 ## DCIM (Data Center Infrastructure Management)
 ### Sites and Locations
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `dcim_list_sites` | List all sites | `name`, `status`, `region_id` |
 | `dcim_get_site` | Get site details | `id` |
 | `dcim_create_site` | Create new site | `name`, `slug`, `status` |
 | `dcim_update_site` | Update site | `id`, fields to update |
 | `dcim_delete_site` | Delete site | `id` |
 | `dcim_list_locations` | List locations within sites | `site_id`, `parent_id` |
 | `dcim_get_location` | Get location details | `id` |
 | `dcim_create_location` | Create location | `name`, `slug`, `site` |
 | `dcim_update_location` | Update location | `id`, fields to update |
 | `dcim_delete_location` | Delete location | `id` |
 | `dcim_list_regions` | List regions | `name` |
 | `dcim_get_region` | Get region details | `id` |
 | `dcim_create_region` | Create region | `name`, `slug` |
 | `dcim_update_region` | Update region | `id`, fields to update |
 | `dcim_delete_region` | Delete region | `id` |
 ### Racks
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `dcim_list_racks` | List racks | `site_id`, `location_id`, `name` |
 | `dcim_get_rack` | Get rack details | `id` |
 | `dcim_create_rack` | Create rack | `name`, `site`, `u_height` |
 | `dcim_update_rack` | Update rack | `id`, fields to update |
 | `dcim_delete_rack` | Delete rack | `id` |
 ### Devices
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `dcim_list_devices` | List devices | `name`, `site_id`, `role_id`, `status` |
 | `dcim_get_device` | Get device details | `id` |
 | `dcim_create_device` | Create device | `name`, `device_type`, `role`, `site` |
 | `dcim_update_device` | Update device | `id`, `primary_ip4`, etc. |
 | `dcim_delete_device` | Delete device | `id` |
 ### Device Types and Roles
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `dcim_list_device_types` | List device types | `manufacturer_id`, `model` |
 | `dcim_get_device_type` | Get type details | `id` |
 | `dcim_create_device_type` | Create device type | `manufacturer`, `model`, `slug` |
 | `dcim_update_device_type` | Update device type | `id`, fields |
 | `dcim_delete_device_type` | Delete device type | `id` |
 | `dcim_list_device_roles` | List device roles | `name` |
 | `dcim_get_device_role` | Get role details | `id` |
 | `dcim_create_device_role` | Create device role | `name`, `slug` |
 | `dcim_update_device_role` | Update device role | `id`, fields |
 | `dcim_delete_device_role` | Delete device role | `id` |
 ### Manufacturers and Platforms
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `dcim_list_manufacturers` | List manufacturers | `name` |
 | `dcim_get_manufacturer` | Get manufacturer details | `id` |
 | `dcim_create_manufacturer` | Create manufacturer | `name`, `slug` |
 | `dcim_update_manufacturer` | Update manufacturer | `id`, fields |
 | `dcim_delete_manufacturer` | Delete manufacturer | `id` |
 | `dcim_list_platforms` | List platforms | `name` |
 | `dcim_get_platform` | Get platform details | `id` |
 | `dcim_create_platform` | Create platform | `name`, `slug` |
 | `dcim_update_platform` | Update platform | `id`, fields |
 | `dcim_delete_platform` | Delete platform | `id` |
 ### Interfaces and Cables
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `dcim_list_interfaces` | List interfaces | `device_id`, `name`, `type` |
 | `dcim_get_interface` | Get interface details | `id` |
 | `dcim_create_interface` | Create interface | `device`, `name`, `type` |
 | `dcim_update_interface` | Update interface | `id`, `enabled`, `mac_address` |
 | `dcim_delete_interface` | Delete interface | `id` |
 | `dcim_list_cables` | List cables | `device_id`, `site_id` |
 | `dcim_get_cable` | Get cable details | `id` |
 | `dcim_create_cable` | Create cable | `a_terminations`, `b_terminations` |
 | `dcim_update_cable` | Update cable | `id`, fields |
 | `dcim_delete_cable` | Delete cable | `id` |
 ### Power
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `dcim_list_power_panels` | List power panels | `site_id` |
 | `dcim_get_power_panel` | Get panel details | `id` |
 | `dcim_create_power_panel` | Create power panel | `name`, `site` |
 | `dcim_list_power_feeds` | List power feeds | `power_panel_id` |
 | `dcim_get_power_feed` | Get feed details | `id` |
 | `dcim_create_power_feed` | Create power feed | `name`, `power_panel`, `supply` |
 ### Other DCIM
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `dcim_list_virtual_chassis` | List virtual chassis | (varies) |
 | `dcim_get_virtual_chassis` | Get virtual chassis | `id` |
 | `dcim_list_inventory_items` | List inventory items | `device_id` |
 | `dcim_get_inventory_item` | Get inventory item | `id` |
 ## IPAM (IP Address Management)
 ### Prefixes
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `ipam_list_prefixes` | List prefixes | `prefix`, `vrf_id`, `within`, `contains` |
 | `ipam_get_prefix` | Get prefix details | `id` |
 | `ipam_create_prefix` | Create prefix | `prefix`, `status`, `site`, `vrf` |
 | `ipam_update_prefix` | Update prefix | `id`, `status`, etc. |
 | `ipam_delete_prefix` | Delete prefix | `id` |
 | `ipam_list_available_prefixes` | List available child prefixes | `prefix_id` |
 | `ipam_create_available_prefix` | Allocate from parent | `prefix_id`, `prefix_length` |
 ### IP Addresses
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `ipam_list_ip_addresses` | List IP addresses | `address`, `vrf_id`, `device_id`, `status` |
 | `ipam_get_ip_address` | Get IP details | `id` |
 | `ipam_create_ip_address` | Create IP address | `address`, `assigned_object_type`, `assigned_object_id` |
 | `ipam_update_ip_address` | Update IP address | `id`, `status`, etc. |
 | `ipam_delete_ip_address` | Delete IP address | `id` |
 | `ipam_list_available_ips` | List available IPs in prefix | `prefix_id` |
 | `ipam_create_available_ip` | Allocate next available | `prefix_id` |
 ### VLANs and VRFs
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `ipam_list_vlans` | List VLANs | `vid`, `name`, `site_id` |
 | `ipam_get_vlan` | Get VLAN details | `id` |
 | `ipam_create_vlan` | Create VLAN | `vid`, `name`, `site` |
 | `ipam_update_vlan` | Update VLAN | `id`, fields |
 | `ipam_delete_vlan` | Delete VLAN | `id` |
 | `ipam_list_vlan_groups` | List VLAN groups | `site_id` |
 | `ipam_get_vlan_group` | Get VLAN group | `id` |
 | `ipam_create_vlan_group` | Create VLAN group | `name`, `slug`, `scope_type` |
 | `ipam_list_vrfs` | List VRFs | `name` |
 | `ipam_get_vrf` | Get VRF details | `id` |
 | `ipam_create_vrf` | Create VRF | `name`, `rd` |
 | `ipam_update_vrf` | Update VRF | `id`, fields |
 | `ipam_delete_vrf` | Delete VRF | `id` |
 ### Other IPAM
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `ipam_list_asns` | List ASNs | (varies) |
 | `ipam_get_asn` | Get ASN details | `id` |
 | `ipam_create_asn` | Create ASN | `asn`, `rir` |
 | `ipam_list_rirs` | List RIRs | `name` |
 | `ipam_get_rir` | Get RIR details | `id` |
 | `ipam_list_aggregates` | List aggregates | `prefix`, `rir_id` |
 | `ipam_get_aggregate` | Get aggregate | `id` |
 | `ipam_create_aggregate` | Create aggregate | `prefix`, `rir` |
 | `ipam_list_services` | List services | `device_id`, `name` |
 | `ipam_get_service` | Get service details | `id` |
 | `ipam_create_service` | Create service | `name`, `ports`, `protocol` |
 ## Virtualization
 ### Clusters
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `virt_list_cluster_types` | List cluster types | `name` |
 | `virt_get_cluster_type` | Get cluster type | `id` |
 | `virt_create_cluster_type` | Create cluster type | `name`, `slug` |
 | `virt_list_cluster_groups` | List cluster groups | `name` |
 | `virt_get_cluster_group` | Get cluster group | `id` |
 | `virt_create_cluster_group` | Create cluster group | `name`, `slug` |
 | `virt_list_clusters` | List clusters | `name`, `site_id`, `type_id` |
 | `virt_get_cluster` | Get cluster details | `id` |
 | `virt_create_cluster` | Create cluster | `name`, `type`, `site` |
 | `virt_update_cluster` | Update cluster | `id`, fields |
 | `virt_delete_cluster` | Delete cluster | `id` |
 ### Virtual Machines
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `virt_list_vms` | List VMs | `name`, `cluster_id`, `site_id`, `status` |
 | `virt_get_vm` | Get VM details | `id` |
 | `virt_create_vm` | Create VM | `name`, `cluster`, `site`, `status` |
 | `virt_update_vm` | Update VM | `id`, `status`, etc. |
 | `virt_delete_vm` | Delete VM | `id` |
 | `virt_list_vm_ifaces` | List VM interfaces | `virtual_machine_id` |
 | `virt_get_vm_iface` | Get VM interface | `id` |
 | `virt_create_vm_iface` | Create VM interface | `virtual_machine`, `name` |
 ## Circuits
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `circuits_list_providers` | List providers | `name` |
 | `circuits_get_provider` | Get provider | `id` |
 | `circuits_create_provider` | Create provider | `name`, `slug` |
 | `circuits_update_provider` | Update provider | `id`, fields |
 | `circuits_delete_provider` | Delete provider | `id` |
 | `circ_list_types` | List circuit types | `name` |
 | `circ_get_type` | Get circuit type | `id` |
 | `circ_create_type` | Create circuit type | `name`, `slug` |
 | `circuits_list_circuits` | List circuits | `provider_id`, `type_id` |
 | `circuits_get_circuit` | Get circuit | `id` |
 | `circuits_create_circuit` | Create circuit | `cid`, `provider`, `type` |
 | `circuits_update_circuit` | Update circuit | `id`, fields |
 | `circuits_delete_circuit` | Delete circuit | `id` |
 | `circ_list_terminations` | List terminations | `circuit_id` |
 | `circ_get_termination` | Get termination | `id` |
 | `circ_create_termination` | Create termination | `circuit`, `site`, `term_side` |
 ## Tenancy
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `tenancy_list_tenant_groups` | List tenant groups | `name` |
 | `tenancy_get_tenant_group` | Get tenant group | `id` |
 | `tenancy_create_tenant_group` | Create tenant group | `name`, `slug` |
 | `tenancy_list_tenants` | List tenants | `name`, `group_id` |
 | `tenancy_get_tenant` | Get tenant | `id` |
 | `tenancy_create_tenant` | Create tenant | `name`, `slug` |
 | `tenancy_update_tenant` | Update tenant | `id`, fields |
 | `tenancy_delete_tenant` | Delete tenant | `id` |
 | `tenancy_list_contacts` | List contacts | `name` |
 | `tenancy_get_contact` | Get contact | `id` |
 | `tenancy_create_contact` | Create contact | `name` |
 ## VPN
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `vpn_list_tunnels` | List VPN tunnels | `name` |
 | `vpn_get_tunnel` | Get tunnel | `id` |
 | `vpn_create_tunnel` | Create tunnel | `name`, `status` |
 | `vpn_list_l2vpns` | List L2VPNs | `name` |
 | `vpn_get_l2vpn` | Get L2VPN | `id` |
 | `vpn_create_l2vpn` | Create L2VPN | `name`, `type` |
 | `vpn_list_ike_policies` | List IKE policies | (varies) |
 | `vpn_list_ipsec_policies` | List IPSec policies | (varies) |
 | `vpn_list_ipsec_profiles` | List IPSec profiles | (varies) |
 ## Wireless
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `wlan_list_groups` | List WLAN groups | `name` |
 | `wlan_get_group` | Get WLAN group | `id` |
 | `wlan_create_group` | Create WLAN group | `name`, `slug` |
 | `wlan_list_lans` | List WLANs | `ssid` |
 | `wlan_get_lan` | Get WLAN | `id` |
 | `wlan_create_lan` | Create WLAN | `ssid`, `group` |
 | `wlan_list_links` | List wireless links | (varies) |
 | `wlan_get_link` | Get wireless link | `id` |
 ## Extras
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `extras_list_tags` | List tags | `name` |
 | `extras_get_tag` | Get tag | `id` |
 | `extras_create_tag` | Create tag | `name`, `slug`, `color` |
 | `extras_update_tag` | Update tag | `id`, fields |
 | `extras_delete_tag` | Delete tag | `id` |
 | `extras_list_custom_fields` | List custom fields | `name` |
 | `extras_get_custom_field` | Get custom field | `id` |
 | `extras_list_webhooks` | List webhooks | `name` |
 | `extras_get_webhook` | Get webhook | `id` |
 | `extras_list_journal_entries` | List journal entries | `assigned_object_type`, `assigned_object_id` |
 | `extras_get_journal_entry` | Get journal entry | `id` |
 | `extras_create_journal_entry` | Create journal entry | `assigned_object_type`, `assigned_object_id`, `comments` |
 | `extras_list_object_changes` | List audit log | `user_id`, `changed_object_type`, `action` |
 | `extras_get_object_change` | Get change details | `id` |
 | `extras_list_config_contexts` | List config contexts | `name` |
 | `extras_get_config_context` | Get config context | `id` |
 ## Common Object Types for Filtering
 | Category | Object Types |
 |----------|--------------|
 | DCIM | `dcim.device`, `dcim.interface`, `dcim.site`, `dcim.rack`, `dcim.cable` |
 | IPAM | `ipam.ipaddress`, `ipam.prefix`, `ipam.vlan`, `ipam.vrf` |
 | Virtualization | `virtualization.virtualmachine`, `virtualization.cluster` |
 | Tenancy | `tenancy.tenant`, `tenancy.contact` |
--- a/plugins/cmdb-assistant/skills/sync-workflow.md
+++ b/plugins/cmdb-assistant/skills/sync-workflow.md
@@ -1,191 +0,0 @@
 # Sync Workflow Skill
 How to synchronize machine state with NetBox.
 ## Prerequisites
 Load these skills:
 - `system-discovery` - Bash commands for system info
 - `mcp-tools-reference` - MCP tool reference
 ## Sync Workflow
 ### Phase 1: Device Lookup
 ```
 dcim_list_devices name=<hostname>
 ```
 If not found, suggest `/cmdb-register` first.
 If found:
 - Store device ID and current field values
 - Fetch interfaces: `dcim_list_interfaces device_id=<device_id>`
 - Fetch IPs: `ipam_list_ip_addresses device_id=<device_id>`
 - Check clusters/VMs: `virt_list_clusters`, `virt_list_vms cluster=<cluster_id>`
 ### Phase 2: Current State Discovery
 Use commands from `system-discovery` skill.
 ### Phase 3: Comparison
 #### Device Attributes
 | Field | Compare |
 |-------|---------|
 | Platform | OS version changed? |
 | Status | Still active? |
 | Serial | Match? |
 | Description | Keep existing |
 #### Network Interfaces
 | Change Type | Detection |
 |-------------|-----------|
 | New interface | Exists locally but not in NetBox |
 | Removed interface | In NetBox but not locally |
 | Changed MAC | MAC address different |
 | Interface type | Type mismatch |
 #### IP Addresses
 | Change Type | Detection |
 |-------------|-----------|
 | New IP | Exists locally but not in NetBox |
 | Removed IP | In NetBox but not locally |
 | Primary IP changed | Default route interface changed |
 #### Docker Containers
 | Change Type | Detection |
 |-------------|-----------|
 | New container | Running locally but no VM in cluster |
 | Stopped container | VM exists but container not running |
 | Resource change | vCPUs/memory different |
 ### Phase 4: Diff Report
 ```markdown
 ## Sync Diff Report
 **Device:** <hostname> (ID: <device_id>)
 **NetBox URL:** https://netbox.example.com/dcim/devices/<id>/
 ### Device Attributes
 | Field | NetBox Value | Current Value | Action |
 |-------|--------------|---------------|--------|
 | Platform | Ubuntu 22.04 | Ubuntu 24.04 | UPDATE |
 ### Network Interfaces
 #### New Interfaces (will create)
 | Interface | Type | MAC | IPs |
 |-----------|------|-----|-----|
 | tailscale0 | virtual | - | 100.x.x.x/32 |
 #### Removed Interfaces (will mark offline)
 | Interface | Type | Reason |
 |-----------|------|--------|
 | eth1 | 1000base-t | Not found locally |
 #### Changed Interfaces
 | Interface | Field | Old | New |
 |-----------|-------|-----|-----|
 | eth0 | mac_address | aa:bb:cc:00:00:00 | aa:bb:cc:11:11:11 |
 ### IP Addresses
 #### New IPs (will create)
 - 192.168.1.150/24 on eth0
 #### Removed IPs (will unassign)
 - 192.168.1.100/24 from eth0
 ### Docker Containers
 #### New Containers (will create VMs)
 | Container | Image | Role |
 |-----------|-------|------|
 | media_lidarr | linuxserver/lidarr | Media Management |
 ### Summary
 - **Updates:** X
 - **Creates:** Y
 - **Removals/Offline:** Z
 ```
 ### Phase 5: Apply Updates
 #### Device Updates
 ```
 dcim_update_device id=<device_id> platform=<new_platform_id>
 ```
 #### Interface Updates
 New:
 ```
 dcim_create_interface device=<device_id> name=<name> type=<type>
 ```
 Removed (mark offline):
 ```
 dcim_update_interface id=<id> enabled=false description="Marked offline by cmdb-sync"
 ```
 Changed:
 ```
 dcim_update_interface id=<id> mac_address=<new_mac>
 ```
 #### IP Address Updates
 New:
 ```
 ipam_create_ip_address address=<ip/prefix> assigned_object_type="dcim.interface" assigned_object_id=<id>
 ```
 Removed (unassign):
 ```
 ipam_update_ip_address id=<id> assigned_object_type=null assigned_object_id=null
 ```
 #### Primary IP Update
 ```
 dcim_update_device id=<device_id> primary_ip4=<new_primary_ip_id>
 ```
 #### Container/VM Updates
 New:
 ```
 virt_create_vm name=<name> cluster=<cluster_id> status="active"
 ```
 Stopped:
 ```
 virt_update_vm id=<id> status="offline"
 ```
 ### Phase 6: Journal Entry
 ```
 extras_create_journal_entry
  assigned_object_type="dcim.device"
  assigned_object_id=<device_id>
  comments="Device synced via /cmdb-sync command\n\nChanges applied:\n- <list>"
 ```
 ## Sync Modes
 ### Dry Run Mode
 - Complete phases 1-4 (lookup, discovery, compare, diff report)
 - Skip phases 5-6 (no updates, no journal)
 - End with: "Dry run complete. No changes applied."
 ### Full Sync Mode
 - Skip user confirmation
 - Update all fields even if unchanged (force refresh)
 ## Error Handling
 | Error | Action |
 |-------|--------|
 | Device not found | Suggest `/cmdb-register` |
 | Permission denied | Note which failed, continue others |
 | Cluster not found | Offer to create or skip container sync |
 | API errors | Log error, continue with remaining |
--- a/plugins/cmdb-assistant/skills/system-discovery.md
+++ b/plugins/cmdb-assistant/skills/system-discovery.md
@@ -1,101 +0,0 @@
 # System Discovery Skill
 Bash commands for gathering system information from the current machine.
 ## Basic Device Information
 ```bash
 # Hostname
 hostname
 # OS/Platform info
 cat /etc/os-release 2>/dev/null || uname -a
 # Hardware model - Raspberry Pi
 cat /proc/device-tree/model 2>/dev/null || echo "Unknown"
 # Hardware model - x86 systems
 cat /sys/class/dmi/id/product_name 2>/dev/null || echo "Unknown"
 # Serial number - Raspberry Pi
 cat /proc/device-tree/serial-number 2>/dev/null || cat /proc/cpuinfo | grep Serial | cut -d: -f2 | tr -d ' ' 2>/dev/null
 # Serial number - x86 systems
 cat /sys/class/dmi/id/product_serial 2>/dev/null || echo "Unknown"
 # CPU count
 nproc
 # Memory in MB
 free -m | awk '/Mem:/ {print $2}'
 # Disk size in GB (root filesystem)
 df -BG / | awk 'NR==2 {print $2}' | tr -d 'G'
 ```
 ## Network Interfaces
 ```bash
 # Get interfaces with IPs (JSON format)
 ip -j addr show 2>/dev/null || ip addr show
 # Get default gateway interface
 ip route | grep default | awk '{print $5}' | head -1
 # Get MAC addresses
 ip -j link show 2>/dev/null || ip link show
 ```
 ## Running Applications
 ```bash
 # Docker containers (JSON format)
 docker ps --format '{"name":"{{.Names}}","image":"{{.Image}}","status":"{{.Status}}","ports":"{{.Ports}}"}' 2>/dev/null || echo "Docker not available"
 # Docker Compose projects (find compose files)
 find ~/apps /home/*/apps -name "docker-compose.yml" -o -name "docker-compose.yaml" 2>/dev/null | head -20
 # Running systemd services
 systemctl list-units --type=service --state=running --no-pager --plain 2>/dev/null | grep -v "^UNIT" | head -30
 ```
 ## Interface Type Mapping
 | Interface Pattern | NetBox Type |
 |-------------------|-------------|
 | `eth*`, `enp*` | `1000base-t` |
 | `wlan*` | `ieee802.11ax` |
 | `tailscale*`, `docker*`, `br-*` | `virtual` |
 | `lo` | Skip (loopback) |
 ## Platform Detection
 Based on OS detected, determine platform name:
 | OS Detection | Platform Name |
 |--------------|---------------|
 | Raspberry Pi OS | `Raspberry Pi OS (Bookworm)` |
 | Ubuntu | `Ubuntu {version} LTS` |
 | Debian | `Debian {version}` |
 | Default | `{OS Name} {Version}` |
 ## Device Role Auto-Detection
 Based on detected services:
 | Detection | Suggested Role |
 |-----------|----------------|
 | Docker containers found | `Docker Host` |
 | Only basic services | `Server` |
 | Specific role specified | Use specified |
 ## Container Role Mapping
 Map container names/images to roles:
 | Container Pattern | Role |
 |-------------------|------|
 | `*caddy*`, `*nginx*`, `*traefik*` | Reverse Proxy |
 | `*db*`, `*postgres*`, `*mysql*`, `*redis*` | Database |
 | `*webui*`, `*frontend*` | Web Application |
 | Others | Infer from image or use "Container" |
--- a/plugins/cmdb-assistant/skills/topology-generation.md
+++ b/plugins/cmdb-assistant/skills/topology-generation.md
@@ -1,155 +0,0 @@
 # Topology Generation Skill
 Generate Mermaid diagrams from NetBox data.
 ## Prerequisites
 Load skill: `mcp-tools-reference`
 ## View: Rack Elevation
 ### Data Collection
 1. Find rack: `dcim_list_racks name=<name>`
 2. Get devices: `dcim_list_devices rack_id=<id>`
 3. Note for each: `position`, `u_height`, `face`, `name`, `role`
 ### Mermaid Template
 ```mermaid
 graph TB
    subgraph rack["Rack: <rack-name> (U<height>)"]
        direction TB
        u42["U42: empty"]
        u41["U41: empty"]
        u40["U40: server-01 (Server)"]
        u39["U39: server-01 (cont.)"]
        u38["U38: switch-01 (Switch)"]
    end
 ```
 ### Rules
 - Mark top U with device name and role
 - Mark subsequent Us as "(cont.)" for multi-U devices
 - Empty Us show "empty"
 ## View: Network Topology
 ### Data Collection
 1. List sites: `dcim_list_sites`
 2. List devices: `dcim_list_devices site_id=<id>`
 3. List cables: `dcim_list_cables`
 4. List interfaces: `dcim_list_interfaces device_id=<id>`
 ### Mermaid Template
 ```mermaid
 graph TD
    subgraph site1["Site: Home"]
        router1[("core-router-01<br/>Router")]
        switch1[["dist-switch-01<br/>Switch"]]
        server1["web-server-01<br/>Server"]
        server2["db-server-01<br/>Server"]
    end
    router1 -->|"eth0 - eth1"| switch1
    switch1 -->|"gi0/1 - eth0"| server1
    switch1 -->|"gi0/2 - eth0"| server2
 ```
 ### Node Shapes by Role
 | Role | Shape | Mermaid Syntax |
 |------|-------|----------------|
 | Router | Cylinder | `[(" ")]` |
 | Switch | Double brackets | `[[ ]]` |
 | Server | Rectangle | `[ ]` |
 | Firewall | Hexagon | `{{ }}` |
 | Other | Rectangle | `[ ]` |
 ### Edge Labels
 Show interface names: `A-side - B-side`
 ## View: Site Overview
 ### Data Collection
 1. Get site: `dcim_get_site id=<id>`
 2. List racks: `dcim_list_racks site_id=<id>`
 3. Count devices per rack: `dcim_list_devices rack_id=<id>`
 ### Mermaid Template
 ```mermaid
 graph TB
    subgraph site["Site: Headquarters"]
        subgraph row1["Row 1"]
            rack1["Rack A1<br/>12/42 U used<br/>5 devices"]
            rack2["Rack A2<br/>20/42 U used<br/>8 devices"]
        end
        subgraph row2["Row 2"]
            rack3["Rack B1<br/>8/42 U used<br/>3 devices"]
        end
    end
 ```
 ## View: Full Infrastructure
 ### Data Collection
 1. List regions: `dcim_list_regions`
 2. List sites: `dcim_list_sites`
 3. Count devices: `dcim_list_devices status=active`
 ### Mermaid Template
 ```mermaid
 graph TB
    subgraph region1["Region: Americas"]
        site1["Headquarters<br/>3 racks, 25 devices"]
        site2["Branch Office<br/>1 rack, 5 devices"]
    end
    subgraph region2["Region: Europe"]
        site3["EU Datacenter<br/>10 racks, 100 devices"]
    end
    site1 -.->|"WAN Link"| site3
 ```
 ## Output Format
 Always provide:
 1. **Summary** - Brief description of diagram content
 2. **Mermaid Code Block** - The diagram code
 3. **Legend** - Explanation of shapes and colors
 4. **Data Notes** - Any data quality issues
 ### Example Output
 ```markdown
 ## Network Topology: Home Site
 This diagram shows network connections between 4 devices at Home site.
 ```mermaid
 graph TD
    router1[("core-router<br/>Router")]
    switch1[["main-switch<br/>Switch"]]
    server1["homelab-01<br/>Server"]
    router1 -->|"eth0 - gi0/24"| switch1
    switch1 -->|"gi0/1 - eth0"| server1
 ```
 **Legend:**
 - Cylinder shape: Routers
 - Double brackets: Switches
 - Rectangle: Servers
 **Data Notes:**
 - 1 device (nas-01) has no cable connections documented
 ```
--- a/plugins/cmdb-assistant/skills/visual-header.md
+++ b/plugins/cmdb-assistant/skills/visual-header.md
@@ -1,32 +0,0 @@
 # Visual Header Skill
 Standard visual header for cmdb-assistant commands.
 ## Header Template
 ```
 +----------------------------------------------------------------------+
 |  CMDB-ASSISTANT - [Context]                                          |
 +----------------------------------------------------------------------+
 ```
 ## Context Values by Command
 | Command | Context |
 |---------|---------|
 | `/cmdb-search` | Search |
 | `/cmdb-device` | Device Management |
 | `/cmdb-ip` | IP Management |
 | `/cmdb-site` | Site Management |
 | `/cmdb-audit` | Data Quality Audit |
 | `/cmdb-register` | Machine Registration |
 | `/cmdb-sync` | Machine Sync |
 | `/cmdb-topology` | Topology |
 | `/change-audit` | Change Audit |
 | `/ip-conflicts` | IP Conflict Detection |
 | `/initial-setup` | Setup Wizard |
 | Agent mode | Infrastructure Management |
 ## Usage
 Display header at the start of every command response before proceeding with the operation.
--- a/plugins/code-sentinel/.claude-plugin/plugin.json
+++ b/plugins/code-sentinel/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
  "name": "code-sentinel",
  "description": "Security scanning and code refactoring tools",
-  "version": "1.0.1",
+  "version": "1.0.0",
  "author": {
    "name": "Leo Miranda",
    "email": "leobmiranda@gmail.com"
--- a/plugins/code-sentinel/README.md
+++ b/plugins/code-sentinel/README.md
@@ -0,0 +1,47 @@
 # code-sentinel
 Security scanning and code refactoring tools for Claude Code projects.
 ## Features
 ### Security Scanning
 - **PreToolUse Hook**: Catches vulnerabilities BEFORE code is written
 - **Full Audit**: `/security-scan` for comprehensive project review
 - **Pattern Detection**: SQL injection, XSS, command injection, secrets, and more
 ### Refactoring
 - **Pattern Library**: Extract method, simplify conditionals, modernize syntax
 - **Safe Transforms**: Preview changes before applying
 - **Reference Updates**: Automatically updates all call sites
 ## Commands
 | Command | Description |
 |---------|-------------|
 | `/security-scan` | Full project security audit |
 | `/refactor <target>` | Apply refactoring with pattern |
 | `/refactor-dry <target>` | Preview opportunities without changes |
 ## Hooks
 - **PreToolUse (Write\|Edit)**: Scans code for security patterns before writing
 ## Security Patterns Detected
 | Category | Examples |
 |----------|----------|
 | Injection | SQL, Command, Code (eval), XSS |
 | Secrets | Hardcoded API keys, passwords |
 | Deserialization | Pickle, unsafe YAML |
 | Path Traversal | Unsanitized file paths |
 ## Installation
 ```bash
 /plugin marketplace add https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace.git
 /plugin install code-sentinel
 ```
 ## Integration
 See claude-md-integration.md for CLAUDE.md additions.
--- a/plugins/code-sentinel/agents/refactor-advisor.md
+++ b/plugins/code-sentinel/agents/refactor-advisor.md
@@ -6,16 +6,6 @@ description: Code structure and refactoring specialist
 You are a software architect specializing in code quality, design patterns, and refactoring.
 ## Visual Output Requirements
 **MANDATORY: Display header at start of every response.**
 ```
 ┌──────────────────────────────────────────────────────────────────┐
 │  🔒 CODE-SENTINEL · Refactor Advisory                            │
 └──────────────────────────────────────────────────────────────────┘
 ```
 ## Expertise
 - Martin Fowler's refactoring catalog
--- a/plugins/code-sentinel/agents/security-reviewer.md
+++ b/plugins/code-sentinel/agents/security-reviewer.md
@@ -1,5 +1,4 @@
 ---
 name: security-reviewer
 description: Security-focused code review agent
 ---
@@ -7,16 +6,6 @@ description: Security-focused code review agent
 You are a security engineer specializing in application security and secure coding practices.
 ## Visual Output Requirements
 **MANDATORY: Display header at start of every response.**
 ```
 ┌──────────────────────────────────────────────────────────────────┐
 │  🔒 CODE-SENTINEL · Security Review                              │
 └──────────────────────────────────────────────────────────────────┘
 ```
 ## Expertise
 - OWASP Top 10 vulnerabilities
--- a/plugins/code-sentinel/commands/refactor-dry.md
+++ b/plugins/code-sentinel/commands/refactor-dry.md
@@ -6,14 +6,6 @@ description: Preview refactoring changes without applying them
 Analyze and preview refactoring opportunities without making changes.
 ## Visual Output
 ```
 +----------------------------------------------------------------------+
 |  CODE-SENTINEL - Refactor Preview                                    |
 +----------------------------------------------------------------------+
 ```
 ## Usage
 ```
 /refactor-dry <target> [--all]
@@ -22,31 +14,44 @@ Analyze and preview refactoring opportunities without making changes.
 **Target:** File path, function name, or "." for current file
 **--all:** Show all opportunities, not just recommended
 ## Skills to Load
 - skills/refactoring-patterns.md
 - skills/dry-run-workflow.md
 ## Process
-1. **Scan Target** - Analyze code using patterns from skill
+1. **Scan Target**
-2. **Score Opportunities** - Rate by Impact/Risk/Effort (see dry-run-workflow skill)
+   Analyze code for refactoring opportunities.
 3. **Output** - Group by recommended vs optional
-## Output Format
+2. **Score Opportunities**
   Each opportunity rated by:
   - Impact (how much it improves code)
   - Risk (likelihood of breaking something)
   - Effort (complexity of the refactoring)
 3. **Output**
 ```
-## Refactoring Opportunities: <target>
+## Refactoring Opportunities: src/handlers.py
 ### Recommended (High Impact, Low Risk)
 1. **pattern** at lines X-Y
   - Impact: High | Risk: Low
   - Run: `/refactor <target> --pattern=<pattern>`
-### Optional
+1. **extract-method** at lines 45-67
- Lower priority items
+   - Extract order validation logic
   - Impact: High (reduces complexity from 12 to 4)
   - Risk: Low (pure function, no side effects)
   - Run: `/refactor src/handlers.py:45 --pattern=extract-method`
 2. **use-dataclass** for OrderInput class
   - Convert to dataclass with validation
   - Impact: Medium (reduces boilerplate)
   - Risk: Low
   - Run: `/refactor src/models.py:OrderInput --pattern=use-dataclass`
 ### Optional (Consider Later)
 3. **use-fstring** at 12 locations
   - Modernize string formatting
   - Impact: Low (readability only)
   - Risk: None
 ### Summary
- X recommended, Y optional
+- 2 recommended refactorings
- Estimated complexity reduction: Z%
+- 1 optional improvement
 - Estimated complexity reduction: 35%
 ```
--- a/plugins/code-sentinel/commands/refactor.md
+++ b/plugins/code-sentinel/commands/refactor.md
@@ -6,14 +6,6 @@ description: Apply refactoring patterns to improve code structure and maintainab
 Apply refactoring transformations to specified code.
 ## Visual Output
 ```
 +----------------------------------------------------------------------+
 |  CODE-SENTINEL - Refactor                                            |
 +----------------------------------------------------------------------+
 ```
 ## Usage
 ```
 /refactor <target> [--pattern=<pattern>]
@@ -22,31 +14,68 @@ Apply refactoring transformations to specified code.
 **Target:** File path, function name, or "." for current context
 **Pattern:** Specific refactoring pattern (optional)
-## Skills to Load
+## Available Patterns
- skills/refactoring-patterns.md
+### Structure
 | Pattern | Description |
 |---------|-------------|
 | `extract-method` | Extract code block into named function |
 | `extract-class` | Move related methods to new class |
 | `inline` | Inline trivial function/variable |
 | `rename` | Rename with all references updated |
 | `move` | Move function/class to different module |
 ### Simplification
 | Pattern | Description |
 |---------|-------------|
 | `simplify-conditional` | Flatten nested if/else |
 | `remove-dead-code` | Delete unreachable code |
 | `consolidate-duplicate` | Merge duplicate code blocks |
 | `decompose-conditional` | Break complex conditions into named parts |
 ### Modernization
 | Pattern | Description |
 |---------|-------------|
 | `use-comprehension` | Convert loops to list/dict comprehensions |
 | `use-pathlib` | Replace os.path with pathlib |
 | `use-fstring` | Convert .format() to f-strings |
 | `use-typing` | Add type hints |
 | `use-dataclass` | Convert class to dataclass |
 ## Process
-1. **Analyze Target** - Parse code, identify opportunities from skill, check dependencies
+1. **Analyze Target**
-2. **Propose Changes** - Show before/after diff, explain improvement, list affected files
+   - Parse code structure
-3. **Apply (with confirmation)** - Make changes, update references, run tests
+   - Identify refactoring opportunities
   - Check for side effects and dependencies
-## Output Format
+2. **Propose Changes**
   - Show before/after diff
   - Explain the improvement
   - List affected files/references
 3. **Apply (with confirmation)**
   - Make changes
   - Update all references
   - Run existing tests if available
 4. **Output**
 ```
-## Refactoring: <pattern>
+## Refactoring: extract-method
 ### Target
-<file>:<function> (lines X-Y)
+src/handlers.py:create_order (lines 45-89)
 ### Changes
- Change description
+- Extracted validation logic → validate_order_input()
 - Extracted pricing logic → calculate_order_total()
 - Original function now 15 lines (was 44)
 ### Files Modified
- file1.py
+- src/handlers.py
 - tests/test_handlers.py (updated calls)
 ### Metrics
- Cyclomatic complexity: X -> Y
+- Cyclomatic complexity: 12 → 4
- Function length: X -> Y lines
+- Function length: 44 → 15 lines
 ```
--- a/plugins/code-sentinel/commands/security-scan.md
+++ b/plugins/code-sentinel/commands/security-scan.md
@@ -6,36 +6,51 @@ description: Full security audit of codebase - scans all files for vulnerability
 Comprehensive security audit of the project.
 ## Visual Output
 ```
 +----------------------------------------------------------------------+
 |  CODE-SENTINEL - Security Scan                                       |
 +----------------------------------------------------------------------+
 ```
 ## Skills to Load
 - skills/security-patterns/SKILL.md
 ## Process
-1. **File Discovery** - Scan: .py, .js, .ts, .jsx, .tsx, .go, .rs, .java, .rb, .php, .sh
+1. **File Discovery**
-2. **Pattern Detection** - Apply patterns from skill (Critical/High/Medium severity)
+   Scan all code files: .py, .js, .ts, .jsx, .tsx, .go, .rs, .java, .rb, .php, .sh
 3. **Report** - Group by severity, include code snippets and fixes
-## Output Format
+2. **Pattern Detection**
   ### Critical Vulnerabilities
   | Pattern | Risk | Detection |
   |---------|------|-----------|
   | SQL Injection | High | String concat in SQL queries |
   | Command Injection | High | shell=True, os.system with vars |
   | XSS | High | innerHTML with user input |
   | Code Injection | Critical | eval/exec with external input |
   | Deserialization | Critical | pickle.loads, yaml.load unsafe |
   | Path Traversal | High | File ops without sanitization |
   | Hardcoded Secrets | High | API keys, passwords in code |
   | SSRF | Medium | URL from user input in requests |
   ### Code Quality Issues
   | Pattern | Risk | Detection |
   |---------|------|-----------|
   | Broad Exceptions | Low | `except:` or `except Exception:` |
   | Debug Statements | Low | print/console.log with data |
   | TODO/FIXME Security | Medium | Comments mentioning security |
   | Deprecated Functions | Medium | Known insecure functions |
 3. **Output Format**
 ```
 ## Security Scan Report
 ### Critical (Immediate Action Required)
-[red] file:line - Vulnerability Type
+🔴 src/db.py:45 - SQL Injection
-   Code: `problematic code`
+   Code: `f"SELECT * FROM users WHERE id = {user_id}"`
-   Fix: Recommended solution
+   Fix: Use parameterized query: `cursor.execute("SELECT * FROM users WHERE id = ?", (user_id,))`
-### High / Medium / Low
+### High
-[Similar format]
+🟠 config.py:12 - Hardcoded Secret
   Code: `API_KEY = "sk-1234..."`
   Fix: Use environment variable: `API_KEY = os.environ.get("API_KEY")`
 ### Medium
 🟡 utils.py:78 - Broad Exception
   Code: `except:`
   Fix: Catch specific exceptions
 ### Summary
 - Critical: X (must fix before deploy)
@@ -43,8 +58,7 @@ Comprehensive security audit of the project.
 - Medium: X (improve when possible)
 ```
-## Exit Guidance
+4. **Exit Code Guidance**
-
+   - Critical findings: Recommend blocking merge/deploy
- Critical findings: Block merge/deploy
+   - High findings: Recommend fixing before release
- High findings: Fix before release
+   - Medium/Low: Informational
 - Medium/Low: Informational
--- a/plugins/code-sentinel/skills/dry-run-workflow.md
+++ b/plugins/code-sentinel/skills/dry-run-workflow.md
@@ -1,99 +0,0 @@
 ---
 description: Workflow for previewing changes safely before applying them
 ---
 # Dry Run Workflow Skill
 ## Overview
 Dry run mode analyzes code and shows proposed changes without modifying files. Essential for reviewing impact before committing to changes.
 ## Opportunity Scoring
 Rate each refactoring opportunity on three dimensions:
 ### Impact Score (1-5)
 | Score | Meaning | Example |
 |-------|---------|---------|
 | 5 | Major improvement | Cyclomatic complexity 15 -> 3 |
 | 4 | Significant improvement | Function 50 lines -> 15 lines |
 | 3 | Moderate improvement | Better naming, clearer structure |
 | 2 | Minor improvement | Code style modernization |
 | 1 | Cosmetic only | Formatting changes |
 ### Risk Score (1-5)
 | Score | Meaning | Example |
 |-------|---------|---------|
 | 5 | Very high risk | Changes to core business logic |
 | 4 | High risk | Modifies shared utilities |
 | 3 | Moderate risk | Changes function signatures |
 | 2 | Low risk | Internal implementation only |
 | 1 | Minimal risk | Pure functions, no side effects |
 ### Effort Score (1-5)
 | Score | Meaning | Example |
 |-------|---------|---------|
 | 5 | Major effort | Requires architecture changes |
 | 4 | Significant effort | Many files affected |
 | 3 | Moderate effort | Multiple related changes |
 | 2 | Low effort | Single file, clear scope |
 | 1 | Trivial | Automated transformation |
 ## Priority Calculation
 ```
 Priority = (Impact * 2) - Risk - (Effort * 0.5)
 ```
 | Priority Range | Recommendation |
 |---------------|----------------|
 | > 5 | Recommended - do it |
 | 3-5 | Optional - consider it |
 | < 3 | Skip - not worth it |
 ## Output Format
 ### Recommended Section
 High impact, low risk opportunities:
 ```
 1. **pattern-name** at file:lines
   - Description of the change
   - Impact: High/Medium/Low (specific metric improvement)
   - Risk: Low/Medium/High (why)
   - Run: `/refactor <target> --pattern=<pattern>`
 ```
 ### Optional Section
 Lower priority opportunities grouped by type.
 ### Summary
 - Count of recommended vs optional
 - Estimated overall improvement percentage
 - Any blockers or dependencies
 ## Dependency Detection
 Before recommending changes, check for:
 1. **Test Coverage** - Does this code have tests?
 2. **Usage Scope** - Is it used elsewhere?
 3. **Side Effects** - Does it modify external state?
 4. **Breaking Changes** - Will it change public API?
 Flag dependencies in output:
 ```
 Note: This refactoring requires updating 3 callers:
  - src/api/handlers.py:45
  - src/cli/commands.py:78
  - tests/test_handlers.py:23
 ```
 ## Safety Checklist
 Before recommending any change:
 - [ ] All affected code locations identified
 - [ ] No breaking API changes without flag
 - [ ] Test coverage assessed
 - [ ] Side effects documented
 - [ ] Rollback path clear (git)
--- a/plugins/code-sentinel/skills/refactoring-patterns.md
+++ b/plugins/code-sentinel/skills/refactoring-patterns.md
@@ -1,119 +0,0 @@
 ---
 description: Code refactoring patterns and techniques for improving structure and maintainability
 ---
 # Refactoring Patterns Skill
 ## Structure Patterns
 | Pattern | Description | When to Use |
 |---------|-------------|-------------|
 | `extract-method` | Extract code block into named function | Long functions, repeated logic |
 | `extract-class` | Move related methods to new class | Class doing too much |
 | `inline` | Inline trivial function/variable | Over-abstracted code |
 | `rename` | Rename with all references updated | Unclear naming |
 | `move` | Move function/class to different module | Misplaced code |
 ### extract-method Example
 ```python
 # BEFORE
 def process_order(order):
    # Validate (extract this)
    if not order.items:
        raise ValueError("Empty order")
    if order.total < 0:
        raise ValueError("Invalid total")
    # Process
    for item in order.items:
        inventory.reserve(item)
    return create_invoice(order)
 # AFTER
 def validate_order(order):
    if not order.items:
        raise ValueError("Empty order")
    if order.total < 0:
        raise ValueError("Invalid total")
 def process_order(order):
    validate_order(order)
    for item in order.items:
        inventory.reserve(item)
    return create_invoice(order)
 ```
 ## Simplification Patterns
 | Pattern | Description | When to Use |
 |---------|-------------|-------------|
 | `simplify-conditional` | Flatten nested if/else | Deep nesting (>3 levels) |
 | `remove-dead-code` | Delete unreachable code | After refactoring |
 | `consolidate-duplicate` | Merge duplicate code blocks | DRY violations |
 | `decompose-conditional` | Break complex conditions into named parts | Long boolean expressions |
 ### simplify-conditional Example
 ```python
 # BEFORE
 if user:
    if user.active:
        if user.has_permission:
            do_action()
 # AFTER (guard clauses)
 if not user:
    return
 if not user.active:
    return
 if not user.has_permission:
    return
 do_action()
 ```
 ## Modernization Patterns
 | Pattern | Description | When to Use |
 |---------|-------------|-------------|
 | `use-comprehension` | Convert loops to list/dict comprehensions | Simple transformations |
 | `use-pathlib` | Replace os.path with pathlib | File path operations |
 | `use-fstring` | Convert .format() to f-strings | String formatting |
 | `use-typing` | Add type hints | Public APIs, complex functions |
 | `use-dataclass` | Convert class to dataclass | Data-holding classes |
 ### use-dataclass Example
 ```python
 # BEFORE
 class User:
    def __init__(self, name, email, age):
        self.name = name
        self.email = email
        self.age = age
 # AFTER
@dataclass
 class User:
    name: str
    email: str
    age: int
 ```
 ## Code Smell Detection
 | Smell | Indicators | Suggested Pattern |
 |-------|------------|-------------------|
 | Long Method | >20 lines, multiple responsibilities | extract-method |
 | Large Class | >10 methods, low cohesion | extract-class |
 | Primitive Obsession | Many related primitives | use-dataclass |
 | Nested Conditionals | >3 nesting levels | simplify-conditional |
 | Duplicate Code | Copy-pasted blocks | consolidate-duplicate |
 | Dead Code | Unreachable branches | remove-dead-code |
 ## Metrics
 After refactoring, measure improvement:
 | Metric | Good Target | Tool |
 |--------|-------------|------|
 | Cyclomatic Complexity | <10 per function | radon, lizard |
 | Function Length | <25 lines | manual count |
 | Class Cohesion | LCOM <0.5 | pylint |
 | Duplication | <3% | jscpd, radon |
--- a/plugins/contract-validator/.claude-plugin/plugin.json
+++ b/plugins/contract-validator/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
  "name": "contract-validator",
-  "version": "1.1.0",
+  "version": "1.0.0",
  "description": "Cross-plugin compatibility validation and Claude.md agent verification",
  "author": {
    "name": "Leo Miranda",
@@ -17,5 +17,6 @@
    "interfaces",
    "cross-plugin"
  ],
-  "commands": ["./commands/"]
+  "commands": ["./commands/"],
  "mcpServers": ["./.mcp.json"]
 }
--- a/plugins/contract-validator/.mcp.json
+++ b/plugins/contract-validator/.mcp.json
@@ -0,0 +1,9 @@
 {
  "mcpServers": {
    "contract-validator": {
      "type": "stdio",
      "command": "${CLAUDE_PLUGIN_ROOT}/mcp-servers/contract-validator/run.sh",
      "args": []
    }
  }
 }
--- a/plugins/contract-validator/README.md
+++ b/plugins/contract-validator/README.md
@@ -0,0 +1,157 @@
 # contract-validator Plugin
 Cross-plugin compatibility validation and CLAUDE.md agent verification for Claude Code plugin marketplaces.
 ## Problem Statement
 As plugin marketplaces grow, several compatibility issues emerge:
 - **Command conflicts**: Multiple plugins defining the same slash command (e.g., `/initial-setup`)
 - **Tool name overlaps**: Different plugins using identical tool names with incompatible interfaces
 - **Undocumented dependencies**: Agents referencing tools that don't exist
 - **Broken data flows**: Agent sequences that expect outputs not produced by prior steps
 Contract-validator solves these by parsing plugin interfaces and validating compatibility before runtime.
 ## Features
 - **Interface Parsing**: Extract commands, agents, and tools from plugin README.md files
 - **Agent Extraction**: Parse CLAUDE.md Four-Agent Model tables and Agents sections
 - **Compatibility Checks**: Pairwise validation between all plugins in a marketplace
 - **Data Flow Validation**: Verify agent tool sequences have valid data producers/consumers
 - **Comprehensive Reports**: Markdown or JSON reports with actionable suggestions
 ## Installation
 This plugin is part of the leo-claude-mktplace. Install via:
 ```bash
 # From marketplace
 claude plugins install leo-claude-mktplace/contract-validator
 # Setup MCP server venv
 cd ~/.claude/plugins/marketplaces/leo-claude-mktplace/mcp-servers/contract-validator
 python -m venv .venv
 source .venv/bin/activate
 pip install -r requirements.txt
 ```
 ## Commands
 | Command | Description |
 |---------|-------------|
 | `/initial-setup` | Interactive setup wizard |
 | `/validate-contracts` | Full marketplace compatibility validation |
 | `/check-agent` | Validate single agent definition |
 | `/list-interfaces` | Show all plugin interfaces |
 ## Agents
 | Agent | Description |
 |-------|-------------|
 | `full-validation` | Complete cross-plugin compatibility validation |
 | `agent-check` | Single agent definition verification |
 ## Tools Summary
 ### Parse Tools (2)
 - `parse_plugin_interface` - Extract interface from plugin README.md
 - `parse_claude_md_agents` - Extract agents from CLAUDE.md
 ### Validation Tools (3)
 - `validate_compatibility` - Check two plugins for conflicts
 - `validate_agent_refs` - Verify agent tool references exist
 - `validate_data_flow` - Check data flow through agent sequences
 ### Report Tools (2)
 - `generate_compatibility_report` - Full marketplace validation report
 - `list_issues` - Filter issues by severity or type
 ## Example Workflow
 ```
 /validate-contracts ~/claude-plugins-work
 # Output:
 # Contract Validation Report
 #
 # | Metric     | Count |
 # |------------|-------|
 # | Plugins    | 12    |
 # | Commands   | 39    |
 # | Tools      | 32    |
 # | **Issues** | **7** |
 # | - Errors   | 3     |
 # | - Warnings | 0     |
 # | - Info     | 4     |
 #
 # ## Issues Found
 # [ERROR] Command conflict: projman and data-platform both define /initial-setup
 # [ERROR] Command conflict: projman and pr-review both define /initial-setup
 # ...
 ```
 ```
 /check-agent Planner ./CLAUDE.md
 # Output:
 # Agent: Planner
 # Status: VALID
 #
 # Tool References Found (3):
 # - create_issue ✓
 # - search_lessons ✓
 # - get_execution_order ✓
 #
 # Data Flow: No issues detected
 ```
 ## Issue Types
 | Type | Severity | Description |
 |------|----------|-------------|
 | `interface_mismatch` | ERROR | Command name conflict between plugins |
 | `missing_tool` | ERROR | Agent references non-existent tool |
 | `interface_mismatch` | WARNING | Tool name overlap (different plugins) |
 | `optional_dependency` | WARNING | Agent uses tool from non-required plugin |
 | `undeclared_output` | INFO | Agent has no documented tool references |
 ## Parsed Interface Structure
 When parsing a plugin README.md, the following structure is extracted:
 ```json
 {
  "plugin_name": "data-platform",
  "description": "Data engineering tools...",
  "commands": [
    {"name": "/ingest", "description": "Load data..."}
  ],
  "agents": [
    {"name": "data-analysis", "description": "..."}
  ],
  "tools": [
    {"name": "read_csv", "category": "pandas"}
  ],
  "tool_categories": {
    "pandas": ["read_csv", "to_csv", ...],
    "PostgreSQL": ["pg_query", ...]
  },
  "features": ["pandas Operations", "PostgreSQL/PostGIS", ...]
 }
 ```
 ## Best Practices
 ### For Plugin Authors
 1. **Use unique command names**: Prefix with plugin name if generic (e.g., `/data-setup` vs `/initial-setup`)
 2. **Document all tools**: Include tool names in README.md with backticks
 3. **Specify tool categories**: Use `### Category (N tools)` headers
 4. **Declare agent tools**: List tools used by agents in their definitions
 ### For Marketplace Maintainers
 1. **Run validation before merging**: Use `/validate-contracts` in CI/CD
 2. **Review warnings**: Tool overlaps may indicate design issues
 3. **Track issues over time**: Use JSON format for programmatic tracking
--- a/Show More
+++ b/Show More
		`@@ -1 +0,0 @@`
			`GITEA_REPO=personal-projects/leo-claude-mktplace`
`@@ -112,4 +112,4 @@ pytest tests/ -v`

	`## Usage`	`## Usage`

	This MCP server is used by the `viz-platform` plugin. See the plugin's commands in `plugins/viz-platform/commands/` for usage.	This MCP server is used by the `viz-platform` plugin. See [plugins/viz-platform/README.md](../../plugins/viz-platform/README.md) for usage instructions.